@pwrdrvr/microapps-publish 0.0.17 → 0.0.21

package/dist/lib/S3Uploader.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const path = tslib_1.__importStar(require("path"));
+const fs = tslib_1.__importStar(require("fs-extra"));
+const S3TransferUtility_1 = tslib_1.__importDefault(require("./S3TransferUtility"));
+class S3Uploader {
+    /**
+     * Copy files to local upload directory
+     * @param config
+     * @param s3UploadPath
+     * @param preflightResponse
+     */
+    static async CopyToUploadDir(config, s3UploadPath) {
+        const { destinationPrefix } = S3Uploader.ParseUploadPath(s3UploadPath);
+        // Make a local root dir for the upload
+        const tempUploadPath = path.join(S3Uploader._tempDir, destinationPrefix);
+        await S3Uploader.removeTempDirIfExists();
+        await fs.mkdir(tempUploadPath, { recursive: true });
+        // Copy the files in the source dir to the root dir
+        // Note: It would be faster to move the files, then move them back
+        await fs.copy(config.app.staticAssetsPath, tempUploadPath);
+    }
+    static ParseUploadPath(s3UploadPath) {
+        // Parse the S3 Source URI
+        const uri = new URL(s3UploadPath);
+        const bucketName = uri.host;
+        const destinationPrefix = uri.pathname.length >= 1 ? uri.pathname.slice(1) : '';
+        return { bucketName, destinationPrefix };
+    }
+    /**
+     * Upload files to S3
+     * @deprecated 2021-11-27
+     * @param config
+     * @param s3UploadPath
+     * @param preflightResponse
+     */
+    static async Upload(config, s3UploadPath, preflightResponse) {
+        try {
+            const { destinationPrefix, bucketName } = S3Uploader.ParseUploadPath(s3UploadPath);
+            // Make a local root dir for the upload
+            const tempUploadPath = path.join(S3Uploader._tempDir, destinationPrefix);
+            await S3Uploader.removeTempDirIfExists();
+            await fs.mkdir(tempUploadPath, { recursive: true });
+            // Copy the files in the source dir to the root dir
+            // Note: It would be faster to move the files, then move them back
+            // FIXME: Use p-map for controlled parallelism
+            await fs.copy(config.app.staticAssetsPath, tempUploadPath);
+            // Do the upload
+            await S3TransferUtility_1.default.UploadDir(this._tempDir, destinationPrefix, bucketName, preflightResponse);
+        }
+        finally {
+            // Delete the directory, now that it's uploaded or if we failed
+            await S3Uploader.removeTempDirIfExists();
+        }
+    }
+    static async removeTempDirIfExists() {
+        try {
+            const stats = await fs.stat(S3Uploader._tempDir);
+            if (stats.isDirectory()) {
+                await fs.rm(S3Uploader._tempDir, { recursive: true });
+            }
+        }
+        catch (_a) {
+            // Don't care
+            // fs.stat will throw if file/dir does not exist
+            // Since we want the directory deleted this is ok
+        }
+    }
+    static get TempDir() {
+        return S3Uploader._tempDir;
+    }
+}
+exports.default = S3Uploader;
+S3Uploader._tempDir = './deploytool-temp';
+//# sourceMappingURL=S3Uploader.js.map

