wrangler 0.0.0-e928f94 → 0.0.0-e95bea2
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/bin/wrangler.js +2 -2
- package/package.json +46 -18
- package/pages/functions/buildWorker.ts +62 -0
- package/pages/functions/filepath-routing.test.ts +123 -0
- package/pages/functions/filepath-routing.ts +178 -0
- package/pages/functions/identifiers.ts +78 -0
- package/pages/functions/routes.ts +151 -0
- package/pages/functions/template-worker.ts +130 -0
- package/src/__tests__/configuration.test.ts +2217 -0
- package/src/__tests__/dev.test.tsx +405 -0
- package/src/__tests__/dev2.test.tsx +152 -0
- package/src/__tests__/guess-worker-format.test.ts +58 -0
- package/src/__tests__/{clipboardy-mock.js → helpers/clipboardy-mock.js} +0 -0
- package/src/__tests__/helpers/cmd-shim.d.ts +11 -0
- package/src/__tests__/helpers/faye-websocket.d.ts +6 -0
- package/src/__tests__/helpers/mock-account-id.ts +44 -0
- package/src/__tests__/helpers/mock-bin.ts +36 -0
- package/src/__tests__/helpers/mock-cfetch.ts +207 -0
- package/src/__tests__/helpers/mock-console.ts +70 -0
- package/src/__tests__/helpers/mock-dialogs.ts +65 -0
- package/src/__tests__/helpers/mock-kv.ts +40 -0
- package/src/__tests__/helpers/mock-stdin.ts +103 -0
- package/src/__tests__/helpers/mock-user.ts +27 -0
- package/src/__tests__/helpers/mock-web-socket.ts +29 -0
- package/src/__tests__/helpers/run-in-tmp.ts +29 -0
- package/src/__tests__/helpers/run-wrangler.ts +16 -0
- package/src/__tests__/helpers/write-wrangler-toml.ts +17 -0
- package/src/__tests__/https-options.test.ts +127 -0
- package/src/__tests__/index.test.ts +957 -119
- package/src/__tests__/jest.setup.ts +69 -0
- package/src/__tests__/kv.test.ts +1408 -0
- package/src/__tests__/logout.test.ts +50 -0
- package/src/__tests__/package-manager.test.ts +206 -0
- package/src/__tests__/pages.test.ts +44 -0
- package/src/__tests__/parse.test.ts +322 -0
- package/src/__tests__/publish.test.ts +2453 -0
- package/src/__tests__/r2.test.ts +198 -0
- package/src/__tests__/route.test.ts +45 -0
- package/src/__tests__/secret.test.ts +425 -0
- package/src/__tests__/sentry.test.ts +146 -0
- package/src/__tests__/tail.test.ts +564 -0
- package/src/__tests__/whoami.test.tsx +86 -0
- package/src/bundle.ts +142 -0
- package/src/cfetch/index.ts +104 -0
- package/src/cfetch/internal.ts +135 -0
- package/src/cli.ts +16 -7
- package/src/config/README.md +107 -0
- package/src/config/config.ts +279 -0
- package/src/config/diagnostics.ts +80 -0
- package/src/config/environment.ts +305 -0
- package/src/config/index.ts +52 -0
- package/src/config/validation-helpers.ts +388 -0
- package/src/config/validation.ts +1027 -0
- package/src/{api/preview.ts → create-worker-preview.ts} +63 -25
- package/src/create-worker-upload-form.ts +217 -0
- package/src/dev/dev.tsx +357 -0
- package/src/dev/local.tsx +241 -0
- package/src/dev/remote.tsx +201 -0
- package/src/dev/use-esbuild.ts +100 -0
- package/src/dialogs.tsx +5 -13
- package/src/entry.ts +159 -0
- package/src/environment-variables.ts +33 -0
- package/src/https-options.ts +122 -0
- package/src/index.tsx +1374 -903
- package/src/inspect.ts +617 -0
- package/src/kv/index.tsx +339 -0
- package/src/module-collection.ts +215 -26
- package/src/open-in-browser.ts +25 -0
- package/src/package-manager.ts +126 -0
- package/src/pages.tsx +452 -250
- package/src/parse.ts +183 -0
- package/src/paths.ts +26 -0
- package/src/proxy.ts +438 -0
- package/src/publish.ts +300 -292
- package/src/r2.ts +50 -0
- package/src/reporting.ts +131 -0
- package/src/selfsigned.d.ts +29 -0
- package/src/sites.tsx +181 -58
- package/src/tail/filters.ts +279 -0
- package/src/tail/index.ts +299 -0
- package/src/tail/printing.ts +62 -0
- package/src/user.tsx +166 -130
- package/src/whoami.tsx +69 -0
- package/src/worker.ts +163 -0
- package/templates/new-worker.js +15 -0
- package/templates/new-worker.ts +15 -0
- package/{static-asset-facade.js → templates/static-asset-facade.js} +0 -0
- package/templates/tsconfig.json +105 -0
- package/wrangler-dist/cli.js +131958 -115793
- package/wrangler-dist/cli.js.map +3 -3
- package/src/__tests__/fixtures/init/.gitkeep +0 -0
- package/src/__tests__/mock-cfetch.js +0 -46
- package/src/api/form_data.ts +0 -141
- package/src/api/inspect.ts +0 -441
- package/src/api/worker.ts +0 -161
- package/src/cfetch.ts +0 -72
- package/src/config.ts +0 -122
- package/src/dev.tsx +0 -724
- package/src/kv.tsx +0 -211
- package/src/tail.tsx +0 -71
package/src/entry.ts
ADDED
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import assert from "node:assert";
|
|
2
|
+
import { existsSync } from "node:fs";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import * as esbuild from "esbuild";
|
|
5
|
+
import { execaCommand } from "execa";
|
|
6
|
+
import type { Config } from "./config";
|
|
7
|
+
import type { CfScriptFormat } from "./worker";
|
|
8
|
+
import type { Metafile } from "esbuild";
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* An entry point for the Worker.
|
|
12
|
+
*
|
|
13
|
+
* It consists not just of a `file`, but also of a `directory` that is used to resolve relative paths.
|
|
14
|
+
*/
|
|
15
|
+
export type Entry = { file: string; directory: string; format: CfScriptFormat };
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Compute the entry-point for the Worker.
|
|
19
|
+
*/
|
|
20
|
+
export async function getEntry(
|
|
21
|
+
args: { script?: string; format?: CfScriptFormat | undefined },
|
|
22
|
+
config: Config,
|
|
23
|
+
command: string
|
|
24
|
+
): Promise<Entry> {
|
|
25
|
+
let file: string;
|
|
26
|
+
let directory = process.cwd();
|
|
27
|
+
if (args.script) {
|
|
28
|
+
// If the script name comes from the command line it is relative to the current working directory.
|
|
29
|
+
file = path.resolve(args.script);
|
|
30
|
+
} else if (config.main === undefined) {
|
|
31
|
+
throw new Error(
|
|
32
|
+
`Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler ${command} path/to/script\`) or the \`main\` config field.`
|
|
33
|
+
);
|
|
34
|
+
} else {
|
|
35
|
+
directory = path.resolve(path.dirname(config.configPath ?? "."));
|
|
36
|
+
file = path.resolve(directory, config.main);
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
await runCustomBuild(file, config.build);
|
|
40
|
+
|
|
41
|
+
if (fileExists(file) === false) {
|
|
42
|
+
throw new Error(
|
|
43
|
+
`Could not resolve "${path.relative(process.cwd(), file)}".`
|
|
44
|
+
);
|
|
45
|
+
}
|
|
46
|
+
const format = await guessWorkerFormat(
|
|
47
|
+
file,
|
|
48
|
+
directory,
|
|
49
|
+
args.format ?? config.build?.upload?.format
|
|
50
|
+
);
|
|
51
|
+
return { file, directory, format };
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
export async function runCustomBuild(
|
|
55
|
+
expectedEntry: string,
|
|
56
|
+
build: Config["build"]
|
|
57
|
+
) {
|
|
58
|
+
if (build?.command) {
|
|
59
|
+
// TODO: add a deprecation message here?
|
|
60
|
+
console.log("running:", build.command);
|
|
61
|
+
await execaCommand(build.command, {
|
|
62
|
+
shell: true,
|
|
63
|
+
stdout: "inherit",
|
|
64
|
+
stderr: "inherit",
|
|
65
|
+
timeout: 1000 * 30,
|
|
66
|
+
...(build.cwd && { cwd: build.cwd }),
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
if (fileExists(expectedEntry) === false) {
|
|
70
|
+
throw new Error(
|
|
71
|
+
`Could not resolve "${path.relative(
|
|
72
|
+
process.cwd(),
|
|
73
|
+
expectedEntry
|
|
74
|
+
)}" after running custom build: ${build.command}`
|
|
75
|
+
);
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* A function to "guess" the type of worker.
|
|
82
|
+
* We do this by running a lightweight build of the actual script,
|
|
83
|
+
* and looking at the metafile generated by esbuild. If it has a default
|
|
84
|
+
* export (or really, any exports), that means it's a "modules" worker.
|
|
85
|
+
* Else, it's a "service-worker" worker. This seems hacky, but works remarkably
|
|
86
|
+
* well in practice.
|
|
87
|
+
*/
|
|
88
|
+
export default async function guessWorkerFormat(
|
|
89
|
+
entryFile: string,
|
|
90
|
+
entryWorkingDirectory: string,
|
|
91
|
+
hint: CfScriptFormat | undefined
|
|
92
|
+
): Promise<CfScriptFormat> {
|
|
93
|
+
const result = await esbuild.build({
|
|
94
|
+
entryPoints: [entryFile],
|
|
95
|
+
absWorkingDir: entryWorkingDirectory,
|
|
96
|
+
metafile: true,
|
|
97
|
+
bundle: false,
|
|
98
|
+
format: "esm",
|
|
99
|
+
write: false,
|
|
100
|
+
});
|
|
101
|
+
// result.metafile is defined because of the `metafile: true` option above.
|
|
102
|
+
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
|
|
103
|
+
const metafile = result.metafile!;
|
|
104
|
+
const entryPoints = Object.entries(metafile.outputs).filter(
|
|
105
|
+
([_path, output]) => output.entryPoint !== undefined
|
|
106
|
+
);
|
|
107
|
+
assert(
|
|
108
|
+
entryPoints.length > 0,
|
|
109
|
+
`Cannot find entry-point "${entryFile}" in generated bundle.` +
|
|
110
|
+
listEntryPoints(entryPoints)
|
|
111
|
+
);
|
|
112
|
+
assert(
|
|
113
|
+
entryPoints.length < 2,
|
|
114
|
+
"More than one entry-point found for generated bundle." +
|
|
115
|
+
listEntryPoints(entryPoints)
|
|
116
|
+
);
|
|
117
|
+
const guessedWorkerFormat =
|
|
118
|
+
entryPoints[0][1].exports.length > 0 ? "modules" : "service-worker";
|
|
119
|
+
|
|
120
|
+
if (hint) {
|
|
121
|
+
if (hint !== guessedWorkerFormat) {
|
|
122
|
+
if (hint === "service-worker") {
|
|
123
|
+
throw new Error(
|
|
124
|
+
"You configured this worker to be a 'service-worker', but the file you are trying to build appears to have ES module exports. Please pass `--format modules`, or simply remove the configuration."
|
|
125
|
+
);
|
|
126
|
+
} else {
|
|
127
|
+
throw new Error(
|
|
128
|
+
"You configured this worker to be 'modules', but the file you are trying to build doesn't export a handler. Please pass `--format service-worker`, or simply remove the configuration."
|
|
129
|
+
);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return guessedWorkerFormat;
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
function listEntryPoints(
|
|
137
|
+
outputs: [string, ValueOf<Metafile["outputs"]>][]
|
|
138
|
+
): string {
|
|
139
|
+
return outputs.map(([_input, output]) => output.entryPoint).join("\n");
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
type ValueOf<T> = T[keyof T];
|
|
143
|
+
|
|
144
|
+
/**
|
|
145
|
+
* Returns true if the given `filePath` exists as-is,
|
|
146
|
+
* or if some version of it (by appending a common extension) exists.
|
|
147
|
+
*/
|
|
148
|
+
export function fileExists(filePath: string): boolean {
|
|
149
|
+
if (path.extname(filePath) !== "") {
|
|
150
|
+
return existsSync(filePath);
|
|
151
|
+
}
|
|
152
|
+
const base = path.join(path.dirname(filePath), path.basename(filePath));
|
|
153
|
+
for (const ext of [".ts", ".tsx", ".js", ".jsx"]) {
|
|
154
|
+
if (existsSync(base + ext)) {
|
|
155
|
+
return true;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Create a function used to access an environment variable.
|
|
3
|
+
*
|
|
4
|
+
* This is not memoized to allow us to change the value at runtime, such as in testing.
|
|
5
|
+
* A warning is shown if the client is using a deprecated version - but only once.
|
|
6
|
+
*/
|
|
7
|
+
export function getEnvironmentVariableFactory({
|
|
8
|
+
variableName,
|
|
9
|
+
deprecatedName,
|
|
10
|
+
defaultValue,
|
|
11
|
+
}: {
|
|
12
|
+
variableName: string;
|
|
13
|
+
deprecatedName?: string;
|
|
14
|
+
defaultValue?: string;
|
|
15
|
+
}) {
|
|
16
|
+
let hasWarned = false;
|
|
17
|
+
return () => {
|
|
18
|
+
if (process.env[variableName]) {
|
|
19
|
+
return process.env[variableName];
|
|
20
|
+
} else if (deprecatedName && process.env[deprecatedName]) {
|
|
21
|
+
if (!hasWarned) {
|
|
22
|
+
// Only show the warning once.
|
|
23
|
+
hasWarned = true;
|
|
24
|
+
console.warn(
|
|
25
|
+
`Using "${deprecatedName}" environment variable. This is deprecated. Please use "${variableName}", instead.`
|
|
26
|
+
);
|
|
27
|
+
}
|
|
28
|
+
return process.env[deprecatedName];
|
|
29
|
+
} else {
|
|
30
|
+
return defaultValue;
|
|
31
|
+
}
|
|
32
|
+
};
|
|
33
|
+
}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import * as fs from "node:fs";
|
|
2
|
+
import { homedir, networkInterfaces } from "node:os";
|
|
3
|
+
import * as path from "node:path";
|
|
4
|
+
import { promisify } from "node:util";
|
|
5
|
+
import type { Attributes, Options } from "selfsigned";
|
|
6
|
+
|
|
7
|
+
// Most of this file has been borrowed from the implementation in Miniflare.
|
|
8
|
+
// See https://github.com/cloudflare/miniflare/blob/870b401ef5/packages/http-server/src/plugin.ts#L313-L397
|
|
9
|
+
// Thanks @mrbbot.
|
|
10
|
+
const CERT_EXPIRY_DAYS = 30;
|
|
11
|
+
const ONE_DAY_IN_MS = 86400000;
|
|
12
|
+
|
|
13
|
+
/**
|
|
14
|
+
* Get the options (i.e. SSL certificates) for running an HTTPS server.
|
|
15
|
+
*
|
|
16
|
+
* The certificates are self-signed and generated locally, and cached in the `CERT_ROOT` directory.
|
|
17
|
+
*/
|
|
18
|
+
export async function getHttpsOptions() {
|
|
19
|
+
const certDirectory = path.join(homedir(), ".wrangler/local-cert");
|
|
20
|
+
const keyPath = path.join(certDirectory, "key.pem");
|
|
21
|
+
const certPath = path.join(certDirectory, "cert.pem");
|
|
22
|
+
|
|
23
|
+
const regenerate =
|
|
24
|
+
!fs.existsSync(keyPath) ||
|
|
25
|
+
!fs.existsSync(certPath) ||
|
|
26
|
+
hasCertificateExpired(keyPath, certPath);
|
|
27
|
+
|
|
28
|
+
if (regenerate) {
|
|
29
|
+
console.log("Generating new self-signed certificate...");
|
|
30
|
+
const { key, cert } = await generateCertificate();
|
|
31
|
+
try {
|
|
32
|
+
// Write certificate files so we can reuse them later.
|
|
33
|
+
fs.mkdirSync(certDirectory, { recursive: true });
|
|
34
|
+
fs.writeFileSync(keyPath, key, "utf8");
|
|
35
|
+
fs.writeFileSync(certPath, cert, "utf8");
|
|
36
|
+
} catch (e) {
|
|
37
|
+
const message = e instanceof Error ? e.message : `${e}`;
|
|
38
|
+
console.warn(
|
|
39
|
+
`Unable to cache generated self-signed certificate in ${certDirectory}.\n${message}`
|
|
40
|
+
);
|
|
41
|
+
}
|
|
42
|
+
return { key, cert };
|
|
43
|
+
} else {
|
|
44
|
+
return {
|
|
45
|
+
key: fs.readFileSync(keyPath, "utf8"),
|
|
46
|
+
cert: fs.readFileSync(certPath, "utf8"),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
/**
|
|
52
|
+
* Determine if the certificate defined in `keyPath` and `certPath` files
|
|
53
|
+
* have expired based on the date when they were last modified.
|
|
54
|
+
*/
|
|
55
|
+
function hasCertificateExpired(keyPath: string, certPath: string): boolean {
|
|
56
|
+
const keyStat = fs.statSync(keyPath);
|
|
57
|
+
const certStat = fs.statSync(certPath);
|
|
58
|
+
const created = Math.max(keyStat.mtimeMs, certStat.mtimeMs);
|
|
59
|
+
return Date.now() - created > (CERT_EXPIRY_DAYS - 2) * ONE_DAY_IN_MS;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Generate a new self-signed certificate and cache it in `CERT_ROOT` directory.
|
|
64
|
+
*/
|
|
65
|
+
async function generateCertificate() {
|
|
66
|
+
// `selfsigned` imports `node-forge`, which is a pretty big library.
|
|
67
|
+
// To reduce startup time, only load this dynamically when needed.
|
|
68
|
+
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
|
|
69
|
+
const generate: typeof import("selfsigned").generate = promisify(
|
|
70
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
71
|
+
require("selfsigned").generate
|
|
72
|
+
);
|
|
73
|
+
|
|
74
|
+
const certAttrs: Attributes = [{ name: "commonName", value: "localhost" }];
|
|
75
|
+
|
|
76
|
+
const certOptions: Options = {
|
|
77
|
+
algorithm: "sha256",
|
|
78
|
+
days: CERT_EXPIRY_DAYS,
|
|
79
|
+
keySize: 2048,
|
|
80
|
+
extensions: [
|
|
81
|
+
{ name: "basicConstraints", cA: true },
|
|
82
|
+
{
|
|
83
|
+
name: "keyUsage",
|
|
84
|
+
keyCertSign: true,
|
|
85
|
+
digitalSignature: true,
|
|
86
|
+
nonRepudiation: true,
|
|
87
|
+
keyEncipherment: true,
|
|
88
|
+
dataEncipherment: true,
|
|
89
|
+
},
|
|
90
|
+
{
|
|
91
|
+
name: "extKeyUsage",
|
|
92
|
+
serverAuth: true,
|
|
93
|
+
clientAuth: true,
|
|
94
|
+
codeSigning: true,
|
|
95
|
+
timeStamping: true,
|
|
96
|
+
},
|
|
97
|
+
{
|
|
98
|
+
name: "subjectAltName",
|
|
99
|
+
altNames: [
|
|
100
|
+
{ type: 2, value: "localhost" },
|
|
101
|
+
...getAccessibleHosts().map((ip) => ({ type: 7, ip })),
|
|
102
|
+
],
|
|
103
|
+
},
|
|
104
|
+
],
|
|
105
|
+
};
|
|
106
|
+
|
|
107
|
+
const { private: key, cert } = await generate(certAttrs, certOptions);
|
|
108
|
+
return { key, cert };
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* Ask the OS for the addresses of locally accessible hosts.
|
|
113
|
+
*/
|
|
114
|
+
function getAccessibleHosts(ipv4 = false): string[] {
|
|
115
|
+
const hosts: string[] = [];
|
|
116
|
+
Object.values(networkInterfaces()).forEach((net) =>
|
|
117
|
+
net?.forEach(({ family, address }) => {
|
|
118
|
+
if (!ipv4 || family === "IPv4") hosts.push(address);
|
|
119
|
+
})
|
|
120
|
+
);
|
|
121
|
+
return hosts;
|
|
122
|
+
}
|