wrangler 0.0.0-e87ad068 → 0.0.0-e8a2a1d9
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.
- package/README.md +10 -12
- package/bin/wrangler.js +13 -74
- package/package.json +213 -199
- package/templates/__tests__/tsconfig.json +1 -1
- package/templates/checked-fetch.js +10 -3
- package/templates/facade.d.ts +4 -1
- package/templates/middleware/common.ts +9 -4
- package/templates/middleware/loader-modules.ts +64 -11
- package/templates/middleware/loader-sw.ts +2 -7
- package/templates/middleware/middleware-d1-beta.d.ts +3 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +1 -0
- package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
- package/templates/middleware/middleware-multiworker-dev.ts +68 -0
- package/templates/middleware/middleware-serve-static-assets.d.ts +6 -0
- package/templates/middleware/middleware-serve-static-assets.ts +56 -0
- package/templates/modules-watch-stub.js +4 -0
- package/templates/new-worker-scheduled.ts +1 -1
- package/templates/new-worker.ts +1 -1
- package/templates/pages-shim.ts +0 -3
- package/templates/pages-template-plugin.ts +12 -2
- package/templates/pages-template-worker.ts +11 -2
- package/templates/startDevWorker/InspectorProxyWorker.ts +652 -0
- package/templates/startDevWorker/ProxyWorker.ts +252 -0
- package/templates/tsconfig.json +1 -1
- package/wrangler-dist/InspectorProxyWorker.js +460 -0
- package/wrangler-dist/InspectorProxyWorker.js.map +6 -0
- package/wrangler-dist/ProxyWorker.js +186 -0
- package/wrangler-dist/ProxyWorker.js.map +6 -0
- package/wrangler-dist/cli.d.ts +21989 -199
- package/wrangler-dist/cli.js +110619 -103132
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/import_meta_url.js +0 -3
- package/miniflare-config-stubs/.env.empty +0 -0
- package/miniflare-config-stubs/package.empty.json +0 -1
- package/miniflare-config-stubs/wrangler.empty.toml +0 -0
- package/miniflare-dist/index.mjs +0 -6442
- package/src/__tests__/access.test.ts +0 -25
- package/src/__tests__/api-dev.test.ts +0 -238
- package/src/__tests__/api-devregistry.test.ts +0 -121
- package/src/__tests__/api.test.ts +0 -102
- package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
- package/src/__tests__/config-cache.test.ts +0 -42
- package/src/__tests__/configuration.test.ts +0 -4727
- package/src/__tests__/constellation.test.ts +0 -371
- package/src/__tests__/d1/d1.test.ts +0 -82
- package/src/__tests__/d1/execute.test.ts +0 -66
- package/src/__tests__/d1/migrate.test.ts +0 -257
- package/src/__tests__/d1/splitter.test.ts +0 -255
- package/src/__tests__/delete.test.ts +0 -272
- package/src/__tests__/deployments.test.ts +0 -369
- package/src/__tests__/dev.test.tsx +0 -1617
- package/src/__tests__/generate.test.ts +0 -237
- package/src/__tests__/get-host-from-url.test.ts +0 -16
- package/src/__tests__/guess-worker-format.test.ts +0 -120
- package/src/__tests__/helpers/clipboardy-mock.js +0 -4
- package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
- package/src/__tests__/helpers/end-event-loop.ts +0 -6
- package/src/__tests__/helpers/mock-account-id.ts +0 -48
- package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
- package/src/__tests__/helpers/mock-bin.ts +0 -36
- package/src/__tests__/helpers/mock-console.ts +0 -112
- package/src/__tests__/helpers/mock-dialogs.ts +0 -139
- package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
- package/src/__tests__/helpers/mock-http-server.ts +0 -46
- package/src/__tests__/helpers/mock-istty.ts +0 -74
- package/src/__tests__/helpers/mock-known-routes.ts +0 -12
- package/src/__tests__/helpers/mock-kv.ts +0 -46
- package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
- package/src/__tests__/helpers/mock-process.ts +0 -34
- package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
- package/src/__tests__/helpers/mock-stdin.ts +0 -108
- package/src/__tests__/helpers/mock-web-socket.ts +0 -29
- package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
- package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
- package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -160
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
- package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
- package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
- package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
- package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
- package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
- package/src/__tests__/helpers/msw/index.ts +0 -52
- package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
- package/src/__tests__/helpers/run-in-tmp.ts +0 -38
- package/src/__tests__/helpers/run-wrangler.ts +0 -16
- package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
- package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
- package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
- package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -11
- package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
- package/src/__tests__/helpers/write-worker-source.ts +0 -31
- package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
- package/src/__tests__/https-options.test.ts +0 -163
- package/src/__tests__/index.test.ts +0 -282
- package/src/__tests__/init.test.ts +0 -3302
- package/src/__tests__/jest.setup.ts +0 -179
- package/src/__tests__/kv.test.ts +0 -1799
- package/src/__tests__/logger.test.ts +0 -207
- package/src/__tests__/logout.test.ts +0 -47
- package/src/__tests__/metrics.test.ts +0 -493
- package/src/__tests__/middleware.scheduled.test.ts +0 -145
- package/src/__tests__/middleware.test.ts +0 -816
- package/src/__tests__/mtls-certificates.test.ts +0 -589
- package/src/__tests__/package-manager.test.ts +0 -353
- package/src/__tests__/pages/deployment-list.test.ts +0 -80
- package/src/__tests__/pages/functions-build.test.ts +0 -529
- package/src/__tests__/pages/pages.test.ts +0 -81
- package/src/__tests__/pages/project-create.test.ts +0 -63
- package/src/__tests__/pages/project-list.test.ts +0 -110
- package/src/__tests__/pages/project-upload.test.ts +0 -500
- package/src/__tests__/pages/publish.test.ts +0 -2864
- package/src/__tests__/pages-deployment-tail.test.ts +0 -957
- package/src/__tests__/parse.test.ts +0 -436
- package/src/__tests__/paths.test.ts +0 -39
- package/src/__tests__/publish.test.ts +0 -8882
- package/src/__tests__/pubsub.test.ts +0 -496
- package/src/__tests__/queues.test.ts +0 -532
- package/src/__tests__/r2.test.ts +0 -374
- package/src/__tests__/route.test.ts +0 -45
- package/src/__tests__/secret.test.ts +0 -693
- package/src/__tests__/tail.test.ts +0 -1000
- package/src/__tests__/test-old-node-version.js +0 -31
- package/src/__tests__/traverse-module-graph.test.ts +0 -220
- package/src/__tests__/tsconfig-sanity.ts +0 -12
- package/src/__tests__/tsconfig.json +0 -8
- package/src/__tests__/tsconfig.tsbuildinfo +0 -1
- package/src/__tests__/type-generation.test.ts +0 -234
- package/src/__tests__/unstableDev.test.ts +0 -61
- package/src/__tests__/user.test.ts +0 -118
- package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
- package/src/__tests__/validate-dev-props.test.ts +0 -56
- package/src/__tests__/version.test.ts +0 -35
- package/src/__tests__/whoami.test.tsx +0 -172
- package/src/__tests__/worker-namespace.test.ts +0 -340
- package/src/abort.d.ts +0 -3
- package/src/api/dev.ts +0 -328
- package/src/api/index.ts +0 -11
- package/src/api/mtls-certificate.ts +0 -148
- package/src/api/pages/create-worker-bundle-contents.ts +0 -80
- package/src/api/pages/index.ts +0 -5
- package/src/api/pages/publish.tsx +0 -371
- package/src/bundle-reporter.ts +0 -68
- package/src/bundle.ts +0 -952
- package/src/cfetch/index.ts +0 -158
- package/src/cfetch/internal.ts +0 -263
- package/src/cli.ts +0 -28
- package/src/config/README.md +0 -107
- package/src/config/config.ts +0 -282
- package/src/config/diagnostics.ts +0 -80
- package/src/config/environment.ts +0 -659
- package/src/config/index.ts +0 -424
- package/src/config/validation-helpers.ts +0 -597
- package/src/config/validation.ts +0 -2524
- package/src/config-cache.ts +0 -85
- package/src/constellation/createProject.tsx +0 -51
- package/src/constellation/deleteProject.ts +0 -51
- package/src/constellation/deleteProjectModel.ts +0 -76
- package/src/constellation/index.ts +0 -75
- package/src/constellation/listCatalog.tsx +0 -35
- package/src/constellation/listModel.tsx +0 -49
- package/src/constellation/listProject.tsx +0 -28
- package/src/constellation/listRuntime.tsx +0 -28
- package/src/constellation/options.ts +0 -17
- package/src/constellation/types.ts +0 -17
- package/src/constellation/uploadModel.tsx +0 -84
- package/src/constellation/utils.ts +0 -90
- package/src/create-worker-preview.ts +0 -293
- package/src/create-worker-upload-form.ts +0 -384
- package/src/d1/backups.tsx +0 -219
- package/src/d1/constants.ts +0 -5
- package/src/d1/create.tsx +0 -102
- package/src/d1/delete.ts +0 -53
- package/src/d1/execute.tsx +0 -371
- package/src/d1/formatTimeAgo.ts +0 -14
- package/src/d1/index.ts +0 -100
- package/src/d1/list.tsx +0 -62
- package/src/d1/migrations/apply.tsx +0 -235
- package/src/d1/migrations/create.tsx +0 -79
- package/src/d1/migrations/helpers.ts +0 -171
- package/src/d1/migrations/index.ts +0 -3
- package/src/d1/migrations/list.tsx +0 -95
- package/src/d1/migrations/options.ts +0 -23
- package/src/d1/options.ts +0 -22
- package/src/d1/splitter.ts +0 -161
- package/src/d1/types.ts +0 -32
- package/src/d1/utils.ts +0 -49
- package/src/delete.ts +0 -100
- package/src/deployments.ts +0 -368
- package/src/deprecated/index.ts +0 -144
- package/src/dev/dev-vars.ts +0 -39
- package/src/dev/dev.tsx +0 -607
- package/src/dev/get-local-persistence-path.ts +0 -31
- package/src/dev/local.tsx +0 -952
- package/src/dev/remote.tsx +0 -636
- package/src/dev/start-server.ts +0 -558
- package/src/dev/use-esbuild.ts +0 -230
- package/src/dev/validate-dev-props.ts +0 -40
- package/src/dev-registry.ts +0 -213
- package/src/dev.tsx +0 -946
- package/src/dialogs.ts +0 -136
- package/src/dispatch-namespace.ts +0 -211
- package/src/docs/helpers.ts +0 -50
- package/src/docs/index.ts +0 -54
- package/src/durable.ts +0 -102
- package/src/entry.ts +0 -344
- package/src/environment-variables/factory.ts +0 -89
- package/src/environment-variables/misc-variables.ts +0 -30
- package/src/errors.ts +0 -11
- package/src/generate/index.ts +0 -303
- package/src/git-client.ts +0 -135
- package/src/global-wrangler-config-path.ts +0 -26
- package/src/https-options.ts +0 -127
- package/src/index.ts +0 -769
- package/src/init.ts +0 -1074
- package/src/inspect.ts +0 -883
- package/src/intl-polyfill.d.ts +0 -139
- package/src/is-ci.ts +0 -14
- package/src/is-interactive.ts +0 -16
- package/src/jest.d.ts +0 -4
- package/src/kv/helpers.ts +0 -433
- package/src/kv/index.ts +0 -594
- package/src/logger.ts +0 -123
- package/src/metrics/index.ts +0 -5
- package/src/metrics/metrics-config.ts +0 -239
- package/src/metrics/metrics-dispatcher.ts +0 -96
- package/src/metrics/metrics-usage-headers.ts +0 -24
- package/src/metrics/send-event.ts +0 -99
- package/src/miniflare-cli/README.md +0 -30
- package/src/miniflare-cli/assets.ts +0 -251
- package/src/miniflare-cli/index.ts +0 -210
- package/src/miniflare-cli/request-context.ts +0 -40
- package/src/miniflare-cli/tsconfig.json +0 -9
- package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
- package/src/miniflare-cli/types.ts +0 -11
- package/src/module-collection.ts +0 -333
- package/src/mtls-certificate/cli.ts +0 -155
- package/src/open-in-browser.ts +0 -17
- package/src/package-manager.ts +0 -219
- package/src/pages/build.ts +0 -423
- package/src/pages/buildFunctions.ts +0 -140
- package/src/pages/constants.ts +0 -18
- package/src/pages/deployment-tails.ts +0 -281
- package/src/pages/deployments.tsx +0 -84
- package/src/pages/dev.ts +0 -759
- package/src/pages/errors.ts +0 -67
- package/src/pages/functions/buildPlugin.ts +0 -114
- package/src/pages/functions/buildWorker.ts +0 -381
- package/src/pages/functions/filepath-routing.test.ts +0 -234
- package/src/pages/functions/filepath-routing.ts +0 -189
- package/src/pages/functions/identifiers.ts +0 -78
- package/src/pages/functions/routes-consolidation.test.ts +0 -250
- package/src/pages/functions/routes-consolidation.ts +0 -73
- package/src/pages/functions/routes-transformation.test.ts +0 -282
- package/src/pages/functions/routes-transformation.ts +0 -115
- package/src/pages/functions/routes-validation.test.ts +0 -403
- package/src/pages/functions/routes-validation.ts +0 -202
- package/src/pages/functions/routes.ts +0 -151
- package/src/pages/functions/tsconfig.json +0 -8
- package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
- package/src/pages/functions.ts +0 -86
- package/src/pages/hash.ts +0 -13
- package/src/pages/index.ts +0 -102
- package/src/pages/projects.tsx +0 -159
- package/src/pages/prompt-select-project.tsx +0 -31
- package/src/pages/publish.tsx +0 -267
- package/src/pages/types.ts +0 -46
- package/src/pages/upload.tsx +0 -469
- package/src/pages/utils.ts +0 -23
- package/src/parse.ts +0 -308
- package/src/paths.ts +0 -71
- package/src/proxy.ts +0 -694
- package/src/publish/index.ts +0 -274
- package/src/publish/publish.ts +0 -1068
- package/src/pubsub/index.ts +0 -286
- package/src/pubsub/pubsub-commands.ts +0 -623
- package/src/queues/cli/commands/consumer/add.ts +0 -71
- package/src/queues/cli/commands/consumer/index.ts +0 -19
- package/src/queues/cli/commands/consumer/remove.ts +0 -31
- package/src/queues/cli/commands/create.ts +0 -25
- package/src/queues/cli/commands/delete.ts +0 -26
- package/src/queues/cli/commands/index.ts +0 -35
- package/src/queues/cli/commands/list.ts +0 -25
- package/src/queues/client.ts +0 -136
- package/src/queues/utils.ts +0 -18
- package/src/r2/constants.ts +0 -4
- package/src/r2/helpers.ts +0 -132
- package/src/r2/index.ts +0 -289
- package/src/routes.ts +0 -140
- package/src/secret/index.ts +0 -380
- package/src/selfsigned.d.ts +0 -29
- package/src/sites.ts +0 -484
- package/src/tail/createTail.ts +0 -415
- package/src/tail/filters.ts +0 -277
- package/src/tail/index.ts +0 -211
- package/src/tail/printing.ts +0 -134
- package/src/traverse-module-graph.ts +0 -54
- package/src/tsconfig-sanity.ts +0 -16
- package/src/type-generation.ts +0 -187
- package/src/update-check.ts +0 -19
- package/src/user/access.ts +0 -68
- package/src/user/auth-variables.ts +0 -113
- package/src/user/choose-account.tsx +0 -39
- package/src/user/generate-auth-url.ts +0 -33
- package/src/user/generate-random-state.ts +0 -16
- package/src/user/index.ts +0 -2
- package/src/user/user.ts +0 -1234
- package/src/utils/collectKeyValues.ts +0 -14
- package/src/utils/render.ts +0 -93
- package/src/whoami.ts +0 -135
- package/src/worker.ts +0 -300
- package/src/yargs-types.ts +0 -37
- package/src/zones.ts +0 -191
- package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
- package/templates/d1-beta-facade.js +0 -244
- package/templates/first-party-worker-module-facade.ts +0 -19
- package/templates/format-dev-errors.ts +0 -34
- package/templates/serve-static-assets.ts +0 -66
- package/templates/service-bindings-module-facade.js +0 -55
- package/templates/service-bindings-sw-facade.js +0 -42
- package/templates/tsconfig.tsbuildinfo +0 -1
|
@@ -0,0 +1,252 @@
|
|
|
1
|
+
import assert from "node:assert";
|
|
2
|
+
import type {
|
|
3
|
+
ProxyWorkerIncomingRequestBody,
|
|
4
|
+
ProxyWorkerOutgoingRequestBody,
|
|
5
|
+
ProxyData,
|
|
6
|
+
} from "../../src/api/startDevWorker/events";
|
|
7
|
+
import {
|
|
8
|
+
DeferredPromise,
|
|
9
|
+
createDeferred,
|
|
10
|
+
} from "../../src/api/startDevWorker/utils";
|
|
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
|
+
|
|
41
|
+
fetch(request: Request) {
|
|
42
|
+
if (isRequestForLiveReloadWebsocket(request)) {
|
|
43
|
+
// requests for live-reload websocket
|
|
44
|
+
|
|
45
|
+
return this.handleLiveReloadWebSocket(request);
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
if (isRequestFromProxyController(request, this.env)) {
|
|
49
|
+
// requests from ProxyController
|
|
50
|
+
|
|
51
|
+
return this.processProxyControllerRequest(request);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
// regular requests to be proxied
|
|
55
|
+
const deferred = createDeferred<Response>();
|
|
56
|
+
|
|
57
|
+
this.requestQueue.set(request, deferred);
|
|
58
|
+
this.processQueue();
|
|
59
|
+
|
|
60
|
+
return deferred.promise;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
handleLiveReloadWebSocket(request: Request) {
|
|
64
|
+
const { 0: response, 1: liveReload } = new WebSocketPair();
|
|
65
|
+
const websocketProtocol =
|
|
66
|
+
request.headers.get("Sec-WebSocket-Protocol") ?? "";
|
|
67
|
+
|
|
68
|
+
this.state.acceptWebSocket(liveReload, ["live-reload"]);
|
|
69
|
+
|
|
70
|
+
return new Response(null, {
|
|
71
|
+
status: 101,
|
|
72
|
+
webSocket: response,
|
|
73
|
+
headers: { "Sec-WebSocket-Protocol": websocketProtocol },
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
processProxyControllerRequest(request: Request) {
|
|
78
|
+
const event = request.cf?.hostMetadata;
|
|
79
|
+
switch (event?.type) {
|
|
80
|
+
case "pause":
|
|
81
|
+
this.proxyData = undefined;
|
|
82
|
+
break;
|
|
83
|
+
|
|
84
|
+
case "play":
|
|
85
|
+
this.proxyData = event.proxyData;
|
|
86
|
+
this.processQueue();
|
|
87
|
+
this.state
|
|
88
|
+
.getWebSockets("live-reload")
|
|
89
|
+
.forEach((ws) => ws.send("reload"));
|
|
90
|
+
|
|
91
|
+
break;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
return new Response(null, { status: 204 });
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
processQueue() {
|
|
98
|
+
const { proxyData } = this; // destructuring is required to keep the type-narrowing (not undefined) in the .then callback and to ensure the same proxyData is used throughout each request
|
|
99
|
+
if (proxyData === undefined) return;
|
|
100
|
+
|
|
101
|
+
for (const [request, deferredResponse] of this.requestQueue) {
|
|
102
|
+
this.requestQueue.delete(request);
|
|
103
|
+
|
|
104
|
+
const userWorkerUrl = new URL(request.url);
|
|
105
|
+
const headers = new Headers(request.headers);
|
|
106
|
+
|
|
107
|
+
// override url parts for proxying
|
|
108
|
+
Object.assign(userWorkerUrl, proxyData.userWorkerUrl);
|
|
109
|
+
|
|
110
|
+
// set request.url in the UserWorker
|
|
111
|
+
const innerUrl = new URL(request.url);
|
|
112
|
+
Object.assign(innerUrl, proxyData.userWorkerInnerUrlOverrides);
|
|
113
|
+
headers.set("MF-Original-URL", innerUrl.href);
|
|
114
|
+
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
|
|
115
|
+
|
|
116
|
+
// merge proxyData headers with the request headers
|
|
117
|
+
for (const [key, value] of Object.entries(proxyData.headers ?? {})) {
|
|
118
|
+
if (key.toLowerCase() === "cookie") {
|
|
119
|
+
const existing = request.headers.get("cookie") ?? "";
|
|
120
|
+
headers.set("cookie", `${existing};${value}`);
|
|
121
|
+
} else {
|
|
122
|
+
headers.set(key, value);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
// explicitly NOT await-ing this promise, we are in a loop and want to process the whole queue quickly
|
|
127
|
+
// if we decide to await, we should include a timeout (~100ms) in case the user worker has long-running/parellel requests
|
|
128
|
+
void fetch(userWorkerUrl, new Request(request, { headers }))
|
|
129
|
+
.then((res) => {
|
|
130
|
+
if (isHtmlResponse(res)) {
|
|
131
|
+
res = insertLiveReloadScript(request, res, this.env, proxyData);
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
deferredResponse.resolve(res);
|
|
135
|
+
})
|
|
136
|
+
.catch((error: Error) => {
|
|
137
|
+
// errors here are network errors or from response post-processing
|
|
138
|
+
// to catch only network errors, use the 2nd param of the fetch.then()
|
|
139
|
+
|
|
140
|
+
void sendMessageToProxyController(this.env, {
|
|
141
|
+
type: "error",
|
|
142
|
+
error: {
|
|
143
|
+
name: error.name,
|
|
144
|
+
message: error.message,
|
|
145
|
+
stack: error.stack,
|
|
146
|
+
cause: error.cause,
|
|
147
|
+
},
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
deferredResponse.reject(error);
|
|
151
|
+
});
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
function isRequestFromProxyController(req: Request, env: Env): boolean {
|
|
157
|
+
return req.headers.get("Authorization") === env.PROXY_CONTROLLER_AUTH_SECRET;
|
|
158
|
+
}
|
|
159
|
+
function isHtmlResponse(res: Response): boolean {
|
|
160
|
+
return res.headers.get("content-type")?.startsWith("text/html") ?? false;
|
|
161
|
+
}
|
|
162
|
+
function isRequestForLiveReloadWebsocket(req: Request): boolean {
|
|
163
|
+
const websocketProtocol = req.headers.get("Sec-WebSocket-Protocol");
|
|
164
|
+
const isWebSocketUpgrade = req.headers.get("Upgrade") === "websocket";
|
|
165
|
+
|
|
166
|
+
return isWebSocketUpgrade && websocketProtocol === LIVE_RELOAD_PROTOCOL;
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
async function sendMessageToProxyController(
|
|
170
|
+
env: Env,
|
|
171
|
+
message: ProxyWorkerOutgoingRequestBody,
|
|
172
|
+
retries = 3
|
|
173
|
+
) {
|
|
174
|
+
try {
|
|
175
|
+
await env.PROXY_CONTROLLER.fetch("http://dummy", {
|
|
176
|
+
method: "POST",
|
|
177
|
+
body: JSON.stringify(message),
|
|
178
|
+
});
|
|
179
|
+
} catch (cause) {
|
|
180
|
+
if (retries > 0) {
|
|
181
|
+
return sendMessageToProxyController(env, message, retries - 1);
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
// no point sending an error message if we can't send this message
|
|
185
|
+
|
|
186
|
+
throw cause;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
|
|
190
|
+
function insertLiveReloadScript(
|
|
191
|
+
request: Request,
|
|
192
|
+
response: Response,
|
|
193
|
+
env: Env,
|
|
194
|
+
proxyData: ProxyData
|
|
195
|
+
) {
|
|
196
|
+
const htmlRewriter = new HTMLRewriter();
|
|
197
|
+
|
|
198
|
+
// if preview-token-expired response, errorDetails will contain "Invalid Workers Preview configuration"
|
|
199
|
+
let errorDetails = "";
|
|
200
|
+
htmlRewriter.on("#cf-error-details", {
|
|
201
|
+
text(element) {
|
|
202
|
+
errorDetails += element.text;
|
|
203
|
+
},
|
|
204
|
+
});
|
|
205
|
+
|
|
206
|
+
htmlRewriter.onDocument({
|
|
207
|
+
end(end) {
|
|
208
|
+
if (
|
|
209
|
+
response.status === 400 &&
|
|
210
|
+
errorDetails.includes("Invalid Workers Preview configuration")
|
|
211
|
+
) {
|
|
212
|
+
void sendMessageToProxyController(env, {
|
|
213
|
+
type: "previewTokenExpired",
|
|
214
|
+
proxyData,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
// if liveReload enabled, append a script tag
|
|
219
|
+
// TODO: compare to existing nodejs implementation
|
|
220
|
+
if (proxyData.liveReload) {
|
|
221
|
+
const websocketUrl = new URL(request.url);
|
|
222
|
+
websocketUrl.protocol =
|
|
223
|
+
websocketUrl.protocol === "http:" ? "ws:" : "wss:";
|
|
224
|
+
|
|
225
|
+
end.append(
|
|
226
|
+
`
|
|
227
|
+
<script>
|
|
228
|
+
(function() {
|
|
229
|
+
var ws;
|
|
230
|
+
function recover() {
|
|
231
|
+
ws = null;
|
|
232
|
+
setTimeout(initLiveReload, 100);
|
|
233
|
+
}
|
|
234
|
+
function initLiveReload() {
|
|
235
|
+
if (ws) return;
|
|
236
|
+
var origin = (location.protocol === "http:" ? "ws://" : "wss://") + location.host;
|
|
237
|
+
ws = new WebSocket(origin + "/cdn-cgi/live-reload", "${LIVE_RELOAD_PROTOCOL}");
|
|
238
|
+
ws.onclose = recover;
|
|
239
|
+
ws.onerror = recover;
|
|
240
|
+
ws.onmessage = location.reload.bind(location);
|
|
241
|
+
}
|
|
242
|
+
})();
|
|
243
|
+
</script>
|
|
244
|
+
`,
|
|
245
|
+
{ html: true }
|
|
246
|
+
);
|
|
247
|
+
}
|
|
248
|
+
},
|
|
249
|
+
});
|
|
250
|
+
|
|
251
|
+
return htmlRewriter.transform(response);
|
|
252
|
+
}
|
package/templates/tsconfig.json
CHANGED