wrangler 0.0.0-e665ccc3 → 0.0.0-e6a3d243

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 (325) hide show
  1. package/README.md +11 -13
  2. package/bin/wrangler.js +13 -102
  3. package/config-schema.json +2947 -0
  4. package/package.json +194 -199
  5. package/templates/__tests__/tsconfig.json +1 -1
  6. package/templates/checked-fetch.js +11 -4
  7. package/templates/facade.d.ts +7 -2
  8. package/templates/gitignore +0 -5
  9. package/templates/init-tests/test-vitest-new-worker.js +1 -1
  10. package/templates/init-tests/test-vitest-new-worker.ts +1 -1
  11. package/templates/middleware/common.ts +9 -4
  12. package/templates/middleware/loader-modules.ts +94 -44
  13. package/templates/middleware/loader-sw.ts +6 -10
  14. package/templates/middleware/middleware-ensure-req-body-drained.ts +18 -0
  15. package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
  16. package/templates/middleware/middleware-serve-static-assets.ts +56 -0
  17. package/templates/modules-watch-stub.js +4 -0
  18. package/templates/new-worker-scheduled.ts +1 -1
  19. package/templates/new-worker.ts +1 -1
  20. package/templates/pages-dev-pipeline.ts +2 -1
  21. package/templates/pages-dev-util.ts +4 -1
  22. package/templates/pages-shim.ts +0 -3
  23. package/templates/pages-template-plugin.ts +14 -4
  24. package/templates/pages-template-worker.ts +12 -3
  25. package/templates/startDevWorker/InspectorProxyWorker.ts +664 -0
  26. package/templates/startDevWorker/ProxyWorker.ts +334 -0
  27. package/templates/tsconfig.json +1 -1
  28. package/wrangler-dist/InspectorProxyWorker.js +464 -0
  29. package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
  30. package/wrangler-dist/ProxyWorker.js +240 -0
  31. package/wrangler-dist/ProxyWorker.js.map +6 -0
  32. package/wrangler-dist/cli.d.ts +23780 -1073
  33. package/wrangler-dist/cli.js +152238 -96945
  34. package/wrangler-dist/wasm-sync.wasm +0 -0
  35. package/Cloudflare_CA.pem +0 -18
  36. package/import_meta_url.js +0 -3
  37. package/miniflare-config-stubs/.env.empty +0 -0
  38. package/miniflare-config-stubs/package.empty.json +0 -1
  39. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  40. package/miniflare-dist/index.mjs +0 -6446
  41. package/src/__tests__/access.test.ts +0 -25
  42. package/src/__tests__/api-dev.test.ts +0 -238
  43. package/src/__tests__/api-devregistry.test.ts +0 -121
  44. package/src/__tests__/api.test.ts +0 -102
  45. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  46. package/src/__tests__/config-cache.test.ts +0 -42
  47. package/src/__tests__/configuration.test.ts +0 -4517
  48. package/src/__tests__/constellation.test.ts +0 -371
  49. package/src/__tests__/d1/d1.test.ts +0 -82
  50. package/src/__tests__/d1/execute.test.ts +0 -66
  51. package/src/__tests__/d1/migrate.test.ts +0 -257
  52. package/src/__tests__/d1/splitter.test.ts +0 -255
  53. package/src/__tests__/delete.test.ts +0 -272
  54. package/src/__tests__/deployments.test.ts +0 -369
  55. package/src/__tests__/dev.test.tsx +0 -1617
  56. package/src/__tests__/generate.test.ts +0 -237
  57. package/src/__tests__/get-host-from-url.test.ts +0 -16
  58. package/src/__tests__/guess-worker-format.test.ts +0 -120
  59. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  60. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  61. package/src/__tests__/helpers/end-event-loop.ts +0 -6
  62. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  63. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  64. package/src/__tests__/helpers/mock-bin.ts +0 -36
  65. package/src/__tests__/helpers/mock-console.ts +0 -112
  66. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  67. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  68. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  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 -12
  72. package/src/__tests__/helpers/mock-kv.ts +0 -46
  73. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  74. package/src/__tests__/helpers/mock-process.ts +0 -34
  75. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  76. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  77. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  78. package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
  79. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  80. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -160
  81. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  82. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  83. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  84. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  85. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  86. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  87. package/src/__tests__/helpers/msw/index.ts +0 -52
  88. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  89. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  90. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  91. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  92. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  93. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  94. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  95. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -11
  96. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  97. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  98. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  99. package/src/__tests__/https-options.test.ts +0 -163
  100. package/src/__tests__/index.test.ts +0 -282
  101. package/src/__tests__/init.test.ts +0 -3196
  102. package/src/__tests__/jest.setup.ts +0 -179
  103. package/src/__tests__/kv.test.ts +0 -1799
  104. package/src/__tests__/logger.test.ts +0 -207
  105. package/src/__tests__/logout.test.ts +0 -47
  106. package/src/__tests__/metrics.test.ts +0 -493
  107. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  108. package/src/__tests__/middleware.test.ts +0 -816
  109. package/src/__tests__/mtls-certificates.test.ts +0 -589
  110. package/src/__tests__/package-manager.test.ts +0 -353
  111. package/src/__tests__/pages/deployment-list.test.ts +0 -80
  112. package/src/__tests__/pages/functions-build.test.ts +0 -528
  113. package/src/__tests__/pages/pages.test.ts +0 -81
  114. package/src/__tests__/pages/project-create.test.ts +0 -63
  115. package/src/__tests__/pages/project-list.test.ts +0 -110
  116. package/src/__tests__/pages/project-upload.test.ts +0 -500
  117. package/src/__tests__/pages/publish.test.ts +0 -2864
  118. package/src/__tests__/pages-deployment-tail.test.ts +0 -957
  119. package/src/__tests__/parse.test.ts +0 -436
  120. package/src/__tests__/paths.test.ts +0 -39
  121. package/src/__tests__/publish.test.ts +0 -8849
  122. package/src/__tests__/pubsub.test.ts +0 -496
  123. package/src/__tests__/queues.test.ts +0 -532
  124. package/src/__tests__/r2.test.ts +0 -374
  125. package/src/__tests__/route.test.ts +0 -45
  126. package/src/__tests__/secret.test.ts +0 -693
  127. package/src/__tests__/tail.test.ts +0 -989
  128. package/src/__tests__/test-old-node-version.js +0 -31
  129. package/src/__tests__/traverse-module-graph.test.ts +0 -220
  130. package/src/__tests__/tsconfig-sanity.ts +0 -12
  131. package/src/__tests__/tsconfig.json +0 -8
  132. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  133. package/src/__tests__/type-generation.test.ts +0 -234
  134. package/src/__tests__/user.test.ts +0 -118
  135. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  136. package/src/__tests__/validate-dev-props.test.ts +0 -56
  137. package/src/__tests__/version.test.ts +0 -35
  138. package/src/__tests__/whoami.test.tsx +0 -172
  139. package/src/__tests__/worker-namespace.test.ts +0 -340
  140. package/src/abort.d.ts +0 -3
  141. package/src/api/dev.ts +0 -321
  142. package/src/api/index.ts +0 -11
  143. package/src/api/mtls-certificate.ts +0 -148
  144. package/src/api/pages/create-worker-bundle-contents.ts +0 -77
  145. package/src/api/pages/index.ts +0 -5
  146. package/src/api/pages/publish.tsx +0 -371
  147. package/src/bundle-reporter.ts +0 -68
  148. package/src/bundle.ts +0 -929
  149. package/src/cfetch/index.ts +0 -158
  150. package/src/cfetch/internal.ts +0 -258
  151. package/src/cli.ts +0 -28
  152. package/src/config/README.md +0 -107
  153. package/src/config/config.ts +0 -282
  154. package/src/config/diagnostics.ts +0 -80
  155. package/src/config/environment.ts +0 -625
  156. package/src/config/index.ts +0 -403
  157. package/src/config/validation-helpers.ts +0 -597
  158. package/src/config/validation.ts +0 -2369
  159. package/src/config-cache.ts +0 -85
  160. package/src/constellation/createProject.tsx +0 -51
  161. package/src/constellation/deleteProject.ts +0 -51
  162. package/src/constellation/deleteProjectModel.ts +0 -68
  163. package/src/constellation/index.ts +0 -75
  164. package/src/constellation/listCatalog.tsx +0 -35
  165. package/src/constellation/listModel.tsx +0 -41
  166. package/src/constellation/listProject.tsx +0 -28
  167. package/src/constellation/listRuntime.tsx +0 -28
  168. package/src/constellation/options.ts +0 -17
  169. package/src/constellation/types.ts +0 -17
  170. package/src/constellation/uploadModel.tsx +0 -64
  171. package/src/constellation/utils.ts +0 -90
  172. package/src/create-worker-preview.ts +0 -293
  173. package/src/create-worker-upload-form.ts +0 -363
  174. package/src/d1/backups.tsx +0 -219
  175. package/src/d1/constants.ts +0 -2
  176. package/src/d1/create.tsx +0 -70
  177. package/src/d1/delete.ts +0 -53
  178. package/src/d1/execute.tsx +0 -357
  179. package/src/d1/formatTimeAgo.ts +0 -14
  180. package/src/d1/index.ts +0 -100
  181. package/src/d1/list.tsx +0 -62
  182. package/src/d1/migrations/apply.tsx +0 -212
  183. package/src/d1/migrations/create.tsx +0 -79
  184. package/src/d1/migrations/helpers.ts +0 -169
  185. package/src/d1/migrations/index.ts +0 -3
  186. package/src/d1/migrations/list.tsx +0 -95
  187. package/src/d1/migrations/options.ts +0 -23
  188. package/src/d1/options.ts +0 -22
  189. package/src/d1/splitter.ts +0 -161
  190. package/src/d1/types.ts +0 -25
  191. package/src/d1/utils.ts +0 -49
  192. package/src/delete.ts +0 -100
  193. package/src/deployments.ts +0 -368
  194. package/src/deprecated/index.ts +0 -144
  195. package/src/dev/dev-vars.ts +0 -39
  196. package/src/dev/dev.tsx +0 -605
  197. package/src/dev/get-local-persistence-path.ts +0 -31
  198. package/src/dev/local.tsx +0 -952
  199. package/src/dev/remote.tsx +0 -635
  200. package/src/dev/start-server.ts +0 -545
  201. package/src/dev/use-esbuild.ts +0 -215
  202. package/src/dev/validate-dev-props.ts +0 -40
  203. package/src/dev-registry.ts +0 -202
  204. package/src/dev.tsx +0 -934
  205. package/src/dialogs.ts +0 -136
  206. package/src/dispatch-namespace.ts +0 -211
  207. package/src/docs/helpers.ts +0 -50
  208. package/src/docs/index.ts +0 -54
  209. package/src/durable.ts +0 -102
  210. package/src/entry.ts +0 -344
  211. package/src/environment-variables/factory.ts +0 -89
  212. package/src/environment-variables/misc-variables.ts +0 -30
  213. package/src/errors.ts +0 -11
  214. package/src/generate/index.ts +0 -298
  215. package/src/git-client.ts +0 -135
  216. package/src/global-wrangler-config-path.ts +0 -26
  217. package/src/https-options.ts +0 -127
  218. package/src/index.ts +0 -768
  219. package/src/init.ts +0 -1037
  220. package/src/inspect.ts +0 -883
  221. package/src/intl-polyfill.d.ts +0 -139
  222. package/src/is-ci.ts +0 -14
  223. package/src/is-interactive.ts +0 -16
  224. package/src/jest.d.ts +0 -4
  225. package/src/kv/helpers.ts +0 -433
  226. package/src/kv/index.ts +0 -594
  227. package/src/logger.ts +0 -123
  228. package/src/metrics/index.ts +0 -5
  229. package/src/metrics/metrics-config.ts +0 -239
  230. package/src/metrics/metrics-dispatcher.ts +0 -96
  231. package/src/metrics/metrics-usage-headers.ts +0 -24
  232. package/src/metrics/send-event.ts +0 -99
  233. package/src/miniflare-cli/README.md +0 -30
  234. package/src/miniflare-cli/assets.ts +0 -255
  235. package/src/miniflare-cli/index.ts +0 -210
  236. package/src/miniflare-cli/request-context.ts +0 -40
  237. package/src/miniflare-cli/tsconfig.json +0 -9
  238. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  239. package/src/miniflare-cli/types.ts +0 -11
  240. package/src/module-collection.ts +0 -333
  241. package/src/mtls-certificate/cli.ts +0 -155
  242. package/src/open-in-browser.ts +0 -17
  243. package/src/package-manager.ts +0 -219
  244. package/src/pages/build.ts +0 -423
  245. package/src/pages/buildFunctions.ts +0 -140
  246. package/src/pages/constants.ts +0 -18
  247. package/src/pages/deployment-tails.ts +0 -281
  248. package/src/pages/deployments.tsx +0 -84
  249. package/src/pages/dev.ts +0 -734
  250. package/src/pages/errors.ts +0 -67
  251. package/src/pages/functions/buildPlugin.ts +0 -114
  252. package/src/pages/functions/buildWorker.ts +0 -350
  253. package/src/pages/functions/filepath-routing.test.ts +0 -234
  254. package/src/pages/functions/filepath-routing.ts +0 -189
  255. package/src/pages/functions/identifiers.ts +0 -78
  256. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  257. package/src/pages/functions/routes-consolidation.ts +0 -73
  258. package/src/pages/functions/routes-transformation.test.ts +0 -282
  259. package/src/pages/functions/routes-transformation.ts +0 -115
  260. package/src/pages/functions/routes-validation.test.ts +0 -403
  261. package/src/pages/functions/routes-validation.ts +0 -202
  262. package/src/pages/functions/routes.ts +0 -151
  263. package/src/pages/functions/tsconfig.json +0 -8
  264. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  265. package/src/pages/functions.ts +0 -86
  266. package/src/pages/hash.ts +0 -13
  267. package/src/pages/index.ts +0 -102
  268. package/src/pages/projects.tsx +0 -159
  269. package/src/pages/prompt-select-project.tsx +0 -31
  270. package/src/pages/publish.tsx +0 -267
  271. package/src/pages/types.ts +0 -46
  272. package/src/pages/upload.tsx +0 -469
  273. package/src/pages/utils.ts +0 -23
  274. package/src/parse.ts +0 -308
  275. package/src/paths.ts +0 -71
  276. package/src/proxy.ts +0 -694
  277. package/src/publish/index.ts +0 -274
  278. package/src/publish/publish.ts +0 -1065
  279. package/src/pubsub/index.ts +0 -286
  280. package/src/pubsub/pubsub-commands.ts +0 -623
  281. package/src/queues/cli/commands/consumer/add.ts +0 -71
  282. package/src/queues/cli/commands/consumer/index.ts +0 -19
  283. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  284. package/src/queues/cli/commands/create.ts +0 -25
  285. package/src/queues/cli/commands/delete.ts +0 -26
  286. package/src/queues/cli/commands/index.ts +0 -35
  287. package/src/queues/cli/commands/list.ts +0 -25
  288. package/src/queues/client.ts +0 -136
  289. package/src/queues/utils.ts +0 -18
  290. package/src/r2/constants.ts +0 -4
  291. package/src/r2/helpers.ts +0 -132
  292. package/src/r2/index.ts +0 -289
  293. package/src/routes.ts +0 -140
  294. package/src/secret/index.ts +0 -377
  295. package/src/selfsigned.d.ts +0 -29
  296. package/src/sites.ts +0 -484
  297. package/src/tail/createTail.ts +0 -415
  298. package/src/tail/filters.ts +0 -277
  299. package/src/tail/index.ts +0 -211
  300. package/src/tail/printing.ts +0 -132
  301. package/src/traverse-module-graph.ts +0 -54
  302. package/src/tsconfig-sanity.ts +0 -16
  303. package/src/type-generation.ts +0 -181
  304. package/src/update-check.ts +0 -19
  305. package/src/user/access.ts +0 -68
  306. package/src/user/auth-variables.ts +0 -113
  307. package/src/user/choose-account.tsx +0 -39
  308. package/src/user/generate-auth-url.ts +0 -33
  309. package/src/user/generate-random-state.ts +0 -16
  310. package/src/user/index.ts +0 -2
  311. package/src/user/user.ts +0 -1234
  312. package/src/utils/collectKeyValues.ts +0 -14
  313. package/src/utils/render.ts +0 -93
  314. package/src/whoami.ts +0 -135
  315. package/src/worker.ts +0 -279
  316. package/src/yargs-types.ts +0 -37
  317. package/src/zones.ts +0 -191
  318. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  319. package/templates/d1-beta-facade.js +0 -244
  320. package/templates/first-party-worker-module-facade.ts +0 -19
  321. package/templates/format-dev-errors.ts +0 -34
  322. package/templates/serve-static-assets.ts +0 -66
  323. package/templates/service-bindings-module-facade.js +0 -55
  324. package/templates/service-bindings-sw-facade.js +0 -42
  325. package/templates/tsconfig.tsbuildinfo +0 -1
