@teamkeel/functions-runtime 0.365.16-12 → 0.365.16-goreleaser-updates13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.365.16-12",
+  "version": "0.365.16-goreleaser-updates13",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {
@@ -28,7 +28,6 @@
     "json-rpc-2.0": "^1.4.1",
     "ksuid": "^3.0.0",
     "kysely": "^0.23.4",
-    "pg": "^8.8.0",
-    "traceparent": "^1.0.0"
+    "pg": "^8.8.0"
   }
 }

package/src/ModelAPI.js

@@ -1,11 +1,8 @@
 const { useDatabase } = require("./database");
-const { getAuditContext } = require("./auditing");
 const { QueryBuilder } = require("./QueryBuilder");
 const { QueryContext } = require("./QueryContext");
 const { applyWhereConditions } = require("./applyWhereConditions");
 const { applyJoins } = require("./applyJoins");
-const { sql } = require("kysely");
-
 const {
   applyLimit,
   applyOffset,
@@ -50,52 +47,12 @@ class ModelAPI {
     this._modelName = upperCamelCase(this._tableName);
   }
 
-  // execute sets the audit context in the database and then runs individual
-  // database statements within a transaction if one hasn't been opened, which
-  // is necessary because the audit parameters will only be available within transactions.
-  async #execute(fn) {
-    const db = useDatabase();
-
-    try {
-      if (db.isTransaction) {
-        await this.#setAuditParameters(db);
-        return await fn(db);
-      } else {
-        return await db.transaction().execute(async (transaction) => {
-          await this.#setAuditParameters(transaction);
-          return fn(transaction);
-        });
-      }
-    } catch (e) {
-      throw new DatabaseError(e);
-    }
-  }
-
-  // setAuditParameters sets audit context data to configuration parameters
-  // in the database so that they can be read by the triggered auditing function.
-  async #setAuditParameters(transaction) {
-    const audit = getAuditContext();
-    const statements = [];
-
-    if (audit.identityId) {
-      statements.push(`CALL set_identity_id('${audit.identityId}');`);
-    }
-
-    if (audit.traceId) {
-      statements.push(`CALL set_trace_id('${audit.traceId}');`);
-    }
-
-    if (statements.length > 0) {
-      const stmt = statements.join("");
-      await sql.raw(stmt).execute(transaction);
-    }
-  }
-
   async create(values) {
     const name = tracing.spanNameForModelAPI(this._modelName, "create");
+    const db = useDatabase();
 
     return tracing.withSpan(name, async (span) => {
-      return await this.#execute(async (db) => {
+      try {
         const query = db
           .insertInto(this._tableName)
           .values(
@@ -107,8 +64,11 @@ class ModelAPI {
 
         span.setAttribute("sql", query.compile().sql);
         const row = await query.executeTakeFirstOrThrow();
+
         return camelCaseObject(row);
-      });
+      } catch (e) {
+        throw new DatabaseError(e);
+      }
     });
   }
 
@@ -195,49 +155,48 @@ class ModelAPI {
 
   async update(where, values) {
     const name = tracing.spanNameForModelAPI(this._modelName, "update");
+    const db = useDatabase();
 
     return tracing.withSpan(name, async (span) => {
-      return await this.#execute(async (db) => {
-        let builder = db.updateTable(this._tableName).returningAll();
+      let builder = db.updateTable(this._tableName).returningAll();
 
-        builder = builder.set(snakeCaseObject(values));
+      builder = builder.set(snakeCaseObject(values));
 
-        const context = new QueryContext(
-          [this._tableName],
-          this._tableConfigMap
-        );
+      const context = new QueryContext([this._tableName], this._tableConfigMap);
 
-        // TODO: support joins for update
-        builder = applyWhereConditions(context, builder, where);
+      // TODO: support joins for update
+      builder = applyWhereConditions(context, builder, where);
 
-        span.setAttribute("sql", builder.compile().sql);
+      span.setAttribute("sql", builder.compile().sql);
 
+      try {
         const row = await builder.executeTakeFirstOrThrow();
         return camelCaseObject(row);
-      });
+      } catch (e) {
+        throw new DatabaseError(e);
+      }
     });
   }
 
   async delete(where) {
     const name = tracing.spanNameForModelAPI(this._modelName, "delete");
+    const db = useDatabase();
 
     return tracing.withSpan(name, async (span) => {
-      return await this.#execute(async (db) => {
-        let builder = db.deleteFrom(this._tableName).returning(["id"]);
-
-        const context = new QueryContext(
-          [this._tableName],
-          this._tableConfigMap
-        );
+      let builder = db.deleteFrom(this._tableName).returning(["id"]);
 
-        // TODO: support joins for delete
-        builder = applyWhereConditions(context, builder, where);
+      const context = new QueryContext([this._tableName], this._tableConfigMap);
 
-        span.setAttribute("sql", builder.compile().sql);
+      // TODO: support joins for delete
+      builder = applyWhereConditions(context, builder, where);
 
+      span.setAttribute("sql", builder.compile().sql);
+      try {
         const row = await builder.executeTakeFirstOrThrow();
         return row.id;
-      });
+      } catch (e) {
+        throw new DatabaseError(e);
+      }
     });
   }
 

