veryfront 0.1.128 → 0.1.129

package/src/src/workflow/worker/dynamic-job-entrypoint.ts

@@ -27,16 +27,19 @@
 
 import { logger as baseLogger } from "../../utils/index.js";
 import { getEnv } from "../../platform/compat/process.js";
-import { env as getProcessEnv } from "../../platform/compat/process.js";
-import { runWithRequestContext } from "../../platform/adapters/fs/veryfront/multi-project-adapter.js";
 import { enhanceAdapterWithFS } from "../../platform/adapters/fs/integration.js";
 import { denoAdapter } from "../../platform/adapters/runtime/deno/index.js";
-import { mergeInjectedWorkflowEnv } from "../../jobs/runtime-env.js";
 import { discoverWorkflows } from "../discovery/index.js";
 import type { VeryfrontConfig } from "../../config/index.js";
 import type { WorkflowBackend } from "../backends/types.js";
 import { WorkflowExecutor } from "../executor/workflow-executor.js";
-import type { CapturedTenantContext } from "../types.js";
+import {
+  failRunExecution,
+  getFinalRunExitCode,
+  getTenantFromEnv,
+  hydrateRunContextEnv,
+  runWithTenantContext,
+} from "./shared.js";
 
 const logger = baseLogger.component("dynamic-job");
 
@@ -62,26 +65,6 @@ export interface DynamicJobEntrypointConfig {
   debug?: boolean;
 }
 
