@shushed/helpers 0.0.198-v2-20251104215240 → 0.0.198-v2-20251105075743

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

@@ -598,7 +598,6 @@ class EnvEngine extends runtime_1.default {
                 },
                 body: JSON.stringify({
                     ...rnConfig,
-                    topicName: rnConfig.topicName,
                     subscriptionName: subscriptionQualifiedName,
                     operation: 'upsert',
                 })

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

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSubscriptionBigQuery = isSubscriptionBigQuery;
 const co_body_1 = __importDefault(require("co-body"));
 const lodash_chunk_1 = __importDefault(require("lodash.chunk"));
 const lodash_isequal_1 = __importDefault(require("lodash.isequal"));
@@ -14,11 +15,8 @@ function isPubSubMessage(req) {
 }
 const pubSubPublishTopics = global.HUSH_PUBSUB_PUBLISH_TOPICS || {};
 global.HUSH_PUBSUB_PUBLISH_TOPICS = pubSubPublishTopics;
-function isSubscriptionOptionsPull(opts) {
-    return 'endpointUrl' in opts && opts.endpointUrl === null;
-}
-function isSubscriptionOptionsPush(opts) {
-    return 'endpointUrl' in opts && !!opts.endpointUrl && (opts.endpointUrl.startsWith('https://') || opts.endpointUrl.startsWith('http://'));
+function isSubscriptionBigQuery(opts) {
+    return 'tableId' in opts && opts.tableId !== null;
 }
 class PubSubHelper extends runtime_1.default {
     serviceAccountEmail;
@@ -118,13 +116,13 @@ class PubSubHelper extends runtime_1.default {
     async createOrUpdate(opts) {
         const [topics] = await this.pubSub.getTopics();
         const topicName = opts.topicName;
-        const mainSubscriptionName = opts.subscriptionName || opts.topicName;
+        const mainSubscriptionName = opts.subscriptionName || topicName;
+        const tableSubscriptionName = `${mainSubscriptionName}.bq`;
         const mainDlqTopicName = `${mainSubscriptionName}.dlq`;
-        const tableDlqTopicName = `${mainSubscriptionName}.bq.dlq`;
         const mainDlqSubscriptionName = `${mainSubscriptionName}.dlq`;
-        const tableSubscriptionName = `${mainSubscriptionName}.bq`;
-        const tableDlqSubscriptionName = `${topicName}.bq.dlq`;
-        let mainTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === opts.topicName);
+        const tableDlqTopicName = `${mainSubscriptionName}.bq.dlq`;
+        const tableDlqSubscriptionName = `${mainSubscriptionName}.bq.dlq`;
+        let mainTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === topicName);
         let mainDlqTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === mainDlqTopicName);
         let tableDlqTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === tableDlqTopicName);
         let mainTopicSubscriptions = null;
