nolo-cli 0.1.31 → 0.1.32

package/server/handlers/connector/connectorConnectionRegistry.ts

@@ -1,240 +0,0 @@
-import { randomUUID } from "node:crypto";
-
-export type ConnectorAgentRunPayload = {
-  agentKey: string;
-  userInput: string;
-  timeoutMs?: number;
-  agentConfig?: unknown;
-  messages?: unknown[];
-  runtimeContext?: unknown;
-  spaceId?: string;
-  category?: string;
-  continueDialogId?: string;
-  meta?: unknown;
-};
-
-export type ConnectorAgentRunResult = {
-  content: string;
-  model?: string;
-  usage?: unknown;
-  trace?: unknown[];
-  diagnostics?: unknown;
-  artifacts?: unknown;
-};
-
-export type ConnectorAgentRunProgress = {
-  eventType?: "tool-call" | "tool-result" | "tool-error";
-  toolCallCount?: number;
-  toolResultCount?: number;
-  lastToolNames?: string[];
-  provider?: string;
-  promptBytes?: number;
-  promptHash?: string;
-  promptRef?: string;
-  promptPageKey?: string;
-  promptPageHash?: string;
-  requestId?: string;
-  workspaceRoot?: string;
-  workspaceKind?: string;
-  message?: string;
-  updatedAt?: number;
-};
-
-export type ConnectorAgentRunOptions = {
-  requestTimeoutMs?: number;
-  onProgress?: (progress: ConnectorAgentRunProgress) => void | Promise<void>;
-  connectorSurface?: string;
-};
-
-type ConnectorSocket = {
-  send(message: string): unknown;
-};
-
-type PendingRequest = {
-  key: string;
-  machineId: string;
-  resolve: (result: ConnectorAgentRunResult) => void;
-  reject: (error: Error) => void;
-  timeout: ReturnType<typeof setTimeout>;
-  onProgress?: (progress: ConnectorAgentRunProgress) => void | Promise<void>;
-  progressTail: Promise<void>;
-};
-
-type RegisteredConnection = {
-  sessionId: string;
-  machineId: string;
-  ownerUserId: string;
-  connectorSurface?: string;
-  receive(message: string): void;
-  close(): void;
-};
-
-function connectionKey(ownerUserId: string, machineId: string) {
-  return `${ownerUserId}:${machineId}`;
-}
-
-function normalizeConnectorSurface(surface: unknown) {
-  return typeof surface === "string" && surface.trim()
-    ? surface.trim().toLowerCase()
-    : undefined;
-}
-
-export function createConnectorConnectionRegistry(options: { requestTimeoutMs?: number } = {}) {
-  const connections = new Map<string, Array<RegisteredConnection & { socket: ConnectorSocket }>>();
-  const pending = new Map<string, PendingRequest>();
-  const requestTimeoutMs = options.requestTimeoutMs ?? 120_000;
-
-  const rejectPendingForConnection = (key: string, machineId: string) => {
-    for (const [requestId, request] of pending.entries()) {
-      if (request.key !== key) continue;
-      pending.delete(requestId);
-      clearTimeout(request.timeout);
-      request.reject(new Error(`Connector disconnected for machine: ${machineId}`));
-    }
-  };
-
-  const unregister = (ownerUserId: string, machineId: string, sessionId?: string) => {
-    const key = connectionKey(ownerUserId, machineId);
-    if (!sessionId) {
-      connections.delete(key);
-      rejectPendingForConnection(key, machineId);
-      return;
-    }
-    const remaining = (connections.get(key) ?? []).filter((connection) =>
-      connection.sessionId !== sessionId
-    );
-    if (remaining.length > 0) {
-      connections.set(key, remaining);
-      return;
-    }
-    connections.delete(key);
-    rejectPendingForConnection(key, machineId);
-  };
-
-  const findConnection = (
-    ownerUserId: string,
-    machineId: string,
-    connectorSurface?: string,
-  ) => {
-    const list = connections.get(connectionKey(ownerUserId, machineId)) ?? [];
-    if (list.length === 0) return null;
-    const surface = normalizeConnectorSurface(connectorSurface);
-    if (surface) {
-      const exact = list.find((connection) => connection.connectorSurface === surface);
-      if (exact) return exact;
-      if (surface === "desktop") {
-        const legacyDesktop = list.find((connection) => !connection.connectorSurface);
-        if (legacyDesktop) return legacyDesktop;
-      }
-      return null;
-    }
-    return list.at(-1) ?? null;
-  };
-
-  return {
-    register(args: {
-      machineId: string;
-      ownerUserId: string;
-      connectorSurface?: string;
-      send: (message: string) => unknown;
-    }): RegisteredConnection {
-      const key = connectionKey(args.ownerUserId, args.machineId);
-      const sessionId = randomUUID();
-      const connection: RegisteredConnection & { socket: ConnectorSocket } = {
-        sessionId,
-        machineId: args.machineId,
-        ownerUserId: args.ownerUserId,
-        connectorSurface: normalizeConnectorSurface(args.connectorSurface),
-        socket: { send: args.send },
-        receive(message) {
-          let parsed: any;
-          try {
-            parsed = JSON.parse(message);
-          } catch {
-            return;
-          }
-          if (typeof parsed?.requestId !== "string") {
-            return;
-          }
-          const request = pending.get(parsed.requestId);
-          if (!request) return;
-          if (parsed.type === "agent.run.progress") {
-            request.progressTail = request.progressTail.then(() =>
-              Promise.resolve(request.onProgress?.(parsed.progress ?? {}))
-            ).catch((error) => {
-              console.warn("[connector] agent.run.progress handler failed", error);
-            });
-            return;
-          }
-          if (parsed.type !== "agent.run.result") return;
-          pending.delete(parsed.requestId);
-          clearTimeout(request.timeout);
-          request.progressTail.then(() => {
-            if (parsed.error) {
-              request.reject(new Error(String(parsed.error)));
-              return;
-            }
-            request.resolve(parsed.result ?? { content: "" });
-          }).catch((error) => {
-            request.reject(error instanceof Error ? error : new Error(String(error)));
-          });
-        },
-        close() {
-          unregister(args.ownerUserId, args.machineId, sessionId);
-        },
-      };
-      connections.set(key, [
-        ...(connections.get(key) ?? []),
-        connection,
-      ]);
-      return connection;
-    },
-
-    hasConnection(ownerUserId: string, machineId: string, connectorSurface?: string) {
-      return Boolean(findConnection(ownerUserId, machineId, connectorSurface));
-    },
-
-    unregister,
-
-    sendAgentRun(
-      ownerUserId: string,
-      machineId: string,
-      payload: ConnectorAgentRunPayload,
-      options: ConnectorAgentRunOptions = {}
-    ): Promise<ConnectorAgentRunResult> {
-      const connection = findConnection(ownerUserId, machineId, options.connectorSurface);
-      if (!connection) {
-        return Promise.reject(new Error(`Connector offline for machine: ${machineId}`));
-      }
-      const requestId = randomUUID();
-      const effectiveRequestTimeoutMs =
-        typeof options.requestTimeoutMs === "number" &&
-        Number.isFinite(options.requestTimeoutMs) &&
-        options.requestTimeoutMs > 0
-          ? options.requestTimeoutMs
-          : requestTimeoutMs;
-      return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-          pending.delete(requestId);
-          reject(new Error(`Connector request timed out for machine: ${machineId}`));
-        }, effectiveRequestTimeoutMs);
-        pending.set(requestId, {
-          key: connectionKey(ownerUserId, machineId),
-          machineId,
-          resolve,
-          reject,
-          timeout,
-          onProgress: options.onProgress,
-          progressTail: Promise.resolve(),
-        });
-        connection.socket.send(JSON.stringify({
-          type: "agent.run",
-          requestId,
-          payload,
-        }));
-      });
-    },
-  };
-}
-
-export const connectorConnectionRegistry = createConnectorConnectionRegistry();

