gcf-common-lib 0.46.0 → 0.48.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "Common helpers for Google Cloud Functions: Pub/Sub publishing, Mongo helpers, and utilities for Node 20+ (TypeScript).",
-  "version": "0.46.0",
+  "version": "0.48.0",
   "publishConfig": {
     "access": "public",
     "branches": [

package/src/index.js

@@ -44,8 +44,6 @@ const pubsub_1 = require("@google-cloud/pubsub");
 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 utils_1 = require("./utils");
 exports.Storage = __importStar(require("@google-cloud/storage"));
 exports.PubSub = __importStar(require("@google-cloud/pubsub"));
 exports.RxJs = __importStar(require("rxjs"));
@@ -53,7 +51,6 @@ exports.MongoDb = __importStar(require("mongodb"));
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./mongo-helper"), exports);
-// export * from './amqp-helper.ts';
 exports.pubSub = new pubsub_1.PubSub();
 exports.storage = new storage_1.Storage();
 exports.GcfCommon = {
@@ -68,22 +65,17 @@ exports.GcfCommon = {
     //   publishOptions?: Options.Publish;
     // },
     async process(payload, handler) {
-        const asyncHandler = async (p) => await handler(p);
-        // return firstValueFrom(
-        //   defer(() => from(asyncHandler({ ...payload }))).pipe(first(), timeout({ first: ms({ s: timeoutSec }) })),
-        // )
-        return asyncHandler({ ...payload })
-            .then(async (res) => {
-            // console.log('res:', res);
-            await exports.GcfCommon.response({ ...payload }, res).catch(noop_1.default);
+        try {
+            const res = await handler({ ...payload });
+            await exports.GcfCommon.response({ ...payload }, res).catch(console.log);
             return res;
-        })
-            .catch(async (error) => {
-            await exports.GcfCommon.response({ ...payload }, exports.GcfCommon.buildResponse(error), { error: '1' }).catch(noop_1.default);
+        }
+        catch (error) {
+            await exports.GcfCommon.response({ ...payload }, exports.GcfCommon.buildErrorResponse(error), { error: '1' }).catch(console.log);
             throw error;
-        });
+        }
     },
-    buildResponse(error) {
+    buildErrorResponse(error) {
         return {
             error: {
                 name: error.name,
@@ -158,14 +150,18 @@ exports.GcfCommon = {
     //     request_id: metaOrAttr.request_id,
     //   } as TMetadataOrAttributes;
     // },
-    async getOptions(payload) {
-        // const { options } = await GcfCommon.safeGetAttributes(event, context, ['options']);
-        const { options } = exports.GcfCommon.getMetadataOrAttribute(payload);
-        return (0, utils_1.safeJsonParse)(options, {});
-    },
+    // 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);
+    // },
     getMetadataOrAttribute(payload) {
         let metadataOrAttribute;
-        if (payload?.context) {
+        // console.log('getMetadataOrAttribute:', payload);
+        if (payload?.request) {
+            metadataOrAttribute = exports.GcfCommon.getRequestAttributes(payload.request);
+        }
+        else if (payload?.context) {
             switch (payload?.context?.eventType) {
                 case 'google.storage.object.finalize': {
                     const gsEvent = payload?.event;
@@ -179,13 +175,10 @@ exports.GcfCommon = {
                 }
             }
         }
-        else if (payload?.request) {
-            metadataOrAttribute = exports.GcfCommon.getRequestMessage(payload.request)?.attributes;
-        }
         // console.log('metadataOrAttribute:', metadataOrAttribute);
         return metadataOrAttribute ?? {};
     },
-    getRequestMessage(request) {
-        return request.body.message;
+    getRequestAttributes(request) {
+        return { ...request?.body?.message?.attributes, ...request?.headers };
     },
 };

package/src/index.ts

@@ -134,7 +134,7 @@ export const GcfCommon = {
   getMetadataOrAttribute<E = TEvent>(payload: TPayload<E>) {
     let metadataOrAttribute: TMetadataOrAttributes | undefined;
 
-    console.log('getMetadataOrAttribute:', payload);
+    // console.log('getMetadataOrAttribute:', payload);
 
     if (payload?.request) {
       metadataOrAttribute = GcfCommon.getRequestAttributes(payload.request);
@@ -153,7 +153,7 @@ export const GcfCommon = {
       }
     }
 
-    console.log('metadataOrAttribute:', metadataOrAttribute);
+    // console.log('metadataOrAttribute:', metadataOrAttribute);
 
     return metadataOrAttribute ?? {};
   },

package/src/mongo-helper.js

@@ -21,7 +21,8 @@ exports.MongoHelper = {
         }
         else {
             coll = await db.createCollection(name, options);
-            afterCreate && (await afterCreate(coll));
+            if (afterCreate)
+                await afterCreate(coll);
         }
         return coll;
     },