@shushed/helpers 0.0.270 → 0.0.271

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

@@ -156,6 +156,26 @@ class PubSubHelper extends runtime_1.default {
         if (topicName.indexOf('rn.') !== 0 && /^\d/.test(topicName)) {
             topicName = `rn.${topicName}`;
         }
+        const topicAttributesNorm = {};
+        if (opts.topicAttributes && typeof opts.topicAttributes === 'object') {
+            for (const key in opts.topicAttributes) {
+                const v = normalizeCore(`${opts.topicAttributes[key]}`);
+                const k = normalizeCore(key);
+                if (v) {
+                    topicAttributesNorm[k] = v;
+                }
+            }
+        }
+        const subscriptionAttributesNorm = {};
+        if (opts.subscriptionAttributes && typeof opts.subscriptionAttributes === 'object') {
+            for (const key in opts.subscriptionAttributes) {
+                const v = normalizeCore(`${opts.subscriptionAttributes[key]}`);
+                const k = normalizeCore(key);
+                if (v) {
+                    subscriptionAttributesNorm[k] = v;
+                }
+            }
+        }
         const mainSubscriptionName = opts.subscriptionName || topicName;
         const tableSubscriptionName = `${mainSubscriptionName}.bq`;
         const mainDlqTopicName = `${mainSubscriptionName}.dlq`;
@@ -181,7 +201,7 @@ class PubSubHelper extends runtime_1.default {
         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;
-        const topic = await this.ensureTopicExists(opts.topicName);
+        const topic = await this.ensureTopicExists(opts.topicName, topicAttributesNorm);
         if (!opts.table) {
             if (tableSubscription) {
                 await tableSubscription.delete();
@@ -194,13 +214,15 @@ class PubSubHelper extends runtime_1.default {
         }
         else {
             if (opts.createDeadLetterQueues) {
-                tableDlqTopic = await this.ensureTopicExists(tableDlqTopicName);
+                tableDlqTopic = await this.ensureTopicExists(tableDlqTopicName, topicAttributesNorm);
                 tableDlqSubscription = await this.ensureSubscribtionExists(tableDlqSubscriptionName, {
+                    attributes: subscriptionAttributesNorm,
                     topic: tableDlqTopic,
                     dlqTopic: null,
                 });
             }
             tableSubscription = await this.ensureSubscribtionExists(tableSubscriptionName, {
+                attributes: subscriptionAttributesNorm,
                 topic: topic,
                 tableId: opts.table.tableId,
                 ackDeadline: opts.table.ackDeadline,
@@ -223,13 +245,15 @@ class PubSubHelper extends runtime_1.default {
         }
         else {
             if (opts.createDeadLetterQueues) {
-                mainDlqTopic = await this.ensureTopicExists(mainDlqTopicName);
+                mainDlqTopic = await this.ensureTopicExists(mainDlqTopicName, topicAttributesNorm);
                 mainDlqSubscription = await this.ensureSubscribtionExists(mainDlqSubscriptionName, {
+                    attributes: subscriptionAttributesNorm,
                     topic: mainDlqTopic,
                     dlqTopic: null,
                 });
             }
             mainSubscription = await this.ensureSubscribtionExists(mainSubscriptionName, {
+                attributes: subscriptionAttributesNorm,
                 topic,
                 dlqTopic: mainDlqTopic || null,
                 exactlyOnceDelivery: true,
@@ -269,7 +293,7 @@ class PubSubHelper extends runtime_1.default {
         const [topics] = await this.pubSub.getTopics();
         return topics.find(topic => this.getNameFromFullyQualifiedName(topic.name) === topicName);
     }
-    async ensureTopicExists(topicName) {
+    async ensureTopicExists(topicName, attributes) {
         let topic = await this.findTopic(topicName);
         let topicMetadata;
         try {
@@ -280,16 +304,17 @@ class PubSubHelper extends runtime_1.default {
         }
         const metadata = {
             labels: {
-                'bs-envname': this.systemEnvName.toLowerCase(),
+                'dlq': topicName.indexOf('.dlq') > -1 ? '1' : '0',
                 'env': this.envName.toLowerCase(),
-                'bs-is-deadletter': topicName.indexOf('.dlq') > -1 ? '1' : '0',
-                'respectful-nudge': '1'
+                'rn': '1',
+                ...(Object.assign({}, attributes || {}), {
+                    'bq': topicName.indexOf('.bq') > -1 ? '1' : '0',
+                }),
             }
         };
         if (topic && !process.env.PUBSUB_EMULATOR_HOST) {
             const simMetadata = Object.assign({}, topicMetadata?.labels || {}, metadata.labels);
             if (!(0, lodash_isequal_1.default)(topicMetadata?.labels, simMetadata)) {
-                simMetadata['last-modified-at'] = new Date().getTime().toString();
                 try {
                     await topic.setMetadata({
                         labels: simMetadata
@@ -374,12 +399,12 @@ class PubSubHelper extends runtime_1.default {
         }
         const proposedLabels = {
             'env': this.envName.toLowerCase(),
-            'bs-workflowid': this.workflowId.toLowerCase(),
-            'bs-envname': this.systemEnvName.toLowerCase(),
-            'bs-is-deadletter': subscriptionName.indexOf('.dlq') > -1 ? '1' : '0',
-            'bs-bigquery-tableid': isSubscriptionBigQuery(opts) && opts.tableId ? opts.tableId.replace(/\./g, '-').toLowerCase() : '',
-            'bs-is-bigquery': isSubscriptionBigQuery(opts) && opts.tableId ? '1' : '0',
-            'respectful-nudge': '1'
+            'dlq': subscriptionName.indexOf('.dlq') > -1 ? '1' : '0',
+            'bq': isSubscriptionBigQuery(opts) && opts.tableId ? '1' : '0',
+            'table': (isSubscriptionBigQuery(opts) && opts.tableId) ? normalizeCore(opts.tableId.split('.').slice(-1)[0]) : '',
+            'int': subscriptionName.indexOf('.int') > -1 ? '1' : '0',
+            'topic': normalizeCore(opts.topic.name.split('/').slice(-1)[0].split('---').slice(-1)[0].split('.')[0]) + (subscriptionName.indexOf('.int') > -1 ? '.int' : ''),
+            ...(Object.assign({}, inputOpts.attributes || {})),
         };
         const simLabels = Object.assign({}, subscriptionMetaData?.labels || {}, proposedLabels);
         if (!(0, lodash_isequal_1.default)(simLabels, subscriptionMetaData?.labels)) {
@@ -487,4 +512,13 @@ class PubSubHelper extends runtime_1.default {
         return subscription;
     }
 }
+function normalizeCore(raw) {
+    return raw
+        .normalize("NFKD")
+        .toLowerCase()
+        .replace(/[\s./:;+|]+/g, "_")
+        .replace(/[^a-z0-9_-]/g, "")
+        .replace(/[_-]{2,}/g, "_")
+        .replace(/^[_-]+|[_-]+$/g, "");
+}
 exports.default = PubSubHelper;

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

@@ -23,6 +23,7 @@ type MessageBody = Record<string, any>;
 type SubscriptionOptionsPull = {
     topic: Topic;
     exactlyOnceDelivery?: boolean;
+    attributes?: Record<string, string>;
     retryMinDelay?: number;
     retryMaxDelay?: number;
     retryLimit?: number;
@@ -32,6 +33,7 @@ type SubscriptionOptionsPull = {
 };
 type SubscriptionOptionsBigQuery = {
     topic: Topic;
+    attributes?: Record<string, string>;
     tableId: string;
     dlqTopic: Topic | null;
     retryMinDelay?: number;
@@ -68,6 +70,9 @@ declare class PubSubHelper extends Runtime {
         subscriptionName?: string;
         createDeadLetterQueues: boolean;
         subscriptionFilter?: string | null;
+        subscriptionLabels?: Record<string, string>;
+        subscriptionAttributes?: Record<string, string>;
+        topicAttributes?: Record<string, string>;
         pull?: null | {
             retryLimit: number;
             ackDeadline: number;

package/package.json

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