wrangler 0.0.0-e6e1daba → 0.0.0-e72a5794

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 (299) hide show
  1. package/README.md +10 -12
  2. package/bin/wrangler.js +10 -76
  3. package/package.json +19 -18
  4. package/templates/__tests__/tsconfig.json +1 -1
  5. package/templates/checked-fetch.js +10 -3
  6. package/templates/facade.d.ts +4 -1
  7. package/templates/gitignore +1 -0
  8. package/templates/middleware/common.ts +9 -4
  9. package/templates/middleware/loader-modules.ts +64 -11
  10. package/templates/middleware/loader-sw.ts +2 -7
  11. package/templates/middleware/middleware-d1-beta.d.ts +3 -0
  12. package/templates/{d1-beta-facade.js → middleware/middleware-d1-beta.ts} +87 -84
  13. package/templates/middleware/middleware-miniflare3-json-error.ts +17 -5
  14. package/templates/middleware/middleware-multiworker-dev.d.ts +4 -0
  15. package/templates/middleware/middleware-multiworker-dev.ts +59 -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/new-worker-scheduled.ts +1 -1
  19. package/templates/new-worker.ts +1 -1
  20. package/templates/pages-dev-util.ts +4 -1
  21. package/templates/pages-shim.ts +0 -3
  22. package/templates/pages-template-plugin.ts +12 -2
  23. package/templates/pages-template-worker.ts +11 -2
  24. package/templates/tsconfig.init.json +1 -2
  25. package/templates/tsconfig.json +1 -1
  26. package/wrangler-dist/cli.d.ts +192 -87
  27. package/wrangler-dist/cli.js +76158 -78596
  28. package/import_meta_url.js +0 -3
  29. package/miniflare-config-stubs/.env.empty +0 -0
  30. package/miniflare-config-stubs/package.empty.json +0 -1
  31. package/miniflare-config-stubs/wrangler.empty.toml +0 -0
  32. package/miniflare-dist/index.mjs +0 -6368
  33. package/src/__tests__/access.test.ts +0 -25
  34. package/src/__tests__/api-dev.test.ts +0 -238
  35. package/src/__tests__/api-devregistry.test.js +0 -64
  36. package/src/__tests__/api.test.ts +0 -80
  37. package/src/__tests__/config-cache-without-cache-dir.test.ts +0 -38
  38. package/src/__tests__/config-cache.test.ts +0 -42
  39. package/src/__tests__/configuration.test.ts +0 -4233
  40. package/src/__tests__/d1/d1.test.ts +0 -82
  41. package/src/__tests__/d1/execute.test.ts +0 -64
  42. package/src/__tests__/d1/migrate.test.ts +0 -155
  43. package/src/__tests__/d1/splitter.test.ts +0 -255
  44. package/src/__tests__/delete.test.ts +0 -266
  45. package/src/__tests__/deployments.test.ts +0 -129
  46. package/src/__tests__/dev.test.tsx +0 -1587
  47. package/src/__tests__/generate.test.ts +0 -238
  48. package/src/__tests__/get-host-from-url.test.ts +0 -16
  49. package/src/__tests__/guess-worker-format.test.ts +0 -120
  50. package/src/__tests__/helpers/clipboardy-mock.js +0 -4
  51. package/src/__tests__/helpers/cmd-shim.d.ts +0 -11
  52. package/src/__tests__/helpers/end-event-loop.ts +0 -6
  53. package/src/__tests__/helpers/mock-account-id.ts +0 -48
  54. package/src/__tests__/helpers/mock-auth-domain.ts +0 -20
  55. package/src/__tests__/helpers/mock-bin.ts +0 -36
  56. package/src/__tests__/helpers/mock-console.ts +0 -106
  57. package/src/__tests__/helpers/mock-dialogs.ts +0 -139
  58. package/src/__tests__/helpers/mock-get-pages-upload-token.ts +0 -25
  59. package/src/__tests__/helpers/mock-get-zone-from-host.ts +0 -11
  60. package/src/__tests__/helpers/mock-http-server.ts +0 -46
  61. package/src/__tests__/helpers/mock-istty.ts +0 -74
  62. package/src/__tests__/helpers/mock-known-routes.ts +0 -12
  63. package/src/__tests__/helpers/mock-kv.ts +0 -46
  64. package/src/__tests__/helpers/mock-oauth-flow.ts +0 -263
  65. package/src/__tests__/helpers/mock-process.ts +0 -34
  66. package/src/__tests__/helpers/mock-set-timeout.ts +0 -16
  67. package/src/__tests__/helpers/mock-stdin.ts +0 -108
  68. package/src/__tests__/helpers/mock-web-socket.ts +0 -29
  69. package/src/__tests__/helpers/msw/blob-worker.cjs +0 -19
  70. package/src/__tests__/helpers/msw/handlers/access.ts +0 -13
  71. package/src/__tests__/helpers/msw/handlers/deployments.ts +0 -93
  72. package/src/__tests__/helpers/msw/handlers/namespaces.ts +0 -81
  73. package/src/__tests__/helpers/msw/handlers/oauth.ts +0 -31
  74. package/src/__tests__/helpers/msw/handlers/r2.ts +0 -60
  75. package/src/__tests__/helpers/msw/handlers/script.ts +0 -56
  76. package/src/__tests__/helpers/msw/handlers/user.ts +0 -52
  77. package/src/__tests__/helpers/msw/handlers/zones.ts +0 -20
  78. package/src/__tests__/helpers/msw/index.ts +0 -50
  79. package/src/__tests__/helpers/msw/read-file-sync.js +0 -61
  80. package/src/__tests__/helpers/run-in-tmp.ts +0 -38
  81. package/src/__tests__/helpers/run-wrangler.ts +0 -16
  82. package/src/__tests__/helpers/string-dynamic-values-matcher.ts +0 -28
  83. package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +0 -1
  84. package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +0 -5
  85. package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +0 -1
  86. package/src/__tests__/helpers/worker-scripts/parent-worker.js +0 -8
  87. package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +0 -5
  88. package/src/__tests__/helpers/write-worker-source.ts +0 -31
  89. package/src/__tests__/helpers/write-wrangler-toml.ts +0 -17
  90. package/src/__tests__/https-options.test.ts +0 -163
  91. package/src/__tests__/index.test.ts +0 -274
  92. package/src/__tests__/init.test.ts +0 -3164
  93. package/src/__tests__/jest.setup.ts +0 -175
  94. package/src/__tests__/kv.test.ts +0 -1799
  95. package/src/__tests__/logger.test.ts +0 -141
  96. package/src/__tests__/logout.test.ts +0 -47
  97. package/src/__tests__/metrics.test.ts +0 -493
  98. package/src/__tests__/middleware.scheduled.test.ts +0 -145
  99. package/src/__tests__/middleware.test.ts +0 -815
  100. package/src/__tests__/mtls-certificates.test.ts +0 -585
  101. package/src/__tests__/package-manager.test.ts +0 -353
  102. package/src/__tests__/pages/deployment-list.test.ts +0 -78
  103. package/src/__tests__/pages/functions-build.test.ts +0 -402
  104. package/src/__tests__/pages/pages.test.ts +0 -81
  105. package/src/__tests__/pages/project-create.test.ts +0 -63
  106. package/src/__tests__/pages/project-list.test.ts +0 -108
  107. package/src/__tests__/pages/project-upload.test.ts +0 -481
  108. package/src/__tests__/pages/publish.test.ts +0 -2745
  109. package/src/__tests__/pages-deployment-tail.test.ts +0 -955
  110. package/src/__tests__/parse.test.ts +0 -436
  111. package/src/__tests__/paths.test.ts +0 -39
  112. package/src/__tests__/publish.test.ts +0 -8167
  113. package/src/__tests__/pubsub.test.ts +0 -493
  114. package/src/__tests__/queues.test.ts +0 -529
  115. package/src/__tests__/r2.test.ts +0 -374
  116. package/src/__tests__/route.test.ts +0 -45
  117. package/src/__tests__/secret.test.ts +0 -693
  118. package/src/__tests__/tail.test.ts +0 -958
  119. package/src/__tests__/test-old-node-version.js +0 -31
  120. package/src/__tests__/tsconfig-sanity.ts +0 -12
  121. package/src/__tests__/tsconfig.json +0 -8
  122. package/src/__tests__/tsconfig.tsbuildinfo +0 -1
  123. package/src/__tests__/type-generation.test.ts +0 -233
  124. package/src/__tests__/user.test.ts +0 -118
  125. package/src/__tests__/utils-collectKeyValues.test.ts +0 -47
  126. package/src/__tests__/validate-dev-props.test.ts +0 -56
  127. package/src/__tests__/version.test.ts +0 -35
  128. package/src/__tests__/whoami.test.tsx +0 -172
  129. package/src/__tests__/worker-namespace.test.ts +0 -339
  130. package/src/abort.d.ts +0 -3
  131. package/src/api/dev.ts +0 -328
  132. package/src/api/index.ts +0 -11
  133. package/src/api/mtls-certificate.ts +0 -148
  134. package/src/api/pages/create-worker-bundle-contents.ts +0 -75
  135. package/src/api/pages/index.ts +0 -5
  136. package/src/api/pages/publish.tsx +0 -368
  137. package/src/bundle-reporter.ts +0 -68
  138. package/src/bundle.ts +0 -877
  139. package/src/cfetch/index.ts +0 -158
  140. package/src/cfetch/internal.ts +0 -258
  141. package/src/cli.ts +0 -28
  142. package/src/config/README.md +0 -107
  143. package/src/config/config.ts +0 -282
  144. package/src/config/diagnostics.ts +0 -80
  145. package/src/config/environment.ts +0 -586
  146. package/src/config/index.ts +0 -375
  147. package/src/config/validation-helpers.ts +0 -597
  148. package/src/config/validation.ts +0 -2198
  149. package/src/config-cache.ts +0 -85
  150. package/src/create-worker-preview.ts +0 -293
  151. package/src/create-worker-upload-form.ts +0 -334
  152. package/src/d1/backups.tsx +0 -215
  153. package/src/d1/constants.ts +0 -2
  154. package/src/d1/create.tsx +0 -64
  155. package/src/d1/delete.ts +0 -53
  156. package/src/d1/execute.tsx +0 -354
  157. package/src/d1/formatTimeAgo.ts +0 -14
  158. package/src/d1/index.ts +0 -100
  159. package/src/d1/list.tsx +0 -60
  160. package/src/d1/migrations/apply.tsx +0 -206
  161. package/src/d1/migrations/create.tsx +0 -76
  162. package/src/d1/migrations/helpers.ts +0 -172
  163. package/src/d1/migrations/index.ts +0 -3
  164. package/src/d1/migrations/list.tsx +0 -92
  165. package/src/d1/migrations/options.ts +0 -23
  166. package/src/d1/options.ts +0 -22
  167. package/src/d1/splitter.ts +0 -161
  168. package/src/d1/types.ts +0 -25
  169. package/src/d1/utils.ts +0 -49
  170. package/src/delete.ts +0 -100
  171. package/src/deployments.ts +0 -116
  172. package/src/deprecated/index.ts +0 -144
  173. package/src/dev/dev-vars.ts +0 -39
  174. package/src/dev/dev.tsx +0 -600
  175. package/src/dev/get-local-persistence-path.ts +0 -31
  176. package/src/dev/local.tsx +0 -922
  177. package/src/dev/remote.tsx +0 -632
  178. package/src/dev/start-server.ts +0 -538
  179. package/src/dev/use-esbuild.ts +0 -205
  180. package/src/dev/validate-dev-props.ts +0 -31
  181. package/src/dev-registry.ts +0 -201
  182. package/src/dev.tsx +0 -914
  183. package/src/dialogs.ts +0 -136
  184. package/src/dispatch-namespace.ts +0 -211
  185. package/src/docs/index.ts +0 -97
  186. package/src/durable.ts +0 -102
  187. package/src/entry.ts +0 -327
  188. package/src/environment-variables/factory.ts +0 -88
  189. package/src/environment-variables/misc-variables.ts +0 -30
  190. package/src/errors.ts +0 -11
  191. package/src/generate/index.ts +0 -298
  192. package/src/git-client.ts +0 -135
  193. package/src/global-wrangler-config-path.ts +0 -26
  194. package/src/https-options.ts +0 -127
  195. package/src/index.ts +0 -705
  196. package/src/init.ts +0 -1022
  197. package/src/inspect.ts +0 -782
  198. package/src/intl-polyfill.d.ts +0 -139
  199. package/src/is-ci.ts +0 -14
  200. package/src/is-interactive.ts +0 -16
  201. package/src/jest.d.ts +0 -4
  202. package/src/kv/helpers.ts +0 -430
  203. package/src/kv/index.ts +0 -594
  204. package/src/logger.ts +0 -104
  205. package/src/metrics/index.ts +0 -5
  206. package/src/metrics/metrics-config.ts +0 -239
  207. package/src/metrics/metrics-dispatcher.ts +0 -96
  208. package/src/metrics/metrics-usage-headers.ts +0 -24
  209. package/src/metrics/send-event.ts +0 -98
  210. package/src/miniflare-cli/README.md +0 -30
  211. package/src/miniflare-cli/assets.ts +0 -251
  212. package/src/miniflare-cli/index.ts +0 -210
  213. package/src/miniflare-cli/request-context.ts +0 -40
  214. package/src/miniflare-cli/tsconfig.json +0 -9
  215. package/src/miniflare-cli/tsconfig.tsbuildinfo +0 -1
  216. package/src/miniflare-cli/types.ts +0 -11
  217. package/src/module-collection.ts +0 -267
  218. package/src/mtls-certificate/cli.ts +0 -155
  219. package/src/open-in-browser.ts +0 -17
  220. package/src/package-manager.ts +0 -219
  221. package/src/pages/build.ts +0 -232
  222. package/src/pages/buildFunctions.ts +0 -130
  223. package/src/pages/constants.ts +0 -18
  224. package/src/pages/deployment-tails.ts +0 -281
  225. package/src/pages/deployments.tsx +0 -86
  226. package/src/pages/dev.ts +0 -716
  227. package/src/pages/errors.ts +0 -66
  228. package/src/pages/functions/buildPlugin.ts +0 -90
  229. package/src/pages/functions/buildWorker.ts +0 -288
  230. package/src/pages/functions/filepath-routing.test.ts +0 -234
  231. package/src/pages/functions/filepath-routing.ts +0 -189
  232. package/src/pages/functions/identifiers.ts +0 -78
  233. package/src/pages/functions/routes-consolidation.test.ts +0 -250
  234. package/src/pages/functions/routes-consolidation.ts +0 -73
  235. package/src/pages/functions/routes-transformation.test.ts +0 -282
  236. package/src/pages/functions/routes-transformation.ts +0 -115
  237. package/src/pages/functions/routes-validation.test.ts +0 -403
  238. package/src/pages/functions/routes-validation.ts +0 -202
  239. package/src/pages/functions/routes.ts +0 -151
  240. package/src/pages/functions/tsconfig.json +0 -8
  241. package/src/pages/functions/tsconfig.tsbuildinfo +0 -1
  242. package/src/pages/functions.ts +0 -86
  243. package/src/pages/hash.ts +0 -13
  244. package/src/pages/index.ts +0 -102
  245. package/src/pages/projects.tsx +0 -162
  246. package/src/pages/prompt-select-project.tsx +0 -31
  247. package/src/pages/publish.tsx +0 -276
  248. package/src/pages/types.ts +0 -46
  249. package/src/pages/upload.tsx +0 -449
  250. package/src/pages/utils.ts +0 -23
  251. package/src/parse.ts +0 -308
  252. package/src/paths.ts +0 -71
  253. package/src/proxy.ts +0 -694
  254. package/src/publish/index.ts +0 -274
  255. package/src/publish/publish.ts +0 -1065
  256. package/src/pubsub/index.ts +0 -286
  257. package/src/pubsub/pubsub-commands.ts +0 -623
  258. package/src/queues/cli/commands/consumer/add.ts +0 -65
  259. package/src/queues/cli/commands/consumer/index.ts +0 -19
  260. package/src/queues/cli/commands/consumer/remove.ts +0 -31
  261. package/src/queues/cli/commands/create.ts +0 -25
  262. package/src/queues/cli/commands/delete.ts +0 -26
  263. package/src/queues/cli/commands/index.ts +0 -35
  264. package/src/queues/cli/commands/list.ts +0 -25
  265. package/src/queues/client.ts +0 -135
  266. package/src/queues/utils.ts +0 -18
  267. package/src/r2/constants.ts +0 -4
  268. package/src/r2/helpers.ts +0 -132
  269. package/src/r2/index.ts +0 -289
  270. package/src/routes.ts +0 -140
  271. package/src/secret/index.ts +0 -375
  272. package/src/selfsigned.d.ts +0 -29
  273. package/src/sites.ts +0 -372
  274. package/src/tail/createTail.ts +0 -406
  275. package/src/tail/filters.ts +0 -277
  276. package/src/tail/index.ts +0 -211
  277. package/src/tail/printing.ts +0 -122
  278. package/src/tsconfig-sanity.ts +0 -16
  279. package/src/type-generation.ts +0 -181
  280. package/src/update-check.ts +0 -19
  281. package/src/user/access.ts +0 -68
  282. package/src/user/auth-variables.ts +0 -113
  283. package/src/user/choose-account.tsx +0 -39
  284. package/src/user/generate-auth-url.ts +0 -33
  285. package/src/user/generate-random-state.ts +0 -16
  286. package/src/user/index.ts +0 -2
  287. package/src/user/user.ts +0 -1233
  288. package/src/utils/collectKeyValues.ts +0 -14
  289. package/src/whoami.ts +0 -135
  290. package/src/worker.ts +0 -257
  291. package/src/yargs-types.ts +0 -37
  292. package/src/zones.ts +0 -191
  293. package/templates/__tests__/tsconfig.tsbuildinfo +0 -1
  294. package/templates/first-party-worker-module-facade.ts +0 -19
  295. package/templates/format-dev-errors.ts +0 -34
  296. package/templates/serve-static-assets.ts +0 -66
  297. package/templates/service-bindings-module-facade.js +0 -55
  298. package/templates/service-bindings-sw-facade.js +0 -42
  299. package/templates/tsconfig.tsbuildinfo +0 -1
