gcf-common-lib 0.32.66 → 0.33.0

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

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
       - run: npm ci
       - run: npm test
 
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           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.32.66",
+  "version": "0.33.0",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -13,27 +13,28 @@
   },
   "main": "src/index",
   "scripts": {
-    "test": "echo \"Error: no test specified\" || exit 0"
+    "build": "tsc",
+    "test": "node --test ./test/"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^4.4.0",
-    "@google-cloud/storage": "^7.11.0",
+    "@google-cloud/pubsub": "^4.10.0",
+    "@google-cloud/storage": "^7.15.2",
     "@tsconfig/node20": "^20.1.4",
-    "@types/amqplib": "^0.10.5",
+    "@types/amqplib": "^0.10.7",
     "@types/bluebird": "^3.5.42",
     "@types/express": "^4.17.21",
-    "@types/lodash": "^4.17.1",
-    "@types/node": "^20.17.22",
-    "amqplib": "^0.10.4",
+    "@types/lodash": "^4.17.16",
+    "@types/node": "^20.17.23",
+    "amqplib": "^0.10.5",
     "bluebird": "^3.7.2",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
-    "mongodb": "^6.6.1",
-    "rxjs": "^7.8.1"
+    "mongodb": "^6.14.1",
+    "rxjs": "^7.8.2"
   },
   "devDependencies": {
     "@eslint/js": "^9.21.0",
@@ -43,7 +44,8 @@
     "eslint-plugin-unicorn": "^57.0.0",
     "globals": "^15.15.0",
     "prettier": "^3.5.2",
-    "typescript-eslint": "^8.25.0"
+    "typescript-eslint": "^8.25.0",
+    "typescript": "^5.3.3"
   },
   "author": "alert83@gmail.com",
   "license": ""

package/src/index.js

@@ -54,43 +54,19 @@ class GcfCommon {
         assertOptions: { durable: true, autoDelete: true, expires: (0, utils_1.ms)({ d: 1 }) },
         publishOptions: { persistent: true },
     };
