@downcity/city 0.2.17 → 0.2.25
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 +33 -16
- package/bin/city/admin/index.d.ts +36 -0
- package/bin/city/admin/index.d.ts.map +1 -0
- package/bin/city/admin/index.js +85 -0
- package/bin/city/admin/index.js.map +1 -0
- package/bin/city/admin/types.d.ts +41 -0
- package/bin/city/admin/types.d.ts.map +1 -0
- package/bin/city/admin/types.js +5 -0
- package/bin/city/admin/types.js.map +1 -0
- package/bin/city/city.d.ts +73 -0
- package/bin/city/city.d.ts.map +1 -0
- package/bin/city/city.js +116 -0
- package/bin/city/city.js.map +1 -0
- package/bin/city/http.d.ts +55 -0
- package/bin/city/http.d.ts.map +1 -0
- package/bin/city/http.js +78 -0
- package/bin/city/http.js.map +1 -0
- package/bin/city/index.d.ts +20 -0
- package/bin/city/index.d.ts.map +1 -0
- package/bin/city/index.js +14 -0
- package/bin/city/index.js.map +1 -0
- package/bin/city/invoker/ai/index.d.ts +126 -0
- package/bin/city/invoker/ai/index.d.ts.map +1 -0
- package/bin/city/invoker/ai/index.js +247 -0
- package/bin/city/invoker/ai/index.js.map +1 -0
- package/bin/city/invoker/ai/stream.d.ts +8 -0
- package/bin/city/invoker/ai/stream.d.ts.map +1 -0
- package/bin/city/invoker/ai/stream.js +17 -0
- package/bin/city/invoker/ai/stream.js.map +1 -0
- package/bin/city/invoker/ai/types.d.ts +14 -0
- package/bin/city/invoker/ai/types.d.ts.map +1 -0
- package/bin/city/invoker/ai/types.js +9 -0
- package/bin/city/invoker/ai/types.js.map +1 -0
- package/bin/city/invoker/balance/index.d.ts +76 -0
- package/bin/city/invoker/balance/index.d.ts.map +1 -0
- package/bin/city/invoker/balance/index.js +137 -0
- package/bin/city/invoker/balance/index.js.map +1 -0
- package/bin/city/invoker/balance/types.d.ts +324 -0
- package/bin/city/invoker/balance/types.d.ts.map +1 -0
- package/bin/city/invoker/balance/types.js +9 -0
- package/bin/city/invoker/balance/types.js.map +1 -0
- package/bin/city/invoker/env/index.d.ts +33 -0
- package/bin/city/invoker/env/index.d.ts.map +1 -0
- package/bin/city/invoker/env/index.js +53 -0
- package/bin/city/invoker/env/index.js.map +1 -0
- package/bin/city/invoker/env/types.d.ts +57 -0
- package/bin/city/invoker/env/types.d.ts.map +1 -0
- package/bin/city/invoker/env/types.js +5 -0
- package/bin/city/invoker/env/types.js.map +1 -0
- package/bin/city/invoker/invoker.d.ts +44 -0
- package/bin/city/invoker/invoker.d.ts.map +1 -0
- package/bin/city/invoker/invoker.js +87 -0
- package/bin/city/invoker/invoker.js.map +1 -0
- package/bin/city/invoker/payment/index.d.ts +69 -0
- package/bin/city/invoker/payment/index.d.ts.map +1 -0
- package/bin/city/invoker/payment/index.js +110 -0
- package/bin/city/invoker/payment/index.js.map +1 -0
- package/bin/city/invoker/payment/types.d.ts +66 -0
- package/bin/city/invoker/payment/types.d.ts.map +1 -0
- package/bin/city/invoker/payment/types.js +10 -0
- package/bin/city/invoker/payment/types.js.map +1 -0
- package/bin/city/invoker/towns/index.d.ts +46 -0
- package/bin/city/invoker/towns/index.d.ts.map +1 -0
- package/bin/city/invoker/towns/index.js +73 -0
- package/bin/city/invoker/towns/index.js.map +1 -0
- package/bin/city/invoker/towns/types.d.ts +46 -0
- package/bin/city/invoker/towns/types.d.ts.map +1 -0
- package/bin/city/invoker/towns/types.js +5 -0
- package/bin/city/invoker/towns/types.js.map +1 -0
- package/bin/city/types/city.d.ts +71 -0
- package/bin/city/types/city.d.ts.map +1 -0
- package/bin/city/types/city.js +8 -0
- package/bin/city/types/city.js.map +1 -0
- package/bin/city/user/index.d.ts +27 -0
- package/bin/city/user/index.d.ts.map +1 -0
- package/bin/city/user/index.js +100 -0
- package/bin/city/user/index.js.map +1 -0
- package/bin/city/user/types.d.ts +49 -0
- package/bin/city/user/types.d.ts.map +1 -0
- package/bin/city/user/types.js +5 -0
- package/bin/city/user/types.js.map +1 -0
- package/bin/core/auth/authenticator.d.ts +6 -6
- package/bin/core/auth/authenticator.d.ts.map +1 -1
- package/bin/core/auth/authenticator.js +11 -11
- package/bin/core/auth/authenticator.js.map +1 -1
- package/bin/core/auth/token-signer.js +4 -4
- package/bin/core/auth/token-signer.js.map +1 -1
- package/bin/core/auth/types.d.ts +7 -7
- package/bin/core/auth/types.d.ts.map +1 -1
- package/bin/core/base/base-init.d.ts +5 -5
- package/bin/core/base/base-init.d.ts.map +1 -1
- package/bin/core/base/base-init.js +8 -8
- package/bin/core/base/base-init.js.map +1 -1
- package/bin/core/base/base-instruction.js +1 -1
- package/bin/core/base/base-instruction.js.map +1 -1
- package/bin/core/base/base-router.d.ts +2 -2
- package/bin/core/base/base-router.d.ts.map +1 -1
- package/bin/core/base/base-router.js +15 -15
- package/bin/core/base/base-router.js.map +1 -1
- package/bin/core/base/base-runtime.d.ts +3 -3
- package/bin/core/base/base-runtime.d.ts.map +1 -1
- package/bin/core/base/base-runtime.js +4 -4
- package/bin/core/base/base-runtime.js.map +1 -1
- package/bin/core/base/base.d.ts +8 -8
- package/bin/core/base/base.d.ts.map +1 -1
- package/bin/core/base/base.js +10 -10
- package/bin/core/base/base.js.map +1 -1
- package/bin/core/runtime.d.ts +4 -4
- package/bin/core/runtime.d.ts.map +1 -1
- package/bin/core/runtime.js +1 -1
- package/bin/core/types.d.ts +3 -3
- package/bin/core/types.d.ts.map +1 -1
- package/bin/index.d.ts +25 -5
- package/bin/index.d.ts.map +1 -1
- package/bin/index.js +18 -7
- package/bin/index.js.map +1 -1
- package/bin/service/ai/openai-compatible-provider.d.ts +1 -1
- package/bin/service/ai/openai-compatible-provider.js +2 -2
- package/bin/service/ai/openai-compatible-provider.js.map +1 -1
- package/bin/service/ai/provider.d.ts +1 -1
- package/bin/service/ai/provider.js +1 -1
- package/bin/service/ai/types.d.ts +1 -1
- package/bin/service/installable-service.d.ts +3 -3
- package/bin/service/installable-service.d.ts.map +1 -1
- package/bin/service/installable-service.js +1 -1
- package/bin/service/installable-service.js.map +1 -1
- package/bin/service/instruction.js +7 -7
- package/bin/service/instruction.js.map +1 -1
- package/bin/service/service.d.ts +5 -5
- package/bin/service/service.d.ts.map +1 -1
- package/bin/service/service.js +1 -1
- package/bin/service/service.js.map +1 -1
- package/bin/service/{studios → towns}/schema.d.ts +23 -23
- package/bin/service/towns/schema.d.ts.map +1 -0
- package/bin/service/towns/schema.js +60 -0
- package/bin/service/towns/schema.js.map +1 -0
- package/bin/service/towns/town-store.d.ts +17 -0
- package/bin/service/towns/town-store.d.ts.map +1 -0
- package/bin/service/towns/town-store.js +49 -0
- package/bin/service/towns/town-store.js.map +1 -0
- package/bin/service/towns/towns-service.d.ts +15 -0
- package/bin/service/towns/towns-service.d.ts.map +1 -0
- package/bin/service/towns/towns-service.js +54 -0
- package/bin/service/towns/towns-service.js.map +1 -0
- package/bin/service/towns/types.d.ts +51 -0
- package/bin/service/towns/types.d.ts.map +1 -0
- package/bin/service/towns/types.js +7 -0
- package/bin/service/towns/types.js.map +1 -0
- package/package.json +9 -8
- package/bin/service/studios/schema.d.ts.map +0 -1
- package/bin/service/studios/schema.js +0 -60
- package/bin/service/studios/schema.js.map +0 -1
- package/bin/service/studios/studio-store.d.ts +0 -17
- package/bin/service/studios/studio-store.d.ts.map +0 -1
- package/bin/service/studios/studio-store.js +0 -49
- package/bin/service/studios/studio-store.js.map +0 -1
- package/bin/service/studios/studios-service.d.ts +0 -15
- package/bin/service/studios/studios-service.d.ts.map +0 -1
- package/bin/service/studios/studios-service.js +0 -51
- package/bin/service/studios/studios-service.js.map +0 -1
- package/bin/service/studios/types.d.ts +0 -51
- package/bin/service/studios/types.d.ts.map +0 -1
- package/bin/service/studios/types.js +0 -7
- package/bin/service/studios/types.js.map +0 -1
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* City 公开类型模块。
|
|
3
|
+
*
|
|
4
|
+
* City 是访问 City 的统一入口:开发者只需要声明访问角色,
|
|
5
|
+
* SDK 会在内部选择 admin 或 user 能力面。
|
|
6
|
+
*/
|
|
7
|
+
import type { FetchLike } from "../http.js";
|
|
8
|
+
/**
|
|
9
|
+
* City 访问角色。
|
|
10
|
+
*/
|
|
11
|
+
export type CityRole = "admin" | "user";
|
|
12
|
+
/**
|
|
13
|
+
* City 共享构造参数。
|
|
14
|
+
*/
|
|
15
|
+
export interface CityClientBaseOptions {
|
|
16
|
+
/**
|
|
17
|
+
* City 的 HTTP 入口地址。
|
|
18
|
+
*
|
|
19
|
+
* 示例:`https://city.example.com` 或 `http://localhost:43127`。
|
|
20
|
+
*/
|
|
21
|
+
city_url: string;
|
|
22
|
+
/**
|
|
23
|
+
* 自定义 fetch 实现。
|
|
24
|
+
*
|
|
25
|
+
* 主要用于测试、Worker 运行时适配,或在请求层注入日志与追踪。
|
|
26
|
+
*/
|
|
27
|
+
fetch?: FetchLike;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Admin City 构造参数。
|
|
31
|
+
*/
|
|
32
|
+
export interface AdminCityOptions extends CityClientBaseOptions {
|
|
33
|
+
/**
|
|
34
|
+
* 使用 admin 身份访问 City。
|
|
35
|
+
*/
|
|
36
|
+
role: "admin";
|
|
37
|
+
/**
|
|
38
|
+
* City 管理密钥。
|
|
39
|
+
*
|
|
40
|
+
* 未传入时会由 City 回退读取 `DOWNCITY_CITY_ADMIN_SECRET_KEY`。
|
|
41
|
+
*/
|
|
42
|
+
admin_secret_key?: string;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* User City 构造参数。
|
|
46
|
+
*/
|
|
47
|
+
export interface UserCityOptions extends CityClientBaseOptions {
|
|
48
|
+
/**
|
|
49
|
+
* 使用 user 身份访问 City。
|
|
50
|
+
*/
|
|
51
|
+
role: "user";
|
|
52
|
+
/**
|
|
53
|
+
* 当前 user_token 绑定的 Town ID。
|
|
54
|
+
*
|
|
55
|
+
* AI 与普通 service action 调用会自动把该值注入为 `town_id`。
|
|
56
|
+
*/
|
|
57
|
+
town_id?: string;
|
|
58
|
+
/**
|
|
59
|
+
* 终端用户访问 token。
|
|
60
|
+
*/
|
|
61
|
+
user_token?: string;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* City 构造参数。
|
|
65
|
+
*/
|
|
66
|
+
export type CityOptions = AdminCityOptions | UserCityOptions;
|
|
67
|
+
/**
|
|
68
|
+
* 按角色收窄后的 City 构造参数。
|
|
69
|
+
*/
|
|
70
|
+
export type CityOptionsForRole<TRole extends CityRole> = TRole extends "admin" ? AdminCityOptions : UserCityOptions;
|
|
71
|
+
//# sourceMappingURL=city.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"city.d.ts","sourceRoot":"","sources":["../../../src/city/types/city.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;GAEG;AACH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAExC;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC;;;;OAIG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;;OAIG;IACH,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC7D;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC5D;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"city.js","sourceRoot":"","sources":["../../../src/city/types/city.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 终端用户 SDK。
|
|
3
|
+
*/
|
|
4
|
+
import { AIInvoker } from "../invoker/ai/index.js";
|
|
5
|
+
import { PaymentInvoker } from "../invoker/payment/index.js";
|
|
6
|
+
import { ServiceClient } from "../invoker/invoker.js";
|
|
7
|
+
import type { UserCityAccessOptions, UserServiceSummary } from "./types.js";
|
|
8
|
+
export declare class UserCityAccess {
|
|
9
|
+
readonly ai: AIInvoker;
|
|
10
|
+
readonly payment: PaymentInvoker;
|
|
11
|
+
readonly serverUrl: string;
|
|
12
|
+
readonly token: string | undefined;
|
|
13
|
+
private readonly town_id?;
|
|
14
|
+
private readonly fetchImpl;
|
|
15
|
+
constructor(options: UserCityAccessOptions);
|
|
16
|
+
/** 获取 Service 调用器 */
|
|
17
|
+
service(name: string): ServiceClient;
|
|
18
|
+
/** 列出已注册的 service 摘要 */
|
|
19
|
+
listServices(): Promise<UserServiceSummary[]>;
|
|
20
|
+
private json;
|
|
21
|
+
private raw;
|
|
22
|
+
private withAuth;
|
|
23
|
+
private buildInput;
|
|
24
|
+
private require_town_id;
|
|
25
|
+
private requireToken;
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/city/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;AAW9F,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,CAAY;gBAE1B,OAAO,EAAE,qBAAqB;IA4B1C,qBAAqB;IACrB,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa;IAWpC,wBAAwB;IAClB,YAAY,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IASnD,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,GAAG;IASX,OAAO,CAAC,QAAQ;IAShB,OAAO,CAAC,UAAU;IAQlB,OAAO,CAAC,eAAe;IAKvB,OAAO,CAAC,YAAY;CAGrB"}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 终端用户 SDK。
|
|
3
|
+
*/
|
|
4
|
+
import { AIInvoker, serializeModel } from "../invoker/ai/index.js";
|
|
5
|
+
import { PaymentInvoker } from "../invoker/payment/index.js";
|
|
6
|
+
import { ServiceClient } from "../invoker/invoker.js";
|
|
7
|
+
import { defaultFetch, normalizeBaseURL, requestJSON, requestRaw, requiredString, } from "../http.js";
|
|
8
|
+
export class UserCityAccess {
|
|
9
|
+
ai;
|
|
10
|
+
payment;
|
|
11
|
+
serverUrl;
|
|
12
|
+
token;
|
|
13
|
+
town_id;
|
|
14
|
+
fetchImpl;
|
|
15
|
+
constructor(options) {
|
|
16
|
+
if (!options || typeof options !== "object") {
|
|
17
|
+
throw new TypeError("User City options are required");
|
|
18
|
+
}
|
|
19
|
+
this.serverUrl = normalizeBaseURL(options.base_url, "base_url");
|
|
20
|
+
this.token = readOptional(options.user_token);
|
|
21
|
+
this.town_id = readOptional(options.town_id);
|
|
22
|
+
this.fetchImpl = options.fetch ?? defaultFetch();
|
|
23
|
+
this.ai = new AIInvoker({
|
|
24
|
+
baseUrl: this.serverUrl,
|
|
25
|
+
token: this.token,
|
|
26
|
+
requestJSON: (path, init) => this.json(path, init),
|
|
27
|
+
requestRaw: (path, init) => this.raw(path, init),
|
|
28
|
+
buildInput: (input) => this.buildInput(input),
|
|
29
|
+
});
|
|
30
|
+
this.payment = new PaymentInvoker({
|
|
31
|
+
requestJSON: (path, init) => this.json(path, init),
|
|
32
|
+
service: (name) => this.service(name),
|
|
33
|
+
hasUserToken: () => Boolean(this.token),
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
// ===================================================================
|
|
37
|
+
// Service → Action 调用
|
|
38
|
+
// ===================================================================
|
|
39
|
+
/** 获取 Service 调用器 */
|
|
40
|
+
service(name) {
|
|
41
|
+
const id = String(name ?? "").trim();
|
|
42
|
+
if (!id)
|
|
43
|
+
throw new TypeError("service name is required");
|
|
44
|
+
return new ServiceClient((path, init) => this.json(path, init), "/v1", id, this.town_id);
|
|
45
|
+
}
|
|
46
|
+
/** 列出已注册的 service 摘要 */
|
|
47
|
+
async listServices() {
|
|
48
|
+
return this.json("/v1/services", { method: "GET" })
|
|
49
|
+
.then((body) => body.items);
|
|
50
|
+
}
|
|
51
|
+
// ===================================================================
|
|
52
|
+
// 内部
|
|
53
|
+
// ===================================================================
|
|
54
|
+
json(path, init) {
|
|
55
|
+
return requestJSON({
|
|
56
|
+
fetch: this.fetchImpl,
|
|
57
|
+
url: `${this.serverUrl}${path}`,
|
|
58
|
+
init: this.withAuth(init),
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
raw(path, init) {
|
|
62
|
+
this.requireToken();
|
|
63
|
+
return requestRaw({
|
|
64
|
+
fetch: this.fetchImpl,
|
|
65
|
+
url: `${this.serverUrl}${path}`,
|
|
66
|
+
init: this.withAuth(init),
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
withAuth(init) {
|
|
70
|
+
const headers = {
|
|
71
|
+
"content-type": "application/json",
|
|
72
|
+
...init.headers,
|
|
73
|
+
};
|
|
74
|
+
if (this.token)
|
|
75
|
+
headers.authorization = `Bearer ${this.token}`;
|
|
76
|
+
return { ...init, headers };
|
|
77
|
+
}
|
|
78
|
+
buildInput(input) {
|
|
79
|
+
return {
|
|
80
|
+
...input,
|
|
81
|
+
model: serializeModel(input.model),
|
|
82
|
+
town_id: this.require_town_id(),
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
require_town_id() {
|
|
86
|
+
if (!this.town_id)
|
|
87
|
+
throw new TypeError("town_id is required for AI calls");
|
|
88
|
+
return this.town_id;
|
|
89
|
+
}
|
|
90
|
+
requireToken() {
|
|
91
|
+
if (!this.token)
|
|
92
|
+
throw new TypeError("user_token is required for this operation");
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
function readOptional(value) {
|
|
96
|
+
if (value === undefined)
|
|
97
|
+
return undefined;
|
|
98
|
+
return requiredString(value, "option");
|
|
99
|
+
}
|
|
100
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/city/user/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 用户端类型。
|
|
3
|
+
*/
|
|
4
|
+
import type { UIMessage, UIMessageChunk } from "ai";
|
|
5
|
+
import type { FetchLike } from "../http.js";
|
|
6
|
+
import type { UserModelInput } from "../invoker/ai/types.js";
|
|
7
|
+
import type { UserPaymentMethod, UserPaymentMethodReason, UserPaymentMethodType } from "../invoker/payment/types.js";
|
|
8
|
+
/**
|
|
9
|
+
* Service 摘要信息。
|
|
10
|
+
*/
|
|
11
|
+
export interface UserServiceSummary {
|
|
12
|
+
/** Service 唯一 ID。 */
|
|
13
|
+
id: string;
|
|
14
|
+
/** Service 展示名称。 */
|
|
15
|
+
name: string;
|
|
16
|
+
/** Service 依赖的环境变量需求列表。 */
|
|
17
|
+
env: Array<{
|
|
18
|
+
/** 环境变量 key。 */
|
|
19
|
+
key: string;
|
|
20
|
+
/** 给用户展示的说明文本。 */
|
|
21
|
+
description: string;
|
|
22
|
+
/** 当前是否必填。 */
|
|
23
|
+
required: boolean;
|
|
24
|
+
}>;
|
|
25
|
+
}
|
|
26
|
+
/** User City 内部访问层构造参数 */
|
|
27
|
+
export interface UserCityAccessOptions {
|
|
28
|
+
/** City 的 HTTP 入口地址。 */
|
|
29
|
+
base_url: string;
|
|
30
|
+
/** 当前 user_token 绑定的 Town ID。 */
|
|
31
|
+
town_id?: string;
|
|
32
|
+
/** 终端用户访问 token。 */
|
|
33
|
+
user_token?: string;
|
|
34
|
+
/** 自定义 fetch 实现。 */
|
|
35
|
+
fetch?: FetchLike;
|
|
36
|
+
}
|
|
37
|
+
/** AI 模态返回类型 */
|
|
38
|
+
export type UserTextResult = UIMessage;
|
|
39
|
+
export type UserStreamChunk = UIMessageChunk;
|
|
40
|
+
export type UserStreamResult = ReadableStream<UserStreamChunk>;
|
|
41
|
+
export type UserImageResult = UIMessage;
|
|
42
|
+
export type UserVideoResult = UIMessage;
|
|
43
|
+
export type { UserPaymentMethod, UserPaymentMethodReason, UserPaymentMethodType };
|
|
44
|
+
/** 发给任意 service 的输入 */
|
|
45
|
+
export interface UserServiceInput {
|
|
46
|
+
model?: UserModelInput;
|
|
47
|
+
[key: string]: unknown;
|
|
48
|
+
}
|
|
49
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/city/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,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACtB,MAAM,6BAA6B,CAAC;AAErC;;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,wBAAwB;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oBAAoB;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB;IACpB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB;AAED,gBAAgB;AAChB,MAAM,MAAM,cAAc,GAAG,SAAS,CAAC;AACvC,MAAM,MAAM,eAAe,GAAG,cAAc,CAAC;AAC7C,MAAM,MAAM,gBAAgB,GAAG,cAAc,CAAC,eAAe,CAAC,CAAC;AAC/D,MAAM,MAAM,eAAe,GAAG,SAAS,CAAC;AACxC,MAAM,MAAM,eAAe,GAAG,SAAS,CAAC;AACxC,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,CAAC;AAElF,uBAAuB;AACvB,MAAM,WAAW,gBAAgB;IAC/B,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/city/user/types.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
|
@@ -16,9 +16,9 @@ export interface AuthResult {
|
|
|
16
16
|
level: RouteIdentity;
|
|
17
17
|
/** 解析出的用户信息(user 级别时可用) */
|
|
18
18
|
user?: RuntimeUser;
|
|
19
|
-
/** 解析出的
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
/** 解析出的 Town 信息(user 级别时可用) */
|
|
20
|
+
town?: {
|
|
21
|
+
town_id: string;
|
|
22
22
|
status: string;
|
|
23
23
|
};
|
|
24
24
|
}
|
|
@@ -29,9 +29,9 @@ export declare class Authenticator {
|
|
|
29
29
|
/** 缓存的 TokenSigner 实例 */
|
|
30
30
|
private tokenSigner?;
|
|
31
31
|
constructor(env: EnvProvider, store: () => Promise<{
|
|
32
|
-
|
|
32
|
+
town: {
|
|
33
33
|
get(id: string): Promise<{
|
|
34
|
-
|
|
34
|
+
town_id: string;
|
|
35
35
|
status: string;
|
|
36
36
|
} | undefined>;
|
|
37
37
|
};
|
|
@@ -62,7 +62,7 @@ export declare class Authenticator {
|
|
|
62
62
|
*/
|
|
63
63
|
authenticate(request: Request, required?: RouteAuth): Promise<AuthResult>;
|
|
64
64
|
/**
|
|
65
|
-
* 签发 user_token(验证
|
|
65
|
+
* 签发 user_token(验证 town 状态后签发)。
|
|
66
66
|
*
|
|
67
67
|
* @param input - token 创建参数
|
|
68
68
|
* @returns 签发结果(含 token 字符串)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../src/core/auth/authenticator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAsB,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5G,WAAW;AACX,WAAW;AACX,MAAM,WAAW,UAAU;IACzB,eAAe;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,2BAA2B;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB
|
|
1
|
+
{"version":3,"file":"authenticator.d.ts","sourceRoot":"","sources":["../../../src/core/auth/authenticator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,EAAsB,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAClG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE5G,WAAW;AACX,WAAW;AACX,MAAM,WAAW,UAAU;IACzB,eAAe;IACf,KAAK,EAAE,aAAa,CAAC;IACrB,2BAA2B;IAC3B,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,+BAA+B;IAC/B,IAAI,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED,YAAY;AACZ,qBAAa,aAAa;IAKtB,OAAO,CAAC,GAAG;IACX,OAAO,CAAC,KAAK;IALf,yBAAyB;IACzB,OAAO,CAAC,WAAW,CAAC,CAAc;gBAGxB,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,MAAM,OAAO,CAAC;QAAE,IAAI,EAAE;YAAE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,SAAS,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC;IAGvH;;;;OAIG;IACH,OAAO,CAAC,SAAS;IASjB;;;;;OAKG;IACG,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;IA0BpD;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,UAAU;IAY/D;;OAEG;IACG,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;IAI/E;;;;;OAKG;IACG,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAiB7E;;;;;OAKG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAG5D"}
|
|
@@ -50,15 +50,15 @@ export class Authenticator {
|
|
|
50
50
|
try {
|
|
51
51
|
const payload = await this.getSigner().verify(token);
|
|
52
52
|
const store = await this.store();
|
|
53
|
-
const
|
|
54
|
-
if (!
|
|
53
|
+
const town = await store.town.get(payload.town_id);
|
|
54
|
+
if (!town)
|
|
55
55
|
return { level: "guest" };
|
|
56
|
-
if (
|
|
56
|
+
if (town.status !== "active")
|
|
57
57
|
return { level: "guest" };
|
|
58
58
|
return {
|
|
59
59
|
level: "user",
|
|
60
60
|
user: { user_id: payload.user_id, metadata: payload.metadata ?? {} },
|
|
61
|
-
|
|
61
|
+
town,
|
|
62
62
|
};
|
|
63
63
|
}
|
|
64
64
|
catch {
|
|
@@ -90,22 +90,22 @@ export class Authenticator {
|
|
|
90
90
|
return this.authorize(await this.resolve(request), required);
|
|
91
91
|
}
|
|
92
92
|
/**
|
|
93
|
-
* 签发 user_token(验证
|
|
93
|
+
* 签发 user_token(验证 town 状态后签发)。
|
|
94
94
|
*
|
|
95
95
|
* @param input - token 创建参数
|
|
96
96
|
* @returns 签发结果(含 token 字符串)
|
|
97
97
|
*/
|
|
98
98
|
async createToken(input) {
|
|
99
99
|
const store = await this.store();
|
|
100
|
-
const
|
|
101
|
-
if (!
|
|
102
|
-
throw httpError(404, `Unknown
|
|
103
|
-
if (
|
|
104
|
-
throw httpError(403, `
|
|
100
|
+
const town = await store.town.get(input.town_id);
|
|
101
|
+
if (!town)
|
|
102
|
+
throw httpError(404, `Unknown town: ${input.town_id}`);
|
|
103
|
+
if (town.status !== "active")
|
|
104
|
+
throw httpError(403, `Town is not active: ${input.town_id}`);
|
|
105
105
|
const user_token = await this.getSigner().sign(input);
|
|
106
106
|
return {
|
|
107
107
|
user_token,
|
|
108
|
-
|
|
108
|
+
town_id: input.town_id,
|
|
109
109
|
user_id: input.user_id,
|
|
110
110
|
...(input.ttl
|
|
111
111
|
? { expires_at: new Date(Date.now() + TokenSigner.parseTTL(input.ttl) * 1000).toISOString() }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticator.js","sourceRoot":"","sources":["../../../src/core/auth/authenticator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAsC,MAAM,0BAA0B,CAAC;AAgBlG,YAAY;AACZ,MAAM,OAAO,aAAa;IAKd;IACA;IALV,yBAAyB;IACjB,WAAW,CAAe;IAElC,YACU,GAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"authenticator.js","sourceRoot":"","sources":["../../../src/core/auth/authenticator.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,8 @@ export class TokenSigner {
|
|
|
30
30
|
}
|
|
31
31
|
/** 签发 user_token */
|
|
32
32
|
async sign(input) {
|
|
33
|
-
if (!input || typeof input.
|
|
34
|
-
throw new TypeError("
|
|
33
|
+
if (!input || typeof input.town_id !== "string" || input.town_id.length === 0) {
|
|
34
|
+
throw new TypeError("town_id is required");
|
|
35
35
|
}
|
|
36
36
|
if (typeof input.user_id !== "string" || input.user_id.length === 0) {
|
|
37
37
|
throw new TypeError("user_id is required");
|
|
@@ -40,7 +40,7 @@ export class TokenSigner {
|
|
|
40
40
|
const now = Math.floor(Date.now() / 1000);
|
|
41
41
|
const payload = {
|
|
42
42
|
aud: "downcity:user",
|
|
43
|
-
|
|
43
|
+
town_id: input.town_id,
|
|
44
44
|
user_id: input.user_id,
|
|
45
45
|
metadata: input.metadata ?? {},
|
|
46
46
|
iat: now,
|
|
@@ -70,7 +70,7 @@ export class TokenSigner {
|
|
|
70
70
|
if (payload.aud !== "downcity:user") {
|
|
71
71
|
throw httpError(401, "Invalid user token audience");
|
|
72
72
|
}
|
|
73
|
-
if (!payload.
|
|
73
|
+
if (!payload.town_id || !payload.user_id) {
|
|
74
74
|
throw httpError(401, "Invalid user token payload");
|
|
75
75
|
}
|
|
76
76
|
return payload;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token-signer.js","sourceRoot":"","sources":["../../../src/core/auth/token-signer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,eAAe,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAGvJ,MAAM,OAAO,WAAW;IACb,UAAU,CAAS;IAE5B,qCAAqC;IAC7B,SAAS,CAAsB;IAEvC,YAAY,UAAkB;QAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED;;;;;OAKG;IACK,YAAY;QAClB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;YAClC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CACtC,KAAK,EACL,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAC/B,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,EACjC,KAAK,EACL,CAAC,MAAM,EAAE,QAAQ,CAAC,CACnB,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,oBAAoB;IACpB,KAAK,CAAC,IAAI,CAAC,KAA2B;QACpC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"token-signer.js","sourceRoot":"","sources":["../../../src/core/auth/token-signer.ts"],"names":[],"mappings":"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"}
|
package/bin/core/auth/types.d.ts
CHANGED
|
@@ -21,9 +21,9 @@ export interface RuntimeUser {
|
|
|
21
21
|
*/
|
|
22
22
|
export interface CreateUserTokenInput {
|
|
23
23
|
/**
|
|
24
|
-
* token 所属的
|
|
24
|
+
* token 所属的 Town ID。
|
|
25
25
|
*/
|
|
26
|
-
|
|
26
|
+
town_id: string;
|
|
27
27
|
/**
|
|
28
28
|
* token 所属的终端用户 ID。
|
|
29
29
|
*/
|
|
@@ -48,9 +48,9 @@ export interface UserTokenPayload {
|
|
|
48
48
|
*/
|
|
49
49
|
aud: "downcity:user";
|
|
50
50
|
/**
|
|
51
|
-
* token 所属
|
|
51
|
+
* token 所属 Town ID。
|
|
52
52
|
*/
|
|
53
|
-
|
|
53
|
+
town_id: string;
|
|
54
54
|
/**
|
|
55
55
|
* token 所属用户 ID。
|
|
56
56
|
*/
|
|
@@ -73,13 +73,13 @@ export interface UserTokenPayload {
|
|
|
73
73
|
*/
|
|
74
74
|
export interface UserTokenIssueResult {
|
|
75
75
|
/**
|
|
76
|
-
* 可交给
|
|
76
|
+
* 可交给 User City 使用的 token。
|
|
77
77
|
*/
|
|
78
78
|
user_token: string;
|
|
79
79
|
/**
|
|
80
|
-
* token 所属
|
|
80
|
+
* token 所属 Town ID。
|
|
81
81
|
*/
|
|
82
|
-
|
|
82
|
+
town_id: string;
|
|
83
83
|
/**
|
|
84
84
|
* token 所属用户 ID。
|
|
85
85
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/auth/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/auth/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEnC;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,GAAG,EAAE,eAAe,CAAC;IAErB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAEnC;;OAEG;IACH,GAAG,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* 并把 runtime 依赖注入到各个 service。
|
|
6
6
|
*/
|
|
7
7
|
import { type CityTableApi } from "../../store/table-api.js";
|
|
8
|
-
import {
|
|
8
|
+
import { TownStore } from "../../service/towns/town-store.js";
|
|
9
9
|
import { Authenticator } from "../auth/authenticator.js";
|
|
10
10
|
import type { Service } from "../../service/service.js";
|
|
11
11
|
import type { Runtime } from "../runtime.js";
|
|
@@ -22,8 +22,8 @@ export interface CityInitState {
|
|
|
22
22
|
};
|
|
23
23
|
/** 所有表 API 映射 */
|
|
24
24
|
table_map: Map<string, CityTableApi>;
|
|
25
|
-
/**
|
|
26
|
-
|
|
25
|
+
/** town store */
|
|
26
|
+
town_store: TownStore;
|
|
27
27
|
/** 鉴权器 */
|
|
28
28
|
authenticator: Authenticator;
|
|
29
29
|
}
|
|
@@ -37,9 +37,9 @@ export declare function initialize_city(params: {
|
|
|
37
37
|
services: Service[];
|
|
38
38
|
/** City ready 回调 */
|
|
39
39
|
require_ready: () => Promise<{
|
|
40
|
-
|
|
40
|
+
town: {
|
|
41
41
|
get(id: string): Promise<{
|
|
42
|
-
|
|
42
|
+
town_id: string;
|
|
43
43
|
status: string;
|
|
44
44
|
} | undefined>;
|
|
45
45
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-init.d.ts","sourceRoot":"","sources":["../../../src/core/base/base-init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAqC,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEhG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"base-init.d.ts","sourceRoot":"","sources":["../../../src/core/base/base-init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAqC,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEhG,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,qBAAqB;IACrB,QAAQ,EAAE,QAAQ,CAAC;IACnB,qBAAqB;IACrB,MAAM,EAAE;QAAE,OAAO,EAAE,QAAQ,CAAA;KAAE,CAAC;IAC9B,iBAAiB;IACjB,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACrC,iBAAiB;IACjB,UAAU,EAAE,SAAS,CAAC;IACtB,UAAU;IACV,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE;IAC5C,iBAAiB;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY;IACZ,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,oBAAoB;IACpB,aAAa,EAAE,MAAM,OAAO,CAAC;QAAE,IAAI,EAAE;YAAE,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,MAAM,EAAE,MAAM,CAAA;aAAE,GAAG,SAAS,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;CACvH,GAAG,OAAO,CAAC,aAAa,CAAC,CAuDzB"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
import { executeDDL } from "../../store/db.js";
|
|
8
8
|
import { TableApi, buildCreateUserTableSQL } from "../../store/table-api.js";
|
|
9
9
|
import { EnvStore } from "../../service/env/env-store.js";
|
|
10
|
-
import {
|
|
10
|
+
import { TownStore } from "../../service/towns/town-store.js";
|
|
11
11
|
import { Authenticator } from "../auth/authenticator.js";
|
|
12
12
|
import { randomSecret } from "../../utils/helpers.js";
|
|
13
13
|
/**
|
|
@@ -18,7 +18,7 @@ export async function initialize_city(params) {
|
|
|
18
18
|
const { database, client, env, builtinTables } = runtime;
|
|
19
19
|
const user_schema = collect_service_schemas(services);
|
|
20
20
|
const table_map = new Map();
|
|
21
|
-
table_map.set("
|
|
21
|
+
table_map.set("towns", new TableApi(database, builtinTables.towns));
|
|
22
22
|
table_map.set("env", new TableApi(database, builtinTables.env));
|
|
23
23
|
for (const [name, table] of Object.entries(user_schema)) {
|
|
24
24
|
table_map.set(name, new TableApi(database, table));
|
|
@@ -34,10 +34,10 @@ export async function initialize_city(params) {
|
|
|
34
34
|
throw new Error("City env table is not initialized");
|
|
35
35
|
const env_store = new EnvStore(env_table);
|
|
36
36
|
await env.attachStore(env_store);
|
|
37
|
-
const
|
|
38
|
-
if (!
|
|
39
|
-
throw new Error("City
|
|
40
|
-
const
|
|
37
|
+
const towns_table = table_map.get("towns");
|
|
38
|
+
if (!towns_table)
|
|
39
|
+
throw new Error("City towns table is not initialized");
|
|
40
|
+
const town_store = new TownStore(towns_table);
|
|
41
41
|
const configured_base_url = env.get("DOWNCITY_CITY_BASE_URL")
|
|
42
42
|
?? env.get("BETTER_AUTH_URL")
|
|
43
43
|
?? runtime.baseURL
|
|
@@ -49,7 +49,7 @@ export async function initialize_city(params) {
|
|
|
49
49
|
service._client = db_client;
|
|
50
50
|
service._authenticator = authenticator;
|
|
51
51
|
service._env = env;
|
|
52
|
-
service.
|
|
52
|
+
service._townStore = town_store;
|
|
53
53
|
service._raw = runtime.raw;
|
|
54
54
|
service._baseURL = configured_base_url ?? runtime.baseURL;
|
|
55
55
|
await service._onInit();
|
|
@@ -58,7 +58,7 @@ export async function initialize_city(params) {
|
|
|
58
58
|
database,
|
|
59
59
|
client: db_client,
|
|
60
60
|
table_map,
|
|
61
|
-
|
|
61
|
+
town_store,
|
|
62
62
|
authenticator,
|
|
63
63
|
};
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-init.js","sourceRoot":"","sources":["../../../src/core/base/base-init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,uBAAuB,EAAqB,MAAM,0BAA0B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,MAAM,gCAAgC,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"base-init.js","sourceRoot":"","sources":["../../../src/core/base/base-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,7 +28,7 @@ export async function build_city_instruction(services) {
|
|
|
28
28
|
}
|
|
29
29
|
return formatInstructionDocument({
|
|
30
30
|
base: {
|
|
31
|
-
builtin_services: ["env", "
|
|
31
|
+
builtin_services: ["env", "towns"],
|
|
32
32
|
loaded_modules: sections.map((item) => item.id),
|
|
33
33
|
},
|
|
34
34
|
sections,
|