@shushed/helpers 0.0.73 → 0.0.75

package/dist/index.d.ts

@@ -28830,6 +28830,7 @@ declare class EnvEngine extends Runtime {
 type Message = {
     buildshipId: string;
     exportableToBigQuery: boolean;
+    subscriptionName?: string;
     body: any;
     sourceSystem: string;
     targetSystem: string;
@@ -28863,6 +28864,7 @@ declare class PubSubHelper extends Runtime {
         topicName: string;
         sourceSystem: string;
     }, payload: AtLeastOne<MessageBody, LastModifiedKeys>, orgMessage?: Message): Promise<string[]>;
+    getSubscriptionName(topicName: string): string;
     createOrUpdate(opts: {
         topicName: string;
         createDeadLetterQueues: boolean;
@@ -28908,9 +28910,41 @@ declare class PubSubHelper extends Runtime {
         tableDlqSubscription: Subscription | null;
         tableSubscription: Subscription | null;
     }>;
-    isRunning(topicName: string): Promise<{
-        subscriptionId: string | undefined;
-        isPushingMessages: boolean;
+    getStatus(topicName: string): Promise<{
+        subscriptions: {
+            main: {
+                name: string;
+                shortName: string;
+                isPush: boolean;
+            } | null;
+            table: {
+                name: string;
+                shortName: string;
+                tableId: string | null | undefined;
+            } | null;
+            tableDlq: {
+                name: string;
+                shortName: string;
+            } | null;
+            mainDlq: {
+                name: string;
+                shortName: string;
+            } | null;
+        };
+        topics: {
+            main: {
+                name: string;
+                shortName: string;
+            } | null;
+            mainDlq: {
+                name: string;
+                shortName: string;
+            } | null;
+            tableDlq: {
+                name: string;
+                shortName: string;
+            } | null;
+        };
     }>;
     pause(topicName: string): Promise<{
         subscriptionId: string;

package/dist/index.js

@@ -810,16 +810,17 @@ var PubSubHelper = class extends Runtime {
       throw new Error("Could not parse the message body. Original body: " + rawMessageText + " . Error: " + err.message);
     }
     const message = {
-      sourceSystem: rawMessage.attributes?.source_system || "unknown",
-      targetSystem: rawMessage.attributes?.target_system || "*",
-      processStartedAt: parseDateOrDefault(rawMessage.attributes?.process_started_at),
+      sourceSystem: rawMessage.message?.attributes?.source_system || "unknown",
+      targetSystem: rawMessage.message?.attributes?.target_system || "*",
+      processStartedAt: parseDateOrDefault(rawMessage.message?.attributes?.process_started_at),
       recordModifiedAt: parseDateOrDefault(getEventTime(messageBody, rawMessage.attributes?.record_modified_at)),
-      originalPublishTime: parseDateOrDefault(rawMessage.attributes?.original_publish_time, parseDateOrDefault(rawMessage.publish_time)),
+      originalPublishTime: parseDateOrDefault(rawMessage.message?.attributes?.original_publish_time, parseDateOrDefault(rawMessage.message?.publish_time)),
       buildshipId: rawMessage.attributes?.buildship_id || "unknown",
-      publishTime: parseDateOrDefault(rawMessage.publish_time),
+      publishTime: parseDateOrDefault(rawMessage.message?.publish_time),
       body: messageBody,
-      exportableToBigQuery: !!rawMessage.attributes?.bigquery,
-      extraAttributes: (0, import_lodash2.default)(rawMessage.attributes || {}, ["source_system", "target_system", "process_started_at", "record_modified_at", "original_publish_time", "buildship_id", "publish_time", "bigquery"])
+      exportableToBigQuery: !!rawMessage.message?.attributes?.bigquery,
+      extraAttributes: (0, import_lodash2.default)(rawMessage.message?.attributes || {}, ["source_system", "target_system", "process_started_at", "record_modified_at", "original_publish_time", "buildship_id", "publish_time", "bigquery"]),
+      subscriptionName: rawMessage.subscription.split("/").pop()
     };
     return message;
   }
@@ -867,10 +868,13 @@ var PubSubHelper = class extends Runtime {
       throw err;
     });
   }
+  getSubscriptionName(topicName) {
+    const infraPrefix = topicName.indexOf("---") !== -1 ? topicName : `${this.envName}---${topicName}`;
+    return `${infraPrefix}-${shortHash(this.triggerId)}`;
+  }
   async createOrUpdate(opts) {
     this.logging.log("createOrUpdate called with", opts);
     const [topics] = await this.pubSub.getTopics();
-    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`;
@@ -897,22 +901,6 @@ 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);
@@ -1231,24 +1219,70 @@ var PubSubHelper = class extends Runtime {
       table: null
     });
   }
-  async isRunning(topicName) {
+  async getStatus(topicName) {
+    this.logging.log("getStatus called with", 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}`;
+    const mainDlqTopicName = `${infraPrefix}-${shortHash(this.triggerId)}-dlq`;
+    const tableDlqTopicName = `${infraPrefix}-${shortHash(this.triggerId)}-bq-dlq`;
+    const mainTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === topicName);
+    const mainDlqTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainDlqTopicName);
+    const tableDlqTopic = topics.find((x) => this.getNameFromFullyQualifiedName(x.name) === tableDlqTopicName);
+    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;
     if (mainTopic) {
       [mainTopicSubscriptions] = await mainTopic.getSubscriptions();
     }
-    const mainSubscriptionName = `${infraPrefix}-${shortHash(this.triggerId)}`;
-    this.logging.log("isRunning checking the", mainSubscriptionName);
+    if (mainDlqTopic) {
+      [mainDlqTopicSubscriptions] = await mainDlqTopic.getSubscriptions();
+    }
+    if (tableDlqTopic) {
+      [tableDlqTopicSubscriptions] = await tableDlqTopic.getSubscriptions();
+    }
     const mainSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainSubscriptionName) || null;
