wrangler 0.0.0-e7a0cd5b → 0.0.0-e8053554

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