@@ -144,7 +142,7 @@ class PubSubHelper extends runtime_1.default {
         let tableSubscription = mainTopicSubscriptions?.find(x => this.getNameFromFullyQualifiedName(x.name) === tableSubscriptionName) || null;
         let tableDlqSubscription = tableDlqTopicSubscriptions?.find(x => this.getNameFromFullyQualifiedName(x.name) === tableDlqSubscriptionName) || null;
         const topic = await this.ensureTopicExists(opts.topicName);
-        if (opts.table || opts.pull || opts.push) {
+        if (opts.table || opts.pull) {
             mainTopic = await this.ensureTopicExists(opts.topicName);
         }
         if (!opts.table) {
@@ -162,7 +160,6 @@ class PubSubHelper extends runtime_1.default {
                 tableDlqTopic = await this.ensureTopicExists(tableDlqTopicName);
                 tableDlqSubscription = await this.ensureSubscribtionExists(tableDlqSubscriptionName, {
                     topic: tableDlqTopic,
-                    endpointUrl: null,
                     dlqTopic: null,
                 });
             }
@@ -176,7 +173,7 @@ class PubSubHelper extends runtime_1.default {
                 dlqTopic: tableDlqTopic || null
             });
         }
-        const pullPushSubscription = opts.pull || opts.push;
+        const pullPushSubscription = opts.pull;
         if (!pullPushSubscription) {
             if (mainSubscription) {
                 await mainSubscription.delete();
@@ -193,19 +190,17 @@ class PubSubHelper extends runtime_1.default {
                 mainDlqSubscription = await this.ensureSubscribtionExists(mainDlqSubscriptionName, {
                     topic: mainDlqTopic,
                     dlqTopic: null,
-                    endpointUrl: null,
                 });
             }
             mainSubscription = await this.ensureSubscribtionExists(mainSubscriptionName, {
                 topic,
                 dlqTopic: mainDlqTopic || null,
-                exactlyOnceDelivery: opts.push ? false : true,
+                exactlyOnceDelivery: true,
                 subscriptionFilter: opts.subscriptionFilter,
-                endpointUrl: opts.push ? this.runtimeUrl + `/executeWorkflow/${this.workflowId}/${this.triggerId}?topic_name=${opts.topicName}` : null,
                 retryMinDelay: pullPushSubscription.retryMinDelay,
                 retryMaxDelay: pullPushSubscription.retryMaxDelay,
                 retryLimit: pullPushSubscription.retryLimit,
-                ackDeadline: Math.max(pullPushSubscription.ackDeadline, opts.push ? 10 : 60)
+                ackDeadline: pullPushSubscription.ackDeadline
             });
         }
         if (!opts.createDeadLetterQueues) {
@@ -296,46 +291,13 @@ class PubSubHelper extends runtime_1.default {
         };
         const opts = Object.assign({}, defaultOptions, inputOpts);
         let nextMetadata = null;
-        if (isSubscriptionOptionsPush(opts)) {
-            if (opts.endpointUrl !== subscriptionMetaData?.pushConfig?.pushEndpoint
-                || this.serviceAccountEmail !== subscriptionMetaData?.pushConfig.oidcToken?.serviceAccountEmail
-                || process.env.GCLOUD_PROJECT + "/" + this.triggerId !== subscriptionMetaData.pushConfig.oidcToken.audience) {
-                if (subscriptionMetaData?.pushConfig?.pushEndpoint && subscription) {
-                    try {
-                        await subscription.modifyPushConfig({
-                            pushEndpoint: opts.endpointUrl,
-                            oidcToken: {
-                                serviceAccountEmail: this.serviceAccountEmail,
-                                audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId,
-                            },
-                        });
-                    }
-                    catch (err) {
-                        this.logging.error('Invariant: While updating push subscription', err.message, err.stack);
-                        throw new Error('Invariant: While updating push subscription - ' + err.message);
-                    }
-                }
-                else if (opts.endpointUrl) {
-                    nextMetadata = nextMetadata || {};
-                    nextMetadata.pushConfig = {
-                        pushEndpoint: opts.endpointUrl,
-                        oidcToken: {
-                            serviceAccountEmail: this.serviceAccountEmail,
-                            audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId,
-                        },
-                    };
-                }
-            }
-        }
-        else {
-            if (subscriptionMetaData?.pushConfig?.pushEndpoint) {
-                nextMetadata = nextMetadata || {};
-                nextMetadata.pushConfig = null;
-            }
+        if (subscriptionMetaData?.pushConfig?.pushEndpoint) {
+            nextMetadata = nextMetadata || {};
+            nextMetadata.pushConfig = null;
         }
         if (opts.dlqTopic) {
             if (opts.dlqTopic.name !== subscriptionMetaData?.deadLetterPolicy?.deadLetterTopic
-                || opts.retryLimit !== subscriptionMetaData?.deadLetterPolicy.maxDeliveryAttempts) {
+                || opts.retryLimit !== subscriptionMetaData?.deadLetterPolicy?.maxDeliveryAttempts) {
                 nextMetadata = nextMetadata || {};
                 nextMetadata.deadLetterPolicy = {
                     deadLetterTopic: opts.dlqTopic.name,
@@ -348,7 +310,7 @@ class PubSubHelper extends runtime_1.default {
             nextMetadata.deadLetterPolicy = null;
         }
         if (opts.exactlyOnceDelivery !== subscriptionMetaData?.enableExactlyOnceDelivery) {
-            if (typeof opts.exactlyOnceDelivery === 'boolean' && isSubscriptionOptionsPull(opts)) {
+            if (typeof opts.exactlyOnceDelivery === 'boolean' && !isSubscriptionBigQuery(opts)) {
                 nextMetadata = nextMetadata || {};
                 nextMetadata.enableExactlyOnceDelivery = opts.exactlyOnceDelivery;
             }
@@ -359,7 +321,7 @@ class PubSubHelper extends runtime_1.default {
         }
         if ((opts.subscriptionFilter && subscriptionMetaData?.filter) && opts.subscriptionFilter !== subscriptionMetaData?.filter) {
             nextMetadata = nextMetadata || {};
-            nextMetadata.filter = opts.subscriptionFilter;
+            nextMetadata.filter = opts.subscriptionFilter || null;
         }
         if (opts.retryMinDelay != subscriptionMetaData?.retryPolicy?.minimumBackoff?.seconds
             || opts.retryMaxDelay != subscriptionMetaData?.retryPolicy?.maximumBackoff?.seconds) {
@@ -371,13 +333,11 @@ class PubSubHelper extends runtime_1.default {
         }
         const proposedLabels = {
             'env': this.envName.toLowerCase(),
-            'bs-triggerid': this.triggerId.toLowerCase(),
             'bs-workflowid': this.workflowId.toLowerCase(),
             'bs-envname': this.systemEnvName.toLowerCase(),
             'bs-is-deadletter': subscriptionName.indexOf('-dlq') > -1 ? 'true' : 'false',
-            'bs-is-push-enabled': isSubscriptionOptionsPush(opts) && opts.endpointUrl ? 'true' : 'false',
-            'bs-bigquery-tableid': !(isSubscriptionOptionsPush(opts) || isSubscriptionOptionsPull(opts)) && opts.tableId ? opts.tableId.replace(/\./g, '-').toLowerCase() : '',
-            'bs-is-bigquery': !(isSubscriptionOptionsPush(opts) || isSubscriptionOptionsPull(opts)) && opts.tableId ? 'true' : 'false',
+            'bs-bigquery-tableid': isSubscriptionBigQuery(opts) && opts.tableId ? opts.tableId.replace(/\./g, '-').toLowerCase() : '',
+            'bs-is-bigquery': isSubscriptionBigQuery(opts) && opts.tableId ? 'true' : 'false',
         };
         const simLabels = Object.assign({}, subscriptionMetaData?.labels || {}, proposedLabels);
         if (!(0, lodash_isequal_1.default)(simLabels, subscriptionMetaData?.labels)) {
@@ -388,7 +348,7 @@ class PubSubHelper extends runtime_1.default {
             nextMetadata = nextMetadata || {};
             nextMetadata.ackDeadlineSeconds = opts.ackDeadline;
         }
-        if (!isSubscriptionOptionsPull(opts) && !isSubscriptionOptionsPush(opts)) {
+        if (isSubscriptionBigQuery(opts)) {
             if (opts.tableId !== subscriptionMetaData?.bigqueryConfig?.table || this.serviceAccountEmail !== subscriptionMetaData?.bigqueryConfig?.serviceAccountEmail) {
                 if (opts.tableId) {
                     nextMetadata = nextMetadata || {};
@@ -423,7 +383,7 @@ 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;
+        let subscription = subscriptions.find((subscription) => this.getNameFromFullyQualifiedName(subscription.name) === subscriptionName) || null;
         let subscriptionMetaData;
         try {
             [subscriptionMetaData] = (await subscription?.getMetadata()) || [null];
@@ -433,7 +393,13 @@ class PubSubHelper extends runtime_1.default {
         }
         const createPayload = await this.updateSubscription(subscriptionName, subscription, subscriptionMetaData, opts);
         if (createPayload && !subscription) {
-            await opts.topic.createSubscription(subscriptionName, createPayload);
+            try {
+                await opts.topic.createSubscription(subscriptionName, createPayload);
+            }
+            catch (err) {
+                this.logging.error('ensureSubscribtionExists received error while creating subscription ' + subscriptionName, err.message, err.stack);
+                throw new Error('Invariant: While creating subscription - ' + err.message);
+            }
             [subscriptions] = await opts.topic.getSubscriptions();
             subscription = subscriptions.find(subscription => this.getNameFromFullyQualifiedName(subscription.name) === subscriptionName) || null;
         }

package/dist/types/src-public/pubsub.d.ts

@@ -4,6 +4,7 @@ import Runtime, { Opts as RuntimeOpts } from './runtime';
 declare global {
     var HUSH_PUBSUB_PUBLISH_TOPICS: Record<string, Topic>;
 }
+export declare function isSubscriptionBigQuery(opts: SubscriptionOptionsBigQuery | SubscriptionOptionsPull): opts is SubscriptionOptionsBigQuery;
 export type Message = {
     buildshipId: string;
     subscriptionName?: string;
@@ -30,6 +31,26 @@ type MessageBody = {
 } & {
     [key: string]: any;
 };
+type SubscriptionOptionsPull = {
+    topic: Topic;
+    exactlyOnceDelivery?: boolean;
+    retryMinDelay?: number;
+    retryMaxDelay?: number;
+    retryLimit?: number;
+    dlqTopic: Topic | null;
+    ackDeadline?: number;
+    subscriptionFilter?: string | null;
+};
+type SubscriptionOptionsBigQuery = {
+    topic: Topic;
+    tableId: string;
+    dlqTopic: Topic | null;
+    retryMinDelay?: number;
+    retryMaxDelay?: number;
+    retryLimit?: number;
+    ackDeadline?: number;
+    subscriptionFilter?: string | null;
+};
 declare class PubSubHelper extends Runtime {
     private serviceAccountEmail;
     private pubSub;
@@ -62,12 +83,6 @@ declare class PubSubHelper extends Runtime {
             retryMinDelay: number;
             retryMaxDelay: number;
         };
-        push?: null | {
-            retryLimit: number;
-            ackDeadline: number;
-            retryMinDelay: number;
-            retryMaxDelay: number;
-        };
         table?: null | {
             tableId: string;
             retryLimit: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.198-v2-20251104215240",
+  "version": "0.0.198-v2-20251105075743",
   "author": "",
   "license": "UNLICENSED",
   "description": "",