wrangler 0.0.0-e978986 → 0.0.0-e98613f8
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 +162 -62
- package/kv-asset-handler.js +1 -0
- package/miniflare-dist/index.mjs +1456 -21
- package/package.json +191 -152
- package/src/__tests__/access.test.ts +25 -0
- package/src/__tests__/api-dev.test.ts +209 -0
- package/src/__tests__/api-devregistry.test.js +56 -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 +3970 -3363
- package/src/__tests__/d1.test.ts +80 -0
- package/src/__tests__/delete.test.ts +263 -0
- package/src/__tests__/deployments.test.ts +91 -0
- package/src/__tests__/dev.test.tsx +1524 -951
- 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__/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-bin.ts +20 -20
- package/src/__tests__/helpers/mock-cfetch.ts +216 -94
- package/src/__tests__/helpers/mock-console.ts +58 -39
- package/src/__tests__/helpers/mock-dialogs.ts +94 -71
- package/src/__tests__/helpers/mock-get-zone-from-host.ts +8 -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 +7 -0
- package/src/__tests__/helpers/mock-kv.ts +27 -27
- package/src/__tests__/helpers/mock-oauth-flow.ts +229 -228
- package/src/__tests__/helpers/mock-process.ts +39 -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/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/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 +241 -233
- package/src/__tests__/init.test.ts +2884 -1536
- package/src/__tests__/jest.setup.ts +159 -34
- package/src/__tests__/kv.test.ts +1660 -1466
- package/src/__tests__/logger.test.ts +100 -74
- package/src/__tests__/logout.test.ts +47 -0
- package/src/__tests__/metrics.test.ts +450 -0
- package/src/__tests__/middleware.scheduled.test.ts +135 -0
- package/src/__tests__/middleware.test.ts +726 -0
- package/src/__tests__/package-manager.test.ts +303 -303
- package/src/__tests__/pages-deployment-tail.test.ts +820 -0
- package/src/__tests__/pages.test.ts +2423 -638
- package/src/__tests__/parse.test.ts +252 -252
- package/src/__tests__/paths.test.ts +39 -0
- package/src/__tests__/publish.test.ts +7516 -5351
- package/src/__tests__/pubsub.test.ts +370 -0
- package/src/__tests__/queues.test.ts +522 -0
- package/src/__tests__/r2.test.ts +388 -228
- package/src/__tests__/route.test.ts +18 -18
- package/src/__tests__/secret.test.ts +622 -459
- package/src/__tests__/tail.test.ts +776 -567
- package/src/__tests__/test-old-node-version.js +31 -0
- package/src/__tests__/type-generation.test.ts +226 -0
- package/src/__tests__/user.test.ts +117 -119
- 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 +264 -91
- package/src/__tests__/worker-namespace.test.ts +326 -0
- package/src/abort.d.ts +1 -1
- package/src/api/dev.ts +210 -0
- package/src/api/index.ts +2 -0
- package/src/bundle-reporter.tsx +68 -0
- package/src/bundle.ts +785 -162
- package/src/cfetch/index.ts +120 -81
- package/src/cfetch/internal.ts +209 -91
- 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 +498 -357
- package/src/config/index.ts +302 -193
- package/src/config/validation-helpers.ts +379 -357
- package/src/config/validation.ts +1931 -1367
- package/src/config-cache.ts +81 -41
- package/src/create-worker-preview.ts +239 -142
- package/src/create-worker-upload-form.ts +300 -238
- 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 +184 -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 +77 -0
- package/src/deprecated/index.ts +438 -0
- package/src/dev/dev-vars.ts +20 -17
- package/src/dev/dev.tsx +547 -352
- package/src/dev/get-local-persistence-path.tsx +31 -0
- package/src/dev/local.tsx +870 -298
- package/src/dev/remote.tsx +591 -215
- package/src/dev/start-server.ts +539 -0
- package/src/dev/use-esbuild.ts +183 -97
- package/src/dev/validate-dev-props.ts +31 -0
- package/src/dev-registry.tsx +201 -0
- package/src/dev.tsx +913 -0
- package/src/dialogs.tsx +132 -99
- package/src/dispatch-namespace.ts +207 -0
- package/src/durable.ts +87 -87
- package/src/entry.ts +235 -228
- package/src/environment-variables.ts +38 -23
- package/src/errors.ts +6 -6
- 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.tsx +630 -2791
- package/src/init.ts +970 -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/kv/helpers.ts +430 -0
- package/src/kv/index.ts +596 -0
- package/src/logger.ts +67 -41
- 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 +96 -0
- package/src/miniflare-cli/assets.ts +220 -0
- package/src/miniflare-cli/index.ts +205 -33
- package/src/miniflare-cli/request-context.ts +18 -18
- 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.tsx +270 -0
- package/src/pages/constants.ts +18 -0
- package/src/pages/deployment-tails.tsx +284 -0
- package/src/pages/deployments.tsx +84 -0
- package/src/pages/dev.tsx +706 -0
- package/src/pages/errors.ts +66 -0
- package/src/pages/functions/buildPlugin.ts +107 -0
- package/src/pages/functions/buildWorker.ts +166 -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.tsx +82 -0
- package/src/pages/hash.tsx +13 -0
- package/src/pages/index.tsx +102 -0
- package/src/pages/projects.tsx +169 -0
- package/src/pages/prompt-select-project.tsx +31 -0
- package/src/pages/publish.tsx +451 -0
- package/src/pages/types.ts +41 -0
- package/src/pages/upload.tsx +426 -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 +1035 -0
- package/src/pubsub/index.ts +286 -0
- package/src/pubsub/pubsub-commands.tsx +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 +378 -0
- package/src/selfsigned.d.ts +23 -23
- package/src/sites.tsx +280 -203
- package/src/tail/createTail.ts +379 -0
- package/src/tail/filters.ts +108 -110
- package/src/tail/index.ts +211 -296
- package/src/tail/printing.ts +86 -46
- package/src/type-generation.ts +173 -0
- package/src/update-check.ts +11 -11
- package/src/user/access.ts +69 -0
- package/src/user/choose-account.tsx +69 -0
- package/src/user/env-vars.ts +46 -0
- package/src/user/generate-auth-url.ts +33 -0
- package/src/user/generate-random-state.ts +16 -0
- package/src/user/index.ts +3 -0
- package/src/user/user.tsx +1198 -0
- package/src/utils/collectKeyValues.ts +14 -0
- package/src/whoami.tsx +141 -42
- package/src/worker.ts +171 -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/checked-fetch.js +17 -0
- package/templates/d1-beta-facade.js +205 -0
- package/templates/first-party-worker-module-facade.ts +18 -0
- package/templates/format-dev-errors.ts +32 -0
- package/templates/init-tests/test-jest-new-worker.js +25 -0
- package/templates/init-tests/test-vitest-new-worker.js +26 -0
- package/templates/middleware/common.ts +62 -0
- package/templates/middleware/loader-modules.ts +84 -0
- package/templates/middleware/loader-sw.ts +227 -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 +4 -4
- package/templates/new-worker-scheduled.ts +16 -16
- 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 +28 -0
- package/templates/pages-dev-util.ts +52 -0
- package/templates/pages-shim.ts +9 -0
- package/templates/pages-template-plugin.ts +171 -0
- package/templates/pages-template-worker.ts +189 -0
- package/templates/serve-static-assets.ts +63 -0
- package/templates/service-bindings-module-facade.js +54 -0
- package/templates/service-bindings-sw-facade.js +42 -0
- package/templates/tsconfig.json +96 -95
- package/wrangler-dist/cli.d.ts +893 -0
- package/wrangler-dist/cli.js +146463 -108710
- 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/kv.ts +0 -408
- package/src/miniflare-cli/enum-keys.ts +0 -17
- package/src/pages.tsx +0 -2027
- package/src/publish.ts +0 -583
- package/src/r2.ts +0 -50
- package/src/user.tsx +0 -1203
- 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
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { execa } from "execa";
|
|
5
|
+
import { findUp } from "find-up";
|
|
6
|
+
import semiver from "semiver";
|
|
7
|
+
|
|
8
|
+
/**
|
|
9
|
+
* Check whether the given current working directory is within a git repository
|
|
10
|
+
* by looking for a `.git` directory in this or an ancestor directory.
|
|
11
|
+
*/
|
|
12
|
+
export async function isInsideGitRepo(cwd: string) {
|
|
13
|
+
const res = await findUp(".git", { cwd, type: "directory" });
|
|
14
|
+
return res !== undefined;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Check whether git is installed by trying to run it.
|
|
19
|
+
*
|
|
20
|
+
* @returns a `string` containing the version of git that's installed, or `null` if git isn't installed
|
|
21
|
+
*/
|
|
22
|
+
export async function getGitVersioon(): Promise<string | null> {
|
|
23
|
+
try {
|
|
24
|
+
const gitVersionExecutionResult = await execa("git", ["--version"]);
|
|
25
|
+
if (gitVersionExecutionResult.exitCode !== 0) {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const [gitVersion] =
|
|
30
|
+
/\d+.\d+.\d+/.exec(gitVersionExecutionResult.stdout) || [];
|
|
31
|
+
return gitVersion;
|
|
32
|
+
} catch (err) {
|
|
33
|
+
return null;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Initialize a new Worker project with a git repository.
|
|
39
|
+
*
|
|
40
|
+
* We want the branch to be called `main` but earlier versions of git do not support `--initial-branch`.
|
|
41
|
+
* If that is the case then we just fallback to the default initial branch name.
|
|
42
|
+
*/
|
|
43
|
+
export async function initializeGit(cwd: string) {
|
|
44
|
+
try {
|
|
45
|
+
// Get the default init branch name
|
|
46
|
+
const { stdout: defaultBranchName } = await execa("git", [
|
|
47
|
+
"config",
|
|
48
|
+
"--get",
|
|
49
|
+
"init.defaultBranch",
|
|
50
|
+
]);
|
|
51
|
+
|
|
52
|
+
// Try to create the repository with the HEAD branch of defaultBranchName ?? `main`.
|
|
53
|
+
await execa(
|
|
54
|
+
"git",
|
|
55
|
+
["init", "--initial-branch", defaultBranchName.trim() ?? "main"],
|
|
56
|
+
{
|
|
57
|
+
cwd,
|
|
58
|
+
}
|
|
59
|
+
);
|
|
60
|
+
} catch {
|
|
61
|
+
// Unable to create the repo with a HEAD branch name, so just fall back to the default.
|
|
62
|
+
await execa("git", ["init"], {
|
|
63
|
+
cwd,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Clone a repository into a given directory, optionally applying a given filter for a sparse checkout.
|
|
70
|
+
* Note: this does NOT initialize a git repository, that must be done separately.
|
|
71
|
+
*
|
|
72
|
+
* @param remote the remote repository to clone
|
|
73
|
+
* @param targetDirectory the directory to clone into
|
|
74
|
+
* @param subdirectory optional, clone a subdirectory instead of the whole repo
|
|
75
|
+
*/
|
|
76
|
+
export async function cloneIntoDirectory(
|
|
77
|
+
remote: string,
|
|
78
|
+
targetDirectory: string,
|
|
79
|
+
subdirectory?: string
|
|
80
|
+
) {
|
|
81
|
+
const args = ["clone", "--depth", "1"];
|
|
82
|
+
|
|
83
|
+
const gitVersion = await getGitVersioon();
|
|
84
|
+
if (!gitVersion) {
|
|
85
|
+
throw new Error("Failed to find git installation");
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
// sparse checkouts were added in git 2.26.0, and allow for...sparse...checkouts...
|
|
89
|
+
// basically it means you can checkout only certain files/folders/etc. instead of
|
|
90
|
+
// the whole repo. useful for monorepos that may, for example,
|
|
91
|
+
// contain multiple wrangler templates
|
|
92
|
+
const useSparseCheckout = subdirectory && semiver(gitVersion, "2.26.0") > -1;
|
|
93
|
+
if (useSparseCheckout) {
|
|
94
|
+
args.push("--filter=blob:none", "--sparse");
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
const tagIndex = remote.lastIndexOf("#");
|
|
98
|
+
if (tagIndex === -1) {
|
|
99
|
+
args.push(remote);
|
|
100
|
+
} else {
|
|
101
|
+
args.push("-b", remote.substring(tagIndex + 1));
|
|
102
|
+
args.push(remote.substring(0, tagIndex));
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
// we first clone into a temporary directory so that if something goes wrong,
|
|
106
|
+
// the user's filesystem isn't left in a messed-up state
|
|
107
|
+
const tempDir = fs.mkdtempSync(
|
|
108
|
+
path.join(os.tmpdir(), `wrangler-generate-repo-`)
|
|
109
|
+
);
|
|
110
|
+
args.push(tempDir);
|
|
111
|
+
|
|
112
|
+
await execa("git", args);
|
|
113
|
+
|
|
114
|
+
// if we can use sparse checkout, run it now.
|
|
115
|
+
// otherwise, the entire repo was cloned anyway, so skip this step
|
|
116
|
+
if (useSparseCheckout) {
|
|
117
|
+
await execa("git", [`sparse-checkout`, `set`, subdirectory], {
|
|
118
|
+
cwd: tempDir,
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
const templatePath =
|
|
123
|
+
subdirectory !== undefined ? path.join(tempDir, subdirectory) : tempDir;
|
|
124
|
+
|
|
125
|
+
// cleanup: move the template to the target directory and delete `.git`
|
|
126
|
+
try {
|
|
127
|
+
fs.renameSync(templatePath, targetDirectory);
|
|
128
|
+
} catch {
|
|
129
|
+
throw new Error(`Failed to find "${subdirectory}" in ${remote}`);
|
|
130
|
+
}
|
|
131
|
+
fs.rmSync(path.join(targetDirectory, ".git"), {
|
|
132
|
+
recursive: true,
|
|
133
|
+
force: true,
|
|
134
|
+
});
|
|
135
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import xdgAppPaths from "xdg-app-paths";
|
|
5
|
+
|
|
6
|
+
function isDirectory(configPath: string) {
|
|
7
|
+
try {
|
|
8
|
+
return fs.statSync(configPath).isDirectory();
|
|
9
|
+
} catch (error) {
|
|
10
|
+
// ignore error
|
|
11
|
+
return false;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export function getGlobalWranglerConfigPath() {
|
|
16
|
+
//TODO: We should implement a custom path --global-config and/or the WRANGLER_HOME type environment variable
|
|
17
|
+
const configDir = xdgAppPaths(".wrangler").config(); // New XDG compliant config path
|
|
18
|
+
const legacyConfigDir = path.join(os.homedir(), ".wrangler"); // Legacy config in user's home directory
|
|
19
|
+
|
|
20
|
+
// Check for the .wrangler directory in root if it is not there then use the XDG compliant path.
|
|
21
|
+
if (isDirectory(legacyConfigDir)) {
|
|
22
|
+
return legacyConfigDir;
|
|
23
|
+
} else {
|
|
24
|
+
return configDir;
|
|
25
|
+
}
|
|
26
|
+
}
|
package/src/https-options.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import * as fs from "node:fs";
|
|
2
|
-
import
|
|
2
|
+
import os from "node:os";
|
|
3
3
|
import * as path from "node:path";
|
|
4
4
|
import { promisify } from "node:util";
|
|
5
|
+
import { getGlobalWranglerConfigPath } from "./global-wrangler-config-path";
|
|
5
6
|
import { logger } from "./logger";
|
|
6
7
|
import type { Attributes, Options } from "selfsigned";
|
|
7
8
|
|
|
@@ -17,36 +18,39 @@ const ONE_DAY_IN_MS = 86400000;
|
|
|
17
18
|
* The certificates are self-signed and generated locally, and cached in the `CERT_ROOT` directory.
|
|
18
19
|
*/
|
|
19
20
|
export async function getHttpsOptions() {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
21
|
+
const certDirectory = path.join(getGlobalWranglerConfigPath(), "local-cert");
|
|
22
|
+
const keyPath = path.join(certDirectory, "key.pem");
|
|
23
|
+
const certPath = path.join(certDirectory, "cert.pem");
|
|
23
24
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
25
|
+
const regenerate =
|
|
26
|
+
!fs.existsSync(keyPath) ||
|
|
27
|
+
!fs.existsSync(certPath) ||
|
|
28
|
+
hasCertificateExpired(keyPath, certPath);
|
|
28
29
|
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
30
|
+
if (regenerate) {
|
|
31
|
+
logger.log("Generating new self-signed certificate...");
|
|
32
|
+
const { key, cert } = await generateCertificate();
|
|
33
|
+
try {
|
|
34
|
+
// Write certificate files so we can reuse them later.
|
|
35
|
+
fs.mkdirSync(certDirectory, { recursive: true });
|
|
36
|
+
fs.writeFileSync(keyPath, key, "utf8");
|
|
37
|
+
fs.writeFileSync(certPath, cert, "utf8");
|
|
38
|
+
} catch (e) {
|
|
39
|
+
const message = e instanceof Error ? e.message : `${e}`;
|
|
40
|
+
logger.warn(
|
|
41
|
+
`Unable to cache generated self-signed certificate in ${path.relative(
|
|
42
|
+
process.cwd(),
|
|
43
|
+
certDirectory
|
|
44
|
+
)}.\n${message}`
|
|
45
|
+
);
|
|
46
|
+
}
|
|
47
|
+
return { key, cert };
|
|
48
|
+
} else {
|
|
49
|
+
return {
|
|
50
|
+
key: fs.readFileSync(keyPath, "utf8"),
|
|
51
|
+
cert: fs.readFileSync(certPath, "utf8"),
|
|
52
|
+
};
|
|
53
|
+
}
|
|
50
54
|
}
|
|
51
55
|
|
|
52
56
|
/**
|
|
@@ -54,70 +58,70 @@ export async function getHttpsOptions() {
|
|
|
54
58
|
* have expired based on the date when they were last modified.
|
|
55
59
|
*/
|
|
56
60
|
function hasCertificateExpired(keyPath: string, certPath: string): boolean {
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
+
const keyStat = fs.statSync(keyPath);
|
|
62
|
+
const certStat = fs.statSync(certPath);
|
|
63
|
+
const created = Math.max(keyStat.mtimeMs, certStat.mtimeMs);
|
|
64
|
+
return Date.now() - created > (CERT_EXPIRY_DAYS - 2) * ONE_DAY_IN_MS;
|
|
61
65
|
}
|
|
62
66
|
|
|
63
67
|
/**
|
|
64
68
|
* Generate a new self-signed certificate and cache it in `CERT_ROOT` directory.
|
|
65
69
|
*/
|
|
66
70
|
async function generateCertificate() {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
71
|
+
// `selfsigned` imports `node-forge`, which is a pretty big library.
|
|
72
|
+
// To reduce startup time, only load this dynamically when needed.
|
|
73
|
+
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
|
|
74
|
+
const generate: typeof import("selfsigned").generate = promisify(
|
|
75
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
76
|
+
require("selfsigned").generate
|
|
77
|
+
);
|
|
74
78
|
|
|
75
|
-
|
|
79
|
+
const certAttrs: Attributes = [{ name: "commonName", value: "localhost" }];
|
|
76
80
|
|
|
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
|
-
|
|
81
|
+
const certOptions: Options = {
|
|
82
|
+
algorithm: "sha256",
|
|
83
|
+
days: CERT_EXPIRY_DAYS,
|
|
84
|
+
keySize: 2048,
|
|
85
|
+
extensions: [
|
|
86
|
+
{ name: "basicConstraints", cA: true },
|
|
87
|
+
{
|
|
88
|
+
name: "keyUsage",
|
|
89
|
+
keyCertSign: true,
|
|
90
|
+
digitalSignature: true,
|
|
91
|
+
nonRepudiation: true,
|
|
92
|
+
keyEncipherment: true,
|
|
93
|
+
dataEncipherment: true,
|
|
94
|
+
},
|
|
95
|
+
{
|
|
96
|
+
name: "extKeyUsage",
|
|
97
|
+
serverAuth: true,
|
|
98
|
+
clientAuth: true,
|
|
99
|
+
codeSigning: true,
|
|
100
|
+
timeStamping: true,
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
name: "subjectAltName",
|
|
104
|
+
altNames: [
|
|
105
|
+
{ type: 2, value: "localhost" },
|
|
106
|
+
...getAccessibleHosts().map((ip) => ({ type: 7, ip })),
|
|
107
|
+
],
|
|
108
|
+
},
|
|
109
|
+
],
|
|
110
|
+
};
|
|
107
111
|
|
|
108
|
-
|
|
109
|
-
|
|
112
|
+
const { private: key, cert } = await generate(certAttrs, certOptions);
|
|
113
|
+
return { key, cert };
|
|
110
114
|
}
|
|
111
115
|
|
|
112
116
|
/**
|
|
113
117
|
* Ask the OS for the addresses of locally accessible hosts.
|
|
114
118
|
*/
|
|
115
119
|
function getAccessibleHosts(ipv4 = false): string[] {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
120
|
+
const hosts: string[] = [];
|
|
121
|
+
Object.values(os.networkInterfaces()).forEach((net) =>
|
|
122
|
+
net?.forEach(({ family, address }) => {
|
|
123
|
+
if (!ipv4 || family === "IPv4") hosts.push(address);
|
|
124
|
+
})
|
|
125
|
+
);
|
|
126
|
+
return hosts;
|
|
123
127
|
}
|