@e-mc/compress 0.7.1 → 0.7.3

package/LICENSE

@@ -1,11 +1,7 @@
-Copyright 2023 An Pham
+Copyright 2023 Sukina
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-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.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -1,5 +1,7 @@
-### @e-mc/compress
+# @e-mc/compress
 
-### LICENSE
+PEP 402 - Forever 2056
 
-BSD 3-Clause
+## LICENSE
+
+MIT

package/index.js

@@ -6,9 +6,9 @@ const stream = require("stream");
 const zlib = require("zlib");
 const wawoff2 = require("wawoff2");
 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 types_1 = require("@e-mc/types");
+const lib_v4_1 = require("@e-mc/module/lib-v4");
+const module_1 = require("@e-mc/module");
 const CACHE_IMAGE = {};
 const CACHE_FONT = {};
 const CACHE_FONTFROM = {};
@@ -53,7 +53,7 @@ function setCacheData(index) {
                                 try {
                                     const stat = fs.lstatSync(pathname);
                                     if (stat.atimeMs + expires > current) {
-                                        if (index === 0 /* CACHE_TYPE.FONT */) {
+                                        if (index === 0) {
                                             CACHE_FONT[paths.concat(filename).join('_')] = [pathname, stat.ctime];
                                             CACHE_FONTFROM[filename] = paths[0];
                                             CACHE_FONTTO[filename] = paths[1];
@@ -207,7 +207,7 @@ class Compress extends module_1.default {
     createWriteStreamAsBrotli(file, output, options) {
         return this.createBrotliCompress(file, options).pipe(fs.createWriteStream(output));
     }
-    tryFile(file, output, config, callback) {
+    async tryFile(file, output, config, callback) {
         if (typeof config === 'function') {
             callback = config;
             config = undefined;
@@ -244,7 +244,7 @@ class Compress extends module_1.default {
                 }
                 else {
                     if (!fromCache) {
-                        this.writeTimeProcess(ext || format, (0, types_1.isString)(result) ? path.basename(result) : filename || 'Completed', startTime, { type: 8 /* LOG_TYPE.COMPRESS */, sessionId, broadcastId });
+                        this.writeTimeProcess(ext || format, (0, types_1.isString)(result) ? path.basename(result) : filename || 'Completed', startTime, { type: 8, sessionId, broadcastId });
                     }
                     if (callback) {
                         callback(null, result || data, ext);
@@ -256,10 +256,10 @@ class Compress extends module_1.default {
                 if (timeout > 0) {
                     timer = setTimeout(() => {
                         aborted = true;
-                        endProcess((0, types_1.errorValue)("Timeout was exceeded" /* ERR_MESSAGE.TIMEOUT */, format));
+                        endProcess((0, types_1.errorValue)("Timeout was exceeded", format));
                     }, timeout);
                 }
-                this.formatMessage(8 /* LOG_TYPE.COMPRESS */, format, [compressing ? 'Compressing file...' : 'Decompressing file...', filename || (output ? path.basename(output) : '')], (0, types_1.isString)(file) ? file : '', { titleColor: 'magenta', sessionId, broadcastId });
+                this.formatMessage(8, format, [compressing ? 'Compressing file...' : 'Decompressing file...', filename || (output ? path.basename(output) : '')], (0, types_1.isString)(file) ? file : '', { titleColor: 'magenta', sessionId, broadcastId });
             };
             try {
                 const writeFont = (data, ext, from) => {
@@ -296,7 +296,7 @@ class Compress extends module_1.default {
                 };
                 const hasFont = () => {
                     let from, to;
-                    if (cache && (CACHE_INIT[0] || setCacheData.call(this, 0 /* CACHE_TYPE.FONT */)) && (from = CACHE_FONTFROM[hash]) && (to = CACHE_FONTTO[hash])) {
+                    if (cache && (CACHE_INIT[0] || setCacheData.call(this, 0)) && (from = CACHE_FONTFROM[hash]) && (to = CACHE_FONTTO[hash])) {
                         const cacheKey = from + `_${to}_` + hash;
                         const tempFont = CACHE_FONT[cacheKey];
                         if (tempFont) {
@@ -311,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[1].toLocaleString(), { ...module_1.default.LOG_STYLE_NOTICE, hintBold: true, sessionId, broadcastId });
+                                    this.formatMessage(8, 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 {
@@ -322,7 +322,7 @@ class Compress extends module_1.default {
                         return false;
                     }
                 };
-                const errorResponse = (font) => endProcess((0, types_1.errorValue)('Invalid MIME', (font ? font.mime : "Unknown" /* ERR_MESSAGE.UNKNOWN */) + ': ' + (output || filename || "Unknown" /* ERR_MESSAGE.UNKNOWN */)));
+                const errorResponse = (font) => endProcess((0, types_1.errorValue)('Invalid MIME', (font ? font.mime : "Unknown") + ': ' + (output || filename || "Unknown")));
                 const data = Buffer.isBuffer(file) ? file : fs.readFileSync(file);
                 switch (format = format.toLowerCase()) {
                     case 'gz':
@@ -467,7 +467,7 @@ class Compress extends module_1.default {
             }
         });
     }
-    tryImage(file, output, config, callback) {
+    async tryImage(file, output, config, callback) {
         if (typeof config === 'function') {
             callback = config;
             config = undefined;
@@ -483,7 +483,7 @@ class Compress extends module_1.default {
         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 ext = output ? path.extname(output).substring(1) : config.format || "Unknown";
         const format = config.format || ext;
         return new Promise((resolve, reject) => {
             let timer = null, hash, cacheKey, aborted, apiKey;
@@ -511,10 +511,10 @@ class Compress extends module_1.default {
                     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 });
+                        this.formatMessage(8, 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 });
+                        this.writeTimeProcess(ext, status, startTime, { type: 8, sessionId, broadcastId });
                     }
                     if (callback) {
                         callback(err, result);
@@ -546,7 +546,7 @@ class Compress extends module_1.default {
                     case 'jpg':
                     case 'jpeg':
                     case 'webp':
-                        apiKey = config.options?.apiKey || (module_1.default.enabled("process.env.apply" /* KEY_NAME.PROCESS_ENV_APPLY */) ? process.env.TINIFY_KEY : '');
+                        apiKey = config.options?.apiKey || (module_1.default.enabled("process.env.apply") ? process.env.TINIFY_KEY : '');
                         break;
                     default:
                         failed((0, types_1.errorMessage)(plugin, 'Unsupported MIME', format));
@@ -574,7 +574,7 @@ class Compress extends module_1.default {
                 failed(err);
                 return;
             }
-            if (this.settings.cache && setCacheData.call(this, 1 /* CACHE_TYPE.IMAGE */)) {
+            if (this.settings.cache && setCacheData.call(this, 1)) {
                 let stored;
                 try {
                     stored = (CACHE_IMAGE[plugin] || (CACHE_IMAGE[plugin] = {}))[hash = module_1.default.asHash(data)];
@@ -591,12 +591,12 @@ class Compress extends module_1.default {
                     }
                 }
             }
-            this.formatMessage(8 /* LOG_TYPE.COMPRESS */, ext, ['Compressing image...', plugin], filename || output, { titleColor: 'magenta', sessionId, broadcastId });
+            this.formatMessage(8, 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);
+                timer = setTimeout(() => failed((0, types_1.errorMessage)(plugin, "Timeout was exceeded")), 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 apiProxy = proxyUrl && (typeof proxyUrl === 'function' ? proxyUrl("https://api.tinify.com") : proxyUrl) || this.module.tinify?.proxy || module_1.default.enabled("process.env.apply") && process.env.TINIFY_PROXY || '';
                 const key = apiKey + apiProxy;
                 let tinypng = CACHE_TINIFY[key];
                 const validate = () => {
@@ -628,7 +628,7 @@ class Compress extends module_1.default {
                             validate();
                         }
                         else {
-                            failed(err || new Error("Unknown" /* ERR_MESSAGE.UNKNOWN */));
+                            failed(err || new Error("Unknown"));
                         }
                     });
                 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/compress",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "Compress constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/e-mc.git",
+    "url": "git+https://github.com/anpham6/e-mc.git",
     "directory": "src/compress"
   },
   "keywords": [
@@ -20,11 +20,11 @@
     "name": "An Pham",
     "email": "anpham6@gmail.com"
   },
-  "license": "BSD 3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.7.1",
-    "@e-mc/types": "0.7.1",
+    "@e-mc/module": "0.7.3",
+    "@e-mc/types": "0.7.3",
     "tinify": "^1.7.1",
     "wawoff2": "^2.0.1",
     "woff2sfnt-sfnt2woff": "^1.0.0"