wrangler 0.0.0-e5d3690 → 0.0.0-e60dc909

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 (345) hide show
  1. package/Cloudflare_CA.pem +18 -0
  2. package/README.md +47 -14
  3. package/bin/wrangler.js +180 -28
  4. package/kv-asset-handler.js +1 -0
  5. package/miniflare-dist/index.mjs +6364 -0
  6. package/package.json +193 -127
  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.js +64 -0
  10. package/src/__tests__/api.test.ts +80 -0
  11. package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
  12. package/src/__tests__/config-cache.test.ts +42 -0
  13. package/src/__tests__/configuration.test.ts +4163 -0
  14. package/src/__tests__/d1/d1.test.ts +123 -0
  15. package/src/__tests__/d1/splitter.test.ts +255 -0
  16. package/src/__tests__/delete.test.ts +266 -0
  17. package/src/__tests__/deployments.test.ts +105 -0
  18. package/src/__tests__/dev.test.tsx +1582 -63
  19. package/src/__tests__/generate.test.ts +238 -0
  20. package/src/__tests__/get-host-from-url.test.ts +16 -0
  21. package/src/__tests__/guess-worker-format.test.ts +85 -0
  22. package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
  23. package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
  24. package/src/__tests__/helpers/mock-account-id.ts +48 -0
  25. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  26. package/src/__tests__/helpers/mock-bin.ts +36 -0
  27. package/src/__tests__/helpers/mock-cfetch.ts +278 -0
  28. package/src/__tests__/helpers/mock-console.ts +106 -0
  29. package/src/__tests__/helpers/mock-dialogs.ts +137 -0
  30. package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
  31. package/src/__tests__/helpers/mock-http-server.ts +46 -0
  32. package/src/__tests__/helpers/mock-istty.ts +74 -0
  33. package/src/__tests__/helpers/mock-known-routes.ts +7 -0
  34. package/src/__tests__/helpers/mock-kv.ts +33 -0
  35. package/src/__tests__/helpers/mock-oauth-flow.ts +271 -0
  36. package/src/__tests__/helpers/mock-process.ts +34 -0
  37. package/src/__tests__/helpers/mock-stdin.ts +108 -0
  38. package/src/__tests__/helpers/mock-web-socket.ts +29 -0
  39. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  40. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  41. package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
  42. package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
  43. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  44. package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
  45. package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
  46. package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
  47. package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
  48. package/src/__tests__/helpers/msw/index.ts +21 -0
  49. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  50. package/src/__tests__/helpers/run-in-tmp.ts +38 -0
  51. package/src/__tests__/helpers/run-wrangler.ts +16 -0
  52. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  53. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  54. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  55. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  56. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  57. package/src/__tests__/helpers/write-worker-source.ts +31 -0
  58. package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
  59. package/src/__tests__/https-options.test.ts +163 -0
  60. package/src/__tests__/index.test.ts +265 -286
  61. package/src/__tests__/init.test.ts +3175 -0
  62. package/src/__tests__/jest.setup.ts +190 -14
  63. package/src/__tests__/kv.test.ts +1780 -1191
  64. package/src/__tests__/logger.test.ts +141 -0
  65. package/src/__tests__/logout.test.ts +47 -0
  66. package/src/__tests__/metrics.test.ts +493 -0
  67. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  68. package/src/__tests__/middleware.test.ts +750 -0
  69. package/src/__tests__/package-manager.test.ts +353 -0
  70. package/src/__tests__/pages-deployment-tail.test.ts +884 -0
  71. package/src/__tests__/pages.test.ts +2899 -0
  72. package/src/__tests__/parse.test.ts +330 -0
  73. package/src/__tests__/paths.test.ts +39 -0
  74. package/src/__tests__/publish.test.ts +7740 -643
  75. package/src/__tests__/pubsub.test.ts +490 -0
  76. package/src/__tests__/queues.test.ts +522 -0
  77. package/src/__tests__/r2.test.ts +393 -0
  78. package/src/__tests__/route.test.ts +45 -0
  79. package/src/__tests__/secret.test.ts +701 -0
  80. package/src/__tests__/tail.test.ts +905 -0
  81. package/src/__tests__/test-old-node-version.js +31 -0
  82. package/src/__tests__/tsconfig-sanity.ts +12 -0
  83. package/src/__tests__/tsconfig.json +8 -0
  84. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  85. package/src/__tests__/type-generation.test.ts +233 -0
  86. package/src/__tests__/user.test.ts +129 -0
  87. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  88. package/src/__tests__/validate-dev-props.test.ts +56 -0
  89. package/src/__tests__/version.test.ts +35 -0
  90. package/src/__tests__/whoami.test.tsx +179 -126
  91. package/src/__tests__/worker-namespace.test.ts +326 -0
  92. package/src/abort.d.ts +3 -0
  93. package/src/api/dev.ts +247 -0
  94. package/src/api/index.ts +2 -0
  95. package/src/bundle-reporter.ts +68 -0
  96. package/src/bundle.ts +823 -0
  97. package/src/cfetch/index.ts +127 -79
  98. package/src/cfetch/internal.ts +238 -48
  99. package/src/cli.ts +25 -6
  100. package/src/config/README.md +107 -0
  101. package/src/config/config.ts +275 -0
  102. package/src/config/diagnostics.ts +80 -0
  103. package/src/config/environment.ts +577 -0
  104. package/src/config/index.ts +358 -0
  105. package/src/config/validation-helpers.ts +597 -0
  106. package/src/config/validation.ts +2151 -0
  107. package/src/config-cache.ts +85 -0
  108. package/src/create-worker-preview.ts +282 -0
  109. package/src/create-worker-upload-form.ts +325 -0
  110. package/src/d1/backups.tsx +223 -0
  111. package/src/d1/constants.ts +2 -0
  112. package/src/d1/create.tsx +63 -0
  113. package/src/d1/delete.ts +56 -0
  114. package/src/d1/execute.tsx +323 -0
  115. package/src/d1/formatTimeAgo.ts +14 -0
  116. package/src/d1/index.ts +101 -0
  117. package/src/d1/list.tsx +48 -0
  118. package/src/d1/migrations/apply.tsx +197 -0
  119. package/src/d1/migrations/create.tsx +77 -0
  120. package/src/d1/migrations/helpers.ts +147 -0
  121. package/src/d1/migrations/index.ts +3 -0
  122. package/src/d1/migrations/list.tsx +79 -0
  123. package/src/d1/migrations/options.ts +18 -0
  124. package/src/d1/options.ts +22 -0
  125. package/src/d1/splitter.ts +161 -0
  126. package/src/d1/types.ts +24 -0
  127. package/src/d1/utils.ts +48 -0
  128. package/src/delete.ts +103 -0
  129. package/src/deployments.ts +83 -0
  130. package/src/deprecated/index.ts +145 -0
  131. package/src/dev/dev-vars.ts +39 -0
  132. package/src/dev/dev.tsx +614 -0
  133. package/src/dev/get-local-persistence-path.ts +31 -0
  134. package/src/dev/local.tsx +932 -0
  135. package/src/dev/remote.tsx +630 -0
  136. package/src/dev/start-server.ts +543 -0
  137. package/src/dev/use-esbuild.ts +204 -0
  138. package/src/dev/validate-dev-props.ts +31 -0
  139. package/src/dev-registry.ts +201 -0
  140. package/src/dev.tsx +927 -757
  141. package/src/dialogs.ts +136 -0
  142. package/src/dispatch-namespace.ts +207 -0
  143. package/src/docs/index.ts +97 -0
  144. package/src/durable.ts +102 -0
  145. package/src/entry.ts +329 -0
  146. package/src/environment-variables/factory.ts +88 -0
  147. package/src/environment-variables/misc-variables.ts +30 -0
  148. package/src/errors.ts +11 -0
  149. package/src/generate/index.ts +300 -0
  150. package/src/git-client.ts +135 -0
  151. package/src/global-wrangler-config-path.ts +26 -0
  152. package/src/https-options.ts +127 -0
  153. package/src/index.ts +694 -0
  154. package/src/init.ts +1024 -0
  155. package/src/inspect.ts +720 -496
  156. package/src/intl-polyfill.d.ts +139 -0
  157. package/src/is-ci.ts +14 -0
  158. package/src/is-interactive.ts +16 -0
  159. package/src/jest.d.ts +4 -0
  160. package/src/kv/helpers.ts +430 -0
  161. package/src/kv/index.ts +596 -0
  162. package/src/logger.ts +104 -0
  163. package/src/metrics/index.ts +5 -0
  164. package/src/metrics/metrics-config.ts +239 -0
  165. package/src/metrics/metrics-dispatcher.ts +96 -0
  166. package/src/metrics/metrics-usage-headers.ts +24 -0
  167. package/src/metrics/send-event.ts +97 -0
  168. package/src/miniflare-cli/README.md +30 -0
  169. package/src/miniflare-cli/assets.ts +250 -0
  170. package/src/miniflare-cli/index.ts +210 -0
  171. package/src/miniflare-cli/request-context.ts +40 -0
  172. package/src/miniflare-cli/tsconfig.json +9 -0
  173. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  174. package/src/miniflare-cli/types.ts +11 -0
  175. package/src/module-collection.ts +256 -53
  176. package/src/open-in-browser.ts +17 -0
  177. package/src/package-manager.ts +219 -0
  178. package/src/pages/build.ts +270 -0
  179. package/src/pages/constants.ts +18 -0
  180. package/src/pages/deployment-tails.ts +284 -0
  181. package/src/pages/deployments.tsx +84 -0
  182. package/src/pages/dev.ts +711 -0
  183. package/src/pages/errors.ts +66 -0
  184. package/src/pages/functions/buildPlugin.ts +107 -0
  185. package/src/pages/functions/buildWorker.ts +166 -0
  186. package/src/pages/functions/filepath-routing.test.ts +234 -0
  187. package/src/pages/functions/filepath-routing.ts +189 -0
  188. package/src/pages/functions/identifiers.ts +78 -0
  189. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  190. package/src/pages/functions/routes-consolidation.ts +73 -0
  191. package/src/pages/functions/routes-transformation.test.ts +282 -0
  192. package/src/pages/functions/routes-transformation.ts +115 -0
  193. package/src/pages/functions/routes-validation.test.ts +403 -0
  194. package/src/pages/functions/routes-validation.ts +202 -0
  195. package/src/pages/functions/routes.ts +151 -0
  196. package/src/pages/functions/tsconfig.json +8 -0
  197. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  198. package/src/pages/functions.ts +82 -0
  199. package/src/pages/hash.ts +13 -0
  200. package/src/pages/index.ts +102 -0
  201. package/src/pages/projects.tsx +167 -0
  202. package/src/pages/prompt-select-project.tsx +31 -0
  203. package/src/pages/publish.tsx +462 -0
  204. package/src/pages/types.ts +41 -0
  205. package/src/pages/upload.tsx +447 -0
  206. package/src/pages/utils.ts +23 -0
  207. package/src/parse.ts +286 -0
  208. package/src/paths.ts +71 -0
  209. package/src/proxy.ts +646 -254
  210. package/src/publish/index.ts +270 -0
  211. package/src/publish/publish.ts +1038 -0
  212. package/src/pubsub/index.ts +286 -0
  213. package/src/pubsub/pubsub-commands.ts +624 -0
  214. package/src/queues/cli/commands/consumer/add.ts +71 -0
  215. package/src/queues/cli/commands/consumer/index.ts +22 -0
  216. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  217. package/src/queues/cli/commands/create.ts +25 -0
  218. package/src/queues/cli/commands/delete.ts +26 -0
  219. package/src/queues/cli/commands/index.ts +36 -0
  220. package/src/queues/cli/commands/list.ts +25 -0
  221. package/src/queues/client.ts +135 -0
  222. package/src/queues/utils.ts +18 -0
  223. package/src/r2/constants.ts +4 -0
  224. package/src/r2/helpers.ts +131 -0
  225. package/src/r2/index.ts +289 -0
  226. package/src/routes.ts +140 -0
  227. package/src/secret/index.ts +379 -0
  228. package/src/selfsigned.d.ts +29 -0
  229. package/src/sites.ts +372 -0
  230. package/src/tail/createTail.ts +379 -0
  231. package/src/tail/filters.ts +277 -0
  232. package/src/tail/index.ts +213 -0
  233. package/src/tail/printing.ts +107 -0
  234. package/src/tsconfig-sanity.ts +16 -0
  235. package/src/type-generation.ts +181 -0
  236. package/src/update-check.ts +19 -0
  237. package/src/user/access.ts +68 -0
  238. package/src/user/auth-variables.ts +113 -0
  239. package/src/user/choose-account.tsx +39 -0
  240. package/src/user/generate-auth-url.ts +33 -0
  241. package/src/user/generate-random-state.ts +16 -0
  242. package/src/user/index.ts +2 -0
  243. package/src/user/user.ts +1232 -0
  244. package/src/utils/collectKeyValues.ts +14 -0
  245. package/src/whoami.ts +135 -0
  246. package/src/worker.ts +251 -0
  247. package/src/yargs-types.ts +24 -0
  248. package/src/zones.ts +191 -0
  249. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  250. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  251. package/templates/__tests__/tsconfig.json +8 -0
  252. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  253. package/templates/checked-fetch.js +17 -0
  254. package/templates/d1-beta-facade.js +241 -0
  255. package/templates/facade.d.ts +14 -0
  256. package/templates/first-party-worker-module-facade.ts +19 -0
  257. package/templates/format-dev-errors.ts +33 -0
  258. package/templates/gitignore +171 -0
  259. package/templates/init-tests/test-jest-new-worker.js +23 -0
  260. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  261. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  262. package/templates/middleware/common.ts +62 -0
  263. package/templates/middleware/loader-modules.ts +82 -0
  264. package/templates/middleware/loader-sw.ts +233 -0
  265. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  266. package/templates/middleware/middleware-pretty-error.ts +40 -0
  267. package/templates/middleware/middleware-scheduled.ts +15 -0
  268. package/templates/new-worker-scheduled.js +17 -0
  269. package/templates/new-worker-scheduled.ts +32 -0
  270. package/templates/new-worker.js +15 -0
  271. package/templates/new-worker.ts +30 -0
  272. package/templates/no-op-worker.js +10 -0
  273. package/templates/pages-dev-pipeline.ts +31 -0
  274. package/templates/pages-dev-util.ts +52 -0
  275. package/templates/pages-shim.ts +12 -0
  276. package/templates/pages-template-plugin.ts +176 -0
  277. package/templates/pages-template-worker.ts +189 -0
  278. package/templates/serve-static-assets.ts +65 -0
  279. package/templates/service-bindings-module-facade.js +54 -0
  280. package/templates/service-bindings-sw-facade.js +42 -0
  281. package/templates/tsconfig-sanity.ts +11 -0
  282. package/templates/tsconfig.init.json +106 -0
  283. package/templates/tsconfig.json +8 -0
  284. package/templates/tsconfig.tsbuildinfo +1 -0
  285. package/wrangler-dist/cli.d.ts +906 -0
  286. package/wrangler-dist/cli.js +134115 -114092
  287. package/wrangler-dist/wasm-sync.wasm +0 -0
  288. package/pages/functions/buildWorker.ts +0 -62
  289. package/pages/functions/filepath-routing.test.ts +0 -39
  290. package/pages/functions/filepath-routing.ts +0 -228
  291. package/pages/functions/identifiers.ts +0 -78
  292. package/pages/functions/routes.ts +0 -158
  293. package/pages/functions/template-worker.ts +0 -136
  294. package/src/__tests__/mock-cfetch.ts +0 -173
  295. package/src/__tests__/mock-dialogs.ts +0 -65
  296. package/src/__tests__/run-in-tmp.ts +0 -19
  297. package/src/__tests__/run-wrangler.ts +0 -32
  298. package/src/api/form_data.ts +0 -131
  299. package/src/api/preview.ts +0 -128
  300. package/src/api/worker.ts +0 -155
  301. package/src/config.ts +0 -646
  302. package/src/dialogs.tsx +0 -77
  303. package/src/index.tsx +0 -1975
  304. package/src/kv.tsx +0 -276
  305. package/src/pages.tsx +0 -1040
  306. package/src/publish.ts +0 -382
  307. package/src/sites.tsx +0 -243
  308. package/src/tail.tsx +0 -73
  309. package/src/user.tsx +0 -1019
  310. package/src/whoami.tsx +0 -69
  311. package/static-asset-facade.js +0 -47
  312. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  313. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  314. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  315. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  316. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  317. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  318. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  319. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  320. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  321. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  322. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  323. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  324. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  325. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  326. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  327. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  328. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  329. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  330. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  331. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  332. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  333. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  334. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  335. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  336. package/vendor/wrangler-mime/LICENSE +0 -21
  337. package/vendor/wrangler-mime/Mime.js +0 -97
  338. package/vendor/wrangler-mime/README.md +0 -187
  339. package/vendor/wrangler-mime/cli.js +0 -46
  340. package/vendor/wrangler-mime/index.js +0 -4
  341. package/vendor/wrangler-mime/lite.js +0 -4
  342. package/vendor/wrangler-mime/package.json +0 -52
  343. package/vendor/wrangler-mime/types/other.js +0 -1
  344. package/vendor/wrangler-mime/types/standard.js +0 -1
  345. package/wrangler-dist/cli.js.map +0 -7
