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/inspect.ts CHANGED
@@ -1,14 +1,18 @@
1
+ import { readFileSync } from "fs";
2
+ import { readFile } from "fs/promises";
1
3
  import assert from "node:assert";
2
4
  import { createServer } from "node:http";
3
5
  import os from "node:os";
4
6
  import { URL } from "node:url";
5
-
7
+ import path from "path";
6
8
  import open from "open";
7
9
  import { useEffect, useRef, useState } from "react";
10
+ import { SourceMapConsumer } from "source-map";
8
11
  import WebSocket, { WebSocketServer } from "ws";
9
12
  import { version } from "../package.json";
10
13
  import { logger } from "./logger";
11
14
  import { waitForPortToBeAvailable } from "./proxy";
15
+ import { getAccessToken } from "./user/access";
12
16
  import type Protocol from "devtools-protocol";
13
17
  import type { IncomingMessage, Server, ServerResponse } from "node:http";
14
18
  import type { MessageEvent } from "ws";
@@ -37,417 +41,624 @@ import type { MessageEvent } from "ws";
37
41
  * - handle more methods from console
38
42
  */
39
43
 
44
+ // Information about Wrangler's bundling process that needs passsed through
45
+ // for DevTools sourcemap transformation
46
+ export interface SourceMapMetadata {
47
+ tmpDir: string;
48
+ entryDirectory: string;
49
+ }
50
+
40
51
  interface InspectorProps {
41
- /**
42
- * The port that the local proxy server should listen on.
43
- */
44
- port: number;
45
- /**
46
- * The websocket URL exposed by Workers that the inspector should connect to.
47
- */
48
- inspectorUrl: string | undefined;
49
- /**
50
- * Whether console statements and exceptions should be logged to the terminal.
51
- * (We don't log them in local mode because they're already getting
52
- * logged to the terminal by nature of them actually running in node locally.)
53
- */
54
- logToTerminal: boolean;
52
+ /**
53
+ * The port that the local proxy server should listen on.
54
+ */
55
+ port: number;
56
+ /**
57
+ * The websocket URL exposed by Workers that the inspector should connect to.
58
+ */
59
+ inspectorUrl: string | undefined;
60
+ /**
61
+ * Whether console statements and exceptions should be logged to the terminal.
62
+ * (We don't log them in local mode because they're already getting
63
+ * logged to the terminal by nature of them actually running in node locally.)
64
+ */
65
+ logToTerminal: boolean;
66
+ /**
67
+ * Sourcemap path, so that stacktraces can be interpretted
68
+ */
69
+ sourceMapPath: string | undefined;
70
+
71
+ sourceMapMetadata: SourceMapMetadata | undefined;
72
+
73
+ host?: string;
74
+
75
+ name?: string;
55
76
  }
56
77
 
