ipx 0.9.7 → 0.9.10

package/dist/chunks/middleware.cjs

@@ -120,18 +120,23 @@ function isValidPath(fp) {
 const createHTTPSource = (options) => {
   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());
+  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);
+  const domains = _domains.map((d) => {
+    if (!d.startsWith("http")) {
+      d = "http://" + d;
+    }
+    return new URL(d).hostname;
+  }).filter(Boolean);
   return async (id, reqOptions) => {
-    const url = new URL(id);
-    if (!url.hostname) {
+    const hostname = new URL(id).hostname;
+    if (!hostname) {
       throw createError("Hostname is missing", 403, id);
     }
-    if (!reqOptions?.bypassDomain && !hosts.find((host) => url.hostname === host)) {
-      throw createError("Forbidden host", 403, url.hostname);
+    if (!reqOptions?.bypassDomain && !domains.find((domain) => hostname === domain)) {
+      throw createError("Forbidden host", 403, hostname);
     }
     const response = await ohmyfetch.fetch(id, {
       agent: id.startsWith("https") ? httpsAgent : httpAgent,
@@ -555,7 +560,7 @@ function handleRequest(req, ipx) {
 }
 function createIPXMiddleware(ipx) {
   return function IPXMiddleware(req, res) {
-    handleRequest({ url: req.url, headers: req.headers }, ipx).then((_res) => {
+    return handleRequest({ url: req.url, headers: req.headers }, ipx).then((_res) => {
       res.statusCode = _res.statusCode;
       res.statusMessage = _res.statusMessage;
       for (const name in _res.headers) {

package/dist/chunks/middleware.mjs

@@ -1,6 +1,6 @@
 import defu from 'defu';
 import { imageMeta } from 'image-meta';
-import { parseURL, withLeadingSlash, hasProtocol, joinURL, decode } from 'ufo';
+import { withLeadingSlash, hasProtocol, joinURL, decode } from 'ufo';
 import { promises } from 'fs';
 import { resolve, join, parse } from 'pathe';
 import http from 'http';
@@ -109,18 +109,23 @@ function isValidPath(fp) {
 const createHTTPSource = (options) => {
   const httpsAgent = new https.Agent({ keepAlive: true });
   const httpAgent = new http.Agent({ keepAlive: true });
-  let domains = options.domains || [];
-  if (typeof domains === "string") {
-    domains = domains.split(",").map((s) => s.trim());
+  let _domains = options.domains || [];
+  if (typeof _domains === "string") {
+    _domains = _domains.split(",").map((s) => s.trim());
   }
-  const hosts = domains.map((domain) => parseURL(domain, "https://").host);
+  const domains = _domains.map((d) => {
+    if (!d.startsWith("http")) {
+      d = "http://" + d;
+    }
+    return new URL(d).hostname;
+  }).filter(Boolean);
   return async (id, reqOptions) => {
-    const url = new URL(id);
-    if (!url.hostname) {
+    const hostname = new URL(id).hostname;
+    if (!hostname) {
       throw createError("Hostname is missing", 403, id);
     }
-    if (!reqOptions?.bypassDomain && !hosts.find((host) => url.hostname === host)) {
-      throw createError("Forbidden host", 403, url.hostname);
+    if (!reqOptions?.bypassDomain && !domains.find((domain) => hostname === domain)) {
+      throw createError("Forbidden host", 403, hostname);
     }
     const response = await fetch(id, {
       agent: id.startsWith("https") ? httpsAgent : httpAgent,
@@ -544,7 +549,7 @@ function handleRequest(req, ipx) {
 }
 function createIPXMiddleware(ipx) {
   return function IPXMiddleware(req, res) {
-    handleRequest({ url: req.url, headers: req.headers }, ipx).then((_res) => {
+    return handleRequest({ url: req.url, headers: req.headers }, ipx).then((_res) => {
       res.statusCode = _res.statusCode;
       res.statusMessage = _res.statusMessage;
       for (const name in _res.headers) {

package/dist/index.d.ts

@@ -49,6 +49,6 @@ interface IPXHResponse {
     body: any;
 }
 declare function handleRequest(req: IPXHRequest, ipx: IPX): Promise<IPXHResponse>;
-declare function createIPXMiddleware(ipx: IPX): (req: IncomingMessage, res: ServerResponse) => void;
+declare function createIPXMiddleware(ipx: IPX): (req: IncomingMessage, res: ServerResponse) => Promise<void>;
 
 export { IPX, IPXCTX, IPXHRequest, IPXHResponse, IPXOptions, ImageMeta, Source, SourceData, SourceFactory, createIPX, createIPXMiddleware, handleRequest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipx",
-  "version": "0.9.7",
+  "version": "0.9.10",
   "repository": "unjs/ipx",
   "license": "MIT",
   "exports": {
@@ -25,9 +25,9 @@
     "image-meta": "^0.1.1",
     "listhen": "^0.2.13",
     "ohmyfetch": "^0.4.18",
-    "pathe": "^0.3.0",
+    "pathe": "^0.3.2",
     "sharp": "^0.30.7",
-    "ufo": "^0.8.4",
+    "ufo": "^0.8.5",
     "xss": "^1.0.13"
   },
   "devDependencies": {
@@ -46,7 +46,7 @@
     "unbuild": "latest",
     "vitest": "latest"
   },
-  "packageManager": "pnpm@7.3.0",
+  "packageManager": "pnpm@7.5.0",
   "scripts": {
     "build": "unbuild",
     "dev": "nodemon",