@shushed/helpers 0.0.35 → 0.0.37

package/dist/index.d.ts

@@ -28743,6 +28743,7 @@ declare class EnvEngine extends Runtime {
 
 type Message = {
     buildshipId: string;
+    exportableToBigQuery: boolean;
     body: any;
     sourceSystem: string;
     targetSystem: string;
@@ -28750,6 +28751,7 @@ type Message = {
     recordModifiedAt: Date | null;
     originalPublishTime: Date | null;
     publishTime: Date | null;
+    extraAttributes: Record<string, string>;
 };
 type LastModifiedKeys = 'last_modified_date_time' | 'last_modified_date' | 'last_modified_datetime' | 'record_modified_at' | 'lastModifiedDateTime' | 'lastModifiedAt' | 'last_modified_at' | 'SystemModifiedAt' | 'system_modified_at' | 'lastUpdatedAt' | 'modified_at' | 'last_updated_at' | 'modifiedAt';
 type AtLeastOne<T, Keys extends keyof T = keyof T> = Partial<T> & {

package/dist/index.js

@@ -678,6 +678,7 @@ var env_default = EnvEngine;
 
 // src-public/pubsub.ts
 var import_co_body = __toESM(require("co-body"));
+var import_lodash = __toESM(require("lodash.omit"));
 function isSubscriptionOptionsPush(opts) {
   return "endpointUrl" in opts;
 }
@@ -705,7 +706,9 @@ var PubSubHelper = class extends Runtime {
       originalPublishTime: parseDateOrDefault(rawMessage.attributes?.original_publish_time, parseDateOrDefault(rawMessage.publish_time)),
       buildshipId: rawMessage.attributes?.buildship_id || "unknown",
       publishTime: parseDateOrDefault(rawMessage.publish_time),
-      body: messageBody
+      body: messageBody,
+      exportableToBigQuery: !!rawMessage.attributes?.bigquery,
+      extraAttributes: (0, import_lodash.default)(rawMessage.attributes || {}, ["source_system", "target_system", "process_started_at", "record_modified_at", "original_publish_time", "buildship_id", "publish_time", "bigquery"])
     };
     return message;
   }
@@ -726,16 +729,21 @@ var PubSubHelper = class extends Runtime {
     for (let i = 0; i < normPayloads.length; i++) {
       const normPayload = normPayloads[i];
       promises.push((async () => {
+        const attributes = {
+          ...(0, import_lodash.default)(options.extraAttributes || {}, ["source_system", "target_system", "process_started_at", "record_modified_at", "original_publish_time", "buildship_id", "publish_time", "bigquery"]),
+          source_system: options.sourceSystem,
+          target_system: options.targetSystem || orgMessage?.targetSystem || "*",
+          process_started_at: (options.processStartedAt || orgMessage?.processStartedAt || /* @__PURE__ */ new Date()).toISOString(),
+          record_modified_at: (getEventTime(normPayload, null) || /* @__PURE__ */ new Date()).toISOString(),
+          original_publish_time: (orgMessage?.originalPublishTime || orgMessage?.publishTime || /* @__PURE__ */ new Date())?.toDateString() || "",
+          buildship_id: this.systemEnvName + "-" + this.workflowId + "-" + this.triggerId
+        };
+        if (options.exportableToBigQuery) {
+          attributes.bigquery = "yes";
+        }
         const result = await topic.publishMessage({
           data: Buffer.from(JSON.stringify(normPayload)),
-          attributes: {
-            source_system: options.sourceSystem,
-            target_system: options.targetSystem || orgMessage?.targetSystem || "*",
-            process_started_at: (options.processStartedAt || orgMessage?.processStartedAt || /* @__PURE__ */ new Date()).toISOString(),
-            record_modified_at: (getEventTime(normPayload, null) || /* @__PURE__ */ new Date()).toISOString(),
-            original_publish_time: (orgMessage?.originalPublishTime || orgMessage?.publishTime || /* @__PURE__ */ new Date())?.toDateString() || "",
-            buildship_id: this.systemEnvName + "-" + this.workflowId + "-" + this.triggerId
-          }
+          attributes
         });
         return result;
       })());
@@ -743,7 +751,7 @@ var PubSubHelper = class extends Runtime {
     return Promise.all(promises);
   }
   async createOrUpdate(opts) {
-    const subscriptionName = `${this.envName === "prod" ? "" : `${this.envName}---`}${this.triggerId}`;
+    const subscriptionName = `${this.envName}---${this.triggerId}`;
     const topic = await this.ensureTopicExists(opts.topicName);
     let dlqTopic = null;
     let dlqSubscription = null;
@@ -839,6 +847,7 @@ var PubSubHelper = class extends Runtime {
         serviceAccountEmail: this.serviceAccountEmail,
         useTableSchema: false
       };
+      payload.filter = `attributes:bigquery`;
     } else {
       payload.ackDeadlineSeconds = opts.ackDeadline || 90;
       payload.pushConfig = {
@@ -854,7 +863,7 @@ var PubSubHelper = class extends Runtime {
       };
       if (opts.dlqTopic) {
         payload.deadLetterPolicy = {
-          deadLetterTopic: this.getNameFromFullyQualifiedName(opts.dlqTopic.name),
+          deadLetterTopic: opts.dlqTopic.name,
           maxDeliveryAttempts: opts.retryLimit
         };
       }

package/dist/package.json

@@ -10,7 +10,8 @@
     "ajv-formats": "^3.0.1",
     "co-body": "^6.2.0",
     "jose": "^6.0.11",
-    "lodash.clonedeep": "^4.5.0"
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.omit": "^4.5.0"
   },
   "files": [
     "dist"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "author": "",
   "license": "UNLICENSED",
   "description": "",
@@ -10,7 +10,8 @@
     "ajv-formats": "^3.0.1",
     "co-body": "^6.2.0",
     "jose": "^6.0.11",
-    "lodash.clonedeep": "^4.5.0"
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.omit": "^4.5.0"
   },
   "files": [
     "dist"