@teamkeel/functions-runtime 0.395.0 → 0.395.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.395.0",
+  "version": "0.395.2",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {
@@ -21,6 +21,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.637.0",
     "@aws-sdk/credential-providers": "^3.637.0",
+    "@aws-sdk/s3-request-presigner": "^3.637.0",
     "@neondatabase/serverless": "^0.9.4",
     "@opentelemetry/api": "^1.7.0",
     "@opentelemetry/exporter-trace-otlp-proto": "^0.46.0",

package/src/File.js

@@ -4,7 +4,8 @@ const {
   GetObjectCommand,
 } = require("@aws-sdk/client-s3");
 const { fromEnv } = require("@aws-sdk/credential-providers");
-const { useDatabase } = require("./database");
+const { getSignedUrl } = require("@aws-sdk/s3-request-presigner");
+const { createDatabaseClient } = require("./database");
 const { DatabaseError } = require("./errors");
 const KSUID = require("ksuid");
 
@@ -105,9 +106,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 +121,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 +138,8 @@ class File extends InlineFile {
       return row.data;
     } catch (e) {
       throw new DatabaseError(e);
+    } finally {
+      await db.destroy();
     }
   }
 
@@ -157,6 +158,30 @@ class File extends InlineFile {
     return this;
   }
 
+  async getPresignedUrl() {
+    if (isS3Storage()) {
+      const s3Client = new S3Client({
+        credentials: fromEnv(),
+        region: process.env.KEEL_REGION,
+      });
+
+      const command = new GetObjectCommand({
+        Bucket: process.env.KEEL_FILES_BUCKET_NAME,
+        Key: "files/" + this.key(),
+      });
+
+      const url = await getSignedUrl(s3Client, command, { expiresIn: 60 * 24 });
+
+      return new URL(url);
+    } else {
+      const contents = await this.read();
+      const dataurl = `data:${this.contentType};name=${
+        this.filename
+      };base64,${contents.toString("base64")}`;
+      return new URL(dataurl);
+    }
+  }
+
   toDbRecord() {
     return {
       key: this.key,
@@ -210,7 +235,7 @@ async function storeFile(contents, key, filename, contentType, expires) {
       throw error;
     }
   } else {
-    const db = useDatabase();
+    const db = createDatabaseClient();
 
     try {
       let query = db
@@ -236,6 +261,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({

package/src/index.d.ts

@@ -176,6 +176,9 @@ export declare class File extends InlineFile {
   get key(): string;
   // Gets size of the file's contents in bytes
   get isPublic(): boolean;
+  // Generates a presigned download URL
+  getPresignedUrl(): Promise<URL>;
+  // Creates a new instance from the database record
   static fromDbRecord(input: FileDbRecord): File;
   // Persists the file
   toDbRecord(): FileDbRecord;