57
78
  export default function useInspector(props: InspectorProps) {
58
- /** A unique ID for this session. */
59
- const inspectorIdRef = useRef(randomId());
60
-
61
- /** The websocket from the devtools instance. */
62
- const [localWebSocket, setLocalWebSocket] = useState<WebSocket>();
63
- /** The websocket from the edge */
64
- const [remoteWebSocket, setRemoteWebSocket] = useState<WebSocket>();
65
-
66
- /**
67
- * The local proxy server that acts as the bridge between
68
- * the remote websocket and the local DevTools instance.
69
- */
70
- const serverRef = useRef<Server>();
71
- if (serverRef.current === undefined) {
72
- serverRef.current = createServer(
73
- (req: IncomingMessage, res: ServerResponse) => {
74
- switch (req.url) {
75
- // We implement a couple of well known end points
76
- // that are queried for metadata by chrome://inspect
77
- case "/json/version":
78
- res.setHeader("Content-Type", "application/json");
79
- res.end(
80
- JSON.stringify({
81
- Browser: `wrangler/v${version}`,
82
- // TODO: (someday): The DevTools protocol should match that of Edge Worker.
83
- // This could be exposed by the preview API.
84
- "Protocol-Version": "1.3",
85
- })
86
- );
87
- return;
88
- case "/json":
89
- case "/json/list":
90
- {
91
- res.setHeader("Content-Type", "application/json");
92
- const localHost = `localhost:${props.port}/ws`;
93
- const devtoolsFrontendUrl = `devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=${localHost}`;
94
- const devtoolsFrontendUrlCompat = `devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${localHost}`;
95
- res.end(
96
- JSON.stringify([
97
- {
98
- id: inspectorIdRef.current,
99
- type: "node",
100
- description: "workers",
101
- webSocketDebuggerUrl: `ws://${localHost}`,
102
- devtoolsFrontendUrl,
103
- devtoolsFrontendUrlCompat,
104
- // Below are fields that are visible in the DevTools UI.
105
- title: "Cloudflare Worker",
106
- faviconUrl: "https://workers.cloudflare.com/favicon.ico",
107
- url:
108
- "https://" +
109
- (remoteWebSocket
110
- ? new URL(remoteWebSocket.url).host
111
- : "workers.dev"),
112
- },
113
- ])
114
- );
115
- }
116
- return;
117
- default:
118
- break;
119
- }
120
- }
121
- );
122
- }
123
- const server = serverRef.current;
124
-
125
- /**
126
- * The websocket server that runs on top of the proxy server.
127
- */
128
- const wsServerRef = useRef<WebSocketServer>();
129
- if (wsServerRef.current === undefined) {
130
- wsServerRef.current = new WebSocketServer({
131
- server,
132
- clientTracking: true,
133
- });
134
- }
135
- const wsServer = wsServerRef.current;
136
-
137
- wsServer.on("connection", (ws: WebSocket) => {
138
- if (wsServer.clients.size > 1) {
139
- /** We only want to have one active Devtools instance at a time. */
140
- logger.error(
141
- "Tried to open a new devtools window when a previous one was already open."
142
- );
143
- ws.close(1013, "Too many clients; only one can be connected at a time");
144
- } else {
145
- // As promised, save the created websocket in a state hook
146
- setLocalWebSocket(ws);
147
-
148
- ws.addEventListener("close", () => {
149
- // And and cleanup when devtools closes
150
- setLocalWebSocket(undefined);
151
- });
152
- }
153
- });
154
-
155
- /**
156
- * We start and stop the server in an effect to take advantage
157
- * of the component lifecycle. Convenient.
158
- */
159
- useEffect(() => {
160
- const abortController = new AbortController();
161
- async function startInspectorProxy() {
162
- await waitForPortToBeAvailable(props.port, {
163
- retryPeriod: 200,
164
- timeout: 2000,
165
- abortSignal: abortController.signal,
166
- });
167
- server.listen(props.port);
168
- }
169
- startInspectorProxy().catch((err) => {
170
- if ((err as { code: string }).code !== "ABORT_ERR") {
171
- logger.error("Failed to start inspector:", err);
172
- }
173
- });
174
- return () => {
175
- server.close();
176
- // Also disconnect any open websockets/devtools connections
177
- wsServer.clients.forEach((ws) => ws.close());
178
- wsServer.close();
179
- abortController.abort();
180
- };
181
- }, [props.port, server, wsServer]);
182
-
183
- /**
184
- * When connecting to the remote websocket, if we don't start either
185
- * the devtools instance or make an actual request to the worker in time,
186
- * then the connecting process can error out. When this happens, we
187
- * want to simply retry the connection. We use a state hook to trigger retries
188
- * of the effect that connects to the remote websocket.
189
- */
190
- const [
191
- retryRemoteWebSocketConnectionSigil,
192
- setRetryRemoteWebSocketConnectionSigil,
193
- ] = useState<number>(0);
194
- function retryRemoteWebSocketConnection() {
195
- setRetryRemoteWebSocketConnectionSigil((x) => x + 1);
196
- }
197
-
198
- /** A simple incrementing id to attach to messages we send to devtools */
199
- const messageCounterRef = useRef(1);
200
-
201
- // This effect tracks the connection to the remote websocket
202
- // (stored in, no surprises here, `remoteWebSocket`)
203
- useEffect(() => {
204
- if (!props.inspectorUrl) {
205
- return;
206
- }
207
- // The actual websocket instance
208
- const ws = new WebSocket(props.inspectorUrl);
209
- setRemoteWebSocket(ws);
210
-
211
- /**
212
- * A handle to the interval we run to keep the websocket alive
213
- */
214
- let keepAliveInterval: NodeJS.Timer;
215
-
216
- /**
217
- * Test if the websocket is closed
218
- */
219
- function isClosed() {
220
- return (
221
- ws.readyState === WebSocket.CLOSED ||
222
- ws.readyState === WebSocket.CLOSING
223
- );
224
- }
225
-
226
- /**
227
- * Send a message to the remote websocket
228
- */
229
- function send(event: Record<string, unknown>): void {
230
- if (!isClosed()) {
231
- ws.send(JSON.stringify(event));
232
- }
233
- }
234
-
235
- /**
236
- * Closes the inspector.
237
- */
238
- function close(): void {
239
- if (!isClosed()) {
240
- try {
241
- ws.close();
242
- } catch (err) {
243
- // Closing before the websocket is ready will throw an error.
244
- }
245
- }
246
- }
247
-
248
- /**
249
- * Since we have a handle on the remote websocket, we can tap
250
- * into its events, and log any pertinent ones directly to
251
- * the terminal (which means you have insight into your worker
252
- * without having to open the devtools).
253
- */
254
- if (props.logToTerminal) {
255
- ws.addEventListener("message", (event: MessageEvent) => {
256
- if (typeof event.data === "string") {
257
- const evt = JSON.parse(event.data);
258
- if (evt.method === "Runtime.exceptionThrown") {
259
- const params = evt.params as Protocol.Runtime.ExceptionThrownEvent;
260
- logger.error(
261
- params.exceptionDetails.text,
262
- params.exceptionDetails.exception?.description ?? ""
263
- );
264
- }
265
- if (evt.method === "Runtime.consoleAPICalled") {
266
- logConsoleMessage(
267
- evt.params as Protocol.Runtime.ConsoleAPICalledEvent
268
- );
269
- }
270
- } else {
271
- // We should never get here, but who know is 2022...
272
- logger.error("Unrecognised devtools event:", event);
273
- }
274
- });
275
- }
276
-
277
- ws.addEventListener("open", () => {
278
- send({ method: "Runtime.enable", id: messageCounterRef.current });
279
- // TODO: This doesn't actually work. Must fix.
280
- send({ method: "Network.enable", id: messageCounterRef.current++ });
281
-
282
- keepAliveInterval = setInterval(() => {
283
- send({
284
- method: "Runtime.getIsolateId",
285
- id: messageCounterRef.current++,
286
- });
287
- }, 10_000);
288
- });
289
-
290
- ws.on("unexpected-response", () => {
291
- logger.log("Waiting for connection...");
292
- /**
293
- * This usually means the worker is not "ready" yet
294
- * so we'll just retry the connection process
295
- */
296
- retryRemoteWebSocketConnection();
297
- });
298
-
299
- ws.addEventListener("close", () => {
300
- clearInterval(keepAliveInterval);
301
- });
302
-
303
- return () => {
304
- // clean up! Let's first stop the heartbeat interval
305
- clearInterval(keepAliveInterval);
306
- // Then we'll send a message to the devtools instance to
307
- // tell it to clear the console.
308
- wsServer.clients.forEach((client) => {
309
- // We could've used `localSocket` here, but
310
- // then we would have had to add it to the effect
311
- // change detection array, which would have made a
312
- // bunch of other stuff complicated. So we'll just
313
- // cycle through all of the server's connected clients
314
- // (in practice, there should only be one or zero) and send
315
- // the Log.clear message.
316
- client.send(
317
- JSON.stringify({
318
- // TODO: This doesn't actually work. Must fix.
319
- method: "Log.clear",
320
- // we can disable the next eslint warning since
321
- // we're referencing a ref that stays alive
322
- // eslint-disable-next-line react-hooks/exhaustive-deps
323
- id: messageCounterRef.current++,
324
- params: {},
325
- })
326
- );
327
- });
328
- // Finally, we'll close the websocket
329
- close();
330
- // And we'll clear `remoteWebsocket`
331
- setRemoteWebSocket(undefined);
332
- };
333
- }, [
334
- props.inspectorUrl,
335
- props.logToTerminal,
336
- wsServer,
337
- // We use a state value as a sigil to trigger a retry of the
338
- // remote websocket connection. It's not used inside the effect,
339
- // so react-hooks/exhaustive-deps doesn't complain if it's not
340
- // included in the dependency array. But its presence is critical,
341
- // so do NOT remove it from the dependency list.
342
- retryRemoteWebSocketConnectionSigil,
343
- ]);
344
-
345
- /**
346
- * We want to make sure we don't lose any messages we receive from the
347
- * remote websocket before devtools connects. So we use a ref to buffer
348
- * messages, and flush them whenever devtools connects.
349
- */
350
- const messageBufferRef = useRef<MessageEvent[]>([]);
351
-
352
- // This effect tracks the state changes _between_ the local
353
- // and remote websockets, and handles how messages flow between them.
354
- useEffect(() => {
355
- /**
356
- * This event listener is used for buffering messages from
357
- * the remote websocket, and flushing them
358
- * when the local websocket connects.
359
- */
360
- function bufferMessageFromRemoteSocket(event: MessageEvent) {
361
- messageBufferRef.current.push(event);
362
- // TODO: maybe we should have a max limit on this?
363
- // if so, we should be careful when removing messages
364
- // from the front, because they could be critical for
365
- // devtools (like execution context creation, etc)
366
- }
367
-
368
- if (remoteWebSocket && !localWebSocket) {
369
- // The local websocket hasn't connected yet, so we'll
370
- // buffer messages until it does.
371
- remoteWebSocket.addEventListener(
372
- "message",
373
- bufferMessageFromRemoteSocket
374
- );
375
- }
376
-
377
- /** Send a message from the local websocket to the remote websocket */
378
- function sendMessageToRemoteWebSocket(event: MessageEvent) {
379
- try {
380
- assert(
381
- remoteWebSocket,
382
- "Trying to send a message to an undefined `remoteWebSocket`"
383
- );
384
- remoteWebSocket.send(event.data);
385
- } catch (e) {
386
- if (
387
- (e as Error).message !==
388
- "WebSocket is not open: readyState 0 (CONNECTING)"
389
- ) {
390
- /**
391
- * ^ this just means we haven't opened a websocket yet
392
- * usually happens until there's at least one request
393
- * which is weird, because we may miss something that
394
- * happens on the first request. Maybe we should buffer
395
- * these messages too?
396
- */
397
- logger.error(e);
398
- }
399
- }
400
- }
401
-
402
- /** Send a message from the local websocket to the remote websocket */
403
- function sendMessageToLocalWebSocket(event: MessageEvent) {
404
- assert(
405
- localWebSocket,
406
- "Trying to send a message to an undefined `localWebSocket`"
407
- );
408
- localWebSocket.send(event.data);
409
- }
410
-
411
- if (localWebSocket && remoteWebSocket) {
412
- // Both the remote and local websockets are connected, so let's
413
- // start sending messages between them.
414
- localWebSocket.addEventListener("message", sendMessageToRemoteWebSocket);
415
- remoteWebSocket.addEventListener("message", sendMessageToLocalWebSocket);
416
-
417
- // Also, let's flush any buffered messages
418
- messageBufferRef.current.forEach(sendMessageToLocalWebSocket);
419
- messageBufferRef.current = [];
420
- }
421
-
422
- return () => {
423
- // Cleanup like good citizens
424
- if (remoteWebSocket) {
425
- remoteWebSocket.removeEventListener(
426
- "message",
427
- bufferMessageFromRemoteSocket
428
- );
429
- remoteWebSocket.removeEventListener(
430
- "message",
431
- sendMessageToLocalWebSocket
432
- );
433
- }
434
- if (localWebSocket) {
435
- localWebSocket.removeEventListener(
436
- "message",
437
- sendMessageToRemoteWebSocket
438
- );
439
- }
440
- };
441
- }, [localWebSocket, remoteWebSocket]);
79
+ /** A unique ID for this session. */
80
+ const inspectorIdRef = useRef(randomId());
81
+
82
+ /** The websocket from the devtools instance. */
83
+ const [localWebSocket, setLocalWebSocket] = useState<WebSocket>();
84
+ /** The websocket from the edge */
85
+ const [remoteWebSocket, setRemoteWebSocket] = useState<WebSocket>();
86
+
87
+ /**
88
+ * The local proxy server that acts as the bridge between
89
+ * the remote websocket and the local DevTools instance.
90
+ */
91
+ const serverRef = useRef<Server>();
92
+ if (serverRef.current === undefined) {
93
+ serverRef.current = createServer(
94
+ (req: IncomingMessage, res: ServerResponse) => {
95
+ switch (req.url) {
96
+ // We implement a couple of well known end points
97
+ // that are queried for metadata by chrome://inspect
98
+ case "/json/version":
99
+ res.setHeader("Content-Type", "application/json");
100
+ res.end(
101
+ JSON.stringify({
102
+ Browser: `wrangler/v${version}`,
103
+ // TODO: (someday): The DevTools protocol should match that of Edge Worker.
104
+ // This could be exposed by the preview API.
105
+ "Protocol-Version": "1.3",
106
+ })
107
+ );
108
+ return;
109
+ case "/json":
110
+ case "/json/list":
111
+ {
112
+ res.setHeader("Content-Type", "application/json");
113
+ const localHost = `localhost:${props.port}/ws`;
114
+ const devtoolsFrontendUrl = `devtools://devtools/bundled/js_app.html?experiments=true&v8only=true&ws=${localHost}`;
115
+ const devtoolsFrontendUrlCompat = `devtools://devtools/bundled/inspector.html?experiments=true&v8only=true&ws=${localHost}`;
116
+ res.end(
117
+ JSON.stringify([
118
+ {
119
+ id: inspectorIdRef.current,
120
+ type: "node",
121
+ description: "workers",
122
+ webSocketDebuggerUrl: `ws://${localHost}`,
123
+ devtoolsFrontendUrl,
124
+ devtoolsFrontendUrlCompat,
125
+ // Below are fields that are visible in the DevTools UI.
126
+ title: "Cloudflare Worker",
127
+ faviconUrl: "https://workers.cloudflare.com/favicon.ico",
128
+ url:
129
+ "https://" +
130
+ (remoteWebSocket
131
+ ? new URL(remoteWebSocket.url).host
132
+ : "workers.dev"),
133
+ },
134
+ ])
135
+ );
136
+ }
137
+ return;
138
+ default:
139
+ break;
140
+ }
141
+ }
142
+ );
143
+ }
144
+ const server = serverRef.current;
145
+
146
+ /**
147
+ * The websocket server that runs on top of the proxy server.
148
+ */
149
+ const wsServerRef = useRef<WebSocketServer>();
150
+ if (wsServerRef.current === undefined) {
151
+ wsServerRef.current = new WebSocketServer({
152
+ server,
153
+ clientTracking: true,
154
+ });
155
+ }
156
+ const wsServer = wsServerRef.current;
157
+
158
+ wsServer.on("connection", (ws: WebSocket) => {
159
+ if (wsServer.clients.size > 1) {
160
+ /** We only want to have one active Devtools instance at a time. */
161
+ logger.error(
162
+ "Tried to open a new devtools window when a previous one was already open."
163
+ );
164
+ ws.close(1013, "Too many clients; only one can be connected at a time");
165
+ } else {
166
+ // Since Wrangler proxies the inspector, reloading Chrome DevTools won't trigger debugger initialisation events (because it's connecting to an extant session).
167
+ // This sends a `Debugger.disable` message to the remote when a new WebSocket connection is initialised,
168
+ // with the assumption that the new connection will shortly send a `Debugger.enable` event and trigger re-initialisation.
169
+ // The key initialisation messages that are needed are the `Debugger.scriptParsed events`.
170
+ remoteWebSocket?.send(
171
+ JSON.stringify({
172
+ // This number is arbitrary, and is chosen to be high so as not to conflict with messages that DevTools might actually send.
173
+ // For completeness, these options don't work: 0, -1, or Number.MAX_SAFE_INTEGER
174
+ id: 100_000_000,
175
+ method: "Debugger.disable",
176
+ })
177
+ );
178
+ // As promised, save the created websocket in a state hook
179
+ setLocalWebSocket(ws);
180
+
181
+ ws.addEventListener("close", () => {
182
+ // And and cleanup when devtools closes
183
+ setLocalWebSocket(undefined);
184
+ });
185
+ }
186
+ });
187
+
188
+ /**
189
+ * We start and stop the server in an effect to take advantage
190
+ * of the component lifecycle. Convenient.
191
+ */
192
+ useEffect(() => {
193
+ const abortController = new AbortController();
194
+ async function startInspectorProxy() {
195
+ await waitForPortToBeAvailable(props.port, {
196
+ retryPeriod: 200,
197
+ timeout: 2000,
198
+ abortSignal: abortController.signal,
199
+ });
200
+ server.listen(props.port);
201
+ }
202
+ startInspectorProxy().catch((err) => {
203
+ if ((err as { code: string }).code !== "ABORT_ERR") {
204
+ logger.error("Failed to start inspector:", err);
205
+ }
206
+ });
207
+ return () => {
208
+ server.close();
209
+ // Also disconnect any open websockets/devtools connections
210
+ wsServer.clients.forEach((ws) => ws.close());
211
+ wsServer.close();
212
+ abortController.abort();
213
+ };
214
+ }, [props.port, server, wsServer]);
215
+
216
+ /**
217
+ * When connecting to the remote websocket, if we don't start either
218
+ * the devtools instance or make an actual request to the worker in time,
219
+ * then the connecting process can error out. When this happens, we
220
+ * want to simply retry the connection. We use a state hook to trigger retries
221
+ * of the effect that connects to the remote websocket.
222
+ */
223
+ const [
224
+ retryRemoteWebSocketConnectionSigil,
225
+ setRetryRemoteWebSocketConnectionSigil,
226
+ ] = useState<number>(0);
227
+ function retryRemoteWebSocketConnection() {
228
+ setRetryRemoteWebSocketConnectionSigil((x) => x + 1);
229
+ }
230
+
231
+ /** A simple incrementing id to attach to messages we send to devtools */
232
+ const messageCounterRef = useRef(1);
233
+
234
+ const cfAccessRef = useRef<string>();
235
+
236
+ useEffect(() => {
237
+ const run = async () => {
238
+ if (props.host && !cfAccessRef.current) {
239
+ const token = await getAccessToken(props.host);
240
+ cfAccessRef.current = token;
241
+ }
242
+ };
243
+ if (props.host) void run();
244
+ }, [props.host]);
245
+
246
+ // This effect tracks the connection to the remote websocket
247
+ // (stored in, no surprises here, `remoteWebSocket`)
248
+ useEffect(() => {
249
+ if (!props.inspectorUrl) {
250
+ return;
251
+ }
252
+
253
+ // The actual websocket instance
254
+ const ws = new WebSocket(props.inspectorUrl, {
255
+ headers: {
256
+ cookie: `CF_Authorization=${cfAccessRef.current}`,
257
+ },
258
+ });
259
+ setRemoteWebSocket(ws);
260
+
261
+ /**
262
+ * A handle to the interval we run to keep the websocket alive
263
+ */
264
+ let keepAliveInterval: NodeJS.Timer;
265
+
266
+ /**
267
+ * Test if the websocket is closed
268
+ */
269
+ function isClosed() {
270
+ return (
271
+ ws.readyState === WebSocket.CLOSED ||
272
+ ws.readyState === WebSocket.CLOSING
273
+ );
274
+ }
275
+
276
+ /**
277
+ * Send a message to the remote websocket
278
+ */
279
+ function send(event: Record<string, unknown>): void {
280
+ if (!isClosed()) {
281
+ ws.send(JSON.stringify(event));
282
+ }
283
+ }
284
+
285
+ /**
286
+ * Closes the inspector.
287
+ */
288
+ function close(): void {
289
+ if (!isClosed()) {
290
+ try {
291
+ ws.close();
292
+ } catch (err) {
293
+ // Closing before the websocket is ready will throw an error.
294
+ }
295
+ }
296
+ }
297
+
298
+ /**
299
+ * Since we have a handle on the remote websocket, we can tap
300
+ * into its events, and log any pertinent ones directly to
301
+ * the terminal (which means you have insight into your worker
302
+ * without having to open the devtools).
303
+ */
304
+ if (props.logToTerminal) {
305
+ ws.addEventListener("message", async (event: MessageEvent) => {
306
+ if (typeof event.data === "string") {
307
+ const evt = JSON.parse(event.data);
308
+ if (evt.method === "Runtime.exceptionThrown") {
309
+ const params = evt.params as Protocol.Runtime.ExceptionThrownEvent;
310
+
311
+ // Parse stack trace with source map.
312
+ if (props.sourceMapPath) {
313
+ // Parse in the sourcemap
314
+ const mapContent = JSON.parse(
315
+ await readFile(props.sourceMapPath, "utf-8")
316
+ );
317
+
318
+ // Create the lines for the exception details log
319
+ const exceptionLines = [
320
+ params.exceptionDetails.exception?.description?.split("\n")[0],
321
+ ];
322
+
323
+ await SourceMapConsumer.with(
324
+ mapContent,
325
+ null,
326
+ async (consumer) => {
327
+ // Pass each of the callframes into the consumer, and format the error
328
+ const stack = params.exceptionDetails.stackTrace?.callFrames;
329
+
330
+ stack?.forEach(
331
+ ({ functionName, lineNumber, columnNumber }, i) => {
332
+ try {
333
+ if (lineNumber) {
334
+ // The line and column numbers in the stackTrace are zero indexed,
335
+ // whereas the sourcemap consumer indexes from one.
336
+ const pos = consumer.originalPositionFor({
337
+ line: lineNumber + 1,
338
+ column: columnNumber + 1,
339
+ });
340
+
341
+ // Print out line which caused error:
342
+ if (i === 0 && pos.source && pos.line) {
343
+ const fileSource = consumer.sourceContentFor(
344
+ pos.source
345
+ );
346
+ const fileSourceLine =
347
+ fileSource?.split("\n")[pos.line - 1] || "";
348
+ exceptionLines.push(fileSourceLine.trim());
349
+
350
+ // If we have a column, we can mark the position underneath
351
+ if (pos.column) {
352
+ exceptionLines.push(
353
+ `${" ".repeat(
354
+ pos.column - fileSourceLine.search(/\S/)
355
+ )}^`
356
+ );
357
+ }
358
+ }
359
+
360
+ // From the way esbuild implements the "names" field:
361
+ // > To save space, the original name is only recorded when it's different from the final name.
362
+ // however, source-map consumer does not handle this
363
+ if (pos && pos.line != null) {
364
+ const convertedFnName =
365
+ pos.name || functionName || "";
366
+ exceptionLines.push(
367
+ ` at ${convertedFnName} (${pos.source}:${pos.line}:${pos.column})`
368
+ );
369
+ }
370
+ }
371
+ } catch {
372
+ // Line failed to parse through the sourcemap consumer
373
+ // We should handle this better
374
+ }
375
+ }
376
+ );
377
+ }
378
+ );
379
+
380
+ // Log the parsed stacktrace
381
+ logger.error(
382
+ params.exceptionDetails.text,
383
+ exceptionLines.join("\n")
384
+ );
385
+ } else {
386
+ // We log the stacktrace to the terminal
387
+ logger.error(
388
+ params.exceptionDetails.text,
389
+ params.exceptionDetails.exception?.description ?? ""
390
+ );
391
+ }
392
+ }
393
+ if (evt.method === "Runtime.consoleAPICalled") {
394
+ logConsoleMessage(
395
+ evt.params as Protocol.Runtime.ConsoleAPICalledEvent
396
+ );
397
+ }
398
+ } else {
399
+ // We should never get here, but who know is 2022...
400
+ logger.error("Unrecognised devtools event:", event);
401
+ }
402
+ });
403
+ }
404
+
405
+ ws.addEventListener("open", () => {
406
+ send({ method: "Runtime.enable", id: messageCounterRef.current });
407
+ // TODO: This doesn't actually work. Must fix.
408
+ send({ method: "Network.enable", id: messageCounterRef.current++ });
409
+
410
+ keepAliveInterval = setInterval(() => {
411
+ send({
412
+ method: "Runtime.getIsolateId",
413
+ id: messageCounterRef.current++,
414
+ });
415
+ }, 10_000);
416
+ });
417
+
418
+ ws.on("unexpected-response", () => {
419
+ logger.log("Waiting for connection...");
420
+ /**
421
+ * This usually means the worker is not "ready" yet
422
+ * so we'll just retry the connection process
423
+ */
424
+ retryRemoteWebSocketConnection();
425
+ });
426
+
427
+ ws.addEventListener("close", () => {
428
+ clearInterval(keepAliveInterval);
429
+ });
430
+
431
+ return () => {
432
+ // clean up! Let's first stop the heartbeat interval
433
+ clearInterval(keepAliveInterval);
434
+ // Then we'll send a message to the devtools instance to
435
+ // tell it to clear the console.
436
+ wsServer.clients.forEach((client) => {
437
+ // We could've used `localSocket` here, but
438
+ // then we would have had to add it to the effect
439
+ // change detection array, which would have made a
440
+ // bunch of other stuff complicated. So we'll just
441
+ // cycle through all of the server's connected clients
442
+ // (in practice, there should only be one or zero) and send
443
+ // the Log.clear message.
444
+ client.send(
445
+ JSON.stringify({
446
+ // TODO: This doesn't actually work. Must fix.
447
+ method: "Log.clear",
448
+ // we can disable the next eslint warning since
449
+ // we're referencing a ref that stays alive
450
+ // eslint-disable-next-line react-hooks/exhaustive-deps
451
+ id: messageCounterRef.current++,
452
+ params: {},
453
+ })
454
+ );
455
+ });
456
+ // Finally, we'll close the websocket
457
+ close();
458
+ // And we'll clear `remoteWebsocket`
459
+ setRemoteWebSocket(undefined);
460
+ };
461
+ }, [
462
+ props.inspectorUrl,
463
+ props.logToTerminal,
464
+ props.sourceMapPath,
465
+ wsServer,
466
+ // We use a state value as a sigil to trigger a retry of the
467
+ // remote websocket connection. It's not used inside the effect,
468
+ // so react-hooks/exhaustive-deps doesn't complain if it's not
469
+ // included in the dependency array. But its presence is critical,
470
+ // so do NOT remove it from the dependency list.
471
+ retryRemoteWebSocketConnectionSigil,
472
+ ]);
473
+
474
+ /**
475
+ * We want to make sure we don't lose any messages we receive from the
476
+ * remote websocket before devtools connects. So we use a ref to buffer
477
+ * messages, and flush them whenever devtools connects.
478
+ */
479
+ const messageBufferRef = useRef<MessageEvent[]>([]);
480
+
481
+ // This effect tracks the state changes _between_ the local
482
+ // and remote websockets, and handles how messages flow between them.
483
+ useEffect(() => {
484
+ /**
485
+ * This event listener is used for buffering messages from
486
+ * the remote websocket, and flushing them
487
+ * when the local websocket connects.
488
+ */
489
+ function bufferMessageFromRemoteSocket(event: MessageEvent) {
490
+ messageBufferRef.current.push(event);
491
+ // TODO: maybe we should have a max limit on this?
492
+ // if so, we should be careful when removing messages
493
+ // from the front, because they could be critical for
494
+ // devtools (like execution context creation, etc)
495
+ }
496
+
497
+ if (remoteWebSocket && !localWebSocket) {
498
+ // The local websocket hasn't connected yet, so we'll
499
+ // buffer messages until it does.
500
+ remoteWebSocket.addEventListener(
501
+ "message",
502
+ bufferMessageFromRemoteSocket
503
+ );
504
+ }
505
+
506
+ /** Send a message from the local websocket to the remote websocket */
507
+ function sendMessageToRemoteWebSocket(event: MessageEvent) {
508
+ try {
509
+ // Intercept Network.loadNetworkResource to load sourcemaps
510
+ const message = JSON.parse(event.data as string);
511
+ if (
512
+ message.method === "Network.loadNetworkResource" &&
513
+ props.sourceMapPath !== undefined &&
514
+ props.sourceMapMetadata !== undefined
515
+ ) {
516
+ // Read the generated source map from esbuild
517
+ const sourceMap = JSON.parse(
518
+ readFileSync(props.sourceMapPath, "utf-8")
519
+ );
520
+
521
+ // The source root is a temporary directory (`tmpDir`), and so shouldn't be user-visible
522
+ // It provides no useful info to the user
523
+ sourceMap.sourceRoot = "";
524
+
525
+ const tmpDir = props.sourceMapMetadata.tmpDir;
526
+
527
+ // See https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#heading=h.mt2g20loc2ct
528
+ // The above link documents the x_google_ignoreList property, which is intended to mark code that shouldn't be visible in DevTools
529
+ // Here we use it to indicate specifically Wrangler-injected code (facades & middleware)
530
+ sourceMap.x_google_ignoreList = sourceMap.sources
531
+ // Filter anything in the generated tmpDir, and anything from Wrangler's templates
532
+ // This should cover facades and middleware, but intentionally doesn't include all non-user code e.g. node_modules
533
+ .map((s: string, idx: number) =>
534
+ s.includes(tmpDir) || s.includes("wrangler/templates")
535
+ ? idx
536
+ : null
537
+ )
538
+ .filter((i: number | null) => i !== null);
539
+
540
+ const entryDirectory = props.sourceMapMetadata.entryDirectory;
541
+
542
+ sourceMap.sources = sourceMap.sources.map(
543
+ (s: string) =>
544
+ // These are never loaded by Wrangler or DevTools. However, the presence of a scheme is required for DevTools to show the path as folders in the Sources view
545
+ // The scheme is intentially not the same as for the sourceMappingURL
546
+ // Without this difference in scheme, DevTools will not strip prefix `../` path elements from top level folders (../node_modules -> node_modules, for instance)
547
+ `worker://${props.name}/${path.relative(entryDirectory, s)}`
548
+ );
549
+
550
+ sendMessageToLocalWebSocket({
551
+ data: JSON.stringify({
552
+ id: message.id,
553
+ result: {
554
+ resource: {
555
+ success: true,
556
+ text: JSON.stringify(sourceMap),
557
+ },
558
+ },
559
+ }),
560
+ });
561
+ return;
562
+ }
563
+ } catch (e) {
564
+ logger.debug(e);
565
+ // Ignore errors, fallthrough to the remote inspector
566
+ }
567
+ try {
568
+ assert(
569
+ remoteWebSocket,
570
+ "Trying to send a message to an undefined `remoteWebSocket`"
571
+ );
572
+ remoteWebSocket.send(event.data);
573
+ } catch (e) {
574
+ if (
575
+ (e as Error).message !==
576
+ "WebSocket is not open: readyState 0 (CONNECTING)"
577
+ ) {
578
+ /**
579
+ * ^ this just means we haven't opened a websocket yet
580
+ * usually happens until there's at least one request
581
+ * which is weird, because we may miss something that
582
+ * happens on the first request. Maybe we should buffer
583
+ * these messages too?
584
+ */
585
+ logger.error(e);
586
+ }
587
+ }
588
+ }
589
+
590
+ /** Send a message from the local websocket to the remote websocket */
591
+ function sendMessageToLocalWebSocket(event: Pick<MessageEvent, "data">) {
592
+ assert(
593
+ localWebSocket,
594
+ "Trying to send a message to an undefined `localWebSocket`"
595
+ );
596
+ try {
597
+ // Intercept Debugger.scriptParsed responses to inject URL schemes
598
+ const message = JSON.parse(event.data as string);
599
+ if (message.method === "Debugger.scriptParsed") {
600
+ // Add the worker:// scheme conditionally, since some module types already have schemes (e.g. wasm)
601
+ message.params.url = new URL(
602
+ message.params.url,
603
+ `worker://${props.name}`
604
+ ).href;
605
+ localWebSocket.send(JSON.stringify(message));
606
+ return;
607
+ }
608
+ } catch (e) {
609
+ logger.debug(e);
610
+ // Ignore errors, fallthrough to the local websocket
611
+ }
612
+
613
+ localWebSocket.send(event.data);
614
+ }
615
+
616
+ if (localWebSocket && remoteWebSocket) {
617
+ // Both the remote and local websockets are connected, so let's
618
+ // start sending messages between them.
619
+ localWebSocket.addEventListener("message", sendMessageToRemoteWebSocket);
620
+ remoteWebSocket.addEventListener("message", sendMessageToLocalWebSocket);
621
+
622
+ // Also, let's flush any buffered messages
623
+ messageBufferRef.current.forEach(sendMessageToLocalWebSocket);
624
+ messageBufferRef.current = [];
625
+ }
626
+
627
+ return () => {
628
+ // Cleanup like good citizens
629
+ if (remoteWebSocket) {
630
+ remoteWebSocket.removeEventListener(
631
+ "message",
632
+ bufferMessageFromRemoteSocket
633
+ );
634
+ remoteWebSocket.removeEventListener(
635
+ "message",
636
+ sendMessageToLocalWebSocket
637
+ );
638
+ }
639
+ if (localWebSocket) {
640
+ localWebSocket.removeEventListener(
641
+ "message",
642
+ sendMessageToRemoteWebSocket
643
+ );
644
+ }
645
+ };
646
+ }, [
647
+ localWebSocket,
648
+ remoteWebSocket,
649
+ props.name,
650
+ props.sourceMapMetadata,
651
+ props.sourceMapPath,
652
+ ]);
442
653
  }
