gramobase 1.0.11 → 1.0.13

package/dist/index.d.cts

@@ -1,40 +1,9 @@
-import { B as BotWorkerPool, L as Lease, G as GramoBaseEvent, a as GramoBaseConfig, C as CollectionConfig, A as AuthConfig, U as UploadOptions, F as FileRecord, M as Migration, W as WorkerStats } from './BotWorkerPool-9ndHQt2g.cjs';
-export { b as ComparisonOperator, c as Filter, d as FindOptions, e as GramoBaseDocument, S as Session, f as UpdateOperators, g as User, h as WalEntry, i as WalOpType, j as WithId } from './BotWorkerPool-9ndHQt2g.cjs';
-import { z } from 'zod';
-import { C as Collection, G as GramoBaseAuth } from './GramoBaseAuth-CHNn2_e5.cjs';
+import { B as BotWorkerPool, G as GramoBaseEvent, a as GramoBaseConfig, S as SchemaLike, C as CollectionConfig, A as AuthConfig, U as UploadOptions, F as FileRecord, M as Migration, W as WorkerStats } from './BotWorkerPool-h_8a20dt.cjs';
+export { b as ComparisonOperator, c as Filter, d as FindOptions, e as GramoBaseDocument, I as InferSchema, L as Lease, f as Session, g as UpdateOperators, h as User, i as WalEntry, j as WalOpType, k as WithId } from './BotWorkerPool-h_8a20dt.cjs';
+import { R as Registry, C as Collection, G as GramoBaseAuth } from './GramoBaseAuth-ObeOxqKj.cjs';
 import EventEmitter from 'eventemitter3';
 import 'node-telegram-bot-api';
