@qodalis/cli 2.5.1 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qodalis/cli",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Framework-agnostic CLI engine for @qodalis terminal applications.",
   "author": "Nicolae Lupei, Qodalis Solutions",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "./assets/*": "./assets/*"
   },
   "dependencies": {
-    "@qodalis/cli-core": "2.5.1",
+    "@qodalis/cli-core": "2.5.2",
     "@xterm/xterm": "^6.0.0",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-web-links": "^0.12.0",

package/public-api.d.mts

@@ -165,7 +165,7 @@ declare const CliKeyValueStore_TOKEN: any;
  */
 declare const SyntaxHighlighterRegistry_TOKEN: any;
 
-declare const LIBRARY_VERSION = "2.5.1";
+declare const LIBRARY_VERSION = "2.5.2";
 declare const API_VERSION = 2;
 
 declare class CliAliasCommandProcessor implements ICliCommandProcessor {

package/public-api.d.ts

@@ -165,7 +165,7 @@ declare const CliKeyValueStore_TOKEN: any;
  */
 declare const SyntaxHighlighterRegistry_TOKEN: any;
 
-declare const LIBRARY_VERSION = "2.5.1";
+declare const LIBRARY_VERSION = "2.5.2";
 declare const API_VERSION = 2;
 
 declare class CliAliasCommandProcessor implements ICliCommandProcessor {

package/public-api.js

@@ -519,7 +519,7 @@ var CliKeyValueStore_TOKEN = cliCore.createCliToken("cli-key-value-store");
 var SyntaxHighlighterRegistry_TOKEN = cliCore.createCliToken("syntax-highlighter-registry");
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.5.1";
+var LIBRARY_VERSION = "2.5.2";
 var API_VERSION = 2;
 var ANONYMOUS = "\0anonymous";
 function aliasOwner(context2) {
@@ -21611,6 +21611,27 @@ function parseAddArgs(value) {
   }
   return {};
 }
+function sameServerUrl(a, b) {
+  const key = (url) => normalizeServerUrl(absoluteUrl(url))?.toLowerCase();
+  const left = key(a);
+  return !!left && left === key(b);
+}
+function absoluteUrl(url) {
+  const origin = globalThis.location?.origin;
+  if (!origin || /^[a-z][a-z0-9+.-]*:\/\//i.test(url.trim())) return url;
+  try {
+    return new URL(url.trim() || "/", origin).href;
+  } catch {
+    return url;
+  }
+}
+async function serverAt(manager, linked, url) {
+  for (const [name, connection] of manager.connections) {
+    if (!manager.isLinked(name) && sameServerUrl(connection.config.url, url)) return { name, byApp: true };
+  }
+  const saved = (await linked.list()).find((server) => sameServerUrl(server.url, url));
+  return saved ? { name: saved.name, byApp: false } : void 0;
+}
 async function replaceConnection(manager, config) {
   const current = [...manager.connections.keys()].find((n) => n.toLowerCase() === config.name.toLowerCase());
   const wasDefault = !!current && manager.defaultServer === current;
@@ -21655,6 +21676,17 @@ var ServerAddProcessor = class {
     if (checked.mixedContent) {
       writer.writeWarning(t.t("cli.server.link.mixed_content", "This page is served over https: the browser may block requests to an http server."));
     }
+    const same = await serverAt(manager, linked, url);
+    if (same?.byApp) {
+      writer.writeError(t.t("cli.server.link.same_as_app_server", "{url} is already configured by the app as '{name}'.", { url, name: same.name }));
+      return;
+    }
+    if (same) {
+      writer.writeWarning(t.t("cli.server.link.already_linked", "{url} is already linked as '{name}'.", { url, name: same.name }));
+      const again = await reader.readConfirm(t.t("cli.server.link.link_again", "Link it again? It replaces '{name}' (a new token)", { name: same.name }), false);
+      if (!again) return;
+    }
+    const replacing = same?.name;
     let probe;
     context2.spinner?.show(t.t("cli.server.link.checking", "Checking {url}\u2026", { url }));
     try {
@@ -21671,8 +21703,8 @@ var ServerAddProcessor = class {
       const go = await reader.readConfirm(t.t("cli.server.link.http_confirm", "Link it anyway?"), false);
       if (!go) return;
     }
-    let name = args.name;
-    if (name) {
+    let name = args.name ?? replacing;
+    if (name && name !== replacing) {
       if (!await this.nameAvailable(context2, manager, linked, name)) return;
     }
     const tokenFlag = command2.args?.["token"];
@@ -21720,6 +21752,10 @@ var ServerAddProcessor = class {
     const server = { name, url, addedAt: Date.now() };
     const previous = (await linked.get(name))?.name;
     if (previous && previous !== name) await linked.remove(previous);
+    if (replacing && replacing.toLowerCase() !== name.toLowerCase()) {
+      await linked.remove(replacing);
+      if (manager.isLinked(replacing)) manager.removeServer(replacing);
+    }
     await linked.save(server, token);
     const connection = await replaceConnection(manager, linkedServerConfig(server, token));
     if (connection.connected) {