wrangler 0.0.0-e928f94 → 0.0.0-e9307365
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/Cloudflare_CA.pem +18 -0
- package/README.md +51 -14
- package/bin/wrangler.js +159 -27
- package/kv-asset-handler.js +1 -0
- package/miniflare-dist/index.mjs +5416 -0
- package/package.json +172 -113
- package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
- package/src/__tests__/config-cache.test.ts +42 -0
- package/src/__tests__/configuration.test.ts +4022 -0
- package/src/__tests__/dev.test.tsx +1294 -0
- package/src/__tests__/generate.test.ts +93 -0
- package/src/__tests__/guess-worker-format.test.ts +85 -0
- package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
- package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
- package/src/__tests__/helpers/mock-account-id.ts +48 -0
- package/src/__tests__/helpers/mock-bin.ts +36 -0
- package/src/__tests__/helpers/mock-cfetch.ts +263 -0
- package/src/__tests__/helpers/mock-console.ts +97 -0
- package/src/__tests__/helpers/mock-dialogs.ts +153 -0
- package/src/__tests__/helpers/mock-http-server.ts +46 -0
- package/src/__tests__/helpers/mock-istty.ts +74 -0
- package/src/__tests__/helpers/mock-kv.ts +33 -0
- package/src/__tests__/helpers/mock-oauth-flow.ts +250 -0
- package/src/__tests__/helpers/mock-process.ts +39 -0
- package/src/__tests__/helpers/mock-stdin.ts +108 -0
- package/src/__tests__/helpers/mock-web-socket.ts +29 -0
- package/src/__tests__/helpers/run-in-tmp.ts +38 -0
- package/src/__tests__/helpers/run-wrangler.ts +16 -0
- package/src/__tests__/helpers/write-worker-source.ts +31 -0
- package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
- package/src/__tests__/https-options.test.ts +163 -0
- package/src/__tests__/index.test.ts +242 -150
- package/src/__tests__/init.test.ts +1992 -0
- package/src/__tests__/jest.setup.ts +150 -0
- package/src/__tests__/kv.test.ts +1671 -0
- package/src/__tests__/logger.test.ts +141 -0
- package/src/__tests__/metrics.test.ts +450 -0
- package/src/__tests__/package-manager.test.ts +353 -0
- package/src/__tests__/pages.test.ts +1261 -0
- package/src/__tests__/parse.test.ts +330 -0
- package/src/__tests__/publish.test.ts +6914 -0
- package/src/__tests__/pubsub.test.ts +367 -0
- package/src/__tests__/r2.test.ts +317 -0
- package/src/__tests__/route.test.ts +45 -0
- package/src/__tests__/secret.test.ts +492 -0
- package/src/__tests__/tail.test.ts +698 -0
- package/src/__tests__/test-old-node-version.js +31 -0
- package/src/__tests__/user.test.ts +144 -0
- package/src/__tests__/validate-dev-props.test.ts +56 -0
- package/src/__tests__/version.test.ts +35 -0
- package/src/__tests__/whoami.test.tsx +289 -0
- package/src/__tests__/worker-namespace.test.ts +327 -0
- package/src/abort.d.ts +3 -0
- package/src/api/dev.ts +86 -0
- package/src/api/index.ts +1 -0
- package/src/bundle-reporter.tsx +29 -0
- package/src/bundle.ts +472 -0
- package/src/cfetch/index.ts +121 -0
- package/src/cfetch/internal.ts +181 -0
- package/src/cli.ts +25 -8
- package/src/config/README.md +107 -0
- package/src/config/config.ts +263 -0
- package/src/config/diagnostics.ts +80 -0
- package/src/config/environment.ts +485 -0
- package/src/config/index.ts +251 -0
- package/src/config/validation-helpers.ts +584 -0
- package/src/config/validation.ts +1856 -0
- package/src/config-cache.ts +84 -0
- package/src/create-worker-preview.ts +257 -0
- package/src/create-worker-upload-form.ts +288 -0
- package/src/dev/dev-vars.ts +36 -0
- package/src/dev/dev.tsx +531 -0
- package/src/dev/local.tsx +385 -0
- package/src/dev/remote.tsx +413 -0
- package/src/dev/use-esbuild.ts +175 -0
- package/src/dev/validate-dev-props.ts +31 -0
- package/src/dev-registry.tsx +157 -0
- package/src/dev.tsx +604 -712
- package/src/dialogs.tsx +115 -65
- package/src/durable.ts +102 -0
- package/src/entry.ts +328 -0
- package/src/environment-variables.ts +35 -0
- package/src/errors.ts +11 -0
- package/src/faye-websocket.d.ts +6 -0
- package/src/generate.ts +131 -0
- package/src/git-client.ts +42 -0
- package/src/global-wrangler-config-path.ts +26 -0
- package/src/https-options.ts +127 -0
- package/src/index.tsx +2167 -1841
- package/src/init.ts +549 -0
- package/src/inspect.ts +750 -0
- package/src/intl-polyfill.d.ts +139 -0
- package/src/is-interactive.ts +12 -0
- package/src/kv.ts +430 -0
- package/src/logger.ts +73 -0
- package/src/metrics/index.ts +5 -0
- package/src/metrics/is-ci.ts +14 -0
- package/src/metrics/metrics-config.ts +239 -0
- package/src/metrics/metrics-dispatcher.ts +96 -0
- package/src/metrics/metrics-usage-headers.ts +24 -0
- package/src/metrics/send-event.ts +92 -0
- package/src/miniflare-cli/README.md +30 -0
- package/src/miniflare-cli/assets.ts +543 -0
- package/src/miniflare-cli/enum-keys.ts +17 -0
- package/src/miniflare-cli/index.ts +85 -0
- package/src/miniflare-cli/request-context.ts +40 -0
- package/src/module-collection.ts +247 -53
- package/src/open-in-browser.ts +17 -0
- package/src/package-manager.ts +219 -0
- package/src/pages/build.tsx +204 -0
- package/src/pages/constants.ts +8 -0
- package/src/pages/deployments.tsx +106 -0
- package/src/pages/dev.tsx +414 -0
- package/src/pages/functions/buildPlugin.ts +105 -0
- package/src/pages/functions/buildWorker.ts +151 -0
- package/src/pages/functions/filepath-routing.test.ts +234 -0
- package/src/pages/functions/filepath-routing.ts +189 -0
- package/src/pages/functions/identifiers.ts +78 -0
- package/src/pages/functions/routes.ts +151 -0
- package/src/pages/index.tsx +84 -0
- package/src/pages/projects.tsx +163 -0
- package/src/pages/publish.tsx +338 -0
- package/src/pages/types.ts +40 -0
- package/src/pages/upload.tsx +415 -0
- package/src/pages/utils.ts +12 -0
- package/src/parse.ts +286 -0
- package/src/paths.ts +26 -0
- package/src/preview.ts +31 -0
- package/src/proxy.ts +476 -0
- package/src/publish.ts +796 -335
- package/src/pubsub/index.ts +286 -0
- package/src/pubsub/pubsub-commands.tsx +623 -0
- package/src/r2.ts +118 -0
- package/src/selfsigned.d.ts +29 -0
- package/src/sites.tsx +357 -100
- package/src/tail/filters.ts +279 -0
- package/src/tail/index.ts +299 -0
- package/src/tail/printing.ts +67 -0
- package/src/update-check.ts +19 -0
- package/src/user/choose-account.tsx +69 -0
- package/src/user/env-vars.ts +46 -0
- package/src/user/generate-auth-url.ts +33 -0
- package/src/user/generate-random-state.ts +16 -0
- package/src/user/index.ts +3 -0
- package/src/user/user.tsx +1189 -0
- package/src/whoami.tsx +169 -0
- package/src/worker-namespace.ts +206 -0
- package/src/worker.ts +203 -0
- package/src/zones.ts +76 -0
- package/templates/checked-fetch.js +17 -0
- package/templates/first-party-worker-module-facade.ts +18 -0
- package/templates/format-dev-errors.ts +32 -0
- package/templates/gitignore +171 -0
- package/templates/new-worker-scheduled.js +17 -0
- package/templates/new-worker-scheduled.ts +32 -0
- package/templates/new-worker.js +15 -0
- package/templates/new-worker.ts +30 -0
- package/templates/no-op-worker.js +10 -0
- package/templates/pages-shim.ts +9 -0
- package/templates/pages-template-plugin.ts +155 -0
- package/templates/pages-template-worker.ts +161 -0
- package/templates/serve-static-assets.ts +63 -0
- package/templates/service-bindings-module-facade.js +51 -0
- package/templates/service-bindings-sw-facade.js +39 -0
- package/templates/tsconfig.json +105 -0
- package/wrangler-dist/cli.d.ts +327 -0
- package/wrangler-dist/cli.js +126729 -101995
- package/src/__tests__/fixtures/init/.gitkeep +0 -0
- package/src/__tests__/mock-cfetch.js +0 -46
- package/src/api/form_data.ts +0 -141
- package/src/api/inspect.ts +0 -441
- package/src/api/preview.ts +0 -128
- package/src/api/worker.ts +0 -161
- package/src/cfetch.ts +0 -72
- package/src/config.ts +0 -122
- package/src/kv.tsx +0 -211
- package/src/pages.tsx +0 -843
- package/src/tail.tsx +0 -71
- package/src/user.tsx +0 -1029
- package/static-asset-facade.js +0 -47
- package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
- package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
- package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
- package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
- package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
- package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
- package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
- package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
- package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
- package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
- package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
- package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
- package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
- package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
- package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
- package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
- package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
- package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
- package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
- package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
- package/vendor/wrangler-mime/CHANGELOG.md +0 -289
- package/vendor/wrangler-mime/LICENSE +0 -21
- package/vendor/wrangler-mime/Mime.js +0 -97
- package/vendor/wrangler-mime/README.md +0 -187
- package/vendor/wrangler-mime/cli.js +0 -46
- package/vendor/wrangler-mime/index.js +0 -4
- package/vendor/wrangler-mime/lite.js +0 -4
- package/vendor/wrangler-mime/package.json +0 -52
- package/vendor/wrangler-mime/types/other.js +0 -1
- package/vendor/wrangler-mime/types/standard.js +0 -1
- package/wrangler-dist/cli.js.map +0 -7
package/src/dev/dev.tsx
ADDED
|
@@ -0,0 +1,531 @@
|
|
|
1
|
+
import { spawn } from "node:child_process";
|
|
2
|
+
import * as path from "node:path";
|
|
3
|
+
import * as util from "node:util";
|
|
4
|
+
import { watch } from "chokidar";
|
|
5
|
+
import clipboardy from "clipboardy";
|
|
6
|
+
import commandExists from "command-exists";
|
|
7
|
+
import { Box, Text, useApp, useInput, useStdin } from "ink";
|
|
8
|
+
import React, { useState, useEffect, useRef } from "react";
|
|
9
|
+
import { withErrorBoundary, useErrorHandler } from "react-error-boundary";
|
|
10
|
+
import onExit from "signal-exit";
|
|
11
|
+
import tmp from "tmp-promise";
|
|
12
|
+
import { fetch } from "undici";
|
|
13
|
+
import {
|
|
14
|
+
getRegisteredWorkers,
|
|
15
|
+
startWorkerRegistry,
|
|
16
|
+
stopWorkerRegistry,
|
|
17
|
+
unregisterWorker,
|
|
18
|
+
} from "../dev-registry";
|
|
19
|
+
import { runCustomBuild } from "../entry";
|
|
20
|
+
import { openInspector } from "../inspect";
|
|
21
|
+
import { logger } from "../logger";
|
|
22
|
+
import openInBrowser from "../open-in-browser";
|
|
23
|
+
import { Local } from "./local";
|
|
24
|
+
import { Remote } from "./remote";
|
|
25
|
+
import { useEsbuild } from "./use-esbuild";
|
|
26
|
+
import { validateDevProps } from "./validate-dev-props";
|
|
27
|
+
import type { Config } from "../config";
|
|
28
|
+
import type { Route } from "../config/environment";
|
|
29
|
+
import type { WorkerRegistry } from "../dev-registry";
|
|
30
|
+
import type { Entry } from "../entry";
|
|
31
|
+
import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli";
|
|
32
|
+
import type { AssetPaths } from "../sites";
|
|
33
|
+
import type { CfWorkerInit } from "../worker";
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* This hooks establishes a connection with the dev registry,
|
|
37
|
+
* and periodically updates itself with details of workers currently
|
|
38
|
+
* running a dev session on this system.
|
|
39
|
+
*/
|
|
40
|
+
function useDevRegistry(
|
|
41
|
+
name: string | undefined,
|
|
42
|
+
services: Config["services"] | undefined,
|
|
43
|
+
mode: "local" | "remote"
|
|
44
|
+
): WorkerRegistry {
|
|
45
|
+
const [workers, setWorkers] = useState<WorkerRegistry>({});
|
|
46
|
+
|
|
47
|
+
useEffect(() => {
|
|
48
|
+
// Let's try to start registry
|
|
49
|
+
// TODO: we should probably call this in a loop
|
|
50
|
+
// in case the registry dies elsewhere
|
|
51
|
+
startWorkerRegistry().catch((err) => {
|
|
52
|
+
logger.error("failed to start worker registry", err);
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
const serviceNames = (services || []).map(
|
|
56
|
+
(serviceBinding) => serviceBinding.service
|
|
57
|
+
);
|
|
58
|
+
|
|
59
|
+
const interval =
|
|
60
|
+
// TODO: enable this for remote mode as well
|
|
61
|
+
// https://github.com/cloudflare/wrangler2/issues/1182
|
|
62
|
+
mode === "local"
|
|
63
|
+
? setInterval(() => {
|
|
64
|
+
getRegisteredWorkers().then(
|
|
65
|
+
(workerDefinitions: WorkerRegistry | undefined) => {
|
|
66
|
+
// We only want the workers that we're bound to
|
|
67
|
+
// so let's filter out the others
|
|
68
|
+
const filteredWorkers = Object.fromEntries(
|
|
69
|
+
Object.entries(workerDefinitions || {}).filter(
|
|
70
|
+
([key, _value]) => serviceNames.includes(key)
|
|
71
|
+
)
|
|
72
|
+
);
|
|
73
|
+
setWorkers((prevWorkers) => {
|
|
74
|
+
if (!util.isDeepStrictEqual(filteredWorkers, prevWorkers)) {
|
|
75
|
+
return filteredWorkers;
|
|
76
|
+
}
|
|
77
|
+
return prevWorkers;
|
|
78
|
+
});
|
|
79
|
+
},
|
|
80
|
+
(err) => {
|
|
81
|
+
logger.warn("Failed to get worker definitions", err);
|
|
82
|
+
}
|
|
83
|
+
);
|
|
84
|
+
}, 300)
|
|
85
|
+
: undefined;
|
|
86
|
+
|
|
87
|
+
return () => {
|
|
88
|
+
interval && clearInterval(interval);
|
|
89
|
+
Promise.allSettled([
|
|
90
|
+
name ? unregisterWorker(name) : Promise.resolve(),
|
|
91
|
+
stopWorkerRegistry(),
|
|
92
|
+
]).then(
|
|
93
|
+
([unregisterResult, stopRegistryResult]) => {
|
|
94
|
+
if (unregisterResult.status === "rejected") {
|
|
95
|
+
logger.error(
|
|
96
|
+
"Failed to unregister worker",
|
|
97
|
+
unregisterResult.reason
|
|
98
|
+
);
|
|
99
|
+
}
|
|
100
|
+
if (stopRegistryResult.status === "rejected") {
|
|
101
|
+
logger.error(
|
|
102
|
+
"Failed to stop worker registry",
|
|
103
|
+
stopRegistryResult.reason
|
|
104
|
+
);
|
|
105
|
+
}
|
|
106
|
+
},
|
|
107
|
+
(err) => {
|
|
108
|
+
logger.error("Failed to clear dev registry effect", err);
|
|
109
|
+
}
|
|
110
|
+
);
|
|
111
|
+
};
|
|
112
|
+
}, [name, services, mode]);
|
|
113
|
+
|
|
114
|
+
return workers;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
export type DevProps = {
|
|
118
|
+
name: string | undefined;
|
|
119
|
+
noBundle: boolean;
|
|
120
|
+
entry: Entry;
|
|
121
|
+
port: number;
|
|
122
|
+
ip: string;
|
|
123
|
+
inspectorPort: number;
|
|
124
|
+
rules: Config["rules"];
|
|
125
|
+
accountId: string | undefined;
|
|
126
|
+
initialMode: "local" | "remote";
|
|
127
|
+
jsxFactory: string | undefined;
|
|
128
|
+
jsxFragment: string | undefined;
|
|
129
|
+
tsconfig: string | undefined;
|
|
130
|
+
upstreamProtocol: "https" | "http";
|
|
131
|
+
localProtocol: "https" | "http";
|
|
132
|
+
localUpstream: string | undefined;
|
|
133
|
+
enableLocalPersistence: boolean;
|
|
134
|
+
liveReload: boolean;
|
|
135
|
+
bindings: CfWorkerInit["bindings"];
|
|
136
|
+
define: Config["define"];
|
|
137
|
+
crons: Config["triggers"]["crons"];
|
|
138
|
+
isWorkersSite: boolean;
|
|
139
|
+
assetPaths: AssetPaths | undefined;
|
|
140
|
+
assetsConfig: Config["assets"];
|
|
141
|
+
compatibilityDate: string;
|
|
142
|
+
compatibilityFlags: string[] | undefined;
|
|
143
|
+
usageModel: "bundled" | "unbound" | undefined;
|
|
144
|
+
minify: boolean | undefined;
|
|
145
|
+
nodeCompat: boolean | undefined;
|
|
146
|
+
build: Config["build"];
|
|
147
|
+
env: string | undefined;
|
|
148
|
+
legacyEnv: boolean;
|
|
149
|
+
zone: string | undefined;
|
|
150
|
+
host: string | undefined;
|
|
151
|
+
routes: Route[] | undefined;
|
|
152
|
+
inspect: boolean;
|
|
153
|
+
logLevel: "none" | "error" | "log" | "warn" | "debug" | undefined;
|
|
154
|
+
logPrefix?: string;
|
|
155
|
+
onReady: (() => void) | undefined;
|
|
156
|
+
showInteractiveDevSession: boolean | undefined;
|
|
157
|
+
forceLocal: boolean | undefined;
|
|
158
|
+
enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
|
|
159
|
+
firstPartyWorker: boolean | undefined;
|
|
160
|
+
sendMetrics: boolean | undefined;
|
|
161
|
+
};
|
|
162
|
+
|
|
163
|
+
export function DevImplementation(props: DevProps): JSX.Element {
|
|
164
|
+
validateDevProps(props);
|
|
165
|
+
|
|
166
|
+
// only load the UI if we're running in a supported environment
|
|
167
|
+
const { isRawModeSupported } = useStdin();
|
|
168
|
+
|
|
169
|
+
return props.showInteractiveDevSession ?? isRawModeSupported ? (
|
|
170
|
+
<InteractiveDevSession {...props} />
|
|
171
|
+
) : (
|
|
172
|
+
<DevSession {...props} local={props.initialMode === "local"} />
|
|
173
|
+
);
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
function InteractiveDevSession(props: DevProps) {
|
|
177
|
+
const toggles = useHotkeys({
|
|
178
|
+
initial: {
|
|
179
|
+
local: props.initialMode === "local",
|
|
180
|
+
tunnel: false,
|
|
181
|
+
},
|
|
182
|
+
port: props.port,
|
|
183
|
+
ip: props.ip,
|
|
184
|
+
inspectorPort: props.inspectorPort,
|
|
185
|
+
inspect: props.inspect,
|
|
186
|
+
localProtocol: props.localProtocol,
|
|
187
|
+
forceLocal: props.forceLocal,
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
useTunnel(toggles.tunnel);
|
|
191
|
+
|
|
192
|
+
return (
|
|
193
|
+
<>
|
|
194
|
+
<DevSession {...props} local={toggles.local} />
|
|
195
|
+
<Box borderStyle="round" paddingLeft={1} paddingRight={1}>
|
|
196
|
+
<Text bold={true}>[b]</Text>
|
|
197
|
+
<Text> open a browser, </Text>
|
|
198
|
+
{props.inspect ? (
|
|
199
|
+
<>
|
|
200
|
+
<Text bold={true}>[d]</Text>
|
|
201
|
+
<Text> open Devtools, </Text>
|
|
202
|
+
</>
|
|
203
|
+
) : null}
|
|
204
|
+
{!props.forceLocal ? (
|
|
205
|
+
<>
|
|
206
|
+
<Text bold={true}>[l]</Text>
|
|
207
|
+
<Text> {toggles.local ? "turn off" : "turn on"} local mode, </Text>
|
|
208
|
+
</>
|
|
209
|
+
) : null}
|
|
210
|
+
<Text bold={true}>[c]</Text>
|
|
211
|
+
<Text> clear console, </Text>
|
|
212
|
+
<Text bold={true}>[x]</Text>
|
|
213
|
+
<Text> to exit</Text>
|
|
214
|
+
</Box>
|
|
215
|
+
</>
|
|
216
|
+
);
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
type DevSessionProps = DevProps & {
|
|
220
|
+
local: boolean;
|
|
221
|
+
};
|
|
222
|
+
|
|
223
|
+
function DevSession(props: DevSessionProps) {
|
|
224
|
+
useCustomBuild(props.entry, props.build);
|
|
225
|
+
|
|
226
|
+
const directory = useTmpDir();
|
|
227
|
+
|
|
228
|
+
const workerDefinitions = useDevRegistry(
|
|
229
|
+
props.name,
|
|
230
|
+
props.bindings.services,
|
|
231
|
+
props.local ? "local" : "remote"
|
|
232
|
+
);
|
|
233
|
+
|
|
234
|
+
const bundle = useEsbuild({
|
|
235
|
+
entry: props.entry,
|
|
236
|
+
destination: directory,
|
|
237
|
+
jsxFactory: props.jsxFactory,
|
|
238
|
+
rules: props.rules,
|
|
239
|
+
jsxFragment: props.jsxFragment,
|
|
240
|
+
serveAssetsFromWorker: Boolean(
|
|
241
|
+
props.assetPaths && !props.isWorkersSite && props.local
|
|
242
|
+
),
|
|
243
|
+
tsconfig: props.tsconfig,
|
|
244
|
+
minify: props.minify,
|
|
245
|
+
nodeCompat: props.nodeCompat,
|
|
246
|
+
define: props.define,
|
|
247
|
+
noBundle: props.noBundle,
|
|
248
|
+
assets: props.assetsConfig,
|
|
249
|
+
workerDefinitions,
|
|
250
|
+
services: props.bindings.services,
|
|
251
|
+
firstPartyWorkerDevFacade: props.firstPartyWorker,
|
|
252
|
+
});
|
|
253
|
+
|
|
254
|
+
return props.local ? (
|
|
255
|
+
<Local
|
|
256
|
+
name={props.name}
|
|
257
|
+
bundle={bundle}
|
|
258
|
+
format={props.entry.format}
|
|
259
|
+
compatibilityDate={props.compatibilityDate}
|
|
260
|
+
compatibilityFlags={props.compatibilityFlags}
|
|
261
|
+
bindings={props.bindings}
|
|
262
|
+
assetPaths={props.assetPaths}
|
|
263
|
+
port={props.port}
|
|
264
|
+
ip={props.ip}
|
|
265
|
+
rules={props.rules}
|
|
266
|
+
inspectorPort={props.inspectorPort}
|
|
267
|
+
enableLocalPersistence={props.enableLocalPersistence}
|
|
268
|
+
liveReload={props.liveReload}
|
|
269
|
+
crons={props.crons}
|
|
270
|
+
localProtocol={props.localProtocol}
|
|
271
|
+
localUpstream={props.localUpstream}
|
|
272
|
+
logLevel={props.logLevel}
|
|
273
|
+
logPrefix={props.logPrefix}
|
|
274
|
+
inspect={props.inspect}
|
|
275
|
+
onReady={props.onReady}
|
|
276
|
+
enablePagesAssetsServiceBinding={props.enablePagesAssetsServiceBinding}
|
|
277
|
+
/>
|
|
278
|
+
) : (
|
|
279
|
+
<Remote
|
|
280
|
+
name={props.name}
|
|
281
|
+
bundle={bundle}
|
|
282
|
+
format={props.entry.format}
|
|
283
|
+
accountId={props.accountId}
|
|
284
|
+
bindings={props.bindings}
|
|
285
|
+
assetPaths={props.assetPaths}
|
|
286
|
+
isWorkersSite={props.isWorkersSite}
|
|
287
|
+
port={props.port}
|
|
288
|
+
ip={props.ip}
|
|
289
|
+
localProtocol={props.localProtocol}
|
|
290
|
+
inspectorPort={props.inspectorPort}
|
|
291
|
+
// TODO: @threepointone #1167
|
|
292
|
+
// liveReload={props.liveReload}
|
|
293
|
+
inspect={props.inspect}
|
|
294
|
+
compatibilityDate={props.compatibilityDate}
|
|
295
|
+
compatibilityFlags={props.compatibilityFlags}
|
|
296
|
+
usageModel={props.usageModel}
|
|
297
|
+
env={props.env}
|
|
298
|
+
legacyEnv={props.legacyEnv}
|
|
299
|
+
zone={props.zone}
|
|
300
|
+
host={props.host}
|
|
301
|
+
routes={props.routes}
|
|
302
|
+
onReady={props.onReady}
|
|
303
|
+
sourceMapPath={bundle?.sourceMapPath}
|
|
304
|
+
sendMetrics={props.sendMetrics}
|
|
305
|
+
/>
|
|
306
|
+
);
|
|
307
|
+
}
|
|
308
|
+
|
|
309
|
+
export interface DirectorySyncResult {
|
|
310
|
+
name: string;
|
|
311
|
+
removeCallback: () => void;
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
function useTmpDir(): string | undefined {
|
|
315
|
+
const [directory, setDirectory] = useState<DirectorySyncResult>();
|
|
316
|
+
const handleError = useErrorHandler();
|
|
317
|
+
useEffect(() => {
|
|
318
|
+
let dir: DirectorySyncResult | undefined;
|
|
319
|
+
try {
|
|
320
|
+
dir = tmp.dirSync({ unsafeCleanup: true });
|
|
321
|
+
setDirectory(dir);
|
|
322
|
+
return;
|
|
323
|
+
} catch (err) {
|
|
324
|
+
logger.error(
|
|
325
|
+
"Failed to create temporary directory to store built files."
|
|
326
|
+
);
|
|
327
|
+
handleError(err);
|
|
328
|
+
}
|
|
329
|
+
return () => {
|
|
330
|
+
dir?.removeCallback();
|
|
331
|
+
};
|
|
332
|
+
}, [handleError]);
|
|
333
|
+
return directory?.name;
|
|
334
|
+
}
|
|
335
|
+
|
|
336
|
+
function useCustomBuild(expectedEntry: Entry, build: Config["build"]): void {
|
|
337
|
+
useEffect(() => {
|
|
338
|
+
if (!build.command) return;
|
|
339
|
+
let watcher: ReturnType<typeof watch> | undefined;
|
|
340
|
+
if (build.watch_dir) {
|
|
341
|
+
watcher = watch(build.watch_dir, {
|
|
342
|
+
persistent: true,
|
|
343
|
+
ignoreInitial: true,
|
|
344
|
+
}).on("all", (_event, filePath) => {
|
|
345
|
+
const relativeFile =
|
|
346
|
+
path.relative(expectedEntry.directory, expectedEntry.file) || ".";
|
|
347
|
+
//TODO: we should buffer requests to the proxy until this completes
|
|
348
|
+
logger.log(`The file ${filePath} changed, restarting build...`);
|
|
349
|
+
runCustomBuild(expectedEntry.file, relativeFile, build).catch((err) => {
|
|
350
|
+
logger.error("Custom build failed:", err);
|
|
351
|
+
});
|
|
352
|
+
});
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
return () => {
|
|
356
|
+
watcher?.close();
|
|
357
|
+
};
|
|
358
|
+
}, [build, expectedEntry]);
|
|
359
|
+
}
|
|
360
|
+
|
|
361
|
+
function sleep(period: number) {
|
|
362
|
+
return new Promise((resolve) => setTimeout(resolve, period));
|
|
363
|
+
}
|
|
364
|
+
const SLEEP_DURATION = 2000;
|
|
365
|
+
// really need a first class api for this
|
|
366
|
+
const hostNameRegex = /userHostname="(.*)"/g;
|
|
367
|
+
async function findTunnelHostname() {
|
|
368
|
+
let hostName: string | undefined;
|
|
369
|
+
while (!hostName) {
|
|
370
|
+
try {
|
|
371
|
+
const resp = await fetch("http://localhost:8789/metrics");
|
|
372
|
+
const data = await resp.text();
|
|
373
|
+
const matches = Array.from(data.matchAll(hostNameRegex));
|
|
374
|
+
hostName = matches[0][1];
|
|
375
|
+
} catch (err) {
|
|
376
|
+
await sleep(SLEEP_DURATION);
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
return hostName;
|
|
380
|
+
}
|
|
381
|
+
|
|
382
|
+
/**
|
|
383
|
+
* Create a tunnel to the remote worker.
|
|
384
|
+
* We've disabled this for now until we figure out a better user experience.
|
|
385
|
+
*/
|
|
386
|
+
function useTunnel(toggle: boolean) {
|
|
387
|
+
const tunnel = useRef<ReturnType<typeof spawn>>();
|
|
388
|
+
const removeSignalExitListener = useRef<() => void>();
|
|
389
|
+
// TODO: test if cloudflared is available, if not
|
|
390
|
+
// point them to a url where they can get docs to install it
|
|
391
|
+
useEffect(() => {
|
|
392
|
+
async function startTunnel() {
|
|
393
|
+
if (toggle) {
|
|
394
|
+
try {
|
|
395
|
+
await commandExists("cloudflared");
|
|
396
|
+
} catch (e) {
|
|
397
|
+
logger.warn(
|
|
398
|
+
"To share your worker on the Internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
|
|
399
|
+
);
|
|
400
|
+
return;
|
|
401
|
+
}
|
|
402
|
+
logger.log("⎔ Starting a tunnel...");
|
|
403
|
+
tunnel.current = spawn("cloudflared", [
|
|
404
|
+
"tunnel",
|
|
405
|
+
"--url",
|
|
406
|
+
"http://localhost:8787",
|
|
407
|
+
"--metrics",
|
|
408
|
+
"localhost:8789",
|
|
409
|
+
]);
|
|
410
|
+
|
|
411
|
+
tunnel.current.on("close", (code) => {
|
|
412
|
+
if (code) {
|
|
413
|
+
logger.log(`Tunnel process exited with code ${code}`);
|
|
414
|
+
}
|
|
415
|
+
});
|
|
416
|
+
|
|
417
|
+
removeSignalExitListener.current = onExit((_code, _signal) => {
|
|
418
|
+
logger.log("⎔ Shutting down local tunnel.");
|
|
419
|
+
tunnel.current?.kill();
|
|
420
|
+
tunnel.current = undefined;
|
|
421
|
+
});
|
|
422
|
+
|
|
423
|
+
const hostName = await findTunnelHostname();
|
|
424
|
+
await clipboardy.write(hostName);
|
|
425
|
+
logger.log(`⬣ Sharing at ${hostName}, copied to clipboard.`);
|
|
426
|
+
}
|
|
427
|
+
}
|
|
428
|
+
|
|
429
|
+
startTunnel().catch(async (err) => {
|
|
430
|
+
logger.error("tunnel:", err);
|
|
431
|
+
});
|
|
432
|
+
|
|
433
|
+
return () => {
|
|
434
|
+
if (tunnel.current) {
|
|
435
|
+
logger.log("⎔ Shutting down tunnel.");
|
|
436
|
+
tunnel.current?.kill();
|
|
437
|
+
tunnel.current = undefined;
|
|
438
|
+
removeSignalExitListener.current && removeSignalExitListener.current();
|
|
439
|
+
removeSignalExitListener.current = undefined;
|
|
440
|
+
}
|
|
441
|
+
};
|
|
442
|
+
}, [toggle]);
|
|
443
|
+
}
|
|
444
|
+
|
|
445
|
+
type useHotkeysInitialState = {
|
|
446
|
+
local: boolean;
|
|
447
|
+
tunnel: boolean;
|
|
448
|
+
};
|
|
449
|
+
function useHotkeys(props: {
|
|
450
|
+
initial: useHotkeysInitialState;
|
|
451
|
+
port: number;
|
|
452
|
+
ip: string;
|
|
453
|
+
inspectorPort: number;
|
|
454
|
+
inspect: boolean;
|
|
455
|
+
localProtocol: "http" | "https";
|
|
456
|
+
forceLocal: boolean | undefined;
|
|
457
|
+
}) {
|
|
458
|
+
const {
|
|
459
|
+
initial,
|
|
460
|
+
port,
|
|
461
|
+
ip,
|
|
462
|
+
inspectorPort,
|
|
463
|
+
inspect,
|
|
464
|
+
localProtocol,
|
|
465
|
+
forceLocal,
|
|
466
|
+
} = props;
|
|
467
|
+
// UGH, we should put port in context instead
|
|
468
|
+
const [toggles, setToggles] = useState(initial);
|
|
469
|
+
const { exit } = useApp();
|
|
470
|
+
useInput(
|
|
471
|
+
async (
|
|
472
|
+
input,
|
|
473
|
+
// eslint-disable-next-line unused-imports/no-unused-vars
|
|
474
|
+
key
|
|
475
|
+
) => {
|
|
476
|
+
switch (input.toLowerCase()) {
|
|
477
|
+
// clear console
|
|
478
|
+
case "c":
|
|
479
|
+
console.clear();
|
|
480
|
+
// This console.log causes Ink to re-render the `DevSession` component.
|
|
481
|
+
// Couldn't find a better way to tell it to do so...
|
|
482
|
+
console.log();
|
|
483
|
+
break;
|
|
484
|
+
// open browser
|
|
485
|
+
case "b": {
|
|
486
|
+
await openInBrowser(`${localProtocol}://${ip}:${port}`);
|
|
487
|
+
break;
|
|
488
|
+
}
|
|
489
|
+
// toggle inspector
|
|
490
|
+
case "d": {
|
|
491
|
+
if (inspect) {
|
|
492
|
+
await openInspector(inspectorPort);
|
|
493
|
+
}
|
|
494
|
+
break;
|
|
495
|
+
}
|
|
496
|
+
// toggle local
|
|
497
|
+
case "l":
|
|
498
|
+
if (forceLocal) return;
|
|
499
|
+
setToggles((previousToggles) => ({
|
|
500
|
+
...previousToggles,
|
|
501
|
+
local: !previousToggles.local,
|
|
502
|
+
}));
|
|
503
|
+
break;
|
|
504
|
+
// shut down
|
|
505
|
+
case "q":
|
|
506
|
+
case "x":
|
|
507
|
+
exit();
|
|
508
|
+
break;
|
|
509
|
+
default:
|
|
510
|
+
// nothing?
|
|
511
|
+
break;
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
);
|
|
515
|
+
return toggles;
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
function ErrorFallback(props: { error: Error }) {
|
|
519
|
+
const { exit } = useApp();
|
|
520
|
+
useEffect(() => exit(props.error));
|
|
521
|
+
return (
|
|
522
|
+
<>
|
|
523
|
+
<Text>Something went wrong:</Text>
|
|
524
|
+
<Text>{props.error.stack}</Text>
|
|
525
|
+
</>
|
|
526
|
+
);
|
|
527
|
+
}
|
|
528
|
+
|
|
529
|
+
export default withErrorBoundary(DevImplementation, {
|
|
530
|
+
FallbackComponent: ErrorFallback,
|
|
531
|
+
});
|