@teamkeel/functions-runtime 0.245.0 → 0.245.2

package/src/ModelAPI.js

@@ -24,6 +24,13 @@ const { camelCaseObject, snakeCaseObject } = require("./casing");
  * @typedef {Object.<string, TableConfig>} TableConfigMap
  */
 
+class DatabaseError extends Error {
+  constructor(error) {
+    super(error.message);
+    this.error = error;
+  }
+}
+
 class ModelAPI {
   /**
    * @param {string} tableName The name of the table this API is for
@@ -39,18 +46,22 @@ class ModelAPI {
   }
 
   async create(values) {
-    const row = await this._db
-      .insertInto(this._tableName)
-      .values(
-        snakeCaseObject({
-          ...this._defaultValues(),
-          ...values,
-        })
-      )
-      .returningAll()
-      .executeTakeFirst();
-
-    return camelCaseObject(row);
+    try {
+      const row = await this._db
+        .insertInto(this._tableName)
+        .values(
+          snakeCaseObject({
+            ...this._defaultValues(),
+            ...values,
+          })
+        )
+        .returningAll()
+        .executeTakeFirstOrThrow();
+
+      return camelCaseObject(row);
+    } catch (e) {
+      throw new DatabaseError(e);
+    }
   }
 
   async findOne(where) {
@@ -97,8 +108,13 @@ class ModelAPI {
     // TODO: support joins for update
     builder = applyWhereConditions(context, builder, where);
 
-    const row = await builder.executeTakeFirstOrThrow();
-    return camelCaseObject(row);
+    try {
+      const row = await builder.executeTakeFirstOrThrow();
+
+      return camelCaseObject(row);
+    } catch (e) {
+      throw new DatabaseError(e);
+    }
   }
 
   async delete(where) {
@@ -109,8 +125,13 @@ class ModelAPI {
     // TODO: support joins for delete
     builder = applyWhereConditions(context, builder, where);
 
-    const row = await builder.executeTakeFirstOrThrow();
-    return row.id;
+    try {
+      const row = await builder.executeTakeFirstOrThrow();
+
+      return row.id;
+    } catch (e) {
+      throw new DatabaseError(e);
+    }
   }
 
   where(where) {
@@ -130,4 +151,5 @@ class ModelAPI {
 
 module.exports = {
   ModelAPI,
+  DatabaseError,
 };

package/src/errors.js

@@ -0,0 +1,34 @@
+const { DatabaseError } = require("./ModelAPI");
+const { createJSONRPCErrorResponse } = require("json-rpc-2.0");
+
+const RuntimeErrors = {
+  UnknownError: -32001,
+  DatabaseError: -32002,
+};
+
+// transforms a JavaScript Error instance (or derivative) into a valid JSONRPC response object
+// to pass back to the Keel runtime
+function errorToJSONRPCResponse(request, e) {
+  // we want to switch on instanceof but there is no way to do that in js, so best to check the constructor class of the error
+
+  // todo: fuzzy matching on postgres errors from both rds-data-api and pg-protocol
+  switch (e.constructor) {
+    case DatabaseError:
+      return createJSONRPCErrorResponse(
+        request.id,
+        RuntimeErrors.DatabaseError,
+        e.message
+      );
+    default:
+      return createJSONRPCErrorResponse(
+        request.id,
+        RuntimeErrors.UnknownError,
+        e.message
+      );
+  }
+}
+
+module.exports = {
+  errorToJSONRPCResponse,
+  RuntimeErrors,
+};

package/src/handleRequest.js

@@ -4,6 +4,8 @@ const {
   JSONRPCErrorCode,
 } = require("json-rpc-2.0");
 
+const { errorToJSONRPCResponse, RuntimeErrors } = require("./errors");
+
 // Generic handler function that is agnostic to runtime environment (local or lambda)
 // to execute a custom function based on the contents of a jsonrpc-2.0 payload object.
 // To read more about jsonrpc request and response shapes, please read https://www.jsonrpc.org/specification
@@ -35,20 +37,19 @@ async function handleRequest(request, config) {
 
     return createJSONRPCSuccessResponse(request.id, result);
   } catch (e) {
-    let msg = "";
-
     if (e instanceof Error) {
-      msg = e.message;
-    } else {
-      msg = JSON.stringify(e);
+      return errorToJSONRPCResponse(request, e);
     }
 
     return createJSONRPCErrorResponse(
       request.id,
-      JSONRPCErrorCode.InternalError,
-      msg
+      RuntimeErrors.UnknownError,
+      JSON.stringify(e)
     );
   }
 }
 
-module.exports.handleRequest = handleRequest;
+module.exports = {
+  handleRequest,
+  RuntimeErrors,
+};

package/src/handleRequest.test.js

@@ -1,5 +1,5 @@
 import { createJSONRPCRequest, JSONRPCErrorCode } from "json-rpc-2.0";
-import { handleRequest } from "./handleRequest";
+import { handleRequest, RuntimeErrors } from "./handleRequest";
 import { test, expect } from "vitest";
 
 test("when the custom function returns expected value", async () => {
@@ -83,7 +83,7 @@ test("when there is an unexpected error in the custom function", async () => {
     id: "123",
     jsonrpc: "2.0",
     error: {
-      code: JSONRPCErrorCode.InternalError,
+      code: RuntimeErrors.UnknownError,
       message: "oopsie daisy",
     },
   });
@@ -105,7 +105,7 @@ test("when there is an unexpected object thrown in the custom function", async (
     id: "123",
     jsonrpc: "2.0",
     error: {
-      code: JSONRPCErrorCode.InternalError,
+      code: RuntimeErrors.UnknownError,
       message: '{"err":"oopsie daisy"}',
     },
   });