@adobe/ccweb-add-on-ssl 3.0.1 → 3.1.0

package/.c8rc.json

@@ -1,7 +1,18 @@
 {
     "all": true,
     "include": ["src/**/*.ts"],
-    "exclude": ["src/**/*.spec.ts", "src/**/*Types.ts", "src/**/index.ts", "src/config/*"],
+    "exclude": [
+        "src/**/*.spec.ts",
+        "src/models/SSLTypes.ts",
+        "src/app/CommandExecutor.ts",
+        "src/validators/CommandValidator.ts",
+        "src/**/index.ts",
+        "src/config/*"
+    ],
+    "lines": 100,
+    "functions": 100,
+    "branches": 100,
+    "statements": 100,
     "reporter": ["html", "text", "text-summary"],
     "report-dir": "coverage"
 }

package/dist/app/CommandExecutor.d.ts

@@ -21,16 +21,15 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-import type { CommandOptions } from "../models/index.js";
 /**
- * Command execution contracts.
+ * Command Executor interface for handling CLI commands.
  */
-export interface CommandExecutor {
+export interface CommandExecutor<TOptions = void> {
     /**
-     * Execute command.
-     * @param options - Command arguments entered by user represented as {@link CommandOptions}.
-     * @returns Promise.
+     * Execute the command.
+     * @param options - Command execution options.
+     * @returns Promise that resolves indicating the command was executed successfully.
      */
-    execute(options?: CommandOptions): Promise<void>;
+    execute(options?: TOptions): Promise<void>;
 }
 //# sourceMappingURL=CommandExecutor.d.ts.map

package/dist/app/CommandExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CommandExecutor.d.ts","sourceRoot":"","sources":["../../src/app/CommandExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,eAAe;IAC5B;;;;OAIG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"}
+{"version":3,"file":"CommandExecutor.d.ts","sourceRoot":"","sources":["../../src/app/CommandExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF;;GAEG;AACH,MAAM,WAAW,eAAe,CAAC,QAAQ,GAAG,IAAI;IAC5C;;;;OAIG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9C"}

package/dist/app/PurgeCommandExecutor.d.ts

@@ -22,7 +22,8 @@
  * SOFTWARE.
  ********************************************************************************/
 import type { AnalyticsService } from "@adobe/ccweb-add-on-analytics";
-import type { Logger, Preferences } from "@adobe/ccweb-add-on-core";
+import type { Logger } from "@adobe/ccweb-add-on-core";
+import { UserPreferences } from "@adobe/ccweb-add-on-core";
 import "reflect-metadata";
 import type { CommandExecutor } from "./CommandExecutor.js";
 /**
@@ -34,12 +35,12 @@ export declare class PurgeCommandExecutor implements CommandExecutor {
     private readonly _logger;
     /**
      * Instantiate {@link PurgeCommandExecutor}.
-     * @param preferences - {@link Preferences} reference.
+     * @param preferences - {@link UserPreferences} reference.
      * @param analyticsService - {@link AnalyticsService} reference.
      * @param logger - {@link Logger} reference.
      * @returns Reference to a new {@link PurgeCommandExecutor} instance.
      */
-    constructor(preferences: Preferences, analyticsService: AnalyticsService, logger: Logger);
+    constructor(preferences: UserPreferences, analyticsService: AnalyticsService, logger: Logger);
     /**
      * Purge all SSL artifacts and invalidate the certificate authority from the trusted source.
      * @returns Promise.

package/dist/app/PurgeCommandExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PurgeCommandExecutor.d.ts","sourceRoot":"","sources":["../../src/app/PurgeCommandExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAOpE,OAAO,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,qBACa,oBAAqB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;;;;;OAMG;gBAEiC,WAAW,EAAE,WAAW,EACd,gBAAgB,EAAE,gBAAgB,EACjD,MAAM,EAAE,MAAM;IAO7C;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC9B,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;CAG/B"}
+{"version":3,"file":"PurgeCommandExecutor.d.ts","sourceRoot":"","sources":["../../src/app/PurgeCommandExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAwB,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAMjF,OAAO,kBAAkB,CAAC;AAG1B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D;;GAEG;AACH,qBACa,oBAAqB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;;;;;OAMG;gBAEqC,WAAW,EAAE,eAAe,EACtB,gBAAgB,EAAE,gBAAgB,EACjD,MAAM,EAAE,MAAM;IAO7C;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC9B,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;CAG/B"}

package/dist/app/PurgeCommandExecutor.js

@@ -23,7 +23,7 @@
  ********************************************************************************/
 import { __decorate, __metadata, __param } from "tslib";
 import { ITypes as IAnalyticsTypes } from "@adobe/ccweb-add-on-analytics";
-import { ITypes as ICoreTypes } from "@adobe/ccweb-add-on-core";
+import { ITypes as ICoreTypes, UserPreferences } from "@adobe/ccweb-add-on-core";
 import devcert from "@adobe/ccweb-add-on-devcert";
 import chalk from "chalk";
 import fs from "fs-extra";
@@ -31,7 +31,7 @@ import { inject, injectable } from "inversify";
 import prompts from "prompts";
 import "reflect-metadata";
 import { AnalyticsErrorMarkers, AnalyticsSuccessMarkers } from "../AnalyticsMarkers.js";
-import { SSLRemoveOption } from "../models/Types.js";
+import { SSLRemoveOption } from "../models/SSLTypes.js";
 /**
  * Purge command execution implementation class.
  */
@@ -41,7 +41,7 @@ let PurgeCommandExecutor = class PurgeCommandExecutor {
     _logger;
     /**
      * Instantiate {@link PurgeCommandExecutor}.
-     * @param preferences - {@link Preferences} reference.
+     * @param preferences - {@link UserPreferences} reference.
      * @param analyticsService - {@link AnalyticsService} reference.
      * @param logger - {@link Logger} reference.
      * @returns Reference to a new {@link PurgeCommandExecutor} instance.
@@ -67,7 +67,7 @@ let PurgeCommandExecutor = class PurgeCommandExecutor {
             initial: 0
         });
         if (!response || !response.purgeConfirmation) {
-            this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_PURGE, LOGS.sslPurgeOptionNotSpecified, false);
+            void this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_PURGE, LOGS.sslPurgeOptionNotSpecified, false);
             return;
         }
         if (response.purgeConfirmation === SSLRemoveOption.Keep) {
@@ -86,13 +86,13 @@ let PurgeCommandExecutor = class PurgeCommandExecutor {
         if (userPreference.ssl !== undefined) {
             userPreference.ssl = undefined;
             this._preferences.set(userPreference);
-            this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_MANUAL_PURGE, "", true);
+            void this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_MANUAL_PURGE, "", true);
         }
     }
     _purgeWxpSSL() {
         if (fs.existsSync(devcert.location())) {
             devcert.removeAll();
-            this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_AUTOMATIC_PURGE, "", true);
+            void this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_AUTOMATIC_PURGE, "", true);
         }
     }
     _promptMessage(message) {
@@ -104,10 +104,10 @@ let PurgeCommandExecutor = class PurgeCommandExecutor {
 };
 PurgeCommandExecutor = __decorate([
     injectable(),
-    __param(0, inject(ICoreTypes.Preferences)),
+    __param(0, inject(ICoreTypes.UserPreferences)),
     __param(1, inject(IAnalyticsTypes.AnalyticsService)),
     __param(2, inject(ICoreTypes.Logger)),
-    __metadata("design:paramtypes", [Object, Object, Object])
+    __metadata("design:paramtypes", [UserPreferences, Function, Object])
 ], PurgeCommandExecutor);
 export { PurgeCommandExecutor };
 const LOGS = {

package/dist/app/SSLReader.d.ts

@@ -21,11 +21,23 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-import type { SSLData } from "../models/index.js";
+import type { Logger } from "@adobe/ccweb-add-on-core";
+import { UserPreferences } from "@adobe/ccweb-add-on-core";
+import "reflect-metadata";
+import type { SSLData } from "../models/SSLTypes.js";
 /**
- * Contracts for reading the SSL artifacts.
+ * Implementation class for reading the SSL artifacts.
  */
-export interface SSLReader {
+export declare class SSLReader {
+    private readonly _preferences;
+    private readonly _logger;
+    /**
+     * Instantiate {@link SSLReader}.
+     * @param Preferences - {@link UserPreferences} reference.
+     * @param logger - {@link Logger} reference.
+     * @returns Reference to a new {@link SSLReader} instance.
+     */
+    constructor(preferences: UserPreferences, logger: Logger);
     /**
      * Is SSL set up manually by the user.
      * @param hostname - Hostname in the SSL certificate.
@@ -45,5 +57,12 @@ export interface SSLReader {
      * @returns Promise of {@link SSLData}.
      */
     read(hostname: string, port: number): Promise<SSLData>;
+    private _getUserDefinedSSL;
+    private _handleExpiredSSLCertificate;
+    private _handleNearingExpirySSLCertificate;
+    private _handleNoSSLCertificateFound;
+    private _handleInvalidUserSSLCertificate;
+    private _handleUnknownExpirySSLCertificate;
+    private _recreateSSLCertificate;
 }
 //# sourceMappingURL=SSLReader.d.ts.map

package/dist/app/SSLReader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SSLReader.d.ts","sourceRoot":"","sources":["../../src/app/SSLReader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAElD;;GAEG;AACH,MAAM,WAAW,SAAS;IACtB;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAEvC;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAEpC;;;;;OAKG;IACH,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC1D"}
+{"version":3,"file":"SSLReader.d.ts","sourceRoot":"","sources":["../../src/app/SSLReader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAgC,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAIzF,OAAO,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD;;GAEG;AACH,qBACa,SAAS;IAClB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;;;;OAKG;gBAEqC,WAAW,EAAE,eAAe,EACrC,MAAM,EAAE,MAAM;IAM7C;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAItC;;;;OAIG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAInC;;;;;OAKG;IACG,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8C5D,OAAO,CAAC,kBAAkB;IAS1B,OAAO,CAAC,4BAA4B;IAMpC,OAAO,CAAC,kCAAkC;IAK1C,OAAO,CAAC,4BAA4B;IAMpC,OAAO,CAAC,gCAAgC;IAKxC,OAAO,CAAC,kCAAkC;IAO1C,OAAO,CAAC,uBAAuB;CAOlC"}

package/dist/app/SSLReader.js

@@ -21,5 +21,147 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-export {};
+import { __decorate, __metadata, __param } from "tslib";
+import { ITypes as ICoreTypes, isFile, UserPreferences } from "@adobe/ccweb-add-on-core";
+import devcert from "@adobe/ccweb-add-on-devcert";
+import fs from "fs-extra";
+import { inject, injectable } from "inversify";
+import "reflect-metadata";
+import format from "string-template";
+/**
+ * Implementation class for reading the SSL artifacts.
+ */
+let SSLReader = class SSLReader {
+    _preferences;
+    _logger;
+    /**
+     * Instantiate {@link SSLReader}.
+     * @param Preferences - {@link UserPreferences} reference.
+     * @param logger - {@link Logger} reference.
+     * @returns Reference to a new {@link SSLReader} instance.
+     */
+    constructor(preferences, logger) {
+        this._preferences = preferences;
+        this._logger = logger;
+    }
+    /**
+     * Is SSL set up manually by the user.
+     * @param hostname - Hostname in the SSL certificate.
+     * @returns Boolean value representing whether SSL is set up manually.
+     */
+    isCustomSSL(hostname) {
+        return this._getUserDefinedSSL(hostname) !== undefined;
+    }
+    /**
+     * Is SSL set up automatically by the tool.
+     * @param hostname - Hostname in the SSL certificate.
+     * @returns Boolean value representing whether SSL is set up automatically.
+     */
+    isWxpSSL(hostname) {
+        return devcert.hasCertificateFor(hostname);
+    }
+    /**
+     * Read the SSL artifacts.
+     * @param hostname - Hostname in the SSL certificate.
+     * @param port - Port where the add-on is being hosted.
+     * @returns Promise of {@link SSLData}.
+     */
+    async read(hostname, port) {
+        const sslSettings = this._getUserDefinedSSL(hostname);
+        // When SSL is set up manuually by the `user`.
+        if (sslSettings !== undefined) {
+            const { certificatePath, keyPath } = sslSettings;
+            if (!certificatePath || !isFile(certificatePath)) {
+                this._handleInvalidUserSSLCertificate(LOGS.invalidCertificatePath);
+                return process.exit(1);
+            }
+            if (!keyPath || !isFile(keyPath)) {
+                this._handleInvalidUserSSLCertificate(LOGS.invalidKeyPath);
+                return process.exit(1);
+            }
+            this._handleUnknownExpirySSLCertificate(hostname, port);
+            return {
+                cert: fs.readFileSync(certificatePath),
+                key: fs.readFileSync(keyPath)
+            };
+        }
+        // When SSL is set up automatically by `devcert`.
+        if (this.isWxpSSL(hostname)) {
+            const caExpiry = devcert.caExpiryInDays();
+            const certificateExpiry = devcert.certificateExpiryInDays(hostname);
+            const expiry = Math.min(certificateExpiry, caExpiry);
+            if (expiry <= 0) {
+                this._handleExpiredSSLCertificate();
+                return process.exit(1);
+            }
+            if (expiry <= 7) {
+                this._handleNearingExpirySSLCertificate(expiry);
+            }
+            return await devcert.certificateFor(hostname);
+        }
+        this._handleNoSSLCertificateFound();
+        return process.exit(1);
+    }
+    _getUserDefinedSSL(hostname) {
+        const { ssl } = this._preferences.get();
+        if (ssl === undefined) {
+            return undefined;
+        }
+        return ssl.get(hostname);
+    }
+    _handleExpiredSSLCertificate() {
+        this._logger.error(LOGS.noValidSSLCertificateFound);
+        this._logger.error(LOGS.expiredSSLCertificate);
+        this._recreateSSLCertificate();
+    }
+    _handleNearingExpirySSLCertificate(expiry) {
+        this._logger.warning(format(LOGS.nearingExpirySSLCertificate, { expiry }));
+        this._recreateSSLCertificate();
+    }
+    _handleNoSSLCertificateFound() {
+        this._logger.error(LOGS.noValidSSLCertificateFound);
+        this._logger.error(LOGS.invalidatedSSLCertificate);
+        this._recreateSSLCertificate();
+    }
+    _handleInvalidUserSSLCertificate(errorMessage) {
+        this._logger.error(errorMessage);
+        this._recreateSSLCertificate();
+    }
+    _handleUnknownExpirySSLCertificate(hostname, port) {
+        this._logger.warning(LOGS.undeterminedExpirySSLCertificate);
+        this._logger.warning(LOGS.unableToSideloadAddOn);
+        this._logger.warning(format(LOGS.checkCertificateValidity, { hostname, port }));
+        this._recreateSSLCertificate();
+    }
+    _recreateSSLCertificate() {
+        this._logger.warning(LOGS.recreateSSLCertificate, { prefix: LOGS.newLine });
+        this._logger.information(LOGS.setupSSLCommand, { prefix: LOGS.tab });
+        this._logger.warning(LOGS.example, { prefix: LOGS.newLine });
+        this._logger.information(LOGS.setupSSLCommandExample, { prefix: LOGS.tab, postfix: LOGS.newLine });
+    }
+};
+SSLReader = __decorate([
+    injectable(),
+    __param(0, inject(ICoreTypes.UserPreferences)),
+    __param(1, inject(ICoreTypes.Logger)),
+    __metadata("design:paramtypes", [UserPreferences, Object])
+], SSLReader);
+export { SSLReader };
+const LOGS = {
+    newLine: "\n",
+    tab: "  ",
+    invalidCertificatePath: "Invalid SSL certificate file path.",
+    invalidKeyPath: "Invalid SSL key file path.",
+    noValidSSLCertificateFound: "Could not locate a valid SSL certificate to host the add-on.",
+    expiredSSLCertificate: "The SSL certificate has expired.",
+    nearingExpirySSLCertificate: "Your SSL certificate will expire in {expiry} days.",
+    invalidatedSSLCertificate: "If you had previously set it up, it may have been invalidated due to a version upgrade.",
+    undeterminedExpirySSLCertificate: "Could not determine the expiry of your SSL certificate.",
+    unableToSideloadAddOn: "If you are unable to sideload your add-on, please check the validity of:",
+    checkCertificateValidity: "https://{hostname}:{port} certificate in your browser.",
+    recreateSSLCertificate: "To re-create the SSL certificate, you may run:",
+    setupSSLCommand: "npx @adobe/ccweb-add-on-ssl setup --hostname [hostname]",
+    example: "Example:",
+    setupSSLCommandExample: "npx @adobe/ccweb-add-on-ssl setup --hostname localhost"
+};
 //# sourceMappingURL=SSLReader.js.map

package/dist/app/SetupCommandExecutor.d.ts

@@ -22,7 +22,8 @@
  * SOFTWARE.
  ********************************************************************************/
 import type { AnalyticsService } from "@adobe/ccweb-add-on-analytics";
-import type { Logger, Preferences } from "@adobe/ccweb-add-on-core";
+import type { Logger } from "@adobe/ccweb-add-on-core";
+import { UserPreferences } from "@adobe/ccweb-add-on-core";
 import "reflect-metadata";
 import type { SetupCommandOptions } from "../models/SetupCommandOptions.js";
 import type { CommandExecutor } from "./CommandExecutor.js";
@@ -30,20 +31,20 @@ import type { SSLReader } from "./SSLReader.js";
 /**
  * Setup command execution implementation class.
  */
-export declare class SetupCommandExecutor implements CommandExecutor {
+export declare class SetupCommandExecutor implements CommandExecutor<SetupCommandOptions> {
     private readonly _preferences;
     private readonly _sslReader;
     private readonly _analyticsService;
     private readonly _logger;
     /**
      * Instantiate {@link SetupCommandExecutor}.
-     * @param preferences - {@link Preferences} reference.
+     * @param preferences - {@link UserPreferences} reference.
      * @param sslReader - {@link SSLReader} reference.
      * @param analyticsService - {@link AnalyticsService} reference.
      * @param logger - {@link Logger} reference.
      * @returns Reference to a new {@link SetupCommandExecutor} instance.
      */
-    constructor(preferences: Preferences, sslReader: SSLReader, analyticsService: AnalyticsService, logger: Logger);
+    constructor(preferences: UserPreferences, sslReader: SSLReader, analyticsService: AnalyticsService, logger: Logger);
     /**
      * Setup self-signed SSL certificate and key by checking if user defined preferences
      * have SSL config data or if the user has already setup the certificates last time.

package/dist/app/SetupCommandExecutor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SetupCommandExecutor.d.ts","sourceRoot":"","sources":["../../src/app/SetupCommandExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAQpE,OAAO,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD;;GAEG;AACH,qBACa,oBAAqB,YAAW,eAAe;IACxD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;;;;;;OAOG;gBAEiC,WAAW,EAAE,WAAW,EAC9B,SAAS,EAAE,SAAS,EACJ,gBAAgB,EAAE,gBAAgB,EACjD,MAAM,EAAE,MAAM;IAQ7C;;;;;;;OAOG;IACG,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;YA2C5C,kBAAkB;YA0BlB,iBAAiB;YAejB,sBAAsB;YAgBtB,kBAAkB;YA+DlB,kBAAkB;IAkChC,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;CAG/B"}
+{"version":3,"file":"SetupCommandExecutor.d.ts","sourceRoot":"","sources":["../../src/app/SetupCommandExecutor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAgC,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAOzF,OAAO,kBAAkB,CAAC;AAI1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAE5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD;;GAEG;AACH,qBACa,oBAAqB,YAAW,eAAe,CAAC,mBAAmB,CAAC;IAC7E,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAkB;IAC/C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IAEjC;;;;;;;OAOG;gBAEqC,WAAW,EAAE,eAAe,EACtC,SAAS,EAAE,SAAS,EACJ,gBAAgB,EAAE,gBAAgB,EACjD,MAAM,EAAE,MAAM;IAQ7C;;;;;;;OAOG;IACG,OAAO,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;YA2C5C,kBAAkB;YA0BlB,iBAAiB;YAejB,sBAAsB;YAgBtB,kBAAkB;YA+DlB,kBAAkB;IAkChC,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;CAG/B"}

package/dist/app/SetupCommandExecutor.js

@@ -23,7 +23,7 @@
  ********************************************************************************/
 import { __decorate, __metadata, __param } from "tslib";
 import { ITypes as IAnalyticsTypes } from "@adobe/ccweb-add-on-analytics";
-import { ITypes as ICoreTypes, isFile } from "@adobe/ccweb-add-on-core";
+import { ITypes as ICoreTypes, isFile, UserPreferences } from "@adobe/ccweb-add-on-core";
 import devcert from "@adobe/ccweb-add-on-devcert";
 import chalk from "chalk";
 import { inject, injectable } from "inversify";
@@ -34,7 +34,7 @@ import "reflect-metadata";
 import format from "string-template";
 import { AnalyticsErrorMarkers, AnalyticsSuccessMarkers } from "../AnalyticsMarkers.js";
 import { ITypes } from "../config/inversify.types.js";
-import { SSLRemoveOption, SSLSetupOption } from "../models/Types.js";
+import { SSLRemoveOption, SSLSetupOption } from "../models/SSLTypes.js";
 const MAX_PROMPT_RETRIES = 3;
 /**
  * Setup command execution implementation class.
@@ -46,7 +46,7 @@ let SetupCommandExecutor = class SetupCommandExecutor {
     _logger;
     /**
      * Instantiate {@link SetupCommandExecutor}.
-     * @param preferences - {@link Preferences} reference.
+     * @param preferences - {@link UserPreferences} reference.
      * @param sslReader - {@link SSLReader} reference.
      * @param analyticsService - {@link AnalyticsService} reference.
      * @param logger - {@link Logger} reference.
@@ -81,16 +81,16 @@ let SetupCommandExecutor = class SetupCommandExecutor {
             initial: 0
         });
         if (!response || !response.sslSetupType) {
-            this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_SETUP, LOGS.sslSetupOptionNotSpecified, false);
+            void this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_SETUP, LOGS.sslSetupOptionNotSpecified, false);
             return process.exit(1);
         }
         if (response.sslSetupType === SSLSetupOption.Manually) {
             await this._setupSSLManually(options.hostname);
-            this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_MANUAL_SETUP, options.hostname, true);
+            void this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_MANUAL_SETUP, options.hostname, true);
         }
         else {
             await this._setupSSLAutomatically(options.hostname);
-            this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_AUTOMATIC_SETUP, options.hostname, true);
+            void this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_AUTOMATIC_SETUP, options.hostname, true);
         }
     }
     async _shouldSetupNewSSL(options) {
@@ -150,7 +150,7 @@ let SetupCommandExecutor = class SetupCommandExecutor {
         });
         // If no response is obtained, which indicates something has gone wrong, then exit.
         if (!response || !response.shouldRemove) {
-            this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_REMOVE, LOGS.sslRemoveOptionNotSpecified, false);
+            void this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_REMOVE, LOGS.sslRemoveOptionNotSpecified, false);
             return process.exit(1);
         }
         // If the user chooses to keep the existing SSL, do not set up a new SSL.
@@ -163,7 +163,7 @@ let SetupCommandExecutor = class SetupCommandExecutor {
             const userPreference = this._preferences.get();
             userPreference.ssl.delete(options.hostname);
             this._preferences.set(userPreference);
-            this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_MANUAL_REMOVE, options.hostname, true);
+            void this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_MANUAL_REMOVE, options.hostname, true);
         }
         if (isWxpSSL) {
             if (devcert.caExpiryInDays() <= 0) {
@@ -172,7 +172,7 @@ let SetupCommandExecutor = class SetupCommandExecutor {
             else {
                 await devcert.removeDomain(options.hostname);
             }
-            this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_AUTOMATIC_REMOVE, options.hostname, true);
+            void this._analyticsService.postEvent(AnalyticsSuccessMarkers.SUCCESSFUL_SSL_AUTOMATIC_REMOVE, options.hostname, true);
         }
         this._logger.success(LOGS.removedExistingSSL, { prefix: LOGS.newLine, postfix: LOGS.newLine });
         return true;
@@ -200,7 +200,7 @@ let SetupCommandExecutor = class SetupCommandExecutor {
             maxTries--;
             this._logger.error(format(LOGS.invalidPathSpecified, { asset }));
         }
-        this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_SETUP, format(LOGS.invalidPathSpecified, { asset }), false);
+        void this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_SETUP, format(LOGS.invalidPathSpecified, { asset }), false);
         return process.exit(1);
     }
     _promptMessage(message) {
@@ -212,11 +212,11 @@ let SetupCommandExecutor = class SetupCommandExecutor {
 };
 SetupCommandExecutor = __decorate([
     injectable(),
-    __param(0, inject(ICoreTypes.Preferences)),
+    __param(0, inject(ICoreTypes.UserPreferences)),
     __param(1, inject(ITypes.SSLReader)),
     __param(2, inject(IAnalyticsTypes.AnalyticsService)),
     __param(3, inject(ICoreTypes.Logger)),
-    __metadata("design:paramtypes", [Object, Object, Object, Object])
+    __metadata("design:paramtypes", [UserPreferences, Function, Function, Object])
 ], SetupCommandExecutor);
 export { SetupCommandExecutor };
 const LOGS = {

package/dist/app/index.d.ts

@@ -21,9 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-export * from "./CommandExecutor.js";
+export type * from "./CommandExecutor.js";
 export * from "./PurgeCommandExecutor.js";
 export * from "./SetupCommandExecutor.js";
 export * from "./SSLReader.js";
-export * from "./WxpSSLReader.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/app/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,cAAc,sBAAsB,CAAC;AACrC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/app/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,mBAAmB,sBAAsB,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC"}

package/dist/app/index.js

@@ -21,9 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-export * from "./CommandExecutor.js";
 export * from "./PurgeCommandExecutor.js";
 export * from "./SetupCommandExecutor.js";
 export * from "./SSLReader.js";
-export * from "./WxpSSLReader.js";
 //# sourceMappingURL=index.js.map

package/dist/commands/purge.js

@@ -49,7 +49,7 @@ export class Purge extends BaseCommand {
         await this._commandExecutor.execute();
     }
     async catch(error) {
-        this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_PURGE, error.message, false);
+        void this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_PURGE, error.message, false);
         throw error;
     }
 }

package/dist/commands/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,EAAE,WAAW,EAAc,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAEnG,OAAO,kBAAkB,CAAC;AAQ1B;;GAEG;AACH,qBAAa,KAAM,SAAQ,WAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmB;IACrD,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAkB;IAEnD,MAAM,CAAC,WAAW,SAAoE;IAEtF,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,KAAK,EAAE;QACV,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5C,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;KACrC,CAaC;gBAEU,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM;IAOpC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpB,KAAK,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAIzD"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,OAAO,EAAE,WAAW,EAAc,MAAM,+BAA+B,CAAC;AAExE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,sCAAsC,CAAC;AAEnG,OAAO,kBAAkB,CAAC;AAQ1B;;GAEG;AACH,qBAAa,KAAM,SAAQ,WAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAuC;IAExE,MAAM,CAAC,WAAW,SAAoE;IAEtF,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,KAAK,EAAE;QACV,QAAQ,EAAE,UAAU,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;QAC5C,WAAW,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;KACrC,CAaC;gBAEU,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM;IAapC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBpB,KAAK,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAIzD"}

package/dist/commands/setup.js

@@ -68,7 +68,7 @@ export class Setup extends BaseCommand {
         await this._commandExecutor.execute(options);
     }
     async catch(error) {
-        this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_SETUP, error.message, false);
+        void this._analyticsService.postEvent(AnalyticsErrorMarkers.ERROR_SSL_SETUP, error.message, false);
         throw error;
     }
 }

package/dist/config/inversify.config.d.ts

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-import { Container } from "inversify";
+import type { Container } from "inversify";
 import "reflect-metadata";
 declare const container: Container;
 export { container as IContainer };

package/dist/config/inversify.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inversify.config.d.ts","sourceRoot":"","sources":["../../src/config/inversify.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAGlF,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,kBAAkB,CAAC;AAO1B,QAAA,MAAM,SAAS,EAAE,SAA0B,CAAC;AAsB5C,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,CAAC"}
+{"version":3,"file":"inversify.config.d.ts","sourceRoot":"","sources":["../../src/config/inversify.config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAGlF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAC3C,OAAO,kBAAkB,CAAC;AAU1B,QAAA,MAAM,SAAS,EAAE,SAA0B,CAAC;AAsB5C,OAAO,EAAE,SAAS,IAAI,UAAU,EAAE,CAAC"}

package/dist/config/inversify.config.js

@@ -23,8 +23,10 @@
  ********************************************************************************/
 import { IContainer as ICoreContainer } from "@adobe/ccweb-add-on-core";
 import "reflect-metadata";
-import { PurgeCommandExecutor, SetupCommandExecutor, WxpSSLReader } from "../app/index.js";
-import { SetupCommandValidator } from "../validators/index.js";
+import { PurgeCommandExecutor } from "../app/PurgeCommandExecutor.js";
+import { SetupCommandExecutor } from "../app/SetupCommandExecutor.js";
+import { SSLReader } from "../app/SSLReader.js";
+import { SetupCommandValidator } from "../validators/SetupCommandValidator.js";
 import { ITypes } from "./inversify.types.js";
 const container = ICoreContainer;
 container
@@ -42,6 +44,6 @@ container
     .to(SetupCommandValidator)
     .inSingletonScope()
     .whenTargetNamed("setup");
-container.bind(ITypes.SSLReader).to(WxpSSLReader).inSingletonScope();
+container.bind(ITypes.SSLReader).to(SSLReader).inSingletonScope();
 export { container as IContainer };
 //# sourceMappingURL=inversify.config.js.map

package/dist/models/{Types.d.ts → SSLTypes.d.ts}

@@ -21,11 +21,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  ********************************************************************************/
-import type { SetupCommandOptions } from "./SetupCommandOptions.js";
-/**
- * Union of supported command options.
- */
-export type CommandOptions = SetupCommandOptions;
 /**
  * SSL setup option.
  */
@@ -53,4 +48,4 @@ export type SSLData = {
      */
     key: string | Buffer;
 };
-//# sourceMappingURL=Types.d.ts.map
+//# sourceMappingURL=SSLTypes.d.ts.map

package/dist/models/SSLTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SSLTypes.d.ts","sourceRoot":"","sources":["../../src/models/SSLTypes.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF;;GAEG;AACH,oBAAY,cAAc;IACtB,aAAa,kBAAkB;IAC/B,QAAQ,aAAa;CACxB;AAED;;GAEG;AACH,oBAAY,eAAe;IACvB,MAAM,WAAW;IACjB,IAAI,SAAS;CAChB;AAED;;GAEG;AACH,MAAM,MAAM,OAAO,GAAG;IAClB;;OAEG;IACH,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAEtB;;OAEG;IACH,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACxB,CAAC"}

package/dist/models/{Types.js → SSLTypes.js}

@@ -37,4 +37,4 @@ export var SSLRemoveOption;
     SSLRemoveOption["Remove"] = "remove";
     SSLRemoveOption["Keep"] = "keep";
 })(SSLRemoveOption || (SSLRemoveOption = {}));
-//# sourceMappingURL=Types.js.map
+//# sourceMappingURL=SSLTypes.js.map

package/dist/models/index.d.ts

@@ -22,5 +22,5 @@
  * SOFTWARE.
  ********************************************************************************/
 export * from "./SetupCommandOptions.js";
-export * from "./Types.js";
+export * from "./SSLTypes.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/models/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,cAAc,0BAA0B,CAAC;AACzC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/models/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;kFAsBkF;AAElF,cAAc,0BAA0B,CAAC;AACzC,cAAc,eAAe,CAAC"}

package/dist/models/index.js

@@ -22,5 +22,5 @@
  * SOFTWARE.
  ********************************************************************************/
 export * from "./SetupCommandOptions.js";
-export * from "./Types.js";
+export * from "./SSLTypes.js";
 //# sourceMappingURL=index.js.map