wrangler 0.0.0-e492c10 → 0.0.0-e4ca780f

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 (360) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +25 -5
  3. package/bin/wrangler.js +174 -34
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +1590 -81
  6. package/package.json +198 -149
  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 +30 -24
  13. package/src/__tests__/configuration.test.ts +4498 -3114
  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 +157 -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 +1592 -802
  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 +104 -55
  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 -224
  65. package/src/__tests__/init.test.ts +3168 -1488
  66. package/src/__tests__/jest.setup.ts +152 -50
  67. package/src/__tests__/kv.test.ts +1789 -1432
  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 +588 -0
  74. package/src/__tests__/package-manager.test.ts +312 -165
  75. package/src/__tests__/pages/deployment-list.test.ts +80 -0
  76. package/src/__tests__/pages/functions-build.test.ts +452 -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 +955 -0
  83. package/src/__tests__/parse.test.ts +358 -248
  84. package/src/__tests__/paths.test.ts +39 -0
  85. package/src/__tests__/publish.test.ts +8322 -4847
  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 -205
  89. package/src/__tests__/route.test.ts +18 -18
  90. package/src/__tests__/secret.test.ts +683 -436
  91. package/src/__tests__/tail.test.ts +835 -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 +3 -0
  105. package/src/api/dev.ts +316 -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 +76 -0
  109. package/src/api/pages/index.ts +5 -0
  110. package/src/api/pages/publish.tsx +355 -0
  111. package/src/bundle-reporter.ts +68 -0
  112. package/src/bundle.ts +874 -135
  113. package/src/cfetch/index.ts +123 -69
  114. package/src/cfetch/internal.ts +217 -96
  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 +563 -339
  119. package/src/config/index.ts +381 -41
  120. package/src/config/validation-helpers.ts +379 -357
  121. package/src/config/validation.ts +2181 -1263
  122. package/src/config-cache.ts +81 -41
  123. package/src/create-worker-preview.ts +250 -132
  124. package/src/create-worker-upload-form.ts +343 -224
  125. package/src/d1/backups.tsx +219 -0
  126. package/src/d1/constants.ts +2 -0
  127. package/src/d1/create.tsx +68 -0
  128. package/src/d1/delete.ts +53 -0
  129. package/src/d1/execute.tsx +357 -0
  130. package/src/d1/formatTimeAgo.ts +14 -0
  131. package/src/d1/index.ts +100 -0
  132. package/src/d1/list.tsx +60 -0
  133. package/src/d1/migrations/apply.tsx +212 -0
  134. package/src/d1/migrations/create.tsx +79 -0
  135. package/src/d1/migrations/helpers.ts +172 -0
  136. package/src/d1/migrations/index.ts +3 -0
  137. package/src/d1/migrations/list.tsx +95 -0
  138. package/src/d1/migrations/options.ts +23 -0
  139. package/src/d1/options.ts +22 -0
  140. package/src/d1/splitter.ts +161 -0
  141. package/src/d1/types.ts +25 -0
  142. package/src/d1/utils.ts +49 -0
  143. package/src/delete.ts +100 -0
  144. package/src/deployments.ts +368 -0
  145. package/src/deprecated/index.ts +144 -0
  146. package/src/dev/dev-vars.ts +20 -17
  147. package/src/dev/dev.tsx +535 -353
  148. package/src/dev/get-local-persistence-path.ts +31 -0
  149. package/src/dev/local.tsx +900 -292
  150. package/src/dev/remote.tsx +620 -201
  151. package/src/dev/start-server.ts +534 -0
  152. package/src/dev/use-esbuild.ts +182 -97
  153. package/src/dev/validate-dev-props.ts +40 -0
  154. package/src/dev-registry.ts +202 -0
  155. package/src/dev.tsx +929 -0
  156. package/src/dialogs.ts +136 -0
  157. package/src/dispatch-namespace.ts +211 -0
  158. package/src/docs/index.ts +97 -0
  159. package/src/durable.ts +102 -0
  160. package/src/entry.ts +259 -189
  161. package/src/environment-variables/factory.ts +88 -0
  162. package/src/environment-variables/misc-variables.ts +30 -0
  163. package/src/errors.ts +6 -6
  164. package/src/generate/index.ts +298 -0
  165. package/src/git-client.ts +135 -0
  166. package/src/global-wrangler-config-path.ts +26 -0
  167. package/src/https-options.ts +84 -80
  168. package/src/index.ts +758 -0
  169. package/src/init.ts +1032 -0
  170. package/src/inspect.ts +721 -562
  171. package/src/intl-polyfill.d.ts +123 -123
  172. package/src/is-ci.ts +14 -0
  173. package/src/is-interactive.ts +16 -0
  174. package/src/jest.d.ts +4 -0
  175. package/src/kv/helpers.ts +430 -0
  176. package/src/kv/index.ts +594 -0
  177. package/src/logger.ts +96 -43
  178. package/src/metrics/index.ts +5 -0
  179. package/src/metrics/metrics-config.ts +239 -0
  180. package/src/metrics/metrics-dispatcher.ts +96 -0
  181. package/src/metrics/metrics-usage-headers.ts +24 -0
  182. package/src/metrics/send-event.ts +99 -0
  183. package/src/miniflare-cli/assets.ts +251 -0
  184. package/src/miniflare-cli/index.ts +202 -33
  185. package/src/miniflare-cli/request-context.ts +18 -18
  186. package/src/miniflare-cli/tsconfig.json +9 -0
  187. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  188. package/src/miniflare-cli/types.ts +11 -0
  189. package/src/module-collection.ts +290 -215
  190. package/src/mtls-certificate/cli.ts +155 -0
  191. package/src/open-in-browser.ts +5 -14
  192. package/src/package-manager.ts +182 -90
  193. package/src/pages/build.ts +410 -0
  194. package/src/pages/buildFunctions.ts +140 -0
  195. package/src/pages/constants.ts +18 -0
  196. package/src/pages/deployment-tails.ts +281 -0
  197. package/src/pages/deployments.tsx +84 -0
  198. package/src/pages/dev.ts +716 -0
  199. package/src/pages/errors.ts +67 -0
  200. package/src/pages/functions/buildPlugin.ts +113 -0
  201. package/src/pages/functions/buildWorker.ts +291 -0
  202. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  203. package/src/pages/functions/filepath-routing.ts +189 -0
  204. package/src/pages/functions/identifiers.ts +78 -0
  205. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  206. package/src/pages/functions/routes-consolidation.ts +73 -0
  207. package/src/pages/functions/routes-transformation.test.ts +282 -0
  208. package/src/pages/functions/routes-transformation.ts +115 -0
  209. package/src/pages/functions/routes-validation.test.ts +403 -0
  210. package/src/pages/functions/routes-validation.ts +202 -0
  211. package/src/pages/functions/routes.ts +151 -0
  212. package/src/pages/functions/tsconfig.json +8 -0
  213. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  214. package/src/pages/functions.ts +86 -0
  215. package/src/pages/hash.ts +13 -0
  216. package/src/pages/index.ts +102 -0
  217. package/src/pages/projects.tsx +159 -0
  218. package/src/pages/prompt-select-project.tsx +31 -0
  219. package/src/pages/publish.tsx +267 -0
  220. package/src/pages/types.ts +46 -0
  221. package/src/pages/upload.tsx +469 -0
  222. package/src/pages/utils.ts +23 -0
  223. package/src/parse.ts +246 -123
  224. package/src/paths.ts +53 -8
  225. package/src/proxy.ts +628 -383
  226. package/src/publish/index.ts +274 -0
  227. package/src/publish/publish.ts +1060 -0
  228. package/src/pubsub/index.ts +286 -0
  229. package/src/pubsub/pubsub-commands.ts +623 -0
  230. package/src/queues/cli/commands/consumer/add.ts +71 -0
  231. package/src/queues/cli/commands/consumer/index.ts +19 -0
  232. package/src/queues/cli/commands/consumer/remove.ts +31 -0
  233. package/src/queues/cli/commands/create.ts +25 -0
  234. package/src/queues/cli/commands/delete.ts +26 -0
  235. package/src/queues/cli/commands/index.ts +35 -0
  236. package/src/queues/cli/commands/list.ts +25 -0
  237. package/src/queues/client.ts +136 -0
  238. package/src/queues/utils.ts +18 -0
  239. package/src/r2/constants.ts +4 -0
  240. package/src/r2/helpers.ts +132 -0
  241. package/src/r2/index.ts +289 -0
  242. package/src/routes.ts +140 -0
  243. package/src/secret/index.ts +376 -0
  244. package/src/selfsigned.d.ts +23 -23
  245. package/src/sites.ts +372 -0
  246. package/src/tail/createTail.ts +406 -0
  247. package/src/tail/filters.ts +109 -111
  248. package/src/tail/index.ts +208 -296
  249. package/src/tail/printing.ts +101 -46
  250. package/src/traverse-module-graph.ts +53 -0
  251. package/src/tsconfig-sanity.ts +16 -0
  252. package/src/type-generation.ts +181 -0
  253. package/src/update-check.ts +11 -11
  254. package/src/user/access.ts +68 -0
  255. package/src/user/auth-variables.ts +113 -0
  256. package/src/user/choose-account.tsx +39 -0
  257. package/src/user/generate-auth-url.ts +33 -0
  258. package/src/user/generate-random-state.ts +16 -0
  259. package/src/user/index.ts +2 -0
  260. package/src/user/user.ts +1233 -0
  261. package/src/utils/collectKeyValues.ts +14 -0
  262. package/src/utils/render.ts +93 -0
  263. package/src/whoami.ts +135 -0
  264. package/src/worker.ts +203 -101
  265. package/src/yargs-types.ts +37 -0
  266. package/src/zones.ts +191 -0
  267. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  268. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  269. package/templates/__tests__/tsconfig.json +8 -0
  270. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  271. package/templates/checked-fetch.js +23 -0
  272. package/templates/d1-beta-facade.js +244 -0
  273. package/templates/facade.d.ts +14 -0
  274. package/templates/first-party-worker-module-facade.ts +19 -0
  275. package/templates/format-dev-errors.ts +34 -0
  276. package/templates/gitignore +1 -0
  277. package/templates/init-tests/test-jest-new-worker.js +23 -0
  278. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  279. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  280. package/templates/middleware/common.ts +62 -0
  281. package/templates/middleware/loader-modules.ts +84 -0
  282. package/templates/middleware/loader-sw.ts +233 -0
  283. package/templates/middleware/middleware-miniflare3-json-error.ts +32 -0
  284. package/templates/middleware/middleware-pretty-error.ts +40 -0
  285. package/templates/middleware/middleware-scheduled.ts +15 -0
  286. package/templates/new-worker-scheduled.js +17 -0
  287. package/templates/new-worker-scheduled.ts +32 -0
  288. package/templates/new-worker.js +3 -3
  289. package/templates/new-worker.ts +21 -3
  290. package/templates/no-op-worker.js +10 -0
  291. package/templates/pages-dev-pipeline.ts +31 -0
  292. package/templates/pages-dev-util.ts +52 -0
  293. package/templates/pages-shim.ts +12 -0
  294. package/templates/pages-template-plugin.ts +180 -0
  295. package/templates/pages-template-worker.ts +189 -0
  296. package/templates/serve-static-assets.ts +66 -0
  297. package/templates/service-bindings-module-facade.js +55 -0
  298. package/templates/service-bindings-sw-facade.js +42 -0
  299. package/templates/tsconfig-sanity.ts +11 -0
  300. package/templates/tsconfig.init.json +105 -0
  301. package/templates/tsconfig.json +6 -103
  302. package/templates/tsconfig.tsbuildinfo +1 -0
  303. package/wrangler-dist/cli.d.ts +1641 -0
  304. package/wrangler-dist/cli.js +129145 -89350
  305. package/wrangler-dist/wasm-sync.wasm +0 -0
  306. package/pages/functions/buildPlugin.ts +0 -92
  307. package/pages/functions/buildWorker.ts +0 -138
  308. package/pages/functions/filepath-routing.ts +0 -189
  309. package/pages/functions/identifiers.ts +0 -78
  310. package/pages/functions/routes.ts +0 -156
  311. package/pages/functions/template-plugin.ts +0 -146
  312. package/pages/functions/template-worker.ts +0 -143
  313. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  314. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  315. package/src/__tests__/pages.test.ts +0 -327
  316. package/src/dialogs.tsx +0 -87
  317. package/src/environment-variables.ts +0 -35
  318. package/src/index.tsx +0 -2698
  319. package/src/kv.ts +0 -319
  320. package/src/miniflare-cli/enum-keys.ts +0 -17
  321. package/src/pages.tsx +0 -1875
  322. package/src/publish.ts +0 -469
  323. package/src/r2.ts +0 -50
  324. package/src/sites.tsx +0 -293
  325. package/src/user.tsx +0 -1203
  326. package/src/whoami.tsx +0 -70
  327. package/templates/static-asset-facade.js +0 -47
  328. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  329. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  330. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  331. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  332. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  333. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  334. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  335. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  336. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  337. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  338. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  339. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  340. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  341. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  342. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  343. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  344. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  345. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  346. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  347. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  348. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  349. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  350. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  351. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  352. package/vendor/wrangler-mime/LICENSE +0 -21
  353. package/vendor/wrangler-mime/Mime.js +0 -97
  354. package/vendor/wrangler-mime/README.md +0 -187
  355. package/vendor/wrangler-mime/cli.js +0 -46
  356. package/vendor/wrangler-mime/index.js +0 -4
  357. package/vendor/wrangler-mime/lite.js +0 -4
  358. package/vendor/wrangler-mime/package.json +0 -52
  359. package/vendor/wrangler-mime/types/other.js +0 -1
  360. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -0,0 +1,14 @@
