gcf-common-lib 0.23.30 → 0.23.31

package/package.json

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

package/src/index.js

@@ -101,14 +101,10 @@ class GcfCommon {
             if (queue && !(0, isEmpty_1.default)(queue)) {
                 console.log('send:', queue, appId, env, json, attributes);
                 return (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
-                    const payload = Buffer.from(JSON.stringify(json !== null && json !== void 0 ? json : {}));
                     yield ch.assertQueue(queue, this.amqpOptions.assertOptions);
-                    yield new Promise((resolve, reject) => ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions, (err, ok) => {
-                        if (err)
-                            reject(err);
-                        else
-                            resolve(ok);
-                    }));
+                    // 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);
                 }), this.amqpOptions.url);
             }
         });

package/src/index.ts

@@ -1,7 +1,7 @@
 import { PubSub } from '@google-cloud/pubsub';
 import isEmpty from 'lodash/isEmpty';
 import noop from 'lodash/noop';
-import { timeoutAfter, withAmqpCh } from './utils';
+import { delay, sendToQueueAsync, 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';
@@ -85,15 +85,10 @@ export class GcfCommon {
     if (queue && !isEmpty(queue)) {
       console.log('send:', queue, appId, env, json, attributes);
       return withAmqpCh(async ch => {
-        const payload = Buffer.from(JSON.stringify(json ?? {}));
         await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-
-        await new Promise((resolve, reject) =>
-          ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions, (err, ok) => {
-            if (err) reject(err); else resolve(ok);
-          }),
-        );
-
+        // const payload = Buffer.from(JSON.stringify(json ?? {}));
+        // ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions);
+        await sendToQueueAsync(ch, queue, json ?? {}, this.amqpOptions.publishOptions);
       }, this.amqpOptions.url as string);
     }
   }

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.sendToQueueAsync = exports.withAmqpCh = exports.withAmqpConn = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.delay = exports.timeoutAfter = void 0;
+exports.sendToQueueConfAsync = exports.sendToQueueAsync = exports.withAmqpConfCh = 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"));
 /**
@@ -96,14 +96,27 @@ function withAmqpCh(fn, url) {
         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) => delay(1000).then(() => ch.close()));
+                    return conn.createChannel();
+                }))().disposer((ch, promise) => ch.close());
             }
             return bluebird_1.default.using(withDisposer(), (ch) => fn(ch));
         }), 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) {
     return __awaiter(this, void 0, void 0, function* () {
         const payload = Buffer.from(JSON.stringify(json));
@@ -113,3 +126,17 @@ function sendToQueueAsync(ch, queue, json, options) {
     });
 }
 exports.sendToQueueAsync = sendToQueueAsync;
+function sendToQueueConfAsync(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);
+            });
+        });
+    });
+}
+exports.sendToQueueConfAsync = sendToQueueConfAsync;

package/src/utils.ts

@@ -79,12 +79,25 @@ export async function withAmqpConn(fn: (conn: Connection) => Promise<any>, url:
   return Bluebird.using(withDisposer(), (conn) => fn(conn));
 }
 
-export async function withAmqpCh(fn: (ch: ConfirmChannel) => Promise<any>, url: string) {
+export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string) {
+  return withAmqpConn(async conn => {
+    function withDisposer() {
+      return Bluebird.method(async () => {
+        return conn.createChannel();
+      })().disposer((ch, promise) => ch.close());
+    }
+
+    return Bluebird.using(withDisposer(), (ch) => fn(ch));
+
+  }, 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) => delay(1000).then(() => ch.close()));
+      })().disposer((ch, promise) => ch.close());
     }
 
     return Bluebird.using(withDisposer(), (ch) => fn(ch));
@@ -96,4 +109,13 @@ export async function sendToQueueAsync(ch: Channel, queue: string, json: Diction
   const payload = Buffer.from(JSON.stringify(json));
   const keepSending = ch.sendToQueue(queue, payload, options);
   if (!keepSending) await new Promise(resolve => ch.once('drain', () => resolve));
+}
+
+export async function sendToQueueConfAsync(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);
+    });
+  });
 }