@downcity/city 0.2.132 → 0.2.134
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 +3 -3
- package/bin/client/types.d.ts +1 -3
- package/bin/client/types.d.ts.map +1 -1
- package/bin/federation/types.d.ts +3 -8
- package/bin/federation/types.d.ts.map +1 -1
- package/bin/pact/admin/index.d.ts.map +1 -1
- package/bin/pact/admin/index.js +7 -15
- package/bin/pact/admin/index.js.map +1 -1
- package/bin/pact/admin/types.d.ts +2 -2
- package/bin/pact/admin/types.d.ts.map +1 -1
- package/bin/pact/invoker/ai/index.d.ts +2 -3
- package/bin/pact/invoker/ai/index.d.ts.map +1 -1
- package/bin/pact/invoker/ai/index.js +2 -4
- package/bin/pact/invoker/ai/index.js.map +1 -1
- package/bin/pact/invoker/ai/openai-transport.d.ts +3 -17
- package/bin/pact/invoker/ai/openai-transport.d.ts.map +1 -1
- package/bin/pact/invoker/ai/openai-transport.js +3 -61
- package/bin/pact/invoker/ai/openai-transport.js.map +1 -1
- package/bin/pact/requester.d.ts +2 -18
- package/bin/pact/requester.d.ts.map +1 -1
- package/bin/pact/requester.js +17 -60
- package/bin/pact/requester.js.map +1 -1
- package/bin/pact/user/index.d.ts.map +1 -1
- package/bin/pact/user/index.js +6 -11
- package/bin/pact/user/index.js.map +1 -1
- package/bin/pact/user/types.d.ts +1 -1
- package/bin/pact/user/types.d.ts.map +1 -1
- package/package.json +2 -2
- package/bin/pact/rpc-client.d.ts +0 -30
- package/bin/pact/rpc-client.d.ts.map +0 -1
- package/bin/pact/rpc-client.js +0 -99
- package/bin/pact/rpc-client.js.map +0 -1
package/README.md
CHANGED
|
@@ -227,7 +227,7 @@ await client.ai.text({
|
|
|
227
227
|
|
|
228
228
|
如果宿主需要继续使用自己的 AI SDK provider（例如 `createOpenAICompatible()` 或
|
|
229
229
|
`createDeepSeek()`），不要手写 `federation_url + "/v1/ai"`。使用
|
|
230
|
-
`client.ai.transport()`，SDK
|
|
230
|
+
`client.ai.transport()`，SDK 会返回 OpenAI-compatible endpoint：
|
|
231
231
|
|
|
232
232
|
```ts
|
|
233
233
|
const transport = client.ai.transport();
|
|
@@ -243,8 +243,8 @@ const provider = createOpenAICompatible({
|
|
|
243
243
|
});
|
|
244
244
|
```
|
|
245
245
|
|
|
246
|
-
-
|
|
247
|
-
-
|
|
246
|
+
- Remote Federation：返回 `{ baseURL: "https://.../v1/ai" }`
|
|
247
|
+
- Local Federation：返回 `{ baseURL: "http://127.0.0.1:15315/v1/ai" }`
|
|
248
248
|
|
|
249
249
|
## 文档
|
|
250
250
|
|
package/bin/client/types.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ export interface CityBaseOptions {
|
|
|
17
17
|
* Federation 的 HTTP 入口地址。
|
|
18
18
|
*
|
|
19
19
|
* 示例：`https://city.example.com`、`http://localhost:43127`
|
|
20
|
-
*
|
|
20
|
+
* 或本机 loopback HTTP：`http://127.0.0.1:15315`。
|
|
21
21
|
*/
|
|
22
22
|
federation_url: string;
|
|
23
23
|
/**
|
|
@@ -45,7 +45,6 @@ export interface AdminCityOptions extends CityBaseOptions {
|
|
|
45
45
|
* Federation 管理密钥。
|
|
46
46
|
*
|
|
47
47
|
* 未传入时会由 SDK 回退读取 `DOWNCITY_FEDERATION_ADMIN_SECRET_KEY`。
|
|
48
|
-
* 使用 `rpc://` 本机可信 Federation 时不需要传入。
|
|
49
48
|
*/
|
|
50
49
|
admin_secret_key?: string;
|
|
51
50
|
}
|
|
@@ -66,7 +65,6 @@ export interface UserCityOptions extends CityBaseOptions {
|
|
|
66
65
|
/**
|
|
67
66
|
* 终端用户访问 token。
|
|
68
67
|
*
|
|
69
|
-
* RPC 入口不会自动注入用户身份；调用需要 user 身份的 action 时仍需传入。
|
|
70
68
|
* 仅访问 public action（例如 accounts 本地登录）时可以暂不传。
|
|
71
69
|
*/
|
|
72
70
|
user_token?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/client/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,gBAAgB,GAAG,eAAe,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,kBAAkB,CAAC,KAAK,SAAS,QAAQ,IAAI,KAAK,SAAS,OAAO,GAC1E,gBAAgB,GAChB,eAAe,CAAC"}
|
|
@@ -30,7 +30,7 @@ export type FederationTrustedIdentity = {
|
|
|
30
30
|
/**
|
|
31
31
|
* Federation 请求进入运行时的 transport 来源。
|
|
32
32
|
*/
|
|
33
|
-
export type FederationRequestTransport = "http"
|
|
33
|
+
export type FederationRequestTransport = "http";
|
|
34
34
|
/**
|
|
35
35
|
* 单次请求的运行时执行上下文。
|
|
36
36
|
*/
|
|
@@ -52,17 +52,12 @@ export interface FederationFetchOptions {
|
|
|
52
52
|
* 进程内可信身份。
|
|
53
53
|
*
|
|
54
54
|
* 关键点（中文）
|
|
55
|
-
* -
|
|
55
|
+
* - 供同进程嵌入式 server 调用使用。
|
|
56
56
|
* - HTTP 入口不会从请求内容自动生成该身份。
|
|
57
57
|
*/
|
|
58
58
|
trusted_identity?: FederationTrustedIdentity;
|
|
59
59
|
/**
|
|
60
|
-
|
|
61
|
-
*
|
|
62
|
-
* 关键点（中文）
|
|
63
|
-
* - HTTP server 默认是 `http`。
|
|
64
|
-
* - FederationRPC 会传入 `rpc`，便于 service 暴露本机专用能力。
|
|
65
|
-
*/
|
|
60
|
+
/** 当前请求来源 transport，默认是 `http`。 */
|
|
66
61
|
transport?: FederationRequestTransport;
|
|
67
62
|
}
|
|
68
63
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/federation/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,MAAM,yBAAyB,GACjC;IACE,6BAA6B;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,IAAI,EAAE,WAAW,CAAC;IAClB,mBAAmB;IACnB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/federation/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD;;;;;;GAMG;AACH,MAAM,MAAM,yBAAyB,GACjC;IACE,6BAA6B;IAC7B,KAAK,EAAE,OAAO,CAAC;CAChB,GACD;IACE,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,IAAI,EAAE,WAAW,CAAC;IAClB,mBAAmB;IACnB,IAAI,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC3C,CAAC;AAEN;;GAEG;AACH,MAAM,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAEhD;;GAEG;AACH,MAAM,WAAW,iCAAiC;IAChD;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,qBAAqB;IACrB,SAAS,CAAC,EAAE,iCAAiC,CAAC;IAC9C;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAC7C;uCACmC;IACnC,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC;AAED;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC,iCAAiC;IACjC,EAAE,EAAE,OAAO,CAAC;IACZ,2BAA2B;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,eAAe;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,0BAA0B;IAC1B,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,yBAAyB;IACzB,YAAY,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAC9C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;OAMG;IACH,EAAE,EAAE,QAAQ,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IACxD;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pact/admin/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pact/admin/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAS3D,OAAO,KAAK,EACV,sBAAsB,EACtB,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,qBAAa,eAAe;IAC1B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC;IAEzB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;gBAE9B,OAAO,EAAE,sBAAsB;IAuB3C,yCAAyC;IACzC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAUpC,sCAAsC;IAChC,YAAY,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAOpD,iDAAiD;IAC3C,UAAU,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAO/C,wBAAwB;IAClB,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAIpC,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,IAAI;IAKZ;;;;OAIG;IACG,UAAU,CAAC,KAAK,EAAE;QACtB,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACnC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KACvB,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAO1F;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ;CAWjB"}
|
package/bin/pact/admin/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { BalanceInvoker } from "../invoker/balance/index.js";
|
|
|
6
6
|
import { EnvInvoker } from "../invoker/env/index.js";
|
|
7
7
|
import { CitiesInvoker } from "../invoker/cities/index.js";
|
|
8
8
|
import { requiredString, } from "../http.js";
|
|
9
|
-
import { create_http_requester,
|
|
9
|
+
import { create_http_requester, } from "../requester.js";
|
|
10
10
|
export class AdminPactAccess {
|
|
11
11
|
balance;
|
|
12
12
|
cities;
|
|
@@ -21,20 +21,12 @@ export class AdminPactAccess {
|
|
|
21
21
|
}
|
|
22
22
|
this.base_url = requiredString(options.base_url, "base_url").replace(/\/+$/, "");
|
|
23
23
|
this.city_id = requiredString(options.city_id, "city_id");
|
|
24
|
-
this.secret =
|
|
25
|
-
|
|
26
|
-
:
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
trusted_access: "admin",
|
|
31
|
-
with_auth: (init) => this.withAuth(init),
|
|
32
|
-
})
|
|
33
|
-
: create_http_requester({
|
|
34
|
-
base_url: this.base_url,
|
|
35
|
-
fetch: options.fetch,
|
|
36
|
-
with_auth: (init) => this.withAuth(init),
|
|
37
|
-
});
|
|
24
|
+
this.secret = requiredString(options.admin_secret_key ?? process.env.DOWNCITY_FEDERATION_ADMIN_SECRET_KEY, "admin_secret_key");
|
|
25
|
+
this.requester = create_http_requester({
|
|
26
|
+
base_url: this.base_url,
|
|
27
|
+
fetch: options.fetch,
|
|
28
|
+
with_auth: (init) => this.withAuth(init),
|
|
29
|
+
});
|
|
38
30
|
const req = (path, init) => this.json(path, init);
|
|
39
31
|
this.balance = new BalanceInvoker({ requestJSON: req });
|
|
40
32
|
this.cities = new CitiesInvoker({ requestJSON: req });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pact/admin/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EACL,cAAc,GAEf,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pact/admin/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ import type { CityModelDescriptor } from "@downcity/type";
|
|
|
6
6
|
import type { UserServiceSummary } from "../user/types.js";
|
|
7
7
|
/** Admin City 内部访问层构造参数 */
|
|
8
8
|
export interface AdminPactAccessOptions {
|
|
9
|
-
/** City 管理端入口地址，支持 `http(s)
|
|
9
|
+
/** City 管理端入口地址，支持 `http(s)://`。 */
|
|
10
10
|
base_url: string;
|
|
11
11
|
/**
|
|
12
12
|
* 当前管理的 City ID。
|
|
@@ -14,7 +14,7 @@ export interface AdminPactAccessOptions {
|
|
|
14
14
|
* 传入后 token 签发等服务会自动使用该 ID，调用方无需再传 city_id。
|
|
15
15
|
*/
|
|
16
16
|
city_id: string;
|
|
17
|
-
/**
|
|
17
|
+
/** 管理密钥。 */
|
|
18
18
|
admin_secret_key?: string;
|
|
19
19
|
/** 自定义 fetch 实现 */
|
|
20
20
|
fetch?: FetchLike;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/pact/admin/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,2BAA2B;AAC3B,MAAM,WAAW,sBAAsB;IACrC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/pact/admin/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE3D,2BAA2B;AAC3B,MAAM,WAAW,sBAAsB;IACrC,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,YAAY;IACZ,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,mBAAmB;IACnB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED;;;;;;GAMG;AACH,MAAM,MAAM,mBAAmB,GAAG,kBAAkB,CAAC;AAErD;;;;;GAKG;AACH,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAEnD;;GAEG;AACH,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd"}
|
|
@@ -40,9 +40,8 @@ export declare class AIInvoker {
|
|
|
40
40
|
* 返回给 OpenAI-compatible AI SDK provider 使用的 transport。
|
|
41
41
|
*
|
|
42
42
|
* 关键说明（中文）
|
|
43
|
-
* -
|
|
44
|
-
* -
|
|
45
|
-
* - transport 只负责传输，不替换 user_token，也不注入 trusted identity。
|
|
43
|
+
* - Federation 统一使用 HTTP(S)；本机服务也应暴露 loopback HTTP URL。
|
|
44
|
+
* - transport 只负责提供 OpenAI-compatible endpoint，不替换 user_token。
|
|
46
45
|
*/
|
|
47
46
|
transport(): OpenAICompatibleTransport;
|
|
48
47
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAEL,KAAK,yBAAyB,EAC/B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAIL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EACV,cAAc,EACd,wBAAwB,EACxB,kBAAkB,EAClB,uBAAuB,EACvB,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,aAAa,EACb,eAAe,EAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAIrD;;;;;;;;GAQG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAyD;IAC7E,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoG;IAC3H,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuD;IAC7E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;gBAE/B,IAAI,EAAE;QAChB,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;QACpE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC;YAAE,IAAI,EAAE,OAAO,eAAe,EAAE,aAAa,CAAA;SAAE,CAAC,CAAC;QAC9G,UAAU,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAClE;IAQD,uDAAuD;IACvD,IAAI,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,cAAc,CAAC;IAOtD,uDAAuD;IACjD,MAAM,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAQhE
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,9 +48,8 @@ export class AIInvoker {
|
|
|
48
48
|
* 返回给 OpenAI-compatible AI SDK provider 使用的 transport。
|
|
49
49
|
*
|
|
50
50
|
* 关键说明（中文）
|
|
51
|
-
* -
|
|
52
|
-
* -
|
|
53
|
-
* - transport 只负责传输，不替换 user_token，也不注入 trusted identity。
|
|
51
|
+
* - Federation 统一使用 HTTP(S)；本机服务也应暴露 loopback HTTP URL。
|
|
52
|
+
* - transport 只负责提供 OpenAI-compatible endpoint，不替换 user_token。
|
|
54
53
|
*/
|
|
55
54
|
transport() {
|
|
56
55
|
return create_openai_compatible_transport(this.baseUrl);
|
|
@@ -71,7 +70,6 @@ export class AIInvoker {
|
|
|
71
70
|
return {
|
|
72
71
|
base_url: transport.baseURL,
|
|
73
72
|
api_key: this.token,
|
|
74
|
-
fetch: transport.fetch,
|
|
75
73
|
model_id: resolved_model_id,
|
|
76
74
|
request_body: this.input({ model: resolved_model_id }),
|
|
77
75
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,kCAAkC,GAEnC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,eAAe,GAIhB,MAAM,gBAAgB,CAAC;AAkBxB,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB;;;;;;;;GAQG;AACH,MAAM,OAAO,SAAS;IACH,GAAG,CAAyD;IAC5D,MAAM,CAAoG;IAC1G,KAAK,CAAuD;IAC5D,OAAO,CAAS;IAChB,KAAK,CAAqB;IAE3C,YAAY,IAMX;QACC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;IAC/B,CAAC;IAED,uDAAuD;IACvD,IAAI,CAAC,KAAuB;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAiB,GAAG,MAAM,OAAO,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC;IAED,uDAAuD;IACvD,KAAK,CAAC,MAAM,CAAC,KAAuB;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,MAAM,SAAS,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,CAAC,CAAC;QACH,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,kCAAkC,GAEnC,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,kBAAkB,EAClB,eAAe,GAIhB,MAAM,gBAAgB,CAAC;AAkBxB,MAAM,MAAM,GAAG,QAAQ,CAAC;AAExB;;;;;;;;GAQG;AACH,MAAM,OAAO,SAAS;IACH,GAAG,CAAyD;IAC5D,MAAM,CAAoG;IAC1G,KAAK,CAAuD;IAC5D,OAAO,CAAS;IAChB,KAAK,CAAqB;IAE3C,YAAY,IAMX;QACC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;QAC9B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC;IAC/B,CAAC;IAED,uDAAuD;IACvD,IAAI,CAAC,KAAuB;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAiB,GAAG,MAAM,OAAO,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC;IAED,uDAAuD;IACvD,KAAK,CAAC,MAAM,CAAC,KAAuB;QAClC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,MAAM,SAAS,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;SAC7D,CAAC,CAAC;QACH,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED;;;;;;OAMG;IACH,SAAS;QACP,OAAO,kCAAkC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IAED;;;;;;OAMG;IACH,UAAU,CAAC,OAAe;QACxB,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACvD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,MAAM,IAAI,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QACnC,OAAO;YACL,QAAQ,EAAE,SAAS,CAAC,OAAO;YAC3B,OAAO,EAAE,IAAI,CAAC,KAAK;YACnB,QAAQ,EAAE,iBAAiB;YAC3B,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAsB,CAAC;SAC3E,CAAC;IACJ,CAAC;IAED,eAAe;IACf,YAAY,CAAC,KAAqB;QAChC,OAAO,IAAI,CAAC,IAAI,CAA2B,eAAe,EAAE,KAAK,CAAC,CAAC;IACrE,CAAC;IAED,eAAe;IACf,YAAY,CAAC,KAA8B;QACzC,OAAO,IAAI,CAAC,IAAI,CAAqB,eAAe,EAAE,KAAoC,CAAC,CAAC;IAC9F,CAAC;IAED,WAAW;IACX,KAAK,CAAC,KAAuB;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAkB,QAAQ,EAAE,KAAK,CAAC,CAAC;IACrD,CAAC;IAED,WAAW;IACX,GAAG,CAAC,KAAmB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAgB,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,WAAW;IACX,GAAG,CAAC,KAAmB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAgB,MAAM,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,aAAa;IACb,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAmC,GAAG,MAAM,SAAS,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACrG,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,GAA0B;QAC9B,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,IAAI,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;IAChG,CAAC;IAEO,IAAI,CAAI,IAAY,EAAE,KAAuB;QACnD,OAAO,IAAI,CAAC,GAAG,CAAI,GAAG,MAAM,GAAG,IAAI,EAAE,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;SACxC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACK,eAAe,CAAC,IAAa,EAAE,GAAY;QACjD,MAAM,WAAW,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,IAAI,WAAW;YAAE,OAAO,WAAW,CAAC;QACpC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,GAGd,CAAC;QACF,MAAM,aAAa,GACjB,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5D,IAAI,aAAa;YAAE,OAAO,aAAa,CAAC;QACxC,OAAO,OAAO,MAAM,CAAC,QAAQ,EAAE,IAAI,KAAK,QAAQ;YAC9C,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE;YAC7B,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED;;OAEG;IACK,qBAAqB,CAAC,GAAY;QACxC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,GAId,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,CAAC,WAEf,CAAC;QACd,OAAO,CACL,MAAM,CAAC,QAAQ,EAAE,UAAU;YAC3B,MAAM,CAAC,UAAU;YACjB,YAAY,EAAE,UAAU;YACxB,MAAM,CAAC,WAAW;YAClB,EAAE,CACH,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,uBAAuB,CAC7B,IAAa,EACb,GAAY;QAEZ,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QAClD,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,MAAM,MAAM,GAAG,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAC3C,CAAC,CAAE,GAGC;YACJ,CAAC,CAAC,EAAE,CAAC;QACP,OAAO;YACL,IAAI,EAAE,UAAU;YAChB,QAAQ,EAAE;gBACR,IAAI,EAAE,SAAS;gBACf,WAAW,EACT,OAAO,MAAM,CAAC,QAAQ,EAAE,WAAW,KAAK,QAAQ;oBAC9C,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW;oBAC7B,CAAC,CAAC,OAAO,MAAM,CAAC,WAAW,KAAK,QAAQ;wBACtC,CAAC,CAAC,MAAM,CAAC,WAAW;wBACpB,CAAC,CAAC,EAAE;gBACV,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC;aAC5C;SACF,CAAC;IACJ,CAAC;IAED,qEAAqE;IAC7D,cAAc,CAAC,KAAuB;QAC5C,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;QACjC,MAAM,IAAI,GAA4B,EAAE,GAAG,IAAI,EAAE,CAAC;QAClD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,6CAA6C;YAC7C,mEAAmE;YACnE,IAAI,CAAC,KAAK,GAAG,KAAK;iBACf,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;iBAC1D,MAAM,CAAC,CAAC,GAAG,EAAkC,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;YACjE,OAAO,IAAwB,CAAC;QAClC,CAAC;QACD,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YACvC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC;iBAC1D,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;iBAC7D,MAAM,CAAC,CAAC,GAAG,EAAkC,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;QACnE,CAAC;QACD,OAAO,IAAwB,CAAC;IAClC,CAAC;CACF;AAED,sEAAsE;AACtE,eAAe;AACf,sEAAsE;AAEtE;;GAEG;AACH,MAAM,OAAO,YAAY;IACN,IAAI,CAA4B;IAEjD,YAAY,KAA4B,EAAE,EAAa;QACrD,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;YACnB,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;QAElE,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,GAAG,CAAC,EAAU;QACZ,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,GAAG;QACD,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IACjC,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACxC,OAAO,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/E,CAAC;CACF;AAED,6BAA6B;AAC7B,MAAM,UAAU,cAAc,CAAC,KAAsD;IACnF,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;AACtD,CAAC;AAED,SAAS,iBAAiB,CACxB,EAAa,EACb,IAAyB;IAEzB,MAAM,KAAK,GAAG;QACZ,GAAG,IAAI;QACP,IAAI,EAAE,eAAe;KACN,CAAC;IAElB,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,kBAAkB,EAAE;QAC/C,UAAU,EAAE,KAAK;QACjB,YAAY,EAAE,KAAK;QACnB,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE;YACL,UAAU,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;SACzC;KACF,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED,sEAAsE;AACtE,8BAA8B;AAC9B,sEAAsE;AAEtE;;;;;;;;GAQG;AACH,MAAM,OAAO,WAAW;IASH;IAER;IAEA;IAZX,0CAA0C;IACjC,IAAI,CAA0B;IACvC,mBAAmB;IACV,QAAQ,CAAS;IAC1B,sBAAsB;IACb,KAAK,CAAqB;IAEnC,YACmB,EAAa;IAC9B,YAAY;IACH,EAAU;IACnB,aAAa;IACJ,OAAe,EAAE;IAC1B,mBAAmB;IACnB,WAAmB,EAAE;IACrB,sBAAsB;IACtB,KAAc,EACd,IAA8B;QATb,OAAE,GAAF,EAAE,CAAW;QAErB,OAAE,GAAF,EAAE,CAAQ;QAEV,SAAI,GAAJ,IAAI,CAAa;QAO1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,mCAAmC;IAEnC,WAAW;IACX,MAAM,CAAC,KAAsC;QAC3C,OAAO,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,WAAW;IACX,IAAI,CAAC,KAAsC;QACzC,OAAO,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,WAAW;IACX,KAAK,CAAC,KAAsC;QAC1C,OAAO,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,kCAAkC;IAElC,uBAAuB;IACvB,GAAG;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,+BAA+B;IAC/B,SAAS;QACP,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;CACF"}
|
|
@@ -2,10 +2,8 @@
|
|
|
2
2
|
* OpenAI-compatible transport 适配模块。
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
|
-
* - 只提供 `baseURL
|
|
6
|
-
* -
|
|
7
|
-
* - RPC Federation 使用 City SDK 的 Federation RPC client，把 OpenAI-compatible
|
|
8
|
-
* request 原样送到 `/v1/ai/chat/completions` 等 AI endpoint。
|
|
5
|
+
* - 只提供 `baseURL`，不绑定具体 AI SDK provider。
|
|
6
|
+
* - 本机 Federation 也应暴露 loopback HTTP URL，因此不需要自定义协议 fetch。
|
|
9
7
|
*/
|
|
10
8
|
/**
|
|
11
9
|
* OpenAI-compatible provider 可复用的 transport 选项。
|
|
@@ -13,24 +11,12 @@
|
|
|
13
11
|
export interface OpenAICompatibleTransport {
|
|
14
12
|
/**
|
|
15
13
|
* OpenAI-compatible AI endpoint 根地址，例如 `https://host/v1/ai`
|
|
16
|
-
* 或 `
|
|
14
|
+
* 或 `http://127.0.0.1:15315/v1/ai`。
|
|
17
15
|
*/
|
|
18
16
|
baseURL: string;
|
|
19
|
-
/**
|
|
20
|
-
* 自定义 fetch。
|
|
21
|
-
*
|
|
22
|
-
* 关键说明（中文）
|
|
23
|
-
* - HTTP Federation 不需要该字段，provider 使用默认 fetch。
|
|
24
|
-
* - RPC Federation 需要该字段把 request 转成 Federation RPC frame。
|
|
25
|
-
*/
|
|
26
|
-
fetch?: typeof globalThis.fetch;
|
|
27
17
|
}
|
|
28
18
|
/**
|
|
29
19
|
* 创建 OpenAI-compatible transport。
|
|
30
20
|
*/
|
|
31
21
|
export declare function create_openai_compatible_transport(federation_url: string): OpenAICompatibleTransport;
|
|
32
|
-
/**
|
|
33
|
-
* 创建给 AI SDK provider 使用的 RPC fetch。
|
|
34
|
-
*/
|
|
35
|
-
export declare function create_federation_rpc_fetch(federation_url: string): typeof globalThis.fetch;
|
|
36
22
|
//# sourceMappingURL=openai-transport.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-transport.d.ts","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/openai-transport.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"openai-transport.d.ts","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/openai-transport.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,cAAc,EAAE,MAAM,GACrB,yBAAyB,CAE3B"}
|
|
@@ -2,71 +2,13 @@
|
|
|
2
2
|
* OpenAI-compatible transport 适配模块。
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
|
-
* - 只提供 `baseURL
|
|
6
|
-
* -
|
|
7
|
-
* - RPC Federation 使用 City SDK 的 Federation RPC client，把 OpenAI-compatible
|
|
8
|
-
* request 原样送到 `/v1/ai/chat/completions` 等 AI endpoint。
|
|
5
|
+
* - 只提供 `baseURL`，不绑定具体 AI SDK provider。
|
|
6
|
+
* - 本机 Federation 也应暴露 loopback HTTP URL，因此不需要自定义协议 fetch。
|
|
9
7
|
*/
|
|
10
|
-
import { request_federation_rpc } from "../../rpc-client.js";
|
|
11
8
|
/**
|
|
12
9
|
* 创建 OpenAI-compatible transport。
|
|
13
10
|
*/
|
|
14
11
|
export function create_openai_compatible_transport(federation_url) {
|
|
15
|
-
|
|
16
|
-
if (!is_rpc_url(federation_url)) {
|
|
17
|
-
return { baseURL };
|
|
18
|
-
}
|
|
19
|
-
return {
|
|
20
|
-
baseURL,
|
|
21
|
-
fetch: create_federation_rpc_fetch(federation_url),
|
|
22
|
-
};
|
|
23
|
-
}
|
|
24
|
-
/**
|
|
25
|
-
* 创建给 AI SDK provider 使用的 RPC fetch。
|
|
26
|
-
*/
|
|
27
|
-
export function create_federation_rpc_fetch(federation_url) {
|
|
28
|
-
return async (input, init) => {
|
|
29
|
-
assert_supported_body(init?.body);
|
|
30
|
-
const request = new Request(input, init);
|
|
31
|
-
assert_supported_request(request);
|
|
32
|
-
const url = new URL(request.url);
|
|
33
|
-
const response = await request_federation_rpc({
|
|
34
|
-
url: federation_url,
|
|
35
|
-
method: request.method,
|
|
36
|
-
path: `${url.pathname}${url.search}`,
|
|
37
|
-
headers: headers_to_record(request.headers),
|
|
38
|
-
body: await read_request_body(request),
|
|
39
|
-
});
|
|
40
|
-
return new Response(empty_response_body(response.status) ? null : response.body, {
|
|
41
|
-
status: response.status,
|
|
42
|
-
headers: response.headers,
|
|
43
|
-
});
|
|
44
|
-
};
|
|
45
|
-
}
|
|
46
|
-
function is_rpc_url(value) {
|
|
47
|
-
return /^rpc:\/\//i.test(value);
|
|
48
|
-
}
|
|
49
|
-
function headers_to_record(headers) {
|
|
50
|
-
return Object.fromEntries(headers.entries());
|
|
51
|
-
}
|
|
52
|
-
async function read_request_body(request) {
|
|
53
|
-
if (request.method === "GET" || request.method === "HEAD") {
|
|
54
|
-
return undefined;
|
|
55
|
-
}
|
|
56
|
-
return await request.text();
|
|
57
|
-
}
|
|
58
|
-
function assert_supported_body(body) {
|
|
59
|
-
if (typeof FormData !== "undefined" && body instanceof FormData) {
|
|
60
|
-
throw new TypeError("Downcity RPC OpenAI-compatible transport does not support FormData body");
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
function assert_supported_request(request) {
|
|
64
|
-
const content_type = request.headers.get("content-type") ?? "";
|
|
65
|
-
if (/^multipart\/form-data\b/i.test(content_type)) {
|
|
66
|
-
throw new TypeError("Downcity RPC OpenAI-compatible transport does not support multipart/form-data body");
|
|
67
|
-
}
|
|
68
|
-
}
|
|
69
|
-
function empty_response_body(status) {
|
|
70
|
-
return status === 204 || status === 205 || status === 304;
|
|
12
|
+
return { baseURL: `${federation_url.replace(/\/+$/, "")}/v1/ai` };
|
|
71
13
|
}
|
|
72
14
|
//# sourceMappingURL=openai-transport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-transport.js","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/openai-transport.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"openai-transport.js","sourceRoot":"","sources":["../../../../src/pact/invoker/ai/openai-transport.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAaH;;GAEG;AACH,MAAM,UAAU,kCAAkC,CAChD,cAAsB;IAEtB,OAAO,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,EAAE,CAAC;AACpE,CAAC"}
|
package/bin/pact/requester.d.ts
CHANGED
|
@@ -2,10 +2,9 @@
|
|
|
2
2
|
* City Pact 请求抽象。
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
|
-
* - 上层 Admin/User invoker 只依赖 requester
|
|
6
|
-
* - HTTP
|
|
5
|
+
* - 上层 Admin/User invoker 只依赖 requester，不直接操作 fetch。
|
|
6
|
+
* - Federation 统一使用 HTTP(S) 入口；本机服务也应暴露 loopback HTTP URL。
|
|
7
7
|
*/
|
|
8
|
-
import type { FederationRpcTrustedAccess } from "@downcity/type";
|
|
9
8
|
import { type FetchLike, type FetchResponseLike, type RequestInitLike } from "./http.js";
|
|
10
9
|
/**
|
|
11
10
|
* City 请求器。
|
|
@@ -31,19 +30,4 @@ export declare function create_http_requester(options: {
|
|
|
31
30
|
/** 请求头增强函数。 */
|
|
32
31
|
with_auth(init: RequestInitLike): RequestInitLike;
|
|
33
32
|
}): CityRequester;
|
|
34
|
-
/**
|
|
35
|
-
* 创建 Federation RPC 请求器。
|
|
36
|
-
*/
|
|
37
|
-
export declare function create_rpc_requester(options: {
|
|
38
|
-
/** Federation RPC 入口地址。 */
|
|
39
|
-
base_url: string;
|
|
40
|
-
/** 本机可信访问级别，仅 Admin City 使用。 */
|
|
41
|
-
trusted_access?: FederationRpcTrustedAccess;
|
|
42
|
-
/** 请求头增强函数。 */
|
|
43
|
-
with_auth(init: RequestInitLike): RequestInitLike;
|
|
44
|
-
}): CityRequester;
|
|
45
|
-
/**
|
|
46
|
-
* 判断 URL 是否为本机 Federation RPC。
|
|
47
|
-
*/
|
|
48
|
-
export declare function is_rpc_url(value: string): boolean;
|
|
49
33
|
//# sourceMappingURL=requester.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requester.d.ts","sourceRoot":"","sources":["../../src/pact/requester.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"requester.d.ts","sourceRoot":"","sources":["../../src/pact/requester.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAML,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACrB,MAAM,WAAW,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,eAAe;IACf,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,mBAAmB;IACnB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IACzD,YAAY;IACZ,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC3D,cAAc;IACd,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACtE;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,4BAA4B;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;IAClB,eAAe;IACf,SAAS,CAAC,IAAI,EAAE,eAAe,GAAG,eAAe,CAAC;CACnD,GAAG,aAAa,CAqBhB"}
|
package/bin/pact/requester.js
CHANGED
|
@@ -2,16 +2,15 @@
|
|
|
2
2
|
* City Pact 请求抽象。
|
|
3
3
|
*
|
|
4
4
|
* 关键点（中文）
|
|
5
|
-
* - 上层 Admin/User invoker 只依赖 requester
|
|
6
|
-
* - HTTP
|
|
5
|
+
* - 上层 Admin/User invoker 只依赖 requester，不直接操作 fetch。
|
|
6
|
+
* - Federation 统一使用 HTTP(S) 入口；本机服务也应暴露 loopback HTTP URL。
|
|
7
7
|
*/
|
|
8
8
|
import { defaultFetch, normalizeBaseURL, requestJSON, requestRaw, requestText, } from "./http.js";
|
|
9
|
-
import { request_federation_rpc } from "./rpc-client.js";
|
|
10
9
|
/**
|
|
11
10
|
* 创建 HTTP 请求器。
|
|
12
11
|
*/
|
|
13
12
|
export function create_http_requester(options) {
|
|
14
|
-
const base_url =
|
|
13
|
+
const base_url = normalize_http_base_url(options.base_url);
|
|
15
14
|
const fetch_impl = options.fetch ?? defaultFetch();
|
|
16
15
|
return {
|
|
17
16
|
base_url,
|
|
@@ -33,62 +32,20 @@ export function create_http_requester(options) {
|
|
|
33
32
|
};
|
|
34
33
|
}
|
|
35
34
|
/**
|
|
36
|
-
*
|
|
35
|
+
* 判断 Federation URL 是否为 HTTP(S)。
|
|
37
36
|
*/
|
|
38
|
-
|
|
39
|
-
const base_url = normalizeBaseURL(
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
throw rpc_error(response);
|
|
52
|
-
}
|
|
53
|
-
return response;
|
|
54
|
-
};
|
|
55
|
-
return {
|
|
56
|
-
base_url,
|
|
57
|
-
json: async (path, init) => JSON.parse((await request(path, init)).body),
|
|
58
|
-
text: async (path, init) => (await request(path, init)).body,
|
|
59
|
-
raw: async (path, init) => response_like(await request(path, init)),
|
|
60
|
-
};
|
|
61
|
-
}
|
|
62
|
-
/**
|
|
63
|
-
* 判断 URL 是否为本机 Federation RPC。
|
|
64
|
-
*/
|
|
65
|
-
export function is_rpc_url(value) {
|
|
66
|
-
return /^rpc:\/\//i.test(value);
|
|
67
|
-
}
|
|
68
|
-
function rpc_error(response) {
|
|
69
|
-
const error = new Error(`Downcity request failed with ${response.status}: ${response.body}`);
|
|
70
|
-
error.status = response.status;
|
|
71
|
-
error.body = response.body;
|
|
72
|
-
return error;
|
|
73
|
-
}
|
|
74
|
-
function response_like(response) {
|
|
75
|
-
const body = encode_body(response.body);
|
|
76
|
-
return {
|
|
77
|
-
ok: response.status >= 200 && response.status < 300,
|
|
78
|
-
status: response.status,
|
|
79
|
-
body,
|
|
80
|
-
json: async () => JSON.parse(response.body),
|
|
81
|
-
text: async () => response.body,
|
|
82
|
-
};
|
|
83
|
-
}
|
|
84
|
-
function encode_body(body) {
|
|
85
|
-
const encoder = new TextEncoder();
|
|
86
|
-
const chunk = encoder.encode(body);
|
|
87
|
-
return new ReadableStream({
|
|
88
|
-
start(controller) {
|
|
89
|
-
controller.enqueue(chunk);
|
|
90
|
-
controller.close();
|
|
91
|
-
},
|
|
92
|
-
});
|
|
37
|
+
function normalize_http_base_url(value) {
|
|
38
|
+
const base_url = normalizeBaseURL(value, "base_url");
|
|
39
|
+
let parsed;
|
|
40
|
+
try {
|
|
41
|
+
parsed = new URL(base_url);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
throw new TypeError("base_url must be a valid http(s) URL");
|
|
45
|
+
}
|
|
46
|
+
if (parsed.protocol !== "http:" && parsed.protocol !== "https:") {
|
|
47
|
+
throw new TypeError("Federation URL must use http:// or https://");
|
|
48
|
+
}
|
|
49
|
+
return base_url;
|
|
93
50
|
}
|
|
94
51
|
//# sourceMappingURL=requester.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requester.js","sourceRoot":"","sources":["../../src/pact/requester.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"requester.js","sourceRoot":"","sources":["../../src/pact/requester.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EACL,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,UAAU,EACV,WAAW,GAIZ,MAAM,WAAW,CAAC;AAgBnB;;GAEG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAOrC;IACC,MAAM,QAAQ,GAAG,uBAAuB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,IAAI,YAAY,EAAE,CAAC;IACnD,OAAO;QACL,QAAQ;QACR,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC;YAChC,KAAK,EAAE,UAAU;YACjB,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,EAAE;YACzB,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;SAC9B,CAAC;QACF,IAAI,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC;YAChC,KAAK,EAAE,UAAU;YACjB,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,EAAE;YACzB,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;SAC9B,CAAC;QACF,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC;YAC9B,KAAK,EAAE,UAAU;YACjB,GAAG,EAAE,GAAG,QAAQ,GAAG,IAAI,EAAE;YACzB,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC;SAC9B,CAAC;KACH,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,uBAAuB,CAAC,KAAc;IAC7C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACrD,IAAI,MAAW,CAAC;IAChB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,SAAS,CAAC,sCAAsC,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;QAChE,MAAM,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pact/user/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAkB,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAoB,kBAAkB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/pact/user/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAkB,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAoB,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAU9F,qBAAa,cAAc;IACzB,QAAQ,CAAC,EAAE,EAAE,SAAS,CAAC;IACvB,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;IAEjC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAEnC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;gBAE9B,OAAO,EAAE,qBAAqB;IA+B1C,qBAAqB;IACrB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAWpC,wBAAwB;IAClB,YAAY,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IASnD,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,GAAG;IAKX,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,YAAY;CAGrB"}
|
package/bin/pact/user/index.js
CHANGED
|
@@ -5,7 +5,7 @@ import { AIInvoker, serializeModel } from "../invoker/ai/index.js";
|
|
|
5
5
|
import { PaymentInvoker } from "../invoker/payment/index.js";
|
|
6
6
|
import { ServiceClient } from "../invoker/invoker.js";
|
|
7
7
|
import { requiredString, } from "../http.js";
|
|
8
|
-
import { create_http_requester,
|
|
8
|
+
import { create_http_requester, } from "../requester.js";
|
|
9
9
|
export class UserPactAccess {
|
|
10
10
|
ai;
|
|
11
11
|
payment;
|
|
@@ -20,16 +20,11 @@ export class UserPactAccess {
|
|
|
20
20
|
this.serverUrl = requiredString(options.base_url, "base_url").replace(/\/+$/, "");
|
|
21
21
|
this.token = readOptional(options.user_token);
|
|
22
22
|
this.city_id = readOptional(options.city_id);
|
|
23
|
-
this.requester =
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
: create_http_requester({
|
|
29
|
-
base_url: this.serverUrl,
|
|
30
|
-
fetch: options.fetch,
|
|
31
|
-
with_auth: (init) => this.withAuth(init),
|
|
32
|
-
});
|
|
23
|
+
this.requester = create_http_requester({
|
|
24
|
+
base_url: this.serverUrl,
|
|
25
|
+
fetch: options.fetch,
|
|
26
|
+
with_auth: (init) => this.withAuth(init),
|
|
27
|
+
});
|
|
33
28
|
this.ai = new AIInvoker({
|
|
34
29
|
baseUrl: this.serverUrl,
|
|
35
30
|
token: this.token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pact/user/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EACL,cAAc,GAEf,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,qBAAqB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/pact/user/index.ts"],"names":[],"mappings":"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"}
|
package/bin/pact/user/types.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export interface UserServiceSummary {
|
|
|
35
35
|
}
|
|
36
36
|
/** User City 内部访问层构造参数 */
|
|
37
37
|
export interface UserPactAccessOptions {
|
|
38
|
-
/** City 的访问入口地址，支持 `http(s)
|
|
38
|
+
/** City 的访问入口地址，支持 `http(s)://`。 */
|
|
39
39
|
base_url: string;
|
|
40
40
|
/** 当前 user_token 绑定的 City ID。 */
|
|
41
41
|
city_id?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/pact/user/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,IAAI,CAAC;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACxB,kBAAkB,EAClB,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAErC,gBAAgB;AAChB,MAAM,MAAM,iBAAiB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC;AAEjE,eAAe;AACf,MAAM,WAAW,cAAc;IAC7B,gBAAgB;IAChB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;CAC9B;AAED,kBAAkB;AAClB,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,cAAc,GAAG,aAAa,EAAE,CAAC;AAEjF;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC,qBAAqB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B;IAC3B,GAAG,EAAE,KAAK,CAAC;QACT,gBAAgB;QAChB,GAAG,EAAE,MAAM,CAAC;QACZ,kBAAkB;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,cAAc;QACd,QAAQ,EAAE,OAAO,CAAC;KACnB,CAAC,CAAC;CACJ;AAED,0BAA0B;AAC1B,MAAM,WAAW,qBAAqB;IACpC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/pact/user/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@downcity/city",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.134",
|
|
4
4
|
"description": "Downcity City runtime and City access SDK for services, actions, auth, env, and cities.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./bin/index.js",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"typescript": "^6.0.3"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@downcity/type": "0.1.
|
|
44
|
+
"@downcity/type": "0.1.90",
|
|
45
45
|
"ai": "^6.0.193",
|
|
46
46
|
"drizzle-orm": "^0.45.2",
|
|
47
47
|
"hono": "^4.12.23"
|
package/bin/pact/rpc-client.d.ts
DELETED
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Federation RPC client。
|
|
3
|
-
*
|
|
4
|
-
* 关键点（中文）
|
|
5
|
-
* - 仅用于 `rpc://` 本机 Federation transport。
|
|
6
|
-
* - 使用 NDJSON over TCP，与 `@downcity/server` 的 FederationRPC 对接。
|
|
7
|
-
*/
|
|
8
|
-
import type { FederationRpcResponseData, FederationRpcTrustedAccess } from "@downcity/type";
|
|
9
|
-
/**
|
|
10
|
-
* Federation RPC 请求输入。
|
|
11
|
-
*/
|
|
12
|
-
export interface FederationRpcClientRequest {
|
|
13
|
-
/** RPC URL，例如 `rpc://127.0.0.1:15315`。 */
|
|
14
|
-
url: string;
|
|
15
|
-
/** 本机可信访问级别，仅 Admin City 使用。 */
|
|
16
|
-
trusted_access?: FederationRpcTrustedAccess;
|
|
17
|
-
/** HTTP 方法。 */
|
|
18
|
-
method: string;
|
|
19
|
-
/** Federation 请求路径。 */
|
|
20
|
-
path: string;
|
|
21
|
-
/** 请求头。 */
|
|
22
|
-
headers?: Record<string, string>;
|
|
23
|
-
/** 请求 body。 */
|
|
24
|
-
body?: string;
|
|
25
|
-
}
|
|
26
|
-
/**
|
|
27
|
-
* 发送一次 Federation RPC 请求。
|
|
28
|
-
*/
|
|
29
|
-
export declare function request_federation_rpc(input: FederationRpcClientRequest): Promise<FederationRpcResponseData>;
|
|
30
|
-
//# sourceMappingURL=rpc-client.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/pact/rpc-client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAEV,yBAAyB,EAEzB,0BAA0B,EAC3B,MAAM,gBAAgB,CAAC;AA4BxB;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,gCAAgC;IAChC,cAAc,CAAC,EAAE,0BAA0B,CAAC;IAC5C,eAAe;IACf,MAAM,EAAE,MAAM,CAAC;IACf,uBAAuB;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW;IACX,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,eAAe;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,yBAAyB,CAAC,CAsEpC"}
|
package/bin/pact/rpc-client.js
DELETED
|
@@ -1,99 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Federation RPC client。
|
|
3
|
-
*
|
|
4
|
-
* 关键点（中文）
|
|
5
|
-
* - 仅用于 `rpc://` 本机 Federation transport。
|
|
6
|
-
* - 使用 NDJSON over TCP，与 `@downcity/server` 的 FederationRPC 对接。
|
|
7
|
-
*/
|
|
8
|
-
/**
|
|
9
|
-
* 发送一次 Federation RPC 请求。
|
|
10
|
-
*/
|
|
11
|
-
export async function request_federation_rpc(input) {
|
|
12
|
-
const net = await load_node_net();
|
|
13
|
-
const endpoint = parse_federation_rpc_url(input.url);
|
|
14
|
-
const request_id = `fed_rpc_${Date.now()}_${Math.random().toString(36).slice(2)}`;
|
|
15
|
-
const request = {
|
|
16
|
-
id: request_id,
|
|
17
|
-
method: "federation.request",
|
|
18
|
-
params: {
|
|
19
|
-
method: input.method,
|
|
20
|
-
path: input.path,
|
|
21
|
-
headers: input.headers,
|
|
22
|
-
body: input.body,
|
|
23
|
-
trusted_access: input.trusted_access,
|
|
24
|
-
},
|
|
25
|
-
};
|
|
26
|
-
return await new Promise((resolve, reject) => {
|
|
27
|
-
const socket = net.createConnection(endpoint);
|
|
28
|
-
let buffered = "";
|
|
29
|
-
let settled = false;
|
|
30
|
-
const finish = (error, data) => {
|
|
31
|
-
if (settled)
|
|
32
|
-
return;
|
|
33
|
-
settled = true;
|
|
34
|
-
socket.destroy();
|
|
35
|
-
if (error) {
|
|
36
|
-
reject(error instanceof Error ? error : new Error(String(error)));
|
|
37
|
-
return;
|
|
38
|
-
}
|
|
39
|
-
resolve(data);
|
|
40
|
-
};
|
|
41
|
-
socket.on("connect", () => {
|
|
42
|
-
socket.write(`${JSON.stringify(request)}\n`);
|
|
43
|
-
});
|
|
44
|
-
socket.on("data", (chunk) => {
|
|
45
|
-
buffered += chunk.toString("utf8");
|
|
46
|
-
let newline_index = buffered.indexOf("\n");
|
|
47
|
-
while (newline_index >= 0) {
|
|
48
|
-
const line = buffered.slice(0, newline_index).trim();
|
|
49
|
-
buffered = buffered.slice(newline_index + 1);
|
|
50
|
-
if (line) {
|
|
51
|
-
try {
|
|
52
|
-
const frame = JSON.parse(line);
|
|
53
|
-
if (frame.id !== request_id) {
|
|
54
|
-
throw new Error(`Unexpected Federation RPC response id: ${frame.id}`);
|
|
55
|
-
}
|
|
56
|
-
if (!frame.success) {
|
|
57
|
-
throw new Error(frame.error);
|
|
58
|
-
}
|
|
59
|
-
finish(undefined, frame.data);
|
|
60
|
-
}
|
|
61
|
-
catch (error) {
|
|
62
|
-
finish(error);
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
newline_index = buffered.indexOf("\n");
|
|
66
|
-
}
|
|
67
|
-
});
|
|
68
|
-
socket.on("error", (error) => {
|
|
69
|
-
finish(error);
|
|
70
|
-
});
|
|
71
|
-
socket.on("close", () => {
|
|
72
|
-
if (!settled) {
|
|
73
|
-
finish(new Error("Federation RPC socket closed before response"));
|
|
74
|
-
}
|
|
75
|
-
});
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
async function load_node_net() {
|
|
79
|
-
const loader = new Function("specifier", "return import(specifier)");
|
|
80
|
-
return await loader("node:net");
|
|
81
|
-
}
|
|
82
|
-
function parse_federation_rpc_url(value) {
|
|
83
|
-
const url = new URL(value);
|
|
84
|
-
if (url.protocol !== "rpc:") {
|
|
85
|
-
throw new TypeError(`Unsupported Federation RPC protocol: ${url.protocol}`);
|
|
86
|
-
}
|
|
87
|
-
if (!url.hostname) {
|
|
88
|
-
throw new TypeError("Federation RPC url requires a host");
|
|
89
|
-
}
|
|
90
|
-
const port = Number(url.port);
|
|
91
|
-
if (!Number.isInteger(port) || port <= 0 || port > 65535) {
|
|
92
|
-
throw new TypeError("Federation RPC url requires a valid port");
|
|
93
|
-
}
|
|
94
|
-
return {
|
|
95
|
-
host: url.hostname,
|
|
96
|
-
port,
|
|
97
|
-
};
|
|
98
|
-
}
|
|
99
|
-
//# sourceMappingURL=rpc-client.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/pact/rpc-client.ts"],"names":[],"mappings":"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"}
|