@maka/maka-cli 5.7.0 → 5.9.0

package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.d.ts

@@ -0,0 +1,121 @@
+import type { Room, IRoomSpot } from '../models/room.js';
+import type { Player } from '../models/player.js';
+import { Direction } from '../types/shared/direction-enum.js';
+/**
+ * Intra-room locations ("at" spots -- player request: every room felt
+ * like everything stood at your elbow; walking into the bar had both
+ * NPCs on you instantly, and you could pick a lock from across the
+ * room). A room MAY declare named spots (door, bar, booths...); actors,
+ * items, and puzzles MAY be positioned at one.
+ *
+ * THE COMPAT RULE (sacred, two layers):
+ * 1. A room with NO spots is one implicit whole-room spot -- every
+ *    helper here short-circuits and behavior is exactly the pre-spots
+ *    game. Old seeds never set spots.
+ * 2. UNPOSITIONED = CIRCULATING: anything without an atSpot is
+ *    "anywhere in the room" -- it reaches everything and everything
+ *    reaches it, and it gets no cover. Companions, spirits, and
+ *    un-migrated NPCs can never strand. Only explicitly positioned
+ *    things gate.
+ *
+ * Spots are a MEAT-plane concept: a Matrix host has no barstools, and
+ * astral space overlays the room whole -- off-meat actors read as
+ * unpositioned.
+ *
+ * Every spot comparison in the game goes through these helpers -- no
+ * call site rolls its own.
+ */
+/** Movement distance between spots, scaled by the room's size. */
+export declare const SIZE_COST: Record<'small' | 'medium' | 'large', number>;
+export declare function spotsActive(room: Room | undefined): boolean;
+/**
+ * The IMPLICIT spot every spotted room has: the open floor. "move away"
+ * stands you here -- deliberately at none of the named places (player
+ * request: "I don't want to be at the door, bar, booths, or back
+ * corner"). It is a REAL position, not the circulating compat state:
+ * you don't reach the bar from out here, and an NPC who wants you
+ * steps onto the open floor too -- that's where you both are. No cover,
+ * always visible: standing apart has a price.
+ */
+export declare const OPEN_FLOOR = "open floor";
+/** Fuzzy-resolves a typed name ("booth") to a declared spot ("booths"),
+ * or "away"/"open floor"/"middle" to the implicit OPEN_FLOOR. */
+export declare function resolveSpot(room: Room | undefined, name: string): IRoomSpot | undefined;
+/**
+ * The actor's validated position: undefined when the room isn't
+ * spotted, the actor is off-meat, unpositioned, or names a spot the
+ * room no longer has (stale writes read as circulating, never as a
+ * phantom position).
+ */
+export declare function spotOf(actor: Player): string | undefined;
+/** Whether two actors share a spot (callers already gate same-room). */
+export declare function sameSpot(a: Player, b: Player): boolean;
+/** Whether an actor can reach a positioned thing (item/puzzle/exit). */
+export declare function canReach(actor: Player, targetSpot: string | undefined): boolean;
+export declare function moveCost(room: Room): number;
+/**
+ * The spot an exit is reachable from. Seed-declared (room.exitSpots)
+ * first; else a spot named like a doorway; else undefined = the exit is
+ * usable from anywhere (compat).
+ */
+export declare function exitSpot(room: Room, direction: Direction): string | undefined;
+/** Where an arrival through `direction` (the direction WALKED, from the
+ * far side) stands: at this room's matching exit spot; else the room's
+ * doorway-named spot; else its first spot (a positioned room always
+ * positions the arriving player -- that's what makes gating bite). */
+export declare function entrySpotFor(room: Room, arrivedFrom: Direction | undefined): string | undefined;
+/** One refusal voice for every spot gate -- always names the cure. */
+export declare function spotRefusal(targetLabel: string, spotName: string): string;
+/**
+ * Auto-move for object work (take/pick/hack/solve): out of combat you
+ * just walk over -- one narration line, no ceremony (the user's ask was
+ * that you CAN'T do it from across the room, not that you must type two
+ * commands). Mid-exchange nobody strolls: refuse like go.ts does, and
+ * the Phase-2 crossing machinery will make it cost instead.
+ */
+export declare function ensureAtSpot(actor: Player, targetSpot: string | undefined): {
+    line?: string;
+    refusal?: string;
+};
+export declare const SPOT_COLOR = "yellow";
+/**
+ * Weaves the room's places into its PROSE: every spot name already in
+ * the description gets the keyword color. When the full name isn't
+ * there, the spot's HEAD NOUN is tried next -- generated prose
+ * paraphrases ("stacked with crates" for the "stacked crates" spot),
+ * and coloring the noun the author actually wrote beats bolting a list
+ * onto good prose (playtest note: the "Also here:" tail didn't flow).
+ * Only places the prose never touches at all get appended, as a
+ * sentence in the game's voice.
+ */
+export declare function highlightSpots(room: Room, text: string): string;
+export declare const ACTOR_COLOR = "green";
+/**
+ * Colors the names of PRESENT, OBVIOUS people in a room's prose (player
+ * request: places got the keyword treatment; actual NPCs deserve one
+ * too). Only actors standing in the open are painted: coloring someone
+ * tucked behind cover would confirm a presence the Perception check is
+ * supposed to guard -- if stale prose names a hidden watcher, the text
+ * stays flat and gives nothing away. Tries the full name, then its
+ * distinctive words ("Krow" for "Mr. Krow").
+ */
+export declare function highlightActors(room: Room, text: string, viewer: Player): string;
+/**
+ * The compact who-stands-where line ('look' reads "You at the door,
+ * Patch at the bar, Old Cray at the booths (cover)"): OCCUPIED places
+ * only, viewer first, co-occupants grouped, circulating actors trailing.
+ *
+ * Casing the room is a PERCEPTION check (player ruling): pass the
+ * viewer's Observe-in-Detail hits and occupants tucked at cover-tagged
+ * spots need the RAW thresholds (p.135-136: Normal 2 for partial cover,
+ * Hidden 4 for good cover) or they're silently omitted -- the booth ate
+ * them. People in the open, at YOUR spot, or circulating are simply
+ * seen, no dice (a pedestrian in plain view isn't a test). Omit `hits`
+ * for the all-seeing form (NPC prompts -- residents know their room).
+ */
+export declare function whoIsWhereLine(room: Room, viewer: Player, hits?: number): string;
+/**
+ * The "who stands where" lines for the bare "move" list and NPC prompts:
+ *   door (you), bar -- Mama Wu, booths (cover)
+ */
+export declare function describeSpotRoster(room: Room, viewer?: Player): string[];