package/server/handlers/connector/connectorWebSocket.ts

@@ -1,121 +0,0 @@
-import { authenticateRequest } from "../../../auth/utils";
-
-import { authenticateMachineToken } from "../machines/machineAuth";
-import {
-  type createConnectorConnectionRegistry,
-  connectorConnectionRegistry,
-} from "./connectorConnectionRegistry";
-
-type AuthResult = { userId: string } | Response;
-type ConnectorRegistry = ReturnType<typeof createConnectorConnectionRegistry>;
-
-type ConnectorWsData = {
-  connector?: {
-    ownerUserId: string;
-    machineId: string;
-    connectorSurface?: string;
-    preview?: {
-      slotSlug: string;
-      capability: "realtime";
-      decision: "local" | "fallback";
-      transport: "connector-ws";
-      wsUrl: string;
-    } | null;
-    connection?: ReturnType<ConnectorRegistry["register"]>;
-  };
-};
-
-type BunServerLike = {
-  upgrade(req: Request, options: { data: ConnectorWsData }): boolean;
-};
-
-async function defaultAuthenticate(req: Request): Promise<AuthResult> {
-  const result = await authenticateRequest(req);
-  if (result instanceof Response) return result;
-  return { userId: result.userId };
-}
-
-export async function handleConnectorUpgradeRequest(
-  req: Request,
-  server: BunServerLike,
-  deps: {
-    authenticate?: (req: Request) => Promise<AuthResult>;
-    authenticateMachine?: typeof authenticateMachineToken;
-    preview?: ConnectorWsData["connector"]["preview"];
-  } = {}
-) {
-  const url = new URL(req.url);
-  const machineId = url.searchParams.get("machineId")?.trim();
-  const connectorSurface = url.searchParams.get("connectorSurface")?.trim().toLowerCase();
-  if (!machineId) {
-    return new Response("machineId is required", { status: 400 });
-  }
-
-  const machineAuth = await (deps.authenticateMachine ?? authenticateMachineToken)(req);
-  if (machineAuth instanceof Response) return machineAuth;
-
-  const auth = machineAuth
-    ? { userId: machineAuth.userId }
-    : await (deps.authenticate ?? defaultAuthenticate)(req);
-  if (auth instanceof Response) return auth;
-
-  if (deps.preview?.decision === "fallback") {
-    return Response.json({
-      wsUrl: deps.preview.wsUrl,
-      slotSlug: deps.preview.slotSlug,
-      capability: deps.preview.capability,
-      decision: deps.preview.decision,
-      transport: deps.preview.transport,
-    });
-  }
-
-  const upgraded = server.upgrade(req, {
-    data: {
-      connector: {
-        ownerUserId: auth.userId,
-        machineId,
-        ...(connectorSurface ? { connectorSurface } : {}),
-        preview: deps.preview ?? null,
-      },
-    },
-  });
-  return upgraded ? undefined : new Response("WebSocket upgrade failed", { status: 400 });
-}
-
-export function handleConnectorOpen(
-  ws: { data?: ConnectorWsData; send(message: string): unknown },
-  deps: { registry?: ConnectorRegistry } = {}
-) {
-  const connector = ws.data?.connector;
-  if (!connector) return false;
-  const registry = deps.registry ?? connectorConnectionRegistry;
-  connector.connection = registry.register({
-    ownerUserId: connector.ownerUserId,
-    machineId: connector.machineId,
-    connectorSurface: connector.connectorSurface,
-    send: (message) => ws.send(message),
-  });
-  return true;
-}
-
-export function handleConnectorMessage(
-  ws: { data?: ConnectorWsData },
-  message: string | Buffer
-) {
-  const connector = ws.data?.connector;
-  if (!connector?.connection) return false;
-  connector.connection.receive(String(message));
-  return true;
-}
-
-export function handleConnectorClose(
-  ws: { data?: ConnectorWsData },
-  deps: { registry?: ConnectorRegistry } = {}
-) {
-  const connector = ws.data?.connector;
-  if (!connector) return false;
-  const registry = deps.registry ?? connectorConnectionRegistry;
-  registry.unregister(connector.ownerUserId, connector.machineId);
-  connector.connection = undefined;
-  return true;
-}

