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.
Files changed (339) hide show
  1. package/README.md +24 -4
  2. package/bin/wrangler.js +170 -62
  3. package/miniflare-dist/index.mjs +1643 -83
  4. package/package.json +198 -154
  5. package/src/__tests__/access.test.ts +25 -0
  6. package/src/__tests__/api-dev.test.ts +238 -0
  7. package/src/__tests__/api-devregistry.test.ts +121 -0
  8. package/src/__tests__/api.test.ts +102 -0
  9. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  10. package/src/__tests__/config-cache.test.ts +30 -24
  11. package/src/__tests__/configuration.test.ts +4506 -3476
  12. package/src/__tests__/constellation.test.ts +371 -0
  13. package/src/__tests__/d1/d1.test.ts +82 -0
  14. package/src/__tests__/d1/execute.test.ts +66 -0
  15. package/src/__tests__/d1/migrate.test.ts +257 -0
  16. package/src/__tests__/d1/splitter.test.ts +255 -0
  17. package/src/__tests__/delete.test.ts +272 -0
  18. package/src/__tests__/deployments.test.ts +369 -0
  19. package/src/__tests__/dev.test.tsx +1590 -983
  20. package/src/__tests__/generate.test.ts +237 -0
  21. package/src/__tests__/get-host-from-url.test.ts +16 -0
  22. package/src/__tests__/guess-worker-format.test.ts +103 -68
  23. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  24. package/src/__tests__/helpers/end-event-loop.ts +6 -0
  25. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  26. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  27. package/src/__tests__/helpers/mock-bin.ts +20 -20
  28. package/src/__tests__/helpers/mock-console.ts +64 -39
  29. package/src/__tests__/helpers/mock-dialogs.ts +88 -79
  30. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +25 -0
  31. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  32. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  33. package/src/__tests__/helpers/mock-istty.ts +65 -18
  34. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  35. package/src/__tests__/helpers/mock-kv.ts +41 -28
  36. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  37. package/src/__tests__/helpers/mock-process.ts +34 -0
  38. package/src/__tests__/helpers/mock-set-timeout.ts +16 -0
  39. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  40. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  41. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  42. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  43. package/src/__tests__/helpers/msw/handlers/deployments.ts +160 -0
  44. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  45. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  46. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  47. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  48. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  49. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  50. package/src/__tests__/helpers/msw/index.ts +52 -0
  51. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  52. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  53. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  54. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +28 -0
  55. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  56. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  57. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  58. package/src/__tests__/helpers/worker-scripts/parent-worker.js +11 -0
  59. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  60. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  61. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  62. package/src/__tests__/https-options.test.ts +142 -109
  63. package/src/__tests__/index.test.ts +262 -237
  64. package/src/__tests__/init.test.ts +3167 -1608
  65. package/src/__tests__/jest.setup.ts +152 -50
  66. package/src/__tests__/kv.test.ts +1789 -1492
  67. package/src/__tests__/logger.test.ts +167 -75
  68. package/src/__tests__/logout.test.ts +47 -0
  69. package/src/__tests__/metrics.test.ts +493 -0
  70. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  71. package/src/__tests__/middleware.test.ts +816 -0
  72. package/src/__tests__/mtls-certificates.test.ts +589 -0
  73. package/src/__tests__/package-manager.test.ts +303 -303
  74. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  75. package/src/__tests__/pages/functions-build.test.ts +528 -0
  76. package/src/__tests__/pages/pages.test.ts +81 -0
  77. package/src/__tests__/pages/project-create.test.ts +63 -0
  78. package/src/__tests__/pages/project-list.test.ts +110 -0
  79. package/src/__tests__/pages/project-upload.test.ts +500 -0
  80. package/src/__tests__/pages/publish.test.ts +2864 -0
  81. package/src/__tests__/pages-deployment-tail.test.ts +957 -0
  82. package/src/__tests__/parse.test.ts +358 -252
  83. package/src/__tests__/paths.test.ts +39 -0
  84. package/src/__tests__/publish.test.ts +8716 -5687
  85. package/src/__tests__/pubsub.test.ts +496 -0
  86. package/src/__tests__/queues.test.ts +532 -0
  87. package/src/__tests__/r2.test.ts +369 -228
  88. package/src/__tests__/route.test.ts +18 -18
  89. package/src/__tests__/secret.test.ts +681 -469
  90. package/src/__tests__/tail.test.ts +866 -567
  91. package/src/__tests__/test-old-node-version.js +31 -0
  92. package/src/__tests__/traverse-module-graph.test.ts +220 -0
  93. package/src/__tests__/tsconfig-sanity.ts +12 -0
  94. package/src/__tests__/tsconfig.json +8 -0
  95. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  96. package/src/__tests__/type-generation.test.ts +234 -0
  97. package/src/__tests__/user.test.ts +107 -120
  98. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  99. package/src/__tests__/validate-dev-props.test.ts +56 -0
  100. package/src/__tests__/version.test.ts +35 -0
  101. package/src/__tests__/whoami.test.tsx +165 -132
  102. package/src/__tests__/worker-namespace.test.ts +340 -0
  103. package/src/abort.d.ts +1 -1
  104. package/src/api/dev.ts +321 -0
  105. package/src/api/index.ts +11 -0
  106. package/src/api/mtls-certificate.ts +148 -0
  107. package/src/api/pages/create-worker-bundle-contents.ts +77 -0
  108. package/src/api/pages/index.ts +5 -0
  109. package/src/api/pages/publish.tsx +371 -0
  110. package/src/bundle-reporter.ts +68 -0
  111. package/src/bundle.ts +890 -165
  112. package/src/cfetch/index.ts +120 -83
  113. package/src/cfetch/internal.ts +208 -92
  114. package/src/cli.ts +23 -8
  115. package/src/config/config.ts +244 -196
  116. package/src/config/diagnostics.ts +61 -61
  117. package/src/config/environment.ts +562 -357
  118. package/src/config/index.ts +374 -196
  119. package/src/config/validation-helpers.ts +379 -366
  120. package/src/config/validation.ts +2197 -1376
  121. package/src/config-cache.ts +81 -41
  122. package/src/constellation/createProject.tsx +51 -0
  123. package/src/constellation/deleteProject.ts +51 -0
  124. package/src/constellation/deleteProjectModel.ts +68 -0
  125. package/src/constellation/index.ts +75 -0
  126. package/src/constellation/listCatalog.tsx +35 -0
  127. package/src/constellation/listModel.tsx +41 -0
  128. package/src/constellation/listProject.tsx +28 -0
  129. package/src/constellation/listRuntime.tsx +28 -0
  130. package/src/constellation/options.ts +17 -0
  131. package/src/constellation/types.ts +17 -0
  132. package/src/constellation/uploadModel.tsx +64 -0
  133. package/src/constellation/utils.ts +90 -0
  134. package/src/create-worker-preview.ts +250 -142
  135. package/src/create-worker-upload-form.ts +347 -238
  136. package/src/d1/backups.tsx +219 -0
  137. package/src/d1/constants.ts +2 -0
  138. package/src/d1/create.tsx +70 -0
  139. package/src/d1/delete.ts +53 -0
  140. package/src/d1/execute.tsx +357 -0
  141. package/src/d1/formatTimeAgo.ts +14 -0
  142. package/src/d1/index.ts +100 -0
  143. package/src/d1/list.tsx +62 -0
  144. package/src/d1/migrations/apply.tsx +212 -0
  145. package/src/d1/migrations/create.tsx +79 -0
  146. package/src/d1/migrations/helpers.ts +169 -0
  147. package/src/d1/migrations/index.ts +3 -0
  148. package/src/d1/migrations/list.tsx +95 -0
  149. package/src/d1/migrations/options.ts +23 -0
  150. package/src/d1/options.ts +22 -0
  151. package/src/d1/splitter.ts +161 -0
  152. package/src/d1/types.ts +25 -0
  153. package/src/d1/utils.ts +49 -0
  154. package/src/delete.ts +100 -0
  155. package/src/deployments.ts +368 -0
  156. package/src/deprecated/index.ts +144 -0
  157. package/src/dev/dev-vars.ts +20 -17
  158. package/src/dev/dev.tsx +535 -325
  159. package/src/dev/get-local-persistence-path.ts +31 -0
  160. package/src/dev/local.tsx +932 -301
  161. package/src/dev/remote.tsx +623 -228
  162. package/src/dev/start-server.ts +545 -0
  163. package/src/dev/use-esbuild.ts +194 -94
  164. package/src/dev/validate-dev-props.ts +40 -0
  165. package/src/dev-registry.ts +202 -0
  166. package/src/dev.tsx +934 -0
  167. package/src/dialogs.ts +136 -0
  168. package/src/dispatch-namespace.ts +211 -0
  169. package/src/docs/helpers.ts +50 -0
  170. package/src/docs/index.ts +54 -0
  171. package/src/durable.ts +87 -87
  172. package/src/entry.ts +253 -231
  173. package/src/environment-variables/factory.ts +89 -0
  174. package/src/environment-variables/misc-variables.ts +30 -0
  175. package/src/errors.ts +6 -6
  176. package/src/generate/index.ts +298 -0
  177. package/src/git-client.ts +135 -0
  178. package/src/global-wrangler-config-path.ts +26 -0
  179. package/src/https-options.ts +84 -80
  180. package/src/index.ts +768 -0
  181. package/src/init.ts +1037 -0
  182. package/src/inspect.ts +816 -595
  183. package/src/intl-polyfill.d.ts +123 -123
  184. package/src/is-ci.ts +14 -0
  185. package/src/is-interactive.ts +16 -0
  186. package/src/jest.d.ts +4 -0
  187. package/src/kv/helpers.ts +433 -0
  188. package/src/kv/index.ts +594 -0
  189. package/src/logger.ts +100 -43
  190. package/src/metrics/index.ts +5 -0
  191. package/src/metrics/metrics-config.ts +239 -0
  192. package/src/metrics/metrics-dispatcher.ts +96 -0
  193. package/src/metrics/metrics-usage-headers.ts +24 -0
  194. package/src/metrics/send-event.ts +99 -0
  195. package/src/miniflare-cli/assets.ts +255 -0
  196. package/src/miniflare-cli/index.ts +202 -33
  197. package/src/miniflare-cli/request-context.ts +18 -18
  198. package/src/miniflare-cli/tsconfig.json +9 -0
  199. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  200. package/src/miniflare-cli/types.ts +11 -0
  201. package/src/module-collection.ts +290 -215
  202. package/src/mtls-certificate/cli.ts +155 -0
  203. package/src/open-in-browser.ts +4 -6
  204. package/src/package-manager.ts +173 -128
  205. package/src/pages/build.ts +423 -0
  206. package/src/pages/buildFunctions.ts +140 -0
  207. package/src/pages/constants.ts +18 -0
  208. package/src/pages/deployment-tails.ts +281 -0
  209. package/src/pages/deployments.tsx +84 -0
  210. package/src/pages/dev.ts +734 -0
  211. package/src/pages/errors.ts +67 -0
  212. package/src/pages/functions/buildPlugin.ts +114 -0
  213. package/src/pages/functions/buildWorker.ts +350 -0
  214. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  215. package/src/pages/functions/filepath-routing.ts +189 -0
  216. package/src/pages/functions/identifiers.ts +78 -0
  217. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  218. package/src/pages/functions/routes-consolidation.ts +73 -0
  219. package/src/pages/functions/routes-transformation.test.ts +282 -0
  220. package/src/pages/functions/routes-transformation.ts +115 -0
  221. package/src/pages/functions/routes-validation.test.ts +403 -0
  222. package/src/pages/functions/routes-validation.ts +202 -0
  223. package/src/pages/functions/routes.ts +151 -0
  224. package/src/pages/functions/tsconfig.json +8 -0
  225. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  226. package/src/pages/functions.ts +86 -0
  227. package/src/pages/hash.ts +13 -0
  228. package/src/pages/index.ts +102 -0
  229. package/src/pages/projects.tsx +159 -0
  230. package/src/pages/prompt-select-project.tsx +31 -0
  231. package/src/pages/publish.tsx +267 -0
  232. package/src/pages/types.ts +46 -0
  233. package/src/pages/upload.tsx +469 -0
  234. package/src/pages/utils.ts +23 -0
  235. package/src/parse.ts +225 -139
  236. package/src/paths.ts +53 -8
  237. package/src/proxy.ts +623 -407
  238. package/src/publish/index.ts +274 -0
  239. package/src/publish/publish.ts +1065 -0
  240. package/src/pubsub/index.ts +286 -0
  241. package/src/pubsub/pubsub-commands.ts +623 -0
  242. package/src/queues/cli/commands/consumer/add.ts +71 -0
  243. package/src/queues/cli/commands/consumer/index.ts +19 -0
  244. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  245. package/src/queues/cli/commands/create.ts +25 -0
  246. package/src/queues/cli/commands/delete.ts +26 -0
  247. package/src/queues/cli/commands/index.ts +35 -0
  248. package/src/queues/cli/commands/list.ts +25 -0
  249. package/src/queues/client.ts +136 -0
  250. package/src/queues/utils.ts +18 -0
  251. package/src/r2/constants.ts +4 -0
  252. package/src/r2/helpers.ts +132 -0
  253. package/src/r2/index.ts +289 -0
  254. package/src/routes.ts +140 -0
  255. package/src/secret/index.ts +377 -0
  256. package/src/selfsigned.d.ts +23 -23
  257. package/src/sites.ts +484 -0
  258. package/src/tail/createTail.ts +415 -0
  259. package/src/tail/filters.ts +109 -111
  260. package/src/tail/index.ts +208 -296
  261. package/src/tail/printing.ts +116 -51
  262. package/src/traverse-module-graph.ts +54 -0
  263. package/src/tsconfig-sanity.ts +16 -0
  264. package/src/type-generation.ts +181 -0
  265. package/src/update-check.ts +11 -11
  266. package/src/user/access.ts +68 -0
  267. package/src/user/auth-variables.ts +113 -0
  268. package/src/user/choose-account.tsx +39 -0
  269. package/src/user/generate-auth-url.ts +33 -0
  270. package/src/user/generate-random-state.ts +16 -0
  271. package/src/user/index.ts +2 -0
  272. package/src/user/user.ts +1234 -0
  273. package/src/utils/collectKeyValues.ts +14 -0
  274. package/src/utils/render.ts +93 -0
  275. package/src/whoami.ts +135 -0
  276. package/src/worker.ts +205 -107
  277. package/src/yargs-types.ts +37 -0
  278. package/src/zones.ts +158 -40
  279. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  280. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  281. package/templates/__tests__/tsconfig.json +8 -0
  282. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  283. package/templates/checked-fetch.js +23 -0
  284. package/templates/d1-beta-facade.js +244 -0
  285. package/templates/facade.d.ts +14 -0
  286. package/templates/first-party-worker-module-facade.ts +19 -0
  287. package/templates/format-dev-errors.ts +34 -0
  288. package/templates/gitignore +1 -0
  289. package/templates/init-tests/test-jest-new-worker.js +23 -0
  290. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  291. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  292. package/templates/middleware/common.ts +62 -0
  293. package/templates/middleware/loader-modules.ts +84 -0
  294. package/templates/middleware/loader-sw.ts +233 -0
  295. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  296. package/templates/middleware/middleware-pretty-error.ts +40 -0
  297. package/templates/middleware/middleware-scheduled.ts +15 -0
  298. package/templates/new-worker-scheduled.js +3 -3
  299. package/templates/new-worker-scheduled.ts +15 -15
  300. package/templates/new-worker.js +3 -3
  301. package/templates/new-worker.ts +18 -15
  302. package/templates/no-op-worker.js +10 -0
  303. package/templates/pages-dev-pipeline.ts +31 -0
  304. package/templates/pages-dev-util.ts +52 -0
  305. package/templates/pages-shim.ts +12 -0
  306. package/templates/pages-template-plugin.ts +180 -0
  307. package/templates/pages-template-worker.ts +189 -0
  308. package/templates/serve-static-assets.ts +66 -0
  309. package/templates/service-bindings-module-facade.js +55 -0
  310. package/templates/service-bindings-sw-facade.js +42 -0
  311. package/templates/tsconfig-sanity.ts +11 -0
  312. package/templates/tsconfig.init.json +105 -0
  313. package/templates/tsconfig.json +6 -103
  314. package/templates/tsconfig.tsbuildinfo +1 -0
  315. package/wrangler-dist/cli.d.ts +1652 -0
  316. package/wrangler-dist/cli.js +139094 -111923
  317. package/wrangler-dist/wasm-sync.wasm +0 -0
  318. package/pages/functions/buildPlugin.ts +0 -105
  319. package/pages/functions/buildWorker.ts +0 -151
  320. package/pages/functions/filepath-routing.ts +0 -189
  321. package/pages/functions/identifiers.ts +0 -78
  322. package/pages/functions/routes.ts +0 -156
  323. package/pages/functions/template-plugin.ts +0 -147
  324. package/pages/functions/template-worker.ts +0 -143
  325. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  326. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  327. package/src/__tests__/pages.test.ts +0 -754
  328. package/src/dialogs.tsx +0 -135
  329. package/src/environment-variables.ts +0 -35
  330. package/src/index.tsx +0 -2859
  331. package/src/kv.ts +0 -408
  332. package/src/miniflare-cli/enum-keys.ts +0 -17
  333. package/src/pages.tsx +0 -2093
  334. package/src/publish.ts +0 -721
  335. package/src/r2.ts +0 -50
  336. package/src/sites.tsx +0 -326
  337. package/src/user.tsx +0 -1214
  338. package/src/whoami.tsx +0 -71
  339. 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
