@teamkeel/functions-runtime 0.414.5 → 0.414.6

package/dist/index.cjs

@@ -37,6 +37,7 @@ __export(index_exports, {
   InlineFile: () => InlineFile,
   KSUID: () => import_ksuid2.default,
   ModelAPI: () => ModelAPI,
+  NonRetriableError: () => NonRetriableError,
   PERMISSION_STATE: () => PERMISSION_STATE,
   Permissions: () => Permissions,
   RequestHeaders: () => RequestHeaders,
@@ -1977,8 +1978,8 @@ async function handleRequest(request, config) {
       let db = null;
       try {
         const { createContextAPI, functions, permissionFns, actionTypes } = config;
-        if (!(request.method in functions)) {
-          const message = `no corresponding function found for '${request.method}'`;
+        if (!functions[request.method]) {
+          const message = `function '${request.method}' does not exist or has not been implemented`;
           span.setStatus({
             code: opentelemetry2.SpanStatusCode.ERROR,
             message
@@ -2098,8 +2099,8 @@ async function handleJob(request, config) {
       let db = null;
       try {
         const { createJobContextAPI, jobs } = config;
-        if (!(request.method in jobs)) {
-          const message = `no corresponding job found for '${request.method}'`;
+        if (!jobs[request.method]) {
+          const message = `job '${request.method}' does not exist or has not been implemented`;
           span.setStatus({
             code: opentelemetry3.SpanStatusCode.ERROR,
             message
@@ -2186,8 +2187,8 @@ async function handleSubscriber(request, config) {
       let db = null;
       try {
         const { createSubscriberContextAPI, subscribers } = config;
-        if (!(request.method in subscribers)) {
-          const message = `no corresponding subscriber found for '${request.method}'`;
+        if (!subscribers[request.method]) {
+          const message = `subscriber '${request.method}' does not exist or has not been implemented`;
           span.setStatus({
             code: opentelemetry4.SpanStatusCode.ERROR,
             message
@@ -2257,8 +2258,8 @@ async function handleRoute(request, config) {
       let db = null;
       try {
         const { createContextAPI, functions } = config;
-        if (!(request.method in functions)) {
-          const message = `no route function found for '${request.method}'`;
+        if (!functions[request.method]) {
+          const message = `route function '${request.method}' does not exist or has not been implemented`;
           span.setStatus({
             code: opentelemetry5.SpanStatusCode.ERROR,
             message
@@ -2497,6 +2498,13 @@ async function page(options, data, action) {
       return c.uiConfig;
     }).filter(Boolean)
   );
+  if (data && options.validate) {
+    const validationResult = await options.validate(data);
+    if (typeof validationResult === "string") {
+      hasValidationErrors = true;
+      validationError = validationResult;
+    }
+  }
   return {
     page: {
       __type: "ui.page",
@@ -2721,6 +2729,16 @@ var dataGridInput = /* @__PURE__ */ __name((name, options) => {
   };
 }, "dataGridInput");
 
+// src/flows/errors.ts
+var NonRetriableError = class extends Error {
+  static {
+    __name(this, "NonRetriableError");
+  }
+  constructor(message) {
+    super(message);
+  }
+};
+
 // src/flows/index.ts
 var STEP_STATUS = /* @__PURE__ */ ((STEP_STATUS2) => {
   STEP_STATUS2["NEW"] = "NEW";
@@ -2738,7 +2756,7 @@ var STEP_TYPE = /* @__PURE__ */ ((STEP_TYPE2) => {
   return STEP_TYPE2;
 })(STEP_TYPE || {});
 var defaultOpts = {
-  retries: 5,
+  retries: 4,
   timeout: 6e4
 };
 function createFlowContext(runId, data, action, spanId, ctx) {
@@ -2757,6 +2775,8 @@ function createFlowContext(runId, data, action, spanId, ctx) {
     step: /* @__PURE__ */ __name(async (name, optionsOrFn, fn) => {
       const options = typeof optionsOrFn === "function" ? {} : optionsOrFn;
       const actualFn = typeof optionsOrFn === "function" ? optionsOrFn : fn;
+      options.retries = options.retries ?? defaultOpts.retries;
+      options.timeout = options.timeout ?? defaultOpts.timeout;
       const db = useDatabase();
       if (usedNames.has(name)) {
         await db.insertInto("keel.flow_step").values({
@@ -2800,10 +2820,11 @@ function createFlowContext(runId, data, action, spanId, ctx) {
           startTime: /* @__PURE__ */ new Date()
         }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
         try {
-          result = await withTimeout(
-            actualFn(),
-            options.timeout ?? defaultOpts.timeout
-          );
+          const stepArgs = {
+            attempt: failedSteps.length + 1,
+            stepOptions: options
+          };
+          result = await withTimeout(actualFn(stepArgs), options.timeout);
         } catch (e) {
           await db.updateTable("keel.flow_step").set({
             status: "FAILED" /* FAILED */,
@@ -2811,7 +2832,10 @@ function createFlowContext(runId, data, action, spanId, ctx) {
             endTime: /* @__PURE__ */ new Date(),
             error: e instanceof Error ? e.message : "An error occurred"
           }).where("id", "=", newSteps[0].id).returningAll().executeTakeFirst();
-          if (failedSteps.length + 1 >= (options.retries ?? defaultOpts.retries)) {
+          if (failedSteps.length >= options.retries || e instanceof NonRetriableError) {
+            if (options.onFailure) {
+              await options.onFailure();
+            }
             throw new ExhuastedRetriesDisrupt();
           }
           await db.insertInto("keel.flow_step").values({
@@ -2884,9 +2908,22 @@ function createFlowContext(runId, data, action, spanId, ctx) {
             (await page(options, null, null)).page
           );
         }
-        const p = await page(options, data, action);
-        if (p.hasValidationErrors) {
-          throw new UIRenderDisrupt(step?.id, p.page);
+        try {
+          const p = await page(options, data, action);
+          if (p.hasValidationErrors) {
+            throw new UIRenderDisrupt(step?.id, p.page);
+          }
+        } catch (e) {
+          if (e instanceof UIRenderDisrupt) {
+            throw e;
+          }
+          await db.updateTable("keel.flow_step").set({
+            status: "FAILED" /* FAILED */,
+            spanId,
+            endTime: /* @__PURE__ */ new Date(),
+            error: e instanceof Error ? e.message : "An error occurred"
+          }).where("id", "=", step?.id).returningAll().executeTakeFirst();
+          throw e;
         }
         await db.updateTable("keel.flow_step").set({
           status: "COMPLETED" /* COMPLETED */,
@@ -2973,8 +3010,8 @@ async function handleFlow(request, config) {
           throw new Error("no runId provided");
         }
         const { flows, createFlowContextAPI } = config;
-        if (!(request.method in flows)) {
-          const message = `no corresponding flow found for '${request.method}'`;
+        if (!flows[request.method]) {
+          const message = `flow '${request.method}' does not exist or has not been implemented`;
           span.setStatus({
             code: opentelemetry6.SpanStatusCode.ERROR,
             message
@@ -3124,6 +3161,7 @@ __name(ksuid, "ksuid");
   InlineFile,
   KSUID,
   ModelAPI,
+  NonRetriableError,
   PERMISSION_STATE,
   Permissions,
   RequestHeaders,