@shushed/helpers 0.0.57 → 0.0.59

package/dist/index.d.ts

@@ -28763,22 +28763,37 @@ declare function validate<T>(payload: T, schema: JSONSchemaType<T>, options: {
 declare const sanitizeToString: DeepRedact;
 declare const sanitize: DeepRedact;
 
+interface ILogging {
+    log(...args: any[]): void;
+    error(...args: any[]): void;
+}
 type Opts = {
     workflowId: string;
     triggerId: string;
     url: string;
     envName: string;
+    logging?: ILogging;
 } | {
     workflowId: string;
     triggerId: string;
     url: string;
-};
+    logging?: ILogging;
+} | Runtime;
+declare class Logging implements ILogging {
+    private workflowId;
+    private triggerId;
+    private systemEnvName;
+    constructor(workflowId: string, triggerId: string, systemEnvName: string);
+    log(...args: any[]): void;
+    error(...args: any[]): void;
+}
 declare class Runtime {
     readonly workflowId: string;
     readonly triggerId: string;
     readonly envName: string;
     readonly systemEnvName: string;
     readonly runtimeUrl: string;
+    readonly logging: ILogging;
     constructor(opts: Opts);
 }
 
@@ -28879,7 +28894,6 @@ declare class PubSubHelper extends Runtime {
     private getNameFromFullyQualifiedName;
     private updateSubscription;
     private ensureSubscribtionExists;
-    private ensureDLQSubscriptionExists;
     deleteSubscriptions(topicName: string): Promise<{
         mainTopic: Topic | undefined;
         mainDlqTopic: Topic | undefined;
@@ -29229,8 +29243,11 @@ type index_BigQueryHelper = BigQueryHelper;
 declare const index_BigQueryHelper: typeof BigQueryHelper;
 type index_EnvEngine = EnvEngine;
 declare const index_EnvEngine: typeof EnvEngine;
+type index_ILogging = ILogging;
 type index_JWKSHelper = JWKSHelper;
 declare const index_JWKSHelper: typeof JWKSHelper;
+type index_Logging = Logging;
+declare const index_Logging: typeof Logging;
 type index_Message = Message;
 type index_NodeOptions = NodeOptions;
 type index_PubSubHelper = PubSubHelper;
@@ -29253,7 +29270,7 @@ declare const index_shortHash: typeof shortHash;
 declare const index_validate: typeof validate;
 declare const index_validateGoogleAuth: typeof validateGoogleAuth;
 declare namespace index {
-  export { index_BigQueryHelper as BigQueryHelper, index_EnvEngine as EnvEngine, index_JWKSHelper as JWKSHelper, type index_Message as Message, type index_NodeOptions as NodeOptions, index_PubSubHelper as PubSubHelper, index_Runtime as Runtime, index_SchedulerHelper as SchedulerHelper, index_Secrets as Secrets, type index_TriggerOnCreateOptions as TriggerOnCreateOptions, type index_TriggerOnExecuteOptions as TriggerOnExecuteOptions, index_getEventTime as getEventTime, index_isCronMessage as isCronMessage, index_isPubSubRequest as isPubSubRequest, index_parseDateOrDefault as parseDateOrDefault, index_sanitize as sanitize, index_sanitizeToString as sanitizeToString, index_shortHash as shortHash, index_validate as validate, index_validateGoogleAuth as validateGoogleAuth };
+  export { index_BigQueryHelper as BigQueryHelper, index_EnvEngine as EnvEngine, type index_ILogging as ILogging, index_JWKSHelper as JWKSHelper, index_Logging as Logging, type index_Message as Message, type index_NodeOptions as NodeOptions, index_PubSubHelper as PubSubHelper, index_Runtime as Runtime, index_SchedulerHelper as SchedulerHelper, index_Secrets as Secrets, type index_TriggerOnCreateOptions as TriggerOnCreateOptions, type index_TriggerOnExecuteOptions as TriggerOnExecuteOptions, index_getEventTime as getEventTime, index_isCronMessage as isCronMessage, index_isPubSubRequest as isPubSubRequest, index_parseDateOrDefault as parseDateOrDefault, index_sanitize as sanitize, index_sanitizeToString as sanitizeToString, index_shortHash as shortHash, index_validate as validate, index_validateGoogleAuth as validateGoogleAuth };
 }
 
 export { index as lib, index$9 as schema, index$1 as types };

package/dist/index.js

@@ -288,6 +288,7 @@ __export(src_public_exports, {
   BigQueryHelper: () => bigquery_default,
   EnvEngine: () => env_default,
   JWKSHelper: () => jwks_default,
+  Logging: () => Logging,
   PubSubHelper: () => pubsub_default,
   Runtime: () => Runtime,
   SchedulerHelper: () => scheduler_default,
@@ -363,25 +364,63 @@ var import_jose = require("jose");
 
 // src-public/runtime.ts
 var DEFAULT_BRANCH = "migratedprod";
-var Runtime = class {
+var Logging = class {
+  constructor(workflowId, triggerId, systemEnvName) {
+    this.workflowId = workflowId;
+    this.triggerId = triggerId;
+    this.systemEnvName = systemEnvName;
+  }
+  log(...args) {
+    console.log({
+      payload: args,
+      workflowId: this.workflowId,
+      wId: this.workflowId,
+      triggerId: this.triggerId,
+      tId: this.triggerId,
+      env: this.systemEnvName
+    });
+  }
+  error(...args) {
+    console.error({
+      payload: args,
+      workflowId: this.workflowId,
+      wId: this.workflowId,
+      triggerId: this.triggerId,
+      tId: this.triggerId,
+      env: this.systemEnvName
+    });
+  }
+};
+var Runtime = class _Runtime {
   workflowId;
   triggerId;
   envName;
   systemEnvName;
   runtimeUrl;
+  logging;
   constructor(opts) {
-    this.workflowId = opts.workflowId;
-    this.triggerId = opts.triggerId;
-    this.systemEnvName = typeof opts.envName !== "undefined" ? opts.envName : (() => {
-      const hostId = opts.url.replace(/^(?:https?:)?\/\//i, "").split("/")[0].split(".")[0].toLowerCase();
-      let branch = DEFAULT_BRANCH;
-      if (hostId.includes("-")) {
-        branch = hostId.split("-")[0];
-      }
-      return branch;
-    })();
-    this.runtimeUrl = "https://" + new URL("https://" + opts.url.replace(/^(?:https?:)?\/\//i, "").split("/")[0]).host;
-    this.envName = this.systemEnvName === DEFAULT_BRANCH ? "prod" : this.systemEnvName;
+    if (opts instanceof _Runtime) {
+      this.workflowId = opts.workflowId;
+      this.triggerId = opts.triggerId;
+      this.systemEnvName = opts.systemEnvName;
+      this.runtimeUrl = opts.runtimeUrl;
+      this.envName = opts.envName;
+      this.logging = opts.logging || new Logging(this.workflowId, this.triggerId, this.systemEnvName);
+    } else {
+      this.workflowId = opts.workflowId;
+      this.triggerId = opts.triggerId;
+      this.systemEnvName = typeof opts.envName !== "undefined" ? opts.envName : (() => {
+        const hostId = opts.url.replace(/^(?:https?:)?\/\//i, "").split("/")[0].split(".")[0].toLowerCase();
+        let branch = DEFAULT_BRANCH;
+        if (hostId.includes("-")) {
+          branch = hostId.split("-")[0];
+        }
+        return branch;
+      })();
+      this.runtimeUrl = "https://" + new URL("https://" + opts.url.replace(/^(?:https?:)?\/\//i, "").split("/")[0]).host;
+      this.envName = this.systemEnvName === DEFAULT_BRANCH ? "prod" : this.systemEnvName;
+      this.logging = opts.logging || new Logging(this.workflowId, this.triggerId, this.systemEnvName);
+    }
   }
 };
 
@@ -567,13 +606,6 @@ var EnvEngine = class extends Runtime {
     };
   }
   async set(envs, level = "trigger", encryptWithValue) {
-    const timeout = 300;
-    await Promise.race([this.initializeIfNeeded(level), new Promise((resolve, reject) => setTimeout(() => {
-      reject(new Error(`Waitied ${timeout}ms. Terminating firestore initialize during the set function`));
-    }, timeout))]).catch((err) => {
-      console.warn("Invariant: While initializing the env engine during set - " + err.message + ` - ${this.envName} - ${this.workflowId} - ${this.triggerId}.
-        Failing quietly as the set might proceed, but this is not a good thing.`);
-    });
     let aes = null;
     if (encryptWithValue) {
       aes = new AES256GCM(Buffer.from(encryptWithValue, "utf8"));
@@ -598,7 +630,6 @@ var EnvEngine = class extends Runtime {
         throw new Error(`Failed to set the ${envs.map((x) => x.name).join(", ")}. Error: ${err.message}`);
       }
     }
-    Object.assign(this.store[level], obj);
     return void 0;
   }
   async initializeIfNeeded(level = "trigger") {
@@ -791,16 +822,19 @@ var PubSubHelper = class extends Runtime {
     return Promise.all(promises);
   }
   async createOrUpdate(opts) {
+    this.logging.log("createOrUpdate called with", opts);
     const [topics] = await this.pubSub.getTopics();
-    const mainDlqTopicName = `${opts.topicName}-${shortHash(this.triggerId)}-dlq`;
-    const tableDlqTopicName = `${opts.topicName}-${shortHash(this.triggerId)}-bq-dlq`;
+    this.logging.log("topics discovered", topics);
+    const infraPrefix = opts.topicName.indexOf("---") !== -1 ? opts.topicName : `${this.envName}---${opts.topicName}`;
+    const mainDlqTopicName = `${infraPrefix}-${shortHash(this.triggerId)}-dlq`;
+    const tableDlqTopicName = `${infraPrefix}-${shortHash(this.triggerId)}-bq-dlq`;
     let mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === opts.topicName);
     let mainDlqTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainDlqTopicName);
     let tableDlqTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === tableDlqTopicName);
-    const mainSubscriptionName = `${opts.topicName}--${shortHash(this.triggerId)}`;
-    const mainDlqSubscriptionName = `${opts.topicName}--${shortHash(this.triggerId)}-dlq`;
-    const tableSubscriptionName = `${opts.topicName}--${shortHash(this.triggerId)}-bq`;
-    const tableDlqSubscriptionName = `${opts.topicName}--${shortHash(this.triggerId)}-bq-dlq`;
+    const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
+    const mainDlqSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}-dlq`;
+    const tableSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}-bq`;
+    const tableDlqSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}-bq-dlq`;
     let mainTopicSubscriptions = null;
     let mainDlqTopicSubscriptions = null;
     let tableDlqTopicSubscriptions = null;
@@ -817,11 +851,28 @@ var PubSubHelper = class extends Runtime {
     let mainDlqSubscription = mainDlqTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainDlqSubscriptionName) || null;
     let tableSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === tableSubscriptionName) || null;
     let tableDlqSubscription = tableDlqTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === tableDlqSubscriptionName) || null;
+    this.logging.log("environment discovery", {
+      mainTopicName: opts.topicName,
+      mainDlqTopicName,
+      tableDlqTopicName,
+      mainSubscriptionName,
+      mainDlqSubscriptionName,
+      tableSubscriptionName,
+      tableDlqSubscriptionName,
+      mainTopicExists: mainTopic,
+      mainDlqTopicExists: mainDlqTopic,
+      tableDlqTopicExists: tableDlqTopic,
+      mainSubscriptionExists: mainSubscription,
+      mainDlqSubscriptionExists: mainDlqSubscription,
+      tableSubscriptionExists: tableSubscription,
+      tableDlqSubscriptionExists: tableDlqSubscription
+    });
     const topic = await this.ensureTopicExists(opts.topicName);
     if (opts.table || opts.pull || opts.push) {
       mainTopic = await this.ensureTopicExists(opts.topicName);
     }
     if (!opts.table) {
+      this.logging.log("createOrUpdate deleting table subscriptions");
       if (tableSubscription) {
         await tableSubscription.delete();
         tableSubscription = null;
@@ -831,12 +882,17 @@ var PubSubHelper = class extends Runtime {
         tableDlqSubscription = null;
       }
     } else {
+      this.logging.log("createOrUpdate creating table subscription");
       if (opts.createDeadLetterQueues) {
+        this.logging.log("createOrUpdate ensuring dlqs exist for table subscription");
         tableDlqTopic = await this.ensureTopicExists(tableDlqTopicName);
-        tableDlqSubscription = await this.ensureDLQSubscriptionExists(tableDlqSubscriptionName, {
-          topic: tableDlqTopic
+        tableDlqSubscription = await this.ensureSubscribtionExists(tableDlqSubscriptionName, {
+          topic: tableDlqTopic,
+          endpointUrl: null,
+          dlqTopic: null
         });
       }
+      this.logging.log("createOrUpdate ensuring the table subscription exists");
       tableSubscription = await this.ensureSubscribtionExists(tableSubscriptionName, {
         topic,
         tableId: opts.table.tableId,
@@ -849,6 +905,7 @@ var PubSubHelper = class extends Runtime {
     }
     const pullPushSubscription = opts.pull || opts.push;
     if (!pullPushSubscription) {
+      this.logging.log("createOrUpdate deleting main subscriptions");
       if (mainSubscription) {
         await mainSubscription.delete();
         mainSubscription = null;
@@ -859,22 +916,26 @@ var PubSubHelper = class extends Runtime {
       }
     } else {
       if (opts.createDeadLetterQueues) {
+        this.logging.log("createOrUpdate creating dlqs for main subscription");
         mainDlqTopic = await this.ensureTopicExists(mainDlqTopicName);
-        mainDlqSubscription = await this.ensureDLQSubscriptionExists(mainDlqSubscriptionName, {
-          topic: mainDlqTopic
-        });
-        mainSubscription = await this.ensureSubscribtionExists(mainSubscriptionName, {
-          topic,
-          dlqTopic: mainDlqTopic,
-          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: pullPushSubscription.ackDeadline
+        mainDlqSubscription = await this.ensureSubscribtionExists(mainDlqSubscriptionName, {
+          topic: mainDlqTopic,
+          dlqTopic: null,
+          endpointUrl: null
         });
       }
+      mainSubscription = await this.ensureSubscribtionExists(mainSubscriptionName, {
+        topic,
+        dlqTopic: mainDlqTopic || null,
+        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: pullPushSubscription.ackDeadline
+      });
     }
     if (!opts.createDeadLetterQueues) {
+      this.logging.log("createOrUpdate deleting all dlqs");
       if (mainDlqSubscription) {
         await mainDlqSubscription.delete();
         mainDlqSubscription = null;
@@ -904,11 +965,20 @@ var PubSubHelper = class extends Runtime {
     return topics.find((topic) => this.getNameFromFullyQualifiedName(topic.name) === topicName);
   }
   async ensureTopicExists(topicName) {
+    this.logging.log("ensureTopicExists called with", topicName);
     let topic = await this.findTopic(topicName);
+    this.logging.log(`ensureTopicExists topic ${!topic ? "does not " : ""}exists`, topic);
+    let topicMetadata;
+    try {
+      [topicMetadata] = await topic?.getMetadata() || [null];
+    } catch (err) {
+      throw new Error("Invariant: While getting topic metadata - " + err.message);
+    }
+    this.logging.log(`ensureTopicExists retrieved topic metadata`, topicMetadata);
     const metadata = {
       labels: {
         "created-at": (/* @__PURE__ */ new Date()).getTime().toString(),
-        "last-modified-at": (/* @__PURE__ */ new Date()).getTime().toString(),
+        "last-modified-at": topicMetadata?.labels?.["last-modified-at"] || (/* @__PURE__ */ new Date()).getTime().toString(),
         "created-by-bs-triggerid": this.triggerId.toLowerCase(),
         "created-by-bs-workflowid": this.workflowId.toLowerCase(),
         "bs-envname": this.systemEnvName.toLowerCase(),
@@ -916,21 +986,25 @@ var PubSubHelper = class extends Runtime {
         [`w-${this.workflowId}-${this.triggerId}`.toLowerCase()]: "true"
       }
     };
-    let topicMetadata;
-    try {
-      [topicMetadata] = await topic?.getMetadata() || [null];
-    } catch (err) {
-      throw new Error("Invariant: While getting topic metadata - " + err.message);
-    }
     if (topic) {
       const simMetadata = Object.assign({}, topicMetadata?.labels || {}, metadata.labels);
       if (!(0, import_lodash.default)(topicMetadata?.labels, simMetadata)) {
         simMetadata["last-modified-at"] = (/* @__PURE__ */ new Date()).getTime().toString();
-        await topic.setMetadata({
-          labels: simMetadata
-        });
+        this.logging.log(`ensureTopicExists topic metadata has changed updating with`, simMetadata);
+        try {
+          await topic.setMetadata({
+            labels: simMetadata
+          });
+        } catch (err) {
+          this.logging.error("ensureTopicExists received error while setting metadata", err.message, err.stack);
+          throw err;
+        }
       }
     } else {
+      this.logging.log(`ensureTopicExists creating new topic`, {
+        name: topicName,
+        labels: metadata.labels
+      });
       await this.pubSub.createTopic({
         name: topicName,
         labels: metadata.labels
@@ -953,11 +1027,20 @@ var PubSubHelper = class extends Runtime {
       retryMaxDelay: 360,
       ackDeadline: 90
     };
+    this.logging.log("updateSubscription called with", subscriptionName, subscription, subscriptionMetaData, inputOpts);
     const opts = Object.assign({}, defaultOptions, inputOpts);
+    this.logging.log("updateSubscription final opts", opts);
     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) {
+          this.logging.log("updateSubscription pushConfig changed, push configuration already exists, modifying", {
+            pushEndpoint: opts.endpointUrl,
+            oidcToken: {
+              serviceAccountEmail: this.serviceAccountEmail,
+              audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
+            }
+          });
           try {
             await subscription.modifyPushConfig({
               pushEndpoint: opts.endpointUrl,
@@ -1047,10 +1130,11 @@ var PubSubHelper = class extends Runtime {
       nextMetadata.bigqueryConfig = null;
     }
     if (subscription && nextMetadata) {
+      this.logging.log("updateSubscription updating subscription", nextMetadata);
       try {
         await subscription.setMetadata(nextMetadata);
       } catch (err) {
-        console.error("Invariant: While updating subscription - " + err.message + ` - ${this.pubSub.projectId} - ${subscriptionName} - ${JSON.stringify(nextMetadata)}`);
+        this.logging.error("updateSubscription received error while setting metadata", err.message, err.stack);
         throw new Error("Invariant: While updating subscription - " + err.message);
       }
     }
@@ -1059,14 +1143,17 @@ var PubSubHelper = class extends Runtime {
   async ensureSubscribtionExists(subscriptionName, opts) {
     let [subscriptions] = await opts.topic.getSubscriptions();
     let subscription = subscriptions.find((subscription2) => this.getNameFromFullyQualifiedName(subscription2.name) === subscriptionName) || null;
+    this.logging.log("ensureSubscribtionExists called with", subscriptionName, opts);
     let subscriptionMetaData;
     try {
       [subscriptionMetaData] = await subscription?.getMetadata() || [null];
     } catch (err) {
       throw new Error("Invariant: While getting subscription metadata - " + err.message);
     }
+    this.logging.log("ensureSubscribtionExists retrieved subscriptionMetaData", subscriptionMetaData);
     const createPayload = await this.updateSubscription(subscriptionName, subscription, subscriptionMetaData, opts);
-    if (createPayload) {
+    if (createPayload && !subscription) {
+      this.logging.log(`ensureSubscribtionExists creating subscription: ${subscriptionName} on topic: ${opts.topic.name} with`, createPayload);
       await opts.topic.createSubscription(subscriptionName, createPayload);
       [subscriptions] = await opts.topic.getSubscriptions();
       subscription = subscriptions.find((subscription2) => this.getNameFromFullyQualifiedName(subscription2.name) === subscriptionName) || null;
@@ -1076,20 +1163,8 @@ var PubSubHelper = class extends Runtime {
     }
     return subscription;
   }
-  async ensureDLQSubscriptionExists(subscriptionName, opts) {
-    let [subscriptions] = await opts.topic.getSubscriptions();
-    let subscription = subscriptions.find((subscription2) => this.getNameFromFullyQualifiedName(subscription2.name) === subscriptionName);
-    if (!subscription) {
-      await opts.topic.createSubscription(subscriptionName);
-      [subscriptions] = await opts.topic.getSubscriptions();
-      subscription = subscriptions.find((subscription2) => this.getNameFromFullyQualifiedName(subscription2.name) === subscriptionName);
-    }
-    if (!subscription) {
-      throw new Error(`Invariant: While creating subscription - subscription is not found`);
-    }
-    return subscription;
-  }
   async deleteSubscriptions(topicName) {
+    this.logging.log("deleteSubscriptions called with", topicName);
     return this.createOrUpdate({
       topicName,
       createDeadLetterQueues: false,
@@ -1101,13 +1176,18 @@ var PubSubHelper = class extends Runtime {
   async isRunning(topicName) {
     const [topics] = await this.pubSub.getTopics();
     const mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === topicName);
+    this.logging.log("isRunning called with", topicName);
+    const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
     let mainTopicSubscriptions = null;
     if (mainTopic) {
       [mainTopicSubscriptions] = await mainTopic.getSubscriptions();
     }
-    const mainSubscriptionName = `${topicName}--${shortHash(this.triggerId)}`;
+    const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
+    this.logging.log("isRunning checking the", mainSubscriptionName);
     const mainSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainSubscriptionName) || null;
+    this.logging.log("isRunning found the", mainSubscription);
     const [metadata] = await mainSubscription?.getMetadata() || [null];
+    this.logging.log("isRunning received metadata", metadata);
     return {
       subscriptionId: mainSubscription?.name,
       isRunning: metadata?.pushConfig?.pushEndpoint !== null
@@ -1116,16 +1196,25 @@ var PubSubHelper = class extends Runtime {
   async pause(topicName) {
     const [topics] = await this.pubSub.getTopics();
     const mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === topicName);
+    this.logging.log("paused called with", topicName);
+    const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
     let mainTopicSubscriptions = null;
     if (mainTopic) {
       [mainTopicSubscriptions] = await mainTopic.getSubscriptions();
     }
-    const mainSubscriptionName = `${topicName}--${shortHash(this.triggerId)}`;
+    const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
+    this.logging.log("isRunning checking the", mainSubscriptionName);
     const mainSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainSubscriptionName) || null;
+    this.logging.log("pause found the", mainSubscription);
     if (mainSubscription) {
-      await mainSubscription.setMetadata({
-        pushConfig: null
-      });
+      try {
+        await mainSubscription.setMetadata({
+          pushConfig: null
+        });
+      } catch (err) {
+        this.logging.error("pause received error while setting metadata", err.message, err.stack);
+        throw err;
+      }
       return {
         subscriptionId: mainSubscription.name
       };
@@ -1137,22 +1226,40 @@ var PubSubHelper = class extends Runtime {
   async resume(topicName) {
     const [topics] = await this.pubSub.getTopics();
     const mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === topicName);
+    this.logging.log("resume called with", topicName);
+    const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
     let mainTopicSubscriptions = null;
     if (mainTopic) {
       [mainTopicSubscriptions] = await mainTopic.getSubscriptions();
     }
-    const mainSubscriptionName = `${topicName}--${shortHash(this.triggerId)}`;
+    const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
+    this.logging.log("resume checking the", mainSubscriptionName);
     const mainSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainSubscriptionName) || null;
+    this.logging.log("resume found the", mainSubscription);
     if (mainSubscription) {
-      await mainSubscription.setMetadata({
-        pushConfig: {
-          pushEndpoint: this.runtimeUrl + "/executeWorkflow/" + this.workflowId + "/" + this.triggerId + `?topic_name=${topicName}`,
-          oidcToken: {
-            serviceAccountEmail: this.serviceAccountEmail,
-            audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
+      try {
+        this.logging.log("resume setting metadata", {
+          pushConfig: {
+            pushEndpoint: this.runtimeUrl + "/executeWorkflow/" + this.workflowId + "/" + this.triggerId + `?topic_name=${topicName}`,
+            oidcToken: {
+              serviceAccountEmail: this.serviceAccountEmail,
+              audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
+            }
           }
-        }
-      });
+        });
+        await mainSubscription.setMetadata({
+          pushConfig: {
+            pushEndpoint: this.runtimeUrl + "/executeWorkflow/" + this.workflowId + "/" + this.triggerId + `?topic_name=${topicName}`,
+            oidcToken: {
+              serviceAccountEmail: this.serviceAccountEmail,
+              audience: process.env.GCLOUD_PROJECT + "/" + this.triggerId
+            }
+          }
+        });
+      } catch (err) {
+        this.logging.error("resume received error while setting metadata", err.message, err.stack);
+        throw err;
+      }
       return {
         subscriptionId: mainSubscription.name
       };

package/package.json

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