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

package/umd/index.global.js

@@ -628,14 +628,14 @@ var scp = (() => {
   var require_sort = __commonJS({
     "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/sort.js"(exports$1, module2) {
       var compareBuild = require_compare_build();
-      var sort = (list, loose) => list.sort((a, b) => compareBuild(a, b, loose));
+      var sort = (list2, loose) => list2.sort((a, b) => compareBuild(a, b, loose));
       module2.exports = sort;
     }
   });
   var require_rsort = __commonJS({
     "../../node_modules/.pnpm/semver@7.7.4/node_modules/semver/functions/rsort.js"(exports$1, module2) {
       var compareBuild = require_compare_build();
-      var rsort = (list, loose) => list.sort((a, b) => compareBuild(b, a, loose));
+      var rsort = (list2, loose) => list2.sort((a, b) => compareBuild(b, a, loose));
       module2.exports = rsort;
     }
   });
@@ -1822,6 +1822,22 @@ var scp = (() => {
     }
   });
   var ICliFileTransferService_TOKEN = "cli-file-transfer-service";
+  var ICliServerAuthService_TOKEN = "cli-server-auth-service";
+  function resolveHeaders(provider) {
+    if (!provider) return {};
+    return typeof provider === "function" ? provider() : provider;
+  }
+  function resolveServerHeaders(services, serverName, configHeaders) {
+    if (services) {
+      const authService = services.get(
+        ICliServerAuthService_TOKEN
+      );
+      if (authService) {
+        return authService.getHeaders(serverName, configHeaders);
+      }
+    }
+    return resolveHeaders(configHeaders);
+  }
   var DefaultLibraryAuthor = {
     name: "Nicolae Lupei",
     email: "nicolae.lupei@qodalis.com"
@@ -1848,9 +1864,12 @@ var scp = (() => {
      * Returns the negotiated API version and the base path for all subsequent calls,
      * or null if the server is unreachable or incompatible.
      */
-    static async discover(baseUrl) {
+    static async discover(baseUrl, headers) {
       try {
-        const response = await fetch(`${baseUrl}${VERSIONS_ENDPOINT}`);
+        const resolved = resolveHeaders(headers);
+        const response = await fetch(`${baseUrl}${VERSIONS_ENDPOINT}`, {
+          headers: Object.keys(resolved).length > 0 ? resolved : void 0
+        });
         if (!response.ok) return null;
         const info = await response.json();
         const version = this.negotiate(info);
@@ -2682,7 +2701,7 @@ var scp = (() => {
   };
 
   // src/lib/version.ts
-  var LIBRARY_VERSION = "2.0.0-beta.12";
+  var LIBRARY_VERSION = "2.0.0-beta.14";
   var API_VERSION2 = 2;
 
   // src/lib/interfaces/index.ts
@@ -2773,7 +2792,7 @@ var scp = (() => {
       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) {
@@ -2785,7 +2804,7 @@ var scp = (() => {
         const entries = await transferService.ls(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         if (entries.length === 0) {
@@ -2842,7 +2861,7 @@ var scp = (() => {
       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) {
@@ -2854,7 +2873,7 @@ var scp = (() => {
         const content = await transferService.cat(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeln(content);
@@ -2935,7 +2954,7 @@ var scp = (() => {
       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) {
@@ -2944,7 +2963,7 @@ var scp = (() => {
       }
       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 {
@@ -2952,7 +2971,7 @@ var scp = (() => {
         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;
@@ -2962,19 +2981,19 @@ var scp = (() => {
               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(
             ICliFileTransferService_TOKEN
           );
           if (fileService) {
@@ -2986,7 +3005,7 @@ var scp = (() => {
             context.writer.writeError("File transfer service not available for browser download.");
           }
         } else {
-          const fileService = context.services.get(
+          const fileService = context.services.getRequired(
             ICliFileTransferService_TOKEN
           );
           if (fileService) {
@@ -3091,14 +3110,14 @@ var scp = (() => {
       }
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const fileService = context.services.get(
+      const fileService = context.services.getRequired(
         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) {
@@ -3128,14 +3147,14 @@ var scp = (() => {
       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
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeSuccess(
@@ -3186,7 +3205,7 @@ var scp = (() => {
       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) {
@@ -3198,7 +3217,7 @@ var scp = (() => {
         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}`);
@@ -3243,7 +3262,7 @@ var scp = (() => {
       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) {
@@ -3255,7 +3274,7 @@ var scp = (() => {
         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}`);
@@ -3300,7 +3319,7 @@ var scp = (() => {
       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) {
@@ -3312,7 +3331,7 @@ var scp = (() => {
         const stat = await transferService.stat(
           serverUrl(server),
           path,
-          server.headers
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         const entries = {
@@ -3394,7 +3413,7 @@ var scp = (() => {
     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) {
@@ -3403,13 +3422,13 @@ var scp = (() => {
       }
       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,
+          resolveServerHeaders(context.services, server.name, server.headers),
           (received, total) => {
             const now = Date.now();
             if (now - lastProgressUpdate < 200) return;
@@ -3419,17 +3438,17 @@ var scp = (() => {
               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(
           ICliFileTransferService_TOKEN
         );
         if (!fileService) {
@@ -3455,14 +3474,14 @@ var scp = (() => {
     async doUpload(serverName, localPath, remotePath, context) {
       const server = resolveServer(serverName, context);
       if (!server) return;
-      const fileService = context.services.get(
+      const fileService = context.services.getRequired(
         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) {
@@ -3470,7 +3489,7 @@ var scp = (() => {
         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) {
@@ -3482,13 +3501,13 @@ var scp = (() => {
         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
+          resolveServerHeaders(context.services, server.name, server.headers)
         );
         context.spinner?.hide();
         context.writer.writeSuccess(
@@ -3505,27 +3524,27 @@ var scp = (() => {
   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);
@@ -3561,20 +3580,20 @@ var scp = (() => {
       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) {
@@ -3601,7 +3620,7 @@ var scp = (() => {
     services: [
       {
         provide: IScpTransferService_TOKEN,
-        useValue: new ScpTransferService()
+        useClass: ScpTransferService
       }
     ]
   };