@@ -0,0 +1,334 @@
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(
37
+ readonly state: DurableObjectState,
38
+ readonly env: Env
39
+ ) {}
40
+
41
+ proxyData?: ProxyData;
42
+ requestQueue = new Map<Request, DeferredPromise<Response>>();
43
+ requestRetryQueue = new Map<Request, DeferredPromise<Response>>();
44
+
45
+ fetch(request: Request) {
46
+ if (isRequestForLiveReloadWebsocket(request)) {
47
+ // requests for live-reload websocket
48
+
49
+ return this.handleLiveReloadWebSocket(request);
50
+ }
51
+
52
+ if (isRequestFromProxyController(request, this.env)) {
53
+ // requests from ProxyController
54
+
55
+ return this.processProxyControllerRequest(request);
56
+ }
57
+
58
+ // regular requests to be proxied
59
+ const deferred = createDeferred<Response>();
60
+
61
+ this.requestQueue.set(request, deferred);
62
+ this.processQueue();
63
+
64
+ return deferred.promise;
65
+ }
66
+
67
+ handleLiveReloadWebSocket(request: Request) {
68
+ const { 0: response, 1: liveReload } = new WebSocketPair();
69
+ const websocketProtocol =
70
+ request.headers.get("Sec-WebSocket-Protocol") ?? "";
71
+
72
+ this.state.acceptWebSocket(liveReload, ["live-reload"]);
73
+
74
+ return new Response(null, {
75
+ status: 101,
76
+ webSocket: response,
77
+ headers: { "Sec-WebSocket-Protocol": websocketProtocol },
78
+ });
79
+ }
80
+
81
+ processProxyControllerRequest(request: Request) {
82
+ const event = request.cf?.hostMetadata;
83
+ switch (event?.type) {
84
+ case "pause":
85
+ this.proxyData = undefined;
86
+ break;
87
+
88
+ case "play":
89
+ this.proxyData = event.proxyData;
90
+ this.processQueue();
91
+ this.state
92
+ .getWebSockets("live-reload")
93
+ .forEach((ws) => ws.send("reload"));
94
+
95
+ break;
96
+ }
97
+
98
+ return new Response(null, { status: 204 });
99
+ }
100
+
101
+ /**
102
+ * Process requests that are being retried first, then process newer requests.
103
+ * Requests that are being retried are, by definition, older than requests which haven't been processed yet.
104
+ * We don't need to be more accurate than this re ordering, since the requests are being fired off synchronously.
105
+ */
106
+ *getOrderedQueue() {
107
+ yield* this.requestRetryQueue;
108
+ yield* this.requestQueue;
109
+ }
110
+
111
+ processQueue() {
112
+ const { proxyData } = this; // store proxyData at the moment this function was called
113
+ if (proxyData === undefined) return;
114
+
115
+ for (const [request, deferredResponse] of this.getOrderedQueue()) {
116
+ this.requestRetryQueue.delete(request);
117
+ this.requestQueue.delete(request);
118
+
119
+ const outerUrl = new URL(request.url);
120
+ const headers = new Headers(request.headers);
121
+
122
+ // override url parts for proxying
123
+ const userWorkerUrl = new URL(request.url);
124
+ Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
125
+
126
+ // set request.url in the UserWorker
127
+ const innerUrl = new URL(request.url);
128
+ Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
129
+ headers.set("MF-Original-URL", innerUrl.href);
130
+ 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
131
+
132
+ // Preserve client `Accept-Encoding`, rather than using Worker's default
133
+ // of `Accept-Encoding: br, gzip`
134
+ const encoding = request.cf?.clientAcceptEncoding;
135
+ if (encoding !== undefined) headers.set("Accept-Encoding", encoding);
136
+
137
+ rewriteUrlRelatedHeaders(headers, outerUrl, innerUrl);
138
+
139
+ // merge proxyData headers with the request headers
140
+ for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
141
+ if (value === undefined) continue;
142
+
143
+ if (key.toLowerCase() === "cookie") {
144
+ const existing = request.headers.get("cookie") ?? "";
145
+ headers.set("cookie", `${existing};${value}`);
146
+ } else {
147
+ headers.set(key, value);
148
+ }
149
+ }
150
+
151
+ // explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly + synchronously
152
+ void fetch(userWorkerUrl, new Request(request, { headers }))
153
+ .then((res) => {
154
+ res = new Response(res.body, res);
155
+ rewriteUrlRelatedHeaders(res.headers, innerUrl, outerUrl);
156
+
157
+ if (isHtmlResponse(res)) {
158
+ res = insertLiveReloadScript(request, res, this.env, proxyData);
159
+ }
160
+
161
+ deferredResponse.resolve(res);
162
+ })
163
+ .catch((error: Error) => {
164
+ // errors here are network errors or from response post-processing
165
+ // to catch only network errors, use the 2nd param of the fetch.then()
166
+
167
+ // we have crossed an async boundary, so proxyData may have changed
168
+ // if proxyData.userWorkerUrl has changed, it means there is a new downstream UserWorker
169
+ // and that this error is stale since it was for a request to the old UserWorker
170
+ // so here we construct a newUserWorkerUrl so we can compare it to the (old) userWorkerUrl
171
+ const newUserWorkerUrl =
172
+ this.proxyData && urlFromParts(this.proxyData.userWorkerUrl);
173
+
174
+ // only report errors if the downstream proxy has NOT changed
175
+ if (userWorkerUrl.href === newUserWorkerUrl?.href) {
176
+ void sendMessageToProxyController(this.env, {
177
+ type: "error",
178
+ error: {
179
+ name: error.name,
180
+ message: error.message,
181
+ stack: error.stack,
182
+ cause: error.cause,
183
+ },
184
+ });
185
+
186
+ deferredResponse.reject(error);
187
+ }
188
+
189
+ // if the request can be retried (subset of idempotent requests which have no body), requeue it
190
+ else if (request.method === "GET" || request.method === "HEAD") {
191
+ this.requestRetryQueue.set(request, deferredResponse);
192
+ // we would only end up here if the downstream UserWorker is chang*ing*
193
+ // i.e. we are in a `pause`d state and expecting a `play` message soon
194
+ // this request will be processed (retried) when the `play` message arrives
195
+ // for that reason, we do not need to call `this.processQueue` here
196
+ // (but, also, it can't hurt to call it since it bails when
197
+ // in a `pause`d state i.e. `this.proxyData` is undefined)
198
+ }
199
+
200
+ // if the request cannot be retried, respond with 503 Service Unavailable
201
+ // important to note, this is not an (unexpected) error -- it is an acceptable flow of local development
202
+ // it would be incorrect to retry non-idempotent requests
203
+ // and would require cloning all body streams to avoid stream reuse (which is inefficient but not out of the question in the future)
204
+ // this is a good enough UX for now since it solves the most common GET use-case
205
+ else {
206
+ deferredResponse.resolve(
207
+ new Response(
208
+ "Your worker restarted mid-request. Please try sending the request again. Only GET or HEAD requests are retried automatically.",
209
+ {
210
+ status: 503,
211
+ headers: { "Retry-After": "0" },
212
+ }
213
+ )
214
+ );
215
+ }
216
+ });
217
+ }
218
+ }
219
+ }
220
+
221
+ function isRequestFromProxyController(req: Request, env: Env): boolean {
222
+ return req.headers.get("Authorization") === env.PROXY_CONTROLLER_AUTH_SECRET;
223
+ }
224
+ function isHtmlResponse(res: Response): boolean {
225
+ return res.headers.get("content-type")?.startsWith("text/html") ?? false;
226
+ }
227
+ function isRequestForLiveReloadWebsocket(req: Request): boolean {
228
+ const websocketProtocol = req.headers.get("Sec-WebSocket-Protocol");
229
+ const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
230
+
231
+ return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
232
+ }
233
+
234
+ function sendMessageToProxyController(
235
+ env: Env,
236
+ message: ProxyWorkerOutgoingRequestBody
237
+ ) {
238
+ return env.PROXY_CONTROLLER.fetch("http://dummy", {
239
+ method: "POST",
240
+ body: JSON.stringify(message),
241
+ });
242
+ }
243
+
244
+ function insertLiveReloadScript(
245
+ request: Request,
246
+ response: Response,
247
+ env: Env,
248
+ proxyData: ProxyData
249
+ ) {
250
+ const htmlRewriter = new HTMLRewriter();
251
+
252
+ // if preview-token-expired response, errorDetails will contain "Invalid Workers Preview configuration"
253
+ let errorDetails = "";
254
+ htmlRewriter.on("#cf-error-details", {
255
+ text(element) {
256
+ errorDetails += element.text;
257
+ },
258
+ });
259
+
260
+ htmlRewriter.onDocument({
261
+ end(end) {
262
+ if (
263
+ response.status === 400 &&
264
+ errorDetails.includes("Invalid Workers Preview configuration")
265
+ ) {
266
+ void sendMessageToProxyController(env, {
267
+ type: "previewTokenExpired",
268
+ proxyData,
269
+ });
270
+ }
271
+
272
+ // if liveReload enabled, append a script tag
273
+ // TODO: compare to existing nodejs implementation
274
+ if (proxyData.liveReload) {
275
+ const websocketUrl = new URL(request.url);
276
+ websocketUrl.protocol =
277
+ websocketUrl.protocol === "http:" ? "ws:" : "wss:";
278
+
279
+ end.append(
280
+ `
281
+ <script>
282
+ (function() {
283
+ var ws;
284
+ function recover() {
285
+ ws = null;
286
+ setTimeout(initLiveReload, 100);
287
+ }
288
+ function initLiveReload() {
289
+ if (ws) return;
290
+ var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
291
+ ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
292
+ ws.onclose = recover;
293
+ ws.onerror = recover;
294
+ ws.onmessage = location.reload.bind(location);
295
+ }
296
+ })();
297
+ </script>
298
+ `,
299
+ { html: true }
300
+ );
301
+ }
302
+ },
303
+ });
304
+
305
+ return htmlRewriter.transform(response);
306
+ }
307
+
308
+ /**
309
+ * Rewrite references to URLs in request/response headers.
310
+ *
311
+ * This function is used to map the URLs in headers like Origin and Access-Control-Allow-Origin
312
+ * so that this proxy is transparent to the Client Browser and User Worker.
313
+ */
314
+ function rewriteUrlRelatedHeaders(headers: Headers, from: URL, to: URL) {
315
+ const setCookie = headers.getAll("Set-Cookie");
316
+ headers.delete("Set-Cookie");
317
+ headers.forEach((value, key) => {
318
+ if (typeof value === "string" && value.includes(from.host)) {
319
+ headers.set(
320
+ key,
321
+ value.replaceAll(from.origin, to.origin).replaceAll(from.host, to.host)
322
+ );
323
+ }
324
+ });
325
+ for (const cookie of setCookie) {
326
+ headers.append(
327
+ "Set-Cookie",
328
+ cookie.replace(
329
+ new RegExp(`Domain=${from.hostname}($|;|,)`),
330
+ `Domain=${to.hostname}$1`
331
+ )
332
+ );
333
+ }
334
+ }
@@ -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
  },