gcf-common-lib 0.23.34 → 0.24.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.23.34",
+  "version": "0.24.34",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -18,22 +18,22 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^3.3.0",
-    "@google-cloud/secret-manager": "^4.2.1",
-    "@google-cloud/storage": "^6.9.4",
+    "@google-cloud/pubsub": "^4.0.0",
+    "@google-cloud/secret-manager": "^5.0.0",
+    "@google-cloud/storage": "^7.0.1",
     "amqplib": "^0.10.3",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
-    "mongodb": "^4.14.0",
-    "rxjs": "^7.8.0"
+    "mongodb": "^4.16.0",
+    "rxjs": "^7.8.1"
   },
   "devDependencies": {
-    "@tsconfig/node14": "^1.0.3",
+    "@tsconfig/node14": "^14.1.0",
     "@types/amqplib": "^0.10.1",
     "@types/bluebird": "^3.5.38",
-    "@types/lodash": "^4.14.191",
-    "@types/node": "^14.18.37"
+    "@types/lodash": "^4.14.197",
+    "@types/node": "^14.18.54"
   },
   "author": "alert83@gmail.com",
   "license": ""

package/src/index.js

@@ -93,7 +93,7 @@ class GcfCommon {
                 console.log('publish:', topic, appId, env, json, attributes);
                 return exports.pubSub.topic(topic).publishMessage({
                     json: json !== null && json !== void 0 ? json : {},
-                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, (v) => '' + v)), { appId: appId !== null && appId !== void 0 ? appId : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', env: env !== null && env !== void 0 ? env : '', 
+                    attributes: Object.assign(Object.assign({}, (0, lodash_1.mapValues)(attributes !== null && attributes !== void 0 ? attributes : {}, (v) => '' + v)), { appId: appId !== null && appId !== void 0 ? appId : '', env: env !== null && env !== void 0 ? env : '', requestId: requestId !== null && requestId !== void 0 ? requestId : '', 
                         //
                         type: 'response', response: '1' }),
                 });
@@ -215,6 +215,6 @@ class GcfCommon {
 }
 exports.GcfCommon = GcfCommon;
 GcfCommon.amqpOptions = {
-    assertOptions: { durable: true },
+    assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
     publishOptions: { persistent: true },
 };

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 { sendToQueueAsync, timeoutAfter, withAmqpCh } from './utils';
+import { ms, 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';
@@ -27,7 +27,7 @@ export class GcfCommon {
     assertOptions?: Options.AssertQueue;
     publishOptions?: Options.Publish;
   } = {
-    assertOptions: { durable: true },
+    assertOptions: { durable: true, autoDelete: true, expires: ms({ d: 1 }) },
     publishOptions: { persistent: true },
   };
 
@@ -73,8 +73,8 @@ export class GcfCommon {
         attributes: {
           ...mapValues(attributes ?? {}, (v) => '' + v),
           appId: appId ?? '',
-          requestId: requestId ?? '',
           env: env ?? '',
+          requestId: requestId ?? '',
           //
           type: 'response',
           response: '1',

package/src/utils.js

@@ -12,9 +12,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendToQueueConfAsync = exports.sendToQueueAsync = exports.withAmqpConfCh = 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.sec = exports.ms = exports.delay = exports.timeoutAfter = void 0;
 const amqplib_1 = require("amqplib");
 const bluebird_1 = __importDefault(require("bluebird"));
+const lodash_1 = require("lodash");
 /**
  *
  * @param seconds Google function v1 timeout limit (max: 9 min)
@@ -32,6 +33,23 @@ function delay(seconds) {
 }
 exports.delay = delay;
 //
+function ms(o) {
+    return sec(o) * 1000;
+}
+exports.ms = ms;
+function sec(o) {
+    const multiMap = {};
+    multiMap.s = 1;
+    multiMap.m = multiMap.s * 60;
+    multiMap.h = multiMap.m * 60;
+    multiMap.d = multiMap.h * 24;
+    multiMap.w = multiMap.d * 7;
+    return (0, lodash_1.chain)(Object.entries(o))
+        .map(([k, v]) => { var _a; return ((_a = multiMap[k]) !== null && _a !== void 0 ? _a : 0) * (v !== null && v !== void 0 ? v : 0); })
+        .reduce((sum, v) => sum + v)
+        .value();
+}
+exports.sec = sec;
 function indexToA1(idx) {
     return colNumToA1(idx + 1);
 }

package/src/utils.ts

@@ -1,6 +1,6 @@
 import { Channel, ConfirmChannel, connect, Connection, Options } from 'amqplib';
 import Bluebird from 'bluebird';
-import { Dictionary } from 'lodash';
+import { chain, Dictionary } from 'lodash';
 
 /**
  *
@@ -17,6 +17,24 @@ export async function delay(seconds: number) {
 
 //
 
+export function ms(o: { w?: number; d?: number; h?: number; m?: number; s?: number }) {
+  return sec(o) * 1000;
+}
+
+export function sec(o: { w?: number; d?: number; h?: number; m?: number; s?: number }) {
+  const multiMap: any = {};
+  multiMap.s = 1;
+  multiMap.m = multiMap.s * 60;
+  multiMap.h = multiMap.m * 60;
+  multiMap.d = multiMap.h * 24;
+  multiMap.w = multiMap.d * 7;
+
+  return chain(Object.entries(o))
+    .map(([k, v]) => (multiMap[k] ?? 0) * (v ?? 0))
+    .reduce((sum, v) => sum + v)
+    .value();
+}
+
 export function indexToA1(idx: number) {
   return colNumToA1(idx + 1);
 }

package/tsconfig.json

@@ -8,6 +8,7 @@
       "ES2019",
       "ES2020",
       "ES2021",
+      "ES2022",
       "ESNext"
     ]
   }