uzdu 1.1.0 → 1.1.2

package/lib/{chunk-463DKYHI.js → chunk-2E5O5JIN.js}

@@ -7,128 +7,6 @@ import {
   runSequentially
 } from "./chunk-WWXWWCCX.js";
 
-// src/azure.ts
-var azure_exports = {};
-__export(azure_exports, {
-  default: () => upload
-});
-import { BlobServiceClient } from "@azure/storage-blob";
-import path from "path";
-import fs from "fs";
-async function upload(dir, options, metadataFile = ".metadata.json") {
-  if (!options.connectionString) throw Error("Uploader needs connection string for Azure Blob Storage. Provide AZURE_STORAGE_CONNECTION_STRING environment variable!");
-  const opts = Object.assign({}, { container: "$web" }, options);
-  const blobServiceClient = BlobServiceClient.fromConnectionString(options.connectionString);
-  const isDebug = process.env.DEBUG && process.env.DEBUG.toLowerCase() === "true";
-  const containerClient = blobServiceClient.getContainerClient(opts.container);
-  let dist = path.resolve(process.cwd(), dir);
-  const files = await listFiles(dir);
-  let metadata;
-  try {
-    const metadataJson = fs.readFileSync(path.join(dir, metadataFile), { encoding: "utf-8" });
-    metadata = JSON.parse(metadataJson);
-  } catch (e) {
-  }
-  if (Object.keys(files).length == 1) {
-    const lstat = fs.lstatSync(dist);
-    if (lstat.isFile()) {
-      dist = path.dirname(dist);
-    }
-  }
-  await Promise.all(Object.entries(files).map(async ([file, absFile]) => {
-    let blobObj;
-    if (metadata) {
-      blobObj = metadata[file];
-    }
-    const blockBlobClient = containerClient.getBlockBlobClient(file);
-    const blobHTTPHeaders = {};
-    if (blobObj?.headers) {
-      const { CacheControl, ContentType } = blobObj.headers;
-      blobHTTPHeaders.blobCacheControl = CacheControl;
-      blobHTTPHeaders.blobContentType = ContentType;
-    }
-    const localFilePath = absFile;
-    await blockBlobClient.uploadFile(localFilePath, { blobHTTPHeaders });
-  }));
-}
-
-// src/s3.ts
-var s3_exports = {};
-__export(s3_exports, {
-  default: () => upload2
-});
-import { S3Client } from "@aws-sdk/client-s3";
-import { Upload } from "@aws-sdk/lib-storage";
-import fs2 from "fs";
-import path2 from "path";
-async function upload2(dir, s3config, metadataFile = ".metadata.json") {
-  if (!s3config.accessKeyId || !s3config.secretAccessKey) {
-    throw new Error("AWS credentials not found in environment variables AWS_KEY_ID and AWS_SECRET_KEY.");
-  }
-  if (!s3config.region) {
-    throw new Error('Neither "region" in the bucket address nor AWS_REGION environment variable was found.');
-  }
-  if (!s3config.bucket) {
-    throw new Error("Amazon S3 bucket name is required");
-  }
-  const { accessKeyId, secretAccessKey, region, endpoint } = s3config;
-  const client = new S3Client({
-    credentials: {
-      accessKeyId,
-      secretAccessKey
-    },
-    region,
-    endpoint
-  });
-  let dist = path2.resolve(process.cwd(), dir);
-  const files = await listFiles(dist);
-  let metadata;
-  try {
-    const metadataJson = fs2.readFileSync(path2.join(dir, metadataFile), { encoding: "utf-8" });
-    metadata = JSON.parse(metadataJson);
-  } catch (e) {
-  }
-  if (Object.keys(files).length == 1) {
-    const lstat = fs2.lstatSync(dist);
-    if (lstat.isFile()) {
-      dist = path2.dirname(dist);
-    }
-  }
-  await Promise.all(Object.entries(files).map(async ([file, absFile]) => {
-    const filePath = absFile;
-    const fileContent = await new Promise((resolve, reject) => {
-      fs2.readFile(filePath, (err, data) => {
-        if (err) reject(err);
-        else resolve(data);
-      });
-    });
-    const params = {
-      Bucket: s3config.bucket,
-      Key: file,
-      Body: fileContent
-    };
-    if (metadata) {
-      const blobObj = metadata[file];
-      if (blobObj && blobObj.headers) {
-        const { CacheControl, ContentType } = blobObj.headers;
-        if (CacheControl) params.CacheControl = CacheControl;
-        if (ContentType) params.ContentType = ContentType;
-      }
-    }
-    return new Upload({
-      client,
-      params,
-      tags: [],
-      queueSize: 4,
-      // optional concurrency configuration
-      partSize: 1024 * 1024 * 5,
-      // optional size of each part, in bytes, at least 5MB
-      leavePartsOnError: false
-      // optional manually handle dropped parts
-    }).done();
-  }));
-}
-
 // src/ssh.ts
 var ssh_exports = {};
 __export(ssh_exports, {
@@ -138,15 +16,15 @@ __export(ssh_exports, {
   getDirMap: () => getDirMap,
   getMakeDirs: () => getMakeDirs,
   getRemoteDestination: () => getRemoteDestination,
-  upload: () => upload3
+  upload: () => upload
 });
 import { Client } from "ssh2";
-import fs3 from "fs";
-import path3 from "path";
+import fs from "fs";
+import path from "path";
 import deepmerge from "deepmerge";
-async function upload3(source, sftpUrl, options) {
+async function upload(source, sftpUrl, options) {
   await new Promise((resolve, reject) => {
-    fs3.stat(source, async (err, stats) => {
+    fs.stat(source, async (err, stats) => {
       if (err) {
         reject(err);
         return;
@@ -255,7 +133,7 @@ function _uploadFile(source, destination, sftp) {
           else resolve();
         });
       } else if (stats.isDirectory()) {
-        const f = path3.basename(source);
+        const f = path.basename(source);
         reject(new Error(`Overwriting directory ${destination} with the file ${f} is not allowed. Remove the directory manually.`));
       } else {
         reject(new Error("Remote path is symlink"));
@@ -270,9 +148,9 @@ function uploadFiles(sourceFiles, source, destination, sshConnection) {
         reject(err);
       } else {
         if (Object.keys(sourceFiles).length == 1) {
-          const lstat2 = fs3.lstatSync(source);
+          const lstat2 = fs.lstatSync(source);
           if (lstat2.isFile()) {
-            const dest = path3.join(destination, Object.keys(sourceFiles)[0]).replace(/\\/g, "/");
+            const dest = path.join(destination, Object.keys(sourceFiles)[0]).replace(/\\/g, "/");
             const src = source;
             await _uploadFile(src, dest, sftp).then(() => resolve()).catch((e) => {
               reject(e);
@@ -281,13 +159,13 @@ function uploadFiles(sourceFiles, source, destination, sshConnection) {
           }
         }
         let sourceDir = source;
-        const lstat = fs3.lstatSync(source);
+        const lstat = fs.lstatSync(source);
         if (lstat.isSymbolicLink()) {
-          sourceDir = fs3.readlinkSync(source);
+          sourceDir = fs.readlinkSync(source);
         }
         const promises = [];
         Object.entries(sourceFiles).map(([baseName, absPath]) => {
-          const dest = path3.join(destination, baseName).replace(/\\/g, "/");
+          const dest = path.join(destination, baseName).replace(/\\/g, "/");
           const promise = new Promise((res, rej) => {
             _uploadFile(absPath, dest, sftp).then(() => res()).catch((e) => {
               rej(e);
@@ -361,7 +239,7 @@ function getFileMap(file) {
   const parts = theFile.split("/");
   if (parts.length == 1) return { [parts[0]]: false };
   else {
-    const aFile = path3.join(...parts.slice(1)).replace(/\\/g, "/");
+    const aFile = path.join(...parts.slice(1)).replace(/\\/g, "/");
     const fileMapEntry = getFileMap(aFile);
     return { [parts[0]]: fileMapEntry };
   }
@@ -379,7 +257,7 @@ function getCredentials(options) {
     if (uzduKeyPath) {
       const resolvedKeyPath = resolvePath(uzduKeyPath);
       try {
-        privateKey = fs3.readFileSync(resolvedKeyPath);
+        privateKey = fs.readFileSync(resolvedKeyPath);
       } catch (e) {
         throw new Error(`Not found private Key file ${resolvedKeyPath}`);
       }
@@ -421,10 +299,10 @@ function getConnectConfig(url) {
   if (!host) throw new Error(`Wrong URL "${url}": host or ivp6 is not specified`);
   const username = groups?.username;
   const password = groups?.password;
-  const path4 = groups?.path;
+  const path2 = groups?.path;
   const _port = parseInt(groups.port);
   const port = isNaN(_port) ? void 0 : _port;
-  const connectConfig = { username, password, host, port, path: path4 };
+  const connectConfig = { username, password, host, port, path: path2 };
   return connectConfig;
 }
 function getRemoteDestination(sftpUrl) {
@@ -432,14 +310,14 @@ function getRemoteDestination(sftpUrl) {
   const execArray = sftpUrlRegex.exec(sftpUrl);
   if (!execArray) throw new Error("Wrong sftp URL");
   if (!execArray.groups) throw new Error("Wrong URL: path is not specified");
-  const path4 = execArray.groups.path;
+  const path2 = execArray.groups.path;
   return normilizeSftpPath(execArray.groups?.path) || "";
 }
-function normilizeSftpPath(path4) {
-  if (path4 == void 0) return void 0;
+function normilizeSftpPath(path2) {
+  if (path2 == void 0) return void 0;
   const re = /^(?<first>[^\/]*)(?<root>\/)?(?<second>.*)?/g;
   re.lastIndex = 0;
-  const execPathArray = re.exec(path4);
+  const execPathArray = re.exec(path2);
   const { groups } = execPathArray ?? {};
   const first = groups?.first;
   const second = groups?.second;
@@ -451,7 +329,7 @@ function normilizeSftpPath(path4) {
     dest = groups2?.tild ? `${second ? second : ""}` : `/${first}${second ? `/${second}` : ""}`;
   } else {
     if (!root && !second) dest = "/";
-    else dest = path4;
+    else dest = path2;
   }
   const destination = dest != "/" ? dest.replace(/\/+$/, "") : dest;
   return destination;
@@ -459,9 +337,6 @@ function normilizeSftpPath(path4) {
 
 export {
   upload,
-  azure_exports,
-  upload2,
-  s3_exports,
-  upload3,
+  execute,
   ssh_exports
 };

package/lib/chunk-XU5JZHWK.js

@@ -0,0 +1,133 @@
+import {
+  __export,
+  listFiles
+} from "./chunk-WWXWWCCX.js";
+
+// src/azure.ts
+var azure_exports = {};
+__export(azure_exports, {
+  default: () => upload
+});
+import { BlobServiceClient } from "@azure/storage-blob";
+import path from "path";
+import fs from "fs";
+async function upload(dir, options, metadataFile = ".metadata.json") {
+  if (!options.connectionString) throw Error("Uploader needs connection string for Azure Blob Storage. Provide AZURE_STORAGE_CONNECTION_STRING environment variable!");
+  const opts = Object.assign({}, { container: "$web" }, options);
+  const blobServiceClient = BlobServiceClient.fromConnectionString(options.connectionString);
+  const isDebug = process.env.DEBUG && process.env.DEBUG.toLowerCase() === "true";
+  const containerClient = blobServiceClient.getContainerClient(opts.container);
+  let dist = path.resolve(process.cwd(), dir);
+  const files = await listFiles(dir);
+  let metadata;
+  try {
+    const metadataJson = fs.readFileSync(path.join(dir, metadataFile), { encoding: "utf-8" });
+    metadata = JSON.parse(metadataJson);
+  } catch (e) {
+  }
+  if (Object.keys(files).length == 1) {
+    const lstat = fs.lstatSync(dist);
+    if (lstat.isFile()) {
+      dist = path.dirname(dist);
+    }
+  }
+  await Promise.all(Object.entries(files).map(async ([file, absFile]) => {
+    let blobObj;
+    if (metadata) {
+      blobObj = metadata[file];
+    }
+    const blockBlobClient = containerClient.getBlockBlobClient(file);
+    const blobHTTPHeaders = {};
+    if (blobObj?.headers) {
+      const { CacheControl, ContentType } = blobObj.headers;
+      blobHTTPHeaders.blobCacheControl = CacheControl;
+      blobHTTPHeaders.blobContentType = ContentType;
+    }
+    const localFilePath = absFile;
+    await blockBlobClient.uploadFile(localFilePath, { blobHTTPHeaders });
+  }));
+}
+
+// src/s3.ts
+var s3_exports = {};
+__export(s3_exports, {
+  default: () => upload2
+});
+import { S3Client } from "@aws-sdk/client-s3";
+import { Upload } from "@aws-sdk/lib-storage";
+import fs2 from "fs";
+import path2 from "path";
+async function upload2(dir, s3config, metadataFile = ".metadata.json") {
+  if (!s3config.accessKeyId || !s3config.secretAccessKey) {
+    throw new Error("AWS credentials not found in environment variables AWS_KEY_ID and AWS_SECRET_KEY.");
+  }
+  if (!s3config.region) {
+    throw new Error('Neither "region" in the bucket address nor AWS_REGION environment variable was found.');
+  }
+  if (!s3config.bucket) {
+    throw new Error("Amazon S3 bucket name is required");
+  }
+  const { accessKeyId, secretAccessKey, region, endpoint } = s3config;
+  const client = new S3Client({
+    credentials: {
+      accessKeyId,
+      secretAccessKey
+    },
+    region,
+    endpoint
+  });
+  let dist = path2.resolve(process.cwd(), dir);
+  const files = await listFiles(dist);
+  let metadata;
+  try {
+    const metadataJson = fs2.readFileSync(path2.join(dir, metadataFile), { encoding: "utf-8" });
+    metadata = JSON.parse(metadataJson);
+  } catch (e) {
+  }
+  if (Object.keys(files).length == 1) {
+    const lstat = fs2.lstatSync(dist);
+    if (lstat.isFile()) {
+      dist = path2.dirname(dist);
+    }
+  }
+  await Promise.all(Object.entries(files).map(async ([file, absFile]) => {
+    const filePath = absFile;
+    const fileContent = await new Promise((resolve, reject) => {
+      fs2.readFile(filePath, (err, data) => {
+        if (err) reject(err);
+        else resolve(data);
+      });
+    });
+    const params = {
+      Bucket: s3config.bucket,
+      Key: file,
+      Body: fileContent
+    };
+    if (metadata) {
+      const blobObj = metadata[file];
+      if (blobObj && blobObj.headers) {
+        const { CacheControl, ContentType } = blobObj.headers;
+        if (CacheControl) params.CacheControl = CacheControl;
+        if (ContentType) params.ContentType = ContentType;
+      }
+    }
+    return new Upload({
+      client,
+      params,
+      tags: [],
+      queueSize: 4,
+      // optional concurrency configuration
+      partSize: 1024 * 1024 * 5,
+      // optional size of each part, in bytes, at least 5MB
+      leavePartsOnError: false
+      // optional manually handle dropped parts
+    }).done();
+  }));
+}
+
+export {
+  upload,
+  azure_exports,
+  upload2,
+  s3_exports
+};

package/lib/uzdu-exec.d.ts

@@ -0,0 +1,2 @@
+
+export {  }

package/lib/uzdu-exec.js

@@ -0,0 +1,27 @@
+import {
+  execute
+} from "./chunk-2E5O5JIN.js";
+import {
+  outputConfiguration
+} from "./chunk-WWXWWCCX.js";
+
+// src/uzdu-exec.ts
+import { Command, Option } from "commander";
+var command = new Command();
+command.description("Execute commands on remote machine").name("uzdu exec");
+command.command("ssh").description("Execute commands via SSH. In addition to sshUrl consider using environment variables UZDU_SSH_KEY_PATH, UZDU_SSH_KEY, UZDU_SSH_PASSWORD").argument("<sshUrl>", "the URL format ssh://[user[:password]@]host[:port]").argument("command", "single line command").addOption(
+  new Option("-d|--dotenv [file]", 'load environment variables from a property file, i.e. a file with "key=value" lines.').preset(".env")
+).addOption(new Option("--privateKeyPath [path to file]", "Path to SSH private key, fallback is UZDU_SSH_KEY_PATH environment variable. Also consider using UZDU_SSH_KEY to provide SSH private key content or UZDU_SSH_PASSWORD.")).action(async (sshUrl, command2, options, thisCommand) => {
+  try {
+    options.callback = (value) => {
+      if (value.message) console.log(value.message);
+      if (value.error) console.error(value.error);
+    };
+    await execute(sshUrl, [command2], options);
+  } catch (e) {
+    thisCommand.error(e.message || e, { exitCode: 127, code: "ssh.upload.error" });
+  }
+});
+command.configureOutput(outputConfiguration);
+command.showHelpAfterError(true);
+command.parse();

package/lib/uzdu-upload.js

@@ -1,11 +1,13 @@
 import {
-  upload as upload2,
-  upload2 as upload3,
-  upload3 as upload4
-} from "./chunk-463DKYHI.js";
+  upload as upload3,
+  upload2 as upload4
+} from "./chunk-XU5JZHWK.js";
 import {
   upload
 } from "./chunk-LFEIDM4S.js";
+import {
+  upload as upload2
+} from "./chunk-2E5O5JIN.js";
 import {
   getEnvironment,
   initEnvironment,
@@ -40,7 +42,7 @@ command.command("aws").description("upload to AWS S3").argument("<from>", "the d
     if (!config.accessKeyId) throw new Error("AWS Access Key ID is not specified. Provide an environement variable AWS_ACCESS_KEY_ID.");
     if (!config.secretAccessKey) throw new Error("AWS Secret Key is not specified. Provide an environment variable AWS_SECRET_ACCESS_KEY.");
     if (!config.region) throw new Error("AWS region is not specified. Provide it in a bucket address or as an envronment variable S3_REGION.");
-    await upload3(from, config);
+    await upload4(from, config);
   } catch (e) {
     thisCommand.error(e.message || e, { exitCode: 53, code: "aws.upload.error" });
   }
@@ -78,7 +80,7 @@ command.command("azure").alias("az").description("upload to Azure Blob Storage")
       connectionString,
       container
     };
-    await upload2(from, azOpt);
+    await upload3(from, azOpt);
   } catch (e) {
     thisCommand.error(e.message || e, { exitCode: 43, code: "az.upload.error" });
   }
@@ -87,7 +89,7 @@ command.command("ssh").description("upload via SFTP. In addition to sftpURL cons
   new Option("-d|--dotenv [file]", 'load environment variables from a property file, i.e. a file with "key=value" lines.').preset(".env")
 ).addOption(new Option("--privateKeyPath [path to file]", "Path to SSH private key, fallback is UZDU_SSH_KEY_PATH environment variable. Also consider using UZDU_SSH_KEY to provide SSH private key content or UZDU_SSH_PASSWORD.")).action(async (source, sftpUrl, options, thisCommand) => {
   try {
-    await upload4(resolvePath(source), sftpUrl, options);
+    await upload2(resolvePath(source), sftpUrl, options);
   } catch (e) {
     thisCommand.error(e.message || e, { exitCode: 127, code: "ssh.upload.error" });
   }

package/lib/uzdu.js

@@ -1,12 +1,14 @@
 #! /usr/bin/env node
 import {
   azure_exports,
-  s3_exports,
-  ssh_exports
-} from "./chunk-463DKYHI.js";
+  s3_exports
+} from "./chunk-XU5JZHWK.js";
 import {
   http_exports
 } from "./chunk-LFEIDM4S.js";
+import {
+  ssh_exports
+} from "./chunk-2E5O5JIN.js";
 import {
   outputConfiguration,
   utils_exports
@@ -17,7 +19,7 @@ import { Command } from "commander";
 var version;
 var description;
 try {
-  version = "1.1.0";
+  version = "1.1.2";
   description = "UZDU - universal zipper, downloader and uploader. Move files to/from zip, clouds (AWS, Azure), to HTTP PUT (e.g. Nexus) and to SSH";
 } catch (e) {
   if (e instanceof ReferenceError) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uzdu",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "UZDU - universal zipper, downloader and uploader. Move files to/from zip, clouds (AWS, Azure), to HTTP PUT (e.g. Nexus) and to SSH",
   "bin": {
     "uzdu": "lib/uzdu.js"