@shushed/helpers 0.0.256 → 0.0.258

package/dist/cjs/src-public/pubsub.js

@@ -360,11 +360,9 @@ class PubSubHelper extends runtime_1.default {
                 nextMetadata.enableExactlyOnceDelivery = null;
             }
         }
-        if (!isSubscriptionBigQuery(opts)) {
-            if ((opts.subscriptionFilter && subscriptionMetaData?.filter) && opts.subscriptionFilter !== subscriptionMetaData?.filter) {
-                nextMetadata = nextMetadata || {};
-                nextMetadata.filter = opts.subscriptionFilter || null;
-            }
+        if (!isSubscriptionBigQuery(opts) && !subscription && opts.subscriptionFilter) {
+            nextMetadata = nextMetadata || {};
+            nextMetadata.filter = opts.subscriptionFilter;
         }
         if (opts.retryMinDelay != subscriptionMetaData?.retryPolicy?.minimumBackoff?.seconds
             || opts.retryMaxDelay != subscriptionMetaData?.retryPolicy?.maximumBackoff?.seconds) {
@@ -438,6 +436,21 @@ class PubSubHelper extends runtime_1.default {
     async ensureSubscribtionExists(subscriptionName, opts) {
         let [subscriptions] = await opts.topic.getSubscriptions();
         let subscription = subscriptions.find((subscription) => this.getNameFromFullyQualifiedName(subscription.name) === subscriptionName) || null;
+        if (!subscription) {
+            const existingSub = this.pubSub.subscription(subscriptionName);
+            try {
+                const [existingMetadata] = await existingSub.getMetadata();
+                if (existingMetadata && existingMetadata.topic !== opts.topic.name) {
+                    this.logging.log(`ensureSubscribtionExists: subscription ${subscriptionName} exists on different topic (${existingMetadata.topic}), deleting to recreate on ${opts.topic.name}`);
+                    await existingSub.delete();
+                }
+            }
+            catch (err) {
+                if (err.code !== 5) {
+                    throw err;
+                }
+            }
+        }
         let subscriptionMetaData;
         try {
             [subscriptionMetaData] = (await subscription?.getMetadata()) || [null];
@@ -445,6 +458,16 @@ class PubSubHelper extends runtime_1.default {
         catch (err) {
             throw new Error('Invariant: While getting subscription metadata - ' + err.message);
         }
+        if (subscription && !isSubscriptionBigQuery(opts)) {
+            const currentFilter = subscriptionMetaData?.filter || null;
+            const desiredFilter = opts.subscriptionFilter || null;
+            if (currentFilter !== desiredFilter) {
+                this.logging.log(`ensureSubscribtionExists: subscription filter changed for ${subscriptionName}, recreating subscription (current: ${JSON.stringify(currentFilter)}, desired: ${JSON.stringify(desiredFilter)})`);
+                await subscription.delete();
+                subscription = null;
+                subscriptionMetaData = null;
+            }
+        }
         const createPayload = await this.updateSubscription(subscriptionName, subscription, subscriptionMetaData, opts);
         if (createPayload && !subscription) {
             this.logging.log('ensureSubscribtionExists creating subscription ' + subscriptionName, createPayload);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.256",
+  "version": "0.0.258",
   "author": "",
   "license": "UNLICENSED",
   "description": "",