@@ -1,141 +0,0 @@
1
- import { logger } from "../logger";
2
- import { mockConsoleMethods } from "./helpers/mock-console";
3
-
4
- describe("logger", () => {
5
- const std = mockConsoleMethods();
6
-
7
- it("should add colored markers to error and warning messages", () => {
8
- logger.loggerLevel = "debug";
9
- logger.debug("This is a debug message");
10
- logger.log("This is a log message");
11
- logger.warn("This is a warn message");
12
- logger.error("This is a error message");
13
-
14
- expect(std.debug).toMatchInlineSnapshot(`"This is a debug message"`);
15
- expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
16
- expect(std.warn).toMatchInlineSnapshot(`
17
- "▲ [WARNING] This is a warn message
18
-
19
- "
20
- `);
21
- expect(std.err).toMatchInlineSnapshot(`
22
- "X [ERROR] This is a error message
23
-
24
- "
25
- `);
26
- });
27
-
28
- describe("loggerLevel=debug", () => {
29
- it("should render messages that are at or above the log level set in the logger", () => {
30
- logger.loggerLevel = "debug";
31
- logger.debug("This is a debug message");
32
- logger.log("This is a log message");
33
- logger.warn("This is a warn message");
34
- logger.error("This is a error message");
35
-
36
- expect(std.debug).toMatchInlineSnapshot(`"This is a debug message"`);
37
- expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
38
- expect(std.warn).toMatchInlineSnapshot(`
39
- "▲ [WARNING] This is a warn message
40
-
41
- "
42
- `);
43
- expect(std.err).toMatchInlineSnapshot(`
44
- "X [ERROR] This is a error message
45
-
46
- "
47
- `);
48
- });
49
- });
50
-
51
- describe("loggerLevel=log", () => {
52
- it("should render messages that are at or above the log level set in the logger", () => {
53
- logger.loggerLevel = "log";
54
- logger.debug("This is a debug message");
55
- logger.log("This is a log message");
56
- logger.warn("This is a warn message");
57
- logger.error("This is a error message");
58
-
59
- expect(std.debug).toMatchInlineSnapshot(`""`);
60
- expect(std.out).toMatchInlineSnapshot(`"This is a log message"`);
61
- expect(std.warn).toMatchInlineSnapshot(`
62
- "▲ [WARNING] This is a warn message
63
-
64
- "
65
- `);
66
- expect(std.err).toMatchInlineSnapshot(`
67
- "X [ERROR] This is a error message
68
-
69
- "
70
- `);
71
- });
72
- });
73
-
74
- describe("loggerLevel=warn", () => {
75
- it("should render messages that are at or above the log level set in the logger", () => {
76
- logger.loggerLevel = "warn";
77
- logger.debug("This is a debug message");
78
- logger.log("This is a log message");
79
- logger.warn("This is a warn message");
80
- logger.error("This is a error message");
81
-
82
- expect(std.debug).toMatchInlineSnapshot(`""`);
83
- expect(std.out).toMatchInlineSnapshot(`""`);
84
- expect(std.warn).toMatchInlineSnapshot(`
85
- "▲ [WARNING] This is a warn message
86
-
87
- "
88
- `);
89
- expect(std.err).toMatchInlineSnapshot(`
90
- "X [ERROR] This is a error message
91
-
92
- "
93
- `);
94
- });
95
- });
96
-
97
- describe("loggerLevel=error", () => {
98
- it("should render messages that are at or above the log level set in the logger", () => {
99
- logger.loggerLevel = "error";
100
- logger.debug("This is a debug message");
101
- logger.log("This is a log message");
102
- logger.warn("This is a warn message");
103
- logger.error("This is a error message");
104
-
105
- expect(std.debug).toMatchInlineSnapshot(`""`);
106
- expect(std.out).toMatchInlineSnapshot(`""`);
107
- expect(std.warn).toMatchInlineSnapshot(`""`);
108
- expect(std.err).toMatchInlineSnapshot(`
109
- "X [ERROR] This is a error message
110
-
111
- "
112
- `);
113
- });
114
- });
115
-
116
- describe("loggerLevelFromEnvVar=error", () => {
117
- beforeEach(() => {
118
- process.env.WRANGLER_LOG = "error";
119
- });
120
- afterEach(() => {
121
- process.env.WRANGLER_LOG = undefined;
122
- });
123
-
124
- it("should render messages that are at or above the log level set in the env var", () => {
125
- logger.loggerLevel = "error";
126
- logger.debug("This is a debug message");
127
- logger.log("This is a log message");
128
- logger.warn("This is a warn message");
129
- logger.error("This is a error message");
130
-
131
- expect(std.debug).toMatchInlineSnapshot(`""`);
132
- expect(std.out).toMatchInlineSnapshot(`""`);
133
- expect(std.warn).toMatchInlineSnapshot(`""`);
134
- expect(std.err).toMatchInlineSnapshot(`
135
- "X [ERROR] This is a error message
136
-
137
- "
138
- `);
139
- });
140
- });
141
- });
@@ -1,47 +0,0 @@
1
- import fs from "node:fs";
2
- import path from "node:path";
3
- import { rest } from "msw";
4
- import { getGlobalWranglerConfigPath } from "../global-wrangler-config-path";
5
- import { USER_AUTH_CONFIG_FILE, writeAuthConfigFile } from "../user";
6
- import { mockConsoleMethods } from "./helpers/mock-console";
7
- import { msw } from "./helpers/msw";
8
- import { runInTempDir } from "./helpers/run-in-tmp";
9
- import { runWrangler } from "./helpers/run-wrangler";
10
-
11
- describe("logout", () => {
12
- runInTempDir();
13
- const std = mockConsoleMethods();
14
-
15
- it("should exit with a message stating the user is not logged in", async () => {
16
- await runWrangler("logout");
17
- expect(std.out).toMatchInlineSnapshot(`"Not logged in, exiting..."`);
18
- });
19
-
20
- it("should logout user that has been properly logged in", async () => {
21
- writeAuthConfigFile({
22
- oauth_token: "some-oauth-tok",
23
- refresh_token: "some-refresh-tok",
24
- });
25
- // Make sure that logout removed the config file containing the auth tokens.
26
- const config = path.join(
27
- getGlobalWranglerConfigPath(),
28
- USER_AUTH_CONFIG_FILE
29
- );
30
- let counter = 0;
31
- msw.use(
32
- rest.post("*/oauth2/revoke", (_, response, context) => {
33
- // Make sure that we made the request to logout.
34
- counter += 1;
35
- return response.once(context.status(200), context.text(""));
36
- })
37
- );
38
-
39
- expect(fs.existsSync(config)).toBeTruthy();
40
-
41
- await runWrangler("logout");
42
-
43
- expect(std.out).toMatchInlineSnapshot(`"Successfully logged out."`);
44
- expect(fs.existsSync(config)).toBeFalsy();
45
- expect(counter).toBe(1);
46
- });
47
- });
@@ -1,493 +0,0 @@
1
- import { mkdirSync } from "node:fs";
2
- import { rest } from "msw";
3
- import { version as wranglerVersion } from "../../package.json";
4
- import { purgeConfigCaches, saveToConfigCache } from "../config-cache";
5
- import { CI } from "../is-ci";
6
- import { logger } from "../logger";
7
- import { getMetricsDispatcher, getMetricsConfig } from "../metrics";
8
- import {
9
- CURRENT_METRICS_DATE,
10
- readMetricsConfig,
11
- USER_ID_CACHE_PATH,
12
- writeMetricsConfig,
13
- } from "../metrics/metrics-config";
14
- import { writeAuthConfigFile } from "../user";
15
- import { mockConsoleMethods } from "./helpers/mock-console";
16
- import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
17
- import { useMockIsTTY } from "./helpers/mock-istty";
18
- import { msw, mswSuccessOauthHandlers } from "./helpers/msw";
19
- import { runInTempDir } from "./helpers/run-in-tmp";
20
-
21
- declare const global: { SPARROW_SOURCE_KEY: string | undefined };
22
-
23
- describe("metrics", () => {
24
- const ORIGINAL_SPARROW_SOURCE_KEY = global.SPARROW_SOURCE_KEY;
25
- const std = mockConsoleMethods();
26
- runInTempDir();
27
-
28
- beforeEach(() => {
29
- // Tell jest to use the original version of the `getMetricsConfig()` function in these tests.
30
- const mockMetricsConfig = jest.requireMock("../metrics/metrics-config");
31
- mockMetricsConfig.useOriginal = true;
32
- global.SPARROW_SOURCE_KEY = "MOCK_KEY";
33
- logger.loggerLevel = "debug";
34
- // Create a node_modules directory to store config-cache files
35
- mkdirSync("node_modules");
36
- });
37
- afterEach(() => {
38
- global.SPARROW_SOURCE_KEY = ORIGINAL_SPARROW_SOURCE_KEY;
39
- purgeConfigCaches();
40
- clearDialogs();
41
- });
42
-
43
- describe("getMetricsDispatcher()", () => {
44
- const MOCK_DISPATCHER_OPTIONS = {
45
- // By setting this to true we avoid the `getMetricsConfig()` logic in these tests.
46
- sendMetrics: true,
47
- offline: false,
48
- };
49
-
50
- // These tests should never hit the `/user` API endpoint.
51
- const userRequests = mockUserRequest();
52
- afterEach(() => {
53
- expect(userRequests.count).toBe(0);
54
- });
55
-
56
- describe("identify()", () => {
57
- it("should send a request to the default URL", async () => {
58
- const request = mockMetricRequest(
59
- {
60
- event: "identify",
61
- properties: {
62
- category: "Workers",
63
- wranglerVersion,
64
- os: process.platform + ":" + process.arch,
65
- a: 1,
66
- b: 2,
67
- },
68
- },
69
- { "Sparrow-Source-Key": "MOCK_KEY" },
70
- "identify"
71
- );
72
- const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
73
- await dispatcher.identify({ a: 1, b: 2 });
74
-
75
- expect(request.count).toBe(1);
76
- expect(std.debug).toMatchInlineSnapshot(
77
- `"Metrics dispatcher: Posting data {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}"`
78
- );
79
- expect(std.out).toMatchInlineSnapshot(`""`);
80
- expect(std.warn).toMatchInlineSnapshot(`""`);
81
- expect(std.err).toMatchInlineSnapshot(`""`);
82
- });
83
-
84
- it("should write a debug log if the dispatcher is disabled", async () => {
85
- const requests = mockMetricRequest({}, {}, "identify");
86
- const dispatcher = await getMetricsDispatcher({
87
- ...MOCK_DISPATCHER_OPTIONS,
88
- sendMetrics: false,
89
- });
90
- await dispatcher.identify({ a: 1, b: 2 });
91
- await flushPromises();
92
-
93
- expect(requests.count).toBe(0);
94
- expect(std.debug).toMatchInlineSnapshot(
95
- `"Metrics dispatcher: Dispatching disabled - would have sent {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}."`
96
- );
97
- expect(std.out).toMatchInlineSnapshot(`""`);
98
- expect(std.warn).toMatchInlineSnapshot(`""`);
99
- expect(std.err).toMatchInlineSnapshot(`""`);
100
- });
101
-
102
- it("should write a debug log if the request fails", async () => {
103
- msw.use(
104
- rest.post("*/identify", async (req, res) => {
105
- return res.networkError("BAD REQUEST");
106
- })
107
- );
108
-
109
- const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
110
- await dispatcher.identify({ a: 1, b: 2 });
111
- await flushPromises();
112
- expect(std.debug).toMatchInlineSnapshot(`
113
- "Metrics dispatcher: Posting data {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}
114
- Metrics dispatcher: Failed to send request: request to https://sparrow.cloudflare.com/api/v1/identify failed, reason: BAD REQUEST"
115
- `);
116
- expect(std.out).toMatchInlineSnapshot(`""`);
117
- expect(std.warn).toMatchInlineSnapshot(`""`);
118
- expect(std.err).toMatchInlineSnapshot(`""`);
119
- });
120
-
121
- it("should write a warning log if no source key has been provided", async () => {
122
- global.SPARROW_SOURCE_KEY = undefined;
123
- const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
124
- await dispatcher.identify({ a: 1, b: 2 });
125
- expect(std.debug).toMatchInlineSnapshot(
126
- `"Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events. { type: 'identify', name: 'identify', properties: { a: 1, b: 2 } }"`
127
- );
128
- expect(std.out).toMatchInlineSnapshot(`""`);
129
- expect(std.warn).toMatchInlineSnapshot(`""`);
130
- expect(std.err).toMatchInlineSnapshot(`""`);
131
- });
132
- });
133
-
134
- describe("sendEvent()", () => {
135
- it("should send a request to the default URL", async () => {
136
- const requests = mockMetricRequest(
137
- {
138
- event: "some-event",
139
- properties: {
140
- category: "Workers",
141
- wranglerVersion,
142
- os: process.platform + ":" + process.arch,
143
- a: 1,
144
- b: 2,
145
- },
146
- },
147
- {
148
- "Sparrow-Source-Key": "MOCK_KEY",
149
- },
150
- "event"
151
- );
152
- const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
153
- await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
154
-
155
- expect(requests.count).toBe(1);
156
- expect(std.debug).toMatchInlineSnapshot(
157
- `"Metrics dispatcher: Posting data {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}"`
158
- );
159
- expect(std.out).toMatchInlineSnapshot(`""`);
160
- expect(std.warn).toMatchInlineSnapshot(`""`);
161
- expect(std.err).toMatchInlineSnapshot(`""`);
162
- });
163
-
164
- it("should write a debug log if the dispatcher is disabled", async () => {
165
- const requests = mockMetricRequest({}, {}, "event");
166
-
167
- const dispatcher = await getMetricsDispatcher({
168
- ...MOCK_DISPATCHER_OPTIONS,
169
- sendMetrics: false,
170
- });
171
- await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
172
- await flushPromises();
173
-
174
- expect(requests.count).toBe(0);
175
- expect(std.debug).toMatchInlineSnapshot(
176
- `"Metrics dispatcher: Dispatching disabled - would have sent {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}."`
177
- );
178
- expect(std.out).toMatchInlineSnapshot(`""`);
179
- expect(std.warn).toMatchInlineSnapshot(`""`);
180
- expect(std.err).toMatchInlineSnapshot(`""`);
181
- });
182
-
183
- it("should write a debug log if the request fails", async () => {
184
- msw.use(
185
- rest.post("*/event", async (_, res) => {
186
- return res.networkError("BAD REQUEST");
187
- })
188
- );
189
- const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
190
- await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
191
- await flushPromises();
192
- expect(std.debug).toMatchInlineSnapshot(`
193
- "Metrics dispatcher: Posting data {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}
194
- Metrics dispatcher: Failed to send request: request to https://sparrow.cloudflare.com/api/v1/event failed, reason: BAD REQUEST"
195
- `);
196
- expect(std.out).toMatchInlineSnapshot(`""`);
197
- expect(std.warn).toMatchInlineSnapshot(`""`);
198
- expect(std.err).toMatchInlineSnapshot(`""`);
199
- });
200
-
201
- it("should write a warning log if no source key has been provided", async () => {
202
- global.SPARROW_SOURCE_KEY = undefined;
203
- const requests = mockMetricRequest({}, {}, "event");
204
- const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
205
- await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
206
-
207
- expect(requests.count).toBe(0);
208
- expect(std.debug).toMatchInlineSnapshot(
209
- `"Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events. { type: 'event', name: 'some-event', properties: { a: 1, b: 2 } }"`
210
- );
211
- expect(std.out).toMatchInlineSnapshot(`""`);
212
- expect(std.warn).toMatchInlineSnapshot(`""`);
213
- expect(std.err).toMatchInlineSnapshot(`""`);
214
- });
215
- });
216
- });
217
-
218
- describe("getMetricsConfig()", () => {
219
- let isCISpy: jest.SpyInstance;
220
-
221
- const { setIsTTY } = useMockIsTTY();
222
- beforeEach(() => {
223
- // Default the mock TTY to interactive for all these tests.
224
- setIsTTY(true);
225
- isCISpy = jest.spyOn(CI, "isCI").mockReturnValue(false);
226
- });
227
-
228
- describe("enabled", () => {
229
- const ORIGINAL_ENV = process.env;
230
- beforeEach(() => {
231
- process.env = { ...ORIGINAL_ENV };
232
- });
233
- afterEach(() => {
234
- process.env = ORIGINAL_ENV;
235
- });
236
-
237
- it("should return the WRANGLER_SEND_METRICS environment variable for enabled if it is defined", async () => {
238
- process.env.WRANGLER_SEND_METRICS = "false";
239
- expect(await getMetricsConfig({})).toMatchObject({
240
- enabled: false,
241
- });
242
- process.env.WRANGLER_SEND_METRICS = "true";
243
- expect(await getMetricsConfig({})).toMatchObject({
244
- enabled: true,
245
- });
246
- });
247
-
248
- it("should return false if running in a CI environment", async () => {
249
- isCISpy.mockReturnValue(true);
250
- expect(await getMetricsConfig({})).toMatchObject({
251
- enabled: false,
252
- });
253
- });
254
-
255
- it("should return the sendMetrics argument for enabled if it is defined", async () => {
256
- expect(
257
- await getMetricsConfig({ sendMetrics: false, offline: false })
258
- ).toMatchObject({
259
- enabled: false,
260
- });
261
- expect(
262
- await getMetricsConfig({ sendMetrics: true, offline: false })
263
- ).toMatchObject({
264
- enabled: true,
265
- });
266
- });
267
-
268
- it("should return enabled false if the process is not interactive", async () => {
269
- setIsTTY(false);
270
- expect(
271
- await getMetricsConfig({
272
- sendMetrics: undefined,
273
- offline: false,
274
- })
275
- ).toMatchObject({
276
- enabled: false,
277
- });
278
- });
279
-
280
- it("should return enabled true if the user on this device previously agreed to send metrics", async () => {
281
- await writeMetricsConfig({
282
- permission: {
283
- enabled: true,
284
- date: new Date(2022, 6, 4),
285
- },
286
- });
287
- expect(
288
- await getMetricsConfig({
289
- sendMetrics: undefined,
290
- offline: false,
291
- })
292
- ).toMatchObject({
293
- enabled: true,
294
- });
295
- });
296
-
297
- it("should return enabled false if the user on this device previously refused to send metrics", async () => {
298
- await writeMetricsConfig({
299
- permission: {
300
- enabled: false,
301
- date: new Date(2022, 6, 4),
302
- },
303
- });
304
- expect(
305
- await getMetricsConfig({
306
- sendMetrics: undefined,
307
- offline: false,
308
- })
309
- ).toMatchObject({
310
- enabled: false,
311
- });
312
- });
313
-
314
- it("should accept and store permission granting to send metrics if the user agrees", async () => {
315
- mockConfirm({
316
- text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
317
- result: true,
318
- });
319
- expect(
320
- await getMetricsConfig({
321
- sendMetrics: undefined,
322
- offline: false,
323
- })
324
- ).toMatchObject({
325
- enabled: true,
326
- });
327
- expect((await readMetricsConfig()).permission).toMatchObject({
328
- enabled: true,
329
- });
330
- });
331
-
332
- it("should accept and store permission declining to send metrics if the user declines", async () => {
333
- mockConfirm({
334
- text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
335
- result: false,
336
- });
337
- expect(
338
- await getMetricsConfig({
339
- sendMetrics: undefined,
340
- offline: false,
341
- })
342
- ).toMatchObject({
343
- enabled: false,
344
- });
345
- expect((await readMetricsConfig()).permission).toMatchObject({
346
- enabled: false,
347
- });
348
- });
349
-
350
- it("should ignore the config if the permission date is older than the current metrics date", async () => {
351
- mockConfirm({
352
- text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
353
- result: false,
354
- });
355
- const OLD_DATE = new Date(2000);
356
- await writeMetricsConfig({
357
- permission: { enabled: true, date: OLD_DATE },
358
- });
359
- expect(
360
- await getMetricsConfig({
361
- sendMetrics: undefined,
362
- offline: false,
363
- })
364
- ).toMatchObject({
365
- enabled: false,
366
- });
367
- const { permission } = await readMetricsConfig();
368
- expect(permission?.enabled).toBe(false);
369
- // The date should be updated to today's date
370
- expect(permission?.date).toEqual(CURRENT_METRICS_DATE);
371
-
372
- expect(std.out).toMatchInlineSnapshot(`
373
- "Usage metrics tracking has changed since you last granted permission.
374
- Your choice has been saved in the following file: test-xdg-config/metrics.json.
375
-
376
- You can override the user level setting for a project in \`wrangler.toml\`:
377
-
378
- - to disable sending metrics for a project: \`send_metrics = false\`
379
- - to enable sending metrics for a project: \`send_metrics = true\`"
380
- `);
381
- });
382
- });
383
-
384
- describe("deviceId", () => {
385
- it("should return a deviceId found in the config file", async () => {
386
- await writeMetricsConfig({ deviceId: "XXXX-YYYY-ZZZZ" });
387
- const { deviceId } = await getMetricsConfig({
388
- sendMetrics: true,
389
- offline: false,
390
- });
391
- expect(deviceId).toEqual("XXXX-YYYY-ZZZZ");
392
- expect((await readMetricsConfig()).deviceId).toEqual(deviceId);
393
- });
394
-
395
- it("should create and store a new deviceId if none is found in the config file", async () => {
396
- await writeMetricsConfig({});
397
- const { deviceId } = await getMetricsConfig({
398
- sendMetrics: true,
399
- offline: false,
400
- });
401
- expect(deviceId).toMatch(
402
- /[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}/
403
- );
404
- expect((await readMetricsConfig()).deviceId).toEqual(deviceId);
405
- });
406
- });
407
-
408
- describe("userId", () => {
409
- const userRequests = mockUserRequest();
410
- it("should return a userId found in a cache file", async () => {
411
- await saveToConfigCache(USER_ID_CACHE_PATH, {
412
- userId: "CACHED_USER_ID",
413
- });
414
- const { userId } = await getMetricsConfig({
415
- sendMetrics: true,
416
- offline: false,
417
- });
418
- expect(userId).toEqual("CACHED_USER_ID");
419
- expect(userRequests.count).toBe(0);
420
- });
421
-
422
- it("should fetch the userId from Cloudflare and store it in a cache file", async () => {
423
- writeAuthConfigFile({ oauth_token: "DUMMY_TOKEN" });
424
- const { userId } = await getMetricsConfig({
425
- sendMetrics: true,
426
- offline: false,
427
- });
428
- await flushPromises();
429
-
430
- expect(userId).toEqual("MOCK_USER_ID");
431
- expect(userRequests.count).toBe(1);
432
- });
433
-
434
- it("should not fetch the userId from Cloudflare if running in `offline` mode", async () => {
435
- writeAuthConfigFile({ oauth_token: "DUMMY_TOKEN" });
436
- const { userId } = await getMetricsConfig({
437
- sendMetrics: true,
438
- offline: true,
439
- });
440
- expect(userId).toBe(undefined);
441
- expect(userRequests.count).toBe(0);
442
- });
443
- });
444
- });
445
- });
446
-
447
- function mockUserRequest() {
448
- const requests = { count: 0 };
449
- beforeEach(() => {
450
- msw.use(
451
- ...mswSuccessOauthHandlers,
452
- rest.get("*/user", (_, res, cxt) => {
453
- requests.count++;
454
- return res(
455
- cxt.status(200),
456
- cxt.json({
457
- success: true,
458
- errors: [],
459
- messages: [],
460
- result: { id: "MOCK_USER_ID" },
461
- })
462
- );
463
- })
464
- );
465
- });
466
- afterEach(() => {
467
- requests.count = 0;
468
- });
469
- return requests;
470
- }
471
-
472
- function mockMetricRequest(
473
- body: unknown,
474
- header: unknown,
475
- endpoint: "identify" | "event"
476
- ) {
477
- const requests = { count: 0 };
478
- msw.use(
479
- rest.post(`*/${endpoint}`, async (req, res, cxt) => {
480
- requests.count++;
481
- expect(await req.json()).toEqual(body);
482
- expect(req.headers).toContain(header);
483
- return res.once(cxt.status(200), cxt.json({}));
484
- })
485
- );
486
-
487
- return requests;
488
- }
489
-
490
- // Forces a tick to allow the non-awaited fetch promise to resolve.
491
- function flushPromises(): Promise<void> {
492
- return new Promise((resolve) => setTimeout(resolve, 0));
493
- }