gcf-common-lib 0.34.0 → 0.35.0

package/eslint.config.mjs

@@ -1,20 +1,18 @@
+import { defineConfig } from 'eslint/config';
 import globals from 'globals';
-import pluginJs from '@eslint/js';
+import js from '@eslint/js';
 import tseslint from 'typescript-eslint';
 import eslintPluginUnicorn from 'eslint-plugin-unicorn';
 import pluginPromise from 'eslint-plugin-promise';
-// import pluginLodash from 'eslint-plugin-lodash';
 
-/** @type {import('eslint').Linter.Config[]} */
-export default [
+export default defineConfig([
   { files: ['**/*.{js,mjs,cjs,ts}'] },
   { files: ['**/*.js'], languageOptions: { sourceType: 'commonjs' } },
-  { languageOptions: { globals: globals.node } },
-  pluginJs.configs.recommended,
-  ...tseslint.configs.recommended,
+  { files: ['**/*.{js,mjs,cjs,ts}'], languageOptions: { globals: globals.node } },
+  { files: ['**/*.{js,mjs,cjs,ts}'], plugins: { js }, extends: ['js/recommended'] },
+  tseslint.configs.recommended,
   eslintPluginUnicorn.configs.recommended,
   pluginPromise.configs['flat/recommended'],
-  // pluginLodash.configs.recommended,
   {
     rules: {
       'block-scoped-var': 'error',
@@ -30,4 +28,4 @@ export default [
       // 'rxjs/no-implicit-any-catch': 'off',
     },
   },
-];
+]);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -23,12 +23,10 @@
   "dependencies": {
     "@google-cloud/pubsub": "^4.10.0",
     "@google-cloud/storage": "^7.15.2",
-    "@tsconfig/node20": "^20.1.4",
     "@types/amqplib": "^0.10.7",
     "@types/bluebird": "^3.5.42",
     "@types/express": "^4.17.21",
     "@types/lodash": "^4.17.16",
-    "@types/node": "^20.17.23",
     "amqplib": "^0.10.5",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
@@ -37,6 +35,8 @@
     "rxjs": "^7.8.2"
   },
   "devDependencies": {
+    "@tsconfig/node20": "^20.1.4",
+    "@types/node": "^20.17.23",
     "@eslint/js": "^9.21.0",
     "eslint": "^9.21.0",
     "eslint-plugin-lodash": "^8.0.0",

package/src/index.js

@@ -45,7 +45,6 @@ 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"));
@@ -58,28 +57,29 @@ __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();
-class GcfCommon {
-    constructor() { }
-    static amqpOptions = {
+exports.GcfCommon = {
+    amqpOptions: {
         assertExchange: { durable: true, autoDelete: false },
         assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
         publishOptions: { persistent: true },
-    };
-    static async process(payload, handler, timeoutSec = 535) {
+    },
+    async process(payload, handler) {
         const asyncHandler = async (p) => await handler(p);
-        return (0, rxjs_1.firstValueFrom)((0, rxjs_1.defer)(() => (0, rxjs_1.from)(asyncHandler({ ...payload }))).pipe((0, rxjs_1.first)(), (0, rxjs_1.timeout)({ first: (0, utils_1.ms)({ s: timeoutSec }) })))
+        // return firstValueFrom(
+        //   defer(() => from(asyncHandler({ ...payload }))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
+        // )
+        return asyncHandler({ ...payload })
             .then(async (res) => {
             // console.log('res:', res);
-            await this.response({ ...payload }, res).catch(noop_1.default);
+            await exports.GcfCommon.response({ ...payload }, res).catch(noop_1.default);
             return res;
         })
             .catch(async (error) => {
-            await this.response({ ...payload }, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+            await exports.GcfCommon.response({ ...payload }, exports.GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
             throw error;
         });
-    }
-    static buildResponse(error) {
+    },
+    buildResponse(error) {
         return {
             error: {
                 name: error.name,
@@ -87,16 +87,16 @@ class GcfCommon {
                 stack: error.stack,
             },
         };
-    }
-    static async response(payload, json, attributes) {
+    },
+    async response(payload, json, attributes) {
         // console.time('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 } = await GcfCommon.safeGetAttributes(
         //   event,
         //   context,
         //   ['consumer_id', 'topic', 'exchange', 'queue'],
         // );
         // console.timeEnd('safeGetAttributes');
-        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(payload);
+        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = exports.GcfCommon.getMetadataOrAttribute(payload);
         //
         console.time('publish');
         if (topic && !(0, isEmpty_1.default)(topic)) {
@@ -115,27 +115,27 @@ class GcfCommon {
         if (exchange && !(0, isEmpty_1.default)(exchange)) {
             console.log('send:', exchange, queue, app_id, env, json, attributes);
             await amqp_helper_1.AmqpHelper.withAmqpCh(async (ch) => {
-                await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
+                await ch.assertExchange(exchange, 'direct', exports.GcfCommon.amqpOptions.assertExchange);
                 await amqp_helper_1.AmqpHelper.publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
-                    ...this.amqpOptions.publishOptions,
+                    ...exports.GcfCommon.amqpOptions.publishOptions,
                     correlationId: request_id,
                 });
-            }, this.amqpOptions.url);
+            }, exports.GcfCommon.amqpOptions.url);
         }
         else if (queue && !(0, isEmpty_1.default)(queue)) {
             console.log('send:', queue, app_id, env, json, attributes);
             await amqp_helper_1.AmqpHelper.withAmqpCh(async (ch) => {
-                // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
+                // await ch.assertQueue(queue, GcfCommon.amqpOptions.assertOptions);
                 await amqp_helper_1.AmqpHelper.publishAmqp(ch, undefined, queue, json ?? {}, {
-                    ...this.amqpOptions.publishOptions,
+                    ...exports.GcfCommon.amqpOptions.publishOptions,
                     correlationId: request_id,
                 });
-            }, this.amqpOptions.url);
+            }, exports.GcfCommon.amqpOptions.url);
         }
         console.timeEnd('publish');
-    }
-    // static async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
-    //   let metaOrAttr = this.getMetadataOrAttribute(event, context);
+    },
+    // async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
+    //   let metaOrAttr = GcfCommon.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));
@@ -154,13 +154,13 @@ class GcfCommon {
     //     app_id: metaOrAttr.app_id,
     //     request_id: metaOrAttr.request_id,
     //   } as TMetadataOrAttributes;
-    // }
-    static async getOptions(payload) {
-        // const { options } = await this.safeGetAttributes(event, context, ['options']);
-        const { options } = this.getMetadataOrAttribute(payload);
+    // },
+    async getOptions(payload) {
+        // const { options } = await GcfCommon.safeGetAttributes(event, context, ['options']);
+        const { options } = exports.GcfCommon.getMetadataOrAttribute(payload);
         return (0, utils_1.safeJsonParse)(options, {});
-    }
-    static getMetadataOrAttribute(payload) {
+    },
+    getMetadataOrAttribute(payload) {
         let metadataOrAttribute;
         if (payload?.context) {
             switch (payload?.context?.eventType) {
@@ -177,13 +177,12 @@ class GcfCommon {
             }
         }
         else if (payload?.request) {
-            metadataOrAttribute = this.getRequestMessage(payload.request)?.attributes;
+            metadataOrAttribute = exports.GcfCommon.getRequestMessage(payload.request)?.attributes;
         }
         // console.log('metadataOrAttribute:', metadataOrAttribute);
         return metadataOrAttribute ?? {};
-    }
-    static getRequestMessage(request) {
+    },
+    getRequestMessage(request) {
         return request.body.message;
-    }
-}
-exports.GcfCommon = GcfCommon;
+    },
+};

package/src/index.ts

@@ -5,7 +5,6 @@ import { Request } from 'express';
 import isEmpty from 'lodash/isEmpty';
 import mapValues from 'lodash/mapValues';
 import noop from 'lodash/noop';
-import { defer, first, firstValueFrom, from, timeout } from 'rxjs';
 import { AmqpHelper } from './amqp-helper';
 import { TEvent, TGSEvent, TMetadataOrAttributes, TPayload, TPSEvent, TResponse } from './types';
 import { ms, safeJsonParse } from './utils';
@@ -22,43 +21,43 @@ export * from './amqp-helper';
 
 export const pubSub = new PubSub();
 export const storage = new Storage();
-// export const secretClient = new SecretManagerServiceClient();
 
-export class GcfCommon {
-  constructor() {}
-
-  static amqpOptions: {
+export const GcfCommon = {
+  amqpOptions: {
+    assertExchange: { durable: true, autoDelete: false },
+    assertOptions: { durable: true, autoDelete: true, expires: ms({ d: 1 }) },
+    publishOptions: { persistent: true },
+  } as {
     url?: string;
     assertExchange?: Options.AssertExchange;
     assertOptions?: Options.AssertQueue;
     publishOptions?: Options.Publish;
-  } = {
-    assertExchange: { durable: true, autoDelete: false },
-    assertOptions: { durable: true, autoDelete: true, expires: ms({ d: 1 }) },
-    publishOptions: { persistent: true },
-  };
+  },
 
-  static async process<T extends TResponse, E = TEvent>(
+  async process<T extends TResponse, E = TEvent>(
     payload: TPayload<E>,
     handler: (p: TPayload<E>) => Promise<any> | any,
-    timeoutSec = 535,
+    // timeoutSec = 535,
   ) {
     const asyncHandler = async (p: TPayload<E>) => await handler(p);
-    return firstValueFrom(
-      defer(() => from(asyncHandler({ ...payload }))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
-    )
+
+    // return firstValueFrom(
+    //   defer(() => from(asyncHandler({ ...payload }))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
+    // )
+
+    return asyncHandler({ ...payload })
       .then(async res => {
         // console.log('res:', res);
-        await this.response({ ...payload }, res as T).catch(noop);
+        await GcfCommon.response({ ...payload }, res as T).catch(noop);
         return res;
       })
       .catch(async (error: Error) => {
-        await this.response({ ...payload }, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
+        await GcfCommon.response({ ...payload }, GcfCommon.buildResponse(error), { error: '1' }).catch(noop);
         throw error;
       });
-  }
+  },
 
-  static buildResponse(error: Error) {
+  buildResponse(error: Error) {
     return {
       error: {
         name: error.name,
@@ -66,18 +65,18 @@ export class GcfCommon {
         stack: error.stack,
       },
     } as TResponse;
-  }
+  },
 
-  static async response<E = TEvent>(payload: TPayload<E>, json?: TResponse, attributes?: Dict<any>) {
+  async response<E = TEvent>(payload: TPayload<E>, json?: TResponse, attributes?: Dict<any>) {
     // console.time('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 } = await GcfCommon.safeGetAttributes(
     //   event,
     //   context,
     //   ['consumer_id', 'topic', 'exchange', 'queue'],
     // );
     // console.timeEnd('safeGetAttributes');
 
-    const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(payload);
+    const { topic, exchange, queue, consumer_id, request_id, app_id, env } = GcfCommon.getMetadataOrAttribute(payload);
 
     //
 
@@ -100,28 +99,28 @@ export class GcfCommon {
     if (exchange && !isEmpty(exchange)) {
       console.log('send:', exchange, queue, app_id, env, json, attributes);
       await AmqpHelper.withAmqpCh(async ch => {
-        await ch.assertExchange(exchange, 'direct', this.amqpOptions.assertExchange);
+        await ch.assertExchange(exchange, 'direct', GcfCommon.amqpOptions.assertExchange);
         await AmqpHelper.publishAmqp(ch, exchange, queue ?? '', json ?? {}, {
-          ...this.amqpOptions.publishOptions,
+          ...GcfCommon.amqpOptions.publishOptions,
           correlationId: request_id,
         });
-      }, this.amqpOptions.url as string);
+      }, GcfCommon.amqpOptions.url as string);
     } else if (queue && !isEmpty(queue)) {
       console.log('send:', queue, app_id, env, json, attributes);
       await AmqpHelper.withAmqpCh(async ch => {
-        // await ch.assertQueue(queue, this.amqpOptions.assertOptions);
+        // await ch.assertQueue(queue, GcfCommon.amqpOptions.assertOptions);
         await AmqpHelper.publishAmqp(ch, undefined, queue, json ?? {}, {
-          ...this.amqpOptions.publishOptions,
+          ...GcfCommon.amqpOptions.publishOptions,
           correlationId: request_id,
         });
-      }, this.amqpOptions.url as string);
+      }, GcfCommon.amqpOptions.url as string);
     }
 
     console.timeEnd('publish');
-  }
+  },
 
-  // static async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
-  //   let metaOrAttr = this.getMetadataOrAttribute(event, context);
+  // async safeGetAttributes<E = TEvent>(event: E, context: TContext, props: string[]) {
+  //   let metaOrAttr = GcfCommon.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));
@@ -140,15 +139,15 @@ export class GcfCommon {
   //     app_id: metaOrAttr.app_id,
   //     request_id: metaOrAttr.request_id,
   //   } as TMetadataOrAttributes;
-  // }
+  // },
 
-  static async getOptions(payload: TPayload): Promise<Dict<any>> {
-    // const { options } = await this.safeGetAttributes(event, context, ['options']);
-    const { options } = this.getMetadataOrAttribute(payload);
+  async getOptions(payload: TPayload): Promise<Dict<any>> {
+    // const { options } = await GcfCommon.safeGetAttributes(event, context, ['options']);
+    const { options } = GcfCommon.getMetadataOrAttribute(payload);
     return safeJsonParse(options as any, {} as any);
-  }
+  },
 
-  static getMetadataOrAttribute<E = TEvent>(payload: TPayload<E>) {
+  getMetadataOrAttribute<E = TEvent>(payload: TPayload<E>) {
     let metadataOrAttribute: TMetadataOrAttributes | undefined;
 
     if (payload?.context) {
@@ -165,27 +164,15 @@ export class GcfCommon {
         }
       }
     } else if (payload?.request) {
-      metadataOrAttribute = this.getRequestMessage(payload.request)?.attributes;
+      metadataOrAttribute = GcfCommon.getRequestMessage(payload.request)?.attributes;
     }
 
     // console.log('metadataOrAttribute:', metadataOrAttribute);
 
     return metadataOrAttribute ?? {};
-  }
+  },
 
-  static getRequestMessage(request: Request) {
+  getRequestMessage(request: Request) {
     return request.body.message as { attributes: TMetadataOrAttributes; data: string; json?: Dict<any> };
-  }
-
-  // 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/tsconfig.json

@@ -1,5 +1,7 @@
 {
   "$schema": "http://json.schemastore.org/tsconfig",
   "extends": "@tsconfig/node20/tsconfig.json",
-  "compilerOptions": {}
+  "compilerOptions": {
+    "newLine": "crlf",
+  }
 }