@shushed/helpers 0.0.232 → 0.0.234

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

@@ -50,7 +50,6 @@ class BigQueryHelper extends runtime_1.default {
             }
         }
         for (const sql of alterStatements) {
-            console.log(`Executing SQL: ${sql}`);
             await this.bigQuery.query({ query: sql });
         }
         return fullTableId;

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

@@ -684,13 +684,10 @@ class EnvEngine extends runtime_1.default {
             const message = {
                 requestSource: requestSource,
                 messageId: requestBody?.message?.messageId || undefined,
-                sourceSystem: requestBody?.message?.attributes?.source_system || 'unknown',
-                targetSystem: requestBody?.message?.attributes?.target_system || 'unknown',
                 buildshipId: requestBody?.message?.attributes?.buildship_id || 'unknown',
                 publishTime: (0, utils_1.parseDateOrDefault)(requestBody?.message?.publish_time),
                 body: messageBody,
                 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)?.replace(/^rn\./, ''),
             };
@@ -780,9 +777,6 @@ class EnvEngine extends runtime_1.default {
             projectId: pubSubProjectId
         });
         global.HUSH_PUBSUB_INSTANCE = pubSub;
-        this.logging.log('getPubSubHelper', {
-            serviceAccountEmail: serviceAccount,
-        });
         return new pubsub_1.default(this, {
             serviceAccountEmail: serviceAccount
         }, pubSub);

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

@@ -111,8 +111,11 @@ class PubSubHelper extends runtime_1.default {
                     attributes: nextAttributes
                 };
                 let messageId = null;
-                if (options.dryRun) {
-                    messageId = await topic.publishMessage(message);
+                if (!options.dryRun) {
+                    messageId = await topic.publishMessage({
+                        data: Buffer.from(JSON.stringify(message.data)),
+                        attributes: message.attributes,
+                    });
                 }
                 return {
                     message,

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

@@ -98,12 +98,18 @@ class Runtime {
             if (opts.trigger?.label) {
                 this.triggerId = opts.trigger.id || '00000000-0000-0000-0000-000000000000';
                 this.triggerName = opts.trigger?.label?.split(/\sv\d/)[0]?.trim() || this.workflowId;
-                this.triggerVersion = buildSemver((opts.trigger.label.split(/\sv\d/)[1]?.trim() || 'v0').replace(/^v/, ''));
+                this.triggerVersion = buildSemver((opts.trigger?.label?.split(/\sv/)?.find(x => /^\d/.test(x))?.trim() || '0'));
                 this.triggerDataProperties = opts.trigger.data?.properties;
                 this.triggerConfigProperties = opts.trigger.config?.properties;
             }
             else {
-                this.triggerId = Object.values(opts.session?.executedNodes || {}).find(e => e.nodeType === 'trigger')?.nodeId ?? '00000000-0000-0000-0000-000000000000';
+                const triggerIdFromSession = Object.values(opts.session?.executedNodes || {}).find(e => e.nodeType === 'trigger')?.nodeId;
+                let triggerIdFromPath = opts.request?.path?.split('/')?.[3];
+                const isTheTriggerIdInPath = triggerIdFromPath && opts.workflow?.nodeValues?.[triggerIdFromPath] && Object.keys(opts.workflow.nodeValues[triggerIdFromPath]).find(x => x.startsWith('config.'));
+                if (!isTheTriggerIdInPath) {
+                    triggerIdFromPath = undefined;
+                }
+                this.triggerId = triggerIdFromSession || triggerIdFromPath || '00000000-0000-0000-0000-000000000000';
                 this.triggerName = this.workflowRoot[this.triggerId]?.triggerName || this.workflowId;
                 this.triggerVersion = this.workflowRoot[this.triggerId]?.triggerVersion || '0.0.0';
                 this.triggerConfig = this.workflowRoot[this.triggerId]?.triggerConfig;
@@ -176,7 +182,7 @@ class Runtime {
 exports.default = Runtime;
 ;
 function buildSemver(version) {
-    const parts = version.split(/\./).map(x => parseInt(x, 10));
+    const parts = version.split('.').map(x => parseInt(x, 10)).filter(x => !isNaN(x));
     for (let i = parts.length; i < 3; i++) {
         parts.push(0);
     }

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

@@ -107,13 +107,10 @@ declare class EnvEngine extends Runtime {
     }, nodeReq: IncomingMessage): Promise<{
         requestSource: string;
         messageId: string | undefined;
-        sourceSystem: string;
-        targetSystem: string;
         buildshipId: string;
         publishTime: Date | null;
         body: any;
         bodyTxt: string | null;
-        exportableToBigQuery: boolean;
         extraAttributes: Record<string, string>;
         subscriptionName: string | undefined;
     }[]>;
@@ -123,13 +120,10 @@ declare class EnvEngine extends Runtime {
     }, nodeReq: IncomingMessage): Promise<{
         requestSource: string;
         messageId: string | undefined;
-        sourceSystem: string;
-        targetSystem: string;
         buildshipId: string;
         publishTime: Date | null;
         body: any;
         bodyTxt: string | null;
-        exportableToBigQuery: boolean;
         extraAttributes: Record<string, string>;
         subscriptionName: string | undefined;
     }>;

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

@@ -13,6 +13,7 @@ export type Opts = {
     runtimeUrl?: string;
     request?: {
         host?: string;
+        path?: string;
     };
     runtimeEnv?: string;
     env?: {

package/package.json

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