@bonsae/nrg 0.10.1 → 0.11.1

package/types/server.d.ts

@@ -2146,12 +2146,8 @@ export type ConfigNodeContext = {
 export declare abstract class IONode<TConfig = any, TCredentials = any, TInput = any, TOutput = any, TSettings = any> extends Node$1<TConfig, TCredentials, TSettings> {
 	static readonly align?: "left" | "right";
 	static readonly color: HexColor;
-	static readonly labelStyle?: "node_label" | "node_label_italic" | string;
-	static readonly paletteLabel?: string;
 	static readonly inputs?: number;
 	static readonly outputs?: number;
-	static readonly inputLabels?: string | string[];
-	static readonly outputLabels?: string | string[];
 	static readonly inputSchema?: Schema;
 	static readonly outputsSchema?: Schema | Schema[];
 	static readonly validateInput: boolean;
@@ -2207,11 +2203,7 @@ export interface IONodeDefinition<TConfigSchema extends TSchema | undefined = un
 	color?: HexColor;
 	inputs?: 0 | 1;
 	outputs?: number;
-	paletteLabel?: string;
-	inputLabels?: string | string[];
-	outputLabels?: string | string[];
 	align?: "left" | "right";
-	labelStyle?: string;
 	configSchema?: TConfigSchema;
 	credentialsSchema?: TCredsSchema;
 	settingsSchema?: TSettingsSchema;

package/vite/index.js

@@ -383,7 +383,24 @@ module.exports = settings;
     this.logger.raw(line);
   }
   async start() {
-    this.port = await getPort({ port: this.preferredPort });
+    const available = await detect(this.preferredPort);
+    if (available === this.preferredPort) {
+      this.port = this.preferredPort;
+    } else {
+      this.logger.warn(
+        `Port ${this.preferredPort} is still in use, waiting...`
+      );
+      await new Promise((resolve) => setTimeout(resolve, 2e3));
+      const retryAvailable = await detect(this.preferredPort);
+      if (retryAvailable === this.preferredPort) {
+        this.port = this.preferredPort;
+      } else {
+        this.logger.warn(
+          `Port ${this.preferredPort} still occupied, using port ${retryAvailable}`
+        );
+        this.port = await getPort({ port: this.preferredPort });
+      }
+    }
     const startProcess = () => {
       return new Promise(async (resolve, reject) => {
         try {
@@ -498,11 +515,17 @@ module.exports = settings;
         }
       };
       try {
-        await retry(checkPortUsage, { attempts: 5, delay: 100 });
+        await retry(checkPortUsage, { attempts: 10, delay: 300 });
       } catch {
         this.logger.warn(
-          `Port ${currentPort} may still be in use. If restart fails, try again in a few seconds.`
+          `Port ${currentPort} still in use after stop. Force killing...`
         );
+        if (pid) {
+          await new Promise((resolve) => {
+            treeKill2(pid, "SIGKILL", () => resolve());
+          });
+          await new Promise((resolve) => setTimeout(resolve, 1e3));
+        }
       }
     }
     this.port = null;
@@ -1118,6 +1141,235 @@ import fs6 from "fs";
 import path6 from "path";
 import { pathToFileURL } from "url";
 import { createRequire } from "module";
+
+// src/vite/client/plugins/help-i18n.ts
+var translations = {
+  "en-US": {
+    sections: {
+      properties: "Properties",
+      credentials: "Credentials",
+      input: "Input",
+      output: "Output",
+      outputs: "Outputs",
+      port: "Port"
+    },
+    columns: {
+      property: "Property",
+      label: "Label",
+      type: "Type",
+      required: "Required",
+      default: "Default",
+      description: "Description"
+    },
+    values: {
+      yes: "Yes",
+      no: "No"
+    }
+  },
+  de: {
+    sections: {
+      properties: "Eigenschaften",
+      credentials: "Zugangsdaten",
+      input: "Eingang",
+      output: "Ausgang",
+      outputs: "Ausg\xE4nge",
+      port: "Port"
+    },
+    columns: {
+      property: "Eigenschaft",
+      label: "Bezeichnung",
+      type: "Typ",
+      required: "Erforderlich",
+      default: "Standard",
+      description: "Beschreibung"
+    },
+    values: {
+      yes: "Ja",
+      no: "Nein"
+    }
+  },
+  "es-ES": {
+    sections: {
+      properties: "Propiedades",
+      credentials: "Credenciales",
+      input: "Entrada",
+      output: "Salida",
+      outputs: "Salidas",
+      port: "Puerto"
+    },
+    columns: {
+      property: "Propiedad",
+      label: "Etiqueta",
+      type: "Tipo",
+      required: "Requerido",
+      default: "Predeterminado",
+      description: "Descripci\xF3n"
+    },
+    values: {
+      yes: "S\xED",
+      no: "No"
+    }
+  },
+  fr: {
+    sections: {
+      properties: "Propri\xE9t\xE9s",
+      credentials: "Identifiants",
+      input: "Entr\xE9e",
+      output: "Sortie",
+      outputs: "Sorties",
+      port: "Port"
+    },
+    columns: {
+      property: "Propri\xE9t\xE9",
+      label: "Libell\xE9",
+      type: "Type",
+      required: "Requis",
+      default: "Par d\xE9faut",
+      description: "Description"
+    },
+    values: {
+      yes: "Oui",
+      no: "Non"
+    }
+  },
+  ko: {
+    sections: {
+      properties: "\uC18D\uC131",
+      credentials: "\uC790\uACA9 \uC99D\uBA85",
+      input: "\uC785\uB825",
+      output: "\uCD9C\uB825",
+      outputs: "\uCD9C\uB825",
+      port: "\uD3EC\uD2B8"
+    },
+    columns: {
+      property: "\uC18D\uC131",
+      label: "\uB77C\uBCA8",
+      type: "\uC720\uD615",
+      required: "\uD544\uC218",
+      default: "\uAE30\uBCF8\uAC12",
+      description: "\uC124\uBA85"
+    },
+    values: {
+      yes: "\uC608",
+      no: "\uC544\uB2C8\uC624"
+    }
+  },
+  "pt-BR": {
+    sections: {
+      properties: "Propriedades",
+      credentials: "Credenciais",
+      input: "Entrada",
+      output: "Sa\xEDda",
+      outputs: "Sa\xEDdas",
+      port: "Porta"
+    },
+    columns: {
+      property: "Propriedade",
+      label: "R\xF3tulo",
+      type: "Tipo",
+      required: "Obrigat\xF3rio",
+      default: "Padr\xE3o",
+      description: "Descri\xE7\xE3o"
+    },
+    values: {
+      yes: "Sim",
+      no: "N\xE3o"
+    }
+  },
+  ru: {
+    sections: {
+      properties: "\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430",
+      credentials: "\u0423\u0447\u0451\u0442\u043D\u044B\u0435 \u0434\u0430\u043D\u043D\u044B\u0435",
+      input: "\u0412\u0445\u043E\u0434",
+      output: "\u0412\u044B\u0445\u043E\u0434",
+      outputs: "\u0412\u044B\u0445\u043E\u0434\u044B",
+      port: "\u041F\u043E\u0440\u0442"
+    },
+    columns: {
+      property: "\u0421\u0432\u043E\u0439\u0441\u0442\u0432\u043E",
+      label: "\u041C\u0435\u0442\u043A\u0430",
+      type: "\u0422\u0438\u043F",
+      required: "\u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E",
+      default: "\u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E",
+      description: "\u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435"
+    },
+    values: {
+      yes: "\u0414\u0430",
+      no: "\u041D\u0435\u0442"
+    }
+  },
+  ja: {
+    sections: {
+      properties: "\u30D7\u30ED\u30D1\u30C6\u30A3",
+      credentials: "\u8A8D\u8A3C\u60C5\u5831",
+      input: "\u5165\u529B",
+      output: "\u51FA\u529B",
+      outputs: "\u51FA\u529B",
+      port: "\u30DD\u30FC\u30C8"
+    },
+    columns: {
+      property: "\u30D7\u30ED\u30D1\u30C6\u30A3",
+      label: "\u30E9\u30D9\u30EB",
+      type: "\u578B",
+      required: "\u5FC5\u9808",
+      default: "\u30C7\u30D5\u30A9\u30EB\u30C8",
+      description: "\u8AAC\u660E"
+    },
+    values: {
+      yes: "\u306F\u3044",
+      no: "\u3044\u3044\u3048"
+    }
+  },
+  "zh-CN": {
+    sections: {
+      properties: "\u5C5E\u6027",
+      credentials: "\u51ED\u8BC1",
+      input: "\u8F93\u5165",
+      output: "\u8F93\u51FA",
+      outputs: "\u8F93\u51FA",
+      port: "\u7AEF\u53E3"
+    },
+    columns: {
+      property: "\u5C5E\u6027",
+      label: "\u6807\u7B7E",
+      type: "\u7C7B\u578B",
+      required: "\u5FC5\u586B",
+      default: "\u9ED8\u8BA4\u503C",
+      description: "\u63CF\u8FF0"
+    },
+    values: {
+      yes: "\u662F",
+      no: "\u5426"
+    }
+  },
+  "zh-TW": {
+    sections: {
+      properties: "\u5C6C\u6027",
+      credentials: "\u6191\u8B49",
+      input: "\u8F38\u5165",
+      output: "\u8F38\u51FA",
+      outputs: "\u8F38\u51FA",
+      port: "\u57E0"
+    },
+    columns: {
+      property: "\u5C6C\u6027",
+      label: "\u6A19\u7C64",
+      type: "\u985E\u578B",
+      required: "\u5FC5\u586B",
+      default: "\u9810\u8A2D\u503C",
+      description: "\u63CF\u8FF0"
+    },
+    values: {
+      yes: "\u662F",
+      no: "\u5426"
+    }
+  }
+};
+function getHelpTranslations(lang) {
+  return translations[lang] ?? translations["en-US"];
+}
+
+// src/vite/client/plugins/help-generator.ts
 function buildPropertyRow(name, schema, required, label) {
   let type = "";
   if (schema["x-nrg-node-type"]) {
@@ -1154,7 +1406,15 @@ var SKIP_FIELDS = /* @__PURE__ */ new Set([
   "g",
   "_users"
 ]);
-function generateSchemaSection(title, schema, labels, heading = "###") {
+function generateSchemaSection(options) {
+  const {
+    title,
+    schema,
+    t,
+    labels,
+    heading = "###",
+    includeDefault = true
+  } = options;
   if (!schema?.properties) return "";
   const required = new Set(schema.required ?? []);
   const rows = Object.entries(schema.properties).filter(([key]) => !SKIP_FIELDS.has(key)).map(
@@ -1167,10 +1427,24 @@ function generateSchemaSection(title, schema, labels, heading = "###") {
   );
   if (rows.length === 0) return "";
   const hasLabels = rows.some((r) => r.label);
-  const headerCells = hasLabels ? '<th>Property</th><th>Label</th><th>Type</th><th>Required</th><th>Default</th><th style="width:35%">Description</th>' : '<th>Property</th><th>Type</th><th>Required</th><th>Default</th><th style="width:40%">Description</th>';
-  const tableRows = rows.map(
-    (r) => hasLabels ? `<tr><td>${r.name}</td><td>${r.label}</td><td>${r.type}</td><td>${r.required ? "Yes" : "No"}</td><td>${r.defaultVal ? `<code>${r.defaultVal}</code>` : ""}</td><td>${r.description}</td></tr>` : `<tr><td>${r.name}</td><td>${r.type}</td><td>${r.required ? "Yes" : "No"}</td><td>${r.defaultVal ? `<code>${r.defaultVal}</code>` : ""}</td><td>${r.description}</td></tr>`
-  ).join("\n");
+  const c = t.columns;
+  const v = t.values;
+  let headerCells;
+  let rowFn;
+  if (hasLabels && includeDefault) {
+    headerCells = `<th>${c.label}</th><th>${c.property}</th><th>${c.type}</th><th>${c.required}</th><th>${c.default}</th><th style="width:35%">${c.description}</th>`;
+    rowFn = (r) => `<tr><td>${r.label}</td><td>${r.name}</td><td>${r.type}</td><td>${r.required ? v.yes : v.no}</td><td>${r.defaultVal ? `<code>${r.defaultVal}</code>` : ""}</td><td>${r.description}</td></tr>`;
+  } else if (hasLabels) {
+    headerCells = `<th>${c.label}</th><th>${c.property}</th><th>${c.type}</th><th>${c.required}</th><th style="width:35%">${c.description}</th>`;
+    rowFn = (r) => `<tr><td>${r.label}</td><td>${r.name}</td><td>${r.type}</td><td>${r.required ? v.yes : v.no}</td><td>${r.description}</td></tr>`;
+  } else if (includeDefault) {
+    headerCells = `<th>${c.property}</th><th>${c.type}</th><th>${c.required}</th><th>${c.default}</th><th style="width:40%">${c.description}</th>`;
+    rowFn = (r) => `<tr><td>${r.name}</td><td>${r.type}</td><td>${r.required ? v.yes : v.no}</td><td>${r.defaultVal ? `<code>${r.defaultVal}</code>` : ""}</td><td>${r.description}</td></tr>`;
+  } else {
+    headerCells = `<th>${c.property}</th><th>${c.type}</th><th>${c.required}</th><th style="width:40%">${c.description}</th>`;
+    rowFn = (r) => `<tr><td>${r.name}</td><td>${r.type}</td><td>${r.required ? v.yes : v.no}</td><td>${r.description}</td></tr>`;
+  }
+  const tableRows = rows.map(rowFn).join("\n");
   const table = `<div style="overflow-x:auto">
 <table width="100%" style="min-width:500px">
 <thead><tr>${headerCells}</tr></thead>
@@ -1179,8 +1453,9 @@ ${tableRows}
 </tbody>
 </table>
 </div>`;
-  return `${heading} ${title}
-
+  const headingLevel = heading.length;
+  const tag = `h${headingLevel}`;
+  return `<${tag}>${title}</${tag}>
 ${table}
 `;
 }
@@ -1199,65 +1474,66 @@ function loadNodeLabels(labelPath) {
     return {};
   }
 }
-function generateHelpDoc(nodeClass, labels) {
+function generateHelpDoc(nodeClass, labels, t) {
   const lines = [];
   if (labels.description) {
-    lines.push(labels.description);
-    lines.push("");
+    lines.push(`<p>${labels.description}</p>`);
   }
-  const configSection = generateSchemaSection(
-    "Properties",
-    nodeClass.configSchema,
-    labels.configs
-  );
+  const configSection = generateSchemaSection({
+    title: t.sections.properties,
+    schema: nodeClass.configSchema,
+    t,
+    labels: labels.configs
+  });
   if (configSection) lines.push(configSection);
-  const credsSection = generateSchemaSection(
-    "Credentials",
-    nodeClass.credentialsSchema,
-    labels.credentials
-  );
+  const credsSection = generateSchemaSection({
+    title: t.sections.credentials,
+    schema: nodeClass.credentialsSchema,
+    t,
+    labels: labels.credentials
+  });
   if (credsSection) lines.push(credsSection);
   if (nodeClass.inputSchema) {
-    const inputLabels = nodeClass.inputLabels;
-    const inputLabel = typeof inputLabels === "string" ? inputLabels : Array.isArray(inputLabels) ? inputLabels[0] : void 0;
-    const inputTitle = inputLabel ? `Input (${inputLabel})` : "Input";
-    const inputSection = generateSchemaSection(
-      inputTitle,
-      nodeClass.inputSchema,
-      labels.input
-    );
+    const inputSection = generateSchemaSection({
+      title: t.sections.input,
+      schema: nodeClass.inputSchema,
+      t,
+      labels: labels.input,
+      includeDefault: false
+    });
     if (inputSection) lines.push(inputSection);
   }
   if (nodeClass.outputsSchema) {
-    const outputLabels = nodeClass.outputLabels;
     if (Array.isArray(nodeClass.outputsSchema)) {
       const portSections = [];
       nodeClass.outputsSchema.forEach((schema, i) => {
-        const portLabel = Array.isArray(outputLabels) ? outputLabels[i] : void 0;
-        const title = portLabel ? `Port ${i + 1} \u2014 ${portLabel}` : `Port ${i + 1}`;
+        const title = `${t.sections.port} ${i + 1}`;
         const portPropLabels = labels.outputs?.[i];
-        const section = generateSchemaSection(
+        const section = generateSchemaSection({
           title,
           schema,
-          portPropLabels,
-          "####"
-        );
+          t,
+          labels: portPropLabels,
+          heading: "####",
+          includeDefault: false
+        });
         if (section) portSections.push(section);
       });
       if (portSections.length) {
-        lines.push(`### Outputs
-
-${portSections.join("\n")}`);
+        lines.push(
+          `<h3>${t.sections.outputs}</h3>
+${portSections.join("\n")}`
+        );
       }
     } else {
-      const label = typeof outputLabels === "string" ? outputLabels : Array.isArray(outputLabels) ? outputLabels[0] : void 0;
-      const title = label ? `Output (${label})` : "Output";
       const outputPropLabels = labels.outputs?.[0];
-      const section = generateSchemaSection(
-        title,
-        nodeClass.outputsSchema,
-        outputPropLabels
-      );
+      const section = generateSchemaSection({
+        title: t.sections.output,
+        schema: nodeClass.outputsSchema,
+        t,
+        labels: outputPropLabels,
+        includeDefault: false
+      });
       if (section) lines.push(section);
     }
   }
@@ -1305,11 +1581,12 @@ function helpGenerator(options) {
           if (fs6.existsSync(manualMd) || fs6.existsSync(manualHtml)) continue;
           const labelPath = path6.join(labelsDir, type, `${lang}.json`);
           const labels = loadNodeLabels(labelPath);
-          const content = generateHelpDoc(NodeClass, labels);
+          const t = getHelpTranslations(lang);
+          const content = generateHelpDoc(NodeClass, labels, t);
           if (!content) continue;
           if (!helpByLang.has(lang)) helpByLang.set(lang, []);
           helpByLang.get(lang).push(
-            `<script type="text/markdown" data-help-name="${type}">
+            `<script type="text/html" data-help-name="${type}">
 ${content}
 </script>`
           );
@@ -1609,12 +1886,8 @@ function nodeDefinitionsInliner(serverOutDir, entryPath, iconsDir, componentsDir
           align: NodeClass.align,
           color: NodeClass.color,
           icon: iconsDir ? resolveIcon(iconsDir, type) : void 0,
-          labelStyle: NodeClass.labelStyle,
-          paletteLabel: NodeClass.paletteLabel,
           inputs: NodeClass.inputs,
           outputs: NodeClass.outputs,
-          inputLabels: NodeClass.inputLabels,
-          outputLabels: NodeClass.outputLabels,
           inputSchema,
           outputsSchema
         };
@@ -2020,10 +2293,14 @@ function serverPlugin(options) {
               changeOrigin: true,
               ws: true,
               configure: (proxy) => {
-                proxy.on("error", () => {
+                proxy.on("error", (_err, _req, res) => {
                   if (nodeRedPort) {
                     proxy.options.target = `http://127.0.0.1:${nodeRedPort}`;
                   }
+                  if (res && !res.headersSent && "writeHead" in res) {
+                    res.writeHead(502);
+                    res.end();
+                  }
                 });
               }
             }
@@ -2038,7 +2315,11 @@ function serverPlugin(options) {
           info: () => {
           },
           warn: console.warn,
-          error: console.error,
+          error: (...args) => {
+            const msg = args.map(String).join(" ");
+            if (isStarting && msg.includes("ECONNREFUSED")) return;
+            console.error(...args);
+          },
           warnOnce: () => {
           },
           hasWarned: false,