@ihazz/bitrix24 1.1.9 → 1.1.11

package/src/polling-service.ts

@@ -95,7 +95,8 @@ export class PollingService {
 
   /**
    * Start the blocking polling loop.
-   * Uses imbot.v2.Event.get which returns { events, lastEventId, hasMore }.
+   * Uses imbot.v2.Event.get which returns { events, nextOffset, hasMore }.
+   * Older payloads may still include lastEventId, so we tolerate both shapes.
    */
   async start(): Promise<void> {
     this.offset = await this.loadOffset();
@@ -115,7 +116,12 @@ export class PollingService {
         backoff.reset();
         this.rateLimitStreak = 0;
 
-        const { events, lastEventId, hasMore } = result;
+        const {
+          events,
+          nextOffset: reportedNextOffset,
+          lastEventId,
+          hasMore,
+        } = result;
         let nextOffset = this.offset;
 
         // Process events sequentially
@@ -133,11 +139,15 @@ export class PollingService {
           }
         }
 
+        if (typeof reportedNextOffset === 'number' && reportedNextOffset >= 0) {
+          nextOffset = Math.max(nextOffset, reportedNextOffset);
+        }
+
         // Advance offset only for events that were processed successfully.
-        if (events.length > 0 && nextOffset > this.offset) {
+        if (nextOffset > this.offset) {
           this.offset = nextOffset;
           await this.persistOffset(this.offset);
-        } else if (events.length > 0 && lastEventId < this.offset) {
+        } else if (events.length > 0 && typeof lastEventId === 'number' && lastEventId < this.offset) {
           this.logger.warn('Polling: lastEventId regressed', {
             lastEventId,
             currentOffset: this.offset,
@@ -162,6 +172,16 @@ export class PollingService {
             throw err;
           }
 
+          if (err.code === 'HTTP_404' && this.offset > 0) {
+            this.logger.warn('Polling offset is no longer valid, resetting to 0 after HTTP 404', {
+              previousOffset: this.offset,
+            });
+            this.offset = 0;
+            await this.persistOffset(this.offset);
+            backoff.reset();
+            continue;
+          }
+
           // Rate limit — short pause without exponential backoff
           if (err.code === RATE_LIMIT_CODE) {
             this.rateLimitStreak++;

package/src/send-service.ts

@@ -38,7 +38,12 @@ export class SendService {
   async sendText(
     ctx: SendContext,
     text: string,
-    options?: { keyboard?: B24Keyboard; convertMarkdown?: boolean; forwardMessages?: number[] },
+    options?: {
+      keyboard?: B24Keyboard;
+      convertMarkdown?: boolean;
+      forwardMessages?: number[];
+      system?: boolean;
+    },
   ): Promise<SendMessageResult> {
     const convertedText = options?.convertMarkdown !== false
       ? markdownToBbCode(text)
@@ -54,6 +59,7 @@ export class SendService {
       const msgOptions: {
         keyboard?: B24Keyboard;
         forwardMessages?: number[];
+        system?: boolean;
       } = {};
 
       if (isLast && options?.keyboard) {
@@ -62,6 +68,9 @@ export class SendService {
       if (isFirst && options?.forwardMessages?.length) {
         msgOptions.forwardMessages = options.forwardMessages;
       }
+      if (options?.system !== undefined) {
+        msgOptions.system = options.system;
+      }
 
       try {
         lastMessageId = await this.api.sendMessage(

package/src/types.ts

@@ -208,7 +208,8 @@ export interface B24V2FetchEventItem {
 /** Response from imbot.v2.Event.get */
 export interface B24V2EventGetResult {
   events: B24V2FetchEventItem[];
-  lastEventId: number;
+  nextOffset?: number;
+  lastEventId?: number;
   hasMore: boolean;
 }