gcf-common-lib 0.23.20 → 0.23.21

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.23.20",
+  "version": "0.23.21",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -21,8 +21,8 @@
     "@google-cloud/pubsub": "^3.3.0",
     "@google-cloud/secret-manager": "^4.2.1",
     "@google-cloud/storage": "^6.9.4",
-    "@types/amqplib": "^0.10.1",
     "amqplib": "^0.10.3",
+    "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "mongodb": "^4.14.0",
@@ -30,6 +30,8 @@
   },
   "devDependencies": {
     "@tsconfig/node14": "^1.0.3",
+    "@types/amqplib": "^0.10.1",
+    "@types/bluebird": "^3.5.38",
     "@types/lodash": "^4.14.191",
     "@types/node": "^14.18.37"
   },

package/src/index.js

@@ -98,7 +98,7 @@ class GcfCommon {
             }
             if (queue && !(0, isEmpty_1.default)(queue)) {
                 console.log('send:', queue, appId, env, json, attributes);
-                return yield (0, utils_1.withAmqpCh)((ch) => __awaiter(this, void 0, void 0, function* () {
+                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);

package/src/index.ts

@@ -83,7 +83,7 @@ export class GcfCommon {
 
     if (queue && !isEmpty(queue)) {
       console.log('send:', queue, appId, env, json, attributes);
-      return await withAmqpCh(async ch => {
+      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);

package/src/mongo-helper.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MongoHelper = void 0;
 const mongodb_1 = require("mongodb");
+const bluebird_1 = __importDefault(require("bluebird"));
 class MongoHelper {
     static collectionExists(client, name) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -35,15 +39,12 @@ class MongoHelper {
     }
     withMongoClient(fn, url, mongoClientOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const mongoClient = new mongodb_1.MongoClient(url, mongoClientOptions);
-            return yield mongoClient
-                .connect()
-                .then((client) => __awaiter(this, void 0, void 0, function* () {
-                return yield fn(client);
-            }))
-                .finally(() => __awaiter(this, void 0, void 0, function* () {
-                yield mongoClient.close();
-            }));
+            function withDisposer() {
+                return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
+                    return new mongodb_1.MongoClient(url, mongoClientOptions).connect();
+                }))().disposer((client, promise) => client.close());
+            }
+            return bluebird_1.default.using(withDisposer(), (client) => fn(client));
         });
     }
 }

package/src/mongo-helper.ts

@@ -1,5 +1,6 @@
 import { Collection, CreateCollectionOptions, MongoClient, MongoClientOptions } from 'mongodb';
 import { Document } from 'bson';
+import Bluebird from 'bluebird';
 
 export class MongoHelper {
   static async collectionExists(client: MongoClient, name: string) {
@@ -28,15 +29,12 @@ export class MongoHelper {
   }
 
   async withMongoClient(fn: (db: MongoClient) => Promise<void>, url: string, mongoClientOptions?: MongoClientOptions) {
-    const mongoClient = new MongoClient(url, mongoClientOptions);
+    function withDisposer() {
+      return Bluebird.method(async () => {
+        return new MongoClient(url, mongoClientOptions).connect();
+      })().disposer((client, promise) => client.close());
+    }
 
-    return await mongoClient
-      .connect()
-      .then(async client => {
-        return await fn(client);
-      })
-      .finally(async () => {
-        await mongoClient.close();
-      });
+    return Bluebird.using(withDisposer(),  (client) => fn(client));
   }
 }

package/src/mongo-lock.js

@@ -17,6 +17,7 @@ const moment_1 = __importDefault(require("moment"));
 const noop_1 = __importDefault(require("lodash/noop"));
 const rxjs_1 = require("rxjs");
 const mongo_helper_1 = require("./mongo-helper");
+const bluebird_1 = __importDefault(require("bluebird"));
 class MongoLock {
     constructor(client) {
         this.client = client;
@@ -74,7 +75,16 @@ class MongoLock {
                 // console.log(locked);
                 if (!locked)
                     throw new Error('Could not acquire lock');
-            }), wait ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity), (0, rxjs_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () { return fn().finally(() => this.releaseLock(name).catch(noop_1.default)); }))));
+            }), wait ? (0, rxjs_1.retry)({ count, delay }) : (0, rxjs_1.tap)(rxjs_1.identity), (0, rxjs_1.switchMap)(() => __awaiter(this, void 0, void 0, function* () {
+                const self = this;
+                function withDisposer() {
+                    return bluebird_1.default.method(Promise.resolve)()
+                        .disposer((ch, promise) => {
+                        self.releaseLock(name).catch(noop_1.default);
+                    });
+                }
+                return bluebird_1.default.using(withDisposer(), () => fn());
+            }))));
         });
     }
     checkLock(name, waitSeconds = 0) {

package/src/mongo-lock.ts

@@ -1,11 +1,13 @@
 import { MongoClient, MongoError } from 'mongodb';
 import moment from 'moment';
 import noop from 'lodash/noop';
-import { defer, from, identity, lastValueFrom, map, of, retry, switchMap, tap } from 'rxjs';
+import { defer, from, identity, lastValueFrom, map, retry, switchMap, tap } from 'rxjs';
 import { MongoHelper } from './mongo-helper';
+import Bluebird from 'bluebird';
 
 export class MongoLock {
-  constructor(private client: MongoClient) {}
+  constructor(private client: MongoClient) {
+  }
 
   async getCollection() {
     const locksColl = await MongoHelper.collectionSafeGet(this.client, 'locks');
@@ -62,7 +64,18 @@ export class MongoLock {
           if (!locked) throw new Error('Could not acquire lock');
         }),
         wait ? retry({ count, delay }) : tap(identity),
-        switchMap(async () => fn().finally(() => this.releaseLock(name).catch(noop))),
+        switchMap(async () => {
+          const self = this;
+
+          function withDisposer() {
+            return Bluebird.method(Promise.resolve)()
+              .disposer((ch, promise) => {
+                self.releaseLock(name).catch(noop);
+              });
+          }
+
+          return Bluebird.using(withDisposer(), () => fn());
+        }),
       ),
     );
   }

