gcf-common-lib 0.24.35 → 0.25.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.24.35",
+  "version": "0.25.36",
   "publishConfig": {
     "access": "public",
     "branches": [

package/src/index.js

@@ -88,12 +88,16 @@ class GcfCommon {
     }
     static publish(event, context, json, attributes) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { topic, queue, appId, env, requestId } = yield this.getTopicAndQueue(event, context);
+            const { topic, exchange, queue, appId, env, requestId } = yield this.safeGetAttributes(event, context, [
+                'topic',
+                'exchange',
+                'queue',
+            ]);
             if (topic && !(0, isEmpty_1.default)(topic)) {
                 console.log('publish:', topic, appId, env, json, attributes);
                 return exports.pubSub.topic(topic).publishMessage({
                     json: json !== null && json !== void 0 ? json : {},
-                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, (v) => '' + v)), { appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', 
+                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, v => '' + v)), { appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', 
                         //
                         type: 'response', response: '1' }),
                 });
@@ -102,100 +106,55 @@ class GcfCommon {
                 console.log('send:', queue, appId, env, json, attributes);
                 return (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
                     yield ch.assertQueue(queue, this.amqpOptions.assertOptions);
-                    // const payload = Buffer.from(JSON.stringify(json ?? {}));
-                    // ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions);
-                    yield (0, utils_1.sendToQueueAsync)(ch, queue, json !== null && json !== void 0 ? json : {}, this.amqpOptions.publishOptions);
+                    yield (0, utils_1.publishAmqp)(ch, undefined, queue, json !== null && json !== void 0 ? json : {}, this.amqpOptions.publishOptions);
                 }), this.amqpOptions.url);
             }
-        });
-    }
-    static getTopicAndQueue(event, context) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            let _meta = this.getMetadata(event, context);
-            if (!_meta.topic && !_meta.queue && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
-                if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
-                    const gsEvent = event;
-                    const [meta] = yield exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                    (_meta = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _b !== void 0 ? _b : {});
-                }
-            }
-            return {
-                topic: _meta.topic,
-                queue: _meta.queue,
-                env: _meta.env,
-                appId: (_c = _meta.appId) !== null && _c !== void 0 ? _c : _meta['app-id'],
-                requestId: (_d = _meta.requestId) !== null && _d !== void 0 ? _d : _meta['request-id'],
-            };
-        });
-    }
-    static getQueue(event, context) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            let _meta = this.getMetadata(event, context);
-            if (!_meta.queue && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
-                if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
-                    const gsEvent = event;
-                    const [meta] = yield exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                    (_meta = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _b !== void 0 ? _b : {});
-                }
+            if (exchange && !(0, isEmpty_1.default)(exchange)) {
+                console.log('send:', exchange, queue, appId, env, json, attributes);
+                return (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
+                    yield ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
+                    yield (0, utils_1.publishAmqp)(ch, exchange, queue !== null && queue !== void 0 ? queue : '', json !== null && json !== void 0 ? json : {}, this.amqpOptions.publishOptions);
+                }), this.amqpOptions.url);
             }
-            return {
-                queue: _meta.queue,
-                env: _meta.env,
-                appId: (_c = _meta.appId) !== null && _c !== void 0 ? _c : _meta['app-id'],
-                requestId: (_d = _meta.requestId) !== null && _d !== void 0 ? _d : _meta['request-id'],
-            };
         });
     }