-/**
- * Get tenant context from environment variables
- */
-function getTenantFromEnv(): CapturedTenantContext | undefined {
-  const projectSlug = getEnv("TENANT_PROJECT_SLUG");
-  const token = getEnv("TENANT_TOKEN");
-
-  if (!projectSlug || !token) {
-    return undefined;
-  }
-
-  return {
-    projectSlug,
-    token,
-    projectId: getEnv("TENANT_PROJECT_ID"),
-    productionMode: getEnv("TENANT_PRODUCTION_MODE") === "1",
-    releaseId: getEnv("TENANT_RELEASE_ID") || undefined,
-  };
-}
-
 /**
  * Run a workflow job with dynamic discovery
  *
@@ -117,21 +100,7 @@ export async function runDynamicWorkflowJob(
       return DYNAMIC_EXIT_CODES.NOT_FOUND;
     }
 
-    const injectedEnv = mergeInjectedWorkflowEnv(run.context.env, getProcessEnv());
-    if (injectedEnv) {
-      const currentEnv = run.context.env;
-      const currentSerialized = currentEnv ? JSON.stringify(currentEnv) : "";
-      const nextSerialized = JSON.stringify(injectedEnv);
-      if (currentSerialized !== nextSerialized) {
-        await backend.updateRun(runId, {
-          context: {
-            ...run.context,
-            env: injectedEnv,
-          },
-        });
-        run = (await backend.getRun(runId)) ?? run;
-      }
-    }
+    run = await hydrateRunContextEnv(backend, runId, run);
 
     // Get tenant context (from env or from stored run)
     const tenant = getTenantFromEnv() ?? run._tenant;
@@ -147,14 +116,8 @@ export async function runDynamicWorkflowJob(
     }
 
     // Execute with tenant context
-    return await runWithRequestContext(
-      {
-        projectSlug: tenant.projectSlug,
-        token: tenant.token,
-        projectId: tenant.projectId,
-        productionMode: tenant.productionMode,
-        releaseId: tenant.releaseId,
-      },
+    return await runWithTenantContext(
+      tenant,
       async () => {
         // Set up FS adapter with Veryfront API backend
         const apiUrl = getEnv("VERYFRONT_API_URL") || "https://api.veryfront.com";
@@ -227,44 +190,15 @@ export async function runDynamicWorkflowJob(
         // Execute the workflow
         try {
           await executor.resume(runId);
-
-          const finalRun = await backend.getRun(runId);
-          const status = finalRun?.status;
-
-          switch (status) {
-            case "completed":
-              if (debug) {
-                logger.info(`Workflow completed successfully: ${runId}`);
-              }
-              return DYNAMIC_EXIT_CODES.SUCCESS;
-
-            case "failed":
-              logger.error(`Workflow failed: ${runId}`, finalRun?.error);
-              return DYNAMIC_EXIT_CODES.WORKFLOW_FAILED;
-
-            case "waiting":
-              if (debug) {
-                logger.info(`Workflow paused (waiting): ${runId}`);
-              }
-              return DYNAMIC_EXIT_CODES.SUCCESS;
-
-            default:
-              logger.warn(`Unexpected final status: ${status}`);
-              return DYNAMIC_EXIT_CODES.SUCCESS;
-          }
+          return getFinalRunExitCode(
+            logger,
+            DYNAMIC_EXIT_CODES,
+            runId,
+            await backend.getRun(runId),
+            debug,
+          );
         } catch (error) {
-          logger.error("Execution error:", error);
-
-          await backend.updateRun(runId, {
-            status: "failed",
-            error: {
-              message: `EXECUTION_ERROR: ${error instanceof Error ? error.message : String(error)}`,
-              stack: error instanceof Error ? error.stack : undefined,
-            },
-            completedAt: new Date(),
-          });
-
-          return DYNAMIC_EXIT_CODES.WORKFLOW_FAILED;
+          return await failRunExecution(backend, logger, DYNAMIC_EXIT_CODES, runId, error);
         }
       },
     );

package/src/src/workflow/worker/job-entrypoint.ts

@@ -22,12 +22,16 @@
 
 import { logger as baseLogger } from "../../utils/index.js";
 import { getEnv } from "../../platform/compat/process.js";
-import { env as getProcessEnv } from "../../platform/compat/process.js";
-import { runWithRequestContext } from "../../platform/adapters/fs/veryfront/multi-project-adapter.js";
-import { mergeInjectedWorkflowEnv } from "../../jobs/runtime-env.js";
 import type { WorkflowBackend } from "../backends/types.js";
 import type { WorkflowExecutor } from "../executor/workflow-executor.js";
-import type { CapturedTenantContext, WorkflowDefinition } from "../types.js";
+import type { WorkflowDefinition } from "../types.js";
+import {
+  failRunExecution,
+  getFinalRunExitCode,
+  getTenantFromEnv,
+  hydrateRunContextEnv,
+  runWithTenantContext,
+} from "./shared.js";
 
 const logger = baseLogger.component("workflow-job");
 
@@ -55,26 +59,6 @@ export const EXIT_CODES = {
   NOT_FOUND: 3,
 } as const;
 
-/**
- * Get tenant context from environment variables
- */
-function getTenantFromEnv(): CapturedTenantContext | undefined {
-  const projectSlug = getEnv("TENANT_PROJECT_SLUG");
-  const token = getEnv("TENANT_TOKEN");
-
-  if (!projectSlug || !token) {
-    return undefined;
-  }
-
-  return {
-    projectSlug,
-    token,
-    projectId: getEnv("TENANT_PROJECT_ID") || undefined,
-    productionMode: getEnv("TENANT_PRODUCTION_MODE") === "1",
-    releaseId: getEnv("TENANT_RELEASE_ID") || undefined,
-  };
-}
-
 /**
  * Run the workflow job
  *
@@ -124,21 +108,7 @@ export async function runWorkflowJob(config: JobEntrypointConfig): Promise<numbe
       return EXIT_CODES.NOT_FOUND;
     }
 
-    const injectedEnv = mergeInjectedWorkflowEnv(run.context.env, getProcessEnv());
-    if (injectedEnv) {
-      const currentEnv = run.context.env;
-      const currentSerialized = currentEnv ? JSON.stringify(currentEnv) : "";
-      const nextSerialized = JSON.stringify(injectedEnv);
-      if (currentSerialized !== nextSerialized) {
-        await backend.updateRun(runId, {
-          context: {
-            ...run.context,
-            env: injectedEnv,
-          },
-        });
-        run = (await backend.getRun(runId)) ?? run;
-      }
-    }
+    run = await hydrateRunContextEnv(backend, runId, run);
 
     // Get tenant context (from env or from stored run)
     const tenant = getTenantFromEnv() ?? run._tenant;
@@ -152,30 +122,13 @@ export async function runWorkflowJob(config: JobEntrypointConfig): Promise<numbe
     const executeWorkflow = async (): Promise<number> => {
       await executor.resume(runId);
 
-      const finalRun = await backend.getRun(runId);
-      const status = finalRun?.status;
-
-      switch (status) {
-        case "completed":
-          if (debug) {
-            logger.info(`Workflow completed successfully: ${runId}`);
-          }
-          return EXIT_CODES.SUCCESS;
-
-        case "failed":
-          logger.error(`Workflow failed: ${runId}`, finalRun?.error);
-          return EXIT_CODES.WORKFLOW_FAILED;
-
-        case "waiting":
-          if (debug) {
-            logger.info(`Workflow paused (waiting): ${runId}`);
-          }
-          return EXIT_CODES.SUCCESS;
-
-        default:
-          logger.warn(`Unexpected final status: ${status}`);
-          return EXIT_CODES.SUCCESS;
-      }
+      return getFinalRunExitCode(
+        logger,
+        EXIT_CODES,
+        runId,
+        await backend.getRun(runId),
+        debug,
+      );
     };
 
     // Wrapper that handles execution errors
@@ -183,33 +136,13 @@ export async function runWorkflowJob(config: JobEntrypointConfig): Promise<numbe
       try {
         return await executeWorkflow();
       } catch (error) {
-        logger.error(`Execution error:`, error);
-
-        await backend.updateRun(runId, {
-          status: "failed",
-          error: {
-            message: `EXECUTION_ERROR: ${error instanceof Error ? error.message : String(error)}`,
-            stack: error instanceof Error ? error.stack : undefined,
-          },
-          completedAt: new Date(),
-        });
-
-        return EXIT_CODES.WORKFLOW_FAILED;
+        return await failRunExecution(backend, logger, EXIT_CODES, runId, error);
       }
     };
 
     // Run with tenant context if available
     if (tenant) {
-      return await runWithRequestContext(
-        {
-          projectSlug: tenant.projectSlug,
-          token: tenant.token,
-          projectId: tenant.projectId,
-          productionMode: tenant.productionMode,
-          releaseId: tenant.releaseId,
-        },
-        safeExecute,
-      );
+      return await runWithTenantContext(tenant, safeExecute);
     }
 
     return await safeExecute();

package/src/src/workflow/worker/shared.ts

@@ -0,0 +1,127 @@
+import { env as getProcessEnv } from "../../platform/compat/process.js";
+import { runWithRequestContext } from "../../platform/adapters/fs/veryfront/multi-project-adapter.js";
+import { getEnv } from "../../platform/compat/process.js";
+import { mergeInjectedWorkflowEnv } from "../../jobs/runtime-env.js";
+import type { WorkflowBackend } from "../backends/types.js";
+import type { CapturedTenantContext, WorkflowRun } from "../types.js";
+
+interface EntrypointLogger {
+  error: (message: string, ...args: unknown[]) => void;
+  info: (message: string, ...args: unknown[]) => void;
+  warn: (message: string, ...args: unknown[]) => void;
+}
+
+interface EntrypointExitCodes {
+  SUCCESS: number;
+  WORKFLOW_FAILED: number;
+}
+
+export function getTenantFromEnv(): CapturedTenantContext | undefined {
+  const projectSlug = getEnv("TENANT_PROJECT_SLUG");
+  const token = getEnv("TENANT_TOKEN");
+
+  if (!projectSlug || !token) {
+    return undefined;
+  }
+
+  return {
+    projectSlug,
+    token,
+    projectId: getEnv("TENANT_PROJECT_ID"),
+    productionMode: getEnv("TENANT_PRODUCTION_MODE") === "1",
+    releaseId: getEnv("TENANT_RELEASE_ID"),
+  };
+}
+
+export async function hydrateRunContextEnv(
+  backend: WorkflowBackend,
+  runId: string,
+  run: WorkflowRun,
+): Promise<WorkflowRun> {
+  const injectedEnv = mergeInjectedWorkflowEnv(run.context.env, getProcessEnv());
+  if (!injectedEnv) {
+    return run;
+  }
+
+  const currentSerialized = run.context.env ? JSON.stringify(run.context.env) : "";
+  const nextSerialized = JSON.stringify(injectedEnv);
+  if (currentSerialized === nextSerialized) {
+    return run;
+  }
+
+  await backend.updateRun(runId, {
+    context: {
+      ...run.context,
+      env: injectedEnv,
+    },
+  });
+
+  return (await backend.getRun(runId)) ?? run;
+}
+
+export function getFinalRunExitCode(
+  logger: EntrypointLogger,
+  exitCodes: EntrypointExitCodes,
+  runId: string,
+  finalRun: WorkflowRun | null,
+  debug = false,
+): number {
+  switch (finalRun?.status) {
+    case "completed":
+      if (debug) {
+        logger.info(`Workflow completed successfully: ${runId}`);
+      }
+      return exitCodes.SUCCESS;
+
+    case "failed":
+      logger.error(`Workflow failed: ${runId}`, finalRun.error);
+      return exitCodes.WORKFLOW_FAILED;
+
+    case "waiting":
+      if (debug) {
+        logger.info(`Workflow paused (waiting): ${runId}`);
+      }
+      return exitCodes.SUCCESS;
+
+    default:
+      logger.warn(`Unexpected final status: ${finalRun?.status}`);
+      return exitCodes.SUCCESS;
+  }
+}
+
+export async function failRunExecution(
+  backend: WorkflowBackend,
+  logger: EntrypointLogger,
+  exitCodes: EntrypointExitCodes,
+  runId: string,
+  error: unknown,
+): Promise<number> {
+  logger.error("Execution error:", error);
+
+  await backend.updateRun(runId, {
+    status: "failed",
+    error: {
+      message: `EXECUTION_ERROR: ${error instanceof Error ? error.message : String(error)}`,
+      stack: error instanceof Error ? error.stack : undefined,
+    },
+    completedAt: new Date(),
+  });
+
+  return exitCodes.WORKFLOW_FAILED;
+}
+
+export function runWithTenantContext<T>(
+  tenant: CapturedTenantContext,
+  fn: () => Promise<T>,
+): Promise<T> {
+  return runWithRequestContext(
+    {
+      projectSlug: tenant.projectSlug,
+      token: tenant.token,
+      projectId: tenant.projectId,
+      productionMode: tenant.productionMode,
+      releaseId: tenant.releaseId,
+    },
+    fn,
+  );
+}

package/esm/src/prompt/schemas/index.d.ts

@@ -1,7 +0,0 @@
-/**
- * Prompt Schemas
- *
- * @module prompt/schemas
- */
-export { type PromptConfig, PromptConfigSchema } from "./prompt.schema.js";
-//# sourceMappingURL=index.d.ts.map

