weifuwu 0.80.0 → 0.81.0

package/dist/index.js

@@ -1466,6 +1466,8 @@ function redirect(url, status = 302) {
 // src/user/index.ts
 var USERS_TABLE = "_weifuwu_users";
 var SESSIONS_TABLE = "_weifuwu_sessions";
+var APP_TABLE = "_weifuwu_apps";
+var MEMBER_TABLE = "_weifuwu_app_members";
 function normalizeEmail(email2) {
   return email2.trim().toLowerCase();
 }
@@ -1484,24 +1486,54 @@ function userSystem(options) {
   const accessTtlSeconds = options.accessTtlSeconds ?? 3600;
   const refreshTtlDays = options.refreshTtlDays ?? 30;
   const prefix = options.prefix ?? "/api/auth";
+  const INVITE_TTL_SECONDS = 7 * 24 * 3600;
   let currentUser = null;
   async function findUserById(id) {
     const rows = await sql.query.from(USERS_TABLE).select("id", "email", "name", "role", "tenant").where({ id }).run();
     return rows.length ? rows[0] : null;
   }
-  async function issueSession(user) {
+  async function findMemberRole(appId, userId) {
+    const rows = await sql.query.from(MEMBER_TABLE).select("role").where({ app_id: appId, user_id: userId }).run();
+    return rows.length ? String(rows[0].role) : null;
+  }
+  async function findAppIdBySlug(slug) {
+    const rows = await sql.query.from(APP_TABLE).select("id").where({ slug }).run();
+    return rows.length ? String(rows[0].id) : null;
+  }
+  async function listAppsFor(userId) {
+    const rows = await sql.query.from(MEMBER_TABLE).select("app_id", "role").where({ user_id: userId }).run();
+    if (!rows.length) return [];
+    const out = [];
+    for (const r of rows) {
+      const apps = await sql.query.from(APP_TABLE).select("id", "slug", "name").where({ id: String(r.app_id) }).run();
+      if (apps.length) {
+        out.push({ id: String(apps[0].id), slug: String(apps[0].slug), name: String(apps[0].name), role: String(r.role) });
+      }
+    }
+    return out;
+  }
+  async function issueSession(user, session) {
     const token = signToken(
-      { sub: user.id, ...user.tenant ? { tenantId: user.tenant } : {} },
+      {
+        sub: user.id,
+        ...session?.appId ? { appId: session.appId, role: session.role } : {},
+        ...!session?.appId && user.tenant ? { tenantId: user.tenant } : {}
+      },
       secret,
       accessTtlSeconds
     );
     const refreshToken = generateRefreshToken();
     const expiresAt = new Date(Date.now() + refreshTtlDays * 24 * 3600 * 1e3);
-    await sql.query.insert(SESSIONS_TABLE).values({ token_hash: hashRefreshToken(refreshToken), user_id: user.id, expires_at: expiresAt }).run();
+    await sql.query.insert(SESSIONS_TABLE).values({
+      token_hash: hashRefreshToken(refreshToken),
+      user_id: user.id,
+      expires_at: expiresAt,
+      ...session?.appId ? { app_id: session.appId } : {}
+    }).run();
     return { token, refreshToken };
   }
   async function consumeRefreshToken(refreshToken) {
-    const rows = await sql.query.from(`${SESSIONS_TABLE} s`).select("s.user_id", "s.expires_at").where({ "s.token_hash": hashRefreshToken(refreshToken), "s.revoked_at": { isNull: true } }).run();
+    const rows = await sql.query.from(`${SESSIONS_TABLE} s`).select("s.user_id", "s.expires_at", "s.app_id").where({ "s.token_hash": hashRefreshToken(refreshToken), "s.revoked_at": { isNull: true } }).run();
     if (!rows.length) throw new HttpError("Invalid refresh token", 401);
     const row = rows[0];
     if (new Date(row.expires_at) < /* @__PURE__ */ new Date()) {
@@ -1509,12 +1541,13 @@ function userSystem(options) {
     }
     const user = await findUserById(row.user_id);
     if (!user) throw new HttpError("User not found", 401);
-    return user;
+    return { user, appId: row.app_id ? String(row.app_id) : void 0 };
   }
   const mw = (async (req, ctx, next) => {
     currentUser = null;
     const sessionPayload = {};
     let payloadTenantId;
+    let payloadAppId;
     const authHeader = req.headers.get("authorization");
     if (authHeader?.startsWith("Bearer ")) {
       const payload = verifyToken(authHeader.slice(7), secret);
@@ -1526,9 +1559,11 @@ function userSystem(options) {
         }
         sessionPayload.userId = String(payload.sub);
         payloadTenantId = payload.tenantId;
+        payloadAppId = payload.appId;
       }
     }
     ctx.user = currentUser;
+    if (payloadAppId != null) ctx.appId = String(payloadAppId);
     if (payloadTenantId != null) ctx.tenantId = String(payloadTenantId);
     ctx.auth = {
       // ── 会话 payload 字段（来自 token，应用层签发时决定带什么） ──
@@ -1547,6 +1582,7 @@ function userSystem(options) {
         }).returning("id", "email", "name", "role", "tenant").run();
         const user = rows[0];
         const session = await issueSession(user);
+        currentUser = user;
         return { ...session, user };
       },
       async login(email2, password) {
@@ -1563,7 +1599,9 @@ function userSystem(options) {
           tenant: row.tenant
         };
         const session = await issueSession(user);
-        return { ...session, user };
+        const apps = await listAppsFor(user.id);
+        currentUser = user;
+        return { ...session, user, apps };
       },
       async logout(refreshToken) {
         await sql.query.update(SESSIONS_TABLE).set({ revoked_at: sql.raw`now()` }).where({ token_hash: hashRefreshToken(refreshToken) }).run();
@@ -1579,6 +1617,115 @@ function userSystem(options) {
       },
       createToken(type, payload, opts) {
         return signToken({ type, ...payload }, secret, opts.ttlSeconds);
+      },
+      // ── 应用三层模型 ──
+      async createApp(input) {
+        if (!currentUser) throw new HttpError("Unauthorized", 401);
+        if (!input.slug || !input.name) throw new HttpError("slug and name are required", 400);
+        const slug = input.slug.trim().toLowerCase();
+        const rows = await sql.query.insert(APP_TABLE).values({
+          slug,
+          name: input.name,
+          owner_user_id: currentUser.id,
+          open_registration: input.openRegistration ?? false
+        }).returning("id", "slug", "name", "owner_user_id", "open_registration").run();
+        const appInfo = rows[0];
+        await sql.query.insert(MEMBER_TABLE).values({ app_id: appInfo.id, user_id: currentUser.id, role: "owner", invited_by: currentUser.id }).run();
+        return appInfo;
+      },
+      async registerInApp(input) {
+        if (!input.email || !input.password) throw new HttpError("email and password are required", 400);
+        if (input.password.length < 8) throw new HttpError("password must be at least 8 characters", 400);
+        const appRows = await sql.query.from(APP_TABLE).select("id", "open_registration").where({ slug: input.appSlug }).run();
+        if (!appRows.length) throw new HttpError("Application not found", 404);
+        const appRow = appRows[0];
+        const appId = String(appRow.id);
+        const email2 = normalizeEmail(input.email);
+        let role = "member";
+        if (!appRow.open_registration) {
+          if (!input.inviteToken) throw new HttpError("Registration closed for this application", 403);
+          const inv = verifyToken(input.inviteToken, secret);
+          if (!inv || inv.type !== "app-invite" || inv.appId !== appId) {
+            throw new HttpError("Invalid invite", 403);
+          }
+          if (inv.email && String(inv.email) !== email2) throw new HttpError("Invite email mismatch", 403);
+          if (typeof inv.role === "string" && inv.role !== "owner") role = inv.role;
+        }
+        let user;
+        const existing = await sql.query.from(USERS_TABLE).select("id", "email", "name", "role", "tenant").where({ email: email2 }).run();
+        if (existing.length) {
+          user = existing[0];
+        } else {
+          const passwordHash = await hashPassword(input.password);
+          const rows = await sql.query.insert(USERS_TABLE).values({
+            email: email2,
+            password_hash: passwordHash,
+            name: input.name ?? null,
+            role: null,
+            tenant: null
+          }).returning("id", "email", "name", "role", "tenant").run();
+          user = rows[0];
+        }
+        const member = await findMemberRole(appId, user.id);
+        if (!member) {
+          await sql.query.insert(MEMBER_TABLE).values({ app_id: appId, user_id: user.id, role, invited_by: currentUser?.id ?? null }).run();
+        }
+        const session = await issueSession(user, { appId, role });
+        currentUser = user;
+        return { ...session, user };
+      },
+      async loginApp(appSlug, email2, password) {
+        const appRows = await sql.query.from(APP_TABLE).select("id").where({ slug: appSlug }).run();
+        if (!appRows.length) throw new HttpError("Application not found", 404);
+        const appId = String(appRows[0].id);
+        const rows = await sql.query.from(USERS_TABLE).select("id", "email", "password_hash", "name", "role", "tenant").where({ email: normalizeEmail(email2) }).run();
+        const row = rows[0];
+        if (!row) throw new HttpError("Invalid email or password", 401);
+        const valid = await verifyPassword(password, String(row.password_hash));
+        if (!valid) throw new HttpError("Invalid email or password", 401);
+        const role = await findMemberRole(appId, String(row.id));
+        if (!role) throw new HttpError("Not a member of this application", 401);
+        const user = {
+          id: String(row.id),
+          email: String(row.email),
+          name: row.name,
+          role: row.role,
+          tenant: row.tenant
+        };
+        const session = await issueSession(user, { appId, role });
+        currentUser = user;
+        return { ...session, user };
+      },
+      async createInvite(appId, opts) {
+        if (!currentUser) throw new HttpError("Unauthorized", 401);
+        const role = await findMemberRole(appId, currentUser.id);
+        if (role !== "owner") throw new HttpError("Owner only", 403);
+        const inviteRole = opts.role && opts.role !== "owner" ? opts.role : "member";
+        const inviteToken = signToken(
+          { type: "app-invite", appId, ...opts.email ? { email: normalizeEmail(opts.email) } : {}, role: inviteRole },
+          secret,
+          INVITE_TTL_SECONDS
+        );
+        return { inviteToken };
+      },
+      async addMember(appId, email2, role) {
+        if (!currentUser) throw new HttpError("Unauthorized", 401);
+        const callerRole = await findMemberRole(appId, currentUser.id);
+        if (callerRole !== "owner") throw new HttpError("Owner only", 403);
+        const target = await sql.query.from(USERS_TABLE).select("id").where({ email: normalizeEmail(email2) }).run();
+        if (!target.length) throw new HttpError("User not found \u2014 invite them to register first", 400);
+        const memberRole = role && role !== "owner" ? role : "member";
+        await sql.query.insert(MEMBER_TABLE).values({ app_id: appId, user_id: String(target[0].id), role: memberRole, invited_by: currentUser.id }).run();
+      },
+      async listMyApps() {
+        if (!currentUser) throw new HttpError("Unauthorized", 401);
+        return listAppsFor(currentUser.id);
+      },
+      async requireApp(appId) {
+        if (!currentUser) throw new HttpError("Unauthorized", 401);
+        const role = await findMemberRole(appId, currentUser.id);
+        if (!role) throw new HttpError("Not a member of this application", 403);
+        return { userId: currentUser.id, appId, role };
       }
     };
     return next(req, ctx);
@@ -1601,11 +1748,33 @@ function userSystem(options) {
       CREATE TABLE IF NOT EXISTS ${SESSIONS_TABLE} (
         token_hash TEXT PRIMARY KEY,
         user_id UUID NOT NULL REFERENCES ${USERS_TABLE}(id) ON DELETE CASCADE,
+        app_id TEXT,
         expires_at TIMESTAMPTZ NOT NULL,
         revoked_at TIMESTAMPTZ,
         created_at TIMESTAMPTZ NOT NULL DEFAULT now()
       )
     `);
+    await sql.unsafe(`ALTER TABLE ${SESSIONS_TABLE} ADD COLUMN IF NOT EXISTS app_id TEXT`);
+    await sql.unsafe(`
+      CREATE TABLE IF NOT EXISTS ${APP_TABLE} (
+        id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+        slug TEXT NOT NULL UNIQUE,
+        name TEXT NOT NULL,
+        owner_user_id UUID NOT NULL REFERENCES ${USERS_TABLE}(id) ON DELETE CASCADE,
+        open_registration BOOLEAN NOT NULL DEFAULT false,
+        created_at TIMESTAMPTZ NOT NULL DEFAULT now()
+      )
+    `);
+    await sql.unsafe(`
+      CREATE TABLE IF NOT EXISTS ${MEMBER_TABLE} (
+        app_id UUID NOT NULL REFERENCES ${APP_TABLE}(id) ON DELETE CASCADE,
+        user_id UUID NOT NULL REFERENCES ${USERS_TABLE}(id) ON DELETE CASCADE,
+        role TEXT NOT NULL DEFAULT 'member',
+        invited_by UUID,
+        joined_at TIMESTAMPTZ NOT NULL DEFAULT now(),
+        PRIMARY KEY (app_id, user_id)
+      )
+    `);
   };
   mw.routes = (app, routeOpts) => {
     const p = routeOpts?.prefix ?? prefix;
@@ -1630,15 +1799,57 @@ function userSystem(options) {
     if (!excluded.has("refresh")) app.post(`${p}/refresh`, async (req, ctx) => {
       const body = await req.json().catch(() => ({}));
       if (!body.refreshToken) throw new HttpError("refreshToken is required", 400);
-      const user = await consumeRefreshToken(body.refreshToken);
+      const { user, appId } = await consumeRefreshToken(body.refreshToken);
       await ctx.auth.logout(body.refreshToken);
-      const session = await issueSession(user);
+      const session = await issueSession(user, appId ? { appId } : void 0);
       return ok({ ...session, user });
     });
     if (!excluded.has("me")) app.get(`${p}/me`, async (_req, ctx) => {
       if (!ctx.user) throw new HttpError("Unauthorized", 401);
       return ok(ctx.user);
     });
+    if (!excluded.has("apps")) {
+      app.post(`${p}/apps`, async (req, ctx) => {
+        const body = await req.json().catch(() => ({}));
+        const appInfo = await ctx.auth.createApp(body);
+        return created({ app: appInfo });
+      });
+      app.get(`${p}/apps`, async (_req, ctx) => {
+        const apps = await ctx.auth.listMyApps();
+        return ok({ apps });
+      });
+      app.post(`${p}/apps/:appSlug/members`, async (req, ctx) => {
+        const body = await req.json().catch(() => ({}));
+        const appId = await findAppIdBySlug(ctx.params.appSlug);
+        if (!appId) throw new HttpError("Application not found", 404);
+        await ctx.auth.addMember(appId, body.email ?? "", body.role);
+        return created({ ok: true });
+      });
+      app.post(`${p}/apps/:appSlug/invites`, async (req, ctx) => {
+        const body = await req.json().catch(() => ({}));
+        const appId = await findAppIdBySlug(ctx.params.appSlug);
+        if (!appId) throw new HttpError("Application not found", 404);
+        const result = await ctx.auth.createInvite(appId, { email: body.email, role: body.role });
+        return created(result);
+      });
+      app.post(`${p}/apps/:appSlug/login`, async (req, ctx) => {
+        const body = await req.json().catch(() => ({}));
+        if (!body.email || !body.password) return badRequest("email and password are required");
+        const result = await ctx.auth.loginApp(ctx.params.appSlug, body.email, body.password);
+        return ok(result);
+      });
+      app.post(`${p}/apps/:appSlug/register`, async (req, ctx) => {
+        const body = await req.json().catch(() => ({}));
+        const result = await ctx.auth.registerInApp({
+          appSlug: ctx.params.appSlug,
+          email: body.email ?? "",
+          password: body.password ?? "",
+          name: body.name,
+          inviteToken: body.inviteToken
+        });
+        return created(result);
+      });
+    }
   };
   return mw;
 }

package/dist/ui-dom/Confirm.d.ts

@@ -1,7 +1,7 @@
 /**
  * weifuwu/ui-dom — Confirm（命令式中间件）
  *
- * v1 退役（design/render-only-plan.md）：实现已收敛到 components/Confirm（vdom 引擎，
+ * v1 退役（design 归档）：实现已收敛到 components/Confirm（vdom 引擎，
  * mountCommand + render-only）。本文件保留为公开 API 兼容入口。
  */
 export { Confirm, confirm } from '../components/Confirm/Confirm.ts';

package/dist/ui-dom/Notification.d.ts

@@ -1,7 +1,7 @@
 /**
  * weifuwu/ui-dom — Notification（命令式中间件）
  *
- * v1 退役（design/render-only-plan.md）：实现已收敛到 components/Notification（vdom 引擎，
+ * v1 退役（design 归档）：实现已收敛到 components/Notification（vdom 引擎，
  * mountCommand + render-only）。本文件保留为公开 API 兼容入口。
  */
 export { Notification, notification } from '../components/Notification/Notification.ts';

package/dist/ui-dom/Toast.d.ts

@@ -1,7 +1,7 @@
 /**
  * weifuwu/ui-dom — Toast（命令式中间件）
  *
- * v1 退役（design/render-only-plan.md）：实现已收敛到 components/Toast（vdom 引擎，
+ * v1 退役（design 归档）：实现已收敛到 components/Toast（vdom 引擎，
  * mountCommand + render-only）。本文件保留为公开 API 兼容入口。
  */
 export { Toast, toast } from '../components/Toast/Toast.ts';

package/dist/ui-dom/hooks/chat.d.ts

@@ -1,7 +1,7 @@
 /**
  * hooks/chat — AI 对话会话（useChat）
  *
- * 会话语义 + 工具调用内嵌 + HITL 审批。render-only 方案（design/render-only-plan.md）：
+ * 会话语义 + 工具调用内嵌 + HITL 审批。render-only 方案（design 归档）：
  * state 是**普通对象**（不再挂组件 $），变化 → notify → 订阅者重渲染；
  * handle 带 subscribe——共享会话的子组件用 ctx.ui.useExternal(handle) 订阅。
  */

package/dist/ui-dom/hooks/external.d.ts

@@ -1,5 +1,5 @@
 /**
- * useExternal — 订阅共享状态（render-only 共享原语，见 design/render-only-plan.md）
+ * useExternal — 订阅共享状态（render-only 共享原语，见 design 归档）
  *
  * 与 useInView/useScrollPosition 同构（mount 阶段注册，生命周期框架管）：
  * - mount 注册：订阅 store（任何变化 → 自身重渲染）

package/dist/ui-dom/index.d.ts

@@ -1,7 +1,7 @@
 /**
  * weifuwu/ui-dom — 前端路由 + 渲染运行时（v2 vdom 引擎，render-only）
  *
- * 渲染运行时 = vdom（第 2 代引擎，design/render-only-plan.md）：
+ * 渲染运行时 = vdom（第 2 代引擎，design 归档）：
  * - 渲染触发唯一原语 ctx.ui.render()（无 $ / dirty——无自动渲染）
  * - 共享状态：createStore + ctx.ui.useExternal
  * - 命令式挂载：mountCommand/unmountCommand（弹窗中间件在 components 各组件内部）