@wrcb/cb-common 1.0.468 → 1.0.470

package/build/index.d.ts

@@ -26,5 +26,3 @@ export * from './types/giftType';
 export * from './types/paymentProviderType';
 export * from './events/subjects';
 export * from './services/TenantDataService';
-export * from './storage/types';
-export * from './storage/interfaces/MediaConfiguration';

package/build/index.js

@@ -42,5 +42,3 @@ __exportStar(require("./types/giftType"), exports);
 __exportStar(require("./types/paymentProviderType"), exports);
 __exportStar(require("./events/subjects"), exports);
 __exportStar(require("./services/TenantDataService"), exports);
-__exportStar(require("./storage/types"), exports);
-__exportStar(require("./storage/interfaces/MediaConfiguration"), exports);

package/build/middlewares/uploadMedia.d.ts

@@ -14,9 +14,6 @@ declare global {
     }
 }
 export declare const uploadMedia: {
-    single: (fieldName: string) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
-    multiple: (fieldName: string, maxCount?: number) => import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     fields: (fields: ExtendedField[]) => (req: Request, res: Response, next: NextFunction) => void;
-    processUpload: (req: Request, res: Response, next: NextFunction) => Promise<void>;
 };
 export {};

package/build/middlewares/uploadMedia.js

@@ -1,28 +1,17 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.uploadMedia = void 0;
+// NÃO APAGAR ESTE
 const multer_1 = __importDefault(require("multer"));