package/src/handleSubscriber.js

@@ -49,7 +49,7 @@ async function handleSubscriber(request, config) {
         const subscriberFunction = subscribers[request.method];
         const actionType = PROTO_ACTION_TYPES.SUBSCRIBER;
 
-        await tryExecuteSubscriber({ request, db, actionType }, async () => {
+        await tryExecuteSubscriber({ db, actionType }, async () => {
           // Return the subscriber function to the containing tryExecuteSubscriber block
           return subscriberFunction(ctx, request.params);
         });

package/src/tryExecuteFunction.js

@@ -1,5 +1,4 @@
 const { withDatabase } = require("./database");
-const { withAuditContext } = require("./auditing");
 const {
   withPermissions,
   PERMISSION_STATE,
@@ -11,15 +10,12 @@ const { PROTO_ACTION_TYPES } = require("./consts");
 // tryExecuteFunction will create a new database transaction around a function call
 // and handle any permissions checks. If a permission check fails, then an Error will be thrown and the catch block will be hit.
 function tryExecuteFunction(
-  { request, db, permitted, permissionFns, actionType, ctx },
+  { db, permitted, permissionFns, actionType, request, ctx },
   cb
 ) {
   return withPermissions(permitted, async ({ getPermissionState }) => {
     return withDatabase(db, actionType, async ({ transaction }) => {
-      const fnResult = await withAuditContext(request, async () => {
-        return cb();
-      });
-
+      const fnResult = await cb();
       // api.permissions maintains an internal state of whether the current function has been *explicitly* permitted/denied by the user in the course of their custom function, or if execution has already been permitted by a role based permission (evaluated in the main runtime).
       // we need to check that the final state is permitted or unpermitted. if it's not, then it means that the user has taken no explicit action to permit/deny
       // and therefore we default to checking the permissions defined in the schema automatically.

package/src/tryExecuteJob.js

@@ -1,6 +1,6 @@
 const { withDatabase } = require("./database");
-const { withAuditContext } = require("./auditing");
 const { withPermissions, PERMISSION_STATE } = require("./permissions");
+
 const { PermissionError } = require("./errors");
 
 // tryExecuteJob will create a new database transaction around a function call
@@ -8,10 +8,7 @@ const { PermissionError } = require("./errors");
 function tryExecuteJob({ db, permitted, actionType, request }, cb) {
   return withPermissions(permitted, async ({ getPermissionState }) => {
     return withDatabase(db, actionType, async () => {
-      await withAuditContext(request, async () => {
-        return cb();
-      });
-
+      await cb();
       // api.permissions maintains an internal state of whether the current operation has been *explicitly* permitted/denied by the user in the course of their custom function, or if execution has already been permitted by a role based permission (evaluated in the main runtime).
       // we need to check that the final state is permitted or unpermitted. if it's not, then it means that the user has taken no explicit action to permit/deny
       // and therefore we default to checking the permissions defined in the schema automatically.

package/src/tryExecuteSubscriber.js

@@ -1,12 +1,9 @@
 const { withDatabase } = require("./database");
-const { withAuditContext } = require("./auditing");
 
 // tryExecuteSubscriber will create a new database connection and execute the function call.
-function tryExecuteSubscriber({ request, db, actionType }, cb) {
+function tryExecuteSubscriber({ db, actionType }, cb) {
   return withDatabase(db, actionType, async () => {
-    await withAuditContext(request, async () => {
-      return cb();
-    });
+    await cb();
   });
 }
 

package/src/auditing.js

@@ -1,35 +0,0 @@
-const { AsyncLocalStorage } = require("async_hooks");
-const TraceParent = require("traceparent");
-
-const auditContextStorage = new AsyncLocalStorage();
-
-// withAuditContext creates the audit context from the runtime request body
-// and sets it to in AsyncLocalStorage so that this data is available to the
-// ModelAPI during the execution of actions, jobs and subscribers.
-async function withAuditContext(request, cb) {
-  let audit = {};
-  if (request.meta?.identity) {
-    audit.identityId = request.meta.identity.id;
-  }
-  if (request.meta?.tracing?.traceparent) {
-    audit.traceId = TraceParent.fromString(
-      request.meta.tracing.traceparent
-    )?.traceId;
-  }
-
-  return await auditContextStorage.run(audit, () => {
-    return cb();
-  });
-}
-
-// getAuditContext retrieves the audit context from AsyncLocalStorage.
-function getAuditContext() {
-  let auditStore = auditContextStorage.getStore();
-  return {
-    identityId: auditStore?.identityId,
-    traceId: auditStore?.traceId,
-  };
-}
-
-module.exports.withAuditContext = withAuditContext;
-module.exports.getAuditContext = getAuditContext;