@downcity/city 0.2.127 → 0.2.130
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 +32 -1
- package/bin/client/types.d.ts +6 -2
- package/bin/client/types.d.ts.map +1 -1
- package/bin/federation/auth/authenticator.d.ts +9 -0
- package/bin/federation/auth/authenticator.d.ts.map +1 -1
- package/bin/federation/auth/authenticator.js +17 -0
- package/bin/federation/auth/authenticator.js.map +1 -1
- package/bin/federation/federation-middleware.d.ts +17 -0
- package/bin/federation/federation-middleware.d.ts.map +1 -0
- package/bin/federation/federation-middleware.js +41 -0
- package/bin/federation/federation-middleware.js.map +1 -0
- package/bin/federation/federation-router.d.ts.map +1 -1
- package/bin/federation/federation-router.js +20 -4
- package/bin/federation/federation-router.js.map +1 -1
- package/bin/federation/federation.d.ts +13 -11
- package/bin/federation/federation.d.ts.map +1 -1
- package/bin/federation/federation.js +26 -18
- package/bin/federation/federation.js.map +1 -1
- package/bin/federation/types.d.ts +32 -2
- package/bin/federation/types.d.ts.map +1 -1
- package/bin/index.d.ts +2 -1
- package/bin/index.d.ts.map +1 -1
- package/bin/index.js.map +1 -1
- package/bin/pact/admin/index.d.ts +1 -1
- package/bin/pact/admin/index.d.ts.map +1 -1
- package/bin/pact/admin/index.js +21 -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/requester.d.ts +47 -0
- package/bin/pact/requester.d.ts.map +1 -0
- package/bin/pact/requester.js +93 -0
- package/bin/pact/requester.js.map +1 -0
- package/bin/pact/rpc-client.d.ts +30 -0
- package/bin/pact/rpc-client.d.ts.map +1 -0
- package/bin/pact/rpc-client.js +99 -0
- package/bin/pact/rpc-client.js.map +1 -0
- package/bin/pact/user/index.d.ts +1 -1
- package/bin/pact/user/index.d.ts.map +1 -1
- package/bin/pact/user/index.js +21 -15
- package/bin/pact/user/index.js.map +1 -1
- package/bin/pact/user/types.d.ts +2 -2
- package/bin/pact/user/types.d.ts.map +1 -1
- package/bin/service/instruction.js +1 -1
- package/bin/service/instruction.js.map +1 -1
- package/bin/types/FederationMiddleware.d.ts +50 -0
- package/bin/types/FederationMiddleware.d.ts.map +1 -0
- package/bin/types/FederationMiddleware.js +9 -0
- package/bin/types/FederationMiddleware.js.map +1 -0
- package/package.json +2 -2
|
@@ -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;AAW3D,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;IA8B3C,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
|
@@ -5,7 +5,8 @@ import { ServiceClient } from "../invoker/invoker.js";
|
|
|
5
5
|
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
|
-
import {
|
|
8
|
+
import { requiredString, } from "../http.js";
|
|
9
|
+
import { create_http_requester, create_rpc_requester, is_rpc_url, } from "../requester.js";
|
|
9
10
|
export class AdminPactAccess {
|
|
10
11
|
balance;
|
|
11
12
|
cities;
|
|
@@ -13,15 +14,26 @@ export class AdminPactAccess {
|
|
|
13
14
|
base_url;
|
|
14
15
|
city_id;
|
|
15
16
|
secret;
|
|
16
|
-
|
|
17
|
+
requester;
|
|
17
18
|
constructor(options) {
|
|
18
19
|
if (!options || typeof options !== "object") {
|
|
19
20
|
throw new TypeError("Admin City options are required");
|
|
20
21
|
}
|
|
21
|
-
this.base_url =
|
|
22
|
+
this.base_url = requiredString(options.base_url, "base_url").replace(/\/+$/, "");
|
|
22
23
|
this.city_id = requiredString(options.city_id, "city_id");
|
|
23
|
-
this.secret =
|
|
24
|
-
|
|
24
|
+
this.secret = is_rpc_url(this.base_url)
|
|
25
|
+
? undefined
|
|
26
|
+
: requiredString(options.admin_secret_key ?? process.env.DOWNCITY_FEDERATION_ADMIN_SECRET_KEY, "admin_secret_key");
|
|
27
|
+
this.requester = is_rpc_url(this.base_url)
|
|
28
|
+
? create_rpc_requester({
|
|
29
|
+
base_url: this.base_url,
|
|
30
|
+
identity: { role: "admin" },
|
|
31
|
+
})
|
|
32
|
+
: create_http_requester({
|
|
33
|
+
base_url: this.base_url,
|
|
34
|
+
fetch: options.fetch,
|
|
35
|
+
with_auth: (init) => this.withAuth(init),
|
|
36
|
+
});
|
|
25
37
|
const req = (path, init) => this.json(path, init);
|
|
26
38
|
this.balance = new BalanceInvoker({ requestJSON: req });
|
|
27
39
|
this.cities = new CitiesInvoker({ requestJSON: req });
|
|
@@ -53,18 +65,10 @@ export class AdminPactAccess {
|
|
|
53
65
|
return this.text("/v1/federation/instruction", { method: "GET" });
|
|
54
66
|
}
|
|
55
67
|
json(path, init) {
|
|
56
|
-
return
|
|
57
|
-
fetch: this.fetchImpl,
|
|
58
|
-
url: `${this.base_url}${path}`,
|
|
59
|
-
init: this.withAuth(init),
|
|
60
|
-
});
|
|
68
|
+
return this.requester.json(path, init);
|
|
61
69
|
}
|
|
62
70
|
text(path, init) {
|
|
63
|
-
return
|
|
64
|
-
fetch: this.fetchImpl,
|
|
65
|
-
url: `${this.base_url}${path}`,
|
|
66
|
-
init: this.withAuth(init),
|
|
67
|
-
});
|
|
71
|
+
return this.requester.text(path, init);
|
|
68
72
|
}
|
|
69
73
|
/**
|
|
70
74
|
* 为当前 City 签发 user token。
|
|
@@ -85,6 +89,8 @@ export class AdminPactAccess {
|
|
|
85
89
|
* - 默认仍然补 `content-type: application/json`，便于 POST action 统一行为
|
|
86
90
|
*/
|
|
87
91
|
withAuth(init) {
|
|
92
|
+
if (!this.secret)
|
|
93
|
+
return init;
|
|
88
94
|
return {
|
|
89
95
|
...init,
|
|
90
96
|
headers: {
|
|
@@ -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,YAAY,
|
|
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,EACrB,oBAAoB,EACpB,UAAU,GAEX,MAAM,iBAAiB,CAAC;AAOzB,MAAM,OAAO,eAAe;IACjB,OAAO,CAAiB;IACxB,MAAM,CAAgB;IACtB,GAAG,CAAa;IAER,QAAQ,CAAS;IACzB,OAAO,CAAS;IACR,MAAM,CAAqB;IAC3B,SAAS,CAAgB;IAE1C,YAAY,OAA+B;QACzC,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,SAAS,CAAC,iCAAiC,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACjF,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;YACrC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,cAAc,CACZ,OAAO,CAAC,gBAAgB,IAAI,OAAO,CAAC,GAAG,CAAC,oCAAoC,EAC5E,kBAAkB,CACnB,CAAC;QACN,IAAI,CAAC,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;YACxC,CAAC,CAAC,oBAAoB,CAAC;gBACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;aAC5B,CAAC;YACJ,CAAC,CAAC,qBAAqB,CAAC;gBACpB,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QAEP,MAAM,GAAG,GAAG,CAAI,IAAY,EAAE,IAAqB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAI,IAAI,EAAE,IAAI,CAAC,CAAC;QACjF,IAAI,CAAC,OAAO,GAAG,IAAI,cAAc,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,GAAG,GAAG,IAAI,UAAU,CAAC,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,yCAAyC;IACzC,OAAO,CAAC,IAAY;QAClB,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,EAAE;YAAE,MAAM,IAAI,SAAS,CAAC,0BAA0B,CAAC,CAAC;QACzD,OAAO,IAAI,aAAa,CACtB,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EACrC,KAAK,EACL,EAAE,CACH,CAAC;IACJ,CAAC;IAED,sCAAsC;IACtC,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAmC,cAAc,EAAE;YAC7E,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,iDAAiD;IACjD,KAAK,CAAC,UAAU;QACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAgC,eAAe,EAAE;YAC3E,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACpE,CAAC;IAEO,IAAI,CAAI,IAAY,EAAE,IAAqB;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAI,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;IAEO,IAAI,CAAC,IAAY,EAAE,IAAqB;QAC9C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,CAAC;IAGD;;;;OAIG;IACH,KAAK,CAAC,UAAU,CAAC,KAIhB;QACC,OAAO,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE;YAC1C,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC;SAC1D,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACK,QAAQ,CAAC,IAAqB;QACpC,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAC9B,OAAO;YACL,GAAG,IAAI;YACP,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE;gBACtC,GAAG,IAAI,CAAC,OAAO;aAChB;SACF,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -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
|
|
9
|
+
/** City 管理端入口地址，支持 `http(s)://` 与本机 `rpc://`。 */
|
|
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
|
+
/** 管理密钥；使用本机 `rpc://` 时不需要传入。 */
|
|
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,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,iCAAiC;IACjC,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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* City Pact 请求抽象。
|
|
3
|
+
*
|
|
4
|
+
* 关键点（中文）
|
|
5
|
+
* - 上层 Admin/User invoker 只依赖 requester，不关心底层是 HTTP 还是本机 RPC。
|
|
6
|
+
* - HTTP 仍然使用 bearer token；RPC 通过本机可信身份进入 Federation。
|
|
7
|
+
*/
|
|
8
|
+
import type { FederationRpcIdentity } from "@downcity/type";
|
|
9
|
+
import { type FetchLike, type FetchResponseLike, type RequestInitLike } from "./http.js";
|
|
10
|
+
/**
|
|
11
|
+
* City 请求器。
|
|
12
|
+
*/
|
|
13
|
+
export interface CityRequester {
|
|
14
|
+
/** 请求入口根地址。 */
|
|
15
|
+
readonly base_url: string;
|
|
16
|
+
/** 请求 JSON 并解析。 */
|
|
17
|
+
json<T>(path: string, init: RequestInitLike): Promise<T>;
|
|
18
|
+
/** 请求文本。 */
|
|
19
|
+
text(path: string, init: RequestInitLike): Promise<string>;
|
|
20
|
+
/** 请求原始响应。 */
|
|
21
|
+
raw(path: string, init: RequestInitLike): Promise<FetchResponseLike>;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* 创建 HTTP 请求器。
|
|
25
|
+
*/
|
|
26
|
+
export declare function create_http_requester(options: {
|
|
27
|
+
/** Federation HTTP 入口地址。 */
|
|
28
|
+
base_url: string;
|
|
29
|
+
/** 自定义 fetch 实现。 */
|
|
30
|
+
fetch?: FetchLike;
|
|
31
|
+
/** 请求头增强函数。 */
|
|
32
|
+
with_auth(init: RequestInitLike): RequestInitLike;
|
|
33
|
+
}): CityRequester;
|
|
34
|
+
/**
|
|
35
|
+
* 创建 Federation RPC 请求器。
|
|
36
|
+
*/
|
|
37
|
+
export declare function create_rpc_requester(options: {
|
|
38
|
+
/** Federation RPC 入口地址。 */
|
|
39
|
+
base_url: string;
|
|
40
|
+
/** 本机可信身份。 */
|
|
41
|
+
identity: FederationRpcIdentity;
|
|
42
|
+
}): CityRequester;
|
|
43
|
+
/**
|
|
44
|
+
* 判断 URL 是否为本机 Federation RPC。
|
|
45
|
+
*/
|
|
46
|
+
export declare function is_rpc_url(value: string): boolean;
|
|
47
|
+
//# sourceMappingURL=requester.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requester.d.ts","sourceRoot":"","sources":["../../src/pact/requester.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,qBAAqB,EAEtB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAML,KAAK,SAAS,EACd,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACrB,MAAM,WAAW,CAAC;AAGnB;;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;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAC5C,2BAA2B;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc;IACd,QAAQ,EAAE,qBAAqB,CAAC;CACjC,GAAG,aAAa,CAsBhB;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEjD"}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* City Pact 请求抽象。
|
|
3
|
+
*
|
|
4
|
+
* 关键点（中文）
|
|
5
|
+
* - 上层 Admin/User invoker 只依赖 requester，不关心底层是 HTTP 还是本机 RPC。
|
|
6
|
+
* - HTTP 仍然使用 bearer token；RPC 通过本机可信身份进入 Federation。
|
|
7
|
+
*/
|
|
8
|
+
import { defaultFetch, normalizeBaseURL, requestJSON, requestRaw, requestText, } from "./http.js";
|
|
9
|
+
import { request_federation_rpc } from "./rpc-client.js";
|
|
10
|
+
/**
|
|
11
|
+
* 创建 HTTP 请求器。
|
|
12
|
+
*/
|
|
13
|
+
export function create_http_requester(options) {
|
|
14
|
+
const base_url = normalizeBaseURL(options.base_url, "base_url");
|
|
15
|
+
const fetch_impl = options.fetch ?? defaultFetch();
|
|
16
|
+
return {
|
|
17
|
+
base_url,
|
|
18
|
+
json: (path, init) => requestJSON({
|
|
19
|
+
fetch: fetch_impl,
|
|
20
|
+
url: `${base_url}${path}`,
|
|
21
|
+
init: options.with_auth(init),
|
|
22
|
+
}),
|
|
23
|
+
text: (path, init) => requestText({
|
|
24
|
+
fetch: fetch_impl,
|
|
25
|
+
url: `${base_url}${path}`,
|
|
26
|
+
init: options.with_auth(init),
|
|
27
|
+
}),
|
|
28
|
+
raw: (path, init) => requestRaw({
|
|
29
|
+
fetch: fetch_impl,
|
|
30
|
+
url: `${base_url}${path}`,
|
|
31
|
+
init: options.with_auth(init),
|
|
32
|
+
}),
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* 创建 Federation RPC 请求器。
|
|
37
|
+
*/
|
|
38
|
+
export function create_rpc_requester(options) {
|
|
39
|
+
const base_url = normalizeBaseURL(options.base_url, "base_url");
|
|
40
|
+
const request = async (path, init) => {
|
|
41
|
+
const response = await request_federation_rpc({
|
|
42
|
+
url: base_url,
|
|
43
|
+
identity: options.identity,
|
|
44
|
+
method: init.method ?? "GET",
|
|
45
|
+
path,
|
|
46
|
+
headers: init.headers,
|
|
47
|
+
body: init.body,
|
|
48
|
+
});
|
|
49
|
+
if (response.status < 200 || response.status >= 300) {
|
|
50
|
+
throw rpc_error(response);
|
|
51
|
+
}
|
|
52
|
+
return response;
|
|
53
|
+
};
|
|
54
|
+
return {
|
|
55
|
+
base_url,
|
|
56
|
+
json: async (path, init) => JSON.parse((await request(path, init)).body),
|
|
57
|
+
text: async (path, init) => (await request(path, init)).body,
|
|
58
|
+
raw: async (path, init) => response_like(await request(path, init)),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
/**
|
|
62
|
+
* 判断 URL 是否为本机 Federation RPC。
|
|
63
|
+
*/
|
|
64
|
+
export function is_rpc_url(value) {
|
|
65
|
+
return /^rpc:\/\//i.test(value);
|
|
66
|
+
}
|
|
67
|
+
function rpc_error(response) {
|
|
68
|
+
const error = new Error(`Downcity request failed with ${response.status}: ${response.body}`);
|
|
69
|
+
error.status = response.status;
|
|
70
|
+
error.body = response.body;
|
|
71
|
+
return error;
|
|
72
|
+
}
|
|
73
|
+
function response_like(response) {
|
|
74
|
+
const body = encode_body(response.body);
|
|
75
|
+
return {
|
|
76
|
+
ok: response.status >= 200 && response.status < 300,
|
|
77
|
+
status: response.status,
|
|
78
|
+
body,
|
|
79
|
+
json: async () => JSON.parse(response.body),
|
|
80
|
+
text: async () => response.body,
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
function encode_body(body) {
|
|
84
|
+
const encoder = new TextEncoder();
|
|
85
|
+
const chunk = encoder.encode(body);
|
|
86
|
+
return new ReadableStream({
|
|
87
|
+
start(controller) {
|
|
88
|
+
controller.enqueue(chunk);
|
|
89
|
+
controller.close();
|
|
90
|
+
},
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
//# sourceMappingURL=requester.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"requester.js","sourceRoot":"","sources":["../../src/pact/requester.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Federation RPC client。
|
|
3
|
+
*
|
|
4
|
+
* 关键点（中文）
|
|
5
|
+
* - 仅用于 `rpc://` 本机 Federation transport。
|
|
6
|
+
* - 使用 NDJSON over TCP，与 `@downcity/server` 的 FederationRPC 对接。
|
|
7
|
+
*/
|
|
8
|
+
import type { FederationRpcIdentity, FederationRpcResponseData } 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
|
+
/** 本机可信身份。 */
|
|
16
|
+
identity: FederationRpcIdentity;
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../src/pact/rpc-client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EACV,qBAAqB,EAErB,yBAAyB,EAE1B,MAAM,gBAAgB,CAAC;AA4BxB;;GAEG;AACH,MAAM,WAAW,0BAA0B;IACzC,0CAA0C;IAC1C,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc;IACd,QAAQ,EAAE,qBAAqB,CAAC;IAChC,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"}
|
|
@@ -0,0 +1,99 @@
|
|
|
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
|
+
identity: input.identity,
|
|
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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rpc-client.js","sourceRoot":"","sources":["../../src/pact/rpc-client.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqDH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,KAAiC;IAEjC,MAAM,GAAG,GAAG,MAAM,aAAa,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,wBAAwB,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,WAAW,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IAClF,MAAM,OAAO,GAAyB;QACpC,EAAE,EAAE,UAAU;QACd,MAAM,EAAE,oBAAoB;QAC5B,MAAM,EAAE;YACN,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ;SACzB;KACF,CAAC;IAEF,OAAO,MAAM,IAAI,OAAO,CAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtE,MAAM,MAAM,GAAG,GAAG,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC9C,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,IAAgC,EAAQ,EAAE;YACxE,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClE,OAAO;YACT,CAAC;YACD,OAAO,CAAC,IAAK,CAAC,CAAC;QACjB,CAAC,CAAC;QAEF,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACxB,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnC,IAAI,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC3C,OAAO,aAAa,IAAI,CAAC,EAAE,CAAC;gBAC1B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;gBACrD,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,aAAa,GAAG,CAAC,CAAC,CAAC;gBAC7C,IAAI,IAAI,EAAE,CAAC;oBACT,IAAI,CAAC;wBACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAA+B,CAAC;wBAC7D,IAAI,KAAK,CAAC,EAAE,KAAK,UAAU,EAAE,CAAC;4BAC5B,MAAM,IAAI,KAAK,CAAC,0CAA0C,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;wBACxE,CAAC;wBACD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;4BACnB,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC/B,CAAC;wBACD,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBAChC,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;gBACH,CAAC;gBACD,aAAa,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC3B,MAAM,CAAC,KAAK,CAAC,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC,CAAC;YACpE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,aAAa;IAC1B,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAkD,CAAC;IACtH,OAAO,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAa;IAC7C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;IAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC;QAC5B,MAAM,IAAI,SAAS,CAAC,wCAAwC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAClB,MAAM,IAAI,SAAS,CAAC,oCAAoC,CAAC,CAAC;IAC5D,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,KAAK,EAAE,CAAC;QACzD,MAAM,IAAI,SAAS,CAAC,0CAA0C,CAAC,CAAC;IAClE,CAAC;IACD,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,QAAQ;QAClB,IAAI;KACL,CAAC;AACJ,CAAC"}
|
package/bin/pact/user/index.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export declare class UserPactAccess {
|
|
|
11
11
|
readonly serverUrl: string;
|
|
12
12
|
readonly token: string | undefined;
|
|
13
13
|
private readonly city_id?;
|
|
14
|
-
private readonly
|
|
14
|
+
private readonly requester;
|
|
15
15
|
constructor(options: UserPactAccessOptions);
|
|
16
16
|
/** 获取 Service 调用器 */
|
|
17
17
|
service(name: string): ServiceClient;
|
|
@@ -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;AAY9F,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;IAuC1C,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
|
@@ -4,22 +4,35 @@
|
|
|
4
4
|
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
|
-
import {
|
|
7
|
+
import { requiredString, } from "../http.js";
|
|
8
|
+
import { create_http_requester, create_rpc_requester, is_rpc_url, } from "../requester.js";
|
|
8
9
|
export class UserPactAccess {
|
|
9
10
|
ai;
|
|
10
11
|
payment;
|
|
11
12
|
serverUrl;
|
|
12
13
|
token;
|
|
13
14
|
city_id;
|
|
14
|
-
|
|
15
|
+
requester;
|
|
15
16
|
constructor(options) {
|
|
16
17
|
if (!options || typeof options !== "object") {
|
|
17
18
|
throw new TypeError("User City options are required");
|
|
18
19
|
}
|
|
19
|
-
this.serverUrl =
|
|
20
|
+
this.serverUrl = requiredString(options.base_url, "base_url").replace(/\/+$/, "");
|
|
20
21
|
this.token = readOptional(options.user_token);
|
|
21
22
|
this.city_id = readOptional(options.city_id);
|
|
22
|
-
this.
|
|
23
|
+
this.requester = is_rpc_url(this.serverUrl)
|
|
24
|
+
? create_rpc_requester({
|
|
25
|
+
base_url: this.serverUrl,
|
|
26
|
+
identity: {
|
|
27
|
+
role: "user",
|
|
28
|
+
city_id: this.require_city_id(),
|
|
29
|
+
},
|
|
30
|
+
})
|
|
31
|
+
: create_http_requester({
|
|
32
|
+
base_url: this.serverUrl,
|
|
33
|
+
fetch: options.fetch,
|
|
34
|
+
with_auth: (init) => this.withAuth(init),
|
|
35
|
+
});
|
|
23
36
|
this.ai = new AIInvoker({
|
|
24
37
|
baseUrl: this.serverUrl,
|
|
25
38
|
token: this.token,
|
|
@@ -51,19 +64,12 @@ export class UserPactAccess {
|
|
|
51
64
|
// 内部
|
|
52
65
|
// ===================================================================
|
|
53
66
|
json(path, init) {
|
|
54
|
-
return
|
|
55
|
-
fetch: this.fetchImpl,
|
|
56
|
-
url: `${this.serverUrl}${path}`,
|
|
57
|
-
init: this.withAuth(init),
|
|
58
|
-
});
|
|
67
|
+
return this.requester.json(path, init);
|
|
59
68
|
}
|
|
60
69
|
raw(path, init) {
|
|
61
|
-
this.
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
url: `${this.serverUrl}${path}`,
|
|
65
|
-
init: this.withAuth(init),
|
|
66
|
-
});
|
|
70
|
+
if (!is_rpc_url(this.serverUrl))
|
|
71
|
+
this.requireToken();
|
|
72
|
+
return this.requester.raw(path, init);
|
|
67
73
|
}
|
|
68
74
|
withAuth(init) {
|
|
69
75
|
const headers = {
|
|
@@ -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,YAAY,
|
|
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,11 +35,11 @@ export interface UserServiceSummary {
|
|
|
35
35
|
}
|
|
36
36
|
/** User City 内部访问层构造参数 */
|
|
37
37
|
export interface UserPactAccessOptions {
|
|
38
|
-
/** City
|
|
38
|
+
/** City 的访问入口地址，支持 `http(s)://` 与本机 `rpc://`。 */
|
|
39
39
|
base_url: string;
|
|
40
40
|
/** 当前 user_token 绑定的 City ID。 */
|
|
41
41
|
city_id?: string;
|
|
42
|
-
/** 终端用户访问 token
|
|
42
|
+
/** 终端用户访问 token；使用本机 `rpc://` 时不需要传入。 */
|
|
43
43
|
user_token?: string;
|
|
44
44
|
/** 自定义 fetch 实现。 */
|
|
45
45
|
fetch?: FetchLike;
|
|
@@ -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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"}
|
|
@@ -40,7 +40,7 @@ export function formatInstructionDocument(input) {
|
|
|
40
40
|
lines.push("1. 创建 Federation 实例。");
|
|
41
41
|
lines.push("2. 通过 base.use(...) 注册业务 Service、AIService 或带 install(ctx) 生命周期的服务。");
|
|
42
42
|
lines.push("3. 先调用 await base.health() 完成初始化。");
|
|
43
|
-
lines.push("4. 通过 base.
|
|
43
|
+
lines.push("4. 通过 base.fetch 或 base.fetch(...) 对外提供请求处理。");
|
|
44
44
|
lines.push("");
|
|
45
45
|
lines.push(`内置服务：${input.base.builtin_services.join(", ")}`);
|
|
46
46
|
lines.push(`当前已加载模块：${input.base.loaded_modules.join(", ")}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instruction.js","sourceRoot":"","sources":["../../src/service/instruction.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAqGH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,WAA8C,EAC9C,GAAuB;IAEvB,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC;IACnC,MAAM,OAAO,GAAG,OAAO,WAAW,KAAK,UAAU;QAC/C,CAAC,CAAC,MAAM,WAAW,CAAC,GAAG,CAAC;QACxB,CAAC,CAAC,WAAW,CAAC;IAChB,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAChD,OAAO,UAAU,IAAI,SAAS,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,IAAe;IAC7C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,sBAAsB,CAAC;IACrD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,IAAI,CAAC,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpB,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,yBAAyB,CAAC,KAMzC;IACC,MAAM,KAAK,GAAa,EAAE,CAAC;IAE3B,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IAChD,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC5B,KAAK,CAAC,IAAI,CAAC,4HAA4H,CAAC,CAAC;IACzI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpB,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IACnC,KAAK,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;IAClF,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAC;IAChD,KAAK,CAAC,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"instruction.js","sourceRoot":"","sources":["../../src/service/instruction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Federation HTTP Middleware 类型模块。
|
|
3
|
+
*
|
|
4
|
+
* 定义 `fed.middle()` 使用的中间件上下文与 next 函数。该层只约束
|
|
5
|
+
* Federation 级 HTTP middleware 的接入接口，具体 CORS、安全响应头、
|
|
6
|
+
* 限流、超时等策略实现由调用方按自己的运行环境提供。
|
|
7
|
+
*/
|
|
8
|
+
import type { Service } from "../service/service.js";
|
|
9
|
+
import type { Runtime } from "../federation/runtime.js";
|
|
10
|
+
import type { FederationRequestExecutionContext } from "../federation/types.js";
|
|
11
|
+
/**
|
|
12
|
+
* Federation middleware 的后续执行函数。
|
|
13
|
+
*
|
|
14
|
+
* 关键说明（中文）
|
|
15
|
+
* - 调用 `next()` 会进入下一个 middleware 或最终的内部 router。
|
|
16
|
+
* - 每个 middleware 中的 `next()` 最多只能调用一次。
|
|
17
|
+
*/
|
|
18
|
+
export type FederationMiddlewareNext = () => Promise<Response>;
|
|
19
|
+
/**
|
|
20
|
+
* Federation HTTP middleware 函数。
|
|
21
|
+
*
|
|
22
|
+
* 关键说明（中文）
|
|
23
|
+
* - 返回 `Response` 可以短路请求。
|
|
24
|
+
* - `await next()` 后可以对响应 headers 做后处理。
|
|
25
|
+
* - middleware 运行在内部 Hono router 之前，因此可在 body 读取前拒绝请求。
|
|
26
|
+
*/
|
|
27
|
+
export type FederationMiddleware = (ctx: FederationMiddlewareContext, next: FederationMiddlewareNext) => Promise<Response> | Response;
|
|
28
|
+
/**
|
|
29
|
+
* 暴露给 middleware 的 Federation 只读引用。
|
|
30
|
+
*/
|
|
31
|
+
export interface FederationMiddlewareFederationRef {
|
|
32
|
+
/** 返回当前 Federation 已注册的 Service 列表。 */
|
|
33
|
+
services(): readonly Service[];
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Federation middleware 单次请求上下文。
|
|
37
|
+
*/
|
|
38
|
+
export interface FederationMiddlewareContext {
|
|
39
|
+
/** 当前原始 HTTP 请求。 */
|
|
40
|
+
request: Request;
|
|
41
|
+
/** 宿主运行时的单次请求执行上下文。 */
|
|
42
|
+
execution?: FederationRequestExecutionContext;
|
|
43
|
+
/** 当前 Federation 的运行时能力集合。 */
|
|
44
|
+
runtime: Runtime;
|
|
45
|
+
/** 当前 Federation 的只读能力引用。 */
|
|
46
|
+
federation: FederationMiddlewareFederationRef;
|
|
47
|
+
/** middleware 之间共享的轻量临时上下文。 */
|
|
48
|
+
locals: Record<string, unknown>;
|
|
49
|
+
}
|
|
50
|
+
//# sourceMappingURL=FederationMiddleware.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"FederationMiddleware.d.ts","sourceRoot":"","sources":["../../src/types/FederationMiddleware.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,wBAAwB,CAAC;AAEhF;;;;;;GAMG;AACH,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;AAE/D;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,GAAG,EAAE,2BAA2B,EAChC,IAAI,EAAE,wBAAwB,KAC3B,OAAO,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC;AAElC;;GAEG;AACH,MAAM,WAAW,iCAAiC;IAChD,uCAAuC;IACvC,QAAQ,IAAI,SAAS,OAAO,EAAE,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,2BAA2B;IAC1C,oBAAoB;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,uBAAuB;IACvB,SAAS,CAAC,EAAE,iCAAiC,CAAC;IAC9C,8BAA8B;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,6BAA6B;IAC7B,UAAU,EAAE,iCAAiC,CAAC;IAC9C,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC"}
|