443
654
 
444
655
  // Credit: https://stackoverflow.com/a/2117523
445
656
  function randomId(): string {
446
- return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
447
- const r = (Math.random() * 16) | 0,
448
- v = c == "x" ? r : (r & 0x3) | 0x8;
449
- return v.toString(16);
450
- });
657
+ return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
658
+ const r = (Math.random() * 16) | 0,
659
+ v = c == "x" ? r : (r & 0x3) | 0x8;
660
+ return v.toString(16);
661
+ });
451
662
  }
452
663
 
453
664
  /**
@@ -459,204 +670,214 @@ function randomId(): string {
459
670
  */
460
671
 
461
672
  export const mapConsoleAPIMessageTypeToConsoleMethod: {
462
- [key in Protocol.Runtime.ConsoleAPICalledEvent["type"]]: Exclude<
463
- keyof Console,
464
- "Console"
465
- >;
673
+ [key in Protocol.Runtime.ConsoleAPICalledEvent["type"]]: Exclude<
674
+ keyof Console,
675
+ "Console"
676
+ >;
466
677
  } = {
467
- log: "log",
468
- debug: "debug",
469
- info: "info",
470
- warning: "warn",
471
- error: "error",
472
- dir: "dir",
473
- dirxml: "dirxml",
474
- table: "table",
475
- trace: "trace",
476
- clear: "clear",
477
- count: "count",
478
- assert: "assert",
479
- profile: "profile",
480
- profileEnd: "profileEnd",
481
- timeEnd: "timeEnd",
482
- startGroup: "group",
483
- startGroupCollapsed: "groupCollapsed",
484
- endGroup: "groupEnd",
678
+ log: "log",
679
+ debug: "debug",
680
+ info: "info",
681
+ warning: "warn",
682
+ error: "error",
683
+ dir: "dir",
684
+ dirxml: "dirxml",
685
+ table: "table",
686
+ trace: "trace",
687
+ clear: "clear",
688
+ count: "count",
689
+ assert: "assert",
690
+ profile: "profile",
691
+ profileEnd: "profileEnd",
692
+ timeEnd: "timeEnd",
693
+ startGroup: "group",
694
+ startGroupCollapsed: "groupCollapsed",
695
+ endGroup: "groupEnd",
485
696
  };
