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
package/src/dev/remote.tsx
DELETED
|
@@ -1,635 +0,0 @@
|
|
|
1
|
-
import { readFile } from "node:fs/promises";
|
|
2
|
-
import path from "node:path";
|
|
3
|
-
import { Text } from "ink";
|
|
4
|
-
import SelectInput from "ink-select-input";
|
|
5
|
-
import React, { useState, useEffect, useRef } from "react";
|
|
6
|
-
import { useErrorHandler } from "react-error-boundary";
|
|
7
|
-
import { printBundleSize } from "../bundle-reporter";
|
|
8
|
-
import {
|
|
9
|
-
createPreviewSession,
|
|
10
|
-
createWorkerPreview,
|
|
11
|
-
} from "../create-worker-preview";
|
|
12
|
-
import useInspector from "../inspect";
|
|
13
|
-
import { logger } from "../logger";
|
|
14
|
-
import { startPreviewServer, usePreviewServer } from "../proxy";
|
|
15
|
-
import { helpIfErrorIsSizeOrScriptStartup } from "../publish/publish";
|
|
16
|
-
import { syncAssets } from "../sites";
|
|
17
|
-
import {
|
|
18
|
-
getAccountChoices,
|
|
19
|
-
requireApiToken,
|
|
20
|
-
saveAccountToCache,
|
|
21
|
-
} from "../user";
|
|
22
|
-
import type { Route } from "../config/environment";
|
|
23
|
-
import type {
|
|
24
|
-
CfPreviewToken,
|
|
25
|
-
CfPreviewSession,
|
|
26
|
-
} from "../create-worker-preview";
|
|
27
|
-
import type { AssetPaths } from "../sites";
|
|
28
|
-
import type { ChooseAccountItem } from "../user";
|
|
29
|
-
import type {
|
|
30
|
-
CfModule,
|
|
31
|
-
CfWorkerInit,
|
|
32
|
-
CfScriptFormat,
|
|
33
|
-
CfAccount,
|
|
34
|
-
CfWorkerContext,
|
|
35
|
-
} from "../worker";
|
|
36
|
-
import type { EsbuildBundle } from "./use-esbuild";
|
|
37
|
-
|
|
38
|
-
interface RemoteProps {
|
|
39
|
-
name: string | undefined;
|
|
40
|
-
bundle: EsbuildBundle | undefined;
|
|
41
|
-
format: CfScriptFormat | undefined;
|
|
42
|
-
isWorkersSite: boolean;
|
|
43
|
-
assetPaths: AssetPaths | undefined;
|
|
44
|
-
port: number;
|
|
45
|
-
ip: string;
|
|
46
|
-
localProtocol: "https" | "http";
|
|
47
|
-
inspect: boolean;
|
|
48
|
-
inspectorPort: number;
|
|
49
|
-
accountId: string | undefined;
|
|
50
|
-
bindings: CfWorkerInit["bindings"];
|
|
51
|
-
compatibilityDate: string;
|
|
52
|
-
compatibilityFlags: string[] | undefined;
|
|
53
|
-
usageModel: "bundled" | "unbound" | undefined;
|
|
54
|
-
env: string | undefined;
|
|
55
|
-
legacyEnv: boolean | undefined;
|
|
56
|
-
zone: string | undefined;
|
|
57
|
-
host: string | undefined;
|
|
58
|
-
routes: Route[] | undefined;
|
|
59
|
-
onReady?: ((ip: string, port: number) => void) | undefined;
|
|
60
|
-
sourceMapPath: string | undefined;
|
|
61
|
-
sendMetrics: boolean | undefined;
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
export function Remote(props: RemoteProps) {
|
|
65
|
-
const [accountId, setAccountId] = useState(props.accountId);
|
|
66
|
-
const accountChoicesRef = useRef<Promise<ChooseAccountItem[]>>();
|
|
67
|
-
const [accountChoices, setAccountChoices] = useState<ChooseAccountItem[]>();
|
|
68
|
-
|
|
69
|
-
const previewToken = useWorker({
|
|
70
|
-
name: props.name,
|
|
71
|
-
bundle: props.bundle,
|
|
72
|
-
format: props.format,
|
|
73
|
-
modules: props.bundle ? props.bundle.modules : [],
|
|
74
|
-
accountId,
|
|
75
|
-
bindings: props.bindings,
|
|
76
|
-
assetPaths: props.assetPaths,
|
|
77
|
-
isWorkersSite: props.isWorkersSite,
|
|
78
|
-
compatibilityDate: props.compatibilityDate,
|
|
79
|
-
compatibilityFlags: props.compatibilityFlags,
|
|
80
|
-
usageModel: props.usageModel,
|
|
81
|
-
env: props.env,
|
|
82
|
-
legacyEnv: props.legacyEnv,
|
|
83
|
-
zone: props.zone,
|
|
84
|
-
host: props.host,
|
|
85
|
-
routes: props.routes,
|
|
86
|
-
onReady: props.onReady,
|
|
87
|
-
sendMetrics: props.sendMetrics,
|
|
88
|
-
port: props.port,
|
|
89
|
-
});
|
|
90
|
-
|
|
91
|
-
usePreviewServer({
|
|
92
|
-
previewToken,
|
|
93
|
-
assetDirectory: props.isWorkersSite
|
|
94
|
-
? undefined
|
|
95
|
-
: props.assetPaths?.assetDirectory,
|
|
96
|
-
localProtocol: props.localProtocol,
|
|
97
|
-
localPort: props.port,
|
|
98
|
-
ip: props.ip,
|
|
99
|
-
});
|
|
100
|
-
|
|
101
|
-
useInspector({
|
|
102
|
-
inspectorUrl:
|
|
103
|
-
props.inspect && previewToken
|
|
104
|
-
? previewToken.inspectorUrl.href
|
|
105
|
-
: undefined,
|
|
106
|
-
port: props.inspectorPort,
|
|
107
|
-
logToTerminal: true,
|
|
108
|
-
sourceMapPath: props.sourceMapPath,
|
|
109
|
-
host: previewToken?.host,
|
|
110
|
-
name: props.name,
|
|
111
|
-
sourceMapMetadata: props.bundle?.sourceMapMetadata,
|
|
112
|
-
});
|
|
113
|
-
|
|
114
|
-
const errorHandler = useErrorHandler();
|
|
115
|
-
|
|
116
|
-
// This effect handles the async step of fetching the available accounts for the current user.
|
|
117
|
-
// If only one account is available then it is just used by calling `setAccountId()`.
|
|
118
|
-
useEffect(() => {
|
|
119
|
-
if (
|
|
120
|
-
accountChoicesRef.current !== undefined ||
|
|
121
|
-
props.accountId !== undefined
|
|
122
|
-
) {
|
|
123
|
-
return;
|
|
124
|
-
}
|
|
125
|
-
accountChoicesRef.current = getAccountChoices();
|
|
126
|
-
accountChoicesRef.current.then(
|
|
127
|
-
(accounts) => {
|
|
128
|
-
if (accounts.length === 1) {
|
|
129
|
-
saveAccountToCache({
|
|
130
|
-
id: accounts[0].id,
|
|
131
|
-
name: accounts[0].name,
|
|
132
|
-
});
|
|
133
|
-
setAccountId(accounts[0].id);
|
|
134
|
-
} else {
|
|
135
|
-
setAccountChoices(accounts);
|
|
136
|
-
}
|
|
137
|
-
},
|
|
138
|
-
(err) => {
|
|
139
|
-
errorHandler(err);
|
|
140
|
-
}
|
|
141
|
-
);
|
|
142
|
-
});
|
|
143
|
-
|
|
144
|
-
// If we have not already chosen an account and there are multiple accounts available
|
|
145
|
-
// allow the users to select one.
|
|
146
|
-
return accountId === undefined && accountChoices !== undefined ? (
|
|
147
|
-
<ChooseAccount
|
|
148
|
-
accounts={accountChoices}
|
|
149
|
-
onSelect={(selectedAccount) => {
|
|
150
|
-
saveAccountToCache(selectedAccount);
|
|
151
|
-
setAccountId(selectedAccount.id);
|
|
152
|
-
}}
|
|
153
|
-
onError={(err) => errorHandler(err)}
|
|
154
|
-
></ChooseAccount>
|
|
155
|
-
) : null;
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
interface RemoteWorkerProps {
|
|
159
|
-
name: string | undefined;
|
|
160
|
-
bundle: EsbuildBundle | undefined;
|
|
161
|
-
format: CfScriptFormat | undefined;
|
|
162
|
-
modules: CfModule[];
|
|
163
|
-
accountId: string | undefined;
|
|
164
|
-
bindings: CfWorkerInit["bindings"];
|
|
165
|
-
assetPaths: AssetPaths | undefined;
|
|
166
|
-
isWorkersSite: boolean;
|
|
167
|
-
compatibilityDate: string | undefined;
|
|
168
|
-
compatibilityFlags: string[] | undefined;
|
|
169
|
-
usageModel: "bundled" | "unbound" | undefined;
|
|
170
|
-
env: string | undefined;
|
|
171
|
-
legacyEnv: boolean | undefined;
|
|
172
|
-
zone: string | undefined;
|
|
173
|
-
host: string | undefined;
|
|
174
|
-
routes: Route[] | undefined;
|
|
175
|
-
onReady: ((ip: string, port: number) => void) | undefined;
|
|
176
|
-
sendMetrics: boolean | undefined;
|
|
177
|
-
port: number;
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
export function useWorker(
|
|
181
|
-
props: RemoteWorkerProps
|
|
182
|
-
): CfPreviewToken | undefined {
|
|
183
|
-
const [session, setSession] = useState<CfPreviewSession | undefined>();
|
|
184
|
-
const [token, setToken] = useState<CfPreviewToken | undefined>();
|
|
185
|
-
const [restartCounter, setRestartCounter] = useState<number>(0);
|
|
186
|
-
// This is the most reliable way to detect whether
|
|
187
|
-
// something's "happened" in our system; We make a ref and
|
|
188
|
-
// mark it once we log our initial message. Refs are vars!
|
|
189
|
-
const startedRef = useRef(false);
|
|
190
|
-
// functions must be destructured before use inside a useEffect, otherwise the entire props object has to be added to the dependency array
|
|
191
|
-
const { onReady } = props;
|
|
192
|
-
// This effect sets up the preview session
|
|
193
|
-
useEffect(() => {
|
|
194
|
-
const abortController = new AbortController();
|
|
195
|
-
async function start() {
|
|
196
|
-
if (props.accountId === undefined) {
|
|
197
|
-
return;
|
|
198
|
-
}
|
|
199
|
-
const { workerAccount, workerContext } = getWorkerAccountAndContext({
|
|
200
|
-
accountId: props.accountId,
|
|
201
|
-
env: props.env,
|
|
202
|
-
legacyEnv: props.legacyEnv,
|
|
203
|
-
zone: props.zone,
|
|
204
|
-
host: props.host,
|
|
205
|
-
routes: props.routes,
|
|
206
|
-
sendMetrics: props.sendMetrics,
|
|
207
|
-
});
|
|
208
|
-
|
|
209
|
-
setSession(
|
|
210
|
-
await createPreviewSession(
|
|
211
|
-
workerAccount,
|
|
212
|
-
workerContext,
|
|
213
|
-
abortController.signal
|
|
214
|
-
)
|
|
215
|
-
);
|
|
216
|
-
}
|
|
217
|
-
start().catch((err) => {
|
|
218
|
-
// instead of logging the raw API error to the user,
|
|
219
|
-
// give them friendly instructions
|
|
220
|
-
// for error 10063 (workers.dev subdomain required)
|
|
221
|
-
if (err.code === 10063) {
|
|
222
|
-
const errorMessage =
|
|
223
|
-
"Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
|
|
224
|
-
const solutionMessage =
|
|
225
|
-
"You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
|
|
226
|
-
const onboardingLink = `https://dash.cloudflare.com/${props.accountId}/workers/onboarding`;
|
|
227
|
-
logger.error(`${errorMessage}\n${solutionMessage}\n${onboardingLink}`);
|
|
228
|
-
}
|
|
229
|
-
// we want to log the error, but not end the process
|
|
230
|
-
// since it could recover after the developer fixes whatever's wrong
|
|
231
|
-
else if ((err as { code: string }).code !== "ABORT_ERR") {
|
|
232
|
-
logger.error("Error while creating remote dev session:", err);
|
|
233
|
-
}
|
|
234
|
-
});
|
|
235
|
-
|
|
236
|
-
return () => {
|
|
237
|
-
abortController.abort();
|
|
238
|
-
};
|
|
239
|
-
}, [
|
|
240
|
-
props.accountId,
|
|
241
|
-
props.env,
|
|
242
|
-
props.host,
|
|
243
|
-
props.legacyEnv,
|
|
244
|
-
props.routes,
|
|
245
|
-
props.zone,
|
|
246
|
-
props.sendMetrics,
|
|
247
|
-
restartCounter,
|
|
248
|
-
]);
|
|
249
|
-
|
|
250
|
-
// This effect uses the session to upload the worker and create a preview
|
|
251
|
-
useEffect(() => {
|
|
252
|
-
const abortController = new AbortController();
|
|
253
|
-
async function start() {
|
|
254
|
-
if (props.accountId === undefined) {
|
|
255
|
-
return;
|
|
256
|
-
}
|
|
257
|
-
if (session === undefined) {
|
|
258
|
-
return;
|
|
259
|
-
}
|
|
260
|
-
setToken(undefined); // reset token in case we're re-running
|
|
261
|
-
|
|
262
|
-
if (!props.bundle || !props.format) return;
|
|
263
|
-
|
|
264
|
-
if (!startedRef.current) {
|
|
265
|
-
startedRef.current = true;
|
|
266
|
-
} else {
|
|
267
|
-
logger.log("⎔ Detected changes, restarted server.");
|
|
268
|
-
}
|
|
269
|
-
|
|
270
|
-
const init = await createRemoteWorkerInit({
|
|
271
|
-
bundle: props.bundle,
|
|
272
|
-
modules: props.modules,
|
|
273
|
-
accountId: props.accountId,
|
|
274
|
-
name: props.name,
|
|
275
|
-
legacyEnv: props.legacyEnv,
|
|
276
|
-
env: props.env,
|
|
277
|
-
isWorkersSite: props.isWorkersSite,
|
|
278
|
-
assetPaths: props.assetPaths,
|
|
279
|
-
format: props.format,
|
|
280
|
-
bindings: props.bindings,
|
|
281
|
-
compatibilityDate: props.compatibilityDate,
|
|
282
|
-
compatibilityFlags: props.compatibilityFlags,
|
|
283
|
-
usageModel: props.usageModel,
|
|
284
|
-
});
|
|
285
|
-
|
|
286
|
-
const { workerAccount, workerContext } = getWorkerAccountAndContext({
|
|
287
|
-
accountId: props.accountId,
|
|
288
|
-
env: props.env,
|
|
289
|
-
legacyEnv: props.legacyEnv,
|
|
290
|
-
zone: props.zone,
|
|
291
|
-
host: props.host,
|
|
292
|
-
routes: props.routes,
|
|
293
|
-
sendMetrics: props.sendMetrics,
|
|
294
|
-
});
|
|
295
|
-
|
|
296
|
-
const workerPreviewToken = await createWorkerPreview(
|
|
297
|
-
init,
|
|
298
|
-
workerAccount,
|
|
299
|
-
workerContext,
|
|
300
|
-
session,
|
|
301
|
-
abortController.signal
|
|
302
|
-
);
|
|
303
|
-
|
|
304
|
-
setToken(workerPreviewToken);
|
|
305
|
-
|
|
306
|
-
// TODO: Once we get service bindings working in the
|
|
307
|
-
// edge preview server, we can define remote dev service bindings
|
|
308
|
-
// and you can uncomment this code.
|
|
309
|
-
// https://github.com/cloudflare/workers-sdk/issues/1182
|
|
310
|
-
|
|
311
|
-
/*
|
|
312
|
-
if (name) {
|
|
313
|
-
await registerWorker(name, {
|
|
314
|
-
mode: "remote",
|
|
315
|
-
// upstream protocol is always https (https://github.com/cloudflare/workers-sdk/issues/583)
|
|
316
|
-
protocol: "https",
|
|
317
|
-
port: undefined,
|
|
318
|
-
host: workerPreviewToken.host,
|
|
319
|
-
headers: {
|
|
320
|
-
"cf-workers-preview-token": workerPreviewToken.value,
|
|
321
|
-
host: workerPreviewToken.host,
|
|
322
|
-
},
|
|
323
|
-
});
|
|
324
|
-
}
|
|
325
|
-
*/
|
|
326
|
-
onReady?.(props.host || "localhost", props.port);
|
|
327
|
-
}
|
|
328
|
-
start().catch((err) => {
|
|
329
|
-
// we want to log the error, but not end the process
|
|
330
|
-
// since it could recover after the developer fixes whatever's wrong
|
|
331
|
-
if ((err as { code: string }).code !== "ABORT_ERR") {
|
|
332
|
-
// instead of logging the raw API error to the user,
|
|
333
|
-
// give them friendly instructions
|
|
334
|
-
// for error 10063 (workers.dev subdomain required)
|
|
335
|
-
if (err.code === 10063) {
|
|
336
|
-
const errorMessage =
|
|
337
|
-
"Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
|
|
338
|
-
const solutionMessage =
|
|
339
|
-
"You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
|
|
340
|
-
const onboardingLink = `https://dash.cloudflare.com/${props.accountId}/workers/onboarding`;
|
|
341
|
-
logger.error(
|
|
342
|
-
`${errorMessage}\n${solutionMessage}\n${onboardingLink}`
|
|
343
|
-
);
|
|
344
|
-
} else if (err.code === 10049) {
|
|
345
|
-
logger.log("Preview token expired, fetching a new one");
|
|
346
|
-
// code 10049 happens when the preview token expires
|
|
347
|
-
// since we want a new preview token when this happens,
|
|
348
|
-
// lets increment the counter, and trigger a rerun of
|
|
349
|
-
// the useEffect above
|
|
350
|
-
setRestartCounter((prevCount) => prevCount + 1);
|
|
351
|
-
} else {
|
|
352
|
-
logger.error("Error on remote worker:", err);
|
|
353
|
-
}
|
|
354
|
-
}
|
|
355
|
-
});
|
|
356
|
-
|
|
357
|
-
return () => {
|
|
358
|
-
abortController.abort();
|
|
359
|
-
};
|
|
360
|
-
}, [
|
|
361
|
-
props.name,
|
|
362
|
-
props.bundle,
|
|
363
|
-
props.format,
|
|
364
|
-
props.accountId,
|
|
365
|
-
props.assetPaths,
|
|
366
|
-
props.isWorkersSite,
|
|
367
|
-
props.compatibilityDate,
|
|
368
|
-
props.compatibilityFlags,
|
|
369
|
-
props.usageModel,
|
|
370
|
-
props.bindings,
|
|
371
|
-
props.modules,
|
|
372
|
-
props.env,
|
|
373
|
-
props.legacyEnv,
|
|
374
|
-
props.zone,
|
|
375
|
-
props.host,
|
|
376
|
-
props.routes,
|
|
377
|
-
session,
|
|
378
|
-
onReady,
|
|
379
|
-
props.sendMetrics,
|
|
380
|
-
props.port,
|
|
381
|
-
]);
|
|
382
|
-
|
|
383
|
-
return token;
|
|
384
|
-
}
|
|
385
|
-
|
|
386
|
-
export async function startRemoteServer(props: RemoteProps) {
|
|
387
|
-
let accountId = props.accountId;
|
|
388
|
-
if (accountId === undefined) {
|
|
389
|
-
const accountChoices = await getAccountChoices();
|
|
390
|
-
if (accountChoices.length === 1) {
|
|
391
|
-
saveAccountToCache({
|
|
392
|
-
id: accountChoices[0].id,
|
|
393
|
-
name: accountChoices[0].name,
|
|
394
|
-
});
|
|
395
|
-
accountId = accountChoices[0].id;
|
|
396
|
-
} else {
|
|
397
|
-
throw logger.error(
|
|
398
|
-
"In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as `account_id` in your `wrangler.toml` file."
|
|
399
|
-
);
|
|
400
|
-
}
|
|
401
|
-
}
|
|
402
|
-
|
|
403
|
-
const previewToken = await getRemotePreviewToken({
|
|
404
|
-
...props,
|
|
405
|
-
accountId: accountId,
|
|
406
|
-
});
|
|
407
|
-
|
|
408
|
-
if (previewToken === undefined) {
|
|
409
|
-
throw logger.error("Failed to get a previewToken");
|
|
410
|
-
}
|
|
411
|
-
// start our proxy server
|
|
412
|
-
const previewServer = await startPreviewServer({
|
|
413
|
-
previewToken,
|
|
414
|
-
assetDirectory: props.isWorkersSite
|
|
415
|
-
? undefined
|
|
416
|
-
: props.assetPaths?.assetDirectory,
|
|
417
|
-
localProtocol: props.localProtocol,
|
|
418
|
-
localPort: props.port,
|
|
419
|
-
ip: props.ip,
|
|
420
|
-
onReady: props.onReady,
|
|
421
|
-
});
|
|
422
|
-
if (!previewServer) {
|
|
423
|
-
throw logger.error("Failed to start remote server");
|
|
424
|
-
}
|
|
425
|
-
return { stop: previewServer.stop };
|
|
426
|
-
}
|
|
427
|
-
|
|
428
|
-
/**
|
|
429
|
-
* getRemotePreviewToken is a react-free version of `useWorker`.
|
|
430
|
-
* It returns a preview token, which we then use in our proxy server
|
|
431
|
-
*/
|
|
432
|
-
export async function getRemotePreviewToken(props: RemoteProps) {
|
|
433
|
-
//setup the preview session
|
|
434
|
-
async function start() {
|
|
435
|
-
if (props.accountId === undefined) {
|
|
436
|
-
throw logger.error("no accountId provided");
|
|
437
|
-
}
|
|
438
|
-
const abortController = new AbortController();
|
|
439
|
-
const { workerAccount, workerContext } = getWorkerAccountAndContext({
|
|
440
|
-
accountId: props.accountId,
|
|
441
|
-
env: props.env,
|
|
442
|
-
legacyEnv: props.legacyEnv,
|
|
443
|
-
zone: props.zone,
|
|
444
|
-
host: props.host,
|
|
445
|
-
routes: props.routes,
|
|
446
|
-
sendMetrics: props.sendMetrics,
|
|
447
|
-
});
|
|
448
|
-
const session = await createPreviewSession(
|
|
449
|
-
workerAccount,
|
|
450
|
-
workerContext,
|
|
451
|
-
abortController.signal
|
|
452
|
-
);
|
|
453
|
-
//use the session to upload the worker, and create a preview
|
|
454
|
-
|
|
455
|
-
if (session === undefined) {
|
|
456
|
-
throw logger.error("Failed to start a session");
|
|
457
|
-
}
|
|
458
|
-
if (!props.bundle || !props.format) return;
|
|
459
|
-
|
|
460
|
-
const init = await createRemoteWorkerInit({
|
|
461
|
-
bundle: props.bundle,
|
|
462
|
-
modules: props.bundle ? props.bundle.modules : [],
|
|
463
|
-
accountId: props.accountId,
|
|
464
|
-
name: props.name,
|
|
465
|
-
legacyEnv: props.legacyEnv,
|
|
466
|
-
env: props.env,
|
|
467
|
-
isWorkersSite: props.isWorkersSite,
|
|
468
|
-
assetPaths: props.assetPaths,
|
|
469
|
-
format: props.format,
|
|
470
|
-
bindings: props.bindings,
|
|
471
|
-
compatibilityDate: props.compatibilityDate,
|
|
472
|
-
compatibilityFlags: props.compatibilityFlags,
|
|
473
|
-
usageModel: props.usageModel,
|
|
474
|
-
});
|
|
475
|
-
const workerPreviewToken = await createWorkerPreview(
|
|
476
|
-
init,
|
|
477
|
-
workerAccount,
|
|
478
|
-
workerContext,
|
|
479
|
-
session,
|
|
480
|
-
abortController.signal
|
|
481
|
-
);
|
|
482
|
-
return workerPreviewToken;
|
|
483
|
-
}
|
|
484
|
-
return start().catch((err) => {
|
|
485
|
-
if ((err as { code?: string })?.code !== "ABORT_ERR") {
|
|
486
|
-
// instead of logging the raw API error to the user,
|
|
487
|
-
// give them friendly instructions
|
|
488
|
-
// for error 10063 (workers.dev subdomain required)
|
|
489
|
-
if (err?.code === 10063) {
|
|
490
|
-
const errorMessage =
|
|
491
|
-
"Error: You need to register a workers.dev subdomain before running the dev command in remote mode";
|
|
492
|
-
const solutionMessage =
|
|
493
|
-
"You can either enable local mode by pressing l, or register a workers.dev subdomain here:";
|
|
494
|
-
const onboardingLink = `https://dash.cloudflare.com/${props.accountId}/workers/onboarding`;
|
|
495
|
-
logger.error(`${errorMessage}\n${solutionMessage}\n${onboardingLink}`);
|
|
496
|
-
} else if (err?.code === 10049) {
|
|
497
|
-
// code 10049 happens when the preview token expires
|
|
498
|
-
logger.log("Preview token expired, restart server to fetch a new one");
|
|
499
|
-
} else {
|
|
500
|
-
helpIfErrorIsSizeOrScriptStartup(err, props.bundle?.dependencies || {});
|
|
501
|
-
logger.error("Error on remote worker:", err);
|
|
502
|
-
}
|
|
503
|
-
}
|
|
504
|
-
});
|
|
505
|
-
}
|
|
506
|
-
|
|
507
|
-
async function createRemoteWorkerInit(props: {
|
|
508
|
-
bundle: EsbuildBundle;
|
|
509
|
-
modules: CfModule[];
|
|
510
|
-
accountId: string;
|
|
511
|
-
name: string | undefined;
|
|
512
|
-
legacyEnv: boolean | undefined;
|
|
513
|
-
env: string | undefined;
|
|
514
|
-
isWorkersSite: boolean;
|
|
515
|
-
assetPaths: AssetPaths | undefined;
|
|
516
|
-
format: CfScriptFormat;
|
|
517
|
-
bindings: CfWorkerInit["bindings"];
|
|
518
|
-
compatibilityDate: string | undefined;
|
|
519
|
-
compatibilityFlags: string[] | undefined;
|
|
520
|
-
usageModel: "bundled" | "unbound" | undefined;
|
|
521
|
-
}) {
|
|
522
|
-
const content = await readFile(props.bundle.path, "utf-8");
|
|
523
|
-
|
|
524
|
-
// TODO: For Dev we could show the reporter message in the interactive box.
|
|
525
|
-
void printBundleSize(
|
|
526
|
-
{ name: path.basename(props.bundle.path), content: content },
|
|
527
|
-
props.modules
|
|
528
|
-
);
|
|
529
|
-
|
|
530
|
-
const assets = await syncAssets(
|
|
531
|
-
props.accountId,
|
|
532
|
-
// When we're using the newer service environments, we wouldn't
|
|
533
|
-
// have added the env name on to the script name. However, we must
|
|
534
|
-
// include it in the kv namespace name regardless (since there's no
|
|
535
|
-
// concept of service environments for kv namespaces yet).
|
|
536
|
-
props.name + (!props.legacyEnv && props.env ? `-${props.env}` : ""),
|
|
537
|
-
props.isWorkersSite ? props.assetPaths : undefined,
|
|
538
|
-
true,
|
|
539
|
-
false
|
|
540
|
-
); // TODO: cancellable?
|
|
541
|
-
|
|
542
|
-
const init: CfWorkerInit = {
|
|
543
|
-
name: props.name,
|
|
544
|
-
main: {
|
|
545
|
-
name: path.basename(props.bundle.path),
|
|
546
|
-
type: props.format === "modules" ? "esm" : "commonjs",
|
|
547
|
-
content,
|
|
548
|
-
},
|
|
549
|
-
modules: props.modules.concat(
|
|
550
|
-
assets.manifest
|
|
551
|
-
? {
|
|
552
|
-
name: "__STATIC_CONTENT_MANIFEST",
|
|
553
|
-
content: JSON.stringify(assets.manifest),
|
|
554
|
-
type: "text",
|
|
555
|
-
}
|
|
556
|
-
: []
|
|
557
|
-
),
|
|
558
|
-
bindings: {
|
|
559
|
-
...props.bindings,
|
|
560
|
-
kv_namespaces: (props.bindings.kv_namespaces || []).concat(
|
|
561
|
-
assets.namespace
|
|
562
|
-
? { binding: "__STATIC_CONTENT", id: assets.namespace }
|
|
563
|
-
: []
|
|
564
|
-
),
|
|
565
|
-
text_blobs: {
|
|
566
|
-
...props.bindings.text_blobs,
|
|
567
|
-
...(assets.manifest &&
|
|
568
|
-
props.format === "service-worker" && {
|
|
569
|
-
__STATIC_CONTENT_MANIFEST: "__STATIC_CONTENT_MANIFEST",
|
|
570
|
-
}),
|
|
571
|
-
},
|
|
572
|
-
},
|
|
573
|
-
migrations: undefined, // no migrations in dev
|
|
574
|
-
compatibility_date: props.compatibilityDate,
|
|
575
|
-
compatibility_flags: props.compatibilityFlags,
|
|
576
|
-
usage_model: props.usageModel,
|
|
577
|
-
keepVars: true,
|
|
578
|
-
logpush: false,
|
|
579
|
-
placement: undefined, // no placement in dev
|
|
580
|
-
};
|
|
581
|
-
|
|
582
|
-
return init;
|
|
583
|
-
}
|
|
584
|
-
|
|
585
|
-
function getWorkerAccountAndContext(props: {
|
|
586
|
-
accountId: string;
|
|
587
|
-
env?: string;
|
|
588
|
-
legacyEnv?: boolean;
|
|
589
|
-
zone?: string;
|
|
590
|
-
host?: string;
|
|
591
|
-
routes: Route[] | undefined;
|
|
592
|
-
sendMetrics?: boolean;
|
|
593
|
-
}): { workerAccount: CfAccount; workerContext: CfWorkerContext } {
|
|
594
|
-
const workerAccount: CfAccount = {
|
|
595
|
-
accountId: props.accountId,
|
|
596
|
-
apiToken: requireApiToken(),
|
|
597
|
-
};
|
|
598
|
-
|
|
599
|
-
const workerContext: CfWorkerContext = {
|
|
600
|
-
env: props.env,
|
|
601
|
-
legacyEnv: props.legacyEnv,
|
|
602
|
-
zone: props.zone,
|
|
603
|
-
host: props.host,
|
|
604
|
-
routes: props.routes,
|
|
605
|
-
sendMetrics: props.sendMetrics,
|
|
606
|
-
};
|
|
607
|
-
|
|
608
|
-
return { workerAccount, workerContext };
|
|
609
|
-
}
|
|
610
|
-
|
|
611
|
-
/**
|
|
612
|
-
* A component that allows the user to select from a list of available accounts.
|
|
613
|
-
*/
|
|
614
|
-
function ChooseAccount(props: {
|
|
615
|
-
accounts: ChooseAccountItem[];
|
|
616
|
-
onSelect: (account: { name: string; id: string }) => void;
|
|
617
|
-
onError: (error: Error) => void;
|
|
618
|
-
}) {
|
|
619
|
-
return (
|
|
620
|
-
<>
|
|
621
|
-
<Text bold>Select an account from below:</Text>
|
|
622
|
-
<SelectInput
|
|
623
|
-
items={props.accounts.map((item) => ({
|
|
624
|
-
key: item.id,
|
|
625
|
-
label: item.name,
|
|
626
|
-
value: item,
|
|
627
|
-
}))}
|
|
628
|
-
onSelect={(item) => {
|
|
629
|
-
logger.log(`Using account: "${item.value.name} - ${item.value.id}"`);
|
|
630
|
-
props.onSelect({ id: item.value.id, name: item.value.name });
|
|
631
|
-
}}
|
|
632
|
-
/>
|
|
633
|
-
</>
|
|
634
|
-
);
|
|
635
|
-
}
|