ipx 0.7.2 → 0.9.2

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/bin/ipx.mjs

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/cli.mjs'

package/dist/{cli.js → chunks/middleware.cjs}

@@ -1,38 +1,29 @@
-#!/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 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 destr = require('destr');
 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 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 destr__default = /*#__PURE__*/_interopDefaultLegacy(destr);
 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; },
@@ -64,11 +55,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;
@@ -90,15 +80,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);
@@ -112,28 +102,28 @@ 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());
   }
   const hosts = domains.map((domain) => ufo.parseURL(domain, "https://").host);
   return async (id, reqOptions) => {
-    const parsedUrl = ufo.parseURL(id, "https://");
-    if (!parsedUrl.host) {
+    const url = new URL(id);
+    if (!url.hostname) {
       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);
+    if (!reqOptions?.bypassDomain && !hosts.find((host) => url.hostname === host)) {
+      throw createError("Forbidden host: " + url.hostname, 403);
     }
-    const response = await fetch__default['default'](id, {
+    const response = await ohmyfetch.fetch(id, {
       agent: id.startsWith("https") ? httpsAgent : httpAgent
     });
     if (!response.ok) {
@@ -161,7 +151,7 @@ const createHTTPSource = (options) => {
 };
 
 function VArg(arg) {
-  return destr__default['default'](arg);
+  return destr__default(arg);
 }
 function parseArgs(args, mappers) {
   const vargs = args.split("_");
@@ -385,7 +375,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: {}
@@ -420,7 +410,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") {
@@ -437,7 +427,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();
@@ -505,7 +496,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;
@@ -520,7 +511,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);
     }
@@ -545,14 +536,6 @@ function createIPXMiddleware(ipx) {
   };
 }
 
-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);
-});
+exports.createIPX = createIPX;
+exports.createIPXMiddleware = createIPXMiddleware;
+exports.handleRequest = handleRequest;