gcf-common-lib 0.23.28 → 0.23.30

package/package.json

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

package/src/index.js

@@ -103,7 +103,12 @@ class GcfCommon {
                 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);
-                    ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions);
+                    yield new Promise((resolve, reject) => ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions, (err, ok) => {
+                        if (err)
+                            reject(err);
+                        else
+                            resolve(ok);
+                    }));
                 }), this.amqpOptions.url);
             }
         });

package/src/index.ts

@@ -87,7 +87,13 @@ export class GcfCommon {
       return withAmqpCh(async ch => {
         const payload = Buffer.from(JSON.stringify(json ?? {}));
         await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-        ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions);
+
+        await new Promise((resolve, reject) =>
+          ch.sendToQueue(queue, payload, this.amqpOptions.publishOptions, (err, ok) => {
+            if (err) reject(err); else resolve(ok);
+          }),
+        );
+
       }, this.amqpOptions.url as string);
     }
   }

package/src/utils.js

@@ -96,7 +96,7 @@ 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.createChannel();
+                    return conn.createConfirmChannel();
                 }))().disposer((ch, promise) => delay(1000).then(() => ch.close()));
             }
             return bluebird_1.default.using(withDisposer(), (ch) => fn(ch));

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { Channel, connect, Connection, Options } from 'amqplib';
+import { Channel, ConfirmChannel, connect, Connection, Options } from 'amqplib';
 import Bluebird from 'bluebird';
 import { Dictionary } from 'lodash';
 
@@ -79,11 +79,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: ConfirmChannel) => Promise<any>, url: string) {
   return withAmqpConn(async conn => {
     function withDisposer() {
       return Bluebird.method(async () => {
-        return conn.createChannel();
+        return conn.createConfirmChannel();
       })().disposer((ch, promise) => delay(1000).then(() => ch.close()));
     }