wrangler 0.0.0-e492c10 → 0.0.0-e5a3814

package/Cloudflare_CA.pem

@@ -0,0 +1,18 @@
+-----BEGIN CERTIFICATE-----
+MIIC6zCCAkygAwIBAgIUI7b68p0pPrCBoW4ptlyvVcPItscwCgYIKoZIzj0EAwQw
+gY0xCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T
+YW4gRnJhbmNpc2NvMRgwFgYDVQQKEw9DbG91ZGZsYXJlLCBJbmMxNzA1BgNVBAMT
+LkNsb3VkZmxhcmUgZm9yIFRlYW1zIEVDQyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkw
+HhcNMjAwMjA0MTYwNTAwWhcNMjUwMjAyMTYwNTAwWjCBjTELMAkGA1UEBhMCVVMx
+EzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xGDAW
+BgNVBAoTD0Nsb3VkZmxhcmUsIEluYzE3MDUGA1UEAxMuQ2xvdWRmbGFyZSBmb3Ig
+VGVhbXMgRUNDIENlcnRpZmljYXRlIEF1dGhvcml0eTCBmzAQBgcqhkjOPQIBBgUr
+gQQAIwOBhgAEAVdXsX8tpA9NAQeEQalvUIcVaFNDvGsR69ysZxOraRWNGHLfq1mi
+P6o3wtmtx/C2OXG01Cw7UFJbKl5MEDxnT2KoAdFSynSJOF2NDoe5LoZHbUW+yR3X
+FDl+MF6JzZ590VLGo6dPBf06UsXbH7PvHH2XKtFt8bBXVNMa5a21RdmpD0Pho0Uw
+QzAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBAjAdBgNVHQ4EFgQU
+YBcQng1AEMMNteuRDAMG0/vgFe0wCgYIKoZIzj0EAwQDgYwAMIGIAkIBQU5OTA2h
+YqmFk8paan5ezHVLcmcucsfYw4L/wmeEjCkczRmCVNm6L86LjhWU0v0wER0e+lHO
+3efvjbsu8gIGSagCQgEBnyYMP9gwg8l96QnQ1khFA1ljFlnqc2XgJHDSaAJC0gdz
++NV3JMeWaD2Rb32jc9r6/a7xY0u0ByqxBQ1OQ0dt7A==
+-----END CERTIFICATE-----

package/README.md

@@ -24,7 +24,7 @@ npx wrangler init my-worker
 # try it out
 cd my-worker && npm run start
 # and then publish it