package/server/handlers/creatorEarningsReportHandler.ts

@@ -1,97 +0,0 @@
-import { getBillingLedgerRuntime } from "../../auth/server/ledger";
-import type { CreatorEarningsReportStore } from "../../auth/server/creatorEarningsReport";
-import { buildCreatorEarningsReport } from "../../auth/server/creatorEarningsReport";
-
-const JSON_HEADERS = {
-  "content-type": "application/json; charset=utf-8",
-};
-
-type CreatorEarningsReportEnv = NodeJS.ProcessEnv & {
-  BILLING_LEDGER_AUDIT_SECRET?: string;
-  BILLING_LEDGER_CLUSTER_ID?: string;
-};
-
-const json = (body: unknown, status = 200) =>
-  new Response(JSON.stringify(body), { status, headers: JSON_HEADERS });
-
-const parseOptionalTimestamp = (value: string | null) => {
-  if (!value) return null;
-  const trimmed = value.trim();
-  if (!trimmed) return null;
-  if (/^\d+$/.test(trimmed)) return Number(trimmed);
-  const parsed = Date.parse(trimmed);
-  if (!Number.isFinite(parsed)) {
-    throw new Error(`invalid timestamp: ${value}`);
-  }
-  return parsed;
-};
-
-const parseSinceHours = (value: string | null) => {
-  if (!value) return 24;
-  const parsed = Number(value);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new Error(`invalid sinceHours: ${value}`);
-  }
-  return parsed;
-};
-
-const resolveDefaultStore = async (): Promise<CreatorEarningsReportStore> => {
-  const dbModule = await import("../../database/server/db");
-  return dbModule.default as CreatorEarningsReportStore;
-};
-
-export function createCreatorEarningsReportHandler({
-  store,
-  env = process.env,
-  nowMs,
-}: {
-  store?: CreatorEarningsReportStore;
-  env?: Partial<CreatorEarningsReportEnv>;
-  nowMs?: number;
-} = {}) {
-  return async function handleCreatorEarningsReport(req: Request) {
-    const expectedSecret = String(env.BILLING_LEDGER_AUDIT_SECRET || "").trim();
-    if (!expectedSecret) {
-      return new Response("Not Found", { status: 404 });
-    }
-
-    const providedSecret =
-      req.headers.get("x-billing-ledger-audit-secret")?.trim() || "";
-    if (providedSecret !== expectedSecret) {
-      return json({ success: false, error: "Unauthorized" }, 401);
-    }
-
-    try {
-      const url = new URL(req.url);
-      const now = nowMs ?? Date.now();
-      const untilMs = parseOptionalTimestamp(url.searchParams.get("until")) ?? now;
-      const explicitSince = parseOptionalTimestamp(url.searchParams.get("since"));
-      const sinceMs =
-        explicitSince ??
-        untilMs - parseSinceHours(url.searchParams.get("sinceHours")) * 3600_000;
-      const clusterId =
-        url.searchParams.get("cluster")?.trim() ||
-        getBillingLedgerRuntime({ ...process.env, ...env }).clusterId;
-
-      const report = await buildCreatorEarningsReport({
-        store: store ?? (await resolveDefaultStore()),
-        clusterId,
-        sinceMs,
-        untilMs,
-        nowMs: now,
-      });
-
-      return json({ success: true, report });
-    } catch (error) {
-      return json(
-        {
-          success: false,
-          error: error instanceof Error ? error.message : String(error),
-        },
-        400
-      );
-    }
-  };
-}
-
-export const handleCreatorEarningsReport = createCreatorEarningsReportHandler();

