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,326 @@
1
+ import {
2
+ createDeferred,
3
+ DeferredPromise,
4
+ urlFromParts,
5
+ } from "../../src/api/startDevWorker/utils";
6
+ import type {
7
+ ProxyData,
8
+ ProxyWorkerIncomingRequestBody,
9
+ ProxyWorkerOutgoingRequestBody,
10
+ } from "../../src/api/startDevWorker/events";
11
+
12
+ interface Env {
13
+ PROXY_CONTROLLER: Fetcher;
14
+ PROXY_CONTROLLER_AUTH_SECRET: string;
15
+ DURABLE_OBJECT: DurableObjectNamespace;
16
+ }
17
+
18
+ // request.cf.hostMetadata is verbose to type using the workers-types Request -- this allows us to have Request correctly typed in this scope
19
+ type Request = Parameters<
20
+ NonNullable<
21
+ ExportedHandler<Env, unknown, ProxyWorkerIncomingRequestBody>["fetch"]
22
+ >
23
+ >[0];
24
+
25
+ const LIVE_RELOAD_PROTOCOL = "WRANGLER_PROXYWORKER_LIVE_RELOAD_PROTOCOL";
26
+ export default {
27
+ fetch(req, env) {
28
+ const singleton = env.DURABLE_OBJECT.idFromName("");
29
+ const inspectorProxy = env.DURABLE_OBJECT.get(singleton);
30
+
31
+ return inspectorProxy.fetch(req);
32
+ },
33
+ } as ExportedHandler<Env, unknown, ProxyWorkerIncomingRequestBody>;
34
+
35
+ export class ProxyWorker implements DurableObject {
36
+ constructor(readonly state: DurableObjectState, readonly env: Env) {}
37
+
38
+ proxyData?: ProxyData;
39
+ requestQueue = new Map<Request, DeferredPromise<Response>>();
40
+ requestRetryQueue = new Map<Request, DeferredPromise<Response>>();
41
+
42
+ fetch(request: Request) {
43
+ if (isRequestForLiveReloadWebsocket(request)) {
44
+ // requests for live-reload websocket
45
+
46
+ return this.handleLiveReloadWebSocket(request);
47
+ }
48
+
49
+ if (isRequestFromProxyController(request, this.env)) {
50
+ // requests from ProxyController
51
+
52
+ return this.processProxyControllerRequest(request);
53
+ }
54
+
55
+ // regular requests to be proxied
56
+ const deferred = createDeferred<Response>();
57
+
58
+ this.requestQueue.set(request, deferred);
59
+ this.processQueue();
60
+
61
+ return deferred.promise;
62
+ }
63
+
64
+ handleLiveReloadWebSocket(request: Request) {
65
+ const { 0: response, 1: liveReload } = new WebSocketPair();
66
+ const websocketProtocol =
67
+ request.headers.get("Sec-WebSocket-Protocol") ?? "";
68
+
69
+ this.state.acceptWebSocket(liveReload, ["live-reload"]);
70
+
71
+ return new Response(null, {
72
+ status: 101,
73
+ webSocket: response,
74
+ headers: { "Sec-WebSocket-Protocol": websocketProtocol },
75
+ });
76
+ }
77
+
78
+ processProxyControllerRequest(request: Request) {
79
+ const event = request.cf?.hostMetadata;
80
+ switch (event?.type) {
81
+ case "pause":
82
+ this.proxyData = undefined;
83
+ break;
84
+
85
+ case "play":
86
+ this.proxyData = event.proxyData;
87
+ this.processQueue();
88
+ this.state
89
+ .getWebSockets("live-reload")
90
+ .forEach((ws) => ws.send("reload"));
91
+
92
+ break;
93
+ }
94
+
95
+ return new Response(null, { status: 204 });
96
+ }
97
+
98
+ /**
99
+ * Process requests that are being retried first, then process newer requests.
100
+ * Requests that are being retried are, by definition, older than requests which haven't been processed yet.
101
+ * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.
102
+ */
103
+ *getOrderedQueue() {
104
+ yield* this.requestRetryQueue;
105
+ yield* this.requestQueue;
106
+ }
107
+
108
+ processQueue() {
109
+ const { proxyData } = this; // store proxyData at the moment this function was called
110
+ if (proxyData === undefined) return;
111
+
112
+ for (const [request, deferredResponse] of this.getOrderedQueue()) {
113
+ this.requestRetryQueue.delete(request);
114
+ this.requestQueue.delete(request);
115
+
116
+ const outerUrl = new URL(request.url);
117
+ const headers = new Headers(request.headers);
118
+
119
+ // override url parts for proxying
120
+ const userWorkerUrl = new URL(request.url);
121
+ Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
122
+
123
+ // set request.url in the UserWorker
124
+ const innerUrl = new URL(request.url);
125
+ Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
126
+ headers.set("MF-Original-URL", innerUrl.href);
127
+ headers.set("MF-Disable-Pretty-Error", "true"); // disables the UserWorker miniflare instance from rendering the pretty error -- instead the ProxyWorker miniflare instance will intercept the json error response and render the pretty error page
128
+
129
+ rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
130
+
131
+ // merge proxyData headers with the request headers
132
+ for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
133
+ if (value === undefined) continue;
134
+
135
+ if (key.toLowerCase() === "cookie") {
136
+ const existing = request.headers.get("cookie") ?? "";
137
+ headers.set("cookie", `${existing};${value}`);
138
+ } else {
139
+ headers.set(key, value);
140
+ }
141
+ }
142
+
143
+ // explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly + synchronously
144
+ void fetch(userWorkerUrl, new Request(request, { headers }))
145
+ .then((res) => {
146
+ res = new Response(res.body, res);
147
+ rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
148
+
149
+ if (isHtmlResponse(res)) {
150
+ res = insertLiveReloadScript(request, res, this.env, proxyData);
151
+ }
152
+
153
+ deferredResponse.resolve(res);
154
+ })
155
+ .catch((error: Error) => {
156
+ // errors here are network errors or from response post-processing
157
+ // to catch only network errors, use the 2nd param of the fetch.then()
158
+
159
+ // we have crossed an async boundary, so proxyData may have changed
160
+ // if proxyData.userWorkerUrl has changed, it means there is a new downstream UserWorker
161
+ // and that this error is stale since it was for a request to the old UserWorker
162
+ // so here we construct a newUserWorkerUrl so we can compare it to the (old) userWorkerUrl
163
+ const newUserWorkerUrl =
164
+ this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);
165
+
166
+ // only report errors if the downstream proxy has NOT changed
167
+ if (userWorkerUrl.href === newUserWorkerUrl?.href) {
168
+ void sendMessageToProxyController(this.env, {
169
+ type: "error",
170
+ error: {
171
+ name: error.name,
172
+ message: error.message,
173
+ stack: error.stack,
174
+ cause: error.cause,
175
+ },
176
+ });
177
+
178
+ deferredResponse.reject(error);
179
+ }
180
+
181
+ // if the request can be retried (subset of idempotent requests which have no body), requeue it
182
+ else if (request.method === "GET" || request.method === "HEAD") {
183
+ this.requestRetryQueue.set(request, deferredResponse);
184
+ // we would only end up here if the downstream UserWorker is chang*ing*
185
+ // i.e. we are in a `pause`d state and expecting a `play` message soon
186
+ // this request will be processed (retried) when the `play` message arrives
187
+ // for that reason, we do not need to call `this.processQueue` here
188
+ // (but, also, it can't hurt to call it since it bails when
189
+ // in a `pause`d state i.e. `this.proxyData` is undefined)
190
+ }
191
+
192
+ // if the request cannot be retried, respond with 503 Service Unavailable
193
+ // important to note, this is not an (unexpected) error -- it is an acceptable flow of local development
194
+ // it would be incorrect to retry non-idempotent requests
195
+ // and would require cloning all body streams to avoid stream reuse (which is inefficient but not out of the question in the future)
196
+ // this is a good enough UX for now since it solves the most common GET use-case
197
+ else {
198
+ deferredResponse.resolve(
199
+ new Response(
200
+ "Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.",
201
+ {
202
+ status: 503,
203
+ headers: { "Retry-After": "0" },
204
+ }
205
+ )
206
+ );
207
+ }
208
+ });
209
+ }
210
+ }
211
+ }
212
+
213
+ function isRequestFromProxyController(req: Request, env: Env): boolean {
214
+ return req.headers.get("Authorization") === env.PROXY_CONTROLLER_AUTH_SECRET;
215
+ }
216
+ function isHtmlResponse(res: Response): boolean {
217
+ return res.headers.get("content-type")?.startsWith("text/html") ?? false;
218
+ }
219
+ function isRequestForLiveReloadWebsocket(req: Request): boolean {
220
+ const websocketProtocol = req.headers.get("Sec-WebSocket-Protocol");
221
+ const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
222
+
223
+ return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
224
+ }
225
+
226
+ function sendMessageToProxyController(
227
+ env: Env,
228
+ message: ProxyWorkerOutgoingRequestBody
229
+ ) {
230
+ return env.PROXY_CONTROLLER.fetch("http://dummy", {
231
+ method: "POST",
232
+ body: JSON.stringify(message),
233
+ });
234
+ }
235
+
236
+ function insertLiveReloadScript(
237
+ request: Request,
238
+ response: Response,
239
+ env: Env,
240
+ proxyData: ProxyData
241
+ ) {
242
+ const htmlRewriter = new HTMLRewriter();
243
+
244
+ // if preview-token-expired response, errorDetails will contain "Invalid Workers Preview configuration"
245
+ let errorDetails = "";
246
+ htmlRewriter.on("#cf-error-details", {
247
+ text(element) {
248
+ errorDetails += element.text;
249
+ },
250
+ });
251
+
252
+ htmlRewriter.onDocument({
253
+ end(end) {
254
+ if (
255
+ response.status === 400 &&
256
+ errorDetails.includes("Invalid Workers Preview configuration")
257
+ ) {
258
+ void sendMessageToProxyController(env, {
259
+ type: "previewTokenExpired",
260
+ proxyData,
261
+ });
262
+ }
263
+
264
+ // if liveReload enabled, append a script tag
265
+ // TODO: compare to existing nodejs implementation
266
+ if (proxyData.liveReload) {
267
+ const websocketUrl = new URL(request.url);
268
+ websocketUrl.protocol =
269
+ websocketUrl.protocol === "http:" ? "ws:" : "wss:";
270
+
271
+ end.append(
272
+ `
273
+ <script>
274
+ (function() {
275
+ var ws;
276
+ function recover() {
277
+ ws = null;
278
+ setTimeout(initLiveReload, 100);
279
+ }
280
+ function initLiveReload() {
281
+ if (ws) return;
282
+ var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
283
+ ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
284
+ ws.onclose = recover;
285
+ ws.onerror = recover;
286
+ ws.onmessage = location.reload.bind(location);
287
+ }
288
+ })();
289
+ </script>
290
+ `,
291
+ { html: true }
292
+ );
293
+ }
294
+ },
295
+ });
296
+
297
+ return htmlRewriter.transform(response);
298
+ }
299
+
300
+ /**
301
+ * Rewrite references to URLs in request/response headers.
302
+ *
303
+ * This function is used to map the URLs in headers like Origin and Access-Control-Allow-Origin
304
+ * so that this proxy is transparent to the Client Browser and User Worker.
305
+ */
306
+ function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
307
+ const setCookie = headers.getAll("Set-Cookie");
308
+ headers.delete("Set-Cookie");
309
+ headers.forEach((value, key) => {
310
+ if (typeof value === "string" && value.includes(from.host)) {
311
+ headers.set(
312
+ key,
313
+ value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
314
+ );
315
+ }
316
+ });
317
+ for (const cookie of setCookie) {
318
+ headers.append(
319
+ "Set-Cookie",
320
+ cookie.replace(
321
+ new RegExp(`Domain=${from.hostname}($|;|,)`),
322
+ `Domain=${to.hostname}$1`
323
+ )
324
+ );
325
+ }
326
+ }
@@ -1,5 +1,5 @@
1
1
  {
2
- "extends": "../tsconfig.json",
2
+ "extends": "@cloudflare/workers-tsconfig/tsconfig.json",
3
3
  "compilerOptions": {
4
4
  "types": ["@cloudflare/workers-types"]
5
5
  },