wrangler 2.20.0 → 3.0.0
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 +4 -4
- package/bin/wrangler.js +9 -75
- package/package.json +5 -13
- package/templates/__tests__/tsconfig.tsbuildinfo +1 -1
- package/templates/checked-fetch.js +1 -1
- package/templates/first-party-worker-module-facade.ts +2 -2
- package/templates/middleware/common.ts +9 -4
- package/templates/middleware/loader-sw.ts +2 -7
- package/templates/new-worker-scheduled.ts +1 -1
- package/templates/new-worker.ts +1 -1
- package/templates/pages-dev-util.ts +4 -1
- package/templates/pages-shim.ts +0 -3
- package/templates/tsconfig.tsbuildinfo +1 -1
- package/wrangler-dist/cli.d.ts +149 -75
- package/wrangler-dist/cli.js +60062 -64338
- 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 -4517
- 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 -3196
- 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 -528
- 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 -8849
- 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 -989
- 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__/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 -321
- 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 -77
- 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 -929
- package/src/cfetch/index.ts +0 -158
- package/src/cfetch/internal.ts +0 -258
- 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 -625
- package/src/config/index.ts +0 -403
- package/src/config/validation-helpers.ts +0 -597
- package/src/config/validation.ts +0 -2369
- 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 -68
- package/src/constellation/index.ts +0 -75
- package/src/constellation/listCatalog.tsx +0 -35
- package/src/constellation/listModel.tsx +0 -41
- 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 -64
- package/src/constellation/utils.ts +0 -90
- package/src/create-worker-preview.ts +0 -293
- package/src/create-worker-upload-form.ts +0 -363
- package/src/d1/backups.tsx +0 -219
- package/src/d1/constants.ts +0 -2
- package/src/d1/create.tsx +0 -70
- package/src/d1/delete.ts +0 -53
- package/src/d1/execute.tsx +0 -357
- 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 -212
- package/src/d1/migrations/create.tsx +0 -79
- package/src/d1/migrations/helpers.ts +0 -169
- 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 -25
- 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 -605
- package/src/dev/get-local-persistence-path.ts +0 -31
- package/src/dev/local.tsx +0 -952
- package/src/dev/remote.tsx +0 -635
- package/src/dev/start-server.ts +0 -545
- package/src/dev/use-esbuild.ts +0 -215
- package/src/dev/validate-dev-props.ts +0 -40
- package/src/dev-registry.ts +0 -202
- package/src/dev.tsx +0 -934
- 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 -298
- 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 -768
- package/src/init.ts +0 -1037
- 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 -734
- package/src/pages/errors.ts +0 -67
- package/src/pages/functions/buildPlugin.ts +0 -114
- package/src/pages/functions/buildWorker.ts +0 -350
- 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 -1065
- 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 -377
- 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 -132
- package/src/traverse-module-graph.ts +0 -54
- package/src/tsconfig-sanity.ts +0 -16
- package/src/type-generation.ts +0 -181
- 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 -279
- package/src/yargs-types.ts +0 -37
- package/src/zones.ts +0 -191
|
@@ -1,293 +0,0 @@
|
|
|
1
|
-
import { URL } from "node:url";
|
|
2
|
-
import { fetch } from "undici";
|
|
3
|
-
import { fetchResult } from "./cfetch";
|
|
4
|
-
import { createWorkerUploadForm } from "./create-worker-upload-form";
|
|
5
|
-
import { logger } from "./logger";
|
|
6
|
-
import { parseJSON } from "./parse";
|
|
7
|
-
import { getAccessToken } from "./user/access";
|
|
8
|
-
import type { CfAccount, CfWorkerContext, CfWorkerInit } from "./worker";
|
|
9
|
-
import type { HeadersInit } from "undici";
|
|
10
|
-
|
|
11
|
-
/**
|
|
12
|
-
* A Preview Session on the edge
|
|
13
|
-
*/
|
|
14
|
-
export interface CfPreviewSession {
|
|
15
|
-
/**
|
|
16
|
-
* A randomly generated id for this session
|
|
17
|
-
*/
|
|
18
|
-
id: string;
|
|
19
|
-
/**
|
|
20
|
-
* A value to use when creating a worker preview under a session
|
|
21
|
-
*/
|
|
22
|
-
value: string;
|
|
23
|
-
/**
|
|
24
|
-
* The host where the session is available.
|
|
25
|
-
*/
|
|
26
|
-
host: string;
|
|
27
|
-
/**
|
|
28
|
-
* A websocket url to a DevTools inspector.
|
|
29
|
-
*
|
|
30
|
-
* Workers does not have a fully-featured implementation
|
|
31
|
-
* of the Chrome DevTools protocol, but supports the following:
|
|
32
|
-
* * `console.log()` output.
|
|
33
|
-
* * `Error` stack traces.
|
|
34
|
-
* * `fetch()` events.
|
|
35
|
-
*
|
|
36
|
-
* There is no support for breakpoints, but we want to implement
|
|
37
|
-
* this eventually.
|
|
38
|
-
*
|
|
39
|
-
* @link https://chromedevtools.github.io/devtools-protocol/
|
|
40
|
-
*/
|
|
41
|
-
inspectorUrl: URL;
|
|
42
|
-
/**
|
|
43
|
-
* A url to prewarm the preview session.
|
|
44
|
-
*
|
|
45
|
-
* @example
|
|
46
|
-
* fetch(prewarmUrl, { method: 'POST' })
|
|
47
|
-
*/
|
|
48
|
-
prewarmUrl: URL;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* A preview mode.
|
|
53
|
-
*
|
|
54
|
-
* * If true, then using a `workers.dev` subdomain.
|
|
55
|
-
* * Otherwise, a list of routes under a single zone.
|
|
56
|
-
*/
|
|
57
|
-
type CfPreviewMode = { workers_dev: boolean } | { routes: string[] };
|
|
58
|
-
|
|
59
|
-
/**
|
|
60
|
-
* A preview token.
|
|
61
|
-
*/
|
|
62
|
-
export interface CfPreviewToken {
|
|
63
|
-
/**
|
|
64
|
-
* The header value required to trigger a preview.
|
|
65
|
-
*
|
|
66
|
-
* @example
|
|
67
|
-
* const headers = { 'cf-workers-preview-token': value }
|
|
68
|
-
* const response = await fetch('https://' + host, { headers })
|
|
69
|
-
*/
|
|
70
|
-
value: string;
|
|
71
|
-
/**
|
|
72
|
-
* The host where the preview is available.
|
|
73
|
-
*/
|
|
74
|
-
host: string;
|
|
75
|
-
/**
|
|
76
|
-
* A websocket url to a DevTools inspector.
|
|
77
|
-
*
|
|
78
|
-
* Workers does not have a fully-featured implementation
|
|
79
|
-
* of the Chrome DevTools protocol, but supports the following:
|
|
80
|
-
* * `console.log()` output.
|
|
81
|
-
* * `Error` stack traces.
|
|
82
|
-
* * `fetch()` events.
|
|
83
|
-
*
|
|
84
|
-
* There is no support for breakpoints, but we want to implement
|
|
85
|
-
* this eventually.
|
|
86
|
-
*
|
|
87
|
-
* @link https://chromedevtools.github.io/devtools-protocol/
|
|
88
|
-
*/
|
|
89
|
-
inspectorUrl: URL;
|
|
90
|
-
/**
|
|
91
|
-
* A url to prewarm the preview session.
|
|
92
|
-
*
|
|
93
|
-
* @example
|
|
94
|
-
* fetch(prewarmUrl, { method: 'POST',
|
|
95
|
-
* headers: {
|
|
96
|
-
* "cf-workers-preview-token": (preview)token.value,
|
|
97
|
-
* }
|
|
98
|
-
* })
|
|
99
|
-
*/
|
|
100
|
-
prewarmUrl: URL;
|
|
101
|
-
}
|
|
102
|
-
|
|
103
|
-
// Credit: https://stackoverflow.com/a/2117523
|
|
104
|
-
function randomId(): string {
|
|
105
|
-
return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
|
|
106
|
-
const r = (Math.random() * 16) | 0,
|
|
107
|
-
v = c == "x" ? r : (r & 0x3) | 0x8;
|
|
108
|
-
return v.toString(16);
|
|
109
|
-
});
|
|
110
|
-
}
|
|
111
|
-
|
|
112
|
-
// URLs are often relative to the zone. Sometimes the base zone
|
|
113
|
-
// will be grey-clouded, and so the host must be swapped out for
|
|
114
|
-
// the worker route host, which is more likely to be orange-clouded
|
|
115
|
-
function switchHost(originalUrl: string, host?: string): URL {
|
|
116
|
-
const url = new URL(originalUrl);
|
|
117
|
-
url.hostname = host ?? url.hostname;
|
|
118
|
-
return url;
|
|
119
|
-
}
|
|
120
|
-
/**
|
|
121
|
-
* Generates a preview session token.
|
|
122
|
-
*/
|
|
123
|
-
export async function createPreviewSession(
|
|
124
|
-
account: CfAccount,
|
|
125
|
-
ctx: CfWorkerContext,
|
|
126
|
-
abortSignal: AbortSignal
|
|
127
|
-
): Promise<CfPreviewSession> {
|
|
128
|
-
const { accountId } = account;
|
|
129
|
-
const initUrl = ctx.zone
|
|
130
|
-
? `/zones/${ctx.zone}/workers/edge-preview`
|
|
131
|
-
: `/accounts/${accountId}/workers/subdomain/edge-preview`;
|
|
132
|
-
|
|
133
|
-
const { exchange_url } = await fetchResult<{ exchange_url: string }>(
|
|
134
|
-
initUrl,
|
|
135
|
-
undefined,
|
|
136
|
-
undefined,
|
|
137
|
-
abortSignal
|
|
138
|
-
);
|
|
139
|
-
|
|
140
|
-
const switchedExchangeUrl = switchHost(exchange_url, ctx.host).toString();
|
|
141
|
-
|
|
142
|
-
logger.debug(`-- START EXCHANGE API REQUEST: GET ${switchedExchangeUrl}`);
|
|
143
|
-
logger.debug("-- END EXCHANGE API REQUEST");
|
|
144
|
-
const exchangeResponse = await fetch(switchedExchangeUrl, {
|
|
145
|
-
signal: abortSignal,
|
|
146
|
-
});
|
|
147
|
-
const bodyText = await exchangeResponse.text();
|
|
148
|
-
logger.debug(
|
|
149
|
-
"-- START EXCHANGE API RESPONSE:",
|
|
150
|
-
exchangeResponse.statusText,
|
|
151
|
-
exchangeResponse.status
|
|
152
|
-
);
|
|
153
|
-
logger.debug("HEADERS:", JSON.stringify(exchangeResponse.headers, null, 2));
|
|
154
|
-
logger.debug("RESPONSE:", bodyText);
|
|
155
|
-
logger.debug("-- END EXCHANGE API RESPONSE");
|
|
156
|
-
|
|
157
|
-
const { inspector_websocket, prewarm, token } = parseJSON<{
|
|
158
|
-
inspector_websocket: string;
|
|
159
|
-
token: string;
|
|
160
|
-
prewarm: string;
|
|
161
|
-
}>(bodyText);
|
|
162
|
-
const inspector = new URL(inspector_websocket);
|
|
163
|
-
inspector.searchParams.append("cf_workers_preview_token", token);
|
|
164
|
-
|
|
165
|
-
return {
|
|
166
|
-
id: randomId(),
|
|
167
|
-
value: token,
|
|
168
|
-
host: ctx.host ?? inspector.host,
|
|
169
|
-
inspectorUrl: switchHost(inspector.href, ctx.host),
|
|
170
|
-
prewarmUrl: switchHost(prewarm, ctx.host),
|
|
171
|
-
};
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
/**
|
|
175
|
-
* Creates a preview token.
|
|
176
|
-
*/
|
|
177
|
-
async function createPreviewToken(
|
|
178
|
-
account: CfAccount,
|
|
179
|
-
worker: CfWorkerInit,
|
|
180
|
-
ctx: CfWorkerContext,
|
|
181
|
-
session: CfPreviewSession,
|
|
182
|
-
abortSignal: AbortSignal
|
|
183
|
-
): Promise<CfPreviewToken> {
|
|
184
|
-
const { value, host, inspectorUrl, prewarmUrl } = session;
|
|
185
|
-
const { accountId } = account;
|
|
186
|
-
const scriptId = worker.name || (ctx.zone ? session.id : host.split(".")[0]);
|
|
187
|
-
const url =
|
|
188
|
-
ctx.env && !ctx.legacyEnv
|
|
189
|
-
? `/accounts/${accountId}/workers/services/${scriptId}/environments/${ctx.env}/edge-preview`
|
|
190
|
-
: `/accounts/${accountId}/workers/scripts/${scriptId}/edge-preview`;
|
|
191
|
-
|
|
192
|
-
const mode: CfPreviewMode = ctx.zone
|
|
193
|
-
? {
|
|
194
|
-
routes: ctx.routes
|
|
195
|
-
? // extract all the route patterns
|
|
196
|
-
ctx.routes.map((route) => {
|
|
197
|
-
if (typeof route === "string") {
|
|
198
|
-
return route;
|
|
199
|
-
}
|
|
200
|
-
if (route.custom_domain) {
|
|
201
|
-
return `${route.pattern}/*`;
|
|
202
|
-
}
|
|
203
|
-
return route.pattern;
|
|
204
|
-
})
|
|
205
|
-
: // if there aren't any patterns, then just match on all routes
|
|
206
|
-
["*/*"],
|
|
207
|
-
}
|
|
208
|
-
: { workers_dev: true };
|
|
209
|
-
|
|
210
|
-
const formData = createWorkerUploadForm(worker);
|
|
211
|
-
formData.set("wrangler-session-config", JSON.stringify(mode));
|
|
212
|
-
|
|
213
|
-
const { preview_token } = await fetchResult<{ preview_token: string }>(
|
|
214
|
-
url,
|
|
215
|
-
{
|
|
216
|
-
method: "POST",
|
|
217
|
-
body: formData,
|
|
218
|
-
headers: {
|
|
219
|
-
"cf-preview-upload-config-token": value,
|
|
220
|
-
},
|
|
221
|
-
},
|
|
222
|
-
undefined,
|
|
223
|
-
abortSignal
|
|
224
|
-
);
|
|
225
|
-
|
|
226
|
-
return {
|
|
227
|
-
value: preview_token,
|
|
228
|
-
host:
|
|
229
|
-
ctx.host ??
|
|
230
|
-
(worker.name
|
|
231
|
-
? `${
|
|
232
|
-
worker.name
|
|
233
|
-
// TODO: this should also probably have the env prefix
|
|
234
|
-
// but it doesn't appear to work yet, instead giving us the
|
|
235
|
-
// "There is nothing here yet" screen
|
|
236
|
-
// ctx.env && !ctx.legacyEnv
|
|
237
|
-
// ? `${ctx.env}.${worker.name}`
|
|
238
|
-
// : worker.name
|
|
239
|
-
}.${host.split(".").slice(1).join(".")}`
|
|
240
|
-
: host),
|
|
241
|
-
|
|
242
|
-
inspectorUrl,
|
|
243
|
-
prewarmUrl,
|
|
244
|
-
};
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
/**
|
|
248
|
-
* A stub to create a Cloudflare Worker preview.
|
|
249
|
-
*
|
|
250
|
-
* @example
|
|
251
|
-
* const {value, host} = await createWorker(init, acct);
|
|
252
|
-
*/
|
|
253
|
-
export async function createWorkerPreview(
|
|
254
|
-
init: CfWorkerInit,
|
|
255
|
-
account: CfAccount,
|
|
256
|
-
ctx: CfWorkerContext,
|
|
257
|
-
session: CfPreviewSession,
|
|
258
|
-
abortSignal: AbortSignal
|
|
259
|
-
): Promise<CfPreviewToken> {
|
|
260
|
-
const token = await createPreviewToken(
|
|
261
|
-
account,
|
|
262
|
-
init,
|
|
263
|
-
ctx,
|
|
264
|
-
session,
|
|
265
|
-
abortSignal
|
|
266
|
-
);
|
|
267
|
-
const accessToken = await getAccessToken(token.prewarmUrl.hostname);
|
|
268
|
-
|
|
269
|
-
const headers: HeadersInit = { "cf-workers-preview-token": token.value };
|
|
270
|
-
if (accessToken) {
|
|
271
|
-
headers.cookie = `CF_Authorization=${accessToken}`;
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
// fire and forget the prewarm call
|
|
275
|
-
fetch(token.prewarmUrl.href, {
|
|
276
|
-
method: "POST",
|
|
277
|
-
signal: abortSignal,
|
|
278
|
-
headers,
|
|
279
|
-
}).then(
|
|
280
|
-
(response) => {
|
|
281
|
-
if (!response.ok) {
|
|
282
|
-
logger.warn("worker failed to prewarm: ", response.statusText);
|
|
283
|
-
}
|
|
284
|
-
},
|
|
285
|
-
(err) => {
|
|
286
|
-
if ((err as { code: string }).code !== "ABORT_ERR") {
|
|
287
|
-
logger.warn("worker failed to prewarm: ", err);
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
);
|
|
291
|
-
|
|
292
|
-
return token;
|
|
293
|
-
}
|
|
@@ -1,363 +0,0 @@
|
|
|
1
|
-
import { readFileSync } from "node:fs";
|
|
2
|
-
import { FormData, File } from "undici";
|
|
3
|
-
import type {
|
|
4
|
-
CfWorkerInit,
|
|
5
|
-
CfModuleType,
|
|
6
|
-
CfDurableObjectMigrations,
|
|
7
|
-
CfPlacement,
|
|
8
|
-
} from "./worker.js";
|
|
9
|
-
|
|
10
|
-
export function toMimeType(type: CfModuleType): string {
|
|
11
|
-
switch (type) {
|
|
12
|
-
case "esm":
|
|
13
|
-
return "application/javascript+module";
|
|
14
|
-
case "commonjs":
|
|
15
|
-
return "application/javascript";
|
|
16
|
-
case "compiled-wasm":
|
|
17
|
-
return "application/wasm";
|
|
18
|
-
case "buffer":
|
|
19
|
-
return "application/octet-stream";
|
|
20
|
-
case "text":
|
|
21
|
-
return "text/plain";
|
|
22
|
-
default:
|
|
23
|
-
throw new TypeError("Unsupported module: " + type);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
export type WorkerMetadataBinding =
|
|
28
|
-
// If you add any new binding types here, also add it to safeBindings
|
|
29
|
-
// under validateUnsafeBinding in config/validation.ts
|
|
30
|
-
| { type: "plain_text"; name: string; text: string }
|
|
31
|
-
| { type: "json"; name: string; json: unknown }
|
|
32
|
-
| { type: "wasm_module"; name: string; part: string }
|
|
33
|
-
| { type: "text_blob"; name: string; part: string }
|
|
34
|
-
| { type: "data_blob"; name: string; part: string }
|
|
35
|
-
| { type: "kv_namespace"; name: string; namespace_id: string }
|
|
36
|
-
| {
|
|
37
|
-
type: "send_email";
|
|
38
|
-
name: string;
|
|
39
|
-
destination_address?: string;
|
|
40
|
-
allowed_destination_addresses?: string[];
|
|
41
|
-
}
|
|
42
|
-
| {
|
|
43
|
-
type: "durable_object_namespace";
|
|
44
|
-
name: string;
|
|
45
|
-
class_name: string;
|
|
46
|
-
script_name?: string;
|
|
47
|
-
environment?: string;
|
|
48
|
-
}
|
|
49
|
-
| { type: "queue"; name: string; queue_name: string }
|
|
50
|
-
| { type: "r2_bucket"; name: string; bucket_name: string }
|
|
51
|
-
| { type: "d1"; name: string; id: string; internalEnv?: string }
|
|
52
|
-
| { type: "service"; name: string; service: string; environment?: string }
|
|
53
|
-
| { type: "analytics_engine"; name: string; dataset?: string }
|
|
54
|
-
| { type: "dispatch_namespace"; name: string; namespace: string }
|
|
55
|
-
| { type: "mtls_certificate"; name: string; certificate_id: string }
|
|
56
|
-
| {
|
|
57
|
-
type: "logfwdr";
|
|
58
|
-
name: string;
|
|
59
|
-
destination: string;
|
|
60
|
-
};
|
|
61
|
-
|
|
62
|
-
export interface WorkerMetadata {
|
|
63
|
-
/** The name of the entry point module. Only exists when the worker is in the ES module format */
|
|
64
|
-
main_module?: string;
|
|
65
|
-
/** The name of the entry point module. Only exists when the worker is in the service-worker format */
|
|
66
|
-
body_part?: string;
|
|
67
|
-
compatibility_date?: string;
|
|
68
|
-
compatibility_flags?: string[];
|
|
69
|
-
usage_model?: "bundled" | "unbound";
|
|
70
|
-
migrations?: CfDurableObjectMigrations;
|
|
71
|
-
capnp_schema?: string;
|
|
72
|
-
bindings: WorkerMetadataBinding[];
|
|
73
|
-
keep_bindings?: WorkerMetadataBinding["type"][];
|
|
74
|
-
logpush?: boolean;
|
|
75
|
-
placement?: CfPlacement;
|
|
76
|
-
// Allow unsafe.metadata to add arbitary properties at runtime
|
|
77
|
-
[key: string]: unknown;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
/**
|
|
81
|
-
* Creates a `FormData` upload from a `CfWorkerInit`.
|
|
82
|
-
*/
|
|
83
|
-
export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
|
|
84
|
-
const formData = new FormData();
|
|
85
|
-
const {
|
|
86
|
-
main,
|
|
87
|
-
bindings,
|
|
88
|
-
migrations,
|
|
89
|
-
usage_model,
|
|
90
|
-
compatibility_date,
|
|
91
|
-
compatibility_flags,
|
|
92
|
-
keepVars,
|
|
93
|
-
logpush,
|
|
94
|
-
placement,
|
|
95
|
-
} = worker;
|
|
96
|
-
|
|
97
|
-
let { modules } = worker;
|
|
98
|
-
|
|
99
|
-
const metadataBindings: WorkerMetadata["bindings"] = [];
|
|
100
|
-
|
|
101
|
-
Object.entries(bindings.vars || {})?.forEach(([key, value]) => {
|
|
102
|
-
if (typeof value === "string") {
|
|
103
|
-
metadataBindings.push({ name: key, type: "plain_text", text: value });
|
|
104
|
-
} else {
|
|
105
|
-
metadataBindings.push({ name: key, type: "json", json: value });
|
|
106
|
-
}
|
|
107
|
-
});
|
|
108
|
-
|
|
109
|
-
bindings.kv_namespaces?.forEach(({ id, binding }) => {
|
|
110
|
-
metadataBindings.push({
|
|
111
|
-
name: binding,
|
|
112
|
-
type: "kv_namespace",
|
|
113
|
-
namespace_id: id,
|
|
114
|
-
});
|
|
115
|
-
});
|
|
116
|
-
|
|
117
|
-
bindings.send_email?.forEach(
|
|
118
|
-
({ name, destination_address, allowed_destination_addresses }) => {
|
|
119
|
-
metadataBindings.push({
|
|
120
|
-
name: name,
|
|
121
|
-
type: "send_email",
|
|
122
|
-
destination_address,
|
|
123
|
-
allowed_destination_addresses,
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
);
|
|
127
|
-
|
|
128
|
-
bindings.durable_objects?.bindings.forEach(
|
|
129
|
-
({ name, class_name, script_name, environment }) => {
|
|
130
|
-
metadataBindings.push({
|
|
131
|
-
name,
|
|
132
|
-
type: "durable_object_namespace",
|
|
133
|
-
class_name: class_name,
|
|
134
|
-
...(script_name && { script_name }),
|
|
135
|
-
...(environment && { environment }),
|
|
136
|
-
});
|
|
137
|
-
}
|
|
138
|
-
);
|
|
139
|
-
|
|
140
|
-
bindings.queues?.forEach(({ binding, queue_name }) => {
|
|
141
|
-
metadataBindings.push({
|
|
142
|
-
type: "queue",
|
|
143
|
-
name: binding,
|
|
144
|
-
queue_name,
|
|
145
|
-
});
|
|
146
|
-
});
|
|
147
|
-
|
|
148
|
-
bindings.r2_buckets?.forEach(({ binding, bucket_name }) => {
|
|
149
|
-
metadataBindings.push({
|
|
150
|
-
name: binding,
|
|
151
|
-
type: "r2_bucket",
|
|
152
|
-
bucket_name,
|
|
153
|
-
});
|
|
154
|
-
});
|
|
155
|
-
|
|
156
|
-
bindings.d1_databases?.forEach(
|
|
157
|
-
({ binding, database_id, database_internal_env }) => {
|
|
158
|
-
metadataBindings.push({
|
|
159
|
-
name: binding,
|
|
160
|
-
type: "d1",
|
|
161
|
-
id: database_id,
|
|
162
|
-
internalEnv: database_internal_env,
|
|
163
|
-
});
|
|
164
|
-
}
|
|
165
|
-
);
|
|
166
|
-
|
|
167
|
-
bindings.services?.forEach(({ binding, service, environment }) => {
|
|
168
|
-
metadataBindings.push({
|
|
169
|
-
name: binding,
|
|
170
|
-
type: "service",
|
|
171
|
-
service,
|
|
172
|
-
...(environment && { environment }),
|
|
173
|
-
});
|
|
174
|
-
});
|
|
175
|
-
|
|
176
|
-
bindings.analytics_engine_datasets?.forEach(({ binding, dataset }) => {
|
|
177
|
-
metadataBindings.push({
|
|
178
|
-
name: binding,
|
|
179
|
-
type: "analytics_engine",
|
|
180
|
-
dataset,
|
|
181
|
-
});
|
|
182
|
-
});
|
|
183
|
-
|
|
184
|
-
bindings.dispatch_namespaces?.forEach(({ binding, namespace }) => {
|
|
185
|
-
metadataBindings.push({
|
|
186
|
-
name: binding,
|
|
187
|
-
type: "dispatch_namespace",
|
|
188
|
-
namespace,
|
|
189
|
-
});
|
|
190
|
-
});
|
|
191
|
-
|
|
192
|
-
bindings.mtls_certificates?.forEach(({ binding, certificate_id }) => {
|
|
193
|
-
metadataBindings.push({
|
|
194
|
-
name: binding,
|
|
195
|
-
type: "mtls_certificate",
|
|
196
|
-
certificate_id,
|
|
197
|
-
});
|
|
198
|
-
});
|
|
199
|
-
|
|
200
|
-
bindings.logfwdr?.bindings.forEach(({ name, destination }) => {
|
|
201
|
-
metadataBindings.push({
|
|
202
|
-
name: name,
|
|
203
|
-
type: "logfwdr",
|
|
204
|
-
destination,
|
|
205
|
-
});
|
|
206
|
-
});
|
|
207
|
-
|
|
208
|
-
for (const [name, filePath] of Object.entries(bindings.wasm_modules || {})) {
|
|
209
|
-
metadataBindings.push({
|
|
210
|
-
name,
|
|
211
|
-
type: "wasm_module",
|
|
212
|
-
part: name,
|
|
213
|
-
});
|
|
214
|
-
|
|
215
|
-
formData.set(
|
|
216
|
-
name,
|
|
217
|
-
new File([readFileSync(filePath)], filePath, {
|
|
218
|
-
type: "application/wasm",
|
|
219
|
-
})
|
|
220
|
-
);
|
|
221
|
-
}
|
|
222
|
-
|
|
223
|
-
for (const [name, filePath] of Object.entries(bindings.text_blobs || {})) {
|
|
224
|
-
metadataBindings.push({
|
|
225
|
-
name,
|
|
226
|
-
type: "text_blob",
|
|
227
|
-
part: name,
|
|
228
|
-
});
|
|
229
|
-
|
|
230
|
-
if (name !== "__STATIC_CONTENT_MANIFEST") {
|
|
231
|
-
formData.set(
|
|
232
|
-
name,
|
|
233
|
-
new File([readFileSync(filePath)], filePath, {
|
|
234
|
-
type: "text/plain",
|
|
235
|
-
})
|
|
236
|
-
);
|
|
237
|
-
}
|
|
238
|
-
}
|
|
239
|
-
|
|
240
|
-
for (const [name, filePath] of Object.entries(bindings.data_blobs || {})) {
|
|
241
|
-
metadataBindings.push({
|
|
242
|
-
name,
|
|
243
|
-
type: "data_blob",
|
|
244
|
-
part: name,
|
|
245
|
-
});
|
|
246
|
-
|
|
247
|
-
formData.set(
|
|
248
|
-
name,
|
|
249
|
-
new File([readFileSync(filePath)], filePath, {
|
|
250
|
-
type: "application/octet-stream",
|
|
251
|
-
})
|
|
252
|
-
);
|
|
253
|
-
}
|
|
254
|
-
|
|
255
|
-
if (main.type === "commonjs") {
|
|
256
|
-
// This is a service-worker format worker.
|
|
257
|
-
for (const module of Object.values([...(modules || [])])) {
|
|
258
|
-
if (module.name === "__STATIC_CONTENT_MANIFEST") {
|
|
259
|
-
// Add the manifest to the form data.
|
|
260
|
-
formData.set(
|
|
261
|
-
module.name,
|
|
262
|
-
new File([module.content], module.name, {
|
|
263
|
-
type: "text/plain",
|
|
264
|
-
})
|
|
265
|
-
);
|
|
266
|
-
// And then remove it from the modules collection
|
|
267
|
-
modules = modules?.filter((m) => m !== module);
|
|
268
|
-
} else if (
|
|
269
|
-
module.type === "compiled-wasm" ||
|
|
270
|
-
module.type === "text" ||
|
|
271
|
-
module.type === "buffer"
|
|
272
|
-
) {
|
|
273
|
-
// Convert all wasm/text/data modules into `wasm_module`/`text_blob`/`data_blob` bindings.
|
|
274
|
-
// The "name" of the module is a file path. We use it
|
|
275
|
-
// to instead be a "part" of the body, and a reference
|
|
276
|
-
// that we can use inside our source. This identifier has to be a valid
|
|
277
|
-
// JS identifier, so we replace all non alphanumeric characters
|
|
278
|
-
// with an underscore.
|
|
279
|
-
const name = module.name.replace(/[^a-zA-Z0-9_$]/g, "_");
|
|
280
|
-
metadataBindings.push({
|
|
281
|
-
name,
|
|
282
|
-
type:
|
|
283
|
-
module.type === "compiled-wasm"
|
|
284
|
-
? "wasm_module"
|
|
285
|
-
: module.type === "text"
|
|
286
|
-
? "text_blob"
|
|
287
|
-
: "data_blob",
|
|
288
|
-
part: name,
|
|
289
|
-
});
|
|
290
|
-
|
|
291
|
-
// Add the module to the form data.
|
|
292
|
-
formData.set(
|
|
293
|
-
name,
|
|
294
|
-
new File([module.content], module.name, {
|
|
295
|
-
type:
|
|
296
|
-
module.type === "compiled-wasm"
|
|
297
|
-
? "application/wasm"
|
|
298
|
-
: module.type === "text"
|
|
299
|
-
? "text/plain"
|
|
300
|
-
: "application/octet-stream",
|
|
301
|
-
})
|
|
302
|
-
);
|
|
303
|
-
// And then remove it from the modules collection
|
|
304
|
-
modules = modules?.filter((m) => m !== module);
|
|
305
|
-
}
|
|
306
|
-
}
|
|
307
|
-
}
|
|
308
|
-
|
|
309
|
-
if (bindings.unsafe?.bindings) {
|
|
310
|
-
// @ts-expect-error unsafe bindings don't need to match a specific type here
|
|
311
|
-
metadataBindings.push(...bindings.unsafe.bindings);
|
|
312
|
-
}
|
|
313
|
-
|
|
314
|
-
const metadata: WorkerMetadata = {
|
|
315
|
-
...(main.type !== "commonjs"
|
|
316
|
-
? { main_module: main.name }
|
|
317
|
-
: { body_part: main.name }),
|
|
318
|
-
bindings: metadataBindings,
|
|
319
|
-
...(compatibility_date && { compatibility_date }),
|
|
320
|
-
...(compatibility_flags && { compatibility_flags }),
|
|
321
|
-
...(usage_model && { usage_model }),
|
|
322
|
-
...(migrations && { migrations }),
|
|
323
|
-
capnp_schema: bindings.logfwdr?.schema,
|
|
324
|
-
...(keepVars && { keep_bindings: ["plain_text", "json"] }),
|
|
325
|
-
...(logpush !== undefined && { logpush }),
|
|
326
|
-
...(placement && { placement }),
|
|
327
|
-
};
|
|
328
|
-
|
|
329
|
-
if (bindings.unsafe?.metadata !== undefined) {
|
|
330
|
-
for (const key of Object.keys(bindings.unsafe.metadata)) {
|
|
331
|
-
metadata[key] = bindings.unsafe.metadata[key];
|
|
332
|
-
}
|
|
333
|
-
}
|
|
334
|
-
|
|
335
|
-
formData.set("metadata", JSON.stringify(metadata));
|
|
336
|
-
|
|
337
|
-
if (main.type === "commonjs" && modules && modules.length > 0) {
|
|
338
|
-
throw new TypeError(
|
|
339
|
-
"More than one module can only be specified when type = 'esm'"
|
|
340
|
-
);
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
for (const module of [main].concat(modules || [])) {
|
|
344
|
-
formData.set(
|
|
345
|
-
module.name,
|
|
346
|
-
new File([module.content], module.name, {
|
|
347
|
-
type: toMimeType(module.type ?? main.type ?? "esm"),
|
|
348
|
-
})
|
|
349
|
-
);
|
|
350
|
-
}
|
|
351
|
-
|
|
352
|
-
if (bindings.logfwdr && bindings.logfwdr.schema) {
|
|
353
|
-
const filePath = bindings.logfwdr.schema;
|
|
354
|
-
formData.set(
|
|
355
|
-
filePath,
|
|
356
|
-
new File([readFileSync(filePath)], filePath, {
|
|
357
|
-
type: "application/octet-stream",
|
|
358
|
-
})
|
|
359
|
-
);
|
|
360
|
-
}
|
|
361
|
-
|
|
362
|
-
return formData;
|
|
363
|
-
}
|