-const factory_1 = require("../storage/factory");
-const tenant_1 = require("../types/tenant");
-const storageService_1 = require("../storage/services/storageService");
-const badRequestError_1 = require("../errors/badRequestError");
 const storage = multer_1.default.memoryStorage();
 const upload = (0, multer_1.default)({ storage });
 exports.uploadMedia = {
-    single: (fieldName) => upload.single(fieldName),
-    multiple: (fieldName, maxCount) => upload.array(fieldName, maxCount),
+    // single: (fieldName: string) => upload.single(fieldName),
+    // multiple: (fieldName: string, maxCount?: number) =>
+    //   upload.array(fieldName, maxCount),
     fields: (fields) => {
         const multerFields = fields.map(({ name, maxCount }) => ({
             name,
@@ -33,87 +22,87 @@ exports.uploadMedia = {
             req._uploadFieldConfig = fields;
             middleware(req, res, next);
         };
-    },
-    processUpload: (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-        try {
-            const storageService = new storageService_1.StorageService(factory_1.StorageFactory.create());
-            const tenant = req.headers['x-tenant'] || tenant_1.Tenant.PoliticaBet;
-            let allFiles = [];
-            if (req.file) {
-                allFiles = [req.file];
-            }
-            else if (req.files) {
-                if (Array.isArray(req.files)) {
-                    allFiles = req.files;
-                }
-                else {
-                    allFiles = Object.values(req.files).flat();
-                }
-            }
-            if (!allFiles.length)
-                return next();
-            // ✅ Verificar se há mais de 5 imagens ou mais de 1 vídeo
-            if (req.files && !Array.isArray(req.files)) {
-                const imageFiles = req.files['images'] || [];
-                const videoFiles = req.files['videos'] || [];
-                if (imageFiles.length > 5) {
-                    throw new badRequestError_1.BadRequestError('TooManyImages');
-                }
-                if (videoFiles.length > 1) {
-                    throw new badRequestError_1.BadRequestError('TooManyVideos');
-                }
-            }
-            // ✅ Verificar novamente via allFiles se alguém tentar burlar o `fieldname`
-            const videoCount = allFiles.filter(f => f.mimetype.startsWith('video/')).length;
-            if (videoCount > 1) {
-                throw new badRequestError_1.BadRequestError('TooManyVideos');
-            }
-            // Validação de tamanho por campo
-            const fieldConfig = req._uploadFieldConfig || [];
-            const getMaxSizeForField = (fieldName) => {
-                const field = fieldConfig.find(f => f.name === fieldName);
-                return (field === null || field === void 0 ? void 0 : field.maxSizeMB) ? field.maxSizeMB * 1024 * 1024 : undefined;
-            };
-            for (const file of allFiles) {
-                const isVideo = file.mimetype.startsWith('video/');
-                const isImage = file.mimetype.startsWith('image/');
-                if (!isImage && !isVideo) {
-                    throw new badRequestError_1.BadRequestError('InvalidFileType');
-                }
-                const maxSize = getMaxSizeForField(file.fieldname);
-                if (maxSize && file.size > maxSize) {
-                    throw new badRequestError_1.BadRequestError(isImage ? 'ImageTooLarge' : 'VideoTooLarge');
-                }
-            }
-            const uploadPromises = allFiles.map((file) => __awaiter(void 0, void 0, void 0, function* () {
-                var _a;
-                const isVideo = file.mimetype.startsWith('video/');
-                const type = isVideo ? 'video' : 'photo';
-                const options = {
-                    tenant,
-                    userId: (_a = req.currentUser) === null || _a === void 0 ? void 0 : _a.id,
-                    targetId: req.body.targetId || undefined,
-                    type,
-                    generateThumbnail: true
-                };
-                return isVideo
-                    ? storageService.uploadVideo(file.buffer, file.originalname, options)
-                    : storageService.uploadImage(file.buffer, file.originalname, options);
-            }));
-            const results = yield Promise.all(uploadPromises);
-            req.uploadResults = results;
-            if (req.files && !Array.isArray(req.files)) {
-                req.uploadResultsByField = {};
-                let index = 0;
-                for (const [fieldName, files] of Object.entries(req.files)) {
-                    req.uploadResultsByField[fieldName] = results.slice(index, index + files.length);
-                    index += files.length;
-                }
-            }
-            next();
-        }
-        catch (error) {
-            next(error);
-        }
-    })
+    }
+    // processUpload: async (req: Request, res: Response, next: NextFunction) => {
+    //   try {
+    //     const storageService = new StorageService(StorageFactory.create())
+    //     const tenant = (req.headers['x-tenant'] as Tenant) || Tenant.PoliticaBet
+    //     let allFiles: Express.Multer.File[] = []
+    //     if (req.file) {
+    //       allFiles = [req.file]
+    //     } else if (req.files) {
+    //       if (Array.isArray(req.files)) {
+    //         allFiles = req.files
+    //       } else {
+    //         allFiles = Object.values(req.files).flat()
+    //       }
+    //     }
+    //     if (!allFiles.length) return next()
+    //     // ✅ Verificar se há mais de 5 imagens ou mais de 1 vídeo
+    //     if (req.files && !Array.isArray(req.files)) {
+    //       const imageFiles = req.files['images'] || []
+    //       const videoFiles = req.files['videos'] || []
+    //       if (imageFiles.length > 5) {
+    //         throw new BadRequestError('TooManyImages')
+    //       }
+    //       if (videoFiles.length > 1) {
+    //         throw new BadRequestError('TooManyVideos')
+    //       }
+    //     }
+    //     // ✅ Verificar novamente via allFiles se alguém tentar burlar o `fieldname`
+    //     const videoCount = allFiles.filter(f =>
+    //       f.mimetype.startsWith('video/')
+    //     ).length
+    //     if (videoCount > 1) {
+    //       throw new BadRequestError('TooManyVideos')
+    //     }
+    //     // Validação de tamanho por campo
+    //     const fieldConfig = req._uploadFieldConfig || []
+    //     const getMaxSizeForField = (fieldName: string): number | undefined => {
+    //       const field = fieldConfig.find(f => f.name === fieldName)
+    //       return field?.maxSizeMB ? field.maxSizeMB * 1024 * 1024 : undefined
+    //     }
+    //     for (const file of allFiles) {
+    //       const isVideo = file.mimetype.startsWith('video/')
+    //       const isImage = file.mimetype.startsWith('image/')
+    //       if (!isImage && !isVideo) {
+    //         throw new BadRequestError('InvalidFileType')
+    //       }
+    //       const maxSize = getMaxSizeForField(file.fieldname)
+    //       if (maxSize && file.size > maxSize) {
+    //         throw new BadRequestError(isImage ? 'ImageTooLarge' : 'VideoTooLarge')
+    //       }
+    //     }
+    //     const uploadPromises = allFiles.map(async file => {
+    //       const isVideo = file.mimetype.startsWith('video/')
+    //       const type: MediaType = isVideo ? 'video' : 'photo'
+    //       const options: UploadOptions = {
+    //         tenant,
+    //         userId: req.currentUser?.id,
+    //         targetId: req.body.targetId || undefined,
+    //         type,
+    //         generateThumbnail: true
+    //       }
+    //       return isVideo
+    //         ? storageService.uploadVideo(file.buffer, file.originalname, options)
+    //         : storageService.uploadImage(file.buffer, file.originalname, options)
+    //     })
+    //     const results = await Promise.all(uploadPromises)
+    //     req.uploadResults = results
+    //     if (req.files && !Array.isArray(req.files)) {
+    //       req.uploadResultsByField = {}
+    //       let index = 0
+    //       for (const [fieldName, files] of Object.entries(req.files)) {
+    //         req.uploadResultsByField[fieldName] = results.slice(
+    //           index,
+    //           index + files.length
+    //         )
+    //         index += files.length
+    //       }
+    //     }
+    //     next()
+    //   } catch (error) {
+    //     next(error)
+    //   }
+    // }
 };

package/build/server.d.ts

@@ -61,9 +61,3 @@ export * from './events/private-show/userFollowedEvent';
 export * from './services/RedisService';
 export * from './services/TenantDataService';
 export * from './services/WasabiUploader';
-export * from './storage/services/storageService';
-export * from './storage/factory';
-export * from './storage/types';
-export * from './storage/providers/minio';
-export * from './storage/providers/spaces';
-export * from './storage/interfaces/MediaConfiguration';

package/build/server.js

@@ -77,9 +77,3 @@ __exportStar(require("./events/private-show/userFollowedEvent"), exports);
 __exportStar(require("./services/RedisService"), exports);
 __exportStar(require("./services/TenantDataService"), exports);
 __exportStar(require("./services/WasabiUploader"), exports);
-__exportStar(require("./storage/services/storageService"), exports);
-__exportStar(require("./storage/factory"), exports);
-__exportStar(require("./storage/types"), exports);
-__exportStar(require("./storage/providers/minio"), exports);
-__exportStar(require("./storage/providers/spaces"), exports);
-__exportStar(require("./storage/interfaces/MediaConfiguration"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wrcb/cb-common",
-  "version": "1.0.468",
+  "version": "1.0.470",
   "description": "Common resources between services",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/build/storage/factory.d.ts

@@ -1,4 +0,0 @@
-import { StorageProvider } from './types';
-export declare class StorageFactory {
-    static create(): StorageProvider;
-}

package/build/storage/factory.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.StorageFactory = void 0;
-const minio_1 = require("./providers/minio");
-const spaces_1 = require("./providers/spaces");
-const server_1 = require("../server");
-class StorageFactory {
-    static create() {
-        const provider = process.env.STORAGE_PROVIDER || 'minio';
-        switch (provider) {
-            case 'minio':
-                return new minio_1.MinioProvider({
-                    endPoint: process.env.MINIO_ENDPOINT || 'localhost',
-                    port: parseInt(process.env.MINIO_PORT || '9000'),
-                    useSSL: process.env.MINIO_USE_SSL === 'true',
-                    accessKey: process.env.MINIO_ACCESS_KEY || 'minioadmin',
-                    secretKey: process.env.MINIO_SECRET_KEY || 'minioadmin',
-                    bucket: process.env.MINIO_BUCKET || 'media-dev'
-                });
-            case 'spaces':
-                return new spaces_1.SpacesProvider({
-                    endpoint: process.env.DO_SPACES_ENDPOINT || 'nyc3.digitaloceanspaces.com',
-                    accessKeyId: process.env.DO_SPACES_KEY,
-                    secretAccessKey: process.env.DO_SPACES_SECRET,
-                    bucket: process.env.DO_SPACES_BUCKET
-                });
-            default:
-                throw new server_1.BadRequestError('UnknownStorageProvider');
-        }
-    }
-}
-exports.StorageFactory = StorageFactory;

package/build/storage/providers/minio.d.ts

@@ -1,19 +0,0 @@
-import { StorageProvider, UploadResult, MediaMetadata, ListFilters } from '../types';
-export declare class MinioProvider implements StorageProvider {
-    private client;
-    private bucket;
-    constructor(config: {
-        endPoint: string;
-        port: number;
-        useSSL: boolean;
-        accessKey: string;
-        secretKey: string;
-        bucket: string;
-    });
-    private ensureBucket;
-    upload(file: Buffer, path: string): Promise<UploadResult>;
-    delete(id: string): Promise<boolean>;
-    get(id: string): Promise<MediaMetadata | null>;
-    list(filters: ListFilters): Promise<MediaMetadata[]>;
-    private buildPrefix;
-}

package/build/storage/providers/minio.js

@@ -1,134 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MinioProvider = void 0;
-// src/storage/providers/minio.ts
-const Minio = __importStar(require("minio"));
-class MinioProvider {
-    constructor(config) {
-        this.client = new Minio.Client({
-            endPoint: config.endPoint,
-            port: config.port,
-            useSSL: config.useSSL,
-            accessKey: config.accessKey,
-            secretKey: config.secretKey
-        });
-        this.bucket = config.bucket;
-        this.ensureBucket();
-    }
-    ensureBucket() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const exists = yield this.client.bucketExists(this.bucket);
-            if (!exists) {
-                yield this.client.makeBucket(this.bucket, 'us-east-1');
-            }
-        });
-    }
-    upload(file, path) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const id = path;
-            yield this.client.putObject(this.bucket, path, file, file.length);
-            const url = `${process.env.STORAGE_PUBLIC_URL}/${this.bucket}/${path}`;
-            return {
-                id,
-                metadata: {
-                    url,
-                    size: file.length,
-                    type: 'image/jpeg', // Você pode detectar isso melhor
-                    uploadedAt: new Date()
-                }
-            };
-        });
-    }
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.client.removeObject(this.bucket, id);
-                return true;
-            }
-            catch (_a) {
-                return false;
-            }
-        });
-    }
-    get(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const stat = yield this.client.statObject(this.bucket, id);
-                const url = `${process.env.STORAGE_PUBLIC_URL}/${this.bucket}/${id}`;
-                return {
-                    url,
-                    size: stat.size,
-                    type: stat.metaData['content-type'] || 'application/octet-stream',
-                    uploadedAt: stat.lastModified
-                };
-            }
-            catch (_a) {
-                return null;
-            }
-        });
-    }
-    list(filters) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const prefix = this.buildPrefix(filters);
-            const stream = this.client.listObjectsV2(this.bucket, prefix, true);
-            const results = [];
-            return new Promise((resolve, reject) => {
-                stream.on('data', obj => {
-                    if (obj.name) {
-                        results.push({
-                            url: `${process.env.STORAGE_PUBLIC_URL}/${this.bucket}/${obj.name}`,
-                            size: obj.size,
-                            type: 'application/octet-stream',
-                            uploadedAt: obj.lastModified
-                        });
-                    }
-                });
-                stream.on('error', reject);
-                stream.on('end', () => resolve(results));
-            });
-        });
-    }
-    buildPrefix(filters) {
-        const parts = [filters.tenant];
-        if (filters.userId)
-            parts.push('users', filters.userId);
-        if (filters.targetId)
-            parts.push('targets', filters.targetId);
-        if (filters.type)
-            parts.push(filters.type);
-        return parts.join('/');
-    }
-}
-exports.MinioProvider = MinioProvider;

