@bonsae/nrg 0.9.0 → 0.9.1

package/README.md

@@ -5,6 +5,7 @@
 <p align="center">
   <a href="https://www.npmjs.com/package/@bonsae/nrg"><img src="https://img.shields.io/npm/v/@bonsae/nrg.svg" alt="npm package"></a>
   <a href="https://github.com/bonsaedev/nrg/actions/workflows/ci.yaml"><img src="https://github.com/bonsaedev/nrg/actions/workflows/ci.yaml/badge.svg?branch=main" alt="build status"></a>
+  <a href="https://socket.dev/npm/package/@bonsae/nrg"><img src="https://badge.socket.dev/npm/package/@bonsae/nrg" alt="Socket Badge"></a>
 </p>
 
 # nrg

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bonsae/nrg",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "NRG framework — build Node-RED nodes with Vue 3, TypeScript, and JSON Schema",
   "author": "Allan Oricil <allanoricil@duck.com>",
   "license": "MIT",

package/server/index.cjs

@@ -750,45 +750,37 @@ function defineConfigNode(def) {
   return NodeClass;
 }
 
-// src/core/server/api/serve-nrg-resources.ts
+// src/core/server/api/nrg-assets.ts
 var import_path = __toESM(require("path"), 1);
 var import_fs = __toESM(require("fs"), 1);
-var MIME = {
-  ".js": "application/javascript",
-  ".mjs": "application/javascript",
-  ".css": "text/css",
-  ".json": "application/json",
-  ".map": "application/json",
-  ".png": "image/png",
-  ".svg": "image/svg+xml"
+var RESOURCES_DIR = import_path.default.resolve(__dirname, "./resources");
+var ALLOWED_FILES = /* @__PURE__ */ new Set([
+  "nrg-client.js",
+  "vue.esm-browser.prod.js",
+  "vue.esm-browser.js"
+]);
+var handleNrgAsset = (req, res, next) => {
+  let fileName = req.params[0];
+  if (fileName === "vue.esm-browser.prod.js" && process.env.NODE_ENV !== "production") {
+    fileName = "vue.esm-browser.js";
+  }
+  if (!ALLOWED_FILES.has(fileName)) return next();
+  const filePath = import_path.default.join(RESOURCES_DIR, fileName);
+  if (!import_fs.default.existsSync(filePath)) return next();
+  res.setHeader("Content-Type", "application/javascript");
+  import_fs.default.createReadStream(filePath).pipe(res);
 };
-var _registered = false;
-function serveNrgResources(RED) {
-  if (_registered) return;
-  _registered = true;
-  const clientDir = import_path.default.resolve(__dirname, "./resources");
-  if (!import_fs.default.existsSync(clientDir)) return;
-  const httpAdmin = RED.httpAdmin;
-  if (!httpAdmin) return;
-  httpAdmin.use(function(req, res, next) {
-    const prefix = "/nrg/assets/";
-    if (!req.path.startsWith(prefix)) return next();
-    let reqPath = req.path.slice(prefix.length);
-    if (reqPath === "vue.esm-browser.prod.js" && process.env.NODE_ENV !== "production") {
-      const devPath = import_path.default.resolve(clientDir, "vue.esm-browser.js");
-      if (import_fs.default.existsSync(devPath)) {
-        reqPath = "vue.esm-browser.js";
-      }
-    }
-    const filePath = import_path.default.resolve(clientDir, reqPath);
-    const rel = import_path.default.relative(clientDir, filePath);
-    if (rel.startsWith("..") || import_path.default.isAbsolute(rel)) return next();
-    if (!import_fs.default.existsSync(filePath) || !import_fs.default.statSync(filePath).isFile())
-      return next();
-    const ext = import_path.default.extname(filePath);
-    res.setHeader("Content-Type", MIME[ext] ?? "application/octet-stream");
-    import_fs.default.createReadStream(filePath).pipe(res);
-  });
+function initNrgAssetsRoute(router) {
+  if (!import_fs.default.existsSync(RESOURCES_DIR)) return;
+  router.get("/nrg/assets/*", handleNrgAsset);
+}
+
+// src/core/server/api/routes.ts
+var _initialized = false;
+function initRoutes(RED) {
+  if (_initialized) return;
+  _initialized = true;
+  initNrgAssetsRoute(RED.httpAdmin);
 }
 
 // src/core/constants.ts
@@ -1022,7 +1014,7 @@ async function registerType(RED, NodeClass) {
 function registerTypes(nodes) {
   const fn = async function(RED) {
     initValidator(RED);
-    serveNrgResources(RED);
+    initRoutes(RED);
     try {
       RED.log.info("Registering node types in series");
       for (const NodeClass of nodes) {

package/types/server.d.ts

@@ -1,6 +1,7 @@
 // Generated by dts-bundle-generator v9.5.1
 
 import { EventEmitter } from 'events';
+import { Express as Express$1 } from 'express';
 import { Http2ServerRequest } from 'http2';
 
 declare const TransformKind: unique symbol;
@@ -2006,18 +2007,7 @@ export interface NodeRedHooks {
 	has(hookId: string): boolean;
 	clear(): void;
 }
-export type NodeRedRequestHandler = (req: any, res: any, next?: () => void) => void;
-export interface NodeRedExpressApp {
-	get(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	post(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	put(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	delete(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	patch(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	options(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	head(path: string, ...handlers: NodeRedRequestHandler[]): void;
-	use(path: string | NodeRedRequestHandler, ...handlers: NodeRedRequestHandler[]): void;
-	all(path: string, ...handlers: NodeRedRequestHandler[]): void;
-}
+export type NodeRedExpressApp = Express;
 export interface RED {
 	/** Internationalization function */
 	_(key: string, substitutions?: Record<string, string>): string;