wrangler 0.0.0-e87ad068 → 0.0.0-e89ee2a5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (327) hide show
  1. package/README.md +10 -12
  2. package/bin/wrangler.js +13 -74
  3. package/package.json +226 -199
  4. package/templates/__tests__/tsconfig.json +1 -1
  5. package/templates/checked-fetch.js +10 -3
  6. package/templates/facade.d.ts +4 -1
  7. package/templates/gitignore +0 -5
  8. package/templates/init-tests/test-vitest-new-worker.js +1 -1
  9. package/templates/init-tests/test-vitest-new-worker.ts +1 -1
  10. package/templates/middleware/common.ts +9 -4
  11. package/templates/middleware/loader-modules.ts +67 -15
  12. package/templates/middleware/loader-sw.ts +6 -10
  13. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  14. package/templates/middleware/middleware-ensure-req-body-drained.ts +19 -0
  15. package/templates/middleware/middleware-miniflare3-json-error.ts +1 -0
  16. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  17. package/templates/middleware/middleware-multiworker-dev.ts +68 -0
  18. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  19. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  20. package/templates/modules-watch-stub.js +4 -0
  21. package/templates/new-worker-scheduled.ts +1 -1
  22. package/templates/new-worker.ts +1 -1
  23. package/templates/pages-dev-pipeline.ts +2 -1
  24. package/templates/pages-shim.ts +0 -3
  25. package/templates/pages-template-plugin.ts +12 -2
  26. package/templates/pages-template-worker.ts +11 -2
  27. package/templates/startDevWorker/InspectorProxyWorker.ts +661 -0
  28. package/templates/startDevWorker/ProxyWorker.ts +326 -0
  29. package/templates/tsconfig.json +1 -1
  30. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  31. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  32. package/wrangler-dist/ProxyWorker.js +237 -0
  33. package/wrangler-dist/ProxyWorker.js.map +6 -0
  34. package/wrangler-dist/cli.d.ts +22559 -328
  35. package/wrangler-dist/cli.js +129487 -111124
  36. package/wrangler-dist/wasm-sync.wasm +0 -0
  37. package/import_meta_url.js +0 -3
  38. package/miniflare-config-stubs/.env.empty +0 -0
  39. package/miniflare-config-stubs/package.empty.json +0 -1
  40. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  41. package/miniflare-dist/index.mjs +0 -6442
  42. package/src/__tests__/access.test.ts +0 -25
  43. package/src/__tests__/api-dev.test.ts +0 -238
  44. package/src/__tests__/api-devregistry.test.ts +0 -121
  45. package/src/__tests__/api.test.ts +0 -102
  46. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  47. package/src/__tests__/config-cache.test.ts +0 -42
  48. package/src/__tests__/configuration.test.ts +0 -4727
  49. package/src/__tests__/constellation.test.ts +0 -371
  50. package/src/__tests__/d1/d1.test.ts +0 -82
  51. package/src/__tests__/d1/execute.test.ts +0 -66
  52. package/src/__tests__/d1/migrate.test.ts +0 -257
  53. package/src/__tests__/d1/splitter.test.ts +0 -255
  54. package/src/__tests__/delete.test.ts +0 -272
  55. package/src/__tests__/deployments.test.ts +0 -369
  56. package/src/__tests__/dev.test.tsx +0 -1617
  57. package/src/__tests__/generate.test.ts +0 -237
  58. package/src/__tests__/get-host-from-url.test.ts +0 -16
  59. package/src/__tests__/guess-worker-format.test.ts +0 -120
  60. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  61. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  62. package/src/__tests__/helpers/end-event-loop.ts +0 -6
  63. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  64. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  65. package/src/__tests__/helpers/mock-bin.ts +0 -36
  66. package/src/__tests__/helpers/mock-console.ts +0 -112
  67. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  68. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  69. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  70. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  71. package/src/__tests__/helpers/mock-istty.ts +0 -74
  72. package/src/__tests__/helpers/mock-known-routes.ts +0 -12
  73. package/src/__tests__/helpers/mock-kv.ts +0 -46
  74. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  75. package/src/__tests__/helpers/mock-process.ts +0 -34
  76. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  77. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  78. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  79. package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
  80. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  81. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -160
  82. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  83. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  84. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  85. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  86. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  87. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  88. package/src/__tests__/helpers/msw/index.ts +0 -52
  89. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  90. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  91. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  92. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  93. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  94. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  95. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  96. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -11
  97. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  98. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  99. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  100. package/src/__tests__/https-options.test.ts +0 -163
  101. package/src/__tests__/index.test.ts +0 -282
  102. package/src/__tests__/init.test.ts +0 -3302
  103. package/src/__tests__/jest.setup.ts +0 -179
  104. package/src/__tests__/kv.test.ts +0 -1799
  105. package/src/__tests__/logger.test.ts +0 -207
  106. package/src/__tests__/logout.test.ts +0 -47
  107. package/src/__tests__/metrics.test.ts +0 -493
  108. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  109. package/src/__tests__/middleware.test.ts +0 -816
  110. package/src/__tests__/mtls-certificates.test.ts +0 -589
  111. package/src/__tests__/package-manager.test.ts +0 -353
  112. package/src/__tests__/pages/deployment-list.test.ts +0 -80
  113. package/src/__tests__/pages/functions-build.test.ts +0 -529
  114. package/src/__tests__/pages/pages.test.ts +0 -81
  115. package/src/__tests__/pages/project-create.test.ts +0 -63
  116. package/src/__tests__/pages/project-list.test.ts +0 -110
  117. package/src/__tests__/pages/project-upload.test.ts +0 -500
  118. package/src/__tests__/pages/publish.test.ts +0 -2864
  119. package/src/__tests__/pages-deployment-tail.test.ts +0 -957
  120. package/src/__tests__/parse.test.ts +0 -436
  121. package/src/__tests__/paths.test.ts +0 -39
  122. package/src/__tests__/publish.test.ts +0 -8882
  123. package/src/__tests__/pubsub.test.ts +0 -496
  124. package/src/__tests__/queues.test.ts +0 -532
  125. package/src/__tests__/r2.test.ts +0 -374
  126. package/src/__tests__/route.test.ts +0 -45
  127. package/src/__tests__/secret.test.ts +0 -693
  128. package/src/__tests__/tail.test.ts +0 -1000
  129. package/src/__tests__/test-old-node-version.js +0 -31
  130. package/src/__tests__/traverse-module-graph.test.ts +0 -220
  131. package/src/__tests__/tsconfig-sanity.ts +0 -12
  132. package/src/__tests__/tsconfig.json +0 -8
  133. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  134. package/src/__tests__/type-generation.test.ts +0 -234
  135. package/src/__tests__/unstableDev.test.ts +0 -61
  136. package/src/__tests__/user.test.ts +0 -118
  137. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  138. package/src/__tests__/validate-dev-props.test.ts +0 -56
  139. package/src/__tests__/version.test.ts +0 -35
  140. package/src/__tests__/whoami.test.tsx +0 -172
  141. package/src/__tests__/worker-namespace.test.ts +0 -340
  142. package/src/abort.d.ts +0 -3
  143. package/src/api/dev.ts +0 -328
  144. package/src/api/index.ts +0 -11
  145. package/src/api/mtls-certificate.ts +0 -148
  146. package/src/api/pages/create-worker-bundle-contents.ts +0 -80
  147. package/src/api/pages/index.ts +0 -5
  148. package/src/api/pages/publish.tsx +0 -371
  149. package/src/bundle-reporter.ts +0 -68
  150. package/src/bundle.ts +0 -952
  151. package/src/cfetch/index.ts +0 -158
  152. package/src/cfetch/internal.ts +0 -263
  153. package/src/cli.ts +0 -28
  154. package/src/config/README.md +0 -107
  155. package/src/config/config.ts +0 -282
  156. package/src/config/diagnostics.ts +0 -80
  157. package/src/config/environment.ts +0 -659
  158. package/src/config/index.ts +0 -424
  159. package/src/config/validation-helpers.ts +0 -597
  160. package/src/config/validation.ts +0 -2524
  161. package/src/config-cache.ts +0 -85
  162. package/src/constellation/createProject.tsx +0 -51
  163. package/src/constellation/deleteProject.ts +0 -51
  164. package/src/constellation/deleteProjectModel.ts +0 -76
  165. package/src/constellation/index.ts +0 -75
  166. package/src/constellation/listCatalog.tsx +0 -35
  167. package/src/constellation/listModel.tsx +0 -49
  168. package/src/constellation/listProject.tsx +0 -28
  169. package/src/constellation/listRuntime.tsx +0 -28
  170. package/src/constellation/options.ts +0 -17
  171. package/src/constellation/types.ts +0 -17
  172. package/src/constellation/uploadModel.tsx +0 -84
  173. package/src/constellation/utils.ts +0 -90
  174. package/src/create-worker-preview.ts +0 -293
  175. package/src/create-worker-upload-form.ts +0 -384
  176. package/src/d1/backups.tsx +0 -219
  177. package/src/d1/constants.ts +0 -5
  178. package/src/d1/create.tsx +0 -102
  179. package/src/d1/delete.ts +0 -53
  180. package/src/d1/execute.tsx +0 -371
  181. package/src/d1/formatTimeAgo.ts +0 -14
  182. package/src/d1/index.ts +0 -100
  183. package/src/d1/list.tsx +0 -62
  184. package/src/d1/migrations/apply.tsx +0 -235
  185. package/src/d1/migrations/create.tsx +0 -79
  186. package/src/d1/migrations/helpers.ts +0 -171
  187. package/src/d1/migrations/index.ts +0 -3
  188. package/src/d1/migrations/list.tsx +0 -95
  189. package/src/d1/migrations/options.ts +0 -23
  190. package/src/d1/options.ts +0 -22
  191. package/src/d1/splitter.ts +0 -161
  192. package/src/d1/types.ts +0 -32
  193. package/src/d1/utils.ts +0 -49
  194. package/src/delete.ts +0 -100
  195. package/src/deployments.ts +0 -368
  196. package/src/deprecated/index.ts +0 -144
  197. package/src/dev/dev-vars.ts +0 -39
  198. package/src/dev/dev.tsx +0 -607
  199. package/src/dev/get-local-persistence-path.ts +0 -31
  200. package/src/dev/local.tsx +0 -952
  201. package/src/dev/remote.tsx +0 -636
  202. package/src/dev/start-server.ts +0 -558
  203. package/src/dev/use-esbuild.ts +0 -230
  204. package/src/dev/validate-dev-props.ts +0 -40
  205. package/src/dev-registry.ts +0 -213
  206. package/src/dev.tsx +0 -946
  207. package/src/dialogs.ts +0 -136
  208. package/src/dispatch-namespace.ts +0 -211
  209. package/src/docs/helpers.ts +0 -50
  210. package/src/docs/index.ts +0 -54
  211. package/src/durable.ts +0 -102
  212. package/src/entry.ts +0 -344
  213. package/src/environment-variables/factory.ts +0 -89
  214. package/src/environment-variables/misc-variables.ts +0 -30
  215. package/src/errors.ts +0 -11
  216. package/src/generate/index.ts +0 -303
  217. package/src/git-client.ts +0 -135
  218. package/src/global-wrangler-config-path.ts +0 -26
  219. package/src/https-options.ts +0 -127
  220. package/src/index.ts +0 -769
  221. package/src/init.ts +0 -1074
  222. package/src/inspect.ts +0 -883
  223. package/src/intl-polyfill.d.ts +0 -139
  224. package/src/is-ci.ts +0 -14
  225. package/src/is-interactive.ts +0 -16
  226. package/src/jest.d.ts +0 -4
  227. package/src/kv/helpers.ts +0 -433
  228. package/src/kv/index.ts +0 -594
  229. package/src/logger.ts +0 -123
  230. package/src/metrics/index.ts +0 -5
  231. package/src/metrics/metrics-config.ts +0 -239
  232. package/src/metrics/metrics-dispatcher.ts +0 -96
  233. package/src/metrics/metrics-usage-headers.ts +0 -24
  234. package/src/metrics/send-event.ts +0 -99
  235. package/src/miniflare-cli/README.md +0 -30
  236. package/src/miniflare-cli/assets.ts +0 -251
  237. package/src/miniflare-cli/index.ts +0 -210
  238. package/src/miniflare-cli/request-context.ts +0 -40
  239. package/src/miniflare-cli/tsconfig.json +0 -9
  240. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  241. package/src/miniflare-cli/types.ts +0 -11
  242. package/src/module-collection.ts +0 -333
  243. package/src/mtls-certificate/cli.ts +0 -155
  244. package/src/open-in-browser.ts +0 -17
  245. package/src/package-manager.ts +0 -219
  246. package/src/pages/build.ts +0 -423
  247. package/src/pages/buildFunctions.ts +0 -140
  248. package/src/pages/constants.ts +0 -18
  249. package/src/pages/deployment-tails.ts +0 -281
  250. package/src/pages/deployments.tsx +0 -84
  251. package/src/pages/dev.ts +0 -759
  252. package/src/pages/errors.ts +0 -67
  253. package/src/pages/functions/buildPlugin.ts +0 -114
  254. package/src/pages/functions/buildWorker.ts +0 -381
  255. package/src/pages/functions/filepath-routing.test.ts +0 -234
  256. package/src/pages/functions/filepath-routing.ts +0 -189
  257. package/src/pages/functions/identifiers.ts +0 -78
  258. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  259. package/src/pages/functions/routes-consolidation.ts +0 -73
  260. package/src/pages/functions/routes-transformation.test.ts +0 -282
  261. package/src/pages/functions/routes-transformation.ts +0 -115
  262. package/src/pages/functions/routes-validation.test.ts +0 -403
  263. package/src/pages/functions/routes-validation.ts +0 -202
  264. package/src/pages/functions/routes.ts +0 -151
  265. package/src/pages/functions/tsconfig.json +0 -8
  266. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  267. package/src/pages/functions.ts +0 -86
  268. package/src/pages/hash.ts +0 -13
  269. package/src/pages/index.ts +0 -102
  270. package/src/pages/projects.tsx +0 -159
  271. package/src/pages/prompt-select-project.tsx +0 -31
  272. package/src/pages/publish.tsx +0 -267
  273. package/src/pages/types.ts +0 -46
  274. package/src/pages/upload.tsx +0 -469
  275. package/src/pages/utils.ts +0 -23
  276. package/src/parse.ts +0 -308
  277. package/src/paths.ts +0 -71
  278. package/src/proxy.ts +0 -694
  279. package/src/publish/index.ts +0 -274
  280. package/src/publish/publish.ts +0 -1068
  281. package/src/pubsub/index.ts +0 -286
  282. package/src/pubsub/pubsub-commands.ts +0 -623
  283. package/src/queues/cli/commands/consumer/add.ts +0 -71
  284. package/src/queues/cli/commands/consumer/index.ts +0 -19
  285. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  286. package/src/queues/cli/commands/create.ts +0 -25
  287. package/src/queues/cli/commands/delete.ts +0 -26
  288. package/src/queues/cli/commands/index.ts +0 -35
  289. package/src/queues/cli/commands/list.ts +0 -25
  290. package/src/queues/client.ts +0 -136
  291. package/src/queues/utils.ts +0 -18
  292. package/src/r2/constants.ts +0 -4
  293. package/src/r2/helpers.ts +0 -132
  294. package/src/r2/index.ts +0 -289
  295. package/src/routes.ts +0 -140
  296. package/src/secret/index.ts +0 -380
  297. package/src/selfsigned.d.ts +0 -29
  298. package/src/sites.ts +0 -484
  299. package/src/tail/createTail.ts +0 -415
  300. package/src/tail/filters.ts +0 -277
  301. package/src/tail/index.ts +0 -211
  302. package/src/tail/printing.ts +0 -134
  303. package/src/traverse-module-graph.ts +0 -54
  304. package/src/tsconfig-sanity.ts +0 -16
  305. package/src/type-generation.ts +0 -187
  306. package/src/update-check.ts +0 -19
  307. package/src/user/access.ts +0 -68
  308. package/src/user/auth-variables.ts +0 -113
  309. package/src/user/choose-account.tsx +0 -39
  310. package/src/user/generate-auth-url.ts +0 -33
  311. package/src/user/generate-random-state.ts +0 -16
  312. package/src/user/index.ts +0 -2
  313. package/src/user/user.ts +0 -1234
  314. package/src/utils/collectKeyValues.ts +0 -14
  315. package/src/utils/render.ts +0 -93
  316. package/src/whoami.ts +0 -135
  317. package/src/worker.ts +0 -300
  318. package/src/yargs-types.ts +0 -37
  319. package/src/zones.ts +0 -191
  320. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  321. package/templates/d1-beta-facade.js +0 -244
  322. package/templates/first-party-worker-module-facade.ts +0 -19
  323. package/templates/format-dev-errors.ts +0 -34
  324. package/templates/serve-static-assets.ts +0 -66
  325. package/templates/service-bindings-module-facade.js +0 -55
  326. package/templates/service-bindings-sw-facade.js +0 -42
  327. package/templates/tsconfig.tsbuildinfo +0 -1
