wrangler 0.0.0-e64812e → 0.0.0-e6c9c5c0

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 (338) hide show
  1. package/README.md +23 -3
  2. package/bin/wrangler.js +170 -62
  3. package/kv-asset-handler.js +1 -0
  4. package/miniflare-dist/index.mjs +1499 -21
  5. package/package.json +193 -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.js +64 -0
  9. package/src/__tests__/api.test.ts +80 -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 +4152 -3363
  13. package/src/__tests__/d1/d1.test.ts +127 -0
  14. package/src/__tests__/d1/splitter.test.ts +255 -0
  15. package/src/__tests__/delete.test.ts +266 -0
  16. package/src/__tests__/deployments.test.ts +105 -0
  17. package/src/__tests__/dev.test.tsx +1558 -952
  18. package/src/__tests__/generate.test.ts +238 -0
  19. package/src/__tests__/get-host-from-url.test.ts +16 -0
  20. package/src/__tests__/guess-worker-format.test.ts +68 -68
  21. package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
  22. package/src/__tests__/helpers/mock-account-id.ts +24 -24
  23. package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
  24. package/src/__tests__/helpers/mock-bin.ts +20 -20
  25. package/src/__tests__/helpers/mock-console.ts +58 -39
  26. package/src/__tests__/helpers/mock-dialogs.ts +88 -79
  27. package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
  28. package/src/__tests__/helpers/mock-http-server.ts +30 -30
  29. package/src/__tests__/helpers/mock-istty.ts +65 -18
  30. package/src/__tests__/helpers/mock-known-routes.ts +12 -0
  31. package/src/__tests__/helpers/mock-kv.ts +41 -28
  32. package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
  33. package/src/__tests__/helpers/mock-process.ts +34 -0
  34. package/src/__tests__/helpers/mock-stdin.ts +82 -77
  35. package/src/__tests__/helpers/mock-web-socket.ts +21 -21
  36. package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
  37. package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
  38. package/src/__tests__/helpers/msw/handlers/deployments.ts +69 -0
  39. package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
  40. package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
  41. package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
  42. package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
  43. package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
  44. package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
  45. package/src/__tests__/helpers/msw/index.ts +50 -0
  46. package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
  47. package/src/__tests__/helpers/run-in-tmp.ts +27 -28
  48. package/src/__tests__/helpers/run-wrangler.ts +8 -8
  49. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
  50. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
  51. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
  52. package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
  53. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
  54. package/src/__tests__/helpers/write-worker-source.ts +16 -16
  55. package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
  56. package/src/__tests__/https-options.test.ts +142 -109
  57. package/src/__tests__/index.test.ts +245 -233
  58. package/src/__tests__/init.test.ts +3135 -1605
  59. package/src/__tests__/jest.setup.ts +148 -50
  60. package/src/__tests__/kv.test.ts +1778 -1471
  61. package/src/__tests__/logger.test.ts +100 -74
  62. package/src/__tests__/logout.test.ts +47 -0
  63. package/src/__tests__/metrics.test.ts +493 -0
  64. package/src/__tests__/middleware.scheduled.test.ts +145 -0
  65. package/src/__tests__/middleware.test.ts +750 -0
  66. package/src/__tests__/package-manager.test.ts +303 -303
  67. package/src/__tests__/pages-deployment-tail.test.ts +955 -0
  68. package/src/__tests__/pages.test.ts +2887 -743
  69. package/src/__tests__/parse.test.ts +252 -252
  70. package/src/__tests__/paths.test.ts +39 -0
  71. package/src/__tests__/publish.test.ts +8004 -5355
  72. package/src/__tests__/pubsub.test.ts +490 -0
  73. package/src/__tests__/queues.test.ts +522 -0
  74. package/src/__tests__/r2.test.ts +364 -228
  75. package/src/__tests__/route.test.ts +18 -18
  76. package/src/__tests__/secret.test.ts +681 -469
  77. package/src/__tests__/tail.test.ts +835 -567
  78. package/src/__tests__/test-old-node-version.js +31 -0
  79. package/src/__tests__/tsconfig-sanity.ts +12 -0
  80. package/src/__tests__/tsconfig.json +8 -0
  81. package/src/__tests__/tsconfig.tsbuildinfo +1 -0
  82. package/src/__tests__/type-generation.test.ts +233 -0
  83. package/src/__tests__/user.test.ts +107 -120
  84. package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
  85. package/src/__tests__/validate-dev-props.test.ts +56 -0
  86. package/src/__tests__/version.test.ts +35 -0
  87. package/src/__tests__/whoami.test.tsx +165 -98
  88. package/src/__tests__/worker-namespace.test.ts +334 -0
  89. package/src/abort.d.ts +1 -1
  90. package/src/api/dev.ts +259 -0
  91. package/src/api/index.ts +3 -0
  92. package/src/api/pages/index.ts +5 -0
  93. package/src/api/pages/publish.tsx +321 -0
  94. package/src/bundle-reporter.ts +68 -0
  95. package/src/bundle.ts +838 -163
  96. package/src/cfetch/index.ts +120 -83
  97. package/src/cfetch/internal.ts +210 -97
  98. package/src/cli.ts +23 -8
  99. package/src/config/config.ts +236 -195
  100. package/src/config/diagnostics.ts +61 -61
  101. package/src/config/environment.ts +516 -357
  102. package/src/config/index.ts +326 -193
  103. package/src/config/validation-helpers.ts +379 -357
  104. package/src/config/validation.ts +1979 -1367
  105. package/src/config-cache.ts +81 -41
  106. package/src/create-worker-preview.ts +239 -142
  107. package/src/create-worker-upload-form.ts +309 -238
  108. package/src/d1/backups.tsx +219 -0
  109. package/src/d1/constants.ts +2 -0
  110. package/src/d1/create.tsx +63 -0
  111. package/src/d1/delete.ts +56 -0
  112. package/src/d1/execute.tsx +323 -0
  113. package/src/d1/formatTimeAgo.ts +14 -0
  114. package/src/d1/index.ts +101 -0
  115. package/src/d1/list.tsx +48 -0
  116. package/src/d1/migrations/apply.tsx +197 -0
  117. package/src/d1/migrations/create.tsx +77 -0
  118. package/src/d1/migrations/helpers.ts +147 -0
  119. package/src/d1/migrations/index.ts +3 -0
  120. package/src/d1/migrations/list.tsx +79 -0
  121. package/src/d1/migrations/options.ts +18 -0
  122. package/src/d1/options.ts +22 -0
  123. package/src/d1/splitter.ts +161 -0
  124. package/src/d1/types.ts +24 -0
  125. package/src/d1/utils.ts +48 -0
  126. package/src/delete.ts +103 -0
  127. package/src/deployments.ts +93 -0
  128. package/src/deprecated/index.ts +145 -0
  129. package/src/dev/dev-vars.ts +20 -17
  130. package/src/dev/dev.tsx +547 -352
  131. package/src/dev/get-local-persistence-path.ts +31 -0
  132. package/src/dev/local.tsx +903 -298
  133. package/src/dev/remote.tsx +620 -215
  134. package/src/dev/start-server.ts +538 -0
  135. package/src/dev/use-esbuild.ts +184 -97
  136. package/src/dev/validate-dev-props.ts +31 -0
  137. package/src/dev-registry.ts +201 -0
  138. package/src/dev.tsx +949 -0
  139. package/src/dialogs.ts +136 -0
  140. package/src/dispatch-namespace.ts +207 -0
  141. package/src/docs/index.ts +98 -0
  142. package/src/durable.ts +87 -87
  143. package/src/entry.ts +236 -230
  144. package/src/environment-variables/factory.ts +88 -0
  145. package/src/environment-variables/misc-variables.ts +30 -0
  146. package/src/errors.ts +6 -6
  147. package/src/generate/index.ts +300 -0
  148. package/src/git-client.ts +135 -0
  149. package/src/global-wrangler-config-path.ts +26 -0
  150. package/src/https-options.ts +84 -80
  151. package/src/index.ts +694 -0
  152. package/src/init.ts +1024 -0
  153. package/src/inspect.ts +698 -593
  154. package/src/intl-polyfill.d.ts +123 -123
  155. package/src/is-ci.ts +14 -0
  156. package/src/is-interactive.ts +16 -0
  157. package/src/jest.d.ts +4 -0
  158. package/src/kv/helpers.ts +430 -0
  159. package/src/kv/index.ts +596 -0
  160. package/src/logger.ts +80 -42
  161. package/src/metrics/index.ts +5 -0
  162. package/src/metrics/metrics-config.ts +239 -0
  163. package/src/metrics/metrics-dispatcher.ts +96 -0
  164. package/src/metrics/metrics-usage-headers.ts +24 -0
  165. package/src/metrics/send-event.ts +98 -0
  166. package/src/miniflare-cli/assets.ts +250 -0
  167. package/src/miniflare-cli/index.ts +202 -33
  168. package/src/miniflare-cli/request-context.ts +18 -18
  169. package/src/miniflare-cli/tsconfig.json +9 -0
  170. package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
  171. package/src/miniflare-cli/types.ts +11 -0
  172. package/src/module-collection.ts +221 -212
  173. package/src/open-in-browser.ts +4 -6
  174. package/src/package-manager.ts +173 -128
  175. package/src/pages/build.ts +150 -0
  176. package/src/pages/buildFunctions.ts +129 -0
  177. package/src/pages/constants.ts +18 -0
  178. package/src/pages/deployment-tails.ts +284 -0
  179. package/src/pages/deployments.tsx +84 -0
  180. package/src/pages/dev.ts +716 -0
  181. package/src/pages/errors.ts +66 -0
  182. package/src/pages/functions/buildPlugin.ts +90 -0
  183. package/src/pages/functions/buildWorker.ts +288 -0
  184. package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
  185. package/src/pages/functions/filepath-routing.ts +189 -0
  186. package/src/pages/functions/identifiers.ts +78 -0
  187. package/src/pages/functions/routes-consolidation.test.ts +250 -0
  188. package/src/pages/functions/routes-consolidation.ts +73 -0
  189. package/src/pages/functions/routes-transformation.test.ts +282 -0
  190. package/src/pages/functions/routes-transformation.ts +115 -0
  191. package/src/pages/functions/routes-validation.test.ts +403 -0
  192. package/src/pages/functions/routes-validation.ts +202 -0
  193. package/src/pages/functions/routes.ts +151 -0
  194. package/src/pages/functions/tsconfig.json +8 -0
  195. package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
  196. package/src/pages/functions.ts +82 -0
  197. package/src/pages/hash.ts +13 -0
  198. package/src/pages/index.ts +102 -0
  199. package/src/pages/projects.tsx +167 -0
  200. package/src/pages/prompt-select-project.tsx +31 -0
  201. package/src/pages/publish.tsx +263 -0
  202. package/src/pages/types.ts +41 -0
  203. package/src/pages/upload.tsx +447 -0
  204. package/src/pages/utils.ts +23 -0
  205. package/src/parse.ts +209 -125
  206. package/src/paths.ts +53 -8
  207. package/src/proxy.ts +623 -394
  208. package/src/publish/index.ts +270 -0
  209. package/src/publish/publish.ts +1064 -0
  210. package/src/pubsub/index.ts +286 -0
  211. package/src/pubsub/pubsub-commands.ts +624 -0
  212. package/src/queues/cli/commands/consumer/add.ts +71 -0
  213. package/src/queues/cli/commands/consumer/index.ts +22 -0
  214. package/src/queues/cli/commands/consumer/remove.ts +38 -0
  215. package/src/queues/cli/commands/create.ts +25 -0
  216. package/src/queues/cli/commands/delete.ts +26 -0
  217. package/src/queues/cli/commands/index.ts +36 -0
  218. package/src/queues/cli/commands/list.ts +25 -0
  219. package/src/queues/client.ts +135 -0
  220. package/src/queues/utils.ts +18 -0
  221. package/src/r2/constants.ts +4 -0
  222. package/src/r2/helpers.ts +131 -0
  223. package/src/r2/index.ts +289 -0
  224. package/src/routes.ts +140 -0
  225. package/src/secret/index.ts +379 -0
  226. package/src/selfsigned.d.ts +23 -23
  227. package/src/sites.ts +372 -0
  228. package/src/tail/createTail.ts +406 -0
  229. package/src/tail/filters.ts +108 -110
  230. package/src/tail/index.ts +210 -296
  231. package/src/tail/printing.ts +101 -46
  232. package/src/tsconfig-sanity.ts +16 -0
  233. package/src/type-generation.ts +181 -0
  234. package/src/update-check.ts +11 -11
  235. package/src/user/access.ts +68 -0
  236. package/src/user/auth-variables.ts +113 -0
  237. package/src/user/choose-account.tsx +39 -0
  238. package/src/user/generate-auth-url.ts +33 -0
  239. package/src/user/generate-random-state.ts +16 -0
  240. package/src/user/index.ts +2 -0
  241. package/src/user/user.ts +1232 -0
  242. package/src/utils/collectKeyValues.ts +14 -0
  243. package/src/whoami.ts +135 -0
  244. package/src/worker.ts +177 -106
  245. package/src/yargs-types.ts +24 -0
  246. package/src/zones.ts +191 -0
  247. package/templates/__tests__/pages-dev-util.test.ts +128 -0
  248. package/templates/__tests__/tsconfig-sanity.ts +12 -0
  249. package/templates/__tests__/tsconfig.json +8 -0
  250. package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
  251. package/templates/checked-fetch.js +15 -0
  252. package/templates/d1-beta-facade.js +241 -0
  253. package/templates/facade.d.ts +14 -0
  254. package/templates/first-party-worker-module-facade.ts +19 -0
  255. package/templates/format-dev-errors.ts +33 -0
  256. package/templates/init-tests/test-jest-new-worker.js +23 -0
  257. package/templates/init-tests/test-vitest-new-worker.js +24 -0
  258. package/templates/init-tests/test-vitest-new-worker.ts +25 -0
  259. package/templates/middleware/common.ts +62 -0
  260. package/templates/middleware/loader-modules.ts +84 -0
  261. package/templates/middleware/loader-sw.ts +233 -0
  262. package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
  263. package/templates/middleware/middleware-pretty-error.ts +40 -0
  264. package/templates/middleware/middleware-scheduled.ts +15 -0
  265. package/templates/new-worker-scheduled.js +3 -3
  266. package/templates/new-worker-scheduled.ts +15 -15
  267. package/templates/new-worker.js +3 -3
  268. package/templates/new-worker.ts +15 -15
  269. package/templates/no-op-worker.js +10 -0
  270. package/templates/pages-dev-pipeline.ts +31 -0
  271. package/templates/pages-dev-util.ts +52 -0
  272. package/templates/pages-shim.ts +12 -0
  273. package/templates/pages-template-plugin.ts +176 -0
  274. package/templates/pages-template-worker.ts +189 -0
  275. package/templates/serve-static-assets.ts +65 -0
  276. package/templates/service-bindings-module-facade.js +54 -0
  277. package/templates/service-bindings-sw-facade.js +42 -0
  278. package/templates/tsconfig-sanity.ts +11 -0
  279. package/templates/tsconfig.init.json +106 -0
  280. package/templates/tsconfig.json +6 -103
  281. package/templates/tsconfig.tsbuildinfo +1 -0
  282. package/wrangler-dist/cli.d.ts +1028 -0
  283. package/wrangler-dist/cli.js +129259 -110922
  284. package/wrangler-dist/wasm-sync.wasm +0 -0
  285. package/pages/functions/buildPlugin.ts +0 -105
  286. package/pages/functions/buildWorker.ts +0 -151
  287. package/pages/functions/filepath-routing.ts +0 -189
  288. package/pages/functions/identifiers.ts +0 -78
  289. package/pages/functions/routes.ts +0 -156
  290. package/pages/functions/template-plugin.ts +0 -147
  291. package/pages/functions/template-worker.ts +0 -143
  292. package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
  293. package/src/__tests__/helpers/mock-cfetch.ts +0 -211
  294. package/src/dialogs.tsx +0 -135
  295. package/src/environment-variables.ts +0 -35
  296. package/src/index.tsx +0 -2864
  297. package/src/kv.ts +0 -408
  298. package/src/miniflare-cli/enum-keys.ts +0 -17
  299. package/src/pages.tsx +0 -2038
  300. package/src/publish.ts +0 -583
  301. package/src/r2.ts +0 -50
  302. package/src/sites.tsx +0 -295
  303. package/src/user.tsx +0 -1203
  304. package/src/whoami.tsx +0 -70
  305. package/templates/static-asset-facade.js +0 -47
  306. package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
  307. package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
  308. package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
  309. package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
  310. package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
  311. package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
  312. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
  313. package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
  314. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
  315. package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
  316. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
  317. package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
  318. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
  319. package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
  320. package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
  321. package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
  322. package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
  323. package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
  324. package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
  325. package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
  326. package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
  327. package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
  328. package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
  329. package/vendor/wrangler-mime/CHANGELOG.md +0 -289
  330. package/vendor/wrangler-mime/LICENSE +0 -21
  331. package/vendor/wrangler-mime/Mime.js +0 -97
  332. package/vendor/wrangler-mime/README.md +0 -187
  333. package/vendor/wrangler-mime/cli.js +0 -46
  334. package/vendor/wrangler-mime/index.js +0 -4
  335. package/vendor/wrangler-mime/lite.js +0 -4
  336. package/vendor/wrangler-mime/package.json +0 -52
  337. package/vendor/wrangler-mime/types/other.js +0 -1
  338. package/vendor/wrangler-mime/types/standard.js +0 -1
