nolo-cli 0.1.45 → 0.1.46

package/database/userDataMerge.ts

@@ -1,95 +0,0 @@
-import {
-  getRecordTimestamp,
-  isTombstoneRecord,
-  shouldReplaceWithNextRecord,
-} from "./tombstones";
-
-interface MergeableUserDataItem {
-  id?: string;
-  dbKey?: string;
-  contentKey?: string;
-  appKey?: string;
-  appId?: string;
-  [key: string]: any;
-}
-
-export const getUserDataItemTimestamp = (dataItem: MergeableUserDataItem): number =>
-  getRecordTimestamp(dataItem);
-
-const getItemKey = (item: MergeableUserDataItem): string | null => {
-  // dbKey 必须优先于 id：dbKey 是全局唯一的 "type-userId-id" 格式，
-  // 而 id 可能只是 ULID 短串，与本地 tombstone 的 dbKey 不匹配会导致
-  // merge 时 tombstone 无法覆盖远端活记录。
-  const candidates = [
-    typeof item.dbKey === "string" ? item.dbKey : undefined,
-    item.id,
-    typeof item.contentKey === "string" ? item.contentKey : undefined,
-    typeof item.appKey === "string" ? item.appKey : undefined,
-    typeof item.appId === "string" ? item.appId : undefined,
-  ];
-
-  for (const candidate of candidates) {
-    if (typeof candidate === "string" && candidate.trim().length > 0) {
-      return candidate;
-    }
-  }
-
-  return null;
-};
-
-export const mergeAndDedupUserData = (
-  localData: MergeableUserDataItem[],
-  remoteResults: any[],
-  options: { includeDeleted?: boolean } = {}
-): MergeableUserDataItem[] => {
-  const uniqueMap = new Map<string, MergeableUserDataItem>();
-
-  const mergeRecordMetadata = (
-    currentItem: MergeableUserDataItem,
-    nextItem: MergeableUserDataItem
-  ): MergeableUserDataItem => {
-    if (
-      typeof currentItem.serverOrigin !== "string" &&
-      typeof nextItem.serverOrigin === "string" &&
-      nextItem.serverOrigin.trim().length > 0
-    ) {
-      return {
-        ...currentItem,
-        serverOrigin: nextItem.serverOrigin,
-      };
-    }
-
-    return currentItem;
-  };
-
-  const addToMap = (item: MergeableUserDataItem) => {
-    const itemKey = getItemKey(item);
-    if (!itemKey) return;
-
-    const existing = uniqueMap.get(itemKey);
-    if (!existing) {
-      uniqueMap.set(itemKey, item);
-      return;
-    }
-
-    if (shouldReplaceWithNextRecord(item, existing)) {
-      uniqueMap.set(itemKey, item);
-      return;
-    }
-
-    uniqueMap.set(itemKey, mergeRecordMetadata(existing, item));
-  };
-
-  localData.forEach(addToMap);
-  remoteResults.forEach((result) => {
-    const items = result?.data?.data;
-    if (Array.isArray(items)) {
-      items.forEach(addToMap);
-    }
-  });
-
-  const merged = Array.from(uniqueMap.values());
-  return options.includeDeleted
-    ? merged
-    : merged.filter((item) => !isTombstoneRecord(item));
-};

package/database/userPreferenceRegister.ts

