@sprucelabs/spruce-file-utils 9.0.60 → 9.2.0

package/README.md

@@ -3,3 +3,4 @@ Spruce File Utils
 ## Useful links
 
 - [Spruce Developer Documentation: https://developer.spruce.ai](https://developer.spruce.ai)
+

package/build/esm/uploading/FileUploader.d.ts

@@ -1,9 +1,12 @@
+import { Settings } from '../files.types';
+import SettingsStore from '../stores/Settings.store';
 export default class FileUploaderImpl implements FileUploader {
-    static Class?: new (localUploadDir?: string) => FileUploader;
+    static Class?: new (options: FileUploaderConstructorOptions) => FileUploader;
     private localUploadDir?;
     private uploadStrategy;
-    protected constructor(localUploadDir?: string);
-    static Uploader(): FileUploader;
+    private settings;
+    protected constructor(options: FileUploaderConstructorOptions);
+    static Uploader(settings: SettingsStore): FileUploader;
     upload(payload: UploadPayload): Promise<{
         uri: string;
         type: string;
@@ -13,6 +16,7 @@ export default class FileUploaderImpl implements FileUploader {
 export interface UploadPayload {
     base64Body: string;
     name: string;
+    organizationId?: string;
 }
 export interface UploadResponse {
     uri: string;
@@ -25,7 +29,13 @@ export interface UploadStrategyUploadOptions {
     name: string;
     buffer: Buffer;
     type: string;
+    settings?: Settings;
 }
 export interface UploadStrategy {
     upload(options: UploadStrategyUploadOptions): Promise<string>;
 }
+interface FileUploaderConstructorOptions {
+    localUploadDir?: string;
+    settings: SettingsStore;
+}
+export {};

package/build/esm/uploading/FileUploader.js

@@ -14,28 +14,37 @@ import * as uuid from 'uuid';
 import LocalUploadStrategy from './LocalUploadStrategy.js';
 import S3UploadStrategy from './S3UploadStrategy.js';
 export default class FileUploaderImpl {
-    constructor(localUploadDir) {
+    constructor(options) {
+        const { localUploadDir, settings } = options !== null && options !== void 0 ? options : {};
         this.localUploadDir = localUploadDir;
         this.uploadStrategy = this.localUploadDir
             ? new LocalUploadStrategy(this.localUploadDir)
             : new S3UploadStrategy();
+        this.settings = settings;
     }
-    static Uploader() {
+    static Uploader(settings) {
         var _a;
-        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)(process.env.LOCAL_UPLOAD_DIR);
+        return new ((_a = this.Class) !== null && _a !== void 0 ? _a : this)({
+            localUploadDir: process.env.LOCAL_UPLOAD_DIR,
+            settings,
+        });
     }
     upload(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { base64Body, name } = assertOptions(payload, [
+            const { base64Body, name, organizationId } = assertOptions(payload, [
                 'base64Body',
                 'name',
             ]);
+            const settings = yield this.settings.findOne({
+                'target.organizationId': organizationId,
+            });
             const { type, ext, buffer } = yield this.findTypeAndBuffer(base64Body, name);
             const uniqueName = `${uuid.v4()}.${ext}`;
             const uri = yield this.uploadStrategy.upload({
                 name: uniqueName,
                 buffer,
                 type,
+                settings: settings !== null && settings !== void 0 ? settings : undefined,
             });
             return { uri, type };
         });

package/build/esm/uploading/S3UploadStrategy.d.ts

@@ -1,4 +1,6 @@
+import AWS from 'aws-sdk';
 import { UploadStrategy, UploadStrategyUploadOptions } from './FileUploader';
 export default class S3UploadStrategy implements UploadStrategy {
+    static AWS: typeof AWS;
     upload(options: UploadStrategyUploadOptions): Promise<string>;
 }

package/build/esm/uploading/S3UploadStrategy.js

@@ -9,16 +9,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { assertOptions } from '@sprucelabs/schema';
 import AWS from 'aws-sdk';
-export default class S3UploadStrategy {
+class S3UploadStrategy {
     upload(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { name, buffer, type } = options;
-            const { env: { AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_S3_BUCKET }, } = assertOptions(process, [
-                'env.AWS_ACCESS_KEY_ID',
-                'env.AWS_SECRET_ACCESS_KEY',
-                'env.AWS_S3_BUCKET',
-            ]);
-            const s3 = new AWS.S3({
+            const { name, buffer, type, settings } = options;
+            let AWS_S3_BUCKET;
+            let AWS_ACCESS_KEY_ID;
+            let AWS_SECRET_ACCESS_KEY;
+            if (!settings) {
+                const { env: { AWS_ACCESS_KEY_ID: awsAccessKeyId, AWS_SECRET_ACCESS_KEY: awsSecretAccessKey, AWS_S3_BUCKET: awsS3Bucket, }, } = assertOptions(process, [
+                    'env.AWS_ACCESS_KEY_ID',
+                    'env.AWS_SECRET_ACCESS_KEY',
+                    'env.AWS_S3_BUCKET',
+                ]);
+                AWS_ACCESS_KEY_ID = awsAccessKeyId;
+                AWS_SECRET_ACCESS_KEY = awsSecretAccessKey;
+                AWS_S3_BUCKET = awsS3Bucket;
+            }
+            else {
+                const { awsAccessKeyId, awsSecretAccessKey, awsS3Bucket } = settings;
+                AWS_ACCESS_KEY_ID = awsAccessKeyId;
+                AWS_SECRET_ACCESS_KEY = awsSecretAccessKey;
+                AWS_S3_BUCKET = awsS3Bucket;
+            }
+            const s3 = new S3UploadStrategy.AWS.S3({
                 accessKeyId: AWS_ACCESS_KEY_ID,
                 secretAccessKey: AWS_SECRET_ACCESS_KEY,
             });
@@ -34,3 +48,5 @@ export default class S3UploadStrategy {
         });
     }
 }
+S3UploadStrategy.AWS = AWS;
+export default S3UploadStrategy;

package/build/uploading/FileUploader.d.ts

@@ -1,9 +1,12 @@
+import { Settings } from '../files.types';
+import SettingsStore from '../stores/Settings.store';
 export default class FileUploaderImpl implements FileUploader {
-    static Class?: new (localUploadDir?: string) => FileUploader;
+    static Class?: new (options: FileUploaderConstructorOptions) => FileUploader;
     private localUploadDir?;
     private uploadStrategy;
-    protected constructor(localUploadDir?: string);
-    static Uploader(): FileUploader;
+    private settings;
+    protected constructor(options: FileUploaderConstructorOptions);
+    static Uploader(settings: SettingsStore): FileUploader;
     upload(payload: UploadPayload): Promise<{
         uri: string;
         type: string;
@@ -13,6 +16,7 @@ export default class FileUploaderImpl implements FileUploader {
 export interface UploadPayload {
     base64Body: string;
     name: string;
+    organizationId?: string;
 }
 export interface UploadResponse {
     uri: string;
@@ -25,7 +29,13 @@ export interface UploadStrategyUploadOptions {
     name: string;
     buffer: Buffer;
     type: string;
+    settings?: Settings;
 }
 export interface UploadStrategy {
     upload(options: UploadStrategyUploadOptions): Promise<string>;
 }
+interface FileUploaderConstructorOptions {
+    localUploadDir?: string;
+    settings: SettingsStore;
+}
+export {};

package/build/uploading/FileUploader.js

@@ -43,26 +43,35 @@ const uuid = __importStar(require("uuid"));
 const LocalUploadStrategy_1 = __importDefault(require("./LocalUploadStrategy"));
 const S3UploadStrategy_1 = __importDefault(require("./S3UploadStrategy"));
 class FileUploaderImpl {
-    constructor(localUploadDir) {
+    constructor(options) {
+        const { localUploadDir, settings } = options ?? {};
         this.localUploadDir = localUploadDir;
         this.uploadStrategy = this.localUploadDir
             ? new LocalUploadStrategy_1.default(this.localUploadDir)
             : new S3UploadStrategy_1.default();
+        this.settings = settings;
     }
-    static Uploader() {
-        return new (this.Class ?? this)(process.env.LOCAL_UPLOAD_DIR);
+    static Uploader(settings) {
+        return new (this.Class ?? this)({
+            localUploadDir: process.env.LOCAL_UPLOAD_DIR,
+            settings,
+        });
     }
     async upload(payload) {
-        const { base64Body, name } = (0, schema_1.assertOptions)(payload, [
+        const { base64Body, name, organizationId } = (0, schema_1.assertOptions)(payload, [
             'base64Body',
             'name',
         ]);
+        const settings = await this.settings.findOne({
+            'target.organizationId': organizationId,
+        });
         const { type, ext, buffer } = await this.findTypeAndBuffer(base64Body, name);
         const uniqueName = `${uuid.v4()}.${ext}`;
         const uri = await this.uploadStrategy.upload({
             name: uniqueName,
             buffer,
             type,
+            settings: settings ?? undefined,
         });
         return { uri, type };
     }

package/build/uploading/S3UploadStrategy.d.ts

@@ -1,4 +1,6 @@
+import AWS from 'aws-sdk';
 import { UploadStrategy, UploadStrategyUploadOptions } from './FileUploader';
 export default class S3UploadStrategy implements UploadStrategy {
+    static AWS: typeof AWS;
     upload(options: UploadStrategyUploadOptions): Promise<string>;
 }

package/build/uploading/S3UploadStrategy.js

@@ -7,13 +7,27 @@ const schema_1 = require("@sprucelabs/schema");
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
 class S3UploadStrategy {
     async upload(options) {
-        const { name, buffer, type } = options;
-        const { env: { AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_S3_BUCKET }, } = (0, schema_1.assertOptions)(process, [
-            'env.AWS_ACCESS_KEY_ID',
-            'env.AWS_SECRET_ACCESS_KEY',
-            'env.AWS_S3_BUCKET',
-        ]);
-        const s3 = new aws_sdk_1.default.S3({
+        const { name, buffer, type, settings } = options;
+        let AWS_S3_BUCKET;
+        let AWS_ACCESS_KEY_ID;
+        let AWS_SECRET_ACCESS_KEY;
+        if (!settings) {
+            const { env: { AWS_ACCESS_KEY_ID: awsAccessKeyId, AWS_SECRET_ACCESS_KEY: awsSecretAccessKey, AWS_S3_BUCKET: awsS3Bucket, }, } = (0, schema_1.assertOptions)(process, [
+                'env.AWS_ACCESS_KEY_ID',
+                'env.AWS_SECRET_ACCESS_KEY',
+                'env.AWS_S3_BUCKET',
+            ]);
+            AWS_ACCESS_KEY_ID = awsAccessKeyId;
+            AWS_SECRET_ACCESS_KEY = awsSecretAccessKey;
+            AWS_S3_BUCKET = awsS3Bucket;
+        }
+        else {
+            const { awsAccessKeyId, awsSecretAccessKey, awsS3Bucket } = settings;
+            AWS_ACCESS_KEY_ID = awsAccessKeyId;
+            AWS_SECRET_ACCESS_KEY = awsSecretAccessKey;
+            AWS_S3_BUCKET = awsS3Bucket;
+        }
+        const s3 = new S3UploadStrategy.AWS.S3({
             accessKeyId: AWS_ACCESS_KEY_ID,
             secretAccessKey: AWS_SECRET_ACCESS_KEY,
         });
@@ -28,4 +42,5 @@ class S3UploadStrategy {
         return uploadedFile.Location;
     }
 }
+S3UploadStrategy.AWS = aws_sdk_1.default;
 exports.default = S3UploadStrategy;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@sprucelabs/spruce-file-utils",
 	"description": "Utils for working with files and Sprucebot.",
-	"version": "9.0.60",
+	"version": "9.2.0",
 	"skill": {
 		"namespace": "files"
 	},