feat: reimplement server with h3 (#168)

.eslintrc

@@ -4,6 +4,7 @@
     "unicorn/prefer-top-level-await": 0,
     "unicorn/no-process-exit": 0,
     "unicorn/prevent-abbreviations": 0,
+    "unicorn/no-null": 0,
     "no-undef": 0
   }
 }

README.md

@@ -117,9 +117,13 @@ You can universally customize IPX configuration using `IPX_*` environment variab
 
 - Default: `300`
 
-- `IPX_HTTP_FETCH_OPTIONS`
+#### `IPX_HTTP_FETCH_OPTIONS`
 
-  - Default: `{}`
+- Default: `{}`
+
+#### `IPX_HTTP_ALLOW_ALL_DOMAINS`
+
+- Default: `false`
 
 ## Modifiers
 

package.json

@@ -37,18 +37,19 @@
   },
   "dependencies": {
     "@fastify/accept-negotiator": "^1.1.0",
+    "citty": "^0.1.4",
     "consola": "^3.2.3",
     "defu": "^6.1.2",
     "destr": "^2.0.1",
     "etag": "^1.8.1",
+    "h3": "^1.8.1",
     "image-meta": "^0.1.1",
     "listhen": "^1.5.2",
     "node-fetch-native": "^1.4.0",
     "pathe": "^1.1.1",
     "sharp": "^0.32.5",
     "ufo": "^1.3.0",
-    "unstorage": "^1.9.0",
-    "xss": "^1.0.14"
+    "unstorage": "^1.9.0"
   },
   "devDependencies": {
     "@types/etag": "^1.8.1",

playground.ts

@@ -1,15 +1,10 @@
-import {
-  createIPX,
-  createIPXMiddleware,
-  ipxFSStorage,
-  ipxHttpStorage,
-} from "./src";
+import { createIPX, createIPXH3App, ipxFSStorage, ipxHttpStorage } from "./src";
 
 const ipx = createIPX({
-  storage: ipxFSStorage({ dir: "./test/assets" }),
+  storage: ipxFSStorage(),
   httpStorage: ipxHttpStorage({
     domains: ["picsum.photos"],
   }),
 });
 
-export default createIPXMiddleware(ipx);
+export default createIPXH3App(ipx);

src/cli.ts

@@ -6,7 +6,7 @@ import {
 } from "listhen/cli";
 import { name, version, description } from "../package.json";
 import { createIPX } from "./ipx";
-import { createIPXMiddleware } from "./middleware";
+import { createIPXNodeServer } from "./server";
 import { ipxFSStorage } from "./storage/node-fs";
 import { ipxHttpStorage } from "./storage/http";
 
@@ -37,8 +37,7 @@ const serve = defineCommand({
         domains: args.domains,
       }),
     });
-    const middleware = createIPXMiddleware(ipx);
-    await listen(middleware, {
+    await listen(createIPXNodeServer(ipx), {
       name: "IPX",
       ...parseListhenArgs(args),
     });

src/index.ts

@@ -1,5 +1,5 @@
 export * from "./ipx";
-export * from "./middleware";
+export * from "./server";
 export * from "./types";
 export * from "./storage/http";
 export * from "./storage/node-fs";

src/ipx.ts

@@ -2,9 +2,10 @@ import { defu } from "defu";
 import { imageMeta as getImageMeta } from "image-meta";
 import { hasProtocol, joinURL, withLeadingSlash } from "ufo";
 import type { SharpOptions } from "sharp";
+import { createError } from "h3";
 import type { ImageMeta, IPXStorage } from "./types";
 import { HandlerName, applyHandler, getHandler } from "./handlers";
-import { cachedPromise, getEnv, createError } from "./utils";
+import { cachedPromise, getEnv } from "./utils";
 
 type IPXSourceMeta = { mtime?: Date; maxAge?: number };
 
@@ -47,8 +48,8 @@ const SUPPORTED_FORMATS = new Set([
 
 export function createIPX(userOptions: IPXOptions): IPX {
   const options: IPXOptions = defu(userOptions, {
-    alias: getEnv<Record<string, string>>("IPX_ALIAS", {}),
-    maxAge: getEnv<number>("IPX_MAX_AGE", 300),
+    alias: getEnv<Record<string, string>>("IPX_ALIAS") || {},
+    maxAge: getEnv<number>("IPX_MAX_AGE") || 300,
     sharpOptions: {},
   } satisfies Omit<IPXOptions, "storage">);
 
@@ -70,7 +71,10 @@ export function createIPX(userOptions: IPXOptions): IPX {
   return function ipx(id, modifiers = {}, opts = {}) {
     // Validate id
     if (!id) {
-      throw createError("resource `id` is missing", 400);
+      throw createError({
+        statusCode: 400,
+        message: `Resource id is missing`,
+      });
     }
 
     // Enforce leading slash for non absolute urls
@@ -88,14 +92,20 @@ export function createIPX(userOptions: IPXOptions): IPX {
       ? options.httpStorage || options.storage
       : options.storage || options.httpStorage;
     if (!storage) {
-      throw createError("No storage configured!", 500);
+      throw createError({
+        statusCode: 500,
+        message: "No storage configured!",
+      });
     }
 
     // Resolve Resource
     const getSourceMeta = cachedPromise(async () => {
       const sourceMeta = await storage.getMeta(id, opts);
       if (!sourceMeta) {
-        throw createError(`Resource not found: ${id}`, 404);
+        throw createError({
+          statusCode: 404,
+          message: `Resource not found: ${id}`,
+        });
       }
       return {
         maxAge:
@@ -108,7 +118,10 @@ export function createIPX(userOptions: IPXOptions): IPX {
     const getSourceData = cachedPromise(async () => {
       const sourceData = await storage.getData(id, opts);
       if (!sourceData) {
-        throw createError(`Resource not found: ${id}`, 404);
+        throw createError({
+          statusCode: 404,
+          message: `Resource not found: ${id}`,
+        });
       }
       return Buffer.from(sourceData);
     });