- name?: string;
26
- entry: Entry;
27
- port: number;
28
- ip: string;
29
- inspectorPort: number;
30
- rules: Config["rules"];
31
- accountId: string | undefined;
32
- initialMode: "local" | "remote";
33
- jsxFactory: string | undefined;
34
- jsxFragment: string | undefined;
35
- tsconfig: string | undefined;
36
- upstreamProtocol: "https" | "http";
37
- localProtocol: "https" | "http";
38
- enableLocalPersistence: boolean;
39
- bindings: CfWorkerInit["bindings"];
40
- crons: Config["triggers"]["crons"];
41
- public: string | undefined;
42
- assetPaths: AssetPaths | undefined;
43
- compatibilityDate: string;
44
- compatibilityFlags: string[] | undefined;
45
- usageModel: "bundled" | "unbound" | undefined;
46
- minify: boolean | undefined;
47
- nodeCompat: boolean | undefined;
48
- build: Config["build"];
49
- env: string | undefined;
50
- legacyEnv: boolean;
51
- zone: string | undefined;
52
- host: string | undefined;
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
- if (props.public && props.entry.format === "service-worker") {
57
- throw new Error(
58
- "You cannot use the service-worker format with a `public` directory."
59
- );
60
- }
61
-
62
- if (props.bindings.wasm_modules && props.entry.format === "modules") {
63
- throw new Error(
64
- "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"
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
- const toggles = useHotkeys(
91
- {
92
- local: props.initialMode === "local",
93
- tunnel: false,
94
- },
95
- props.port,
96
- props.ip,
97
- props.inspectorPort,
98
- props.localProtocol
99
- );
100
-
101
- useTunnel(toggles.tunnel);
102
-
103
- return (
104
- <>
105
- <DevSession {...props} local={toggles.local} />
106
- <Box borderStyle="round" paddingLeft={1} paddingRight={1}>
107
- <Text bold={true}>[b]</Text>
108
- <Text> open a browser, </Text>
109
- <Text bold={true}>[d]</Text>
110
- <Text> open Devtools, </Text>
111
- <Text bold={true}>[l]</Text>
112
- <Text> {toggles.local ? "turn off" : "turn on"} local mode, </Text>
113
- <Text bold={true}>[c]</Text>
114
- <Text> clear console, </Text>
115
- <Text bold={true}>[x]</Text>
116
- <Text> to exit</Text>
117
- </Box>
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
- local: boolean;
237
+ local: boolean;
238
+ experimentalLocal?: boolean;
124
239
  };
125
240
 
126
241
  function DevSession(props: DevSessionProps) {
127
- useCustomBuild(props.entry, props.build);
128
-
129
- const directory = useTmpDir();
130
-
131
- const bundle = useEsbuild({
132
- entry: props.entry,
133
- destination: directory,
134
- staticRoot: props.public,
135
- jsxFactory: props.jsxFactory,
136
- rules: props.rules,
137
- jsxFragment: props.jsxFragment,
138
- // In dev for remote mode, we serve --experimental-assets from the local proxy before we send the request to the worker.
139
- serveAssetsFromWorker: !!props.public && !!props.local,
140
- tsconfig: props.tsconfig,
141
- minify: props.minify,
142
- nodeCompat: props.nodeCompat,
143
- });
144
-
145
- return props.local ? (
146
- <Local
147
- name={props.name}
148
- bundle={bundle}
149
- format={props.entry.format}
150
- compatibilityDate={props.compatibilityDate}
151
- localProtocol={props.localProtocol}
152
- compatibilityFlags={props.compatibilityFlags}
153
- bindings={props.bindings}
154
- assetPaths={props.assetPaths}
155
- public={props.public}
156
- port={props.port}
157
- ip={props.ip}
158
- rules={props.rules}
159
- inspectorPort={props.inspectorPort}
160
- enableLocalPersistence={props.enableLocalPersistence}
161
- crons={props.crons}
162
- />
163
- ) : (
164
- <Remote
165
- name={props.name}
166
- bundle={bundle}
167
- format={props.entry.format}
168
- accountId={props.accountId}
169
- bindings={props.bindings}
170
- assetPaths={props.assetPaths}
171
- public={props.public}
172
- port={props.port}
173
- ip={props.ip}
174
- localProtocol={props.localProtocol}
175
- inspectorPort={props.inspectorPort}
176
- compatibilityDate={props.compatibilityDate}
177
- compatibilityFlags={props.compatibilityFlags}
178
- usageModel={props.usageModel}
179
- env={props.env}
180
- legacyEnv={props.legacyEnv}
181
- zone={props.zone}
182
- host={props.host}
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
- name: string;
189
- removeCallback: () => void;
388
+ name: string;
389
+ removeCallback: () => void;
190
390
  }
191
391
 
192
392
  function useTmpDir(): string | undefined {
193
- const [directory, setDirectory] = useState<DirectorySyncResult>();
194
- const handleError = useErrorHandler();
195
- useEffect(() => {
196
- let dir: DirectorySyncResult | undefined;
197
- try {
198
- dir = tmp.dirSync({ unsafeCleanup: true });
199
- setDirectory(dir);
200
- return;
201
- } catch (err) {
202
- logger.error(
203
- "Failed to create temporary directory to store built files."
204
- );
205
- handleError(err);
206
- }
207
- return () => {
208
- dir?.removeCallback();
209
- };
210
- }, [handleError]);
211
- return directory?.name;
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
- useEffect(() => {
216
- if (!build.command) return;
217
- let watcher: ReturnType<typeof watch> | undefined;
218
- if (build.watch_dir) {
219
- watcher = watch(build.watch_dir, {
220
- persistent: true,
221
- ignoreInitial: true,
222
- }).on("all", (_event, filePath) => {
223
- const relativeFile =
224
- path.relative(expectedEntry.directory, expectedEntry.file) || ".";
225
- //TODO: we should buffer requests to the proxy until this completes
226
- logger.log(`The file ${filePath} changed, restarting build...`);
227
- runCustomBuild(expectedEntry.file, relativeFile, build).catch((err) => {
228
- logger.error("Custom build failed:", err);
229
- });
230
- });
231
- }
232
-
233
- return () => {
234
- watcher?.close();
235
- };
236
- }, [build, expectedEntry]);
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
- return new Promise((resolve) => setTimeout(resolve, period));
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
- let hostName: string | undefined;
247
- while (!hostName) {
248
- try {
249
- const resp = await fetch("http://localhost:8789/metrics");
250
- const data = await resp.text();
251
- const matches = Array.from(data.matchAll(hostNameRegex));
252
- hostName = matches[0][1];
253
- } catch (err) {
254
- await sleep(SLEEP_DURATION);
255
- }
256
- }
257
- return hostName;
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
- const tunnel = useRef<ReturnType<typeof spawn>>();
266
- const removeSignalExitListener = useRef<() => void>();
267
- // TODO: test if cloudflared is available, if not
268
- // point them to a url where they can get docs to install it
269
- useEffect(() => {
270
- async function startTunnel() {
271
- if (toggle) {
272
- try {
273
- await commandExists("cloudflared");
274
- } catch (e) {
275
- logger.warn(
276
- "To share your worker on the Internet, please install `cloudflared` from https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation"
277
- );
278
- return;
279
- }
280
- logger.log("⎔ Starting a tunnel...");
281
- tunnel.current = spawn("cloudflared", [
282
- "tunnel",
283
- "--url",
284
- "http://localhost:8787",
285
- "--metrics",
286
- "localhost:8789",
287
- ]);
288
-
289
- tunnel.current.on("close", (code) => {
290
- if (code) {
291
- logger.log(`Tunnel process exited with code ${code}`);
292
- }
293
- });
294
-
295
- removeSignalExitListener.current = onExit((_code, _signal) => {
296
- logger.log("⎔ Shutting down local tunnel.");
297
- tunnel.current?.kill();
298
- tunnel.current = undefined;
299
- });
300
-
301
- const hostName = await findTunnelHostname();
302
- await clipboardy.write(hostName);
303
- logger.log(`⬣ Sharing at ${hostName}, copied to clipboard.`);
304
- }
305
- }
306
-
307
- startTunnel().catch(async (err) => {
308
- logger.error("tunnel:", err);
309
- });
310
-
311
- return () => {
312
- if (tunnel.current) {
313
- logger.log("⎔ Shutting down tunnel.");
314
- tunnel.current?.kill();
315
- tunnel.current = undefined;
316
- removeSignalExitListener.current && removeSignalExitListener.current();
317
- removeSignalExitListener.current = undefined;
318
- }
319
- };
320
- }, [toggle]);
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
- local: boolean;
325
- tunnel: boolean;
524
+ local: boolean;
525
+ tunnel: boolean;
326
526
  };
327
- function useHotkeys(
328
- initial: useHotkeysInitialState,
329
- port: number,
330
- ip: string,
331
- inspectorPort: number,
332
- localProtocol: "http" | "https"
333
- ) {
334
- // UGH, we should put port in context instead
335
- const [toggles, setToggles] = useState(initial);
336
- const { exit } = useApp();
337
- useInput(
338
- async (
339
- input,
340
- // eslint-disable-next-line unused-imports/no-unused-vars
341
- key
342
- ) => {
343
- switch (input.toLowerCase()) {
344
- // clear console
345
- case "c":
346
- console.clear();
347
- // This console.log causes Ink to re-render the `DevSession` component.
348
- // Couldn't find a better way to tell it to do so...
349
- console.log();
350
- break;
351
- // open browser
352
- case "b": {
353
- await openInBrowser(`${localProtocol}://${ip}:${port}`);
354
- break;
355
- }
356
- // toggle inspector
357
- case "d": {
358
- await openInspector(inspectorPort);
359
- break;
360
- }
361
- // toggle local
362
- case "l":
363
- setToggles((previousToggles) => ({
364
- ...previousToggles,
365
- local: !previousToggles.local,
366
- }));
367
- break;
368
- // shut down
369
- case "q":
370
- case "x":
371
- exit();
372
- break;
373
- default:
374
- // nothing?
375
- break;
376
- }
377
- }
378
- );
379
- return toggles;
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
- const { exit } = useApp();
384
- useEffect(() => exit(props.error));
385
- return (
386
- <>
387
- <Text>Something went wrong:</Text>
388
- <Text>{props.error.stack}</Text>
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
- FallbackComponent: ErrorFallback,
604
+ FallbackComponent: ErrorFallback,
395
605
  });