@flowfuse/nr-launcher - npm Package Compare versions

Comparing version 2.5.2-5843274-202406170826.0 to 2.5.2-a5ba57e-202407040907.0

lib/launcher.js

@@ -145,2 +145,4 @@ const fs = require('fs')
         nodesDir.push(path.join(require.main.path, '..', '..', '@flowfuse', 'nr-file-nodes').replace(/\\/g, '/'))
+        nodesDir.push(path.join(require.main.path, 'node_modules', '@flowfuse', 'nr-assistant').replace(/\\/g, '/'))
+        nodesDir.push(path.join(require.main.path, '..', '..', '@flowfuse', 'nr-assistant').replace(/\\/g, '/'))
         nodesDir.push(require.main.path)
@@ -369,3 +371,3 @@
             stdio: ['ignore', 'pipe', 'pipe'],
-            cwd: path.join(this.settings.rootDir, this.settings.userDir)
+            cwd: path.join(this.settings.rootDir, this.settings.userDir, 'storage')
         }
@@ -372,0 +374,0 @@

lib/runtimeSettings.js

@@ -27,2 +27,3 @@ function getSettingsFile (settings) {
         projectLink: null,
+        assistant: null,
         httpNodeAuth: '',
@@ -148,2 +149,13 @@ setupAuthMiddleware: '',
     }
+
+    if (settings.assistant) {
+        // Enable the nr-assistant nodes when configured
+        projectSettings.assistant = {
+            enabled: settings.assistant.enabled, // overall enable/disable
+            url: `${settings.forgeURL}/api/v1/assistant/`, // URL for the assistant service
+            token: settings.projectToken,
+            requestTimeout: settings.assistant.requestTimeout || 60000 // timeout for assistant requests
+        }
+    }
+
     let contextStorage = ''
@@ -205,8 +217,8 @@ if (settings.fileStore?.url) {
 
-    // Something here is causing direct access to the editor to fail in FFC.
-    // if (settings.forgeURL.includes('https://')) {
-    //     httpAdminCookieOptions.sameSite = 'None'
-    //     httpAdminCookieOptions.secure = true
-    //     httpAdminCookieOptions.partitioned = true
-    // }
+    if (settings.forgeURL.includes('https://')) {
+        httpAdminCookieOptions.name = 'nr-ff-auth'
+        httpAdminCookieOptions.sameSite = 'None'
+        httpAdminCookieOptions.secure = true
+        httpAdminCookieOptions.partitioned = true
+    }
 
@@ -333,3 +345,4 @@ const settingsTemplate = `
         ${projectSettings.fileStore ? 'fileStore: ' + JSON.stringify(projectSettings.fileStore) + ',' : ''}
-        ${projectSettings.projectLink ? 'projectLink: ' + JSON.stringify(projectSettings.projectLink) : ''}
+        ${projectSettings.projectLink ? 'projectLink: ' + JSON.stringify(projectSettings.projectLink) + ',' : ''}
+        ${projectSettings.assistant ? 'assistant: ' + JSON.stringify(projectSettings.assistant) : ''}
     },
@@ -336,0 +349,0 @@ runtimeState: {

package.json

 {
   "name": "@flowfuse/nr-launcher",
-  "version": "2.5.2-5843274-202406170826.0",
+  "version": "2.5.2-a5ba57e-202407040907.0",
   "description": "FlowFuse Launcher for running Node-RED",
@@ -47,2 +47,3 @@ "exports": {
   "dependencies": {
+    "@flowfuse/nr-assistant": "nightly",
     "@flowfuse/nr-file-nodes": "nightly",
@@ -69,2 +70,3 @@ "@flowfuse/nr-project-nodes": "nightly",
     "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-no-only-tests": "^3.1.0",
     "mocha": "^10.2.0",
@@ -71,0 +73,0 @@ "sass": "1.66.1",

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

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

557201

increased by0.16%

Lines of code

3341

increased by0.39%

Worsened metrics

Dependency count

17

increased by6.25%

Dev dependency count

10

increased by11.11%

Dependency changes

• + Added@flowfuse/nr-assistant@nightly

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