gcf-common-lib 0.33.0 → 0.34.0

package/.github/workflows/npm-publish.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           node-version: 20
       - run: npm ci
+#      - run: npm run build
       - run: npm test
 
   publish-npm:
@@ -29,6 +30,7 @@ jobs:
           node-version: 20
           registry-url: https://registry.npmjs.org/
       - run: npm ci
+#      - run: npm run build
       - run: npm publish
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

package/package.json

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

package/src/amqp-helper.js

@@ -13,15 +13,15 @@ exports.AmqpHelper = {
                 const amqpConn = await (0, amqplib_1.connect)(url);
                 amqpConn.on('close', () => console.info('Amqp connection closed!'));
                 return amqpConn;
-            })().disposer((conn, promise) => conn.close());
+            })().disposer((channelModel, promise) => channelModel.close());
         }
-        return bluebird_1.default.using(withDisposer(), conn => fn(conn));
+        return bluebird_1.default.using(withDisposer(), channelModel => fn(channelModel));
     },
     async withAmqpCh(fn, url, useConfirmChannel = false, prefetch = 1) {
-        return exports.AmqpHelper.withAmqpConn(async (conn) => {
+        return exports.AmqpHelper.withAmqpConn(async (channelModel) => {
             function withDisposer() {
                 return bluebird_1.default.method(async () => {
-                    const ch = useConfirmChannel ? await conn.createConfirmChannel() : await conn.createChannel();
+                    const ch = useConfirmChannel ? await channelModel.createConfirmChannel() : await channelModel.createChannel();
                     await ch.prefetch(prefetch);
                     return ch;
                 })().disposer((ch, promise) => ch.close());

package/src/amqp-helper.ts

@@ -1,25 +1,25 @@
-import { Channel, ConfirmChannel, connect, Connection, Options } from 'amqplib';
+import { Channel, ChannelModel, ConfirmChannel, connect, Options } from 'amqplib';
 import Bluebird from 'bluebird';
 import Dict = NodeJS.Dict;
 
 export const AmqpHelper = {
-  async withAmqpConn(fn: (conn: Connection) => Promise<any>, url: string) {
+  async withAmqpConn(fn: (channelModel: ChannelModel) => Promise<any>, url: string) {
     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());
+      })().disposer((channelModel, promise) => channelModel.close());
     }
 
-    return Bluebird.using(withDisposer(), conn => fn(conn));
+    return Bluebird.using(withDisposer(), channelModel => fn(channelModel));
   },
 
   async withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string, useConfirmChannel = false, prefetch = 1) {
-    return AmqpHelper.withAmqpConn(async conn => {
+    return AmqpHelper.withAmqpConn(async channelModel => {
       function withDisposer() {
         return Bluebird.method(async () => {
-          const ch = useConfirmChannel ? await conn.createConfirmChannel() : await conn.createChannel();
+          const ch = useConfirmChannel ? await channelModel.createConfirmChannel() : await channelModel.createChannel();
           await ch.prefetch(prefetch);
           return ch;
         })().disposer((ch, promise) => ch.close());

package/src/index.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -44,6 +54,8 @@ exports.RxJs = __importStar(require("rxjs"));
 exports.MongoDb = __importStar(require("mongodb"));
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./mongo-helper"), exports);
+__exportStar(require("./amqp-helper"), exports);
 exports.pubSub = new pubsub_1.PubSub();
 exports.storage = new storage_1.Storage();
 // export const secretClient = new SecretManagerServiceClient();

package/src/index.ts

@@ -17,6 +17,8 @@ export * as RxJs from 'rxjs';
 export * as MongoDb from 'mongodb';
 export * from './types';
 export * from './utils';
+export * from './mongo-helper';
+export * from './amqp-helper';
 
 export const pubSub = new PubSub();
 export const storage = new Storage();

package/src/mongo-lock.js

@@ -45,7 +45,7 @@ class MongoLock {
         }
         catch (error) {
             // 11000 means duplicate key error, which is expected on an active lock
-            if (error?.code !== 11000) {
+            if (error?.code !== 11_000) {
                 // Unexpected error, what happened here :o
                 throw error;
             }

package/src/utils.js

@@ -1,6 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.safeJsonParse = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
+exports.timeoutAfter = timeoutAfter;
+exports.delay = delay;
+exports.ms = ms;
+exports.sec = sec;
+exports.indexToA1 = indexToA1;
+exports.A1ToIndex = A1ToIndex;
+exports.colNumToA1 = colNumToA1;
+exports.A1ToColNum = A1ToColNum;
+exports.safeJsonParse = safeJsonParse;
 /**
  *
  * @param seconds Google function v1 timeout limit (max: 9 min)
@@ -8,15 +16,12 @@ exports.safeJsonParse = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIn
 async function timeoutAfter(seconds = 540) {
     return new Promise((resolve, reject) => setTimeout(() => reject(new Error(`${seconds} seconds timeout exceeded`)), seconds * 1000));
 }
-exports.timeoutAfter = timeoutAfter;
 async function delay(seconds) {
     return new Promise(resolve => setTimeout(() => resolve(), seconds * 1000));
 }
-exports.delay = delay;
 function ms(o) {
     return sec(o) * 1000;
 }
-exports.ms = ms;
 function sec(o) {
     const multiMap = {};
     multiMap.s = 1;
@@ -28,15 +33,12 @@ function sec(o) {
         .map(([k, v]) => (multiMap[k] ?? 0) * (v ?? 0))
         .reduce((sum, v) => sum + v, 0);
 }
-exports.sec = sec;
 function indexToA1(idx) {
     return colNumToA1(idx + 1);
 }
-exports.indexToA1 = indexToA1;
 function A1ToIndex(value) {
     return A1ToColNum(value) - 1;
 }
-exports.A1ToIndex = A1ToIndex;
 function colNumToA1(columnNumber) {
     const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     // To store result (Excel column name)
@@ -62,7 +64,6 @@ function colNumToA1(columnNumber) {
         .map(n => chars[n])
         .join('');
 }
-exports.colNumToA1 = colNumToA1;
 function A1ToColNum(value) {
     const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
     let result = 0;
@@ -73,7 +74,6 @@ function A1ToColNum(value) {
     }
     return result;
 }
-exports.A1ToColNum = A1ToColNum;
 function safeJsonParse(value, fallbackValue) {
     try {
         return JSON.parse(value);
@@ -82,4 +82,3 @@ function safeJsonParse(value, fallbackValue) {
         return fallbackValue;
     }
 }
-exports.safeJsonParse = safeJsonParse;