@qodalis/cli-scp 2.0.0-beta.12 → 2.0.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qodalis/cli-scp",
-  "version": "2.0.0-beta.12",
+  "version": "2.0.0-beta.14",
   "description": "SCP-like file transfer between browser and remote servers",
   "author": "Qodalis Solutions",
   "license": "MIT",
@@ -18,7 +18,7 @@
   "umd": "./umd/index.global.js",
   "unpkg": "./umd/index.global.js",
   "dependencies": {
-    "@qodalis/cli-core": "2.0.0-beta.12"
+    "@qodalis/cli-core": "2.0.0-beta.14"
   },
   "sideEffects": false,
   "main": "./public-api.js",

package/public-api.d.mts

@@ -18,7 +18,7 @@ declare class CliScpCommandCommandProcessor implements ICliCommandProcessor {
     private doUpload;
 }
 
-declare const LIBRARY_VERSION = "2.0.0-beta.12";
+declare const LIBRARY_VERSION = "2.0.0-beta.14";
 declare const API_VERSION = 2;
 
 declare const scpModule: ICliModule;

package/public-api.d.ts

@@ -18,7 +18,7 @@ declare class CliScpCommandCommandProcessor implements ICliCommandProcessor {
     private doUpload;
 }
 
-declare const LIBRARY_VERSION = "2.0.0-beta.12";
+declare const LIBRARY_VERSION = "2.0.0-beta.14";
 declare const API_VERSION = 2;
 
 declare const scpModule: ICliModule;

package/public-api.js

@@ -5,7 +5,7 @@ var cliCore = require('@qodalis/cli-core');
 // src/lib/processors/cli-scp-command-processor.ts
 
 // src/lib/version.ts
-var LIBRARY_VERSION = "2.0.0-beta.12";
+var LIBRARY_VERSION = "2.0.0-beta.14";
 var API_VERSION = 2;
 
 // src/lib/interfaces/index.ts
