nolo-cli 0.1.30 → 0.1.31

package/server/payments/waffo/waffoPaymentProvider.ts

@@ -9,10 +9,9 @@ import {
 } from "@waffo/pancake-ts";
 import { ulid } from "ulid";
 import { CORS_HEADERS_AUTH } from "../../../auth/utils";
-import { handleToken } from "../../../auth/server/token";
+import { readUserFromRequest } from "../../../auth/server/token";
 import { rechargeUserBalance } from "../../../auth/server/recharge";
-import serverDb from "../../../database/server/db";
-import { createResponse } from "../../createResponse";
+import { getServerAuthorityStore } from "../../../database/server/db";
 import type { PaymentProvider } from "../paymentProvider";
 import {
   getRechargeCreditLimits,
@@ -63,6 +62,8 @@ const jsonError = (
 const paymentKey = (paymentRequestId: string) =>
   `${WAFFO_PAYMENT_PREFIX}${paymentRequestId}`;
 
+const getWaffoStore = () => getServerAuthorityStore();
+
 const getMerchantId = () =>
   process.env.WAFFO_MERCHANT_ID?.trim() || DEFAULT_MERCHANT_ID;
 
@@ -156,8 +157,10 @@ export const handleCreateWaffoOrder = async (req: Request) => {
     );
   }
 
-  const authResult = await handleToken(req, createResponse());
-  if (authResult instanceof Response) return authResult;
+  const authResult = await readUserFromRequest(req);
+  if (!authResult?.userId) {
+    return jsonError(401, "Authentication required.", "AUTH_REQUIRED");
+  }
 
   let body: any = {};
   try {
@@ -178,7 +181,7 @@ export const handleCreateWaffoOrder = async (req: Request) => {
   const { credits } = validation;
 
   const userId = String(authResult.userId || "");
-  const user = await serverDb.get(`user:${userId}`).catch(() => null);
+  const user = await getWaffoStore().get(`user:${userId}`).catch(() => null);
   const username =
     typeof user?.username === "string"
       ? user.username
@@ -233,7 +236,7 @@ export const handleCreateWaffoOrder = async (req: Request) => {
         tokenExpiresAt: result.tokenExpiresAt,
       },
     };
-    await serverDb.put(paymentKey(paymentRequestId), record);
+    await getWaffoStore().put(paymentKey(paymentRequestId), record);
 
     return jsonResponse({
       success: true,
@@ -300,7 +303,7 @@ export const handleWaffoWebhook = async (req: Request) => {
   }
 
   const key = paymentKey(paymentRequestId);
-  const record = (await serverDb.get(key).catch(() => null)) as
+  const record = (await getWaffoStore().get(key).catch(() => null)) as
     | WaffoPaymentRecord
     | null;
   if (!record) {
@@ -310,7 +313,7 @@ export const handleWaffoWebhook = async (req: Request) => {
     });
   }
 
-  await serverDb.put(key, {
+  await getWaffoStore().put(key, {
     ...record,
     status: "paid",
     updatedAt: Date.now(),

package/server/runtimeRole.ts

@@ -0,0 +1,15 @@
+export type NoloRuntimeRole = "core" | "overlay" | "web";
+
+export function resolveRuntimeRole(
+  env: Record<string, string | undefined> = process.env
+): NoloRuntimeRole {
+  const raw = String(env.NOLO_SERVER_RUNTIME_ROLE || "")
+    .trim()
+    .toLowerCase();
+  if (raw === "overlay" || raw === "web") return raw;
+  return "core";
+}
+
+export function shouldRunBackgroundWorkers(role: NoloRuntimeRole): boolean {
+  return role === "core";
+}

package/server/scheduler/scheduledTaskRuntime.ts

@@ -1,6 +1,6 @@
 import type { Agent, DialogConfig, ScheduledTaskConfig } from "../../app/types";
 import { DataType } from "../../create/types";
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { createDialogKey, createUserKey } from "../../database/keys";
 import { extractCustomId } from "../../core/prefix";
 import { resolveMemoryRuntime } from "../../ai/memory/runtime";
@@ -23,8 +23,10 @@ import { resolveAutonomousRuntimeContext } from "../handlers/agentRun/autonomous
 
 export const DEFAULT_SCHEDULED_MAX_ROUNDS = 12;
 
+const getScheduledTaskRuntimeStore = () => getServerAuthorityStore();
+
 const defaultRuntimeDeps = {
-  serverDb,
+  serverDb: getScheduledTaskRuntimeStore(),
   fetchConvMsgs,
   runAgentLoop,
   appendToExistingDialog,

package/server/scheduler/schedulerService.ts

@@ -7,13 +7,13 @@
  * 生命周期由 server/entry.ts 管理（startAgentTaskScheduler / stopAgentTaskScheduler）。
  */
 
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { DataType } from "../../create/types";
 import type { DialogConfig, ScheduledTaskConfig } from "../../app/types";
 import { executeScheduledTaskRun } from "./scheduledTaskRuntime";
 
 const defaultSchedulerDeps = {
-  serverDb,
+  serverDb: getServerAuthorityStore(),
   executeScheduledTaskRun,
 };
 

package/server/taskRunBridgeRoutes.ts

@@ -1,8 +1,8 @@
-import { handleToken } from "../auth/server/token";
+import { readUserFromRequest } from "../auth/server/token";
 import { createApiRouteFamily } from "./apiRouteAdapter";
 import { DataType } from "../create/types";
 import { createKey } from "../database/keys";
-import serverDb from "../database/server/db";
+import { getServerAuthorityStore } from "../database/server/db";
 import { fetchMessages } from "../chat/messages/fetchMessages";
 import { authenticateMachineToken } from "./handlers/machines/machineAuth";
 import {
@@ -15,6 +15,8 @@ const JSON_HEADERS: Record<string, string> = {
   "Access-Control-Allow-Origin": "*",
 };
 
+const getTaskRunBridgeStore = () => getServerAuthorityStore();
+
 function json(body: unknown, status = 200) {
   return new Response(JSON.stringify(body), { status, headers: JSON_HEADERS });
 }
@@ -24,7 +26,7 @@ async function authenticateTaskRunBridge(req: Request): Promise<{ userId: string
   if (machineAuth instanceof Response) return machineAuth;
   if (machineAuth?.userId) return { userId: machineAuth.userId };
 
-  const user = await handleToken(req as any, {});
+  const user = await readUserFromRequest(req);
   if (!user?.userId) {
     return json({ ok: false, error: "Unauthorized" }, 401);
   }
@@ -70,9 +72,10 @@ export async function handleDialogReadBridge(req: Request) {
     : 50;
 
   try {
+    const store = getTaskRunBridgeStore();
     const [meta, msgs] = await Promise.all([
-      serverDb.get(expectedDialogKey),
-      fetchMessages(serverDb, dialogId, { limit, throwOnError: true }),
+      store.get(expectedDialogKey),
+      fetchMessages(store, dialogId, { limit, throwOnError: true }),
     ]);
     return json({ ok: true, meta, msgs });
   } catch (error) {

package/share/server/fetchCommunityShares.ts

@@ -1,7 +1,7 @@
 // 路径: share/server/fetchCommunityShares.ts
 // 职责：SSR 专用——直接读取 serverDb，获取社区分享列表，供 render.tsx 预载使用
 
-import serverDb, { ensureServerDbOpen } from "../../database/server/db";
+import { ensureServerDbOpen } from "../../database/server/db";
 import { shareKey } from "../keys";
 import type { ShareSummary } from "../types";
 import { scanIndexToSummaries } from "./helpers";

package/share/server/helpers.ts

@@ -1,4 +1,4 @@
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { shareKey } from "../keys";
 import { isShareType, type ShareSummary, type ShareType } from "../types";
 import { DataType } from "../../create/types";
@@ -48,12 +48,13 @@ export const resolveIndexedDbKey = (raw: any): string => {
   return "";
 };
 
-export const readShareByDbKey = async (dbKey: string): Promise<any | null> => {
-  try {
-    return await serverDb.get(dbKey);
-  } catch (error: unknown) {
-    if (isLevelNotFoundError(error)) return null;
-    throw error;
+export const readShareByDbKey = async (dbKey: string): Promise<any | null> => {
+  const store = getServerAuthorityStore();
+  try {
+    return await store.get(dbKey);
+  } catch (error: unknown) {
+    if (isLevelNotFoundError(error)) return null;
+    throw error;
   }
 };
 
@@ -165,15 +166,16 @@ export const toShareSummary = (
 
 // ── Generic index scan → ShareSummary[] ─────────────────────────────
 
-export const scanIndexToSummaries = async (
-  range: { start: string; end: string },
-  limit: number,
-  cursor: string | undefined,
-  summaryOptions: ToSummaryOptions = {}
-): Promise<{ shares: ShareSummary[]; nextCursor?: string }> => {
-  const shares: ShareSummary[] = [];
-  const seen = new Set<string>();
-  let lastIndexKey = "";
+export const scanIndexToSummaries = async (
+  range: { start: string; end: string },
+  limit: number,
+  cursor: string | undefined,
+  summaryOptions: ToSummaryOptions = {}
+): Promise<{ shares: ShareSummary[]; nextCursor?: string }> => {
+  const store = getServerAuthorityStore();
+  const shares: ShareSummary[] = [];
+  const seen = new Set<string>();
+  let lastIndexKey = "";
 
   const iterOptions: any = { gte: range.start, lte: range.end };
   if (cursor) {
@@ -181,7 +183,7 @@ export const scanIndexToSummaries = async (
     delete iterOptions.gte;
   }
 
-  for await (const [indexKey, rawIndexValue] of serverDb.iterator(iterOptions)) {
+  for await (const [indexKey, rawIndexValue] of store.iterator(iterOptions)) {
     if (shares.length >= limit) {
       return { shares, nextCursor: lastIndexKey };
     }

package/share/server/importShare.ts

@@ -12,12 +12,12 @@
  *   5. importCount +1（一次，不重复）
  */
 
-import { handleToken } from "../../auth/server/token";
+import { readUserFromRequest } from "../../auth/server/token";
 import {
   getProductPriceCredits,
   hasActiveEntitlement,
 } from "../../auth/server/productEntitlements";
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { logger } from "../../auth/server/shared";
 import { createPageServer } from "../../render/page/server/createPage";
 import { resolveSharePaidAccess } from "../paidAccess";
@@ -37,22 +37,17 @@ const extractToken = (req: Request): string | null => {
 
 /** 认证，token 无效 / 缺失时返回 null */
 async function authenticate(req: Request): Promise<string | null> {
-  const authReq: any = { headers: { get: (k: string) => req.headers.get(k) } };
-  const mockRes: any = { status: () => ({ json: () => null }) };
-  try {
-    const user = await handleToken(authReq, mockRes);
-    return user?.userId ?? null;
-  } catch {
-    return null;
-  }
+  const user = await readUserFromRequest(req);
+  return user?.userId ?? null;
 }
 
 /** 原子自增 importCount（最终一致，不需要严格原子性） */
 async function incrementImportCount(token: string): Promise<void> {
+  const store = getServerAuthorityStore();
   const dbKey = `share-${token}`;
   try {
-    const record: any = await serverDb.get(dbKey);
-    await serverDb.put(dbKey, {
+    const record: any = await store.get(dbKey);
+    await store.put(dbKey, {
       ...record,
       meta: { ...(record?.meta ?? {}), importCount: (record?.meta?.importCount ?? 0) + 1 },
     });
@@ -70,6 +65,7 @@ export async function handleImportShare(req: Request): Promise<Response> {
     new Response(JSON.stringify({ success: false, message: "请先登录" }), { status: 401, headers: CORS_HEADERS });
 
   try {
+    const store = getServerAuthorityStore();
     // 1. 鉴权
     const userId = await authenticate(req);
     if (!userId) return json401();
@@ -81,7 +77,7 @@ export async function handleImportShare(req: Request): Promise<Response> {
     // 3. 读取 share 记录
     let shareData: any;
     try {
-      shareData = await serverDb.get(`share-${token}`);
+      shareData = await store.get(`share-${token}`);
     } catch {
       return new Response(
         JSON.stringify({ success: false, message: "分享不存在" }),

package/share/server/listCommunityShares.ts

@@ -1,4 +1,4 @@
-import { ensureServerDbOpen } from "../../database/server/db";
+import { ensureServerDbOpen, getServerAuthorityStore } from "../../database/server/db";
 import { shareKey } from "../keys";
 import { normalizeUserId } from "../helpers";
 import {
@@ -9,7 +9,6 @@ import {
   scanIndexToSummaries,
   toShareSummary,
 } from "./helpers";
-import serverDb from "../../database/server/db";
 import { parseToken, verifyToken } from "../../auth/token";
 import { assertSessionTokenVersion } from "../../auth/sessionTokenVersion";
 import { DB_PREFIX } from "../../database/keys";
@@ -43,6 +42,7 @@ export const handleListCreatorCommunityShares = async (req: ShareListRequest) =>
 
   try {
     await ensureServerDbOpen();
+    const store = getServerAuthorityStore();
 
     const range = shareKey.communityCreatorRange(requestedUserId);
     const result = await scanIndexToSummaries(range, limit, cursor, {
@@ -55,7 +55,7 @@ export const handleListCreatorCommunityShares = async (req: ShareListRequest) =>
     if (result.shares.length === 0 && !cursor) {
       const shareRange = shareKey.range();
       const legacyShares = [];
-      for await (const [dbKey, rawValue] of serverDb.iterator({
+      for await (const [dbKey, rawValue] of store.iterator({
         gte: shareRange.start,
         lte: shareRange.end,
       })) {
@@ -116,7 +116,7 @@ const getAuthorizedUserId = async (req: Request): Promise<string | null> => {
   if (!userId || typeof userId !== "string") return null;
 
   try {
-    const user = await serverDb.get(`${DB_PREFIX.USER}${userId}`);
+    const user = await getServerAuthorityStore().get(`${DB_PREFIX.USER}${userId}`);
     if (!user?.publicKey || user?.isDisabled) return null;
 
     const payload = verifyToken(token, user.publicKey);

package/share/server/purchaseDoc.ts

@@ -9,8 +9,8 @@
  *   - 检查当前用户是否有权访问（已购买或免费）
  */
 
-import { handleToken } from "../../auth/server/token";
-import serverDb from "../../database/server/db";
+import { readUserFromRequest } from "../../auth/server/token";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { logger } from "../../auth/server/shared";
 import {
   getProductPriceCredits,
@@ -36,24 +36,15 @@ const extractToken = (req: Request): string | null => {
 
 /** 认证并返回 userId，无 token 时返回 null（不抛错） */
 async function authenticate(req: Request): Promise<string | null> {
-  const authReq: any = { headers: { get: (k: string) => req.headers.get(k) } };
-  // mock res：handleToken 在 token 缺失或无效时会调用 res.status().json()
-  // 我们用 mock 让它静默返回 null
-  const mockRes: any = {
-    status: () => ({ json: () => null }),
-  };
-  try {
-    const user = await handleToken(authReq, mockRes);
-    return user?.userId ?? null;
-  } catch {
-    return null;
-  }
+  const user = await readUserFromRequest(req);
+  return user?.userId ?? null;
 }
 
 // ── POST /api/share/:token/purchase ──────────────────────────────────
 
 export async function handlePurchaseDoc(req: Request): Promise<Response> {
   try {
+    const store = getServerAuthorityStore();
     const userId = await authenticate(req);
     if (!userId) {
       return new Response(
@@ -74,7 +65,7 @@ export async function handlePurchaseDoc(req: Request): Promise<Response> {
     const shareDbKey = `share-${token}`;
     let shareData: any;
     try {
-      shareData = await serverDb.get(shareDbKey);
+      shareData = await store.get(shareDbKey);
     } catch {
       return new Response(
         JSON.stringify({ success: false, message: "分享不存在" }),
@@ -158,6 +149,7 @@ export async function handlePurchaseDoc(req: Request): Promise<Response> {
 
 export async function handleCheckDocAccess(req: Request): Promise<Response> {
   try {
+    const store = getServerAuthorityStore();
     const userId = await authenticate(req);
     const token = extractToken(req);
 
@@ -171,7 +163,7 @@ export async function handleCheckDocAccess(req: Request): Promise<Response> {
     // 读取 share 记录获取价格
     let shareData: any;
     try {
-      shareData = await serverDb.get(`share-${token}`);
+      shareData = await store.get(`share-${token}`);
     } catch {
       return new Response(
         JSON.stringify({ success: false, message: "分享不存在" }),

package/share/server/readCommunityShareCover.ts

@@ -1,5 +1,6 @@
 import { Buffer } from "node:buffer";
-import { ensureServerDbOpen } from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
+import { ensureDbOpen } from "../../database/server/ensureDbOpen";
 import { shareKey } from "../keys";
 import { toSafeString } from "../helpers";
 import { errorResponse, readShareByDbKey } from "./helpers";
@@ -39,7 +40,7 @@ export const handleReadCommunityShareCover = async (req: CommunityCoverRequest)
   }
 
   try {
-    await ensureServerDbOpen();
+    await ensureDbOpen(getServerAuthorityStore());
 
     const rawShare = await readShareByDbKey(shareKey.create(token));
     if (!rawShare || rawShare?.meta?.visibility !== "community") {

package/share/server/readSharedTable.ts

@@ -1,4 +1,4 @@
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { rowKey } from "../../database/keys";
 import { DataType } from "../../create/types";
 import { isTombstoneRecord } from "../../database/tombstones";
@@ -62,12 +62,13 @@ const resolveRowLimit = (value: unknown): number | null => {
   return parsed;
 };
 
-export async function readSharedTablePreview(
-  token: string,
-  options: ReadSharedTablePreviewOptions = {}
-): Promise<SharedTablePreview | null> {
-  const rowLimit = resolveRowLimit(options.rowLimit);
-  const shareData = await readShareByDbKey(`share-${token}`);
+export async function readSharedTablePreview(
+  token: string,
+  options: ReadSharedTablePreviewOptions = {}
+): Promise<SharedTablePreview | null> {
+  const store = getServerAuthorityStore();
+  const rowLimit = resolveRowLimit(options.rowLimit);
+  const shareData = await readShareByDbKey(`share-${token}`);
   if (!shareData || isTombstoneRecord(shareData)) return null;
 
   const liveTable = toLiveTableMetadata(shareData);
@@ -85,12 +86,12 @@ export async function readSharedTablePreview(
         : null;
     if (!tenantId || !tableId) return null;
 
-    const rows: Record<string, unknown>[] = [];
-    const { gte, lte } = rowKey.range(tenantId, tableId);
-    for await (const [, value] of serverDb.iterator({ gte, lte })) {
-      if (value?.type === DataType.TABLE_ROW && !value?.deletedAt) {
-        rows.push(value);
-        if (rowLimit != null && rows.length >= rowLimit) break;
+    const rows: Record<string, unknown>[] = [];
+    const { gte, lte } = rowKey.range(tenantId, tableId);
+    for await (const [, value] of store.iterator({ gte, lte })) {
+      if (value?.type === DataType.TABLE_ROW && !value?.deletedAt) {
+        rows.push(value);
+        if (rowLimit != null && rows.length >= rowLimit) break;
       }
     }
 

package/share/server/tableReplication.ts

@@ -1,8 +1,8 @@
-import serverDb from "../../database/server/db";
-import { rowKey } from "../../database/keys";
-import { noloWriteRequest } from "../../database/requests";
-import { isTombstoneRecord } from "../../database/tombstones";
-import { readShareByDbKey } from "./helpers";
+import { getServerAuthorityStore } from "../../database/server/db";
+import { rowKey } from "../../database/keys";
+import { noloWriteRequest } from "../../database/requests";
+import { isTombstoneRecord } from "../../database/tombstones";
+import { readShareByDbKey } from "./helpers";
 
 type BootstrapArgs = {
   shareDbKey: string;
@@ -58,16 +58,17 @@ type MutationArgs = {
   ) => Promise<void>;
 };
 
-const defaultPatchShareMeta = async (
-  shareDbKey: string,
-  changes: Record<string, unknown>
-) => {
-  const shareRecord = await readShareByDbKey(shareDbKey);
-  if (!shareRecord || isTombstoneRecord(shareRecord)) return;
-  await serverDb.put(shareDbKey, {
-    ...shareRecord,
-    meta: {
-      ...(shareRecord.meta ?? {}),
+const defaultPatchShareMeta = async (
+  shareDbKey: string,
+  changes: Record<string, unknown>
+) => {
+  const store = getServerAuthorityStore();
+  const shareRecord = await readShareByDbKey(shareDbKey);
+  if (!shareRecord || isTombstoneRecord(shareRecord)) return;
+  await store.put(shareDbKey, {
+    ...shareRecord,
+    meta: {
+      ...(shareRecord.meta ?? {}),
       ...changes,
     },
   });
@@ -95,15 +96,16 @@ export const isLiveTableShareRecord = (shareRecord: any, tableDbKey?: string): b
 
 export const patchShareMeta = defaultPatchShareMeta;
 
-export async function findActiveLiveShareByTable(
-  tenantId: string,
-  tableId: string
-): Promise<(Record<string, unknown> & { dbKey: string }) | null> {
-  const tableDbKey = `meta-${tenantId}-${tableId}`;
-  for await (const [dbKey, value] of serverDb.iterator({
-    gte: "share-",
-    lte: "share-\uffff",
-  })) {
+export async function findActiveLiveShareByTable(
+  tenantId: string,
+  tableId: string
+): Promise<(Record<string, unknown> & { dbKey: string }) | null> {
+  const store = getServerAuthorityStore();
+  const tableDbKey = `meta-${tenantId}-${tableId}`;
+  for await (const [dbKey, value] of store.iterator({
+    gte: "share-",
+    lte: "share-\uffff",
+  })) {
     if (isLiveTableShareRecord(value, tableDbKey)) {
       return {
         ...value,
@@ -112,21 +114,22 @@ export async function findActiveLiveShareByTable(
     }
   }
   return null;
-}
-
-const defaultLoadOriginTableSnapshot = async (tableDbKey: string) => {
-  const tableMeta = await serverDb.get(tableDbKey);
-  const tenantId =
-    typeof tableMeta?.tenantId === "string" ? tableMeta.tenantId : "";
-  const tableId = typeof tableMeta?.tableId === "string" ? tableMeta.tableId : "";
-  const rows: any[] = [];
-
-  if (tenantId && tableId) {
-    const { gte, lte } = rowKey.range(tenantId, tableId);
-    for await (const [, value] of serverDb.iterator({ gte, lte })) {
-      if (!value?.deletedAt) {
-        rows.push(value);
-      }
+}
+
+const defaultLoadOriginTableSnapshot = async (tableDbKey: string) => {
+  const store = getServerAuthorityStore();
+  const tableMeta = await store.get(tableDbKey);
+  const tenantId =
+    typeof tableMeta?.tenantId === "string" ? tableMeta.tenantId : "";
+  const tableId = typeof tableMeta?.tableId === "string" ? tableMeta.tableId : "";
+  const rows: any[] = [];
+
+  if (tenantId && tableId) {
+    const { gte, lte } = rowKey.range(tenantId, tableId);
+    for await (const [, value] of store.iterator({ gte, lte })) {
+      if (!value?.deletedAt) {
+        rows.push(value);
+      }
     }
   }