downcity 1.1.347 → 1.1.352
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -4
- package/bin/city/agent/AgentModel.d.ts +1 -1
- package/bin/city/agent/AgentModel.js +2 -2
- package/bin/city/agent/AgentModel.js.map +1 -1
- package/bin/city/agent/tui/PiTuiChatRenderer.d.ts.map +1 -1
- package/bin/city/agent/tui/PiTuiChatRenderer.js +8 -5
- package/bin/city/agent/tui/PiTuiChatRenderer.js.map +1 -1
- package/bin/city/runtime/city-model/CityAiServiceBinding.js +4 -4
- package/bin/city/runtime/city-model/CityAiServiceBinding.js.map +1 -1
- package/bin/city/runtime/plugins/CityBuiltinPlugins.js +7 -7
- package/bin/city/runtime/plugins/CityBuiltinPlugins.js.map +1 -1
- package/bin/city/shared/CityBalance.js +5 -5
- package/bin/city/shared/CityBalance.js.map +1 -1
- package/bin/city/shared/CityUserLogin.js +19 -19
- package/bin/city/shared/CityUserLogin.js.map +1 -1
- package/bin/city/shared/CityUserManager.d.ts +3 -3
- package/bin/city/shared/CityUserManager.d.ts.map +1 -1
- package/bin/city/shared/CityUserManager.js +4 -4
- package/bin/city/shared/CityUserManager.js.map +1 -1
- package/bin/federation/app.js +4 -4
- package/bin/federation/app.js.map +1 -1
- package/bin/federation/core/session.d.ts +47 -20
- package/bin/federation/core/session.d.ts.map +1 -1
- package/bin/federation/core/session.js +100 -0
- package/bin/federation/core/session.js.map +1 -1
- package/bin/federation/create/commands/create.d.ts +10 -11
- package/bin/federation/create/commands/create.d.ts.map +1 -1
- package/bin/federation/create/commands/create.js +123 -280
- package/bin/federation/create/commands/create.js.map +1 -1
- package/bin/federation/create/templates/CloudflareWorkersTemplate.d.ts +9 -0
- package/bin/federation/create/templates/CloudflareWorkersTemplate.d.ts.map +1 -0
- package/bin/federation/create/templates/CloudflareWorkersTemplate.js +165 -0
- package/bin/federation/create/templates/CloudflareWorkersTemplate.js.map +1 -0
- package/bin/federation/create/templates/LocalNodeTemplate.d.ts +12 -0
- package/bin/federation/create/templates/LocalNodeTemplate.d.ts.map +1 -0
- package/bin/federation/create/templates/LocalNodeTemplate.js +208 -0
- package/bin/federation/create/templates/LocalNodeTemplate.js.map +1 -0
- package/bin/federation/create/templates/TemplateCatalog.d.ts +13 -0
- package/bin/federation/create/templates/TemplateCatalog.d.ts.map +1 -0
- package/bin/federation/create/templates/TemplateCatalog.js +29 -0
- package/bin/federation/create/templates/TemplateCatalog.js.map +1 -0
- package/bin/federation/deploy/commands/deploy.d.ts +2 -2
- package/bin/federation/deploy/commands/deploy.d.ts.map +1 -1
- package/bin/federation/deploy/commands/deploy.js +14 -10
- package/bin/federation/deploy/commands/deploy.js.map +1 -1
- package/bin/federation/deploy/config/FederationDeployTargetResolver.d.ts +4 -4
- package/bin/federation/deploy/config/FederationDeployTargetResolver.d.ts.map +1 -1
- package/bin/federation/deploy/config/FederationDeployTargetResolver.js +5 -6
- package/bin/federation/deploy/config/FederationDeployTargetResolver.js.map +1 -1
- package/bin/federation/deploy/config/FederationProjectConfigReader.d.ts +7 -9
- package/bin/federation/deploy/config/FederationProjectConfigReader.d.ts.map +1 -1
- package/bin/federation/deploy/config/FederationProjectConfigReader.js +102 -155
- package/bin/federation/deploy/config/FederationProjectConfigReader.js.map +1 -1
- package/bin/federation/deploy/runtime/CloudflareAccountResolver.d.ts +1 -1
- package/bin/federation/deploy/runtime/CloudflareAccountResolver.js +2 -2
- package/bin/federation/deploy/runtime/CloudflareAccountResolver.js.map +1 -1
- package/bin/federation/deploy/runtime/CloudflareWorkersDeployer.d.ts +2 -2
- package/bin/federation/deploy/runtime/CloudflareWorkersDeployer.d.ts.map +1 -1
- package/bin/federation/deploy/runtime/CloudflareWorkersDeployer.js +92 -44
- package/bin/federation/deploy/runtime/CloudflareWorkersDeployer.js.map +1 -1
- package/bin/federation/deploy/runtime/D1DatabaseResolver.d.ts +1 -1
- package/bin/federation/deploy/runtime/D1DatabaseResolver.js +4 -4
- package/bin/federation/deploy/runtime/D1DatabaseResolver.js.map +1 -1
- package/bin/federation/deploy/runtime/LocalFederationDeployer.d.ts +15 -0
- package/bin/federation/deploy/runtime/LocalFederationDeployer.d.ts.map +1 -0
- package/bin/federation/deploy/runtime/LocalFederationDeployer.js +326 -0
- package/bin/federation/deploy/runtime/LocalFederationDeployer.js.map +1 -0
- package/bin/federation/deploy/runtime/LocalProcessLauncher.d.ts +11 -0
- package/bin/federation/deploy/runtime/LocalProcessLauncher.d.ts.map +1 -0
- package/bin/federation/deploy/runtime/LocalProcessLauncher.js +49 -0
- package/bin/federation/deploy/runtime/LocalProcessLauncher.js.map +1 -0
- package/bin/federation/deploy/runtime/PackageScriptRunner.d.ts +1 -1
- package/bin/federation/deploy/runtime/PackageScriptRunner.js +1 -1
- package/bin/federation/deploy/runtime/ProjectVersionManager.d.ts +1 -1
- package/bin/federation/deploy/runtime/ProjectVersionManager.js +1 -1
- package/bin/federation/deploy/runtime/QueueResolver.d.ts +1 -1
- package/bin/federation/deploy/runtime/QueueResolver.js +2 -2
- package/bin/federation/deploy/runtime/QueueResolver.js.map +1 -1
- package/bin/federation/deploy/runtime/R2BucketResolver.d.ts +1 -1
- package/bin/federation/deploy/runtime/R2BucketResolver.js +2 -2
- package/bin/federation/deploy/runtime/R2BucketResolver.js.map +1 -1
- package/bin/federation/deploy/runtime/WranglerConfigWriter.js +8 -8
- package/bin/federation/deploy/runtime/WranglerConfigWriter.js.map +1 -1
- package/bin/federation/index.d.ts.map +1 -1
- package/bin/federation/index.js +28 -17
- package/bin/federation/index.js.map +1 -1
- package/bin/federation/query/commands/query.d.ts +1 -1
- package/bin/federation/query/commands/query.js +5 -11
- package/bin/federation/query/commands/query.js.map +1 -1
- package/bin/federation/server/FederationServerManager.d.ts.map +1 -1
- package/bin/federation/server/FederationServerManager.js +5 -0
- package/bin/federation/server/FederationServerManager.js.map +1 -1
- package/bin/federation/server/FederationServerWorkspace.d.ts.map +1 -1
- package/bin/federation/server/FederationServerWorkspace.js +4 -0
- package/bin/federation/server/FederationServerWorkspace.js.map +1 -1
- package/bin/federation/tui/FederationDashboard.js +11 -9
- package/bin/federation/tui/FederationDashboard.js.map +1 -1
- package/bin/federation/types/FederationProjectConfig.d.ts +69 -49
- package/bin/federation/types/FederationProjectConfig.d.ts.map +1 -1
- package/bin/federation/types/FederationProjectConfig.js +5 -5
- package/bin/federation/types/FederationQuery.d.ts +1 -1
- package/bin/federation/types/FederationQuery.d.ts.map +1 -1
- package/bin/federation/types/FederationRegistry.d.ts +54 -0
- package/bin/federation/types/FederationRegistry.d.ts.map +1 -0
- package/bin/federation/types/FederationRegistry.js +10 -0
- package/bin/federation/types/FederationRegistry.js.map +1 -0
- package/bin/federation/types/FederationTemplate.d.ts +31 -0
- package/bin/federation/types/FederationTemplate.d.ts.map +1 -0
- package/bin/federation/types/FederationTemplate.js +7 -0
- package/bin/federation/types/FederationTemplate.js.map +1 -0
- package/package.json +9 -8
package/README.md
CHANGED
|
@@ -7,9 +7,17 @@ npm install -g downcity
|
|
|
7
7
|
downcity -v
|
|
8
8
|
```
|
|
9
9
|
|
|
10
|
-
安装后会得到 `downcity`
|
|
10
|
+
安装后会得到 `city` / `downcity` 与 `fed` / `downfed` 两组命令：
|
|
11
11
|
|
|
12
|
-
-
|
|
13
|
-
-
|
|
12
|
+
- `fed` 创建、部署和管理 Federation；Local Node.js 和 Cloudflare Workers 都通过 `fed deploy` 部署。
|
|
13
|
+
- `city` 管理本机 Agent、插件、chat 与 Federation 用户登录态。
|
|
14
14
|
|
|
15
|
-
|
|
15
|
+
```bash
|
|
16
|
+
fed create ./my-fed
|
|
17
|
+
cd my-fed
|
|
18
|
+
pnpm install
|
|
19
|
+
fed deploy
|
|
20
|
+
fed
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
`fed create` 默认生成 Local Node.js + SQLite 项目。Local deploy 会自动注入并保存 admin key。无参数执行 `fed` 会进入系统级 Federation 管理面板，已部署实例不依赖当前工作目录。
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Agent 默认模型配置服务。
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
|
-
* - 模型候选项唯一来源是当前 Federation
|
|
5
|
+
* - 模型候选项唯一来源是当前 Federation User City 的 `ai.catalog()`。
|
|
6
6
|
* - 只维护 Agent 配置中的 `execution.modelId`，不管理 Session 运行时模型。
|
|
7
7
|
* - 配置更新在 Agent 下次启动或重启时解析为运行时模型实例。
|
|
8
8
|
*/
|
|
@@ -44,7 +44,7 @@ async function resolve_model_id(params) {
|
|
|
44
44
|
if (!choices.some((choice) => choice.value === requested_model_id)) {
|
|
45
45
|
throw new CliError({
|
|
46
46
|
title: `Model not available: ${requested_model_id}`,
|
|
47
|
-
note: "目标模型不在当前 Federation
|
|
47
|
+
note: "目标模型不在当前 Federation User City 返回的对话模型中。",
|
|
48
48
|
fix: `downcity agent model ${params.project_root} --set <model-id>`,
|
|
49
49
|
});
|
|
50
50
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AgentModel.js","sourceRoot":"","sources":["../../../src/city/agent/AgentModel.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,oDAAoD,CAAC;AAC9F,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EACL,eAAe,EACf,iBAAiB,GAClB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAQhD,sCAAsC;AACtC,KAAK,UAAU,oBAAoB,CACjC,YAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,0BAA0B,EAAE,CAAC;IAClD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CACzB,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,YAAY,CAC5D,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,QAAQ,CAAC;YACjB,KAAK,EAAE,yBAAyB;YAChC,IAAI,EAAE,YAAY,YAAY,EAAE;YAChC,GAAG,EAAE,yBAAyB,YAAY,EAAE;SAC7C,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,EAAE;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;KACvB,CAAC;AACJ,CAAC;AAED,uCAAuC;AACvC,KAAK,UAAU,gBAAgB,CAAC,MAO/B;IACC,MAAM,OAAO,GAAG,MAAM,wBAAwB,EAAE,CAAC;IACjD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,QAAQ,CAAC;YACjB,KAAK,EAAE,mCAAmC;YAC1C,IAAI,EAAE,iDAAiD;YACvD,GAAG,EAAE,4BAA4B;SAClC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC1E,IAAI,kBAAkB,EAAE,CAAC;QACvB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,KAAK,kBAAkB,CAAC,EAAE,CAAC;YACnE,MAAM,IAAI,QAAQ,CAAC;gBACjB,KAAK,EAAE,wBAAwB,kBAAkB,EAAE;gBACnD,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"AgentModel.js","sourceRoot":"","sources":["../../../src/city/agent/AgentModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PiTuiChatRenderer.d.ts","sourceRoot":"","sources":["../../../../src/city/agent/tui/PiTuiChatRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,KAAK,EACV,kCAAkC,EAClC,gCAAgC,EACjC,MAAM,sCAAsC,CAAC;AAE9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF;;GAEG;AACH,qBAAa,iBAAkB,YAAW,gCAAgC;IACxE,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,oBAAoB,CAAS;IACrC,mBAAmB,CAAC,EAAE,gCAAgC,CAAC,qBAAqB,CAAC,CAAC;IAE9E;;;;OAIG;gBAED,YAAY,EAAE,oBAAoB,EAClC,cAAc,EAAE,MAAM,IAAI,EAC1B,mBAAmB,CAAC,EAAE,gCAAgC,CAAC,qBAAqB,CAAC;IAS/E;;OAEG;IACH,UAAU,IAAI,IAAI;IAKlB;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrC;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"PiTuiChatRenderer.d.ts","sourceRoot":"","sources":["../../../../src/city/agent/tui/PiTuiChatRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,OAAO,KAAK,EACV,kCAAkC,EAClC,gCAAgC,EACjC,MAAM,sCAAsC,CAAC;AAE9C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAEvF;;GAEG;AACH,qBAAa,iBAAkB,YAAW,gCAAgC;IACxE,OAAO,CAAC,YAAY,CAAwB;IAC5C,OAAO,CAAC,oBAAoB,CAAS;IACrC,mBAAmB,CAAC,EAAE,gCAAgC,CAAC,qBAAqB,CAAC,CAAC;IAE9E;;;;OAIG;gBAED,YAAY,EAAE,oBAAoB,EAClC,cAAc,EAAE,MAAM,IAAI,EAC1B,mBAAmB,CAAC,EAAE,gCAAgC,CAAC,qBAAqB,CAAC;IAS/E;;OAEG;IACH,UAAU,IAAI,IAAI;IAKlB;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAIrC;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IA4B1C;;;;OAIG;IACH,WAAW,IAAI,kCAAkC;CAMlD"}
|
|
@@ -55,14 +55,17 @@ export class PiTuiChatRenderer {
|
|
|
55
55
|
if (event.variant === "part" &&
|
|
56
56
|
event.type === "tool" &&
|
|
57
57
|
event.part.state === "approval-required" &&
|
|
58
|
-
event.part.approval) {
|
|
58
|
+
event.part.approval?.request) {
|
|
59
59
|
const approval = event.part.approval;
|
|
60
|
+
const request = approval.request;
|
|
61
|
+
if (!request)
|
|
62
|
+
return;
|
|
60
63
|
this.on_approval_request?.({
|
|
61
64
|
approval_id: approval.approval_id,
|
|
62
|
-
tool_name:
|
|
63
|
-
cmd:
|
|
64
|
-
cwd:
|
|
65
|
-
reason:
|
|
65
|
+
tool_name: request.tool_name,
|
|
66
|
+
cmd: request.command,
|
|
67
|
+
cwd: request.cwd,
|
|
68
|
+
reason: request.reason,
|
|
66
69
|
});
|
|
67
70
|
}
|
|
68
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PiTuiChatRenderer.js","sourceRoot":"","sources":["../../../../src/city/agent/tui/PiTuiChatRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAGpF;;GAEG;AACH,MAAM,OAAO,iBAAiB;IACpB,YAAY,CAAwB;IACpC,oBAAoB,GAAG,KAAK,CAAC;IACrC,mBAAmB,CAA2D;IAE9E;;;;OAIG;IACH,YACE,YAAkC,EAClC,cAA0B,EAC1B,mBAA6E;QAE7E,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAqB,CAAC;YAC5C,YAAY;YACZ,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,OAAe;QAC5B,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,KAAsB;QACjC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACtC,IACE,KAAK,CAAC,OAAO,KAAK,OAAO;YACzB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAClB,CAAC;YACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACnC,CAAC;QACD,IACE,KAAK,CAAC,OAAO,KAAK,MAAM;YACxB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,mBAAmB;YACxC,KAAK,CAAC,IAAI,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"PiTuiChatRenderer.js","sourceRoot":"","sources":["../../../../src/city/agent/tui/PiTuiChatRenderer.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AAGpF;;GAEG;AACH,MAAM,OAAO,iBAAiB;IACpB,YAAY,CAAwB;IACpC,oBAAoB,GAAG,KAAK,CAAC;IACrC,mBAAmB,CAA2D;IAE9E;;;;OAIG;IACH,YACE,YAAkC,EAClC,cAA0B,EAC1B,mBAA6E;QAE7E,IAAI,CAAC,YAAY,GAAG,IAAI,qBAAqB,CAAC;YAC5C,YAAY;YACZ,cAAc;SACf,CAAC,CAAC;QACH,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,CAAC;IAED;;OAEG;IACH,UAAU;QACR,IAAI,CAAC,oBAAoB,GAAG,KAAK,CAAC;QAClC,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,OAAe;QAC5B,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;;OAIG;IACH,YAAY,CAAC,KAAsB;QACjC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACtC,IACE,KAAK,CAAC,OAAO,KAAK,OAAO;YACzB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,EAClB,CAAC;YACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACnC,CAAC;QACD,IACE,KAAK,CAAC,OAAO,KAAK,MAAM;YACxB,KAAK,CAAC,IAAI,KAAK,MAAM;YACrB,KAAK,CAAC,IAAI,CAAC,KAAK,KAAK,mBAAmB;YACxC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAC5B,CAAC;YACD,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC;YACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;YACjC,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACzB,WAAW,EAAE,QAAQ,CAAC,WAAW;gBACjC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,GAAG,EAAE,OAAO,CAAC,OAAO;gBACpB,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,WAAW;QACT,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC;QAChC,OAAO;YACL,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;SAChD,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -35,10 +35,10 @@ export async function listCityAiServiceModelsForAdmin(env = process.env) {
|
|
|
35
35
|
* 读取用户态可调用模型目录。
|
|
36
36
|
*/
|
|
37
37
|
export async function listCityAiServiceModelsForUser(env = process.env) {
|
|
38
|
-
const {
|
|
38
|
+
const { city } = await cityUserManager.createUserClient({
|
|
39
39
|
env,
|
|
40
40
|
});
|
|
41
|
-
const catalog = await
|
|
41
|
+
const catalog = await city.ai.catalog();
|
|
42
42
|
return catalog.all();
|
|
43
43
|
}
|
|
44
44
|
/**
|
|
@@ -85,10 +85,10 @@ export async function createCityAiAgentModel(input) {
|
|
|
85
85
|
const modelId = String(input.modelId || "").trim();
|
|
86
86
|
if (!modelId)
|
|
87
87
|
throw new Error("modelId cannot be empty");
|
|
88
|
-
const {
|
|
88
|
+
const { city } = await cityUserManager.createUserClient({
|
|
89
89
|
env: input.env ?? process.env,
|
|
90
90
|
});
|
|
91
|
-
const catalog = await
|
|
91
|
+
const catalog = await city.ai.catalog();
|
|
92
92
|
const model = catalog.get(modelId);
|
|
93
93
|
if (!model || !is_city_ai_execution_model(model)) {
|
|
94
94
|
throw new Error(`Agent execution model not found in Federation: ${modelId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityAiServiceBinding.js","sourceRoot":"","sources":["../../../../src/city/runtime/city-model/CityAiServiceBinding.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAGtC,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;AAC9C,MAAM,0BAA0B,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAsBzE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,+BAA+B,CACnD,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,kBAAkB,CAAC;QACpD,GAAG;QACH,kBAAkB,EAAE,KAAK;QACzB,WAAW,EAAE,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,eAAe,CAAC,eAAe,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;IACnF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CACb,6HAA6H,CAC9H,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;QACpB,IAAI,EAAE,OAAO;QACb,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,OAAO,EAAE,IAAI,CAAC,cAAc;QAC5B,gBAAgB;KACjB,CAAC,CAAC;IACH,OAAO,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"CityAiServiceBinding.js","sourceRoot":"","sources":["../../../../src/city/runtime/city-model/CityAiServiceBinding.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ export function createCityStaticBuiltinPlugins(input = {}) {
|
|
|
71
71
|
* 创建 City agent 运行期应启用的完整内建 plugin 集合。
|
|
72
72
|
*/
|
|
73
73
|
export async function createCityBuiltinPlugins(input) {
|
|
74
|
-
const {
|
|
74
|
+
const { city } = await city_user_manager.createUserClient({
|
|
75
75
|
env: input.env ?? process.env,
|
|
76
76
|
});
|
|
77
77
|
return [
|
|
@@ -82,7 +82,7 @@ export async function createCityBuiltinPlugins(input) {
|
|
|
82
82
|
}),
|
|
83
83
|
new ImagePlugin({
|
|
84
84
|
list_models: async () => {
|
|
85
|
-
const catalog = await
|
|
85
|
+
const catalog = await city.ai.catalog();
|
|
86
86
|
return catalog.forModality("image").map((model) => ({
|
|
87
87
|
id: model.id,
|
|
88
88
|
name: model.name,
|
|
@@ -92,15 +92,15 @@ export async function createCityBuiltinPlugins(input) {
|
|
|
92
92
|
meta: JSON.parse(JSON.stringify(model.meta ?? {})),
|
|
93
93
|
}));
|
|
94
94
|
},
|
|
95
|
-
image_create: async (image_input) => await
|
|
95
|
+
image_create: async (image_input) => await city.ai.image_create({
|
|
96
96
|
...image_input,
|
|
97
97
|
model: require_model_id(image_input, "image_create"),
|
|
98
98
|
}),
|
|
99
|
-
image_result: async (image_input) => await
|
|
99
|
+
image_result: async (image_input) => await city.ai.image_result(image_input),
|
|
100
100
|
}),
|
|
101
101
|
new SoundPlugin({
|
|
102
102
|
list_models: async () => {
|
|
103
|
-
const catalog = await
|
|
103
|
+
const catalog = await city.ai.catalog();
|
|
104
104
|
return catalog.all()
|
|
105
105
|
.filter((model) => model.modalities.includes("asr") || model.modalities.includes("tts"))
|
|
106
106
|
.map((model) => ({
|
|
@@ -112,11 +112,11 @@ export async function createCityBuiltinPlugins(input) {
|
|
|
112
112
|
meta: JSON.parse(JSON.stringify(model.meta ?? {})),
|
|
113
113
|
}));
|
|
114
114
|
},
|
|
115
|
-
asr: async (asr_input) => await
|
|
115
|
+
asr: async (asr_input) => await city.ai.asr({
|
|
116
116
|
...asr_input,
|
|
117
117
|
model: require_model_id(asr_input, "asr"),
|
|
118
118
|
}),
|
|
119
|
-
tts: async (tts_input) => await
|
|
119
|
+
tts: async (tts_input) => await city.ai.tts({
|
|
120
120
|
...tts_input,
|
|
121
121
|
model: require_model_id(tts_input, "tts"),
|
|
122
122
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityBuiltinPlugins.js","sourceRoot":"","sources":["../../../../src/city/runtime/plugins/CityBuiltinPlugins.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,UAAU,EACV,aAAa,EACb,aAAa,EACb,WAAW,EACX,YAAY,EACZ,SAAS,EACT,WAAW,EACX,WAAW,EACX,UAAU,EACV,eAAe,EACf,SAAS,EACT,eAAe,GAChB,MAAM,mBAAmB,CAAC;AAQ3B,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,MAAM,iBAAiB,GAAG,IAAI,eAAe,EAAE,CAAC;AAEhD;;GAEG;AACH,SAAS,gBAAgB,CAAC,KAAc,EAAE,UAAkB;IAC1D,MAAM,MAAM,GAAG,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ;QAC/C,CAAC,CAAC,KAA4B;QAC9B,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,QAAQ,GAAG,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7E,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,SAAS,CAAC,GAAG,UAAU,oBAAoB,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,yBAAyB,CAAC,MAAuB;IACxD,MAAM,QAAQ,GAAG,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC;IACjD,MAAM,QAAQ,GAAG,QAAQ,EAAE,QAAQ,CAAC;IACpC,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,CAAC;IAChC,MAAM,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC;IAExB,OAAO;QACL,IAAI,eAAe,CAAC;YAClB,OAAO,EAAE,QAAQ,EAAE,OAAO,KAAK,IAAI;YACnC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;SAC7C,CAAC;QACF,IAAI,aAAa,CAAC;YAChB,OAAO,EAAE,MAAM,EAAE,OAAO,KAAK,IAAI;YACjC,gBAAgB,EAAE,MAAM,EAAE,gBAAgB;SAC3C,CAAC;QACF,IAAI,SAAS,CAAC;YACZ,OAAO,EAAE,EAAE,EAAE,OAAO,KAAK,IAAI;YAC7B,gBAAgB,EAAE,EAAE,EAAE,gBAAgB;SACvC,CAAC;KACH,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,8BAA8B,CAAC,QAS3C,EAAE;IACJ,OAAO;QACL,IAAI,WAAW,EAAE;QACjB,IAAI,SAAS,EAAE;QACf,IAAI,eAAe,EAAE;QACrB,IAAI,UAAU,CAAC;YACb,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK;YACzC,QAAQ,EAAE,yBAAyB,CAAC,KAAK,CAAC,MAAM,CAAC;SAClD,CAAC;QACF,IAAI,aAAa,CAAC;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI;YAC7C,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI;SAC9C,CAAC;QACF,IAAI,UAAU,EAAE;QAChB,IAAI,YAAY,EAAE;KACnB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,KAa9C;IACC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"CityBuiltinPlugins.js","sourceRoot":"","sources":["../../../../src/city/runtime/plugins/CityBuiltinPlugins.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ const cityUserManager = new CityUserManager();
|
|
|
15
15
|
* 读取当前 City user 的余额。
|
|
16
16
|
*/
|
|
17
17
|
export async function readCurrentCityBalance() {
|
|
18
|
-
const { user,
|
|
19
|
-
const account = await
|
|
18
|
+
const { user, city } = await cityUserManager.createUserClient();
|
|
19
|
+
const account = await city.service("balance").get("me");
|
|
20
20
|
assertBalanceUserMatchesToken(account, user.user_id);
|
|
21
21
|
return account;
|
|
22
22
|
}
|
|
@@ -24,10 +24,10 @@ export async function readCurrentCityBalance() {
|
|
|
24
24
|
* 给当前 City user 发起充值。
|
|
25
25
|
*/
|
|
26
26
|
export async function rechargeCurrentCityUser(input) {
|
|
27
|
-
const {
|
|
27
|
+
const { city } = await cityUserManager.createUserClient();
|
|
28
28
|
const credits = normalizePositiveInteger(input.credits, "credits");
|
|
29
29
|
const method_id = normalizeText(input.method_id) || DEFAULT_PAYMENT_METHOD_ID;
|
|
30
|
-
const topup = await
|
|
30
|
+
const topup = await city.service("balance").action("topups/create").invoke({
|
|
31
31
|
credits,
|
|
32
32
|
note: normalizeText(input.note) || "City user recharge",
|
|
33
33
|
ref: normalizeText(input.ref),
|
|
@@ -36,7 +36,7 @@ export async function rechargeCurrentCityUser(input) {
|
|
|
36
36
|
method_id,
|
|
37
37
|
},
|
|
38
38
|
});
|
|
39
|
-
const checkout = await
|
|
39
|
+
const checkout = await city.payment.method(method_id).invoke({
|
|
40
40
|
topup_id: topup.topup_id,
|
|
41
41
|
});
|
|
42
42
|
const checkout_url = normalizeText(checkout.checkout_url);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityBalance.js","sourceRoot":"","sources":["../../../src/city/shared/CityBalance.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AASnE,MAAM,yBAAyB,GAAG,QAAQ,CAAC;AAC3C,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;AAE9C;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAC1C,MAAM,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"CityBalance.js","sourceRoot":"","sources":["../../../src/city/shared/CityBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,8 +55,8 @@ function mapProvidersToOptions(items) {
|
|
|
55
55
|
return options;
|
|
56
56
|
}
|
|
57
57
|
async function loadAuthOptions(federation_url) {
|
|
58
|
-
const
|
|
59
|
-
const accounts =
|
|
58
|
+
const city = new City({ role: "user", federation_url });
|
|
59
|
+
const accounts = city.service("accounts");
|
|
60
60
|
const result = await accounts.get("providers");
|
|
61
61
|
return mapProvidersToOptions(result.items ?? []);
|
|
62
62
|
}
|
|
@@ -99,8 +99,8 @@ async function emailLogin(input) {
|
|
|
99
99
|
const password = String(response.password || "");
|
|
100
100
|
if (!email || !email.includes("@") || !password)
|
|
101
101
|
return null;
|
|
102
|
-
const
|
|
103
|
-
const accounts =
|
|
102
|
+
const city = new City({ role: "user", federation_url: input.federation_url });
|
|
103
|
+
const accounts = city.service("accounts");
|
|
104
104
|
const started = await accounts.action("login/start").invoke({
|
|
105
105
|
provider: "email",
|
|
106
106
|
city_id: input.city_id,
|
|
@@ -115,7 +115,7 @@ async function emailLogin(input) {
|
|
|
115
115
|
if (continued.error || continued.status !== "done") {
|
|
116
116
|
throw new Error(continued.error || "login failed");
|
|
117
117
|
}
|
|
118
|
-
const result = await readLoginResult(
|
|
118
|
+
const result = await readLoginResult(city, started.login_id);
|
|
119
119
|
if (!result || result.error || !result.user_token) {
|
|
120
120
|
throw new Error(result?.error || "login failed: no token");
|
|
121
121
|
}
|
|
@@ -145,8 +145,8 @@ async function emailRegister(input) {
|
|
|
145
145
|
throw new Error("invalid email");
|
|
146
146
|
if (password.length < 8)
|
|
147
147
|
throw new Error("password must be at least 8 characters");
|
|
148
|
-
const
|
|
149
|
-
const accounts =
|
|
148
|
+
const city = new City({ role: "user", federation_url: input.federation_url });
|
|
149
|
+
const accounts = city.service("accounts");
|
|
150
150
|
const registered = await accounts.action("register").invoke({
|
|
151
151
|
email,
|
|
152
152
|
password,
|
|
@@ -182,8 +182,8 @@ async function emailRegister(input) {
|
|
|
182
182
|
});
|
|
183
183
|
}
|
|
184
184
|
async function oauthAuth(input, provider) {
|
|
185
|
-
const
|
|
186
|
-
const accounts =
|
|
185
|
+
const city = new City({ role: "user", federation_url: input.federation_url });
|
|
186
|
+
const accounts = city.service("accounts");
|
|
187
187
|
const started = await accounts.action("login/start").invoke({
|
|
188
188
|
provider,
|
|
189
189
|
city_id: input.city_id,
|
|
@@ -204,7 +204,7 @@ async function oauthAuth(input, provider) {
|
|
|
204
204
|
],
|
|
205
205
|
note: "Waiting for browser authorization...",
|
|
206
206
|
});
|
|
207
|
-
const result = await pollLoginResult(
|
|
207
|
+
const result = await pollLoginResult(city, started.login_id);
|
|
208
208
|
if (!result || result.error || !result.user_token) {
|
|
209
209
|
throw new Error(result?.error || "OAuth failed");
|
|
210
210
|
}
|
|
@@ -216,15 +216,15 @@ async function oauthAuth(input, provider) {
|
|
|
216
216
|
});
|
|
217
217
|
}
|
|
218
218
|
async function inputAuth(input, provider) {
|
|
219
|
-
const
|
|
220
|
-
const started = await
|
|
219
|
+
const city = new City({ role: "user", federation_url: input.federation_url });
|
|
220
|
+
const started = await city.service("accounts").action("login/start").invoke({
|
|
221
221
|
provider,
|
|
222
222
|
city_id: input.city_id,
|
|
223
223
|
});
|
|
224
224
|
if (started.error || started.status !== "done" || !started.login_id) {
|
|
225
225
|
throw new Error(started.error || "login failed");
|
|
226
226
|
}
|
|
227
|
-
const result = await readLoginResult(
|
|
227
|
+
const result = await readLoginResult(city, started.login_id);
|
|
228
228
|
if (!result || result.error || !result.user_token) {
|
|
229
229
|
throw new Error(result?.error || "login failed: no token");
|
|
230
230
|
}
|
|
@@ -235,10 +235,10 @@ async function inputAuth(input, provider) {
|
|
|
235
235
|
user_label: result.email || result.user_id || provider,
|
|
236
236
|
});
|
|
237
237
|
}
|
|
238
|
-
async function pollLoginResult(
|
|
238
|
+
async function pollLoginResult(city, login_id) {
|
|
239
239
|
for (let index = 0; index < 180; index += 1) {
|
|
240
240
|
try {
|
|
241
|
-
const result = await readLoginResult(
|
|
241
|
+
const result = await readLoginResult(city, login_id);
|
|
242
242
|
if (result.error)
|
|
243
243
|
return result;
|
|
244
244
|
if (result.status === "done")
|
|
@@ -251,8 +251,8 @@ async function pollLoginResult(client, login_id) {
|
|
|
251
251
|
}
|
|
252
252
|
return { error: "login timed out" };
|
|
253
253
|
}
|
|
254
|
-
async function readLoginResult(
|
|
255
|
-
return await
|
|
254
|
+
async function readLoginResult(city, login_id) {
|
|
255
|
+
return await city.service("accounts").get("login/result", { login_id });
|
|
256
256
|
}
|
|
257
257
|
function buildUserSession(input) {
|
|
258
258
|
return {
|
|
@@ -273,13 +273,13 @@ async function buildVerifiedUserSession(input) {
|
|
|
273
273
|
});
|
|
274
274
|
}
|
|
275
275
|
async function readUserSessionFromToken(input) {
|
|
276
|
-
const
|
|
276
|
+
const city = new City({
|
|
277
277
|
role: "user",
|
|
278
278
|
federation_url: input.federation_url,
|
|
279
279
|
city_id: input.city_id,
|
|
280
280
|
user_token: input.user_token,
|
|
281
281
|
});
|
|
282
|
-
const result = await
|
|
282
|
+
const result = await city.service("accounts").get("me");
|
|
283
283
|
const user_id = readString(result.user?.user_id);
|
|
284
284
|
const email = readString(result.profile?.email);
|
|
285
285
|
const display_name = readString(result.profile?.display_name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserLogin.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserLogin.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"CityUserLogin.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserLogin.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare class CityUserManager {
|
|
|
17
17
|
*/
|
|
18
18
|
resolveCurrentUser(input?: ResolveCityUserInput): Promise<ResolvedCityUser>;
|
|
19
19
|
/**
|
|
20
|
-
* 创建当前有效 City
|
|
20
|
+
* 创建当前有效 User City。
|
|
21
21
|
*/
|
|
22
22
|
createUserClient(input?: ResolveCityUserInput): Promise<{
|
|
23
23
|
/**
|
|
@@ -25,9 +25,9 @@ export declare class CityUserManager {
|
|
|
25
25
|
*/
|
|
26
26
|
user: ResolvedCityUser;
|
|
27
27
|
/**
|
|
28
|
-
* City
|
|
28
|
+
* 绑定当前用户身份的 City SDK 实例。
|
|
29
29
|
*/
|
|
30
|
-
|
|
30
|
+
city: City<"user">;
|
|
31
31
|
}>;
|
|
32
32
|
/**
|
|
33
33
|
* 读取当前 City base 的 admin secret。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserManager.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAStC,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EAGrB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACG,kBAAkB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4DrF;;OAEG;IACG,gBAAgB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC;QAChE;;WAEG;QACH,IAAI,EAAE,gBAAgB,CAAC;QAEvB;;WAEG;QACH,
|
|
1
|
+
{"version":3,"file":"CityUserManager.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAStC,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EAGrB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACG,kBAAkB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA4DrF;;OAEG;IACG,gBAAgB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC;QAChE;;WAEG;QACH,IAAI,EAAE,gBAAgB,CAAC;QAEvB;;WAEG;QACH,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;KACpB,CAAC;IAmBF;;OAEG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,GAAG,SAAS;YAMxH,iBAAiB;CAgChC"}
|
|
@@ -71,7 +71,7 @@ export class CityUserManager {
|
|
|
71
71
|
return resolved;
|
|
72
72
|
}
|
|
73
73
|
/**
|
|
74
|
-
* 创建当前有效 City
|
|
74
|
+
* 创建当前有效 User City。
|
|
75
75
|
*/
|
|
76
76
|
async createUserClient(input = {}) {
|
|
77
77
|
const user = await this.resolveCurrentUser({
|
|
@@ -83,7 +83,7 @@ export class CityUserManager {
|
|
|
83
83
|
}
|
|
84
84
|
return {
|
|
85
85
|
user,
|
|
86
|
-
|
|
86
|
+
city: new City({
|
|
87
87
|
role: "user",
|
|
88
88
|
federation_url: user.federation_url,
|
|
89
89
|
city_id: user.city_id,
|
|
@@ -100,13 +100,13 @@ export class CityUserManager {
|
|
|
100
100
|
|| undefined;
|
|
101
101
|
}
|
|
102
102
|
async verifyCurrentUser(user, session_user_id) {
|
|
103
|
-
const
|
|
103
|
+
const city = new City({
|
|
104
104
|
role: "user",
|
|
105
105
|
federation_url: user.federation_url,
|
|
106
106
|
city_id: user.city_id,
|
|
107
107
|
user_token: user.user_token,
|
|
108
108
|
});
|
|
109
|
-
const result = await
|
|
109
|
+
const result = await city.service("accounts").get("me");
|
|
110
110
|
const token_user_id = readString(result.user?.user_id);
|
|
111
111
|
if (!token_user_id) {
|
|
112
112
|
throw new Error("City user token resolved without a user_id. Run `city city login` again.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserManager.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CityUserManager.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"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"}
|
package/bin/federation/app.js
CHANGED
|
@@ -13,8 +13,8 @@ import { show, showError, showSuccess } from "./core/ui.js";
|
|
|
13
13
|
import { updateCli } from "./core/update.js";
|
|
14
14
|
import { getCliLocale, setCliLocale, t } from "../shared/CliLocale.js";
|
|
15
15
|
import { setActiveServer, writePersistedCliLocale } from "./core/session.js";
|
|
16
|
-
import {
|
|
17
|
-
import {
|
|
16
|
+
import { create_federation_project } from "./create/commands/create.js";
|
|
17
|
+
import { deploy_federation_project } from "./deploy/commands/deploy.js";
|
|
18
18
|
import { prompt_add_federation_server } from "./server/FederationServerManager.js";
|
|
19
19
|
import { open_federation_server_workspace } from "./server/FederationServerWorkspace.js";
|
|
20
20
|
import { open_federation_dashboard } from "./tui/FederationDashboard.js";
|
|
@@ -33,7 +33,7 @@ async function run_federation_dashboard_action(action) {
|
|
|
33
33
|
return "quit";
|
|
34
34
|
}
|
|
35
35
|
if (action === "create_federation") {
|
|
36
|
-
await
|
|
36
|
+
await create_federation_project(".", { force: false });
|
|
37
37
|
return "refresh";
|
|
38
38
|
}
|
|
39
39
|
if (action.startsWith("open_federation:")) {
|
|
@@ -47,7 +47,7 @@ async function run_federation_dashboard_action(action) {
|
|
|
47
47
|
return "refresh";
|
|
48
48
|
}
|
|
49
49
|
if (action === "deploy_federation") {
|
|
50
|
-
await
|
|
50
|
+
await deploy_federation_project(".", {});
|
|
51
51
|
return "refresh";
|
|
52
52
|
}
|
|
53
53
|
if (action === "more") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/federation/app.ts"],"names":[],"mappings":";AAEA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,CAAC,EAAE,MAAM,uBAAuB,CAAC;AAEtE,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACxF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/federation/app.ts"],"names":[],"mappings":"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"}
|