package/src/utils.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+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;
 const amqplib_1 = require("amqplib");
+const bluebird_1 = __importDefault(require("bluebird"));
 /**
  *
  * @param seconds Google function v1 timeout limit (max: 9 min)
@@ -79,20 +83,26 @@ function A1ToColNum(value) {
 exports.A1ToColNum = A1ToColNum;
 function withAmqpConn(fn, url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const amqpConn = yield (0, amqplib_1.connect)(url);
-        amqpConn.on('close', () => console.info('Amqp connection closed!'));
-        return yield fn(amqpConn).finally(() => __awaiter(this, void 0, void 0, function* () { return yield amqpConn.close(); }));
+        function withDisposer() {
+            return bluebird_1.default.method(() => __awaiter(this, void 0, void 0, function* () {
+                const amqpConn = yield (0, amqplib_1.connect)(url);
+                amqpConn.on('close', () => console.info('Amqp connection closed!'));
+                return amqpConn;
+            }))().disposer((conn, promise) => conn.close());
+        }
+        return bluebird_1.default.using(withDisposer(), (conn) => fn(conn));
     });
 }
 exports.withAmqpConn = withAmqpConn;
 function withAmqpCh(fn, url) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield withAmqpConn((conn) => __awaiter(this, void 0, void 0, function* () {
-            const ch = yield conn.createChannel();
-            return yield fn(ch).finally(() => __awaiter(this, void 0, void 0, function* () {
-                yield delay(1000);
-                yield ch.close();
-            }));
+        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();
+                }))().disposer((ch, promise) => delay(1000).then(() => ch.close()));
+            }
+            return bluebird_1.default.using(withDisposer(), (ch) => fn(ch));
         }), url);
     });
 }

package/src/utils.ts

@@ -1,4 +1,5 @@
 import { Channel, connect, Connection } from 'amqplib';
+import Bluebird from 'bluebird';
 
 /**
  *
@@ -67,17 +68,26 @@ export function A1ToColNum(value: string) {
 }
 
 export async function withAmqpConn(fn: (conn: Connection) => Promise<any>, url: string) {
-  const amqpConn = await connect(url);
-  amqpConn.on('close', () => console.info('Amqp connection closed!'));
-  return await fn(amqpConn).finally(async () => await amqpConn.close());
+  function withDisposer() {
+    return Bluebird.method(async () => {
+      const amqpConn = await connect(url);
+      amqpConn.on('close', () => console.info('Amqp connection closed!'));
+      return amqpConn;
+    })().disposer((conn, promise) => conn.close());
+  }
+
+  return Bluebird.using(withDisposer(), (conn) => fn(conn));
 }
 
 export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string) {
-  return await withAmqpConn(async conn => {
-    const ch = await conn.createChannel();
-    return await fn(ch).finally(async () => {
-      await delay(1000);
-      await ch.close();
-    });
+  return withAmqpConn(async conn => {
+    function withDisposer() {
+      return Bluebird.method(async () => {
+        return conn.createChannel();
+      })().disposer((ch, promise) => delay(1000).then(() => ch.close()));
+    }
+
+    return Bluebird.using(withDisposer(), (ch) => fn(ch));
+
   }, url);
 }