wrangler 0.0.0-e41c7e41 → 0.0.0-e44afaf79

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