netlify-cli 23.13.5 → 23.15.0

package/dist/lib/images/proxy.d.ts

@@ -1,30 +1,10 @@
-import type { IncomingMessage } from 'http';
-import { type NormalizedCachedConfigConfig } from '../../utils/command-helpers.js';
+import type { IncomingMessage, ServerResponse } from 'http';
+import { type ImageHandler } from '@netlify/images';
 import type { ServerSettings } from '../../utils/types.d.ts';
 export declare const IMAGE_URL_PATTERN = "/.netlify/images";
-interface QueryParams {
-    w?: string;
-    width?: string;
-    h?: string;
-    height?: string;
-    q?: string;
-    quality?: string;
-    fm?: string;
-    fit?: string;
-    position?: string;
-}
-export declare const parseAllRemoteImages: (config: Pick<NormalizedCachedConfigConfig, "images">) => {
-    errors: ErrorObject[];
-    remotePatterns: RegExp[];
-};
-interface ErrorObject {
-    message: string;
-}
 export declare const isImageRequest: (req: IncomingMessage) => boolean;
-export declare const transformImageParams: (query: QueryParams) => string;
-export declare const initializeProxy: ({ config, settings, }: {
-    config: NormalizedCachedConfigConfig;
+export declare const initializeProxy: ({ settings, imageHandler, }: {
     settings: ServerSettings;
-}) => import("express-serve-static-core").Express;
-export {};
+    imageHandler: ImageHandler;
+}) => (req: IncomingMessage, res: ServerResponse) => Promise<void>;
 //# sourceMappingURL=proxy.d.ts.map

package/dist/lib/images/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/images/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAK3C,OAAO,EAAsB,KAAK,4BAA4B,EAAE,MAAM,gCAAgC,CAAA;AAEtG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAE5D,eAAO,MAAM,iBAAiB,qBAAqB,CAAA;AAEnD,UAAU,WAAW;IACnB,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,CAAC,CAAC,EAAE,MAAM,CAAA;IACV,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAYD,eAAO,MAAM,oBAAoB,GAAa,QAAQ,IAAI,CAAC,4BAA4B,EAAE,QAAQ,CAAC,KAAG;IACnG,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,cAAc,EAAE,MAAM,EAAE,CAAA;CAsBzB,CAAA;AAED,UAAU,WAAW;IACnB,OAAO,EAAE,MAAM,CAAA;CAChB;AA0BD,eAAO,MAAM,cAAc,GAAa,KAAK,eAAe,KAAG,OAE9D,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAa,OAAO,WAAW,KAAG,MAyBlE,CAAA;AAED,eAAO,MAAM,eAAe,GAAa,uBAGtC;IACD,MAAM,EAAE,4BAA4B,CAAA;IACpC,QAAQ,EAAE,cAAc,CAAA;CACzB,gDA2DA,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/images/proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,MAAM,CAAA;AAE3D,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAGnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAG5D,eAAO,MAAM,iBAAiB,qBAAqB,CAAA;AAEnD,eAAO,MAAM,cAAc,GAAa,KAAK,eAAe,KAAG,OAE9D,CAAA;AAED,eAAO,MAAM,eAAe,GAAa,6BAGtC;IACD,QAAQ,EAAE,cAAc,CAAA;IACxB,YAAY,EAAE,YAAY,CAAA;CAC3B,MAGe,KAAK,eAAe,EAAE,KAAK,cAAc,kBAkBxD,CAAA"}

package/dist/lib/images/proxy.js

@@ -1,117 +1,28 @@
-import express from 'express';
-import { createIPX, ipxFSStorage, ipxHttpStorage, createIPXNodeServer } from 'ipx';
-import { log, NETLIFYDEVERR } from '../../utils/command-helpers.js';
 import { getProxyUrl } from '../../utils/proxy.js';
+import { fromWebResponse, toWebRequest } from '@netlify/dev-utils';
 export const IMAGE_URL_PATTERN = '/.netlify/images';
-export const parseAllRemoteImages = function (config) {
-    const remotePatterns = [];
-    const errors = [];
-    const remoteImages = config?.images?.remote_images;
-    if (!remoteImages) {
-        return { errors, remotePatterns };
-    }
-    for (const patternString of remoteImages) {
-        try {
-            const urlRegex = new RegExp(patternString);
-            remotePatterns.push(urlRegex);
-        }
-        catch (error) {
-            const message = error instanceof Error ? error.message : 'An unknown error occurred';
-            errors.push({ message });
-        }
-    }
-    return { errors, remotePatterns };
-};
-const getErrorMessage = function ({ message }) {
-    return message;
-};
-const handleRemoteImagesErrors = function (errors) {
-    if (errors.length === 0) {
-        return;
-    }
-    const errorMessage = errors.map(getErrorMessage).join('\n\n');
-    log(NETLIFYDEVERR, `Remote images syntax errors:\n${errorMessage}`);
-};
-const parseRemoteImages = function ({ config }) {
-    if (!config) {
-        return [];
-    }
-    const { errors, remotePatterns } = parseAllRemoteImages(config);
-    handleRemoteImagesErrors(errors);
-    return remotePatterns;
-};
 export const isImageRequest = function (req) {
     return req.url?.startsWith(IMAGE_URL_PATTERN) ?? false;
 };
