wrangler 0.0.0-e1c2f5b9 → 0.0.0-e1d50407

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