@qodalis/cli-scp 2.0.0-beta.9 → 2.0.0-rc.2

package/public-api.mjs

@@ -1,15 +1,11 @@
-import { DefaultLibraryAuthor, ICliFileTransferService_TOKEN } from '@qodalis/cli-core';
+import { createCliToken, DefaultLibraryAuthor, resolveServerHeaders, ICliFileTransferService_TOKEN, resolveHeaders, splitShellWords } from '@qodalis/cli-core';
 
 // src/lib/processors/cli-scp-command-processor.ts
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0-beta.9";
+var LIBRARY_VERSION = "2.0.0-rc.2";
 var API_VERSION = 2;
-
-// src/lib/interfaces/index.ts
-var IScpTransferService_TOKEN = "scp-transfer-service";
-
-// src/lib/processors/scp-utils.ts
+var IScpTransferService_TOKEN = createCliToken("scp-transfer-service");
 function resolveServer(serverName, context) {
   const servers = context.options?.servers;
   if (!servers || servers.length === 0) {
@@ -47,10 +43,10 @@ function parseServerAndPath(value, context, args) {
   if (serverArg && pathArg) {
     return [String(serverArg), String(pathArg)];
   }
-  if (!value?.trim()) {
+  const parts = splitShellWords(value ?? "");
+  if (parts.length === 0) {
     return null;
   }
-  const parts = value.trim().split(/\s+/);
   if (parts.length < 2) {
     if (serverArg && parts.length >= 1) {
       return [String(serverArg), parts.join(" ")];
@@ -62,8 +58,6 @@ function parseServerAndPath(value, context, args) {
   }
   return [parts[0], parts.slice(1).join(" ")];
 }
-
-// src/lib/processors/cli-scp-ls-processor.ts
 var CliScpLsProcessor = class {
   constructor() {
     this.command = "ls";
@@ -94,7 +88,7 @@ var CliScpLsProcessor = class {
     const [serverName, path] = parsed;
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -106,7 +100,7 @@ var CliScpLsProcessor = class {
       const entries = await transferService.ls(
         serverUrl(server),
         path,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       if (entries.length === 0) {
@@ -131,8 +125,6 @@ var CliScpLsProcessor = class {
     context.writer.writeln("List files and directories on a remote server.");
   }
 };
-
-// src/lib/processors/cli-scp-cat-processor.ts
 var CliScpCatProcessor = class {
   constructor() {
     this.command = "cat";
@@ -163,7 +155,7 @@ var CliScpCatProcessor = class {
     const [serverName, path] = parsed;
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -175,7 +167,7 @@ var CliScpCatProcessor = class {
       const content = await transferService.cat(
         serverUrl(server),
         path,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeln(content);
@@ -233,12 +225,11 @@ var CliScpDownloadProcessor = class {
       remotePath = String(args["remote-path"] || args["path"]);
       localPath = args["local-path"] ? String(args["local-path"]) : void 0;
     } else {
-      const value = command.value?.trim();
-      if (!value) {
+      const parts = command.positionals ?? [];
+      if (parts.length === 0) {
         context.writer.writeError("Usage: scp download <server> <remote-path> [local-path]");
         return;
       }
-      const parts = value.split(/\s+/);
       if (parts.length < 2) {
         context.writer.writeError("Usage: scp download <server> <remote-path> [local-path]");
         return;
@@ -254,7 +245,7 @@ var CliScpDownloadProcessor = class {
     localPath = localPath || remotePath.split("/").pop() || "download";
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -263,6 +254,7 @@ var CliScpDownloadProcessor = class {
     }
     const useBrowserDownload = command.args?.["save"] === true;
     context.spinner?.show(`Downloading ${remotePath} from ${server.name}...`);
+    context.notifier.info(`scp: downloading from ${server.name}`);
     const abortController = new AbortController();
     const abortSub = context.onAbort.subscribe(() => abortController.abort());
     try {
@@ -270,7 +262,7 @@ var CliScpDownloadProcessor = class {
       const { content, size } = await transferService.download(
         serverUrl(server),
         remotePath,
-        server.headers,
+        resolveServerHeaders(context.services, server.name, server.headers),
         (received, total) => {
           const now = Date.now();
           if (now - lastProgressUpdate < 200) return;
@@ -280,10 +272,12 @@ var CliScpDownloadProcessor = class {
             context.spinner?.show(
               `Downloading ${remotePath}... ${pct}% (${formatBytes(received)}/${formatBytes(total)})`
             );
+            context.notifier.info(`scp: download ${pct}%`);
           } else {
             context.spinner?.show(
               `Downloading ${remotePath}... ${formatBytes(received)}`
             );
+            context.notifier.info(`scp: download ${formatBytes(received)}`);
           }
         },
         abortController.signal
@@ -372,14 +366,13 @@ var CliScpUploadProcessor = class {
       localPath = args["local-path"] ? String(args["local-path"]) : void 0;
       remotePath = String(args["remote-path"]);
     } else {
-      const value = command.value?.trim();
-      if (!value) {
+      const parts = command.positionals ?? [];
+      if (parts.length === 0) {
         context.writer.writeError(
           useLocalPicker ? "Usage: scp upload --local <server> <remote-path>" : "Usage: scp upload <server> <local-path> <remote-path>"
         );
         return;
       }
-      const parts = value.split(/\s+/);
       if (useLocalPicker) {
         if (parts.length < 2) {
           context.writer.writeError("Usage: scp upload --local <server> <remote-path>");
@@ -412,7 +405,7 @@ var CliScpUploadProcessor = class {
       context.writer.writeError("File transfer service not available.");
       return;
     }
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -442,13 +435,14 @@ var CliScpUploadProcessor = class {
     context.spinner?.show(
       `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
     );
+    context.notifier.info(`scp: uploading to ${server.name}`);
     try {
       await transferService.upload(
         serverUrl(server),
         remotePath,
         content,
         filename,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(
@@ -467,8 +461,6 @@ var CliScpUploadProcessor = class {
     context.writer.writeln("  scp upload --local <server> <remote-path>         Pick from your machine via browser");
   }
 };
-
-// src/lib/processors/cli-scp-rm-processor.ts
 var CliScpRmProcessor = class {
   constructor() {
     this.command = "rm";
@@ -499,7 +491,7 @@ var CliScpRmProcessor = class {
     const [serverName, path] = parsed;
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -511,7 +503,7 @@ var CliScpRmProcessor = class {
       await transferService.rm(
         serverUrl(server),
         path,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(`Deleted: ${server.name}:${path}`);
@@ -524,8 +516,6 @@ var CliScpRmProcessor = class {
     context.writer.writeln("Delete a file on a remote server.");
   }
 };
-
-// src/lib/processors/cli-scp-mkdir-processor.ts
 var CliScpMkdirProcessor = class {
   constructor() {
     this.command = "mkdir";
@@ -556,7 +546,7 @@ var CliScpMkdirProcessor = class {
     const [serverName, path] = parsed;
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -568,7 +558,7 @@ var CliScpMkdirProcessor = class {
       await transferService.mkdir(
         serverUrl(server),
         path,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(`Created directory: ${server.name}:${path}`);
@@ -581,8 +571,6 @@ var CliScpMkdirProcessor = class {
     context.writer.writeln("Create a directory on a remote server.");
   }
 };
-
-// src/lib/processors/cli-scp-stat-processor.ts
 var CliScpStatProcessor = class {
   constructor() {
     this.command = "stat";
@@ -613,7 +601,7 @@ var CliScpStatProcessor = class {
     const [serverName, path] = parsed;
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -625,7 +613,7 @@ var CliScpStatProcessor = class {
       const stat = await transferService.stat(
         serverUrl(server),
         path,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       const entries = {
@@ -669,33 +657,25 @@ var CliScpCommandCommandProcessor = class {
     ];
   }
   async processCommand(command, context) {
-    const value = command.value?.trim();
-    if (value && value.includes(":") && !value.startsWith("-")) {
-      const colonIdx = value.indexOf(":");
-      const spaceBeforeColon = value.lastIndexOf(" ", colonIdx);
-      if (spaceBeforeColon === -1) {
-        const serverName = value.substring(0, colonIdx);
-        const rest = value.substring(colonIdx + 1);
-        const parts2 = rest.trim().split(/\s+/);
-        const remotePath = parts2[0];
-        const localPath = parts2[1] || remotePath.split("/").pop() || "download";
+    const [first = "", second] = command.positionals ?? [];
+    if (first && !first.startsWith("-")) {
+      const colonIdx = first.indexOf(":");
+      if (colonIdx !== -1) {
+        const serverName = first.substring(0, colonIdx);
+        const remotePath = first.substring(colonIdx + 1);
+        const localPath = second || remotePath.split("/").pop() || "download";
         if (remotePath) {
           await this.doDownload(serverName, remotePath, localPath, command, context);
           return;
         }
       }
-      const parts = value.split(/\s+/);
-      if (parts.length >= 2) {
-        const secondPart = parts[1];
-        if (secondPart.includes(":")) {
-          const localPath = parts[0];
-          const srvColonIdx = secondPart.indexOf(":");
-          const serverName = secondPart.substring(0, srvColonIdx);
-          const remotePath = secondPart.substring(srvColonIdx + 1);
-          if (remotePath) {
-            await this.doUpload(serverName, localPath, remotePath, context);
-            return;
-          }
+      if (second?.includes(":")) {
+        const srvColonIdx = second.indexOf(":");
+        const serverName = second.substring(0, srvColonIdx);
+        const remotePath = second.substring(srvColonIdx + 1);
+        if (remotePath) {
+          await this.doUpload(serverName, first, remotePath, context);
+          return;
         }
       }
     }
@@ -707,7 +687,7 @@ var CliScpCommandCommandProcessor = class {
   async doDownload(serverName, remotePath, localPath, command, context) {
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -716,12 +696,13 @@ var CliScpCommandCommandProcessor = class {
     }
     const useBrowserDownload = command.args?.["save"] === true;
     context.spinner?.show(`Downloading ${remotePath} from ${server.name}...`);
+    context.notifier.info(`scp: downloading from ${server.name}`);
     try {
       let lastProgressUpdate = 0;
       const { content, size } = await transferService.download(
         serverUrl(server),
         remotePath,
-        server.headers,
+        resolveServerHeaders(context.services, server.name, server.headers),
         (received, total) => {
           const now = Date.now();
           if (now - lastProgressUpdate < 200) return;
@@ -731,10 +712,12 @@ var CliScpCommandCommandProcessor = class {
             context.spinner?.show(
               `Downloading ${remotePath}... ${pct}% (${formatBytes(received)}/${formatBytes(total)})`
             );
+            context.notifier.info(`scp: download ${pct}%`);
           } else {
             context.spinner?.show(
               `Downloading ${remotePath}... ${formatBytes(received)}`
             );
+            context.notifier.info(`scp: download ${formatBytes(received)}`);
           }
         }
       );
@@ -772,7 +755,7 @@ var CliScpCommandCommandProcessor = class {
       context.writer.writeError("File transfer service not available.");
       return;
     }
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -780,6 +763,7 @@ var CliScpCommandCommandProcessor = class {
       return;
     }
     context.spinner?.show(`Reading local file "${localPath}"...`);
+    context.notifier.info(`scp: reading ${localPath}`);
     try {
       const content = await fileService.readFile(localPath);
       if (content === null) {
@@ -791,12 +775,13 @@ var CliScpCommandCommandProcessor = class {
       context.spinner?.show(
         `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
       );
+      context.notifier.info(`scp: uploading to ${server.name}`);
       await transferService.upload(
         serverUrl(server),
         remotePath,
         content,
         filename,
-        server.headers
+        resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(
@@ -808,32 +793,30 @@ var CliScpCommandCommandProcessor = class {
     }
   }
 };
-
-// src/lib/services/scp-transfer.service.ts
 var ScpTransferService = class {
   async ls(serverUrl2, path, headers) {
     const res = await this._fetch(`${serverUrl2}/api/qcli/fs/ls?path=${encodeURIComponent(path)}`, {
-      headers
+      headers: resolveHeaders(headers)
     });
     const data = await res.json();
     return data.entries;
   }
   async cat(serverUrl2, path, headers) {
     const res = await this._fetch(`${serverUrl2}/api/qcli/fs/cat?path=${encodeURIComponent(path)}`, {
-      headers
+      headers: resolveHeaders(headers)
     });
     const data = await res.json();
     return data.content;
   }
   async stat(serverUrl2, path, headers) {
     const res = await this._fetch(`${serverUrl2}/api/qcli/fs/stat?path=${encodeURIComponent(path)}`, {
-      headers
+      headers: resolveHeaders(headers)
     });
     return await res.json();
   }
   async download(serverUrl2, path, headers, onProgress, signal) {
     const res = await this._fetch(`${serverUrl2}/api/qcli/fs/download?path=${encodeURIComponent(path)}`, {
-      headers,
+      headers: resolveHeaders(headers),
       signal
     });
     const contentLength = parseInt(res.headers.get("content-length") || "0", 10);
@@ -869,20 +852,20 @@ var ScpTransferService = class {
     await this._fetch(`${serverUrl2}/api/qcli/fs/upload`, {
       method: "POST",
       body: formData,
-      headers
+      headers: resolveHeaders(headers)
     });
   }
   async mkdir(serverUrl2, path, headers) {
     await this._fetch(`${serverUrl2}/api/qcli/fs/mkdir`, {
       method: "POST",
-      headers: { "Content-Type": "application/json", ...headers },
+      headers: { "Content-Type": "application/json", ...resolveHeaders(headers) },
       body: JSON.stringify({ path })
     });
   }
   async rm(serverUrl2, path, headers) {
     await this._fetch(`${serverUrl2}/api/qcli/fs/rm?path=${encodeURIComponent(path)}`, {
       method: "DELETE",
-      headers
+      headers: resolveHeaders(headers)
     });
   }
   async _fetch(url, init) {