hereya-cli 0.89.1 → 0.91.0

package/dist/lib/executor-start/format.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Workspaces look like `org/name`, which is not filesystem-safe. The
+ * write-side in `app deploy --local` (commands/app/deploy/index.ts) MUST use
+ * the same sanitization.
+ */
+export declare function sanitizeWorkspaceForFilename(workspace: string): string;
+/**
+ * Strip credentials from log strings before flushing them to the cloud.
+ * Removes:
+ *   - any occurrence of the actual hereyaGitPassword value
+ *   - userinfo from URLs (https://user:pass@host -> https://host)
+ */
+export declare function redactCredentials(str: string, password?: string): string;

package/dist/lib/executor-start/format.js

@@ -0,0 +1,22 @@
+/**
+ * Workspaces look like `org/name`, which is not filesystem-safe. The
+ * write-side in `app deploy --local` (commands/app/deploy/index.ts) MUST use
+ * the same sanitization.
+ */
+export function sanitizeWorkspaceForFilename(workspace) {
+    return workspace.replaceAll('/', '-');
+}
+/**
+ * Strip credentials from log strings before flushing them to the cloud.
+ * Removes:
+ *   - any occurrence of the actual hereyaGitPassword value
+ *   - userinfo from URLs (https://user:pass@host -> https://host)
+ */
+export function redactCredentials(str, password) {
+    let out = str;
+    if (password) {
+        out = out.split(password).join('[REDACTED]');
+    }
+    out = out.replaceAll(/(https?:\/\/|git:\/\/)([^/\s@]+@)/g, '$1');
+    return out;
+}

package/dist/lib/executor-start/job-dispatch.d.ts

@@ -0,0 +1,15 @@
+import { CloudBackend } from '../../backend/cloud/cloud-backend.js';
+import { LocalExecutor } from '../../executor/local.js';
+export interface JobDispatchHooks {
+    log(msg: string): void;
+    warn(msg: string): void;
+}
+/**
+ * Dispatches a single job to the right handler, with periodic log flushing
+ * and heartbeating to the cloud. Errors are caught and reported as failed jobs.
+ */
+export declare function dispatchJob(job: {
+    id: string;
+    payload: any;
+    type: string;
+}, executor: LocalExecutor, cloudBackend: CloudBackend, hooks: JobDispatchHooks): Promise<void>;

package/dist/lib/executor-start/job-dispatch.js

@@ -0,0 +1,89 @@
+import { executeAppJob } from './execute-app-job.js';
+import { executeDeployJob } from './execute-deploy-job.js';
+import { executeInitJob } from './execute-init-job.js';
+/**
+ * Dispatches a single job to the right handler, with periodic log flushing
+ * and heartbeating to the cloud. Errors are caught and reported as failed jobs.
+ */
+export async function dispatchJob(job, executor, cloudBackend, hooks) {
+    let logBuffer = '';
+    const logInterval = setInterval(async () => {
+        if (logBuffer) {
+            const logs = logBuffer;
+            logBuffer = '';
+            try {
+                await cloudBackend.updateExecutorJob({ jobId: job.id, logs });
+            }
+            catch {
+                // log flush errors are non-fatal
+            }
+        }
+    }, 10_000);
+    const heartbeatInterval = setInterval(async () => {
+        try {
+            await cloudBackend.updateExecutorJob({ jobId: job.id });
+        }
+        catch {
+            // heartbeat errors are non-fatal
+        }
+    }, 30_000);
+    const logger = {
+        debug(msg) {
+            logBuffer += msg + '\n';
+        },
+        error(msg) {
+            logBuffer += msg + '\n';
+        },
+        info(msg) {
+            logBuffer += msg + '\n';
+        },
+    };
+    const finalize = async (result, label) => {
+        clearInterval(logInterval);
+        clearInterval(heartbeatInterval);
+        await cloudBackend.updateExecutorJob({
+            jobId: job.id,
+            logs: logBuffer,
+            result,
+            status: result.success ? 'completed' : 'failed',
+        });
+        hooks.log(`Job ${job.id} ${result.success ? 'completed' : 'failed'}${label ? ` (${label})` : ''}`);
+    };
+    try {
+        if (job.type === 'resolve-env') {
+            const resolved = await executor.resolveEnvValues(job.payload);
+            await finalize({ env: resolved, success: true }, 'resolve-env');
+            return;
+        }
+        if (job.type === 'deploy' || job.type === 'undeploy') {
+            const deployResult = await executeDeployJob(job, executor, cloudBackend, logger);
+            await finalize(deployResult, job.type);
+            return;
+        }
+        if (job.type === 'init') {
+            const initResult = await executeInitJob(job, executor, logger);
+            await finalize(initResult, 'init');
+            return;
+        }
+        if (job.type === 'app-deploy' || job.type === 'app-destroy') {
+            const appJobResult = await executeAppJob(job, cloudBackend, logger);
+            await finalize(appJobResult, job.type);
+            return;
+        }
+        const result = job.type === 'provision'
+            ? await executor.provision({ ...job.payload, logger })
+            : await executor.destroy({ ...job.payload, logger });
+        await finalize(result, '');
+    }
+    catch (error) {
+        clearInterval(logInterval);
+        clearInterval(heartbeatInterval);
+        await cloudBackend.updateExecutorJob({
+            jobId: job.id,
+            logs: logBuffer + `\nError: ${error.message}\n`,
+            result: { reason: error.message, success: false },
+            status: 'failed',
+        });
+        hooks.warn(`Job ${job.id} failed: ${error.message}`);
+    }
+}

package/dist/lib/package/index.d.ts

