@aaqu/fromcubes-react 0.2.2 → 0.2.3

package/nodes/lib/helpers.js

@@ -141,6 +141,23 @@ function validateSubPath(input) {
   return { ok: true, value: trimmed };
 }
 
+/**
+ * The app's router: `app._router` on Express 4, `app.router` on Express 5.
+ * `_router` is read first because Express 4's `app.router` getter throws.
+ *
+ * @param {Object} app  Express app (e.g. `RED.httpNode`).
+ * @returns {Object|undefined}
+ */
+function getHttpRouter(app) {
+  if (!app) return undefined;
+  if (app._router) return app._router;
+  try {
+    return app.router;
+  } catch {
+    return undefined;
+  }
+}
+
 /**
  * Remove a single route mount-point from an Express router by exact path
  * match. Used at deploy teardown to drop the previous portal's HTTP route
@@ -745,6 +762,8 @@ module.exports.identifierRe = identifierRe;
 module.exports.serveableHash = serveableHash;
 module.exports.hasFreshBuild = hasFreshBuild;
 module.exports.shouldSkipInstall = shouldSkipInstall;
+module.exports.getHttpRouter = getHttpRouter;
+module.exports.removeRoute = removeRoute;
 module.exports.NAME_MAX_LEN = NAME_MAX_LEN;
 
 /**
@@ -969,6 +988,7 @@ function createHelpers(RED) {
     quickCheckSyntax,
     serveableHash,
     hasFreshBuild,
+    getHttpRouter,
     removeRoute,
     isSafeName,
     validateSubPath,

package/nodes/portal-react.js

@@ -381,6 +381,7 @@ module.exports = function (RED) {
     quickCheckSyntax,
     serveableHash,
     hasFreshBuild,
+    getHttpRouter,
     removeRoute,
     isSafeName,
     validateSubPath,
@@ -539,7 +540,7 @@ module.exports = function (RED) {
         deleteCacheFiles(oldSt.jsxHash);
       }
       delete pageState[prevEndpoint];
-      removeRoute(RED.httpNode._router, prevEndpoint);
+      removeRoute(getHttpRouter(RED.httpNode), prevEndpoint);
       delete registeredRoutes[prevEndpoint];
       if (endpointOwners[prevEndpoint] === nodeId) {
         delete endpointOwners[prevEndpoint];
@@ -1596,7 +1597,7 @@ module.exports = function (RED) {
               deleteCacheFiles(lastJsxHash);
             }
             delete pageState[endpoint];
-            removeRoute(RED.httpNode._router, endpoint);
+            removeRoute(getHttpRouter(RED.httpNode), endpoint);
             delete registeredRoutes[endpoint];
           }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaqu/fromcubes-react",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Fromcubes React - React portals for Node-RED, built at deploy, with live WebSocket data binding",
   "type": "commonjs",
   "keywords": [