1
+ /**
2
+ * a function that takes an array of strings in `key:value` format
3
+ * (typically from yargs or config) and returns back
4
+ * a neat object with the keys and values
5
+ */
6
+ export function collectKeyValues(array?: string[]) {
7
+ return (
8
+ array?.reduce<Record<string, string>>((recordsToCollect, v) => {
9
+ const [key, ...value] = v.split(":");
10
+ recordsToCollect[key] = value.join(":");
11
+ return recordsToCollect;
12
+ }, {}) || {}
13
+ );
14
+ }
@@ -0,0 +1,93 @@
1
+ import { EventEmitter } from "events";
2
+ import { render as inkRender } from "ink";
3
+ import type { ReactElement } from "react";
4
+ import type { WriteStream } from "tty";
5
+
6
+ export function renderToString(tree: ReactElement): string {
7
+ const { output, cleanup } = render(tree);
8
+ cleanup();
9
+ return output;
10
+ }
11
+
12
+ // The code below is mostly copied from ink-render-string.
13
+ // See https://github.com/zhanwang626/ink-render-string.git.
14
+
15
+ // MIT License
16
+
17
+ // Copyright (c) 2021 Zhan Wang
18
+
19
+ // Permission is hereby granted, free of charge, to any person obtaining a copy
20
+ // of this software and associated documentation files (the "Software"), to deal
21
+ // in the Software without restriction, including without limitation the rights
22
+ // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
23
+ // copies of the Software, and to permit persons to whom the Software is
24
+ // furnished to do so, subject to the following conditions:
25
+
26
+ // The above copyright notice and this permission notice shall be included in all
27
+ // copies or substantial portions of the Software.
28
+
29
+ // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30
+ // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31
+ // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32
+ // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33
+ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34
+ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35
+ // SOFTWARE.
36
+
37
+ interface Instance {
38
+ output: string;
39
+ unmount: () => void;
40
+ cleanup: () => void;
41
+ stdout: OutputStream;
42
+ stderr: OutputStream;
43
+ frames: string[];
44
+ }
45
+
46
+ const LASTFRAME_UNDEFINED = "value of stdout.lastframe() is undefined";
47
+
48
+ export class OutputStream extends EventEmitter {
49
+ readonly frames: string[] = [];
50
+ private _lastFrame?: string;
51
+
52
+ get columns(): number {
53
+ return this._originalStream.columns;
54
+ }
55
+ get rows(): number {
56
+ return this._originalStream.rows;
57
+ }
58
+
59
+ constructor(private _originalStream: WriteStream) {
60
+ super();
61
+ }
62
+
63
+ write = (frame: string) => {
64
+ this.frames.push(frame);
65
+ this._lastFrame = frame;
66
+ };
67
+
68
+ lastFrame = () => {
69
+ return this._lastFrame;
70
+ };
71
+ }
72
+
73
+ export const render = (tree: ReactElement): Instance => {
74
+ const stdout = new OutputStream(process.stdout);
75
+ const stderr = new OutputStream(process.stderr);
76
+
77
+ const instance = inkRender(tree, {
78
+ stdout: stdout as unknown as WriteStream,
79
+ stderr: stderr as unknown as WriteStream,
80
+ debug: true,
81
+ exitOnCtrlC: false,
82
+ patchConsole: false,
83
+ });
84
+
85
+ return {
86
+ output: stdout.lastFrame() || LASTFRAME_UNDEFINED,
87
+ stdout,
88
+ stderr,
89
+ cleanup: instance.cleanup,
90
+ unmount: instance.unmount,
91
+ frames: stdout.frames,
92
+ };
93
+ };
package/src/whoami.ts ADDED
@@ -0,0 +1,135 @@
1
+ import chalk from "chalk";
2
+ import { fetchListResult, fetchResult } from "./cfetch";
3
+ import { logger } from "./logger";
4
+ import { getAPIToken, getAuthFromEnv, getScopes } from "./user";
5
+
6
+ export async function whoami() {
7
+ logger.log("Getting User settings...");
8
+ const user = await getUserInfo();
9
+ if (user === undefined) {
10
+ return void logger.log(
11
+ "You are not authenticated. Please run `wrangler login`."
12
+ );
13
+ }
14
+
15
+ if (user.email !== undefined) {
16
+ logger.log(
17
+ `👋 You are logged in with an ${
18
+ user.authType
19
+ }, associated with the email ${chalk.blue(user.email)}!`
20
+ );
21
+ } else {
22
+ logger.log(
23
+ `👋 You are logged in with an ${user.authType}. Unable to retrieve email for this user. Are you missing the \`User->User Details->Read\` permission?`
24
+ );
25
+ }
26
+ logger.table(
27
+ user.accounts.map((account) => ({
28
+ "Account Name": account.name,
29
+ "Account ID": account.id,
30
+ }))
31
+ );
32
+ const permissions =
33
+ user.tokenPermissions?.map((scope) => scope.split(":")) ?? [];
34
+
35
+ if (user.authType !== "OAuth Token") {
36
+ return void logger.log(
37
+ `🔓 To see token permissions visit https://dash.cloudflare.com/profile/api-tokens`
38
+ );
39
+ }
40
+ logger.log(
41
+ `🔓 Token Permissions: If scopes are missing, you may need to logout and re-login.`
42
+ );
43
+ logger.log(`Scope (Access)`);
44
+ for (const [scope, access] of permissions) {
45
+ logger.log(`- ${scope} ${access ? `(${access})` : ``}`);
46
+ }
47
+ }
48
+
49
+ type AuthType = "Global API Key" | "API Token" | "OAuth Token";
50
+ export interface UserInfo {
51
+ apiToken: string;
52
+ authType: AuthType;
53
+ email: string | undefined;
54
+ accounts: AccountInfo[];
55
+ tokenPermissions: string[] | undefined;
56
+ }
57
+
58
+ export async function getUserInfo(): Promise<UserInfo | undefined> {
59
+ const apiToken = getAPIToken();
60
+ if (!apiToken) return;
61
+
62
+ const tokenPermissions = await getTokenPermissions();
63
+
64
+ const usingEnvAuth = !!getAuthFromEnv();
65
+ const usingGlobalAuthKey = "authKey" in apiToken;
66
+ return {
67
+ apiToken: usingGlobalAuthKey ? apiToken.authKey : apiToken.apiToken,
68
+ authType: usingGlobalAuthKey
69
+ ? "Global API Key"
70
+ : usingEnvAuth
71
+ ? "API Token"
72
+ : "OAuth Token",
73
+ email: "authEmail" in apiToken ? apiToken.authEmail : await getEmail(),
74
+ accounts: await getAccounts(),
75
+ tokenPermissions,
76
+ };
77
+ }
78
+
79
+ async function getEmail(): Promise<string | undefined> {
80
+ try {
81
+ const { email } = await fetchResult<{ email: string }>("/user");
82
+ return email;
83
+ } catch (e) {
84
+ if ((e as { code?: number }).code === 9109) {
85
+ return undefined;
86
+ } else {
87
+ throw e;
88
+ }
89
+ }
90
+ }
91
+
92
+ type AccountInfo = { name: string; id: string };
93
+
94
+ async function getAccounts(): Promise<AccountInfo[]> {
95
+ return await fetchListResult<AccountInfo>("/accounts");
96
+ }
97
+
98
+ async function getTokenPermissions(): Promise<string[] | undefined> {
99
+ // Tokens can either be API tokens or Oauth tokens.
100
+ // Here we only extract permissions from OAuth tokens.
101
+
102
+ return getScopes() as string[];
103
+
104
+ // In future we may be able to get the token permissions on an API token,
105
+ // but currently we cannot as that permission is not able to be added to
106
+ // an API token.
107
+
108
+ // try {
109
+ // // First we get the token identifier (only returned on API tokens)
110
+ // const { id } = await fetchResult<{ id: string }>("/user/tokens/verify");
111
+
112
+ // // Get the token permissions for the current token
113
+ // const { policies } = await fetchResult<{
114
+ // policies: { id: string; name: string }[];
115
+ // }>(`/user/tokens/${id}`);
116
+
117
+ // return policies.map((p) => p.name);
118
+ // } catch (e) {
119
+ // if ((e as { code?: number }).code === 1000) {
120
+ // // Invalid token - Oauth token
121
+
122
+ // // Get scopes
123
+ // const scopes = getScopes() as string[];
124
+ // // We may not get scopes back if they are not currently cached,
125
+ // // however next time an access token is requested,
126
+ // // the scopes will be added to the cache.
127
+ // return scopes;
128
+ // } else if ((e as { code?: number }).code === 9109) {
129
+ // // Token cannot view its permissions
130
+ // return undefined;
131
+ // } else {
132
+ // throw e;
133
+ // }
134
+ // }
135
+ }
package/src/worker.ts CHANGED
@@ -1,17 +1,22 @@
1
+ import type { Environment } from "./config";
2
+ import type { Route } from "./config/environment";
3
+ import type { ApiCredentials } from "./user";
4
+
1
5
  /**
2
6
  * A Cloudflare account.
3
7
  */