@@ -1,420 +1,625 @@
1
1
  import MockWebSocket from "jest-websocket-mock";
2
+ import { rest } from "msw";
2
3
  import { Headers, Request } from "undici";
3
4
  import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
4
- import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
5
5
  import { mockConsoleMethods } from "./helpers/mock-console";
6
+ import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
6
7
  import { useMockIsTTY } from "./helpers/mock-istty";
8
+ import { createFetchResult, msw, mswSucessScriptHandlers } from "./helpers/msw";
7
9
  import { runInTempDir } from "./helpers/run-in-tmp";
8
10
  import { runWrangler } from "./helpers/run-wrangler";
9
- import type { TailEventMessage, RequestEvent, ScheduledEvent } from "../tail";
11
+ import type {
12
+ TailEventMessage,
13
+ RequestEvent,
14
+ ScheduledEvent,
15
+ AlarmEvent,
16
+ EmailEvent,
17
+ } from "../tail/createTail";
18
+ import type { RequestInit } from "undici";
10
19
  import type WebSocket from "ws";
11
20
 
12
21
  describe("tail", () => {
13
- runInTempDir();
14
- mockAccountId();
15
- mockApiToken();
16
-
17
- const std = mockConsoleMethods();
18
-
19
- afterEach(() => {
20
- mockWebSockets.forEach((ws) => ws.close());
21
- mockWebSockets.splice(0);
22
- unsetAllMocks();
23
- });
24
-
25
- /**
26
- * Interaction with the tailing API, including tail creation,
27
- * deletion, and connection.
28
- */
29
- describe("API interaction", () => {
30
- it("creates and then delete tails", async () => {
31
- const api = mockWebsocketAPIs();
32
- expect(api.requests.creation.count).toStrictEqual(0);
33
-
34
- await runWrangler("tail test-worker");
35
-
36
- await expect(api.ws.connected).resolves.toBeTruthy();
37
- expect(api.requests.creation.count).toStrictEqual(1);
38
- expect(api.requests.deletion.count).toStrictEqual(0);
39
-
40
- api.ws.close();
41
- expect(api.requests.deletion.count).toStrictEqual(1);
42
- });
43
-
44
- it("creates and then delete tails: legacy envs", async () => {
45
- const api = mockWebsocketAPIs("some-env", true);
46
- expect(api.requests.creation.count).toStrictEqual(0);
47
-
48
- await runWrangler("tail test-worker --env some-env --legacy-env true");
49
-
50
- await expect(api.ws.connected).resolves.toBeTruthy();
51
- expect(api.requests.creation.count).toStrictEqual(1);
52
- expect(api.requests.deletion.count).toStrictEqual(0);
53
-
54
- api.ws.close();
55
- expect(api.requests.deletion.count).toStrictEqual(1);
56
- });
57
-
58
- it("creates and then delete tails: service envs", async () => {
59
- const api = mockWebsocketAPIs("some-env");
60
- expect(api.requests.creation.count).toStrictEqual(0);
61
-
62
- await runWrangler("tail test-worker --env some-env --legacy-env false");
63
-
64
- await expect(api.ws.connected).resolves.toBeTruthy();
65
- expect(api.requests.creation.count).toStrictEqual(1);
66
- expect(api.requests.deletion.count).toStrictEqual(0);
67
-
68
- api.ws.close();
69
- expect(api.requests.deletion.count).toStrictEqual(1);
70
- });
71
-
72
- it("errors when the websocket closes unexpectedly", async () => {
73
- const api = mockWebsocketAPIs();
74
- api.ws.close();
75
-
76
- await expect(runWrangler("tail test-worker")).rejects.toThrow();
77
- });
78
-
79
- it("activates debug mode when the cli arg is passed in", async () => {
80
- const api = mockWebsocketAPIs();
81
- await runWrangler("tail test-worker --debug");
82
- await expect(api.nextMessageJson()).resolves.toHaveProperty(
83
- "debug",
84
- true
85
- );
86
- });
87
- });
88
-
89
- describe("filtering", () => {
90
- it("sends sampling rate filters", async () => {
91
- const api = mockWebsocketAPIs();
92
- const tooHigh = runWrangler("tail test-worker --sampling-rate 10");
93
- await expect(tooHigh).rejects.toThrow();
94
-
95
- const tooLow = runWrangler("tail test-worker --sampling-rate -5");
96
- await expect(tooLow).rejects.toThrow();
97
-
98
- await runWrangler("tail test-worker --sampling-rate 0.25");
99
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
100
- { sampling_rate: 0.25 },
101
- ]);
102
- });
103
-
104
- it("sends single status filters", async () => {
105
- const api = mockWebsocketAPIs();
106
- await runWrangler("tail test-worker --status error");
107
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
108
- { outcome: ["exception", "exceededCpu", "unknown"] },
109
- ]);
110
- });
111
-
112
- it("sends multiple status filters", async () => {
113
- const api = mockWebsocketAPIs();
114
- await runWrangler("tail test-worker --status error --status canceled");
115
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
116
- { outcome: ["exception", "exceededCpu", "unknown", "canceled"] },
117
- ]);
118
- });
119
-
120
- it("sends single HTTP method filters", async () => {
121
- const api = mockWebsocketAPIs();
122
- await runWrangler("tail test-worker --method POST");
123
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
124
- { method: ["POST"] },
125
- ]);
126
- });
127
-
128
- it("sends multiple HTTP method filters", async () => {
129
- const api = mockWebsocketAPIs();
130
- await runWrangler("tail test-worker --method POST --method GET");
131
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
132
- { method: ["POST", "GET"] },
133
- ]);
134
- });
135
-
136
- it("sends header filters without a query", async () => {
137
- const api = mockWebsocketAPIs();
138
- await runWrangler("tail test-worker --header X-CUSTOM-HEADER");
139
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
140
- { header: { key: "X-CUSTOM-HEADER" } },
141
- ]);
142
- });
143
-
144
- it("sends header filters with a query", async () => {
145
- const api = mockWebsocketAPIs();
146
- await runWrangler("tail test-worker --header X-CUSTOM-HEADER:some-value");
147
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
148
- { header: { key: "X-CUSTOM-HEADER", query: "some-value" } },
149
- ]);
150
- });
151
-
152
- it("sends single IP filters", async () => {
153
- const api = mockWebsocketAPIs();
154
- const fakeIp = "192.0.2.1";
155
-
156
- await runWrangler(`tail test-worker --ip ${fakeIp}`);
157
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
158
- { client_ip: [fakeIp] },
159
- ]);
160
- });
161
-
162
- it("sends multiple IP filters", async () => {
163
- const api = mockWebsocketAPIs();
164
- const fakeIp = "192.0.2.1";
165
-
166
- await runWrangler(`tail test-worker --ip ${fakeIp} --ip self`);
167
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
168
- { client_ip: [fakeIp, "self"] },
169
- ]);
170
- });
171
-
172
- it("sends search filters", async () => {
173
- const api = mockWebsocketAPIs();
174
- const search = "filterMe";
175
-
176
- await runWrangler(`tail test-worker --search ${search}`);
177
- await expect(api.nextMessageJson()).resolves.toHaveProperty("filters", [
178
- { query: search },
179
- ]);
180
- });
181
-
182
- it("sends everything but the kitchen sink", async () => {
183
- const api = mockWebsocketAPIs();
184
- const sampling_rate = 0.69;
185
- const status = ["ok", "error"];
186
- const method = ["GET", "POST", "PUT"];
187
- const header = "X-HELLO:world";
188
- const client_ip = ["192.0.2.1", "self"];
189
- const query = "onlyTheseMessagesPlease";
190
-
191
- const cliFilters =
192
- `--sampling-rate ${sampling_rate} ` +
193
- status.map((s) => `--status ${s} `).join("") +
194
- method.map((m) => `--method ${m} `).join("") +
195
- `--header ${header} ` +
196
- client_ip.map((c) => `--ip ${c} `).join("") +
197
- `--search ${query} ` +
198
- `--debug`;
199
-
200
- const expectedWebsocketMessage = {
201
- filters: [
202
- { sampling_rate },
203
- { outcome: ["ok", "exception", "exceededCpu", "unknown"] },
204
- { method },
205
- { header: { key: "X-HELLO", query: "world" } },
206
- { client_ip },
207
- { query },
208
- ],
209
- debug: true,
210
- };
211
-
212
- await runWrangler(`tail test-worker ${cliFilters}`);
213
- await expect(api.nextMessageJson()).resolves.toEqual(
214
- expectedWebsocketMessage
215
- );
216
- });
217
- });
218
-
219
- describe("printing", () => {
220
- const { setIsTTY } = useMockIsTTY();
221
-
222
- it("logs request messages in JSON format", async () => {
223
- const api = mockWebsocketAPIs();
224
- await runWrangler("tail test-worker --format json");
225
-
226
- const event = generateMockRequestEvent();
227
- const message = generateMockEventMessage({ event });
228
- const serializedMessage = serialize(message);
229
-
230
- api.ws.send(serializedMessage);
231
- expect(std.out).toMatch(deserializeToJson(serializedMessage));
232
- });
233
-
234
- it("logs scheduled messages in JSON format", async () => {
235
- const api = mockWebsocketAPIs();
236
- await runWrangler("tail test-worker --format json");
237
-
238
- const event = generateMockScheduledEvent();
239
- const message = generateMockEventMessage({ event });
240
- const serializedMessage = serialize(message);
241
-
242
- api.ws.send(serializedMessage);
243
- expect(std.out).toMatch(deserializeToJson(serializedMessage));
244
- });
245
-
246
- it("logs request messages in pretty format", async () => {
247
- const api = mockWebsocketAPIs();
248
- await runWrangler("tail test-worker --format pretty");
249
-
250
- const event = generateMockRequestEvent();
251
- const message = generateMockEventMessage({ event });
252
- const serializedMessage = serialize(message);
253
-
254
- api.ws.send(serializedMessage);
255
- expect(
256
- std.out
257
- .replace(
258
- new Date(mockEventTimestamp).toLocaleString(),
259
- "[mock event timestamp]"
260
- )
261
- .replace(
262
- mockTailExpiration.toLocaleString(),
263
- "[mock expiration date]"
264
- )
265
- ).toMatchInlineSnapshot(`
266
- "Successfully created tail, expires at [mock expiration date]
267
- Connected to test-worker, waiting for logs...
268
- GET https://example.org/ - Ok @ [mock event timestamp]"
269
- `);
270
- });
271
-
272
- it("logs scheduled messages in pretty format", async () => {
273
- const api = mockWebsocketAPIs();
274
- await runWrangler("tail test-worker --format pretty");
275
-
276
- const event = generateMockScheduledEvent();
277
- const message = generateMockEventMessage({ event });
278
- const serializedMessage = serialize(message);
279
-
280
- api.ws.send(serializedMessage);
281
- expect(
282
- std.out
283
- .replace(
284
- new Date(mockEventTimestamp).toLocaleString(),
285
- "[mock timestamp string]"
286
- )
287
- .replace(
288
- mockTailExpiration.toLocaleString(),
289
- "[mock expiration date]"
290
- )
291
- ).toMatchInlineSnapshot(`
292
- "Successfully created tail, expires at [mock expiration date]
293
- Connected to test-worker, waiting for logs...
294
- \\"* * * * *\\" @ [mock timestamp string] - Ok"
295
- `);
296
- });
297
-
298
- it("should not crash when the tail message has a void event", async () => {
299
- const api = mockWebsocketAPIs();
300
- await runWrangler("tail test-worker --format pretty");
301
-
302
- const message = generateMockEventMessage({ event: null });
303
- const serializedMessage = serialize(message);
304
-
305
- api.ws.send(serializedMessage);
306
- expect(
307
- std.out
308
- .replace(
309
- new Date(mockEventTimestamp).toLocaleString(),
310
- "[mock timestamp string]"
311
- )
312
- .replace(
313
- mockTailExpiration.toLocaleString(),
314
- "[mock expiration date]"
315
- )
316
- ).toMatchInlineSnapshot(`
317
- "Successfully created tail, expires at [mock expiration date]
318
- Connected to test-worker, waiting for logs...
319
- [missing request] - Ok @ [mock timestamp string]"
320
- `);
321
- });
322
-
323
- it("defaults to logging in pretty format when the output is a TTY", async () => {
324
- setIsTTY(true);
325
- const api = mockWebsocketAPIs();
326
- await runWrangler("tail test-worker");
327
-
328
- const event = generateMockRequestEvent();
329
- const message = generateMockEventMessage({ event });
330
- const serializedMessage = serialize(message);
331
-
332
- api.ws.send(serializedMessage);
333
- expect(
334
- std.out
335
- .replace(
336
- new Date(mockEventTimestamp).toLocaleString(),
337
- "[mock event timestamp]"
338
- )
339
- .replace(
340
- mockTailExpiration.toLocaleString(),
341
- "[mock expiration date]"
342
- )
343
- ).toMatchInlineSnapshot(`
344
- "Successfully created tail, expires at [mock expiration date]
345
- Connected to test-worker, waiting for logs...
346
- GET https://example.org/ - Ok @ [mock event timestamp]"
347
- `);
348
- });
349
-
350
- it("defaults to logging in json format when the output is not a TTY", async () => {
351
- setIsTTY(false);
352
-
353
- const api = mockWebsocketAPIs();
354
- await runWrangler("tail test-worker");
355
-
356
- const event = generateMockRequestEvent();
357
- const message = generateMockEventMessage({ event });
358
- const serializedMessage = serialize(message);
359
-
360
- api.ws.send(serializedMessage);
361
- expect(std.out).toMatch(deserializeToJson(serializedMessage));
362
- });
363
-
364
- it("logs console messages and exceptions", async () => {
365
- setIsTTY(true);
366
- const api = mockWebsocketAPIs();
367
- await runWrangler("tail test-worker");
368
-
369
- const event = generateMockRequestEvent();
370
- const message = generateMockEventMessage({
371
- event,
372
- logs: [
373
- { message: ["some string"], level: "log", timestamp: 1234561 },
374
- {
375
- message: [{ complex: "object" }],
376
- level: "log",
377
- timestamp: 1234562,
378
- },
379
- { message: [1234], level: "error", timestamp: 1234563 },
380
- ],
381
- exceptions: [
382
- { name: "Error", message: "some error", timestamp: 1234564 },
383
- { name: "Error", message: { complex: "error" }, timestamp: 1234564 },
384
- ],
385
- });
386
- const serializedMessage = serialize(message);
387
-
388
- api.ws.send(serializedMessage);
389
- expect(
390
- std.out
391
- .replace(
392
- new Date(mockEventTimestamp).toLocaleString(),
393
- "[mock event timestamp]"
394
- )
395
- .replace(
396
- mockTailExpiration.toLocaleString(),
397
- "[mock expiration date]"
398
- )
399
- ).toMatchInlineSnapshot(`
400
- "Successfully created tail, expires at [mock expiration date]
401
- Connected to test-worker, waiting for logs...
402
- GET https://example.org/ - Ok @ [mock event timestamp]
403
- (log) some string
404
- (log) { complex: 'object' }
405
- (error) 1234"
406
- `);
407
- expect(std.err).toMatchInlineSnapshot(`
408
- "X [ERROR]  Error: some error
409
-
410
-
411
- X [ERROR]  Error: { complex: 'error' }
412
-
413
- "
414
- `);
415
- expect(std.warn).toMatchInlineSnapshot(`""`);
416
- });
417
- });
22
+ beforeEach(() => msw.use(...mswSucessScriptHandlers));
23
+ runInTempDir();
24
+ mockAccountId();
25
+ mockApiToken();
26
+
27
+ const std = mockConsoleMethods();
28
+
29
+ afterEach(() => {
30
+ mockWebSockets.forEach((ws) => ws.close());
31
+ mockWebSockets.splice(0);
32
+ clearDialogs();
33
+ });
34
+
35
+ /**
36
+ * Interaction with the tailing API, including tail creation,
37
+ * deletion, and connection.
38
+ */
39
+ describe("API interaction", () => {
40
+ const { setIsTTY } = useMockIsTTY();
41
+ it("should throw an error if name isn't provided", async () => {
42
+ await expect(
43
+ runWrangler("tail")
44
+ ).rejects.toThrowErrorMatchingInlineSnapshot(
45
+ `"Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`wrangler tail <worker-name>\`"`
46
+ );
47
+ });
48
+ it("warns about durable object restarts for tty", async () => {
49
+ setIsTTY(true);
50
+ mockConfirm({
51
+ text: "Would you like to continue?",
52
+ result: false,
53
+ });
54
+ const api = mockWebsocketAPIs();
55
+ expect(api.requests.creation.length).toStrictEqual(0);
56
+ await runWrangler("tail durable-object--websocket--response");
57
+ expect(std.out).toMatchInlineSnapshot(`""`);
58
+ expect(std.warn).toMatchInlineSnapshot(`
59
+ "▲ [WARNING] Beginning log collection requires restarting the Durable Objects associated with durable-object--websocket--response. Any WebSocket connections or other non-persisted state will be lost as part of this restart.
60
+
61
+ "
62
+ `);
63
+ expect(std.err).toMatchInlineSnapshot(`""`);
64
+ });
65
+ it("creates and then delete tails", async () => {
66
+ const api = mockWebsocketAPIs();
67
+ expect(api.requests.creation.length).toStrictEqual(0);
68
+
69
+ await runWrangler("tail test-worker");
70
+
71
+ await expect(api.ws.connected).resolves.toBeTruthy();
72
+ expect(api.requests.creation.length).toStrictEqual(1);
73
+ expect(api.requests.deletion.count).toStrictEqual(0);
74
+
75
+ await api.closeHelper();
76
+ expect(api.requests.deletion.count).toStrictEqual(1);
77
+ });
78
+ it("should connect to the worker assigned to a given route", async () => {
79
+ const api = mockWebsocketAPIs();
80
+ expect(api.requests.creation.length).toStrictEqual(0);
81
+
82
+ msw.use(
83
+ rest.get(`*/zones`, (req, res, ctx) => {
84
+ expect(req.url.searchParams.get("name")).toBe("example.com");
85
+ return res.once(
86
+ ctx.status(200),
87
+ ctx.json({
88
+ success: true,
89
+ errors: [],
90
+ messages: [],
91
+ result: [{ id: "test-zone" }],
92
+ })
93
+ );
94
+ })
95
+ );
96
+ msw.use(
97
+ rest.get(`*/zones/:zoneId/workers/routes`, (req, res, ctx) => {
98
+ return res.once(
99
+ ctx.status(200),
100
+ ctx.json({
101
+ success: true,
102
+ errors: [],
103
+ messages: [],
104
+ result: [
105
+ {
106
+ pattern: "example.com/*",
107
+ script: "test-worker",
108
+ },
109
+ ],
110
+ })
111
+ );
112
+ })
113
+ );
114
+ await runWrangler("tail example.com/*");
115
+
116
+ await expect(api.ws.connected).resolves.toBeTruthy();
117
+ expect(api.requests.creation.length).toStrictEqual(1);
118
+ expect(api.requests.deletion.count).toStrictEqual(0);
119
+
120
+ await api.closeHelper();
121
+ expect(api.requests.deletion.count).toStrictEqual(1);
122
+ });
123
+
124
+ it("should error if a given route is not assigned to the user's zone", async () => {
125
+ msw.use(
126
+ rest.get(`*/zones`, (req, res, ctx) => {
127
+ expect(req.url.searchParams.get("name")).toBe("example.com");
128
+ return res.once(
129
+ ctx.status(200),
130
+ ctx.json({
131
+ success: true,
132
+ errors: [],
133
+ messages: [],
134
+ result: [{ id: "test-zone" }],
135
+ })
136
+ );
137
+ })
138
+ );
139
+ msw.use(
140
+ rest.get(`*/zones/:zoneId/workers/routes`, (req, res, ctx) => {
141
+ return res.once(
142
+ ctx.status(200),
143
+ ctx.json({
144
+ success: true,
145
+ errors: [],
146
+ messages: [],
147
+ result: [],
148
+ })
149
+ );
150
+ })
151
+ );
152
+
153
+ await expect(runWrangler("tail example.com/*")).rejects.toThrow();
154
+ });
155
+ it("should error if a given route is not within the user's zone", async () => {
156
+ msw.use(
157
+ rest.get(`*/zones`, (req, res, ctx) => {
158
+ expect(req.url.searchParams.get("name")).toBe("example.com");
159
+ return res.once(
160
+ ctx.status(200),
161
+ ctx.json({
162
+ success: true,
163
+ errors: [],
164
+ messages: [],
165
+ result: [],
166
+ })
167
+ );
168
+ })
169
+ );
170
+
171
+ await expect(runWrangler("tail example.com/*")).rejects.toThrow();
172
+ });
173
+
174
+ it("creates and then delete tails: legacy envs", async () => {
175
+ const api = mockWebsocketAPIs("some-env", true);
176
+ expect(api.requests.creation.length).toStrictEqual(0);
177
+
178
+ await runWrangler("tail test-worker --env some-env --legacy-env true");
179
+
180
+ await expect(api.ws.connected).resolves.toBeTruthy();
181
+ expect(api.requests.creation.length).toStrictEqual(1);
182
+ expect(api.requests.deletion.count).toStrictEqual(0);
183
+
184
+ await api.closeHelper();
185
+ expect(api.requests.deletion.count).toStrictEqual(1);
186
+ });
187
+
188
+ it("creates and then delete tails: service envs", async () => {
189
+ const api = mockWebsocketAPIs("some-env");
190
+ expect(api.requests.creation.length).toStrictEqual(0);
191
+
192
+ await runWrangler("tail test-worker --env some-env --legacy-env false");
193
+
194
+ await expect(api.ws.connected).resolves.toBeTruthy();
195
+ expect(api.requests.creation.length).toStrictEqual(1);
196
+ expect(api.requests.deletion.count).toStrictEqual(0);
197
+
198
+ await api.closeHelper();
199
+ expect(api.requests.deletion.count).toStrictEqual(1);
200
+ });
201
+
202
+ it("errors when the websocket closes unexpectedly", async () => {
203
+ const api = mockWebsocketAPIs();
204
+ await api.closeHelper();
205
+
206
+ await expect(runWrangler("tail test-worker")).rejects.toThrow();
207
+ });
208
+
209
+ it("activates debug mode when the cli arg is passed in", async () => {
210
+ const api = mockWebsocketAPIs();
211
+ await runWrangler("tail test-worker --debug");
212
+ await expect(api.nextMessageJson()).resolves.toHaveProperty(
213
+ "debug",
214
+ true
215
+ );
216
+ });
217
+ });
218
+
219
+ describe("filtering", () => {
220
+ it("sends sampling rate filters", async () => {
221
+ const api = mockWebsocketAPIs();
222
+ const tooHigh = runWrangler("tail test-worker --sampling-rate 10");
223
+ await expect(tooHigh).rejects.toThrow();
224
+
225
+ const tooLow = runWrangler("tail test-worker --sampling-rate -5");
226
+ await expect(tooLow).rejects.toThrow();
227
+
228
+ await runWrangler("tail test-worker --sampling-rate 0.25");
229
+
230
+ expect(api.requests.creation[0]).toEqual({
231
+ filters: [{ sampling_rate: 0.25 }],
232
+ });
233
+ });
234
+
235
+ it("sends single status filters", async () => {
236
+ const api = mockWebsocketAPIs();
237
+ await runWrangler("tail test-worker --status error");
238
+ expect(api.requests.creation[0]).toEqual({
239
+ filters: [
240
+ {
241
+ outcome: ["exception", "exceededCpu", "exceededMemory", "unknown"],
242
+ },
243
+ ],
244
+ });
245
+ });
246
+
247
+ it("sends multiple status filters", async () => {
248
+ const api = mockWebsocketAPIs();
249
+ await runWrangler("tail test-worker --status error --status canceled");
250
+ expect(api.requests.creation[0]).toEqual({
251
+ filters: [
252
+ {
253
+ outcome: [
254
+ "exception",
255
+ "exceededCpu",
256
+ "exceededMemory",
257
+ "unknown",
258
+ "canceled",
259
+ ],
260
+ },
261
+ ],
262
+ });
263
+ });
264
+
265
+ it("sends single HTTP method filters", async () => {
266
+ const api = mockWebsocketAPIs();
267
+ await runWrangler("tail test-worker --method POST");
268
+ expect(api.requests.creation[0]).toEqual({
269
+ filters: [{ method: ["POST"] }],
270
+ });
271
+ });
272
+
273
+ it("sends multiple HTTP method filters", async () => {
274
+ const api = mockWebsocketAPIs();
275
+ await runWrangler("tail test-worker --method POST --method GET");
276
+ expect(api.requests.creation[0]).toEqual({
277
+ filters: [{ method: ["POST", "GET"] }],
278
+ });
279
+ });
280
+
281
+ it("sends header filters without a query", async () => {
282
+ const api = mockWebsocketAPIs();
283
+ await runWrangler("tail test-worker --header X-CUSTOM-HEADER");
284
+ expect(api.requests.creation[0]).toEqual({
285
+ filters: [{ header: { key: "X-CUSTOM-HEADER" } }],
286
+ });
287
+ });
288
+
289
+ it("sends header filters with a query", async () => {
290
+ const api = mockWebsocketAPIs();
291
+ await runWrangler("tail test-worker --header X-CUSTOM-HEADER:some-value");
292
+ expect(api.requests.creation[0]).toEqual({
293
+ filters: [{ header: { key: "X-CUSTOM-HEADER", query: "some-value" } }],
294
+ });
295
+ });
296
+
297
+ it("sends single IP filters", async () => {
298
+ const api = mockWebsocketAPIs();
299
+ const fakeIp = "192.0.2.1";
300
+
301
+ await runWrangler(`tail test-worker --ip ${fakeIp}`);
302
+ expect(api.requests.creation[0]).toEqual({
303
+ filters: [{ client_ip: [fakeIp] }],
304
+ });
305
+ });
306
+
307
+ it("sends multiple IP filters", async () => {
308
+ const api = mockWebsocketAPIs();
309
+ const fakeIp = "192.0.2.1";
310
+
311
+ await runWrangler(`tail test-worker --ip ${fakeIp} --ip self`);
312
+ expect(api.requests.creation[0]).toEqual({
313
+ filters: [{ client_ip: [fakeIp, "self"] }],
314
+ });
315
+ });
316
+
317
+ it("sends search filters", async () => {
318
+ const api = mockWebsocketAPIs();
319
+ const search = "filterMe";
320
+
321
+ await runWrangler(`tail test-worker --search ${search}`);
322
+ expect(api.requests.creation[0]).toEqual({
323
+ filters: [{ query: search }],
324
+ });
325
+ });
326
+
327
+ it("sends everything but the kitchen sink", async () => {
328
+ const api = mockWebsocketAPIs();
329
+ const sampling_rate = 0.69;
330
+ const status = ["ok", "error"];
331
+ const method = ["GET", "POST", "PUT"];
332
+ const header = "X-HELLO:world";
333
+ const client_ip = ["192.0.2.1", "self"];
334
+ const query = "onlyTheseMessagesPlease";
335
+
336
+ const cliFilters =
337
+ `--sampling-rate ${sampling_rate} ` +
338
+ status.map((s) => `--status ${s} `).join("") +
339
+ method.map((m) => `--method ${m} `).join("") +
340
+ `--header ${header} ` +
341
+ client_ip.map((c) => `--ip ${c} `).join("") +
342
+ `--search ${query} ` +
343
+ `--debug`;
344
+
345
+ const expectedWebsocketMessage = {
346
+ filters: [
347
+ { sampling_rate: 0.69 },
348
+ {
349
+ outcome: [
350
+ "ok",
351
+ "exception",
352
+ "exceededCpu",
353
+ "exceededMemory",
354
+ "unknown",
355
+ ],
356
+ },
357
+ { method: ["GET", "POST", "PUT"] },
358
+ { header: { key: "X-HELLO", query: "world" } },
359
+ { client_ip: ["192.0.2.1", "self"] },
360
+ { query: "onlyTheseMessagesPlease" },
361
+ ],
362
+ };
363
+
364
+ await runWrangler(`tail test-worker ${cliFilters}`);
365
+ expect(api.requests.creation[0]).toEqual(expectedWebsocketMessage);
366
+ });
367
+ });
368
+
369
+ describe("printing", () => {
370
+ const { setIsTTY } = useMockIsTTY();
371
+
372
+ it("logs request messages in JSON format", async () => {
373
+ const api = mockWebsocketAPIs();
374
+ await runWrangler("tail test-worker --format json");
375
+
376
+ const event = generateMockRequestEvent();
377
+ const message = generateMockEventMessage({ event });
378
+ const serializedMessage = serialize(message);
379
+
380
+ api.ws.send(serializedMessage);
381
+ expect(std.out).toMatch(deserializeToJson(serializedMessage));
382
+ });
383
+
384
+ it("logs scheduled messages in JSON format", async () => {
385
+ const api = mockWebsocketAPIs();
386
+ await runWrangler("tail test-worker --format json");
387
+
388
+ const event = generateMockScheduledEvent();
389
+ const message = generateMockEventMessage({ event });
390
+ const serializedMessage = serialize(message);
391
+
392
+ api.ws.send(serializedMessage);
393
+ expect(std.out).toMatch(deserializeToJson(serializedMessage));
394
+ });
395
+
396
+ it("logs alarm messages in json format", async () => {
397
+ const api = mockWebsocketAPIs();
398
+ await runWrangler("tail test-worker --format json");
399
+
400
+ const event = generateMockAlarmEvent();
401
+ const message = generateMockEventMessage({ event });
402
+ const serializedMessage = serialize(message);
403
+
404
+ api.ws.send(serializedMessage);
405
+ expect(std.out).toMatch(deserializeToJson(serializedMessage));
406
+ });
407
+
408
+ it("logs email messages in json format", async () => {
409
+ const api = mockWebsocketAPIs();
410
+ await runWrangler("tail test-worker --format json");
411
+
412
+ const event = generateMockEmailEvent();
413
+ const message = generateMockEventMessage({ event });
414
+ const serializedMessage = serialize(message);
415
+
416
+ api.ws.send(serializedMessage);
417
+ expect(std.out).toMatch(deserializeToJson(serializedMessage));
418
+ });
419
+
420
+ it("logs request messages in pretty format", async () => {
421
+ const api = mockWebsocketAPIs();
422
+ await runWrangler("tail test-worker --format pretty");
423
+
424
+ const event = generateMockRequestEvent();
425
+ const message = generateMockEventMessage({ event });
426
+ const serializedMessage = serialize(message);
427
+
428
+ api.ws.send(serializedMessage);
429
+ expect(
430
+ std.out
431
+ .replace(
432
+ new Date(mockEventTimestamp).toLocaleString(),
433
+ "[mock event timestamp]"
434
+ )
435
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
436
+ ).toMatchInlineSnapshot(`
437
+ "Successfully created tail, expires at [mock expiration date]
438
+ Connected to test-worker, waiting for logs...
439
+ GET https://example.org/ - Ok @ [mock event timestamp]"
440
+ `);
441
+ });
442
+
443
+ it("logs scheduled messages in pretty format", async () => {
444
+ const api = mockWebsocketAPIs();
445
+ await runWrangler("tail test-worker --format pretty");
446
+
447
+ const event = generateMockScheduledEvent();
448
+ const message = generateMockEventMessage({ event });
449
+ const serializedMessage = serialize(message);
450
+
451
+ api.ws.send(serializedMessage);
452
+ expect(
453
+ std.out
454
+ .replace(
455
+ new Date(mockEventTimestamp).toLocaleString(),
456
+ "[mock timestamp string]"
457
+ )
458
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
459
+ ).toMatchInlineSnapshot(`
460
+ "Successfully created tail, expires at [mock expiration date]
461
+ Connected to test-worker, waiting for logs...
462
+ \\"* * * * *\\" @ [mock timestamp string] - Ok"
463
+ `);
464
+ });
465
+
466
+ it("logs alarm messages in pretty format", async () => {
467
+ const api = mockWebsocketAPIs();
468
+ await runWrangler("tail test-worker --format pretty");
469
+
470
+ const event = generateMockAlarmEvent();
471
+ const message = generateMockEventMessage({ event });
472
+ const serializedMessage = serialize(message);
473
+
474
+ api.ws.send(serializedMessage);
475
+ expect(
476
+ std.out
477
+ .replace(
478
+ new Date(mockEventScheduledTime).toLocaleString(),
479
+ "[mock scheduled time]"
480
+ )
481
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
482
+ ).toMatchInlineSnapshot(`
483
+ "Successfully created tail, expires at [mock expiration date]
484
+ Connected to test-worker, waiting for logs...
485
+ Alarm @ [mock scheduled time] - Ok"
486
+ `);
487
+ });
488
+
489
+ it("logs email messages in pretty format", async () => {
490
+ const api = mockWebsocketAPIs();
491
+ await runWrangler("tail test-worker --format pretty");
492
+
493
+ const event = generateMockEmailEvent();
494
+ const message = generateMockEventMessage({ event });
495
+ const serializedMessage = serialize(message);
496
+
497
+ api.ws.send(serializedMessage);
498
+ expect(
499
+ std.out
500
+ .replace(
501
+ new Date(mockEventTimestamp).toLocaleString(),
502
+ "[mock event timestamp]"
503
+ )
504
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
505
+ ).toMatchInlineSnapshot(`
506
+ "Successfully created tail, expires at [mock expiration date]
507
+ Connected to test-worker, waiting for logs...
508
+ Email from:${mockEmailEventFrom} to:${mockEmailEventTo} size:${mockEmailEventSize} @ [mock event timestamp] - Ok"
509
+ `);
510
+ });
511
+
512
+ it("should not crash when the tail message has a void event", async () => {
513
+ const api = mockWebsocketAPIs();
514
+ await runWrangler("tail test-worker --format pretty");
515
+
516
+ const message = generateMockEventMessage({ event: null });
517
+ const serializedMessage = serialize(message);
518
+
519
+ api.ws.send(serializedMessage);
520
+ expect(
521
+ std.out
522
+ .replace(
523
+ new Date(mockEventTimestamp).toLocaleString(),
524
+ "[mock timestamp string]"
525
+ )
526
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
527
+ ).toMatchInlineSnapshot(`
528
+ "Successfully created tail, expires at [mock expiration date]
529
+ Connected to test-worker, waiting for logs...
530
+ Unknown Event - Ok @ [mock timestamp string]"
531
+ `);
532
+ });
533
+
534
+ it("defaults to logging in pretty format when the output is a TTY", async () => {
535
+ setIsTTY(true);
536
+ const api = mockWebsocketAPIs();
537
+ await runWrangler("tail test-worker");
538
+
539
+ const event = generateMockRequestEvent();
540
+ const message = generateMockEventMessage({ event });
541
+ const serializedMessage = serialize(message);
542
+
543
+ api.ws.send(serializedMessage);
544
+ expect(
545
+ std.out
546
+ .replace(
547
+ new Date(mockEventTimestamp).toLocaleString(),
548
+ "[mock event timestamp]"
549
+ )
550
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
551
+ ).toMatchInlineSnapshot(`
552
+ "Successfully created tail, expires at [mock expiration date]
553
+ Connected to test-worker, waiting for logs...
554
+ GET https://example.org/ - Ok @ [mock event timestamp]"
555
+ `);
556
+ });
557
+
558
+ it("defaults to logging in json format when the output is not a TTY", async () => {
559
+ setIsTTY(false);
560
+
561
+ const api = mockWebsocketAPIs();
562
+ await runWrangler("tail test-worker");
563
+
564
+ const event = generateMockRequestEvent();
565
+ const message = generateMockEventMessage({ event });
566
+ const serializedMessage = serialize(message);
567
+
568
+ api.ws.send(serializedMessage);
569
+ expect(std.out).toMatch(deserializeToJson(serializedMessage));
570
+ });
571
+
572
+ it("logs console messages and exceptions", async () => {
573
+ setIsTTY(true);
574
+ const api = mockWebsocketAPIs();
575
+ await runWrangler("tail test-worker");
576
+
577
+ const event = generateMockRequestEvent();
578
+ const message = generateMockEventMessage({
579
+ event,
580
+ logs: [
581
+ { message: ["some string"], level: "log", timestamp: 1234561 },
582
+ {
583
+ message: [{ complex: "object" }],
584
+ level: "log",
585
+ timestamp: 1234562,
586
+ },
587
+ { message: [1234], level: "error", timestamp: 1234563 },
588
+ ],
589
+ exceptions: [
590
+ { name: "Error", message: "some error", timestamp: 1234564 },
591
+ { name: "Error", message: { complex: "error" }, timestamp: 1234564 },
592
+ ],
593
+ });
594
+ const serializedMessage = serialize(message);
595
+
596
+ api.ws.send(serializedMessage);
597
+ expect(
598
+ std.out
599
+ .replace(
600
+ new Date(mockEventTimestamp).toLocaleString(),
601
+ "[mock event timestamp]"
602
+ )
603
+ .replace(mockTailExpiration.toISOString(), "[mock expiration date]")
604
+ ).toMatchInlineSnapshot(`
605
+ "Successfully created tail, expires at [mock expiration date]
606
+ Connected to test-worker, waiting for logs...
607
+ GET https://example.org/ - Ok @ [mock event timestamp]
608
+ (log) some string
609
+ (log) { complex: 'object' }
610
+ (error) 1234"
611
+ `);
612
+ expect(std.err).toMatchInlineSnapshot(`
613
+ "X [ERROR]  Error: some error
614
+
615
+
616
+ X [ERROR]  Error: { complex: 'error' }
617
+
618
+ "
619
+ `);
620
+ expect(std.warn).toMatchInlineSnapshot(`""`);
621
+ });
622
+ });
418
623
  });
