gcf-common-lib 0.11.1 → 0.12.1

package/index.js

@@ -64,15 +64,23 @@ class GcfCommon {
         });
     }
     static getTopic(event, context) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             /** t_{GUID}__{YYYY-MM-DD} */
-            let topicName = (_a = event === null || event === void 0 ? void 0 : event.metadata) === null || _a === void 0 ? void 0 : _a.topic;
-            if (!topicName && ((_b = context === null || context === void 0 ? void 0 : context.resource) === null || _b === void 0 ? void 0 : _b.type) === 'storage#object') {
-                const file = exports.storage.bucket(event.bucket).file(event.name);
-                const [meta] = yield file.getMetadata();
-                topicName = (_c = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _c === void 0 ? void 0 : _c.topic;
-                console.log('topic:', topicName);
+            let topicName;
+            if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.storage.object.finalize') {
+                const gsEvent = event;
+                topicName = (_a = gsEvent === null || gsEvent === void 0 ? void 0 : gsEvent.metadata) === null || _a === void 0 ? void 0 : _a.topic;
+                if (!topicName && ((_b = context === null || context === void 0 ? void 0 : context.resource) === null || _b === void 0 ? void 0 : _b.type) === 'storage#object') {
+                    const file = exports.storage.bucket(gsEvent.bucket).file(gsEvent.name);
+                    const [meta] = yield file.getMetadata();
+                    topicName = (_c = meta === null || meta === void 0 ? void 0 : meta.metadata) === null || _c === void 0 ? void 0 : _c.topic;
+                    console.log('topic:', topicName);
+                }
+            }
+            else if ((context === null || context === void 0 ? void 0 : context.eventType) === 'google.pubsub.topic.publish') {
+                const psEvent = event;
+                topicName = (_d = psEvent.data) === null || _d === void 0 ? void 0 : _d.topic;
             }
             if (topicName && !(0, isEmpty_1.default)(topicName)) {
                 const topic = exports.pubSub.topic(topicName);

package/index.ts

@@ -5,7 +5,7 @@ import isEmpty from "lodash/isEmpty";
 import noop from "lodash/noop";
 import {timeoutAfter} from "./utils";
 
-export type TEvent = {
+export type TGSEvent = {
     bucket: string;
     contentType: string;
     crc32c: string;
@@ -26,14 +26,22 @@ export type TEvent = {
     updated: string;
 }
 
+export type TPSEvent = {
+    '@type': string; // 'type.googleapis.com/google.pubsub.v1.PubsubMessage'
+    attributes?: string | null;
+    data: string | { [k: string]: any };
+}
+
+export type TEvent = TGSEvent | TPSEvent;
+
 export type TContext = {
     eventId: string;
     timestamp: string;
-    eventType: string; // 'google.storage.object.finalize'
+    eventType: 'google.storage.object.finalize' | 'google.pubsub.topic.publish';
     resource: {
-        service: string; // 'storage.googleapis.com'
+        service: 'storage.googleapis.com' | 'pubsub.googleapis.com';
         name: string;
-        type: string; // 'storage#object'
+        type: string; // 'storage#object' | 'type.googleapis.com/google.pubsub.v1.PubsubMessage'
     }
 }
 
@@ -96,13 +104,22 @@ export class GcfCommon {
     static async getTopic(event: TEvent, context: TContext) {
 
         /** t_{GUID}__{YYYY-MM-DD} */
-        let topicName: string | undefined = event?.metadata?.topic;
+        let topicName: string | undefined;
 
-        if (!topicName && context?.resource?.type === 'storage#object') {
-            const file: File = storage.bucket(event.bucket).file(event.name);
-            const [meta] = await file.getMetadata();
-            topicName = meta?.metadata?.topic;
-            console.log('topic:', topicName);
+        if (context?.eventType === 'google.storage.object.finalize') {
+            const gsEvent = event as TGSEvent;
+
+            topicName = gsEvent?.metadata?.topic;
+
+            if (!topicName && context?.resource?.type === 'storage#object') {
+                const file: File = storage.bucket(gsEvent.bucket).file(gsEvent.name);
+                const [meta] = await file.getMetadata();
+                topicName = meta?.metadata?.topic;
+                console.log('topic:', topicName);
+            }
+        } else if (context?.eventType === 'google.pubsub.topic.publish') {
+            const psEvent = event as TPSEvent;
+            topicName = (psEvent.data as any)?.topic;
         }
 
         if (topicName && !isEmpty(topicName)) {
@@ -112,7 +129,7 @@ export class GcfCommon {
         }
     }
 
-    static async getOptions(event: TEvent, context: TContext) {
+    static async getOptions(event: TGSEvent, context: TContext) {
         if (event?.metadata?.options) {
             return JSON.parse(event?.metadata?.options ?? '{}');
         } else {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gcf-common-lib",
   "description": "",
-  "version": "0.11.1",
+  "version": "0.12.1",
   "publishConfig": {
     "access": "public",
     "branches": [
@@ -20,14 +20,14 @@
     "url": "https://github.com/TopTechnologies/gcf-common.git"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^2.18.5",
-    "@google-cloud/secret-manager": "^3.10.1",
-    "@google-cloud/storage": "^5.18.1",
+    "@google-cloud/pubsub": "^2.19.0",
+    "@google-cloud/secret-manager": "^3.11.0",
+    "@google-cloud/storage": "^5.18.2",
     "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@tsconfig/node14": "^1.0.1",
-    "@types/lodash": "^4.14.178"
+    "@types/lodash": "^4.14.179"
   },
   "author": "alert83@gmail.com",
   "license": "MIT"