@@ -1,131 +0,0 @@
-import { DataType } from "../create/types";
-import { ulid } from ".//utils/ulid";
-
-export const USER_PREFERENCE_NAMES = {
-  AUTHORITY_HOME: "authority_home",
-  DEFAULT_SPACE: "space_default",
-  DEFAULT_AGENT: "agent_default",
-} as const;
-
-export type UserPreferenceName =
-  (typeof USER_PREFERENCE_NAMES)[keyof typeof USER_PREFERENCE_NAMES];
-
-export interface UserPreferenceRegisterRecord<T = unknown> {
-  type: DataType.SETTING;
-  registerType: "user_preference";
-  preferenceName: UserPreferenceName;
-  schemaVersion: 1;
-  userId: string;
-  value: T | null;
-  opId: string;
-  createdAt: number;
-  updatedAt: number;
-}
-
-const toTimestamp = (value: unknown): number => {
-  if (typeof value === "number" && Number.isFinite(value)) return value;
-  if (typeof value === "string") {
-    const parsed = Date.parse(value);
-    return Number.isFinite(parsed) ? parsed : 0;
-  }
-  return 0;
-};
-
-const normalizeAuthorityServer = (value: unknown): string | null => {
-  if (typeof value !== "string") return null;
-  const trimmed = value.trim().replace(/\/+$/, "");
-  return /^https?:\/\//i.test(trimmed) ? trimmed : null;
-};
-
-const nextRegisterUpdatedAt = (previousRecord?: Partial<UserPreferenceRegisterRecord>) => {
-  const previousTimestamp = Math.max(
-    toTimestamp(previousRecord?.updatedAt),
-    toTimestamp(previousRecord?.createdAt)
-  );
-  return Math.max(Date.now(), previousTimestamp + 1);
-};
-
-export const buildUserPreferenceRegisterRecord = <T>({
-  userId,
-  preferenceName,
-  value,
-  previousRecord,
-}: {
-  userId: string;
-  preferenceName: UserPreferenceName;
-  value: T | null;
-  previousRecord?: Partial<UserPreferenceRegisterRecord<T>> | null;
-}): UserPreferenceRegisterRecord<T> => {
-  const updatedAt = nextRegisterUpdatedAt(previousRecord ?? undefined);
-
-  return {
-    type: DataType.SETTING,
-    registerType: "user_preference",
-    preferenceName,
-    schemaVersion: 1,
-    userId,
-    value,
-    opId: ulid(),
-    createdAt: toTimestamp(previousRecord?.createdAt) || updatedAt,
-    updatedAt,
-  };
-};
-
-export const readUserPreferenceRegisterValue = <T>(
-  record: any,
-  preferenceName: UserPreferenceName
-): T | null | undefined => {
-  if (!record || typeof record !== "object") return undefined;
-  if (record.registerType !== "user_preference") return undefined;
-  if (record.preferenceName !== preferenceName) return undefined;
-  if (!("value" in record)) return undefined;
-  return record.value as T | null;
-};
-
-export const buildDefaultAgentPreferenceRegisterRecord = ({
-  userId,
-  defaultAgentId,
-  previousRecord,
-}: {
-  userId: string;
-  defaultAgentId: string | null;
-  previousRecord?: Partial<UserPreferenceRegisterRecord<string>> | null;
-}) =>
-  buildUserPreferenceRegisterRecord<string>({
-    userId,
-    preferenceName: USER_PREFERENCE_NAMES.DEFAULT_AGENT,
-    value: defaultAgentId,
-    previousRecord,
-  });
-
-export const buildAuthorityHomePreferenceRegisterRecord = ({
-  userId,
-  authorityServer,
-  previousRecord,
-}: {
-  userId: string;
-  authorityServer: string | null;
-  previousRecord?: Partial<UserPreferenceRegisterRecord<string>> | null;
-}) =>
-  buildUserPreferenceRegisterRecord<string>({
-    userId,
-    preferenceName: USER_PREFERENCE_NAMES.AUTHORITY_HOME,
-    value: normalizeAuthorityServer(authorityServer),
-    previousRecord,
-  });
-
-export const buildDefaultSpacePreferenceRegisterRecord = ({
-  userId,
-  defaultSpaceId,
-  previousRecord,
-}: {
-  userId: string;
-  defaultSpaceId: string | null;
-  previousRecord?: Partial<UserPreferenceRegisterRecord<string>> | null;
-}) =>
-  buildUserPreferenceRegisterRecord<string>({
-    userId,
-    preferenceName: USER_PREFERENCE_NAMES.DEFAULT_SPACE,
-    value: defaultSpaceId,
-    previousRecord,
-  });

package/database/utils/ulid.ts

@@ -1 +0,0 @@
-export { ulid } from "ulid";

package/defaultServer.ts

@@ -1 +0,0 @@
-export const DEFAULT_NOLO_SERVER_URL = "https://nolo.chat";

package/dialogAttachmentCleanup.ts