419
624
 
420
625
  /* helpers */
@@ -429,45 +634,51 @@ describe("tail", () => {
429
634
  * @returns the same type we expect when deserializing in wrangler
430
635
  */
431
636
  function serialize(message: TailEventMessage): WebSocket.RawData {
432
- if (isScheduled(message.event)) {
433
- // `ScheduledEvent`s work just fine
434
- const stringified = JSON.stringify(message);
435
- return Buffer.from(stringified, "utf-8");
436
- } else {
437
- // Since the "properties" of an `undici.Request` are actually getters,
438
- // which don't serialize properly, we need to hydrate them manually.
439
- // This isn't a problem outside of testing since deserialization
440
- // works just fine and wrangler never _sends_ any event messages,
441
- // it only receives them.
442
- const request = ((message.event as RequestEvent | undefined | null) || {})
443
- .request;
444
- const stringified = JSON.stringify(message, (key, value) => {
445
- if (key !== "request") {
446
- return value;
447
- }
448
-
449
- return {
450
- ...request,
451
- url: request?.url,
452
- headers: request?.headers,
453
- method: request?.method,
454
- };
455
- });
456
-
457
- return Buffer.from(stringified, "utf-8");
458
- }
637
+ if (!isRequest(message.event)) {
638
+ // `ScheduledEvent`s and `TailEvent`s work just fine
639
+ const stringified = JSON.stringify(message);
640
+ return Buffer.from(stringified, "utf-8");
641
+ } else {
642
+ // Since the "properties" of an `undici.Request` are actually getters,
643
+ // which don't serialize properly, we need to hydrate them manually.
644
+ // This isn't a problem outside of testing since deserialization
645
+ // works just fine and wrangler never _sends_ any event messages,
646
+ // it only receives them.
647
+ const request = ((message.event as RequestEvent | undefined | null) || {})
648
+ .request;
649
+ const stringified = JSON.stringify(message, (key, value) => {
650
+ if (key !== "request") {
651
+ return value;
652
+ }
653
+
654
+ return {
655
+ ...request,
656
+ url: request?.url,
657
+ headers: request?.headers,
658
+ method: request?.method,
659
+ };
660
+ });
661
+
662
+ return Buffer.from(stringified, "utf-8");
663
+ }
459
664
  }
460
665
 
461
666
  /**
462
667
  * Small helper to disambiguate the event types possible in a `TailEventMessage`
463
668
  *
464
669
  * @param event A TailEvent
465
- * @returns whether event is a ScheduledEvent (true) or a RequestEvent
670
+ * @returns true if `event` is a RequestEvent
466
671
  */
467
- function isScheduled(
468
- event: ScheduledEvent | RequestEvent | undefined | null
469
- ): event is ScheduledEvent {
470
- return Boolean(event && "cron" in event);
672
+ function isRequest(
673
+ event:
674
+ | ScheduledEvent
675
+ | RequestEvent
676
+ | AlarmEvent
677
+ | EmailEvent
678
+ | undefined
679
+ | null
680
+ ): event is RequestEvent {
681
+ return Boolean(event && "request" in event);
471
682
  }
472
683
 
473
684
  /**
@@ -479,7 +690,7 @@ function isScheduled(
479
690
  * @returns a string ready to be printed to the terminal or compared against
480
691
  */
481
692
  function deserializeToJson(message: WebSocket.RawData): string {
482
- return JSON.stringify(JSON.parse(message.toString()), null, 2);
693
+ return JSON.stringify(JSON.parse(message.toString()), null, 2);
483
694
  }
484
695
 
485
696
  /**
@@ -487,12 +698,13 @@ function deserializeToJson(message: WebSocket.RawData): string {
487
698
  * when running `wrangler tail`
488
699
  */
489
700
  type MockAPI = {
490
- requests: {
491
- creation: RequestCounter;
492
- deletion: RequestCounter;
493
- };
494
- ws: MockWebSocket;
495
- nextMessageJson(): Promise<unknown>;
701
+ requests: {
702
+ creation: RequestInit[];
703
+ deletion: RequestCounter;
704
+ };
705
+ ws: MockWebSocket;
706
+ nextMessageJson(): Promise<unknown>;
707
+ closeHelper: () => Promise<void>;
496
708
  };
497
709
 
498
710
  /**
@@ -501,7 +713,7 @@ type MockAPI = {
501
713
  * the correct API calls without actually sending any web traffic
502
714
  */
503
715
  type RequestCounter = {
504
- count: number;
716
+ count: number;
505
717
  };
506
718
 
507
719
  /**
@@ -511,34 +723,39 @@ type RequestCounter = {
511
723
  * @returns a `RequestCounter` for counting how many times the API is hit
512
724
  */
513
725
  function mockCreateTailRequest(
514
- websocketURL: string,
515
- env?: string,
516
- legacyEnv = false
517
- ): RequestCounter {
518
- const requests = { count: 0 };
519
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
520
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
521
- setMockResponse(
522
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/tails`,
523
- "POST",
524
- ([_url, accountId, scriptName, envName]) => {
525
- requests.count++;
526
- expect(accountId).toEqual("some-account-id");
527
- expect(scriptName).toEqual(
528
- legacyEnv && env ? `test-worker-${env}` : "test-worker"
529
- );
530
- if (!legacyEnv) {
531
- expect(envName).toEqual(env);
532
- }
533
- return {
534
- id: "tail-id",
535
- url: websocketURL,
536
- expires_at: mockTailExpiration,
537
- };
538
- }
539
- );
540
-
541
- return requests;
726
+ websocketURL: string,
727
+ env?: string,
728
+ legacyEnv = false,
729
+ expectedScriptName = legacyEnv && env ? `test-worker-${env}` : "test-worker"
730
+ ): RequestInit[] {
731
+ const requests: RequestInit[] = [];
732
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
733
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
734
+ msw.use(
735
+ rest.post(
736
+ `*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/tails`,
737
+ async (req, res, ctx) => {
738
+ const request = await req.json();
739
+ requests.push(request);
740
+ expect(req.params.accountId).toEqual("some-account-id");
741
+ expect(req.params.scriptName).toEqual(expectedScriptName);
742
+ if (!legacyEnv) {
743
+ expect(req.params.envName).toEqual(env);
744
+ }
745
+ return res.once(
746
+ ctx.json(
747
+ createFetchResult({
748
+ url: websocketURL,
749
+ id: "tail-id",
750
+ expires_at: mockTailExpiration,
751
+ })
752
+ )
753
+ );
754
+ }
755
+ )
756
+ );
757
+
758
+ return requests;
542
759
  }
543
760
 
544
761
  /**
@@ -551,43 +768,58 @@ const mockTailExpiration = new Date(3005, 1);
551
768
  */
552
769
  const mockEventTimestamp = 1645454470467;
553
770
 
771
+ /**
772
+ * Default value for event time ISO strings
773
+ */
774
+ const mockEventScheduledTime = new Date(mockEventTimestamp).toISOString();
775
+
776
+ /**
777
+ * Default value for email event from
778
+ */
779
+ const mockEmailEventFrom = "from@example.com";
780
+
781
+ /**
782
+ * Default value for email event to
783
+ */
784
+ const mockEmailEventTo = "to@example.com";
785
+
786
+ /**
787
+ * Default value for email event mail size
788
+ */
789
+ const mockEmailEventSize = 45416;
790
+
554
791
  /**
555
792
  * Mock out the API hit during Tail deletion
556
793
  *
557
794
  * @returns a `RequestCounter` for counting how many times the API is hit
558
795
  */
559
796
  function mockDeleteTailRequest(
560
- env?: string,
561
- legacyEnv = false
797
+ env?: string,
798
+ legacyEnv = false,
799
+ expectedScriptName = legacyEnv && env ? `test-worker-${env}` : "test-worker"
562
800
  ): RequestCounter {
563
- const requests = { count: 0 };
564
- const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
565
- const environment = env && !legacyEnv ? "/environments/:envName" : "";
566
- setMockResponse(
567
- // "/accounts/:accountId/workers/scripts/:worker/tails",
568
- `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/tails/:tailId`,
569
- "DELETE",
570
- ([_url, accountId, scriptName, envNameOrTailId, tailId]) => {
571
- requests.count++;
572
- expect(accountId).toEqual("some-account-id");
573
- expect(scriptName).toEqual(
574
- legacyEnv && env ? `test-worker-${env}` : "test-worker"
575
- );
576
- if (!legacyEnv) {
577
- if (env) {
578
- expect(envNameOrTailId).toEqual(env);
579
- expect(tailId).toEqual("tail-id");
580
- } else {
581
- expect(envNameOrTailId).toEqual("tail-id");
582
- }
583
- } else {
584
- expect(envNameOrTailId).toEqual("tail-id");
585
- }
586
- return null;
587
- }
588
- );
589
-
590
- return requests;
801
+ const requests = { count: 0 };
802
+ const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
803
+ const environment = env && !legacyEnv ? "/environments/:envName" : "";
804
+ msw.use(
805
+ rest.delete(
806
+ `*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/tails/:tailId`,
807
+ async (req, res, ctx) => {
808
+ requests.count++;
809
+ expect(req.params.accountId).toEqual("some-account-id");
810
+ expect(req.params.scriptName).toEqual(expectedScriptName);
811
+ if (!legacyEnv) {
812
+ if (env) {
813
+ expect(req.params.tailId).toEqual("tail-id");
814
+ }
815
+ }
816
+ expect(req.params.tailId).toEqual("tail-id");
817
+ return res(ctx.json(createFetchResult(null)));
818
+ }
819
+ )
820
+ );
821
+
822
+ return requests;
591
823
  }
592
824
 
593
825
  const mockWebSockets: MockWebSocket[] = [];
@@ -599,31 +831,53 @@ const mockWebSockets: MockWebSocket[] = [];
599
831
  * @param websocketURL a fake websocket URL for wrangler to connect to
600
832
  * @returns a mocked-out version of the API
601
833
  */
602
- function mockWebsocketAPIs(env?: string, legacyEnv = false): MockAPI {
603
- const websocketURL = "ws://localhost:1234";
604
- const api: MockAPI = {
605
- requests: {
606
- deletion: { count: 0 },
607
- creation: { count: 0 },
608
- },
609
- // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
610
- ws: null!, // will be set in the `beforeEach()` below.
611
-
612
- /**
613
- * Parse the next message received by the mock websocket as JSON
614
- * @returns JSON.parse of the next message received by the websocket
615
- */
616
- async nextMessageJson() {
617
- const message = await api.ws.nextMessage;
618
- return JSON.parse(message as string);
619
- },
620
- };
621
- api.requests.creation = mockCreateTailRequest(websocketURL, env, legacyEnv);
622
- api.requests.deletion = mockDeleteTailRequest(env, legacyEnv);
623
- api.ws = new MockWebSocket(websocketURL);
624
- mockWebSockets.push(api.ws);
625
-
626
- return api;
834
+ function mockWebsocketAPIs(
835
+ env?: string,
836
+ legacyEnv = false,
837
+ expectedScriptName?: string
838
+ ): MockAPI {
839
+ const websocketURL = "ws://localhost:1234";
840
+ const api: MockAPI = {
841
+ requests: {
842
+ deletion: { count: 0 },
843
+ creation: [],
844
+ },
845
+ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
846
+ ws: null!, // will be set in the `beforeEach()` below.
847
+
848
+ /**
849
+ * Parse the next message received by the mock websocket as JSON
850
+ * @returns JSON.parse of the next message received by the websocket
851
+ */
852
+ async nextMessageJson() {
853
+ const message = await api.ws.nextMessage;
854
+ return JSON.parse(message as string);
855
+ },
856
+ /**
857
+ * Close the mock websocket and clean up the API.
858
+ * The setTimeout forces a cycle to allow for closing and cleanup
859
+ * @returns a Promise that resolves when the websocket is closed
860
+ */
861
+ async closeHelper() {
862
+ api.ws.close();
863
+ await new Promise((resolve) => setTimeout(resolve, 0));
864
+ },
865
+ };
866
+ api.requests.creation = mockCreateTailRequest(
867
+ websocketURL,
868
+ env,
869
+ legacyEnv,
870
+ expectedScriptName
871
+ );
872
+ api.requests.deletion = mockDeleteTailRequest(
873
+ env,
874
+ legacyEnv,
875
+ expectedScriptName
876
+ );
877
+ api.ws = new MockWebSocket(websocketURL);
878
+ mockWebSockets.push(api.ws);
879
+
880
+ return api;
627
881
  }
628
882
 
629
883
  /**
@@ -634,19 +888,19 @@ function mockWebsocketAPIs(env?: string, legacyEnv = false): MockAPI {
634
888
  * @returns a `TailEventMessage` that wrangler can process and display
635
889
  */
636
890
  function generateMockEventMessage({
637
- outcome = "ok",
638
- exceptions = [],
639
- logs = [],
640
- eventTimestamp = mockEventTimestamp,
641
- event = generateMockRequestEvent(),
891
+ outcome = "ok",
892
+ exceptions = [],
893
+ logs = [],
894
+ eventTimestamp = mockEventTimestamp,
895
+ event = generateMockRequestEvent(),
642
896
  }: Partial<TailEventMessage>): TailEventMessage {
643
- return {
644
- outcome,
645
- exceptions,
646
- logs,
647
- eventTimestamp,
648
- event,
649
- };
897
+ return {
898
+ outcome,
899
+ exceptions,
900
+ logs,
901
+ eventTimestamp,
902
+ event,
903
+ };
650
904
  }
651
905
 
652
906
  /**
@@ -657,34 +911,48 @@ function generateMockEventMessage({
657
911
  * @returns a `RequestEvent` that can be used within an `EventMessage`
658
912
  */
659
913
  function generateMockRequestEvent(
660
- opts?: Partial<RequestEvent["request"]>
914
+ opts?: Partial<RequestEvent["request"]>
661
915
  ): RequestEvent {
662
- return {
663
- request: Object.assign(
664
- new Request(opts?.url || "https://example.org/", {
665
- method: opts?.method || "GET",
666
- headers:
667
- opts?.headers || new Headers({ "X-EXAMPLE-HEADER": "some_value" }),
668
- }),
669
- {
670
- cf: opts?.cf || {
671
- tlsCipher: "AEAD-ENCRYPT-O-MATIC-SHA",
672
- tlsVersion: "TLSv2.0",
673
- asn: 42069,
674
- colo: "ATL",
675
- httpProtocol: "HTTP/4",
676
- asOrganization: "Cloudflare",
677
- },
678
- }
679
- ),
680
- };
916
+ return {
917
+ request: Object.assign(
918
+ new Request(opts?.url || "https://example.org/", {
919
+ method: opts?.method || "GET",
920
+ headers:
921
+ opts?.headers || new Headers({ "X-EXAMPLE-HEADER": "some_value" }),
922
+ }),
923
+ {
924
+ cf: opts?.cf || {
925
+ tlsCipher: "AEAD-ENCRYPT-O-MATIC-SHA",
926
+ tlsVersion: "TLSv2.0",
927
+ asn: 42069,
928
+ colo: "ATL",
929
+ httpProtocol: "HTTP/4",
930
+ asOrganization: "Cloudflare",
931
+ },
932
+ }
933
+ ),
934
+ };
681
935
  }
682
936
 
683
937
  function generateMockScheduledEvent(
684
- opts?: Partial<ScheduledEvent>
938
+ opts?: Partial<ScheduledEvent>
685
939
  ): ScheduledEvent {
686
- return {
687
- cron: opts?.cron || "* * * * *",
688
- scheduledTime: opts?.scheduledTime || mockEventTimestamp,
689
- };
940
+ return {
941
+ cron: opts?.cron || "* * * * *",
942
+ scheduledTime: opts?.scheduledTime || mockEventTimestamp,
943
+ };
944
+ }
945
+
946
+ function generateMockAlarmEvent(opts?: Partial<AlarmEvent>): AlarmEvent {
947
+ return {
948
+ scheduledTime: opts?.scheduledTime || mockEventScheduledTime,
949
+ };
950
+ }
951
+
952
+ function generateMockEmailEvent(opts?: Partial<EmailEvent>): EmailEvent {
953
+ return {
954
+ mailFrom: opts?.mailFrom || mockEmailEventFrom,
955
+ rcptTo: opts?.rcptTo || mockEmailEventTo,
956
+ rawSize: opts?.rawSize || mockEmailEventSize,
957
+ };
690
958
  }