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.
- package/README.md +23 -3
- package/bin/wrangler.js +170 -62
- package/kv-asset-handler.js +1 -0
- package/miniflare-dist/index.mjs +1499 -21
- package/package.json +193 -152
- package/src/__tests__/access.test.ts +25 -0
- package/src/__tests__/api-dev.test.ts +238 -0
- package/src/__tests__/api-devregistry.test.js +64 -0
- package/src/__tests__/api.test.ts +80 -0
- package/src/__tests__/config-cache-without-cache-dir.test.ts +38 -0
- package/src/__tests__/config-cache.test.ts +30 -24
- package/src/__tests__/configuration.test.ts +4152 -3363
- package/src/__tests__/d1/d1.test.ts +127 -0
- package/src/__tests__/d1/splitter.test.ts +255 -0
- package/src/__tests__/delete.test.ts +266 -0
- package/src/__tests__/deployments.test.ts +105 -0
- package/src/__tests__/dev.test.tsx +1558 -952
- package/src/__tests__/generate.test.ts +238 -0
- package/src/__tests__/get-host-from-url.test.ts +16 -0
- package/src/__tests__/guess-worker-format.test.ts +68 -68
- package/src/__tests__/helpers/cmd-shim.d.ts +6 -6
- package/src/__tests__/helpers/mock-account-id.ts +24 -24
- package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
- package/src/__tests__/helpers/mock-bin.ts +20 -20
- package/src/__tests__/helpers/mock-console.ts +58 -39
- package/src/__tests__/helpers/mock-dialogs.ts +88 -79
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +11 -0
- package/src/__tests__/helpers/mock-http-server.ts +30 -30
- package/src/__tests__/helpers/mock-istty.ts +65 -18
- package/src/__tests__/helpers/mock-known-routes.ts +12 -0
- package/src/__tests__/helpers/mock-kv.ts +41 -28
- package/src/__tests__/helpers/mock-oauth-flow.ts +241 -233
- package/src/__tests__/helpers/mock-process.ts +34 -0
- package/src/__tests__/helpers/mock-stdin.ts +82 -77
- package/src/__tests__/helpers/mock-web-socket.ts +21 -21
- package/src/__tests__/helpers/msw/blob-worker.cjs +19 -0
- package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
- package/src/__tests__/helpers/msw/handlers/deployments.ts +69 -0
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +81 -0
- package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
- package/src/__tests__/helpers/msw/handlers/r2.ts +60 -0
- package/src/__tests__/helpers/msw/handlers/script.ts +56 -0
- package/src/__tests__/helpers/msw/handlers/user.ts +52 -0
- package/src/__tests__/helpers/msw/handlers/zones.ts +20 -0
- package/src/__tests__/helpers/msw/index.ts +50 -0
- package/src/__tests__/helpers/msw/read-file-sync.js +61 -0
- package/src/__tests__/helpers/run-in-tmp.ts +27 -28
- package/src/__tests__/helpers/run-wrangler.ts +8 -8
- package/src/__tests__/helpers/worker-scripts/child-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-worker.js +5 -0
- package/src/__tests__/helpers/worker-scripts/hello-world-wrangler.toml +1 -0
- package/src/__tests__/helpers/worker-scripts/parent-worker.js +8 -0
- package/src/__tests__/helpers/worker-scripts/parent-wrangler.toml +5 -0
- package/src/__tests__/helpers/write-worker-source.ts +16 -16
- package/src/__tests__/helpers/write-wrangler-toml.ts +9 -9
- package/src/__tests__/https-options.test.ts +142 -109
- package/src/__tests__/index.test.ts +245 -233
- package/src/__tests__/init.test.ts +3135 -1605
- package/src/__tests__/jest.setup.ts +148 -50
- package/src/__tests__/kv.test.ts +1778 -1471
- package/src/__tests__/logger.test.ts +100 -74
- package/src/__tests__/logout.test.ts +47 -0
- package/src/__tests__/metrics.test.ts +493 -0
- package/src/__tests__/middleware.scheduled.test.ts +145 -0
- package/src/__tests__/middleware.test.ts +750 -0
- package/src/__tests__/package-manager.test.ts +303 -303
- package/src/__tests__/pages-deployment-tail.test.ts +955 -0
- package/src/__tests__/pages.test.ts +2887 -743
- package/src/__tests__/parse.test.ts +252 -252
- package/src/__tests__/paths.test.ts +39 -0
- package/src/__tests__/publish.test.ts +8004 -5355
- package/src/__tests__/pubsub.test.ts +490 -0
- package/src/__tests__/queues.test.ts +522 -0
- package/src/__tests__/r2.test.ts +364 -228
- package/src/__tests__/route.test.ts +18 -18
- package/src/__tests__/secret.test.ts +681 -469
- package/src/__tests__/tail.test.ts +835 -567
- package/src/__tests__/test-old-node-version.js +31 -0
- package/src/__tests__/tsconfig-sanity.ts +12 -0
- package/src/__tests__/tsconfig.json +8 -0
- package/src/__tests__/tsconfig.tsbuildinfo +1 -0
- package/src/__tests__/type-generation.test.ts +233 -0
- package/src/__tests__/user.test.ts +107 -120
- package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
- package/src/__tests__/validate-dev-props.test.ts +56 -0
- package/src/__tests__/version.test.ts +35 -0
- package/src/__tests__/whoami.test.tsx +165 -98
- package/src/__tests__/worker-namespace.test.ts +334 -0
- package/src/abort.d.ts +1 -1
- package/src/api/dev.ts +259 -0
- package/src/api/index.ts +3 -0
- package/src/api/pages/index.ts +5 -0
- package/src/api/pages/publish.tsx +321 -0
- package/src/bundle-reporter.ts +68 -0
- package/src/bundle.ts +838 -163
- package/src/cfetch/index.ts +120 -83
- package/src/cfetch/internal.ts +210 -97
- package/src/cli.ts +23 -8
- package/src/config/config.ts +236 -195
- package/src/config/diagnostics.ts +61 -61
- package/src/config/environment.ts +516 -357
- package/src/config/index.ts +326 -193
- package/src/config/validation-helpers.ts +379 -357
- package/src/config/validation.ts +1979 -1367
- package/src/config-cache.ts +81 -41
- package/src/create-worker-preview.ts +239 -142
- package/src/create-worker-upload-form.ts +309 -238
- package/src/d1/backups.tsx +219 -0
- package/src/d1/constants.ts +2 -0
- package/src/d1/create.tsx +63 -0
- package/src/d1/delete.ts +56 -0
- package/src/d1/execute.tsx +323 -0
- package/src/d1/formatTimeAgo.ts +14 -0
- package/src/d1/index.ts +101 -0
- package/src/d1/list.tsx +48 -0
- package/src/d1/migrations/apply.tsx +197 -0
- package/src/d1/migrations/create.tsx +77 -0
- package/src/d1/migrations/helpers.ts +147 -0
- package/src/d1/migrations/index.ts +3 -0
- package/src/d1/migrations/list.tsx +79 -0
- package/src/d1/migrations/options.ts +18 -0
- package/src/d1/options.ts +22 -0
- package/src/d1/splitter.ts +161 -0
- package/src/d1/types.ts +24 -0
- package/src/d1/utils.ts +48 -0
- package/src/delete.ts +103 -0
- package/src/deployments.ts +93 -0
- package/src/deprecated/index.ts +145 -0
- package/src/dev/dev-vars.ts +20 -17
- package/src/dev/dev.tsx +547 -352
- package/src/dev/get-local-persistence-path.ts +31 -0
- package/src/dev/local.tsx +903 -298
- package/src/dev/remote.tsx +620 -215
- package/src/dev/start-server.ts +538 -0
- package/src/dev/use-esbuild.ts +184 -97
- package/src/dev/validate-dev-props.ts +31 -0
- package/src/dev-registry.ts +201 -0
- package/src/dev.tsx +949 -0
- package/src/dialogs.ts +136 -0
- package/src/dispatch-namespace.ts +207 -0
- package/src/docs/index.ts +98 -0
- package/src/durable.ts +87 -87
- package/src/entry.ts +236 -230
- package/src/environment-variables/factory.ts +88 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/errors.ts +6 -6
- package/src/generate/index.ts +300 -0
- package/src/git-client.ts +135 -0
- package/src/global-wrangler-config-path.ts +26 -0
- package/src/https-options.ts +84 -80
- package/src/index.ts +694 -0
- package/src/init.ts +1024 -0
- package/src/inspect.ts +698 -593
- package/src/intl-polyfill.d.ts +123 -123
- package/src/is-ci.ts +14 -0
- package/src/is-interactive.ts +16 -0
- package/src/jest.d.ts +4 -0
- package/src/kv/helpers.ts +430 -0
- package/src/kv/index.ts +596 -0
- package/src/logger.ts +80 -42
- package/src/metrics/index.ts +5 -0
- package/src/metrics/metrics-config.ts +239 -0
- package/src/metrics/metrics-dispatcher.ts +96 -0
- package/src/metrics/metrics-usage-headers.ts +24 -0
- package/src/metrics/send-event.ts +98 -0
- package/src/miniflare-cli/assets.ts +250 -0
- package/src/miniflare-cli/index.ts +202 -33
- package/src/miniflare-cli/request-context.ts +18 -18
- package/src/miniflare-cli/tsconfig.json +9 -0
- package/src/miniflare-cli/tsconfig.tsbuildinfo +1 -0
- package/src/miniflare-cli/types.ts +11 -0
- package/src/module-collection.ts +221 -212
- package/src/open-in-browser.ts +4 -6
- package/src/package-manager.ts +173 -128
- package/src/pages/build.ts +150 -0
- package/src/pages/buildFunctions.ts +129 -0
- package/src/pages/constants.ts +18 -0
- package/src/pages/deployment-tails.ts +284 -0
- package/src/pages/deployments.tsx +84 -0
- package/src/pages/dev.ts +716 -0
- package/src/pages/errors.ts +66 -0
- package/src/pages/functions/buildPlugin.ts +90 -0
- package/src/pages/functions/buildWorker.ts +288 -0
- package/{pages → src/pages}/functions/filepath-routing.test.ts +113 -113
- package/src/pages/functions/filepath-routing.ts +189 -0
- package/src/pages/functions/identifiers.ts +78 -0
- package/src/pages/functions/routes-consolidation.test.ts +250 -0
- package/src/pages/functions/routes-consolidation.ts +73 -0
- package/src/pages/functions/routes-transformation.test.ts +282 -0
- package/src/pages/functions/routes-transformation.ts +115 -0
- package/src/pages/functions/routes-validation.test.ts +403 -0
- package/src/pages/functions/routes-validation.ts +202 -0
- package/src/pages/functions/routes.ts +151 -0
- package/src/pages/functions/tsconfig.json +8 -0
- package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
- package/src/pages/functions.ts +82 -0
- package/src/pages/hash.ts +13 -0
- package/src/pages/index.ts +102 -0
- package/src/pages/projects.tsx +167 -0
- package/src/pages/prompt-select-project.tsx +31 -0
- package/src/pages/publish.tsx +263 -0
- package/src/pages/types.ts +41 -0
- package/src/pages/upload.tsx +447 -0
- package/src/pages/utils.ts +23 -0
- package/src/parse.ts +209 -125
- package/src/paths.ts +53 -8
- package/src/proxy.ts +623 -394
- package/src/publish/index.ts +270 -0
- package/src/publish/publish.ts +1064 -0
- package/src/pubsub/index.ts +286 -0
- package/src/pubsub/pubsub-commands.ts +624 -0
- package/src/queues/cli/commands/consumer/add.ts +71 -0
- package/src/queues/cli/commands/consumer/index.ts +22 -0
- package/src/queues/cli/commands/consumer/remove.ts +38 -0
- package/src/queues/cli/commands/create.ts +25 -0
- package/src/queues/cli/commands/delete.ts +26 -0
- package/src/queues/cli/commands/index.ts +36 -0
- package/src/queues/cli/commands/list.ts +25 -0
- package/src/queues/client.ts +135 -0
- package/src/queues/utils.ts +18 -0
- package/src/r2/constants.ts +4 -0
- package/src/r2/helpers.ts +131 -0
- package/src/r2/index.ts +289 -0
- package/src/routes.ts +140 -0
- package/src/secret/index.ts +379 -0
- package/src/selfsigned.d.ts +23 -23
- package/src/sites.ts +372 -0
- package/src/tail/createTail.ts +406 -0
- package/src/tail/filters.ts +108 -110
- package/src/tail/index.ts +210 -296
- package/src/tail/printing.ts +101 -46
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +181 -0
- package/src/update-check.ts +11 -11
- package/src/user/access.ts +68 -0
- package/src/user/auth-variables.ts +113 -0
- package/src/user/choose-account.tsx +39 -0
- package/src/user/generate-auth-url.ts +33 -0
- package/src/user/generate-random-state.ts +16 -0
- package/src/user/index.ts +2 -0
- package/src/user/user.ts +1232 -0
- package/src/utils/collectKeyValues.ts +14 -0
- package/src/whoami.ts +135 -0
- package/src/worker.ts +177 -106
- package/src/yargs-types.ts +24 -0
- package/src/zones.ts +191 -0
- package/templates/__tests__/pages-dev-util.test.ts +128 -0
- package/templates/__tests__/tsconfig-sanity.ts +12 -0
- package/templates/__tests__/tsconfig.json +8 -0
- package/templates/__tests__/tsconfig.tsbuildinfo +1 -0
- package/templates/checked-fetch.js +15 -0
- package/templates/d1-beta-facade.js +241 -0
- package/templates/facade.d.ts +14 -0
- package/templates/first-party-worker-module-facade.ts +19 -0
- package/templates/format-dev-errors.ts +33 -0
- package/templates/init-tests/test-jest-new-worker.js +23 -0
- package/templates/init-tests/test-vitest-new-worker.js +24 -0
- package/templates/init-tests/test-vitest-new-worker.ts +25 -0
- package/templates/middleware/common.ts +62 -0
- package/templates/middleware/loader-modules.ts +84 -0
- package/templates/middleware/loader-sw.ts +233 -0
- package/templates/middleware/middleware-miniflare3-json-error.ts +20 -0
- package/templates/middleware/middleware-pretty-error.ts +40 -0
- package/templates/middleware/middleware-scheduled.ts +15 -0
- package/templates/new-worker-scheduled.js +3 -3
- package/templates/new-worker-scheduled.ts +15 -15
- package/templates/new-worker.js +3 -3
- package/templates/new-worker.ts +15 -15
- package/templates/no-op-worker.js +10 -0
- package/templates/pages-dev-pipeline.ts +31 -0
- package/templates/pages-dev-util.ts +52 -0
- package/templates/pages-shim.ts +12 -0
- package/templates/pages-template-plugin.ts +176 -0
- package/templates/pages-template-worker.ts +189 -0
- package/templates/serve-static-assets.ts +65 -0
- package/templates/service-bindings-module-facade.js +54 -0
- package/templates/service-bindings-sw-facade.js +42 -0
- package/templates/tsconfig-sanity.ts +11 -0
- package/templates/tsconfig.init.json +106 -0
- package/templates/tsconfig.json +6 -103
- package/templates/tsconfig.tsbuildinfo +1 -0
- package/wrangler-dist/cli.d.ts +1028 -0
- package/wrangler-dist/cli.js +129259 -110922
- package/wrangler-dist/wasm-sync.wasm +0 -0
- package/pages/functions/buildPlugin.ts +0 -105
- package/pages/functions/buildWorker.ts +0 -151
- package/pages/functions/filepath-routing.ts +0 -189
- package/pages/functions/identifiers.ts +0 -78
- package/pages/functions/routes.ts +0 -156
- package/pages/functions/template-plugin.ts +0 -147
- package/pages/functions/template-worker.ts +0 -143
- package/src/__tests__/helpers/faye-websocket.d.ts +0 -6
- package/src/__tests__/helpers/mock-cfetch.ts +0 -211
- package/src/dialogs.tsx +0 -135
- package/src/environment-variables.ts +0 -35
- package/src/index.tsx +0 -2864
- package/src/kv.ts +0 -408
- package/src/miniflare-cli/enum-keys.ts +0 -17
- package/src/pages.tsx +0 -2038
- package/src/publish.ts +0 -583
- package/src/r2.ts +0 -50
- package/src/sites.tsx +0 -295
- package/src/user.tsx +0 -1203
- package/src/whoami.tsx +0 -70
- package/templates/static-asset-facade.js +0 -47
- package/vendor/@cloudflare/kv-asset-handler/CHANGELOG.md +0 -332
- package/vendor/@cloudflare/kv-asset-handler/LICENSE_APACHE +0 -176
- package/vendor/@cloudflare/kv-asset-handler/LICENSE_MIT +0 -25
- package/vendor/@cloudflare/kv-asset-handler/README.md +0 -245
- package/vendor/@cloudflare/kv-asset-handler/dist/index.d.ts +0 -32
- package/vendor/@cloudflare/kv-asset-handler/dist/index.js +0 -354
- package/vendor/@cloudflare/kv-asset-handler/dist/mocks.d.ts +0 -13
- package/vendor/@cloudflare/kv-asset-handler/dist/mocks.js +0 -148
- package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/getAssetFromKV.js +0 -436
- package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/mapRequestToAsset.js +0 -40
- package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.d.ts +0 -1
- package/vendor/@cloudflare/kv-asset-handler/dist/test/serveSinglePageApp.js +0 -42
- package/vendor/@cloudflare/kv-asset-handler/dist/types.d.ts +0 -26
- package/vendor/@cloudflare/kv-asset-handler/dist/types.js +0 -31
- package/vendor/@cloudflare/kv-asset-handler/package.json +0 -52
- package/vendor/@cloudflare/kv-asset-handler/src/index.ts +0 -296
- package/vendor/@cloudflare/kv-asset-handler/src/mocks.ts +0 -136
- package/vendor/@cloudflare/kv-asset-handler/src/test/getAssetFromKV.ts +0 -464
- package/vendor/@cloudflare/kv-asset-handler/src/test/mapRequestToAsset.ts +0 -33
- package/vendor/@cloudflare/kv-asset-handler/src/test/serveSinglePageApp.ts +0 -42
- package/vendor/@cloudflare/kv-asset-handler/src/types.ts +0 -39
- package/vendor/wrangler-mime/CHANGELOG.md +0 -289
- package/vendor/wrangler-mime/LICENSE +0 -21
- package/vendor/wrangler-mime/Mime.js +0 -97
- package/vendor/wrangler-mime/README.md +0 -187
- package/vendor/wrangler-mime/cli.js +0 -46
- package/vendor/wrangler-mime/index.js +0 -4
- package/vendor/wrangler-mime/lite.js +0 -4
- package/vendor/wrangler-mime/package.json +0 -52
- package/vendor/wrangler-mime/types/other.js +0 -1
- 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 {
|
|
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
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
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
|
+
"[33m▲ [43;33m[[43;30mWARNING[43;33m][0m [1mBeginning 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.[0m
|
|
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
|
+
"[31mX [41;31m[[41;97mERROR[41;31m][0m [1m Error: some error[0m
|
|
614
|
+
|
|
615
|
+
|
|
616
|
+
[31mX [41;31m[[41;97mERROR[41;31m][0m [1m Error: { complex: 'error' }[0m
|
|
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
|
-
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
440
|
-
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
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
|
|
670
|
+
* @returns true if `event` is a RequestEvent
|
|
466
671
|
*/
|
|
467
|
-
function
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
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
|
-
|
|
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
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
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
|
-
|
|
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
|
-
|
|
515
|
-
|
|
516
|
-
|
|
517
|
-
|
|
518
|
-
|
|
519
|
-
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
527
|
-
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
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
|
-
|
|
561
|
-
|
|
797
|
+
env?: string,
|
|
798
|
+
legacyEnv = false,
|
|
799
|
+
expectedScriptName = legacyEnv && env ? `test-worker-${env}` : "test-worker"
|
|
562
800
|
): RequestCounter {
|
|
563
|
-
|
|
564
|
-
|
|
565
|
-
|
|
566
|
-
|
|
567
|
-
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
571
|
-
|
|
572
|
-
|
|
573
|
-
|
|
574
|
-
|
|
575
|
-
|
|
576
|
-
|
|
577
|
-
|
|
578
|
-
|
|
579
|
-
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
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(
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
-
|
|
616
|
-
|
|
617
|
-
|
|
618
|
-
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
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
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
891
|
+
outcome = "ok",
|
|
892
|
+
exceptions = [],
|
|
893
|
+
logs = [],
|
|
894
|
+
eventTimestamp = mockEventTimestamp,
|
|
895
|
+
event = generateMockRequestEvent(),
|
|
642
896
|
}: Partial<TailEventMessage>): TailEventMessage {
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
648
|
-
|
|
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
|
-
|
|
914
|
+
opts?: Partial<RequestEvent["request"]>
|
|
661
915
|
): RequestEvent {
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
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
|
-
|
|
938
|
+
opts?: Partial<ScheduledEvent>
|
|
685
939
|
): ScheduledEvent {
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
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
|
}
|