wrangler 0.0.0-e452a04 → 0.0.0-e464fcdb

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