@tc-libs/file-handler 4.9.0 → 4.10.0

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@tc-libs/file-handler",
-  "version": "4.9.0",
+  "version": "4.10.0",
   "dependencies": {
-    "@tc-libs/app-cache": "4.9.0",
-    "@tc-libs/constant": "4.9.0",
-    "@tc-libs/database": "4.9.0",
-    "@tc-libs/file": "4.9.0",
-    "@tc-libs/storage": "4.9.0",
+    "@tc-libs/app-cache": "4.10.0",
+    "@tc-libs/constant": "4.10.0",
+    "@tc-libs/database": "4.10.0",
+    "@tc-libs/file": "4.10.0",
+    "@tc-libs/storage": "4.10.0",
     "bytes": "3.1.2",
     "fluent-ffmpeg": "^2.1.3",
     "lodash": "^4.17.21",

package/src/services/file-handler.service.js

@@ -104,13 +104,10 @@ let FileHandlerService = FileHandlerService_1 = class FileHandlerService {
         // content
         const content = file.buffer;
         // final response
-        let response;
+        let response = null;
         switch (fileType) {
             case 'image':
-                if (ext === '.gif') {
-                    response = await (0, file_1.handleFile)(ext, hashName, file, mime, content, fileType, this._storage, options);
-                }
-                else
+                if (ext !== '.gif')
                     response = await (0, handlers_1.handleImg)(this._imgConf, ext, hashName, file, mime, content, fileType, this._storage, options);
                 break;
             // case 'video':
@@ -137,10 +134,9 @@ let FileHandlerService = FileHandlerService_1 = class FileHandlerService {
             //     this._storage,
             //   );
             //   break;
-            default:
-                response = null;
-                break;
         }
+        if (!response)
+            response = await (0, file_1.handleFile)(ext, hashName, file, mime, content, fileType, this._storage, options);
         return response;
     }
     hashName(name) {

package/src/services/file-handler.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"file-handler.service.js","sourceRoot":"","sources":["../../../../../packages/file-handler/src/services/file-handler.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file-handler.service.js","sourceRoot":"","sources":["../../../../../packages/file-handler/src/services/file-handler.service.ts"],"names":[],"mappings":"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"}

package/src/services/handlers/file.js

@@ -1,7 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleFile = void 0;
+const tslib_1 = require("tslib");
+const sharp_1 = tslib_1.__importDefault(require("sharp"));
 const handleFile = async (ext, hashName, file, mime, content, fileType, storage, options) => {
+    let image, metadata = null;
+    try {
+        // get image by sharp
+        image = (0, sharp_1.default)(content);
+        // get metadata for estract original width and height
+        metadata = await image.metadata();
+    }
+    catch (error) {
+        console.error('Error processing image with sharp:', error);
+    }
     // get all resizes
     const key = `${hashName}${ext}`;
     const storageResponse = await storage.uploadItem(key, content, {
@@ -23,7 +35,7 @@ const handleFile = async (ext, hashName, file, mime, content, fileType, storage,
         provider: storageResponse.provider,
         width: null,
         height: null,
-        metadata: null,
+        metadata,
         formats: [],
     };
     return response;

package/src/services/handlers/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../../packages/file-handler/src/services/handlers/file.ts"],"names":[],"mappings":";;;AAKO,MAAM,UAAU,GAAG,KAAK,EAC7B,GAAW,EACX,QAAgB,EAChB,IAAW,EACX,IAAS,EACT,OAAe,EACf,QAAgB,EAChB,OAA4B,EAC5B,OAA0B,EACG,EAAE;IAC/B,kBAAkB;IAClB,MAAM,GAAG,GAAG,GAAG,QAAQ,GAAG,GAAG,EAAE,CAAC;IAChC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE;QAC7D,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IACH,kBAAkB;IAClB,MAAM,QAAQ,GAAuB;QACnC,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,IAAI,EAAE,eAAe,CAAC,gBAAgB;QACtC,MAAM,EAAE,eAAe,CAAC,IAAI;QAC5B,IAAI,EAAE,QAAQ;QACd,GAAG;QACH,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE,eAAe,CAAC,OAAO;QAChC,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AApCW,QAAA,UAAU,cAoCrB"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../../../../../packages/file-handler/src/services/handlers/file.ts"],"names":[],"mappings":";;;;AAIA,0DAA0B;AAEnB,MAAM,UAAU,GAAG,KAAK,EAC7B,GAAW,EACX,QAAgB,EAChB,IAAW,EACX,IAAS,EACT,OAAe,EACf,QAAgB,EAChB,OAA4B,EAC5B,OAA0B,EACG,EAAE;IAC/B,IAAI,KAAK,EACP,QAAQ,GAAG,IAAI,CAAC;IAClB,IAAI,CAAC;QACH,qBAAqB;QACrB,KAAK,GAAG,IAAA,eAAK,EAAC,OAAO,CAAC,CAAC;QACvB,qDAAqD;QACrD,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,kBAAkB;IAClB,MAAM,GAAG,GAAG,GAAG,QAAQ,GAAG,GAAG,EAAE,CAAC;IAChC,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE;QAC7D,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,OAAO,CAAC,GAAG;KACjB,CAAC,CAAC;IACH,kBAAkB;IAClB,MAAM,QAAQ,GAAuB;QACnC,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,IAAI,EAAE,eAAe,CAAC,gBAAgB;QACtC,MAAM,EAAE,eAAe,CAAC,IAAI;QAC5B,IAAI,EAAE,QAAQ;QACd,GAAG;QACH,IAAI;QACJ,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,OAAO,EAAE,eAAe,CAAC,OAAO;QAChC,WAAW,EAAE,eAAe,CAAC,WAAW;QACxC,QAAQ,EAAE,eAAe,CAAC,QAAQ;QAClC,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,IAAI;QACZ,QAAQ;QACR,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AA/CW,QAAA,UAAU,cA+CrB"}