@shushed/helpers 0.0.198-v2-20251111082635 → 0.0.198-v2-20251113133839

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

@@ -692,7 +692,7 @@ class EnvEngine extends runtime_1.default {
                 bodyTxt: messageBodyRaw,
                 exportableToBigQuery: !!requestBody?.message?.attributes?.bigquery,
                 extraAttributes: Object.assign({}, request.query, (0, lodash_omit_1.default)(requestBody?.message?.attributes || {}, ['source_system', 'target_system', 'buildship_id', 'bigquery'])),
-                subscriptionName: requestBody?.subscription?.split('/')?.pop() || request.query.subscriptionName,
+                subscriptionName: (requestBody?.subscription?.split('/')?.pop() || request.query.subscriptionName)?.replace(/^rn\./, ''),
             };
             messages.push(message);
         }

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

@@ -108,14 +108,17 @@ class PubSubHelper extends runtime_1.default {
     }
     async createOrUpdate(opts) {
         const [topics] = await this.pubSub.getTopics();
-        const topicName = opts.topicName;
+        let topicName = opts.topicName;
+        if (topicName.indexOf('rn.') !== 0 && /^\d/.test(topicName)) {
+            topicName = `rn.${topicName}`;
+        }
         const mainSubscriptionName = opts.subscriptionName || topicName;
         const tableSubscriptionName = `${mainSubscriptionName}.bq`;
         const mainDlqTopicName = `${mainSubscriptionName}.dlq`;
         const mainDlqSubscriptionName = `${mainSubscriptionName}.dlq`;
         const tableDlqTopicName = `${mainSubscriptionName}.bq.dlq`;
         const tableDlqSubscriptionName = `${mainSubscriptionName}.bq.dlq`;
-        let mainTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === topicName);
+        const mainTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === topicName);
         let mainDlqTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === mainDlqTopicName);
         let tableDlqTopic = topics.find(x => this.getNameFromFullyQualifiedName(x.name) === tableDlqTopicName);
         let mainTopicSubscriptions = null;
@@ -135,9 +138,6 @@ class PubSubHelper extends runtime_1.default {
         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);
-        if (opts.table || opts.pull) {
-            mainTopic = await this.ensureTopicExists(opts.topicName);
-        }
         if (!opts.table) {
             if (tableSubscription) {
                 await tableSubscription.delete();
@@ -212,7 +212,7 @@ class PubSubHelper extends runtime_1.default {
                 await mainDlqTopic.delete();
         }
         return {
-            mainTopic,
+            mainTopic: topic,
             mainDlqTopic,
             tableDlqTopic,
             mainSubscription,

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

@@ -211,11 +211,14 @@ function minutesAgo(minutes) {
     return new Date(Date.now() - minutes * 60 * 1000).toISOString();
 }
 function setRetryAfterVariable(value, options) {
+    if (!options.root || !options.root.state) {
+        return null;
+    }
     let v = null;
     if (value instanceof Response) {
         v = value.headers.get('retry-after') || null;
     }
-    else if (typeof v === 'object') {
+    else if (typeof value === 'object') {
         if (value instanceof Headers) {
             v = value.get('retry-after') || null;
         }
@@ -223,11 +226,36 @@ function setRetryAfterVariable(value, options) {
             v = value['retry-after'] || null;
         }
     }
-    else if (typeof v !== 'string') {
-        v = null;
+    else if (typeof value === 'string') {
+        v = value;
+    }
+    let normV = 0;
+    if (v) {
+        if (/^\d+$/.test(v)) {
+            normV = new Date(Date.now() + parseInt(v) * 1000).getTime();
+        }
+        else {
+            normV = new Date(v).getTime();
+        }
+        if (isNaN(normV)) {
+            normV = 0;
+        }
+    }
+    else {
+        normV = 0;
+    }
+    let existingV = 0;
+    if (options.root.state['_$hsRetryAfter_']) {
+        existingV = new Date(options.root.state['_$hsRetryAfter_']).getTime();
+        if (isNaN(existingV)) {
+            existingV = 0;
+        }
+    }
+    if (normV > existingV) {
+        options.root.state['_$hsRetryAfter_'] = new Date(normV).toISOString();
+        return new Date(normV).toISOString();
     }
-    options.root.state['_$hsRetryAfter_'] = v;
-    return v;
+    return options.root.state['_$hsRetryAfter_'] ?? null;
 }
 global.functionsCache = global.functionsCache || {};
 exports.FUNCTION_EXPR_ERROR = Symbol('function');
@@ -252,12 +280,7 @@ function onResponse(config, options, requiredFlag) {
         headersToSet = outputBody.headersToSet;
     }
     if (options.root?.state?.['_$hsRetryAfter_'] && !Object.keys(headersToSet).some(x => x.toLocaleLowerCase() === 'retry-after')) {
-        let retryAfter = options.root.state['_$hsRetryAfter_'];
-        if (retryAfter) {
-            if (/^\d+$/.test(retryAfter ?? '')) {
-                retryAfter = new Date(Date.now() + parseInt(retryAfter) * 1000).toString();
-            }
-        }
+        const retryAfter = options.root.state['_$hsRetryAfter_'];
         headersToSet['retry-after'] = retryAfter;
     }
     if (headersToSet) {
@@ -275,23 +298,39 @@ function onResponse(config, options, requiredFlag) {
     else {
         responsePayload = outputBody;
     }
+    const redactedResponse = {
+        message: `<Redacted Response>. Client does not have required permission flag: ${requiredFlag}`,
+        error: false,
+    };
     if (responsePayload && Array.isArray(responsePayload) && responsePayload.length === numberOfInputMessages) {
         return {
             status: headersToSet['retry-after'] ? 429 : (outputStatus ? outputStatus : ((responsePayload && responsePayload instanceof Error) ? 500 : 200)),
             value: responsePayload.map(x => {
                 if (x && typeof x === 'object' && x.statusCode && x.body) {
+                    if (requiredFlag && !flags?.includes(requiredFlag) && !(x.body instanceof Error)) {
+                        return Object.assign({}, x, { body: redactedResponse });
+                    }
+                    if (x.body instanceof Error) {
+                        return Object.assign({}, x, { message: x.body.message, error: true });
+                    }
                     return x;
                 }
                 return {
                     statusCode: x instanceof Error ? (headersToSet['retry-after'] ? 429 : 500) : 200,
-                    body: x instanceof Error ? x.message : x,
+                    body: x instanceof Error ? ({
+                        message: x.message,
+                        error: true
+                    }) : (requiredFlag && flags?.includes(requiredFlag) ? x : redactedResponse),
                 };
             })
         };
     }
     return {
         status: headersToSet['retry-after'] ? 429 : (outputStatus ? outputStatus : ((responsePayload && responsePayload instanceof Error) ? 500 : 200)),
-        value: responsePayload,
+        value: responsePayload instanceof Error ? ({
+            message: responsePayload.message,
+            error: true
+        }) : (requiredFlag && flags?.includes(requiredFlag) ? responsePayload : redactedResponse),
         cacheMaxAge: 0,
     };
 }

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

@@ -78,7 +78,7 @@ declare class PubSubHelper extends Runtime {
             ackDeadline: number;
         };
     }): Promise<{
-        mainTopic: Topic | undefined;
+        mainTopic: Topic;
         mainDlqTopic: Topic | undefined;
         tableDlqTopic: Topic | undefined;
         mainSubscription: Subscription | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.198-v2-20251111082635",
+  "version": "0.0.198-v2-20251113133839",
   "author": "",
   "license": "UNLICENSED",
   "description": "",