486
697
 
487
698
  function logConsoleMessage(evt: Protocol.Runtime.ConsoleAPICalledEvent): void {
488
- const args: string[] = [];
489
- for (const ro of evt.args) {
490
- switch (ro.type) {
491
- case "string":
492
- case "number":
493
- case "boolean":
494
- case "undefined":
495
- case "symbol":
496
- case "bigint":
497
- args.push(ro.value);
498
- break;
499
- case "function":
500
- args.push(`[Function: ${ro.description ?? "<no-description>"}]`);
501
- break;
502
- case "object":
503
- if (!ro.preview) {
504
- args.push(
505
- ro.subtype === "null"
506
- ? "null"
507
- : ro.description ?? "<no-description>"
508
- );
509
- } else {
510
- args.push(ro.preview.description ?? "<no-description>");
511
-
512
- switch (ro.preview.subtype) {
513
- case "array":
514
- args.push(
515
- "[ " +
516
- ro.preview.properties
517
- .map(({ value }) => {
518
- return value;
519
- })
520
- .join(", ") +
521
- (ro.preview.overflow ? "..." : "") +
522
- " ]"
523
- );
524
-
525
- break;
526
- case "weakmap":
527
- case "map":
528
- args.push(
529
- "{\n" +
530
- // Maps always have entries
531
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
532
- ro.preview
533
- .entries!.map(({ key, value }) => {
534
- return ` ${key?.description ?? "<unknown>"} => ${
535
- value.description
536
- }`;
537
- })
538
- .join(",\n") +
539
- (ro.preview.overflow ? "\n ..." : "") +
540
- "\n}"
541
- );
542
-
543
- break;
544
- case "weakset":
545
- case "set":
546
- args.push(
547
- "{ " +
548
- // Sets always have entries
549
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
550
- ro.preview
551
- .entries!.map(({ value }) => {
552
- return `${value.description}`;
553
- })
554
- .join(", ") +
555
- (ro.preview.overflow ? ", ..." : "") +
556
- " }"
557
- );
558
- break;
559
- case "regexp":
560
- break;
561
- case "date":
562
- break;
563
- case "generator":
564
- args.push(ro.preview.properties[0].value || "");
565
- break;
566
- case "promise":
567
- if (ro.preview.properties[0].value === "pending") {
568
- args.push(`{<${ro.preview.properties[0].value}>}`);
569
- } else {
570
- args.push(
571
- `{<${ro.preview.properties[0].value}>: ${ro.preview.properties[1].value}}`
572
- );
573
- }
574
- break;
575
- case "node":
576
- case "iterator":
577
- case "proxy":
578
- case "typedarray":
579
- case "arraybuffer":
580
- case "dataview":
581
- case "webassemblymemory":
582
- case "wasmvalue":
583
- break;
584
- case "error":
585
- default:
586
- // just a pojo
587
- args.push(
588
- "{\n" +
589
- ro.preview.properties
590
- .map(({ name, value }) => {
591
- return ` ${name}: ${value}`;
592
- })
593
- .join(",\n") +
594
- (ro.preview.overflow ? "\n ..." : "") +
595
- "\n}"
596
- );
597
- }
598
- }
599
- break;
600
- default:
601
- args.push(ro.description || ro.unserializableValue || "🦋");
602
- break;
603
- }
604
- }
605
-
606
- const method = mapConsoleAPIMessageTypeToConsoleMethod[evt.type];
607
-
608
- if (method in console) {
609
- switch (method) {
610
- case "dir":
611
- console.dir(args);
612
- break;
613
- case "table":
614
- console.table(args);
615
- break;
616
- default:
617
- // eslint-disable-next-line prefer-spread
618
- console[method].apply(console, args);
619
- break;
620
- }
621
- } else {
622
- logger.warn(`Unsupported console method: ${method}`);
623
- logger.warn("console event:", evt);
624
- }
699
+ const args: string[] = [];
700
+ for (const ro of evt.args) {
701
+ switch (ro.type) {
702
+ case "string":
703
+ case "number":
704
+ case "boolean":
705
+ case "undefined":
706
+ case "symbol":
707
+ case "bigint":
708
+ args.push(ro.value);
709
+ break;
710
+ case "function":
711
+ args.push(`[Function: ${ro.description ?? "<no-description>"}]`);
712
+ break;
713
+ case "object":
714
+ if (!ro.preview) {
715
+ args.push(
716
+ ro.subtype === "null"
717
+ ? "null"
718
+ : ro.description ?? "<no-description>"
719
+ );
720
+ } else {
721
+ args.push(ro.preview.description ?? "<no-description>");
722
+
723
+ switch (ro.preview.subtype) {
724
+ case "array":
725
+ args.push(
726
+ "[ " +
727
+ ro.preview.properties
728
+ .map(({ value }) => {
729
+ return value;
730
+ })
731
+ .join(", ") +
732
+ (ro.preview.overflow ? "..." : "") +
733
+ " ]"
734
+ );
735
+
736
+ break;
737
+ case "weakmap":
738
+ case "map":
739
+ ro.preview.entries === undefined
740
+ ? args.push("{}")
741
+ : args.push(
742
+ "{\n" +
743
+ ro.preview.entries
744
+ .map(({ key, value }) => {
745
+ return ` ${key?.description ?? "<unknown>"} => ${
746
+ value.description
747
+ }`;
748
+ })
749
+ .join(",\n") +
750
+ (ro.preview.overflow ? "\n ..." : "") +
751
+ "\n}"
752
+ );
753
+
754
+ break;
755
+ case "weakset":
756
+ case "set":
757
+ ro.preview.entries === undefined
758
+ ? args.push("{}")
759
+ : args.push(
760
+ "{ " +
761
+ ro.preview.entries
762
+ .map(({ value }) => {
763
+ return `${value.description}`;
764
+ })
765
+ .join(", ") +
766
+ (ro.preview.overflow ? ", ..." : "") +
767
+ " }"
768
+ );
769
+ break;
770
+ case "regexp":
771
+ break;
772
+ case "date":
773
+ break;
774
+ case "generator":
775
+ args.push(ro.preview.properties[0].value || "");
776
+ break;
777
+ case "promise":
778
+ if (ro.preview.properties[0].value === "pending") {
779
+ args.push(`{<${ro.preview.properties[0].value}>}`);
780
+ } else {
781
+ args.push(
782
+ `{<${ro.preview.properties[0].value}>: ${ro.preview.properties[1].value}}`
783
+ );
784
+ }
785
+ break;
786
+ case "node":
787
+ case "iterator":
788
+ case "proxy":
789
+ case "typedarray":
790
+ case "arraybuffer":
791
+ case "dataview":
792
+ case "webassemblymemory":
793
+ case "wasmvalue":
794
+ break;
795
+ case "error":
796
+ default:
797
+ // just a pojo
798
+ args.push(
799
+ "{\n" +
800
+ ro.preview.properties
801
+ .map(({ name, value }) => {
802
+ return ` ${name}: ${value}`;
803
+ })
804
+ .join(",\n") +
805
+ (ro.preview.overflow ? "\n ..." : "") +
806
+ "\n}"
807
+ );
808
+ }
809
+ }
810
+ break;
811
+ default:
812
+ args.push(ro.description || ro.unserializableValue || "🦋");
813
+ break;
814
+ }
815
+ }
816
+
817
+ const method = mapConsoleAPIMessageTypeToConsoleMethod[evt.type];
818
+
819
+ if (method in console) {
820
+ switch (method) {
821
+ case "dir":
822
+ console.dir(args);
823
+ break;
824
+ case "table":
825
+ console.table(args);
826
+ break;
827
+ default:
828
+ // eslint-disable-next-line prefer-spread
829
+ console[method].apply(console, args);
830
+ break;
831
+ }
832
+ } else {
833
+ logger.warn(`Unsupported console method: ${method}`);
834
+ logger.warn("console event:", evt);
835
+ }
625
836
  }
