wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9
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 +16 -2
- package/bin/wrangler.js +31 -11
- package/miniflare-dist/index.mjs +1340 -330
- package/package.json +40 -13
- 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__/configuration.test.ts +683 -470
- package/src/__tests__/d1.test.ts +123 -0
- package/src/__tests__/delete.test.ts +263 -0
- package/src/__tests__/deployments.test.ts +105 -0
- package/src/__tests__/dev.test.tsx +453 -70
- package/src/__tests__/dialogs.test.tsx +40 -0
- package/src/__tests__/generate.test.ts +235 -0
- package/src/__tests__/get-host-from-url.test.ts +16 -0
- package/src/__tests__/helpers/mock-auth-domain.ts +20 -0
- package/src/__tests__/helpers/mock-cfetch.ts +92 -26
- package/src/__tests__/helpers/mock-console.ts +11 -2
- package/src/__tests__/helpers/mock-dialogs.ts +1 -1
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -0
- package/src/__tests__/helpers/mock-known-routes.ts +7 -0
- package/src/__tests__/helpers/mock-kv.ts +1 -1
- package/src/__tests__/helpers/mock-oauth-flow.ts +74 -53
- package/src/__tests__/helpers/mock-process.ts +8 -13
- package/src/__tests__/helpers/msw/handlers/access.ts +13 -0
- package/src/__tests__/helpers/msw/handlers/deployments.ts +59 -0
- package/src/__tests__/helpers/msw/handlers/namespaces.ts +104 -0
- package/src/__tests__/helpers/msw/handlers/oauth.ts +31 -0
- package/src/__tests__/helpers/msw/handlers/r2.ts +80 -0
- package/src/__tests__/helpers/msw/handlers/script.ts +75 -0
- package/src/__tests__/helpers/msw/handlers/user.ts +63 -0
- package/src/__tests__/helpers/msw/handlers/zones.ts +22 -0
- package/src/__tests__/helpers/msw/index.ts +21 -0
- 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__/index.test.ts +103 -97
- package/src/__tests__/init.test.ts +1484 -382
- package/src/__tests__/jest.setup.ts +88 -5
- package/src/__tests__/kv.test.ts +655 -540
- package/src/__tests__/logout.test.ts +47 -0
- package/src/__tests__/metrics.test.ts +95 -45
- package/src/__tests__/middleware.scheduled.test.ts +145 -0
- package/src/__tests__/middleware.test.ts +750 -0
- package/src/__tests__/pages-deployment-tail.test.ts +884 -0
- package/src/__tests__/pages.test.ts +1301 -119
- package/src/__tests__/paths.test.ts +39 -0
- package/src/__tests__/publish.test.ts +2266 -1180
- package/src/__tests__/pubsub.test.ts +211 -88
- package/src/__tests__/queues.test.ts +522 -0
- package/src/__tests__/r2.test.ts +363 -203
- package/src/__tests__/secret.test.ts +261 -59
- package/src/__tests__/tail.test.ts +352 -151
- package/src/__tests__/test-old-node-version.js +3 -3
- 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 +59 -73
- package/src/__tests__/utils-collectKeyValues.test.ts +47 -0
- package/src/__tests__/validate-dev-props.test.ts +56 -0
- package/src/__tests__/whoami.test.tsx +114 -66
- package/src/__tests__/worker-namespace.test.ts +154 -155
- package/src/api/dev.ts +170 -38
- package/src/api/index.ts +1 -0
- package/src/bundle-reporter.tsx +41 -2
- package/src/bundle.ts +668 -81
- package/src/cfetch/index.ts +40 -3
- package/src/cfetch/internal.ts +144 -32
- package/src/cli.ts +4 -3
- package/src/config/config.ts +27 -3
- package/src/config/environment.ts +131 -7
- package/src/config/index.ts +128 -8
- package/src/config/validation-helpers.ts +19 -6
- package/src/config/validation.ts +411 -14
- package/src/config-cache.ts +3 -2
- package/src/create-worker-preview.ts +31 -6
- package/src/create-worker-upload-form.ts +84 -22
- package/src/d1/backups.tsx +223 -0
- package/src/d1/constants.ts +2 -0
- package/src/d1/create.tsx +63 -0
- package/src/d1/delete.tsx +56 -0
- package/src/d1/execute.tsx +352 -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 +196 -0
- package/src/d1/migrations/create.tsx +77 -0
- package/src/d1/migrations/helpers.ts +147 -0
- package/src/d1/migrations/index.tsx +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/types.tsx +24 -0
- package/src/d1/utils.ts +48 -0
- package/src/delete.ts +108 -0
- package/src/deployments.ts +83 -0
- package/src/deprecated/index.ts +145 -0
- package/src/dev/dev-vars.ts +11 -8
- package/src/dev/dev.tsx +220 -58
- package/src/dev/get-local-persistence-path.tsx +31 -0
- package/src/dev/local.tsx +740 -181
- package/src/dev/remote.tsx +340 -123
- package/src/dev/start-server.ts +543 -0
- package/src/dev/use-esbuild.ts +61 -7
- package/src/dev/validate-dev-props.ts +31 -0
- package/src/dev-registry.tsx +201 -0
- package/src/dev.tsx +614 -258
- package/src/dialogs.tsx +41 -8
- package/src/{worker-namespace.ts → dispatch-namespace.ts} +23 -22
- package/src/docs/index.ts +97 -0
- package/src/entry.ts +3 -2
- package/src/environment-variables/factory.ts +88 -0
- package/src/environment-variables/misc-variables.ts +30 -0
- package/src/generate/index.ts +300 -0
- package/src/git-client.ts +100 -7
- package/src/index.tsx +249 -1560
- package/src/init.ts +626 -150
- package/src/inspect.ts +137 -32
- package/src/{metrics/is-ci.ts → is-ci.ts} +0 -0
- package/src/is-interactive.ts +4 -0
- package/src/jest.d.ts +4 -0
- package/src/{kv.ts → kv/helpers.ts} +3 -3
- package/src/kv/index.ts +596 -0
- package/src/logger.ts +27 -8
- package/src/metrics/index.ts +1 -0
- package/src/metrics/metrics-config.ts +4 -4
- package/src/metrics/metrics-dispatcher.ts +1 -0
- package/src/metrics/metrics-usage-headers.ts +24 -0
- package/src/metrics/send-event.ts +13 -8
- package/src/miniflare-cli/assets.ts +172 -465
- package/src/miniflare-cli/index.ts +149 -24
- 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 +12 -3
- package/src/pages/build.tsx +108 -42
- package/src/pages/constants.ts +11 -0
- package/src/pages/deployment-tails.tsx +284 -0
- package/src/pages/deployments.tsx +9 -31
- package/src/pages/dev.tsx +417 -108
- package/src/pages/errors.ts +66 -0
- package/src/pages/functions/buildPlugin.ts +86 -84
- package/src/pages/functions/buildWorker.ts +121 -106
- 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/tsconfig.json +8 -0
- package/src/pages/functions/tsconfig.tsbuildinfo +1 -0
- package/src/pages/functions.tsx +82 -0
- package/src/pages/hash.tsx +13 -0
- package/src/pages/index.tsx +73 -55
- package/src/pages/projects.tsx +9 -3
- package/src/pages/prompt-select-project.tsx +31 -0
- package/src/pages/publish.tsx +183 -60
- package/src/pages/types.ts +1 -0
- package/src/pages/upload.tsx +107 -56
- package/src/pages/utils.ts +13 -2
- package/src/paths.ts +49 -4
- package/src/proxy.ts +375 -157
- package/src/publish/index.ts +270 -0
- package/src/{publish.ts → publish/publish.ts} +431 -188
- package/src/pubsub/pubsub-commands.tsx +4 -3
- 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/sites.tsx +3 -3
- package/src/tail/createTail.ts +379 -0
- package/src/tail/filters.ts +4 -6
- package/src/tail/index.ts +199 -284
- package/src/tail/printing.ts +43 -3
- package/src/tsconfig-sanity.ts +16 -0
- package/src/type-generation.ts +181 -0
- package/src/user/access.ts +68 -0
- package/src/user/auth-variables.ts +113 -0
- package/src/user/choose-account.tsx +1 -1
- package/src/user/index.ts +0 -1
- package/src/user/user.tsx +116 -49
- package/src/utils/collectKeyValues.ts +14 -0
- package/src/whoami.tsx +80 -2
- package/src/worker.ts +69 -9
- package/src/yargs-types.ts +24 -0
- package/src/zones.ts +124 -9
- 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/d1-beta-facade.js +205 -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 +82 -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.js +1 -1
- package/templates/pages-dev-pipeline.ts +31 -0
- package/templates/pages-dev-util.ts +52 -0
- package/templates/pages-shim.ts +4 -1
- package/templates/pages-template-plugin.ts +21 -5
- package/templates/pages-template-worker.ts +37 -9
- package/templates/{static-asset-facade.js → serve-static-assets.ts} +23 -7
- 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 +5 -102
- package/templates/tsconfig.tsbuildinfo +1 -0
- package/wrangler-dist/cli.d.ts +621 -42
- package/wrangler-dist/cli.js +144441 -102606
- package/src/environment-variables.ts +0 -35
- package/src/faye-websocket.d.ts +0 -6
- package/src/generate.ts +0 -33
- package/src/miniflare-cli/enum-keys.ts +0 -17
- package/src/preview.ts +0 -31
- package/src/r2.ts +0 -50
- package/src/user/env-vars.ts +0 -46
|
@@ -0,0 +1,379 @@
|
|
|
1
|
+
import WebSocket from "ws";
|
|
2
|
+
import { version as packageVersion } from "../../package.json";
|
|
3
|
+
import { fetchResult } from "../cfetch";
|
|
4
|
+
import type { TailFilterMessage, Outcome } from "./filters";
|
|
5
|
+
export type { TailCLIFilters } from "./filters";
|
|
6
|
+
export { translateCLICommandToFilterMessage } from "./filters";
|
|
7
|
+
export { jsonPrintLogs, prettyPrintLogs } from "./printing";
|
|
8
|
+
import type { Request } from "undici";
|
|
9
|
+
|
|
10
|
+
const TRACE_VERSION = "trace-v1";
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* When creating a Tail, the response from the API contains
|
|
14
|
+
* - an ID used for identifying the tail
|
|
15
|
+
* - a URL to a WebSocket connection available for the tail to connect to
|
|
16
|
+
* - an expiration date when the tail is no longer guaranteed to be valid
|
|
17
|
+
*/
|
|
18
|
+
type TailCreationApiResponse = {
|
|
19
|
+
id: string;
|
|
20
|
+
url: string;
|
|
21
|
+
expires_at: Date;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Generate a URL that, when `cfetch`ed, creates a tail.
|
|
26
|
+
*
|
|
27
|
+
* https://api.cloudflare.com/#worker-tail-logs-start-tail
|
|
28
|
+
*
|
|
29
|
+
* @param accountId the account ID associated with the worker to tail
|
|
30
|
+
* @param workerName the name of the worker to tail
|
|
31
|
+
* @returns a `cfetch`-ready URL for creating a new tail
|
|
32
|
+
*/
|
|
33
|
+
function makeCreateTailUrl(
|
|
34
|
+
accountId: string,
|
|
35
|
+
workerName: string,
|
|
36
|
+
env: string | undefined
|
|
37
|
+
): string {
|
|
38
|
+
return env
|
|
39
|
+
? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails`
|
|
40
|
+
: `/accounts/${accountId}/workers/scripts/${workerName}/tails`;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Generate a URL that, when `cfetch`ed, deletes a tail
|
|
45
|
+
*
|
|
46
|
+
* https://api.cloudflare.com/#worker-tail-logs-delete-tail
|
|
47
|
+
*
|
|
48
|
+
* @param accountId the account ID associated with the worker we're tailing
|
|
49
|
+
* @param workerName the name of the worker we're tailing
|
|
50
|
+
* @param tailId the ID of the tail we want to delete
|
|
51
|
+
* @returns a `cfetch`-ready URL for deleting a tail
|
|
52
|
+
*/
|
|
53
|
+
function makeDeleteTailUrl(
|
|
54
|
+
accountId: string,
|
|
55
|
+
workerName: string,
|
|
56
|
+
tailId: string,
|
|
57
|
+
env: string | undefined
|
|
58
|
+
): string {
|
|
59
|
+
return env
|
|
60
|
+
? `/accounts/${accountId}/workers/services/${workerName}/environments/${env}/tails/${tailId}`
|
|
61
|
+
: `/accounts/${accountId}/workers/scripts/${workerName}/tails/${tailId}`;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
interface CreatePagesTailOptions {
|
|
65
|
+
accountId: string;
|
|
66
|
+
projectName: string;
|
|
67
|
+
deploymentId: string;
|
|
68
|
+
filters: TailFilterMessage;
|
|
69
|
+
debug?: boolean;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
/**
|
|
73
|
+
* Create and connect to a Pages Function Tail.
|
|
74
|
+
*
|
|
75
|
+
* Under the hood, this function
|
|
76
|
+
* - Registers a new Tail with the API
|
|
77
|
+
* - Connects to the tail worker
|
|
78
|
+
* - Sends any filters over the connection
|
|
79
|
+
*
|
|
80
|
+
* @returns a websocket connection, an expiration, and a function to call to delete the tail
|
|
81
|
+
*/
|
|
82
|
+
export async function createPagesTail({
|
|
83
|
+
accountId,
|
|
84
|
+
projectName,
|
|
85
|
+
deploymentId,
|
|
86
|
+
filters,
|
|
87
|
+
debug = false,
|
|
88
|
+
}: CreatePagesTailOptions) {
|
|
89
|
+
const tailRecord = await fetchResult<TailCreationApiResponse>(
|
|
90
|
+
`/accounts/${accountId}/pages/projects/${projectName}/deployments/${deploymentId}/tails`,
|
|
91
|
+
{
|
|
92
|
+
method: "POST",
|
|
93
|
+
body: JSON.stringify(filters),
|
|
94
|
+
}
|
|
95
|
+
);
|
|
96
|
+
|
|
97
|
+
const deleteTail = async () =>
|
|
98
|
+
fetchResult(
|
|
99
|
+
`/accounts/${accountId}/pages/projects/${projectName}/deployments/${deploymentId}/tails/${tailRecord.id}`,
|
|
100
|
+
{ method: "DELETE" }
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
const tail = new WebSocket(tailRecord.url, TRACE_VERSION, {
|
|
104
|
+
headers: {
|
|
105
|
+
"Sec-WebSocket-Protocol": TRACE_VERSION, // needs to be `trace-v1` to be accepted
|
|
106
|
+
"User-Agent": `wrangler-js/${packageVersion}`,
|
|
107
|
+
},
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
// send filters when we open up
|
|
111
|
+
tail.on("open", () => {
|
|
112
|
+
tail.send(
|
|
113
|
+
JSON.stringify({ debug: debug }),
|
|
114
|
+
{ binary: false, compress: false, mask: false, fin: true },
|
|
115
|
+
(err) => {
|
|
116
|
+
if (err) {
|
|
117
|
+
throw err;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
);
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
return { tail, deleteTail, expiration: tailRecord.expires_at };
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
/**
|
|
127
|
+
* Create and connect to a tail.
|
|
128
|
+
*
|
|
129
|
+
* Under the hood, this function
|
|
130
|
+
* - Registers a new Tail with the API
|
|
131
|
+
* - Connects to the tail worker
|
|
132
|
+
* - Sends any filters over the connection
|
|
133
|
+
*
|
|
134
|
+
* @param accountId the account ID associated with the worker to tail
|
|
135
|
+
* @param workerName the name of the worker to tail
|
|
136
|
+
* @param filters A list of `TailAPIFilters` given to the tail
|
|
137
|
+
* @param debug Flag to run tail in debug mode
|
|
138
|
+
* @returns a websocket connection, an expiration, and a function to call to delete the tail
|
|
139
|
+
*/
|
|
140
|
+
export async function createTail(
|
|
141
|
+
accountId: string,
|
|
142
|
+
workerName: string,
|
|
143
|
+
filters: TailFilterMessage,
|
|
144
|
+
debug: boolean,
|
|
145
|
+
env: string | undefined
|
|
146
|
+
): Promise<{
|
|
147
|
+
tail: WebSocket;
|
|
148
|
+
expiration: Date;
|
|
149
|
+
deleteTail: () => Promise<void>;
|
|
150
|
+
}> {
|
|
151
|
+
// create the tail
|
|
152
|
+
const createTailUrl = makeCreateTailUrl(accountId, workerName, env);
|
|
153
|
+
const {
|
|
154
|
+
id: tailId,
|
|
155
|
+
url: websocketUrl,
|
|
156
|
+
expires_at: expiration,
|
|
157
|
+
} = await fetchResult<TailCreationApiResponse>(createTailUrl, {
|
|
158
|
+
method: "POST",
|
|
159
|
+
body: JSON.stringify(filters),
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
// delete the tail (not yet!)
|
|
163
|
+
const deleteUrl = makeDeleteTailUrl(accountId, workerName, tailId, env);
|
|
164
|
+
async function deleteTail() {
|
|
165
|
+
await fetchResult(deleteUrl, { method: "DELETE" });
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
// connect to the tail
|
|
169
|
+
const tail = new WebSocket(websocketUrl, TRACE_VERSION, {
|
|
170
|
+
headers: {
|
|
171
|
+
"Sec-WebSocket-Protocol": TRACE_VERSION, // needs to be `trace-v1` to be accepted
|
|
172
|
+
"User-Agent": `wrangler-js/${packageVersion}`,
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
// send filters when we open up
|
|
177
|
+
tail.on("open", function () {
|
|
178
|
+
tail.send(
|
|
179
|
+
JSON.stringify({ debug: debug }),
|
|
180
|
+
{ binary: false, compress: false, mask: false, fin: true },
|
|
181
|
+
(err) => {
|
|
182
|
+
if (err) {
|
|
183
|
+
throw err;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
);
|
|
187
|
+
});
|
|
188
|
+
|
|
189
|
+
return { tail, expiration, deleteTail };
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
/**
|
|
193
|
+
* Everything captured by the trace worker and sent to us via
|
|
194
|
+
* `wrangler tail` is structured JSON that deserializes to this type.
|
|
195
|
+
*/
|
|
196
|
+
export type TailEventMessage = {
|
|
197
|
+
/**
|
|
198
|
+
* Whether the execution of this worker succeeded or failed
|
|
199
|
+
*/
|
|
200
|
+
outcome: Outcome;
|
|
201
|
+
|
|
202
|
+
/**
|
|
203
|
+
* The name of the script we're tailing
|
|
204
|
+
*/
|
|
205
|
+
scriptName?: string;
|
|
206
|
+
|
|
207
|
+
/**
|
|
208
|
+
* Any exceptions raised by the worker
|
|
209
|
+
*/
|
|
210
|
+
exceptions: {
|
|
211
|
+
/**
|
|
212
|
+
* The name of the exception.
|
|
213
|
+
*/
|
|
214
|
+
name: string;
|
|
215
|
+
|
|
216
|
+
/**
|
|
217
|
+
* The error message
|
|
218
|
+
*/
|
|
219
|
+
message: unknown;
|
|
220
|
+
|
|
221
|
+
/**
|
|
222
|
+
* When the exception was raised/thrown
|
|
223
|
+
*/
|
|
224
|
+
timestamp: number;
|
|
225
|
+
}[];
|
|
226
|
+
|
|
227
|
+
/**
|
|
228
|
+
* Any logs sent out by the worker
|
|
229
|
+
*/
|
|
230
|
+
logs: {
|
|
231
|
+
message: unknown[];
|
|
232
|
+
level: string; // TODO: make this a union of possible values
|
|
233
|
+
timestamp: number;
|
|
234
|
+
}[];
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* When the event was triggered
|
|
238
|
+
*/
|
|
239
|
+
eventTimestamp: number;
|
|
240
|
+
|
|
241
|
+
/**
|
|
242
|
+
* The event that triggered the worker. In the case of an HTTP request,
|
|
243
|
+
* this will be a RequestEvent. If it's a cron trigger, it'll be a
|
|
244
|
+
* ScheduledEvent. If it's a durable object alarm, it's an AlarmEvent.
|
|
245
|
+
*
|
|
246
|
+
* Until workers-types exposes individual types for export, we'll have
|
|
247
|
+
* to just re-define these types ourselves.
|
|
248
|
+
*/
|
|
249
|
+
event: RequestEvent | ScheduledEvent | AlarmEvent | undefined | null;
|
|
250
|
+
};
|
|
251
|
+
|
|
252
|
+
/**
|
|
253
|
+
* A request that triggered worker execution
|
|
254
|
+
*/
|
|
255
|
+
|
|
256
|
+
export type RequestEvent = {
|
|
257
|
+
request: Pick<Request, "url" | "method" | "headers"> & {
|
|
258
|
+
/**
|
|
259
|
+
* Cloudflare-specific properties
|
|
260
|
+
* https://developers.cloudflare.com/workers/runtime-apis/request#incomingrequestcfproperties
|
|
261
|
+
*/
|
|
262
|
+
cf: {
|
|
263
|
+
/**
|
|
264
|
+
* How long (in ms) it took for the client's TCP connection to make a
|
|
265
|
+
* round trip to the worker and back. For all my gamers out there,
|
|
266
|
+
* this is the request's ping
|
|
267
|
+
*/
|
|
268
|
+
clientTcpRtt?: number;
|
|
269
|
+
|
|
270
|
+
/**
|
|
271
|
+
* Longitude and Latitude of where the request originated from
|
|
272
|
+
*/
|
|
273
|
+
longitude?: string;
|
|
274
|
+
latitude?: string;
|
|
275
|
+
|
|
276
|
+
/**
|
|
277
|
+
* What cipher was used to establish the TLS connection
|
|
278
|
+
*/
|
|
279
|
+
tlsCipher: string;
|
|
280
|
+
|
|
281
|
+
/**
|
|
282
|
+
* Which continent the request came from.
|
|
283
|
+
*/
|
|
284
|
+
continent?: "NA";
|
|
285
|
+
|
|
286
|
+
/**
|
|
287
|
+
* ASN of the incoming request
|
|
288
|
+
*/
|
|
289
|
+
asn: number;
|
|
290
|
+
|
|
291
|
+
/**
|
|
292
|
+
* The country the incoming request is coming from
|
|
293
|
+
*/
|
|
294
|
+
country?: string;
|
|
295
|
+
|
|
296
|
+
/**
|
|
297
|
+
* The TLS version the connection used
|
|
298
|
+
*/
|
|
299
|
+
tlsVersion: string;
|
|
300
|
+
|
|
301
|
+
/**
|
|
302
|
+
* The colo that processed the request (i.e. the airport code
|
|
303
|
+
* of the closest city to the server that spun up the worker)
|
|
304
|
+
*/
|
|
305
|
+
colo: string;
|
|
306
|
+
|
|
307
|
+
/**
|
|
308
|
+
* The timezone where the request came from
|
|
309
|
+
*/
|
|
310
|
+
timezone?: string;
|
|
311
|
+
|
|
312
|
+
/**
|
|
313
|
+
* The city where the request came from
|
|
314
|
+
*/
|
|
315
|
+
city?: string;
|
|
316
|
+
|
|
317
|
+
/**
|
|
318
|
+
* The browser-requested prioritization information in the request object
|
|
319
|
+
*/
|
|
320
|
+
requestPriority?: string;
|
|
321
|
+
|
|
322
|
+
/**
|
|
323
|
+
* Which version of HTTP the request came over e.g. "HTTP/2"
|
|
324
|
+
*/
|
|
325
|
+
httpProtocol: string;
|
|
326
|
+
|
|
327
|
+
/**
|
|
328
|
+
* The region where the request originated from
|
|
329
|
+
*/
|
|
330
|
+
region?: string;
|
|
331
|
+
regionCode?: string;
|
|
332
|
+
|
|
333
|
+
/**
|
|
334
|
+
* The organization which owns the ASN of the incoming request, for example, Google Cloud.
|
|
335
|
+
*/
|
|
336
|
+
asOrganization: string;
|
|
337
|
+
|
|
338
|
+
/**
|
|
339
|
+
* Metro code (DMA) of the incoming request, for example, "635".
|
|
340
|
+
*/
|
|
341
|
+
metroCode?: string;
|
|
342
|
+
|
|
343
|
+
/**
|
|
344
|
+
* Postal code of the incoming request, for example, "78701".
|
|
345
|
+
*/
|
|
346
|
+
postalCode?: string;
|
|
347
|
+
};
|
|
348
|
+
};
|
|
349
|
+
};
|
|
350
|
+
|
|
351
|
+
/**
|
|
352
|
+
* An event that was triggered at a certain time
|
|
353
|
+
*/
|
|
354
|
+
export type ScheduledEvent = {
|
|
355
|
+
/**
|
|
356
|
+
* The cron pattern that matched when this event fired
|
|
357
|
+
*/
|
|
358
|
+
cron: string;
|
|
359
|
+
|
|
360
|
+
/**
|
|
361
|
+
* The time this worker was scheduled to run.
|
|
362
|
+
* For some reason, this doesn't...work correctly when we
|
|
363
|
+
* do it directly as a Date. So parse it later on your own.
|
|
364
|
+
*/
|
|
365
|
+
scheduledTime: number;
|
|
366
|
+
};
|
|
367
|
+
|
|
368
|
+
/**
|
|
369
|
+
* A event that was triggered from a durable object alarm
|
|
370
|
+
*/
|
|
371
|
+
export type AlarmEvent = {
|
|
372
|
+
/**
|
|
373
|
+
* The datetime the alarm was scheduled for.
|
|
374
|
+
*
|
|
375
|
+
* This is sent as an ISO timestamp string (different than ScheduledEvent.scheduledTime),
|
|
376
|
+
* you should parse it later on on your own.
|
|
377
|
+
*/
|
|
378
|
+
scheduledTime: string;
|
|
379
|
+
};
|
package/src/tail/filters.ts
CHANGED
|
@@ -58,13 +58,14 @@ type OutcomeFilter = {
|
|
|
58
58
|
|
|
59
59
|
/**
|
|
60
60
|
* There are five possible outcomes we can get, three of which
|
|
61
|
-
* (exception, exceededCpu, and unknown) are considered errors
|
|
61
|
+
* (exception, exceededCpu, exceededMemory, and unknown) are considered errors
|
|
62
62
|
*/
|
|
63
63
|
export type Outcome =
|
|
64
64
|
| "ok"
|
|
65
65
|
| "canceled"
|
|
66
66
|
| "exception"
|
|
67
67
|
| "exceededCpu"
|
|
68
|
+
| "exceededMemory"
|
|
68
69
|
| "unknown";
|
|
69
70
|
|
|
70
71
|
/**
|
|
@@ -121,7 +122,6 @@ type QueryFilter = {
|
|
|
121
122
|
*/
|
|
122
123
|
export type TailFilterMessage = {
|
|
123
124
|
filters: TailAPIFilter[];
|
|
124
|
-
debug: boolean;
|
|
125
125
|
};
|
|
126
126
|
|
|
127
127
|
/**
|
|
@@ -129,12 +129,10 @@ export type TailFilterMessage = {
|
|
|
129
129
|
* into a message that we can send to the tail worker.
|
|
130
130
|
*
|
|
131
131
|
* @param cliFilters An object containing all the filters passed in from the CLI
|
|
132
|
-
* @param debug Whether or not we should be in debug mode
|
|
133
132
|
* @returns A filter message ready to be sent to the tail worker
|
|
134
133
|
*/
|
|
135
134
|
export function translateCLICommandToFilterMessage(
|
|
136
|
-
cliFilters: TailCLIFilters
|
|
137
|
-
debug: boolean
|
|
135
|
+
cliFilters: TailCLIFilters
|
|
138
136
|
): TailFilterMessage {
|
|
139
137
|
const apiFilters: TailAPIFilter[] = [];
|
|
140
138
|
|
|
@@ -164,7 +162,6 @@ export function translateCLICommandToFilterMessage(
|
|
|
164
162
|
|
|
165
163
|
return {
|
|
166
164
|
filters: apiFilters,
|
|
167
|
-
debug,
|
|
168
165
|
};
|
|
169
166
|
}
|
|
170
167
|
|
|
@@ -210,6 +207,7 @@ function parseOutcome(
|
|
|
210
207
|
case "error":
|
|
211
208
|
outcomes.add("exception");
|
|
212
209
|
outcomes.add("exceededCpu");
|
|
210
|
+
outcomes.add("exceededMemory");
|
|
213
211
|
outcomes.add("unknown");
|
|
214
212
|
break;
|
|
215
213
|
|