@teamkeel/functions-runtime 0.413.2-next.3 → 0.413.3-next.1

package/dist/index.d.cts

@@ -537,15 +537,18 @@ interface FlowContext<C extends FlowConfig> {
     step: Step<C>;
     ui: UI<C>;
 }
+type JsonSerializable = string | number | boolean | null | JsonSerializable[] | {
+    [key: string]: JsonSerializable;
+};
 type Step<C extends FlowConfig> = {
-    <R>(name: string, options: {
+    <R extends JsonSerializable | void>(name: string, options: {
         stage?: ExtractStageKeys<C>;
         maxRetries?: number;
         timeoutInMs?: number;
     }, fn: () => Promise<R> & {
         catch: (errorHandler: (err: Error) => Promise<void> | void) => Promise<any>;
     }): Promise<R>;
-    <R>(name: string, fn: () => Promise<R> & {
+    <R extends JsonSerializable | void>(name: string, fn: () => Promise<R> & {
         catch: (errorHandler: (err: Error) => Promise<void> | void) => Promise<any>;
     }): Promise<R>;
 };

package/dist/index.d.ts

@@ -537,15 +537,18 @@ interface FlowContext<C extends FlowConfig> {
     step: Step<C>;
     ui: UI<C>;
 }
+type JsonSerializable = string | number | boolean | null | JsonSerializable[] | {
+    [key: string]: JsonSerializable;
+};
 type Step<C extends FlowConfig> = {
-    <R>(name: string, options: {
+    <R extends JsonSerializable | void>(name: string, options: {
         stage?: ExtractStageKeys<C>;
         maxRetries?: number;
         timeoutInMs?: number;
     }, fn: () => Promise<R> & {
         catch: (errorHandler: (err: Error) => Promise<void> | void) => Promise<any>;
     }): Promise<R>;
-    <R>(name: string, fn: () => Promise<R> & {
+    <R extends JsonSerializable | void>(name: string, fn: () => Promise<R> & {
         catch: (errorHandler: (err: Error) => Promise<void> | void) => Promise<any>;
     }): Promise<R>;
 };

package/dist/index.js

@@ -2558,7 +2558,7 @@ function createFlowContext(runId, data, spanId) {
       const options = typeof optionsOrFn === "function" ? {} : optionsOrFn;
       const actualFn = typeof optionsOrFn === "function" ? optionsOrFn : fn;
       const db = useDatabase();
-      const past = await db.selectFrom("keel_flow_step").where("run_id", "=", runId).where("name", "=", name).selectAll().execute();
+      const past = await db.selectFrom("keel.flow_step").where("run_id", "=", runId).where("name", "=", name).selectAll().execute();
       const newSteps = past.filter((step) => step.status === "NEW" /* NEW */);
       const completedSteps = past.filter(
         (step) => step.status === "COMPLETED" /* COMPLETED */
@@ -2582,7 +2582,7 @@ function createFlowContext(runId, data, spanId) {
       }
       if (newSteps.length === 1) {
         let result = null;
-        await db.updateTable("keel_flow_step").set({
+        await db.updateTable("keel.flow_step").set({
           startTime: /* @__PURE__ */ new Date()
         }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
         try {
@@ -2591,7 +2591,7 @@ function createFlowContext(runId, data, spanId) {
             options.timeoutInMs ?? defaultOpts.timeoutInMs
           );
         } catch (e) {
-          await db.updateTable("keel_flow_step").set({
+          await db.updateTable("keel.flow_step").set({
             status: "FAILED" /* FAILED */,
             spanId,
             endTime: /* @__PURE__ */ new Date(),
@@ -2600,7 +2600,7 @@ function createFlowContext(runId, data, spanId) {
           if (failedSteps.length + 1 >= (options.maxRetries ?? defaultOpts.maxRetries)) {
             throw new ExhuastedRetriesDisrupt();
           }
-          await db.insertInto("keel_flow_step").values({
+          await db.insertInto("keel.flow_step").values({
             run_id: runId,
             name,
             stage: options.stage,
@@ -2609,7 +2609,7 @@ function createFlowContext(runId, data, spanId) {
           }).returningAll().executeTakeFirst();
           throw new StepCreatedDisrupt();
         }
-        await db.updateTable("keel_flow_step").set({
+        await db.updateTable("keel.flow_step").set({
           status: "COMPLETED" /* COMPLETED */,
           value: JSON.stringify(result),
           spanId,
@@ -2617,7 +2617,7 @@ function createFlowContext(runId, data, spanId) {
         }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
         return result;
       }
-      await db.insertInto("keel_flow_step").values({
+      await db.insertInto("keel.flow_step").values({
         run_id: runId,
         name,
         stage: options.stage,
@@ -2629,12 +2629,12 @@ function createFlowContext(runId, data, spanId) {
     ui: {
       page: /* @__PURE__ */ __name(async (name, options) => {
         const db = useDatabase();
-        let step = await db.selectFrom("keel_flow_step").where("run_id", "=", runId).where("name", "=", name).selectAll().executeTakeFirst();
+        let step = await db.selectFrom("keel.flow_step").where("run_id", "=", runId).where("name", "=", name).selectAll().executeTakeFirst();
         if (step && step.status === "COMPLETED" /* COMPLETED */) {
           return step.value;
         }
         if (!step) {
-          step = await db.insertInto("keel_flow_step").values({
+          step = await db.insertInto("keel.flow_step").values({
             run_id: runId,
             name,
             stage: options.stage,
@@ -2647,7 +2647,7 @@ function createFlowContext(runId, data, spanId) {
         if (!data) {
           throw new UIRenderDisrupt(step?.id, page(options));
         }
-        await db.updateTable("keel_flow_step").set({
+        await db.updateTable("keel.flow_step").set({
           status: "COMPLETED" /* COMPLETED */,
           value: JSON.stringify(data),
           spanId,
@@ -2723,7 +2723,7 @@ async function handleFlow(request, config) {
         db = createDatabaseClient({
           connString: request.meta?.secrets?.KEEL_DB_CONN
         });
-        const flowRun = await db.selectFrom("keel_flow_run").where("id", "=", runId).selectAll().executeTakeFirst();
+        const flowRun = await db.selectFrom("keel.flow_run").where("id", "=", runId).selectAll().executeTakeFirst();
         if (!flowRun) {
           throw new Error("no flow run found");
         }
@@ -2734,48 +2734,70 @@ async function handleFlow(request, config) {
         );
         const flowFunction = flows[request.method].fn;
         flowConfig = flows[request.method].config;
-        await tryExecuteFlow(db, async () => {
-          const inputs = parseInputs(flowRun.input);
-          return flowFunction(ctx, inputs);
-        });
+        const inputs = parseInputs(flowRun.input);
+        try {
+          await tryExecuteFlow(db, async () => {
+            return flowFunction(ctx, inputs);
+          });
+        } catch (e) {
+          if (e instanceof StepCreatedDisrupt) {
+            return createJSONRPCSuccessResponse5(request.id, {
+              runId,
+              runCompleted: false,
+              config: flowConfig
+            });
+          }
+          if (e instanceof UIRenderDisrupt) {
+            return createJSONRPCSuccessResponse5(request.id, {
+              runId,
+              stepId: e.stepId,
+              config: flowConfig,
+              ui: e.contents
+            });
+          }
+          span.recordException(e);
+          span.setStatus({
+            code: opentelemetry6.SpanStatusCode.ERROR,
+            message: e.message
+          });
+          if (e instanceof ExhuastedRetriesDisrupt) {
+            return createJSONRPCSuccessResponse5(request.id, {
+              runId,
+              runCompleted: true,
+              error: "flow failed due to exhausted step retries",
+              config: flowConfig
+            });
+          }
+          return createJSONRPCSuccessResponse5(request.id, {
+            runId,
+            runCompleted: true,
+            error: e.message,
+            config: flowConfig
+          });
+        }
         return createJSONRPCSuccessResponse5(request.id, {
           runId,
           runCompleted: true,
           config: flowConfig
         });
       } catch (e) {
-        if (e instanceof StepCreatedDisrupt) {
-          return createJSONRPCSuccessResponse5(request.id, {
-            runId,
-            runCompleted: false,
-            config: flowConfig
-          });
-        }
-        if (e instanceof UIRenderDisrupt) {
-          return createJSONRPCSuccessResponse5(request.id, {
-            runId,
-            stepId: e.stepId,
-            config: flowConfig,
-            ui: e.contents
+        if (e instanceof Error) {
+          span.recordException(e);
+          span.setStatus({
+            code: opentelemetry6.SpanStatusCode.ERROR,
+            message: e.message
           });
+          return errorToJSONRPCResponse(request, e);
         }
-        span.recordException(e);
+        const message = JSON.stringify(e);
         span.setStatus({
           code: opentelemetry6.SpanStatusCode.ERROR,
-          message: e.message
+          message
         });
-        if (e instanceof ExhuastedRetriesDisrupt) {
-          return createJSONRPCSuccessResponse5(request.id, {
-            runId,
-            runCompleted: true,
-            error: "flow failed due to exhausted step retries",
-            config: flowConfig
-          });
-        }
         return createJSONRPCErrorResponse6(
           request.id,
-          JSONRPCErrorCode5.InternalError,
-          e.message
+          RuntimeErrors.UnknownError,
+          message
         );
       } finally {
         if (db) {