626
837
 
627
838
  /**
628
839
  * Opens the chrome debugger
629
840
  */
630
- export const openInspector = async (inspectorPort: number) => {
631
- const url = `https://built-devtools.pages.dev/js_app?experiments=true&v8only=true&ws=localhost:${inspectorPort}/ws`;
632
- const errorMessage =
633
- "Failed to open inspector.\nInspector depends on having a Chromium-based browser installed, maybe you need to install one?";
634
-
635
- // see: https://github.com/sindresorhus/open/issues/177#issue-610016699
636
- let braveBrowser: string;
637
- switch (os.platform()) {
638
- case "darwin":
639
- case "win32":
640
- braveBrowser = "Brave";
641
- break;
642
- default:
643
- braveBrowser = "brave";
644
- }
645
-
646
- const childProcess = await open(url, {
647
- app: [
648
- {
649
- name: open.apps.chrome,
650
- },
651
- {
652
- name: braveBrowser,
653
- },
654
- {
655
- name: open.apps.edge,
656
- },
657
- ],
658
- });
659
- childProcess.on("error", () => {
660
- logger.warn(errorMessage);
661
- });
841
+ export const openInspector = async (
842
+ inspectorPort: number,
843
+ worker: string | undefined
844
+ ) => {
845
+ const query = new URLSearchParams();
846
+ query.set("theme", "systemPreferred");
847
+ query.set("ws", `localhost:${inspectorPort}/ws`);
848
+ if (worker) query.set("domain", worker);
849
+ const url = `https://devtools.devprod.cloudflare.dev/js_app?${query.toString()}`;
850
+ const errorMessage =
851
+ "Failed to open inspector.\nInspector depends on having a Chromium-based browser installed, maybe you need to install one?";
852
+
853
+ // see: https://github.com/sindresorhus/open/issues/177#issue-610016699
854
+ let braveBrowser: string;
855
+ switch (os.platform()) {
856
+ case "darwin":
857
+ case "win32":
858
+ braveBrowser = "Brave";
859
+ break;
860
+ default:
861
+ braveBrowser = "brave";
862
+ }
863
+
864
+ const childProcess = await open(url, {
865
+ app: [
866
+ {
867
+ name: open.apps.chrome,
868
+ },
869
+ {
870
+ name: braveBrowser,
871
+ },
872
+ {
873
+ name: open.apps.edge,
874
+ },
875
+ {
876
+ name: open.apps.firefox,
877
+ },
878
+ ],
879
+ });
880
+ childProcess.on("error", () => {
881
+ logger.warn(errorMessage);
882
+ });
662
883
  };