@maka/maka-cli 5.6.0 → 5.8.0

package/bundle/typescript/src/tools/dotenvx/dotenvx.class.d.ts

@@ -0,0 +1,24 @@
+export declare class DOTENVX {
+    private static instance;
+    static getInstance(): DOTENVX;
+    /**
+     * Loads a process.env-style file into process.env. Drop-in replacement for
+     * dotenv.config({ path }) that also transparently decrypts the file if it
+     * was encrypted with dotenvx (using a sibling .env.keys file or a
+     * DOTENV_PRIVATE_KEY* environment variable).
+     */
+    load(filePath: string): void;
+    /**
+     * Sets a single KEY=value pair into a .env-style file, creating the file's
+     * keypair on first use if needed. Encrypted by default (matching encrypt());
+     * pass plain: true to write it unencrypted (used for the local environment).
+     */
+    set(key: string, value: string, filePath: string, opts?: {
+        plain?: boolean;
+    }): Promise<void>;
+    /**
+     * Reads and decrypts a single key's value from a .env-style file. Returns
+     * undefined if the key isn't set.
+     */
+    get(key: string, filePath: string): Promise<string | undefined>;
+}

package/bundle/typescript/src/tools/dotenvx/dotenvx.class.js

@@ -0,0 +1,66 @@
+// Dotenvx wrapper: loads (and transparently decrypts) process.env-style files,
+// and sets/gets individual secrets, encrypting on first use for non-local envs.
+import path from 'path';
+import dotenvxPkg from '@dotenvx/dotenvx';
+import { Log } from '../log/log.class.js';
+const { config: loadDotenvxConfig, set: setDotenvxValue, get: getDotenvxValue } = dotenvxPkg;
+const errorHandler = (caller, error) => {
+    if (process.env['MAKA_DEV'] === 'True') {
+        Log.error(`Error in ${caller}`);
+    }
+    if (error) {
+        console.error(error);
+    }
+};
+export class DOTENVX {
+    static instance;
+    static getInstance() {
+        if (!DOTENVX.instance) {
+            DOTENVX.instance = new DOTENVX();
+        }
+        return DOTENVX.instance;
+    }
+    /**
+     * Loads a process.env-style file into process.env. Drop-in replacement for
+     * dotenv.config({ path }) that also transparently decrypts the file if it
+     * was encrypted with dotenvx (using a sibling .env.keys file or a
+     * DOTENV_PRIVATE_KEY* environment variable).
+     */
+    load(filePath) {
+        try {
+            loadDotenvxConfig({ path: filePath, quiet: true });
+        }
+        catch (e) {
+            errorHandler('load()', e);
+        }
+    }
+    /**
+     * Sets a single KEY=value pair into a .env-style file, creating the file's
+     * keypair on first use if needed. Encrypted by default (matching encrypt());
+     * pass plain: true to write it unencrypted (used for the local environment).
+     */
+    async set(key, value, filePath, opts = {}) {
+        try {
+            const envKeysFile = path.join(path.dirname(filePath), '.env.keys');
+            await setDotenvxValue(key, value, { path: filePath, envKeysFile, encrypt: !opts.plain });
+        }
+        catch (e) {
+            errorHandler('set()', e);
+        }
+    }
+    /**
+     * Reads and decrypts a single key's value from a .env-style file. Returns
+     * undefined if the key isn't set.
+     */
+    async get(key, filePath) {
+        try {
+            const envKeysFile = path.join(path.dirname(filePath), '.env.keys');
+            return await getDotenvxValue(key, { path: filePath, envKeysFile });
+        }
+        catch (e) {
+            errorHandler('get()', e);
+            return undefined;
+        }
+    }
+}
+//# sourceMappingURL=dotenvx.class.js.map