-
-/**
- * Registry uses a pinned Telegram message as a distributed lock.
- *
- * When a gramobase instance starts up, it reads the registry message.
- * If no lease exists or the existing lease is expired, it writes a new
- * lease with its own instanceId and begins sending heartbeats.
- *
- * This prevents multiple writer processes from corrupting the index
- * (last-write-wins races on the pinned index message).
- *
- * Read-only operations are always permitted. Only index mutations
- * require holding the write lease.
- */
-declare class Registry {
-    private pool;
-    private channelId;
-    private debug;
-    private state;
-    private readonly instanceId;
-    constructor(pool: BotWorkerPool, channelId: string, debug?: boolean);
-    acquireWriteLease(): Promise<Lease>;
-    releaseWriteLease(): Promise<void>;
-    forceRelease(): Promise<void>;
-    isWriteLeaseHeld(): Promise<boolean>;
-    private heartbeat;
-    private readRegistryMessage;
-    private writeRegistryMessage;
-    getInstanceId(): string;
-    getCurrentLease(): Lease | null;
-}
+import 'zod';
 
 type Unsubscribe = () => void;
 /**
@@ -78,7 +47,7 @@ declare class GramoBase {
     constructor(config: GramoBaseConfig);
     connect(): Promise<this>;
     disconnect(): Promise<void>;
-    collection<T extends z.ZodType>(name: string, config: CollectionConfig<T>): Collection<T>;
+    collection<T extends SchemaLike>(name: string, config: CollectionConfig<T>): Collection<T>;
     createAuth(config: AuthConfig): GramoBaseAuth;
     uploadFile(data: Buffer, options?: UploadOptions): Promise<FileRecord>;
     getFileUrl(fileId: string): Promise<string>;
@@ -101,4 +70,4 @@ declare class GramoBase {
 }
 declare function createClient(config: GramoBaseConfig): GramoBase;
 
-export { AuthConfig, Collection, CollectionConfig, FileRecord, GramoBase, GramoBaseAuth, GramoBaseConfig, GramoBaseEvent, Lease, Migration, RealtimeManager, UploadOptions, createClient };
+export { AuthConfig, Collection, CollectionConfig, FileRecord, GramoBase, GramoBaseAuth, GramoBaseConfig, GramoBaseEvent, Migration, RealtimeManager, SchemaLike, UploadOptions, createClient };

package/dist/index.d.ts

@@ -1,40 +1,9 @@
-import { B as BotWorkerPool, L as Lease, G as GramoBaseEvent, a as GramoBaseConfig, C as CollectionConfig, A as AuthConfig, U as UploadOptions, F as FileRecord, M as Migration, W as WorkerStats } from './BotWorkerPool-9ndHQt2g.js';
-export { b as ComparisonOperator, c as Filter, d as FindOptions, e as GramoBaseDocument, S as Session, f as UpdateOperators, g as User, h as WalEntry, i as WalOpType, j as WithId } from './BotWorkerPool-9ndHQt2g.js';
-import { z } from 'zod';
-import { C as Collection, G as GramoBaseAuth } from './GramoBaseAuth-00fg0u_b.js';
+import { B as BotWorkerPool, G as GramoBaseEvent, a as GramoBaseConfig, S as SchemaLike, C as CollectionConfig, A as AuthConfig, U as UploadOptions, F as FileRecord, M as Migration, W as WorkerStats } from './BotWorkerPool-h_8a20dt.js';
+export { b as ComparisonOperator, c as Filter, d as FindOptions, e as GramoBaseDocument, I as InferSchema, L as Lease, f as Session, g as UpdateOperators, h as User, i as WalEntry, j as WalOpType, k as WithId } from './BotWorkerPool-h_8a20dt.js';
+import { R as Registry, C as Collection, G as GramoBaseAuth } from './GramoBaseAuth-DfRKq2yW.js';
 import EventEmitter from 'eventemitter3';
 import 'node-telegram-bot-api';
-
-/**
- * Registry uses a pinned Telegram message as a distributed lock.
- *
- * When a gramobase instance starts up, it reads the registry message.
- * If no lease exists or the existing lease is expired, it writes a new
- * lease with its own instanceId and begins sending heartbeats.
- *
- * This prevents multiple writer processes from corrupting the index
- * (last-write-wins races on the pinned index message).
- *
- * Read-only operations are always permitted. Only index mutations
- * require holding the write lease.
- */
-declare class Registry {
-    private pool;
-    private channelId;
-    private debug;
-    private state;
-    private readonly instanceId;
-    constructor(pool: BotWorkerPool, channelId: string, debug?: boolean);
-    acquireWriteLease(): Promise<Lease>;
-    releaseWriteLease(): Promise<void>;
-    forceRelease(): Promise<void>;
-    isWriteLeaseHeld(): Promise<boolean>;
-    private heartbeat;
-    private readRegistryMessage;
-    private writeRegistryMessage;
-    getInstanceId(): string;
-    getCurrentLease(): Lease | null;
-}
+import 'zod';
 
 type Unsubscribe = () => void;
 /**
@@ -78,7 +47,7 @@ declare class GramoBase {
     constructor(config: GramoBaseConfig);
     connect(): Promise<this>;
     disconnect(): Promise<void>;
-    collection<T extends z.ZodType>(name: string, config: CollectionConfig<T>): Collection<T>;
+    collection<T extends SchemaLike>(name: string, config: CollectionConfig<T>): Collection<T>;
     createAuth(config: AuthConfig): GramoBaseAuth;
     uploadFile(data: Buffer, options?: UploadOptions): Promise<FileRecord>;
     getFileUrl(fileId: string): Promise<string>;
@@ -101,4 +70,4 @@ declare class GramoBase {
 }
 declare function createClient(config: GramoBaseConfig): GramoBase;
 
-export { AuthConfig, Collection, CollectionConfig, FileRecord, GramoBase, GramoBaseAuth, GramoBaseConfig, GramoBaseEvent, Lease, Migration, RealtimeManager, UploadOptions, createClient };
+export { AuthConfig, Collection, CollectionConfig, FileRecord, GramoBase, GramoBaseAuth, GramoBaseConfig, GramoBaseEvent, Migration, RealtimeManager, SchemaLike, UploadOptions, createClient };

package/dist/index.js

@@ -270,9 +270,10 @@ var INDEX_TAG = "__GRAMOBASE_INDEX__";
 var DOC_TAG = "__GRAMOBASE_DOC__";
 var MAX_MSG_BYTES = 4e3;
 var TelegramStorage = class {
-  constructor(pool, defaultChannelId, encryptionKey, debug = false) {
+  constructor(pool, defaultChannelId, registry, encryptionKey, debug = false) {
     this.pool = pool;
     this.defaultChannelId = defaultChannelId;
+    this.registry = registry;
     this.debug = debug;
     if (encryptionKey) {
       this.encryptionKey = createHash("sha256").update(encryptionKey).digest();
@@ -280,20 +281,52 @@ var TelegramStorage = class {
   }
   pool;
   defaultChannelId;
+  registry;
   debug;
   encryptionKey = null;
   // collection → pinned index message ID
   indexMsgIds = /* @__PURE__ */ new Map();
   // ─── Index management ─────────────────────────────────────────────────────
