netlify-cli 17.24.0 → 17.25.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,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;2CA2GjF,CAAA"}

package/dist/utils/proxy.js

@@ -520,7 +520,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 +661,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 });