package/dist/lib/S3Uploader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"S3Uploader.js","sourceRoot":"","sources":["../../src/lib/S3Uploader.ts"],"names":[],"mappings":";;;AAAA,mDAA6B;AAE7B,qDAA+B;AAE/B,oFAAoD;AAEpD,MAAqB,UAAU;IAC7B;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAe,EAAE,YAAoB;QACvE,MAAM,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAEvE,uCAAuC;QACvC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QACzE,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;QACzC,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpD,mDAAmD;QACnD,kEAAkE;QAClE,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAC7D,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,YAAoB;QAIhD,0BAA0B;QAC1B,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QAClC,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;QAC5B,MAAM,iBAAiB,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAEhF,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,CAAC;IAC3C,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,MAAe,EACf,YAAoB,EACpB,iBAAkD;QAElD,IAAI;YACF,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,GAAG,UAAU,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;YAEnF,uCAAuC;YACvC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YACzE,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;YACzC,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAEpD,mDAAmD;YACnD,kEAAkE;YAClE,8CAA8C;YAC9C,MAAM,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;YAE3D,gBAAgB;YAChB,MAAM,2BAAiB,CAAC,SAAS,CAC/B,IAAI,CAAC,QAAQ,EACb,iBAAiB,EACjB,UAAU,EACV,iBAAiB,CAClB,CAAC;SACH;gBAAS;YACR,+DAA+D;YAC/D,MAAM,UAAU,CAAC,qBAAqB,EAAE,CAAC;SAC1C;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,qBAAqB;QACvC,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YACjD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;gBACvB,MAAM,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;aACvD;SACF;QAAC,WAAM;YACN,aAAa;YACb,gDAAgD;YAChD,iDAAiD;SAClD;IACH,CAAC;IAGM,MAAM,KAAK,OAAO;QACvB,OAAO,UAAU,CAAC,QAAQ,CAAC;IAC7B,CAAC;;AAtFH,6BAuFC;AAJyB,mBAAQ,GAAG,mBAAmB,CAAC"}

package/dist/lib/Versions.d.ts

@@ -0,0 +1,27 @@
+export interface IVersions {
+    version: string;
+    alias?: string;
+}
+export interface IFileToModify {
+    path: string;
+    versions: IVersions;
+}
+/**
+ * Setup version and alias strings
+ * @param version
+ * @returns
+ */
+export declare function createVersions(version: string): IVersions;
+/**
+ * Write new versions into specified config file
+ * @param path
+ * @param requiredVersions
+ * @param leaveFiles
+ * @returns
+ */
+export declare function writeNewVersions(path: string, requiredVersions: IVersions, leaveFiles: boolean): Promise<boolean>;
+/**
+ * Restore files that the version was patched into
+ */
+export declare function restoreFiles(filesToModify: IFileToModify[]): Promise<void>;
+//# sourceMappingURL=Versions.d.ts.map

package/dist/lib/Versions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Versions.d.ts","sourceRoot":"","sources":["../../src/lib/Versions.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,SAAS,CAAC;CACrB;AAOD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAEzD;AAED;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,SAAS,EAC3B,UAAU,EAAE,OAAO,GAClB,OAAO,CAAC,OAAO,CAAC,CAoClB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhF"}

package/dist/lib/Versions.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.restoreFiles = exports.writeNewVersions = exports.createVersions = void 0;
+const fs_extra_1 = require("fs-extra");
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}
+/**
+ * Setup version and alias strings
+ * @param version
+ * @returns
+ */
+function createVersions(version) {
+    return { version, alias: `v${version.replace(/\./g, '_')}` };
+}
+exports.createVersions = createVersions;
+/**
+ * Write new versions into specified config file
+ * @param path
+ * @param requiredVersions
+ * @param leaveFiles
+ * @returns
+ */
+async function writeNewVersions(path, requiredVersions, leaveFiles) {
+    const stats = await fs_extra_1.promises.stat(path);
+    if (!stats.isFile) {
+        return false;
+    }
+    // Make a backup of the file
+    await fs_extra_1.promises.copyFile(path, `${path}.original`);
+    // File exists, check that it has the required version strings
+    let fileText = await fs_extra_1.promises.readFile(path, 'utf8');
+    for (const key of Object.keys(requiredVersions)) {
+        const placeHolder = key === 'version' ? '0.0.0' : 'v0_0_0';
+        if (fileText.indexOf(placeHolder) === -1) {
+            // The required placeholder is missing
+            return false;
+        }
+        else {
+            const regExp = new RegExp(escapeRegExp(placeHolder), 'g');
+            fileText = fileText.replace(regExp, key === 'version' ? requiredVersions.version : requiredVersions.alias);
+        }
+    }
+    // Write the updated file contents
+    await fs_extra_1.promises.writeFile(path, fileText, 'utf8');
+    // Leave a copy of the modified file if requested
+    if (leaveFiles) {
+        // This copy will overwrite an existing file
+        await fs_extra_1.promises.copyFile(path, `${path}.modified`);
+    }
+    return true;
+}
+exports.writeNewVersions = writeNewVersions;
+/**
+ * Restore files that the version was patched into
+ */
+async function restoreFiles(filesToModify) {
+    // Put the old files back when succeeded or failed
+    for (const fileToModify of filesToModify) {
+        try {
+            const stats = await fs_extra_1.promises.stat(`${fileToModify.path}.original`);
+            if (stats.isFile()) {
+                // Remove the possibly modified file
+                await fs_extra_1.promises.unlink(fileToModify.path);
+                // Move the original file back
+                await fs_extra_1.promises.rename(`${fileToModify.path}.original`, fileToModify.path);
+            }
+        }
+        catch (_a) {
+            // don't care... if the file doesn't exist we can't do anything
+        }
+    }
+}
+exports.restoreFiles = restoreFiles;
+//# sourceMappingURL=Versions.js.map

