downcity 1.1.68 → 1.1.70
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/city/core/session.d.ts +12 -2
- package/city/core/session.d.ts.map +1 -1
- package/city/core/session.js +22 -3
- package/city/core/session.js.map +1 -1
- package/city/create/commands/create.js +0 -6
- package/city/create/commands/create.js.map +1 -1
- package/city/deploy/config/CityProjectEnvLoader.d.ts +1 -1
- package/city/deploy/config/CityProjectEnvLoader.d.ts.map +1 -1
- package/city/deploy/config/CityProjectEnvLoader.js +9 -32
- package/city/deploy/config/CityProjectEnvLoader.js.map +1 -1
- package/city/deploy/runtime/CloudflareAccountResolver.d.ts.map +1 -1
- package/city/deploy/runtime/CloudflareAccountResolver.js +7 -10
- package/city/deploy/runtime/CloudflareAccountResolver.js.map +1 -1
- package/city/deploy/runtime/CloudflareWorkersDeployer.d.ts +1 -1
- package/city/deploy/runtime/CloudflareWorkersDeployer.d.ts.map +1 -1
- package/city/deploy/runtime/CloudflareWorkersDeployer.js +48 -23
- package/city/deploy/runtime/CloudflareWorkersDeployer.js.map +1 -1
- package/city/deploy/runtime/D1DatabaseResolver.d.ts +7 -4
- package/city/deploy/runtime/D1DatabaseResolver.d.ts.map +1 -1
- package/city/deploy/runtime/D1DatabaseResolver.js +53 -12
- package/city/deploy/runtime/D1DatabaseResolver.js.map +1 -1
- package/city/deploy/runtime/WranglerConfigWriter.d.ts +2 -2
- package/city/deploy/runtime/WranglerConfigWriter.d.ts.map +1 -1
- package/city/deploy/runtime/WranglerConfigWriter.js +4 -4
- package/city/deploy/runtime/WranglerConfigWriter.js.map +1 -1
- package/city/types/CityProjectConfig.d.ts +1 -9
- package/city/types/CityProjectConfig.d.ts.map +1 -1
- package/city/types/CityProjectConfig.js +1 -1
- package/package.json +4 -4
package/city/core/session.d.ts
CHANGED
|
@@ -38,6 +38,8 @@ export interface ClientConfig {
|
|
|
38
38
|
active_server_url?: string;
|
|
39
39
|
/** 已保存的 server 列表 */
|
|
40
40
|
servers: ServerProfile[];
|
|
41
|
+
/** 当前 Cloudflare account id，属于 CLI 本地 provider 状态。 */
|
|
42
|
+
cloudflare_account_id?: string;
|
|
41
43
|
/** 当前选择的模型 ID */
|
|
42
44
|
model: string;
|
|
43
45
|
/** 上次使用的身份 */
|
|
@@ -51,6 +53,14 @@ export declare function readConfig(): ClientConfig;
|
|
|
51
53
|
* 写入 config 到磁盘。
|
|
52
54
|
*/
|
|
53
55
|
export declare function writeConfig(config: ClientConfig): void;
|
|
56
|
+
/**
|
|
57
|
+
* 读取当前保存的 Cloudflare account id。
|
|
58
|
+
*/
|
|
59
|
+
export declare function readCloudflareAccountId(): string | undefined;
|
|
60
|
+
/**
|
|
61
|
+
* 写入当前 Cloudflare account id。
|
|
62
|
+
*/
|
|
63
|
+
export declare function writeCloudflareAccountId(account_id: string): void;
|
|
54
64
|
/**
|
|
55
65
|
* 读取当前激活的 server。
|
|
56
66
|
*/
|
|
@@ -64,7 +74,7 @@ export declare function setActiveServer(baseUrl: string): void;
|
|
|
64
74
|
*/
|
|
65
75
|
export declare function addServer(input: {
|
|
66
76
|
base_url: string;
|
|
67
|
-
admin_secret_key
|
|
77
|
+
admin_secret_key?: string;
|
|
68
78
|
name?: string;
|
|
69
79
|
}): ServerProfile;
|
|
70
80
|
/**
|
|
@@ -76,7 +86,7 @@ export declare function addServer(input: {
|
|
|
76
86
|
*/
|
|
77
87
|
export declare function updateServer(currentBaseUrl: string, input: {
|
|
78
88
|
base_url: string;
|
|
79
|
-
admin_secret_key
|
|
89
|
+
admin_secret_key?: string;
|
|
80
90
|
name?: string;
|
|
81
91
|
}): ServerProfile;
|
|
82
92
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAeH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,oCAAoC;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,uBAAuB;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB;IACrB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc;IACd,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAClC;AAMD;;GAEG;AACH,wBAAgB,UAAU,IAAI,YAAY,
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAeH,MAAM,WAAW,YAAY;IAC3B,6BAA6B;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,gCAAgC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW;IACX,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,oCAAoC;IACpC,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,uBAAuB;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB;IACrB,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,sDAAsD;IACtD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc;IACd,aAAa,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;CAClC;AAMD;;GAEG;AACH,wBAAgB,UAAU,IAAI,YAAY,CAgBzC;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI,CAetD;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,MAAM,GAAG,SAAS,CAE5D;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAMjE;AAMD;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,GAAG,SAAS,CAG5D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAUrD;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE;IAC/B,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,aAAa,CAkBhB;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAC1B,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE;IACL,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GACA,aAAa,CA8Bf;AAED;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAclD;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS,CAGrE;AAcD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAEpE;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAE3D;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAMlD;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAErD"}
|
package/city/core/session.js
CHANGED
|
@@ -27,6 +27,9 @@ export function readConfig() {
|
|
|
27
27
|
return {
|
|
28
28
|
active_server_url,
|
|
29
29
|
servers,
|
|
30
|
+
cloudflare_account_id: typeof raw.cloudflare_account_id === "string"
|
|
31
|
+
? raw.cloudflare_account_id.trim() || undefined
|
|
32
|
+
: undefined,
|
|
30
33
|
model: typeof raw.model === "string" ? raw.model : "",
|
|
31
34
|
last_identity: raw.last_identity === "admin" || raw.last_identity === "user"
|
|
32
35
|
? raw.last_identity
|
|
@@ -44,10 +47,29 @@ export function writeConfig(config) {
|
|
|
44
47
|
writeJSON(CONFIG_FILE, {
|
|
45
48
|
active_server_url: active,
|
|
46
49
|
servers: normalizedServers,
|
|
50
|
+
cloudflare_account_id: typeof config.cloudflare_account_id === "string"
|
|
51
|
+
? config.cloudflare_account_id.trim() || undefined
|
|
52
|
+
: undefined,
|
|
47
53
|
model: config.model ?? "",
|
|
48
54
|
last_identity: config.last_identity,
|
|
49
55
|
});
|
|
50
56
|
}
|
|
57
|
+
/**
|
|
58
|
+
* 读取当前保存的 Cloudflare account id。
|
|
59
|
+
*/
|
|
60
|
+
export function readCloudflareAccountId() {
|
|
61
|
+
return readConfig().cloudflare_account_id;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* 写入当前 Cloudflare account id。
|
|
65
|
+
*/
|
|
66
|
+
export function writeCloudflareAccountId(account_id) {
|
|
67
|
+
const config = readConfig();
|
|
68
|
+
writeConfig({
|
|
69
|
+
...config,
|
|
70
|
+
cloudflare_account_id: String(account_id).trim() || undefined,
|
|
71
|
+
});
|
|
72
|
+
}
|
|
51
73
|
// ============================================================
|
|
52
74
|
// Server 管理
|
|
53
75
|
// ============================================================
|
|
@@ -252,9 +274,6 @@ function normalizeServers(servers) {
|
|
|
252
274
|
function normalizeServer(input) {
|
|
253
275
|
const normalizedBaseUrl = normalizeBaseUrl(input.base_url);
|
|
254
276
|
const normalizedAdminSecretKey = String(input.admin_secret_key ?? "").trim();
|
|
255
|
-
if (!normalizedAdminSecretKey) {
|
|
256
|
-
throw new Error("admin_secret_key cannot be empty");
|
|
257
|
-
}
|
|
258
277
|
const normalizedName = String(input.name ?? "").trim() || deriveServerName(normalizedBaseUrl);
|
|
259
278
|
return {
|
|
260
279
|
name: normalizedName,
|
package/city/core/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE5C,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,CAAC;AACjD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,13 +165,7 @@ function createCloudflareWorkersFiles(name, target) {
|
|
|
165
165
|
path: ".env.example",
|
|
166
166
|
content: [
|
|
167
167
|
"# Local deploy values.",
|
|
168
|
-
"CITY_TARGET=cloudflare-workers",
|
|
169
|
-
"CLOUDFLARE_ACCOUNT_ID=",
|
|
170
|
-
`CITY_WORKER_URL=https://${name}.<your-subdomain>.workers.dev`,
|
|
171
|
-
`DOWNCITY_WORKER_URL=https://${name}.<your-subdomain>.workers.dev`,
|
|
172
|
-
`CITY_D1_DATABASE_ID=`,
|
|
173
168
|
`CITY_D1_DATABASE_NAME=${name}-db`,
|
|
174
|
-
"CITY_D1_BINDING=DB",
|
|
175
169
|
"",
|
|
176
170
|
].join("\n"),
|
|
177
171
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/create/commands/create.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../src/create/commands/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city deploy` 默认读取目标目录下的 `.env`，方便本地显式部署。
|
|
6
|
-
* - `.env`
|
|
6
|
+
* - `.env` 只保存 City 项目自身真正需要的部署输入，例如 D1 name。
|
|
7
7
|
* - Provider key、Stripe key 等业务密钥仍应写入 City env 表，而不是写入公开客户端。
|
|
8
8
|
*/
|
|
9
9
|
import type { CityProjectDeployEnv, CityProjectDeployEnvFile } from "../../types/CityProjectConfig.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityProjectEnvLoader.d.ts","sourceRoot":"","sources":["../../../src/deploy/config/CityProjectEnvLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"CityProjectEnvLoader.d.ts","sourceRoot":"","sources":["../../../src/deploy/config/CityProjectEnvLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,oBAAoB,EACpB,wBAAwB,EACzB,MAAM,kCAAkC,CAAC;AAM1C;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI5D;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,wBAAwB,CAWtF;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,EAAE,wBAAwB,EAClC,QAAQ,EAAE,OAAO,CAAC,oBAAoB,CAAC,GACtC,wBAAwB,CAkB1B"}
|
|
@@ -3,20 +3,14 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city deploy` 默认读取目标目录下的 `.env`，方便本地显式部署。
|
|
6
|
-
* - `.env`
|
|
6
|
+
* - `.env` 只保存 City 项目自身真正需要的部署输入，例如 D1 name。
|
|
7
7
|
* - Provider key、Stripe key 等业务密钥仍应写入 City env 表，而不是写入公开客户端。
|
|
8
8
|
*/
|
|
9
9
|
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
10
10
|
import { join } from "node:path";
|
|
11
11
|
import { config } from "dotenv";
|
|
12
12
|
const DEPLOY_ENV_KEYS = [
|
|
13
|
-
"CITY_TARGET",
|
|
14
|
-
"CLOUDFLARE_ACCOUNT_ID",
|
|
15
|
-
"CITY_WORKER_URL",
|
|
16
|
-
"DOWNCITY_WORKER_URL",
|
|
17
|
-
"CITY_D1_DATABASE_ID",
|
|
18
13
|
"CITY_D1_DATABASE_NAME",
|
|
19
|
-
"CITY_D1_BINDING",
|
|
20
14
|
];
|
|
21
15
|
/**
|
|
22
16
|
* 加载 City 项目目录下的 `.env`。
|
|
@@ -38,14 +32,7 @@ export function readCityProjectDeployEnv(project_dir) {
|
|
|
38
32
|
return {
|
|
39
33
|
env_path,
|
|
40
34
|
env: normalizeDeployEnv({
|
|
41
|
-
cloudflare_account_id: file_env.CLOUDFLARE_ACCOUNT_ID ?? process.env.CLOUDFLARE_ACCOUNT_ID,
|
|
42
|
-
city_worker_url: file_env.CITY_WORKER_URL
|
|
43
|
-
?? file_env.DOWNCITY_WORKER_URL
|
|
44
|
-
?? process.env.CITY_WORKER_URL
|
|
45
|
-
?? process.env.DOWNCITY_WORKER_URL,
|
|
46
|
-
city_d1_database_id: file_env.CITY_D1_DATABASE_ID ?? process.env.CITY_D1_DATABASE_ID,
|
|
47
35
|
city_d1_database_name: file_env.CITY_D1_DATABASE_NAME ?? process.env.CITY_D1_DATABASE_NAME,
|
|
48
|
-
city_d1_binding: file_env.CITY_D1_BINDING ?? process.env.CITY_D1_BINDING,
|
|
49
36
|
}),
|
|
50
37
|
};
|
|
51
38
|
}
|
|
@@ -76,32 +63,16 @@ export function writeCityProjectDeployEnv(env_file, next_env) {
|
|
|
76
63
|
*/
|
|
77
64
|
function normalizeDeployEnv(input) {
|
|
78
65
|
return {
|
|
79
|
-
cloudflare_account_id: clean(input.cloudflare_account_id),
|
|
80
|
-
city_worker_url: clean(input.city_worker_url),
|
|
81
|
-
city_d1_database_id: clean(input.city_d1_database_id),
|
|
82
66
|
city_d1_database_name: clean(input.city_d1_database_name),
|
|
83
|
-
city_d1_binding: clean(input.city_d1_binding),
|
|
84
67
|
};
|
|
85
68
|
}
|
|
86
69
|
/**
|
|
87
70
|
* 渲染部署环境变量。
|
|
88
71
|
*/
|
|
89
72
|
function renderDeployEnv(env) {
|
|
90
|
-
const values = {
|
|
91
|
-
CITY_TARGET: "cloudflare-workers",
|
|
92
|
-
};
|
|
93
|
-
if (env.cloudflare_account_id)
|
|
94
|
-
values.CLOUDFLARE_ACCOUNT_ID = env.cloudflare_account_id;
|
|
95
|
-
if (env.city_worker_url) {
|
|
96
|
-
values.CITY_WORKER_URL = env.city_worker_url;
|
|
97
|
-
values.DOWNCITY_WORKER_URL = env.city_worker_url;
|
|
98
|
-
}
|
|
99
|
-
if (env.city_d1_database_id)
|
|
100
|
-
values.CITY_D1_DATABASE_ID = env.city_d1_database_id;
|
|
73
|
+
const values = {};
|
|
101
74
|
if (env.city_d1_database_name)
|
|
102
75
|
values.CITY_D1_DATABASE_NAME = env.city_d1_database_name;
|
|
103
|
-
if (env.city_d1_binding)
|
|
104
|
-
values.CITY_D1_BINDING = env.city_d1_binding;
|
|
105
76
|
return values;
|
|
106
77
|
}
|
|
107
78
|
/**
|
|
@@ -128,7 +99,13 @@ function upsertEnvValues(text, values) {
|
|
|
128
99
|
next_lines.push(`${key}=${quoteEnvValue(values[key] ?? "")}`);
|
|
129
100
|
}
|
|
130
101
|
}
|
|
131
|
-
|
|
102
|
+
const filtered_lines = next_lines.filter((line) => (!line.match(/^\s*CITY_D1_DATABASE_ID\s*=/)
|
|
103
|
+
&& !line.match(/^\s*CITY_WORKER_URL\s*=/)
|
|
104
|
+
&& !line.match(/^\s*DOWNCITY_WORKER_URL\s*=/)
|
|
105
|
+
&& !line.match(/^\s*CITY_TARGET\s*=/)
|
|
106
|
+
&& !line.match(/^\s*CLOUDFLARE_ACCOUNT_ID\s*=/)
|
|
107
|
+
&& !line.match(/^\s*CITY_D1_BINDING\s*=/)));
|
|
108
|
+
return `${filtered_lines.join("\n").replace(/\n+$/, "")}\n`;
|
|
132
109
|
}
|
|
133
110
|
/**
|
|
134
111
|
* 解析简单 env 文件。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityProjectEnvLoader.js","sourceRoot":"","sources":["../../../src/deploy/config/CityProjectEnvLoader.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,MAAM,eAAe,GAAG;IACtB,
|
|
1
|
+
{"version":3,"file":"CityProjectEnvLoader.js","sourceRoot":"","sources":["../../../src/deploy/config/CityProjectEnvLoader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudflareAccountResolver.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareAccountResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"CloudflareAccountResolver.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareAccountResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAGjF,+BAA+B;AAC/B,MAAM,WAAW,8BAA8B;IAC7C,iBAAiB;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB;IACtB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,oCAAoC;IACpC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,+BAA+B;AAC/B,MAAM,WAAW,8BAA8B;IAC7C,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gCAAgC;IAChC,QAAQ,EAAE,wBAAwB,CAAC;CACpC;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC,CAmCzC"}
|
|
@@ -7,18 +7,17 @@
|
|
|
7
7
|
* - Wrangler 已登录但无法枚举 account 时，进入最小交互：重新登录或手动输入 account id。
|
|
8
8
|
*/
|
|
9
9
|
import { isCancel, select, text } from "@clack/prompts";
|
|
10
|
+
import { readCloudflareAccountId, writeCloudflareAccountId } from "../../core/session.js";
|
|
10
11
|
import { emitCliBlock } from "../../shared/CliReporter.js";
|
|
11
12
|
import { CliError } from "../../shared/CliError.js";
|
|
12
|
-
import { writeCityProjectDeployEnv, } from "../config/CityProjectEnvLoader.js";
|
|
13
13
|
import { runCommand } from "./CommandRunner.js";
|
|
14
14
|
/**
|
|
15
15
|
* 解析并准备 Cloudflare account。
|
|
16
16
|
*/
|
|
17
17
|
export async function resolveCloudflareAccount(params) {
|
|
18
|
-
const saved_account_id = params.env_file.env.cloudflare_account_id;
|
|
19
18
|
const initial_account_id = normalizeAccountId(params.account_id)
|
|
20
19
|
?? normalizeAccountId(process.env.CLOUDFLARE_ACCOUNT_ID)
|
|
21
|
-
?? normalizeAccountId(
|
|
20
|
+
?? normalizeAccountId(readCloudflareAccountId());
|
|
22
21
|
if (initial_account_id) {
|
|
23
22
|
return persistCloudflareAccount(params.env_file, initial_account_id);
|
|
24
23
|
}
|
|
@@ -54,7 +53,7 @@ async function resolveAccountAfterLookupDenied(params) {
|
|
|
54
53
|
throw new CliError({
|
|
55
54
|
title: "Cloudflare account required",
|
|
56
55
|
note: "Wrangler credential exists, but Cloudflare rejected user/account lookup, so city cannot choose an account automatically.",
|
|
57
|
-
fix: "Run city deploy --account-id <account_id> or
|
|
56
|
+
fix: "Run city deploy --account-id <account_id> or rerun in an interactive terminal.",
|
|
58
57
|
});
|
|
59
58
|
}
|
|
60
59
|
emitCliBlock({
|
|
@@ -73,7 +72,7 @@ async function resolveAccountAfterLookupDenied(params) {
|
|
|
73
72
|
{
|
|
74
73
|
label: "Enter account id",
|
|
75
74
|
value: "enter-account-id",
|
|
76
|
-
hint: "Saved to
|
|
75
|
+
hint: "Saved to local City CLI state",
|
|
77
76
|
},
|
|
78
77
|
{
|
|
79
78
|
label: "Cancel deploy",
|
|
@@ -120,7 +119,7 @@ async function promptForAccountId(env_file) {
|
|
|
120
119
|
return persistCloudflareAccount(env_file, String(account_id));
|
|
121
120
|
}
|
|
122
121
|
/**
|
|
123
|
-
* 保存 Cloudflare account id
|
|
122
|
+
* 保存 Cloudflare account id 到本地 City CLI 状态。
|
|
124
123
|
*/
|
|
125
124
|
function persistCloudflareAccount(env_file, account_id) {
|
|
126
125
|
const normalized_account_id = normalizeAccountId(account_id);
|
|
@@ -130,12 +129,10 @@ function persistCloudflareAccount(env_file, account_id) {
|
|
|
130
129
|
note: "Cloudflare account id should be 32 hexadecimal characters.",
|
|
131
130
|
});
|
|
132
131
|
}
|
|
133
|
-
|
|
134
|
-
cloudflare_account_id: normalized_account_id,
|
|
135
|
-
});
|
|
132
|
+
writeCloudflareAccountId(normalized_account_id);
|
|
136
133
|
return {
|
|
137
134
|
account_id: normalized_account_id,
|
|
138
|
-
env_file
|
|
135
|
+
env_file,
|
|
139
136
|
};
|
|
140
137
|
}
|
|
141
138
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudflareAccountResolver.js","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareAccountResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"CloudflareAccountResolver.js","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareAccountResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city deploy` 的用户心智是“部署一个 City 项目”，不是配置 Cloudflare 工程。
|
|
6
6
|
* - 构建和类型检查从 package.json 自动推断，`city.json` 保持最小。
|
|
7
|
-
* - D1
|
|
7
|
+
* - D1 等部署绑定写入项目 `.env`，Worker URL 回写到 City 自己的 server 配置。
|
|
8
8
|
*/
|
|
9
9
|
import type { CityDeployOptions, CityProjectConfigFile } from "../../types/CityProjectConfig.js";
|
|
10
10
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudflareWorkersDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareWorkersDeployer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"CloudflareWorkersDeployer.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareWorkersDeployer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,KAAK,EACV,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,kCAAkC,CAAC;AAW1C;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,qBAAqB,EAClC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,IAAI,CAAC,CAiFf"}
|
|
@@ -4,13 +4,14 @@
|
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city deploy` 的用户心智是“部署一个 City 项目”，不是配置 Cloudflare 工程。
|
|
6
6
|
* - 构建和类型检查从 package.json 自动推断，`city.json` 保持最小。
|
|
7
|
-
* - D1
|
|
7
|
+
* - D1 等部署绑定写入项目 `.env`，Worker URL 回写到 City 自己的 server 配置。
|
|
8
8
|
*/
|
|
9
9
|
import { rmSync } from "node:fs";
|
|
10
10
|
import { dirname } from "node:path";
|
|
11
|
+
import { addServer, readActiveServer, readServer } from "../../core/session.js";
|
|
11
12
|
import { emitCliBlock } from "../../shared/CliReporter.js";
|
|
12
13
|
import { CliError } from "../../shared/CliError.js";
|
|
13
|
-
import { readCityProjectDeployEnv,
|
|
14
|
+
import { readCityProjectDeployEnv, } from "../config/CityProjectEnvLoader.js";
|
|
14
15
|
import { resolveCloudflareAccount } from "./CloudflareAccountResolver.js";
|
|
15
16
|
import { resolveD1Database } from "./D1DatabaseResolver.js";
|
|
16
17
|
import { writeWranglerConfig } from "./WranglerConfigWriter.js";
|
|
@@ -32,7 +33,7 @@ export async function deployCloudflareWorkers(config_file, options) {
|
|
|
32
33
|
],
|
|
33
34
|
});
|
|
34
35
|
if (options.verify_only) {
|
|
35
|
-
await verifyWorker(
|
|
36
|
+
await verifyWorker(readVerifyBaseUrl());
|
|
36
37
|
return;
|
|
37
38
|
}
|
|
38
39
|
const account_result = await resolveCloudflareAccount({
|
|
@@ -47,15 +48,14 @@ export async function deployCloudflareWorkers(config_file, options) {
|
|
|
47
48
|
skip_build: options.skip_build,
|
|
48
49
|
skip_typecheck: options.skip_typecheck,
|
|
49
50
|
});
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
const wrangler_result = writeWranglerConfig(config_file, env_file);
|
|
51
|
+
const d1_result = await resolveD1Database({
|
|
52
|
+
config_file,
|
|
53
|
+
env_file,
|
|
54
|
+
account_id,
|
|
55
|
+
create_if_missing: options.dry_run !== true,
|
|
56
|
+
});
|
|
57
|
+
env_file = d1_result.env_file;
|
|
58
|
+
const wrangler_result = writeWranglerConfig(config_file, env_file, d1_result.resolved_database_id);
|
|
59
59
|
emitCliBlock({
|
|
60
60
|
tone: "success",
|
|
61
61
|
title: "Wrangler config generated",
|
|
@@ -73,11 +73,6 @@ export async function deployCloudflareWorkers(config_file, options) {
|
|
|
73
73
|
rmSync(dirname(wrangler_result.config_path), { recursive: true, force: true });
|
|
74
74
|
}
|
|
75
75
|
const worker_url = extractWorkerUrl(output);
|
|
76
|
-
if (worker_url && !options.dry_run) {
|
|
77
|
-
env_file = writeCityProjectDeployEnv(env_file, {
|
|
78
|
-
city_worker_url: worker_url,
|
|
79
|
-
});
|
|
80
|
-
}
|
|
81
76
|
emitCliBlock({
|
|
82
77
|
tone: "success",
|
|
83
78
|
title: options.dry_run ? "Worker dry-run completed" : "Worker deployed",
|
|
@@ -86,8 +81,11 @@ export async function deployCloudflareWorkers(config_file, options) {
|
|
|
86
81
|
...(worker_url ? [{ label: "url", value: worker_url }] : []),
|
|
87
82
|
],
|
|
88
83
|
});
|
|
84
|
+
if (worker_url && !options.dry_run) {
|
|
85
|
+
registerDeployedServer(config_file.config.name, worker_url);
|
|
86
|
+
}
|
|
89
87
|
if (options.verify && !options.dry_run) {
|
|
90
|
-
await verifyWorker(
|
|
88
|
+
await verifyWorker(worker_url ?? readVerifyBaseUrl());
|
|
91
89
|
}
|
|
92
90
|
}
|
|
93
91
|
/**
|
|
@@ -107,15 +105,12 @@ async function runWranglerDeploy(config_file, params) {
|
|
|
107
105
|
/**
|
|
108
106
|
* 验证 Worker 健康状态。
|
|
109
107
|
*/
|
|
110
|
-
async function verifyWorker(
|
|
111
|
-
const base_url = process.env.DOWNCITY_WORKER_URL
|
|
112
|
-
?? process.env.CITY_WORKER_URL
|
|
113
|
-
?? env_file.env.city_worker_url;
|
|
108
|
+
async function verifyWorker(base_url) {
|
|
114
109
|
if (!base_url?.trim()) {
|
|
115
110
|
emitCliBlock({
|
|
116
111
|
tone: "warning",
|
|
117
112
|
title: "Verification skipped",
|
|
118
|
-
note: "
|
|
113
|
+
note: "No connected City server found. Run `city deploy` first, or choose a server in Manage Servers.",
|
|
119
114
|
});
|
|
120
115
|
return;
|
|
121
116
|
}
|
|
@@ -145,6 +140,36 @@ async function verifyWorker(env_file) {
|
|
|
145
140
|
function extractWorkerUrl(output) {
|
|
146
141
|
return output.match(/https:\/\/[^\s]+\.workers\.dev/i)?.[0];
|
|
147
142
|
}
|
|
143
|
+
/**
|
|
144
|
+
* 把部署出的 Worker 自动注册为当前 City server。
|
|
145
|
+
*/
|
|
146
|
+
function registerDeployedServer(name, worker_url) {
|
|
147
|
+
const existing_server = readServer(worker_url);
|
|
148
|
+
const active_server = readActiveServer();
|
|
149
|
+
const preserved_admin_secret_key = existing_server?.admin_secret_key
|
|
150
|
+
?? (active_server?.base_url === worker_url ? active_server.admin_secret_key : "")
|
|
151
|
+
?? "";
|
|
152
|
+
addServer({
|
|
153
|
+
name,
|
|
154
|
+
base_url: worker_url,
|
|
155
|
+
admin_secret_key: preserved_admin_secret_key,
|
|
156
|
+
});
|
|
157
|
+
emitCliBlock({
|
|
158
|
+
tone: "success",
|
|
159
|
+
title: "City server connected",
|
|
160
|
+
facts: [
|
|
161
|
+
{ label: "name", value: name },
|
|
162
|
+
{ label: "url", value: worker_url },
|
|
163
|
+
],
|
|
164
|
+
note: "The deployed Worker is now the active City server.",
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
/**
|
|
168
|
+
* 读取当前用于校验的 City server URL。
|
|
169
|
+
*/
|
|
170
|
+
function readVerifyBaseUrl() {
|
|
171
|
+
return readActiveServer()?.base_url;
|
|
172
|
+
}
|
|
148
173
|
/**
|
|
149
174
|
* shell 参数转义。
|
|
150
175
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudflareWorkersDeployer.js","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareWorkersDeployer.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"CloudflareWorkersDeployer.js","sourceRoot":"","sources":["../../../src/deploy/runtime/CloudflareWorkersDeployer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - D1 是 Workers 目标的运行时资源，由 `city deploy` 自动准备。
|
|
6
|
-
* - database id
|
|
7
|
-
* -
|
|
6
|
+
* - 用户只需要理解 database name；database id 由 CLI 在部署时自动解析。
|
|
7
|
+
* - `.env` 只保存 database name 与 binding，不暴露内部 database id。
|
|
8
|
+
* - dry-run 不创建远程资源，只使用已有 database name 解析临时 Wrangler 配置。
|
|
8
9
|
*/
|
|
9
10
|
import type { CityProjectConfigFile, CityProjectDeployEnvFile } from "../../types/CityProjectConfig.js";
|
|
10
11
|
/** D1 解析参数。 */
|
|
@@ -15,13 +16,15 @@ export interface ResolveD1DatabaseParams {
|
|
|
15
16
|
env_file: CityProjectDeployEnvFile;
|
|
16
17
|
/** Cloudflare account id。 */
|
|
17
18
|
account_id?: string;
|
|
19
|
+
/** 找不到同名数据库时是否允许创建。 */
|
|
20
|
+
create_if_missing?: boolean;
|
|
18
21
|
}
|
|
19
22
|
/** D1 解析结果。 */
|
|
20
23
|
export interface ResolveD1DatabaseResult {
|
|
21
24
|
/** 更新后的本地部署环境文件。 */
|
|
22
25
|
env_file: CityProjectDeployEnvFile;
|
|
23
|
-
/** D1 database id。 */
|
|
24
|
-
|
|
26
|
+
/** 本次部署解析出的 D1 database id。 */
|
|
27
|
+
resolved_database_id?: string;
|
|
25
28
|
}
|
|
26
29
|
/**
|
|
27
30
|
* 确认 D1 数据库存在，必要时创建并写入项目 `.env`。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1DatabaseResolver.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/D1DatabaseResolver.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"D1DatabaseResolver.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/D1DatabaseResolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,kCAAkC,CAAC;AAM1C,eAAe;AACf,MAAM,WAAW,uBAAuB;IACtC,mBAAmB;IACnB,WAAW,EAAE,qBAAqB,CAAC;IACnC,uBAAuB;IACvB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uBAAuB;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,eAAe;AACf,MAAM,WAAW,uBAAuB;IACtC,oBAAoB;IACpB,QAAQ,EAAE,wBAAwB,CAAC;IACnC,+BAA+B;IAC/B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC,CAqFlC"}
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - D1 是 Workers 目标的运行时资源，由 `city deploy` 自动准备。
|
|
6
|
-
* - database id
|
|
7
|
-
* -
|
|
6
|
+
* - 用户只需要理解 database name；database id 由 CLI 在部署时自动解析。
|
|
7
|
+
* - `.env` 只保存 database name 与 binding，不暴露内部 database id。
|
|
8
|
+
* - dry-run 不创建远程资源，只使用已有 database name 解析临时 Wrangler 配置。
|
|
8
9
|
*/
|
|
9
10
|
import { emitCliBlock } from "../../shared/CliReporter.js";
|
|
10
11
|
import { CliError } from "../../shared/CliError.js";
|
|
@@ -17,21 +18,42 @@ export async function resolveD1Database(params) {
|
|
|
17
18
|
const database = params.config_file.config.database;
|
|
18
19
|
if (!database)
|
|
19
20
|
return { env_file: params.env_file };
|
|
20
|
-
const
|
|
21
|
-
|
|
21
|
+
const create_if_missing = params.create_if_missing !== false;
|
|
22
|
+
emitCliBlock({
|
|
23
|
+
tone: "warning",
|
|
24
|
+
title: "Checking D1 database",
|
|
25
|
+
facts: [{ label: "name", value: database.name }],
|
|
26
|
+
});
|
|
27
|
+
const listed_database_id = await findExistingD1DatabaseId({
|
|
28
|
+
project_dir: params.config_file.project_dir,
|
|
29
|
+
account_id: params.account_id,
|
|
30
|
+
database_name: database.name,
|
|
31
|
+
});
|
|
32
|
+
if (listed_database_id) {
|
|
33
|
+
const next_env_file = writeCityProjectDeployEnv(params.env_file, {
|
|
34
|
+
city_d1_database_name: database.name,
|
|
35
|
+
});
|
|
22
36
|
emitCliBlock({
|
|
23
37
|
tone: "success",
|
|
24
|
-
title: "D1 database
|
|
38
|
+
title: "D1 database reused",
|
|
25
39
|
facts: [
|
|
26
40
|
{ label: "name", value: database.name },
|
|
27
|
-
{ label: "id", value:
|
|
41
|
+
{ label: "id", value: listed_database_id },
|
|
42
|
+
{ label: "env", value: next_env_file.env_path },
|
|
28
43
|
],
|
|
29
44
|
});
|
|
30
45
|
return {
|
|
31
|
-
env_file:
|
|
32
|
-
|
|
46
|
+
env_file: next_env_file,
|
|
47
|
+
resolved_database_id: listed_database_id,
|
|
33
48
|
};
|
|
34
49
|
}
|
|
50
|
+
if (!create_if_missing) {
|
|
51
|
+
throw new CliError({
|
|
52
|
+
title: "D1 database not found",
|
|
53
|
+
note: `Cloudflare account does not have a D1 database named ${database.name}.`,
|
|
54
|
+
fix: "Run `city deploy` once without `--dry-run` to let City create it, or create the D1 database manually and keep CITY_D1_DATABASE_NAME in the project .env.",
|
|
55
|
+
});
|
|
56
|
+
}
|
|
35
57
|
emitCliBlock({
|
|
36
58
|
tone: "warning",
|
|
37
59
|
title: "Creating D1 database",
|
|
@@ -49,13 +71,11 @@ export async function resolveD1Database(params) {
|
|
|
49
71
|
throw new CliError({
|
|
50
72
|
title: "Unable to read D1 database id",
|
|
51
73
|
note: output,
|
|
52
|
-
fix: "Create D1 manually
|
|
74
|
+
fix: "Create D1 manually in Cloudflare or keep CITY_D1_DATABASE_NAME set, then rerun city deploy.",
|
|
53
75
|
});
|
|
54
76
|
}
|
|
55
77
|
const next_env_file = writeCityProjectDeployEnv(params.env_file, {
|
|
56
|
-
city_d1_database_id: database_id,
|
|
57
78
|
city_d1_database_name: database.name,
|
|
58
|
-
city_d1_binding: database.binding,
|
|
59
79
|
});
|
|
60
80
|
emitCliBlock({
|
|
61
81
|
tone: "success",
|
|
@@ -68,7 +88,7 @@ export async function resolveD1Database(params) {
|
|
|
68
88
|
});
|
|
69
89
|
return {
|
|
70
90
|
env_file: next_env_file,
|
|
71
|
-
database_id,
|
|
91
|
+
resolved_database_id: database_id,
|
|
72
92
|
};
|
|
73
93
|
}
|
|
74
94
|
/**
|
|
@@ -77,6 +97,27 @@ export async function resolveD1Database(params) {
|
|
|
77
97
|
function extractD1DatabaseId(output) {
|
|
78
98
|
return output.match(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/i)?.[0];
|
|
79
99
|
}
|
|
100
|
+
/**
|
|
101
|
+
* 从 Cloudflare 已有 D1 列表中查找同名数据库。
|
|
102
|
+
*/
|
|
103
|
+
async function findExistingD1DatabaseId(params) {
|
|
104
|
+
const output = await runCommand({
|
|
105
|
+
label: "List D1 databases",
|
|
106
|
+
command: "pnpm exec wrangler d1 list --json",
|
|
107
|
+
cwd: params.project_dir,
|
|
108
|
+
env: { CLOUDFLARE_ACCOUNT_ID: params.account_id },
|
|
109
|
+
capture: true,
|
|
110
|
+
});
|
|
111
|
+
try {
|
|
112
|
+
const parsed = JSON.parse(output);
|
|
113
|
+
const matched = parsed.find((item) => String(item?.name ?? "").trim() === params.database_name);
|
|
114
|
+
const database_id = String(matched?.uuid ?? "").trim();
|
|
115
|
+
return database_id || undefined;
|
|
116
|
+
}
|
|
117
|
+
catch {
|
|
118
|
+
return undefined;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
80
121
|
/**
|
|
81
122
|
* shell 参数转义。
|
|
82
123
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"D1DatabaseResolver.js","sourceRoot":"","sources":["../../../src/deploy/runtime/D1DatabaseResolver.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"D1DatabaseResolver.js","sourceRoot":"","sources":["../../../src/deploy/runtime/D1DatabaseResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city.json` 是简单的 City 项目声明，Wrangler 配置是部署时临时生成物。
|
|
6
6
|
* - Cloudflare 默认值由 CLI 管理，用户不需要在 `city.json` 里写 worker_name 等细节。
|
|
7
|
-
* - D1 database id
|
|
7
|
+
* - D1 database id 由 CLI 在部署时解析，不污染用户手写配置。
|
|
8
8
|
*/
|
|
9
9
|
import type { CityProjectConfigFile, CityProjectDeployEnvFile } from "../../types/CityProjectConfig.js";
|
|
10
10
|
/** 写入 wrangler.toml 的结果。 */
|
|
@@ -15,5 +15,5 @@ export interface WranglerConfigWriteResult {
|
|
|
15
15
|
/**
|
|
16
16
|
* 根据 City 项目配置和本地部署环境写入临时 wrangler.toml。
|
|
17
17
|
*/
|
|
18
|
-
export declare function writeWranglerConfig(config_file: CityProjectConfigFile, env_file: CityProjectDeployEnvFile): WranglerConfigWriteResult;
|
|
18
|
+
export declare function writeWranglerConfig(config_file: CityProjectConfigFile, env_file: CityProjectDeployEnvFile, database_id?: string): WranglerConfigWriteResult;
|
|
19
19
|
//# sourceMappingURL=WranglerConfigWriter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WranglerConfigWriter.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/WranglerConfigWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,kCAAkC,CAAC;AAE1C,4BAA4B;AAC5B,MAAM,WAAW,yBAAyB;IACxC,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,qBAAqB,EAClC,QAAQ,EAAE,wBAAwB,
|
|
1
|
+
{"version":3,"file":"WranglerConfigWriter.d.ts","sourceRoot":"","sources":["../../../src/deploy/runtime/WranglerConfigWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EACzB,MAAM,kCAAkC,CAAC;AAE1C,4BAA4B;AAC5B,MAAM,WAAW,yBAAyB;IACxC,0BAA0B;IAC1B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,qBAAqB,EAClC,QAAQ,EAAE,wBAAwB,EAClC,WAAW,CAAC,EAAE,MAAM,GACnB,yBAAyB,CAgC3B"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city.json` 是简单的 City 项目声明，Wrangler 配置是部署时临时生成物。
|
|
6
6
|
* - Cloudflare 默认值由 CLI 管理，用户不需要在 `city.json` 里写 worker_name 等细节。
|
|
7
|
-
* - D1 database id
|
|
7
|
+
* - D1 database id 由 CLI 在部署时解析，不污染用户手写配置。
|
|
8
8
|
*/
|
|
9
9
|
import { mkdtempSync, writeFileSync } from "node:fs";
|
|
10
10
|
import { tmpdir } from "node:os";
|
|
@@ -12,11 +12,11 @@ import { join, resolve } from "node:path";
|
|
|
12
12
|
/**
|
|
13
13
|
* 根据 City 项目配置和本地部署环境写入临时 wrangler.toml。
|
|
14
14
|
*/
|
|
15
|
-
export function writeWranglerConfig(config_file, env_file) {
|
|
15
|
+
export function writeWranglerConfig(config_file, env_file, database_id) {
|
|
16
16
|
const config = config_file.config;
|
|
17
17
|
const config_dir = mkdtempSync(join(tmpdir(), "downcity-wrangler-"));
|
|
18
18
|
const config_path = join(config_dir, "wrangler.toml");
|
|
19
|
-
const
|
|
19
|
+
const resolved_database_id = database_id ?? "";
|
|
20
20
|
const lines = [
|
|
21
21
|
`name = ${tomlString(config.name)}`,
|
|
22
22
|
`main = ${tomlString(resolve(config_file.project_dir, config.entry))}`,
|
|
@@ -25,7 +25,7 @@ export function writeWranglerConfig(config_file, env_file) {
|
|
|
25
25
|
"workers_dev = true",
|
|
26
26
|
];
|
|
27
27
|
if (config.database) {
|
|
28
|
-
lines.push("", "[[d1_databases]]", `binding = ${tomlString(config.database.binding)}`, `database_name = ${tomlString(config.database.name)}`, `database_id = ${tomlString(
|
|
28
|
+
lines.push("", "[[d1_databases]]", `binding = ${tomlString(config.database.binding)}`, `database_name = ${tomlString(config.database.name)}`, `database_id = ${tomlString(resolved_database_id)}`);
|
|
29
29
|
}
|
|
30
30
|
lines.push("", "[observability]", "enabled = true");
|
|
31
31
|
writeFileSync(config_path, `${lines.join("\n")}\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WranglerConfigWriter.js","sourceRoot":"","sources":["../../../src/deploy/runtime/WranglerConfigWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAY1C;;GAEG;AACH,MAAM,UAAU,mBAAmB,CACjC,WAAkC,EAClC,QAAkC;
|
|
1
|
+
{"version":3,"file":"WranglerConfigWriter.js","sourceRoot":"","sources":["../../../src/deploy/runtime/WranglerConfigWriter.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAY1C;;GAEG;AACH,MAAM,UAAU,mBAAmB,CACjC,WAAkC,EAClC,QAAkC,EAClC,WAAoB;IAEpB,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IAClC,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;IACtD,MAAM,oBAAoB,GAAG,WAAW,IAAI,EAAE,CAAC;IAE/C,MAAM,KAAK,GAAG;QACZ,UAAU,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACnC,UAAU,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;QACtE,wBAAwB,UAAU,CAAC,YAAY,CAAC,EAAE;QAClD,yBAAyB,SAAS,CAAC,CAAC,eAAe,CAAC,CAAC,EAAE;QACvD,oBAAoB;KACrB,CAAC;IAEF,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CACR,EAAE,EACF,kBAAkB,EAClB,aAAa,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,EAClD,mBAAmB,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,EACrD,iBAAiB,UAAU,CAAC,oBAAoB,CAAC,EAAE,CACpD,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CACR,EAAE,EACF,iBAAiB,EACjB,gBAAgB,CACjB,CAAC;IAEF,aAAa,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO,EAAE,WAAW,EAAE,CAAC;AACzB,CAAC;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,SAAS,SAAS,CAAC,MAAgB;IACjC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;AAClD,CAAC"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
5
|
* - `city.json` 是开发者手写的最小项目声明。
|
|
6
|
-
* - `.env`
|
|
6
|
+
* - `.env` 只保存 City 项目自身真正需要的部署输入，例如 D1 name。
|
|
7
7
|
* - 配置里不放 Cloudflare token、provider key 或过细的 Worker 选项。
|
|
8
8
|
*/
|
|
9
9
|
/** City 项目当前支持的部署目标类型。 */
|
|
@@ -34,16 +34,8 @@ export interface CityProjectConfig {
|
|
|
34
34
|
}
|
|
35
35
|
/** City 项目本地部署环境。 */
|
|
36
36
|
export interface CityProjectDeployEnv {
|
|
37
|
-
/** Cloudflare account id，用于后续部署复用，不属于密钥。 */
|
|
38
|
-
cloudflare_account_id?: string;
|
|
39
|
-
/** Worker 公开访问地址，用于部署后验证与客户端连接。 */
|
|
40
|
-
city_worker_url?: string;
|
|
41
|
-
/** Cloudflare D1 database id。 */
|
|
42
|
-
city_d1_database_id?: string;
|
|
43
37
|
/** Cloudflare D1 database name。 */
|
|
44
38
|
city_d1_database_name?: string;
|
|
45
|
-
/** Worker runtime 中的 D1 binding 名称。 */
|
|
46
|
-
city_d1_binding?: string;
|
|
47
39
|
}
|
|
48
40
|
/** 已读取并解析完成的 City 项目配置文件。 */
|
|
49
41
|
export interface CityProjectConfigFile {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityProjectConfig.d.ts","sourceRoot":"","sources":["../../src/types/CityProjectConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,0BAA0B;AAC1B,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,CAAC;AAErD,wBAAwB;AACxB,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AAErC,0BAA0B;AAC1B,MAAM,WAAW,yBAAyB;IACxC,mCAAmC;IACnC,IAAI,EAAE,IAAI,CAAC;IACX,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;CACd;AAED,4BAA4B;AAC5B,MAAM,WAAW,iBAAiB;IAChC,gCAAgC;IAChC,IAAI,EAAE,eAAe,CAAC;IACtB,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,MAAM,EAAE,iBAAiB,CAAC;IAC1B,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,yBAAyB,CAAC;CACtC;AAED,qBAAqB;AACrB,MAAM,WAAW,oBAAoB;IACnC,
|
|
1
|
+
{"version":3,"file":"CityProjectConfig.d.ts","sourceRoot":"","sources":["../../src/types/CityProjectConfig.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,0BAA0B;AAC1B,MAAM,MAAM,iBAAiB,GAAG,oBAAoB,CAAC;AAErD,wBAAwB;AACxB,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC;AAErC,0BAA0B;AAC1B,MAAM,WAAW,yBAAyB;IACxC,mCAAmC;IACnC,IAAI,EAAE,IAAI,CAAC;IACX,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;CACd;AAED,4BAA4B;AAC5B,MAAM,WAAW,iBAAiB;IAChC,gCAAgC;IAChC,IAAI,EAAE,eAAe,CAAC;IACtB,wCAAwC;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,2CAA2C;IAC3C,MAAM,EAAE,iBAAiB,CAAC;IAC1B,+BAA+B;IAC/B,QAAQ,CAAC,EAAE,yBAAyB,CAAC;CACtC;AAED,qBAAqB;AACrB,MAAM,WAAW,oBAAoB;IACnC,mCAAmC;IACnC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,6BAA6B;AAC7B,MAAM,WAAW,qBAAqB;IACpC,kBAAkB;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,yBAAyB;IACzB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB;IACtB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,+BAA+B;AAC/B,MAAM,WAAW,wBAAwB;IACvC,oBAAoB;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc;IACd,GAAG,EAAE,oBAAoB,CAAC;CAC3B;AAED,gBAAgB;AAChB,MAAM,WAAW,gBAAgB;IAC/B,cAAc;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB;IACnB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,6BAA6B;AAC7B,MAAM,WAAW,iBAAiB;IAChC,iCAAiC;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,mBAAmB;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,oBAAoB;IACpB,MAAM,EAAE,OAAO,CAAC;IAChB,+BAA+B;IAC/B,UAAU,EAAE,OAAO,CAAC;IACpB,mCAAmC;IACnC,cAAc,EAAE,OAAO,CAAC;IACxB,uCAAuC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "downcity",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.70",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity CLI bundle — installs city and town commands",
|
|
6
6
|
"bin": {
|
|
@@ -45,9 +45,9 @@
|
|
|
45
45
|
"prompts": "^2.4.2",
|
|
46
46
|
"ws": "^8.21.0",
|
|
47
47
|
"zod": "^4.4.3",
|
|
48
|
-
"@downcity/
|
|
49
|
-
"@downcity/
|
|
50
|
-
"@downcity/plugins": "^1.0.
|
|
48
|
+
"@downcity/city": "^0.2.25",
|
|
49
|
+
"@downcity/agent": "^1.1.62",
|
|
50
|
+
"@downcity/plugins": "^1.0.20"
|
|
51
51
|
},
|
|
52
52
|
"scripts": {
|
|
53
53
|
"build": "node scripts/copy-cli-products.mjs && node scripts/ensure-cli-executable.mjs",
|