package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.js

@@ -0,0 +1,315 @@
+import { significantWords, wordsAreCloseEnough } from './fuzzy-match.js';
+import { hint } from './hints.js';
+/**
+ * Intra-room locations ("at" spots -- player request: every room felt
+ * like everything stood at your elbow; walking into the bar had both
+ * NPCs on you instantly, and you could pick a lock from across the
+ * room). A room MAY declare named spots (door, bar, booths...); actors,
+ * items, and puzzles MAY be positioned at one.
+ *
+ * THE COMPAT RULE (sacred, two layers):
+ * 1. A room with NO spots is one implicit whole-room spot -- every
+ *    helper here short-circuits and behavior is exactly the pre-spots
+ *    game. Old seeds never set spots.
+ * 2. UNPOSITIONED = CIRCULATING: anything without an atSpot is
+ *    "anywhere in the room" -- it reaches everything and everything
+ *    reaches it, and it gets no cover. Companions, spirits, and
+ *    un-migrated NPCs can never strand. Only explicitly positioned
+ *    things gate.
+ *
+ * Spots are a MEAT-plane concept: a Matrix host has no barstools, and
+ * astral space overlays the room whole -- off-meat actors read as
+ * unpositioned.
+ *
+ * Every spot comparison in the game goes through these helpers -- no
+ * call site rolls its own.
+ */
+/** Movement distance between spots, scaled by the room's size. */
+export const SIZE_COST = {
+    small: 1, medium: 2, large: 4,
+};
+export function spotsActive(room) {
+    return (room?.spots?.length ?? 0) > 0;
+}
+/**
+ * The IMPLICIT spot every spotted room has: the open floor. "move away"
+ * stands you here -- deliberately at none of the named places (player
+ * request: "I don't want to be at the door, bar, booths, or back
+ * corner"). It is a REAL position, not the circulating compat state:
+ * you don't reach the bar from out here, and an NPC who wants you
+ * steps onto the open floor too -- that's where you both are. No cover,
+ * always visible: standing apart has a price.
+ */
+export const OPEN_FLOOR = 'open floor';
+const OPEN_FLOOR_ALIASES = /^(away|apart|open floor|the floor|floor|middle|center|centre)$/i;
+/** Fuzzy-resolves a typed name ("booth") to a declared spot ("booths"),
+ * or "away"/"open floor"/"middle" to the implicit OPEN_FLOOR. */
+export function resolveSpot(room, name) {
+    if (!room || !spotsActive(room) || !name.trim())
+        return undefined;
+    const typed = name.trim().toLowerCase();
+    if (OPEN_FLOOR_ALIASES.test(typed))
+        return { name: OPEN_FLOOR };
+    const spots = room.spots ?? [];
+    const exact = spots.find(s => s.name.toLowerCase() === typed);
+    if (exact)
+        return exact;
+    const substr = spots.filter(s => s.name.toLowerCase().includes(typed) || typed.includes(s.name.toLowerCase()));
+    if (substr.length === 1)
+        return substr[0];
+    const typedWords = significantWords(typed);
+    const scored = spots.filter(s => significantWords(s.name.toLowerCase()).some(sw => typedWords.some(tw => wordsAreCloseEnough(tw, sw))));
+    return scored.length === 1 ? scored[0] : undefined;
+}
+/**
+ * The actor's validated position: undefined when the room isn't
+ * spotted, the actor is off-meat, unpositioned, or names a spot the
+ * room no longer has (stale writes read as circulating, never as a
+ * phantom position).
+ */
+export function spotOf(actor) {
+    const room = actor.currentLocation;
+    if (!spotsActive(room) || actor.plane !== 'meat' || !actor.atSpot)
+        return undefined;
+    if (actor.atSpot === OPEN_FLOOR)
+        return OPEN_FLOOR;
+    return room.spots.some(s => s.name === actor.atSpot) ? actor.atSpot : undefined;
+}
+/** Whether two actors share a spot (callers already gate same-room). */
+export function sameSpot(a, b) {
+    const room = a.currentLocation;
+    if (!spotsActive(room))
+        return true;
+    const sa = spotOf(a);
+    const sb = spotOf(b);
+    if (sa === undefined || sb === undefined)
+        return true; // circulating reaches everyone
+    return sa === sb;
+}
+/** Whether an actor can reach a positioned thing (item/puzzle/exit). */
+export function canReach(actor, targetSpot) {
+    if (targetSpot === undefined)
+        return true;
+    const room = actor.currentLocation;
+    if (!spotsActive(room))
+        return true;
+    const mine = spotOf(actor);
+    if (mine === undefined)
+        return true;
+    return mine === targetSpot;
+}
+export function moveCost(room) {
+    return SIZE_COST[room.size ?? 'medium'];
+}
+/**
+ * The spot an exit is reachable from. Seed-declared (room.exitSpots)
+ * first; else a spot named like a doorway; else undefined = the exit is
+ * usable from anywhere (compat).
+ */
+export function exitSpot(room, direction) {
+    if (!spotsActive(room))
+        return undefined;
+    const declared = room.exitSpots.get(direction);
+    if (declared && room.spots.some(s => s.name === declared))
+        return declared;
+    const doorish = room.spots.find(s => /door|entrance|entry|threshold|gate/i.test(s.name));
+    return doorish?.name;
+}
+/** Where an arrival through `direction` (the direction WALKED, from the
+ * far side) stands: at this room's matching exit spot; else the room's
+ * doorway-named spot; else its first spot (a positioned room always
+ * positions the arriving player -- that's what makes gating bite). */
+export function entrySpotFor(room, arrivedFrom) {
+    if (!spotsActive(room))
+        return undefined;
+    if (arrivedFrom !== undefined) {
+        const viaExit = exitSpot(room, room.getOppositeDirection(arrivedFrom));
+        if (viaExit)
+            return viaExit;
+    }
+    const doorish = room.spots.find(s => /door|entrance|entry|threshold|gate/i.test(s.name));
+    return doorish?.name ?? room.spots[0]?.name;
+}
+/** One refusal voice for every spot gate -- always names the cure. */
+export function spotRefusal(targetLabel, spotName) {
+    return `${targetLabel} is across the room at the ${spotName} -- "move to ${spotName}" first.`;
+}
+/**
+ * Auto-move for object work (take/pick/hack/solve): out of combat you
+ * just walk over -- one narration line, no ceremony (the user's ask was
+ * that you CAN'T do it from across the room, not that you must type two
+ * commands). Mid-exchange nobody strolls: refuse like go.ts does, and
+ * the Phase-2 crossing machinery will make it cost instead.
+ */
+export function ensureAtSpot(actor, targetSpot) {
+    if (canReach(actor, targetSpot))
+        return {};
+    if (actor.inExchange) {
+        return { refusal: `That's over at the ${targetSpot} -- and you're mid-exchange. Crossing open floor now means eating lead.` };
+    }
+    actor.atSpot = targetSpot;
+    actor.performAction('moves to', `the ${targetSpot}`);
+    return { line: `You cross to the ${targetSpot}.` };
+}
+// Place names render in this color wherever they appear -- the classic
+// MUD "interactive keyword" convention (player request: places should
+// live IN the room's prose, color-coded, not in a separate list).
+export const SPOT_COLOR = 'yellow';
+const hl = (name) => `{${SPOT_COLOR}-fg}${name}{/${SPOT_COLOR}-fg}`;
+/**
+ * Weaves the room's places into its PROSE: every spot name already in
+ * the description gets the keyword color. When the full name isn't
+ * there, the spot's HEAD NOUN is tried next -- generated prose
+ * paraphrases ("stacked with crates" for the "stacked crates" spot),
+ * and coloring the noun the author actually wrote beats bolting a list
+ * onto good prose (playtest note: the "Also here:" tail didn't flow).
+ * Only places the prose never touches at all get appended, as a
+ * sentence in the game's voice.
+ */
+export function highlightSpots(room, text) {
+    if (!spotsActive(room))
+        return text;
+    const missing = [];
+    let out = text;
+    const esc = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    // Longest first so "back corner" wins before "bar" ever could.
+    for (const s of [...room.spots].sort((a, b) => b.name.length - a.name.length)) {
+        const full = new RegExp(`\\b(${esc(s.name)})\\b`, 'i');
+        if (full.test(out)) {
+            out = out.replace(full, (m) => hl(m));
+            continue;
+        }
+        const noun = s.name.trim().split(/\s+/).pop();
+        // The noun fallback must not land inside an already-painted tag --
+        // require the match not be immediately followed by a closing tag.
+        const nounRe = new RegExp(`\\b(${esc(noun)})\\b(?!\\{/)`, 'i');
+        if (noun.length >= 3 && nounRe.test(out)) {
+            out = out.replace(nounRe, (m) => hl(m));
+        }
+        else {
+            missing.push(hl(s.name));
+        }
+    }
+    if (missing.length > 0) {
+        const named = missing.reverse().map(m => `the ${m}`);
+        const list = named.length === 1 ? named[0]
+            : `${named.slice(0, -1).join(', ')} and ${named[named.length - 1]}`;
+        out += ` Your eye picks out ${list}.`;
+    }
+    return out;
+}
+// People render in this color wherever prose names them -- green, the
+// color NPC speech already wears.
+export const ACTOR_COLOR = 'green';
+/**
+ * Colors the names of PRESENT, OBVIOUS people in a room's prose (player
+ * request: places got the keyword treatment; actual NPCs deserve one
+ * too). Only actors standing in the open are painted: coloring someone
+ * tucked behind cover would confirm a presence the Perception check is
+ * supposed to guard -- if stale prose names a hidden watcher, the text
+ * stays flat and gives nothing away. Tries the full name, then its
+ * distinctive words ("Krow" for "Mr. Krow").
+ */
+export function highlightActors(room, text, viewer) {
+    let out = text;
+    const esc = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const paint = (m) => `{${ACTOR_COLOR}-fg}${m}{/${ACTOR_COLOR}-fg}`;
+    for (const a of room.getActors()) {
+        if (a === viewer || !viewer.canPerceive(a))
+            continue;
+        // Obvious only: circulating, on the open floor, or at an untagged spot.
+        const s = spotOf(a);
+        if (s !== undefined && s !== OPEN_FLOOR) {
+            const covered = (room.spots ?? []).some(sp => sp.name === s && (sp.tags ?? []).some(t => t.startsWith('cover')));
+            if (covered)
+                continue;
+        }
+        const full = new RegExp(`\\b(${esc(a.name)})\\b`);
+        if (full.test(out)) {
+            out = out.replace(full, paint);
+            continue;
+        }
+        const word = a.name.split(/\s+/).filter(w => w.length >= 4).pop();
+        if (word) {
+            const wordRe = new RegExp(`\\b(${esc(word)})\\b(?!\\{/)`);
+            if (wordRe.test(out))
+                out = out.replace(wordRe, paint);
+        }
+    }
+    return out;
+}
+/**
+ * The compact who-stands-where line ('look' reads "You at the door,
+ * Patch at the bar, Old Cray at the booths (cover)"): OCCUPIED places
+ * only, viewer first, co-occupants grouped, circulating actors trailing.
+ *
+ * Casing the room is a PERCEPTION check (player ruling): pass the
+ * viewer's Observe-in-Detail hits and occupants tucked at cover-tagged
+ * spots need the RAW thresholds (p.135-136: Normal 2 for partial cover,
+ * Hidden 4 for good cover) or they're silently omitted -- the booth ate
+ * them. People in the open, at YOUR spot, or circulating are simply
+ * seen, no dice (a pedestrian in plain view isn't a test). Omit `hits`
+ * for the all-seeing form (NPC prompts -- residents know their room).
+ */
+export function whoIsWhereLine(room, viewer, hits) {
+    if (!spotsActive(room))
+        return '';
+    const actors = room.getActors().filter(a => a === viewer || viewer.canPerceive(a));
+    const viewerSpot = spotOf(viewer);
+    const parts = [];
+    for (const s of room.spots) {
+        let here = actors.filter(a => a.atSpot === s.name);
+        if (hits !== undefined && s.name !== viewerSpot) {
+            const covered = (s.tags ?? []).some(t => t.startsWith('cover'));
+            const threshold = (s.tags ?? []).includes('cover-good') ? 4 : covered ? 2 : 0;
+            if (threshold > 0 && hits < threshold) {
+                here = here.filter(a => a === viewer);
+            }
+        }
+        if (here.length === 0)
+            continue;
+        const names = here.map(a => a === viewer ? 'You' : a.name);
+        if (here.includes(viewer))
+            names.sort(n => n === 'You' ? -1 : 1);
+        const tags = [...new Set((s.tags ?? []).map(t => t.startsWith('cover') ? 'cover' : t))];
+        parts.push(`${names.join(' and ')} at the ${hl(s.name)}${tags.length > 0 ? ` (${tags.join(', ')})` : ''}`);
+    }
+    // The open floor: always visible (no cover out there), phrased "on",
+    // not "at" -- it's the neutral ground, not a fixture.
+    const onFloor = actors.filter(a => a.atSpot === OPEN_FLOOR);
+    if (onFloor.length > 0) {
+        const names = onFloor.map(a => a === viewer ? 'You' : a.name);
+        if (onFloor.includes(viewer))
+            names.sort(n => n === 'You' ? -1 : 1);
+        parts.push(`${names.join(' and ')} on the ${hl(OPEN_FLOOR)}`);
+    }
+    const drifting = actors.filter(a => a !== viewer && !a.atSpot && a.plane === 'meat');
+    if (drifting.length > 0)
+        parts.push(`${drifting.map(a => a.name).join(', ')} moving through`);
+    return parts.join(', ');
+}
+/**
+ * The "who stands where" lines for the bare "move" list and NPC prompts:
+ *   door (you), bar -- Mama Wu, booths (cover)
+ */
+export function describeSpotRoster(room, viewer) {
+    if (!spotsActive(room))
+        return [];
+    const actors = room.getActors();
+    const lines = room.spots.map(s => {
+        const here = actors.filter(a => a !== viewer && a.atSpot === s.name && (viewer ? viewer.canPerceive(a) : true)).map(a => a.name);
+        const you = viewer && spotOf(viewer) === s.name ? ['you'] : [];
+        const tags = (s.tags ?? []).map(t => t.startsWith('cover') ? 'cover' : t);
+        const tagNote = tags.length > 0 ? ` (${[...new Set(tags)].join(', ')})` : '';
+        const who = [...you, ...here];
+        return `${s.name}${tagNote}${who.length > 0 ? ` -- ${who.join(', ')}` : ''}`;
+    });
+    // The implicit neutral ground rides along ("move away" stands here).
+    const onFloor = [
+        ...(viewer && spotOf(viewer) === OPEN_FLOOR ? ['you'] : []),
+        ...actors.filter(a => a !== viewer && a.atSpot === OPEN_FLOOR && (viewer ? viewer.canPerceive(a) : true)).map(a => a.name),
+    ];
+    lines.push(`${OPEN_FLOOR}${hint(' ("move away")')}${onFloor.length > 0 ? ` -- ${onFloor.join(', ')}` : ''}`);
+    return lines;
+}
+//# sourceMappingURL=spots.js.map

