@mastra/google-cloud-pubsub 1.0.2 → 1.0.3-alpha.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @mastra/inngest
 
+## 1.0.3-alpha.0
+
+### Patch Changes
+
+- Add `nack` support and `deliveryAttempt` tracking on the subscriber callback, and enable exactly-once delivery on grouped subscriptions. ([#15307](https://github.com/mastra-ai/mastra/pull/15307))
+
+- Updated dependencies [[`d63ffdb`](https://github.com/mastra-ai/mastra/commit/d63ffdbb2c11e76fe5ea45faab44bc15460f010c)]:
+  - @mastra/core@1.25.1-alpha.0
+
 ## 1.0.2
 
 ### Patch Changes

package/LICENSE.md

@@ -1,3 +1,18 @@
+Portions of this software are licensed as follows:
+
+- All content that resides under any directory named "ee/" within this
+  repository, including but not limited to:
+  - `packages/core/src/auth/ee/`
+  - `packages/server/src/server/auth/ee/`
+    is licensed under the license defined in `ee/LICENSE`.
+
+- All third-party components incorporated into the Mastra Software are
+  licensed under the original license provided by the owner of the
+  applicable component.
+
+- Content outside of the above-mentioned directories or restrictions is
+  available under the "Apache License 2.0" as defined below.
+
 # Apache License 2.0
 
 Copyright (c) 2025 Kepler Software, Inc.

package/dist/index.cjs

@@ -10,12 +10,18 @@ var GoogleCloudPubSub = class extends events.PubSub {
   ackBuffer = {};
   activeSubscriptions = {};
   activeCbs = {};
+  // Tracks the actual anonymous message listener registered on each subscription,
+  // so we can remove it cleanly on the final unsubscribe.
+  messageListeners = {};
   constructor(config) {
     super();
     this.pubsub = new pubsub.PubSub(config);
     this.instanceId = crypto.randomUUID();
   }
-  getSubscriptionName(topic) {
+  getSubscriptionName(topic, group) {
+    if (group) {
+      return `${topic}-${group}`;
+    }
     return `${topic}-${this.instanceId}`;
   }
   async ackMessage(topic, message) {
@@ -29,19 +35,29 @@ var GoogleCloudPubSub = class extends events.PubSub {
       console.error("Error acking message", e);
     }
   }
-  async init(topicName) {
+  async init(topicName, group) {
     try {
       await this.pubsub.createTopic(topicName);
     } catch {
     }
+    const subscriptionName = this.getSubscriptionName(topicName, group);
+    const subscriptionKey = group ? `${topicName}:${group}` : topicName;
     try {
-      const [sub] = await this.pubsub.topic(topicName).createSubscription(this.getSubscriptionName(topicName), {
+      const [sub] = await this.pubsub.topic(topicName).createSubscription(subscriptionName, {
         enableMessageOrdering: true,
-        enableExactlyOnceDelivery: topicName === "workflows" ? true : false
+        enableExactlyOnceDelivery: topicName === "workflows" || !!group
       });
-      this.activeSubscriptions[topicName] = sub;
+      this.activeSubscriptions[subscriptionKey] = sub;
       return sub;
     } catch {
+      if (group) {
+        try {
+          const sub = this.pubsub.subscription(subscriptionName);
+          this.activeSubscriptions[subscriptionKey] = sub;
+          return sub;
+        } catch {
+        }
+      }
     }
     return void 0;
   }
@@ -77,7 +93,7 @@ var GoogleCloudPubSub = class extends events.PubSub {
       }
     }
   }
-  async subscribe(topic, cb) {
+  async subscribe(topic, cb, options) {
     if (topic.startsWith("workflow.events.")) {
       const parts = topic.split(".");
       if (parts[parts.length - 2] === "v2") {
@@ -86,48 +102,79 @@ var GoogleCloudPubSub = class extends events.PubSub {
         topic = "workflow.events.v1";
       }
     }
-    const subscription = this.activeSubscriptions[topic] ?? await this.init(topic);
+    const group = options?.group;
+    const subscriptionKey = group ? `${topic}:${group}` : topic;
+    const subscription = this.activeSubscriptions[subscriptionKey] ?? await this.init(topic, group);
     if (!subscription) {
       throw new Error(`Failed to subscribe to topic: ${topic}`);
     }
-    this.activeSubscriptions[topic] = subscription;
-    const activeCbs = this.activeCbs[topic] ?? /* @__PURE__ */ new Set();
+    this.activeSubscriptions[subscriptionKey] = subscription;
+    const activeCbs = this.activeCbs[subscriptionKey] ?? /* @__PURE__ */ new Set();
     activeCbs.add(cb);
-    this.activeCbs[topic] = activeCbs;
+    this.activeCbs[subscriptionKey] = activeCbs;
     if (subscription.isOpen) {
       return;
     }
-    subscription.on("message", async (message) => {
+    const messageListener = async (message) => {
       const event = JSON.parse(message.data.toString());
       event.id = message.id;
       event.createdAt = message.publishTime;
+      event.deliveryAttempt = message.deliveryAttempt ?? 1;
       try {
-        const activeCbs2 = this.activeCbs[topic] ?? [];
+        const activeCbs2 = this.activeCbs[subscriptionKey] ?? [];
         for (const cb2 of activeCbs2) {
-          cb2(event, async () => {
-            try {
-              await this.ackMessage(topic, message);
-            } catch (e) {
-              console.error("Error acking message", e);
+          cb2(
+            event,
+            async () => {
+              try {
+                await this.ackMessage(subscriptionKey, message);
+              } catch (e) {
+                console.error("Error acking message", e);
+              }
+            },
+            async () => {
+              try {
+                message.nack();
+              } catch (e) {
+                console.error("Error nacking message", e);
+              }
             }
-          });
+          );
         }
       } catch (error) {
         console.error("Error processing event", error);
       }
-    });
+    };
+    this.messageListeners[subscriptionKey] = messageListener;
+    subscription.on("message", messageListener);
     subscription.on("error", async (error) => {
       console.error("subscription error", error);
     });
   }
   async unsubscribe(topic, cb) {
-    const subscription = this.activeSubscriptions[topic] ?? this.pubsub.subscription(this.getSubscriptionName(topic));
-    const activeCbs = this.activeCbs[topic] ?? /* @__PURE__ */ new Set();
-    activeCbs.delete(cb);
-    this.activeCbs[topic] = activeCbs;
-    if (activeCbs.size === 0) {
-      subscription.removeListener("message", cb);
-      await subscription.close();
+    const keysToCheck = [topic];
+    for (const key of Object.keys(this.activeCbs)) {
+      if (key.startsWith(`${topic}:`) && !keysToCheck.includes(key)) {
+        keysToCheck.push(key);
+      }
+    }
+    for (const subscriptionKey of keysToCheck) {
+      const activeCbs = this.activeCbs[subscriptionKey];
+      if (activeCbs?.has(cb)) {
+        activeCbs.delete(cb);
+        if (activeCbs.size === 0) {
+          const subscription = this.activeSubscriptions[subscriptionKey];
+          const listener = this.messageListeners[subscriptionKey];
+          if (subscription) {
+            if (listener) subscription.removeListener("message", listener);
+            await subscription.close();
+          }
+          delete this.activeSubscriptions[subscriptionKey];
+          delete this.activeCbs[subscriptionKey];
+          delete this.messageListeners[subscriptionKey];
+        }
+        return;
+      }
     }
   }
   async flush() {

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["PubSub","PubSubClient","activeCbs","cb"],"mappings":"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","file":"index.cjs","sourcesContent":["import { PubSub as PubSubClient } from '@google-cloud/pubsub';\nimport type { ClientConfig, Message, Subscription } from '@google-cloud/pubsub';\nimport { PubSub } from '@mastra/core/events';\nimport type { Event } from '@mastra/core/events';\n\nexport class GoogleCloudPubSub extends PubSub {\n  private instanceId: string;\n  private pubsub: PubSubClient;\n  private ackBuffer: Record<string, Promise<any>> = {};\n  private activeSubscriptions: Record<string, Subscription> = {};\n  private activeCbs: Record<string, Set<(event: Event, ack: () => Promise<void>) => void>> = {};\n\n  constructor(config: ClientConfig) {\n    super();\n    this.pubsub = new PubSubClient(config);\n    this.instanceId = crypto.randomUUID();\n  }\n\n  getSubscriptionName(topic: string) {\n    return `${topic}-${this.instanceId}`;\n  }\n\n  async ackMessage(topic: string, message: Message) {\n    try {\n      const ackResponse = Promise.race([message.ackWithResponse(), new Promise(resolve => setTimeout(resolve, 5000))]);\n      this.ackBuffer[topic + '-' + message.id] = ackResponse.catch(() => {});\n      await ackResponse;\n      delete this.ackBuffer[topic + '-' + message.id];\n    } catch (e) {\n      console.error('Error acking message', e);\n    }\n  }\n\n  async init(topicName: string) {\n    try {\n      await this.pubsub.createTopic(topicName);\n    } catch {\n      // no-op\n    }\n    try {\n      const [sub] = await this.pubsub.topic(topicName).createSubscription(this.getSubscriptionName(topicName), {\n        enableMessageOrdering: true,\n        enableExactlyOnceDelivery: topicName === 'workflows' ? true : false,\n      });\n      this.activeSubscriptions[topicName] = sub;\n      return sub;\n    } catch {\n      // no-op\n    }\n\n    return undefined;\n  }\n\n  async destroy(topicName: string) {\n    const subName = this.getSubscriptionName(topicName);\n    delete this.activeSubscriptions[topicName];\n    this.pubsub.subscription(subName).removeAllListeners();\n    await this.pubsub.subscription(subName).close();\n    await this.pubsub.subscription(subName).delete();\n    await this.pubsub.topic(topicName).delete();\n  }\n\n  async publish(topicName: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void> {\n    if (topicName.startsWith('workflow.events.')) {\n      const parts = topicName.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topicName = 'workflow.events.v2';\n      } else {\n        topicName = 'workflow.events.v1';\n      }\n    }\n\n    let topic = this.pubsub.topic(topicName);\n\n    try {\n      await topic.publishMessage({\n        data: Buffer.from(JSON.stringify(event)),\n        orderingKey: 'workflows',\n      });\n    } catch (e: any) {\n      if (e.code === 5) {\n        await this.pubsub.createTopic(topicName);\n        await this.publish(topicName, event);\n      } else {\n        throw e;\n      }\n    }\n  }\n\n  async subscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void> {\n    if (topic.startsWith('workflow.events.')) {\n      const parts = topic.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topic = 'workflow.events.v2';\n      } else {\n        topic = 'workflow.events.v1';\n      }\n    }\n\n    // Update tracked callbacks\n    const subscription = this.activeSubscriptions[topic] ?? (await this.init(topic));\n    if (!subscription) {\n      throw new Error(`Failed to subscribe to topic: ${topic}`);\n    }\n\n    this.activeSubscriptions[topic] = subscription;\n\n    const activeCbs = this.activeCbs[topic] ?? new Set();\n    activeCbs.add(cb);\n    this.activeCbs[topic] = activeCbs;\n\n    if (subscription.isOpen) {\n      return;\n    }\n\n    subscription.on('message', async message => {\n      const event = JSON.parse(message.data.toString()) as Event;\n      event.id = message.id;\n      event.createdAt = message.publishTime;\n\n      try {\n        const activeCbs = this.activeCbs[topic] ?? [];\n        for (const cb of activeCbs) {\n          cb(event, async () => {\n            try {\n              await this.ackMessage(topic, message);\n            } catch (e) {\n              console.error('Error acking message', e);\n            }\n          });\n        }\n      } catch (error) {\n        console.error('Error processing event', error);\n      }\n    });\n\n    subscription.on('error', async error => {\n      // if (error.code === 5) {\n      //   await this.init(topic);\n      // } else {\n      //   // TODO: determine if other errors require re-subscription\n      //   // console.error('subscription error, retrying in 5 seconds', error);\n      //   // await new Promise(resolve => setTimeout(resolve, 5000));\n      //   // await this.subscribe(topic, cb);\n      //   console.error('subscription error', error);\n      // }\n      console.error('subscription error', error);\n    });\n  }\n\n  async unsubscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void> {\n    const subscription = this.activeSubscriptions[topic] ?? this.pubsub.subscription(this.getSubscriptionName(topic));\n    const activeCbs = this.activeCbs[topic] ?? new Set();\n    activeCbs.delete(cb);\n    this.activeCbs[topic] = activeCbs;\n\n    if (activeCbs.size === 0) {\n      subscription.removeListener('message', cb);\n      await subscription.close();\n    }\n  }\n\n  async flush(): Promise<void> {\n    await Promise.all(Object.values(this.ackBuffer));\n  }\n}\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":["PubSub","PubSubClient","activeCbs","cb"],"mappings":"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","file":"index.cjs","sourcesContent":["import { PubSub as PubSubClient } from '@google-cloud/pubsub';\nimport type { ClientConfig, Message, Subscription } from '@google-cloud/pubsub';\nimport { PubSub } from '@mastra/core/events';\nimport type { Event, EventCallback, SubscribeOptions } from '@mastra/core/events';\n\nexport class GoogleCloudPubSub extends PubSub {\n  private instanceId: string;\n  private pubsub: PubSubClient;\n  private ackBuffer: Record<string, Promise<any>> = {};\n  private activeSubscriptions: Record<string, Subscription> = {};\n  private activeCbs: Record<string, Set<EventCallback>> = {};\n  // Tracks the actual anonymous message listener registered on each subscription,\n  // so we can remove it cleanly on the final unsubscribe.\n  private messageListeners: Record<string, (message: Message) => void> = {};\n\n  constructor(config: ClientConfig) {\n    super();\n    this.pubsub = new PubSubClient(config);\n    this.instanceId = crypto.randomUUID();\n  }\n\n  getSubscriptionName(topic: string, group?: string) {\n    if (group) {\n      return `${topic}-${group}`;\n    }\n    return `${topic}-${this.instanceId}`;\n  }\n\n  async ackMessage(topic: string, message: Message) {\n    try {\n      const ackResponse = Promise.race([message.ackWithResponse(), new Promise(resolve => setTimeout(resolve, 5000))]);\n      this.ackBuffer[topic + '-' + message.id] = ackResponse.catch(() => {});\n      await ackResponse;\n      delete this.ackBuffer[topic + '-' + message.id];\n    } catch (e) {\n      console.error('Error acking message', e);\n    }\n  }\n\n  async init(topicName: string, group?: string) {\n    try {\n      await this.pubsub.createTopic(topicName);\n    } catch {\n      // no-op\n    }\n    const subscriptionName = this.getSubscriptionName(topicName, group);\n    const subscriptionKey = group ? `${topicName}:${group}` : topicName;\n    try {\n      const [sub] = await this.pubsub.topic(topicName).createSubscription(subscriptionName, {\n        enableMessageOrdering: true,\n        enableExactlyOnceDelivery: topicName === 'workflows' || !!group,\n      });\n      this.activeSubscriptions[subscriptionKey] = sub;\n      return sub;\n    } catch {\n      // Subscription may already exist (e.g. shared group subscription created by another process).\n      // Get the existing subscription instead.\n      if (group) {\n        try {\n          const sub = this.pubsub.subscription(subscriptionName);\n          this.activeSubscriptions[subscriptionKey] = sub;\n          return sub;\n        } catch {\n          // no-op\n        }\n      }\n    }\n\n    return undefined;\n  }\n\n  async destroy(topicName: string) {\n    const subName = this.getSubscriptionName(topicName);\n    delete this.activeSubscriptions[topicName];\n    this.pubsub.subscription(subName).removeAllListeners();\n    await this.pubsub.subscription(subName).close();\n    await this.pubsub.subscription(subName).delete();\n    await this.pubsub.topic(topicName).delete();\n  }\n\n  async publish(topicName: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void> {\n    if (topicName.startsWith('workflow.events.')) {\n      const parts = topicName.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topicName = 'workflow.events.v2';\n      } else {\n        topicName = 'workflow.events.v1';\n      }\n    }\n\n    let topic = this.pubsub.topic(topicName);\n\n    try {\n      await topic.publishMessage({\n        data: Buffer.from(JSON.stringify(event)),\n        orderingKey: 'workflows',\n      });\n    } catch (e: any) {\n      if (e.code === 5) {\n        await this.pubsub.createTopic(topicName);\n        await this.publish(topicName, event);\n      } else {\n        throw e;\n      }\n    }\n  }\n\n  async subscribe(topic: string, cb: EventCallback, options?: SubscribeOptions): Promise<void> {\n    if (topic.startsWith('workflow.events.')) {\n      const parts = topic.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topic = 'workflow.events.v2';\n      } else {\n        topic = 'workflow.events.v1';\n      }\n    }\n\n    const group = options?.group;\n    // Use a composite key when group is set so grouped and non-grouped subscriptions\n    // on the same topic don't collide\n    const subscriptionKey = group ? `${topic}:${group}` : topic;\n\n    // Update tracked callbacks\n    const subscription = this.activeSubscriptions[subscriptionKey] ?? (await this.init(topic, group));\n    if (!subscription) {\n      throw new Error(`Failed to subscribe to topic: ${topic}`);\n    }\n\n    this.activeSubscriptions[subscriptionKey] = subscription;\n\n    const activeCbs = this.activeCbs[subscriptionKey] ?? new Set();\n    activeCbs.add(cb);\n    this.activeCbs[subscriptionKey] = activeCbs;\n\n    if (subscription.isOpen) {\n      return;\n    }\n\n    const messageListener = async (message: Message) => {\n      const event = JSON.parse(message.data.toString()) as Event;\n      event.id = message.id;\n      event.createdAt = message.publishTime;\n      event.deliveryAttempt = message.deliveryAttempt ?? 1;\n\n      try {\n        const activeCbs = this.activeCbs[subscriptionKey] ?? [];\n        for (const cb of activeCbs) {\n          cb(\n            event,\n            async () => {\n              try {\n                await this.ackMessage(subscriptionKey, message);\n              } catch (e) {\n                console.error('Error acking message', e);\n              }\n            },\n            async () => {\n              try {\n                message.nack();\n              } catch (e) {\n                console.error('Error nacking message', e);\n              }\n            },\n          );\n        }\n      } catch (error) {\n        console.error('Error processing event', error);\n      }\n    };\n\n    this.messageListeners[subscriptionKey] = messageListener;\n    subscription.on('message', messageListener);\n\n    subscription.on('error', async error => {\n      console.error('subscription error', error);\n    });\n  }\n\n  async unsubscribe(topic: string, cb: EventCallback): Promise<void> {\n    // Check both grouped and non-grouped subscription keys for this callback\n    const keysToCheck = [topic];\n    for (const key of Object.keys(this.activeCbs)) {\n      if (key.startsWith(`${topic}:`) && !keysToCheck.includes(key)) {\n        keysToCheck.push(key);\n      }\n    }\n\n    for (const subscriptionKey of keysToCheck) {\n      const activeCbs = this.activeCbs[subscriptionKey];\n      if (activeCbs?.has(cb)) {\n        activeCbs.delete(cb);\n\n        if (activeCbs.size === 0) {\n          const subscription = this.activeSubscriptions[subscriptionKey];\n          const listener = this.messageListeners[subscriptionKey];\n          if (subscription) {\n            if (listener) subscription.removeListener('message', listener);\n            await subscription.close();\n          }\n          delete this.activeSubscriptions[subscriptionKey];\n          delete this.activeCbs[subscriptionKey];\n          delete this.messageListeners[subscriptionKey];\n        }\n        return;\n      }\n    }\n  }\n\n  async flush(): Promise<void> {\n    await Promise.all(Object.values(this.ackBuffer));\n  }\n}\n"]}

package/dist/index.d.ts

@@ -1,20 +1,21 @@
 import type { ClientConfig, Message, Subscription } from '@google-cloud/pubsub';
 import { PubSub } from '@mastra/core/events';
-import type { Event } from '@mastra/core/events';
+import type { Event, EventCallback, SubscribeOptions } from '@mastra/core/events';
 export declare class GoogleCloudPubSub extends PubSub {
     private instanceId;
     private pubsub;
     private ackBuffer;
     private activeSubscriptions;
     private activeCbs;
+    private messageListeners;
     constructor(config: ClientConfig);
-    getSubscriptionName(topic: string): string;
+    getSubscriptionName(topic: string, group?: string): string;
     ackMessage(topic: string, message: Message): Promise<void>;
-    init(topicName: string): Promise<Subscription | undefined>;
+    init(topicName: string, group?: string): Promise<Subscription | undefined>;
     destroy(topicName: string): Promise<void>;
     publish(topicName: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void>;
-    subscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void>;
-    unsubscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void>;
+    subscribe(topic: string, cb: EventCallback, options?: SubscribeOptions): Promise<void>;
+    unsubscribe(topic: string, cb: EventCallback): Promise<void>;
     flush(): Promise<void>;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAEjD,qBAAa,iBAAkB,SAAQ,MAAM;IAC3C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,SAAS,CAA6E;gBAElF,MAAM,EAAE,YAAY;IAMhC,mBAAmB,CAAC,KAAK,EAAE,MAAM;IAI3B,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAW1C,IAAI,CAAC,SAAS,EAAE,MAAM;IAoBtB,OAAO,CAAC,SAAS,EAAE,MAAM;IASzB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BjF,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IA6D9F,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAYhG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAElF,qBAAa,iBAAkB,SAAQ,MAAM;IAC3C,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,SAAS,CAAoC;IACrD,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,SAAS,CAA0C;IAG3D,OAAO,CAAC,gBAAgB,CAAkD;gBAE9D,MAAM,EAAE,YAAY;IAMhC,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAO3C,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO;IAW1C,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM;IAgCtC,OAAO,CAAC,SAAS,EAAE,MAAM;IASzB,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IA2BjF,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAuEtF,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IA8B5D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAG7B"}

package/dist/index.js

@@ -8,12 +8,18 @@ var GoogleCloudPubSub = class extends PubSub {
   ackBuffer = {};
   activeSubscriptions = {};
   activeCbs = {};
+  // Tracks the actual anonymous message listener registered on each subscription,
+  // so we can remove it cleanly on the final unsubscribe.
+  messageListeners = {};
   constructor(config) {
     super();
     this.pubsub = new PubSub$1(config);
     this.instanceId = crypto.randomUUID();
   }
-  getSubscriptionName(topic) {
+  getSubscriptionName(topic, group) {
+    if (group) {
+      return `${topic}-${group}`;
+    }
     return `${topic}-${this.instanceId}`;
   }
   async ackMessage(topic, message) {
@@ -27,19 +33,29 @@ var GoogleCloudPubSub = class extends PubSub {
       console.error("Error acking message", e);
     }
   }
-  async init(topicName) {
+  async init(topicName, group) {
     try {
       await this.pubsub.createTopic(topicName);
     } catch {
     }
+    const subscriptionName = this.getSubscriptionName(topicName, group);
+    const subscriptionKey = group ? `${topicName}:${group}` : topicName;
     try {
-      const [sub] = await this.pubsub.topic(topicName).createSubscription(this.getSubscriptionName(topicName), {
+      const [sub] = await this.pubsub.topic(topicName).createSubscription(subscriptionName, {
         enableMessageOrdering: true,
-        enableExactlyOnceDelivery: topicName === "workflows" ? true : false
+        enableExactlyOnceDelivery: topicName === "workflows" || !!group
       });
-      this.activeSubscriptions[topicName] = sub;
+      this.activeSubscriptions[subscriptionKey] = sub;
       return sub;
     } catch {
+      if (group) {
+        try {
+          const sub = this.pubsub.subscription(subscriptionName);
+          this.activeSubscriptions[subscriptionKey] = sub;
+          return sub;
+        } catch {
+        }
+      }
     }
     return void 0;
   }
@@ -75,7 +91,7 @@ var GoogleCloudPubSub = class extends PubSub {
       }
     }
   }
-  async subscribe(topic, cb) {
+  async subscribe(topic, cb, options) {
     if (topic.startsWith("workflow.events.")) {
       const parts = topic.split(".");
       if (parts[parts.length - 2] === "v2") {
@@ -84,48 +100,79 @@ var GoogleCloudPubSub = class extends PubSub {
         topic = "workflow.events.v1";
       }
     }
-    const subscription = this.activeSubscriptions[topic] ?? await this.init(topic);
+    const group = options?.group;
+    const subscriptionKey = group ? `${topic}:${group}` : topic;
+    const subscription = this.activeSubscriptions[subscriptionKey] ?? await this.init(topic, group);
     if (!subscription) {
       throw new Error(`Failed to subscribe to topic: ${topic}`);
     }
-    this.activeSubscriptions[topic] = subscription;
-    const activeCbs = this.activeCbs[topic] ?? /* @__PURE__ */ new Set();
+    this.activeSubscriptions[subscriptionKey] = subscription;
+    const activeCbs = this.activeCbs[subscriptionKey] ?? /* @__PURE__ */ new Set();
     activeCbs.add(cb);
-    this.activeCbs[topic] = activeCbs;
+    this.activeCbs[subscriptionKey] = activeCbs;
     if (subscription.isOpen) {
       return;
     }
-    subscription.on("message", async (message) => {
+    const messageListener = async (message) => {
       const event = JSON.parse(message.data.toString());
       event.id = message.id;
       event.createdAt = message.publishTime;
+      event.deliveryAttempt = message.deliveryAttempt ?? 1;
       try {
-        const activeCbs2 = this.activeCbs[topic] ?? [];
+        const activeCbs2 = this.activeCbs[subscriptionKey] ?? [];
         for (const cb2 of activeCbs2) {
-          cb2(event, async () => {
-            try {
-              await this.ackMessage(topic, message);
-            } catch (e) {
-              console.error("Error acking message", e);
+          cb2(
+            event,
+            async () => {
+              try {
+                await this.ackMessage(subscriptionKey, message);
+              } catch (e) {
+                console.error("Error acking message", e);
+              }
+            },
+            async () => {
+              try {
+                message.nack();
+              } catch (e) {
+                console.error("Error nacking message", e);
+              }
             }
-          });
+          );
         }
       } catch (error) {
         console.error("Error processing event", error);
       }
-    });
+    };
+    this.messageListeners[subscriptionKey] = messageListener;
+    subscription.on("message", messageListener);
     subscription.on("error", async (error) => {
       console.error("subscription error", error);
     });
   }
   async unsubscribe(topic, cb) {
-    const subscription = this.activeSubscriptions[topic] ?? this.pubsub.subscription(this.getSubscriptionName(topic));
-    const activeCbs = this.activeCbs[topic] ?? /* @__PURE__ */ new Set();
-    activeCbs.delete(cb);
-    this.activeCbs[topic] = activeCbs;
-    if (activeCbs.size === 0) {
-      subscription.removeListener("message", cb);
-      await subscription.close();
+    const keysToCheck = [topic];
+    for (const key of Object.keys(this.activeCbs)) {
+      if (key.startsWith(`${topic}:`) && !keysToCheck.includes(key)) {
+        keysToCheck.push(key);
+      }
+    }
+    for (const subscriptionKey of keysToCheck) {
+      const activeCbs = this.activeCbs[subscriptionKey];
+      if (activeCbs?.has(cb)) {
+        activeCbs.delete(cb);
+        if (activeCbs.size === 0) {
+          const subscription = this.activeSubscriptions[subscriptionKey];
+          const listener = this.messageListeners[subscriptionKey];
+          if (subscription) {
+            if (listener) subscription.removeListener("message", listener);
+            await subscription.close();
+          }
+          delete this.activeSubscriptions[subscriptionKey];
+          delete this.activeCbs[subscriptionKey];
+          delete this.messageListeners[subscriptionKey];
+        }
+        return;
+      }
     }
   }
   async flush() {

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":["PubSubClient","activeCbs","cb"],"mappings":"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","file":"index.js","sourcesContent":["import { PubSub as PubSubClient } from '@google-cloud/pubsub';\nimport type { ClientConfig, Message, Subscription } from '@google-cloud/pubsub';\nimport { PubSub } from '@mastra/core/events';\nimport type { Event } from '@mastra/core/events';\n\nexport class GoogleCloudPubSub extends PubSub {\n  private instanceId: string;\n  private pubsub: PubSubClient;\n  private ackBuffer: Record<string, Promise<any>> = {};\n  private activeSubscriptions: Record<string, Subscription> = {};\n  private activeCbs: Record<string, Set<(event: Event, ack: () => Promise<void>) => void>> = {};\n\n  constructor(config: ClientConfig) {\n    super();\n    this.pubsub = new PubSubClient(config);\n    this.instanceId = crypto.randomUUID();\n  }\n\n  getSubscriptionName(topic: string) {\n    return `${topic}-${this.instanceId}`;\n  }\n\n  async ackMessage(topic: string, message: Message) {\n    try {\n      const ackResponse = Promise.race([message.ackWithResponse(), new Promise(resolve => setTimeout(resolve, 5000))]);\n      this.ackBuffer[topic + '-' + message.id] = ackResponse.catch(() => {});\n      await ackResponse;\n      delete this.ackBuffer[topic + '-' + message.id];\n    } catch (e) {\n      console.error('Error acking message', e);\n    }\n  }\n\n  async init(topicName: string) {\n    try {\n      await this.pubsub.createTopic(topicName);\n    } catch {\n      // no-op\n    }\n    try {\n      const [sub] = await this.pubsub.topic(topicName).createSubscription(this.getSubscriptionName(topicName), {\n        enableMessageOrdering: true,\n        enableExactlyOnceDelivery: topicName === 'workflows' ? true : false,\n      });\n      this.activeSubscriptions[topicName] = sub;\n      return sub;\n    } catch {\n      // no-op\n    }\n\n    return undefined;\n  }\n\n  async destroy(topicName: string) {\n    const subName = this.getSubscriptionName(topicName);\n    delete this.activeSubscriptions[topicName];\n    this.pubsub.subscription(subName).removeAllListeners();\n    await this.pubsub.subscription(subName).close();\n    await this.pubsub.subscription(subName).delete();\n    await this.pubsub.topic(topicName).delete();\n  }\n\n  async publish(topicName: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void> {\n    if (topicName.startsWith('workflow.events.')) {\n      const parts = topicName.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topicName = 'workflow.events.v2';\n      } else {\n        topicName = 'workflow.events.v1';\n      }\n    }\n\n    let topic = this.pubsub.topic(topicName);\n\n    try {\n      await topic.publishMessage({\n        data: Buffer.from(JSON.stringify(event)),\n        orderingKey: 'workflows',\n      });\n    } catch (e: any) {\n      if (e.code === 5) {\n        await this.pubsub.createTopic(topicName);\n        await this.publish(topicName, event);\n      } else {\n        throw e;\n      }\n    }\n  }\n\n  async subscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void> {\n    if (topic.startsWith('workflow.events.')) {\n      const parts = topic.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topic = 'workflow.events.v2';\n      } else {\n        topic = 'workflow.events.v1';\n      }\n    }\n\n    // Update tracked callbacks\n    const subscription = this.activeSubscriptions[topic] ?? (await this.init(topic));\n    if (!subscription) {\n      throw new Error(`Failed to subscribe to topic: ${topic}`);\n    }\n\n    this.activeSubscriptions[topic] = subscription;\n\n    const activeCbs = this.activeCbs[topic] ?? new Set();\n    activeCbs.add(cb);\n    this.activeCbs[topic] = activeCbs;\n\n    if (subscription.isOpen) {\n      return;\n    }\n\n    subscription.on('message', async message => {\n      const event = JSON.parse(message.data.toString()) as Event;\n      event.id = message.id;\n      event.createdAt = message.publishTime;\n\n      try {\n        const activeCbs = this.activeCbs[topic] ?? [];\n        for (const cb of activeCbs) {\n          cb(event, async () => {\n            try {\n              await this.ackMessage(topic, message);\n            } catch (e) {\n              console.error('Error acking message', e);\n            }\n          });\n        }\n      } catch (error) {\n        console.error('Error processing event', error);\n      }\n    });\n\n    subscription.on('error', async error => {\n      // if (error.code === 5) {\n      //   await this.init(topic);\n      // } else {\n      //   // TODO: determine if other errors require re-subscription\n      //   // console.error('subscription error, retrying in 5 seconds', error);\n      //   // await new Promise(resolve => setTimeout(resolve, 5000));\n      //   // await this.subscribe(topic, cb);\n      //   console.error('subscription error', error);\n      // }\n      console.error('subscription error', error);\n    });\n  }\n\n  async unsubscribe(topic: string, cb: (event: Event, ack?: () => Promise<void>) => void): Promise<void> {\n    const subscription = this.activeSubscriptions[topic] ?? this.pubsub.subscription(this.getSubscriptionName(topic));\n    const activeCbs = this.activeCbs[topic] ?? new Set();\n    activeCbs.delete(cb);\n    this.activeCbs[topic] = activeCbs;\n\n    if (activeCbs.size === 0) {\n      subscription.removeListener('message', cb);\n      await subscription.close();\n    }\n  }\n\n  async flush(): Promise<void> {\n    await Promise.all(Object.values(this.ackBuffer));\n  }\n}\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":["PubSubClient","activeCbs","cb"],"mappings":"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","file":"index.js","sourcesContent":["import { PubSub as PubSubClient } from '@google-cloud/pubsub';\nimport type { ClientConfig, Message, Subscription } from '@google-cloud/pubsub';\nimport { PubSub } from '@mastra/core/events';\nimport type { Event, EventCallback, SubscribeOptions } from '@mastra/core/events';\n\nexport class GoogleCloudPubSub extends PubSub {\n  private instanceId: string;\n  private pubsub: PubSubClient;\n  private ackBuffer: Record<string, Promise<any>> = {};\n  private activeSubscriptions: Record<string, Subscription> = {};\n  private activeCbs: Record<string, Set<EventCallback>> = {};\n  // Tracks the actual anonymous message listener registered on each subscription,\n  // so we can remove it cleanly on the final unsubscribe.\n  private messageListeners: Record<string, (message: Message) => void> = {};\n\n  constructor(config: ClientConfig) {\n    super();\n    this.pubsub = new PubSubClient(config);\n    this.instanceId = crypto.randomUUID();\n  }\n\n  getSubscriptionName(topic: string, group?: string) {\n    if (group) {\n      return `${topic}-${group}`;\n    }\n    return `${topic}-${this.instanceId}`;\n  }\n\n  async ackMessage(topic: string, message: Message) {\n    try {\n      const ackResponse = Promise.race([message.ackWithResponse(), new Promise(resolve => setTimeout(resolve, 5000))]);\n      this.ackBuffer[topic + '-' + message.id] = ackResponse.catch(() => {});\n      await ackResponse;\n      delete this.ackBuffer[topic + '-' + message.id];\n    } catch (e) {\n      console.error('Error acking message', e);\n    }\n  }\n\n  async init(topicName: string, group?: string) {\n    try {\n      await this.pubsub.createTopic(topicName);\n    } catch {\n      // no-op\n    }\n    const subscriptionName = this.getSubscriptionName(topicName, group);\n    const subscriptionKey = group ? `${topicName}:${group}` : topicName;\n    try {\n      const [sub] = await this.pubsub.topic(topicName).createSubscription(subscriptionName, {\n        enableMessageOrdering: true,\n        enableExactlyOnceDelivery: topicName === 'workflows' || !!group,\n      });\n      this.activeSubscriptions[subscriptionKey] = sub;\n      return sub;\n    } catch {\n      // Subscription may already exist (e.g. shared group subscription created by another process).\n      // Get the existing subscription instead.\n      if (group) {\n        try {\n          const sub = this.pubsub.subscription(subscriptionName);\n          this.activeSubscriptions[subscriptionKey] = sub;\n          return sub;\n        } catch {\n          // no-op\n        }\n      }\n    }\n\n    return undefined;\n  }\n\n  async destroy(topicName: string) {\n    const subName = this.getSubscriptionName(topicName);\n    delete this.activeSubscriptions[topicName];\n    this.pubsub.subscription(subName).removeAllListeners();\n    await this.pubsub.subscription(subName).close();\n    await this.pubsub.subscription(subName).delete();\n    await this.pubsub.topic(topicName).delete();\n  }\n\n  async publish(topicName: string, event: Omit<Event, 'id' | 'createdAt'>): Promise<void> {\n    if (topicName.startsWith('workflow.events.')) {\n      const parts = topicName.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topicName = 'workflow.events.v2';\n      } else {\n        topicName = 'workflow.events.v1';\n      }\n    }\n\n    let topic = this.pubsub.topic(topicName);\n\n    try {\n      await topic.publishMessage({\n        data: Buffer.from(JSON.stringify(event)),\n        orderingKey: 'workflows',\n      });\n    } catch (e: any) {\n      if (e.code === 5) {\n        await this.pubsub.createTopic(topicName);\n        await this.publish(topicName, event);\n      } else {\n        throw e;\n      }\n    }\n  }\n\n  async subscribe(topic: string, cb: EventCallback, options?: SubscribeOptions): Promise<void> {\n    if (topic.startsWith('workflow.events.')) {\n      const parts = topic.split('.');\n      if (parts[parts.length - 2] === 'v2') {\n        topic = 'workflow.events.v2';\n      } else {\n        topic = 'workflow.events.v1';\n      }\n    }\n\n    const group = options?.group;\n    // Use a composite key when group is set so grouped and non-grouped subscriptions\n    // on the same topic don't collide\n    const subscriptionKey = group ? `${topic}:${group}` : topic;\n\n    // Update tracked callbacks\n    const subscription = this.activeSubscriptions[subscriptionKey] ?? (await this.init(topic, group));\n    if (!subscription) {\n      throw new Error(`Failed to subscribe to topic: ${topic}`);\n    }\n\n    this.activeSubscriptions[subscriptionKey] = subscription;\n\n    const activeCbs = this.activeCbs[subscriptionKey] ?? new Set();\n    activeCbs.add(cb);\n    this.activeCbs[subscriptionKey] = activeCbs;\n\n    if (subscription.isOpen) {\n      return;\n    }\n\n    const messageListener = async (message: Message) => {\n      const event = JSON.parse(message.data.toString()) as Event;\n      event.id = message.id;\n      event.createdAt = message.publishTime;\n      event.deliveryAttempt = message.deliveryAttempt ?? 1;\n\n      try {\n        const activeCbs = this.activeCbs[subscriptionKey] ?? [];\n        for (const cb of activeCbs) {\n          cb(\n            event,\n            async () => {\n              try {\n                await this.ackMessage(subscriptionKey, message);\n              } catch (e) {\n                console.error('Error acking message', e);\n              }\n            },\n            async () => {\n              try {\n                message.nack();\n              } catch (e) {\n                console.error('Error nacking message', e);\n              }\n            },\n          );\n        }\n      } catch (error) {\n        console.error('Error processing event', error);\n      }\n    };\n\n    this.messageListeners[subscriptionKey] = messageListener;\n    subscription.on('message', messageListener);\n\n    subscription.on('error', async error => {\n      console.error('subscription error', error);\n    });\n  }\n\n  async unsubscribe(topic: string, cb: EventCallback): Promise<void> {\n    // Check both grouped and non-grouped subscription keys for this callback\n    const keysToCheck = [topic];\n    for (const key of Object.keys(this.activeCbs)) {\n      if (key.startsWith(`${topic}:`) && !keysToCheck.includes(key)) {\n        keysToCheck.push(key);\n      }\n    }\n\n    for (const subscriptionKey of keysToCheck) {\n      const activeCbs = this.activeCbs[subscriptionKey];\n      if (activeCbs?.has(cb)) {\n        activeCbs.delete(cb);\n\n        if (activeCbs.size === 0) {\n          const subscription = this.activeSubscriptions[subscriptionKey];\n          const listener = this.messageListeners[subscriptionKey];\n          if (subscription) {\n            if (listener) subscription.removeListener('message', listener);\n            await subscription.close();\n          }\n          delete this.activeSubscriptions[subscriptionKey];\n          delete this.activeCbs[subscriptionKey];\n          delete this.messageListeners[subscriptionKey];\n        }\n        return;\n      }\n    }\n  }\n\n  async flush(): Promise<void> {\n    await Promise.all(Object.values(this.ackBuffer));\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/google-cloud-pubsub",
-  "version": "1.0.2",
+  "version": "1.0.3-alpha.0",
   "description": "Mastra Google Cloud PubSub integration",
   "type": "module",
   "main": "dist/index.js",
@@ -23,26 +23,26 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^5.2.3",
+    "@google-cloud/pubsub": "^5.3.0",
     "@inngest/realtime": "^0.4.6",
     "@opentelemetry/api": "^1.9.0",
-    "inngest": "^3.44.2",
-    "zod": "^3.25.76"
+    "inngest": "^3.52.6",
+    "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@types/node": "22.19.7",
-    "@vitest/coverage-v8": "4.0.12",
-    "@vitest/ui": "4.0.12",
-    "ai": "^4.3.16",
-    "eslint": "^9.37.0",
+    "@types/node": "22.19.15",
+    "@vitest/coverage-v8": "4.0.18",
+    "@vitest/ui": "4.0.18",
+    "ai": "^4.3.19",
+    "eslint": "^9.39.4",
     "tsup": "^8.5.1",
     "typescript": "^5.9.3",
-    "vitest": "4.0.16",
-    "@internal/lint": "0.0.60",
-    "@internal/types-builder": "0.0.35",
-    "@mastra/libsql": "1.5.0",
-    "@mastra/core": "1.5.0",
-    "@mastra/deployer": "1.5.0"
+    "vitest": "4.0.18",
+    "@mastra/deployer": "1.25.1-alpha.0",
+    "@mastra/libsql": "1.8.2-alpha.0",
+    "@internal/lint": "0.0.83",
+    "@internal/types-builder": "0.0.58",
+    "@mastra/core": "1.25.1-alpha.0"
   },
   "peerDependencies": {
     "@mastra/core": ">=1.0.0-0 <2.0.0-0"