gcf-common-lib 0.25.44 → 0.25.46

package/package.json

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

package/src/types.ts

@@ -51,8 +51,9 @@ export type TGSEvent = {
 
 export type TPSEvent = {
   '@type': string; // 'type.googleapis.com/google.pubsub.v1.PubsubMessage'
-  attributes?: TMetadataOrAttributes;
-  data?: string | Dict<any>;
+  attributes: TMetadataOrAttributes;
+  data: string;
+  json?: Dict<string>;
 };
 
 export type TEvent = TGSEvent | TPSEvent;

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.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;
+exports.sendToQueueConfAmqp = exports.publishAmqp = exports.withAmqpCh = exports.withAmqpConn = exports.safeJsonParse = 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");
@@ -28,7 +28,7 @@ function timeoutAfter(seconds = 540) {
 exports.timeoutAfter = timeoutAfter;
 function delay(seconds) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve) => setTimeout(() => resolve(undefined), seconds * 1000));
+        return new Promise(resolve => setTimeout(() => resolve(undefined), seconds * 1000));
     });
 }
 exports.delay = delay;
@@ -95,6 +95,15 @@ function A1ToColNum(value) {
     return result;
 }
 exports.A1ToColNum = A1ToColNum;
+function safeJsonParse(value, fallbackValue) {
+    try {
+        return JSON.parse(value);
+    }
+    catch (err) {
+        return fallbackValue;
+    }
+}
+exports.safeJsonParse = safeJsonParse;
 //
 function withAmqpConn(fn, url) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -105,7 +114,7 @@ function withAmqpConn(fn, url) {
                 return amqpConn;
             }))().disposer((conn, promise) => conn.close());
         }
-        return bluebird_1.default.using(withDisposer(), (conn) => fn(conn));
+        return bluebird_1.default.using(withDisposer(), conn => fn(conn));
     });
 }
 exports.withAmqpConn = withAmqpConn;
@@ -114,10 +123,10 @@ function withAmqpCh(fn, url, useConfirmChannel = false) {
         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 (useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel());
+                    return useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel();
                 }))().disposer((ch, promise) => ch.close());
             }
-            return bluebird_1.default.using(withDisposer(), (ch) => fn(ch));
+            return bluebird_1.default.using(withDisposer(), ch => fn(ch));
         }), url);
     });
 }
@@ -125,7 +134,9 @@ exports.withAmqpCh = withAmqpCh;
 function publishAmqp(ch, exchange, routingKey, json, options) {
     return __awaiter(this, void 0, void 0, function* () {
         const payload = Buffer.from(JSON.stringify(json));
-        const keepSending = exchange ? ch.publish(exchange, routingKey, payload, options) : ch.sendToQueue(routingKey, 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(undefined)));
     });
@@ -134,7 +145,7 @@ 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) => err ? reject(err) : resolve(ok)));
+        yield new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))));
     });
 }
 exports.sendToQueueConfAmqp = sendToQueueConfAmqp;

package/src/utils.ts

@@ -8,11 +8,12 @@ import { chain, Dictionary } from 'lodash';
  */
 export async function timeoutAfter(seconds: number = 540) {
   return new Promise<undefined>((resolve, reject) =>
-    setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000));
+    setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000),
+  );
 }
 
 export async function delay(seconds: number) {
-  return new Promise((resolve) => setTimeout(() => resolve(undefined), seconds * 1000));
+  return new Promise(resolve => setTimeout(() => resolve(undefined), seconds * 1000));
 }
 
 //
@@ -83,6 +84,14 @@ export function A1ToColNum(value: string) {
   return result;
 }
 
+export function safeJsonParse(value: string, fallbackValue?: any) {
+  try {
+    return JSON.parse(value);
+  } catch (err) {
+    return fallbackValue;
+  }
+}
+
 //
 
 export async function withAmqpConn(fn: (conn: Connection) => Promise<any>, url: string) {
@@ -94,29 +103,43 @@ export async function withAmqpConn(fn: (conn: Connection) => Promise<any>, url:
     })().disposer((conn, promise) => conn.close());
   }
 
-  return Bluebird.using(withDisposer(), (conn) => fn(conn));
+  return Bluebird.using(withDisposer(), conn => fn(conn));
 }
 
 export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string, useConfirmChannel = false) {
   return withAmqpConn(async conn => {
     function withDisposer() {
       return Bluebird.method(async () => {
-        return (useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel());
+        return useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel();
       })().disposer((ch, promise) => ch.close());
     }
 
-    return Bluebird.using(withDisposer(), (ch) => fn(ch));
-
+    return Bluebird.using(withDisposer(), ch => fn(ch));
   }, url);
 }
 
-export async function publishAmqp(ch: Channel, exchange: string | undefined, routingKey: 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 = exchange ? ch.publish(exchange, routingKey, payload, options) : ch.sendToQueue(routingKey, payload, options);
+  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 sendToQueueConfAmqp(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) => err ? reject(err) : resolve(ok)));
-}
+  await new Promise((resolve, reject) =>
+    ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))),
+  );
+}