@@ -0,0 +1,661 @@
1
+ import assert from "node:assert";
2
+ import {
3
+ DevToolsCommandRequest,
4
+ DevToolsCommandRequests,
5
+ DevToolsCommandResponses,
6
+ DevToolsEvent,
7
+ DevToolsEvents,
8
+ serialiseError,
9
+ } from "../../src/api/startDevWorker/events";
10
+ import {
11
+ assertNever,
12
+ createDeferred,
13
+ DeferredPromise,
14
+ MaybePromise,
15
+ urlFromParts,
16
+ } from "../../src/api/startDevWorker/utils";
17
+ import type {
18
+ InspectorProxyWorkerIncomingWebSocketMessage,
19
+ InspectorProxyWorkerOutgoingRequestBody,
20
+ InspectorProxyWorkerOutgoingWebsocketMessage,
21
+ ProxyData,
22
+ } from "../../src/api/startDevWorker/events";
23
+
24
+ const ALLOWED_HOST_HOSTNAMES = ["127.0.0.1", "[::1]", "localhost"];
25
+ const ALLOWED_ORIGIN_HOSTNAMES = [
26
+ "devtools.devprod.cloudflare.dev",
27
+ "cloudflare-devtools.pages.dev",
28
+ /^[a-z0-9]+\.cloudflare-devtools\.pages\.dev$/,
29
+ "127.0.0.1",
30
+ "[::1]",
31
+ "localhost",
32
+ ];
33
+
34
+ interface Env {
35
+ PROXY_CONTROLLER: Fetcher;
36
+ PROXY_CONTROLLER_AUTH_SECRET: string;
37
+ WRANGLER_VERSION: string;
38
+ DURABLE_OBJECT: DurableObjectNamespace;
39
+ }
40
+
41
+ export default {
42
+ fetch(req, env) {
43
+ const singleton = env.DURABLE_OBJECT.idFromName("");
44
+ const inspectorProxy = env.DURABLE_OBJECT.get(singleton);
45
+
46
+ return inspectorProxy.fetch(req);
47
+ },
48
+ } as ExportedHandler<Env>;
49
+
50
+ function isDevToolsEvent<Method extends DevToolsEvents["method"]>(
51
+ event: unknown,
52
+ name: Method
53
+ ): event is DevToolsEvent<Method> {
54
+ return (
55
+ typeof event === "object" &&
56
+ event !== null &&
57
+ "method" in event &&
58
+ event.method === name
59
+ );
60
+ }
61
+
62
+ export class InspectorProxyWorker implements DurableObject {
63
+ constructor(_state: DurableObjectState, readonly env: Env) {}
64
+
65
+ websockets: {
66
+ proxyController?: WebSocket;
67
+ runtime?: WebSocket;
68
+ devtools?: WebSocket;
69
+
70
+ // Browser DevTools cannot read the filesystem,
71
+ // instead they fetch via `Network.loadNetworkResource` messages.
72
+ // IDE DevTools can read the filesystem and expect absolute paths.
73
+ devtoolsHasFileSystemAccess?: boolean;
74
+
75
+ // We want to be able to delay devtools connection response
76
+ // until we've connected to the runtime inspector server
77
+ // so this deferred holds a promise to websockets.runtime
78
+ runtimeDeferred: DeferredPromise<WebSocket>;
79
+ } = {
80
+ runtimeDeferred: createDeferred<WebSocket>(),
81
+ };
82
+ proxyData?: ProxyData;
83
+ runtimeMessageBuffer: (DevToolsCommandResponses | DevToolsEvents)[] = [];
84
+
85
+ async fetch(req: Request) {
86
+ if (
87
+ req.headers.get("Authorization") === this.env.PROXY_CONTROLLER_AUTH_SECRET
88
+ ) {
89
+ return this.handleProxyControllerRequest(req);
90
+ }
91
+
92
+ if (req.headers.get("Upgrade") === "websocket") {
93
+ return this.handleDevToolsWebSocketUpgradeRequest(req);
94
+ }
95
+
96
+ return this.handleDevToolsJsonRequest(req);
97
+ }
98
+
99
+ // ************************
100
+ // ** PROXY CONTROLLER **
101
+ // ************************
102
+
103
+ handleProxyControllerRequest(req: Request) {
104
+ assert(
105
+ req.headers.get("Upgrade") === "websocket",
106
+ "Expected proxy controller data request to be WebSocket upgrade"
107
+ );
108
+
109
+ const { 0: response, 1: proxyController } = new WebSocketPair();
110
+ proxyController.accept();
111
+ proxyController.addEventListener("close", (event) => {
112
+ // don't reconnect the proxyController websocket
113
+ // ProxyController can detect this event and reconnect itself
114
+
115
+ this.sendDebugLog(
116
+ "PROXY CONTROLLER WEBSOCKET CLOSED",
117
+ event.code,
118
+ event.reason
119
+ );
120
+
121
+ if (this.websockets.proxyController === proxyController) {
122
+ this.websockets.proxyController = undefined;
123
+ }
124
+ });
125
+ proxyController.addEventListener("error", (event) => {
126
+ // don't reconnect the proxyController websocket
127
+ // ProxyController can detect this event and reconnect itself
128
+
129
+ const error = serialiseError(event.error);
130
+ this.sendDebugLog("PROXY CONTROLLER WEBSOCKET ERROR", error);
131
+
132
+ if (this.websockets.proxyController === proxyController) {
133
+ this.websockets.proxyController = undefined;
134
+ }
135
+ });
136
+ proxyController.addEventListener(
137
+ "message",
138
+ this.handleProxyControllerIncomingMessage
139
+ );
140
+
141
+ this.websockets.proxyController = proxyController;
142
+
143
+ return new Response(null, {
144
+ status: 101,
145
+ webSocket: response,
146
+ });
147
+ }
148
+
149
+ handleProxyControllerIncomingMessage = (event: MessageEvent) => {
150
+ assert(
151
+ typeof event.data === "string",
152
+ "Expected event.data from proxy controller to be string"
153
+ );
154
+
155
+ const message: InspectorProxyWorkerIncomingWebSocketMessage = JSON.parse(
156
+ event.data
157
+ );
158
+
159
+ this.sendDebugLog("handleProxyControllerIncomingMessage", event.data);
160
+
161
+ switch (message.type) {
162
+ case "reloadStart": {
163
+ this.sendRuntimeDiscardConsoleEntries();
164
+
165
+ break;
166
+ }
167
+ case "reloadComplete": {
168
+ this.proxyData = message.proxyData;
169
+
170
+ this.reconnectRuntimeWebSocket();
171
+
172
+ break;
173
+ }
174
+ default: {
175
+ assertNever(message);
176
+ }
177
+ }
178
+ };
179
+
180
+ sendProxyControllerMessage(
181
+ message: string | InspectorProxyWorkerOutgoingWebsocketMessage
182
+ ) {
183
+ message = typeof message === "string" ? message : JSON.stringify(message);
184
+
185
+ // if the proxyController websocket is disconnected, throw away the message
186
+ this.websockets.proxyController?.send(message);
187
+ }
188
+
189
+ async sendProxyControllerRequest(
190
+ message: InspectorProxyWorkerOutgoingRequestBody
191
+ ) {
192
+ try {
193
+ const res = await this.env.PROXY_CONTROLLER.fetch("http://dummy", {
194
+ method: "POST",
195
+ body: JSON.stringify(message),
196
+ });
197
+ return res.ok ? await res.text() : undefined;
198
+ } catch (e) {
199
+ this.sendDebugLog(
200
+ "FAILED TO SEND PROXY CONTROLLER REQUEST",
201
+ serialiseError(e)
202
+ );
203
+ return undefined;
204
+ }
205
+ }
206
+
207
+ sendDebugLog: typeof console.debug = (...args) => {
208
+ this.sendProxyControllerRequest({ type: "debug-log", args });
209
+ };
210
+
211
+ // ***************
212
+ // ** RUNTIME **
213
+ // ***************
214
+
215
+ handleRuntimeIncomingMessage = (event: MessageEvent) => {
216
+ assert(typeof event.data === "string");
217
+
218
+ const msg = JSON.parse(event.data) as
219
+ | DevToolsCommandResponses
220
+ | DevToolsEvents;
221
+ this.sendDebugLog("RUNTIME INCOMING MESSAGE", msg);
222
+
223
+ if (isDevToolsEvent(msg, "Runtime.exceptionThrown")) {
224
+ this.sendProxyControllerMessage(event.data);
225
+ }
226
+ if (
227
+ this.proxyData?.proxyLogsToController &&
228
+ isDevToolsEvent(msg, "Runtime.consoleAPICalled")
229
+ ) {
230
+ this.sendProxyControllerMessage(event.data);
231
+ }
232
+
233
+ this.runtimeMessageBuffer.push(msg);
234
+ this.tryDrainRuntimeMessageBuffer();
235
+ };
236
+
237
+ handleRuntimeScriptParsed(msg: DevToolsEvent<"Debugger.scriptParsed">) {
238
+ // If the devtools does not have filesystem access,
239
+ // rewrite the sourceMapURL to use a special scheme.
240
+ // This special scheme is used to indicate whether
241
+ // to intercept each loadNetworkResource message.
242
+
243
+ if (
244
+ !this.websockets.devtoolsHasFileSystemAccess &&
245
+ msg.params.sourceMapURL !== undefined &&
246
+ // Don't try to find a sourcemap for e.g. node-internal: scripts
247
+ msg.params.url.startsWith("file:")
248
+ ) {
249
+ const url = new URL(msg.params.sourceMapURL, msg.params.url);
250
+ // Check for file: in case msg.params.sourceMapURL has a different
251
+ // protocol (e.g. data). In that case we should ignore this file
252
+ if (url.protocol === "file:") {
253
+ msg.params.sourceMapURL = url.href.replace("file:", "wrangler-file:");
254
+ }
255
+ }
256
+
257
+ void this.sendDevToolsMessage(msg);
258
+ }
259
+
260
+ tryDrainRuntimeMessageBuffer = () => {
261
+ // If we don't have a DevTools WebSocket, try again later
262
+ if (this.websockets.devtools === undefined) return;
263
+
264
+ // clear the buffer and replay each message to devtools
265
+ for (const msg of this.runtimeMessageBuffer.splice(0)) {
266
+ if (isDevToolsEvent(msg, "Debugger.scriptParsed")) {
267
+ this.handleRuntimeScriptParsed(msg);
268
+ } else {
269
+ void this.sendDevToolsMessage(msg);
270
+ }
271
+ }
272
+ };
273
+
274
+ runtimeAbortController = new AbortController(); // will abort the in-flight websocket upgrade request to the remote runtime
275
+ runtimeKeepAliveInterval: number | null = null;
276
+ async reconnectRuntimeWebSocket() {
277
+ assert(this.proxyData, "Expected this.proxyData to be defined");
278
+
279
+ this.sendDebugLog("reconnectRuntimeWebSocket");
280
+
281
+ this.websockets.runtime?.close();
282
+ this.websockets.runtime = undefined;
283
+ this.runtimeAbortController.abort();
284
+ this.runtimeAbortController = new AbortController();
285
+ this.websockets.runtimeDeferred = createDeferred<WebSocket>(
286
+ this.websockets.runtimeDeferred
287
+ );
288
+
289
+ const runtimeWebSocketUrl = urlFromParts(
290
+ this.proxyData.userWorkerInspectorUrl
291
+ );
292
+ runtimeWebSocketUrl.protocol = this.proxyData.userWorkerUrl.protocol; // http: or https:
293
+
294
+ this.sendDebugLog("NEW RUNTIME WEBSOCKET", runtimeWebSocketUrl);
295
+
296
+ // Make sure DevTools re-fetches script contents,
297
+ // and uses the newly created execution context
298
+ this.sendDevToolsMessage({
299
+ method: "Runtime.executionContextsCleared",
300
+ params: undefined,
301
+ });
302
+
303
+ const upgrade = await fetch(runtimeWebSocketUrl, {
304
+ headers: {
305
+ ...this.proxyData.headers,
306
+ Upgrade: "websocket",
307
+ },
308
+ signal: this.runtimeAbortController.signal,
309
+ });
310
+
311
+ const runtime = upgrade.webSocket;
312
+ if (!runtime) {
313
+ const error = new Error(
314
+ `Failed to establish the WebSocket connection: expected server to reply with HTTP status code 101 (switching protocols), but received ${upgrade.status} instead.`
315
+ );
316
+
317
+ this.websockets.runtimeDeferred.reject(error);
318
+ this.sendProxyControllerRequest({
319
+ type: "runtime-websocket-error",
320
+ error: serialiseError(error),
321
+ });
322
+
323
+ return;
324
+ }
325
+
326
+ this.websockets.runtime = runtime;
327
+
328
+ runtime.addEventListener("message", this.handleRuntimeIncomingMessage);
329
+
330
+ runtime.addEventListener("close", (event) => {
331
+ this.sendDebugLog("RUNTIME WEBSOCKET CLOSED", event.code, event.reason);
332
+
333
+ clearInterval(this.runtimeKeepAliveInterval);
334
+
335
+ if (this.websockets.runtime === runtime) {
336
+ this.websockets.runtime = undefined;
337
+ }
338
+
339
+ // don't reconnect the runtime websocket
340
+ // if it closes unexpectedly (very rare or a case where reconnecting won't succeed anyway)
341
+ // wait for a new proxy-data message or manual restart
342
+ });
343
+
344
+ runtime.addEventListener("error", (event) => {
345
+ const error = serialiseError(event.error);
346
+ this.sendDebugLog("RUNTIME WEBSOCKET ERROR", error);
347
+
348
+ clearInterval(this.runtimeKeepAliveInterval);
349
+
350
+ if (this.websockets.runtime === runtime) {
351
+ this.websockets.runtime = undefined;
352
+ }
353
+
354
+ this.sendProxyControllerRequest({
355
+ type: "runtime-websocket-error",
356
+ error,
357
+ });
358
+
359
+ // don't reconnect the runtime websocket
360
+ // if it closes unexpectedly (very rare or a case where reconnecting won't succeed anyway)
361
+ // wait for a new proxy-data message or manual restart
362
+ });
363
+
364
+ runtime.accept();
365
+
366
+ // fetch(Upgrade: websocket) resolves when the websocket is open
367
+ // therefore the open event will not fire, so just trigger the handler
368
+ this.handleRuntimeWebSocketOpen(runtime);
369
+ }
370
+
371
+ #runtimeMessageCounter = 1e8;
372
+ nextCounter() {
373
+ return ++this.#runtimeMessageCounter;
374
+ }
375
+ handleRuntimeWebSocketOpen(runtime: WebSocket) {
376
+ this.sendDebugLog("RUNTIME WEBSOCKET OPENED");
377
+
378
+ this.sendRuntimeMessage(
379
+ { method: "Runtime.enable", id: this.nextCounter() },
380
+ runtime
381
+ );
382
+ this.sendRuntimeMessage(
383
+ { method: "Debugger.enable", id: this.nextCounter() },
384
+ runtime
385
+ );
386
+ this.sendRuntimeMessage(
387
+ { method: "Network.enable", id: this.nextCounter() },
388
+ runtime
389
+ );
390
+
391
+ clearInterval(this.runtimeKeepAliveInterval);
392
+ this.runtimeKeepAliveInterval = setInterval(() => {
393
+ this.sendRuntimeMessage(
394
+ { method: "Runtime.getIsolateId", id: this.nextCounter() },
395
+ runtime
396
+ );
397
+ }, 10_000) as any;
398
+
399
+ this.websockets.runtimeDeferred.resolve(runtime);
400
+ }
401
+
402
+ sendRuntimeDiscardConsoleEntries() {
403
+ // by default, sendRuntimeMessage waits for the runtime websocket to connect
404
+ // but we only want to send this message now or never
405
+ // if we schedule it to send later (like waiting for the websocket, by default)
406
+ // then we risk clearing logs that have occured since we scheduled it too
407
+ // which is worse than leaving logs from the previous version on screen
408
+ if (this.websockets.runtime) {
409
+ this.sendRuntimeMessage(
410
+ {
411
+ method: "Runtime.discardConsoleEntries",
412
+ id: this.nextCounter(),
413
+ },
414
+ this.websockets.runtime
415
+ );
416
+ }
417
+ }
418
+
419
+ async sendRuntimeMessage(
420
+ message: string | DevToolsCommandRequests,
421
+ runtime: MaybePromise<WebSocket> = this.websockets.runtimeDeferred.promise
422
+ ) {
423
+ runtime = await runtime;
424
+ message = typeof message === "string" ? message : JSON.stringify(message);
425
+
426
+ this.sendDebugLog("SEND TO RUNTIME", message);
427
+
428
+ runtime.send(message);
429
+ }
430
+
431
+ // ****************
432
+ // ** DEVTOOLS **
433
+ // ****************
434
+
435
+ #inspectorId = crypto.randomUUID();
436
+ async handleDevToolsJsonRequest(req: Request) {
437
+ const url = new URL(req.url);
438
+
439
+ if (url.pathname === "/json/version") {
440
+ return Response.json({
441
+ Browser: `wrangler/v${this.env.WRANGLER_VERSION}`,
442
+ // TODO: (someday): The DevTools protocol should match that of workerd.
443
+ // This could be exposed by the preview API.
444
+ "Protocol-Version": "1.3",
445
+ });
446
+ }
447
+
448
+ if (url.pathname === "/json" || url.pathname === "/json/list") {
449
+ // TODO: can we remove the `/ws` here if we only have a single worker?
450
+ const localHost = `${url.host}/ws`;
451
+ const devtoolsFrontendUrl = `https://devtools.devprod.cloudflare.dev/js_app?theme=systemPreferred&debugger=true&ws=${localHost}`;
452
+
453
+ return Response.json([
454
+ {
455
+ id: this.#inspectorId,
456
+ type: "node", // TODO: can we specify different type?
457
+ description: "workers",
458
+ webSocketDebuggerUrl: `ws://${localHost}`,
459
+ devtoolsFrontendUrl,
460
+ devtoolsFrontendUrlCompat: devtoolsFrontendUrl,
461
+ // Below are fields that are visible in the DevTools UI.
462
+ title: "Cloudflare Worker",
463
+ faviconUrl: "https://workers.cloudflare.com/favicon.ico",
464
+ // url: "http://" + localHost, // looks unnecessary
465
+ },
466
+ ]);
467
+ }
468
+
469
+ return new Response(null, { status: 404 });
470
+ }
471
+
472
+ async handleDevToolsWebSocketUpgradeRequest(req: Request) {
473
+ // Validate `Host` header
474
+ let hostHeader = req.headers.get("Host");
475
+ if (hostHeader == null) return new Response(null, { status: 400 });
476
+ try {
477
+ const host = new URL(`http://${hostHeader}`);
478
+ if (!ALLOWED_HOST_HOSTNAMES.includes(host.hostname)) {
479
+ return new Response("Disallowed `Host` header", { status: 401 });
480
+ }
481
+ } catch {
482
+ return new Response("Expected `Host` header", { status: 400 });
483
+ }
484
+ // Validate `Origin` header
485
+ let originHeader = req.headers.get("Origin");
486
+ if (originHeader === null && !req.headers.has("User-Agent")) {
487
+ // VSCode doesn't send an `Origin` header, but also doesn't send a
488
+ // `User-Agent` header, so allow an empty origin in this case.
489
+ originHeader = "http://localhost";
490
+ }
491
+ if (originHeader === null) {
492
+ return new Response("Expected `Origin` header", { status: 400 });
493
+ }
494
+ try {
495
+ const origin = new URL(originHeader);
496
+ const allowed = ALLOWED_ORIGIN_HOSTNAMES.some((rule) => {
497
+ if (typeof rule === "string") return origin.hostname === rule;
498
+ else return rule.test(origin.hostname);
499
+ });
500
+ if (!allowed) {
501
+ return new Response("Disallowed `Origin` header", { status: 401 });
502
+ }
503
+ } catch {
504
+ return new Response("Expected `Origin` header", { status: 400 });
505
+ }
506
+
507
+ // DevTools attempting to connect
508
+ this.sendDebugLog("DEVTOOLS WEBSOCKET TRYING TO CONNECT");
509
+
510
+ // Delay devtools connection response until we've connected to the runtime inspector server
511
+ await this.websockets.runtimeDeferred.promise;
512
+
513
+ this.sendDebugLog("DEVTOOLS WEBSOCKET CAN NOW CONNECT");
514
+
515
+ assert(
516
+ req.headers.get("Upgrade") === "websocket",
517
+ "Expected DevTools connection to be WebSocket upgrade"
518
+ );
519
+ const { 0: response, 1: devtools } = new WebSocketPair();
520
+ devtools.accept();
521
+
522
+ if (this.websockets.devtools !== undefined) {
523
+ /** We only want to have one active Devtools instance at a time. */
524
+ // TODO(consider): prioritise new websocket over previous
525
+ devtools.close(
526
+ 1013,
527
+ "Too many clients; only one can be connected at a time"
528
+ );
529
+ } else {
530
+ devtools.addEventListener("message", this.handleDevToolsIncomingMessage);
531
+ devtools.addEventListener("close", (event) => {
532
+ this.sendDebugLog(
533
+ "DEVTOOLS WEBSOCKET CLOSED",
534
+ event.code,
535
+ event.reason
536
+ );
537
+
538
+ if (this.websockets.devtools === devtools) {
539
+ this.websockets.devtools = undefined;
540
+ }
541
+ });
542
+ devtools.addEventListener("error", (event) => {
543
+ const error = serialiseError(event.error);
544
+ this.sendDebugLog("DEVTOOLS WEBSOCKET ERROR", error);
545
+
546
+ if (this.websockets.devtools === devtools) {
547
+ this.websockets.devtools = undefined;
548
+ }
549
+ });
550
+
551
+ // Since Wrangler proxies the inspector, reloading Chrome DevTools won't trigger debugger initialisation events (because it's connecting to an extant session).
552
+ // This sends a `Debugger.disable` message to the remote when a new WebSocket connection is initialised,
553
+ // with the assumption that the new connection will shortly send a `Debugger.enable` event and trigger re-initialisation.
554
+ // The key initialisation messages that are needed are the `Debugger.scriptParsed events`.
555
+ this.sendRuntimeMessage({
556
+ id: this.nextCounter(),
557
+ method: "Debugger.disable",
558
+ });
559
+
560
+ this.sendDebugLog("DEVTOOLS WEBSOCKET CONNECTED");
561
+
562
+ // Our patched DevTools are hosted on a `https://` URL. These cannot
563
+ // access `file://` URLs, meaning local source maps cannot be fetched.
564
+ // To get around this, we can rewrite `Debugger.scriptParsed` events to
565
+ // include a special `worker:` scheme for source maps, and respond to
566
+ // `Network.loadNetworkResource` commands for these. Unfortunately, this
567
+ // breaks IDE's built-in debuggers (e.g. VSCode and WebStorm), so we only
568
+ // want to enable this transformation when we detect hosted DevTools has
569
+ // connected. We do this by looking at the WebSocket handshake headers:
570
+ //
571
+ // DevTools
572
+ //
573
+ // Upgrade: websocket
574
+ // Host: localhost:9229
575
+ // (from Chrome) User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36
576
+ // (from Firefox) User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/116.0
577
+ // Origin: https://devtools.devprod.cloudflare.dev
578
+ // ...
579
+ //
580
+ // VSCode
581
+ //
582
+ // Upgrade: websocket
583
+ // Host: localhost
584
+ // ...
585
+ //
586
+ // WebStorm
587
+ //
588
+ // Upgrade: websocket
589
+ // Host: localhost:9229
590
+ // Origin: http://localhost:9229
591
+ // ...
592
+ //
593
+ // From this, we could just use the presence of a `User-Agent` header to
594
+ // determine if DevTools connected, but VSCode/WebStorm could very well
595
+ // add this in future versions. We could also look for an `Origin` header
596
+ // matching the hosted DevTools URL, but this would prevent preview/local
597
+ // versions working. Instead, we look for a browser-like `User-Agent`.
598
+ const userAgent = req.headers.get("User-Agent") ?? "";
599
+ const hasFileSystemAccess = !/mozilla/i.test(userAgent);
600
+
601
+ this.websockets.devtools = devtools;
602
+ this.websockets.devtoolsHasFileSystemAccess = hasFileSystemAccess;
603
+
604
+ this.tryDrainRuntimeMessageBuffer();
605
+ }
606
+
607
+ return new Response(null, { status: 101, webSocket: response });
608
+ }
609
+
610
+ handleDevToolsIncomingMessage = (event: MessageEvent) => {
611
+ assert(
612
+ typeof event.data === "string",
613
+ "Expected devtools incoming message to be of type string"
614
+ );
615
+
616
+ const message = JSON.parse(event.data) as DevToolsCommandRequests;
617
+ this.sendDebugLog("DEVTOOLS INCOMING MESSAGE", message);
618
+
619
+ if (message.method === "Network.loadNetworkResource") {
620
+ return void this.handleDevToolsLoadNetworkResource(message);
621
+ }
622
+
623
+ this.sendRuntimeMessage(JSON.stringify(message));
624
+ };
625
+
626
+ async handleDevToolsLoadNetworkResource(
627
+ message: DevToolsCommandRequest<"Network.loadNetworkResource">
628
+ ) {
629
+ const response = await this.sendProxyControllerRequest({
630
+ type: "load-network-resource",
631
+ url: message.params.url,
632
+ });
633
+ if (response === undefined) {
634
+ this.sendDebugLog(
635
+ `ProxyController could not resolve Network.loadNetworkResource for "${message.params.url}"`
636
+ );
637
+
638
+ // When the ProxyController cannot resolve a resource, let the runtime handle the request
639
+ this.sendRuntimeMessage(JSON.stringify(message));
640
+ } else {
641
+ // this.websockets.devtools can be undefined here
642
+ // the incoming message implies we have a devtools connection, but after
643
+ // the await it could've dropped in which case we can safely not respond
644
+ this.sendDevToolsMessage({
645
+ id: message.id,
646
+ // @ts-expect-error DevTools Protocol type does not match our patched devtools -- result.resource.text was added
647
+ result: { resource: { success: true, text: response } },
648
+ });
649
+ }
650
+ }
651
+
652
+ sendDevToolsMessage(
653
+ message: string | DevToolsCommandResponses | DevToolsEvents
654
+ ) {
655
+ message = typeof message === "string" ? message : JSON.stringify(message);
656
+
657
+ this.sendDebugLog("SEND TO DEVTOOLS", message);
658
+
659
+ this.websockets.devtools?.send(message);
660
+ }
661
+ }