ipx 1.3.0 → 2.0.0-1

package/README.md

@@ -3,28 +3,48 @@
 [![npm version][npm-version-src]][npm-version-href]
 [![npm downloads][npm-downloads-src]][npm-downloads-href]
 
-High performance, secure and easy to use image proxy based on [sharp](https://github.com/lovell/sharp) and [libvips](https://github.com/libvips/libvips).
+High performance, secure and easy-to-use image optimizer.
+
+Powered by [sharp](https://github.com/lovell/sharp) and [libvips](https://github.com/libvips/libvips).
+
+> [!IMPORTANT]
+> This is the development branch for IPX v2. Check out [ipx/v1](https://github.com/unjs/ipx/tree/v1) for latest stable docs and [#71](https://github.com/unjs/ipx/issues/171) for v2 roadmap.
 
 ## Using CLI
 
-You can use `ipx` command to start server using:
+You can use `ipx` command to start server.
+
+Using `npx`:
+
+```bash
+npx ipx@next-2 serve --dir ./
+```
+
+Usin `bun`
 
 ```bash
-npx ipx@latest
+bun x npx ipx@next-2 serve --dir ./
 ```
 
-The default server directory is the current working directory.
+The default serve directory is the current working directory.
 
 ## Programatic API
 
 You can use IPX as a middleware or directly use IPX interface.
 
 ```ts
-import { createIPX, createIPXMiddleware } from "ipx";
-
-const ipx = createIPX({ domains: ["unjs.io"] });
+import {
+  createIPX,
+  createIPXMiddleware,
+  ipxFSStorage,
+  ipxHttpStorage,
+} from "ipx";
+
+const ipx = createIPX({
+  storage: ipxFSStorage({ dir: "./public" }),
+  httpStorage: ipxHttpStorage({ domains: ["picsum.photos"] }),
+});
 
-// (req, res) => void
 const ipxMiddleware = createIPXMiddleware(ipx);
 ```
 
@@ -33,10 +53,6 @@ const ipxMiddleware = createIPXMiddleware(ipx);
 ```js
 import { createIPX, createIPXMiddleware } from "ipx";
 import { listen } from "listhen";
-import { createApp, fromNodeMiddleware, toNodeListener } from "h3";
-
-const ipx = createIPX({});
-const ipxMiddleware = createIPXMiddleware(ipx);
 
 const app = createApp().use("/", fromNodeMiddleware(ipxMiddleware));
 
@@ -46,19 +62,15 @@ listen(toNodeListener(app));
 **Example:** Using [express](https://expressjs.com):
 
 ```js
-import { createIPX, createIPXMiddleware } from "ipx";
 import { listen } from "listhen";
 import express from "express";
 
-const ipx = createIPX({});
-const ipxMiddleware = createIPXMiddleware(ipx);
-
 const app = express().use("/", ipxMiddleware);
 
 listen(app);
 ```
 
-## Examples
+## URL Examples
 
 Get original image:
 
@@ -76,6 +88,46 @@ Resize to `200x200px` using `embed` method and change format to `webp`:
 
 `/embed,f_webp,s_200x200/static/buffalo.png`
 
+## Config
+
+You can universally customize IPX configuration using `IPX_*` environment variables.
+
+- `IPX_ALIAS`
+
+  - Default: `{}`
+
+### Filesystem Source Options
+
+(enabled by default with CLI only)
+
+#### `IPX_FS_DIR`
+
+- Default: `.` (current working directory)
+
+#### `IPX_FS_MAX_AGE`
+
+- Default: `300`
+
+### HTTP(s) Source Options
+
+(enabled by default with CLI only)
+
+#### `IPX_HTTP_DOMAINS`
+
+- Default: `[]`
+
+#### `IPX_HTTP_MAX_AGE`
+
+- Default: `300`
+
+#### `IPX_HTTP_FETCH_OPTIONS`
+
+- Default: `{}`
+
+#### `IPX_HTTP_ALLOW_ALL_DOMAINS`
+
+- Default: `false`
+
 ## Modifiers
 
 | Property       | Docs                                                            | Example                                              | Comments                                                                                                                                                          |
@@ -107,30 +159,6 @@ Resize to `200x200px` using `embed` method and change format to `webp`:
 | grayscale      | [Docs](https://sharp.pixelplumbing.com/api-colour#grayscale)    | `/grayscale/buffalo.png`                             |
 | animated       | -                                                               | `/animated/buffalo.gif`                              | Experimental                                                                                                                                                      |
 
-## Config
-
-Config can be customized using `IPX_*` environment variables.
-
-- `IPX_DIR`
-
-  - Default: `.` (current working directory)
-
-- `IPX_DOMAINS`
-
-  - Default: `[]`
-
-- `IPX_MAX_AGE`
-
-  - Default: `300`
-
-- `IPX_ALIAS`
-
-  - Default: `{}`
-
-- `IPX_FETCH_OPTIONS`
-
-  - Default: `{}`
-
 ## License
 
 [MIT](./LICENSE)

package/dist/cli.cjs

@@ -1,33 +1,63 @@
 'use strict';
 
-const consola = require('consola');
 const listhen = require('listhen');
-const index = require('./index.cjs');
+const citty = require('citty');
+const cli = require('listhen/cli');
+const nodeFs = require('./shared/ipx.680a50a5.cjs');
 require('defu');
 require('image-meta');
 require('ufo');
-require('node:fs');
-require('pathe');
+require('h3');
 require('destr');
-require('node:http');
-require('node:https');
-require('node-fetch-native');
 require('@fastify/accept-negotiator');
 require('etag');
-require('xss');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+require('ofetch');
+require('pathe');
 
-const consola__default = /*#__PURE__*/_interopDefaultCompat(consola);
+const name = "ipx";
+const version = "2.0.0-1";
+const description = "High performance, secure and easy-to-use image optimizer.";
 
-async function main() {
-  const ipx = index.createIPX({});
-  const middleware = index.createIPXMiddleware(ipx);
-  await listhen.listen(middleware, {
-    clipboard: false
-  });
-}
-main().catch((error) => {
-  consola__default.error(error);
-  process.exit(1);
+const serve = citty.defineCommand({
+  meta: {
+    description: "Start IPX Server"
+  },
+  args: {
+    dir: {
+      type: "string",
+      required: false,
+      description: "Directory to serve (default: current directory) ENV: IPX_FS_DIR"
+    },
+    domains: {
+      type: "string",
+      required: false,
+      description: "Allowed domains (comma separated) ENV: IPX_HTTP_DOMAINS"
+    },
+    ...cli.getArgs()
+  },
+  async run({ args }) {
+    const ipx = nodeFs.createIPX({
+      storage: nodeFs.ipxFSStorage({
+        dir: args.dir
+      }),
+      httpStorage: nodeFs.ipxHttpStorage({
+        domains: args.domains
+      })
+    });
+    await listhen.listen(nodeFs.createIPXNodeServer(ipx), {
+      name: "IPX",
+      ...cli.parseArgs(args)
+    });
+  }
+});
+const main = citty.defineCommand({
+  meta: {
+    name,
+    version,
+    description
+  },
+  subCommands: {
+    serve
+  }
 });
+citty.runMain(main);

package/dist/cli.mjs

@@ -1,27 +1,61 @@
-import consola from 'consola';
 import { listen } from 'listhen';
-import { createIPX, createIPXMiddleware } from './index.mjs';
+import { defineCommand, runMain } from 'citty';
+import { getArgs, parseArgs } from 'listhen/cli';
+import { c as createIPX, g as ipxFSStorage, i as ipxHttpStorage, e as createIPXNodeServer } from './shared/ipx.57fad794.mjs';
 import 'defu';
 import 'image-meta';
 import 'ufo';
-import 'node:fs';
-import 'pathe';
+import 'h3';
 import 'destr';
-import 'node:http';
-import 'node:https';
-import 'node-fetch-native';
 import '@fastify/accept-negotiator';
 import 'etag';
-import 'xss';
+import 'ofetch';
+import 'pathe';
 
-async function main() {
-  const ipx = createIPX({});
-  const middleware = createIPXMiddleware(ipx);
-  await listen(middleware, {
-    clipboard: false
-  });
-}
-main().catch((error) => {
-  consola.error(error);
-  process.exit(1);
+const name = "ipx";
+const version = "2.0.0-1";
+const description = "High performance, secure and easy-to-use image optimizer.";
+
+const serve = defineCommand({
+  meta: {
+    description: "Start IPX Server"
+  },
+  args: {
+    dir: {
+      type: "string",
+      required: false,
+      description: "Directory to serve (default: current directory) ENV: IPX_FS_DIR"
+    },
+    domains: {
+      type: "string",
+      required: false,
+      description: "Allowed domains (comma separated) ENV: IPX_HTTP_DOMAINS"
+    },
+    ...getArgs()
+  },
+  async run({ args }) {
+    const ipx = createIPX({
+      storage: ipxFSStorage({
+        dir: args.dir
+      }),
+      httpStorage: ipxHttpStorage({
+        domains: args.domains
+      })
+    });
+    await listen(createIPXNodeServer(ipx), {
+      name: "IPX",
+      ...parseArgs(args)
+    });
+  }
+});
+const main = defineCommand({
+  meta: {
+    name,
+    version,
+    description
+  },
+  subCommands: {
+    serve
+  }
 });
+runMain(main);