gcf-common-lib 0.28.61 → 0.29.62

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

@@ -12,10 +12,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
       - run: npm ci
       - run: npm test
 
@@ -23,10 +23,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14
+          node-version: 18
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.28.61",
+  "version": "0.29.62",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -9,7 +9,7 @@
     ]
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "main": "src/index",
   "scripts": {
@@ -20,31 +20,30 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@types/amqplib": "^0.10.4",
+    "@types/amqplib": "^0.10.5",
     "@types/bluebird": "^3.5.42",
-    "@types/lodash": "^4.14.201",
-    "@types/node": "^16.18.61",
-    "@google-cloud/pubsub": "^4.1.1",
-    "@google-cloud/secret-manager": "^5.0.1",
-    "@google-cloud/storage": "^7.7.0",
+    "@types/lodash": "^4.17.0",
+    "@types/node": "^18.19.26",
+    "@google-cloud/pubsub": "^4.3.3",
+    "@google-cloud/storage": "^7.9.0",
     "amqplib": "^0.10.3",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "mongodb": "^4.17.1",
+    "mongodb": "^4.17.2",
     "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^6.10.0",
-    "@typescript-eslint/parser": "^6.10.0",
-    "@tsconfig/node16": "^16.1.1",
-    "eslint": "^8.53.0",
+    "@typescript-eslint/eslint-plugin": "^7.3.1",
+    "@typescript-eslint/parser": "^7.3.1",
+    "@tsconfig/node18": "^18.2.2",
+    "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-lodash": "^7.4.0",
     "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-rxjs": "^5.0.3",
-    "eslint-plugin-unicorn": "^49.0.0"
+    "eslint-plugin-unicorn": "^51.0.1"
   },
   "author": "alert83@gmail.com",
   "license": ""

package/src/amqp-helper.js

@@ -0,0 +1,44 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AmqpHelper = void 0;
+const amqplib_1 = require("amqplib");
+const bluebird_1 = __importDefault(require("bluebird"));
+exports.AmqpHelper = {
+    async withAmqpConn(fn, url) {
+        function withDisposer() {
+            return bluebird_1.default.method(async () => {
+                const amqpConn = await (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));
+    },
+    async withAmqpCh(fn, url, useConfirmChannel = false, prefetch = 1) {
+        return exports.AmqpHelper.withAmqpConn(async (conn) => {
+            function withDisposer() {
+                return bluebird_1.default.method(async () => {
+                    const ch = useConfirmChannel ? await conn.createConfirmChannel() : await conn.createChannel();
+                    await ch.prefetch(prefetch);
+                    return ch;
+                })().disposer((ch, promise) => ch.close());
+            }
+            return bluebird_1.default.using(withDisposer(), ch => fn(ch));
+        }, url);
+    },
+    async publishAmqp(ch, exchange, routingKey, json, options) {
+        const payload = Buffer.from(JSON.stringify(json));
+        const keepSending = exchange
+            ? ch.publish(exchange, routingKey, payload, options)
+            : ch.sendToQueue(routingKey, payload, options);
+        if (!keepSending)
+            await new Promise(resolve => ch.once('drain', () => resolve()));
+    },
+    async sendToQueueConfAmqp(ch, queue, json, options) {
+        const payload = Buffer.from(JSON.stringify(json));
+        await new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))));
+    },
+};

package/src/amqp-helper.ts

@@ -0,0 +1,52 @@
+import { Channel, ConfirmChannel, connect, Connection, Options } from 'amqplib';
+import Bluebird from 'bluebird';
+import Dict = NodeJS.Dict;
+
+export const AmqpHelper = {
+  async withAmqpConn(fn: (conn: Connection) => 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());
+    }
+
+    return Bluebird.using(withDisposer(), conn => fn(conn));
+  },
+
+  async withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string, useConfirmChannel = false, prefetch = 1) {
+    return AmqpHelper.withAmqpConn(async conn => {
+      function withDisposer() {
+        return Bluebird.method(async () => {
+          const ch = useConfirmChannel ? await conn.createConfirmChannel() : await conn.createChannel();
+          await ch.prefetch(prefetch);
+          return ch;
+        })().disposer((ch, promise) => ch.close());
+      }
+
+      return Bluebird.using(withDisposer(), ch => fn(ch));
+    }, url);
+  },
+
+  async publishAmqp(
+    ch: Channel,
+    exchange: string | undefined,
+    routingKey: string,
+    json: Dict<any>,
+    options?: Options.Publish,
+  ) {
+    const payload = Buffer.from(JSON.stringify(json));
+    const keepSending = exchange
+      ? ch.publish(exchange, routingKey, payload, options)
+      : ch.sendToQueue(routingKey, payload, options);
+    if (!keepSending) await new Promise<void>(resolve => ch.once('drain', () => resolve()));
+  },
+
+  async sendToQueueConfAmqp(ch: ConfirmChannel, queue: string, json: Dict<any>, options?: Options.Publish) {
+    const payload = Buffer.from(JSON.stringify(json));
+    await new Promise((resolve, reject) =>
+      ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))),
+    );
+  },
+};

