ipx 0.8.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
 
@@ -85,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,34 +2,30 @@
 
 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; },
@@ -61,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;
@@ -87,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);
@@ -109,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());
@@ -127,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) {
@@ -158,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("_");
@@ -382,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: {}
@@ -417,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") {
@@ -434,7 +429,8 @@ 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();
@@ -502,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;
@@ -517,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,18 +1,17 @@
-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; },
@@ -44,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;
@@ -78,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);
@@ -92,7 +90,7 @@ const createFilesystemSource = (options) => {
     return {
       mtime: stats.mtime,
       maxAge: options.maxAge || 300,
-      getData: cachedPromise(() => readFile(fsPath))
+      getData: cachedPromise(() => promises.readFile(fsPath))
     };
   };
 };
@@ -110,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, {
@@ -417,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) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipx",
-  "version": "0.8.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",
+    "listhen": "^0.2.5",
+    "ohmyfetch": "^0.4.2",
+    "pathe": "^0.2.0",
     "sharp": "^0.29.0",
     "ufo": "^0.7.9",
-    "xss": "^1.0.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/CHANGELOG.md

@@ -1,220 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-## [0.8.0](https://github.com/unjs/ipx/compare/v0.7.2...v0.8.0) (2021-09-05)
-
-
-### ⚠ BREAKING CHANGES
-
-* update sharp to 0.29.0
-
-* update sharp to 0.29.0 ([b5a06fb](https://github.com/unjs/ipx/commit/b5a06fbdd2d5e0caf12f8c8a3d389ebed2744425)), closes [/github.com/lovell/sharp/blob/master/docs/changelog.md#v0290---17th-august-2021](https://github.com/unjs//github.com/lovell/sharp/blob/master/docs/changelog.md/issues/v0290---17th-august-2021)
-
-### [0.7.2](https://github.com/unjs/ipx/compare/v0.7.1...v0.7.2) (2021-07-26)
-
-
-### Features
-
-* default to not upscaling images ([#41](https://github.com/unjs/ipx/issues/41)) ([162f730](https://github.com/unjs/ipx/commit/162f7308650416905b33ab2c031c5fc7b82ef13b))
-
-### [0.7.1](https://github.com/unjs/ipx/compare/v0.7.0...v0.7.1) (2021-07-02)
-
-
-### Bug Fixes
-
-* handle background number ([2f82a56](https://github.com/unjs/ipx/commit/2f82a56893004e6797b23ef40c2940155fde63f4))
-* resize with width and hight ([3ca70a0](https://github.com/unjs/ipx/commit/3ca70a017d86a2d907a935eaf6ffab901424bffb))
-* support background with rotate ([b6c8f8c](https://github.com/unjs/ipx/commit/b6c8f8cb1310d18134d0ade2e4c023d3d7a1936c))
-
-## [0.7.0](https://github.com/unjs/ipx/compare/v0.6.7...v0.7.0) (2021-07-01)
-
-
-### ⚠ BREAKING CHANGES
-
-* **pkg:** add exports field
-* move modifiers to path from query
-
-### Features
-
-* `reqOptions` and `bypassDomain` ([fc8c7b5](https://github.com/unjs/ipx/commit/fc8c7b5b655d61e23f6f63af82669ed23e48eec5))
-* **pkg:** add exports field ([394384f](https://github.com/unjs/ipx/commit/394384f19364845e228aedeee598d8960d263c7e))
-* move modifiers to path from query ([b7570d9](https://github.com/unjs/ipx/commit/b7570d942bf282da38acdc79b34c6e33177611c0))
-
-
-### Bug Fixes
-
-* don't prepend trailing slash to external id ([01e151a](https://github.com/unjs/ipx/commit/01e151a90c0601802bf197cf28542d24fae1c3b4))
-
-### [0.6.7](https://github.com/unjs/ipx/compare/v0.6.6...v0.6.7) (2021-07-01)
-
-### Bug Fixes
-
-- **middleware:** set res.body ([d7dc146](https://github.com/unjs/ipx/commit/d7dc1466224310e583d6c595a3c1e67b00f4a13f))
-
-### [0.6.6](https://github.com/unjs/ipx/compare/v0.6.5...v0.6.6) (2021-07-01)
-
-### [0.6.5](https://github.com/unjs/ipx/compare/v0.6.4...v0.6.5) (2021-07-01)
-
-### Features
-
-- expose handleRequest ([7c8c857](https://github.com/unjs/ipx/commit/7c8c857fc4a84d57ee8c2a5919f0b397c2e1b220))
-
-### Bug Fixes
-
-- **filesystem:** handle when input is not a file ([9e1f7bf](https://github.com/unjs/ipx/commit/9e1f7bf73463b0958362bfa1443f1db24058410a))
-
-### [0.6.4](https://github.com/unjs/ipx/compare/v0.6.3...v0.6.4) (2021-07-01)
-
-### Bug Fixes
-
-- enforce leadingSlash for alias resolution ([3092e00](https://github.com/unjs/ipx/commit/3092e00870a29cb797c1c3b6cb921497523800fa))
-
-### [0.6.3](https://github.com/unjs/ipx/compare/v0.6.2...v0.6.3) (2021-06-30)
-
-### Bug Fixes
-
-- content-type of svg files ([#38](https://github.com/unjs/ipx/issues/38)) ([a7a1b3b](https://github.com/unjs/ipx/commit/a7a1b3b8fb3c1b996ec823d80d029a11a19b9311))
-
-### [0.6.2](https://github.com/unjs/ipx/compare/v0.6.1...v0.6.2) (2021-06-29)
-
-### Features
-
-- experimental animated support (ref [#35](https://github.com/unjs/ipx/issues/35)) ([d93fdfa](https://github.com/unjs/ipx/commit/d93fdfa1d591e70b89084a7f50d37343a7d68df8))
-- support id alias ([#32](https://github.com/unjs/ipx/issues/32)) ([d4356cf](https://github.com/unjs/ipx/commit/d4356cfc28f23000e3e25f597d49eb164da580b3))
-- **http:** use hostname for domain validation ([da5ca74](https://github.com/unjs/ipx/commit/da5ca74b0a57f5e47b1927f282fdda7228e54f58)), closes [nuxt/image#343](https://github.com/nuxt/image/issues/343)
-
-### Bug Fixes
-
-- apply context modifiers first (resolves [#33](https://github.com/unjs/ipx/issues/33)) ([cf9effd](https://github.com/unjs/ipx/commit/cf9effd1f8b390c51507f2b18d2a69de921017fd))
-- default modifiers to empty object ([00d5c1d](https://github.com/unjs/ipx/commit/00d5c1d262a300469d24dc5a92c4a9940f2f0483))
-
-### [0.6.1](https://github.com/unjs/ipx/compare/v0.6.0...v0.6.1) (2021-05-26)
-
-## [0.6.0](https://github.com/unjs/ipx/compare/v0.5.8...v0.6.0) (2021-02-15)
-
-### ⚠ BREAKING CHANGES
-
-- improved handlers and format support
-
-### Features
-
-- improved handlers and format support ([f4f6e58](https://github.com/unjs/ipx/commit/f4f6e586119e5c9c7c81354277b42e2d3406bb96))
-
-### [0.5.8](https://github.com/unjs/ipx/compare/v0.5.7...v0.5.8) (2021-02-08)
-
-### Bug Fixes
-
-- **ipx:** handle when modifiers not provided ([4efebd8](https://github.com/unjs/ipx/commit/4efebd88963cfd054004810207874553e89e5d61))
-
-### [0.5.7](https://github.com/unjs/ipx/compare/v0.5.6...v0.5.7) (2021-02-08)
-
-### Bug Fixes
-
-- override meta.type and meta.mimeType if format modifier used ([820f1e2](https://github.com/unjs/ipx/commit/820f1e253dcbd0fe1122a742bb75dcfc364b868b))
-
-### [0.5.6](https://github.com/unjs/ipx/compare/v0.5.5...v0.5.6) (2021-02-04)
-
-### Bug Fixes
-
-- remove extra space ([6df3504](https://github.com/unjs/ipx/commit/6df350413d2cab1b4d4a4c9f8b8a92bd906cc8f5))
-
-### [0.5.5](https://github.com/unjs/ipx/compare/v0.5.4...v0.5.5) (2021-02-04)
-
-### Bug Fixes
-
-- add public and s-maxage ([bfd9727](https://github.com/unjs/ipx/commit/bfd9727ac867d0af390f56dd939347f5183d1763))
-
-### [0.5.4](https://github.com/unjs/ipx/compare/v0.5.3...v0.5.4) (2021-02-04)
-
-### Bug Fixes
-
-- **http:** user headers.get ([9cf5aeb](https://github.com/unjs/ipx/commit/9cf5aebaff8f8fe86014993ac4c91590bc5a6134))
-
-### [0.5.3](https://github.com/unjs/ipx/compare/v0.5.2...v0.5.3) (2021-02-04)
-
-### Bug Fixes
-
-- fix max-age cache header name ([833272b](https://github.com/unjs/ipx/commit/833272b6a4c63c388e941c8f037118c204a8dac4))
-- **types:** optional ipxOptions ([692ab1f](https://github.com/unjs/ipx/commit/692ab1f6c64fa86d77581bebdcabf0ba707b9469))
-
-### [0.5.2](https://github.com/unjs/ipx/compare/v0.5.1...v0.5.2) (2021-02-03)
-
-### Features
-
-- support meta, content-type and svg handling ([37592e7](https://github.com/unjs/ipx/commit/37592e711d166df41c29f1b1117adb186d42ce5d))
-
-### Bug Fixes
-
-- only giveup svg if no format modifier set ([f5ce8b7](https://github.com/unjs/ipx/commit/f5ce8b7aecd18629b7a116dc6aecd5096d4573aa))
-
-### [0.5.1](https://github.com/unjs/ipx/compare/v0.5.0...v0.5.1) (2021-02-03)
-
-### Bug Fixes
-
-- **pkg:** export index.ts ([6125bbb](https://github.com/unjs/ipx/commit/6125bbb79ad430294f5d371d9a08f8ecca5c8372))
-
-## [0.5.0](https://github.com/unjs/ipx/compare/v0.4.8...v0.5.0) (2021-02-03)
-
-### ⚠ BREAKING CHANGES
-
-- rewrite ipx
-
-### Features
-
-- rewrite ipx ([a60fb0d](https://github.com/unjs/ipx/commit/a60fb0d44b96c9f135af3295730c3da13fbc3e6c))
-
-### [0.4.8](https://github.com/unjs/ipx/compare/v0.4.7...v0.4.8) (2020-12-23)
-
-### Bug Fixes
-
-- update allowList import ([a26cae0](https://github.com/unjs/ipx/commit/a26cae00faa4fea7c190e3fb4efdf5fa1d137095))
-
-### [0.4.7](https://github.com/unjs/ipx/compare/v0.4.6...v0.4.7) (2020-12-23)
-
-### Bug Fixes
-
-- **pkg:** update exports ([584cfe4](https://github.com/unjs/ipx/commit/584cfe4c341da6e10a7da28a20afe6b4d9aeff0a))
-
-### [0.4.6](https://github.com/unjs/ipx/compare/v0.4.5...v0.4.6) (2020-11-30)
-
-### [0.4.5](https://github.com/unjs/ipx/compare/v0.4.4...v0.4.5) (2020-11-30)
-
-### Bug Fixes
-
-- prevent unknow format error ([#18](https://github.com/unjs/ipx/issues/18)) ([3f338be](https://github.com/unjs/ipx/commit/3f338be630c76fd2d91901462cc3d5b495719882))
-
-### [0.4.4](https://github.com/unjs/ipx/compare/v0.4.3...v0.4.4) (2020-11-27)
-
-### Features
-
-- add background operation ([#16](https://github.com/unjs/ipx/issues/16)) ([b1a0178](https://github.com/unjs/ipx/commit/b1a0178c2522bba1361a8973bf338fe0ae1cab86))
-
-### [0.4.3](https://github.com/unjs/ipx/compare/v0.4.2...v0.4.3) (2020-11-25)
-
-### Features
-
-- allow gif images ([#15](https://github.com/unjs/ipx/issues/15)) ([51dcfc1](https://github.com/unjs/ipx/commit/51dcfc1dc0a076eca2c33ce5fcaf37b970964bca))
-
-### [0.4.2](https://github.com/unjs/ipx/compare/v0.4.1...v0.4.2) (2020-11-18)
-
-### Bug Fixes
-
-- support `HttpAgent` with `remote` input ([#14](https://github.com/unjs/ipx/issues/14)) ([699b671](https://github.com/unjs/ipx/commit/699b6717d1b6f817edb784d50cd5f2ce8da5d21a))
-
-### [0.4.1](https://github.com/unjs/ipx/compare/v0.4.0...v0.4.1) (2020-11-12)
-
-### Features
-
-- allow overiding `sharp.options` ([#13](https://github.com/unjs/ipx/issues/13)) ([ae7244d](https://github.com/unjs/ipx/commit/ae7244d83712d352e4fd08fa2106122aac6f2689))
-
-## [0.4.0](https://github.com/unjs/ipx/compare/v0.4.0-rc.1...v0.4.0) (2020-11-05)
-
-### Features
-
-- support svg files ([#9](https://github.com/unjs/ipx/issues/9)) ([a020904](https://github.com/unjs/ipx/commit/a02090436e0116de641fa3d415dfeae1bee79379))
-
-### Bug Fixes
-
-- remove meta ([a490fb6](https://github.com/unjs/ipx/commit/a490fb6bb13a5f215a1ffb39b6acbf6d5de85aca))
-- support adapter on client ([4ffd7e8](https://github.com/unjs/ipx/commit/4ffd7e84553b4b13dbb15bee801d27d014b9dc08))

package/dist/cli.js

@@ -1,558 +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 enlarge () { return enlarge; },
-  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);
-}
-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],
-  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) => {
-    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, { withoutEnlargement: !context.enlarge });
-  }
-};
-const height = {
-  args: [VArg],
-  apply: (context, pipe, height2) => {
-    return pipe.resize(null, height2, { withoutEnlargement: !context.enlarge });
-  }
-};
-const resize = {
-  args: [VArg, VArg, VArg],
-  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
-    });
-  }
-};
-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, {
-      background: context.background
-    });
-  }
-};
-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 = { meta };
-      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);
-});