@pi-r/jimp 0.9.4 → 0.10.1

package/index.js

@@ -9,6 +9,7 @@ const node_crypto_1 = require("node:crypto");
 const types_1 = require("@e-mc/types");
 const util_1 = require("@pi-r/jimp/util");
 const Image = require('@e-mc/image');
+const kJimp = Symbol.for('jimp:constructor');
 let WEBPMUX = null, WEBPMUX_INIT = false;
 try {
     WEBPMUX = require('node-webpmux');
@@ -80,7 +81,7 @@ function getMethodName(value) {
         return value;
     }
 }
-async function performCommand(host, instance, localUri, command, outputType, outputAs, buffer, parent) {
+async function performCommand(host, instance, localUri, command, outputType, outputAs, { buffer, parent } = {}) {
     return await jimp.read((buffer || localUri))
         .then(async (img) => {
         return await transformCommand(localUri, new JimpHandler(img, instance, host), command, outputType, outputAs, parent);
@@ -145,8 +146,8 @@ async function setImageCache(instance, tempKey, tempFile, output, localFile) {
         else {
             stored[tempKey] = { tempKey, tempFile, ctimeMs: Date.now() };
         }
-        if (instance.settings.jimp.cache_expires) {
-            fs.writeFile(tempFile + '.json', JSON.stringify(stored[tempKey]), 'utf-8', () => { });
+        if (instance.settings.jimp?.cache_expires) {
+            fs.writeFile(tempFile + '.json', JSON.stringify(stored[tempKey]), 'utf8', () => { });
         }
     }
     catch {
@@ -195,7 +196,7 @@ function getCacheData(instance) {
                         if (item.isFile() && path.extname(item.name) === '.json') {
                             const pathname = path.join(TEMP_DIR, item.name);
                             try {
-                                const data = JSON.parse(fs.readFileSync(pathname, 'utf-8'));
+                                const data = JSON.parse(fs.readFileSync(pathname, 'utf8'));
                                 if ((0, types_1.isPlainObject)(data) && fs.existsSync(data.tempFile)) {
                                     if (data.ctimeMs + expires > current) {
                                         CACHE_TRANSFORM[data.tempKey] = data;
@@ -257,9 +258,8 @@ class JimpHandler {
         const data = this.instance.rotateData;
         if (data) {
             const { values, color } = data;
-            const handler = this.handler;
             if (!isNaN(color)) {
-                handler.background(color);
+                this.handler.background(color);
             }
             const tasks = [];
             const length = values.length;
@@ -269,11 +269,11 @@ class JimpHandler {
                 const ext = path.extname(localFile);
                 for (let i = 1; i < length; ++i) {
                     const value = values[i];
-                    const img = handler.clone().rotate(value);
+                    const img = this.handler.clone().rotate(value);
                     const output = leading + value + ext;
                     tasks.push(img.writeAsync(output)
                         .then(() => {
-                        void this.finalize(output, callback);
+                        void this.finalize(output, callback, false);
                     })
                         .catch((err) => {
                         this.instance.writeFail(["Unable to rotate image", "jimp"], err, 2048);
@@ -281,7 +281,7 @@ class JimpHandler {
                 }
             }
             if (deg) {
-                handler.rotate(deg);
+                this.handler.rotate(deg);
             }
             if (tasks.length > 0) {
                 return Promise.all(tasks).then(() => this);
@@ -295,7 +295,6 @@ class JimpHandler {
         }
         const data = this.instance.methodData;
         if (data) {
-            const handler = this.handler;
             for (const [name, args = []] of data) {
                 try {
                     const alias = getMethodName(name);
@@ -305,14 +304,14 @@ class JimpHandler {
                     if (alias === 'composite') {
                         const [src, x, y, opts] = args;
                         if ((0, types_1.isString)(src) && typeof x === 'number' && typeof y === 'number') {
-                            handler.composite(await jimp.read(src), x, y, opts);
+                            this.handler.composite(await jimp.read(src), x, y, opts);
                         }
                         else {
                             throw (0, types_1.errorValue)("Invalid parameters", alias);
                         }
                     }
                     else {
-                        handler[alias](...args);
+                        this.handler[alias](...args);
                     }
                 }
                 catch (err) {
@@ -328,25 +327,10 @@ class JimpHandler {
         const data = this.instance.resizeData;
         if (data) {
             const { width, height, color, algorithm, align, mode } = data;
-            const handler = this.handler;
             if (!isNaN(color)) {
-                handler.background(color);
-            }
-            let resizeMode = jimp.RESIZE_NEAREST_NEIGHBOR, flags = 0;
-            switch (algorithm) {
-                case 'bilinear':
-                    resizeMode = jimp.RESIZE_BILINEAR;
-                    break;
-                case 'bicubic':
-                    resizeMode = jimp.RESIZE_BICUBIC;
-                    break;
-                case 'hermite':
-                    resizeMode = jimp.RESIZE_HERMITE;
-                    break;
-                case 'bezier':
-                    resizeMode = jimp.RESIZE_BEZIER;
-                    break;
+                this.handler.background(color);
             }
+            let flags = 0;
             switch (align[0]) {
                 case 'left':
                     flags |= jimp.HORIZONTAL_ALIGN_LEFT;
@@ -371,17 +355,36 @@ class JimpHandler {
             }
             switch (mode) {
                 case 'contain':
-                    handler.contain(width, height, flags);
+                    this.handler.contain(width, height, flags);
                     break;
                 case 'cover':
-                    handler.cover(width, height, flags);
+                    this.handler.cover(width, height, flags);
                     break;
                 case 'scale':
-                    handler.scaleToFit(width, height);
+                    this.handler.scaleToFit(width, height);
                     break;
-                default:
-                    handler.resize(width === Infinity ? jimp.AUTO : width, height === Infinity ? jimp.AUTO : height, resizeMode);
+                default: {
+                    let resizeMode = jimp.RESIZE_NEAREST_NEIGHBOR;
+                    switch (algorithm) {
+                        case 'bilinear':
+                            resizeMode = jimp.RESIZE_BILINEAR;
+                            break;
+                        case 'bicubic':
+                            resizeMode = jimp.RESIZE_BICUBIC;
+                            break;
+                        case 'hermite':
+                            resizeMode = jimp.RESIZE_HERMITE;
+                            break;
+                        case 'bezier':
+                            resizeMode = jimp.RESIZE_BEZIER;
+                            break;
+                        case 'none':
+                            resizeMode = undefined;
+                            break;
+                    }
+                    this.handler.resize(width === Infinity ? jimp.AUTO : width, height === Infinity ? jimp.AUTO : height, resizeMode);
                     break;
+                }
             }
         }
     }
@@ -391,7 +394,7 @@ class JimpHandler {
         }
         this.handler.background(value);
     }
-    async finalize(output, callback) {
+    async finalize(output, callback, replace) {
         if (this.aborted) {
             return;
         }
@@ -400,7 +403,7 @@ class JimpHandler {
             const settings = instance.settings;
             const webp = settings.webp ||= {};
             const data = instance.qualityData;
-            const replace = instance.getCommand().includes('@');
+            replace ??= instance.getCommand().includes('@');
             const filename = (0, util_1.renameExt)(output, 'webp', replace);
             const args = [(0, util_1.normalizePath)(output)];
             if (data) {
@@ -445,7 +448,7 @@ class JimpHandler {
             }
             args.push('-o', (0, util_1.normalizePath)(filename));
             try {
-                child_process.execFile(await (0, util_1.importBinary)('cwebp', webp.path), args, { shell: true, signal: this.instance.signal, ...execOptions(settings) }, err => {
+                child_process.execFile((0, types_1.sanitizeCmd)(await (0, util_1.importBinary)('cwebp', webp.path), args), { shell: true, signal: this.instance.signal, ...execOptions(settings) }, err => {
                     if (err) {
                         this.instance.writeFail(["Unable to convert file", path.basename(filename)], err, 2048);
                     }
@@ -521,7 +524,7 @@ class JimpHandler {
         }
         const data = this.instance.cropData;
         if (data) {
-            this.handler = this.handler.crop(data.x, data.y, data.width, data.height);
+            this.handler.crop(data.x, data.y, data.width, data.height);
         }
     }
     opacity() {
@@ -530,7 +533,7 @@ class JimpHandler {
         }
         const value = this.instance.opacityValue ?? NaN;
         if (value >= 0) {
-            this.handler = this.handler.opacity(value);
+            this.handler.opacity(value);
         }
     }
     quality() {
@@ -539,7 +542,7 @@ class JimpHandler {
         }
         const data = this.instance.qualityData;
         if (data && !isNaN(data.value)) {
-            this.handler = this.handler.quality(data.value);
+            this.handler.quality(data.value);
         }
     }
     write(output, callback) {
@@ -589,6 +592,7 @@ class JimpHandler {
     }
 }
 class Jimp extends Image {
+    static [kJimp] = true;
     static async transform(file, command, options = {}) {
         const [outputType, saveAs, outputAs] = (0, util_1.parseFormat)(command = command.trim(), options.mimeType);
         if (!outputType) {
@@ -760,8 +764,8 @@ class Jimp extends Image {
             };
             const transformBuffer = (bmpFile) => {
                 startMessage();
-                performCommand(host, this, localUri, command, outputType, outputAs, bmpFile || file.buffer, file)
-                    .then((img) => {
+                performCommand(host, this, localUri, command, outputType, outputAs, { buffer: bmpFile || file.buffer, parent: file })
+                    .then(img => {
                     if (typeof bmpFile === 'string') {
                         removeFile(bmpFile);
                     }
@@ -789,6 +793,9 @@ class Jimp extends Image {
                             if (!err && result) {
                                 finalize(result);
                             }
+                            else if (Image.isErrorCode(err, types_1.ERR_CODE.MODULE_NOT_FOUND)) {
+                                resolve();
+                            }
                             else {
                                 errorResponse(err || new Error("Unknown"));
                             }
@@ -828,11 +835,10 @@ class Jimp extends Image {
                                 for (let i = 0, length = gif2webp.length; i < length; ++i) {
                                     const arg = gif2webp[i];
                                     switch (arg) {
-                                        case '-h':
-                                        case '-version':
-                                            continue;
                                         case '-o':
                                             ++i;
+                                        case '-h':
+                                        case '-version':
                                             continue;
                                         case '-q':
                                         case '-m':
@@ -850,7 +856,7 @@ class Jimp extends Image {
                             }
                             args.push('-o', (0, util_1.normalizePath)(webp));
                             try {
-                                child_process.execFile(await (0, util_1.importBinary)('gif2webp', webp_path), args, { shell: true, signal: this.signal, ...execOptions(this.settings) }, (err, stdout) => {
+                                child_process.execFile((0, types_1.sanitizeCmd)(await (0, util_1.importBinary)('gif2webp', webp_path), args), { shell: true, signal: this.signal, ...execOptions(this.settings) }, (err, stdout) => {
                                     if (!err) {
                                         this.addLog(types_1.STATUS_TYPE.INFO, stdout);
                                         finalize(webp);
@@ -1031,7 +1037,7 @@ class Jimp extends Image {
                 const { path: webp_path } = settings.webp ||= {};
                 const bmpFile = getTempPath(this, 'bmp');
                 try {
-                    child_process.execFile(await (0, util_1.importBinary)('dwebp', webp_path), [(0, util_1.normalizePath)(localUri), '-bmp', '-o', (0, util_1.normalizePath)(bmpFile)], { shell: true, signal: this.signal, ...execOptions(settings) }, err => {
+                    child_process.execFile((0, types_1.sanitizeCmd)(await (0, util_1.importBinary)('dwebp', webp_path), [(0, util_1.normalizePath)(localUri), '-bmp', '-o', (0, util_1.normalizePath)(bmpFile)]), { shell: true, signal: this.signal, ...execOptions(settings) }, err => {
                         if (!err) {
                             transformBuffer(bmpFile);
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/jimp",
-  "version": "0.9.4",
+  "version": "0.10.1",
   "description": "Jimp V0 image constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/image": "^0.11.5",
-    "@e-mc/types": "^0.11.5",
+    "@e-mc/image": "^0.12.3",
+    "@e-mc/types": "^0.12.3",
     "bmp-js": "^0.1.0",
     "gifwrap": "^0.10.1",
     "jimp": "^0.22.12"

package/types/index.d.ts

@@ -19,8 +19,7 @@ export interface JimpSettings extends ImageSettings {
 
 export type ResultCallback<T = unknown, U = void, V = unknown> = (err: V, result: T) => U;
 
-export interface IJimpHandler<T extends IHost = IHost, U extends ImageModule = ImageModule> extends ImageHandler<jimp, T, IImage<T, U>> {
-    method(): Promise<void>;
+export interface IJimpHandler<T extends IHost = IHost, U extends ImageModule = ImageModule> extends ImageHandler<jimp, T, IImage<T, U>, void, Promise<void>> {
     quality(): void;
     rotate(localFile?: string, callback?: ResultCallback<string>): Promise<this>;
     background(value: number | [number, number, number, number]): void;

package/util.js

@@ -9,23 +9,22 @@ exports.showInputType = showInputType;
 exports.showOutputType = showOutputType;
 const path = require("node:path");
 const fs = require("node:fs");
-const jimp = require("jimp");
 const types = require("@e-mc/types");
 const Image = require("@e-mc/image");
 exports.MIME_INPUT = new Set([
-    jimp.MIME_PNG,
-    jimp.MIME_JPEG,
-    jimp.MIME_BMP,
-    jimp.MIME_GIF,
-    jimp.MIME_TIFF,
-    "image/webp"
+    Image.MIME_PNG,
+    Image.MIME_JPEG,
+    Image.MIME_BMP,
+    Image.MIME_GIF,
+    Image.MIME_TIFF,
+    Image.MIME_WEBP
 ]);
 exports.MIME_OUTPUT = new Set([
-    jimp.MIME_PNG,
-    jimp.MIME_JPEG,
-    jimp.MIME_BMP,
-    jimp.MIME_GIF,
-    "image/webp"
+    Image.MIME_PNG,
+    Image.MIME_JPEG,
+    Image.MIME_BMP,
+    Image.MIME_GIF,
+    Image.MIME_WEBP
 ]);
 function parseFormat(command, mimeType, gif) {
     command = command.toLowerCase();
@@ -39,16 +38,16 @@ function parseFormat(command, mimeType, gif) {
                         saveAs = 'jpg';
                         break;
                     case 'webp':
-                        if (mimeType === jimp.MIME_JPEG) {
-                            mime = jimp.MIME_JPEG;
+                        if (mimeType === Image.MIME_JPEG) {
+                            mime = Image.MIME_JPEG;
                             saveAs = 'jpg';
                         }
-                        else if (gif && mimeType === jimp.MIME_GIF) {
-                            mime = jimp.MIME_GIF;
+                        else if (gif && mimeType === Image.MIME_GIF) {
+                            mime = Image.MIME_GIF;
                             saveAs = 'gif';
                         }
                         else {
-                            mime = jimp.MIME_PNG;
+                            mime = Image.MIME_PNG;
                             saveAs = 'png';
                         }
                         outputAs = 'webp';
@@ -81,7 +80,7 @@ function getWebP_bin(name, pathname) {
     if (pathname && fs.existsSync(pathname)) {
         name += Image.PLATFORM_WIN32 ? '.exe' : '';
         const bin = path.join(pathname, name);
-        return Image.sanitizeCmd(fs.existsSync(bin) ? bin : path.join(pathname, 'bin', name));
+        return types.sanitizeCmd(fs.existsSync(bin) ? bin : path.join(pathname, 'bin', name));
     }
     return require(name + '-bin');
 }
@@ -89,7 +88,7 @@ async function importBinary(name, pathname) {
     if (pathname && fs.existsSync(pathname)) {
         name += Image.PLATFORM_WIN32 ? '.exe' : '';
         const bin = path.join(pathname, name);
-        return Image.sanitizeCmd(fs.existsSync(bin) ? bin : path.join(pathname, 'bin', name));
+        return fs.existsSync(bin) ? bin : path.join(pathname, 'bin', name);
     }
     return types.importESM(name + '-bin', true);
 }