-export const transformImageParams = function (query) {
-    const params = {};
-    const width = query.w || query.width || null;
-    const height = query.h || query.height || null;
-    if (width && height) {
-        params.s = `${width}x${height}`;
-    }
-    else {
-        params.w = width;
-        params.h = height;
-    }
-    params.quality = query.q || query.quality || null;
-    params.format = query.fm || null;
-    const fit = query.fit || null;
-    params.fit = fit === 'contain' ? 'inside' : fit;
-    params.position = query.position || null;
-    return Object.entries(params)
-        .filter(([, value]) => value !== null)
-        .map(([key, value]) => `${key}_${value}`)
-        .join(',');
-};
-export const initializeProxy = function ({ config, settings, }) {
-    const remoteImages = parseRemoteImages({ config });
+export const initializeProxy = function ({ settings, imageHandler, }) {
     const devServerUrl = getProxyUrl(settings);
-    const ipx = createIPX({
-        storage: ipxFSStorage({ dir: ('publish' in config.build ? config.build.publish : undefined) ?? './public' }),
-        httpStorage: ipxHttpStorage({
-            allowAllDomains: true,
-        }),
-    });
-    const handler = createIPXNodeServer(ipx);
-    const app = express();
-    let lastTimeRemoteImagesConfigurationDetailsMessageWasLogged = 0;
-    app.use(IMAGE_URL_PATTERN, (req, res) => {
-        const { url, ...query } = req.query;
-        const sourceImagePath = url;
-        const modifiers = transformImageParams(query) || `_`;
-        if (!sourceImagePath.startsWith('http://') && !sourceImagePath.startsWith('https://')) {
-            // Construct the full URL for relative paths to request from development server
-            const sourceImagePathWithLeadingSlash = sourceImagePath.startsWith('/') ? sourceImagePath : `/${sourceImagePath}`;
-            const fullImageUrl = `${devServerUrl}${encodeURIComponent(sourceImagePathWithLeadingSlash)}`;
-            req.url = `/${modifiers}/${fullImageUrl}`;
-        }
-        else {
-            // If the image is remote, we first check if it's allowed by any of patterns
-            if (!remoteImages.some((remoteImage) => remoteImage.test(sourceImagePath))) {
-                const remoteImageNotAllowedLogMessage = `Remote image "${sourceImagePath}" source for Image CDN is not allowed.`;
-                // Contextual information about the remote image configuration is throttled
-                // to avoid spamming the console as it's quite verbose
-                // Each not allowed remote image will still be logged, just without configuration details
-                if (Date.now() - lastTimeRemoteImagesConfigurationDetailsMessageWasLogged > 1000 * 30) {
-                    log(`${remoteImageNotAllowedLogMessage}\n\n${remoteImages.length === 0
-                        ? 'Currently no remote images are allowed.'
-                        : `Currently allowed remote images configuration details:\n${remoteImages
-                            .map((pattern) => ` - ${pattern}`)
-                            .join('\n')}`}\n\nRefer to https://ntl.fyi/remote-images for information about how to configure allowed remote images.`);
-                    lastTimeRemoteImagesConfigurationDetailsMessageWasLogged = Date.now();
-                }
-                else {
-                    log(remoteImageNotAllowedLogMessage);
-                }
-                res.status(400).end();
+    return async (req, res) => {
+        try {
+            const webRequest = toWebRequest(req);
+            const match = imageHandler.match(webRequest);
+            if (!match) {
+                res.statusCode = 404;
+                res.end('Image not found');
                 return;
             }
-            // Construct the full URL for remote paths
-            req.url = `/${modifiers}/${encodeURIComponent(sourceImagePath)}`;
+            const response = await match.handle(devServerUrl);
+            await fromWebResponse(response, res);
+        }
+        catch (error) {
+            console.error('Image proxy error:', error);
+            res.statusCode = 500;
+            res.end('Internal server error');
         }
-        handler(req, res);
-    });
-    return app;
+    };
 };
 //# sourceMappingURL=proxy.js.map

package/dist/lib/images/proxy.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/lib/images/proxy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proxy.js","sourceRoot":"","sources":["../../../src/lib/images/proxy.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAElE,MAAM,CAAC,MAAM,iBAAiB,GAAG,kBAAkB,CAAA;AAEnD,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,GAAoB;IAC1D,OAAO,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAA;AACxD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,EACvC,QAAQ,EACR,YAAY,GAIb;IACC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAA;IAE1C,OAAO,KAAK,EAAE,GAAoB,EAAE,GAAmB,EAAE,EAAE;QACzD,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAA;YACpC,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;YAC5C,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;gBACpB,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;gBAC1B,OAAM;YACR,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YACjD,MAAM,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAA;YAC1C,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;YACpB,GAAG,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;QAClC,CAAC;IACH,CAAC,CAAA;AACH,CAAC,CAAA"}