package/bundle/typescript/src/tools/dotenvx/dotenvx.class.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dotenvx.class.js","sourceRoot":"","sources":["../../../../../src/tools/dotenvx/dotenvx.class.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,gFAAgF;AAChF,OAAO,IAAI,MAAM,MAAM,CAAC;AAExB,OAAO,UAAU,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAE1C,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,eAAe,EAAE,GAAG,UAAU,CAAC;AAE7F,MAAM,YAAY,GAAG,CAAC,MAAc,EAAE,KAAY,EAAE,EAAE;IACpD,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,MAAM,EAAE,CAAC;QACvC,GAAG,CAAC,KAAK,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QAEV,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC,CAAA;AAED,MAAM,OAAO,OAAO;IACV,MAAM,CAAC,QAAQ,CAAU;IAE1B,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;YACtB,OAAO,CAAC,QAAQ,GAAG,IAAI,OAAO,EAAE,CAAC;QACnC,CAAC;QACD,OAAO,OAAO,CAAC,QAAQ,CAAC;IAC1B,CAAC;IAED;;;;;OAKG;IACI,IAAI,CAAC,QAAgB;QAC1B,IAAI,CAAC;YACH,iBAAiB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,QAAgB,EAAE,OAA4B,EAAE;QAC3F,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;YACnE,MAAM,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3F,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IAED;;;OAGG;IACI,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,QAAgB;QAC5C,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,CAAC,CAAC;YACnE,OAAO,MAAM,eAAe,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACzB,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;CACF"}

package/bundle/typescript/src/tools/ssh/ssh.class.js

@@ -80,7 +80,7 @@ export class SSH {
         ]);
         // Control stdio based on `silentOutput`
         const stdioOption = silentOutput ? 'pipe' : 'inherit';