-    static getTopic(event, context) {
+    static safeGetAttributes(event, context, props) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
-            let _meta = this.getMetadata(event, context);
-            if (!_meta.topic && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
+            let metaOrAttr = this.getMetadataOrAttribute(event, context);
+            const everyPropIsNil = props.map(prop => (0, lodash_1.get)(metaOrAttr, prop)).every(v => (0, lodash_1.isNil)(v));
+            // if no prop then check file metadata
+            if (everyPropIsNil && ((_a = context === null || context === void 0 ? void 0 : context.resource) === null || _a === void 0 ? void 0 : _a.type) === 'storage#object') {
                 if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
                     const gsEvent = event;
                     const [meta] = yield exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                    (_meta = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _b !== void 0 ? _b : {});
+                    metaOrAttr = (_b = meta === null || meta === void 0 ? void 0 : meta.metadata) !== null && _b !== void 0 ? _b : {};
                 }
             }
-            return {
-                topic: _meta.topic,
-                env: _meta.env,
-                appId: (_c = _meta.appId) !== null && _c !== void 0 ? _c : _meta['app-id'],
-                requestId: (_d = _meta.requestId) !== null && _d !== void 0 ? _d : _meta['request-id'],
-            };
+            return Object.assign(Object.assign({}, metaOrAttr), { appId: (_c = metaOrAttr.appId) !== null && _c !== void 0 ? _c : metaOrAttr['app-id'], requestId: (_d = metaOrAttr.requestId) !== null && _d !== void 0 ? _d : metaOrAttr['request-id'] });
         });
     }
     static getOptions(event, context) {
-        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let { options } = this.getMetadata(event, context);
-            if (!options) {
-                if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
-                    const gsEvent = event;
-                    const [meta] = yield exports.storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-                    options = (_a = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _a === void 0 ? void 0 : _a.options;
-                }
-            }
+            const { options } = yield this.safeGetAttributes(event, context, ['options']);
             return JSON.parse(options !== null && options !== void 0 ? options : '{}');
         });
     }
