@e-mc/compress 0.9.1 → 0.9.3

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.9.1/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.9.3/lib/index.d.ts)
 
 ```typescript
 import type { CompressLevel } from "./squared";
@@ -120,9 +120,9 @@ instance.tryImage("/tmp/image.png", "/path/output/compressed.png", options)
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/compress.d.ts
-- https://www.unpkg.com/@e-mc/types@0.9.1/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/compress.d.ts
+- https://www.unpkg.com/@e-mc/types@0.9.3/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -4,6 +4,7 @@ const fs = require("fs");
 const stream = require("stream");
 const zlib = require("zlib");
 const wawoff2 = require("wawoff2");
+const tinify = require("tinify");
 const { toSfnt, toWoff } = require('woff2sfnt-sfnt2woff');
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
@@ -12,7 +13,6 @@ const CACHE_FONT = {};
 const CACHE_FONTFROM = {};
 const CACHE_FONTTO = {};
 const CACHE_INIT = [false, false];
-const CACHE_TINIFY = {};
 let SINGLETON_INSTANCE;
 let TEMP_DIR = '';
 const GZIP_ZOPFLI = (function () {
@@ -80,7 +80,6 @@ function setCacheData(index) {
     return CACHE_INIT[index] = true;
 }
 const removeFile = (pathname) => fs.unlink(pathname, () => { });
-const checkChunkSize = (value) => typeof value === 'number' && value > 0 && value % 1024 === 0;
 class Compress extends module_1 {
     static singleton() {
         if (!SINGLETON_INSTANCE) {
@@ -113,7 +112,7 @@ class Compress extends module_1 {
         if (zopfli_iterations && (zopfli_iterations = Math.floor(+zopfli_iterations)) > 0) {
             this.level.zopfli = zopfli_iterations;
         }
-        if (chunk_size && ((0, types_1.isString)(chunk_size) && checkChunkSize(chunk_size = (0, types_1.formatSize)(chunk_size)) || checkChunkSize(chunk_size = +chunk_size))) {
+        if (chunk_size && ((0, types_1.isString)(chunk_size) && (0, types_1.alignSize)(chunk_size = (0, types_1.formatSize)(chunk_size), 1) || (0, types_1.alignSize)(chunk_size = +chunk_size, 1))) {
             this.chunkSize = chunk_size;
         }
         return this;
@@ -168,7 +167,7 @@ class Compress extends module_1 {
         else {
             gzip.level ?? (gzip.level = this.level.gz);
         }
-        if (checkChunkSize(chunkSize)) {
+        if (!isNaN(chunkSize = (0, types_1.alignSize)(chunkSize, 1))) {
             gzip.chunkSize = chunkSize;
         }
         else {
@@ -195,7 +194,7 @@ class Compress extends module_1 {
         }
         catch {
         }
-        if (checkChunkSize(chunkSize)) {
+        if (!isNaN(chunkSize = (0, types_1.alignSize)(chunkSize, 1))) {
             brotli.chunkSize = chunkSize;
         }
         else {
@@ -228,10 +227,12 @@ class Compress extends module_1 {
             options = output;
             output = '';
         }
+        else {
+            options || (options = {});
+        }
         if (!(0, types_1.isString)(output)) {
             output = typeof file === 'string' ? file : '';
         }
-        options || (options = {});
         const { filename, startTime = process.hrtime(), timeout = 0, sessionId, broadcastId } = options;
         let format = options.format;
         if (!format) {
@@ -518,7 +519,6 @@ class Compress extends module_1 {
                     else {
                         this.writeTimeProcess(ext, status, startTime, { type: 8, sessionId, broadcastId });
                     }
-                    resolve(result);
                     if (!ctime && hash && cacheKey && TEMP_DIR) {
                         const pathname = path.join(TEMP_DIR, plugin, hash);
                         if (module_1.createDir(pathname)) {
@@ -530,6 +530,7 @@ class Compress extends module_1 {
                             });
                         }
                     }
+                    resolve(result);
                 };
                 if (output) {
                     fs.writeFile(output, result, err => complete(err));
@@ -577,7 +578,7 @@ class Compress extends module_1 {
                 let stored;
                 try {
                     stored = (CACHE_IMAGE[plugin] || (CACHE_IMAGE[plugin] = {}))[hash = module_1.asHash(data)];
-                    cacheKey = module_1.asHash(plugin + ':' + (apiKey ? format + apiKey : module_1.asString(options) || 'unknown'), 'md5');
+                    cacheKey = plugin + ':' + module_1.asHash(apiKey ? format + apiKey : module_1.asString(options.options), 'md5');
                     const ctime = stored?.[cacheKey];
                     if (ctime) {
                         success(fs.readFileSync(path.join(TEMP_DIR, plugin, hash, cacheKey)), ctime);
@@ -596,47 +597,23 @@ class Compress extends module_1 {
             }
             if (apiKey) {
                 const apiProxy = proxyUrl && (typeof proxyUrl === 'function' ? proxyUrl("https://api.tinify.com") : proxyUrl) || this.module.tinify?.proxy || module_1.enabled("process.env.apply") && process.env.TINIFY_PROXY || '';
-                const key = apiKey + apiProxy;
-                let tinypng = CACHE_TINIFY[key];
-                const validate = () => {
-                    tinypng = require('tinify');
-                    tinypng.key = apiKey;
-                    if (apiProxy) {
-                        tinypng.proxy = apiProxy;
-                    }
-                    tinypng.validate(err => {
-                        if (!err) {
-                            fromBuffer();
-                            CACHE_TINIFY[key] = tinypng;
-                        }
-                        else {
-                            if (err instanceof tinypng.AccountError) {
-                                delete CACHE_TINIFY[key];
+                tinify.key = apiKey;
+                tinify.proxy = apiProxy;
+                tinify.validate(err => {
+                    if (!err) {
+                        tinify.fromBuffer(data).toBuffer((error, result) => {
+                            if (!error && result) {
+                                success(result);
                             }
-                            failed(err);
-                        }
-                    });
-                };
-                const fromBuffer = (cache) => {
-                    tinypng.fromBuffer(data).toBuffer((err, result) => {
-                        if (!err && result) {
-                            success(result);
-                        }
-                        else if (cache) {
-                            delete CACHE_TINIFY[key];
-                            validate();
-                        }
-                        else {
-                            failed(err || new Error("Unknown"));
-                        }
-                    });
-                };
-                if (!tinypng) {
-                    validate();
-                }
-                else {
-                    fromBuffer(true);
-                }
+                            else {
+                                failed(error || new Error("Unknown"));
+                            }
+                        });
+                    }
+                    else {
+                        failed(err);
+                    }
+                });
             }
             else {
                 try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/compress",
-  "version": "0.9.1",
+  "version": "0.9.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.9.1",
-    "@e-mc/types": "0.9.1",
+    "@e-mc/module": "0.9.3",
+    "@e-mc/types": "0.9.3",
     "tinify": "^1.7.1",
     "wawoff2": "^2.0.1",
     "woff2sfnt-sfnt2woff": "^1.0.0"