-    this.logging.log("isRunning found the", mainSubscription?.name);
-    const [metadata] = await mainSubscription?.getMetadata() || [null];
-    this.logging.log("isRunning received metadata", metadata);
+    const mainDlqSubscription = mainDlqTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === mainDlqSubscriptionName) || null;
+    const tableSubscription = mainTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === tableSubscriptionName) || null;
+    const tableDlqSubscription = tableDlqTopicSubscriptions?.find((x) => this.getNameFromFullyQualifiedName(x.name) === tableDlqSubscriptionName) || null;
     return {
-      subscriptionId: mainSubscription?.name,
-      isPushingMessages: !!metadata?.pushConfig?.pushEndpoint
+      subscriptions: {
+        main: mainSubscription ? {
+          name: mainSubscription.name,
+          shortName: this.getNameFromFullyQualifiedName(mainSubscription.name),
+          isPush: (await mainSubscription.getMetadata())[0]?.pushConfig?.pushEndpoint ? true : false
+        } : null,
+        table: tableSubscription ? {
+          name: tableSubscription.name,
+          shortName: this.getNameFromFullyQualifiedName(tableSubscription.name),
+          tableId: (await tableSubscription.getMetadata())[0]?.bigqueryConfig?.table
+        } : null,
+        tableDlq: tableDlqSubscription ? {
+          name: tableDlqSubscription.name,
+          shortName: this.getNameFromFullyQualifiedName(tableDlqSubscription.name)
+        } : null,
+        mainDlq: mainDlqSubscription ? {
+          name: mainDlqSubscription.name,
+          shortName: this.getNameFromFullyQualifiedName(mainDlqSubscription.name)
+        } : null
+      },
+      topics: {
+        main: mainTopic ? {
+          name: mainTopic.name,
+          shortName: this.getNameFromFullyQualifiedName(mainTopic.name)
+        } : null,
+        mainDlq: mainDlqTopic ? {
+          name: mainDlqTopic.name,
+          shortName: this.getNameFromFullyQualifiedName(mainDlqTopic.name)
+        } : null,
+        tableDlq: tableDlqTopic ? {
+          name: tableDlqTopic.name,
+          shortName: this.getNameFromFullyQualifiedName(tableDlqTopic.name)
+        } : null
+      }
     };
   }
   async pause(topicName) {

package/package.json

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