package/src/index.js

@@ -29,27 +29,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GcfCommon = exports.secretClient = exports.storage = exports.pubSub = exports.MongoDb = exports.RxJs = exports.SecretManager = exports.PubSub = exports.Storage = void 0;
+exports.GcfCommon = exports.storage = exports.pubSub = exports.MongoDb = exports.RxJs = exports.PubSub = exports.Storage = void 0;
 const pubsub_1 = require("@google-cloud/pubsub");
-const secret_manager_1 = require("@google-cloud/secret-manager");
 const storage_1 = require("@google-cloud/storage");
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 const mapValues_1 = __importDefault(require("lodash/mapValues"));
 const noop_1 = __importDefault(require("lodash/noop"));
 const rxjs_1 = require("rxjs");
+const amqp_helper_1 = require("./amqp-helper");
 const utils_1 = require("./utils");
 exports.Storage = __importStar(require("@google-cloud/storage"));
 exports.PubSub = __importStar(require("@google-cloud/pubsub"));
-exports.SecretManager = __importStar(require("@google-cloud/secret-manager"));
 exports.RxJs = __importStar(require("rxjs"));
 exports.MongoDb = __importStar(require("mongodb"));
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 exports.pubSub = new pubsub_1.PubSub();
 exports.storage = new storage_1.Storage();
