@vercel/python 4.5.1 → 4.7.0

package/dist/index.js

@@ -302,9 +302,9 @@ var require_path_key = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/resolveCommand.js
+// ../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js
 var require_resolveCommand = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module2) {
+  "../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module2) {
     "use strict";
     var path = require("path");
     var which2 = require_which();
@@ -312,7 +312,8 @@ var require_resolveCommand = __commonJS({
     function resolveCommandAttempt(parsed, withoutPathExt) {
       const cwd = process.cwd();
       const hasCustomCwd = parsed.options.cwd != null;
-      if (hasCustomCwd) {
+      const shouldSwitchCwd = hasCustomCwd && process.chdir !== void 0;
+      if (shouldSwitchCwd) {
         try {
           process.chdir(parsed.options.cwd);
         } catch (err) {
@@ -326,7 +327,9 @@ var require_resolveCommand = __commonJS({
         });
       } catch (e) {
       } finally {
-        process.chdir(cwd);
+        if (shouldSwitchCwd) {
+          process.chdir(cwd);
+        }
       }
       if (resolved) {
         resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
@@ -340,9 +343,9 @@ var require_resolveCommand = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/escape.js
+// ../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/util/escape.js
 var require_escape = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/escape.js"(exports, module2) {
+  "../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/util/escape.js"(exports, module2) {
     "use strict";
     var metaCharsRegExp = /([()\][%!^"`<>&|;, *?])/g;
     function escapeCommand(arg) {
@@ -351,8 +354,8 @@ var require_escape = __commonJS({
     }
     function escapeArgument(arg, doubleEscapeMetaChars) {
       arg = `${arg}`;
-      arg = arg.replace(/(\\*)"/g, '$1$1\\"');
-      arg = arg.replace(/(\\*)$/, "$1$1");
+      arg = arg.replace(/(?=(\\+?)?)\1"/g, '$1$1\\"');
+      arg = arg.replace(/(?=(\\+?)?)\1$/, "$1$1");
       arg = `"${arg}"`;
       arg = arg.replace(metaCharsRegExp, "^$1");
       if (doubleEscapeMetaChars) {
@@ -391,9 +394,9 @@ var require_shebang_command = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/readShebang.js
+// ../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/util/readShebang.js
 var require_readShebang = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/util/readShebang.js"(exports, module2) {
+  "../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/util/readShebang.js"(exports, module2) {
     "use strict";
     var fs2 = require("fs");
     var shebangCommand = require_shebang_command();
@@ -1488,9 +1491,9 @@ var require_semver = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/parse.js
+// ../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/parse.js
 var require_parse = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/parse.js"(exports, module2) {
+  "../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/parse.js"(exports, module2) {
     "use strict";
     var path = require("path");
     var niceTry = require_src();
@@ -1574,9 +1577,9 @@ var require_parse = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/enoent.js
+// ../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/enoent.js
 var require_enoent = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/lib/enoent.js"(exports, module2) {
+  "../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/lib/enoent.js"(exports, module2) {
     "use strict";
     var isWin = process.platform === "win32";
     function notFoundError(original, syscall) {
@@ -1624,9 +1627,9 @@ var require_enoent = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/index.js
+// ../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/index.js
 var require_cross_spawn = __commonJS({
-  "../../node_modules/.pnpm/cross-spawn@6.0.5/node_modules/cross-spawn/index.js"(exports, module2) {
+  "../../node_modules/.pnpm/cross-spawn@6.0.6/node_modules/cross-spawn/index.js"(exports, module2) {
     "use strict";
     var cp = require("child_process");
     var parse = require_parse();
@@ -1802,9 +1805,9 @@ var require_once = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/end-of-stream@1.4.1/node_modules/end-of-stream/index.js
+// ../../node_modules/.pnpm/end-of-stream@1.4.4/node_modules/end-of-stream/index.js
 var require_end_of_stream = __commonJS({
-  "../../node_modules/.pnpm/end-of-stream@1.4.1/node_modules/end-of-stream/index.js"(exports, module2) {
+  "../../node_modules/.pnpm/end-of-stream@1.4.4/node_modules/end-of-stream/index.js"(exports, module2) {
     var once = require_once();
     var noop = function() {
     };
@@ -1824,6 +1827,7 @@ var require_end_of_stream = __commonJS({
       var rs = stream._readableState;
       var readable = opts.readable || opts.readable !== false && stream.readable;
       var writable = opts.writable || opts.writable !== false && stream.writable;
+      var cancelled = false;
       var onlegacyfinish = function() {
         if (!stream.writable)
           onfinish();
@@ -1845,9 +1849,14 @@ var require_end_of_stream = __commonJS({
         callback.call(stream, err);
       };
       var onclose = function() {
-        if (readable && !(rs && rs.ended))
+        process.nextTick(onclosenexttick);
+      };
+      var onclosenexttick = function() {
+        if (cancelled)
+          return;
+        if (readable && !(rs && (rs.ended && !rs.destroyed)))
           return callback.call(stream, new Error("premature close"));
-        if (writable && !(ws && ws.ended))
+        if (writable && !(ws && (ws.ended && !ws.destroyed)))
           return callback.call(stream, new Error("premature close"));
       };
       var onrequest = function() {
@@ -1872,6 +1881,7 @@ var require_end_of_stream = __commonJS({
         stream.on("error", onerror);
       stream.on("close", onclose);
       return function() {
+        cancelled = true;
         stream.removeListener("complete", onfinish);
         stream.removeListener("abort", onclose);
         stream.removeListener("request", onrequest);
@@ -1890,12 +1900,16 @@ var require_end_of_stream = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/pump@3.0.0/node_modules/pump/index.js
+// ../../node_modules/.pnpm/pump@3.0.2/node_modules/pump/index.js
 var require_pump = __commonJS({
-  "../../node_modules/.pnpm/pump@3.0.0/node_modules/pump/index.js"(exports, module2) {
+  "../../node_modules/.pnpm/pump@3.0.2/node_modules/pump/index.js"(exports, module2) {
     var once = require_once();
     var eos = require_end_of_stream();
-    var fs2 = require("fs");
+    var fs2;
+    try {
+      fs2 = require("fs");
+    } catch (e) {
+    }
     var noop = function() {
     };
     var ancient = /^v?\.0/.test(process.version);
@@ -3083,7 +3097,13 @@ var build = async ({
   const handlerPyContents = originalHandlerPyContents.replace(/__VC_HANDLER_MODULE_NAME/g, moduleName).replace(/__VC_HANDLER_ENTRYPOINT/g, entrypointWithSuffix);
   const globOptions = {
     cwd: workPath,
-    ignore: config && typeof config.excludeFiles === "string" ? config.excludeFiles : "node_modules/**"
+    ignore: config && typeof config.excludeFiles === "string" ? config.excludeFiles : [
+      ".git/**",
+      ".vercel/**",
+      "**/node_modules/**",
+      "**/.next/**",
+      "**/.nuxt/**"
+    ]
   };
   const files = await (0, import_build_utils3.glob)("**", globOptions);
   const handlerPyFilename = "vc__handler__python";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/python",
-  "version": "4.5.1",
+  "version": "4.7.0",
   "main": "./dist/index.js",
   "license": "Apache-2.0",
   "homepage": "https://vercel.com/docs/runtimes#official-runtimes/python",
@@ -19,7 +19,7 @@
     "@types/jest": "27.4.1",
     "@types/node": "14.18.33",
     "@types/which": "3.0.0",
-    "@vercel/build-utils": "8.4.12",
+    "@vercel/build-utils": "9.0.1",
     "cross-env": "7.0.3",
     "execa": "^1.0.0",
     "fs-extra": "11.1.1",

package/vc_init.py

@@ -27,7 +27,7 @@ def format_headers(headers, decode=False):
         keyToList[key].append(value)
     return keyToList
 
-if 'VERCEL_IPC_FD' in os.environ:
+if 'VERCEL_IPC_FD' in os.environ or 'VERCEL_IPC_PATH' in os.environ:
     from http.server import ThreadingHTTPServer
     import http
     import time
@@ -36,10 +36,15 @@ if 'VERCEL_IPC_FD' in os.environ:
     import builtins
     import logging
 
-    ipc_fd = int(os.getenv("VERCEL_IPC_FD", ""))
-    sock = socket.socket(fileno=ipc_fd)
     start_time = time.time()
 
+    if 'VERCEL_IPC_FD' in os.environ:
+        ipc_fd = int(os.getenv("VERCEL_IPC_FD", ""))
+        sock = socket.socket(fileno=ipc_fd)
+    else:
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        sock.connect(os.getenv("VERCEL_IPC_PATH", ""))
+
     send_message = lambda message: sock.sendall((json.dumps(message) + '\0').encode())
     storage = contextvars.ContextVar('storage', default=None)
 
@@ -178,6 +183,17 @@ if 'VERCEL_IPC_FD' in os.environ:
             del self.headers['x-vercel-internal-span-id']
             del self.headers['x-vercel-internal-trace-id']
 
+            send_message({
+                "type": "handler-started",
+                "payload": {
+                    "handlerStartedAt": int(time.time() * 1000),
+                    "context": {
+                        "invocationId": invocationId,
+                        "requestId": requestId,
+                    }
+                }
+            })
+
             token = storage.set({
                 "invocationId": invocationId,
                 "requestId": requestId,