package/bundle/typescript/src/commands/game/sideQuest/utilities/spots.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spots.js","sourceRoot":"","sources":["../../../../../../../src/commands/game/sideQuest/utilities/spots.ts"],"names":[],"mappings":"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"}

package/bundle/typescript/src/commands/ssl.js

@@ -73,23 +73,18 @@ Command.create({
                 Log.error(e);
                 return;
             }
-            const spinHandle = Log.withSpinner();
-            spinHandle.start('Verifying Letsencrypt configuration');
-            await SSH.ssh('sudo snap install core; sudo snap refresh core', {
-                ...sshConfig
-            });
-            await SSH.ssh('sudo snap install --classic certbot', {
-                ...sshConfig
-            });
-            await SSH.ssh('sudo ln -s /snap/bin/certbot /usr/bin/certbot', {
-                ...sshConfig
-            });
-            spinHandle.success();
             const domainNames = (configDomains) ? configDomains : await Actions.ask('[?] Domains to register: ');
             const emailUpdate = (configEmail) ? configEmail : await Actions.ask('Email to use for auto-updates: ');
-            await SSH.ssh('sudo certbot --nginx --agree-tos --expand -n --domains ' + domainNames + ' --email ' + emailUpdate, {
-                ...sshConfig
-            }, { verbose: true });
+            const spinHandle = Log.withSpinner();
+            spinHandle.start('Verifying Letsencrypt configuration and requesting certificate');
+            try {
+                await SSL.setupLetsEncrypt(sshConfig, { domains: domainNames, email: emailUpdate });
+            }
+            catch (e) {
+                spinHandle.failure();
+                throw e;
+            }
+            spinHandle.success();
             const letsEncryptConfig = {
                 domainNames,
                 emailUpdate

package/bundle/typescript/src/commands/ssl.js.map

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

package/bundle/typescript/src/templates/react/kit/mui/auth/password-reset/basic-password-reset-page.js.tsx

@@ -1,10 +1,9 @@
 import React, { useContext } from 'react';
 import { Container, Paper, Typography, TextField, Button } from '@mui/material';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router-dom';
 
-export const BasicPasswordResetPage = (props) => {
-  const { params = {} } = props;
-  const { token } = params;
+export const BasicPasswordResetPage = () => {
+  const { token } = useParams();
 
   const { resetPassword } = useContext(AuthContext);
   const navigate = useNavigate();

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.7.0",
+  "version": "5.9.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.",