package/src/publish.ts DELETED
@@ -1,382 +0,0 @@
1
- import assert from "node:assert";
2
- import path from "node:path";
3
- import { readFile } from "node:fs/promises";
4
- import * as esbuild from "esbuild";
5
- import type { Metafile } from "esbuild";
6
- import { execa } from "execa";
7
- import tmp from "tmp-promise";
8
- import type { CfWorkerInit } from "./api/worker";
9
- import { toFormData } from "./api/form_data";
10
- import { fetchResult } from "./cfetch";
11
- import type { Config } from "./config";
12
- import makeModuleCollector from "./module-collection";
13
- import type { AssetPaths } from "./sites";
14
- import { syncAssets } from "./sites";
15
-
16
- type CfScriptFormat = undefined | "modules" | "service-worker";
17
-
18
- type Props = {
19
- config: Config;
20
- format: CfScriptFormat | undefined;
21
- script: string | undefined;
22
- name: string | undefined;
23
- env: string | undefined;
24
- compatibilityDate: string | undefined;
25
- compatibilityFlags: string[] | undefined;
26
- assetPaths: AssetPaths | undefined;
27
- triggers: (string | number)[] | undefined;
28
- routes: (string | number)[] | undefined;
29
- legacyEnv: boolean | undefined;
30
- jsxFactory: undefined | string;
31
- jsxFragment: undefined | string;
32
- experimentalPublic: boolean;
33
- };
34
-
35
- function sleep(ms: number) {
36
- return new Promise((resolve) => setTimeout(resolve, ms));
37
- }
38
-
39
- export default async function publish(props: Props): Promise<void> {
40
- if (props.experimentalPublic && props.format === "service-worker") {
41
- // TODO: check config too
42
- throw new Error(
43
- "You cannot publish in the service worker format with a public directory."
44
- );
45
- }
46
- // TODO: warn if git/hg has uncommitted changes
47
- const { config } = props;
48
- const {
49
- account_id: accountId,
50
- build,
51
- // @ts-expect-error hidden
52
- __path__,
53
- } = config;
54
-
55
- const envRootObj =
56
- props.env && config.env ? config.env[props.env] || {} : config;
57
-
58
- assert(
59
- envRootObj.compatibility_date || props.compatibilityDate,
60
- "A compatibility_date is required when publishing. Add one to your wrangler.toml file, or pass it in your terminal as --compatibility_date. See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information."
61
- );
62
-
63
- if (accountId === undefined) {
64
- throw new Error("No account_id provided.");
65
- }
66
-
67
- const triggers = props.triggers || config.triggers?.crons;
68
- const routes = props.routes || config.routes;
69
-
70
- const jsxFactory = props.jsxFactory || config.jsx_factory;
71
- const jsxFragment = props.jsxFragment || config.jsx_fragment;
72
-
73
- assert(config.account_id, "missing account id");
74
-
75
- let scriptName = props.name || config.name;
76
- assert(
77
- scriptName,
78
- 'You need to provide a name when publishing a worker. Either pass it as a cli arg with `--name <name>` or in your config file as `name = "<name>"`'
79
- );
80
-
81
- let file: string;
82
- if (props.script) {
83
- // If the script name comes from the command line it is relative to the current working directory.
84
- file = path.resolve(props.script);
85
- } else {
86
- // If the script name comes from the config, then it is relative to the wrangler.toml file.
87
- assert(build?.upload?.main, "missing main file");
88
- file = path.resolve(path.dirname(__path__), build.upload.main);
89
- }
90
-
91
- if (props.legacyEnv) {
92
- scriptName += props.env ? `-${props.env}` : "";
93
- }
94
- const envName = props.env ?? "production";
95
-
96
- const destination = await tmp.dir({ unsafeCleanup: true });
97
- if (props.config.build?.command) {
98
- // TODO: add a deprecation message here?
99
- console.log("running:", props.config.build.command);
100
- const buildCommandPieces = props.config.build.command.split(" ");
101
- await execa(buildCommandPieces[0], buildCommandPieces.slice(1), {
102
- stdout: "inherit",
103
- stderr: "inherit",
104
- ...(props.config.build?.cwd && { cwd: props.config.build.cwd }),
105
- });
106
- }
107
-
108
- const moduleCollector = makeModuleCollector();
109
- const result = await esbuild.build({
110
- ...(props.experimentalPublic
111
- ? {
112
- stdin: {
113
- contents: (
114
- await readFile(
115
- path.join(__dirname, "../static-asset-facade.js"),
116
- "utf8"
117
- )
118
- ).replace("__ENTRY_POINT__", file),
119
- sourcefile: "static-asset-facade.js",
120
- resolveDir: path.dirname(file),
121
- },
122
- nodePaths: [path.join(__dirname, "../vendor")],
123
- }
124
- : { entryPoints: [file] }),
125
- bundle: true,
126
- outdir: destination.path,
127
- external: ["__STATIC_CONTENT_MANIFEST"],
128
- format: "esm",
129
- sourcemap: true,
130
- metafile: true,
131
- conditions: ["worker", "browser"],
132
- loader: {
133
- ".js": "jsx",
134
- },
135
- plugins: [moduleCollector.plugin],
136
- ...(jsxFactory && { jsxFactory }),
137
- ...(jsxFragment && { jsxFragment }),
138
- });
139
-
140
- // result.metafile is defined because of the `metafile: true` option above.
141
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
142
- const metafile = result.metafile!;
143
- const entryPoints = Object.entries(metafile.outputs).filter(
144
- ([_path, output]) => output.entryPoint !== undefined
145
- );
146
- assert(
147
- entryPoints.length > 0,
148
- `Cannot find entry-point "${file}" in generated bundle.` +
149
- listEntryPoints(entryPoints)
150
- );
151
- assert(
152
- entryPoints.length < 2,
153
- "More than one entry-point found for generated bundle." +
154
- listEntryPoints(entryPoints)
155
- );
156
- const entryPointExports = entryPoints[0][1].exports;
157
- const resolvedEntryPointPath = entryPoints[0][0];
158
- const { format } = props;
159
- const bundle = {
160
- type: entryPointExports.length > 0 ? "esm" : "commonjs",
161
- exports: entryPointExports,
162
- };
163
-
164
- // TODO: instead of bundling the facade with the worker, we should just bundle the worker and expose it as a module.
165
- // That way we'll be able to accurately tell if this is a service worker or not.
166
-
167
- if (format === "modules" && bundle.type === "commonjs") {
168
- console.error("⎔ Cannot use modules with a commonjs bundle.");
169
- // TODO: a much better error message here, with what to do next
170
- return;
171
- }
172
- if (format === "service-worker" && bundle.type !== "esm") {
173
- console.error("⎔ Cannot use service-worker with a esm bundle.");
174
- // TODO: a much better error message here, with what to do next
175
- return;
176
- }
177
-
178
- const content = await readFile(resolvedEntryPointPath, { encoding: "utf-8" });
179
- await destination.cleanup();
180
-
181
- // if config.migrations
182
- // get current migration tag
183
- let migrations;
184
- if (config.migrations !== undefined) {
185
- const scripts = await fetchResult<{ id: string; migration_tag: string }[]>(
186
- `/accounts/${accountId}/workers/scripts`
187
- );
188
- const script = scripts.find(({ id }) => id === scriptName);
189
- if (script?.migration_tag) {
190
- // was already published once
191
- const foundIndex = config.migrations.findIndex(
192
- (migration) => migration.tag === script.migration_tag
193
- );
194
- if (foundIndex === -1) {
195
- console.warn(
196
- `The published script ${scriptName} has a migration tag "${script.migration_tag}, which was not found in wrangler.toml. You may have already deleted it. Applying all available migrations to the script...`
197
- );
198
- migrations = {
199
- old_tag: script.migration_tag,
200
- new_tag: config.migrations[config.migrations.length - 1].tag,
201
- steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
202
- };
203
- } else {
204
- migrations = {
205
- old_tag: script.migration_tag,
206
- new_tag: config.migrations[config.migrations.length - 1].tag,
207
- steps: config.migrations
208
- .slice(foundIndex + 1)
209
- .map(({ tag: _tag, ...rest }) => rest),
210
- };
211
- }
212
- } else {
213
- migrations = {
214
- new_tag: config.migrations[config.migrations.length - 1].tag,
215
- steps: config.migrations.map(({ tag: _tag, ...rest }) => rest),
216
- };
217
- }
218
- }
219
-
220
- const assets = await syncAssets(
221
- accountId,
222
- scriptName,
223
- props.assetPaths,
224
- false
225
- );
226
-
227
- const bindings: CfWorkerInit["bindings"] = {
228
- kv_namespaces: envRootObj.kv_namespaces?.concat(
229
- assets.namespace
230
- ? { binding: "__STATIC_CONTENT", id: assets.namespace }
231
- : []
232
- ),
233
- vars: envRootObj.vars,
234
- durable_objects: envRootObj.durable_objects,
235
- services: envRootObj.experimental_services,
236
- };
237
-
238
- const worker: CfWorkerInit = {
239
- name: scriptName,
240
- main: {
241
- name: path.basename(resolvedEntryPointPath),
242
- content: content,
243
- type: bundle.type === "esm" ? "esm" : "commonjs",
244
- },
245
- bindings,
246
- ...(migrations && { migrations }),
247
- modules: moduleCollector.modules.concat(
248
- assets.manifest
249
- ? {
250
- name: "__STATIC_CONTENT_MANIFEST",
251
- content: JSON.stringify(assets.manifest),
252
- type: "text",
253
- }
254
- : []
255
- ),
256
- compatibility_date: config.compatibility_date,
257
- compatibility_flags: config.compatibility_flags,
258
- usage_model: config.usage_model,
259
- };
260
-
261
- const start = Date.now();
262
- function formatTime(duration: number) {
263
- return `(${(duration / 1000).toFixed(2)} sec)`;
264
- }
265
-
266
- const notProd = !props.legacyEnv && props.env;
267
- const workerName = notProd ? `${scriptName} (${envName})` : scriptName;
268
- const workerUrl = notProd
269
- ? `/accounts/${accountId}/workers/services/${scriptName}/environments/${envName}`
270
- : `/accounts/${accountId}/workers/scripts/${scriptName}`;
271
-
272
- // Upload the script so it has time to propagate.
273
- const { available_on_subdomain } = await fetchResult(
274
- workerUrl,
275
- {
276
- method: "PUT",
277
- // @ts-expect-error: TODO: fix this type error!
278
- body: toFormData(worker),
279
- },
280
- new URLSearchParams({ available_on_subdomains: "true" })
281
- );
282
-
283
- const uploadMs = Date.now() - start;
284
- console.log("Uploaded", workerName, formatTime(uploadMs));
285
- const deployments: Promise<string[]>[] = [];
286
-
287
- const userSubdomain = (
288
- await fetchResult<{ subdomain: string }>(
289
- `/accounts/${accountId}/workers/subdomain`
290
- )
291
- ).subdomain;
292
-
293
- const scriptURL =
294
- props.legacyEnv || !props.env
295
- ? `${scriptName}.${userSubdomain}.workers.dev`
296
- : `${envName}.${scriptName}.${userSubdomain}.workers.dev`;
297
-
298
- // Enable the `workers.dev` subdomain.
299
- // TODO: Make this configurable.
300
- if (!available_on_subdomain) {
301
- deployments.push(
302
- fetchResult(`${workerUrl}/subdomain`, {
303
- method: "POST",
304
- body: JSON.stringify({ enabled: true }),
305
- headers: {
306
- "Content-Type": "application/json",
307
- },
308
- })
309
- .then(() => [scriptURL])
310
- // Add a delay when the subdomain is first created.
311
- // This is to prevent an issue where a negative cache-hit
312
- // causes the subdomain to be unavailable for 30 seconds.
313
- // This is a temporary measure until we fix this on the edge.
314
- .then(async (url) => {
315
- await sleep(3000);
316
- return url;
317
- })
318
- );
319
- } else {
320
- deployments.push(Promise.resolve([scriptURL]));
321
- }
322
-
323
- // Update routing table for the script.
324
- if (routes && routes.length) {
325
- deployments.push(
326
- fetchResult(`${workerUrl}/routes`, {
327
- // TODO: PATCH will not delete previous routes on this script,
328
- // whereas PUT will. We need to decide on the default behaviour
329
- // and how to configure it.
330
- method: "PUT",
331
- body: JSON.stringify(routes.map((pattern) => ({ pattern }))),
332
- headers: {
333
- "Content-Type": "application/json",
334
- },
335
- }).then(() => {
336
- if (routes.length > 10) {
337
- return routes
338
- .slice(0, 9)
339
- .map(String)
340
- .concat([`...and ${routes.length - 10} more routes`]);
341
- }
342
- return routes.map(String);
343
- })
344
- );
345
- }
346
-
347
- // Configure any schedules for the script.
348
- // TODO: rename this to `schedules`?
349
- if (triggers && triggers.length) {
350
- deployments.push(
351
- fetchResult(`${workerUrl}/schedules`, {
352
- // TODO: Unlike routes, this endpoint does not support PATCH.
353
- // So technically, this will override any previous schedules.
354
- // We should change the endpoint to support PATCH.
355
- method: "PUT",
356
- body: JSON.stringify(triggers.map((cron) => ({ cron }))),
357
- headers: {
358
- "Content-Type": "application/json",
359
- },
360
- }).then(() => triggers.map(String))
361
- );
362
- }
363
-
364
- if (!deployments.length) {
365
- return;
366
- }
367
-
368
- const targets = await Promise.all(deployments);
369
- const deployMs = Date.now() - start - uploadMs;
370
- console.log("Deployed", workerName, formatTime(deployMs));
371
- for (const target of targets.flat()) {
372
- console.log(" ", target);
373
- }
374
- }
375
-
376
- function listEntryPoints(
377
- outputs: [string, ValueOf<Metafile["outputs"]>][]
378
- ): string {
379
- return outputs.map(([_input, output]) => output.entryPoint).join("\n");
380
- }
381
-
382
- type ValueOf<T> = T[keyof T];
package/src/sites.tsx DELETED
@@ -1,243 +0,0 @@
1
- import * as path from "node:path";
2
- import { readdir, readFile, stat } from "node:fs/promises";
3
- import ignore from "ignore";
4
- import { XXHash64 } from "xxhash-addon";
5
- import { fetchResult } from "./cfetch";
6
- import type { Config } from "./config";
7
- import { listNamespaceKeys, listNamespaces, putBulkKeyValue } from "./kv";
8
-
9
- /** Paths to always ignore. */
10
- const ALWAYS_IGNORE = ["node_modules"];
11
- const HIDDEN_FILES_TO_INCLUDE = [
12
- ".well-known", // See https://datatracker.ietf.org/doc/html/rfc8615
13
- ];
14
-
15
- async function* getFilesInFolder(dirPath: string): AsyncIterable<string> {
16
- const files = await readdir(dirPath, { withFileTypes: true });
17
- for (const file of files) {
18
- // Skip files that we never want to process.
19
- if (ALWAYS_IGNORE.some((p) => file.name === p)) {
20
- continue;
21
- }
22
- // Skip hidden files (starting with .) except for some special ones
23
- if (
24
- file.name.startsWith(".") &&
25
- !HIDDEN_FILES_TO_INCLUDE.some((p) => file.name === p)
26
- ) {
27
- continue;
28
- }
29
- // TODO: follow symlinks??
30
- if (file.isDirectory()) {
31
- yield* await getFilesInFolder(path.join(dirPath, file.name));
32
- } else {
33
- yield path.join(dirPath, file.name);
34
- }
35
- }
36
- }
37
-
38
- /**
39
- * Create a hash key for the given content using the xxhash algorithm.
40
- *
41
- * Note we only return the first 10 characters, since we will also include the file name in the asset manifest key
42
- * the most important thing here is to detect changes of a single file to invalidate the cache and
43
- * it's impossible to serve two different files with the same name
44
- */
45
- function hashFileContent(content: string): string {
46
- const hasher = new XXHash64();
47
- hasher.update(Buffer.from(content));
48
- const hash = hasher.digest();
49
- return hash.toString("hex").substring(0, 10);
50
- }
51
-
52
- /**
53
- * Create a hashed asset key for the given asset.
54
- *
55
- * The key will change if the file path or content of the asset changes.
56
- * The algorithm used here matches that of Wrangler 1.
57
- */
58
- function hashAsset(filePath: string, content: string): string {
59
- const extName = path.extname(filePath) || "";
60
- const baseName = path.basename(filePath, extName);
61
- const directory = path.dirname(filePath);
62
- const hash = hashFileContent(content);
63
- return urlSafe(path.join(directory, `${baseName}.${hash}${extName}`));
64
- }
65
-
66
- async function createKVNamespaceIfNotAlreadyExisting(
67
- title: string,
68
- accountId: string
69
- ) {
70
- // check if it already exists
71
- // TODO: this is super inefficient, should be made better
72
- const namespaces = await listNamespaces(accountId);
73
- const found = namespaces.find((x) => x.title === title);
74
- if (found) {
75
- return { created: false, id: found.id };
76
- }
77
-
78
- // else we make the namespace
79
- // TODO: use an export from ./kv
80
- const json = await fetchResult<{ id: string }>(
81
- `/accounts/${accountId}/storage/kv/namespaces`,
82
- {
83
- method: "POST",
84
- headers: {
85
- "Content-Type": "application/json",
86
- },
87
- body: JSON.stringify({ title }),
88
- }
89
- );
90
-
91
- return {
92
- created: true,
93
- id: json.id,
94
- };
95
- }
96
-
97
- /**
98
- * Upload the assets found within the `dirPath` directory to the sites assets KV namespace for
99
- * the worker given by `scriptName`.
100
- *
101
- * @param accountId the account to upload to.
102
- * @param scriptName the name of the worker whose assets we are uploading.
103
- * @param siteAssets an objects describing what assets to upload, or undefined if there are no assets to upload.
104
- * @param preview if true then upload to a "preview" KV namespace.
105
- * @param _env (not implemented).
106
- * @returns a promise for an object mapping the relative paths of the assets to the key of that
107
- * asset in the KV namespace.
108
- */
109
- export async function syncAssets(
110
- accountId: string,
111
- scriptName: string,
112
- siteAssets: AssetPaths | undefined,
113
- preview: boolean,
114
- _env?: string
115
- ): Promise<{
116
- manifest: { [filePath: string]: string } | undefined;
117
- namespace: string | undefined;
118
- }> {
119
- if (siteAssets === undefined) {
120
- return { manifest: undefined, namespace: undefined };
121
- }
122
-
123
- const title = `__${scriptName}_sites_assets${preview ? "_preview" : ""}`;
124
- const { id: namespace } = await createKVNamespaceIfNotAlreadyExisting(
125
- title,
126
- accountId
127
- );
128
-
129
- // let's get all the keys in this namespace
130
- const result = await listNamespaceKeys(accountId, namespace);
131
- const keys = new Set(result.map((x) => x.name));
132
-
133
- const manifest = {};
134
- const upload: {
135
- key: string;
136
- value: string;
137
- base64: boolean;
138
- }[] = [];
139
-
140
- const include = createPatternMatcher(siteAssets.includePatterns, false);
141
- const exclude = createPatternMatcher(siteAssets.excludePatterns, true);
142
- // TODO: this can be more efficient by parallelising
143
- for await (const file of getFilesInFolder(siteAssets.baseDirectory)) {
144
- if (!include(file)) {
145
- continue;
146
- }
147
- if (exclude(file)) {
148
- continue;
149
- }
150
-
151
- await validateAssetSize(file);
152
- console.log(`reading ${file}...`);
153
- const content = await readFile(file, "base64");
154
-
155
- const assetKey = hashAsset(file, content);
156
- validateAssetKey(assetKey);
157
-
158
- // now put each of the files into kv
159
- if (!keys.has(assetKey)) {
160
- console.log(`uploading as ${assetKey}...`);
161
- upload.push({
162
- key: assetKey,
163
- value: content,
164
- base64: true,
165
- });
166
- } else {
167
- console.log(`skipping - already uploaded`);
168
- }
169
- manifest[path.relative(siteAssets.baseDirectory, file)] = assetKey;
170
- }
171
- await putBulkKeyValue(accountId, namespace, JSON.stringify(upload));
172
- return { manifest, namespace };
173
- }
174
-
175
- function createPatternMatcher(
176
- patterns: string[],
177
- exclude: boolean
178
- ): (filePath: string) => boolean {
179
- if (patterns.length === 0) {
180
- return (_filePath) => !exclude;
181
- } else {
182
- const ignorer = ignore().add(patterns);
183
- return (filePath) => ignorer.test(filePath).ignored;
184
- }
185
- }
186
-
187
- async function validateAssetSize(filePath: string) {
188
- const { size } = await stat(filePath);
189
- if (size > 25 * 1024 * 1024) {
190
- throw new Error(
191
- `File ${filePath} is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits`
192
- );
193
- }
194
- }
195
-
196
- function validateAssetKey(assetKey: string) {
197
- if (assetKey.length > 512) {
198
- throw new Error(
199
- `The asset path key "${assetKey}" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits",`
200
- );
201
- }
202
- }
203
-
204
- /**
205
- * Convert a filePath to be safe to use as a relative URL.
206
- *
207
- * Primarily this involves converting Windows backslashes to forward slashes.
208
- */
209
- function urlSafe(filePath: string): string {
210
- return filePath.replace(/\\/g, "/");
211
- }
212
-
213
- /**
214
- * Information about the assets that should be uploaded
215
- */
216
- export interface AssetPaths {
217
- baseDirectory: string;
218
- includePatterns: string[];
219
- excludePatterns: string[];
220
- }
221
-
222
- /**
223
- * Get an object that describes what assets to upload, if any.
224
- *
225
- * Uses the args (passed from the command line) if available,
226
- * falling back to those defined in the config.
227
- *
228
- * // TODO: Support for environments
229
- */
230
- export function getAssetPaths(
231
- config: Config,
232
- baseDirectory = config.site?.bucket,
233
- includePatterns = config.site?.include ?? [],
234
- excludePatterns = config.site?.exclude ?? []
235
- ): undefined | AssetPaths {
236
- return baseDirectory
237
- ? {
238
- baseDirectory,
239
- includePatterns,
240
- excludePatterns,
241
- }
242
- : undefined;
243
- }
package/src/tail.tsx DELETED
@@ -1,73 +0,0 @@
1
- import WebSocket from "ws";
2
- import { version as packageVersion } from "../package.json";
3
- import { fetchResult } from "./cfetch";
4
-
5
- export type TailApiResponse = {
6
- id: string;
7
- url: string;
8
- expires_at: Date;
9
- };
10
-
11
- function makeCreateTailUrl(accountId: string, workerName: string): string {
12
- return `/accounts/${accountId}/workers/scripts/${workerName}/tails`;
13
- }
14
-
15
- function makeDeleteTailUrl(
16
- accountId: string,
17
- workerName: string,
18
- tailId: string
19
- ): string {
20
- return `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
21
- }
22
-
23
- /// Creates a tail, but doesn't connect to it.
24
- async function createTailButDontConnect(
25
- accountId: string,
26
- workerName: string
27
- ): Promise<TailApiResponse> {
28
- const createTailUrl = makeCreateTailUrl(accountId, workerName);
29
- /// https://api.cloudflare.com/#worker-tail-logs-start-tail
30
- return await fetchResult<TailApiResponse>(createTailUrl, {
31
- method: "POST",
32
- });
33
- }
34
-
35
- export async function createTail(
36
- accountId: string,
37
- workerName: string,
38
- _filters: Filters
39
- ): Promise<{
40
- tail: WebSocket;
41
- expiration: Date;
42
- deleteTail: () => Promise<void>;
43
- }> {
44
- const {
45
- id: tailId,
46
- url: websocketUrl,
47
- expires_at: expiration,
48
- } = await createTailButDontConnect(accountId, workerName);
49
- const deleteUrl = makeDeleteTailUrl(accountId, workerName, tailId);
50
-
51
- // deletes the tail
52
- async function deleteTail() {
53
- await fetchResult(deleteUrl, { method: "DELETE" });
54
- }
55
-
56
- const tail = new WebSocket(websocketUrl, "trace-v1", {
57
- headers: {
58
- "Sec-WebSocket-Protocol": "trace-v1", // needs to be `trace-v1` to be accepted
59
- "User-Agent": `wrangler-js/${packageVersion}`,
60
- },
61
- });
62
-
63
- // TODO: send filters as well
64
- return { tail, expiration, deleteTail };
65
- }
66
-
67
- export type Filters = {
68
- status?: "ok" | "error" | "canceled";
69
- header?: string;
70
- method?: string;
71
- "sampling-rate"?: number;
72
- search?: string;
73
- };