@e-mc/compress 0.3.2 → 0.3.3

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2023 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { CompressConstructor } from '../types/lib';
-
-declare const Compress: CompressConstructor;
-
+import type { CompressConstructor } from '../types/lib';
+
+declare const Compress: CompressConstructor;
+
 export = Compress;

package/index.js

@@ -9,12 +9,13 @@ const { toSfnt, toWoff } = require('woff2sfnt-sfnt2woff');
 const types_1 = require("../types");
 const lib_v4_1 = require("../module/lib-v4");
 const module_1 = require("../module");
+const CACHE_IMAGE = {};
 const CACHE_FONT = {};
 const CACHE_FONTFROM = {};
 const CACHE_FONTTO = {};
+const CACHE_INIT = [false, false];
 const CACHE_TINIFY = {};
 let SINGLETON_INSTANCE;
-let CACHE_INIT = false;
 let TEMP_DIR = '';
 const GZIP_ZOPFLI = (function () {
     try {
@@ -24,52 +25,61 @@ const GZIP_ZOPFLI = (function () {
     }
     return null;
 })();
-function setCacheData() {
-    if (!CACHE_INIT) {
-        TEMP_DIR = this.getTempDir({ moduleDir: true, createDir: true, increment: 5 });
-        const settings = this.settings;
-        const expires = (0, types_1.parseExpires)(settings.cache_expires || 0);
+function setCacheData(index) {
+    if (CACHE_INIT[index]) {
+        return true;
+    }
+    TEMP_DIR || (TEMP_DIR = this.getTempDir({ moduleDir: true, createDir: true, increment: 5 }));
+    const settings = this.settings;
+    const expires = (0, types_1.parseExpires)(settings.cache_expires || 0);
+    if (TEMP_DIR) {
         if (expires === 0) {
-            settings.cache_expires = 0;
-        }
-        if (TEMP_DIR) {
-            if (expires === 0) {
+            if (CACHE_INIT.every(value => !value)) {
                 module_1.default.removeDir(TEMP_DIR, true);
             }
-            else {
-                const current = Date.now();
-                (function recurse(paths) {
-                    const srcDir = path.join(TEMP_DIR, ...paths);
-                    try {
-                        fs.readdirSync(srcDir, { withFileTypes: true }).forEach(item => {
-                            const filename = item.name;
-                            if (item.isFile()) {
-                                const pathname = path.join(srcDir, filename);
+            settings.cache_expires = 0;
+        }
+        else {
+            const current = Date.now();
+            (function recurse(paths) {
+                const srcDir = path.join(TEMP_DIR, ...paths);
+                try {
+                    fs.readdirSync(srcDir, { withFileTypes: true }).forEach(item => {
+                        var _a, _b, _c;
+                        const filename = item.name;
+                        if (item.isFile()) {
+                            const pathname = path.join(srcDir, filename);
+                            if (paths.length === 2) {
                                 try {
-                                    if (fs.lstatSync(pathname).atimeMs + expires > current) {
-                                        CACHE_FONT[paths.concat(filename).join('_')] = pathname;
-                                        CACHE_FONTFROM[filename] = paths[0];
-                                        CACHE_FONTTO[filename] = paths[1];
+                                    const stat = fs.lstatSync(pathname);
+                                    if (stat.atimeMs + expires > current) {
+                                        if (index === 0 /* CACHE_TYPE.FONT */) {
+                                            CACHE_FONT[paths.concat(filename).join('_')] = [pathname, stat.ctime];
+                                            CACHE_FONTFROM[filename] = paths[0];
+                                            CACHE_FONTTO[filename] = paths[1];
+                                        }
+                                        else {
+                                            ((_b = (CACHE_IMAGE[_a = paths[0]] || (CACHE_IMAGE[_a] = {})))[_c = paths[1]] || (_b[_c] = {}))[filename] = stat.ctime;
+                                        }
                                         return;
                                     }
                                 }
                                 catch {
                                 }
-                                removeFile(pathname);
                             }
-                            else if (item.isDirectory()) {
-                                recurse(paths.concat(filename));
-                            }
-                        });
-                    }
-                    catch {
-                    }
-                })([]);
-            }
+                            removeFile(pathname);
+                        }
+                        else if (item.isDirectory()) {
+                            recurse(paths.concat(filename));
+                        }
+                    });
+                }
+                catch {
+                }
+            })([]);
         }
-        CACHE_INIT = true;
     }
-    return true;
+    return CACHE_INIT[index] = true;
 }
 const removeFile = (pathname) => fs.unlink(pathname, () => { });
 const checkChunkSize = (value) => typeof value === 'number' && value > 0 && value % 1024 === 0;
@@ -278,7 +288,7 @@ class Compress extends module_1.default {
                         }
                         fs.writeFile(tempFont, data, err => {
                             if (!err) {
-                                CACHE_FONT[from + '_' + ext + '_' + hash] = tempFont;
+                                CACHE_FONT[from + '_' + ext + '_' + hash] = [tempFont, new Date()];
                                 CACHE_FONTTO[hash] = ext;
                             }
                         });
@@ -286,13 +296,13 @@ class Compress extends module_1.default {
                 };
                 const hasFont = () => {
                     let from, to;
-                    if (cache && (CACHE_INIT || setCacheData.call(this)) && (from = CACHE_FONTFROM[hash]) && (to = CACHE_FONTTO[hash])) {
+                    if (cache && (CACHE_INIT[0] || setCacheData.call(this, 0 /* CACHE_TYPE.FONT */)) && (from = CACHE_FONTFROM[hash]) && (to = CACHE_FONTTO[hash])) {
                         const cacheKey = from + `_${to}_` + hash;
                         const tempFont = CACHE_FONT[cacheKey];
                         if (tempFont) {
-                            if (module_1.default.isPath(tempFont)) {
+                            if (module_1.default.isPath(tempFont[0])) {
                                 try {
-                                    const data = fs.readFileSync(tempFont);
+                                    const data = fs.readFileSync(tempFont[0]);
                                     let pathname;
                                     if (output) {
                                         fs.writeFileSync(pathname = (0, types_1.renameExt)(output, to), data);
@@ -301,7 +311,7 @@ class Compress extends module_1.default {
                                     else {
                                         endProcess(null, data, to, '', true);
                                     }
-                                    this.formatMessage(8 /* LOG_TYPE.COMPRESS */, from, [pathname ? path.basename(pathname) : `Completed -> font/${to}`, 'cache'], tempFont, { ...module_1.default.LOG_STYLE_NOTICE, hintBold: true, sessionId, broadcastId });
+                                    this.formatMessage(8 /* LOG_TYPE.COMPRESS */, from, [pathname ? path.basename(pathname) : `Completed -> font/${to}`, 'cache'], tempFont[1].toLocaleString(), { ...module_1.default.LOG_STYLE_NOTICE, hintBold: true, sessionId, broadcastId });
                                     return true;
                                 }
                                 catch {
@@ -469,15 +479,14 @@ class Compress extends module_1.default {
         else {
             config || (config = {});
         }
-        const { plugin = 'tinify', filename, startTime = process.hrtime(), timeout = 0, proxyUrl, sessionId, broadcastId } = config;
+        const { plugin = 'tinify', filename, startTime = process.hrtime(), timeout = 0, proxyUrl, options, sessionId, broadcastId } = config;
         if (!(0, types_1.isString)(output)) {
             output = typeof file === 'string' ? file : '';
         }
         const ext = output ? path.extname(output).substring(1) : config.format || "Unknown" /* ERR_MESSAGE.UNKNOWN */;
         const format = config.format || ext;
-        this.formatMessage(8 /* LOG_TYPE.COMPRESS */, ext, ['Compressing image...', plugin], filename || output, { titleColor: 'magenta', sessionId, broadcastId });
         return new Promise((resolve, reject) => {
-            let timer = null, aborted, apiKey;
+            let timer = null, hash, cacheKey, aborted, apiKey;
             const failed = (err) => {
                 aborted = true;
                 if (timer) {
@@ -491,7 +500,7 @@ class Compress extends module_1.default {
                     reject(err);
                 }
             };
-            const success = (result) => {
+            const success = (result, ctime) => {
                 if (aborted) {
                     return;
                 }
@@ -499,12 +508,29 @@ class Compress extends module_1.default {
                     clearTimeout(timer);
                 }
                 const complete = (err) => {
-                    const value = output ? path.basename(output) : filename;
-                    this.writeTimeProcess(ext, value ? plugin + '@' + value : 'Completed', startTime, { type: 8 /* LOG_TYPE.COMPRESS */, sessionId, broadcastId });
+                    const value = output ? path.basename(output) : filename || (0, types_1.isString)(file) && path.basename(file);
+                    const status = value ? plugin + ' -> ' + value : 'Completed';
+                    if (ctime) {
+                        this.formatMessage(8 /* LOG_TYPE.COMPRESS */, value ? path.extname(value).substring(1) : '', [status, 'cache'], ctime.toLocaleString(), { ...module_1.default.LOG_STYLE_NOTICE, hintBold: true, sessionId, broadcastId });
+                    }
+                    else {
+                        this.writeTimeProcess(ext, status, startTime, { type: 8 /* LOG_TYPE.COMPRESS */, sessionId, broadcastId });
+                    }
                     if (callback) {
                         callback(err, result);
                     }
                     resolve(result);
+                    if (!ctime && hash && cacheKey && TEMP_DIR) {
+                        const pathname = path.join(TEMP_DIR, plugin, hash);
+                        if (module_1.default.createDir(pathname)) {
+                            fs.writeFile(path.join(pathname, cacheKey), result, error => {
+                                var _a, _b;
+                                if (!error) {
+                                    ((_a = (CACHE_IMAGE[plugin] || (CACHE_IMAGE[plugin] = {})))[_b = hash] || (_a[_b] = {}))[cacheKey] = new Date();
+                                }
+                            });
+                        }
+                    }
                 };
                 if (output) {
                     fs.writeFile(output, result, err => complete(err));
@@ -540,9 +566,6 @@ class Compress extends module_1.default {
                         return;
                 }
             }
-            if (timeout > 0) {
-                timer = setTimeout(() => failed((0, types_1.errorMessage)(plugin, "Timeout was exceeded" /* ERR_MESSAGE.TIMEOUT */)), timeout);
-            }
             let data;
             try {
                 data = Buffer.isBuffer(file) ? file : fs.readFileSync(file);
@@ -551,10 +574,31 @@ class Compress extends module_1.default {
                 failed(err);
                 return;
             }
+            if (this.settings.cache && setCacheData.call(this, 1 /* CACHE_TYPE.IMAGE */)) {
+                let stored;
+                try {
+                    stored = (CACHE_IMAGE[plugin] || (CACHE_IMAGE[plugin] = {}))[hash = module_1.default.asHash(data)];
+                    cacheKey = module_1.default.asHash(plugin + ':' + (apiKey ? format + apiKey : module_1.default.asString(options) || 'unknown'), 'md5');
+                    const ctime = stored?.[cacheKey];
+                    if (ctime) {
+                        success(fs.readFileSync(path.join(TEMP_DIR, plugin, hash, cacheKey)), ctime);
+                        return;
+                    }
+                }
+                catch {
+                    if (stored && cacheKey) {
+                        delete stored[cacheKey];
+                    }
+                }
+            }
+            this.formatMessage(8 /* LOG_TYPE.COMPRESS */, ext, ['Compressing image...', plugin], filename || output, { titleColor: 'magenta', sessionId, broadcastId });
+            if (timeout > 0) {
+                timer = setTimeout(() => failed((0, types_1.errorMessage)(plugin, "Timeout was exceeded" /* ERR_MESSAGE.TIMEOUT */)), timeout);
+            }
             if (apiKey) {
                 const apiProxy = proxyUrl && (typeof proxyUrl === 'function' ? proxyUrl("https://api.tinify.com" /* VALUES.TINIFY_API_ENDPOINT */) : proxyUrl) || this.module.tinify?.proxy || module_1.default.enabled("process.env.apply" /* KEY_NAME.PROCESS_ENV_APPLY */) && process.env.TINIFY_PROXY || '';
-                const cacheKey = apiKey + apiProxy;
-                let tinypng = CACHE_TINIFY[cacheKey];
+                const key = apiKey + apiProxy;
+                let tinypng = CACHE_TINIFY[key];
                 const validate = () => {
                     tinypng = require('tinify');
                     tinypng.key = apiKey;
@@ -564,11 +608,11 @@ class Compress extends module_1.default {
                     tinypng.validate(err => {
                         if (!err) {
                             fromBuffer();
-                            CACHE_TINIFY[cacheKey] = tinypng;
+                            CACHE_TINIFY[key] = tinypng;
                         }
                         else {
                             if (err instanceof tinypng.AccountError) {
-                                delete CACHE_TINIFY[cacheKey];
+                                delete CACHE_TINIFY[key];
                             }
                             failed(err);
                         }
@@ -580,7 +624,7 @@ class Compress extends module_1.default {
                             success(result);
                         }
                         else if (cache) {
-                            delete CACHE_TINIFY[cacheKey];
+                            delete CACHE_TINIFY[key];
                             validate();
                         }
                         else {
@@ -598,7 +642,7 @@ class Compress extends module_1.default {
             else {
                 try {
                     const transform = require(plugin);
-                    transform(config.options)(data).then(result => {
+                    transform(options)(data).then(result => {
                         if (result !== data) {
                             success(result);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/compress",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Compress constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -23,8 +23,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.3.2",
-    "@e-mc/types": "0.3.2",
+    "@e-mc/module": "0.3.3",
+    "@e-mc/types": "0.3.3",
     "tinify": "^1.7.1",
     "wawoff2": "^2.0.1",
     "woff2sfnt-sfnt2woff": "^1.0.0"