@budibase/backend-core 3.2.35 → 3.2.37

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "3.2.35",
+  "version": "3.2.37",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -30,9 +30,6 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.709.0",
-    "@aws-sdk/lib-storage": "3.709.0",
-    "@aws-sdk/s3-request-presigner": "3.709.0",
     "@budibase/nano": "10.1.5",
     "@budibase/pouchdb-replication-stream": "1.2.11",
     "@budibase/shared-core": "*",
@@ -74,7 +71,6 @@
   "devDependencies": {
     "@jest/types": "^29.6.3",
     "@shopify/jest-koa-mocks": "5.1.1",
-    "@smithy/types": "4.0.0",
     "@swc/core": "1.3.71",
     "@swc/jest": "0.2.27",
     "@types/chance": "1.1.3",
@@ -114,5 +110,5 @@
       }
     }
   },
-  "gitHead": "b3b24c0789b35d089f69e9b56ddfc7462c09fc0e"
+  "gitHead": "39f78eda743e69d71d9a247f6dd63a44856b3c72"
 }

package/dist/src/environment.d.ts

@@ -45,7 +45,7 @@ declare const environment: {
     MINIO_ACCESS_KEY: string | undefined;
     MINIO_SECRET_KEY: string | undefined;
     AWS_SESSION_TOKEN: string | undefined;
-    AWS_REGION: string;
+    AWS_REGION: string | undefined;
     MINIO_URL: string | undefined;
     MINIO_ENABLED: string | number;
     INTERNAL_API_KEY: string | undefined;

package/dist/src/objectStore/buckets/app.d.ts

@@ -4,6 +4,6 @@ export declare function clientLibraryPath(appId: string): string;
  * due to issues with the domain we were unable to continue doing this - keeping
  * incase we are able to switch back to CDN path again in future.
  */
-export declare function clientLibraryCDNUrl(appId: string, version: string): Promise<string>;
+export declare function clientLibraryCDNUrl(appId: string, version: string): string;
 export declare function clientLibraryUrl(appId: string, version: string): string;
-export declare function getAppFileUrl(s3Key: string): Promise<string>;
+export declare function getAppFileUrl(s3Key: string): string;

package/dist/src/objectStore/buckets/global.d.ts

@@ -1,2 +1,2 @@
-export declare const getGlobalFileUrl: (type: string, name: string, etag?: string) => Promise<string>;
+export declare const getGlobalFileUrl: (type: string, name: string, etag?: string) => string;
 export declare const getGlobalFileS3Key: (type: string, name: string) => string;

package/dist/src/objectStore/buckets/plugins.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from "@budibase/types";
-export declare function enrichPluginURLs(plugins?: Plugin[]): Promise<Plugin[]>;
+export declare function enrichPluginURLs(plugins?: Plugin[]): Plugin[];
 export declare function getPluginJSKey(plugin: Plugin): string;
 export declare function getPluginIconKey(plugin: Plugin): string | undefined;
 export declare function getPluginS3Dir(pluginName: string): string;

package/dist/src/objectStore/objectStore.d.ts

@@ -1,6 +1,7 @@
-import { HeadObjectCommandOutput, S3, _Object as S3Object } from "@aws-sdk/client-s3";
-import stream, { Readable } from "stream";
+import AWS from "aws-sdk";
+import { Readable } from "stream";
 import fs, { PathLike, ReadStream } from "fs";
+import { HeadObjectOutput } from "aws-sdk/clients/s3";
 import { ReadableStream } from "stream/web";
 export declare const SIGNED_FILE_PREFIX = "/files/signed";
 type BaseUploadParams = {
@@ -31,9 +32,9 @@ export declare function sanitizeBucket(input: string): string;
  * @return an S3 object store object, check S3 Nodejs SDK for usage.
  * @constructor
  */
-export declare function ObjectStore(opts?: {
+export declare function ObjectStore(bucket: string, opts?: {
     presigning: boolean;
-}): S3;
+}): AWS.S3;
 /**
  * Given an object store and a bucket name this will make sure the bucket exists,
  * if it does not exist then it will create it.
@@ -46,39 +47,28 @@ export declare function createBucketIfNotExists(client: any, bucketName: string)
  * Uploads the contents of a file given the required parameters, useful when
  * temp files in use (for example file uploaded as an attachment).
  */
-export declare function upload({ bucket: bucketName, filename, path, type, metadata, body, ttl, }: UploadParams): Promise<import("@aws-sdk/client-s3").CompleteMultipartUploadCommandOutput>;
+export declare function upload({ bucket: bucketName, filename, path, type, metadata, body, ttl, }: UploadParams): Promise<AWS.S3.ManagedUpload.SendData>;
 /**
  * Similar to the upload function but can be used to send a file stream
  * through to the object store.
  */
 export declare function streamUpload({ bucket: bucketName, stream, filename, type, extra, ttl, }: StreamUploadParams): Promise<{
     ContentLength: number | undefined;
-    Location?: string | undefined;
-    Bucket?: string | undefined;
-    Key?: string | undefined;
-    Expiration?: string | undefined;
-    ETag?: string | undefined;
-    ChecksumCRC32?: string | undefined;
-    ChecksumCRC32C?: string | undefined;
-    ChecksumSHA1?: string | undefined;
-    ChecksumSHA256?: string | undefined;
-    ServerSideEncryption?: import("@aws-sdk/client-s3").ServerSideEncryption | undefined;
-    VersionId?: string | undefined;
-    SSEKMSKeyId?: string | undefined;
-    BucketKeyEnabled?: boolean | undefined;
-    RequestCharged?: import("@aws-sdk/client-s3").RequestCharged | undefined;
-    $metadata: import("@smithy/types").ResponseMetadata;
+    Location: string;
+    ETag: string;
+    Bucket: string;
+    Key: string;
 }>;
 /**
  * retrieves the contents of a file from the object store, if it is a known content type it
  * will be converted, otherwise it will be returned as a buffer stream.
  */
-export declare function retrieve(bucketName: string, filepath: string): Promise<string | stream.Readable>;
-export declare function listAllObjects(bucketName: string, path: string): Promise<S3Object[]>;
+export declare function retrieve(bucketName: string, filepath: string): Promise<any>;
+export declare function listAllObjects(bucketName: string, path: string): Promise<AWS.S3.Object[]>;
 /**
  * Generate a presigned url with a default TTL of 1 hour
  */
-export declare function getPresignedUrl(bucketName: string, key: string, durationSeconds?: number): Promise<string>;
+export declare function getPresignedUrl(bucketName: string, key: string, durationSeconds?: number): string;
 /**
  * Same as retrieval function but puts to a temporary file.
  */
@@ -87,8 +77,8 @@ export declare function retrieveDirectory(bucketName: string, path: string): Pro
 /**
  * Delete a single file.
  */
-export declare function deleteFile(bucketName: string, filepath: string): Promise<import("@aws-sdk/client-s3").DeleteObjectCommandOutput>;
-export declare function deleteFiles(bucketName: string, filepaths: string[]): Promise<import("@aws-sdk/client-s3").DeleteObjectsCommandOutput>;
+export declare function deleteFile(bucketName: string, filepath: string): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.S3.DeleteObjectOutput, AWS.AWSError>>;
+export declare function deleteFiles(bucketName: string, filepaths: string[]): Promise<import("aws-sdk/lib/request").PromiseResult<AWS.S3.DeleteObjectsOutput, AWS.AWSError>>;
 /**
  * Delete a path, including everything within.
  */
@@ -97,7 +87,7 @@ export declare function uploadDirectory(bucketName: string, localPath: string, b
 export declare function downloadTarballDirect(url: string, path: string, headers?: {}): Promise<void>;
 export declare function downloadTarball(url: string, bucketName: string, path: string): Promise<string>;
 export declare function getReadStream(bucketName: string, path: string): Promise<Readable>;
-export declare function getObjectMetadata(bucket: string, path: string): Promise<HeadObjectCommandOutput>;
+export declare function getObjectMetadata(bucket: string, path: string): Promise<HeadObjectOutput>;
 export declare function extractBucketAndPath(url: string): {
     bucket: string;
     path: string;

package/dist/src/objectStore/utils.d.ts

@@ -1,4 +1,4 @@
-import { PutBucketLifecycleConfigurationCommandInput } from "@aws-sdk/client-s3";
+import { PutBucketLifecycleConfigurationRequest } from "aws-sdk/clients/s3";
 import { AutomationAttachment, AutomationAttachmentContent, BucketedContent } from "@budibase/types";
 /****************************************************
  *      NOTE: When adding a new bucket - name       *
@@ -14,6 +14,6 @@ export declare const ObjectStoreBuckets: {
     TEMP: string;
 };
 export declare function budibaseTempDir(): string;
-export declare const bucketTTLConfig: (bucketName: string, days: number) => PutBucketLifecycleConfigurationCommandInput;
+export declare const bucketTTLConfig: (bucketName: string, days: number) => PutBucketLifecycleConfigurationRequest;
 export declare function processObjectStoreAttachment(attachment: AutomationAttachment): Promise<BucketedContent>;
 export declare function processAutomationAttachment(attachment: AutomationAttachment): Promise<AutomationAttachmentContent | BucketedContent>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "3.2.35",
+  "version": "3.2.37",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "dist/index.js",
   "types": "dist/src/index.d.ts",
@@ -30,9 +30,6 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "3.709.0",
-    "@aws-sdk/lib-storage": "3.709.0",
-    "@aws-sdk/s3-request-presigner": "3.709.0",
     "@budibase/nano": "10.1.5",
     "@budibase/pouchdb-replication-stream": "1.2.11",
     "@budibase/shared-core": "*",
@@ -74,7 +71,6 @@
   "devDependencies": {
     "@jest/types": "^29.6.3",
     "@shopify/jest-koa-mocks": "5.1.1",
-    "@smithy/types": "4.0.0",
     "@swc/core": "1.3.71",
     "@swc/jest": "0.2.27",
     "@types/chance": "1.1.3",
@@ -114,5 +110,5 @@
       }
     }
   },
-  "gitHead": "b3b24c0789b35d089f69e9b56ddfc7462c09fc0e"
+  "gitHead": "39f78eda743e69d71d9a247f6dd63a44856b3c72"
 }