@qodalis/cli-scp 2.0.0-beta.11 → 2.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qodalis/cli-scp",
-  "version": "2.0.0-beta.11",
+  "version": "2.0.0-beta.13",
   "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.11"
+    "@qodalis/cli-core": "2.0.0-beta.13"
   },
   "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.11";
+declare const LIBRARY_VERSION = "2.0.0-beta.13";
 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.11";
+declare const LIBRARY_VERSION = "2.0.0-beta.13";
 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.11";
+var LIBRARY_VERSION = "2.0.0-beta.13";
 var API_VERSION = 2;
 
 // src/lib/interfaces/index.ts
@@ -96,7 +96,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) {
@@ -165,7 +165,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) {
@@ -256,7 +256,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,6 +265,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 {
@@ -282,17 +283,19 @@ 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
       );
       context.spinner?.hide();
       if (useBrowserDownload) {
-        const fileService = context.services.get(
+        const fileService = context.services.getRequired(
           cliCore.ICliFileTransferService_TOKEN
         );
         if (fileService) {
@@ -304,7 +307,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) {
@@ -407,14 +410,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) {
@@ -444,6 +447,7 @@ 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),
@@ -501,7 +505,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) {
@@ -558,7 +562,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) {
@@ -615,7 +619,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) {
@@ -709,7 +713,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) {
@@ -718,6 +722,7 @@ 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(
@@ -733,15 +738,17 @@ 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)}`);
           }
         }
       );
       context.spinner?.hide();
-      const fileService = context.services.get(
+      const fileService = context.services.getRequired(
         cliCore.ICliFileTransferService_TOKEN
       );
       if (!fileService) {
@@ -767,14 +774,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) {
@@ -782,6 +789,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) {
@@ -793,6 +801,7 @@ 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,
@@ -810,32 +819,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);
@@ -871,20 +878,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) {