@@ -37,20 +37,20 @@ export declare const ParameterSpec: z.ZodEffects<z.ZodObject<{
     description: z.ZodOptional<z.ZodString>;
     mandatory: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
-    description?: string | undefined;
     default?: string | undefined;
+    description?: string | undefined;
     mandatory?: boolean | undefined;
 }, {
-    description?: string | undefined;
     default?: string | undefined;
+    description?: string | undefined;
     mandatory?: boolean | undefined;
 }>, {
-    description?: string | undefined;
     default?: string | undefined;
+    description?: string | undefined;
     mandatory?: boolean | undefined;
 }, {
-    description?: string | undefined;
     default?: string | undefined;
+    description?: string | undefined;
     mandatory?: boolean | undefined;
 }>;
 export type IParameterSpec = z.infer<typeof ParameterSpec>;
@@ -79,42 +79,37 @@ export declare const PackageMetadata: z.ZodObject<{
         description: z.ZodOptional<z.ZodString>;
         mandatory: z.ZodOptional<z.ZodDefault<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }>, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }>>>, Record<string, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }> | undefined, Record<string, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }> | undefined>;
     snakeCase: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    infra: InfrastructureType;
     iac: IacType;
-    dependencies?: Record<string, string> | undefined;
-    kind?: "package" | "app" | undefined;
-    parameters?: Record<string, {
-        description?: string | undefined;
-        default?: string | undefined;
-        mandatory?: boolean | undefined;
-    }> | undefined;
+    infra: InfrastructureType;
+    kind?: "app" | "package" | undefined;
     deploy?: boolean | undefined;
+    dependencies?: Record<string, string> | undefined;
     devDeploy?: boolean | undefined;
     inputs?: Record<string, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">> | undefined;
     onDeploy?: {
@@ -123,18 +118,18 @@ export declare const PackageMetadata: z.ZodObject<{
     } | undefined;
     originalInfra?: InfrastructureType | undefined;
     outputs?: Record<string, z.objectOutputType<{}, z.ZodTypeAny, "passthrough">> | undefined;
-    snakeCase?: boolean | undefined;
-}, {
-    infra: InfrastructureType;
-    iac: IacType;
-    dependencies?: Record<string, string> | undefined;
-    kind?: "package" | "app" | undefined;
     parameters?: Record<string, {
-        description?: string | undefined;
         default?: string | undefined;
+        description?: string | undefined;
         mandatory?: boolean | undefined;
     }> | undefined;
+    snakeCase?: boolean | undefined;
+}, {
+    iac: IacType;
+    infra: InfrastructureType;
+    kind?: "app" | "package" | undefined;
     deploy?: boolean | undefined;
+    dependencies?: Record<string, string> | undefined;
     devDeploy?: boolean | undefined;
     inputs?: Record<string, z.objectInputType<{}, z.ZodTypeAny, "passthrough">> | undefined;
     onDeploy?: {
@@ -143,6 +138,11 @@ export declare const PackageMetadata: z.ZodObject<{
     } | undefined;
     originalInfra?: InfrastructureType | undefined;
     outputs?: Record<string, z.objectInputType<{}, z.ZodTypeAny, "passthrough">> | undefined;
+    parameters?: Record<string, {
+        default?: string | undefined;
+        description?: string | undefined;
+        mandatory?: boolean | undefined;
+    }> | undefined;
     snakeCase?: boolean | undefined;
 }>;
 export type IPackageMetadata = z.infer<typeof PackageMetadata>;

package/oclif.manifest.json

@@ -2018,6 +2018,14 @@
           "multiple": false,
           "type": "option"
         },
+        "idleTimeout": {
+          "char": "i",
+          "description": "seconds idle before exit; omit to keep running indefinitely",
+          "name": "idleTimeout",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
           "description": "name of the workspace to poll jobs for",
@@ -3161,7 +3169,7 @@
     "workspace:executor:install": {
       "aliases": [],
       "args": {},
-      "description": "Install a remote executor into a workspace",
+      "description": "Install a remote executor into a workspace.\n\nTwo modes are supported:\n  - ephemeral (default): provisions hereya/aws-executor-broker (Lambda + on-demand EC2).\n  - always-on: provisions hereya/remote-executor-aws (legacy always-on EC2).",
       "flags": {
         "debug": {
           "description": "enable debug mode",
@@ -3176,6 +3184,26 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "mode": {
+          "description": "executor mode: ephemeral (Lambda + on-demand EC2) or always-on (legacy)",
+          "name": "mode",
+          "default": "ephemeral",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "ephemeral",
+            "always-on"
+          ],
+          "type": "option"
+        },
+        "parameter": {
+          "char": "p",
+          "description": "parameter for the package, in the form of 'key=value'. Can be specified multiple times.",
+          "name": "parameter",
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
           "description": "name of the workspace",
@@ -3240,7 +3268,7 @@
     "workspace:executor:uninstall": {
       "aliases": [],
       "args": {},
-      "description": "Uninstall the remote executor from a workspace",
+      "description": "Uninstall the remote executor from a workspace.\n\nThe --mode flag must match the mode used at install time (default: ephemeral).",
       "flags": {
         "debug": {
           "description": "enable debug mode",
@@ -3248,6 +3276,18 @@
           "allowNo": false,
           "type": "boolean"
         },
+        "mode": {
+          "description": "executor mode used at install time",
+          "name": "mode",
+          "default": "ephemeral",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "ephemeral",
+            "always-on"
+          ],
+          "type": "option"
+        },
         "workspace": {
           "char": "w",
           "description": "name of the workspace",
@@ -3277,5 +3317,5 @@
       ]
     }
   },
-  "version": "0.89.1"
+  "version": "0.91.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hereya-cli",
   "description": "Infrastructure as Package",
-  "version": "0.89.1",
+  "version": "0.91.0",
   "author": "Hereya Developers",
   "bin": {
     "hereya": "./bin/run.js"