@downcity/services 0.1.71 → 0.1.83

package/bin/accounts/index.d.ts

@@ -194,8 +194,8 @@ export declare class AccountsService extends InstallableService {
                 }, {}, {
                     length: number | undefined;
                 }>;
-                town_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-                    name: "town_id";
+                city_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+                    name: "city_id";
                     tableName: "service_accounts_oauth_states";
                     dataType: "string";
                     columnType: "SQLiteText";

package/bin/accounts/index.js

@@ -41,7 +41,7 @@ export class AccountsService extends InstallableService {
         this.options = options;
         this.instruction = ({ actions }) => [
             "提供 Downcity 的账号、邮箱验证、GitHub/Google/WeChat OAuth 登录能力。",
-            "注册或登录时传入 town_id 后，接口会返回绑定该 town 的 City user_token。",
+            "注册或登录时传入 city_id 后，接口会返回绑定该 city 的 City user_token。",
             "OAuth 回调地址固定为 /v1/accounts/oauth/callback，服务会根据 City 公网地址生成完整回调 URL。",
             `当前暴露 ${actions.length} 个动作，常用流程是 register/login -> verify-email 或 oauth/start -> me。`,
         ].join("\n");
@@ -159,7 +159,7 @@ export class AccountsService extends InstallableService {
                         });
                     }
                     const userToken = await ctx.createUserToken({
-                        town_id: String(body.town_id ?? ""),
+                        city_id: String(body.city_id ?? ""),
                         user_id,
                         ttl: this.options.token_ttl,
                     });
@@ -201,7 +201,7 @@ export class AccountsService extends InstallableService {
                         });
                     }
                     const userToken = await ctx.createUserToken({
-                        town_id: String(body.town_id ?? ""),
+                        city_id: String(body.city_id ?? ""),
                         user_id,
                         ttl: this.options.token_ttl,
                     });
@@ -236,9 +236,9 @@ export class AccountsService extends InstallableService {
                 if (!config) {
                     return c.jsonResponse({ error: "provider not configured" }, 400);
                 }
-                const town_id = String(body.town_id ?? "").trim() || "town_downcity";
+                const city_id = String(body.city_id ?? "").trim() || "city_downcity";
                 const state = randomToken(24);
-                await this.createOAuthState(town_id, provider, state);
+                await this.createOAuthState(city_id, provider, state);
                 const url = buildOAuthAuthorizeURL(config, this.getOAuthCallbackURL(), state);
                 return c.jsonResponse({ url, state, provider });
             },
