netlify-cli 17.24.0 → 17.26.0

package/dist/utils/deploy/hash-fns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAYA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAoGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,UACb;IACN,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB;;;;;;;;;;;;;;;;;;;oBAvFyC,OAAO;;;;;EA4LlD,CAAA;AAED,eAAe,OAAO,CAAA"}
+{"version":3,"file":"hash-fns.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/hash-fns.ts"],"names":[],"mappings":"AAYA,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAoGlD,QAAA,MAAM,OAAO,YACF,WAAW,eACP,MAAM,EAAE,UACb;IACN,0BAA0B;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,QAAQ,CAAA;IACzB,wBAAwB;IACxB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,YAAY,EAAE,QAAQ,CAAA;IACtB,OAAO,EAAE,QAAQ,CAAA;IACjB,kBAAkB,EAAE,QAAQ,CAAA;IAC5B,QAAQ,EAAE,QAAQ,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;CACjB;;;;;;;;;;;;;;;;;;;oBAvFyC,OAAO;;;;;EA8LlD,CAAA;AAED,eAAe,OAAO,CAAA"}

package/dist/utils/deploy/hash-fns.js

@@ -95,7 +95,7 @@ const hashFns = async (command, directories, config) => {
         statusCb,
         tmpDir,
     });
-    const fileObjs = functionZips.map(({ buildData, displayName, generator, invocationMode, path: functionPath, priority, runtime, runtimeVersion, trafficRules, }) => ({
+    const fileObjs = functionZips.map(({ buildData, displayName, generator, invocationMode, path: functionPath, priority, runtime, runtimeVersion, trafficRules, timeout, }) => ({
         filepath: functionPath,
         root: tmpDir,
         relname: path.relative(tmpDir, functionPath),
@@ -108,6 +108,7 @@ const hashFns = async (command, directories, config) => {
         displayName,
         generator,
         invocationMode,
+        timeout,
         buildData,
         priority,
         trafficRules,

package/dist/utils/deploy/upload-files.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upload-files.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"AASA,QAAA,MAAM,WAAW;;;;wBAuEhB,CAAA;AAuDD,eAAe,WAAW,CAAA"}
+{"version":3,"file":"upload-files.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/upload-files.ts"],"names":[],"mappings":"AASA,QAAA,MAAM,WAAW;;;;wBAwEhB,CAAA;AAuDD,eAAe,WAAW,CAAA"}

package/dist/utils/deploy/upload-files.js

@@ -14,7 +14,7 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
     });
     // @ts-expect-error TS(7006) FIXME: Parameter 'fileObj' implicitly has an 'any' type.
     const uploadFile = async (fileObj, index) => {
-        const { assetType, body, filepath, invocationMode, normalizedPath, runtime } = fileObj;
+        const { assetType, body, filepath, invocationMode, normalizedPath, runtime, timeout } = fileObj;
         const readStreamCtor = () => body ?? fs.createReadStream(filepath);
         statusCb({
             type: 'upload',
@@ -38,6 +38,7 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, maxRet
                         body: readStreamCtor,
                         deployId,
                         invocationMode,
+                        timeout,
                         name: encodeURI(normalizedPath),
                         runtime,
                     };

package/dist/utils/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAkB/C,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAytB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU;aAqBT,WAAW;cAAY,cAAc;0BAAwB,OAAO;2CAoGjF,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAkB/D,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAywB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU;aAqBT,WAAW;cAAY,cAAc;0BAAwB,OAAO;2CA2GjF,CAAA"}

package/dist/utils/proxy.js

@@ -34,8 +34,11 @@ import { generateRequestID } from './request-id.js';
 import { createRewriter, onChanges } from './rules-proxy.js';
 import { signRedirect } from './sign-redirect.js';
 const gunzip = util.promisify(zlib.gunzip);
+const gzip = util.promisify(zlib.gzip);
 const brotliDecompress = util.promisify(zlib.brotliDecompress);
+const brotliCompress = util.promisify(zlib.brotliCompress);
 const deflate = util.promisify(zlib.deflate);
+const inflate = util.promisify(zlib.inflate);
 const shouldGenerateETag = Symbol('Internal: response should generate ETag');
 const decompressResponseBody = async function (body, contentEncoding = '') {
     switch (contentEncoding) {
@@ -44,11 +47,40 @@ const decompressResponseBody = async function (body, contentEncoding = '') {
         case 'br':
             return await brotliDecompress(body);
         case 'deflate':
-            return await deflate(body);
+            return await inflate(body);
         default:
             return body;
     }
 };
+const compressResponseBody = async function (body, contentEncoding = '') {
+    switch (contentEncoding) {
+        case 'gzip':
+            return await gzip(body);
+        case 'br':
+            return await brotliCompress(body);
+        case 'deflate':
+            return await deflate(body);
+        default:
+            return Buffer.from(body, 'utf8');
+    }
+};
+const injectHtml = async function (responseBody, proxyRes, htmlInjections) {
+    const decompressedBody = await decompressResponseBody(responseBody, proxyRes.headers['content-encoding']);
+    const bodyWithInjections = (htmlInjections ?? []).reduce((accum, htmlInjection) => {
+        if (!htmlInjection.html || typeof htmlInjection.html !== 'string') {
+            return accum;
+        }
+        const location = htmlInjection.location ?? 'before_closing_head_tag';
+        if (location === 'before_closing_head_tag') {
+            accum = accum.replace('</head>', `${htmlInjection.html}</head>`);
+        }
+        else if (location === 'before_closing_body_tag') {
+            accum = accum.replace('</body>', `${htmlInjection.html}</body>`);
+        }
+        return accum;
+    }, decompressedBody.toString());
+    return await compressResponseBody(bodyWithInjections, proxyRes.headers['content-encoding']);
+};
 // @ts-expect-error TS(7006) FIXME: Parameter 'errorBuffer' implicitly has an 'any' ty... Remove this comment to see the full error message
 const formatEdgeFunctionError = (errorBuffer, acceptsHtml) => {
     const { error: { message, name, stack }, } = JSON.parse(errorBuffer.toString());
@@ -312,25 +344,7 @@ const reqToURL = function (req, pathname) {
     return new URL(pathname, `${req.protocol || (req.headers.scheme && `${req.headers.scheme}:`) || 'http:'}//${req.headers.host || req.hostname}`);
 };
 const MILLISEC_TO_SEC = 1e3;
-const initializeProxy = async function ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'any... Remove this comment to see the full error message
-config, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'distDir' implicitly has an 'any... Remove this comment to see the full error message
-configPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'env' implicitly has an 'any... Remove this comment to see the full error message
-distDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'host' implicitly has an 'any... Remove this comment to see the full error message
-env, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'imageProxy' implicitly has an 'any... Remove this comment to see the full error message
-host, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'port' implicitly has an 'any... Remove this comment to see the full error message
-imageProxy, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'any... Remove this comment to see the full error message
-port, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteInfo' implicitly has an 'any... Remove this comment to see the full error message
-projectDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any... Remove this comment to see the full error message
-siteInfo, }) {
+const initializeProxy = async function ({ config, configPath, distDir, env, host, imageProxy, port, projectDir, siteInfo, }) {
     const proxy = httpProxy.createProxyServer({
         selfHandleResponse: true,
         target: {
@@ -445,10 +459,16 @@ siteInfo, }) {
         // @ts-expect-error TS(2345) FIXME: Argument of type 'string | undefined' is not assig... Remove this comment to see the full error message
         const requestURL = new URL(req.url, `http://${req.headers.host || '127.0.0.1'}`);
         const headersRules = headersForPath(headers, requestURL.pathname);
+        const htmlInjections = config.dev?.processing?.html?.injections &&
+            config.dev.processing.html.injections.length !== 0 &&
+            proxyRes.headers?.['content-type']?.startsWith('text/html')
+            ? config.dev.processing.html.injections
+            : undefined;
         // for streamed responses, we can't do etag generation nor error templates.
         // we'll just stream them through!
+        // when html_injections are present in dev config, we can't use streamed response
         const isStreamedResponse = proxyRes.headers['content-length'] === undefined;
-        if (isStreamedResponse) {
+        if (isStreamedResponse && !htmlInjections) {
             Object.entries(headersRules).forEach(([key, val]) => {
                 // @ts-expect-error TS(2345) FIXME: Argument of type 'unknown' is not assignable to pa... Remove this comment to see the full error message
                 res.setHeader(key, val);
@@ -468,7 +488,7 @@ siteInfo, }) {
         });
         proxyRes.on('end', async function onEnd() {
             // @ts-expect-error TS(7005) FIXME: Variable 'responseData' implicitly has an 'any[]' ... Remove this comment to see the full error message
-            const responseBody = Buffer.concat(responseData);
+            let responseBody = Buffer.concat(responseData);
             // @ts-expect-error TS(2339) FIXME: Property 'proxyOptions' does not exist on type 'In... Remove this comment to see the full error message
             let responseStatus = req.proxyOptions.status || proxyRes.statusCode;
             // `req[shouldGenerateETag]` may contain a function that determines
@@ -502,7 +522,15 @@ siteInfo, }) {
                 res.write(errorResponse);
                 return res.end();
             }
-            res.writeHead(responseStatus, proxyRes.headers);
+            let proxyResHeaders = proxyRes.headers;
+            if (htmlInjections) {
+                responseBody = await injectHtml(responseBody, proxyRes, htmlInjections);
+                proxyResHeaders = {
+                    ...proxyResHeaders,
+                    'content-length': String(responseBody.byteLength),
+                };
+            }
+            res.writeHead(responseStatus, proxyResHeaders);
             if (responseStatus !== 304) {
                 res.write(responseBody);
             }
@@ -520,7 +548,7 @@ siteInfo, }) {
             return proxy.web(req, res, options);
         },
         // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
-        ws: (req, socket, head) => proxy.ws(req, socket, head),
+        ws: (req, socket, head, options) => proxy.ws(req, socket, head, options),
     };
     return handlers;
 };
@@ -661,8 +689,15 @@ export const startProxy = async function ({ accountId, addonsUrls, blobsContext,
     const primaryServer = settings.https
         ? https.createServer({ cert: settings.https.cert, key: settings.https.key }, onRequestWithOptions)
         : http.createServer(onRequestWithOptions);
-    const onUpgrade = function onUpgrade(req, socket, head) {
-        proxy.ws(req, socket, head);
+    const onUpgrade = async function onUpgrade(req, socket, head) {
+        const match = await rewriter(req);
+        if (match && !match.force404 && isExternal(match)) {
+            const reqUrl = reqToURL(req, req.url);
+            const dest = new URL(match.to, `${reqUrl.protocol}//${reqUrl.host}`);
+            const destURL = stripOrigin(dest);
+            return proxy.ws(req, socket, head, { target: dest.origin, changeOrigin: true, pathRewrite: () => destURL });
+        }
+        return proxy.ws(req, socket, head, {});
     };
     primaryServer.on('upgrade', onUpgrade);
     primaryServer.listen({ port: settings.port });