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/start-server.ts
DELETED
|
@@ -1,545 +0,0 @@
|
|
|
1
|
-
import { fork } from "node:child_process";
|
|
2
|
-
import { realpathSync } from "node:fs";
|
|
3
|
-
import * as path from "node:path";
|
|
4
|
-
import * as util from "node:util";
|
|
5
|
-
import onExit from "signal-exit";
|
|
6
|
-
import tmp from "tmp-promise";
|
|
7
|
-
import { bundleWorker } from "../bundle";
|
|
8
|
-
import {
|
|
9
|
-
getBoundRegisteredWorkers,
|
|
10
|
-
registerWorker,
|
|
11
|
-
startWorkerRegistry,
|
|
12
|
-
stopWorkerRegistry,
|
|
13
|
-
} from "../dev-registry";
|
|
14
|
-
import { runCustomBuild } from "../entry";
|
|
15
|
-
import { logger } from "../logger";
|
|
16
|
-
import { waitForPortToBeAvailable } from "../proxy";
|
|
17
|
-
import traverseModuleGraph from "../traverse-module-graph";
|
|
18
|
-
import {
|
|
19
|
-
setupBindings,
|
|
20
|
-
getMiniflare3,
|
|
21
|
-
buildMiniflare3Logger,
|
|
22
|
-
setupMiniflareOptions,
|
|
23
|
-
setupNodeOptions,
|
|
24
|
-
transformMf2OptionsToMf3Options,
|
|
25
|
-
} from "./local";
|
|
26
|
-
import { startRemoteServer } from "./remote";
|
|
27
|
-
import { validateDevProps } from "./validate-dev-props";
|
|
28
|
-
|
|
29
|
-
import type { Config } from "../config";
|
|
30
|
-
import type { DurableObjectBindings } from "../config/environment";
|
|
31
|
-
import type { WorkerRegistry } from "../dev-registry";
|
|
32
|
-
import type { Entry } from "../entry";
|
|
33
|
-
import type { DevProps, DirectorySyncResult } from "./dev";
|
|
34
|
-
import type { LocalProps } from "./local";
|
|
35
|
-
import type { EsbuildBundle } from "./use-esbuild";
|
|
36
|
-
import type { Miniflare as Miniflare3Type } from "@miniflare/tre";
|
|
37
|
-
|
|
38
|
-
import type { ChildProcess } from "node:child_process";
|
|
39
|
-
|
|
40
|
-
export async function startDevServer(
|
|
41
|
-
props: DevProps & {
|
|
42
|
-
local: boolean;
|
|
43
|
-
disableDevRegistry: boolean;
|
|
44
|
-
}
|
|
45
|
-
) {
|
|
46
|
-
try {
|
|
47
|
-
let workerDefinitions: WorkerRegistry = {};
|
|
48
|
-
validateDevProps(props);
|
|
49
|
-
|
|
50
|
-
if (props.build.command) {
|
|
51
|
-
const relativeFile =
|
|
52
|
-
path.relative(props.entry.directory, props.entry.file) || ".";
|
|
53
|
-
await runCustomBuild(props.entry.file, relativeFile, props.build).catch(
|
|
54
|
-
(err) => {
|
|
55
|
-
logger.error("Custom build failed:", err);
|
|
56
|
-
}
|
|
57
|
-
);
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
//implement a react-free version of useTmpDir
|
|
61
|
-
const directory = setupTempDir();
|
|
62
|
-
if (!directory) {
|
|
63
|
-
throw new Error("Failed to create temporary directory.");
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
//start the worker registry
|
|
67
|
-
logger.log("disableDevRegistry: ", props.disableDevRegistry);
|
|
68
|
-
if (!props.disableDevRegistry) {
|
|
69
|
-
try {
|
|
70
|
-
await startWorkerRegistry();
|
|
71
|
-
if (props.local) {
|
|
72
|
-
const boundRegisteredWorkers = await getBoundRegisteredWorkers({
|
|
73
|
-
services: props.bindings.services,
|
|
74
|
-
durableObjects: props.bindings.durable_objects,
|
|
75
|
-
});
|
|
76
|
-
|
|
77
|
-
if (
|
|
78
|
-
!util.isDeepStrictEqual(boundRegisteredWorkers, workerDefinitions)
|
|
79
|
-
) {
|
|
80
|
-
workerDefinitions = boundRegisteredWorkers || {};
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
} catch (err) {
|
|
84
|
-
logger.error("failed to start worker registry", err);
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
const betaD1Shims = props.bindings.d1_databases?.map((db) => db.binding);
|
|
89
|
-
|
|
90
|
-
//implement a react-free version of useEsbuild
|
|
91
|
-
const bundle = await runEsbuild({
|
|
92
|
-
entry: props.entry,
|
|
93
|
-
destination: directory.name,
|
|
94
|
-
jsxFactory: props.jsxFactory,
|
|
95
|
-
processEntrypoint: props.processEntrypoint,
|
|
96
|
-
rules: props.rules,
|
|
97
|
-
jsxFragment: props.jsxFragment,
|
|
98
|
-
serveAssetsFromWorker: Boolean(
|
|
99
|
-
props.assetPaths && !props.isWorkersSite && props.local
|
|
100
|
-
),
|
|
101
|
-
tsconfig: props.tsconfig,
|
|
102
|
-
minify: props.minify,
|
|
103
|
-
legacyNodeCompat: props.legacyNodeCompat,
|
|
104
|
-
nodejsCompat: props.nodejsCompat,
|
|
105
|
-
define: props.define,
|
|
106
|
-
noBundle: props.noBundle,
|
|
107
|
-
assets: props.assetsConfig,
|
|
108
|
-
betaD1Shims,
|
|
109
|
-
workerDefinitions,
|
|
110
|
-
services: props.bindings.services,
|
|
111
|
-
firstPartyWorkerDevFacade: props.firstPartyWorker,
|
|
112
|
-
testScheduled: props.testScheduled,
|
|
113
|
-
local: props.local,
|
|
114
|
-
experimentalLocal: props.experimentalLocal,
|
|
115
|
-
doBindings: props.bindings.durable_objects?.bindings ?? [],
|
|
116
|
-
});
|
|
117
|
-
|
|
118
|
-
if (props.local) {
|
|
119
|
-
const { stop, inspectorUrl } = await startLocalServer({
|
|
120
|
-
name: props.name,
|
|
121
|
-
bundle: bundle,
|
|
122
|
-
format: props.entry.format,
|
|
123
|
-
compatibilityDate: props.compatibilityDate,
|
|
124
|
-
compatibilityFlags: props.compatibilityFlags,
|
|
125
|
-
bindings: props.bindings,
|
|
126
|
-
assetPaths: props.assetPaths,
|
|
127
|
-
initialPort: props.initialPort,
|
|
128
|
-
initialIp: props.initialIp,
|
|
129
|
-
rules: props.rules,
|
|
130
|
-
inspectorPort: props.inspectorPort,
|
|
131
|
-
localPersistencePath: props.localPersistencePath,
|
|
132
|
-
liveReload: props.liveReload,
|
|
133
|
-
crons: props.crons,
|
|
134
|
-
queueConsumers: props.queueConsumers,
|
|
135
|
-
localProtocol: props.localProtocol,
|
|
136
|
-
localUpstream: props.localUpstream,
|
|
137
|
-
inspect: props.inspect,
|
|
138
|
-
onReady: props.onReady,
|
|
139
|
-
enablePagesAssetsServiceBinding: props.enablePagesAssetsServiceBinding,
|
|
140
|
-
usageModel: props.usageModel,
|
|
141
|
-
workerDefinitions,
|
|
142
|
-
experimentalLocal: props.experimentalLocal,
|
|
143
|
-
accountId: props.accountId,
|
|
144
|
-
experimentalLocalRemoteKv: props.experimentalLocalRemoteKv,
|
|
145
|
-
sourceMapPath: bundle?.sourceMapPath,
|
|
146
|
-
});
|
|
147
|
-
|
|
148
|
-
return {
|
|
149
|
-
stop: async () => {
|
|
150
|
-
stop();
|
|
151
|
-
await stopWorkerRegistry();
|
|
152
|
-
},
|
|
153
|
-
inspectorUrl,
|
|
154
|
-
};
|
|
155
|
-
} else {
|
|
156
|
-
const { stop } = await startRemoteServer({
|
|
157
|
-
name: props.name,
|
|
158
|
-
bundle: bundle,
|
|
159
|
-
format: props.entry.format,
|
|
160
|
-
accountId: props.accountId,
|
|
161
|
-
bindings: props.bindings,
|
|
162
|
-
assetPaths: props.assetPaths,
|
|
163
|
-
isWorkersSite: props.isWorkersSite,
|
|
164
|
-
port: props.initialPort,
|
|
165
|
-
ip: props.initialIp,
|
|
166
|
-
localProtocol: props.localProtocol,
|
|
167
|
-
inspectorPort: props.inspectorPort,
|
|
168
|
-
inspect: props.inspect,
|
|
169
|
-
compatibilityDate: props.compatibilityDate,
|
|
170
|
-
compatibilityFlags: props.compatibilityFlags,
|
|
171
|
-
usageModel: props.usageModel,
|
|
172
|
-
env: props.env,
|
|
173
|
-
legacyEnv: props.legacyEnv,
|
|
174
|
-
zone: props.zone,
|
|
175
|
-
host: props.host,
|
|
176
|
-
routes: props.routes,
|
|
177
|
-
onReady: props.onReady,
|
|
178
|
-
sourceMapPath: bundle?.sourceMapPath,
|
|
179
|
-
sendMetrics: props.sendMetrics,
|
|
180
|
-
});
|
|
181
|
-
return {
|
|
182
|
-
stop: async () => {
|
|
183
|
-
stop();
|
|
184
|
-
await stopWorkerRegistry();
|
|
185
|
-
},
|
|
186
|
-
// TODO: inspectorUrl,
|
|
187
|
-
};
|
|
188
|
-
}
|
|
189
|
-
} catch (err) {
|
|
190
|
-
logger.error(err);
|
|
191
|
-
}
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
function setupTempDir(): DirectorySyncResult | undefined {
|
|
195
|
-
let dir: DirectorySyncResult | undefined;
|
|
196
|
-
try {
|
|
197
|
-
dir = tmp.dirSync({ unsafeCleanup: true });
|
|
198
|
-
|
|
199
|
-
return dir;
|
|
200
|
-
} catch (err) {
|
|
201
|
-
logger.error("Failed to create temporary directory to store built files.");
|
|
202
|
-
}
|
|
203
|
-
}
|
|
204
|
-
|
|
205
|
-
async function runEsbuild({
|
|
206
|
-
entry,
|
|
207
|
-
destination,
|
|
208
|
-
jsxFactory,
|
|
209
|
-
jsxFragment,
|
|
210
|
-
processEntrypoint,
|
|
211
|
-
rules,
|
|
212
|
-
assets,
|
|
213
|
-
betaD1Shims,
|
|
214
|
-
serveAssetsFromWorker,
|
|
215
|
-
tsconfig,
|
|
216
|
-
minify,
|
|
217
|
-
legacyNodeCompat,
|
|
218
|
-
nodejsCompat,
|
|
219
|
-
define,
|
|
220
|
-
noBundle,
|
|
221
|
-
workerDefinitions,
|
|
222
|
-
services,
|
|
223
|
-
firstPartyWorkerDevFacade,
|
|
224
|
-
testScheduled,
|
|
225
|
-
local,
|
|
226
|
-
experimentalLocal,
|
|
227
|
-
doBindings,
|
|
228
|
-
}: {
|
|
229
|
-
entry: Entry;
|
|
230
|
-
destination: string | undefined;
|
|
231
|
-
jsxFactory: string | undefined;
|
|
232
|
-
jsxFragment: string | undefined;
|
|
233
|
-
processEntrypoint: boolean;
|
|
234
|
-
rules: Config["rules"];
|
|
235
|
-
assets: Config["assets"];
|
|
236
|
-
betaD1Shims?: string[];
|
|
237
|
-
define: Config["define"];
|
|
238
|
-
services: Config["services"];
|
|
239
|
-
serveAssetsFromWorker: boolean;
|
|
240
|
-
tsconfig: string | undefined;
|
|
241
|
-
minify: boolean | undefined;
|
|
242
|
-
legacyNodeCompat: boolean | undefined;
|
|
243
|
-
nodejsCompat: boolean | undefined;
|
|
244
|
-
noBundle: boolean;
|
|
245
|
-
workerDefinitions: WorkerRegistry;
|
|
246
|
-
firstPartyWorkerDevFacade: boolean | undefined;
|
|
247
|
-
testScheduled?: boolean;
|
|
248
|
-
local: boolean;
|
|
249
|
-
experimentalLocal: boolean | undefined;
|
|
250
|
-
doBindings: DurableObjectBindings;
|
|
251
|
-
}): Promise<EsbuildBundle | undefined> {
|
|
252
|
-
if (!destination) return;
|
|
253
|
-
|
|
254
|
-
let traverseModuleGraphResult:
|
|
255
|
-
| Awaited<ReturnType<typeof bundleWorker>>
|
|
256
|
-
| undefined;
|
|
257
|
-
let bundleResult: Awaited<ReturnType<typeof bundleWorker>> | undefined;
|
|
258
|
-
if (noBundle) {
|
|
259
|
-
traverseModuleGraphResult = await traverseModuleGraph(entry, rules);
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
if (processEntrypoint || !noBundle) {
|
|
263
|
-
bundleResult = await bundleWorker(entry, destination, {
|
|
264
|
-
bundle: !noBundle,
|
|
265
|
-
disableModuleCollection: noBundle,
|
|
266
|
-
serveAssetsFromWorker,
|
|
267
|
-
jsxFactory,
|
|
268
|
-
jsxFragment,
|
|
269
|
-
rules,
|
|
270
|
-
tsconfig,
|
|
271
|
-
minify,
|
|
272
|
-
legacyNodeCompat,
|
|
273
|
-
nodejsCompat,
|
|
274
|
-
define,
|
|
275
|
-
checkFetch: true,
|
|
276
|
-
assets: assets && {
|
|
277
|
-
...assets,
|
|
278
|
-
// disable the cache in dev
|
|
279
|
-
bypassCache: true,
|
|
280
|
-
},
|
|
281
|
-
betaD1Shims,
|
|
282
|
-
workerDefinitions,
|
|
283
|
-
services,
|
|
284
|
-
firstPartyWorkerDevFacade,
|
|
285
|
-
targetConsumer: "dev", // We are starting a dev server
|
|
286
|
-
testScheduled,
|
|
287
|
-
local,
|
|
288
|
-
experimentalLocal,
|
|
289
|
-
doBindings,
|
|
290
|
-
});
|
|
291
|
-
}
|
|
292
|
-
|
|
293
|
-
return {
|
|
294
|
-
id: 0,
|
|
295
|
-
entry,
|
|
296
|
-
path: bundleResult?.resolvedEntryPointPath ?? entry.file,
|
|
297
|
-
type:
|
|
298
|
-
bundleResult?.bundleType ??
|
|
299
|
-
(entry.format === "modules" ? "esm" : "commonjs"),
|
|
300
|
-
modules: traverseModuleGraphResult?.modules ?? bundleResult?.modules ?? [],
|
|
301
|
-
dependencies: bundleResult?.dependencies ?? {},
|
|
302
|
-
sourceMapPath: bundleResult?.sourceMapPath,
|
|
303
|
-
sourceMapMetadata: bundleResult?.sourceMapMetadata,
|
|
304
|
-
};
|
|
305
|
-
}
|
|
306
|
-
|
|
307
|
-
export async function startLocalServer({
|
|
308
|
-
name: workerName,
|
|
309
|
-
bundle,
|
|
310
|
-
format,
|
|
311
|
-
compatibilityDate,
|
|
312
|
-
compatibilityFlags,
|
|
313
|
-
usageModel,
|
|
314
|
-
bindings,
|
|
315
|
-
workerDefinitions,
|
|
316
|
-
assetPaths,
|
|
317
|
-
initialPort,
|
|
318
|
-
inspectorPort,
|
|
319
|
-
rules,
|
|
320
|
-
localPersistencePath,
|
|
321
|
-
liveReload,
|
|
322
|
-
initialIp,
|
|
323
|
-
crons,
|
|
324
|
-
queueConsumers,
|
|
325
|
-
localProtocol,
|
|
326
|
-
localUpstream,
|
|
327
|
-
inspect,
|
|
328
|
-
onReady,
|
|
329
|
-
enablePagesAssetsServiceBinding,
|
|
330
|
-
experimentalLocal,
|
|
331
|
-
accountId,
|
|
332
|
-
experimentalLocalRemoteKv,
|
|
333
|
-
}: LocalProps) {
|
|
334
|
-
let local: ChildProcess | undefined;
|
|
335
|
-
let experimentalLocalRef: Miniflare3Type | undefined;
|
|
336
|
-
let removeSignalExitListener: (() => void) | undefined;
|
|
337
|
-
let inspectorUrl: string | undefined;
|
|
338
|
-
const setInspectorUrl = (url: string) => {
|
|
339
|
-
inspectorUrl = url;
|
|
340
|
-
};
|
|
341
|
-
|
|
342
|
-
const abortController = new AbortController();
|
|
343
|
-
async function startLocalWorker() {
|
|
344
|
-
if (!bundle || !format) return;
|
|
345
|
-
|
|
346
|
-
// port for the worker
|
|
347
|
-
await waitForPortToBeAvailable(initialPort, {
|
|
348
|
-
retryPeriod: 200,
|
|
349
|
-
timeout: 2000,
|
|
350
|
-
abortSignal: abortController.signal,
|
|
351
|
-
});
|
|
352
|
-
|
|
353
|
-
if (bindings.services && bindings.services.length > 0) {
|
|
354
|
-
logger.warn(
|
|
355
|
-
"⎔ Support for service bindings in local mode is experimental and may change."
|
|
356
|
-
);
|
|
357
|
-
}
|
|
358
|
-
|
|
359
|
-
const scriptPath = realpathSync(bundle.path);
|
|
360
|
-
|
|
361
|
-
const upstream =
|
|
362
|
-
typeof localUpstream === "string"
|
|
363
|
-
? `${localProtocol}://${localUpstream}`
|
|
364
|
-
: undefined;
|
|
365
|
-
|
|
366
|
-
const {
|
|
367
|
-
externalDurableObjects,
|
|
368
|
-
internalDurableObjects,
|
|
369
|
-
wasmBindings,
|
|
370
|
-
textBlobBindings,
|
|
371
|
-
dataBlobBindings,
|
|
372
|
-
} = setupBindings({
|
|
373
|
-
wasm_modules: bindings.wasm_modules,
|
|
374
|
-
text_blobs: bindings.text_blobs,
|
|
375
|
-
data_blobs: bindings.data_blobs,
|
|
376
|
-
durable_objects: bindings.durable_objects,
|
|
377
|
-
format,
|
|
378
|
-
bundle,
|
|
379
|
-
});
|
|
380
|
-
|
|
381
|
-
const { forkOptions, miniflareCLIPath, options } = setupMiniflareOptions({
|
|
382
|
-
workerName,
|
|
383
|
-
port: initialPort,
|
|
384
|
-
scriptPath,
|
|
385
|
-
localProtocol,
|
|
386
|
-
ip: initialIp,
|
|
387
|
-
format,
|
|
388
|
-
rules,
|
|
389
|
-
compatibilityDate,
|
|
390
|
-
compatibilityFlags,
|
|
391
|
-
usageModel,
|
|
392
|
-
kv_namespaces: bindings?.kv_namespaces,
|
|
393
|
-
queueBindings: bindings?.queues,
|
|
394
|
-
queueConsumers,
|
|
395
|
-
r2_buckets: bindings?.r2_buckets,
|
|
396
|
-
d1_databases: bindings?.d1_databases,
|
|
397
|
-
internalDurableObjects,
|
|
398
|
-
externalDurableObjects,
|
|
399
|
-
localPersistencePath,
|
|
400
|
-
liveReload,
|
|
401
|
-
assetPaths,
|
|
402
|
-
vars: bindings?.vars,
|
|
403
|
-
wasmBindings,
|
|
404
|
-
textBlobBindings,
|
|
405
|
-
dataBlobBindings,
|
|
406
|
-
crons,
|
|
407
|
-
upstream,
|
|
408
|
-
workerDefinitions,
|
|
409
|
-
enablePagesAssetsServiceBinding,
|
|
410
|
-
});
|
|
411
|
-
|
|
412
|
-
if (experimentalLocal) {
|
|
413
|
-
const log = await buildMiniflare3Logger();
|
|
414
|
-
const mf3Options = await transformMf2OptionsToMf3Options({
|
|
415
|
-
miniflare2Options: options,
|
|
416
|
-
format,
|
|
417
|
-
bundle,
|
|
418
|
-
log,
|
|
419
|
-
kvNamespaces: bindings?.kv_namespaces,
|
|
420
|
-
r2Buckets: bindings?.r2_buckets,
|
|
421
|
-
d1Databases: bindings?.d1_databases,
|
|
422
|
-
authenticatedAccountId: accountId,
|
|
423
|
-
kvRemote: experimentalLocalRemoteKv,
|
|
424
|
-
inspectorPort,
|
|
425
|
-
});
|
|
426
|
-
const { Miniflare } = await getMiniflare3();
|
|
427
|
-
const mf = new Miniflare(mf3Options);
|
|
428
|
-
const runtimeURL = await mf.ready;
|
|
429
|
-
experimentalLocalRef = mf;
|
|
430
|
-
removeSignalExitListener = onExit((_code, _signal) => {
|
|
431
|
-
logger.log("⎔ Shutting down experimental local server.");
|
|
432
|
-
void mf.dispose();
|
|
433
|
-
experimentalLocalRef = undefined;
|
|
434
|
-
});
|
|
435
|
-
onReady?.(runtimeURL.hostname, parseInt(runtimeURL.port ?? 8787));
|
|
436
|
-
return;
|
|
437
|
-
}
|
|
438
|
-
|
|
439
|
-
const nodeOptions = setupNodeOptions({ inspect, inspectorPort });
|
|
440
|
-
logger.log("⎔ Starting a local server...");
|
|
441
|
-
|
|
442
|
-
const child = (local = fork(miniflareCLIPath, forkOptions, {
|
|
443
|
-
cwd: path.dirname(scriptPath),
|
|
444
|
-
execArgv: nodeOptions,
|
|
445
|
-
stdio: "pipe",
|
|
446
|
-
}));
|
|
447
|
-
|
|
448
|
-
child.on("message", async (messageString) => {
|
|
449
|
-
const message = JSON.parse(messageString as string);
|
|
450
|
-
if (message.ready) {
|
|
451
|
-
// Let's register our presence in the dev registry
|
|
452
|
-
if (workerName) {
|
|
453
|
-
await registerWorker(workerName, {
|
|
454
|
-
protocol: localProtocol,
|
|
455
|
-
mode: "local",
|
|
456
|
-
port: message.port,
|
|
457
|
-
host: initialIp,
|
|
458
|
-
durableObjects: internalDurableObjects.map((binding) => ({
|
|
459
|
-
name: binding.name,
|
|
460
|
-
className: binding.class_name,
|
|
461
|
-
})),
|
|
462
|
-
...(message.durableObjectsPort
|
|
463
|
-
? {
|
|
464
|
-
durableObjectsHost: initialIp,
|
|
465
|
-
durableObjectsPort: message.durableObjectsPort,
|
|
466
|
-
}
|
|
467
|
-
: {}),
|
|
468
|
-
});
|
|
469
|
-
}
|
|
470
|
-
onReady?.(initialIp, message.port);
|
|
471
|
-
}
|
|
472
|
-
});
|
|
473
|
-
|
|
474
|
-
child.on("close", (code) => {
|
|
475
|
-
if (code) {
|
|
476
|
-
logger.log(`Miniflare process exited with code ${code}`);
|
|
477
|
-
}
|
|
478
|
-
});
|
|
479
|
-
|
|
480
|
-
child.stdout?.on("data", (data: Buffer) => {
|
|
481
|
-
process.stdout.write(data);
|
|
482
|
-
});
|
|
483
|
-
|
|
484
|
-
// parse the node inspector url (which may be received in chunks) from stderr
|
|
485
|
-
let stderrData = "";
|
|
486
|
-
let inspectorUrlFound = false;
|
|
487
|
-
child.stderr?.on("data", (data: Buffer) => {
|
|
488
|
-
if (!inspectorUrlFound) {
|
|
489
|
-
stderrData += data.toString();
|
|
490
|
-
const matches =
|
|
491
|
-
/Debugger listening on (ws:\/\/127\.0\.0\.1:\d+\/[A-Za-z0-9-]+)[\r|\n]/.exec(
|
|
492
|
-
stderrData
|
|
493
|
-
);
|
|
494
|
-
if (matches) {
|
|
495
|
-
inspectorUrlFound = true;
|
|
496
|
-
setInspectorUrl(matches[1]);
|
|
497
|
-
}
|
|
498
|
-
}
|
|
499
|
-
|
|
500
|
-
process.stderr.write(data);
|
|
501
|
-
});
|
|
502
|
-
|
|
503
|
-
child.on("exit", (code) => {
|
|
504
|
-
if (code) {
|
|
505
|
-
logger.error(`Miniflare process exited with code ${code}`);
|
|
506
|
-
}
|
|
507
|
-
});
|
|
508
|
-
|
|
509
|
-
child.on("error", (error: Error) => {
|
|
510
|
-
logger.error(`Miniflare process failed to spawn`);
|
|
511
|
-
logger.error(error);
|
|
512
|
-
});
|
|
513
|
-
|
|
514
|
-
removeSignalExitListener = onExit((_code, _signal) => {
|
|
515
|
-
logger.log("⎔ Shutting down local server.");
|
|
516
|
-
child.kill();
|
|
517
|
-
local = undefined;
|
|
518
|
-
});
|
|
519
|
-
}
|
|
520
|
-
|
|
521
|
-
startLocalWorker().catch((err) => {
|
|
522
|
-
logger.error("local worker:", err);
|
|
523
|
-
});
|
|
524
|
-
|
|
525
|
-
return {
|
|
526
|
-
inspectorUrl,
|
|
527
|
-
stop: () => {
|
|
528
|
-
abortController.abort();
|
|
529
|
-
if (local) {
|
|
530
|
-
logger.log("⎔ Shutting down local server.");
|
|
531
|
-
local.kill();
|
|
532
|
-
local = undefined;
|
|
533
|
-
}
|
|
534
|
-
if (experimentalLocalRef) {
|
|
535
|
-
logger.log("⎔ Shutting down experimental local server.");
|
|
536
|
-
// Initialisation errors are also thrown asynchronously by dispose().
|
|
537
|
-
// The catch() above should've caught them though.
|
|
538
|
-
experimentalLocalRef?.dispose().catch(() => {});
|
|
539
|
-
experimentalLocalRef = undefined;
|
|
540
|
-
}
|
|
541
|
-
removeSignalExitListener?.();
|
|
542
|
-
removeSignalExitListener = undefined;
|
|
543
|
-
},
|
|
544
|
-
};
|
|
545
|
-
}
|