+  async readRawMessageText(msgId, channel) {
+    try {
+      const msg = await this.pool.execute(
+        (bot) => bot.forwardMessage(channel, channel, msgId)
+      );
+      if (!msg?.text) return null;
+      let text = msg.text;
+      if (this.encryptionKey && text.startsWith("ENC:")) {
+        text = this.decrypt(text);
+      }
+      return text;
+    } catch {
+      return null;
+    }
+  }
   async loadIndex(collection, channelId) {
     const channel = channelId ?? this.defaultChannelId;
+    try {
+      const msgId = await this.registry.getCollectionIndexMsgId(collection);
+      if (msgId) {
+        const text = await this.readRawMessageText(msgId, channel);
+        if (text && text.startsWith(INDEX_TAG)) {
+          const json = text.replace(INDEX_TAG + "\n", "");
+          const parsed = JSON.parse(json);
+          this.indexMsgIds.set(collection, msgId);
+          return parsed;
+        }
+      }
+    } catch {
+    }
     try {
       const chat = await this.pool.execute((bot) => bot.getChat(channel));
       if (chat.pinned_message?.text?.startsWith(INDEX_TAG)) {
         const json = chat.pinned_message.text.replace(INDEX_TAG + "\n", "");
         const parsed = JSON.parse(json);
-        this.indexMsgIds.set(collection, chat.pinned_message.message_id);
-        return parsed;
+        if (parsed.collection === collection) {
+          this.indexMsgIds.set(collection, chat.pinned_message.message_id);
+          await this.registry.setCollectionIndexMsgId(collection, chat.pinned_message.message_id);
+          return parsed;
+        }
       }
     } catch {
     }
@@ -308,7 +341,7 @@ var TelegramStorage = class {
     const channel = channelId ?? this.defaultChannelId;
     const text = `${INDEX_TAG}
 ${JSON.stringify(index)}`;
-    const existingMsgId = this.indexMsgIds.get(index.collection);
+    const existingMsgId = this.indexMsgIds.get(index.collection) || await this.registry.getCollectionIndexMsgId(index.collection);
     if (existingMsgId) {
       try {
         await this.pool.execute(
@@ -324,10 +357,9 @@ ${JSON.stringify(index)}`;
     const msg = await this.pool.execute(
       (bot) => bot.sendMessage(channel, text, { disable_notification: true })
     );
-    this.indexMsgIds.set(index.collection, msg.message_id);
-    await this.pool.execute(
-      (bot) => bot.pinChatMessage(channel, msg.message_id, { disable_notification: true })
-    );
+    const newMsgId = msg.message_id;
+    this.indexMsgIds.set(index.collection, newMsgId);
+    await this.registry.setCollectionIndexMsgId(index.collection, newMsgId);
   }
   // ─── Document CRUD ────────────────────────────────────────────────────────
   async writeDocument(doc, channelId) {
@@ -347,10 +379,9 @@ ${JSON.stringify(index)}`;
   async readDocument(msgId, channelId) {
     const channel = channelId ?? this.defaultChannelId;
     try {
-      const msgs = await this.pool.execute(
-        (bot) => bot.forwardMessages(channel, channel, [msgId])
+      const msg = await this.pool.execute(
+        (bot) => bot.forwardMessage(channel, channel, msgId)
       );
-      const msg = Array.isArray(msgs) ? msgs[0] : msgs;
       if (!msg?.text) return null;
       let text = msg.text;
       if (this.encryptionKey && text.startsWith("ENC:")) {
@@ -361,6 +392,7 @@ ${JSON.stringify(index)}`;
       }
       const parsed = JSON.parse(text);
       delete parsed[DOC_TAG];
+      parsed._msgId = msgId;
       return parsed;
     } catch {
       return null;
@@ -399,10 +431,9 @@ ${JSON.stringify(index)}`;
     const msgIds = JSON.parse(headerText.replace("CHUNK:", ""));
     const parts = [];
     for (const id of msgIds) {
-      const msgs = await this.pool.execute(
-        (bot) => bot.forwardMessages(channel, channel, [id])
+      const msg = await this.pool.execute(
+        (bot) => bot.forwardMessage(channel, channel, id)
       );
-      const msg = Array.isArray(msgs) ? msgs[0] : msgs;
       if (msg?.text) parts.push(msg.text);
     }
     return parts.join("");
@@ -603,7 +634,8 @@ var Registry = class {
     this.state = {
       activeLease: null,
       instanceId: this.instanceId,
-      registryMsgId: null
+      registryMsgId: null,
+      indexes: {}
     };
   }
   pool;
@@ -611,14 +643,33 @@ var Registry = class {
   debug;
   state;
   instanceId;
-  async acquireWriteLease() {
+  async acquireWriteLease(options = { wait: true }) {
     const existing = await this.readRegistryMessage();
     if (existing?.activeLease) {
       const lease2 = existing.activeLease;
       if (lease2.instanceId !== this.instanceId && Date.now() < lease2.expiresAt) {
-        throw new Error(
-          `[gramobase Registry] Another instance (${lease2.instanceId}) holds the write lease until ${new Date(lease2.expiresAt).toISOString()}. Use Registry.forceRelease() to break a stale lease.`
-        );
+        if (!options.wait) {
+          throw new Error(
+            `[gramobase Registry] Another instance (${lease2.instanceId}) holds the write lease until ${new Date(
+              lease2.expiresAt
+            ).toISOString()}. Use Registry.forceRelease() to break a stale lease.`
+          );
+        }
+        const waitMs = lease2.expiresAt - Date.now() + 250;
+        if (this.debug) {
+          console.log(
+            `[Registry] Lease held by ${lease2.instanceId}, waiting ${waitMs}ms for it to expire...`
+          );
+        }
+        await new Promise((resolve) => setTimeout(resolve, waitMs));
+        const recheckState = await this.readRegistryMessage();
+        if (recheckState?.activeLease && recheckState.activeLease.instanceId !== this.instanceId && Date.now() < recheckState.activeLease.expiresAt) {
+          throw new Error(
+            `[gramobase Registry] Another instance (${recheckState.activeLease.instanceId}) holds the write lease until ${new Date(
+              recheckState.activeLease.expiresAt
+            ).toISOString()}. Use Registry.forceRelease() to break a stale lease.`
+          );
+        }
       }
     }
     const lease = {
@@ -670,15 +721,26 @@ var Registry = class {
       if (chat.pinned_message?.text?.startsWith(REGISTRY_TAG)) {
         this.state.registryMsgId = chat.pinned_message.message_id;
         const json = chat.pinned_message.text.replace(REGISTRY_TAG + "\n", "");
-        return JSON.parse(json);
+        const parsed = JSON.parse(json);
+        this.state.indexes = parsed.indexes || {};
+        return parsed;
       }
     } catch {
     }
     return null;
   }
   async writeRegistryMessage(data) {
+    let leasePayload = null;
+    if (data.activeLease) {
+      const { heartbeatInterval, ...rest } = data.activeLease;
+      leasePayload = rest;
+    }
+    const payload = {
+      activeLease: leasePayload,
+      indexes: data.indexes || this.state.indexes || {}
+    };
     const text = `${REGISTRY_TAG}
-${JSON.stringify(data, null, 0)}`;
+${JSON.stringify(payload, null, 0)}`;
     if (this.state.registryMsgId) {
       try {
         await this.pool.execute(
@@ -701,6 +763,22 @@ ${JSON.stringify(data, null, 0)}`;
       })
     );
   }
+  async getCollectionIndexMsgId(collection) {
+    if (!this.state.registryMsgId) {
+      await this.readRegistryMessage();
+    }
+    return this.state.indexes[collection] || null;
+  }
+  async setCollectionIndexMsgId(collection, msgId) {
+    if (!this.state.registryMsgId) {
+      await this.readRegistryMessage();
+    }
+    this.state.indexes[collection] = msgId;
+    await this.writeRegistryMessage({
+      activeLease: this.state.activeLease,
+      indexes: this.state.indexes
+    });
+  }
   getInstanceId() {
     return this.instanceId;
   }
@@ -1456,9 +1534,15 @@ var GramoBase = class {
     const tokens = Array.isArray(config.botToken) ? config.botToken : [config.botToken];
     this.pool = new BotWorkerPool(tokens, config.concurrency ?? 25, config.debug ?? false);
     this.cache = new HotCache(config.cacheMaxBytes, config.cacheTtlMs);
+    this.registry = new Registry(
+      this.pool,
+      config.indexChannelId ?? config.channelId,
+      config.debug ?? false
+    );
     this.storage = new TelegramStorage(
       this.pool,
       config.channelId,
+      this.registry,
       config.encryptionKey,
       config.debug ?? false
     );
@@ -1467,11 +1551,6 @@ var GramoBase = class {
       config.walChannelId ?? config.channelId,
       config.debug ?? false
     );
-    this.registry = new Registry(
-      this.pool,
-      config.indexChannelId ?? config.channelId,
-      config.debug ?? false
-    );
     this.realtime = new RealtimeManager(
       this.pool,
       config.webhookUrl,
@@ -1602,7 +1681,20 @@ var GramoBase = class {
     }
   }
 };
+var globalForGramo = globalThis;
 function createClient(config) {
+  if (config.global) {
+    if (!globalForGramo.__gramobase_clients__) {
+      globalForGramo.__gramobase_clients__ = /* @__PURE__ */ new Map();
+    }
+    const cacheKey = Array.isArray(config.botToken) ? `${config.channelId}:${config.botToken.join(",")}` : `${config.channelId}:${config.botToken}`;
+    if (globalForGramo.__gramobase_clients__.has(cacheKey)) {
+      return globalForGramo.__gramobase_clients__.get(cacheKey);
+    }
+    const client = new GramoBase(config);
+    globalForGramo.__gramobase_clients__.set(cacheKey, client);
+    return client;
+  }
   return new GramoBase(config);
 }