@teamkeel/functions-runtime 0.394.2 → 0.395.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.394.2",
+  "version": "0.395.1",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {

package/src/File.js

@@ -4,7 +4,7 @@ const {
   GetObjectCommand,
 } = require("@aws-sdk/client-s3");
 const { fromEnv } = require("@aws-sdk/credential-providers");
-const { useDatabase } = require("./database");
+const { createDatabaseClient } = require("./database");
 const { DatabaseError } = require("./errors");
 const KSUID = require("ksuid");
 
@@ -105,9 +105,7 @@ class File extends InlineFile {
   async read() {
     if (this._contents) {
       const arrayBuffer = await this._contents.arrayBuffer();
-      const buffer = Buffer.from(arrayBuffer);
-
-      return buffer;
+      return Buffer.from(arrayBuffer);
     }
 
     if (isS3Storage()) {
@@ -122,12 +120,12 @@ class File extends InlineFile {
       };
       const command = new GetObjectCommand(params);
       const response = await s3Client.send(command);
-      const blob = response.Body.transformToByteArray();
+      const blob = await response.Body.transformToByteArray();
       return Buffer.from(blob);
     }
 
     // default to db storage
-    const db = useDatabase();
+    const db = createDatabaseClient();
 
     try {
       let query = db
@@ -139,6 +137,8 @@ class File extends InlineFile {
       return row.data;
     } catch (e) {
       throw new DatabaseError(e);
+    } finally {
+      await db.destroy();
     }
   }
 
@@ -195,7 +195,11 @@ async function storeFile(contents, key, filename, contentType, expires) {
     };
 
     if (expires) {
-      params.Expires = expires;
+      if (expires instanceof Date) {
+        params.Expires = expires;
+      } else {
+        console.warn("Invalid expires value. Skipping Expires parameter.");
+      }
     }
 
     const command = new PutObjectCommand(params);
@@ -206,8 +210,7 @@ async function storeFile(contents, key, filename, contentType, expires) {
       throw error;
     }
   } else {
-    // default to db storage
-    const db = useDatabase();
+    const db = createDatabaseClient();
 
     try {
       let query = db
@@ -233,6 +236,8 @@ async function storeFile(contents, key, filename, contentType, expires) {
       await query.execute();
     } catch (e) {
       throw new DatabaseError(e);
+    } finally {
+      await db.destroy();
     }
   }
 }

package/src/database.js

@@ -70,6 +70,7 @@ function useDatabase() {
 
   // If we've gotten to this point, then we know that we are in a custom function runtime server
   // context and we haven't been able to retrieve the in-context instance of Kysely, which means we should throw an error.
+  console.trace();
   throw new Error("useDatabase must be called within a function");
 }
 

package/src/handleRequest.js

@@ -80,6 +80,7 @@ async function handleRequest(request, config) {
             return customFunction(ctx, inputs);
           }
         );
+
         if (result instanceof Error) {
           span.recordException(result);
           span.setStatus({