@flowfuse/nr-launcher - npm Package Compare versions

Comparing version 2.6.0 to 2.6.1-086b7f8-202408010855.0

lib/context/FFContextStorage.js

@@ -90,3 +90,9 @@ const MemoryCache = require('./memoryCache')
             const path = paginateUrl('cache', cursor, limit)
-            const response = await self.client.get(path, opts)
+            
+            let response
+            try {
+                response = await self.client.get(path, opts)
+            } catch (err) {
+                console.error('Error populating cache ' + err.toString())
+            }
             return response?.body
@@ -335,3 +341,7 @@ }
         }
-        await self.client.post(path, opts)
+        try {
+            await self.client.post(path, opts)
+        } catch (err) {
+            console.error('Failed to write cache to backend ' + err.toString())
+        }
     }
@@ -338,0 +348,0 @@ }

lib/launcher.js

@@ -635,2 +635,27 @@ const fs = require('fs')
         })
+        let stderrBuffer = ''
+        this.proc.stderr.on('data', (data) => {
+            // Do not assume `data` is a complete log record.
+            // Parse until newline
+            stderrBuffer = stderrBuffer + data
+            let linebreak = stderrBuffer.indexOf('\n')
+            while (linebreak > -1) {
+                const line = stderrBuffer.substring(0, linebreak)
+                if (line.length > 0) {
+                    if (line[0] === '{' && line[line.length - 1] === '}') {
+                        // In case something console.log's directly, we can't assume the line is JSON
+                        // from our logger
+                        try {
+                            this.logBuffer.add(JSON.parse(line))
+                        } catch (err) {
+                            this.logBuffer.add({ msg: line })
+                        }
+                    } else {
+                        this.logBuffer.add({ msg: line })
+                    }
+                }
+                stderrBuffer = stderrBuffer.substring(linebreak + 1)
+                linebreak = stderrBuffer.indexOf('\n')
+            }
+        })
     }
@@ -637,0 +662,0 @@

lib/runtimeSettings.js