@@ -1,151 +0,0 @@
-import { deleteDbRecordOnServers, readDbRecordFromServers, type GlobalDeleteResult } from "./globalRecordOperations";
-import {
-  buildDialogAttachmentPlan,
-  extractFileContentIds,
-  type DialogAttachmentCandidate,
-  type DialogAttachmentPlan,
-} from "./chat/dialog/dialogAttachmentCleanup";
-
-export { buildDialogAttachmentPlan, extractFileContentIds };
-
-export type DialogAttachmentDeleteResult = {
-  fileId: string;
-  fileDbKey: string;
-  deleteResults: GlobalDeleteResult[];
-};
-
-function asText(value: unknown) {
-  return typeof value === "string" && value.trim() ? value.trim() : null;
-}
-
-async function readDialogMessages(args: {
-  authToken: string;
-  dialogId: string;
-  fetchImpl: typeof fetch;
-  serverUrl: string;
-}) {
-  const response = await args.fetchImpl(`${args.serverUrl}/rpc/getConvMsgs`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${args.authToken}`,
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({ dialogId: args.dialogId, limit: 10000 }),
-  });
-  if (!response.ok) {
-    throw new Error(`read dialog messages failed on ${args.serverUrl}: HTTP ${response.status}`);
-  }
-  const payload = await response.json();
-  return Array.isArray(payload) ? payload : [];
-}
-
-export async function planDialogAttachmentCleanup(args: {
-  authToken: string;
-  dialogId: string;
-  ownerId?: string | null;
-  includeUserOwnedReferenced?: boolean;
-  fallbackFetchImpl?: typeof fetch;
-  fetchImpl: typeof fetch;
-  serverUrl: string;
-  serverUrls: string[];
-}): Promise<DialogAttachmentPlan> {
-  const messages = await readDialogMessages({
-    authToken: args.authToken,
-    dialogId: args.dialogId,
-    fetchImpl: args.fetchImpl,
-    serverUrl: args.serverUrl,
-  });
-  const fileIds = [...new Set(messages.flatMap((message) => extractFileContentIds(message)))];
-  const metadataByFileId: Record<string, any> = {};
-  const metadataReadFailures: Array<{ fileId: string; error: string }> = [];
-
-  for (const fileId of fileIds) {
-    try {
-      const result = await readDbRecordFromServers({
-        authToken: args.authToken,
-        dbKey: `file-id-${fileId}`,
-        fallbackFetchImpl: args.fallbackFetchImpl,
-        fetchImpl: args.fetchImpl,
-        serverUrls: args.serverUrls,
-        label: `file metadata index ${fileId}`,
-      });
-      const mainKey = asText(result.record?.mainKey);
-      if (!mainKey) throw new Error(`file-id index missing mainKey`);
-      const metadata = await readDbRecordFromServers({
-        authToken: args.authToken,
-        dbKey: mainKey,
-        fallbackFetchImpl: args.fallbackFetchImpl,
-        fetchImpl: args.fetchImpl,
-        serverUrls: args.serverUrls,
-        label: `file metadata ${fileId}`,
-      });
-      metadataByFileId[fileId] = {
-        ...metadata.record,
-        dbKey: asText(metadata.record?.dbKey) ?? mainKey,
-      };
-    } catch (error) {
-      const fallbackKey =
-        args.ownerId && !fileId.startsWith("file-")
-          ? `file-${args.ownerId}-${fileId}`
-          : null;
-      if (fallbackKey) {
-        try {
-          const metadata = await readDbRecordFromServers({
-            authToken: args.authToken,
-            dbKey: fallbackKey,
-            fallbackFetchImpl: args.fallbackFetchImpl,
-            fetchImpl: args.fetchImpl,
-            serverUrls: args.serverUrls,
-            label: `file metadata ${fileId}`,
-          });
-          metadataByFileId[fileId] = {
-            ...metadata.record,
-            dbKey: asText(metadata.record?.dbKey) ?? fallbackKey,
-          };
-          continue;
-        } catch {
-          // Keep the original index error; it explains why the preferred path failed.
-        }
-      }
-      metadataReadFailures.push({
-        fileId,
-        error: error instanceof Error ? error.message : String(error),
-      });
-    }
-  }
-
-  return buildDialogAttachmentPlan({
-    dialogId: args.dialogId,
-    ownerId: args.ownerId,
-    includeUserOwnedReferenced: args.includeUserOwnedReferenced,
-    messages,
-    metadataByFileId,
-    metadataReadFailures,
-  });
-}
-
-export async function deleteDialogAttachmentCandidates(args: {
-  authToken: string;
-  candidates: DialogAttachmentCandidate[];
-  fallbackFetchImpl?: typeof fetch;
-  fetchImpl: typeof fetch;
-  serverUrls: string[];
-}): Promise<DialogAttachmentDeleteResult[]> {
-  const results: DialogAttachmentDeleteResult[] = [];
-  for (const candidate of args.candidates) {
-    if (candidate.status !== "delete" || !candidate.fileDbKey) continue;
-    const deleteResults = await deleteDbRecordOnServers({
-      authToken: args.authToken,
-      dbKey: candidate.fileDbKey,
-      fallbackFetchImpl: args.fallbackFetchImpl,
-      fetchImpl: args.fetchImpl,
-      serverUrls: args.serverUrls,
-    });
-    results.push({
-      fileId: candidate.fileId,
-      fileDbKey: candidate.fileDbKey,
-      deleteResults,
-    });
-  }
-  return results;
-}