8
+
4
9
  export interface CfAccount {
5
- /**
6
- * An API token.
7
- *
8
- * @link https://api.cloudflare.com/#user-api-tokens-properties
9
- */
10
- apiToken: string;
11
- /**
12
- * An account ID.
13
- */
14
- accountId: string;
10
+ /**
11
+ * An API token.
12
+ *
13
+ * @link https://api.cloudflare.com/#user-api-tokens-properties
14
+ */
15
+ apiToken: ApiCredentials;
16
+ /**
17
+ * An account ID.
18
+ */
19
+ accountId: string;
15
20
  }
16
21
 
17
22
  /**
@@ -23,150 +28,247 @@ export type CfScriptFormat = "modules" | "service-worker";
23
28
  * A module type.
24
29
  */
25
30
  export type CfModuleType =
26
- | "esm"
27
- | "commonjs"
28
- | "compiled-wasm"
29
- | "text"
30
- | "buffer";
31
+ | "esm"
32
+ | "commonjs"
33
+ | "compiled-wasm"
34
+ | "text"
35
+ | "buffer";
31
36
 
32
37
  /**
33
38
  * An imported module.
34
39
  */
35
40
  export interface CfModule {
36
- /**
37
- * The module name.
38
- *
39
- * @example
40
- * './src/index.js'
41
- */
42
- name: string;
43
- /**
44
- * The module content, usually JavaScript or WASM code.
45
- *
46
- * @example
47
- * export default {
48
- * async fetch(request) {
49
- * return new Response('Ok')
50
- * }
51
- * }
52
- */
53
- content: string | Buffer;
54
- /**
55
- * The module type.
56
- *
57
- * If absent, will default to the main module's type.
58
- */
59
- type?: CfModuleType;
41
+ /**
42
+ * The module name.
43
+ *
44
+ * @example
45
+ * './src/index.js'
46
+ */
47
+ name: string;
48
+ /**
49
+ * The module content, usually JavaScript or WASM code.
50
+ *
51
+ * @example
52
+ * export default {
53
+ * async fetch(request) {
54
+ * return new Response('Ok')
55
+ * }
56
+ * }
57
+ */
58
+ content: string | Buffer;
59
+ /**
60
+ * The module type.
61
+ *
62
+ * If absent, will default to the main module's type.
63
+ */
64
+ type?: CfModuleType;
60
65
  }
