@lucaapp/service-utils 1.56.2 → 1.56.4

package/dist/lib/api/endpoint.js

@@ -8,7 +8,7 @@ const zod_1 = require("zod");
 const assert_1 = __importDefault(require("assert"));
 const http_1 = require("./types/http");
 const libphonenumber_js_1 = require("libphonenumber-js");
-const multer_1 = __importDefault(require("multer"));
+const busboy_1 = __importDefault(require("busboy"));
 const sendBadContextError = (response, error, debug) => {
     response.err = error;
     return response.status(500).send({
@@ -147,22 +147,46 @@ const validateAndSendResponse = async (expressResponse, response, validResponses
         sendErrorResponse(expressResponse, error, undefined, debug);
     }
 };
-const upload = (0, multer_1.default)({
-    storage: multer_1.default.memoryStorage(),
-});
-function handleFileUpload(request, response) {
+async function stream2buffer(stream) {
     return new Promise((resolve, reject) => {
-        upload.single('file')(request, response, err => {
-            if (err) {
-                reject(err);
-            }
-            else {
-                if (!request.file) {
-                    return resolve();
-                }
-                resolve(request.file);
-            }
+        const buf = [];
+        stream.on('data', chunk => buf.push(chunk));
+        stream.on('end', () => resolve(Buffer.concat(buf)));
+        stream.on('error', error => reject(error));
+    });
+}
+function handleFileUpload(request) {
+    return new Promise((resolve, reject) => {
+        const bb = (0, busboy_1.default)({
+            headers: request.headers,
+            defCharset: 'utf8',
+            limits: {
+                fileSize: 20 * 1024 * 1024, // 20 mb
+                files: 1,
+            },
+        });
+        let file = undefined;
+        bb.once('error', error => {
+            reject(error);
+        });
+        bb.on('file', async (fieldname, fileStream, filename) => {
+            const { encoding, mimeType: mimetype, filename: name } = filename;
+            const originalName = Buffer.from(name, 'latin1').toString('utf8');
+            const fileBuffer = await stream2buffer(fileStream);
+            file = {
+                buffer: fileBuffer,
+                originalname: originalName,
+                encoding,
+                mimetype,
+                size: fileBuffer.length,
+                fieldname: fieldname,
+                filename: name,
+            };
+        });
+        bb.once('finish', () => {
+            resolve(file);
         });
+        request.pipe(bb);
     });
 }
 const handleMiddleware = async (middleware, context, request, response, debug) => 
@@ -194,10 +218,11 @@ new Promise(async (resolve) => {
         }
         const { ip, baseUrl, originalUrl, route, method } = request;
         let file = undefined;
-        if (request.headers['content-type']?.includes('multipart/form-data')) {
-            file = await handleFileUpload(request, response);
+        if (middleware.options.config?.isFileUpload &&
+            request.headers['content-type']?.includes('multipart/form-data')) {
+            file = await handleFileUpload(request);
         }
-        // if the header is multipart we should use multer and return a buffer with the content
+        // if the header is multipart we should return a buffer with the content
         const handlerRequest = {
             body: handlerRequestBody,
             ...(file && { file }),

package/dist/lib/api/types/middleware.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { z } from 'zod';
 import { ArrayToUnion, ExtractZodOutput, ZodSchemaOuput } from './utils';
 export type EndpointResponseSchema = {
@@ -6,6 +7,15 @@ export type EndpointResponseSchema = {
     schema: z.ZodSchema<any> | z.ZodVoid;
     headers?: Record<string, string>;
 };
+export type FileUpload = {
+    buffer: Buffer;
+    originalname: string;
+    encoding: string;
+    mimetype: string;
+    size: number;
+    fieldname: string;
+    filename: string;
+};
 export type MiddlewareHandler<TResponseSchema, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TContextSchema> = (request: {
     body: ZodSchemaOuput<TRequestBodySchema>;
     params: ZodSchemaOuput<TRequestParamsSchema>;
@@ -16,7 +26,7 @@ export type MiddlewareHandler<TResponseSchema, TRequestBodySchema, TRequestParam
     originalUrl: string;
     path: string;
     method: string;
-    file?: Express.Multer.File;
+    file?: FileUpload;
 }, send: (response: ExtractZodOutput<ArrayToUnion<TResponseSchema>>) => void, next: (context?: ZodSchemaOuput<TContextSchema>) => void) => Promise<void>;
 export type MiddlewareOptions<TResponseSchemas extends ReadonlyArray<EndpointResponseSchema>, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TContextSchema> = {
     schemas?: {
@@ -27,6 +37,9 @@ export type MiddlewareOptions<TResponseSchemas extends ReadonlyArray<EndpointRes
         context?: TContextSchema;
     };
     responses: TResponseSchemas;
+    config?: {
+        isFileUpload?: boolean;
+    };
     errors?: Record<string, number>;
 };
 export type Middleware<TResponseSchemas extends ReadonlyArray<EndpointResponseSchema>, TRequestBodySchema, TRequestParamsSchema, TRequestQuerySchema, TRequestHeadersSchema, TContextSchema> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucaapp/service-utils",
-  "version": "1.56.2",
+  "version": "1.56.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "files": [
@@ -23,11 +23,11 @@
     "@tsconfig/node18": "1.0.1",
     "@types/express": "4.17.15",
     "@types/express-serve-static-core": "^4.17.43",
-    "@types/multer": "^1.4.11",
     "@types/node": "18.18.2",
     "@types/response-time": "^2.3.5",
     "@types/swagger-ui-express": "4.1.3",
     "axios": "^1.6.0",
+    "busboy": "^1.6.0",
     "cls-rtracer": "^2.6.2",
     "express": "4.19.2",
     "express-async-errors": "3.1.1",
@@ -36,7 +36,6 @@
     "libphonenumber-js": "1.9.44",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.44",
-    "multer": "^1.4.5-lts.1",
     "negotiator": "^0.6.3",
     "pino-http": "9.0.0",
     "prom-client": "14.1.0",
@@ -49,6 +48,7 @@
     "zod": "3.22.3"
   },
   "devDependencies": {
+    "@types/busboy": "^1.5.3",
     "@types/express": "4.17.15",
     "@types/lodash": "^4.14.187",
     "@types/negotiator": "^0.6.1",