@n42/cli 0.3.50 → 0.3.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n42/cli",
-  "version": "0.3.50",
+  "version": "0.3.68",
   "description": "Node42 CLI – Command-line interface for Peppol eDelivery path discovery, diagnostics, and tooling",
   "keywords": [
     "node42",

package/src/assets/discover.js

@@ -64,7 +64,7 @@ function addSvgClickListener() {
       else {
         if (!url.startsWith("#")) {
           terminal.open({
-              url: decodeURIComponent(url),
+              url: url,
               method: "GET"
           });
         }
@@ -178,9 +178,8 @@ document.addEventListener("DOMContentLoaded", () => {
   
   terminal = new Terminal({
       title: "Terminal",
-      brand: "curl",
       theme: "light",
-      pkgVersion: "0.3.19"
+      pkgVersion: "0.3.65"
   });
 
   addSvgClickListener();

package/src/assets/terminal-light.css

@@ -150,4 +150,5 @@
 .cm-json-number { color: #f59e0b; }
 .cm-json-boolean { color: #ec4899; }
 .cm-json-null { color: #94a3b8; }
-.cm-json-step { color: #4cb56f; }
+.cm-json-step { color: #4cb56f; }
+.cm-json-error { color: #ef4444; }

package/src/assets/terminal.js

@@ -2,7 +2,6 @@ class Terminal {
   constructor(opts = {}) {
     this.opts = {
       title: "Request",
-      brand: "curl",
       ...opts,
     };
 
@@ -13,6 +12,8 @@ class Terminal {
     this._history = [];
     this._historyIndex = -1;
 
+    this.runningFromFile = window.location.protocol === "file:";
+
     // ---- reusable events ----
     this.enterEvent = new KeyboardEvent("keydown", {
       key: "Enter",
@@ -29,11 +30,21 @@ class Terminal {
       which: 27,
       bubbles: true
     });
+
+    // ---- colors ----
+    this.colorBlue="#3f9cff";
+    this.colorBrown="#a07c4f";
+    this.colorOrange="#f59e0b";
+    this.colorPink="#ec4899";
+    this.colorGray="#94a3b8"; 
+    this.colorGreen="#4cb56f";
+    this.colorRed="#ef4444";
   }
 
   async openAndRun(req) {
     this.open(req);
-    try { await this.run(req); } 
+    
+    try { await this.httpRequest(req); } 
     catch (e) {
       // errors already printed by run(); rethrow if you want
     }
@@ -53,7 +64,7 @@ class Terminal {
     this.overlay.classList.remove("hidden");
     this.dialog.classList.remove("hidden");
 
-    this.input.value = `curl -X ${req.method} ${req.url}`;
+    this.input.value = `request -X ${req.method} ${req.url}`;
     this.input.focus();
 
     // prevent background scroll
@@ -114,14 +125,14 @@ class Terminal {
     this._setBusy(false);
   }
 
-  async run(req) {
+  async httpRequest(req) {
     const normalized = this._normalizeReq(req);
     this._resetTerminal();
 
-    const cmd = `$ ${this.opts.brand} ${this._toCurlArgs(normalized)}`;
+    const cmd = `$ request ${this._getReqArgs(normalized)}`;
     this._addHistory(cmd)
 
-    this._printLine(cmd);
+    this._printColoredLine(cmd, this.colorBlue);
     this._printLine("");
 
     this._setBusy(true);
@@ -164,7 +175,7 @@ class Terminal {
       if (normalized.body) this._printLine(`> (body ${this._byteLen(normalized.body)} bytes)`);
       this._printLine("");
 
-      this.title.textContent = `Terminal [${normalized.method}]: curl`;
+      this.title.textContent = `Terminal [${normalized.method}]: request`;
 
       const res = await fetch(normalized.url, fetchInit);
 
@@ -275,8 +286,6 @@ class Terminal {
   }
 
   _handleCommand(cmd) {
-    this._printLine(`$ ${cmd}`);
-
     if (cmd === "clear") {
       this._addHistory(cmd);
       this._resetTerminal();
@@ -289,9 +298,21 @@ class Terminal {
       return;
     }
     
-    if (cmd.startsWith("curl ")) {
-      // Parse: curl [-X METHOD] <url>
-      const m = cmd.match(/^curl\s+(?:-X\s+(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)\s+)?(https?:\/\/\S+)$/i);
+    if (cmd.startsWith("request ")) {
+      if (this.runningFromFile) {
+        this._addHistory(cmd);
+
+        this._printColoredLine(`$ ${cmd}`, this.colorBlue);
+
+        this._printLine("");
+        this._printColoredLine("[error]: CORS has blocked this request (the script is running from file://).", this.colorRed);
+        this._printLine("Use the arrow keys to reselect the URL, then click the top-right button to open it in a browser tab instead.");
+        this._printLine("");
+
+        return;
+      }
+      // Parse: request [METHOD] <url>
+      const m = cmd.match(/^request\s+(?:-X\s+(GET|POST|PUT|PATCH|DELETE|HEAD|OPTIONS)\s+)?(https?:\/\/\S+)$/i);
 
       if (m) {
         const method = m[1] ? m[1].toUpperCase() : "GET";
@@ -309,12 +330,12 @@ class Terminal {
         this._resetTerminal();
         this._printHtml(this._jsonHighlight(discoveryTrace));
       } else {
-        this._printLine("[error]: Discovery trace missing");
+        this._printColoredLine("[error]: Discovery trace missing", this.colorRed);
       }
       return;
     }
     
-    this._printLine("[error]: Unknown command");  
+    this._printColoredLine("[error]: Unknown command", this.colorRed);  
   }
 
   _createImgEl(src, size, alt) {
@@ -447,13 +468,13 @@ class Terminal {
     btnDownload.prepend(downloadImg); 
     btnDownload.addEventListener("click", () => this._download());
 
-    const openExtImg = this._createImgEl("../../assets/open-external-light.svg", 24, "Open");
-    const btnOpenExt = document.createElement("button");
-    btnOpenExt.className = "cm-btn";
-    btnOpenExt.type = "button";
-    btnOpenExt.title = "Open";
-    btnOpenExt.prepend(openExtImg);
-    btnOpenExt.addEventListener("click", () => this._openExt());
+    const openUrlImg = this._createImgEl("../../assets/open-external-light.svg", 24, "Open");
+    const btnOpenUrl = document.createElement("button");
+    btnOpenUrl.className = "cm-btn";
+    btnOpenUrl.type = "button";
+    btnOpenUrl.title = "Open URL";
+    btnOpenUrl.prepend(openUrlImg);
+    btnOpenUrl.addEventListener("click", () => this._openUrl());
 
     const themeImg = this._createImgEl("../../assets/theme-light.svg", 24, "Theme");
     const btnTheme = document.createElement("button");
@@ -463,7 +484,7 @@ class Terminal {
     btnTheme.prepend(themeImg);
     btnTheme.addEventListener("click", () => this._toggleTheme());
 
-    head.append(title, spacer, btnTheme, btnCopy, btnDownload, btnOpenExt);
+    head.append(title, spacer, btnTheme, btnCopy, btnDownload, btnOpenUrl);
 
     // Body
     const body = document.createElement("div");
@@ -513,7 +534,7 @@ class Terminal {
 
     this.btnCopy = btnCopy;
     this.btnDownload = btnDownload;
-    this.btnOpenExt = btnOpenExt;
+    this.btnOpenUrl = btnOpenUrl;
     this.btnTheme = btnTheme;
 
     // Close when clicking outside (optional)
@@ -562,7 +583,7 @@ class Terminal {
     this.statusEl.textContent = isBusy ? "Running…" : "Ready";
   }
 
-  _openExt() {
+  _openUrl() {
     const url = this.input.value.replace(/^.*?(?=https?:\/\/)/, "")
     window.open(url, '_blank');
   }
@@ -582,7 +603,7 @@ class Terminal {
     this._printLine("");
 
     this._printLine("Available commands:");
-    this._printLine("  curl [-X METHOD] <url>  – send HTTP request to a URL");
+    this._printLine("  request [-X METHOD] <url>  – send HTTP request to a URL");
     this._printLine("  trace                   – output discovery trace");
     this._printLine("  clear                   – clear terminal output");
     this._printLine("  help                    – show this help text");
@@ -601,13 +622,22 @@ class Terminal {
     this._printLine("");
 
     this._printLine("Examples:");
-    this._printLine("  curl https://api.node42.dev/health");
-    this._printLine("  curl -X POST https://api.node42.dev/health");
+    this._printLine("  request https://api.node42.dev/health");
+    this._printLine("  request -X POST https://api.node42.dev/health");
     this._printLine("");
   }
 
   _printLine(s) {
-    this.term.textContent += `${s}\n`;
+    const html = s.replace(/\r?\n/g, "<br>");
+    this.term.innerHTML += `${html}<br>`;
+    this._scrollToBottom();
+  }
+
+  _printColoredLine(s, color="#111827") {
+    const html = this.term.innerHTML;
+    this.term.innerHTML =
+    `${html}<span style="color:${color};">${s}</span><br>`;
+    
     this._scrollToBottom();
   }
 
@@ -617,8 +647,13 @@ class Terminal {
   }
 
   _printRaw(s) {
-    this.term.textContent += s;
-    if (!s.endsWith("\n")) this.term.textContent += "\n";
+    const html = s.replace(/\r?\n/g, "<br>");
+    this.term.innerHTML += html;
+
+    if (!s.endsWith("\n")) {
+      this.term.innerHTML += "<br>";
+    }
+
     this._scrollToBottom();
   }
 
@@ -653,14 +688,14 @@ class Terminal {
     const url = URL.createObjectURL(blob);
     const a = document.createElement("a");
     a.href = url;
-    a.download = `curl-output-${new Date().toISOString().slice(0,19).replace(/[:T]/g,"-")}.txt`;
+    a.download = `request-output-${new Date().toISOString().slice(0,19).replace(/[:T]/g,"-")}.txt`;
     document.body.appendChild(a);
     a.click();
     a.remove();
     URL.revokeObjectURL(url);
   }
 
-  _toCurlArgs(req) {
+  _getReqArgs(req) {
     // Presentational: escapes minimally for display (not execution-safe for all shells).
     const parts = [];
     parts.push(`-X ${req.method}`);