package/server/handlers/creatorSettlementReportHandler.ts

@@ -1,98 +0,0 @@
-import { getBillingLedgerRuntime } from "../../auth/server/ledger";
-import type { CreatorSettlementReportStore } from "../../auth/server/creatorSettlementReport";
-import { buildCreatorSettlementReport } from "../../auth/server/creatorSettlementReport";
-
-const JSON_HEADERS = {
-  "content-type": "application/json; charset=utf-8",
-};
-
-type CreatorSettlementReportEnv = NodeJS.ProcessEnv & {
-  BILLING_LEDGER_AUDIT_SECRET?: string;
-  BILLING_LEDGER_CLUSTER_ID?: string;
-};
-
-const json = (body: unknown, status = 200) =>
-  new Response(JSON.stringify(body), { status, headers: JSON_HEADERS });
-
-const parseOptionalTimestamp = (value: string | null) => {
-  if (!value) return null;
-  const trimmed = value.trim();
-  if (!trimmed) return null;
-  if (/^\d+$/.test(trimmed)) return Number(trimmed);
-  const parsed = Date.parse(trimmed);
-  if (!Number.isFinite(parsed)) {
-    throw new Error(`invalid timestamp: ${value}`);
-  }
-  return parsed;
-};
-
-const parseSinceHours = (value: string | null) => {
-  if (!value) return 24;
-  const parsed = Number(value);
-  if (!Number.isFinite(parsed) || parsed <= 0) {
-    throw new Error(`invalid sinceHours: ${value}`);
-  }
-  return parsed;
-};
-
-const resolveDefaultStore = async (): Promise<CreatorSettlementReportStore> => {
-  const dbModule = await import("../../database/server/db");
-  return dbModule.default as CreatorSettlementReportStore;
-};
-
-export function createCreatorSettlementReportHandler({
-  store,
-  env = process.env,
-  nowMs,
-}: {
-  store?: CreatorSettlementReportStore;
-  env?: Partial<CreatorSettlementReportEnv>;
-  nowMs?: number;
-} = {}) {
-  return async function handleCreatorSettlementReport(req: Request) {
-    const expectedSecret = String(env.BILLING_LEDGER_AUDIT_SECRET || "").trim();
-    if (!expectedSecret) {
-      return new Response("Not Found", { status: 404 });
-    }
-
-    const providedSecret =
-      req.headers.get("x-billing-ledger-audit-secret")?.trim() || "";
-    if (providedSecret !== expectedSecret) {
-      return json({ success: false, error: "Unauthorized" }, 401);
-    }
-
-    try {
-      const url = new URL(req.url);
-      const now = nowMs ?? Date.now();
-      const untilMs = parseOptionalTimestamp(url.searchParams.get("until")) ?? now;
-      const explicitSince = parseOptionalTimestamp(url.searchParams.get("since"));
-      const sinceMs =
-        explicitSince ??
-        untilMs - parseSinceHours(url.searchParams.get("sinceHours")) * 3600_000;
-      const clusterId =
-        url.searchParams.get("cluster")?.trim() ||
-        getBillingLedgerRuntime({ ...process.env, ...env }).clusterId;
-
-      const report = await buildCreatorSettlementReport({
-        store: store ?? (await resolveDefaultStore()),
-        clusterId,
-        sinceMs,
-        untilMs,
-        nowMs: now,
-      });
-
-      return json({ success: true, report });
-    } catch (error) {
-      return json(
-        {
-          success: false,
-          error: error instanceof Error ? error.message : String(error),
-        },
-        400
-      );
-    }
-  };
-}
-
-export const handleCreatorSettlementReport =
-  createCreatorSettlementReportHandler();