-exports.secretClient = new secret_manager_1.SecretManagerServiceClient();
+// export const secretClient = new SecretManagerServiceClient();
 class GcfCommon {
     constructor() { }
+    static amqpOptions = {
+        assertExchange: { durable: true, autoDelete: false },
+        assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
+        publishOptions: { persistent: true },
+    };
     /**
      *
      * @param {!TEvent} event Event payload.
@@ -59,20 +63,34 @@ class GcfCommon {
      */
     static async process(event, context, handler = rxjs_1.identity, timeoutSec = 535) {
         const asyncHandler = async (_event, _context) => await handler(_event, _context);
-        return (0, rxjs_1.firstValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(asyncHandler(event, context))).pipe((0, rxjs_1.first)(), (0, rxjs_1.timeout)({ first: (0, utils_1.ms)({ s: timeoutSec }) })));
-    }
-    static async processOLd(event, context, handler = rxjs_1.identity, timeoutSec = 535) {
-        return Promise.race([(0, utils_1.timeoutAfter)(timeoutSec), handler(event, context)])
+        return (0, rxjs_1.firstValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(asyncHandler(event, context))).pipe((0, rxjs_1.first)(), (0, rxjs_1.timeout)({ first: (0, utils_1.ms)({ s: timeoutSec }) })))
             .then(async (res) => {
             // console.log('res:', res);
-            await this.publish(event, context, res);
+            await this.response(event, context, res).catch(noop_1.default);
             return res;
         })
             .catch(async (error) => {
-            await this.publish(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+            await this.response(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
             throw error;
         });
     }
+    // static async processOLd<T extends TResponse, E = TEvent>(
+    //   event: E,
+    //   context: TContext,
+    //   handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
+    //   timeoutSec = 535,
+    // ) {
+    //   return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
+    //     .then(async res => {
+    //       // console.log('res:', res);
+    //       await this.response(event, context, res as T);
+    //       return res;
+    //     })
+    //     .catch(async (error: Error) => {
+    //       await this.response(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
+    //       throw error;
+    //     });
+    // }
     static buildResponse(error) {
         return {
             error: {
@@ -82,10 +100,15 @@ class GcfCommon {
             },
         };
     }
-    static async publish(event, context, json, attributes) {
-        console.time('safeGetAttributes');
-        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(event, context, ['consumer_id', 'topic', 'exchange', 'queue']);
-        console.timeEnd('safeGetAttributes');
+    static async response(event, context, json, attributes) {
+        // console.time('safeGetAttributes');
+        // const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(
+        //   event,
+        //   context,
+        //   ['consumer_id', 'topic', 'exchange', 'queue'],
+        // );
+        // console.timeEnd('safeGetAttributes');
+        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(event, context);
         //
         console.time('publish');
         if (topic && !(0, isEmpty_1.default)(topic)) {
@@ -103,9 +126,9 @@ class GcfCommon {
         }
         if (exchange && !(0, isEmpty_1.default)(exchange)) {
             console.log('send:', exchange, queue, app_id, env, json, attributes);
-            await (0, utils_1.withAmqpCh)(async (ch) => {
+            await amqp_helper_1.AmqpHelper.withAmqpCh(async (ch) => {
                 await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
-                await (0, utils_1.publishAmqp)(ch, exchange, queue ?? '', json ?? {}, {
+                await amqp_helper_1.AmqpHelper.publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
                     ...this.amqpOptions.publishOptions,
                     correlationId: request_id,
                 });
@@ -113,9 +136,9 @@ class GcfCommon {
         }
         else if (queue && !(0, isEmpty_1.default)(queue)) {
             console.log('send:', queue, app_id, env, json, attributes);
-            await (0, utils_1.withAmqpCh)(async (ch) => {
+            await amqp_helper_1.AmqpHelper.withAmqpCh(async (ch) => {
                 // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-                await (0, utils_1.publishAmqp)(ch, undefined, queue, json ?? {}, {
+                await amqp_helper_1.AmqpHelper.publishAmqp(ch, undefined, queue, json ?? {}, {
                     ...this.amqpOptions.publishOptions,
                     correlationId: request_id,
                 });
@@ -123,28 +146,31 @@ class GcfCommon {
         }
         console.timeEnd('publish');
     }
-    static async safeGetAttributes(event, context, props) {
-        let metaOrAttr = this.getMetadataOrAttribute(event, context);
-        // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
-        // const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
-        // // if no prop then check file metadata
-        // if (!someProp && context?.resource?.type === 'storage#object') {
-        //   console.log('get metadata from file');
-        //   if (context?.eventType === 'google.storage.object.finalize') {
-        //     const gsEvent = event as TGSEvent;
-        //     const [meta] = await new Storage().bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-        //     metaOrAttr = meta?.metadata ?? {};
-        //   }
-        // }
-        return {
-            ...metaOrAttr,
-            app_id: metaOrAttr.app_id,
-            request_id: metaOrAttr.request_id,
-        };
-    }
+    // static async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
+    //   let metaOrAttr = this.getMetadataOrAttribute(event, context);
+    //   // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
+    //
+    //   const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
+    //   // if no prop then check file metadata
+    //   if (!someProp && context?.resource?.type === 'storage#object') {
+    //     console.log('get metadata from file');
+    //     if (context?.eventType === 'google.storage.object.finalize') {
+    //       const gsEvent = event as TGSEvent;
+    //       const [meta] = await new Storage().bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
+    //       metaOrAttr = meta?.metadata ?? {};
+    //     }
+    //   }
+    //
+    //   return {
+    //     ...metaOrAttr,
+    //     app_id: metaOrAttr.app_id,
+    //     request_id: metaOrAttr.request_id,
+    //   } as TMetadataOrAttributes;
+    // }
     static async getOptions(event, context) {
-        const { options } = await this.safeGetAttributes(event, context, ['options']);
-        return JSON.parse(options ?? '{}');
+        // const { options } = await this.safeGetAttributes(event, context, ['options']);
+        const { options } = this.getMetadataOrAttribute(event, context);
+        return (0, utils_1.safeJsonParse)(options, {});
     }
     static getMetadataOrAttribute(event, context) {
         let metadataOrAttribute;
@@ -162,20 +188,5 @@ class GcfCommon {
         }
         return metadataOrAttribute ?? {};
     }
-    static async getSecret(name, version) {
-        const projectId = await exports.secretClient.getProjectId();
-        const secretName = `projects/${projectId}/secrets/${name}`;
-        const secretVersion = `${secretName}/versions/${version ?? 'latest'}`;
-        const [response] = await exports.secretClient.accessSecretVersion({ name: secretVersion });
-        return response?.payload?.data?.toString();
-    }
-    static async getSecrets(names, versions) {
-        return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch(noop_1.default)));
-    }
 }
 exports.GcfCommon = GcfCommon;
-GcfCommon.amqpOptions = {
-    assertExchange: { durable: true, autoDelete: false },
-    assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
-    publishOptions: { persistent: true },
-};

package/src/index.ts

@@ -1,18 +1,17 @@
 import { PubSub } from '@google-cloud/pubsub';
-import { SecretManagerServiceClient } from '@google-cloud/secret-manager';
 import { Storage } from '@google-cloud/storage';
 import { Options } from 'amqplib';
 import isEmpty from 'lodash/isEmpty';
 import mapValues from 'lodash/mapValues';
 import noop from 'lodash/noop';
 import { defer, first, firstValueFrom, from, identity, timeout } from 'rxjs';
+import { AmqpHelper } from './amqp-helper';
 import { TContext, TEvent, TGSEvent, TMetadataOrAttributes, TPSEvent, TResponse } from './types';
-import { ms, publishAmqp, timeoutAfter, withAmqpCh } from './utils';
+import { ms, safeJsonParse } from './utils';
 import Dict = NodeJS.Dict;
 
 export * as Storage from '@google-cloud/storage';
 export * as PubSub from '@google-cloud/pubsub';
-export * as SecretManager from '@google-cloud/secret-manager';
 export * as RxJs from 'rxjs';
 export * as MongoDb from 'mongodb';
 export * from './types';
@@ -20,7 +19,7 @@ export * from './utils';
 
 export const pubSub = new PubSub();
 export const storage = new Storage();
-export const secretClient = new SecretManagerServiceClient();
+// export const secretClient = new SecretManagerServiceClient();
 
 export class GcfCommon {
   constructor() {}
@@ -52,27 +51,36 @@ export class GcfCommon {
     const asyncHandler = async (_event: any, _context: any) => await handler(_event, _context);
     return firstValueFrom(
       defer(() => from(asyncHandler(event, context))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
-    );
-  }
-
-  static async processOLd<T extends TResponse, E = TEvent>(
-    event: E,
-    context: TContext,
-    handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
-    timeoutSec = 535,
-  ) {
-    return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
+    )
       .then(async res => {
         // console.log('res:', res);
-        await this.publish(event, context, res as T);
+        await this.response(event, context, res as T).catch(noop);
         return res;
       })
       .catch(async (error: Error) => {
-        await this.publish(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
+        await this.response(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
         throw error;
       });
   }
 
+  // static async processOLd<T extends TResponse, E = TEvent>(
+  //   event: E,
+  //   context: TContext,
+  //   handler: (event: E, context: TContext) => Promise<T | E> | T | E = identity,
+  //   timeoutSec = 535,
+  // ) {
+  //   return Promise.race([timeoutAfter(timeoutSec), handler(event, context)])
+  //     .then(async res => {
+  //       // console.log('res:', res);
+  //       await this.response(event, context, res as T);
+  //       return res;
+  //     })
+  //     .catch(async (error: Error) => {
+  //       await this.response(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
+  //       throw error;
+  //     });
+  // }
+
   static buildResponse(error: Error) {
     return {
       error: {
@@ -83,17 +91,20 @@ export class GcfCommon {
     } as TResponse;
   }
 
-  static async publish<E = TEvent>(event: E, context: TContext, json?: TResponse, attributes?: Dict<any>) {
-    console.time('safeGetAttributes');
+  static async response<E = TEvent>(event: E, context: TContext, json?: TResponse, attributes?: Dict<any>) {
+    // console.time('safeGetAttributes');
+    // const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(
+    //   event,
+    //   context,
+    //   ['consumer_id', 'topic', 'exchange', 'queue'],
+    // );
+    // console.timeEnd('safeGetAttributes');
 
-    const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(
+    const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(
       event,
       context,
-      ['consumer_id', 'topic', 'exchange', 'queue'],
     );
 
-    console.timeEnd('safeGetAttributes');
-
     //
 
     console.time('publish');
@@ -114,18 +125,18 @@ export class GcfCommon {
 
     if (exchange && !isEmpty(exchange)) {
       console.log('send:', exchange, queue, app_id, env, json, attributes);
-      await withAmqpCh(async ch => {
+      await AmqpHelper.withAmqpCh(async ch => {
         await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
-        await publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
+        await AmqpHelper.publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
           ...this.amqpOptions.publishOptions,
           correlationId: request_id,
         });
       }, this.amqpOptions.url as string);
     } else if (queue && !isEmpty(queue)) {
       console.log('send:', queue, app_id, env, json, attributes);
-      await withAmqpCh(async ch => {
+      await AmqpHelper.withAmqpCh(async ch => {
         // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
-        await publishAmqp(ch, undefined, queue, json ?? {}, {
+        await AmqpHelper.publishAmqp(ch, undefined, queue, json ?? {}, {
           ...this.amqpOptions.publishOptions,
           correlationId: request_id,
         });
@@ -135,31 +146,32 @@ export class GcfCommon {
     console.timeEnd('publish');
   }
 
-  static async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
-    let metaOrAttr = this.getMetadataOrAttribute(event, context);
-    // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
-
-    // const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
-    // // if no prop then check file metadata
-    // if (!someProp && context?.resource?.type === 'storage#object') {
-    //   console.log('get metadata from file');
-    //   if (context?.eventType === 'google.storage.object.finalize') {
-    //     const gsEvent = event as TGSEvent;
-    //     const [meta] = await new Storage().bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
-    //     metaOrAttr = meta?.metadata ?? {};
-    //   }
-    // }
-
-    return {
-      ...metaOrAttr,
-      app_id: metaOrAttr.app_id,
-      request_id: metaOrAttr.request_id,
-    } as TMetadataOrAttributes;
-  }
+  // static async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
+  //   let metaOrAttr = this.getMetadataOrAttribute(event, context);
+  //   // const everyPropIsNil = props.map(prop => get(metaOrAttr, prop)).every(v => isNil(v));
+  //
+  //   const someProp = props.map(prop => get(metaOrAttr, prop)).some(v => !isNil(v));
+  //   // if no prop then check file metadata
+  //   if (!someProp && context?.resource?.type === 'storage#object') {
+  //     console.log('get metadata from file');
+  //     if (context?.eventType === 'google.storage.object.finalize') {
+  //       const gsEvent = event as TGSEvent;
+  //       const [meta] = await new Storage().bucket(gsEvent.bucket).file(gsEvent.name).getMetadata();
+  //       metaOrAttr = meta?.metadata ?? {};
+  //     }
+  //   }
+  //
+  //   return {
+  //     ...metaOrAttr,
+  //     app_id: metaOrAttr.app_id,
+  //     request_id: metaOrAttr.request_id,
+  //   } as TMetadataOrAttributes;
+  // }
 
   static async getOptions(event: TEvent, context: TContext): Promise<Dict<any>> {
-    const { options } = await this.safeGetAttributes(event, context, ['options']);
-    return JSON.parse(options ?? '{}');
+    // const { options } = await this.safeGetAttributes(event, context, ['options']);
+    const { options } = this.getMetadataOrAttribute(event, context);
+    return safeJsonParse(options as any, {} as any);
   }
 
   static getMetadataOrAttribute<E = TEvent>(event: E, context: TContext) {
@@ -181,15 +193,15 @@ export class GcfCommon {
     return metadataOrAttribute ?? {};
   }
 
-  static async getSecret(name: string, version?: string) {
-    const projectId = await secretClient.getProjectId();
-    const secretName = `projects/${projectId}/secrets/${name}`;
-    const secretVersion = `${secretName}/versions/${version ?? 'latest'}`;
-    const [response] = await secretClient.accessSecretVersion({ name: secretVersion });
-    return response?.payload?.data?.toString();
-  }
-
-  static async getSecrets(names: string[], versions?: string[]) {
-    return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch(noop)));
-  }
+  // static async getSecret(name: string, version?: string) {
+  //   const projectId = await secretClient.getProjectId();
+  //   const secretName = `projects/${projectId}/secrets/${name}`;
+  //   const secretVersion = `${secretName}/versions/${version ?? 'latest'}`;
+  //   const [response] = await secretClient.accessSecretVersion({ name: secretVersion });
+  //   return response?.payload?.data?.toString();
+  // }
+  //
+  // static async getSecrets(names: string[], versions?: string[]) {
+  //   return Promise.all(names.map(async (name, idx) => this.getSecret(name, versions?.[idx]).catch(noop)));
+  // }
 }

package/src/mongo-lock.js

@@ -13,6 +13,7 @@ const bluebird_1 = __importDefault(require("bluebird"));
  * @deprecated
  */
 class MongoLock {
+    client;
     constructor(client) {
         this.client = client;
     }

package/src/utils.js

@@ -1,11 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToQueueConfAmqp = exports.publishAmqp = exports.withAmqpCh = exports.withAmqpConn = exports.safeJsonParse = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
-const amqplib_1 = require("amqplib");
-const bluebird_1 = __importDefault(require("bluebird"));
+exports.safeJsonParse = exports.A1ToColNum = exports.colNumToA1 = exports.A1ToIndex = exports.indexToA1 = exports.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
 /**
  *
  * @param seconds Google function v1 timeout limit (max: 9 min)
@@ -90,39 +85,3 @@ function safeJsonParse(value, fallbackValue) {
 }
 exports.safeJsonParse = safeJsonParse;
 //
-async function withAmqpConn(fn, url) {
-    function withDisposer() {
-        return bluebird_1.default.method(async () => {
-            const amqpConn = await (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;
-async function withAmqpCh(fn, url, useConfirmChannel = false) {
-    return withAmqpConn(async (conn) => {
-        function withDisposer() {
-            return bluebird_1.default.method(async () => {
-                return useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel();
-            })().disposer((ch, promise) => ch.close());
-        }
-        return bluebird_1.default.using(withDisposer(), ch => fn(ch));
-    }, url);
-}
-exports.withAmqpCh = withAmqpCh;
-async function publishAmqp(ch, exchange, routingKey, json, options) {
-    const payload = Buffer.from(JSON.stringify(json));
-    const keepSending = exchange
-        ? ch.publish(exchange, routingKey, payload, options)
-        : ch.sendToQueue(routingKey, payload, options);
-    if (!keepSending)
-        await new Promise(resolve => ch.once('drain', () => resolve()));
-}
-exports.publishAmqp = publishAmqp;
-async function sendToQueueConfAmqp(ch, queue, json, options) {
-    const payload = Buffer.from(JSON.stringify(json));
-    await new Promise((resolve, reject) => ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))));
-}
-exports.sendToQueueConfAmqp = sendToQueueConfAmqp;

package/src/utils.ts

@@ -1,5 +1,3 @@
-import { Channel, ConfirmChannel, connect, Connection, Options } from 'amqplib';
-import Bluebird from 'bluebird';
 import Dict = NodeJS.Dict;
 
 /**
@@ -92,53 +90,3 @@ export function safeJsonParse<T = Dict<any>>(value: string, fallbackValue?: T) {
 }
 
 //
-
-export async function withAmqpConn(fn: (conn: Connection) => 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());
-  }
-
-  return Bluebird.using(withDisposer(), conn => fn(conn));
-}
-
-export async function withAmqpCh(fn: (ch: Channel) => Promise<any>, url: string, useConfirmChannel = false) {
-  return withAmqpConn(async conn => {
-    function withDisposer() {
-      return Bluebird.method(async () => {
-        return useConfirmChannel ? conn.createConfirmChannel() : conn.createChannel();
-      })().disposer((ch, promise) => ch.close());
-    }
-
-    return Bluebird.using(withDisposer(), ch => fn(ch));
-  }, url);
-}
-
-export async function publishAmqp(
-  ch: Channel,
-  exchange: string | undefined,
-  routingKey: string,
-  json: Dict<any>,
-  options?: Options.Publish,
-) {
-  const payload = Buffer.from(JSON.stringify(json));
-  const keepSending = exchange
-    ? ch.publish(exchange, routingKey, payload, options)
-    : ch.sendToQueue(routingKey, payload, options);
-  if (!keepSending) await new Promise<void>(resolve => ch.once('drain', () => resolve()));
-}
-
-export async function sendToQueueConfAmqp(
-  ch: ConfirmChannel,
-  queue: string,
-  json: Dict<any>,
-  options?: Options.Publish,
-) {
-  const payload = Buffer.from(JSON.stringify(json));
-  await new Promise((resolve, reject) =>
-    ch.sendToQueue(queue, payload, options, (err, ok) => (err ? reject(err) : resolve(ok))),
-  );
-}

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "$schema": "http://json.schemastore.org/tsconfig",
-  "extends": "@tsconfig/node16/tsconfig.json",
+  "extends": "@tsconfig/node18/tsconfig.json",
   "compilerOptions": {}
 }