wrangler 0.0.0-e61fba8 → 0.0.0-e665ccc3
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 +24 -4
- package/bin/wrangler.js +170 -62
- package/miniflare-dist/index.mjs +1643 -83
- package/package.json +198 -154
- package/src/__tests__/access.test.ts +25 -0
- package/src/__tests__/api-dev.test.ts +238 -0
- package/src/__tests__/api-devregistry.test.ts +121 -0
- package/src/__tests__/api.test.ts +102 -0
- package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
- package/src/__tests__/config-cache.test.ts +30 -24
- package/src/__tests__/configuration.test.ts +4506 -3476
- package/src/__tests__/constellation.test.ts +371 -0
- package/src/__tests__/d1/d1.test.ts +82 -0
- package/src/__tests__/d1/execute.test.ts +66 -0
- package/src/__tests__/d1/migrate.test.ts +257 -0
- package/src/__tests__/d1/splitter.test.ts +255 -0
- package/src/__tests__/delete.test.ts +272 -0
- package/src/__tests__/deployments.test.ts +369 -0
- package/src/__tests__/dev.test.tsx +1590 -983
- package/src/__tests__/generate.test.ts +237 -0
- package/src/__tests__/get-host-from-url.test.ts +16 -0
- package/src/__tests__/guess-worker-format.test.ts +103 -68
- package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
- package/src/__tests__/helpers/end-event-loop.ts +6 -0
- package/src/__tests__/helpers/mock-account-id.ts +24 -24
- package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
- package/src/__tests__/helpers/mock-bin.ts +20 -20
- package/src/__tests__/helpers/mock-console.ts +64 -39
- package/src/__tests__/helpers/mock-dialogs.ts +88 -79
- package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
- package/src/__tests__/helpers/mock-http-server.ts +30 -30
- package/src/__tests__/helpers/mock-istty.ts +65 -18
- package/src/__tests__/helpers/mock-known-routes.ts +12 -0
- package/src/__tests__/helpers/mock-kv.ts +41 -28
- package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
- package/src/__tests__/helpers/mock-process.ts +34 -0
- package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
- package/src/__tests__/helpers/mock-stdin.ts +82 -77
- package/src/__tests__/helpers/mock-web-socket.ts +21 -21
- package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
- package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
- package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
- package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
- package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
- package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
- package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
- package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
- package/src/__tests__/helpers/msw/index.ts +52 -0
- package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
- package/src/__tests__/helpers/run-in-tmp.ts +27 -28
- package/src/__tests__/helpers/run-wrangler.ts +8 -8
- package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
- package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
- package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
- package/src/__tests__/helpers/write-worker-source.ts +16 -16
- package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
- package/src/__tests__/https-options.test.ts +142 -109
- package/src/__tests__/index.test.ts +262 -237
- package/src/__tests__/init.test.ts +3167 -1608
- package/src/__tests__/jest.setup.ts +152 -50
- package/src/__tests__/kv.test.ts +1789 -1492
- package/src/__tests__/logger.test.ts +167 -75
- package/src/__tests__/logout.test.ts +47 -0
- package/src/__tests__/metrics.test.ts +493 -0
- package/src/__tests__/middleware.scheduled.test.ts +145 -0
- package/src/__tests__/middleware.test.ts +816 -0
- package/src/__tests__/mtls-certificates.test.ts +589 -0
- package/src/__tests__/package-manager.test.ts +303 -303
- package/src/__tests__/pages/deployment-list.test.ts +80 -0
- package/src/__tests__/pages/functions-build.test.ts +528 -0
- package/src/__tests__/pages/pages.test.ts +81 -0
- package/src/__tests__/pages/project-create.test.ts +63 -0
- package/src/__tests__/pages/project-list.test.ts +110 -0
- package/src/__tests__/pages/project-upload.test.ts +500 -0
- package/src/__tests__/pages/publish.test.ts +2864 -0
- package/src/__tests__/pages-deployment-tail.test.ts +957 -0
- package/src/__tests__/parse.test.ts +358 -252
- package/src/__tests__/paths.test.ts +39 -0
- package/src/__tests__/publish.test.ts +8716 -5687
- package/src/__tests__/pubsub.test.ts +496 -0
- package/src/__tests__/queues.test.ts +532 -0
- package/src/__tests__/r2.test.ts +369 -228
- package/src/__tests__/route.test.ts +18 -18
- package/src/__tests__/secret.test.ts +681 -469
- package/src/__tests__/tail.test.ts +866 -567
- package/src/__tests__/test-old-node-version.js +31 -0
- package/src/__tests__/traverse-module-graph.test.ts +220 -0
- package/src/__tests__/tsconfig-sanity.ts +12 -0
- package/src/__tests__/tsconfig.json +8 -0
- package/src/__tests__/tsconfig.tsbuildinfo +1 -0
- package/src/__tests__/type-generation.test.ts +234 -0
- package/src/__tests__/user.test.ts +107 -120
- package/src/__tests__/utils-collectKeyValues.test.ts +47 -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 +165 -132
- package/src/__tests__/worker-namespace.test.ts +340 -0
- package/src/abort.d.ts +1 -1
- package/src/api/dev.ts +321 -0
- package/src/api/index.ts +11 -0
- package/src/api/mtls-certificate.ts +148 -0
- package/src/api/pages/create-worker-bundle-contents.ts +77 -0
- package/src/api/pages/index.ts +5 -0
- package/src/api/pages/publish.tsx +371 -0
- package/src/bundle-reporter.ts +68 -0
- package/src/bundle.ts +890 -165
- package/src/cfetch/index.ts +120 -83
- package/src/cfetch/internal.ts +208 -92
- package/src/cli.ts +23 -8
- package/src/config/config.ts +244 -196
- package/src/config/diagnostics.ts +61 -61
- package/src/config/environment.ts +562 -357
- package/src/config/index.ts +374 -196
- package/src/config/validation-helpers.ts +379 -366
- package/src/config/validation.ts +2197 -1376
- package/src/config-cache.ts +81 -41
- package/src/constellation/createProject.tsx +51 -0
- package/src/constellation/deleteProject.ts +51 -0
- package/src/constellation/deleteProjectModel.ts +68 -0
- package/src/constellation/index.ts +75 -0
- package/src/constellation/listCatalog.tsx +35 -0
- package/src/constellation/listModel.tsx +41 -0
- package/src/constellation/listProject.tsx +28 -0
- package/src/constellation/listRuntime.tsx +28 -0
- package/src/constellation/options.ts +17 -0
- package/src/constellation/types.ts +17 -0
- package/src/constellation/uploadModel.tsx +64 -0
- package/src/constellation/utils.ts +90 -0
- package/src/create-worker-preview.ts +250 -142
- package/src/create-worker-upload-form.ts +347 -238
- package/src/d1/backups.tsx +219 -0
- package/src/d1/constants.ts +2 -0
- package/src/d1/create.tsx +70 -0
- package/src/d1/delete.ts +53 -0
- package/src/d1/execute.tsx +357 -0
- package/src/d1/formatTimeAgo.ts +14 -0
- package/src/d1/index.ts +100 -0
- package/src/d1/list.tsx +62 -0
- package/src/d1/migrations/apply.tsx +212 -0
- package/src/d1/migrations/create.tsx +79 -0
- package/src/d1/migrations/helpers.ts +169 -0
- package/src/d1/migrations/index.ts +3 -0
- package/src/d1/migrations/list.tsx +95 -0
- package/src/d1/migrations/options.ts +23 -0
- package/src/d1/options.ts +22 -0
- package/src/d1/splitter.ts +161 -0
- package/src/d1/types.ts +25 -0
- package/src/d1/utils.ts +49 -0
- package/src/delete.ts +100 -0
- package/src/deployments.ts +368 -0
- package/src/deprecated/index.ts +144 -0
- package/src/dev/dev-vars.ts +20 -17
- package/src/dev/dev.tsx +535 -325
- package/src/dev/get-local-persistence-path.ts +31 -0
- package/src/dev/local.tsx +932 -301
- package/src/dev/remote.tsx +623 -228
- package/src/dev/start-server.ts +545 -0
- package/src/dev/use-esbuild.ts +194 -94
- package/src/dev/validate-dev-props.ts +40 -0
- package/src/dev-registry.ts +202 -0
- package/src/dev.tsx +934 -0
- package/src/dialogs.ts +136 -0
- package/src/dispatch-namespace.ts +211 -0
- package/src/docs/helpers.ts +50 -0
- package/src/docs/index.ts +54 -0
- package/src/durable.ts +87 -87
- package/src/entry.ts +253 -231
- package/src/environment-variables/factory.ts +89 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/errors.ts +6 -6
- package/src/generate/index.ts +298 -0
- package/src/git-client.ts +135 -0
- package/src/global-wrangler-config-path.ts +26 -0
- package/src/https-options.ts +84 -80
- package/src/index.ts +768 -0
- package/src/init.ts +1037 -0
- package/src/inspect.ts +816 -595
- package/src/intl-polyfill.d.ts +123 -123
- package/src/is-ci.ts +14 -0
- package/src/is-interactive.ts +16 -0
- package/src/jest.d.ts +4 -0
- package/src/kv/helpers.ts +433 -0
- package/src/kv/index.ts +594 -0
- package/src/logger.ts +100 -43
- package/src/metrics/index.ts +5 -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 +99 -0
- package/src/miniflare-cli/assets.ts +255 -0
- package/src/miniflare-cli/index.ts +202 -33
- package/src/miniflare-cli/request-context.ts +18 -18
- package/src/miniflare-cli/tsconfig.json +9 -0
- package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
- package/src/miniflare-cli/types.ts +11 -0
- package/src/module-collection.ts +290 -215
- package/src/mtls-certificate/cli.ts +155 -0
- package/src/open-in-browser.ts +4 -6
- package/src/package-manager.ts +173 -128
- package/src/pages/build.ts +423 -0
- package/src/pages/buildFunctions.ts +140 -0
- package/src/pages/constants.ts +18 -0
- package/src/pages/deployment-tails.ts +281 -0
- package/src/pages/deployments.tsx +84 -0
- package/src/pages/dev.ts +734 -0
- package/src/pages/errors.ts +67 -0
- package/src/pages/functions/buildPlugin.ts +114 -0
- package/src/pages/functions/buildWorker.ts +350 -0
- package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
- package/src/pages/functions/filepath-routing.ts +189 -0
- package/src/pages/functions/identifiers.ts +78 -0
- package/src/pages/functions/routes-consolidation.test.ts +250 -0
- package/src/pages/functions/routes-consolidation.ts +73 -0
- package/src/pages/functions/routes-transformation.test.ts +282 -0
- package/src/pages/functions/routes-transformation.ts +115 -0
- package/src/pages/functions/routes-validation.test.ts +403 -0
- package/src/pages/functions/routes-validation.ts +202 -0
- package/src/pages/functions/routes.ts +151 -0
- package/src/pages/functions/tsconfig.json +8 -0
- package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
- package/src/pages/functions.ts +86 -0
- package/src/pages/hash.ts +13 -0
- package/src/pages/index.ts +102 -0
- package/src/pages/projects.tsx +159 -0
- package/src/pages/prompt-select-project.tsx +31 -0
- package/src/pages/publish.tsx +267 -0
- package/src/pages/types.ts +46 -0
- package/src/pages/upload.tsx +469 -0
- package/src/pages/utils.ts +23 -0
- package/src/parse.ts +225 -139
- package/src/paths.ts +53 -8
- package/src/proxy.ts +623 -407
- package/src/publish/index.ts +274 -0
- package/src/publish/publish.ts +1065 -0
- package/src/pubsub/index.ts +286 -0
- package/src/pubsub/pubsub-commands.ts +623 -0
- package/src/queues/cli/commands/consumer/add.ts +71 -0
- package/src/queues/cli/commands/consumer/index.ts +19 -0
- package/src/queues/cli/commands/consumer/remove.ts +31 -0
- package/src/queues/cli/commands/create.ts +25 -0
- package/src/queues/cli/commands/delete.ts +26 -0
- package/src/queues/cli/commands/index.ts +35 -0
- package/src/queues/cli/commands/list.ts +25 -0
- package/src/queues/client.ts +136 -0
- package/src/queues/utils.ts +18 -0
- package/src/r2/constants.ts +4 -0
- package/src/r2/helpers.ts +132 -0
- package/src/r2/index.ts +289 -0
- package/src/routes.ts +140 -0
- package/src/secret/index.ts +377 -0
- package/src/selfsigned.d.ts +23 -23
- package/src/sites.ts +484 -0
- package/src/tail/createTail.ts +415 -0
- package/src/tail/filters.ts +109 -111
- package/src/tail/index.ts +208 -296
- package/src/tail/printing.ts +116 -51
- package/src/traverse-module-graph.ts +54 -0
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +181 -0
- package/src/update-check.ts +11 -11
- package/src/user/access.ts +68 -0
- package/src/user/auth-variables.ts +113 -0
- package/src/user/choose-account.tsx +39 -0
- package/src/user/generate-auth-url.ts +33 -0
- package/src/user/generate-random-state.ts +16 -0
- package/src/user/index.ts +2 -0
- package/src/user/user.ts +1234 -0
- package/src/utils/collectKeyValues.ts +14 -0
- package/src/utils/render.ts +93 -0
- package/src/whoami.ts +135 -0
- package/src/worker.ts +205 -107
- package/src/yargs-types.ts +37 -0
- package/src/zones.ts +158 -40
- package/templates/__tests__/pages-dev-util.test.ts +128 -0
- package/templates/__tests__/tsconfig-sanity.ts +12 -0
- package/templates/__tests__/tsconfig.json +8 -0
- package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
- package/templates/checked-fetch.js +23 -0
- package/templates/d1-beta-facade.js +244 -0
- package/templates/facade.d.ts +14 -0
- package/templates/first-party-worker-module-facade.ts +19 -0
- package/templates/format-dev-errors.ts +34 -0
- package/templates/gitignore +1 -0
- package/templates/init-tests/test-jest-new-worker.js +23 -0
- package/templates/init-tests/test-vitest-new-worker.js +24 -0
- package/templates/init-tests/test-vitest-new-worker.ts +25 -0
- package/templates/middleware/common.ts +62 -0
- package/templates/middleware/loader-modules.ts +84 -0
- package/templates/middleware/loader-sw.ts +233 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
- package/templates/middleware/middleware-pretty-error.ts +40 -0
- package/templates/middleware/middleware-scheduled.ts +15 -0
- package/templates/new-worker-scheduled.js +3 -3
- package/templates/new-worker-scheduled.ts +15 -15
- package/templates/new-worker.js +3 -3
- package/templates/new-worker.ts +18 -15
- package/templates/no-op-worker.js +10 -0
- package/templates/pages-dev-pipeline.ts +31 -0
- package/templates/pages-dev-util.ts +52 -0
- package/templates/pages-shim.ts +12 -0
- package/templates/pages-template-plugin.ts +180 -0
- package/templates/pages-template-worker.ts +189 -0
- package/templates/serve-static-assets.ts +66 -0
- package/templates/service-bindings-module-facade.js +55 -0
- package/templates/service-bindings-sw-facade.js +42 -0
- package/templates/tsconfig-sanity.ts +11 -0
- package/templates/tsconfig.init.json +105 -0
- package/templates/tsconfig.json +6 -103
- package/templates/tsconfig.tsbuildinfo +1 -0
- package/wrangler-dist/cli.d.ts +1652 -0
- package/wrangler-dist/cli.js +139094 -111923
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/pages/functions/buildPlugin.ts +0 -105
- package/pages/functions/buildWorker.ts +0 -151
- package/pages/functions/filepath-routing.ts +0 -189
- package/pages/functions/identifiers.ts +0 -78
- package/pages/functions/routes.ts +0 -156
- package/pages/functions/template-plugin.ts +0 -147
- package/pages/functions/template-worker.ts +0 -143
- package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
- package/src/__tests__/helpers/mock-cfetch.ts +0 -211
- package/src/__tests__/pages.test.ts +0 -754
- package/src/dialogs.tsx +0 -135
- package/src/environment-variables.ts +0 -35
- package/src/index.tsx +0 -2859
- package/src/kv.ts +0 -408
- package/src/miniflare-cli/enum-keys.ts +0 -17
- package/src/pages.tsx +0 -2093
- package/src/publish.ts +0 -721
- package/src/r2.ts +0 -50
- package/src/sites.tsx +0 -326
- package/src/user.tsx +0 -1214
- package/src/whoami.tsx +0 -71
- package/templates/static-asset-facade.js +0 -43
package/src/dev/dev.tsx
CHANGED
|
@@ -1,14 +1,21 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
2
|
import * as path from "node:path";
|
|
3
|
+
import * as util from "node:util";
|
|
3
4
|
import { watch } from "chokidar";
|
|
4
5
|
import clipboardy from "clipboardy";
|
|
5
6
|
import commandExists from "command-exists";
|
|
6
7
|
import { Box, Text, useApp, useInput, useStdin } from "ink";
|
|
7
|
-
import React, { useState, useEffect, useRef } from "react";
|
|
8
|
+
import React, { useState, useEffect, useRef, useMemo } from "react";
|
|
8
9
|
import { withErrorBoundary, useErrorHandler } from "react-error-boundary";
|
|
9
10
|
import onExit from "signal-exit";
|
|
10
11
|
import tmp from "tmp-promise";
|
|
11
12
|
import { fetch } from "undici";
|
|
13
|
+
import {
|
|
14
|
+
getBoundRegisteredWorkers,
|
|
15
|
+
startWorkerRegistry,
|
|
16
|
+
stopWorkerRegistry,
|
|
17
|
+
unregisterWorker,
|
|
18
|
+
} from "../dev-registry";
|
|
12
19
|
import { runCustomBuild } from "../entry";
|
|
13
20
|
import { openInspector } from "../inspect";
|
|
14
21
|
import { logger } from "../logger";
|
|
@@ -16,245 +23,438 @@ import openInBrowser from "../open-in-browser";
|
|
|
16
23
|
import { Local } from "./local";
|
|
17
24
|
import { Remote } from "./remote";
|
|
18
25
|
import { useEsbuild } from "./use-esbuild";
|
|
26
|
+
import { validateDevProps } from "./validate-dev-props";
|
|
19
27
|
import type { Config } from "../config";
|
|
28
|
+
import type { Route } from "../config/environment";
|
|
29
|
+
import type { WorkerRegistry } from "../dev-registry";
|
|
20
30
|
import type { Entry } from "../entry";
|
|
31
|
+
import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli/types";
|
|
21
32
|
import type { AssetPaths } from "../sites";
|
|
22
33
|
import type { CfWorkerInit } from "../worker";
|
|
23
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
|
+
durableObjects: Config["durable_objects"] | undefined,
|
|
44
|
+
mode: "local" | "remote"
|
|
45
|
+
): WorkerRegistry {
|
|
46
|
+
const [workers, setWorkers] = useState<WorkerRegistry>({});
|
|
47
|
+
|
|
48
|
+
useEffect(() => {
|
|
49
|
+
// Let's try to start registry
|
|
50
|
+
// TODO: we should probably call this in a loop
|
|
51
|
+
// in case the registry dies elsewhere
|
|
52
|
+
startWorkerRegistry().catch((err) => {
|
|
53
|
+
logger.error("failed to start worker registry", err);
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
const interval =
|
|
57
|
+
// TODO: enable this for remote mode as well
|
|
58
|
+
// https://github.com/cloudflare/workers-sdk/issues/1182
|
|
59
|
+
mode === "local"
|
|
60
|
+
? setInterval(() => {
|
|
61
|
+
getBoundRegisteredWorkers({
|
|
62
|
+
services,
|
|
63
|
+
durableObjects,
|
|
64
|
+
}).then(
|
|
65
|
+
(boundRegisteredWorkers: WorkerRegistry | undefined) => {
|
|
66
|
+
setWorkers((prevWorkers) => {
|
|
67
|
+
if (
|
|
68
|
+
!util.isDeepStrictEqual(boundRegisteredWorkers, prevWorkers)
|
|
69
|
+
) {
|
|
70
|
+
return boundRegisteredWorkers || {};
|
|
71
|
+
}
|
|
72
|
+
return prevWorkers;
|
|
73
|
+
});
|
|
74
|
+
},
|
|
75
|
+
(err) => {
|
|
76
|
+
logger.warn("Failed to get worker definitions", err);
|
|
77
|
+
}
|
|
78
|
+
);
|
|
79
|
+
}, 300)
|
|
80
|
+
: undefined;
|
|
81
|
+
|
|
82
|
+
return () => {
|
|
83
|
+
interval && clearInterval(interval);
|
|
84
|
+
Promise.allSettled([
|
|
85
|
+
name ? unregisterWorker(name) : Promise.resolve(),
|
|
86
|
+
stopWorkerRegistry(),
|
|
87
|
+
]).then(
|
|
88
|
+
([unregisterResult, stopRegistryResult]) => {
|
|
89
|
+
if (unregisterResult.status === "rejected") {
|
|
90
|
+
logger.error(
|
|
91
|
+
"Failed to unregister worker",
|
|
92
|
+
unregisterResult.reason
|
|
93
|
+
);
|
|
94
|
+
}
|
|
95
|
+
if (stopRegistryResult.status === "rejected") {
|
|
96
|
+
logger.error(
|
|
97
|
+
"Failed to stop worker registry",
|
|
98
|
+
stopRegistryResult.reason
|
|
99
|
+
);
|
|
100
|
+
}
|
|
101
|
+
},
|
|
102
|
+
(err) => {
|
|
103
|
+
logger.error("Failed to clear dev registry effect", err);
|
|
104
|
+
}
|
|
105
|
+
);
|
|
106
|
+
};
|
|
107
|
+
}, [name, services, durableObjects, mode]);
|
|
108
|
+
|
|
109
|
+
return workers;
|
|
110
|
+
}
|
|
111
|
+
|
|
24
112
|
export type DevProps = {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
113
|
+
name: string | undefined;
|
|
114
|
+
noBundle: boolean;
|
|
115
|
+
entry: Entry;
|
|
116
|
+
initialPort: number;
|
|
117
|
+
initialIp: string;
|
|
118
|
+
inspectorPort: number;
|
|
119
|
+
processEntrypoint: boolean;
|
|
120
|
+
rules: Config["rules"];
|
|
121
|
+
accountId: string | undefined;
|
|
122
|
+
initialMode: "local" | "remote";
|
|
123
|
+
jsxFactory: string | undefined;
|
|
124
|
+
jsxFragment: string | undefined;
|
|
125
|
+
tsconfig: string | undefined;
|
|
126
|
+
upstreamProtocol: "https" | "http";
|
|
127
|
+
localProtocol: "https" | "http";
|
|
128
|
+
localUpstream: string | undefined;
|
|
129
|
+
localPersistencePath: string | null;
|
|
130
|
+
liveReload: boolean;
|
|
131
|
+
bindings: CfWorkerInit["bindings"];
|
|
132
|
+
define: Config["define"];
|
|
133
|
+
crons: Config["triggers"]["crons"];
|
|
134
|
+
queueConsumers: Config["queues"]["consumers"];
|
|
135
|
+
isWorkersSite: boolean;
|
|
136
|
+
assetPaths: AssetPaths | undefined;
|
|
137
|
+
assetsConfig: Config["assets"];
|
|
138
|
+
compatibilityDate: string;
|
|
139
|
+
compatibilityFlags: string[] | undefined;
|
|
140
|
+
usageModel: "bundled" | "unbound" | undefined;
|
|
141
|
+
minify: boolean | undefined;
|
|
142
|
+
legacyNodeCompat: boolean | undefined;
|
|
143
|
+
nodejsCompat: boolean | undefined;
|
|
144
|
+
build: Config["build"];
|
|
145
|
+
env: string | undefined;
|
|
146
|
+
legacyEnv: boolean;
|
|
147
|
+
zone: string | undefined;
|
|
148
|
+
host: string | undefined;
|
|
149
|
+
routes: Route[] | undefined;
|
|
150
|
+
inspect: boolean;
|
|
151
|
+
onReady: ((ip: string, port: number) => void) | undefined;
|
|
152
|
+
showInteractiveDevSession: boolean | undefined;
|
|
153
|
+
forceLocal: boolean | undefined;
|
|
154
|
+
enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
|
|
155
|
+
firstPartyWorker: boolean | undefined;
|
|
156
|
+
sendMetrics: boolean | undefined;
|
|
157
|
+
testScheduled: boolean | undefined;
|
|
158
|
+
experimentalLocal: boolean | undefined;
|
|
159
|
+
experimentalLocalRemoteKv: boolean | undefined;
|
|
53
160
|
};
|
|
54
161
|
|
|
55
162
|
export function DevImplementation(props: DevProps): JSX.Element {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
if (props.bindings.text_blobs && props.entry.format === "modules") {
|
|
69
|
-
throw new Error(
|
|
70
|
-
"You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
|
|
71
|
-
);
|
|
72
|
-
}
|
|
73
|
-
|
|
74
|
-
if (props.bindings.data_blobs && props.entry.format === "modules") {
|
|
75
|
-
throw new Error(
|
|
76
|
-
"You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure `[rules]` in your wrangler.toml"
|
|
77
|
-
);
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
// only load the UI if we're running in a supported environment
|
|
81
|
-
const { isRawModeSupported } = useStdin();
|
|
82
|
-
return isRawModeSupported ? (
|
|
83
|
-
<InteractiveDevSession {...props} />
|
|
84
|
-
) : (
|
|
85
|
-
<DevSession {...props} local={props.initialMode === "local"} />
|
|
86
|
-
);
|
|
163
|
+
validateDevProps(props);
|
|
164
|
+
|
|
165
|
+
// only load the UI if we're running in a supported environment
|
|
166
|
+
const { isRawModeSupported } = useStdin();
|
|
167
|
+
|
|
168
|
+
return props.showInteractiveDevSession ?? isRawModeSupported ? (
|
|
169
|
+
<InteractiveDevSession {...props} />
|
|
170
|
+
) : (
|
|
171
|
+
<DevSession {...props} local={props.initialMode === "local"} />
|
|
172
|
+
);
|
|
87
173
|
}
|
|
88
174
|
|
|
175
|
+
// This is a nasty hack to allow `useHotkeys` and its "[b] open a browser" feature to read these values
|
|
176
|
+
// without triggering a re-render loop when `onReady()` updates them.
|
|
177
|
+
// The initially requested port can be different than what's actually used, if, for example, you request port 0.
|
|
178
|
+
let ip: string;
|
|
179
|
+
let port: number;
|
|
180
|
+
|
|
89
181
|
function InteractiveDevSession(props: DevProps) {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
182
|
+
const toggles = useHotkeys({
|
|
183
|
+
initial: {
|
|
184
|
+
local: props.initialMode === "local",
|
|
185
|
+
tunnel: false,
|
|
186
|
+
},
|
|
187
|
+
inspectorPort: props.inspectorPort,
|
|
188
|
+
inspect: props.inspect,
|
|
189
|
+
localProtocol: props.localProtocol,
|
|
190
|
+
forceLocal: props.forceLocal,
|
|
191
|
+
worker: props.name,
|
|
192
|
+
});
|
|
193
|
+
|
|
194
|
+
ip = props.initialIp;
|
|
195
|
+
port = props.initialPort;
|
|
196
|
+
|
|
197
|
+
useTunnel(toggles.tunnel);
|
|
198
|
+
|
|
199
|
+
const onReady = (newIp: string, newPort: number) => {
|
|
200
|
+
if (newIp !== props.initialIp || newPort !== props.initialPort) {
|
|
201
|
+
ip = newIp;
|
|
202
|
+
port = newPort;
|
|
203
|
+
if (props.onReady) {
|
|
204
|
+
props.onReady(newIp, newPort);
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
};
|
|
208
|
+
|
|
209
|
+
return (
|
|
210
|
+
<>
|
|
211
|
+
<DevSession {...props} local={toggles.local} onReady={onReady} />
|
|
212
|
+
<Box borderStyle="round" paddingLeft={1} paddingRight={1}>
|
|
213
|
+
<Text bold={true}>[b]</Text>
|
|
214
|
+
<Text> open a browser, </Text>
|
|
215
|
+
{props.inspect ? (
|
|
216
|
+
<>
|
|
217
|
+
<Text bold={true}>[d]</Text>
|
|
218
|
+
<Text> open Devtools, </Text>
|
|
219
|
+
</>
|
|
220
|
+
) : null}
|
|
221
|
+
{!props.forceLocal ? (
|
|
222
|
+
<>
|
|
223
|
+
<Text bold={true}>[l]</Text>
|
|
224
|
+
<Text> {toggles.local ? "turn off" : "turn on"} local mode, </Text>
|
|
225
|
+
</>
|
|
226
|
+
) : null}
|
|
227
|
+
<Text bold={true}>[c]</Text>
|
|
228
|
+
<Text> clear console, </Text>
|
|
229
|
+
<Text bold={true}>[x]</Text>
|
|
230
|
+
<Text> to exit</Text>
|
|
231
|
+
</Box>
|
|
232
|
+
</>
|
|
233
|
+
);
|
|
120
234
|
}
|
|
121
235
|
|
|
122
236
|
type DevSessionProps = DevProps & {
|
|
123
|
-
|
|
237
|
+
local: boolean;
|
|
238
|
+
experimentalLocal?: boolean;
|
|
124
239
|
};
|
|
125
240
|
|
|
126
241
|
function DevSession(props: DevSessionProps) {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
242
|
+
useCustomBuild(props.entry, props.build);
|
|
243
|
+
|
|
244
|
+
const directory = useTmpDir();
|
|
245
|
+
const handleError = useErrorHandler();
|
|
246
|
+
|
|
247
|
+
// Note: when D1 is out of beta, this (and all instances of `betaD1Shims`) can be removed.
|
|
248
|
+
// Additionally, useMemo is used so that new arrays aren't created on every render
|
|
249
|
+
// cause re-rendering further down.
|
|
250
|
+
const betaD1Shims = useMemo(
|
|
251
|
+
() => props.bindings.d1_databases?.map((db) => db.binding),
|
|
252
|
+
[props.bindings.d1_databases]
|
|
253
|
+
);
|
|
254
|
+
|
|
255
|
+
// If we are using d1 bindings, and are not bundling the worker
|
|
256
|
+
// we should error here as the d1 shim won't be added
|
|
257
|
+
if (Array.isArray(betaD1Shims) && betaD1Shims.length > 0 && props.noBundle) {
|
|
258
|
+
handleError(
|
|
259
|
+
new Error(
|
|
260
|
+
"While in beta, you cannot use D1 bindings without bundling your worker. Please remove `no_bundle` from your wrangler.toml file or remove the `--no-bundle` flag to access D1 bindings."
|
|
261
|
+
)
|
|
262
|
+
);
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
const workerDefinitions = useDevRegistry(
|
|
266
|
+
props.name,
|
|
267
|
+
props.bindings.services,
|
|
268
|
+
props.bindings.durable_objects,
|
|
269
|
+
props.local ? "local" : "remote"
|
|
270
|
+
);
|
|
271
|
+
|
|
272
|
+
const bundle = useEsbuild({
|
|
273
|
+
entry: props.entry,
|
|
274
|
+
destination: directory,
|
|
275
|
+
jsxFactory: props.jsxFactory,
|
|
276
|
+
processEntrypoint: props.processEntrypoint,
|
|
277
|
+
rules: props.rules,
|
|
278
|
+
jsxFragment: props.jsxFragment,
|
|
279
|
+
serveAssetsFromWorker: Boolean(
|
|
280
|
+
props.assetPaths && !props.isWorkersSite && props.local
|
|
281
|
+
),
|
|
282
|
+
tsconfig: props.tsconfig,
|
|
283
|
+
minify: props.minify,
|
|
284
|
+
legacyNodeCompat: props.legacyNodeCompat,
|
|
285
|
+
nodejsCompat: props.nodejsCompat,
|
|
286
|
+
betaD1Shims,
|
|
287
|
+
define: props.define,
|
|
288
|
+
noBundle: props.noBundle,
|
|
289
|
+
assets: props.assetsConfig,
|
|
290
|
+
workerDefinitions,
|
|
291
|
+
services: props.bindings.services,
|
|
292
|
+
durableObjects: props.bindings.durable_objects || { bindings: [] },
|
|
293
|
+
firstPartyWorkerDevFacade: props.firstPartyWorker,
|
|
294
|
+
local: props.local,
|
|
295
|
+
// Enable the bundling to know whether we are using dev or publish
|
|
296
|
+
targetConsumer: "dev",
|
|
297
|
+
testScheduled: props.testScheduled ?? false,
|
|
298
|
+
experimentalLocal: props.experimentalLocal,
|
|
299
|
+
});
|
|
300
|
+
|
|
301
|
+
// TODO(queues) support remote wrangler dev
|
|
302
|
+
if (
|
|
303
|
+
!props.local &&
|
|
304
|
+
(props.bindings.queues?.length || props.queueConsumers?.length)
|
|
305
|
+
) {
|
|
306
|
+
logger.warn(
|
|
307
|
+
"Queues are currently in Beta and are not supported in wrangler dev remote mode."
|
|
308
|
+
);
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
const announceAndOnReady: typeof props.onReady = (finalIp, finalPort) => {
|
|
312
|
+
if (process.send) {
|
|
313
|
+
process.send(
|
|
314
|
+
JSON.stringify({
|
|
315
|
+
event: "DEV_SERVER_READY",
|
|
316
|
+
ip: finalIp,
|
|
317
|
+
port: finalPort,
|
|
318
|
+
})
|
|
319
|
+
);
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
if (props.onReady) {
|
|
323
|
+
props.onReady(finalIp, finalPort);
|
|
324
|
+
}
|
|
325
|
+
};
|
|
326
|
+
|
|
327
|
+
return props.local ? (
|
|
328
|
+
<Local
|
|
329
|
+
name={props.name}
|
|
330
|
+
bundle={bundle}
|
|
331
|
+
format={props.entry.format}
|
|
332
|
+
compatibilityDate={props.compatibilityDate}
|
|
333
|
+
compatibilityFlags={props.compatibilityFlags}
|
|
334
|
+
usageModel={props.usageModel}
|
|
335
|
+
bindings={props.bindings}
|
|
336
|
+
workerDefinitions={workerDefinitions}
|
|
337
|
+
assetPaths={props.assetPaths}
|
|
338
|
+
initialPort={props.initialPort}
|
|
339
|
+
initialIp={props.initialIp}
|
|
340
|
+
rules={props.rules}
|
|
341
|
+
inspectorPort={props.inspectorPort}
|
|
342
|
+
localPersistencePath={props.localPersistencePath}
|
|
343
|
+
liveReload={props.liveReload}
|
|
344
|
+
crons={props.crons}
|
|
345
|
+
queueConsumers={props.queueConsumers}
|
|
346
|
+
localProtocol={props.localProtocol}
|
|
347
|
+
localUpstream={props.localUpstream}
|
|
348
|
+
inspect={props.inspect}
|
|
349
|
+
onReady={announceAndOnReady}
|
|
350
|
+
enablePagesAssetsServiceBinding={props.enablePagesAssetsServiceBinding}
|
|
351
|
+
experimentalLocal={props.experimentalLocal}
|
|
352
|
+
accountId={props.accountId}
|
|
353
|
+
experimentalLocalRemoteKv={props.experimentalLocalRemoteKv}
|
|
354
|
+
sourceMapPath={bundle?.sourceMapPath}
|
|
355
|
+
/>
|
|
356
|
+
) : (
|
|
357
|
+
<Remote
|
|
358
|
+
name={props.name}
|
|
359
|
+
bundle={bundle}
|
|
360
|
+
format={props.entry.format}
|
|
361
|
+
accountId={props.accountId}
|
|
362
|
+
bindings={props.bindings}
|
|
363
|
+
assetPaths={props.assetPaths}
|
|
364
|
+
isWorkersSite={props.isWorkersSite}
|
|
365
|
+
port={props.initialPort}
|
|
366
|
+
ip={props.initialIp}
|
|
367
|
+
localProtocol={props.localProtocol}
|
|
368
|
+
inspectorPort={props.inspectorPort}
|
|
369
|
+
// TODO: @threepointone #1167
|
|
370
|
+
// liveReload={props.liveReload}
|
|
371
|
+
inspect={props.inspect}
|
|
372
|
+
compatibilityDate={props.compatibilityDate}
|
|
373
|
+
compatibilityFlags={props.compatibilityFlags}
|
|
374
|
+
usageModel={props.usageModel}
|
|
375
|
+
env={props.env}
|
|
376
|
+
legacyEnv={props.legacyEnv}
|
|
377
|
+
zone={props.zone}
|
|
378
|
+
host={props.host}
|
|
379
|
+
routes={props.routes}
|
|
380
|
+
onReady={announceAndOnReady}
|
|
381
|
+
sourceMapPath={bundle?.sourceMapPath}
|
|
382
|
+
sendMetrics={props.sendMetrics}
|
|
383
|
+
/>
|
|
384
|
+
);
|
|
185
385
|
}
|
|
186
386
|
|
|
187
387
|
export interface DirectorySyncResult {
|
|
188
|
-
|
|
189
|
-
|
|
388
|
+
name: string;
|
|
389
|
+
removeCallback: () => void;
|
|
190
390
|
}
|
|
191
391
|
|
|
192
392
|
function useTmpDir(): string | undefined {
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
393
|
+
const [directory, setDirectory] = useState<DirectorySyncResult>();
|
|
394
|
+
const handleError = useErrorHandler();
|
|
395
|
+
useEffect(() => {
|
|
396
|
+
let dir: DirectorySyncResult | undefined;
|
|
397
|
+
try {
|
|
398
|
+
dir = tmp.dirSync({ unsafeCleanup: true });
|
|
399
|
+
setDirectory(dir);
|
|
400
|
+
return;
|
|
401
|
+
} catch (err) {
|
|
402
|
+
logger.error(
|
|
403
|
+
"Failed to create temporary directory to store built files."
|
|
404
|
+
);
|
|
405
|
+
handleError(err);
|
|
406
|
+
}
|
|
407
|
+
return () => {
|
|
408
|
+
dir?.removeCallback();
|
|
409
|
+
};
|
|
410
|
+
}, [handleError]);
|
|
411
|
+
return directory?.name;
|
|
212
412
|
}
|
|
213
413
|
|
|
214
414
|
function useCustomBuild(expectedEntry: Entry, build: Config["build"]): void {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
415
|
+
useEffect(() => {
|
|
416
|
+
if (!build.command) return;
|
|
417
|
+
let watcher: ReturnType<typeof watch> | undefined;
|
|
418
|
+
if (build.watch_dir) {
|
|
419
|
+
watcher = watch(build.watch_dir, {
|
|
420
|
+
persistent: true,
|
|
421
|
+
ignoreInitial: true,
|
|
422
|
+
}).on("all", (_event, filePath) => {
|
|
423
|
+
const relativeFile =
|
|
424
|
+
path.relative(expectedEntry.directory, expectedEntry.file) || ".";
|
|
425
|
+
//TODO: we should buffer requests to the proxy until this completes
|
|
426
|
+
logger.log(`The file ${filePath} changed, restarting build...`);
|
|
427
|
+
runCustomBuild(expectedEntry.file, relativeFile, build).catch((err) => {
|
|
428
|
+
logger.error("Custom build failed:", err);
|
|
429
|
+
});
|
|
430
|
+
});
|
|
431
|
+
}
|
|
432
|
+
|
|
433
|
+
return () => {
|
|
434
|
+
void watcher?.close();
|
|
435
|
+
};
|
|
436
|
+
}, [build, expectedEntry]);
|
|
237
437
|
}
|
|
238
438
|
|
|
239
439
|
function sleep(period: number) {
|
|
240
|
-
|
|
440
|
+
return new Promise((resolve) => setTimeout(resolve, period));
|
|
241
441
|
}
|
|
242
442
|
const SLEEP_DURATION = 2000;
|
|
243
443
|
// really need a first class api for this
|
|
244
444
|
const hostNameRegex = /userHostname="(.*)"/g;
|
|
245
445
|
async function findTunnelHostname() {
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
446
|
+
let hostName: string | undefined;
|
|
447
|
+
while (!hostName) {
|
|
448
|
+
try {
|
|
449
|
+
const resp = await fetch("http://localhost:8789/metrics");
|
|
450
|
+
const data = await resp.text();
|
|
451
|
+
const matches = Array.from(data.matchAll(hostNameRegex));
|
|
452
|
+
hostName = matches[0][1];
|
|
453
|
+
} catch (err) {
|
|
454
|
+
await sleep(SLEEP_DURATION);
|
|
455
|
+
}
|
|
456
|
+
}
|
|
457
|
+
return hostName;
|
|
258
458
|
}
|
|
259
459
|
|
|
260
460
|
/**
|
|
@@ -262,134 +462,144 @@ async function findTunnelHostname() {
|
|
|
262
462
|
* We've disabled this for now until we figure out a better user experience.
|
|
263
463
|
*/
|
|
264
464
|
function useTunnel(toggle: boolean) {
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
465
|
+
const tunnel = useRef<ReturnType<typeof spawn>>();
|
|
466
|
+
const removeSignalExitListener = useRef<() => void>();
|
|
467
|
+
// TODO: test if cloudflared is available, if not
|
|
468
|
+
// point them to a url where they can get docs to install it
|
|
469
|
+
useEffect(() => {
|
|
470
|
+
async function startTunnel() {
|
|
471
|
+
if (toggle) {
|
|
472
|
+
try {
|
|
473
|
+
await commandExists("cloudflared");
|
|
474
|
+
} catch (e) {
|
|
475
|
+
logger.warn(
|
|
476
|
+
"To share your worker on the Internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
|
|
477
|
+
);
|
|
478
|
+
return;
|
|
479
|
+
}
|
|
480
|
+
logger.log("⎔ Starting a tunnel...");
|
|
481
|
+
tunnel.current = spawn("cloudflared", [
|
|
482
|
+
"tunnel",
|
|
483
|
+
"--url",
|
|
484
|
+
"http://localhost:8787",
|
|
485
|
+
"--metrics",
|
|
486
|
+
"localhost:8789",
|
|
487
|
+
]);
|
|
488
|
+
|
|
489
|
+
tunnel.current.on("close", (code) => {
|
|
490
|
+
if (code) {
|
|
491
|
+
logger.log(`Tunnel process exited with code ${code}`);
|
|
492
|
+
}
|
|
493
|
+
});
|
|
494
|
+
|
|
495
|
+
removeSignalExitListener.current = onExit((_code, _signal) => {
|
|
496
|
+
logger.log("⎔ Shutting down local tunnel.");
|
|
497
|
+
tunnel.current?.kill();
|
|
498
|
+
tunnel.current = undefined;
|
|
499
|
+
});
|
|
500
|
+
|
|
501
|
+
const hostName = await findTunnelHostname();
|
|
502
|
+
await clipboardy.write(hostName);
|
|
503
|
+
logger.log(`⬣ Sharing at ${hostName}, copied to clipboard.`);
|
|
504
|
+
}
|
|
505
|
+
}
|
|
506
|
+
|
|
507
|
+
startTunnel().catch(async (err) => {
|
|
508
|
+
logger.error("tunnel:", err);
|
|
509
|
+
});
|
|
510
|
+
|
|
511
|
+
return () => {
|
|
512
|
+
if (tunnel.current) {
|
|
513
|
+
logger.log("⎔ Shutting down tunnel.");
|
|
514
|
+
tunnel.current?.kill();
|
|
515
|
+
tunnel.current = undefined;
|
|
516
|
+
removeSignalExitListener.current && removeSignalExitListener.current();
|
|
517
|
+
removeSignalExitListener.current = undefined;
|
|
518
|
+
}
|
|
519
|
+
};
|
|
520
|
+
}, [toggle]);
|
|
321
521
|
}
|
|
322
522
|
|
|
323
523
|
type useHotkeysInitialState = {
|
|
324
|
-
|
|
325
|
-
|
|
524
|
+
local: boolean;
|
|
525
|
+
tunnel: boolean;
|
|
326
526
|
};
|
|
327
|
-
function useHotkeys(
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
527
|
+
function useHotkeys(props: {
|
|
528
|
+
initial: useHotkeysInitialState;
|
|
529
|
+
inspectorPort: number;
|
|
530
|
+
inspect: boolean;
|
|
531
|
+
localProtocol: "http" | "https";
|
|
532
|
+
forceLocal: boolean | undefined;
|
|
533
|
+
worker: string | undefined;
|
|
534
|
+
}) {
|
|
535
|
+
const { initial, inspectorPort, inspect, localProtocol, forceLocal } = props;
|
|
536
|
+
// UGH, we should put port in context instead
|
|
537
|
+
const [toggles, setToggles] = useState(initial);
|
|
538
|
+
const { exit } = useApp();
|
|
539
|
+
|
|
540
|
+
useInput(
|
|
541
|
+
async (
|
|
542
|
+
input,
|
|
543
|
+
// eslint-disable-next-line unused-imports/no-unused-vars
|
|
544
|
+
key
|
|
545
|
+
) => {
|
|
546
|
+
switch (input.toLowerCase()) {
|
|
547
|
+
// clear console
|
|
548
|
+
case "c":
|
|
549
|
+
console.clear();
|
|
550
|
+
// This console.log causes Ink to re-render the `DevSession` component.
|
|
551
|
+
// Couldn't find a better way to tell it to do so...
|
|
552
|
+
console.log();
|
|
553
|
+
break;
|
|
554
|
+
// open browser
|
|
555
|
+
case "b": {
|
|
556
|
+
if (ip === "0.0.0.0") {
|
|
557
|
+
await openInBrowser(`${localProtocol}://127.0.0.1:${port}`);
|
|
558
|
+
return;
|
|
559
|
+
}
|
|
560
|
+
await openInBrowser(`${localProtocol}://${ip}:${port}`);
|
|
561
|
+
break;
|
|
562
|
+
}
|
|
563
|
+
// toggle inspector
|
|
564
|
+
case "d": {
|
|
565
|
+
if (inspect) {
|
|
566
|
+
await openInspector(inspectorPort, props.worker);
|
|
567
|
+
}
|
|
568
|
+
break;
|
|
569
|
+
}
|
|
570
|
+
// toggle local
|
|
571
|
+
case "l":
|
|
572
|
+
if (forceLocal) return;
|
|
573
|
+
setToggles((previousToggles) => ({
|
|
574
|
+
...previousToggles,
|
|
575
|
+
local: !previousToggles.local,
|
|
576
|
+
}));
|
|
577
|
+
break;
|
|
578
|
+
// shut down
|
|
579
|
+
case "q":
|
|
580
|
+
case "x":
|
|
581
|
+
exit();
|
|
582
|
+
break;
|
|
583
|
+
default:
|
|
584
|
+
// nothing?
|
|
585
|
+
break;
|
|
586
|
+
}
|
|
587
|
+
}
|
|
588
|
+
);
|
|
589
|
+
return toggles;
|
|
380
590
|
}
|
|
381
591
|
|
|
382
592
|
function ErrorFallback(props: { error: Error }) {
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
593
|
+
const { exit } = useApp();
|
|
594
|
+
useEffect(() => exit(props.error));
|
|
595
|
+
return (
|
|
596
|
+
<>
|
|
597
|
+
<Text>Something went wrong:</Text>
|
|
598
|
+
<Text>{props.error.stack}</Text>
|
|
599
|
+
</>
|
|
600
|
+
);
|
|
391
601
|
}
|
|
392
602
|
|
|
393
603
|
export default withErrorBoundary(DevImplementation, {
|
|
394
|
-
|
|
604
|
+
FallbackComponent: ErrorFallback,
|
|
395
605
|
});
|