pangea-server 3.3.33 → 3.3.35

package/dist/database/db-client.js

@@ -16,7 +16,7 @@ function initDatabase(models, seeds, config = {}) {
         username: (0, helpers_1.getEnvStr)('DB_USERNAME'),
         password: (0, helpers_1.getEnvStr)('DB_PASSWORD'),
         database: (0, helpers_1.getEnvStr)('DB_DATABASE'),
-        pool: { max: 5, min: 0, acquire: 30000, idle: 9999999 },
+        pool: { max: 10, min: 2, idle: 30000, acquire: 60000 },
         models: Object.values(models),
         logging: config.logging ? logQuery : false,
         benchmark: true,

package/dist/helpers/file.helpers.d.ts

@@ -1,8 +1,16 @@
-type PreviousFile = string | null | undefined;
-export declare function uploadImage(image: UploadableImage, previousFile: PreviousFile, ...folders: string[]): Promise<string>;
-export declare function uploadImages(images: UploadableImage[], ...folders: string[]): Promise<string[]>;
-export declare function uploadVideo(file: MulterFile, previousFile: PreviousFile, ...folders: string[]): Promise<string>;
-export declare function uploadVideos(files: MulterFile[], ...folders: string[]): Promise<string[]>;
+type PreviousFile = string | null;
+export declare function uploadImage(image: UploadableImage, folder: string, previousFile?: PreviousFile): Promise<string>;
+export declare function uploadImages(images: UploadableImage[], folder: string): Promise<string[]>;
+export declare function uploadVideo(file: MulterFile, folder: string, previousFile?: PreviousFile): Promise<string>;
+export declare function uploadVideos(files: MulterFile[], folder: string): Promise<string[]>;
 export declare function deleteFile(filename: string): Promise<void>;
 export declare function deleteFiles(filenames: string[]): Promise<void[]>;
+export declare function generateUploadUrl(contentType: string, folder: string): Promise<{
+    url: string;
+    key: string;
+}>;
+export declare function generateUploadUrls(contentTypes: string[], folder: string): Promise<{
+    url: string;
+    key: string;
+}[]>;
 export {};

package/dist/helpers/file.helpers.js

@@ -3,14 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteFiles = exports.deleteFile = exports.uploadVideos = exports.uploadVideo = exports.uploadImages = exports.uploadImage = void 0;
+exports.generateUploadUrls = exports.generateUploadUrl = exports.deleteFiles = exports.deleteFile = exports.uploadVideos = exports.uploadVideo = exports.uploadImages = exports.uploadImage = void 0;
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
 const fs_1 = __importDefault(require("fs"));
 const aws_sdk_1 = __importDefault(require("aws-sdk"));
-const sharp_1 = __importDefault(require("sharp"));
 // helpers
-const error_helpers_1 = require("./error.helpers");
 const print_helpers_1 = require("./print.helpers");
 const env_helpers_1 = require("./env.helpers");
 const random_helpers_1 = require("./random.helpers");
@@ -21,46 +19,31 @@ const s3 = new aws_sdk_1.default.S3({
     accessKeyId: (0, env_helpers_1.getEnvStr)('DIGITAL_OCEAN_SPACES_ACCESS_KEY'),
     secretAccessKey: (0, env_helpers_1.getEnvStr)('DIGITAL_OCEAN_SPACES_SECRET_KEY'),
 });
-async function uploadImage(image, previousFile, ...folders) {
-    if (!image)
-        error_helpers_1.AppError.Throw({ statusCodeName: 'BAD_REQUEST', errorCode: 'IMAGE_NOT_SENT' });
+async function uploadImage(image, folder, previousFile) {
     if (previousFile)
         await deleteFile(previousFile);
-    const imageBuffer = typeof image === 'string' ? await promises_1.default.readFile(path_1.default.join(process.cwd(), image)) : image.buffer;
-    const maxSizeKb = 100;
-    const maxSizeBytes = maxSizeKb * 1024;
-    const qualityRatio = imageBuffer.length > maxSizeBytes ? maxSizeBytes / imageBuffer.length : 1;
-    const qualityMultiplier = 2;
-    const targetQuality = Math.floor(qualityRatio * 100 * qualityMultiplier);
-    const quality = Math.max(10, Math.min(100, targetQuality));
-    const bufferCompressed = await (0, sharp_1.default)(imageBuffer).png({ quality }).toBuffer();
-    return uploadFile(bufferCompressed, 'image/jpeg', ...folders);
+    const buffer = typeof image === 'string' ? await promises_1.default.readFile(path_1.default.join(process.cwd(), image)) : image.buffer;
+    return uploadFile(buffer, folder, 'image/png');
 }
 exports.uploadImage = uploadImage;
-function uploadImages(images, ...folders) {
-    if (!images)
-        error_helpers_1.AppError.Throw({ statusCodeName: 'BAD_REQUEST', errorCode: 'IMAGES_NOT_SENT' });
-    return Promise.all(images.map((image) => uploadImage(image, undefined, ...folders)));
+function uploadImages(images, folder) {
+    return Promise.all(images.map((image) => uploadImage(image, folder)));
 }
 exports.uploadImages = uploadImages;
-async function uploadVideo(file, previousFile, ...folders) {
-    if (!file)
-        error_helpers_1.AppError.Throw({ statusCodeName: 'BAD_REQUEST', errorCode: 'VIDEO_NOT_SENT' });
+async function uploadVideo(file, folder, previousFile) {
     if (previousFile)
         await deleteFile(previousFile);
     const stream = fs_1.default.createReadStream(file.path);
     try {
-        return await uploadFile(stream, file.mimetype, ...folders);
+        return await uploadFile(stream, folder, file.mimetype);
     }
     finally {
         promises_1.default.unlink(file.path);
     }
 }
 exports.uploadVideo = uploadVideo;
-function uploadVideos(files, ...folders) {
-    if (!files)
-        error_helpers_1.AppError.Throw({ statusCodeName: 'BAD_REQUEST', errorCode: 'VIDEOS_NOT_SENT' });
-    return Promise.all(files.map((file) => uploadVideo(file, undefined, ...folders)));
+function uploadVideos(files, folder) {
+    return Promise.all(files.map((file) => uploadVideo(file, folder)));
 }
 exports.uploadVideos = uploadVideos;
 async function deleteFile(filename) {
@@ -72,16 +55,22 @@ function deleteFiles(filenames) {
     return Promise.all(filenames.map((filename) => deleteFile(filename)));
 }
 exports.deleteFiles = deleteFiles;
+async function generateUploadUrl(contentType, folder) {
+    const key = `${folder}/${(0, random_helpers_1.getRandomString)('short')}`;
+    const params = { Bucket: bucketName, Key: key, ContentType: contentType, ACL: 'public-read', Expires: 60 };
+    const url = await s3.getSignedUrlPromise('putObject', params);
+    return { url, key };
+}
+exports.generateUploadUrl = generateUploadUrl;
+async function generateUploadUrls(contentTypes, folder) {
+    return Promise.all(contentTypes.map((contentType) => generateUploadUrl(contentType, folder)));
+}
+exports.generateUploadUrls = generateUploadUrls;
 // internal functions
-async function uploadFile(body, contentType, ...folders) {
-    const params = {
-        Bucket: bucketName,
-        Key: `${folders.join('/')}/${(0, random_helpers_1.getRandomString)('short')}`,
-        Body: body,
-        ContentType: contentType,
-        ACL: 'public-read',
-    };
+async function uploadFile(body, folder, contentType) {
+    const key = `${folder}/${(0, random_helpers_1.getRandomString)('short')}`;
+    const params = { Bucket: bucketName, Key: key, ContentType: contentType, Body: body, ACL: 'public-read' };
     const res = await s3.upload(params).promise();
     (0, print_helpers_1.printInfo)('file', `file uploaded to ${res.Location}`);
-    return res.Key;
+    return key;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "3.3.33",
+  "version": "3.3.35",
   "files": [
     "dist"
   ],
@@ -58,7 +58,6 @@
     "reflect-metadata": "0.2.2",
     "sequelize": "6.37.7",
     "sequelize-typescript": "2.1.6",
-    "sharp": "0.34.1",
     "typia": "9.7.2"
   },
   "devDependencies": {