@@ -337,7 +337,7 @@ export class AccountsService extends InstallableService {
             const profile = await resolveOAuthProfile(provider, this.getOAuthProviderConfig(provider), code, this.getOAuthCallbackURL());
             const authUserId = await this.ensureOAuthAuthUser(profile, request);
             const result = await this._authenticator.createToken({
-                town_id: entry.town_id,
+                city_id: entry.city_id,
                 user_id: authUserId,
                 ttl: this.options.token_ttl,
             });
@@ -468,14 +468,14 @@ export class AccountsService extends InstallableService {
     /**
      * 创建 OAuth state。
      */
-    async createOAuthState(town_id, provider, state) {
-        await runPrepared(this.rawPrepare(`INSERT INTO ${ACCOUNTS_OAUTH_STATE_TABLE} (state, town_id, provider, user_token, created_at) VALUES (?, ?, ?, ?, ?)`), [state, town_id, provider, "", Date.now()]);
+    async createOAuthState(city_id, provider, state) {
+        await runPrepared(this.rawPrepare(`INSERT INTO ${ACCOUNTS_OAUTH_STATE_TABLE} (state, city_id, provider, user_token, created_at) VALUES (?, ?, ?, ?, ?)`), [state, city_id, provider, "", Date.now()]);
     }
     /**
      * 读取 OAuth state。
      */
     async readOAuthState(state) {
-        const row = await readPreparedFirst(this.rawPrepare(`SELECT state, town_id, provider, user_token, created_at FROM ${ACCOUNTS_OAUTH_STATE_TABLE} WHERE state = ?`), [state]);
+        const row = await readPreparedFirst(this.rawPrepare(`SELECT state, city_id, provider, user_token, created_at FROM ${ACCOUNTS_OAUTH_STATE_TABLE} WHERE state = ?`), [state]);
         if (!row)
             return null;
         if (Date.now() - Number(row.created_at) > OAUTH_STATE_TTL_MS) {

package/bin/accounts/schema.d.ts

@@ -73,9 +73,9 @@ export interface AccountsOAuthStateRow extends Record<string, unknown> {
      */
     state: string;
     /**
-     * 登录成功后要签发到哪个 town。
+     * 登录成功后要签发到哪个 city。
      */
-    town_id: string;
+    city_id: string;
     /**
      * 第三方 provider 标识。
      */
@@ -255,8 +255,8 @@ export declare const accountsOAuthStates: import("drizzle-orm/sqlite-core").SQLi
         }, {}, {
             length: number | undefined;
         }>;
-        town_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-            name: "town_id";
+        city_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "city_id";
             tableName: "service_accounts_oauth_states";
             dataType: "string";
             columnType: "SQLiteText";

package/bin/accounts/schema.js

@@ -69,9 +69,9 @@ export const accountsOAuthStates = sqliteTable(ACCOUNTS_OAUTH_STATE_TABLE, {
      */
     state: text("state").primaryKey(),
     /**
-     * 登录成功后要签发到哪个 town。
+     * 登录成功后要签发到哪个 city。
      */
-    town_id: text("town_id").notNull(),
+    city_id: text("city_id").notNull(),
     /**
      * provider 标识。
      */

package/bin/balance/service.d.ts

@@ -2,7 +2,7 @@
  * Downcity 官方 Balance 服务实现。
  *
  * 设计边界：
- * - 余额是用户级全局钱包，不与 town 绑定
+ * - 余额是用户级全局钱包，不与 city 绑定
  * - 服务只负责账户、流水、充值单、redeem_code 与原子加减款
  * - 真正的计费策略应由业务方在 hook 中直接调用本服务
  */

package/bin/balance/service.js

@@ -2,7 +2,7 @@
  * Downcity 官方 Balance 服务实现。
  *
  * 设计边界：
- * - 余额是用户级全局钱包，不与 town 绑定
+ * - 余额是用户级全局钱包，不与 city 绑定
  * - 服务只负责账户、流水、充值单、redeem_code 与原子加减款
  * - 真正的计费策略应由业务方在 hook 中直接调用本服务
  */

package/bin/usage/service.d.ts

@@ -42,8 +42,8 @@ export declare const usageEvents: import("drizzle-orm/sqlite-core").SQLiteTableW
         }, {}, {
             length: number | undefined;
         }>;
-        town_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-            name: "town_id";
+        city_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+            name: "city_id";
             tableName: "service_usage_events";
             dataType: "string";
             columnType: "SQLiteText";
@@ -210,8 +210,8 @@ export declare class UsageService extends InstallableService {
                 }, {}, {
                     length: number | undefined;
                 }>;
-                town_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
-                    name: "town_id";
+                city_id: import("drizzle-orm/sqlite-core").SQLiteColumn<{
+                    name: "city_id";
                     tableName: "service_usage_events";
                     dataType: "string";
                     columnType: "SQLiteText";

package/bin/usage/service.js

@@ -11,7 +11,7 @@ import { InstallableService } from "@downcity/city";
  */
 export const usageEvents = sqliteTable("service_usage_events", {
     event_id: text("event_id").primaryKey(),
-    town_id: text("town_id").notNull(),
+    city_id: text("city_id").notNull(),
     user_id: text("user_id").notNull(),
     service: text("service").notNull(),
     model_id: text("model_id").notNull(),
@@ -77,7 +77,7 @@ export class UsageService extends InstallableService {
                 return requestCtx.jsonResponse({
                     items: await events.select({
                         user_id: requestCtx.user?.user_id ?? "",
-                        town_id: requestCtx.town?.town_id ?? "",
+                        city_id: requestCtx.city?.city_id ?? "",
                     }),
                 });
             },
@@ -87,11 +87,11 @@ export class UsageService extends InstallableService {
 /**
  * 只记录真实用户侧调用。
  *
- * 管理端操作没有 user/town 上下文，usage 服务自己的查询也不应反过来
+ * 管理端操作没有 user/city 上下文，usage 服务自己的查询也不应反过来
  * 产生 usage 事件，否则统计接口会污染自身结果。
  */
 function shouldRecordUsage(ctx) {
-    return Boolean(ctx.user?.user_id && ctx.town?.town_id && ctx.service?.id !== "usage");
+    return Boolean(ctx.user?.user_id && ctx.city?.city_id && ctx.service?.id !== "usage");
 }
 /**
  * 创建 usage 事件记录。
@@ -99,7 +99,7 @@ function shouldRecordUsage(ctx) {
 function createUsageEvent(ctx, status) {
     return {
         event_id: `usage_${randomId()}`,
-        town_id: ctx.town?.town_id ?? "",
+        city_id: ctx.city?.city_id ?? "",
         user_id: ctx.user?.user_id ?? "",
         service: ctx.service?.id ?? "",
         model_id: ctx.variant?.id ?? "",
@@ -119,12 +119,12 @@ function createUsageEvent(ctx, status) {
 function summarizeUsage(rows) {
     const byKey = new Map();
     for (const row of rows) {
-        const key = `${row.town_id}\u0000${row.service}\u0000${row.status}`;
-        const current = byKey.get(key) ?? { town_id: row.town_id, service: row.service, status: row.status, count: 0 };
+        const key = `${row.city_id}\u0000${row.service}\u0000${row.status}`;
+        const current = byKey.get(key) ?? { city_id: row.city_id, service: row.service, status: row.status, count: 0 };
         current.count += 1;
         byKey.set(key, current);
     }
-    return [...byKey.values()].sort((a, b) => `${a.town_id}:${a.service}:${a.status}`.localeCompare(`${b.town_id}:${b.service}:${b.status}`));
+    return [...byKey.values()].sort((a, b) => `${a.city_id}:${a.service}:${a.status}`.localeCompare(`${b.city_id}:${b.service}:${b.status}`));
 }
 /**
  * 生成随机 ID（兼容 Node 和 Workers）。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downcity/services",
-  "version": "0.1.71",
+  "version": "0.1.83",
   "description": "Downcity public services package for accounts, balance, usage, Stripe, Creem, Dodo, and Waffo payment flows.",
   "type": "module",
   "main": "./bin/index.js",
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@waffo/pancake-ts": "^0.11.0",
-    "@downcity/city": "0.2.80",
+    "@downcity/city": "0.2.92",
     "better-auth": "^1.6.12",
     "dodopayments": "^2.36.0",
     "drizzle-orm": "^0.45.2"