nolo-cli 0.1.30 → 0.1.31

package/server/handlers/appDeployStatusStore.ts

@@ -1,9 +1,11 @@
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 
 export const APP_DEPLOY_JOB_PREFIX = "app-deploy-job-";
 const APP_DEPLOY_LATEST_PREFIX = "app-deploy-latest-";
 const APP_DEPLOY_JOB_TTL_MS = 24 * 60 * 60 * 1000;
 
+const getAppDeployStatusStore = () => getServerAuthorityStore();
+
 export type AppDeployJobStatus =
   | "pending"
   | "running"
@@ -71,6 +73,7 @@ export async function createAppDeployJob(args: {
   summary?: string;
   steps?: AppDeployJobStep[];
 }): Promise<AppDeployJobRecord> {
+  const store = getAppDeployStatusStore();
   const now = new Date().toISOString();
   const record: AppDeployJobRecord = {
     jobId: args.jobId,
@@ -83,8 +86,8 @@ export async function createAppDeployJob(args: {
     updatedAt: now,
     expiresAt: new Date(Date.now() + APP_DEPLOY_JOB_TTL_MS).toISOString(),
   };
-  await serverDb.put(buildJobKey(args.jobId), record);
-  await serverDb.put(buildLatestKey(args.userId), {
+  await store.put(buildJobKey(args.jobId), record);
+  await store.put(buildLatestKey(args.userId), {
     jobId: args.jobId,
     updatedAt: now,
   });
@@ -92,10 +95,11 @@ export async function createAppDeployJob(args: {
 }
 
 export async function getAppDeployJob(jobId: string): Promise<AppDeployJobRecord | null> {
+  const store = getAppDeployStatusStore();
   try {
-    const record = (await serverDb.get(buildJobKey(jobId))) as AppDeployJobRecord;
+    const record = (await store.get(buildJobKey(jobId))) as AppDeployJobRecord;
     if (isExpired(record?.expiresAt)) {
-      await serverDb.del(buildJobKey(jobId));
+      await store.del(buildJobKey(jobId));
       return null;
     }
     return record;
@@ -113,6 +117,7 @@ export async function patchAppDeployJob(
   jobId: string,
   patch: Partial<AppDeployJobRecord>
 ): Promise<AppDeployJobRecord | null> {
+  const store = getAppDeployStatusStore();
   const prev = patchQueues.get(jobId) ?? Promise.resolve();
   const op = prev.catch(() => {}).then(async (): Promise<AppDeployJobRecord | null> => {
     const current = await getAppDeployJob(jobId);
@@ -122,8 +127,8 @@ export async function patchAppDeployJob(
       ...patch,
       updatedAt: new Date().toISOString(),
     };
-    await serverDb.put(buildJobKey(jobId), next);
-    await serverDb.put(buildLatestKey(next.userId), {
+    await store.put(buildJobKey(jobId), next);
+    await store.put(buildLatestKey(next.userId), {
       jobId,
       updatedAt: next.updatedAt,
     });
@@ -139,8 +144,9 @@ export async function patchAppDeployJob(
 }
 
 export async function getLatestAppDeployJobId(userId: string): Promise<string | null> {
+  const store = getAppDeployStatusStore();
   try {
-    const record = (await serverDb.get(buildLatestKey(userId))) as { jobId?: string };
+    const record = (await store.get(buildLatestKey(userId))) as { jobId?: string };
     return typeof record?.jobId === "string" ? record.jobId : null;
   } catch (error: any) {
     if (error?.notFound) return null;
@@ -152,13 +158,14 @@ export async function resolveLatestAppDeployJobId(userId: string): Promise<{
   jobId: string | null;
   ambiguous: boolean;
 }> {
+  const store = getAppDeployStatusStore();
   const jobs: AppDeployJobRecord[] = [];
-  for await (const [key, value] of serverDb.iterator()) {
+  for await (const [key, value] of store.iterator()) {
     if (typeof key !== "string" || !key.startsWith(APP_DEPLOY_JOB_PREFIX)) continue;
     const record = value as AppDeployJobRecord;
     if (!record || record.userId !== userId) continue;
     if (isExpired(record.expiresAt)) {
-      await serverDb.del(key);
+      await store.del(key);
       continue;
     }
     jobs.push(record);

package/server/handlers/appDomainHandler.ts

@@ -1,5 +1,5 @@
 import { resolve4 } from "node:dns/promises";
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { getAppRecord, setAppCustomUrl } from "./appSandboxHandler";
 import { hasSpaceRole } from "./appSpaceAccess";
 import {
@@ -14,6 +14,8 @@ export const APP_ROUTE_PREFIX = "app-route-";
 
 export type DomainBindMode = "platform_a";
 
+const getAppDomainStore = () => getServerAuthorityStore();
+
 export interface DomainRecord {
   hostname: string;
   mode: DomainBindMode;
@@ -176,7 +178,9 @@ export async function handleAppDomainAllow(req: Request): Promise<Response> {
     return new Response("denied", { status: 404 });
   }
 
-  const appId = await serverDb.get(`${DOMAIN_HOST_PREFIX}${hostname}`).catch(() => null);
+  const appId = await getAppDomainStore()
+    .get(`${DOMAIN_HOST_PREFIX}${hostname}`)
+    .catch(() => null);
   if (typeof appId === "string" && appId.trim()) {
     return new Response("ok", {
       status: 200,
@@ -226,7 +230,7 @@ async function listDomainRecords(
     backfill?: boolean;
   } = {}
 ): Promise<DomainRecord[]> {
-  const { db = serverDb, req, backfill = true } = options;
+  const { db = getAppDomainStore(), req, backfill = true } = options;
   const prefix = `${APP_DOMAIN_PREFIX}${appId}-`;
   const records: DomainRecord[] = [];
   for await (const [key, value] of db.iterator({
@@ -256,7 +260,7 @@ async function refreshDomainDnsState(
     db?: any;
   } = {}
 ): Promise<DomainRecord> {
-  const { db = serverDb } = options;
+  const { db = getAppDomainStore() } = options;
   const resolvedARecords = await resolveHostnameARecords(record.hostname);
   const pendingDns =
     record.aRecords.length === 0 ||
@@ -275,7 +279,7 @@ async function refreshDomainDnsState(
 async function syncPrimaryCustomUrl(
   appId: string,
   req?: Request,
-  db: any = serverDb
+  db: any = getAppDomainStore()
 ): Promise<void> {
   const records = await listDomainRecords(appId, { db, req });
   const active = records.find((record) => !record.pendingDns);
@@ -346,14 +350,15 @@ export async function handleAppDomainBind(req: Request): Promise<Response> {
   }
 
   return withHostnameLock(hostname, async () => {
+    const store = getAppDomainStore();
     const hostKey = `${DOMAIN_HOST_PREFIX}${hostname}`;
     const domainKey = buildAppDomainKey(appId, hostname);
-    const currentOwner = await serverDb.get(hostKey).catch(() => null);
+    const currentOwner = await store.get(hostKey).catch(() => null);
     if (currentOwner && currentOwner !== appId) {
       return jsonError(409, "该域名已被其他应用绑定", "HOSTNAME_ALREADY_BOUND");
     }
 
-    const existing = await serverDb.get(domainKey).catch(() => null) as DomainRecord | null;
+    const existing = (await store.get(domainKey).catch(() => null)) as DomainRecord | null;
     const resolvedARecords = await resolveHostnameARecords(hostname);
     const pendingDns = !targetARecords.every((ip) => resolvedARecords.includes(ip));
     const now = new Date().toISOString();
@@ -368,10 +373,10 @@ export async function handleAppDomainBind(req: Request): Promise<Response> {
     };
 
     await Promise.all([
-      serverDb.put(hostKey, appId),
-      serverDb.put(domainKey, record),
+      store.put(hostKey, appId),
+      store.put(domainKey, record),
     ]);
-    await syncPrimaryCustomUrl(appId, req);
+    await syncPrimaryCustomUrl(appId, req, store);
 
     return jsonOk({
       success: true,
@@ -406,14 +411,15 @@ export async function handleAppDomainUnbind(req: Request): Promise<Response> {
   }
 
   return withHostnameLock(hostname, async () => {
+    const store = getAppDomainStore();
     const hostKey = `${DOMAIN_HOST_PREFIX}${hostname}`;
     const domainKey = buildAppDomainKey(appId, hostname);
-    const currentOwner = await serverDb.get(hostKey).catch(() => null);
+    const currentOwner = await store.get(hostKey).catch(() => null);
     if (currentOwner === appId) {
-      await serverDb.del(hostKey).catch(() => {});
+      await store.del(hostKey).catch(() => {});
     }
-    await serverDb.del(domainKey).catch(() => {});
-    await syncPrimaryCustomUrl(appId, req);
+    await store.del(domainKey).catch(() => {});
+    await syncPrimaryCustomUrl(appId, req, store);
     return jsonOk({ success: true, appId, hostname, removed: true });
   });
 }
@@ -454,7 +460,7 @@ export async function handleAppDomainList(req: Request): Promise<Response> {
 
 export async function deleteAppDomains(
   appId: string,
-  db: any = serverDb
+  db: any = getAppDomainStore()
 ): Promise<void> {
   const prefix = `${APP_DOMAIN_PREFIX}${appId}-`;
   for await (const [domainKey, value] of db.iterator({

package/server/handlers/appLegacyInfraCleanup.ts

@@ -1,7 +1,10 @@
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 
 export const APP_ROUTE_PREFIX = "app-route-";
 
-export async function deleteLegacyAppInfraRecords(appId: string, db: any = serverDb): Promise<void> {
+export async function deleteLegacyAppInfraRecords(
+  appId: string,
+  db: any = getServerAuthorityStore(),
+): Promise<void> {
   await db.del(`${APP_ROUTE_PREFIX}${appId}`).catch(() => {});
 }

package/server/handlers/appSandboxHandler.ts

@@ -2,12 +2,12 @@
 // 在我们服务器用 Bun Worker 沙箱运行用户部署的应用代码
 // 路由: /apps/:appId/*  → 加载代码 → Worker 沙箱执行 → 返回 Response
 
-import { join } from "path";
-import { tmpdir } from "os";
-import { writeFile, unlink } from "fs/promises";
-import { pathToFileURL } from "node:url";
-import serverDb from "../../database/server/db";
-import { saveVersion } from "./versionStore";
+import { join } from "path";
+import { tmpdir } from "os";
+import { writeFile, unlink } from "fs/promises";
+import { pathToFileURL } from "node:url";
+import { getServerAuthorityStore } from "../../database/server/db";
+import { saveVersion } from "./versionStore";
 import type { BundleFile } from "../appBundler";
 import {
   getSpaceRecord,
@@ -19,8 +19,29 @@ import {
   buildLegacyAppRouteKey,
   buildOwnerScopedAppKey,
 } from "../../app/utils/appKeys";
-import { WEB_AUTH_TOKEN_COOKIE } from "../../auth/tokenCookie";
-import { buildTombstoneRecord, isTombstoneRecord } from "../../database/tombstones";
+import { WEB_AUTH_TOKEN_COOKIE } from "../../auth/tokenCookie";
+import { buildTombstoneRecord, isTombstoneRecord } from "../../database/tombstones";
+
+const getAppSandboxStore = () => getServerAuthorityStore();
+const serverDb = {
+  get<T = any>(key: string) {
+    return getAppSandboxStore().get<T>(key);
+  },
+  put(key: string, value: unknown) {
+    return getAppSandboxStore().put(key, value);
+  },
+  del(key: string) {
+    return getAppSandboxStore().del(key);
+  },
+  iterator(options?: {
+    gte?: string;
+    lte?: string;
+    lt?: string;
+    reverse?: boolean;
+  }) {
+    return getAppSandboxStore().iterator(options);
+  },
+};
 
 // ── 存储 key ────────────────────────────────────────────────
 export const APP_CODE_PREFIX = "app-code-";

package/server/handlers/appSpaceAccess.ts

@@ -1,10 +1,12 @@
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 import { buildLegacyAppRouteKey } from "../../app/utils/appKeys";
 import { isTombstoneRecord } from "../../database/tombstones";
 
 const SPACE_PREFIX = "space-";
 const SPACE_MEMBER_PREFIX = "space-member-";
 
+const getAppSpaceAccessStore = () => getServerAuthorityStore();
+
 export type SpaceRole = "owner" | "admin" | "member" | "guest";
 
 const ROLE_RANK: Record<SpaceRole, number> = {
@@ -41,8 +43,9 @@ export const createAppContentKey = (appId: string, appKey?: string): string =>
 export async function getSpaceRecord(spaceId?: string | null): Promise<any | null> {
   const normalized = normalizeSpaceId(spaceId);
   if (!normalized) return null;
+  const store = getAppSpaceAccessStore();
   try {
-    const record = await serverDb.get(createSpaceKey(normalized));
+    const record = await store.get(createSpaceKey(normalized));
     return isTombstoneRecord(record) ? null : record;
   } catch {
     return null;
@@ -52,8 +55,9 @@ export async function getSpaceRecord(spaceId?: string | null): Promise<any | nul
 export async function getUserSpaceMembership(userId: string, spaceId?: string | null): Promise<any | null> {
   const normalized = normalizeSpaceId(spaceId);
   if (!userId || !normalized) return null;
+  const store = getAppSpaceAccessStore();
   try {
-    const record = await serverDb.get(createSpaceMemberKey(userId, normalized));
+    const record = await store.get(createSpaceMemberKey(userId, normalized));
     return isTombstoneRecord(record) ? null : record;
   } catch {
     return null;
@@ -92,9 +96,10 @@ export async function hasSpaceRole(
 
 export async function listUserSpaceIds(userId: string): Promise<string[]> {
   if (!userId) return [];
+  const store = getAppSpaceAccessStore();
   const prefix = `${SPACE_MEMBER_PREFIX}${userId}-`;
   const ids = new Set<string>();
-  for await (const [key, value] of serverDb.iterator({ gte: prefix, lte: `${prefix}\xff` })) {
+  for await (const [key, value] of store.iterator({ gte: prefix, lte: `${prefix}\xff` })) {
     if (isTombstoneRecord(value)) continue;
     const rawKey = String(key);
     const spaceId = rawKey.slice(prefix.length);
@@ -117,9 +122,10 @@ export async function addAppToSpace(params: {
   }
 
   const spaceKey = createSpaceKey(normalized);
+  const store = getAppSpaceAccessStore();
   let spaceData: any;
   try {
-    spaceData = await serverDb.get(spaceKey);
+    spaceData = await store.get(spaceKey);
   } catch {
     throw new Error("space_not_found");
   }
@@ -127,7 +133,7 @@ export async function addAppToSpace(params: {
   const now = params.updatedAt ?? Date.now();
   const contentKey = createAppContentKey(params.appId, params.appKey);
   const legacyContentKey = createAppContentKey(params.appId);
-  await serverDb.put(spaceKey, {
+  await store.put(spaceKey, {
     ...spaceData,
     updatedAt: now,
     contents: {
@@ -157,9 +163,10 @@ export async function removeAppFromSpace(
     createAppContentKey(appId, appKey ?? undefined),
     createAppContentKey(appId),
   ]);
+  const store = getAppSpaceAccessStore();
   try {
     const spaceKey = createSpaceKey(normalized);
-    const spaceData: any = await serverDb.get(spaceKey);
+    const spaceData: any = await store.get(spaceKey);
     const nextContents = { ...(spaceData?.contents ?? {}) };
     let changed = false;
     for (const contentKey of contentKeys) {
@@ -168,7 +175,7 @@ export async function removeAppFromSpace(
       changed = true;
     }
     if (changed) {
-      await serverDb.put(spaceKey, {
+      await store.put(spaceKey, {
         ...spaceData,
         updatedAt: Date.now(),
         contents: nextContents,

package/server/handlers/chatHandler.ts

@@ -25,7 +25,7 @@ import {
   selectUpstreamRequest,
 } from "./chatProxyRouting";
 import { authenticateMachineToken } from "./machines/machineAuth";
-import serverDb from "../../database/server/db";
+import { getServerAuthorityStore } from "../../database/server/db";
 const encoder = new TextEncoder();
 
 // 简单的控制台日志封装，带颜色高亮
@@ -250,6 +250,13 @@ const normalizeCustomChatUrl = (rawUrl: unknown): string | undefined => {
   return url;
 };
 
+const inferProviderCallEndpoint = (url: unknown): string | undefined => {
+  if (typeof url !== "string") return undefined;
+  if (url.includes("/responses")) return "responses";
+  if (url.includes("/chat/completions")) return "chat.completions";
+  return undefined;
+};
+
 const hydrateProxyRequestFromAgent = async (
   request: ChatProxyPayload
 ): Promise<ChatProxyPayload> => {
@@ -262,7 +269,7 @@ const hydrateProxyRequestFromAgent = async (
 
   let agent: any = null;
   try {
-    agent = await serverDb.get(agentKey);
+    agent = await getServerAuthorityStore().get(agentKey);
   } catch {
     return request;
   }
@@ -504,6 +511,19 @@ export async function handleChatRequest(req: Request, extraHeaders = {}) {
       fallbackRequests: upstreamRequest.fallbackRequests,
       fallbackOnStatuses: upstreamRequest.fallbackOnStatuses,
       init: upstreamRequest.init,
+      providerCallStore: getServerAuthorityStore(),
+      providerCallContext: {
+        userId,
+        dialogId:
+          typeof body.dialogId === "string" && body.dialogId.trim()
+            ? body.dialogId.trim()
+            : undefined,
+        agentId:
+          typeof request.agentKey === "string" && request.agentKey.trim()
+            ? request.agentKey.trim()
+            : undefined,
+        endpoint: inferProviderCallEndpoint(upstreamRequest.url),
+      },
     });
     clearTimeout(timer);
     const requestedBillingServiceTier =