package/server/handlers/deepseekOcrHandler.ts

@@ -1,114 +0,0 @@
-import { getFileContentById } from "../../database/server/fileService";
-import { authenticateRequest } from "../../auth/utils";
-import { chargeExternalTool } from "../../ai/token/externalToolCost";
-
-export const handleDeepseekOcr = async (req: Request): Promise<Response> => {
-    const DEEPINFRA_API_KEY = process.env.DEEPINFRA_API_KEY;
-
-    if (req.method === "OPTIONS") {
-        return new Response(null, {
-            status: 204,
-            headers: {
-                "Access-Control-Allow-Origin": "*",
-                "Access-Control-Allow-Headers": "Content-Type, Authorization",
-            },
-        });
-    }
-
-    const auth = await authenticateRequest(req);
-    if (auth instanceof Response) return auth;
-
-    if (!DEEPINFRA_API_KEY) {
-        return new Response(JSON.stringify({ error: "Server missing DEEPINFRA_API_KEY environment variable" }), {
-            status: 500,
-            headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" }
-        });
-    }
-
-    try {
-        const body: any = await req.json();
-        const { imageUrl, prompt, dialogId } = body;
-
-        if (!imageUrl || typeof imageUrl !== "string") {
-            return new Response(JSON.stringify({ error: "缺少有效的 imageUrl 参数" }), {
-                status: 400,
-                headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" },
-            });
-        }
-
-        let finalImageUrl = imageUrl;
-
-        if (imageUrl && (imageUrl.startsWith("file-") || /^[0-9A-Z]{26}$/.test(imageUrl))) {
-            try {
-                const { buffer, metadata } = await getFileContentById(imageUrl);
-                const base64 = buffer.toString("base64");
-                finalImageUrl = `data:${metadata.mimeType || "image/png"};base64,${base64}`;
-            } catch (e: any) {
-                console.error(`Failed to resolve file content for ${imageUrl}:`, e);
-                if (imageUrl.startsWith("file-")) {
-                    return new Response(JSON.stringify({ error: `File not found or inaccessible: ${imageUrl}` }), {
-                        status: 404,
-                        headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" }
-                    });
-                }
-            }
-        }
-
-        const response = await fetch("https://api.deepinfra.com/v1/openai/chat/completions", {
-            method: "POST",
-            headers: {
-                "Authorization": `Bearer ${DEEPINFRA_API_KEY}`,
-                "Content-Type": "application/json",
-            },
-            body: JSON.stringify({
-                model: "deepseek-ai/DeepSeek-OCR",
-                messages: [
-                    {
-                        role: "user",
-                        content: [
-                            {
-                                type: "text",
-                                text: prompt || "识别图片中的所有文字"
-                            },
-                            {
-                                type: "image_url",
-                                image_url: {
-                                    url: finalImageUrl
-                                }
-                            }
-                        ]
-                    }
-                ],
-            }),
-        });
-
-        if (!response.ok) {
-            const errorText = await response.text();
-            return new Response(JSON.stringify({ error: `DeepInfra API error: ${errorText}` }), {
-                status: response.status,
-                headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" }
-            });
-        }
-
-        const data = await response.json();
-        await chargeExternalTool({
-            userId: auth.userId,
-            toolId: "deepseek-ai/DeepSeek-OCR",
-            dialogId,
-            inputTokens: data.usage?.prompt_tokens ?? 0,
-            outputTokens: data.usage?.completion_tokens ?? 0,
-            reason: "deepseek_ocr",
-        });
-        return new Response(JSON.stringify(data), {
-            status: 200,
-            headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" }
-        });
-
-    } catch (error: any) {
-        console.error("DeepseekOCR handler error:", error);
-        return new Response(JSON.stringify({ error: error.message }), {
-            status: 500,
-            headers: { "Content-Type": "application/json", "Access-Control-Allow-Origin": "*" }
-        });
-    }
-};