fix: closing file connections before updating the server (#1172)

SignalK · Oct 28, 2020 · 38533d7 · 38533d7
1 parent e82e23a
commit 38533d7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/interfaces/appstore.js b/src/interfaces/appstore.js
@@ -19,6 +19,7 @@ const _ = require('lodash')
 const compareVersions = require('compare-versions')
 const { installModule, removeModule } = require('../modules')
 const {
+  isTheServerModule,
   findModulesWithKeyword,
   getLatestServerVersion,
   getAuthor
@@ -55,7 +56,7 @@ module.exports = function(app) {
           findPluginsAndWebapps()
             .then(([plugins, webapps]) => {
               if (
-                name !== app.config.name &&
+                !isTheServerModule(name, app) &&
                 !plugins.find(packageNameIs(name)) &&
                 !webapps.find(packageNameIs(name))
               ) {
@@ -302,6 +303,21 @@ module.exports = function(app) {
   }
 
   function installSKModule(module, version) {
+    if (isTheServerModule(module, app)) {
+      try {
+        app.providers.forEach(providerHolder => {
+          if (
+            typeof providerHolder.pipeElements[0].pipeline[0].options
+              .filename !== 'undefined'
+          ) {
+            debug('close file connection:', providerHolder.id)
+            providerHolder.pipeElements[0].end()
+          }
+        })
+      } catch (err) {
+        debug(err)
+      }
+    }
     updateSKModule(module, version, false)
   }
 

diff --git a/src/modules.ts b/src/modules.ts
@@ -174,7 +174,7 @@ function runNpm(
 
   debug(`${command}: ${packageString}`)
 
-  if (name === app.config.name) {
+  if (isTheServerModule(name, app)) {
     if (process.platform === 'win32') {
       npm = spawn(
         'cmd',
@@ -207,6 +207,10 @@ function runNpm(
   })
 }
 
+function isTheServerModule(moduleName: string, app: App) {
+  return moduleName === app.config.name
+}
+
 function findModulesWithKeyword(keyword: string) {
   return new Promise((resolve, reject) => {
     let errorCount = 0
@@ -325,6 +329,7 @@ module.exports = {
   modulesWithKeyword,
   installModule,
   removeModule,
+  isTheServerModule,
   findModulesWithKeyword,
   getLatestServerVersion,
   checkForNewServerVersion,