ipx 0.7.0 → 0.9.0

package/README.md

@@ -6,7 +6,7 @@
 
 High performance, secure and easy to use image proxy based on [sharp](https://github.com/lovell/sharp) and [libvips](https://github.com/libvips/libvips).
 
-<h2 align="center">Usage</h2>
+## Usage
 
 ### Quick Start
 
@@ -46,31 +46,33 @@ Keep original format (`png`) and set width to `200`:
 
 `http://localhost:3000/w_200/static/buffalo.png`
 
-Resize to `200px` using `embed` method and change format to `webp`:
+Resize to `200x200px` using `embed` method and change format to `webp`:
 
-`http://localhost:3000/embed,f_webp,s_200/static/buffalo.png`
+`http://localhost:3000/embed,f_webp,s_200x200/static/buffalo.png`
 
 ### Modifiers
 
-| Property  | Docs                                                            | Example                                          | Comments                                                              |
-| --------- | :-------------------------------------------------------------- | :----------------------------------------------- | :-------------------------------------------------------------------- |
-| width     | \_                                                              | `http://localhost:3000/width_200/buffalo.png`    |
-| height    | \_                                                              | `http://localhost:3000/height_200/buffalo.png`   |
-| trim      | [Docs](https://sharp.pixelplumbing.com/api-resize#trim)         | `http://localhost:3000/trim_100/buffalo.png`     |
-| format    | [Docs](https://sharp.pixelplumbing.com/api-output#toformat)     | `http://localhost:3000/format_webp/buffalo.png`  | Supported format: `jpg`, `jpeg`, `png`, `webp`, `avif`, `gif`, `heif` |
-| quality   | \_                                                              | `http://localhost:3000/quality_50/buffalo.png`   | Accepted values: 0 to 100                                             |
-| rotate    | [Docs](https://sharp.pixelplumbing.com/api-operation#rotate)    | `http://localhost:3000/rotate_45/buffalo.png`    |
-| flip      | [Docs](https://sharp.pixelplumbing.com/api-operation#flip)      | `http://localhost:3000/flip/buffalo.png`         |
-| flop      | [Docs](https://sharp.pixelplumbing.com/api-operation#flop)      | `http://localhost:3000/flop/buffalo.png`         |
-| sharpen   | [Docs](https://sharp.pixelplumbing.com/api-operation#sharpen)   | `http://localhost:3000/sharpen_30/buffalo.png`   |
-| median    | [Docs](https://sharp.pixelplumbing.com/api-operation#median)    | `http://localhost:3000/median_10/buffalo.png`    |
-| gamma     | [Docs](https://sharp.pixelplumbing.com/api-operation#gamma)     | `http://localhost:3000/gamma_3/buffalo.png`      |
-| negate    | [Docs](https://sharp.pixelplumbing.com/api-operation#negate)    | `http://localhost:3000/negate/buffalo.png`       |
-| normalize | [Docs](https://sharp.pixelplumbing.com/api-operation#normalize) | `http://localhost:3000/normalize/buffalo.png`    |
-| threshold | [Docs](https://sharp.pixelplumbing.com/api-operation#threshold) | `http://localhost:3000/threshold_10/buffalo.png` |
-| tint      | [Docs](https://sharp.pixelplumbing.com/api-colour#tint)         | `http://localhost:3000/tint_1098123/buffalo.png` |
-| grayscale | [Docs](https://sharp.pixelplumbing.com/api-colour#grayscale)    | `http://localhost:3000/grayscale/buffalo.png`    |
-| animated  | -                                                               | `http://localhost:3000/animated/buffalo.gif`     | Experimental                                                          |
+| Property    | Docs                                                            | Example                                                 | Comments                                                                                                                                                          |
+| ----------- | :-------------------------------------------------------------- | :------------------------------------------------------ | :---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| width / w   | \_                                                              | `http://localhost:3000/width_200/buffalo.png`           |
+| height / h  | \_                                                              | `http://localhost:3000/height_200/buffalo.png`          |
+| resize / s  | \_                                                              | `http://localhost:3000/s_200x200/buffalo.png`           |
+| trim        | [Docs](https://sharp.pixelplumbing.com/api-resize#trim)         | `http://localhost:3000/trim_100/buffalo.png`            |
+| format      | [Docs](https://sharp.pixelplumbing.com/api-output#toformat)     | `http://localhost:3000/format_webp/buffalo.png`         | Supported format: `jpg`, `jpeg`, `png`, `webp`, `avif`, `gif`, `heif`                                                                                             |
+| quality / q | \_                                                              | `http://localhost:3000/quality_50/buffalo.png`          | Accepted values: 0 to 100                                                                                                                                         |
+| rotate      | [Docs](https://sharp.pixelplumbing.com/api-operation#rotate)    | `http://localhost:3000/rotate_45/buffalo.png`           |
+| enlarge     | \_                                                              | `http://localhost:3000/enlarge,s_2000x2000/buffalo.png` | Allow the image to be upscaled. By default the returned image will never be larger than the source in any dimension, while preserving the requested aspect ratio. |
+| flip        | [Docs](https://sharp.pixelplumbing.com/api-operation#flip)      | `http://localhost:3000/flip/buffalo.png`                |
+| flop        | [Docs](https://sharp.pixelplumbing.com/api-operation#flop)      | `http://localhost:3000/flop/buffalo.png`                |
+| sharpen     | [Docs](https://sharp.pixelplumbing.com/api-operation#sharpen)   | `http://localhost:3000/sharpen_30/buffalo.png`          |
+| median      | [Docs](https://sharp.pixelplumbing.com/api-operation#median)    | `http://localhost:3000/median_10/buffalo.png`           |
+| gamma       | [Docs](https://sharp.pixelplumbing.com/api-operation#gamma)     | `http://localhost:3000/gamma_3/buffalo.png`             |
+| negate      | [Docs](https://sharp.pixelplumbing.com/api-operation#negate)    | `http://localhost:3000/negate/buffalo.png`              |
+| normalize   | [Docs](https://sharp.pixelplumbing.com/api-operation#normalize) | `http://localhost:3000/normalize/buffalo.png`           |
+| threshold   | [Docs](https://sharp.pixelplumbing.com/api-operation#threshold) | `http://localhost:3000/threshold_10/buffalo.png`        |
+| tint        | [Docs](https://sharp.pixelplumbing.com/api-colour#tint)         | `http://localhost:3000/tint_1098123/buffalo.png`        |
+| grayscale   | [Docs](https://sharp.pixelplumbing.com/api-colour#grayscale)    | `http://localhost:3000/grayscale/buffalo.png`           |
+| animated    | -                                                               | `http://localhost:3000/animated/buffalo.gif`            | Experimental                                                                                                                                                      |
 
 ### Config
 
@@ -83,6 +85,6 @@ Config can be customized using `IPX_*` environment variables.
 - `IPX_DOMAINS`
   - Default: `[]`
 
-<h2 align="center">License</h2>
+## License
 
 MIT

package/dist/index.cjs

@@ -2,38 +2,35 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const Sharp = require('sharp');
 const defu = require('defu');
 const imageMeta = require('image-meta');
 const ufo = require('ufo');
-const path = require('path');
+const fs = require('fs');
+const pathe = require('pathe');
 const isValidPath = require('is-valid-path');
-const fsExtra = require('fs-extra');
 const destr = require('destr');
 const http = require('http');
 const https = require('https');
-const fetch = require('node-fetch');
+const ohmyfetch = require('ohmyfetch');
 const getEtag = require('etag');
 const xss = require('xss');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e["default"] : e; }
 
-const Sharp__default = /*#__PURE__*/_interopDefaultLegacy(Sharp);
 const defu__default = /*#__PURE__*/_interopDefaultLegacy(defu);
-const imageMeta__default = /*#__PURE__*/_interopDefaultLegacy(imageMeta);
 const isValidPath__default = /*#__PURE__*/_interopDefaultLegacy(isValidPath);
 const destr__default = /*#__PURE__*/_interopDefaultLegacy(destr);
 const http__default = /*#__PURE__*/_interopDefaultLegacy(http);
 const https__default = /*#__PURE__*/_interopDefaultLegacy(https);
-const fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 const getEtag__default = /*#__PURE__*/_interopDefaultLegacy(getEtag);
 const xss__default = /*#__PURE__*/_interopDefaultLegacy(xss);
 
-const Handlers = /*#__PURE__*/Object.freeze({
+const Handlers = {
   __proto__: null,
   get quality () { return quality; },
   get fit () { return fit; },
   get background () { return background; },
+  get enlarge () { return enlarge; },
   get width () { return width; },
   get height () { return height; },
   get resize () { return resize; },
@@ -60,11 +57,10 @@ const Handlers = /*#__PURE__*/Object.freeze({
   get w () { return w; },
   get h () { return h; },
   get s () { return s; }
-});
+};
 
 function getEnv(name, defaultValue) {
-  var _a;
-  return (_a = destr__default['default'](process.env[name])) != null ? _a : defaultValue;
+  return destr__default(process.env[name]) ?? defaultValue;
 }
 function cachedPromise(fn) {
   let p;
@@ -86,15 +82,15 @@ function createError(message, statusCode) {
 }
 
 const createFilesystemSource = (options) => {
-  const rootDir = path.resolve(options.dir);
+  const rootDir = pathe.resolve(options.dir);
   return async (id) => {
-    const fsPath = path.resolve(path.join(rootDir, id));
-    if (!isValidPath__default['default'](id) || id.includes("..") || !fsPath.startsWith(rootDir)) {
+    const fsPath = pathe.resolve(pathe.join(rootDir, id));
+    if (!isValidPath__default(id) || id.includes("..") || !fsPath.startsWith(rootDir)) {
       throw createError("Forbidden path:" + id, 403);
     }
     let stats;
     try {
-      stats = await fsExtra.stat(fsPath);
+      stats = await fs.promises.stat(fsPath);
     } catch (err) {
       if (err.code === "ENOENT") {
         throw createError("File not found: " + fsPath, 404);
@@ -108,14 +104,14 @@ const createFilesystemSource = (options) => {
     return {
       mtime: stats.mtime,
       maxAge: options.maxAge || 300,
-      getData: cachedPromise(() => fsExtra.readFile(fsPath))
+      getData: cachedPromise(() => fs.promises.readFile(fsPath))
     };
   };
 };
 
 const createHTTPSource = (options) => {
-  const httpsAgent = new https__default['default'].Agent({ keepAlive: true });
-  const httpAgent = new http__default['default'].Agent({ keepAlive: true });
+  const httpsAgent = new https__default.Agent({ keepAlive: true });
+  const httpAgent = new http__default.Agent({ keepAlive: true });
   let domains = options.domains || [];
   if (typeof domains === "string") {
     domains = domains.split(",").map((s) => s.trim());
@@ -126,10 +122,10 @@ const createHTTPSource = (options) => {
     if (!parsedUrl.host) {
       throw createError("Hostname is missing: " + id, 403);
     }
-    if (!(reqOptions == null ? void 0 : reqOptions.bypassDomain) && !hosts.find((host) => parsedUrl.host === host)) {
+    if (!reqOptions?.bypassDomain && !hosts.find((host) => parsedUrl.host === host)) {
       throw createError("Forbidden host: " + parsedUrl.host, 403);
     }
-    const response = await fetch__default['default'](id, {
+    const response = await ohmyfetch.fetch(id, {
       agent: id.startsWith("https") ? httpsAgent : httpAgent
     });
     if (!response.ok) {
@@ -157,7 +153,7 @@ const createHTTPSource = (options) => {
 };
 
 function VArg(arg) {
-  return destr__default['default'](arg);
+  return destr__default(arg);
 }
 function parseArgs(args, mappers) {
   const vargs = args.split("_");
@@ -170,6 +166,19 @@ function applyHandler(ctx, pipe, handler, argsStr) {
   const args = handler.args ? parseArgs(argsStr, handler.args) : [];
   return handler.apply(ctx, pipe, ...args);
 }
+function clampDimensionsPreservingAspectRatio(sourceDimensions, desiredDimensions) {
+  const desiredAspectRatio = desiredDimensions.width / desiredDimensions.height;
+  let { width, height } = desiredDimensions;
+  if (width > sourceDimensions.width) {
+    width = sourceDimensions.width;
+    height = Math.round(sourceDimensions.width / desiredAspectRatio);
+  }
+  if (height > sourceDimensions.height) {
+    height = sourceDimensions.height;
+    width = Math.round(sourceDimensions.height * desiredAspectRatio);
+  }
+  return { width, height };
+}
 
 const quality = {
   args: [VArg],
@@ -191,27 +200,40 @@ const background = {
   args: [VArg],
   order: -1,
   apply: (context, _pipe, background2) => {
+    background2 = String(background2);
     if (!background2.startsWith("#") && (HEX_RE.test(background2) || SHORTHEX_RE.test(background2))) {
       background2 = "#" + background2;
     }
     context.background = background2;
   }
 };
+const enlarge = {
+  args: [],
+  apply: (context) => {
+    context.enlarge = true;
+  }
+};
 const width = {
   args: [VArg],
-  apply: (_context, pipe, width2) => {
-    return pipe.resize(width2, null);
+  apply: (context, pipe, width2) => {
+    return pipe.resize(width2, null, { withoutEnlargement: !context.enlarge });
   }
 };
 const height = {
   args: [VArg],
-  apply: (_context, pipe, height2) => {
-    return pipe.resize(null, height2);
+  apply: (context, pipe, height2) => {
+    return pipe.resize(null, height2, { withoutEnlargement: !context.enlarge });
   }
 };
 const resize = {
   args: [VArg, VArg, VArg],
-  apply: (context, pipe, width2, height2) => {
+  apply: (context, pipe, size) => {
+    let [width2, height2] = String(size).split("x").map((v) => Number(v));
+    if (!context.enlarge) {
+      const clamped = clampDimensionsPreservingAspectRatio(context.meta, { width: width2, height: height2 });
+      width2 = clamped.width;
+      height2 = clamped.height;
+    }
     return pipe.resize(width2, height2, {
       fit: context.fit,
       background: context.background
@@ -250,8 +272,10 @@ const extract = {
 };
 const rotate = {
   args: [VArg],
-  apply: (_context, pipe, angel) => {
-    return pipe.rotate(angel);
+  apply: (context, pipe, angel) => {
+    return pipe.rotate(angel, {
+      background: context.background
+    });
   }
 };
 const flip = {
@@ -353,7 +377,7 @@ function createIPX(userOptions) {
     alias: getEnv("IPX_ALIAS", {}),
     sharp: {}
   };
-  const options = defu__default['default'](userOptions, defaults);
+  const options = defu__default(userOptions, defaults);
   options.alias = Object.fromEntries(Object.entries(options.alias).map((e) => [ufo.withLeadingSlash(e[0]), e[1]]));
   const ctx = {
     sources: {}
@@ -388,7 +412,7 @@ function createIPX(userOptions) {
     const getData = cachedPromise(async () => {
       const src = await getSrc();
       const data = await src.getData();
-      const meta = imageMeta__default['default'](data);
+      const meta = imageMeta.imageMeta(data);
       const mFormat = modifiers.f || modifiers.format;
       let format = mFormat || meta.type;
       if (format === "jpg") {
@@ -405,14 +429,15 @@ function createIPX(userOptions) {
       if (animated) {
         format = "webp";
       }
-      let sharp = Sharp__default['default'](data, { animated });
+      const Sharp = await import('sharp').then((r) => r.default || r);
+      let sharp = Sharp(data, { animated });
       Object.assign(sharp.options, options.sharp);
       const handlers = Object.entries(modifiers).map(([name, args]) => ({ handler: getHandler(name), name, args })).filter((h) => h.handler).sort((a, b) => {
         const aKey = (a.handler.order || a.name || "").toString();
         const bKey = (b.handler.order || b.name || "").toString();
         return aKey.localeCompare(bKey);
       });
-      const handlerCtx = {};
+      const handlerCtx = { meta };
       for (const h of handlers) {
         sharp = applyHandler(handlerCtx, sharp, h.handler, h.args) || sharp;
       }
@@ -473,7 +498,7 @@ async function _handleRequest(req, ipx) {
     res.headers["Cache-Control"] = `max-age=${+src.maxAge}, public, s-maxage=${+src.maxAge}`;
   }
   const { data, format } = await img.data();
-  const etag = getEtag__default['default'](data);
+  const etag = getEtag__default(data);
   res.headers.ETag = etag;
   if (etag && req.headers["if-none-match"] === etag) {
     res.statusCode = 304;
@@ -488,7 +513,7 @@ async function _handleRequest(req, ipx) {
 function handleRequest(req, ipx) {
   return _handleRequest(req, ipx).catch((err) => {
     const statusCode = parseInt(err.statusCode) || 500;
-    const statusMessage = err.statusMessage ? xss__default['default'](err.statusMessage) : `IPX Error (${statusCode})`;
+    const statusMessage = err.statusMessage ? xss__default(err.statusMessage) : `IPX Error (${statusCode})`;
     if (process.env.NODE_ENV !== "production" && statusCode === 500) {
       console.error(err);
     }

package/dist/index.mjs

@@ -1,22 +1,22 @@
-import Sharp from 'sharp';
 import defu from 'defu';
-import imageMeta from 'image-meta';
+import { imageMeta } from 'image-meta';
 import { parseURL, withLeadingSlash, hasProtocol, joinURL, decode } from 'ufo';
-import { resolve, join } from 'path';
+import { promises } from 'fs';
+import { resolve, join } from 'pathe';
 import isValidPath from 'is-valid-path';
-import { stat, readFile } from 'fs-extra';
 import destr from 'destr';
 import http from 'http';
 import https from 'https';
-import fetch from 'node-fetch';
+import { fetch } from 'ohmyfetch';
 import getEtag from 'etag';
 import xss from 'xss';
 
-var Handlers = /*#__PURE__*/Object.freeze({
+const Handlers = {
   __proto__: null,
   get quality () { return quality; },
   get fit () { return fit; },
   get background () { return background; },
+  get enlarge () { return enlarge; },
   get width () { return width; },
   get height () { return height; },
   get resize () { return resize; },
@@ -43,11 +43,10 @@ var Handlers = /*#__PURE__*/Object.freeze({
   get w () { return w; },
   get h () { return h; },
   get s () { return s; }
-});
+};
 
 function getEnv(name, defaultValue) {
-  var _a;
-  return (_a = destr(process.env[name])) != null ? _a : defaultValue;
+  return destr(process.env[name]) ?? defaultValue;
 }
 function cachedPromise(fn) {
   let p;
@@ -77,7 +76,7 @@ const createFilesystemSource = (options) => {
     }
     let stats;
     try {
-      stats = await stat(fsPath);
+      stats = await promises.stat(fsPath);
     } catch (err) {
       if (err.code === "ENOENT") {
         throw createError("File not found: " + fsPath, 404);
@@ -91,7 +90,7 @@ const createFilesystemSource = (options) => {
     return {
       mtime: stats.mtime,
       maxAge: options.maxAge || 300,
-      getData: cachedPromise(() => readFile(fsPath))
+      getData: cachedPromise(() => promises.readFile(fsPath))
     };
   };
 };
@@ -109,7 +108,7 @@ const createHTTPSource = (options) => {
     if (!parsedUrl.host) {
       throw createError("Hostname is missing: " + id, 403);
     }
-    if (!(reqOptions == null ? void 0 : reqOptions.bypassDomain) && !hosts.find((host) => parsedUrl.host === host)) {
+    if (!reqOptions?.bypassDomain && !hosts.find((host) => parsedUrl.host === host)) {
       throw createError("Forbidden host: " + parsedUrl.host, 403);
     }
     const response = await fetch(id, {
@@ -153,6 +152,19 @@ function applyHandler(ctx, pipe, handler, argsStr) {
   const args = handler.args ? parseArgs(argsStr, handler.args) : [];
   return handler.apply(ctx, pipe, ...args);
 }
+function clampDimensionsPreservingAspectRatio(sourceDimensions, desiredDimensions) {
+  const desiredAspectRatio = desiredDimensions.width / desiredDimensions.height;
+  let { width, height } = desiredDimensions;
+  if (width > sourceDimensions.width) {
+    width = sourceDimensions.width;
+    height = Math.round(sourceDimensions.width / desiredAspectRatio);
+  }
+  if (height > sourceDimensions.height) {
+    height = sourceDimensions.height;
+    width = Math.round(sourceDimensions.height * desiredAspectRatio);
+  }
+  return { width, height };
+}
 
 const quality = {
   args: [VArg],
@@ -174,27 +186,40 @@ const background = {
   args: [VArg],
   order: -1,
   apply: (context, _pipe, background2) => {
+    background2 = String(background2);
     if (!background2.startsWith("#") && (HEX_RE.test(background2) || SHORTHEX_RE.test(background2))) {
       background2 = "#" + background2;
     }
     context.background = background2;
   }
 };
+const enlarge = {
+  args: [],
+  apply: (context) => {
+    context.enlarge = true;
+  }
+};
 const width = {
   args: [VArg],
-  apply: (_context, pipe, width2) => {
-    return pipe.resize(width2, null);
+  apply: (context, pipe, width2) => {
+    return pipe.resize(width2, null, { withoutEnlargement: !context.enlarge });
   }
 };
 const height = {
   args: [VArg],
-  apply: (_context, pipe, height2) => {
-    return pipe.resize(null, height2);
+  apply: (context, pipe, height2) => {
+    return pipe.resize(null, height2, { withoutEnlargement: !context.enlarge });
   }
 };
 const resize = {
   args: [VArg, VArg, VArg],
-  apply: (context, pipe, width2, height2) => {
+  apply: (context, pipe, size) => {
+    let [width2, height2] = String(size).split("x").map((v) => Number(v));
+    if (!context.enlarge) {
+      const clamped = clampDimensionsPreservingAspectRatio(context.meta, { width: width2, height: height2 });
+      width2 = clamped.width;
+      height2 = clamped.height;
+    }
     return pipe.resize(width2, height2, {
       fit: context.fit,
       background: context.background
@@ -233,8 +258,10 @@ const extract = {
 };
 const rotate = {
   args: [VArg],
-  apply: (_context, pipe, angel) => {
-    return pipe.rotate(angel);
+  apply: (context, pipe, angel) => {
+    return pipe.rotate(angel, {
+      background: context.background
+    });
   }
 };
 const flip = {
@@ -388,6 +415,7 @@ function createIPX(userOptions) {
       if (animated) {
         format = "webp";
       }
+      const Sharp = await import('sharp').then((r) => r.default || r);
       let sharp = Sharp(data, { animated });
       Object.assign(sharp.options, options.sharp);
       const handlers = Object.entries(modifiers).map(([name, args]) => ({ handler: getHandler(name), name, args })).filter((h) => h.handler).sort((a, b) => {
@@ -395,7 +423,7 @@ function createIPX(userOptions) {
         const bKey = (b.handler.order || b.name || "").toString();
         return aKey.localeCompare(bKey);
       });
-      const handlerCtx = {};
+      const handlerCtx = { meta };
       for (const h of handlers) {
         sharp = applyHandler(handlerCtx, sharp, h.handler, h.args) || sharp;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipx",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "repository": "unjs/ipx",
   "license": "MIT",
   "exports": {
@@ -17,10 +17,10 @@
     "dist"
   ],
   "scripts": {
-    "build": "siroc build",
+    "build": "unbuild",
     "dev": "nodemon",
     "lint": "eslint --ext .ts .",
-    "prepublishOnly": "yarn build",
+    "prepack": "yarn build",
     "release": "yarn test && standard-version && git push --follow-tags && npm publish",
     "start": "node bin/ipx.js",
     "test": "yarn lint && jest"
@@ -30,19 +30,18 @@
     "defu": "^5.0.0",
     "destr": "^1.1.0",
     "etag": "^1.8.1",
-    "fs-extra": "^10.0.0",
-    "image-meta": "^0.0.1",
+    "image-meta": "^0.1.1",
     "is-valid-path": "^0.1.1",
-    "listhen": "^0.2.4",
-    "node-fetch": "^2.6.1",
-    "sharp": "^0.28.3",
-    "ufo": "^0.7.7",
-    "xss": "^1.0.9"
+    "listhen": "^0.2.5",
+    "ohmyfetch": "^0.4.2",
+    "pathe": "^0.2.0",
+    "sharp": "^0.29.0",
+    "ufo": "^0.7.9",
+    "xss": "^1.0.10"
   },
   "devDependencies": {
     "@nuxtjs/eslint-config-typescript": "latest",
     "@types/etag": "latest",
-    "@types/fs-extra": "latest",
     "@types/is-valid-path": "latest",
     "@types/jest": "latest",
     "@types/node-fetch": "latest",
@@ -51,9 +50,9 @@
     "jest": "latest",
     "jiti": "latest",
     "nodemon": "latest",
-    "siroc": "latest",
     "standard-version": "latest",
     "ts-jest": "latest",
-    "typescript": "latest"
+    "typescript": "latest",
+    "unbuild": "latest"
   }
 }

package/dist/cli.js

@@ -1,529 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const consola = require('consola');
-const listhen = require('listhen');
-const Sharp = require('sharp');
-const defu = require('defu');
-const imageMeta = require('image-meta');
-const ufo = require('ufo');
-const path = require('path');
-const isValidPath = require('is-valid-path');
-const fsExtra = require('fs-extra');
-const destr = require('destr');
-const http = require('http');
-const https = require('https');
-const fetch = require('node-fetch');
-const getEtag = require('etag');
-const xss = require('xss');
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-const consola__default = /*#__PURE__*/_interopDefaultLegacy(consola);
-const Sharp__default = /*#__PURE__*/_interopDefaultLegacy(Sharp);
-const defu__default = /*#__PURE__*/_interopDefaultLegacy(defu);
-const imageMeta__default = /*#__PURE__*/_interopDefaultLegacy(imageMeta);
-const isValidPath__default = /*#__PURE__*/_interopDefaultLegacy(isValidPath);
-const destr__default = /*#__PURE__*/_interopDefaultLegacy(destr);
-const http__default = /*#__PURE__*/_interopDefaultLegacy(http);
-const https__default = /*#__PURE__*/_interopDefaultLegacy(https);
-const fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
-const getEtag__default = /*#__PURE__*/_interopDefaultLegacy(getEtag);
-const xss__default = /*#__PURE__*/_interopDefaultLegacy(xss);
-
-const Handlers = /*#__PURE__*/Object.freeze({
-  __proto__: null,
-  get quality () { return quality; },
-  get fit () { return fit; },
-  get background () { return background; },
-  get width () { return width; },
-  get height () { return height; },
-  get resize () { return resize; },
-  get trim () { return trim; },
-  get extend () { return extend; },
-  get extract () { return extract; },
-  get rotate () { return rotate; },
-  get flip () { return flip; },
-  get flop () { return flop; },
-  get sharpen () { return sharpen; },
-  get median () { return median; },
-  get blur () { return blur; },
-  get flatten () { return flatten; },
-  get gamma () { return gamma; },
-  get negate () { return negate; },
-  get normalize () { return normalize; },
-  get threshold () { return threshold; },
-  get modulate () { return modulate; },
-  get tint () { return tint; },
-  get grayscale () { return grayscale; },
-  get crop () { return crop; },
-  get q () { return q; },
-  get b () { return b; },
-  get w () { return w; },
-  get h () { return h; },
-  get s () { return s; }
-});
-
-function getEnv(name, defaultValue) {
-  var _a;
-  return (_a = destr__default['default'](process.env[name])) != null ? _a : defaultValue;
-}
-function cachedPromise(fn) {
-  let p;
-  return (...args) => {
-    if (p) {
-      return p;
-    }
-    p = Promise.resolve(fn(...args));
-    return p;
-  };
-}
-class IPXError extends Error {
-}
-function createError(message, statusCode) {
-  const err = new IPXError(message);
-  err.statusMessage = "IPX: " + message;
-  err.statusCode = statusCode;
-  return err;
-}
-
-const createFilesystemSource = (options) => {
-  const rootDir = path.resolve(options.dir);
-  return async (id) => {
-    const fsPath = path.resolve(path.join(rootDir, id));
-    if (!isValidPath__default['default'](id) || id.includes("..") || !fsPath.startsWith(rootDir)) {
-      throw createError("Forbidden path:" + id, 403);
-    }
-    let stats;
-    try {
-      stats = await fsExtra.stat(fsPath);
-    } catch (err) {
-      if (err.code === "ENOENT") {
-        throw createError("File not found: " + fsPath, 404);
-      } else {
-        throw createError("File access error for " + fsPath + ":" + err.code, 403);
-      }
-    }
-    if (!stats.isFile()) {
-      throw createError("Path should be a file: " + fsPath, 400);
-    }
-    return {
-      mtime: stats.mtime,
-      maxAge: options.maxAge || 300,
-      getData: cachedPromise(() => fsExtra.readFile(fsPath))
-    };
-  };
-};
-
-const createHTTPSource = (options) => {
-  const httpsAgent = new https__default['default'].Agent({ keepAlive: true });
-  const httpAgent = new http__default['default'].Agent({ keepAlive: true });
-  let domains = options.domains || [];
-  if (typeof domains === "string") {
-    domains = domains.split(",").map((s) => s.trim());
-  }
-  const hosts = domains.map((domain) => ufo.parseURL(domain, "https://").host);
-  return async (id, reqOptions) => {
-    const parsedUrl = ufo.parseURL(id, "https://");
-    if (!parsedUrl.host) {
-      throw createError("Hostname is missing: " + id, 403);
-    }
-    if (!(reqOptions == null ? void 0 : reqOptions.bypassDomain) && !hosts.find((host) => parsedUrl.host === host)) {
-      throw createError("Forbidden host: " + parsedUrl.host, 403);
-    }
-    const response = await fetch__default['default'](id, {
-      agent: id.startsWith("https") ? httpsAgent : httpAgent
-    });
-    if (!response.ok) {
-      throw createError(response.statusText || "fetch error", response.status || 500);
-    }
-    let maxAge = options.maxAge || 300;
-    const _cacheControl = response.headers.get("cache-control");
-    if (_cacheControl) {
-      const m = _cacheControl.match(/max-age=(\d+)/);
-      if (m && m[1]) {
-        maxAge = parseInt(m[1]);
-      }
-    }
-    let mtime;
-    const _lastModified = response.headers.get("last-modified");
-    if (_lastModified) {
-      mtime = new Date(_lastModified);
-    }
-    return {
-      mtime,
-      maxAge,
-      getData: cachedPromise(() => response.buffer())
-    };
-  };
-};
-
-function VArg(arg) {
-  return destr__default['default'](arg);
-}
-function parseArgs(args, mappers) {
-  const vargs = args.split("_");
-  return mappers.map((v, i) => v(vargs[i]));
-}
-function getHandler(key) {
-  return Handlers[key];
-}
-function applyHandler(ctx, pipe, handler, argsStr) {
-  const args = handler.args ? parseArgs(argsStr, handler.args) : [];
-  return handler.apply(ctx, pipe, ...args);
-}
-
-const quality = {
-  args: [VArg],
-  order: -1,
-  apply: (context, _pipe, quality2) => {
-    context.quality = quality2;
-  }
-};
-const fit = {
-  args: [VArg],
-  order: -1,
-  apply: (context, _pipe, fit2) => {
-    context.fit = fit2;
-  }
-};
-const HEX_RE = /^([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i;
-const SHORTHEX_RE = /^([a-f\d])([a-f\d])([a-f\d])$/i;
-const background = {
-  args: [VArg],
-  order: -1,
-  apply: (context, _pipe, background2) => {
-    if (!background2.startsWith("#") && (HEX_RE.test(background2) || SHORTHEX_RE.test(background2))) {
-      background2 = "#" + background2;
-    }
-    context.background = background2;
-  }
-};
-const width = {
-  args: [VArg],
-  apply: (_context, pipe, width2) => {
-    return pipe.resize(width2, null);
-  }
-};
-const height = {
-  args: [VArg],
-  apply: (_context, pipe, height2) => {
-    return pipe.resize(null, height2);
-  }
-};
-const resize = {
-  args: [VArg, VArg, VArg],
-  apply: (context, pipe, width2, height2) => {
-    return pipe.resize(width2, height2, {
-      fit: context.fit,
-      background: context.background
-    });
-  }
-};
-const trim = {
-  args: [VArg],
-  apply: (_context, pipe, threshold2) => {
-    return pipe.trim(threshold2);
-  }
-};
-const extend = {
-  args: [VArg, VArg, VArg, VArg],
-  apply: (context, pipe, top, right, bottom, left) => {
-    return pipe.extend({
-      top,
-      left,
-      bottom,
-      right,
-      background: context.background
-    });
-  }
-};
-const extract = {
-  args: [VArg, VArg, VArg, VArg],
-  apply: (context, pipe, top, right, bottom, left) => {
-    return pipe.extend({
-      top,
-      left,
-      bottom,
-      right,
-      background: context.background
-    });
-  }
-};
-const rotate = {
-  args: [VArg],
-  apply: (_context, pipe, angel) => {
-    return pipe.rotate(angel);
-  }
-};
-const flip = {
-  args: [],
-  apply: (_context, pipe) => {
-    return pipe.flip();
-  }
-};
-const flop = {
-  args: [],
-  apply: (_context, pipe) => {
-    return pipe.flop();
-  }
-};
-const sharpen = {
-  args: [VArg, VArg, VArg],
-  apply: (_context, pipe, sigma, flat, jagged) => {
-    return pipe.sharpen(sigma, flat, jagged);
-  }
-};
-const median = {
-  args: [VArg, VArg, VArg],
-  apply: (_context, pipe, size) => {
-    return pipe.median(size);
-  }
-};
-const blur = {
-  args: [VArg, VArg, VArg],
-  apply: (_context, pipe) => {
-    return pipe.blur();
-  }
-};
-const flatten = {
-  args: [VArg, VArg, VArg],
-  apply: (context, pipe) => {
-    return pipe.flatten({
-      background: context.background
-    });
-  }
-};
-const gamma = {
-  args: [VArg, VArg, VArg],
-  apply: (_context, pipe, gamma2, gammaOut) => {
-    return pipe.gamma(gamma2, gammaOut);
-  }
-};
-const negate = {
-  args: [VArg, VArg, VArg],
-  apply: (_context, pipe) => {
-    return pipe.negate();
-  }
-};
-const normalize = {
-  args: [VArg, VArg, VArg],
-  apply: (_context, pipe) => {
-    return pipe.normalize();
-  }
-};
-const threshold = {
-  args: [VArg],
-  apply: (_context, pipe, threshold2) => {
-    return pipe.threshold(threshold2);
-  }
-};
-const modulate = {
-  args: [VArg],
-  apply: (_context, pipe, brightness, saturation, hue) => {
-    return pipe.modulate({
-      brightness,
-      saturation,
-      hue
-    });
-  }
-};
-const tint = {
-  args: [VArg],
-  apply: (_context, pipe, rgb) => {
-    return pipe.tint(rgb);
-  }
-};
-const grayscale = {
-  args: [VArg],
-  apply: (_context, pipe) => {
-    return pipe.grayscale();
-  }
-};
-const crop = extract;
-const q = quality;
-const b = background;
-const w = width;
-const h = height;
-const s = resize;
-
-const SUPPORTED_FORMATS = ["jpeg", "png", "webp", "avif", "tiff"];
-function createIPX(userOptions) {
-  const defaults = {
-    dir: getEnv("IPX_DIR", "."),
-    domains: getEnv("IPX_DOMAINS", []),
-    alias: getEnv("IPX_ALIAS", {}),
-    sharp: {}
-  };
-  const options = defu__default['default'](userOptions, defaults);
-  options.alias = Object.fromEntries(Object.entries(options.alias).map((e) => [ufo.withLeadingSlash(e[0]), e[1]]));
-  const ctx = {
-    sources: {}
-  };
-  if (options.dir) {
-    ctx.sources.filesystem = createFilesystemSource({
-      dir: options.dir
-    });
-  }
-  if (options.domains) {
-    ctx.sources.http = createHTTPSource({
-      domains: options.domains
-    });
-  }
-  return function ipx(id, modifiers = {}, reqOptions = {}) {
-    if (!id) {
-      throw createError("resource id is missing", 400);
-    }
-    id = ufo.hasProtocol(id) ? id : ufo.withLeadingSlash(id);
-    for (const base in options.alias) {
-      if (id.startsWith(base)) {
-        id = ufo.joinURL(options.alias[base], id.substr(base.length));
-      }
-    }
-    const getSrc = cachedPromise(() => {
-      const source = ufo.hasProtocol(id) ? "http" : "filesystem";
-      if (!ctx.sources[source]) {
-        throw createError("Unknown source: " + source, 400);
-      }
-      return ctx.sources[source](id, reqOptions);
-    });
-    const getData = cachedPromise(async () => {
-      const src = await getSrc();
-      const data = await src.getData();
-      const meta = imageMeta__default['default'](data);
-      const mFormat = modifiers.f || modifiers.format;
-      let format = mFormat || meta.type;
-      if (format === "jpg") {
-        format = "jpeg";
-      }
-      if (meta.type === "svg" && !mFormat) {
-        return {
-          data,
-          format: "svg+xml",
-          meta
-        };
-      }
-      const animated = modifiers.animated !== void 0 || modifiers.a !== void 0;
-      if (animated) {
-        format = "webp";
-      }
-      let sharp = Sharp__default['default'](data, { animated });
-      Object.assign(sharp.options, options.sharp);
-      const handlers = Object.entries(modifiers).map(([name, args]) => ({ handler: getHandler(name), name, args })).filter((h) => h.handler).sort((a, b) => {
-        const aKey = (a.handler.order || a.name || "").toString();
-        const bKey = (b.handler.order || b.name || "").toString();
-        return aKey.localeCompare(bKey);
-      });
-      const handlerCtx = {};
-      for (const h of handlers) {
-        sharp = applyHandler(handlerCtx, sharp, h.handler, h.args) || sharp;
-      }
-      if (SUPPORTED_FORMATS.includes(format)) {
-        sharp = sharp.toFormat(format, {
-          quality: handlerCtx.quality,
-          progressive: format === "jpeg"
-        });
-      }
-      const newData = await sharp.toBuffer();
-      return {
-        data: newData,
-        format,
-        meta
-      };
-    });
-    return {
-      src: getSrc,
-      data: getData
-    };
-  };
-}
-
-async function _handleRequest(req, ipx) {
-  const res = {
-    statusCode: 200,
-    statusMessage: "",
-    headers: {},
-    body: ""
-  };
-  const [modifiersStr = "", ...idSegments] = req.url.substr(1).split("/");
-  const id = ufo.decode(idSegments.join("/"));
-  if (!modifiersStr) {
-    throw createError("Modifiers is missing in path: " + req.url, 400);
-  }
-  if (!id || id === "/") {
-    throw createError("Resource id is missing: " + req.url, 400);
-  }
-  const modifiers = Object.create(null);
-  if (modifiersStr !== "_") {
-    for (const p of modifiersStr.split(",")) {
-      const [key, value = ""] = p.split("_");
-      modifiers[key] = ufo.decode(value);
-    }
-  }
-  const img = ipx(id, modifiers, req.options);
-  const src = await img.src();
-  if (src.mtime) {
-    if (req.headers["if-modified-since"]) {
-      if (new Date(req.headers["if-modified-since"]) >= src.mtime) {
-        res.statusCode = 304;
-        return res;
-      }
-    }
-    res.headers["Last-Modified"] = +src.mtime + "";
-  }
-  if (src.maxAge !== void 0) {
-    res.headers["Cache-Control"] = `max-age=${+src.maxAge}, public, s-maxage=${+src.maxAge}`;
-  }
-  const { data, format } = await img.data();
-  const etag = getEtag__default['default'](data);
-  res.headers.ETag = etag;
-  if (etag && req.headers["if-none-match"] === etag) {
-    res.statusCode = 304;
-    return res;
-  }
-  if (format) {
-    res.headers["Content-Type"] = `image/${format}`;
-  }
-  res.body = data;
-  return res;
-}
-function handleRequest(req, ipx) {
-  return _handleRequest(req, ipx).catch((err) => {
-    const statusCode = parseInt(err.statusCode) || 500;
-    const statusMessage = err.statusMessage ? xss__default['default'](err.statusMessage) : `IPX Error (${statusCode})`;
-    if (process.env.NODE_ENV !== "production" && statusCode === 500) {
-      console.error(err);
-    }
-    return {
-      statusCode,
-      statusMessage,
-      body: statusMessage,
-      headers: {}
-    };
-  });
-}
-function createIPXMiddleware(ipx) {
-  return function IPXMiddleware(req, res) {
-    handleRequest({ url: req.url, headers: req.headers }, ipx).then((_res) => {
-      res.statusCode = _res.statusCode;
-      res.statusMessage = _res.statusMessage;
-      for (const name in _res.headers) {
-        res.setHeader(name, _res.headers[name]);
-      }
-      res.end(_res.body);
-    });
-  };
-}
-
-async function main() {
-  const ipx = createIPX({});
-  const middleware = createIPXMiddleware(ipx);
-  await listhen.listen(middleware, {
-    clipboard: false
-  });
-}
-main().catch((err) => {
-  consola__default['default'].error(err);
-  process.exit(1);
-});