package/dist/lib/Versions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Versions.js","sourceRoot":"","sources":["../../src/lib/Versions.ts"],"names":[],"mappings":";;;AAAA,uCAA0C;AAY1C,6FAA6F;AAC7F,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC,oCAAoC;AAC3F,CAAC;AAED;;;;GAIG;AACH,SAAgB,cAAc,CAAC,OAAe;IAC5C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC;AAC/D,CAAC;AAFD,wCAEC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CACpC,IAAY,EACZ,gBAA2B,EAC3B,UAAmB;IAEnB,MAAM,KAAK,GAAG,MAAM,mBAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;QACjB,OAAO,KAAK,CAAC;KACd;IAED,4BAA4B;IAC5B,MAAM,mBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI,WAAW,CAAC,CAAC;IAE5C,8DAA8D;IAC9D,IAAI,QAAQ,GAAG,MAAM,mBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;QAC/C,MAAM,WAAW,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3D,IAAI,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE;YACxC,sCAAsC;YACtC,OAAO,KAAK,CAAC;SACd;aAAM;YACL,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,GAAG,CAAC,CAAC;YAC1D,QAAQ,GAAG,QAAQ,CAAC,OAAO,CACzB,MAAM,EACN,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAE,gBAAgB,CAAC,KAAgB,CAClF,CAAC;SACH;KACF;IAED,kCAAkC;IAClC,MAAM,mBAAE,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;IAE3C,iDAAiD;IACjD,IAAI,UAAU,EAAE;QACd,4CAA4C;QAC5C,MAAM,mBAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,IAAI,WAAW,CAAC,CAAC;KAC7C;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAxCD,4CAwCC;AAED;;GAEG;AACI,KAAK,UAAU,YAAY,CAAC,aAA8B;IAC/D,kDAAkD;IAClD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;QACxC,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,mBAAE,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,WAAW,CAAC,CAAC;YAC7D,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE;gBAClB,oCAAoC;gBACpC,MAAM,mBAAE,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAEnC,8BAA8B;gBAC9B,MAAM,mBAAE,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC,IAAI,WAAW,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;aACrE;SACF;QAAC,WAAM;YACN,+DAA+D;SAChE;KACF;AACH,CAAC;AAhBD,oCAgBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pwrdrvr/microapps-publish",
-  "version": "0.0.17",
+  "version": "0.0.21",
   "description": "Publish tool for deploying apps and updates",
   "main": "dist/index.js",
   "source": "src/index.ts",
@@ -8,7 +8,7 @@
     "access": "public"
   },
   "bin": {
-    "microapps-publish": "dist/index.js"
+    "microapps-publish": "./bin/run"
   },
   "engineStrict": true,
   "engine": {
@@ -41,7 +41,9 @@
     "@aws-sdk/lib-storage": "^3.20.0",
     "@oclif/command": "^1.8.4",
     "@oclif/config": "^1.17.1",
+    "@oclif/core": "^1.0.4",
     "@oclif/errors": "^1.3.5",
+    "@oclif/plugin-help": "^3.2.7",
     "chalk": "^4.1.2",
     "commander": "^7.1.0",
     "convict": "^6.1.0",
@@ -64,5 +66,12 @@
     "@types/mime-types": "^2.1.0",
     "@types/source-map-support": "^0.5.4",
     "type-fest": "^0.20.2"
+  },
+  "oclif": {
+    "commands": "./dist/commands/",
+    "bin": "microapps-publish",
+    "plugins": [
+      "@oclif/plugin-help"
+    ]
   }
 }