@@ -64,8 +64,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";
@@ -96,7 +94,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) {
@@ -108,7 +106,7 @@ var CliScpLsProcessor = class {
       const entries = await transferService.ls(
         serverUrl(server),
         path,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       if (entries.length === 0) {
@@ -133,8 +131,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";
@@ -165,7 +161,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) {
@@ -177,7 +173,7 @@ var CliScpCatProcessor = class {
       const content = await transferService.cat(
         serverUrl(server),
         path,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeln(content);
@@ -256,7 +252,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) {
@@ -265,7 +261,7 @@ var CliScpDownloadProcessor = class {
     }
     const useBrowserDownload = command.args?.["save"] === true;
     context.spinner?.show(`Downloading ${remotePath} from ${server.name}...`);
-    context.setStatusText(`scp: downloading from ${server.name}`);
+    context.notifier.info(`scp: downloading from ${server.name}`);
     const abortController = new AbortController();
     const abortSub = context.onAbort.subscribe(() => abortController.abort());
     try {
@@ -273,7 +269,7 @@ var CliScpDownloadProcessor = class {
       const { content, size } = await transferService.download(
         serverUrl(server),
         remotePath,
-        server.headers,
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers),
         (received, total) => {
           const now = Date.now();
           if (now - lastProgressUpdate < 200) return;
@@ -283,19 +279,19 @@ var CliScpDownloadProcessor = class {
             context.spinner?.show(
               `Downloading ${remotePath}... ${pct}% (${formatBytes(received)}/${formatBytes(total)})`
             );
-            context.setStatusText(`scp: download ${pct}%`);
+            context.notifier.info(`scp: download ${pct}%`);
           } else {
             context.spinner?.show(
               `Downloading ${remotePath}... ${formatBytes(received)}`
             );
-            context.setStatusText(`scp: download ${formatBytes(received)}`);
+            context.notifier.info(`scp: download ${formatBytes(received)}`);
           }
         },
         abortController.signal
       );
       context.spinner?.hide();
       if (useBrowserDownload) {
-        const fileService = context.services.get(
+        const fileService = context.services.getRequired(
           cliCore.ICliFileTransferService_TOKEN
         );
         if (fileService) {
@@ -307,7 +303,7 @@ var CliScpDownloadProcessor = class {
           context.writer.writeError("File transfer service not available for browser download.");
         }
       } else {
-        const fileService = context.services.get(
+        const fileService = context.services.getRequired(
           cliCore.ICliFileTransferService_TOKEN
         );
         if (fileService) {
@@ -410,14 +406,14 @@ var CliScpUploadProcessor = class {
     }
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const fileService = context.services.get(
+    const fileService = context.services.getRequired(
       cliCore.ICliFileTransferService_TOKEN
     );
     if (!fileService) {
       context.writer.writeError("File transfer service not available.");
       return;
     }
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -447,14 +443,14 @@ var CliScpUploadProcessor = class {
     context.spinner?.show(
       `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
     );
-    context.setStatusText(`scp: uploading to ${server.name}`);
+    context.notifier.info(`scp: uploading to ${server.name}`);
     try {
       await transferService.upload(
         serverUrl(server),
         remotePath,
         content,
         filename,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(
@@ -473,8 +469,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";
@@ -505,7 +499,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) {
@@ -517,7 +511,7 @@ var CliScpRmProcessor = class {
       await transferService.rm(
         serverUrl(server),
         path,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(`Deleted: ${server.name}:${path}`);
@@ -530,8 +524,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";
@@ -562,7 +554,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) {
@@ -574,7 +566,7 @@ var CliScpMkdirProcessor = class {
       await transferService.mkdir(
         serverUrl(server),
         path,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(`Created directory: ${server.name}:${path}`);
@@ -587,8 +579,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";
@@ -619,7 +609,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) {
@@ -631,7 +621,7 @@ var CliScpStatProcessor = class {
       const stat = await transferService.stat(
         serverUrl(server),
         path,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       const entries = {
@@ -713,7 +703,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) {
@@ -722,13 +712,13 @@ var CliScpCommandCommandProcessor = class {
     }
     const useBrowserDownload = command.args?.["save"] === true;
     context.spinner?.show(`Downloading ${remotePath} from ${server.name}...`);
-    context.setStatusText(`scp: downloading 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,
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers),
         (received, total) => {
           const now = Date.now();
           if (now - lastProgressUpdate < 200) return;
@@ -738,17 +728,17 @@ var CliScpCommandCommandProcessor = class {
             context.spinner?.show(
               `Downloading ${remotePath}... ${pct}% (${formatBytes(received)}/${formatBytes(total)})`
             );
-            context.setStatusText(`scp: download ${pct}%`);
+            context.notifier.info(`scp: download ${pct}%`);
           } else {
             context.spinner?.show(
               `Downloading ${remotePath}... ${formatBytes(received)}`
             );
-            context.setStatusText(`scp: download ${formatBytes(received)}`);
+            context.notifier.info(`scp: download ${formatBytes(received)}`);
           }
         }
       );
       context.spinner?.hide();
-      const fileService = context.services.get(
+      const fileService = context.services.getRequired(
         cliCore.ICliFileTransferService_TOKEN
       );
       if (!fileService) {
@@ -774,14 +764,14 @@ var CliScpCommandCommandProcessor = class {
   async doUpload(serverName, localPath, remotePath, context) {
     const server = resolveServer(serverName, context);
     if (!server) return;
-    const fileService = context.services.get(
+    const fileService = context.services.getRequired(
       cliCore.ICliFileTransferService_TOKEN
     );
     if (!fileService) {
       context.writer.writeError("File transfer service not available.");
       return;
     }
-    const transferService = context.services.get(
+    const transferService = context.services.getRequired(
       IScpTransferService_TOKEN
     );
     if (!transferService) {
@@ -789,7 +779,7 @@ var CliScpCommandCommandProcessor = class {
       return;
     }
     context.spinner?.show(`Reading local file "${localPath}"...`);
-    context.setStatusText(`scp: reading ${localPath}`);
+    context.notifier.info(`scp: reading ${localPath}`);
     try {
       const content = await fileService.readFile(localPath);
       if (content === null) {
@@ -801,13 +791,13 @@ var CliScpCommandCommandProcessor = class {
       context.spinner?.show(
         `Uploading "${filename}" (${formatBytes(content.length)}) to ${server.name}:${remotePath}...`
       );
-      context.setStatusText(`scp: uploading to ${server.name}`);
+      context.notifier.info(`scp: uploading to ${server.name}`);
       await transferService.upload(
         serverUrl(server),
         remotePath,
         content,
         filename,
-        server.headers
+        cliCore.resolveServerHeaders(context.services, server.name, server.headers)
       );
       context.spinner?.hide();
       context.writer.writeSuccess(
@@ -819,32 +809,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: cliCore.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: cliCore.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: cliCore.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: cliCore.resolveHeaders(headers),
       signal
     });
     const contentLength = parseInt(res.headers.get("content-length") || "0", 10);
@@ -880,20 +868,20 @@ var ScpTransferService = class {
     await this._fetch(`${serverUrl2}/api/qcli/fs/upload`, {
       method: "POST",
       body: formData,
-      headers
+      headers: cliCore.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", ...cliCore.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: cliCore.resolveHeaders(headers)
     });
   }
   async _fetch(url, init) {