@hs-x/cli 0.4.5 → 0.4.6
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/cloudflare-account-preflight.d.ts +26 -0
- package/dist/cloudflare-account-preflight.d.ts.map +1 -0
- package/dist/cloudflare-account-preflight.js +64 -0
- package/dist/cloudflare-account-preflight.js.map +1 -0
- package/dist/cloudflare-kv.d.ts.map +1 -1
- package/dist/cloudflare-kv.js +31 -6
- package/dist/cloudflare-kv.js.map +1 -1
- package/dist/cloudflare-pointer.d.ts.map +1 -1
- package/dist/cloudflare-pointer.js +9 -3
- package/dist/cloudflare-pointer.js.map +1 -1
- package/dist/cloudflare-scoped-resource.d.ts +6 -0
- package/dist/cloudflare-scoped-resource.d.ts.map +1 -1
- package/dist/cloudflare-scoped-resource.js +13 -6
- package/dist/cloudflare-scoped-resource.js.map +1 -1
- package/dist/commands/deploy.d.ts.map +1 -1
- package/dist/commands/deploy.js +226 -23
- package/dist/commands/deploy.js.map +1 -1
- package/dist/constants.d.ts +1 -1
- package/dist/constants.js +1 -1
- package/dist/control-plane-tenant-provisioning.d.ts +2 -0
- package/dist/control-plane-tenant-provisioning.d.ts.map +1 -1
- package/dist/control-plane-tenant-provisioning.js +15 -2
- package/dist/control-plane-tenant-provisioning.js.map +1 -1
- package/dist/errors-registry.d.ts.map +1 -1
- package/dist/errors-registry.js +36 -0
- package/dist/errors-registry.js.map +1 -1
- package/dist/services/cloudflare-kv.d.ts.map +1 -1
- package/dist/services/cloudflare-kv.js +22 -4
- package/dist/services/cloudflare-kv.js.map +1 -1
- package/dist/tenant-state.d.ts +18 -0
- package/dist/tenant-state.d.ts.map +1 -1
- package/dist/tenant-state.js +72 -29
- package/dist/tenant-state.js.map +1 -1
- package/package.json +8 -8
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { CloudflareScopedResourceKind } from './cloudflare-scoped-resource.js';
|
|
2
|
+
export declare class CloudflareAnalyticsEngineDisabledError extends Error {
|
|
3
|
+
readonly accountId: string;
|
|
4
|
+
readonly name = "CloudflareAnalyticsEngineDisabledError";
|
|
5
|
+
readonly code: "HSX_E_CLOUDFLARE_ANALYTICS_ENGINE_DISABLED";
|
|
6
|
+
constructor(accountId: string);
|
|
7
|
+
}
|
|
8
|
+
export declare function validateCloudflareResourceForAccount(input: {
|
|
9
|
+
readonly accountId: string;
|
|
10
|
+
readonly apiToken: string;
|
|
11
|
+
readonly kind: CloudflareScopedResourceKind;
|
|
12
|
+
readonly resourceId: string;
|
|
13
|
+
readonly fetchImpl?: typeof fetch;
|
|
14
|
+
}): Promise<boolean>;
|
|
15
|
+
export declare function preflightCloudflareAnalyticsEngine(input: {
|
|
16
|
+
readonly accountId: string;
|
|
17
|
+
readonly apiToken: string;
|
|
18
|
+
readonly fetchImpl?: typeof fetch;
|
|
19
|
+
}): Promise<void>;
|
|
20
|
+
export declare function classifyCloudflareCommandFailure(input: {
|
|
21
|
+
readonly accountId?: string;
|
|
22
|
+
readonly stdout: string;
|
|
23
|
+
readonly stderr: string;
|
|
24
|
+
readonly exitCode: number | null;
|
|
25
|
+
}): Error;
|
|
26
|
+
//# sourceMappingURL=cloudflare-account-preflight.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflare-account-preflight.d.ts","sourceRoot":"","sources":["../src/cloudflare-account-preflight.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,iCAAiC,CAAC;AAEpF,qBAAa,sCAAuC,SAAQ,KAAK;IAInD,QAAQ,CAAC,SAAS,EAAE,MAAM;IAHtC,SAAkB,IAAI,4CAA4C;IAClE,QAAQ,CAAC,IAAI,EAAG,4CAA4C,CAAU;gBAEjD,SAAS,EAAE,MAAM;CAOvC;AAaD,wBAAsB,oCAAoC,CAAC,KAAK,EAAE;IAChE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CACnC,GAAG,OAAO,CAAC,OAAO,CAAC,CAmBnB;AAED,wBAAsB,kCAAkC,CAAC,KAAK,EAAE;IAC9D,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CACnC,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhB;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE;IACtD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,GAAG,KAAK,CAQR"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
export class CloudflareAnalyticsEngineDisabledError extends Error {
|
|
2
|
+
accountId;
|
|
3
|
+
name = 'CloudflareAnalyticsEngineDisabledError';
|
|
4
|
+
code = 'HSX_E_CLOUDFLARE_ANALYTICS_ENGINE_DISABLED';
|
|
5
|
+
constructor(accountId) {
|
|
6
|
+
super(`HSX_E_CLOUDFLARE_ANALYTICS_ENGINE_DISABLED: Workers Analytics Engine is not enabled for Cloudflare account ${accountId}. Enable it at https://dash.cloudflare.com/${encodeURIComponent(accountId)}/analytics/analytics-engine and run hs-x deploy again.`);
|
|
7
|
+
this.accountId = accountId;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
function apiBaseUrl() {
|
|
11
|
+
return (process.env.HSX_CLOUDFLARE_API_BASE_URL ?? 'https://api.cloudflare.com/client/v4').replace(/\/$/, '');
|
|
12
|
+
}
|
|
13
|
+
function resourcePath(kind, resourceId) {
|
|
14
|
+
if (kind === 'tenant-d1')
|
|
15
|
+
return `/d1/database/${encodeURIComponent(resourceId)}`;
|
|
16
|
+
return `/storage/kv/namespaces/${encodeURIComponent(resourceId)}`;
|
|
17
|
+
}
|
|
18
|
+
export async function validateCloudflareResourceForAccount(input) {
|
|
19
|
+
const fetchImpl = input.fetchImpl ?? fetch;
|
|
20
|
+
const response = await fetchImpl(`${apiBaseUrl()}/accounts/${encodeURIComponent(input.accountId)}${resourcePath(input.kind, input.resourceId)}`, { headers: { authorization: `Bearer ${input.apiToken}` } });
|
|
21
|
+
if (response.status === 404)
|
|
22
|
+
return false;
|
|
23
|
+
if (!response.ok) {
|
|
24
|
+
const detail = await response.text().catch(() => '');
|
|
25
|
+
throw new Error(`HSX_E_CLOUDFLARE_RESOURCE_VALIDATION_FAILED: Could not validate ${input.kind} ${input.resourceId} in Cloudflare account ${input.accountId} (${response.status})${detail ? `: ${detail.slice(0, 300)}` : ''}`);
|
|
26
|
+
}
|
|
27
|
+
return true;
|
|
28
|
+
}
|
|
29
|
+
export async function preflightCloudflareAnalyticsEngine(input) {
|
|
30
|
+
const fetchImpl = input.fetchImpl ?? fetch;
|
|
31
|
+
const response = await fetchImpl(`${apiBaseUrl()}/accounts/${encodeURIComponent(input.accountId)}/analytics_engine/sql`, {
|
|
32
|
+
method: 'POST',
|
|
33
|
+
headers: {
|
|
34
|
+
authorization: `Bearer ${input.apiToken}`,
|
|
35
|
+
'content-type': 'text/plain',
|
|
36
|
+
},
|
|
37
|
+
body: 'SHOW TABLES',
|
|
38
|
+
});
|
|
39
|
+
if (response.ok)
|
|
40
|
+
return;
|
|
41
|
+
const detail = await response.text().catch(() => '');
|
|
42
|
+
if (/\b10089\b|analytics engine[^\n]*(?:not enabled|enable)/i.test(detail)) {
|
|
43
|
+
throw new CloudflareAnalyticsEngineDisabledError(input.accountId);
|
|
44
|
+
}
|
|
45
|
+
// Cloudflare's connected OAuth access tokens are accepted by Wrangler's
|
|
46
|
+
// Workers APIs but the Analytics SQL endpoint currently authenticates only
|
|
47
|
+
// API tokens. That specific response is indeterminate, not "disabled";
|
|
48
|
+
// Wrangler's upload classifier remains the exact final guard.
|
|
49
|
+
if (response.status === 401 && /\b10000\b|authentication error/i.test(detail))
|
|
50
|
+
return;
|
|
51
|
+
// Some API-compatible test/dev endpoints do not expose the SQL route. The
|
|
52
|
+
// Wrangler error classifier below remains the final fail-closed guard.
|
|
53
|
+
if (response.status === 404)
|
|
54
|
+
return;
|
|
55
|
+
throw new Error(`HSX_E_CLOUDFLARE_ANALYTICS_PREFLIGHT_FAILED: Could not verify Workers Analytics Engine for Cloudflare account ${input.accountId} (${response.status})${detail ? `: ${detail.slice(0, 300)}` : ''}`);
|
|
56
|
+
}
|
|
57
|
+
export function classifyCloudflareCommandFailure(input) {
|
|
58
|
+
const detail = input.stderr || input.stdout;
|
|
59
|
+
if (/\b10089\b|analytics engine[^\n]*(?:not enabled|enable)/i.test(detail)) {
|
|
60
|
+
return new CloudflareAnalyticsEngineDisabledError(input.accountId ?? 'unknown');
|
|
61
|
+
}
|
|
62
|
+
return new Error(`Cloudflare deploy failed with exit code ${input.exitCode ?? 'unknown'}.\n${detail}`);
|
|
63
|
+
}
|
|
64
|
+
//# sourceMappingURL=cloudflare-account-preflight.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cloudflare-account-preflight.js","sourceRoot":"","sources":["../src/cloudflare-account-preflight.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-kv.d.ts","sourceRoot":"","sources":["../src/cloudflare-kv.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC9D,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CACnC,GAAG,kBAAkB,
|
|
1
|
+
{"version":3,"file":"cloudflare-kv.d.ts","sourceRoot":"","sources":["../src/cloudflare-kv.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC9D,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;IACjD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CACnC,GAAG,kBAAkB,CA8IrB;AAMD,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG;IACrE,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;CACxC,CAYA"}
|
package/dist/cloudflare-kv.js
CHANGED
|
@@ -22,19 +22,41 @@ export function createCloudflareKvClient(input) {
|
|
|
22
22
|
throw new Error('Cloudflare KV namespace has not been initialized.');
|
|
23
23
|
return namespaceId;
|
|
24
24
|
};
|
|
25
|
+
const namespacesPath = `/client/v4/accounts/${encodeURIComponent(input.accountId)}/storage/kv/namespaces`;
|
|
26
|
+
const findNamespace = async (name) => {
|
|
27
|
+
const url = new URL(namespacesPath, baseUrl);
|
|
28
|
+
url.searchParams.set('per_page', '1000');
|
|
29
|
+
const listResponse = await api(`${url.pathname}${url.search}`);
|
|
30
|
+
const listBody = (await listResponse.json());
|
|
31
|
+
const existing = listBody.result?.find((item) => item.title === name);
|
|
32
|
+
return existing?.id && existing.title ? { id: existing.id, title: existing.title } : undefined;
|
|
33
|
+
};
|
|
25
34
|
return {
|
|
26
35
|
async ensureNamespace(name) {
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
const existing = listBody.result?.find((item) => item.title === name);
|
|
30
|
-
if (existing?.id && existing.title) {
|
|
36
|
+
const existing = await findNamespace(name);
|
|
37
|
+
if (existing) {
|
|
31
38
|
namespaceId = existing.id;
|
|
32
|
-
return
|
|
39
|
+
return existing;
|
|
33
40
|
}
|
|
34
|
-
const createResponse = await
|
|
41
|
+
const createResponse = await fetchImpl(new URL(namespacesPath, baseUrl), {
|
|
35
42
|
method: 'POST',
|
|
43
|
+
headers: {
|
|
44
|
+
authorization: `Bearer ${input.apiToken}`,
|
|
45
|
+
'content-type': 'application/json',
|
|
46
|
+
},
|
|
36
47
|
body: JSON.stringify({ title: name }),
|
|
37
48
|
});
|
|
49
|
+
if (!createResponse.ok) {
|
|
50
|
+
const detail = await createResponse.text().catch(() => '');
|
|
51
|
+
if (isNamespaceAlreadyExists(createResponse.status, detail)) {
|
|
52
|
+
const adopted = await findNamespace(name);
|
|
53
|
+
if (adopted) {
|
|
54
|
+
namespaceId = adopted.id;
|
|
55
|
+
return adopted;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
throw new Error(`Cloudflare KV request failed (${createResponse.status})${detail ? `: ${detail}` : ''}`);
|
|
59
|
+
}
|
|
38
60
|
const createBody = (await createResponse.json());
|
|
39
61
|
if (!createBody.result?.id) {
|
|
40
62
|
throw new Error('Cloudflare KV namespace create response did not include an id.');
|
|
@@ -80,6 +102,9 @@ export function createCloudflareKvClient(input) {
|
|
|
80
102
|
},
|
|
81
103
|
};
|
|
82
104
|
}
|
|
105
|
+
function isNamespaceAlreadyExists(status, detail) {
|
|
106
|
+
return status === 400 && /(?:\b10014\b|namespace[^\n]*already exists)/i.test(detail);
|
|
107
|
+
}
|
|
83
108
|
export function resolveCloudflareCredentials(argv) {
|
|
84
109
|
return {
|
|
85
110
|
apiToken: resolveFlag(argv, '--cloudflare-api-token') ??
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-kv.js","sourceRoot":"","sources":["../src/cloudflare-kv.ts"],"names":[],"mappings":"AAaA,MAAM,UAAU,wBAAwB,CAAC,KAMxC;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,4BAA4B,CAAC;IAC9D,IAAI,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;IAEpC,MAAM,GAAG,GAAG,KAAK,EAAE,IAAY,EAAE,OAAoB,EAAE,EAAqB,EAAE;QAC5E,MAAM,QAAQ,GAAG,MAAM,SAAS,CAAC,IAAI,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;YACvD,GAAG,IAAI;YACP,OAAO,EAAE;gBACP,aAAa,EAAE,UAAU,KAAK,CAAC,QAAQ,EAAE;gBACzC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5D,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;aACxB;SACF,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;YACrD,MAAM,IAAI,KAAK,CACb,iCAAiC,QAAQ,CAAC,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAClF,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAW,EAAE;QACtC,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvF,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC;IAEF,
|
|
1
|
+
{"version":3,"file":"cloudflare-kv.js","sourceRoot":"","sources":["../src/cloudflare-kv.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-pointer.d.ts","sourceRoot":"","sources":["../src/cloudflare-pointer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAK9C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC,CAO3E;AAWD,wBAAsB,uBAAuB,CAAC,KAAK,EAAE;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;CACvC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"cloudflare-pointer.d.ts","sourceRoot":"","sources":["../src/cloudflare-pointer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAK9C,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC,CAO3E;AAWD,wBAAsB,uBAAuB,CAAC,KAAK,EAAE;IACnD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,oBAAoB,EAAE,MAAM,CAAC;CACvC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAsBhE;AAED,wBAAsB,6BAA6B,CAAC,KAAK,EAAE;IACzD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAWhE"}
|
|
@@ -19,14 +19,20 @@ async function saveCloudflarePointer(root, pointer) {
|
|
|
19
19
|
}
|
|
20
20
|
export async function ensureCloudflarePointer(input) {
|
|
21
21
|
const existing = await loadCloudflarePointer(input.root);
|
|
22
|
-
if (existing
|
|
22
|
+
if (existing?.cloudflareAccountId === input.cloudflareAccountId &&
|
|
23
|
+
existing.stateKvNamespaceId === input.stateKvNamespaceId &&
|
|
24
|
+
existing.stateKvNamespaceName === input.stateKvNamespaceName) {
|
|
23
25
|
return existing;
|
|
24
|
-
|
|
26
|
+
}
|
|
27
|
+
const machineId = existing ? undefined : await getMachineId();
|
|
25
28
|
const pointer = Schema.decodeUnknownSync(schemas.CloudflarePointer)({
|
|
26
29
|
cloudflareAccountId: input.cloudflareAccountId,
|
|
27
30
|
stateKvNamespaceId: input.stateKvNamespaceId,
|
|
28
31
|
stateKvNamespaceName: input.stateKvNamespaceName,
|
|
29
|
-
|
|
32
|
+
// Rebinding Cloudflare accounts changes the storage location, not the
|
|
33
|
+
// local machine owner. Preserving ownerId keeps this project's local
|
|
34
|
+
// deploy history address stable while preventing cross-account KV reads.
|
|
35
|
+
ownerId: existing?.ownerId ?? `local_${machineId?.slice(2, 10)}`,
|
|
30
36
|
});
|
|
31
37
|
await saveCloudflarePointer(input.root, pointer);
|
|
32
38
|
return pointer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-pointer.js","sourceRoot":"","sources":["../src/cloudflare-pointer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,uBAAuB,GAAG,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;AAEjE,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,IAAY;IAEZ,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,EAAE,MAAM,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,IAAY,EACZ,OAA6D;IAE7D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAC;IACjD,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACzE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,KAK7C;IACC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzD,
|
|
1
|
+
{"version":3,"file":"cloudflare-pointer.js","sourceRoot":"","sources":["../src/cloudflare-pointer.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,12 @@ export declare function resolveOrProvisionCloudflareScopedResource<T>(input: {
|
|
|
33
33
|
readonly kind: CloudflareScopedResourceKind;
|
|
34
34
|
readonly exactResourceId?: string;
|
|
35
35
|
readonly exactResourceName?: string;
|
|
36
|
+
/**
|
|
37
|
+
* Proves that an exact stored id still belongs to the active Cloudflare
|
|
38
|
+
* account. Returning false discards the stale id and re-enters the guarded
|
|
39
|
+
* deterministic-name provisioning path.
|
|
40
|
+
*/
|
|
41
|
+
readonly validateExactResource?: (resourceId: string) => Promise<boolean>;
|
|
36
42
|
readonly provisionByName: (resourceName: string) => Promise<{
|
|
37
43
|
readonly resourceId: string;
|
|
38
44
|
readonly value?: T;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-scoped-resource.d.ts","sourceRoot":"","sources":["../src/cloudflare-scoped-resource.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mCAAmC,KAAK,CAAC;AAEtD,MAAM,MAAM,4BAA4B,GAAG,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAEnF,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,uCAAuC,CAAC,CAAC;IACxD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;CAC/B;AAED,qBAAa,uCAAwC,SAAQ,KAAK;IAK9D,QAAQ,CAAC,YAAY,EAAE,4BAA4B;IACnD,QAAQ,CAAC,cAAc,EAAE,MAAM;IALjC,SAAkB,IAAI,6CAA6C;IACnE,QAAQ,CAAC,IAAI,EAAG,uCAAuC,CAAU;gBAGtD,YAAY,EAAE,4BAA4B,EAC1C,cAAc,EAAE,MAAM;CAMlC;AAwBD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED,uFAAuF;AACvF,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,gCAAgC,EAC1C,IAAI,EAAE,4BAA4B,GACjC,MAAM,CAMR;AAED,yFAAyF;AACzF,wBAAgB,qCAAqC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI9E;AAED;;;;GAIG;AACH,wBAAsB,0CAA0C,CAAC,CAAC,EAAE,KAAK,EAAE;IACzE,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,EAAE,CACxB,YAAY,EAAE,MAAM,KACjB,OAAO,CAAC;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CACnE,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"cloudflare-scoped-resource.d.ts","sourceRoot":"","sources":["../src/cloudflare-scoped-resource.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mCAAmC,KAAK,CAAC;AAEtD,MAAM,MAAM,4BAA4B,GAAG,YAAY,GAAG,WAAW,GAAG,UAAU,CAAC;AAEnF,MAAM,WAAW,gCAAgC;IAC/C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,uCAAuC,CAAC,CAAC;IACxD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;CAC/B;AAED,qBAAa,uCAAwC,SAAQ,KAAK;IAK9D,QAAQ,CAAC,YAAY,EAAE,4BAA4B;IACnD,QAAQ,CAAC,cAAc,EAAE,MAAM;IALjC,SAAkB,IAAI,6CAA6C;IACnE,QAAQ,CAAC,IAAI,EAAG,uCAAuC,CAAU;gBAGtD,YAAY,EAAE,4BAA4B,EAC1C,cAAc,EAAE,MAAM;CAMlC;AAwBD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAOxD;AAED,uFAAuF;AACvF,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,gCAAgC,EAC1C,IAAI,EAAE,4BAA4B,GACjC,MAAM,CAMR;AAED,yFAAyF;AACzF,wBAAgB,qCAAqC,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAI9E;AAED;;;;GAIG;AACH,wBAAsB,0CAA0C,CAAC,CAAC,EAAE,KAAK,EAAE;IACzE,QAAQ,CAAC,QAAQ,EAAE,gCAAgC,CAAC;IACpD,QAAQ,CAAC,IAAI,EAAE,4BAA4B,CAAC;IAC5C,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1E,QAAQ,CAAC,eAAe,EAAE,CACxB,YAAY,EAAE,MAAM,KACjB,OAAO,CAAC;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;KAAE,CAAC,CAAC;CACnE,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC,CAAC,CAAC,CA6BtD"}
|
|
@@ -53,17 +53,24 @@ export function legacyTruncatedCloudflareResourceName(fullName) {
|
|
|
53
53
|
*/
|
|
54
54
|
export async function resolveOrProvisionCloudflareScopedResource(input) {
|
|
55
55
|
const fullName = cloudflareScopedResourceFullName(input.identity, input.kind);
|
|
56
|
-
const resourceName = input.exactResourceName ?? legacyTruncatedCloudflareResourceName(fullName);
|
|
57
56
|
if (input.exactResourceId) {
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
57
|
+
const valid = input.validateExactResource
|
|
58
|
+
? await input.validateExactResource(input.exactResourceId)
|
|
59
|
+
: true;
|
|
60
|
+
if (valid) {
|
|
61
|
+
return {
|
|
62
|
+
resourceId: input.exactResourceId,
|
|
63
|
+
resourceName: input.exactResourceName ?? legacyTruncatedCloudflareResourceName(fullName),
|
|
64
|
+
value: undefined,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
63
67
|
}
|
|
64
68
|
if (fullName.length > CLOUDFLARE_RESOURCE_NAME_MAX_LENGTH) {
|
|
65
69
|
throw new CloudflareResourceIdentityRequiredError(input.kind, fullName.length);
|
|
66
70
|
}
|
|
71
|
+
// A stale exact id is not ownership proof for its stored name. Recover via
|
|
72
|
+
// the canonical injective name only; long legacy names remain fail-closed.
|
|
73
|
+
const resourceName = legacyTruncatedCloudflareResourceName(fullName);
|
|
67
74
|
const provisioned = await input.provisionByName(resourceName);
|
|
68
75
|
return {
|
|
69
76
|
resourceId: provisioned.resourceId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudflare-scoped-resource.js","sourceRoot":"","sources":["../src/cloudflare-scoped-resource.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mCAAmC,GAAG,EAAE,CAAC;AAiBtD,MAAM,OAAO,uCAAwC,SAAQ,KAAK;IAKrD;IACA;IALO,IAAI,GAAG,yCAAyC,CAAC;IAC1D,IAAI,GAAG,uCAAgD,CAAC;IAEjE,YACW,YAA0C,EAC1C,cAAsB;QAE/B,KAAK,CACH,0CAA0C,aAAa,CAAC,YAAY,CAAC,mFAAmF,cAAc,mKAAmK,CAC1U,CAAC;QALO,iBAAY,GAAZ,YAAY,CAA8B;QAC1C,mBAAc,GAAd,cAAc,CAAQ;IAKjC,CAAC;CACF;AAED,SAAS,aAAa,CAAC,IAAkC;IACvD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,YAAY;YACf,OAAO,sBAAsB,CAAC;QAChC,KAAK,WAAW;YACd,OAAO,oBAAoB,CAAC;QAC9B,KAAK,UAAU;YACb,OAAO,oBAAoB,CAAC;IAChC,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAAkC;IACxD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,YAAY;YACf,OAAO,SAAS,CAAC;QACnB,KAAK,WAAW;YACd,OAAO,QAAQ,CAAC;QAClB,KAAK,UAAU;YACb,OAAO,OAAO,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO,CACL,KAAK;SACF,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,GAAG,CAClC,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,gCAAgC,CAC9C,QAA0C,EAC1C,IAAkC;IAElC,OAAO,OAAO,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,kBAAkB,CACxE,QAAQ,CAAC,SAAS,CACnB,IAAI,kBAAkB,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,kBAAkB,CACjE,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAC9B,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;AAC9B,CAAC;AAED,yFAAyF;AACzF,MAAM,UAAU,qCAAqC,CAAC,QAAgB;IACpE,OAAO,QAAQ,CAAC,MAAM,IAAI,mCAAmC;QAC3D,CAAC,CAAC,QAAQ;QACV,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,mCAAmC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACjF,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,0CAA0C,CAAI,
|
|
1
|
+
{"version":3,"file":"cloudflare-scoped-resource.js","sourceRoot":"","sources":["../src/cloudflare-scoped-resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAGL,KAAK,cAAc,EASpB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EACV,sBAAsB,EACtB,6BAA6B,EAC7B,mBAAmB,EAEnB,uBAAuB,EACvB,+BAA+B,EAC/B,oBAAoB,EACpB,yBAAyB,EACzB,cAAc,EACd,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAqB,MAAM,EAAE,OAAO,EAAkC,MAAM,aAAa,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAIzD,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|