gcf-common-lib 0.23.25 → 0.23.26

package/package.json

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

package/src/index.js

@@ -93,7 +93,9 @@ class GcfCommon {
                 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)), { requestId: requestId !== null && requestId !== void 0 ? requestId : '', appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '', type: 'response', response: '1' }),
+                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, (v) => '' + v)), { requestId: requestId !== null && requestId !== void 0 ? requestId : '', env: env !== null && env !== void 0 ? env : '', appId: appId !== null && appId !== void 0 ? appId : '', 
+                        //
+                        type: 'response', response: '1' }),
                 });
             }
             if (queue && !(0, isEmpty_1.default)(queue)) {

package/src/index.ts

@@ -73,8 +73,9 @@ export class GcfCommon {
         attributes: {
           ...mapValues(attributes ?? {}, (v) => '' + v),
           requestId: requestId ?? '',
-          appId: appId ?? '',
           env: env ?? '',
+          appId: appId ?? '',
+          //
           type: 'response',
           response: '1',
         },

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.withAmqpCh = exports.withAmqpConn = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.delay = exports.timeoutAfter = void 0;
+exports.sentToQueueAsync = exports.withAmqpCh = exports.withAmqpConn = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.delay = exports.timeoutAfter = void 0;
 const amqplib_1 = require("amqplib");
 const bluebird_1 = __importDefault(require("bluebird"));
 /**
@@ -21,17 +21,13 @@ const bluebird_1 = __importDefault(require("bluebird"));
  */
 function timeoutAfter(seconds = 540) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000);
-        });
+        return new Promise((resolve, reject) => setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000));
     });
 }
 exports.timeoutAfter = timeoutAfter;
 function delay(seconds) {
     return __awaiter(this, void 0, void 0, function* () {
-        return new Promise((resolve, reject) => {
-            setTimeout(() => resolve(undefined), seconds * 1000);
-        });
+        return new Promise((resolve) => setTimeout(() => resolve(undefined), seconds * 1000));
     });
 }
 exports.delay = delay;
@@ -81,6 +77,7 @@ function A1ToColNum(value) {
     return result;
 }
 exports.A1ToColNum = A1ToColNum;
+//
 function withAmqpConn(fn, url) {
     return __awaiter(this, void 0, void 0, function* () {
         function withDisposer() {
@@ -107,3 +104,12 @@ function withAmqpCh(fn, url) {
     });
 }
 exports.withAmqpCh = withAmqpCh;
+function sentToQueueAsync(ch, queue, json, options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const payload = Buffer.from(JSON.stringify(json));
+        const keepSending = ch.sendToQueue(queue, payload, options);
+        if (!keepSending)
+            yield new Promise(resolve => ch.once('drain', () => resolve));
+    });
+}
+exports.sentToQueueAsync = sentToQueueAsync;

package/src/utils.ts

@@ -1,20 +1,18 @@
-import { Channel, connect, Connection } from 'amqplib';
+import { Channel, connect, Connection, Options } from 'amqplib';
 import Bluebird from 'bluebird';
+import { Dictionary } from 'lodash';
 
 /**
  *
  * @param seconds Google function v1 timeout limit (max: 9 min)
  */
 export async function timeoutAfter(seconds: number = 540) {
-  return new Promise<undefined>((resolve, reject) => {
-    setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000);
-  });
+  return new Promise<undefined>((resolve, reject) =>
+    setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000));
 }
 
 export async function delay(seconds: number) {
-  return new Promise<undefined>((resolve, reject) => {
-    setTimeout(() => resolve(undefined), seconds * 1000);
-  });
+  return new Promise((resolve) => setTimeout(() => resolve(undefined), seconds * 1000));
 }
 
 //
@@ -67,6 +65,8 @@ export function A1ToColNum(value: string) {
   return result;
 }
 
+//
+
 export async function withAmqpConn(fn: (conn: Connection) => Promise<any>, url: string) {
   function withDisposer() {
     return Bluebird.method(async () => {
@@ -90,4 +90,10 @@ export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string)
     return Bluebird.using(withDisposer(), (ch) => fn(ch));
 
   }, url);
+}
+
+export async function sentToQueueAsync(ch: Channel, queue: 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));
 }