-    /**
-     *
-     * @param {!TEvent} event Event payload.
-     * @param {!TContext} context Metadata for the event.
-     * @param handler
-     * @param timeoutSec Seconds
-     */
-    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 process(payload, handler, timeoutSec = 535) {
+        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 }) })))
             .then(async (res) => {
             // console.log('res:', res);
-            await this.response(event, context, res).catch(noop_1.default);
+            await this.response({ ...payload }, res).catch(noop_1.default);
             return res;
         })
             .catch(async (error) => {
-            await this.response(event, context, GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+            await this.response({ ...payload }, 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: {
@@ -100,7 +76,7 @@ class GcfCommon {
             },
         };
     }
-    static async response(event, context, json, attributes) {
+    static async response(payload, json, attributes) {
         // console.time('safeGetAttributes');
         // const { topic, exchange, queue, consumer_id, request_id, app_id, env } = await this.safeGetAttributes(
         //   event,
@@ -108,7 +84,7 @@ class GcfCommon {
         //   ['consumer_id', 'topic', 'exchange', 'queue'],
         // );
         // console.timeEnd('safeGetAttributes');
-        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(event, context);
+        const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(payload);
         //
         console.time('publish');
         if (topic && !(0, isEmpty_1.default)(topic)) {
@@ -167,26 +143,35 @@ class GcfCommon {
     //     request_id: metaOrAttr.request_id,
     //   } as TMetadataOrAttributes;
     // }
-    static async getOptions(event, context) {
+    static async getOptions(payload) {
         // const { options } = await this.safeGetAttributes(event, context, ['options']);
-        const { options } = this.getMetadataOrAttribute(event, context);
+        const { options } = this.getMetadataOrAttribute(payload);
         return (0, utils_1.safeJsonParse)(options, {});
     }
-    static getMetadataOrAttribute(event, context) {
+    static getMetadataOrAttribute(payload) {
         let metadataOrAttribute;
-        switch (context?.eventType) {
-            case 'google.storage.object.finalize': {
-                const gsEvent = event;
-                metadataOrAttribute = gsEvent?.metadata;
-                break;
-            }
-            case 'google.pubsub.topic.publish': {
-                const psEvent = event;
-                metadataOrAttribute = psEvent?.attributes;
-                break;
+        if (payload?.context) {
+            switch (payload?.context?.eventType) {
+                case 'google.storage.object.finalize': {
+                    const gsEvent = payload?.event;
+                    metadataOrAttribute = gsEvent?.metadata;
+                    break;
+                }
+                case 'google.pubsub.topic.publish': {
+                    const psEvent = payload?.event;
+                    metadataOrAttribute = psEvent?.attributes;
+                    break;
+                }
             }
         }
+        else if (payload?.request) {
+            metadataOrAttribute = this.getRequestMessage(payload.request)?.attributes;
+        }
+        // console.log('metadataOrAttribute:', metadataOrAttribute);
         return metadataOrAttribute ?? {};
     }
+    static getRequestMessage(request) {
+        return request.body.message;
+    }
 }
 exports.GcfCommon = GcfCommon;

package/src/index.ts

@@ -75,8 +75,6 @@ export class GcfCommon {
     // );
     // console.timeEnd('safeGetAttributes');
 
-    console.log('response:', payload);
-
     const { topic, exchange, queue, consumer_id, request_id, app_id, env } = this.getMetadataOrAttribute(payload);
 
     //
@@ -168,7 +166,7 @@ export class GcfCommon {
       metadataOrAttribute = this.getRequestMessage(payload.request)?.attributes;
     }
 
-    console.log('metadataOrAttribute:', metadataOrAttribute);
+    // console.log('metadataOrAttribute:', metadataOrAttribute);
 
     return metadataOrAttribute ?? {};
   }

package/src/utils.js

@@ -13,7 +13,6 @@ async function delay(seconds) {
     return new Promise(resolve => setTimeout(() => resolve(), seconds * 1000));
 }
 exports.delay = delay;
-//
 function ms(o) {
     return sec(o) * 1000;
 }
@@ -84,4 +83,3 @@ function safeJsonParse(value, fallbackValue) {
     }
 }
 exports.safeJsonParse = safeJsonParse;
-//

package/test/test.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_test_1 = require("node:test");
+const src_1 = require("../src");
+(0, node_test_1.describe)('test', () => {
+    const event = {
+        '@type': 'type.googleapis.com/google.pubsub.v1.PubsubMessage',
+        json: { foo: 'bar' },
+        attributes: { topic: 'test', env: 'test', options: '{}' },
+    };
+    const context = {
+        eventId: '1',
+        timestamp: `${Date.now()}`,
+        eventType: 'google.pubsub.topic.publish',
+        resource: {
+            name: 'test',
+            service: 'pubsub.googleapis.com',
+            type: 'type.googleapis.com/google.pubsub.v1.PubsubMessage',
+        },
+    };
+    (0, node_test_1.it)('test', async () => {
+        const res = await src_1.GcfCommon.process({ event, context }, async (p) => p.event?.data);
+        console.log(res);
+    });
+});

package/test/test.ts

@@ -0,0 +1,26 @@
+import { describe, it } from 'node:test';
+import { GcfCommon, TContext, TEvent } from '../src';
+
+describe('test', () => {
+  const event: TEvent = {
+    '@type': 'type.googleapis.com/google.pubsub.v1.PubsubMessage',
+    json: { foo: 'bar' },
+    attributes: { topic: 'test', env: 'test', options: '{}' },
+  };
+
+  const context: TContext = {
+    eventId: '1',
+    timestamp: `${Date.now()}`,
+    eventType: 'google.pubsub.topic.publish',
+    resource: {
+      name: 'test',
+      service: 'pubsub.googleapis.com',
+      type: 'type.googleapis.com/google.pubsub.v1.PubsubMessage',
+    },
+  };
+
+  it('test', async () => {
+    const res = await GcfCommon.process({ event, context }, async p => p.event?.data);
+    console.log(res);
+  });
+});

package/.eslintrc.json

@@ -1,49 +0,0 @@
-{
-  "root": true,
-  "env": {
-    "es2021": true,
-    "commonjs": true
-  },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module",
-    "tsconfigRootDir": ".",
-    "project": [
-      "./tsconfig.json"
-    ]
-  },
-  "plugins": [
-    "@typescript-eslint",
-    "import",
-    "promise",
-    "rxjs",
-    "lodash",
-    "unicorn"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:import/recommended",
-    "plugin:import/typescript",
-    "plugin:promise/recommended",
-    "plugin:rxjs/recommended",
-    "plugin:lodash/recommended",
-    "plugin:unicorn/recommended"
-  ],
-  "settings": {
-    "import/resolver": {
-      "typescript": true,
-      "node": true
-    }
-  },
-  "rules": {
-    "@typescript-eslint/no-explicit-any": "off",
-    "@typescript-eslint/no-unused-vars": "off",
-    "@typescript-eslint/no-empty-function": "off",
-    "@typescript-eslint/no-empty-interface": "off",
-    "lodash/prefer-lodash-method": "off",
-    "rxjs/no-implicit-any-catch": "off",
-    "unicorn/prevent-abbreviations": "off"
-  }
-}