create-signkit 0.1.6 → 0.1.8
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/dist/providers/cloudflare/cloudflare-client.d.ts +92 -0
- package/dist/providers/cloudflare/cloudflare-client.d.ts.map +1 -0
- package/dist/providers/cloudflare/cloudflare-client.js +322 -0
- package/dist/providers/cloudflare/cloudflare-client.js.map +1 -0
- package/dist/providers/cloudflare/reconciler.d.ts +2 -2
- package/dist/providers/cloudflare/reconciler.d.ts.map +1 -1
- package/dist/providers/cloudflare/reconciler.js +22 -23
- package/dist/providers/cloudflare/reconciler.js.map +1 -1
- package/dist/providers/cloudflare/wrangler.d.ts +0 -32
- package/dist/providers/cloudflare/wrangler.d.ts.map +1 -1
- package/dist/providers/cloudflare/wrangler.js +5 -127
- package/dist/providers/cloudflare/wrangler.js.map +1 -1
- package/dist/runtime/process.d.ts +6 -1
- package/dist/runtime/process.d.ts.map +1 -1
- package/dist/runtime/process.js +8 -3
- package/dist/runtime/process.js.map +1 -1
- package/dist/runtime.d.ts +3 -2
- package/dist/runtime.d.ts.map +1 -1
- package/dist/runtime.js +5 -4
- package/dist/runtime.js.map +1 -1
- package/package.json +7 -6
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { type ProcessRunner } from '../../runtime/process.js';
|
|
2
|
+
import { assertSuccessfulUpload, isMissingWorkerError, sortWorkerVersions, type DeployResult, type TriggerDeployOptions, type UploadVersionOptions, type WorkerVersion } from './wrangler.js';
|
|
3
|
+
export { assertSuccessfulUpload, isMissingWorkerError, sortWorkerVersions };
|
|
4
|
+
export type { DeployResult, TriggerDeployOptions, UploadVersionOptions, WorkerVersion };
|
|
5
|
+
/**
|
|
6
|
+
* CLI-neutral port consumed by the reconciler.
|
|
7
|
+
*
|
|
8
|
+
* The installed `cf` CLI (1.0.0-beta.14) runs: whoami (`accounts list`),
|
|
9
|
+
* listD1/createD1 (`d1 list`/`d1 create`), D1 remote migrations
|
|
10
|
+
* (`d1 migrations list`/`apply` for pending, `d1 query` for applied
|
|
11
|
+
* history), R2 (`r2 buckets get`/`create`), secret-name inspection, and exact
|
|
12
|
+
* version traffic publication (`workers deployments create`).
|
|
13
|
+
*
|
|
14
|
+
* Worker version inspection, uploads, trigger reconciliation, and D1 export
|
|
15
|
+
* retain the Wrangler compatibility client. The authenticated v1 archive
|
|
16
|
+
* contains Wrangler configuration, not cf
|
|
17
|
+
* Build Output. Native upload must first prove equivalent no-rebundle, strict
|
|
18
|
+
* override, retained-var, secret-file, and partial-failure recovery behavior
|
|
19
|
+
* before replacing that path. See docs/architecture/create-signkit.md for the
|
|
20
|
+
* next-phase gate.
|
|
21
|
+
*/
|
|
22
|
+
export interface CloudflareClient {
|
|
23
|
+
whoami(): Promise<Whoami>;
|
|
24
|
+
listD1(): Promise<D1Database[]>;
|
|
25
|
+
createD1(name: string): Promise<D1Database>;
|
|
26
|
+
exportD1(name: string, outputPath: string): Promise<void>;
|
|
27
|
+
listMigrations(options: MigrationCommandOptions): Promise<MigrationList>;
|
|
28
|
+
applyMigrations(options: MigrationCommandOptions): Promise<string[]>;
|
|
29
|
+
r2Exists(name: string): Promise<boolean>;
|
|
30
|
+
createR2(name: string): Promise<void>;
|
|
31
|
+
listSecrets(workerName: string): Promise<string[]>;
|
|
32
|
+
listVersions(workerName: string): Promise<WorkerVersion[]>;
|
|
33
|
+
deployFirst(options: UploadVersionOptions): Promise<DeployResult>;
|
|
34
|
+
uploadVersion(options: UploadVersionOptions): Promise<DeployResult>;
|
|
35
|
+
deployVersion(workerName: string, versionId: string): Promise<void>;
|
|
36
|
+
deployTriggers(options: TriggerDeployOptions): Promise<void>;
|
|
37
|
+
invocations(): readonly CloudflareInvocation[];
|
|
38
|
+
}
|
|
39
|
+
export interface CloudflareInvocation {
|
|
40
|
+
args: string[];
|
|
41
|
+
cwd?: string;
|
|
42
|
+
env: NodeJS.ProcessEnv;
|
|
43
|
+
}
|
|
44
|
+
export interface Whoami {
|
|
45
|
+
accounts: Array<{
|
|
46
|
+
id: string;
|
|
47
|
+
name?: string;
|
|
48
|
+
}>;
|
|
49
|
+
}
|
|
50
|
+
export interface D1Database {
|
|
51
|
+
uuid: string;
|
|
52
|
+
name: string;
|
|
53
|
+
}
|
|
54
|
+
export interface MigrationList {
|
|
55
|
+
pending: string[];
|
|
56
|
+
applied: string[];
|
|
57
|
+
}
|
|
58
|
+
export interface MigrationCommandOptions {
|
|
59
|
+
d1Id: string;
|
|
60
|
+
migrationsDir: string;
|
|
61
|
+
}
|
|
62
|
+
export interface CloudflareClientOptions {
|
|
63
|
+
runner: ProcessRunner;
|
|
64
|
+
accountId: string;
|
|
65
|
+
env: NodeJS.ProcessEnv;
|
|
66
|
+
cfBin?: string;
|
|
67
|
+
wranglerBin?: string;
|
|
68
|
+
nodeExecutable?: string;
|
|
69
|
+
}
|
|
70
|
+
export declare function resolveCfBin(from?: string): string;
|
|
71
|
+
export declare function accountIdIsAuthorized(whoami: Whoami, accountId: string): boolean;
|
|
72
|
+
export declare function assertSelectedAccountAuthorized(whoami: Whoami, accountId: string): void;
|
|
73
|
+
export declare function createCloudflareClient(options: CloudflareClientOptions): CloudflareClient;
|
|
74
|
+
/**
|
|
75
|
+
* `cf d1 migrations list` on the verified 1.0.0-beta.14 build emits a JSON
|
|
76
|
+
* array of rows shaped `{"Name":"0045_...sql"}` (capital `Name`, not the
|
|
77
|
+
* lowercase `name`/`filename` keys Wrangler's text tables would scrape).
|
|
78
|
+
* Any other shape is treated as a hard failure rather than an empty pending
|
|
79
|
+
* list, since silently returning no pending migrations would let a broken
|
|
80
|
+
* parser bypass the schema-epoch check below it.
|
|
81
|
+
*/
|
|
82
|
+
export declare function parseCfMigrationNames(stdout: string, label: string): string[];
|
|
83
|
+
/**
|
|
84
|
+
* Applied migration history cannot come from `cf d1 migrations list` (it
|
|
85
|
+
* only reports what is pending), so it is read back with `cf d1 query`
|
|
86
|
+
* against the d1_migrations bookkeeping table Wrangler/D1 maintain. The SDK
|
|
87
|
+
* query result is an array of per-statement results, each with an explicit
|
|
88
|
+
* `success` flag; a missing or false flag is a hard failure, never an empty
|
|
89
|
+
* applied list.
|
|
90
|
+
*/
|
|
91
|
+
export declare function parseD1QueryAppliedNames(stdout: string): string[];
|
|
92
|
+
//# sourceMappingURL=cloudflare-client.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflare-client.d.ts","sourceRoot":"","sources":["../../../src/providers/cloudflare/cloudflare-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,322 @@
|
|
|
1
|
+
import { mkdtemp, rm } from 'node:fs/promises';
|
|
2
|
+
import { createRequire } from 'node:module';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { dirname, join } from 'node:path';
|
|
5
|
+
import { generic, preflight, unavailable } from '../../cli/errors.js';
|
|
6
|
+
import { filterEnvForCloudflareCli } from '../../runtime/process.js';
|
|
7
|
+
import { assertSuccessfulUpload, createWranglerClient, isMissingWorkerError, sortWorkerVersions } from './wrangler.js';
|
|
8
|
+
export { assertSuccessfulUpload, isMissingWorkerError, sortWorkerVersions };
|
|
9
|
+
export function resolveCfBin(from = import.meta.url) {
|
|
10
|
+
const require = createRequire(from);
|
|
11
|
+
const pkg = require.resolve('cf/package.json');
|
|
12
|
+
return join(dirname(pkg), 'bin', 'cf');
|
|
13
|
+
}
|
|
14
|
+
export function accountIdIsAuthorized(whoami, accountId) {
|
|
15
|
+
const wanted = accountId.toLowerCase();
|
|
16
|
+
return whoami.accounts.some((account) => account.id.toLowerCase() === wanted);
|
|
17
|
+
}
|
|
18
|
+
export function assertSelectedAccountAuthorized(whoami, accountId) {
|
|
19
|
+
if (!accountIdIsAuthorized(whoami, accountId)) {
|
|
20
|
+
throw preflight('the selected --account-id is not present in this cf CLI session');
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
export function createCloudflareClient(options) {
|
|
24
|
+
const cfBin = options.cfBin ?? resolveCfBin();
|
|
25
|
+
const nodeExecutable = options.nodeExecutable ?? process.execPath;
|
|
26
|
+
const invocations = [];
|
|
27
|
+
const childEnv = filterEnvForCloudflareCli(options.env, options.accountId);
|
|
28
|
+
const wrangler = createWranglerClient({
|
|
29
|
+
runner: options.runner,
|
|
30
|
+
accountId: options.accountId,
|
|
31
|
+
env: options.env,
|
|
32
|
+
wranglerBin: options.wranglerBin,
|
|
33
|
+
nodeExecutable: options.nodeExecutable
|
|
34
|
+
});
|
|
35
|
+
async function run(args, cwd, errorDetail) {
|
|
36
|
+
let discoveryCwd;
|
|
37
|
+
const resolvedCwd = cwd ?? (discoveryCwd = await mkdtemp(join(tmpdir(), 'create-signkit-cf-')));
|
|
38
|
+
try {
|
|
39
|
+
const invocation = { args, cwd: resolvedCwd, env: childEnv };
|
|
40
|
+
invocations.push(invocation);
|
|
41
|
+
const result = await options.runner.run({
|
|
42
|
+
file: nodeExecutable,
|
|
43
|
+
argv: [cfBin, ...args],
|
|
44
|
+
cwd: resolvedCwd,
|
|
45
|
+
env: childEnv
|
|
46
|
+
});
|
|
47
|
+
if (result.code !== 0) {
|
|
48
|
+
const detail = errorDetail === 'hidden' ? '' : formatCfError(result.stderr, result.stdout);
|
|
49
|
+
throw unavailable(`cf ${args[0]} ${args[1] ?? ''}`.trim() + ` failed (exit ${result.code})${detail}`);
|
|
50
|
+
}
|
|
51
|
+
return result;
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
if (discoveryCwd) {
|
|
55
|
+
await rm(discoveryCwd, { recursive: true, force: true });
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
// cf prints only the current API page, discarding result_info. Exhaust every
|
|
60
|
+
// bounded page before the reconciler may conclude that a resource is absent.
|
|
61
|
+
async function readPages(command, label, idKey, hidden = false) {
|
|
62
|
+
const rows = [];
|
|
63
|
+
const identities = new Set();
|
|
64
|
+
for (let page = 1; page <= 100; page += 1) {
|
|
65
|
+
const result = await run([...command, '--page', String(page), '--per-page', '50'], undefined, hidden ? 'hidden' : undefined);
|
|
66
|
+
const batch = parseJsonArray(result.stdout, label);
|
|
67
|
+
if (batch.length > 50)
|
|
68
|
+
throw generic(`${label} exceeded the requested page size`);
|
|
69
|
+
for (const row of batch) {
|
|
70
|
+
const id = asObject(row)[idKey];
|
|
71
|
+
if (typeof id !== 'string' || id.length === 0 || identities.has(id)) {
|
|
72
|
+
throw generic(`${label} returned a malformed or repeated resource identity`);
|
|
73
|
+
}
|
|
74
|
+
identities.add(id);
|
|
75
|
+
rows.push(row);
|
|
76
|
+
}
|
|
77
|
+
if (batch.length < 50)
|
|
78
|
+
return rows;
|
|
79
|
+
}
|
|
80
|
+
throw generic(`${label} exceeded the discovery page limit; resource absence is not proven`);
|
|
81
|
+
}
|
|
82
|
+
return {
|
|
83
|
+
invocations() {
|
|
84
|
+
return invocations;
|
|
85
|
+
},
|
|
86
|
+
async whoami() {
|
|
87
|
+
const rows = await readPages(['accounts', 'list'], 'cf accounts list', 'id', true);
|
|
88
|
+
return {
|
|
89
|
+
accounts: rows.map((row) => {
|
|
90
|
+
const record = asObject(row);
|
|
91
|
+
return { id: String(record.id ?? ''), name: optionalString(record.name) };
|
|
92
|
+
})
|
|
93
|
+
};
|
|
94
|
+
},
|
|
95
|
+
async listD1() {
|
|
96
|
+
const rows = await readPages(['d1', 'list'], 'cf d1 list', 'uuid');
|
|
97
|
+
return rows.map((row) => {
|
|
98
|
+
const record = asObject(row);
|
|
99
|
+
const uuid = String(record.uuid ?? record.id ?? '');
|
|
100
|
+
const name = String(record.name ?? '');
|
|
101
|
+
if (!uuid || !name) {
|
|
102
|
+
throw generic('cf d1 list returned a row without uuid/name');
|
|
103
|
+
}
|
|
104
|
+
return { uuid, name };
|
|
105
|
+
});
|
|
106
|
+
},
|
|
107
|
+
async createD1(name) {
|
|
108
|
+
const result = await run(['d1', 'create', '--name', name]);
|
|
109
|
+
const record = asObject(parseJsonValue(result.stdout, 'cf d1 create'));
|
|
110
|
+
const uuid = String(record.uuid ?? record.id ?? '');
|
|
111
|
+
if (!uuid) {
|
|
112
|
+
throw generic(`cf d1 create ${name} did not return a database id`);
|
|
113
|
+
}
|
|
114
|
+
return { uuid, name: String(record.name ?? name) };
|
|
115
|
+
},
|
|
116
|
+
async exportD1(name, outputPath) {
|
|
117
|
+
await wrangler.exportD1(name, outputPath);
|
|
118
|
+
},
|
|
119
|
+
async listMigrations(options) {
|
|
120
|
+
const pendingResult = await run([
|
|
121
|
+
'd1',
|
|
122
|
+
'migrations',
|
|
123
|
+
'list',
|
|
124
|
+
options.d1Id,
|
|
125
|
+
'--dir',
|
|
126
|
+
options.migrationsDir
|
|
127
|
+
]);
|
|
128
|
+
const pending = parseCfMigrationNames(pendingResult.stdout, 'cf d1 migrations list');
|
|
129
|
+
const queryResult = await run([
|
|
130
|
+
'd1',
|
|
131
|
+
'query',
|
|
132
|
+
options.d1Id,
|
|
133
|
+
'--sql',
|
|
134
|
+
'SELECT name FROM d1_migrations ORDER BY id'
|
|
135
|
+
]);
|
|
136
|
+
const applied = parseD1QueryAppliedNames(queryResult.stdout);
|
|
137
|
+
return { pending, applied };
|
|
138
|
+
},
|
|
139
|
+
async applyMigrations(options) {
|
|
140
|
+
await run(['d1', 'migrations', 'apply', options.d1Id, '--dir', options.migrationsDir]);
|
|
141
|
+
return [];
|
|
142
|
+
},
|
|
143
|
+
async r2Exists(name) {
|
|
144
|
+
try {
|
|
145
|
+
await run(['r2', 'buckets', 'get', name]);
|
|
146
|
+
return true;
|
|
147
|
+
}
|
|
148
|
+
catch (error) {
|
|
149
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
150
|
+
if (/not found|does not exist|couldn't find|404/i.test(message)) {
|
|
151
|
+
return false;
|
|
152
|
+
}
|
|
153
|
+
throw error;
|
|
154
|
+
}
|
|
155
|
+
},
|
|
156
|
+
async createR2(name) {
|
|
157
|
+
await run(['r2', 'buckets', 'create', '--name', name]);
|
|
158
|
+
},
|
|
159
|
+
async listSecrets(workerName) {
|
|
160
|
+
try {
|
|
161
|
+
const result = await run(['workers', 'secrets', 'list', '--worker', workerName]);
|
|
162
|
+
const rows = parseJsonValue(result.stdout, 'cf workers secrets list');
|
|
163
|
+
if (!Array.isArray(rows) || rows.length > 1000) {
|
|
164
|
+
throw generic('cf workers secrets list returned a malformed or oversized list');
|
|
165
|
+
}
|
|
166
|
+
const names = new Set();
|
|
167
|
+
for (const row of rows) {
|
|
168
|
+
const name = asObject(row).name;
|
|
169
|
+
if (typeof name !== 'string' || name.length === 0 || names.has(name)) {
|
|
170
|
+
throw generic('cf workers secrets list returned a malformed or duplicate name');
|
|
171
|
+
}
|
|
172
|
+
names.add(name);
|
|
173
|
+
}
|
|
174
|
+
return [...names];
|
|
175
|
+
}
|
|
176
|
+
catch (error) {
|
|
177
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
178
|
+
if (isMissingWorkerError(message))
|
|
179
|
+
return [];
|
|
180
|
+
throw error;
|
|
181
|
+
}
|
|
182
|
+
},
|
|
183
|
+
async listVersions(workerName) {
|
|
184
|
+
return wrangler.listVersions(workerName);
|
|
185
|
+
},
|
|
186
|
+
async deployFirst(options) {
|
|
187
|
+
return wrangler.deployFirst(options);
|
|
188
|
+
},
|
|
189
|
+
async uploadVersion(options) {
|
|
190
|
+
return wrangler.uploadVersion(options);
|
|
191
|
+
},
|
|
192
|
+
async deployVersion(workerName, versionId) {
|
|
193
|
+
if (!isUuid(versionId))
|
|
194
|
+
throw generic('a valid Worker version id is required');
|
|
195
|
+
const result = await run([
|
|
196
|
+
'workers',
|
|
197
|
+
'deployments',
|
|
198
|
+
'create',
|
|
199
|
+
'--worker',
|
|
200
|
+
workerName,
|
|
201
|
+
'--strategy',
|
|
202
|
+
'percentage',
|
|
203
|
+
'--versions',
|
|
204
|
+
JSON.stringify([{ version_id: versionId, percentage: 100 }])
|
|
205
|
+
]);
|
|
206
|
+
const deployment = asObject(parseJsonValue(result.stdout, 'cf workers deployments create'));
|
|
207
|
+
const versions = deployment.versions;
|
|
208
|
+
const selected = Array.isArray(versions) && versions.length === 1 ? asObject(versions[0]) : {};
|
|
209
|
+
if (!isUuid(deployment.id) ||
|
|
210
|
+
deployment.strategy !== 'percentage' ||
|
|
211
|
+
typeof selected.version_id !== 'string' ||
|
|
212
|
+
selected.version_id.toLowerCase() !== versionId.toLowerCase() ||
|
|
213
|
+
selected.percentage !== 100) {
|
|
214
|
+
throw generic('cf Worker deployment did not confirm the exact requested version at 100%');
|
|
215
|
+
}
|
|
216
|
+
},
|
|
217
|
+
async deployTriggers(options) {
|
|
218
|
+
await wrangler.deployTriggers(options);
|
|
219
|
+
}
|
|
220
|
+
};
|
|
221
|
+
}
|
|
222
|
+
/**
|
|
223
|
+
* `cf d1 migrations list` on the verified 1.0.0-beta.14 build emits a JSON
|
|
224
|
+
* array of rows shaped `{"Name":"0045_...sql"}` (capital `Name`, not the
|
|
225
|
+
* lowercase `name`/`filename` keys Wrangler's text tables would scrape).
|
|
226
|
+
* Any other shape is treated as a hard failure rather than an empty pending
|
|
227
|
+
* list, since silently returning no pending migrations would let a broken
|
|
228
|
+
* parser bypass the schema-epoch check below it.
|
|
229
|
+
*/
|
|
230
|
+
export function parseCfMigrationNames(stdout, label) {
|
|
231
|
+
const parsed = parseJsonValue(stdout, label);
|
|
232
|
+
if (!Array.isArray(parsed)) {
|
|
233
|
+
throw generic(`expected a JSON array of migration rows from ${label}`);
|
|
234
|
+
}
|
|
235
|
+
return parsed.map((row) => {
|
|
236
|
+
const record = asObject(row);
|
|
237
|
+
const name = record.Name;
|
|
238
|
+
if (typeof name !== 'string' || name.length === 0) {
|
|
239
|
+
throw generic(`${label} returned a row without a Name field`);
|
|
240
|
+
}
|
|
241
|
+
return name;
|
|
242
|
+
});
|
|
243
|
+
}
|
|
244
|
+
/**
|
|
245
|
+
* Applied migration history cannot come from `cf d1 migrations list` (it
|
|
246
|
+
* only reports what is pending), so it is read back with `cf d1 query`
|
|
247
|
+
* against the d1_migrations bookkeeping table Wrangler/D1 maintain. The SDK
|
|
248
|
+
* query result is an array of per-statement results, each with an explicit
|
|
249
|
+
* `success` flag; a missing or false flag is a hard failure, never an empty
|
|
250
|
+
* applied list.
|
|
251
|
+
*/
|
|
252
|
+
export function parseD1QueryAppliedNames(stdout) {
|
|
253
|
+
const parsed = parseJsonValue(stdout, 'cf d1 query');
|
|
254
|
+
if (!Array.isArray(parsed) || parsed.length !== 1) {
|
|
255
|
+
throw generic('expected exactly one query result from cf d1 query');
|
|
256
|
+
}
|
|
257
|
+
const applied = [];
|
|
258
|
+
for (const entry of parsed) {
|
|
259
|
+
const record = asObject(entry);
|
|
260
|
+
if (record.success !== true) {
|
|
261
|
+
throw generic('cf d1 query reported an unsuccessful result for the d1_migrations lookup');
|
|
262
|
+
}
|
|
263
|
+
const rows = record.results;
|
|
264
|
+
if (!Array.isArray(rows)) {
|
|
265
|
+
throw generic('cf d1 query result is missing a results array');
|
|
266
|
+
}
|
|
267
|
+
for (const row of rows) {
|
|
268
|
+
const name = asObject(row).name;
|
|
269
|
+
if (typeof name !== 'string' || name.length === 0) {
|
|
270
|
+
throw generic('cf d1 query returned a d1_migrations row without a name');
|
|
271
|
+
}
|
|
272
|
+
applied.push(name);
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
return applied;
|
|
276
|
+
}
|
|
277
|
+
function parseJsonValue(stdout, label) {
|
|
278
|
+
const trimmed = stdout.trim();
|
|
279
|
+
const start = trimmed.search(/[[{]/);
|
|
280
|
+
if (start === -1) {
|
|
281
|
+
throw generic(`expected JSON output from ${label}`);
|
|
282
|
+
}
|
|
283
|
+
try {
|
|
284
|
+
return JSON.parse(trimmed.slice(start));
|
|
285
|
+
}
|
|
286
|
+
catch {
|
|
287
|
+
throw generic(`failed to parse JSON output from ${label}`);
|
|
288
|
+
}
|
|
289
|
+
}
|
|
290
|
+
function parseJsonArray(stdout, label) {
|
|
291
|
+
const parsed = parseJsonValue(stdout, label);
|
|
292
|
+
if (Array.isArray(parsed)) {
|
|
293
|
+
return parsed;
|
|
294
|
+
}
|
|
295
|
+
if (isObject(parsed) && Array.isArray(parsed.result)) {
|
|
296
|
+
return parsed.result;
|
|
297
|
+
}
|
|
298
|
+
throw generic(`expected a JSON array from ${label}`);
|
|
299
|
+
}
|
|
300
|
+
function formatCfError(stderr, stdout) {
|
|
301
|
+
const text = (stderr || stdout).trim().split(/\r?\n/).slice(0, 8).join('\n');
|
|
302
|
+
return text ? `\n${redactSecrets(text)}` : '';
|
|
303
|
+
}
|
|
304
|
+
function redactSecrets(text) {
|
|
305
|
+
return text
|
|
306
|
+
.replace(/(bearer\s+)[^\s]+/gi, '$1[REDACTED]')
|
|
307
|
+
.replace(/(token["\s:=]+)[^\s"]+/gi, '$1[REDACTED]');
|
|
308
|
+
}
|
|
309
|
+
function asObject(value) {
|
|
310
|
+
return isObject(value) ? value : {};
|
|
311
|
+
}
|
|
312
|
+
function isObject(value) {
|
|
313
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
314
|
+
}
|
|
315
|
+
function optionalString(value) {
|
|
316
|
+
return typeof value === 'string' ? value : undefined;
|
|
317
|
+
}
|
|
318
|
+
function isUuid(value) {
|
|
319
|
+
return (typeof value === 'string' &&
|
|
320
|
+
/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(value));
|
|
321
|
+
}
|
|
322
|
+
//# sourceMappingURL=cloudflare-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflare-client.js","sourceRoot":"","sources":["../../../src/providers/cloudflare/cloudflare-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,12 +4,12 @@ import type { ReleaseProvenance } from '../../release/provenance.js';
|
|
|
4
4
|
import type { BundleExtractor } from '../../release/extract.js';
|
|
5
5
|
import type { FileSystem } from '../../runtime/fs.js';
|
|
6
6
|
import type { HttpClient } from '../../runtime/http.js';
|
|
7
|
-
import { type
|
|
7
|
+
import { type CloudflareClient } from './cloudflare-client.js';
|
|
8
8
|
export interface ReconcileRuntime {
|
|
9
9
|
fs: FileSystem;
|
|
10
10
|
http: HttpClient;
|
|
11
11
|
releases: ReleaseResolver;
|
|
12
|
-
|
|
12
|
+
cloudflare: CloudflareClient;
|
|
13
13
|
extractor: BundleExtractor;
|
|
14
14
|
now: () => Date;
|
|
15
15
|
env: NodeJS.ProcessEnv;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["../../../src/providers/cloudflare/reconciler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,KAAK,EAEX,eAAe,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,0BAA0B,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAuBxD,OAAO,EAQN,KAAK,
|
|
1
|
+
{"version":3,"file":"reconciler.d.ts","sourceRoot":"","sources":["../../../src/providers/cloudflare/reconciler.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAErE,OAAO,KAAK,EAEX,eAAe,EAEf,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAmB,MAAM,0BAA0B,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAuBxD,OAAO,EAQN,KAAK,gBAAgB,EACrB,MAAM,wBAAwB,CAAC;AAEhC,MAAM,WAAW,gBAAgB;IAChC,EAAE,EAAE,UAAU,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,eAAe,CAAC;IAC1B,UAAU,EAAE,gBAAgB,CAAC;IAC7B,SAAS,EAAE,eAAe,CAAC;IAC3B,GAAG,EAAE,MAAM,IAAI,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,SAAS,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,CAAC;CAC3C;AAED,MAAM,WAAW,QAAQ;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,YAAY,EAAE,KAAK,CAAC;IACpB,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAe;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAC/B;AAYD,wBAAsB,mBAAmB,CACxC,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,gBAAgB,GACvB,OAAO,CAAC,eAAe,CAAC,CAyE1B"}
|
|
@@ -8,8 +8,8 @@ import { createStateStore, d1BackupFileName, resolveBackupsDir, resolveStatePath
|
|
|
8
8
|
import { renderWranglerConfig } from './config.js';
|
|
9
9
|
import { selectProductionWorkersDevOrigin, smokeCheck } from './smoke.js';
|
|
10
10
|
import { posixRelativeToRoot } from '../../release/paths.js';
|
|
11
|
-
import { assertSelectedAccountAuthorized, assertSuccessfulUpload, isMissingWorkerError, sortWorkerVersions } from './
|
|
12
|
-
const BOOTSTRAP_WARNING_CONFIGURED = 'The bootstrap owner email is configured as a non-secret Worker var.
|
|
11
|
+
import { assertSelectedAccountAuthorized, assertSuccessfulUpload, isMissingWorkerError, sortWorkerVersions } from './cloudflare-client.js';
|
|
12
|
+
const BOOTSTRAP_WARNING_CONFIGURED = 'The bootstrap owner email is configured as a non-secret Worker var. If this is a fresh or uninitialized instance, claim the initial owner immediately via POST /api/v1/instance/bootstrap before advertising this URL: only the matching verified identity can claim it, and the window stays open until then. Initialized instances retain their existing owner and do not bootstrap again.';
|
|
13
13
|
const BOOTSTRAP_WARNING_MISSING = 'No bootstrap owner email is configured: an uninitialized instance fails closed and cannot be claimed. Pass --bootstrap-owner-email <email> to deploy or upgrade; create-signkit applies it as a non-secret Worker var.';
|
|
14
14
|
function bootstrapWarningFor(target) {
|
|
15
15
|
return target.bootstrapOwnerEmail ? BOOTSTRAP_WARNING_CONFIGURED : BOOTSTRAP_WARNING_MISSING;
|
|
@@ -25,8 +25,8 @@ export async function reconcileCloudflare(input, runtime) {
|
|
|
25
25
|
throw conflict('upgrade requires recorded local state; adopt the existing Worker before upgrading rather than taking it over');
|
|
26
26
|
}
|
|
27
27
|
const target = resolveEffectiveConfig(input, existing);
|
|
28
|
-
assertSelectedAccountAuthorized(await runtime.
|
|
29
|
-
const remote = await inspectRemote(runtime.
|
|
28
|
+
assertSelectedAccountAuthorized(await runtime.cloudflare.whoami(), target.accountId);
|
|
29
|
+
const remote = await inspectRemote(runtime.cloudflare, target);
|
|
30
30
|
assertUpgradeRouteUnchanged(input, existing);
|
|
31
31
|
const drift = detectDrift(existing, target, remote);
|
|
32
32
|
if (drift.length > 0 && input.command !== 'adopt' && input.command !== 'plan') {
|
|
@@ -130,14 +130,14 @@ async function deployOrUpgrade(input, target, runtime, stateStore, existing, rem
|
|
|
130
130
|
if (isUuid(target.d1)) {
|
|
131
131
|
throw conflict(`D1 id ${target.d1} was not found; pass a D1 name to create it, or adopt an existing database`);
|
|
132
132
|
}
|
|
133
|
-
current.d1 = await runtime.
|
|
133
|
+
current.d1 = await runtime.cloudflare.createD1(target.d1);
|
|
134
134
|
mutations.push('create-d1');
|
|
135
135
|
}
|
|
136
136
|
if (!current.r2Exists) {
|
|
137
137
|
if (input.command !== 'deploy' || existing) {
|
|
138
138
|
throw conflict(`R2 bucket ${target.r2} does not exist`);
|
|
139
139
|
}
|
|
140
|
-
await runtime.
|
|
140
|
+
await runtime.cloudflare.createR2(target.r2);
|
|
141
141
|
current.r2Exists = true;
|
|
142
142
|
mutations.push('create-r2');
|
|
143
143
|
}
|
|
@@ -161,17 +161,16 @@ async function deployOrUpgrade(input, target, runtime, stateStore, existing, rem
|
|
|
161
161
|
backupPath = await persistD1Backup(runtime, stateStore.path, current.d1.name);
|
|
162
162
|
mutations.push('d1-export');
|
|
163
163
|
const migrationOptions = {
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
database: current.d1.name
|
|
164
|
+
d1Id: current.d1.uuid,
|
|
165
|
+
migrationsDir: extracted.migrationsDirectory
|
|
167
166
|
};
|
|
168
|
-
const migrations = await runtime.
|
|
167
|
+
const migrations = await runtime.cloudflare.listMigrations(migrationOptions);
|
|
169
168
|
assertCompatibleSchemaEpoch(existing, release, migrations.applied);
|
|
170
169
|
const pending = [...migrations.pending];
|
|
171
170
|
if (pending.length > 0) {
|
|
172
|
-
await runtime.
|
|
171
|
+
await runtime.cloudflare.applyMigrations(migrationOptions);
|
|
173
172
|
mutations.push('d1-migrations');
|
|
174
|
-
const remaining = await runtime.
|
|
173
|
+
const remaining = await runtime.cloudflare.listMigrations(migrationOptions);
|
|
175
174
|
if (remaining.pending.length > 0) {
|
|
176
175
|
throw generic(`D1 migrations remain pending after apply: ${remaining.pending.join(', ')}`);
|
|
177
176
|
}
|
|
@@ -190,12 +189,12 @@ async function deployOrUpgrade(input, target, runtime, stateStore, existing, rem
|
|
|
190
189
|
let uploaded;
|
|
191
190
|
if (requiresFirstWorkerUpload) {
|
|
192
191
|
try {
|
|
193
|
-
uploaded = assertSuccessfulUpload(await runtime.
|
|
192
|
+
uploaded = assertSuccessfulUpload(await runtime.cloudflare.deployFirst(uploadOptions));
|
|
194
193
|
}
|
|
195
194
|
catch (error) {
|
|
196
195
|
let versionsAfterFailure;
|
|
197
196
|
try {
|
|
198
|
-
versionsAfterFailure = sortWorkerVersions(await runtime.
|
|
197
|
+
versionsAfterFailure = sortWorkerVersions(await runtime.cloudflare.listVersions(target.workerName));
|
|
199
198
|
}
|
|
200
199
|
catch (inspectionError) {
|
|
201
200
|
const inspectionDetail = inspectionError instanceof Error ? inspectionError.message : String(inspectionError);
|
|
@@ -251,13 +250,13 @@ async function deployOrUpgrade(input, target, runtime, stateStore, existing, rem
|
|
|
251
250
|
mutations.push('deploy');
|
|
252
251
|
}
|
|
253
252
|
else {
|
|
254
|
-
uploaded = assertSuccessfulUpload(await runtime.
|
|
253
|
+
uploaded = assertSuccessfulUpload(await runtime.cloudflare.uploadVersion(uploadOptions));
|
|
255
254
|
assertNewWorkerVersion(uploaded.workerVersionId, previousVersionId);
|
|
256
255
|
mutations.push('versions-upload');
|
|
257
|
-
await runtime.
|
|
256
|
+
await runtime.cloudflare.deployVersion(target.workerName, uploaded.workerVersionId);
|
|
258
257
|
mutations.push('versions-deploy');
|
|
259
258
|
try {
|
|
260
|
-
await runtime.
|
|
259
|
+
await runtime.cloudflare.deployTriggers({
|
|
261
260
|
cwd: extracted.root,
|
|
262
261
|
configPath: extracted.configPath,
|
|
263
262
|
workerName: target.workerName
|
|
@@ -414,7 +413,7 @@ async function persistD1Backup(runtime, statePath, d1Name) {
|
|
|
414
413
|
await runtime.fs.mkdir(dir, { mode: BACKUP_DIR_MODE });
|
|
415
414
|
await runtime.fs.chmod(dir, BACKUP_DIR_MODE);
|
|
416
415
|
const backupPath = await uniqueD1BackupPath(runtime, dir, d1Name);
|
|
417
|
-
await runtime.
|
|
416
|
+
await runtime.cloudflare.exportD1(d1Name, backupPath);
|
|
418
417
|
await runtime.fs.chmod(backupPath, BACKUP_FILE_MODE);
|
|
419
418
|
return backupPath;
|
|
420
419
|
}
|
|
@@ -457,12 +456,12 @@ function triggerReconciliationFailureReport(activeWorkerVersionId, previousWorke
|
|
|
457
456
|
guidance: `State records active Worker version ${activeWorkerVersionId} with triggerReconciliationRequired. Automatic Worker-only rollback and HTTPS smoke were not attempted because trigger reconciliation may have partially applied. Inspect the active routes and Cron Triggers, then rerun the same deploy or upgrade command to reconcile them.`
|
|
458
457
|
};
|
|
459
458
|
}
|
|
460
|
-
async function inspectRemote(
|
|
459
|
+
async function inspectRemote(cloudflare, target) {
|
|
461
460
|
const [databases, r2Exists, versions, secretNames] = await Promise.all([
|
|
462
|
-
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
461
|
+
cloudflare.listD1(),
|
|
462
|
+
cloudflare.r2Exists(target.r2),
|
|
463
|
+
cloudflare.listVersions(target.workerName),
|
|
464
|
+
cloudflare.listSecrets(target.workerName)
|
|
466
465
|
]);
|
|
467
466
|
const d1 = databases.find((database) => database.name === target.d1 || database.uuid === target.d1);
|
|
468
467
|
return {
|