@downcity/city 0.2.213 → 0.2.214
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/bin/federation/auth/federation-key-store.d.ts +7 -0
- package/bin/federation/auth/federation-key-store.d.ts.map +1 -1
- package/bin/federation/auth/federation-key-store.js +24 -5
- package/bin/federation/auth/federation-key-store.js.map +1 -1
- package/bin/federation/auth/key-schema.d.ts +9 -0
- package/bin/federation/auth/key-schema.d.ts.map +1 -1
- package/bin/federation/auth/key-schema.js +10 -0
- package/bin/federation/auth/key-schema.js.map +1 -1
- package/bin/federation/federation-init.d.ts.map +1 -1
- package/bin/federation/federation-init.js +29 -4
- package/bin/federation/federation-init.js.map +1 -1
- package/bin/federation/federation-runtime.js +7 -0
- package/bin/federation/federation-runtime.js.map +1 -1
- package/bin/federation/runtime.d.ts +6 -0
- package/bin/federation/runtime.d.ts.map +1 -1
- package/bin/service/env/env-store.d.ts +7 -0
- package/bin/service/env/env-store.d.ts.map +1 -1
- package/bin/service/env/env-store.js +23 -0
- package/bin/service/env/env-store.js.map +1 -1
- package/bin/store/db.d.ts +12 -1
- package/bin/store/db.d.ts.map +1 -1
- package/bin/store/db.js.map +1 -1
- package/bin/store/table-api.d.ts +3 -0
- package/bin/store/table-api.d.ts.map +1 -1
- package/bin/store/table-api.js +9 -0
- package/bin/store/table-api.js.map +1 -1
- package/package.json +1 -1
|
@@ -14,6 +14,13 @@ export declare class FederationKeyStore {
|
|
|
14
14
|
constructor(table: CityTableApi<FederationAuthKeyRecord>);
|
|
15
15
|
/** 确保 Federation 至少存在一把 active signing key。 */
|
|
16
16
|
ensure_active_key(): Promise<FederationAuthKeyRecord>;
|
|
17
|
+
/**
|
|
18
|
+
* 将历史遗留的多把 active key 确定性收敛为一把。
|
|
19
|
+
*
|
|
20
|
+
* 保留创建时间最早的 key；时间相同时按 key_id 排序。其余 key 转为 retired，继续
|
|
21
|
+
* 出现在 JWKS 中并可验证已签发 token，不会因自动修复导致存量会话失效。
|
|
22
|
+
*/
|
|
23
|
+
reconcile_active_keys(): Promise<FederationAuthKeyRecord | undefined>;
|
|
17
24
|
/** 读取当前唯一 active signing key。 */
|
|
18
25
|
get_active_key(): Promise<FederationAuthKeyRecord | undefined>;
|
|
19
26
|
/** 按 kid 读取可用于验签的密钥。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federation-key-store.d.ts","sourceRoot":"","sources":["../../../src/federation/auth/federation-key-store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,uBAAuB,EACvB,cAAc,EAEf,MAAM,YAAY,CAAC;AAEpB,8BAA8B;AAC9B,eAAO,MAAM,oBAAoB,EAAG,OAAgB,CAAC;AAErD,kCAAkC;AAClC,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY,CAAC,uBAAuB,CAAC;IAEzE,+CAA+C;IACzC,iBAAiB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAK3D,iCAAiC;IAC3B,cAAc,IAAI,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAQpE,wBAAwB;IAClB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAOxF,uBAAuB;IACjB,eAAe,IAAI,OAAO,CAAC,cAAc,CAAC;IAQhD,0CAA0C;YAC5B,iBAAiB;
|
|
1
|
+
{"version":3,"file":"federation-key-store.d.ts","sourceRoot":"","sources":["../../../src/federation/auth/federation-key-store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EACV,uBAAuB,EACvB,cAAc,EAEf,MAAM,YAAY,CAAC;AAEpB,8BAA8B;AAC9B,eAAO,MAAM,oBAAoB,EAAG,OAAgB,CAAC;AAErD,kCAAkC;AAClC,qBAAa,kBAAkB;IACjB,OAAO,CAAC,QAAQ,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY,CAAC,uBAAuB,CAAC;IAEzE,+CAA+C;IACzC,iBAAiB,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAK3D;;;;;OAKG;IACG,qBAAqB,IAAI,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAe3E,iCAAiC;IAC3B,cAAc,IAAI,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAQpE,wBAAwB;IAClB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,GAAG,SAAS,CAAC;IAOxF,uBAAuB;IACjB,eAAe,IAAI,OAAO,CAAC,cAAc,CAAC;IAQhD,0CAA0C;YAC5B,iBAAiB;CAkChC"}
|
|
@@ -19,6 +19,24 @@ export class FederationKeyStore {
|
|
|
19
19
|
const active_key = await this.get_active_key();
|
|
20
20
|
return active_key ?? this.create_active_key();
|
|
21
21
|
}
|
|
22
|
+
/**
|
|
23
|
+
* 将历史遗留的多把 active key 确定性收敛为一把。
|
|
24
|
+
*
|
|
25
|
+
* 保留创建时间最早的 key；时间相同时按 key_id 排序。其余 key 转为 retired，继续
|
|
26
|
+
* 出现在 JWKS 中并可验证已签发 token，不会因自动修复导致存量会话失效。
|
|
27
|
+
*/
|
|
28
|
+
async reconcile_active_keys() {
|
|
29
|
+
const rows = await this.table.select({ status: "active" });
|
|
30
|
+
if (rows.length <= 1)
|
|
31
|
+
return rows[0];
|
|
32
|
+
const [winner, ...duplicates] = [...rows].sort((left, right) => left.created_at.localeCompare(right.created_at) || left.key_id.localeCompare(right.key_id));
|
|
33
|
+
const retired_at = new Date().toISOString();
|
|
34
|
+
await Promise.all(duplicates.map((key) => this.table.update({
|
|
35
|
+
where: { key_id: key.key_id, status: "active" },
|
|
36
|
+
values: { status: "retired", retired_at },
|
|
37
|
+
})));
|
|
38
|
+
return winner;
|
|
39
|
+
}
|
|
22
40
|
/** 读取当前唯一 active signing key。 */
|
|
23
41
|
async get_active_key() {
|
|
24
42
|
const rows = await this.table.select({ status: "active" });
|
|
@@ -45,9 +63,6 @@ export class FederationKeyStore {
|
|
|
45
63
|
}
|
|
46
64
|
/** 生成并保存新的 active Ed25519 signing key。 */
|
|
47
65
|
async create_active_key() {
|
|
48
|
-
const existing = await this.get_active_key();
|
|
49
|
-
if (existing)
|
|
50
|
-
return existing;
|
|
51
66
|
const key_id = `key_${randomSecret(16)}`;
|
|
52
67
|
const key_pair = await generateKeyPair(USER_TOKEN_ALGORITHM, {
|
|
53
68
|
crv: "Ed25519",
|
|
@@ -74,8 +89,12 @@ export class FederationKeyStore {
|
|
|
74
89
|
created_at: new Date().toISOString(),
|
|
75
90
|
retired_at: "",
|
|
76
91
|
};
|
|
77
|
-
await this.table.
|
|
78
|
-
|
|
92
|
+
await this.table.insert_if_absent(record);
|
|
93
|
+
const active_key = await this.get_active_key();
|
|
94
|
+
if (!active_key) {
|
|
95
|
+
throw new Error("Federation failed to initialize an active user token signing key");
|
|
96
|
+
}
|
|
97
|
+
return active_key;
|
|
79
98
|
}
|
|
80
99
|
}
|
|
81
100
|
/** 将数据库 JSON 转成严格的公开 Ed25519 JWK。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federation-key-store.js","sourceRoot":"","sources":["../../../src/federation/auth/federation-key-store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAQtD,8BAA8B;AAC9B,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAgB,CAAC;AAErD,kCAAkC;AAClC,MAAM,OAAO,kBAAkB;IACA;IAA7B,YAA6B,KAA4C;QAA5C,UAAK,GAAL,KAAK,CAAuC;IAAG,CAAC;IAE7E,+CAA+C;IAC/C,KAAK,CAAC,iBAAiB;QACrB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAC/C,OAAO,UAAU,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAChD,CAAC;IAED,iCAAiC;IACjC,KAAK,CAAC,cAAc;QAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC3D,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;QACpF,CAAC;QACD,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,oBAAoB,CAAC,MAAc;QACvC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QACjD,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACvD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,uBAAuB;IACvB,KAAK,CAAC,eAAe;QACnB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI;aACd,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC;aACzC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC;QACvC,OAAO,EAAE,IAAI,EAAE,CAAC;IAClB,CAAC;IAED,0CAA0C;IAClC,KAAK,CAAC,iBAAiB;QAC7B,MAAM,
|
|
1
|
+
{"version":3,"file":"federation-key-store.js","sourceRoot":"","sources":["../../../src/federation/auth/federation-key-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,15 @@
|
|
|
4
4
|
* Federation 使用该系统表持久化 Ed25519 Key Ring。私钥只在服务端签发路径读取，
|
|
5
5
|
* 对外 JWKS 仅返回 public_jwk，避免产品后端获得签发能力。
|
|
6
6
|
*/
|
|
7
|
+
/** active user token signing key 的数据库唯一索引名称。 */
|
|
8
|
+
export declare const FEDERATION_ACTIVE_AUTH_KEY_INDEX = "federation_auth_keys_one_active";
|
|
9
|
+
/**
|
|
10
|
+
* 建立 active signing key 全局唯一约束。
|
|
11
|
+
*
|
|
12
|
+
* SQLite、Cloudflare D1 与 Postgres 都支持 partial unique index。以 status 作为索引列，
|
|
13
|
+
* 只索引 active 记录，从而允许任意数量的 retired/revoked key 继续承担历史 token 验签。
|
|
14
|
+
*/
|
|
15
|
+
export declare const CREATE_FEDERATION_ACTIVE_AUTH_KEY_INDEX_SQL: string;
|
|
7
16
|
/** Federation SQLite 签名密钥表。 */
|
|
8
17
|
export declare const sqlite_federation_auth_keys: import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
|
|
9
18
|
name: "federation_auth_keys";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key-schema.d.ts","sourceRoot":"","sources":["../../../src/federation/auth/key-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,+BAA+B;AAC/B,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAetC,CAAC;AAEH,iCAAiC;AACjC,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAelC,CAAC"}
|
|
1
|
+
{"version":3,"file":"key-schema.d.ts","sourceRoot":"","sources":["../../../src/federation/auth/key-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAOH,gDAAgD;AAChD,eAAO,MAAM,gCAAgC,oCAAoC,CAAC;AAElF;;;;;GAKG;AACH,eAAO,MAAM,2CAA2C,QAEoB,CAAC;AAE7E,+BAA+B;AAC/B,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAetC,CAAC;AAEH,iCAAiC;AACjC,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAelC,CAAC"}
|
|
@@ -7,6 +7,16 @@
|
|
|
7
7
|
import { pgTable, text as pgText } from "drizzle-orm/pg-core";
|
|
8
8
|
import { sqliteTable, text as sqliteText } from "drizzle-orm/sqlite-core";
|
|
9
9
|
const FEDERATION_AUTH_KEY_TABLE = "federation_auth_keys";
|
|
10
|
+
/** active user token signing key 的数据库唯一索引名称。 */
|
|
11
|
+
export const FEDERATION_ACTIVE_AUTH_KEY_INDEX = "federation_auth_keys_one_active";
|
|
12
|
+
/**
|
|
13
|
+
* 建立 active signing key 全局唯一约束。
|
|
14
|
+
*
|
|
15
|
+
* SQLite、Cloudflare D1 与 Postgres 都支持 partial unique index。以 status 作为索引列，
|
|
16
|
+
* 只索引 active 记录，从而允许任意数量的 retired/revoked key 继续承担历史 token 验签。
|
|
17
|
+
*/
|
|
18
|
+
export const CREATE_FEDERATION_ACTIVE_AUTH_KEY_INDEX_SQL = `CREATE UNIQUE INDEX IF NOT EXISTS "${FEDERATION_ACTIVE_AUTH_KEY_INDEX}" `
|
|
19
|
+
+ `ON "${FEDERATION_AUTH_KEY_TABLE}" ("status") WHERE "status" = 'active'`;
|
|
10
20
|
/** Federation SQLite 签名密钥表。 */
|
|
11
21
|
export const sqlite_federation_auth_keys = sqliteTable(FEDERATION_AUTH_KEY_TABLE, {
|
|
12
22
|
/** JWT protected header 使用的密钥 ID。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"key-schema.js","sourceRoot":"","sources":["../../../src/federation/auth/key-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1E,MAAM,yBAAyB,GAAG,sBAAsB,CAAC;AAEzD,+BAA+B;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,WAAW,CAAC,yBAAyB,EAAE;IAChF,qCAAqC;IACrC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;IACzC,6BAA6B;IAC7B,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;IAC5C,sCAAsC;IACtC,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC9C,qDAAqD;IACrD,WAAW,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;IAChD,gBAAgB;IAChB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;IACtC,cAAc;IACd,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC9C,gCAAgC;IAChC,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;CAC/C,CAAC,CAAC;AAEH,iCAAiC;AACjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC,yBAAyB,EAAE;IACxE,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;IACrC,6BAA6B;IAC7B,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;IACxC,sCAAsC;IACtC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC1C,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;IAC5C,gBAAgB;IAChB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;IAClC,cAAc;IACd,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC1C,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;CAC3C,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"key-schema.js","sourceRoot":"","sources":["../../../src/federation/auth/key-schema.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,IAAI,IAAI,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1E,MAAM,yBAAyB,GAAG,sBAAsB,CAAC;AAEzD,gDAAgD;AAChD,MAAM,CAAC,MAAM,gCAAgC,GAAG,iCAAiC,CAAC;AAElF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,2CAA2C,GACtD,sCAAsC,gCAAgC,IAAI;MACxE,OAAO,yBAAyB,wCAAwC,CAAC;AAE7E,+BAA+B;AAC/B,MAAM,CAAC,MAAM,2BAA2B,GAAG,WAAW,CAAC,yBAAyB,EAAE;IAChF,qCAAqC;IACrC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;IACzC,6BAA6B;IAC7B,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;IAC5C,sCAAsC;IACtC,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC9C,qDAAqD;IACrD,WAAW,EAAE,UAAU,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;IAChD,gBAAgB;IAChB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;IACtC,cAAc;IACd,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC9C,gCAAgC;IAChC,UAAU,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;CAC/C,CAAC,CAAC;AAEH,iCAAiC;AACjC,MAAM,CAAC,MAAM,uBAAuB,GAAG,OAAO,CAAC,yBAAyB,EAAE;IACxE,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE;IACrC,6BAA6B;IAC7B,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,EAAE;IACxC,sCAAsC;IACtC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC1C,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,EAAE;IAC5C,gBAAgB;IAChB,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE;IAClC,cAAc;IACd,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;IAC1C,gCAAgC;IAChC,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE;CAC3C,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federation-init.d.ts","sourceRoot":"","sources":["../../src/federation/federation-init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAqC,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"federation-init.d.ts","sourceRoot":"","sources":["../../src/federation/federation-init.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAqC,KAAK,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAMxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAK5C,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAEzD;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAClC,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,qBAAqB,CAAC,MAAM,EAAE;IAClD,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;IACtH,8BAA8B;IAC9B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAsF/B"}
|
|
@@ -10,6 +10,7 @@ import { EnvStore } from "../service/env/env-store.js";
|
|
|
10
10
|
import { CityStore } from "../service/cities/city-store.js";
|
|
11
11
|
import { Authenticator } from "./auth/authenticator.js";
|
|
12
12
|
import { FederationKeyStore } from "./auth/federation-key-store.js";
|
|
13
|
+
import { CREATE_FEDERATION_ACTIVE_AUTH_KEY_INDEX_SQL } from "./auth/key-schema.js";
|
|
13
14
|
import { UserTokenAuthority } from "./auth/user-token-authority.js";
|
|
14
15
|
import { BureauTokenStore } from "./auth/bureau-token-store.js";
|
|
15
16
|
import { randomSecret } from "../utils/helpers.js";
|
|
@@ -55,7 +56,7 @@ export async function initialize_federation(params) {
|
|
|
55
56
|
if (!auth_key_table)
|
|
56
57
|
throw new Error("Federation auth key table is not initialized");
|
|
57
58
|
const key_store = new FederationKeyStore(auth_key_table);
|
|
58
|
-
await key_store
|
|
59
|
+
await initialize_federation_auth_keys(key_store, db_client);
|
|
59
60
|
const token_authority = new UserTokenAuthority(key_store, `urn:downcity:federation:${federation_id}`);
|
|
60
61
|
const bureau_token_table = table_map.get("bureau_tokens");
|
|
61
62
|
if (!bureau_token_table)
|
|
@@ -112,15 +113,39 @@ function collect_service_schemas(services) {
|
|
|
112
113
|
async function bootstrap_default_keys(env) {
|
|
113
114
|
const admin_key = env.get("DOWNCITY_FEDERATION_ADMIN_SECRET_KEY") || `admin_${randomSecret()}`;
|
|
114
115
|
if (!env.get("DOWNCITY_FEDERATION_ADMIN_SECRET_KEY")) {
|
|
115
|
-
await env.
|
|
116
|
+
await env.ensure({ key: "DOWNCITY_FEDERATION_ADMIN_SECRET_KEY", value: admin_key });
|
|
116
117
|
}
|
|
117
118
|
const federation_id = env.get("DOWNCITY_FEDERATION_ID") || `fed_${randomSecret(16)}`;
|
|
118
119
|
if (!env.get("DOWNCITY_FEDERATION_ID")) {
|
|
119
|
-
await env.
|
|
120
|
+
await env.ensure({ key: "DOWNCITY_FEDERATION_ID", value: federation_id });
|
|
120
121
|
}
|
|
121
122
|
const better_auth_secret = env.get("BETTER_AUTH_SECRET") || `better_auth_${randomSecret()}${randomSecret()}`;
|
|
122
123
|
if (!env.get("BETTER_AUTH_SECRET")) {
|
|
123
|
-
await env.
|
|
124
|
+
await env.ensure({ key: "BETTER_AUTH_SECRET", value: better_auth_secret });
|
|
124
125
|
}
|
|
125
126
|
}
|
|
127
|
+
/**
|
|
128
|
+
* 初始化 Federation user token Key Ring 的数据库不变量。
|
|
129
|
+
*
|
|
130
|
+
* 关键说明（中文）
|
|
131
|
+
* - 先收敛旧版本可能留下的多 active 数据，再建立 partial unique index。
|
|
132
|
+
* - 新数据库建立索引后才生成首把 key，所有 Worker isolate 通过数据库约束竞争唯一胜者。
|
|
133
|
+
* - 重试覆盖滚动发布期间旧实例恰好插入 active key 的极短窗口。
|
|
134
|
+
*/
|
|
135
|
+
async function initialize_federation_auth_keys(key_store, db_client) {
|
|
136
|
+
const max_attempts = 3;
|
|
137
|
+
let last_error;
|
|
138
|
+
for (let attempt = 1; attempt <= max_attempts; attempt += 1) {
|
|
139
|
+
await key_store.reconcile_active_keys();
|
|
140
|
+
try {
|
|
141
|
+
await executeDDL(db_client, CREATE_FEDERATION_ACTIVE_AUTH_KEY_INDEX_SQL);
|
|
142
|
+
await key_store.ensure_active_key();
|
|
143
|
+
return;
|
|
144
|
+
}
|
|
145
|
+
catch (error) {
|
|
146
|
+
last_error = error;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
throw last_error;
|
|
150
|
+
}
|
|
126
151
|
//# sourceMappingURL=federation-init.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federation-init.js","sourceRoot":"","sources":["../../src/federation/federation-init.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"federation-init.js","sourceRoot":"","sources":["../../src/federation/federation-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -124,6 +124,13 @@ class DatabaseEnvProvider {
|
|
|
124
124
|
this.cache.set(entry.key, entry.value);
|
|
125
125
|
return entry;
|
|
126
126
|
}
|
|
127
|
+
async ensure(input) {
|
|
128
|
+
if (!this.store)
|
|
129
|
+
throw new Error("Env store is not ready");
|
|
130
|
+
const entry = await this.store.ensure(input);
|
|
131
|
+
this.cache.set(entry.key, entry.value);
|
|
132
|
+
return entry;
|
|
133
|
+
}
|
|
127
134
|
async remove(key) {
|
|
128
135
|
if (!this.store)
|
|
129
136
|
throw new Error("Env store is not ready");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"federation-runtime.js","sourceRoot":"","sources":["../../src/federation/federation-runtime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"federation-runtime.js","sourceRoot":"","sources":["../../src/federation/federation-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAEvF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAM1E;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAA0B;IAClE,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC1C,MAAM,cAAc,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAE7C,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,EAAE;QACpB,MAAM;QACN,GAAG,EAAE,IAAI,mBAAmB,EAAE;QAC9B,aAAa,EAAE,cAAc;QAC7B,GAAG,EAAE,OAAO,CAAC,EAAE,CAAC,OAAO;QACvB,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,kBAAkB,CAAC,OAAwB;IAClD,OAAO,OAAO,KAAK,IAAI;QACrB,CAAC,CAAC;YACE,MAAM,EAAE,QAAQ;YAChB,GAAG,EAAE,KAAK;YACV,oBAAoB,EAAE,uBAAuB;YAC7C,aAAa,EAAE,gBAAgB;SAChC;QACH,CAAC,CAAC;YACE,MAAM,EAAE,YAAY;YACpB,GAAG,EAAE,SAAS;YACd,oBAAoB,EAAE,2BAA2B;YACjD,aAAa,EAAE,oBAAoB;SACpC,CAAC;AACR,CAAC;AAED;;;;;;GAMG;AACH,SAAS,aAAa,CAAC,EAA0D;IAC/E,MAAM,YAAY,GAAI,EAAE,CAAC,OAA2D,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC;IAC9G,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC;QAAE,OAAO,QAAQ,CAAC;IAClD,IAAI,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1C,MAAM,SAAS,GAAG,EAAE,CAAC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC;IAC7C,IAAI,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,QAAQ,CAAC;IAClD,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,MAAM,IAAI,KAAK,CAAC,6FAA6F,CAAC,CAAC;AACjH,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CAAC,EAAyB;IAClD,MAAM,MAAM,GAAG,EAAE,CAAC,OAAO,CAAC;IAC1B,IAAI,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QACzC,OAAO,MAAkB,CAAC;IAC5B,CAAC;IACD,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QACjC,OAAO;YACL,MAAM,EAAE,CAAC,GAAW,EAAE,MAAkB,EAAE,EAAE,CACzC,MAAkE,CAAC,GAAG,EAAE,MAAM,CAAC;SACnF,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;AACnF,CAAC;AAED;;;;;;GAMG;AACH,MAAM,mBAAmB;IACf,KAAK,CAAY;IACR,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEnD,KAAK,CAAC,WAAW,CAAC,KAAe;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QACxB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACnB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;YACtD,GAAG;YACH,KAAK;YACL,MAAM,EAAE,UAAmB;SAC5B,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAqB;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAqB;QAChC,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACtB,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC3D,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;QAC5C,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAY;QACvB,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACxC,MAAM,MAAM,GAAe,EAAE,CAAC;QAC9B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
|
|
@@ -47,6 +47,12 @@ export interface EnvProvider {
|
|
|
47
47
|
* @param input - 环境变量键值
|
|
48
48
|
*/
|
|
49
49
|
upsert(input: EnvUpsertInput): Promise<EnvEntry>;
|
|
50
|
+
/**
|
|
51
|
+
* 仅在数据库不存在对应 key 时写入，并返回并发竞争后的数据库值。
|
|
52
|
+
*
|
|
53
|
+
* @param input - 环境变量默认键值
|
|
54
|
+
*/
|
|
55
|
+
ensure(input: EnvUpsertInput): Promise<EnvEntry>;
|
|
50
56
|
/**
|
|
51
57
|
* 删除环境变量。
|
|
52
58
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/federation/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,GAAG,cAAc,GAAG,UAAU,CAAC;AAMnD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAErC;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;OAEG;IACH,IAAI,IAAI,QAAQ,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEzC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEjD;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAMD;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU;IACV,MAAM,EAAE,QAAQ,CAAC;IACjB,YAAY;IACZ,GAAG,EAAE,QAAQ,CAAC;IACd,8CAA8C;IAC9C,oBAAoB,EAAE,QAAQ,CAAC;IAC/B,iCAAiC;IACjC,aAAa,EAAE,QAAQ,CAAC;CACzB;AAMD;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB;;;;OAIG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;OAIG;IACH,GAAG,EAAE,WAAW,CAAC;IAEjB;;;;OAIG;IACH,aAAa,EAAE,aAAa,CAAC;IAE7B;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B"}
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/federation/runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,+BAA+B;AAC/B,MAAM,MAAM,QAAQ,GAAG,cAAc,GAAG,UAAU,CAAC;AAMnD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAErC;;;;;;OAMG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;OAEG;IACH,IAAI,IAAI,QAAQ,EAAE,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAEzC;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEjD;;;;OAIG;IACH,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAEjD;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEnC;;;;OAIG;IACH,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IAE1C;;;;;OAKG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7C;AAMD;;;;;GAKG;AACH,MAAM,WAAW,aAAa;IAC5B,UAAU;IACV,MAAM,EAAE,QAAQ,CAAC;IACjB,YAAY;IACZ,GAAG,EAAE,QAAQ,CAAC;IACd,8CAA8C;IAC9C,oBAAoB,EAAE,QAAQ,CAAC;IAC/B,iCAAiC;IACjC,aAAa,EAAE,QAAQ,CAAC;CACzB;AAMD;;;;GAIG;AACH,MAAM,WAAW,OAAO;IACtB;;;;OAIG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,QAAQ,CAAC;IAEjB;;;;OAIG;IACH,GAAG,EAAE,WAAW,CAAC;IAEjB;;;;OAIG;IACH,aAAa,EAAE,aAAa,CAAC;IAE7B;;;OAGG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B"}
|
|
@@ -10,6 +10,13 @@ export declare class EnvStore {
|
|
|
10
10
|
constructor(table: CityTableApi<EnvEntry>);
|
|
11
11
|
list(): Promise<EnvEntry[]>;
|
|
12
12
|
upsert(input: EnvUpsertInput): Promise<EnvEntry>;
|
|
13
|
+
/**
|
|
14
|
+
* 原子确保 env key 存在，并返回数据库最终保存的值。
|
|
15
|
+
*
|
|
16
|
+
* 多个 Worker isolate 并发首次启动时，所有实例可能生成不同默认值。主键约束负责
|
|
17
|
+
* 选出唯一胜者，失败方随后读取胜出值，避免覆盖已经建立的 Federation 身份。
|
|
18
|
+
*/
|
|
19
|
+
ensure(input: EnvUpsertInput): Promise<EnvEntry>;
|
|
13
20
|
remove(key: string): Promise<void>;
|
|
14
21
|
}
|
|
15
22
|
//# sourceMappingURL=env-store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-store.d.ts","sourceRoot":"","sources":["../../../src/service/env/env-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE3D,qBAAa,QAAQ;IACP,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC;IAE3C,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI3B,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkBhD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC"}
|
|
1
|
+
{"version":3,"file":"env-store.d.ts","sourceRoot":"","sources":["../../../src/service/env/env-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE3D,qBAAa,QAAQ;IACP,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE,YAAY,CAAC,QAAQ,CAAC;IAE3C,IAAI,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAI3B,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkBtD;;;;;OAKG;IACG,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkBhD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAGzC"}
|
|
@@ -28,6 +28,29 @@ export class EnvStore {
|
|
|
28
28
|
}
|
|
29
29
|
return { key, value, source: "database" };
|
|
30
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* 原子确保 env key 存在，并返回数据库最终保存的值。
|
|
33
|
+
*
|
|
34
|
+
* 多个 Worker isolate 并发首次启动时，所有实例可能生成不同默认值。主键约束负责
|
|
35
|
+
* 选出唯一胜者，失败方随后读取胜出值，避免覆盖已经建立的 Federation 身份。
|
|
36
|
+
*/
|
|
37
|
+
async ensure(input) {
|
|
38
|
+
const key = normalizeEnvKey(input.key);
|
|
39
|
+
const value = String(input.value ?? "");
|
|
40
|
+
const now = new Date().toISOString();
|
|
41
|
+
await this.table.insert_if_absent({
|
|
42
|
+
key,
|
|
43
|
+
value,
|
|
44
|
+
source: "database",
|
|
45
|
+
created_at: now,
|
|
46
|
+
updated_at: now,
|
|
47
|
+
});
|
|
48
|
+
const rows = await this.table.select({ key });
|
|
49
|
+
const stored = rows[0];
|
|
50
|
+
if (!stored)
|
|
51
|
+
throw new Error(`Failed to initialize Federation env key: ${key}`);
|
|
52
|
+
return { key, value: stored.value, source: "database" };
|
|
53
|
+
}
|
|
31
54
|
async remove(key) {
|
|
32
55
|
await this.table.delete({ key: normalizeEnvKey(key) });
|
|
33
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-store.js","sourceRoot":"","sources":["../../../src/service/env/env-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,MAAM,OAAO,QAAQ;IACC;IAApB,YAAoB,KAA6B;QAA7B,UAAK,GAAL,KAAK,CAAwB;IAAG,CAAC;IAErD,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAqB;QAChC,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAuB,CAAC,CAAC;QAEnE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBACtB,KAAK,EAAE,EAAE,GAAG,EAAuB;gBACnC,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAuB;aAC7E,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAc,CAAC,CAAC;QAC5G,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EAAuB,CAAC,CAAC;IAC9E,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"env-store.js","sourceRoot":"","sources":["../../../src/service/env/env-store.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,MAAM,OAAO,QAAQ;IACC;IAApB,YAAoB,KAA6B;QAA7B,UAAK,GAAL,KAAK,CAAwB;IAAG,CAAC;IAErD,KAAK,CAAC,IAAI;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAqB;QAChC,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAuB,CAAC,CAAC;QAEnE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;gBACtB,KAAK,EAAE,EAAE,GAAG,EAAuB;gBACnC,MAAM,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAuB;aAC7E,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAc,CAAC,CAAC;QAC5G,CAAC;QAED,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC5C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,MAAM,CAAC,KAAqB;QAChC,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACxC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC;YAChC,GAAG;YACH,KAAK;YACL,MAAM,EAAE,UAAU;YAClB,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;SACJ,CAAC,CAAC;QAEf,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAuB,CAAC,CAAC;QACnE,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,GAAG,EAAE,CAAC,CAAC;QAChF,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACtB,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,EAAuB,CAAC,CAAC;IAC9E,CAAC;CACF"}
|
package/bin/store/db.d.ts
CHANGED
|
@@ -21,6 +21,16 @@ export interface DbClient {
|
|
|
21
21
|
/** 关闭连接（异步，可选） */
|
|
22
22
|
end?(): Promise<void>;
|
|
23
23
|
}
|
|
24
|
+
/**
|
|
25
|
+
* 支持冲突忽略语义的 Drizzle insert query。
|
|
26
|
+
*
|
|
27
|
+
* SQLite、D1 与 Postgres 的 insert builder 都实现该公共子集，供系统初始化执行
|
|
28
|
+
* 原子的“仅在不存在时插入”，避免跨 Worker isolate 的查询后写入竞态。
|
|
29
|
+
*/
|
|
30
|
+
interface InsertQuery extends PromiseLike<unknown> {
|
|
31
|
+
/** 唯一约束冲突时不写入，也不抛出冲突错误。 */
|
|
32
|
+
onConflictDoNothing(): PromiseLike<unknown>;
|
|
33
|
+
}
|
|
24
34
|
/**
|
|
25
35
|
* Drizzle select / insert / update / delete 的公共子集。
|
|
26
36
|
*
|
|
@@ -35,7 +45,7 @@ export interface Database {
|
|
|
35
45
|
};
|
|
36
46
|
};
|
|
37
47
|
insert(t: unknown): {
|
|
38
|
-
values(v: Record<string, unknown> | Record<string, unknown>[]):
|
|
48
|
+
values(v: Record<string, unknown> | Record<string, unknown>[]): InsertQuery;
|
|
39
49
|
};
|
|
40
50
|
update(t: unknown): {
|
|
41
51
|
set(v: Record<string, unknown>): {
|
|
@@ -58,4 +68,5 @@ export interface Database {
|
|
|
58
68
|
export declare function executeDDL(db: {
|
|
59
69
|
$client: DbClient;
|
|
60
70
|
}, ddl: string): Promise<void>;
|
|
71
|
+
export {};
|
|
61
72
|
//# sourceMappingURL=db.d.ts.map
|
package/bin/store/db.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/store/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAMvC;;;;;GAKG;AACH,MAAM,WAAW,QAAQ;IACvB,6DAA6D;IAC7D,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,wBAAwB;IACxB,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D,eAAe;IACf,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,kBAAkB;IAClB,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/store/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAMvC;;;;;GAKG;AACH,MAAM,WAAW,QAAQ;IACvB,6DAA6D;IAC7D,IAAI,CAAC,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,wBAAwB;IACxB,MAAM,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D,eAAe;IACf,KAAK,CAAC,IAAI,IAAI,CAAC;IACf,kBAAkB;IAClB,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB;AAYD;;;;;GAKG;AACH,UAAU,WAAY,SAAQ,WAAW,CAAC,OAAO,CAAC;IAChD,2BAA2B;IAC3B,mBAAmB,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;CAC7C;AAMD;;;;;;GAMG;AACH,MAAM,WAAW,QAAQ;IACvB,MAAM,IAAI;QAAE,IAAI,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,GAAG;YAAE,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC;IACvI,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG;QAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,WAAW,CAAA;KAAE,CAAC;IACpG,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG;QAAE,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;YAAE,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC;IACzG,MAAM,CAAC,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,CAAC;CACrE;AAMD;;;;;;;;GAQG;AACH,wBAAsB,UAAU,CAAC,EAAE,EAAE;IAAE,OAAO,EAAE,QAAQ,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAItF"}
|
package/bin/store/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/store/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/store/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAgEH,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAE9E;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAAyB,EAAE,GAAW;IACrE,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;IACrB,IAAI,OAAO,CAAC,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;QAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAAC,OAAO;IAAC,CAAC;IACjE,IAAI,OAAO,CAAC,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QAAC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAAC,CAAC;AAC/D,CAAC"}
|
package/bin/store/table-api.d.ts
CHANGED
|
@@ -16,6 +16,8 @@ export interface CityTableApi<TRow = Record<string, unknown>> {
|
|
|
16
16
|
select(where?: Partial<TRow>): Promise<TRow[]>;
|
|
17
17
|
/** 插入一行或多行数据 */
|
|
18
18
|
insert(values: Partial<TRow> | Partial<TRow>[]): Promise<void>;
|
|
19
|
+
/** 原子插入一行；命中任意唯一约束时保留数据库现有记录。 */
|
|
20
|
+
insert_if_absent(value: Partial<TRow>): Promise<void>;
|
|
19
21
|
/** 按 where 等值条件更新数据 */
|
|
20
22
|
update(input: {
|
|
21
23
|
where: Partial<TRow>;
|
|
@@ -31,6 +33,7 @@ export declare class TableApi implements CityTableApi {
|
|
|
31
33
|
constructor(db: Database, schema: AnySQLiteTable | AnyPgTable);
|
|
32
34
|
select(where?: Record<string, unknown>): Promise<Record<string, unknown>[]>;
|
|
33
35
|
insert(values: Record<string, unknown> | Record<string, unknown>[]): Promise<void>;
|
|
36
|
+
insert_if_absent(value: Record<string, unknown>): Promise<void>;
|
|
34
37
|
update(input: {
|
|
35
38
|
where: Record<string, unknown>;
|
|
36
39
|
values: Record<string, unknown>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-api.d.ts","sourceRoot":"","sources":["../../src/store/table-api.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAOxC,MAAM,WAAW,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1D,kBAAkB;IAClB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,0BAA0B;IAC1B,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAC;IAC7C,YAAY;IACZ,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,gBAAgB;IAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,uBAAuB;IACvB,MAAM,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChF,uBAAuB;IACvB,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/C;AAMD,qBAAa,QAAS,YAAW,YAAY;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAC;IAE7C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAW;gBAElB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAG,UAAU;IAMvD,MAAM,CAAC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAS/E,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF,MAAM,CAAC,KAAK,EAAE;QAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACjC,GAAG,OAAO,CAAC,MAAM,CAAC;IAWb,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAM9D;AA0BD,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,UAAU,GAAG,MAAM,CA4BlF"}
|
|
1
|
+
{"version":3,"file":"table-api.d.ts","sourceRoot":"","sources":["../../src/store/table-api.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAQ9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAOxC,MAAM,WAAW,YAAY,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1D,kBAAkB;IAClB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,0BAA0B;IAC1B,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAC;IAC7C,YAAY;IACZ,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAC/C,gBAAgB;IAChB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,iCAAiC;IACjC,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtD,uBAAuB;IACvB,MAAM,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChF,uBAAuB;IACvB,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/C;AAMD,qBAAa,QAAS,YAAW,YAAY;IAC3C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,cAAc,GAAG,UAAU,CAAC;IAE7C,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAW;gBAElB,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,GAAG,UAAU;IAMvD,MAAM,CAAC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAS/E,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAMlF,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/D,MAAM,CAAC,KAAK,EAAE;QAClB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KACjC,GAAG,OAAO,CAAC,MAAM,CAAC;IAWb,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;CAM9D;AA0BD,gBAAgB;AAChB,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,cAAc,GAAG,UAAU,GAAG,MAAM,CA4BlF"}
|
package/bin/store/table-api.js
CHANGED
|
@@ -31,6 +31,15 @@ export class TableApi {
|
|
|
31
31
|
throw new TypeError("insert() values cannot be empty");
|
|
32
32
|
await this.db.insert(this.schema).values(rows);
|
|
33
33
|
}
|
|
34
|
+
async insert_if_absent(value) {
|
|
35
|
+
if (Object.keys(value).length === 0) {
|
|
36
|
+
throw new TypeError("insert_if_absent() value cannot be empty");
|
|
37
|
+
}
|
|
38
|
+
await this.db
|
|
39
|
+
.insert(this.schema)
|
|
40
|
+
.values(value)
|
|
41
|
+
.onConflictDoNothing();
|
|
42
|
+
}
|
|
34
43
|
async update(input) {
|
|
35
44
|
if (Object.keys(input.values).length === 0) {
|
|
36
45
|
throw new TypeError("update() values cannot be empty");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table-api.js","sourceRoot":"","sources":["../../src/store/table-api.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EACL,eAAe,EACf,YAAY,EACZ,EAAE,EACF,GAAG,GAEJ,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"table-api.js","sourceRoot":"","sources":["../../src/store/table-api.ts"],"names":[],"mappings":"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"}
|