@shushed/helpers 0.0.73 → 0.0.74

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;

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,6 +868,10 @@ 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();

package/package.json

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