package/build/storage/providers/spaces.d.ts

@@ -1,17 +0,0 @@
-import { StorageProvider, UploadResult, MediaMetadata, ListFilters } from '../types';
-export declare class SpacesProvider implements StorageProvider {
-    private s3;
-    private bucket;
-    constructor(config: {
-        endpoint: string;
-        accessKeyId: string;
-        secretAccessKey: string;
-        bucket: string;
-    });
-    upload(file: Buffer, path: string): Promise<UploadResult>;
-    delete(id: string): Promise<boolean>;
-    get(id: string): Promise<MediaMetadata | null>;
-    list(filters: ListFilters): Promise<MediaMetadata[]>;
-    private detectContentType;
-    private buildPrefix;
-}

package/build/storage/providers/spaces.js

@@ -1,128 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpacesProvider = void 0;
-// src/storage/providers/minio.ts
-// DIGITAL OCEAN SPACES
-const aws_sdk_1 = __importDefault(require("aws-sdk"));
-class SpacesProvider {
-    constructor(config) {
-        this.s3 = new aws_sdk_1.default.S3({
-            endpoint: new aws_sdk_1.default.Endpoint(config.endpoint),
-            accessKeyId: config.accessKeyId,
-            secretAccessKey: config.secretAccessKey
-        });
-        this.bucket = config.bucket;
-    }
-    upload(file, path) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const params = {
-                Bucket: this.bucket,
-                Key: path,
-                Body: file,
-                ACL: 'public-read',
-                ContentType: this.detectContentType(path)
-            };
-            const result = yield this.s3.upload(params).promise();
-            return {
-                id: path,
-                metadata: {
-                    url: result.Location,
-                    size: file.length,
-                    type: params.ContentType,
-                    uploadedAt: new Date()
-                }
-            };
-        });
-    }
-    delete(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.s3
-                    .deleteObject({
-                    Bucket: this.bucket,
-                    Key: id
-                })
-                    .promise();
-                return true;
-            }
-            catch (_a) {
-                return false;
-            }
-        });
-    }
-    get(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const head = yield this.s3
-                    .headObject({
-                    Bucket: this.bucket,
-                    Key: id
-                })
-                    .promise();
-                return {
-                    url: `https://${this.bucket}.${this.s3.endpoint.hostname}/${id}`,
-                    size: head.ContentLength || 0,
-                    type: head.ContentType || 'application/octet-stream',
-                    uploadedAt: head.LastModified || new Date()
-                };
-            }
-            catch (_a) {
-                return null;
-            }
-        });
-    }
-    list(filters) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const prefix = this.buildPrefix(filters);
-            const params = {
-                Bucket: this.bucket,
-                Prefix: prefix,
-                MaxKeys: filters.limit || 1000
-            };
-            const result = yield this.s3.listObjectsV2(params).promise();
-            return (result.Contents || []).map(obj => ({
-                url: `https://${this.bucket}.${this.s3.endpoint.hostname}/${obj.Key}`,
-                size: obj.Size || 0,
-                type: 'application/octet-stream',
-                uploadedAt: obj.LastModified || new Date()
-            }));
-        });
-    }
-    detectContentType(path) {
-        var _a;
-        const ext = (_a = path.split('.').pop()) === null || _a === void 0 ? void 0 : _a.toLowerCase();
-        const types = {
-            jpg: 'image/jpeg',
-            jpeg: 'image/jpeg',
-            png: 'image/png',
-            webp: 'image/webp',
-            mp4: 'video/mp4',
-            webm: 'video/webm',
-            mov: 'video/quicktime'
-        };
-        return types[ext || ''] || 'application/octet-stream';
-    }
-    buildPrefix(filters) {
-        const parts = [filters.tenant];
-        if (filters.userId)
-            parts.push('users', filters.userId);
-        if (filters.targetId)
-            parts.push('targets', filters.targetId);
-        if (filters.type)
-            parts.push(filters.type);
-        return parts.join('/');
-    }
-}
-exports.SpacesProvider = SpacesProvider;