package/esm/src/prompt/schemas/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/src/prompt/schemas/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC"}

package/esm/src/prompt/schemas/index.js

@@ -1,6 +0,0 @@
-/**
- * Prompt Schemas
- *
- * @module prompt/schemas
- */
-export { PromptConfigSchema } from "./prompt.schema.js";

package/esm/src/security/http/handlers-index.d.ts

@@ -1,5 +0,0 @@
-export { AuthHandler } from "./auth.js";
-export { SecurityConfigLoader } from "./config.js";
-export { loadSecurityConfig, setCors } from "./middleware/index.js";
-export type { CORSConfig, CSPDirectives, SecurityConfig } from "./middleware/index.js";
-//# sourceMappingURL=handlers-index.d.ts.map

package/esm/src/security/http/handlers-index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"handlers-index.d.ts","sourceRoot":"","sources":["../../../../src/src/security/http/handlers-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACpE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC"}

package/esm/src/security/http/handlers-index.js

@@ -1,3 +0,0 @@
-export { AuthHandler } from "./auth.js";
-export { SecurityConfigLoader } from "./config.js";
-export { loadSecurityConfig, setCors } from "./middleware/index.js";

package/src/src/prompt/schemas/index.ts

@@ -1,7 +0,0 @@
-/**
- * Prompt Schemas
- *
- * @module prompt/schemas
- */
-
-export { type PromptConfig, PromptConfigSchema } from "./prompt.schema.js";

package/src/src/security/http/handlers-index.ts

@@ -1,4 +0,0 @@
-export { AuthHandler } from "./auth.js";
-export { SecurityConfigLoader } from "./config.js";
-export { loadSecurityConfig, setCors } from "./middleware/index.js";
-export type { CORSConfig, CSPDirectives, SecurityConfig } from "./middleware/index.js";