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