@node-red/runtime 4.1.3 → 4.1.4

package/lib/nodes/Node.js

@@ -322,6 +322,7 @@ Node.prototype.close = function(removed) {
             // The callback takes a 'done' callback and (maybe) the removed flag
             promises.push(
                 new Promise((resolve) => {
+                    var resolved = false;
                     try {
                         var args = [];
                         if (callback.length === 2) {
@@ -329,13 +330,19 @@ Node.prototype.close = function(removed) {
                             args.push(!!removed);
                         }
                         args.push(() => {
-                            resolve();
+                            if (!resolved) {
+                                resolved = true;
+                                resolve();
+                            }
                         });
                         callback.apply(node, args);
                     } catch(err) {
                         // TODO: error thrown in node async close callback
                         // We've never logged this properly.
-                        resolve();
+                        if (!resolved) {
+                            resolved = true;
+                            resolve();
+                        }
                     }
                 })
             );

package/lib/nodes/context/localfilesystem.js

@@ -155,6 +155,7 @@ function LocalFileSystem(config){
     }
     this.pendingWrites = {};
     this.knownCircularRefs = {};
+    this.closing = false;
 
     if (config.hasOwnProperty('flushInterval')) {
         this.flushInterval = Math.max(0,config.flushInterval) * 1000;
@@ -233,16 +234,19 @@ LocalFileSystem.prototype.open = function(){
 
 LocalFileSystem.prototype.close = function(){
     var self = this;
-    if (this.cache && this._pendingWriteTimeout) {
-        clearTimeout(this._pendingWriteTimeout);
-        delete this._pendingWriteTimeout;
+    this.closing = true;
+    if (this.cache) {
+        if (this._pendingWriteTimeout) {
+            clearTimeout(this._pendingWriteTimeout);
+            delete this._pendingWriteTimeout;
+        }
         this.flushInterval = 0;
+        // Always flush pending writes on close, even if no timeout was pending
         self.writePromise = self.writePromise.then(function(){
             return self._flushPendingWrites.call(self).catch(function(err) {
                 log.error(log._("context.localfilesystem.error-write",{message:err.toString()}));
             });
         });
-
     }
     return this.writePromise;
 }
@@ -298,8 +302,9 @@ LocalFileSystem.prototype.set = function(scope, key, value, callback) {
     if (this.cache) {
         this.cache.set(scope,key,value,callback);
         this.pendingWrites[scope] = true;
-        if (this._pendingWriteTimeout) {
-            // there's a pending write which will handle this
+        if (this._pendingWriteTimeout || this.closing) {
+            // there's a pending write which will handle this,
+            // or we're closing and the close() flush will handle it
             return;
         } else {
             this._pendingWriteTimeout = setTimeout(function() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "4.1.3",
+    "version": "4.1.4",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "4.1.3",
-        "@node-red/util": "4.1.3",
+        "@node-red/registry": "4.1.4",
+        "@node-red/util": "4.1.4",
         "async-mutex": "0.5.0",
         "clone": "2.1.2",
         "cronosjs": "1.7.1",