61
66
 
62
67
  /**
63
68
  * A map of variable names to values.
64
69
  */
65
- interface CfVars {
66
- [key: string]: unknown;
70
+ export interface CfVars {
71
+ [key: string]: unknown;
67
72
  }
68
73
 
69
74
  /**
70
75
  * A KV namespace.
71
76
  */
72
- interface CfKvNamespace {
73
- binding: string;
74
- id: string;
77
+ export interface CfKvNamespace {
78
+ binding: string;
79
+ id: string;
80
+ }
81
+
82
+ /**
83
+ * A binding to send email.
84
+ */
85
+ export interface CfSendEmailBindings {
86
+ name: string;
87
+ destination_address?: string;
88
+ allowed_destination_addresses?: string[];
75
89
  }
76
90
 
77
91
  /**
78
92
  * A binding to a wasm module (in service-worker format)
79
93
  */
80
94
 
81
- interface CfWasmModuleBindings {
82
- [key: string]: string;
95
+ export interface CfWasmModuleBindings {
96
+ [key: string]: string;
83
97
  }
84
98
 
85
99
  /**
86
100
  * A binding to a text blob (in service-worker format)
87
101
  */
88
102
 
89
- interface CfTextBlobBindings {
90
- [key: string]: string;
103
+ export interface CfTextBlobBindings {
104
+ [key: string]: string;
91
105
  }
92
106
 
93
107
  /**
94
108
  * A binding to a data blob (in service-worker format)
95
109
  */
96
110
 
97
- interface CfDataBlobBindings {
98
- [key: string]: string;
111
+ export interface CfDataBlobBindings {
112
+ [key: string]: string;
99
113
  }
100
114
 
101
115
  /**
102
116
  * A Durable Object.
103
117
  */
104
- interface CfDurableObject {
105
- name: string;
106
- class_name: string;
107
- script_name?: string;
118
+ export interface CfDurableObject {
119
+ name: string;
120
+ class_name: string;
121
+ script_name?: string;
122
+ environment?: string;
123
+ }
124
+
125
+ export interface CfQueue {
126
+ binding: string;
127
+ queue_name: string;
128
+ }
129
+
130
+ export interface CfR2Bucket {
131
+ binding: string;
132
+ bucket_name: string;
133
+ }
134
+
135
+ export const D1_BETA_PREFIX = `__D1_BETA__` as const;
136
+ export type D1PrefixedBinding = `${typeof D1_BETA_PREFIX}${string}`;
137
+
138
+ // TODO: figure out if this is duplicated in packages/wrangler/src/config/environment.ts
139
+ export interface CfD1Database {
140
+ // For now, all D1 bindings are alpha
141
+ binding: D1PrefixedBinding;
142
+ database_id: string;
143
+ database_name?: string;
144
+ preview_database_id?: string;
145
+ database_internal_env?: string;
146
+ migrations_table?: string;
147
+ migrations_dir?: string;
148
+ }
149
+
150
+ interface CfService {
151
+ binding: string;
152
+ service: string;
153
+ environment?: string;
108
154
  }
109
155
 
110
- interface CfR2Bucket {
111
- binding: string;
112
- bucket_name: string;
156
+ interface CfAnalyticsEngineDataset {
157
+ binding: string;
158
+ dataset?: string;
159
+ }
160
+
161
+ interface CfDispatchNamespace {
162
+ binding: string;
163
+ namespace: string;
164
+ }
165
+
166
+ interface CfMTlsCertificate {
167
+ binding: string;
168
+ certificate_id: string;
169
+ }
170
+
171
+ interface CfLogfwdr {
172
+ schema: string | undefined;
173
+ bindings: CfLogfwdrBinding[];
174
+ }
175
+
176
+ interface CfLogfwdrBinding {
177
+ name: string;
178
+ destination: string;
113
179
  }
114
180
 
115
181
  interface CfUnsafeBinding {
116
- name: string;
117
- type: string;
182
+ name: string;
183
+ type: string;
184
+ }
185
+
186
+ type CfUnsafeMetadata = Record<string, unknown>;
187
+
188
+ interface CfUnsafe {
189
+ bindings: CfUnsafeBinding[] | undefined;
190
+ metadata: CfUnsafeMetadata | undefined;
118
191
  }
119
192
 
120
193
  export interface CfDurableObjectMigrations {
121
- old_tag?: string;
122
- new_tag: string;
123
- steps: {
124
- new_classes?: string[];
125
- renamed_classes?: {
126
- from: string;
127
- to: string;
128
- }[];
129
- deleted_classes?: string[];
130
- }[];
194
+ old_tag?: string;
195
+ new_tag: string;
196
+ steps: {
197
+ new_classes?: string[];
198
+ renamed_classes?: {
199
+ from: string;
200
+ to: string;
201
+ }[];
202
+ deleted_classes?: string[];
203
+ }[];
131
204
  }
132
205
 
133
206
  /**
134
207
  * Options for creating a `CfWorker`.
135
208
  */
136
209
  export interface CfWorkerInit {
137
- /**
138
- * The name of the worker.
139
- */
140
- name: string | undefined;
141
- /**
142
- * The entrypoint module.
143
- */
144
- main: CfModule;
145
- /**
146
- * The list of additional modules.
147
- */
148
- modules: CfModule[] | undefined;
149
- /**
150
- * All the bindings
151
- */
152
- bindings: {
153
- vars: CfVars | undefined;
154
- kv_namespaces: CfKvNamespace[] | undefined;
155
- wasm_modules: CfWasmModuleBindings | undefined;
156
- text_blobs: CfTextBlobBindings | undefined;
157
- data_blobs: CfDataBlobBindings | undefined;
158
- durable_objects: { bindings: CfDurableObject[] } | undefined;
159
- r2_buckets: CfR2Bucket[] | undefined;
160
- unsafe: CfUnsafeBinding[] | undefined;
161
- };
162
- migrations: CfDurableObjectMigrations | undefined;
163
- compatibility_date: string | undefined;
164
- compatibility_flags: string[] | undefined;
165
- usage_model: "bundled" | "unbound" | undefined;
210
+ /**
211
+ * The name of the worker.
212
+ */
213
+ name: string | undefined;
214
+ /**
215
+ * The entrypoint module.
216
+ */
217
+ main: CfModule;
218
+ /**
219
+ * The list of additional modules.
220
+ */
221
+ modules: CfModule[] | undefined;
222
+ /**
223
+ * All the bindings
224
+ */
225
+ bindings: {
226
+ vars: CfVars | undefined;
227
+ kv_namespaces: CfKvNamespace[] | undefined;
228
+ send_email: CfSendEmailBindings[] | undefined;
229
+ wasm_modules: CfWasmModuleBindings | undefined;
230
+ text_blobs: CfTextBlobBindings | undefined;
231
+ data_blobs: CfDataBlobBindings | undefined;
232
+ durable_objects: { bindings: CfDurableObject[] } | undefined;
233
+ queues: CfQueue[] | undefined;
234
+ r2_buckets: CfR2Bucket[] | undefined;
235
+ d1_databases: CfD1Database[] | undefined;
236
+ services: CfService[] | undefined;
237
+ analytics_engine_datasets: CfAnalyticsEngineDataset[] | undefined;
238
+ dispatch_namespaces: CfDispatchNamespace[] | undefined;
239
+ mtls_certificates: CfMTlsCertificate[] | undefined;
240
+ logfwdr: CfLogfwdr | undefined;
241
+ unsafe: CfUnsafe | undefined;
242
+ };
243
+ migrations: CfDurableObjectMigrations | undefined;
244
+ compatibility_date: string | undefined;
245
+ compatibility_flags: string[] | undefined;
246
+ usage_model: "bundled" | "unbound" | undefined;
247
+ keepVars: boolean | undefined;
248
+ logpush: boolean | undefined;
166
249
  }
167
250
 
168
251
  export interface CfWorkerContext {
169
- env: string | undefined;
170
- legacyEnv: boolean | undefined;
171
- zone: { id: string; host: string } | undefined;
252
+ env: string | undefined;
253
+ legacyEnv: boolean | undefined;
254
+ zone: string | undefined;
255
+ host: string | undefined;
256
+ routes: Route[] | undefined;
257
+ sendMetrics: boolean | undefined;
258
+ }
259
+
260
+ // Prefix binding with identifier which will then get picked up by the D1 shim.
261
+ // Once the D1 Api is out of beta, this function can be removed.
262
+ export function identifyD1BindingsAsBeta(
263
+ dbs: Environment["d1_databases"]
264
+ ): CfD1Database[] | undefined {
265
+ return dbs?.map((db) => ({
266
+ ...db,
267
+ binding: `${D1_BETA_PREFIX}${db.binding}`,
268
+ }));
269
+ }
270
+
271
+ // Remove beta prefix
272
+ export function removeD1BetaPrefix(binding: D1PrefixedBinding): string {
273
+ return binding.slice(D1_BETA_PREFIX.length);
172
274
  }
@@ -0,0 +1,37 @@
1
+ import type { OnlyCamelCase } from "./config/config";
2
+ import type { ArgumentsCamelCase, Argv } from "yargs";
3
+
4
+ /**
5
+ * Yargs options included in every wrangler command.
6
+ */
7
+ export interface CommonYargsOptions {
8
+ v: boolean | undefined;
9
+ config: string | undefined;
10
+ env: string | undefined;
11
+ "experimental-json-config": boolean | undefined;
12
+ }
13
+
14
+ export type CommonYargsArgv = Argv<CommonYargsOptions>;
15
+
16
+ export type YargvToInterface<T> = T extends Argv<infer P>
17
+ ? ArgumentsCamelCase<P>
18
+ : never;
19
+
20
+ // See http://stackoverflow.com/questions/51465182/how-to-remove-index-signature-using-mapped-types
21
+ type RemoveIndex<T> = {
22
+ [K in keyof T as string extends K
23
+ ? never
24
+ : number extends K
25
+ ? never
26
+ : K]: T[K];
27
+ };
28
+
29
+ /**
30
+ * Given some Yargs Options function factory, extract the interface
31
+ * that corresponds to the yargs arguments, remove index types, and only allow camelCase
32
+ */
33
+ export type StrictYargsOptionsToInterface<
34
+ T extends (yargs: CommonYargsArgv) => Argv
35
+ > = T extends (yargs: CommonYargsArgv) => Argv<infer P>
36
+ ? OnlyCamelCase<RemoveIndex<ArgumentsCamelCase<P>>>
37
+ : never;