ipx 0.9.8 → 0.9.11

package/dist/cli.cjs

@@ -2,7 +2,7 @@
 
 const consola = require('consola');
 const listhen = require('listhen');
-const middleware = require('./chunks/middleware.cjs');
+const middleware = require('./shared/ipx.eadce322.cjs');
 require('defu');
 require('image-meta');
 require('ufo');

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import consola from 'consola';
 import { listen } from 'listhen';
-import { c as createIPX, a as createIPXMiddleware } from './chunks/middleware.mjs';
+import { c as createIPX, a as createIPXMiddleware } from './shared/ipx.72b0591f.mjs';
 import 'defu';
 import 'image-meta';
 import 'ufo';

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const middleware = require('./chunks/middleware.cjs');
+const middleware = require('./shared/ipx.eadce322.cjs');
 require('defu');
 require('image-meta');
 require('ufo');

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/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as createIPX, a as createIPXMiddleware, h as handleRequest } from './chunks/middleware.mjs';
+export { c as createIPX, a as createIPXMiddleware, h as handleRequest } from './shared/ipx.72b0591f.mjs';
 import 'defu';
 import 'image-meta';
 import 'ufo';

package/dist/{chunks/middleware.mjs → shared/ipx.72b0591f.mjs}

@@ -106,6 +106,7 @@ function isValidPath(fp) {
   return true;
 }
 
+const HTTP_RE = /^https?:\/\//;
 const createHTTPSource = (options) => {
   const httpsAgent = new https.Agent({ keepAlive: true });
   const httpAgent = new http.Agent({ keepAlive: true });
@@ -113,7 +114,12 @@ const createHTTPSource = (options) => {
   if (typeof _domains === "string") {
     _domains = _domains.split(",").map((s) => s.trim());
   }
-  const domains = _domains.map((d) => new URL(d).hostname || new URL("http://" + d).hostname).filter(Boolean);
+  const domains = _domains.map((d) => {
+    if (!HTTP_RE.test(d)) {
+      d = "http://" + d;
+    }
+    return new URL(d).hostname;
+  }).filter(Boolean);
   return async (id, reqOptions) => {
     const hostname = new URL(id).hostname;
     if (!hostname) {
@@ -524,6 +530,7 @@ async function _handleRequest(req, ipx) {
   if (format) {
     res.headers["Content-Type"] = `image/${format}`;
   }
+  res.headers["Content-Security-Policy"] = "default-src 'none'";
   res.body = data;
   return sanetizeReponse(res);
 }
@@ -544,7 +551,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.cjs → shared/ipx.eadce322.cjs}

@@ -117,6 +117,7 @@ function isValidPath(fp) {
   return true;
 }
 
+const HTTP_RE = /^https?:\/\//;
 const createHTTPSource = (options) => {
   const httpsAgent = new https__default.Agent({ keepAlive: true });
   const httpAgent = new http__default.Agent({ keepAlive: true });
@@ -124,7 +125,12 @@ const createHTTPSource = (options) => {
   if (typeof _domains === "string") {
     _domains = _domains.split(",").map((s) => s.trim());
   }
-  const domains = _domains.map((d) => new URL(d).hostname || new URL("http://" + d).hostname).filter(Boolean);
+  const domains = _domains.map((d) => {
+    if (!HTTP_RE.test(d)) {
+      d = "http://" + d;
+    }
+    return new URL(d).hostname;
+  }).filter(Boolean);
   return async (id, reqOptions) => {
     const hostname = new URL(id).hostname;
     if (!hostname) {
@@ -535,6 +541,7 @@ async function _handleRequest(req, ipx) {
   if (format) {
     res.headers["Content-Type"] = `image/${format}`;
   }
+  res.headers["Content-Security-Policy"] = "default-src 'none'";
   res.body = data;
   return sanetizeReponse(res);
 }
@@ -555,7 +562,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipx",
-  "version": "0.9.8",
+  "version": "0.9.11",
   "repository": "unjs/ipx",
   "license": "MIT",
   "exports": {
@@ -19,34 +19,35 @@
   ],
   "dependencies": {
     "consola": "^2.15.3",
-    "defu": "^6.0.0",
+    "defu": "^6.1.0",
     "destr": "^1.1.1",
     "etag": "^1.8.1",
     "image-meta": "^0.1.1",
-    "listhen": "^0.2.13",
+    "listhen": "^0.2.15",
     "ohmyfetch": "^0.4.18",
-    "pathe": "^0.3.0",
+    "pathe": "^0.3.5",
     "sharp": "^0.30.7",
-    "ufo": "^0.8.4",
-    "xss": "^1.0.13"
+    "ufo": "^0.8.5",
+    "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@nuxtjs/eslint-config-typescript": "latest",
-    "@types/etag": "latest",
-    "@types/is-valid-path": "latest",
-    "@types/node-fetch": "latest",
-    "@types/sharp": "latest",
-    "c8": "latest",
-    "eslint": "latest",
-    "jiti": "latest",
-    "nodemon": "latest",
+    "@nuxtjs/eslint-config-typescript": "^11.0.0",
+    "@types/etag": "^1.8.1",
+    "@types/is-valid-path": "^0.1.0",
+    "@types/node-fetch": "^2.6.2",
+    "@types/sharp": "^0.30.5",
+    "@vitest/coverage-c8": "^0.22.1",
+    "changelogen": "^0.3.0",
+    "eslint": "^8.23.0",
+    "jiti": "^1.14.0",
+    "nodemon": "^2.0.19",
     "serve-handler": "^6.1.3",
-    "standard-version": "latest",
-    "typescript": "latest",
-    "unbuild": "latest",
-    "vitest": "latest"
+    "standard-version": "^9.5.0",
+    "typescript": "^4.8.2",
+    "unbuild": "^0.8.10",
+    "vitest": "^0.22.1"
   },
-  "packageManager": "pnpm@7.3.0",
+  "packageManager": "pnpm@7.9.5",
   "scripts": {
     "build": "unbuild",
     "dev": "nodemon",