-        const result = spawnSync(`ssh`, args, { encoding: 'utf-8', stdio: [stdioOption, 'pipe', 'pipe'] });
+        const result = spawnSync(`ssh`, args, { encoding: 'utf-8', stdio: [stdioOption, stdioOption, stdioOption] });
         if (silentOutput) {
             return {
                 stdout: result.stdout || '',

package/bundle/typescript/src/tools/ssh/ssh.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssh.class.js","sourceRoot":"","sources":["../../../../../src/tools/ssh/ssh.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ssh.class.js","sourceRoot":"","sources":["../../../../../src/tools/ssh/ssh.class.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/tools/ssl/ssl.class.d.ts

@@ -1,3 +1,4 @@
+import { IDefaultProps } from '../ssh/ssh.interfaces.js';
 interface ISSLGenCSR {
     keyName: string;
     csrName: string;
@@ -10,8 +11,15 @@ interface ISSLGenSSC {
     cwd?: string;
     useConfig?: boolean;
 }
+interface ILetsEncryptSetup {
+    domains: string;
+    email: string;
+    retries?: number;
+    retryDelayMs?: number;
+}
 export declare class SSL {
     static genCSR(opts: ISSLGenCSR): void;
     static genSSC(opts: ISSLGenSSC): void;
+    static setupLetsEncrypt(sshConfig: IDefaultProps, opts: ILetsEncryptSetup): Promise<void>;
 }
 export {};

package/bundle/typescript/src/tools/ssl/ssl.class.js

@@ -1,4 +1,19 @@
 import { spawnSync } from 'child_process';
+import { SSH } from '../ssh/ssh.class.js';
+import { Log } from '../log/log.class.js';
+// Errors that mean "already in the desired state" rather than a real failure -
+// these commands are re-run on every deploy/ssl invocation and aren't idempotent
+// on their own.
+const LETSENCRYPT_IGNORE_ERRORS = [
+    'snap "core" is already installed',
+    'snap "core" has no updates available',
+    'snap "certbot" is already installed',
+    "ln: failed to create symbolic link '/usr/bin/certbot': File exists",
+    'Certificate not yet due for renewal'
+];
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
 export class SSL {
     static genCSR(opts) {
         const cwd = (opts.cwd) ? opts.cwd : process.cwd();
@@ -50,5 +65,43 @@ export class SSL {
             spawnSync('openssl', args, { stdio: 'inherit', cwd });
         }
     }
+    // Installs certbot via snap and obtains/renews a cert with the nginx plugin.
+    // Shared by `maka ssl --env <env> letsencrypt` and `maka deploy:ubuntu --letsencrypt`
+    // so both paths behave identically and stay idempotent on re-runs.
+    static async setupLetsEncrypt(sshConfig, opts) {
+        const retries = opts.retries ?? 3;
+        const retryDelayMs = opts.retryDelayMs ?? 15000;
+        function run(command) {
+            const result = SSH.sshSync(command, sshConfig, { silentOutput: true });
+            if (!result) {
+                throw new Error(`No result received from command: ${command}`);
+            }
+            const shouldIgnore = LETSENCRYPT_IGNORE_ERRORS.some(err => result.stderr.includes(err));
+            if (result.status !== 0 && !shouldIgnore) {
+                throw new Error(`Command failed (status ${result.status}): ${command}\n${(result.stderr || result.stdout).trim()}`);
+            }
+        }
+        // On a freshly-booted Ubuntu host, snapd may not have finished seeding yet;
+        // `snap install` fails with "too early for operation" if it's not waited for.
+        run('sudo snap wait system seed.loaded');
+        run('sudo snap install core; sudo snap refresh core');
+        run('sudo snap install --classic certbot');
+        run('sudo ln -s /snap/bin/certbot /usr/bin/certbot');
+        const certbotCmd = `sudo certbot --nginx --agree-tos --expand -n --domains ${opts.domains} --email ${opts.email}`;
+        for (let attempt = 1; attempt <= retries; attempt++) {
+            try {
+                run(certbotCmd);
+                return;
+            }
+            catch (e) {
+                const isLastAttempt = attempt === retries;
+                if (isLastAttempt)
+                    throw e;
+                Log.warn(`Certbot attempt ${attempt}/${retries} failed, retrying in ${retryDelayMs / 1000}s (DNS may still be propagating, or a firewall rule hasn't taken effect yet):`);
+                Log.warn(String(e instanceof Error ? e.message : e));
+                await sleep(retryDelayMs);
+            }
+        }
+    }
 }
 //# sourceMappingURL=ssl.class.js.map

package/bundle/typescript/src/tools/ssl/ssl.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"ssl.class.js","sourceRoot":"","sources":["../../../../../src/tools/ssl/ssl.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAgB1C,MAAM,OAAO,GAAG;IACP,MAAM,CAAC,MAAM,CAAC,IAAgB;QACnC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAElD,MAAM,IAAI,GAAG;YACX,KAAK;YACL,MAAM;YACN,SAAS;YACT,UAAU;YACV,QAAQ;YACR,SAAS;YACT,IAAI,CAAC,OAAO;YACZ,MAAM;YACN,IAAI,CAAC,OAAO;SACb,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;QAED,uEAAuE;QACvE,yBAAyB;QACzB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,MAAM,CAAC,IAAgB;QACnC,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAElD,MAAM,IAAI,GAAG;YACX,KAAK;YACL,OAAO;YACP,MAAM;YACN,MAAM;YACN,IAAI,CAAC,OAAO;YACZ,MAAM;YACN,IAAI,CAAC,OAAO;SACb,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC5B,CAAC;QAED,uEAAuE;QACvE,yBAAyB;QACzB,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"ssl.class.js","sourceRoot":"","sources":["../../../../../src/tools/ssl/ssl.class.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.6.0",
+  "version": "5.8.0",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",
@@ -40,6 +40,7 @@
     "@aws-sdk/client-ecr": "^3.1111.0",
     "@aws-sdk/client-route-53": "^3.1111.0",
     "@aws-sdk/client-route-53-domains": "^3.1111.0",
+    "@dotenvx/dotenvx": "^2.21.0",
     "@inquirer/prompts": "^8.5.2",
     "@maka/tar": "^6.2.2",
     "blessed": "^0.1.81",
@@ -49,7 +50,6 @@
     "cli-table": "^0.3.11",
     "cross-spawn": "^7.0.6",
     "date-fns": "^4.1.0",
-    "dotenv": "^17.4.2",
     "ejs": "^6.0.1",
     "elegant-spinner": "^3.0.0",
     "http-proxy": "^1.18.1",