-npm run publish
+npm run deploy
 ```
 
 ## Installation:

package/bin/wrangler.js

@@ -1,6 +1,8 @@
 #!/usr/bin/env node
-const { spawn } = require("node:child_process");
-const { join } = require("node:path");
+const { spawn } = require("child_process");
+const path = require("path");
+const fs = require("fs");
+const os = require("os");
 const semiver = require("semiver");
 
 const MIN_NODE_VERSION = "16.7.0";
@@ -20,6 +22,30 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
     return;
   }
 
+  let pathToCACerts = process.env.NODE_EXTRA_CA_CERTS;
+  if (pathToCACerts) {
+    // TODO:
+    // - should we log a warning here?
+    // - maybe we can generate a certificate that concatenates with ours?
+    //
+    //  I do think it'll be rare that someone wants to add a cert AND
+    //  use cloudflare WARP, but let's wait till the situation actually
+    //  arises before we do anything about it
+  } else {
+    const osTempDir = os.tmpdir();
+    const certDir = path.join(osTempDir, "wrangler-cert");
+    const certPath = path.join(certDir, "Cloudflare_CA.pem");
+    // copy cert to the system temp dir if needed
+    if (!fs.existsSync(certPath)) {
+      fs.mkdirSync(certDir, { recursive: true });
+      fs.writeFileSync(
+        certPath,
+        fs.readFileSync(path.join(__dirname, "../Cloudflare_CA.pem"), "utf-8")
+      );
+    }
+    pathToCACerts = certPath;
+  }
+
   wranglerProcess = spawn(
     process.execPath,
     [
@@ -29,10 +55,16 @@ Consider using a Node.js version manager such as https://volta.sh/ or https://gi
       "--no-warnings",
       "--experimental-vm-modules",
       ...process.execArgv,
-      join(__dirname, "../wrangler-dist/cli.js"),
+      path.join(__dirname, "../wrangler-dist/cli.js"),
       ...process.argv.slice(2),
     ],
-    { stdio: "inherit" }
+    {
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        NODE_EXTRA_CA_CERTS: pathToCACerts,
+      },
+    }
   ).on("exit", (code) =>
     process.exit(code === undefined || code === null ? 0 : code)
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wrangler",
-  "version": "0.0.0-e492c10",
+  "version": "0.0.0-e5a3814",
   "author": "wrangler@cloudflare.com",
   "description": "Command-line interface for all things Cloudflare Workers",
   "bin": {
@@ -36,11 +36,12 @@
     "cli"
   ],
   "dependencies": {
+    "@cloudflare/kv-asset-handler": "^0.2.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.1.1",
     "@esbuild-plugins/node-modules-polyfill": "^0.1.4",
     "blake3-wasm": "^2.1.5",
     "esbuild": "0.14.34",
-    "miniflare": "2.4.0",
+    "miniflare": "^2.5.0",
     "nanoid": "^3.3.3",
     "path-to-regexp": "^6.2.0",
     "selfsigned": "^2.0.1",
@@ -75,6 +76,7 @@
     "find-up": "^6.3.0",
     "get-port": "^6.1.2",
     "glob-to-regexp": "0.4.1",
+    "http-terminator": "^3.2.0",
     "ignore": "^5.2.0",
     "ink": "^3.2.0",
     "ink-select-input": "^4.2.1",
@@ -86,6 +88,7 @@
     "jest-websocket-mock": "^2.3.0",
     "mime": "^3.0.0",
     "open": "^8.4.0",
+    "p-queue": "^7.2.0",
     "pretty-bytes": "^6.0.0",
     "prompts": "^2.4.2",
     "react": "^17.0.2",
@@ -96,7 +99,7 @@
     "timeago.js": "^4.0.2",
     "tmp-promise": "^3.0.3",
     "ts-dedent": "^2.2.0",
-    "undici": "^4.15.1",
+    "undici": "^5.3.0",
     "update-check": "^1.5.4",
     "ws": "^8.5.0",
     "yargs": "^17.4.1"
@@ -110,7 +113,8 @@
     "wrangler-dist",
     "templates",
     "vendor",
-    "import_meta_url.js"
+    "import_meta_url.js",
+    "Cloudflare_CA.pem"
   ],
   "scripts": {
     "clean": "rm -rf wrangler-dist miniflare-dist",
@@ -130,7 +134,7 @@
     "testTimeout": 30000,
     "testRegex": ".*.(test|spec)\\.[jt]sx?$",
     "transformIgnorePatterns": [
-      "node_modules/(?!find-up|locate-path|p-locate|p-limit|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
+      "node_modules/(?!find-up|locate-path|p-locate|p-limit|p-timeout|p-queue|yocto-queue|path-exists|execa|strip-final-newline|npm-run-path|path-key|onetime|mimic-fn|human-signals|is-stream|get-port|supports-color|pretty-bytes)"
     ],
     "moduleNameMapper": {
       "clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",

package/pages/functions/buildPlugin.ts

@@ -1,5 +1,7 @@
 import { access, lstat } from "node:fs/promises";
 import { dirname, relative, resolve } from "node:path";
+import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
+import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
 import { build } from "esbuild";
 
 type Options = {
@@ -8,6 +10,7 @@ type Options = {
   minify?: boolean;
   sourcemap?: boolean;
   watch?: boolean;
+  nodeCompat?: boolean;
   onEnd?: () => void;
 };
 
@@ -17,6 +20,7 @@ export function buildPlugin({
   minify = false,
   sourcemap = false,
   watch = false,
+  nodeCompat,
   onEnd = () => {},
 }: Options) {
   return build({
@@ -30,6 +34,7 @@ export function buildPlugin({
     sourcemap,
     watch,
     allowOverwrite: true,
+    define: { ...(nodeCompat ? { global: "globalThis" } : {}) },
     plugins: [
       {
         name: "wrangler notifier and monitor",
@@ -87,6 +92,14 @@ export function buildPlugin({
           }
         },
       },
+      ...(nodeCompat
+        ? [
+            NodeGlobalsPolyfills({
+              buffer: true,
+            }),
+            NodeModulesPolyfills(),
+          ]
+        : []),
     ],
   });
 }

package/pages/functions/buildWorker.ts

@@ -1,5 +1,7 @@
 import { access, cp, lstat, rm } from "node:fs/promises";
 import { join, resolve } from "node:path";
+import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
+import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
 import { build } from "esbuild";
 import { nanoid } from "nanoid";
 
@@ -12,6 +14,7 @@ type Options = {
   watch?: boolean;
   onEnd?: () => void;
   buildOutputDirectory?: string;
+  nodeCompat?: boolean;
 };
 
 export function buildWorker({
@@ -23,6 +26,7 @@ export function buildWorker({
   watch = false,
   onEnd = () => {},
   buildOutputDirectory,
+  nodeCompat,
 }: Options) {
   return build({
     entryPoints: [resolve(__dirname, "../pages/functions/template-worker.ts")],
@@ -37,6 +41,7 @@ export function buildWorker({
     allowOverwrite: true,
     define: {
       __FALLBACK_SERVICE__: JSON.stringify(fallbackService),
+      ...(nodeCompat ? { global: "globalThis" } : {}),
     },
     plugins: [
       {
@@ -122,7 +127,7 @@ export function buildWorker({
                   // TODO: Watch args.path for changes and re-copy when updated
                   contents: `export const onRequest = ({ request, env, functionPath }) => {
                     const url = new URL(request.url)
-                    const relativePathname = url.pathname.split(functionPath)[1] || "/";
+                    const relativePathname = \`/\${url.pathname.split(functionPath)[1] || ''}\`.replace(/^\\/\\//, '/');
                     url.pathname = '/cdn-cgi/pages-plugins/${identifier}' + relativePathname
                     request = new Request(url.toString(), request)
                     return env.ASSETS.fetch(request)
@@ -133,6 +138,14 @@ export function buildWorker({
           );
         },
       },
+      ...(nodeCompat
+        ? [
+            NodeGlobalsPolyfills({
+              buffer: true,
+            }),
+            NodeModulesPolyfills(),
+          ]
+        : []),
     ],
   });
 }

package/pages/functions/template-plugin.ts

@@ -103,8 +103,9 @@ export default function (pluginArgs) {
     const { env, next, data } = workerContext;
 
     const url = new URL(request.url);
-    const relativePathname =
-      url.pathname.split(workerContext.functionPath)[1] || "/";
+    const relativePathname = `/${
+      url.pathname.split(workerContext.functionPath)[1] || ""
+    }`.replace(/^\/\//, "/");
 
     const handlerIterator = executeRequest(request, relativePathname);
     const pluginNext = async (input?: RequestInfo, init?: RequestInit) => {