-    static getMetadata(event, context) {
-        let metadata;
+    static getMetadataOrAttribute(event, context) {
+        let metadataOrAttribute;
         switch (context === null || context === void 0 ? void 0 : context.eventType) {
             case 'google.storage.object.finalize': {
                 const gsEvent = event;
-                metadata = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata;
+                metadataOrAttribute = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata;
                 break;
             }
             case 'google.pubsub.topic.publish': {
                 const psEvent = event;
-                metadata = psEvent === null || psEvent === void 0 ? void 0 : psEvent.attributes;
+                metadataOrAttribute = psEvent === null || psEvent === void 0 ? void 0 : psEvent.attributes;
                 break;
             }
         }
-        return metadata !== null && metadata !== void 0 ? metadata : {};
+        return metadataOrAttribute !== null && metadataOrAttribute !== void 0 ? metadataOrAttribute : {};
     }
     static getSecret(name, version) {
         var _a, _b;
@@ -215,6 +174,7 @@ class GcfCommon {
 }
 exports.GcfCommon = GcfCommon;
 GcfCommon.amqpOptions = {
+    assertExchange: { durable: true, autoDelete: false },
     assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
     publishOptions: { persistent: true },
 };

package/src/index.ts

@@ -1,11 +1,11 @@
 import { PubSub } from '@google-cloud/pubsub';
 import isEmpty from 'lodash/isEmpty';
 import noop from 'lodash/noop';
-import { ms, sendToQueueAsync, timeoutAfter, withAmqpCh } from './utils';
+import { ms, publishAmqp, timeoutAfter, withAmqpCh } from './utils';
 import { Storage } from '@google-cloud/storage';
 import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
-import { TContext, TEvent, TGSEvent, TMetadata, TPSEvent, TResponse } from './types';
-import { mapValues } from 'lodash';
+import { TContext, TEvent, TGSEvent, TMetadataOrAttributes, TPSEvent, TResponse } from './types';
+import { get, isNil, mapValues } from 'lodash';
 import { Options } from 'amqplib';
 import Dict = NodeJS.Dict;
 
@@ -24,9 +24,11 @@ export const secretClient = new SecretManagerServiceClient();
 export class GcfCommon {
   static amqpOptions: {
     url?: string;
+    assertExchange?: Options.AssertExchange;
     assertOptions?: Options.AssertQueue;
     publishOptions?: Options.Publish;
   } = {
+    assertExchange: { durable: true, autoDelete: false },
     assertOptions: { durable: true, autoDelete: true, expires: ms({ d: 1 }) },
     publishOptions: { persistent: true },
   };
@@ -64,14 +66,18 @@ export class GcfCommon {
   }
 
   static async publish(event: TEvent, context: TContext, json?: TResponse, attributes?: Dict<any>) {
-    const { topic, queue, appId, env, requestId } = await this.getTopicAndQueue(event, context);
+    const { topic, exchange, queue, appId, env, requestId } = await this.safeGetAttributes(event, context, [
+      'topic',
+      'exchange',
+      'queue',
+    ]);
 
     if (topic && !isEmpty(topic)) {
       console.log('publish:', topic, appId, env, json, attributes);
       return pubSub.topic(topic).publishMessage({
         json: json ?? {},
         attributes: {
-          ...mapValues(attributes ?? {}, (v) => '' + v),
+          ...mapValues(attributes ?? {}, v => '' + v),
           appId: appId ?? '',
           env: env ?? '',
           requestId: requestId ?? '',
@@ -86,103 +92,61 @@ export class GcfCommon {
       console.log('send:', queue, appId, env, json, attributes);
       return withAmqpCh(async ch => {
         await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-        // const payload = Buffer.from(JSON.stringify(json ?? {}));
-        // ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions);
-        await sendToQueueAsync(ch, queue, json ?? {}, this.amqpOptions.publishOptions);
+        await publishAmqp(ch, undefined, queue, json ?? {}, this.amqpOptions.publishOptions);
       }, this.amqpOptions.url as string);
     }
-  }
-
-
-  static async getTopicAndQueue(event: TEvent, context: TContext) {
-    let _meta = this.getMetadata(event, context);
-
-    if (!_meta.topic && !_meta.queue && context?.resource?.type === 'storage#object') {
-      if (context?.eventType === 'google.storage.object.finalize') {
-        const gsEvent = event as TGSEvent;
-        const [meta] = await storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-        (_meta = meta?.metadata ?? {});
-      }
-    }
 
-    return {
-      topic: _meta.topic,
-      queue: _meta.queue,
-      env: _meta.env,
-      appId: _meta.appId ?? _meta['app-id'],
-      requestId: _meta.requestId ?? _meta['request-id'],
-    };
-  }
-
-  static async getQueue(event: TEvent, context: TContext) {
-    let _meta = this.getMetadata(event, context);
-
-    if (!_meta.queue && context?.resource?.type === 'storage#object') {
-      if (context?.eventType === 'google.storage.object.finalize') {
-        const gsEvent = event as TGSEvent;
-        const [meta] = await storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-        (_meta = meta?.metadata ?? {});
-      }
+    if (exchange && !isEmpty(exchange)) {
+      console.log('send:', exchange, queue, appId, env, json, attributes);
+      return withAmqpCh(async ch => {
+        await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
+        await publishAmqp(ch, exchange, queue ?? '', json ?? {}, this.amqpOptions.publishOptions);
+      }, this.amqpOptions.url as string);
     }
-
-    return {
-      queue: _meta.queue,
-      env: _meta.env,
-      appId: _meta.appId ?? _meta['app-id'],
-      requestId: _meta.requestId ?? _meta['request-id'],
-    };
   }
 
-  static async getTopic(event: TEvent, context: TContext) {
-    let _meta = this.getMetadata(event, context);
+  static async safeGetAttributes(event: TEvent, context: TContext, props: string[]) {
+    let metaOrAttr = this.getMetadataOrAttribute(event, context);
+    const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
 
-    if (!_meta.topic && context?.resource?.type === 'storage#object') {
+    // if no prop then check file metadata
+    if (everyPropIsNil && context?.resource?.type === 'storage#object') {
       if (context?.eventType === 'google.storage.object.finalize') {
         const gsEvent = event as TGSEvent;
         const [meta] = await storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-        (_meta = meta?.metadata ?? {});
+        metaOrAttr = meta?.metadata ?? {};
       }
     }
 
     return {
-      topic: _meta.topic,
-      env: _meta.env,
-      appId: _meta.appId ?? _meta['app-id'],
-      requestId: _meta.requestId ?? _meta['request-id'],
-    };
+      ...metaOrAttr,
+      appId: metaOrAttr.appId ?? metaOrAttr['app-id'],
+      requestId: metaOrAttr.requestId ?? metaOrAttr['request-id'],
+    } as TMetadataOrAttributes;
   }
 
   static async getOptions(event: TEvent, context: TContext): Promise<Dict<any>> {
-    let { options } = this.getMetadata(event, context);
-
-    if (!options) {
-      if (context?.eventType === 'google.storage.object.finalize') {
-        const gsEvent = event as TGSEvent;
-        const [meta] = await storage.bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-        options = meta?.metadata?.options;
-      }
-    }
-
+    const { options } = await this.safeGetAttributes(event, context, ['options']);
     return JSON.parse(options ?? '{}');
   }
 
-  static getMetadata(event: TEvent, context: TContext) {
-    let metadata: TMetadata | undefined;
+  static getMetadataOrAttribute(event: TEvent, context: TContext) {
+    let metadataOrAttribute: TMetadataOrAttributes | undefined;
 
     switch (context?.eventType) {
       case 'google.storage.object.finalize': {
         const gsEvent = event as TGSEvent;
-        metadata = gsEvent?.metadata;
+        metadataOrAttribute = gsEvent?.metadata;
         break;
       }
       case 'google.pubsub.topic.publish': {
         const psEvent = event as TPSEvent;
-        metadata = psEvent?.attributes;
+        metadataOrAttribute = psEvent?.attributes;
         break;
       }
     }
 
-    return metadata ?? {};
+    return metadataOrAttribute ?? {};
   }
 
   static async getSecret(name: string, version?: string) {

package/src/types.ts

@@ -1,8 +1,10 @@
 import Dict = NodeJS.Dict;
 
-export type TMetadata = {
+export type TMetadataOrAttributes = {
   topic?: string; // response PubSub topic [t_{GUID}__{YYYY-MM-DD}]
+  exchange?: string; // response amqp exchange
   queue?: string; // response amqp queue
+  //
   env?: string; // app environment
   appId?: string; // app id
   'app-id'?: string; // app id
@@ -21,7 +23,7 @@ export type TGSEvent = {
   kind: string; // 'storage#object'
   md5Hash: string;
   mediaLink: string;
-  metadata: TMetadata;
+  metadata: TMetadataOrAttributes;
   metageneration: string;
   name: string;
   selfLink: string;
@@ -34,7 +36,7 @@ export type TGSEvent = {
 
 export type TPSEvent = {
   '@type': string; // 'type.googleapis.com/google.pubsub.v1.PubsubMessage'
-  attributes?: TMetadata;
+  attributes?: TMetadataOrAttributes;
   data?: string | Dict<any>;
 };
 

package/src/utils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToQueueConfAsync = exports.sendToQueueAsync = exports.withAmqpConfCh = exports.withAmqpCh = exports.withAmqpConn = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
+exports.sendToQueueConfAmqp = exports.publishAmqp = exports.withAmqpCh = exports.withAmqpConn = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
 const amqplib_1 = require("amqplib");
 const bluebird_1 = __importDefault(require("bluebird"));
 const lodash_1 = require("lodash");
@@ -109,12 +109,12 @@ function withAmqpConn(fn, url) {
     });
 }
 exports.withAmqpConn = withAmqpConn;
-function withAmqpCh(fn, url) {
+function withAmqpCh(fn, url, useConfirmChannel = false) {
     return __awaiter(this, void 0, void 0, function* () {
         return withAmqpConn((conn) => __awaiter(this, void 0, void 0, function* () {
             function withDisposer() {
                 return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
-                    return conn.createChannel();
+                    return (useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel());
                 }))().disposer((ch, promise) => ch.close());
             }
             return bluebird_1.default.using(withDisposer(), (ch) => fn(ch));
@@ -122,39 +122,19 @@ function withAmqpCh(fn, url) {
     });
 }
 exports.withAmqpCh = withAmqpCh;
-function withAmqpConfCh(fn, url) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return withAmqpConn((conn) => __awaiter(this, void 0, void 0, function* () {
-            function withDisposer() {
-                return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
-                    return conn.createConfirmChannel();
-                }))().disposer((ch, promise) => ch.close());
-            }
-            return bluebird_1.default.using(withDisposer(), (ch) => fn(ch));
-        }), url);
-    });
-}
-exports.withAmqpConfCh = withAmqpConfCh;
-function sendToQueueAsync(ch, queue, json, options) {
+function publishAmqp(ch, exchange, routingKey, json, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const payload = Buffer.from(JSON.stringify(json));
-        const keepSending = ch.sendToQueue(queue, payload, options);
+        const keepSending = exchange ? ch.publish(exchange, routingKey, payload, options) : ch.sendToQueue(routingKey, payload, options);
         if (!keepSending)
-            yield new Promise(resolve => ch.once('drain', () => resolve));
+            yield new Promise(resolve => ch.once('drain', () => resolve(undefined)));
     });
 }
-exports.sendToQueueAsync = sendToQueueAsync;
-function sendToQueueConfAsync(ch, queue, json, options) {
+exports.publishAmqp = publishAmqp;
+function sendToQueueConfAmqp(ch, queue, json, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const payload = Buffer.from(JSON.stringify(json));
-        yield new Promise((resolve, reject) => {
-            ch.sendToQueue(queue, payload, options, (err, ok) => {
-                if (err)
-                    reject(err);
-                else
-                    resolve(ok);
-            });
-        });
+        yield new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => err ? reject(err) : resolve(ok)));
     });
 }
-exports.sendToQueueConfAsync = sendToQueueConfAsync;
+exports.sendToQueueConfAmqp = sendToQueueConfAmqp;

package/src/utils.ts

@@ -97,11 +97,11 @@ export async function withAmqpConn(fn: (conn: Connection) => Promise<any>, url:
   return Bluebird.using(withDisposer(), (conn) => fn(conn));
 }
 
-export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string) {
+export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string, useConfirmChannel = false) {
   return withAmqpConn(async conn => {
     function withDisposer() {
       return Bluebird.method(async () => {
-        return conn.createChannel();
+        return (useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel());
       })().disposer((ch, promise) => ch.close());
     }
 
@@ -110,30 +110,13 @@ export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string)
   }, url);
 }
 
-export async function withAmqpConfCh(fn: (ch: ConfirmChannel) => Promise<any>, url: string) {
-  return withAmqpConn(async conn => {
-    function withDisposer() {
-      return Bluebird.method(async () => {
-        return conn.createConfirmChannel();
-      })().disposer((ch, promise) => ch.close());
-    }
-
-    return Bluebird.using(withDisposer(), (ch) => fn(ch));
-
-  }, url);
-}
-
-export async function sendToQueueAsync(ch: Channel, queue: string, json: Dictionary<any>, options?: Options.Publish) {
+export async function publishAmqp(ch: Channel, exchange: string | undefined, routingKey: string, json: Dictionary<any>, options?: Options.Publish) {
   const payload = Buffer.from(JSON.stringify(json));
-  const keepSending = ch.sendToQueue(queue, payload, options);
-  if (!keepSending) await new Promise(resolve => ch.once('drain', () => resolve));
+  const keepSending = exchange ? ch.publish(exchange, routingKey, payload, options) : ch.sendToQueue(routingKey, payload, options);
+  if (!keepSending) await new Promise(resolve => ch.once('drain', () => resolve(undefined)));
 }
 
-export async function sendToQueueConfAsync(ch: ConfirmChannel, queue: string, json: Dictionary<any>, options?: Options.Publish) {
+export async function sendToQueueConfAmqp(ch: ConfirmChannel, queue: string, json: Dictionary<any>, options?: Options.Publish) {
   const payload = Buffer.from(JSON.stringify(json));
-  await new Promise((resolve, reject) => {
-    ch.sendToQueue(queue, payload, options, (err, ok) => {
-      if (err) reject(err); else resolve(ok);
-    });
-  });
+  await new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => err ? reject(err) : resolve(ok)));
 }