@@ -0,1 +1,2 @@
+const path = require('path')
 function getSettingsFile (settings) {
@@ -159,2 +160,8 @@ const projectSettings = {
 
+    // all current drivers add settings.rootDir and settings.userDir
+    if (settings.rootDir) {
+        const uibRoot = path.join(settings.rootDir, settings.userDir, 'storage', 'uibuilder').split(path.sep).join(path.posix.sep)
+        projectSettings.uibuilder = { uibRoot }
+    }
+
     let contextStorage = ''
@@ -355,2 +362,3 @@ if (settings.fileStore?.url) {
     httpAdminCookieOptions: ${JSON.stringify(httpAdminCookieOptions)},
+    ${projectSettings.uibuilder ? 'uibuilder: ' + JSON.stringify(projectSettings.uibuilder) : ''}
 }
@@ -357,0 +365,0 @@ `

package.json

 {
-    "name": "@flowfuse/nr-launcher",
-    "version": "2.6.0",
-    "description": "FlowFuse Launcher for running Node-RED",
-    "exports": {
-        "./auditLogger": "./lib/auditLogger/index.js",
-        "./adminAuth": "./lib/auth/adminAuth.js",
-        "./authMiddleware": "./lib/auth/httpAuthMiddleware.js",
-        "./storage": "./lib/storage/index.js",
-        "./context": "./lib/context/index.js"
-    },
-    "node-red": {
-        "plugins": {
-            "flowfuse-auth": "lib/auth/httpAuthPlugin.js",
-            "flowfuse-library": "lib/storage/libraryPlugin.js",
-            "forge-light": "lib/theme/forge-light/forge-light.js",
-            "forge-dark": "lib/theme/forge-dark/forge-dark.js",
-            "forge-resources": "lib/resources/resourcePlugin.js"
-        }
-    },
-    "scripts": {
-        "test": "mocha 'test/unit/**/*_spec.js'",
-        "lint": "eslint -c .eslintrc *.js lib/*.js test/**/*.js",
-        "lint:fix": "eslint -c .eslintrc *.js lib/*.js test/**/*.js --fix",
-        "build-theme": "node lib/theme/scripts/build.js "
-    },
-    "keywords": [
-        "FlowFuse"
-    ],
-    "bin": {
-        "flowforge-node-red": "./index.js",
-        "flowfuse-node-red": "./index.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/FlowFuse/nr-launcher.git"
-    },
-    "author": {
-        "name": "FlowFuse Inc."
-    },
-    "license": "Apache-2.0",
-    "bugs": {
-        "url": "https://github.com/FlowFuse/nr-launcher/issues"
-    },
-    "homepage": "https://github.com/FlowFuse/nr-launcher#readme",
-    "dependencies": {
-        "@flowfuse/nr-assistant": "^0.1.0",
-        "@flowfuse/nr-file-nodes": "^0.0.5",
-        "@flowfuse/nr-project-nodes": "^0.6.2",
-        "@node-red/util": "^3.1.0",
-        "body-parser": "^1.20.2",
-        "command-line-args": "^5.2.1",
-        "express": "^4.18.2",
-        "express-session": "^1.18.0",
-        "got": "^11.8.6",
-        "json-stringify-safe": "5.0.1",
-        "memorystore": "^1.6.7",
-        "oauth": "^0.9.15",
-        "parse-prometheus-text-format": "^1.1.1",
-        "passport": "0.6.0",
-        "passport-oauth2": "^1.6.1",
-        "prom-client": "^15.0.0",
-        "ws": "^8.7.0"
-    },
-    "devDependencies": {
-        "@flowforge/file-server": "git://github.com/FlowFuse/file-server.git",
-        "eslint": "^8.49.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-no-only-tests": "^3.1.0",
-        "mocha": "^10.2.0",
-        "sass": "1.66.1",
-        "should": "^13.2.3",
-        "sinon": "^17.0.1",
-        "sqlite3": "^5.1.6",
-        "yaml": "^2.1.3"
+  "name": "@flowfuse/nr-launcher",
+  "version": "2.6.1-086b7f8-202408010855.0",
+  "description": "FlowFuse Launcher for running Node-RED",
+  "exports": {
+    "./auditLogger": "./lib/auditLogger/index.js",
+    "./adminAuth": "./lib/auth/adminAuth.js",
+    "./authMiddleware": "./lib/auth/httpAuthMiddleware.js",
+    "./storage": "./lib/storage/index.js",
+    "./context": "./lib/context/index.js"
+  },
+  "node-red": {
+    "plugins": {
+      "flowfuse-auth": "lib/auth/httpAuthPlugin.js",
+      "flowfuse-library": "lib/storage/libraryPlugin.js",
+      "forge-light": "lib/theme/forge-light/forge-light.js",
+      "forge-dark": "lib/theme/forge-dark/forge-dark.js",
+      "forge-resources": "lib/resources/resourcePlugin.js"
     }
+  },
+  "scripts": {
+    "test": "mocha 'test/unit/**/*_spec.js'",
+    "lint": "eslint -c .eslintrc *.js lib/*.js test/**/*.js",
+    "lint:fix": "eslint -c .eslintrc *.js lib/*.js test/**/*.js --fix",
+    "build-theme": "node lib/theme/scripts/build.js "
+  },
+  "keywords": [
+    "FlowFuse"
+  ],
+  "bin": {
+    "flowforge-node-red": "./index.js",
+    "flowfuse-node-red": "./index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/FlowFuse/nr-launcher.git"
+  },
+  "author": {
+    "name": "FlowFuse Inc."
+  },
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/FlowFuse/nr-launcher/issues"
+  },
+  "homepage": "https://github.com/FlowFuse/nr-launcher#readme",
+  "dependencies": {
+    "@flowfuse/nr-assistant": "nightly",
+    "@flowfuse/nr-file-nodes": "nightly",
+    "@flowfuse/nr-project-nodes": "nightly",
+    "@node-red/util": "^3.1.0",
+    "body-parser": "^1.20.2",
+    "command-line-args": "^5.2.1",
+    "express": "^4.18.2",
+    "express-session": "^1.18.0",
+    "got": "^11.8.6",
+    "json-stringify-safe": "5.0.1",
+    "memorystore": "^1.6.7",
+    "oauth": "^0.9.15",
+    "parse-prometheus-text-format": "^1.1.1",
+    "passport": "0.6.0",
+    "passport-oauth2": "^1.6.1",
+    "prom-client": "^15.0.0",
+    "ws": "^8.7.0"
+  },
+  "devDependencies": {
+    "@flowforge/file-server": "git://github.com/FlowFuse/file-server.git",
+    "eslint": "^8.49.0",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-no-only-tests": "^3.1.0",
+    "mocha": "^10.2.0",
+    "sass": "1.66.1",
+    "should": "^13.2.3",
+    "sinon": "^17.0.1",
+    "sqlite3": "^5.1.6",
+    "yaml": "^2.1.3"
+  }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

559478

increased by0.29%

Lines of code

3382

increased by1.23%

Worsened metrics

Number of downloads

372

decreased by-61.45%

Number of low quality alerts

1

increased byInfinity%

Dependency changes

• + Added@flowfuse/nr-assistant@0.1.4-51c0518-202412161051.0(transitive)

• + Added@flowfuse/nr-file-nodes@0.0.9-1e6a163-202412191018.0(transitive)

• + Added@flowfuse/nr-project-nodes@0.7.5-1fb7208-202412091856.0(transitive)

• + Addedagent-base@7.1.3(transitive)

• + Addedhttp-proxy-agent@7.0.2(transitive)

• + Addedhttps-proxy-agent@7.0.6(transitive)

• + Addedproxy-from-env@1.1.0(transitive)

• - Removed@flowfuse/nr-assistant@0.1.3(transitive)

• - Removed@flowfuse/nr-file-nodes@0.0.5(transitive)

• - Removed@flowfuse/nr-project-nodes@0.6.4(transitive)

• Updated@flowfuse/nr-assistant@nightly

• Updated@flowfuse/nr-file-nodes@nightly

• Updated@flowfuse/nr-project-nodes@nightly