@flink-app/firebase-messaging-plugin 0.7.0-alpha.0 → 0.11.0

package/.flink/generatedHandlers.ts

@@ -1,7 +1,7 @@
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink";
 import * as PostMessage_0 from "../src/handlers/PostMessage";
 
-export const handlers = [{"importName":"PostMessage_0","moduleSpecifier":"../src/handlers/PostMessage","schemasToGenerate":{"reqSchemaType":"PostMessage_12_ReqSchema","resSchemaType":"PostMessage_12_ResSchema"},"__file":"PostMessage.ts","__query":[],"__params":[],"__schemas":{"reqSchema":{"$schema":"http://json-schema.org/draft-07/schema#","type":"object","additionalProperties":false,"properties":{"to":{"type":"array","items":{"type":"string"},"description":"Devices to send to"},"notification":{"type":"object","properties":{"title":{"type":"string","description":"Optional push notification title"},"body":{"type":"string","description":"Optional body"}},"additionalProperties":false,"description":"Use `notification` if sending a standard push notification https://firebase.google.com/docs/cloud-messaging/concept-options#notifications"},"data":{"type":"object","additionalProperties":{"type":"string"},"description":"Use `data` to send data messages. https://firebase.google.com/docs/cloud-messaging/concept-options#data_messages"}},"required":["data","to"],"definitions":{}},"resSchema":{"$schema":"http://json-schema.org/draft-07/schema#","type":"object","additionalProperties":false,"properties":{"failedDevices":{"type":"array","items":{"type":"string"},"description":"Devices to which delivery failed"}},"required":["failedDevices"],"definitions":{}}},"assumedHttpMethod":HttpMethod.post,"handler":PostMessage_0,"Route":PostMessage_0.Route}];
+export const handlers = [{handler: PostMessage_0, assumedHttpMethod: HttpMethod.post}];
 autoRegisteredHandlers.push(...handlers);
     

package/.flink/generatedJobs.ts

@@ -1,4 +1,4 @@
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 import { autoRegisteredJobs } from "@flink-app/flink";
 export const jobs = [];
 autoRegisteredJobs.push(...jobs);

package/.flink/generatedRepos.ts

@@ -1,4 +1,4 @@
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
   import { autoRegisteredRepos } from "@flink-app/flink";
   export const repos = [];
   autoRegisteredRepos.push(...repos);

package/.flink/schemas/schemas.ts

@@ -1,7 +1,7 @@
 import Message from "../../src/schemas/Message";
 import SendResult from "../../src/schemas/SendResult";
 
-// Generated Mon Jul 10 2023 18:13:41 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 export interface PostMessage_12_ReqSchema extends Message {}
 
 export interface PostMessage_12_ResSchema extends SendResult {}

package/.flink/start.ts

@@ -1,4 +1,4 @@
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 import "./generatedHandlers";
 import "./generatedRepos";
 import "./generatedJobs";

package/dist/.flink/generatedHandlers.d.ts

@@ -1,72 +1,6 @@
 import { HttpMethod } from "@flink-app/flink";
 import * as PostMessage_0 from "../src/handlers/PostMessage";
 export declare const handlers: {
-    importName: string;
-    moduleSpecifier: string;
-    schemasToGenerate: {
-        reqSchemaType: string;
-        resSchemaType: string;
-    };
-    __file: string;
-    __query: never[];
-    __params: never[];
-    __schemas: {
-        reqSchema: {
-            $schema: string;
-            type: string;
-            additionalProperties: boolean;
-            properties: {
-                to: {
-                    type: string;
-                    items: {
-                        type: string;
-                    };
-                    description: string;
-                };
-                notification: {
-                    type: string;
-                    properties: {
-                        title: {
-                            type: string;
-                            description: string;
-                        };
-                        body: {
-                            type: string;
-                            description: string;
-                        };
-                    };
-                    additionalProperties: boolean;
-                    description: string;
-                };
-                data: {
-                    type: string;
-                    additionalProperties: {
-                        type: string;
-                    };
-                    description: string;
-                };
-            };
-            required: string[];
-            definitions: {};
-        };
-        resSchema: {
-            $schema: string;
-            type: string;
-            additionalProperties: boolean;
-            properties: {
-                failedDevices: {
-                    type: string;
-                    items: {
-                        type: string;
-                    };
-                    description: string;
-                };
-            };
-            required: string[];
-            definitions: {};
-        };
-    };
-    assumedHttpMethod: HttpMethod;
     handler: typeof PostMessage_0;
-    Route: import("@flink-app/flink").RouteProps;
+    assumedHttpMethod: HttpMethod;
 }[];

package/dist/.flink/generatedHandlers.js

@@ -20,8 +20,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlers = void 0;
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 var PostMessage_0 = __importStar(require("../src/handlers/PostMessage"));
-exports.handlers = [{ "importName": "PostMessage_0", "moduleSpecifier": "../src/handlers/PostMessage", "schemasToGenerate": { "reqSchemaType": "PostMessage_12_ReqSchema", "resSchemaType": "PostMessage_12_ResSchema" }, "__file": "PostMessage.ts", "__query": [], "__params": [], "__schemas": { "reqSchema": { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "to": { "type": "array", "items": { "type": "string" }, "description": "Devices to send to" }, "notification": { "type": "object", "properties": { "title": { "type": "string", "description": "Optional push notification title" }, "body": { "type": "string", "description": "Optional body" } }, "additionalProperties": false, "description": "Use `notification` if sending a standard push notification https://firebase.google.com/docs/cloud-messaging/concept-options#notifications" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, "description": "Use `data` to send data messages. https://firebase.google.com/docs/cloud-messaging/concept-options#data_messages" } }, "required": ["data", "to"], "definitions": {} }, "resSchema": { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "failedDevices": { "type": "array", "items": { "type": "string" }, "description": "Devices to which delivery failed" } }, "required": ["failedDevices"], "definitions": {} } }, "assumedHttpMethod": flink_1.HttpMethod.post, "handler": PostMessage_0, "Route": PostMessage_0.Route }];
+exports.handlers = [{ handler: PostMessage_0, assumedHttpMethod: flink_1.HttpMethod.post }];
 flink_1.autoRegisteredHandlers.push.apply(flink_1.autoRegisteredHandlers, exports.handlers);

package/dist/.flink/generatedJobs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.jobs = [];
 flink_1.autoRegisteredJobs.push.apply(flink_1.autoRegisteredJobs, exports.jobs);

package/dist/.flink/generatedRepos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.repos = void 0;
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 exports.repos = [];
 flink_1.autoRegisteredRepos.push.apply(flink_1.autoRegisteredRepos, exports.repos);

package/dist/.flink/start.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// Generated Mon Jul 10 2023 18:13:40 GMT+0200 (Central European Summer Time)
+// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
 require("./generatedHandlers");
 require("./generatedRepos");
 require("./generatedJobs");

package/dist/src/firebaseMessagingPlugin.d.ts

@@ -3,7 +3,7 @@ export declare type FirebaseMessagingPluginOptions = {
     /**
      * Firebase server key
      */
-    serverKey: string;
+    serviceAccountKey: string;
     /**
      * If to expose endpoints for sending push notification.
      */

package/dist/src/firebaseMessagingPlugin.js

@@ -65,21 +65,34 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firebaseMessagingPlugin = void 0;
 var flink_1 = require("@flink-app/flink");
-var fcm_push_1 = __importDefault(require("fcm-push"));
 var PostMessage = __importStar(require("./handlers/PostMessage"));
+var firebase_admin_1 = __importDefault(require("firebase-admin"));
 var firebaseMessagingPlugin = function (options) {
-    var fcmClient = new fcm_push_1.default(options.serverKey);
+    var decodedKey = Buffer.from(options.serviceAccountKey, "base64").toString("utf-8");
+    var adminAdpp = firebase_admin_1.default.initializeApp({
+        credential: firebase_admin_1.default.credential.cert(JSON.parse(decodedKey))
+    });
     return {
         id: "firebaseMessaging",
         ctx: {
-            fcmClient: fcmClient,
-            send: function (message) { return send(message, fcmClient); },
+            send: function (message) { return send(message, adminAdpp); },
         },
         init: function (app) { return __awaiter(void 0, void 0, void 0, function () {
             var _a;
@@ -96,15 +109,16 @@ exports.firebaseMessagingPlugin = firebaseMessagingPlugin;
 /**
  * Send push notification.
  */
-function send(message, fcmClient) {
+function send(message, adminApp) {
     var messages = message.to.map(function (to) {
-        return __assign(__assign({}, message), { to: to });
+        var toArray = message.to, rest = __rest(message, ["to"]);
+        return __assign(__assign({}, rest), { token: to });
     });
     return Promise.all(messages.map(function (m) {
-        return fcmClient
-            .send(m)
+        adminApp
+            .messaging().send(m)
             .catch(function (err) {
-            return flink_1.log.debug("[firebaseMessaging] Failed sending to device " + m.to + ": " + err);
+            return flink_1.log.debug("[firebaseMessaging] Failed sending to device " + m.token + ": " + err);
         });
     }));
 }

package/dist/src/handlers/PostMessage.d.ts

@@ -5,3 +5,5 @@ import SendResult from "../schemas/SendResult";
 export declare const Route: RouteProps;
 declare const PostMessage: Handler<FlinkContext<FirebaseMessagingContext>, Message, SendResult>;
 export default PostMessage;
+export declare const __assumedHttpMethod = "post", __file = "PostMessage.ts", __query: never[], __params: never[];
+export declare const __schemas: any;

package/dist/src/handlers/PostMessage.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Route = void 0;
+exports.__schemas = exports.__params = exports.__query = exports.__file = exports.__assumedHttpMethod = exports.Route = void 0;
 var flink_1 = require("@flink-app/flink");
 exports.Route = {
     method: flink_1.HttpMethod.post,
@@ -59,3 +59,5 @@ var PostMessage = function (_a) {
     });
 };
 exports.default = PostMessage;
+exports.__assumedHttpMethod = "post", exports.__file = "PostMessage.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "to": { "type": "array", "items": { "type": "string" }, "description": "Devices to send to" }, "notification": { "type": "object", "properties": { "title": { "type": "string", "description": "Optional push notification title" }, "body": { "type": "string", "description": "Optional body" } }, "additionalProperties": false, "description": "Use `notification` if sending a standard push notification https://firebase.google.com/docs/cloud-messaging/concept-options#notifications" }, "data": { "type": "object", "additionalProperties": { "type": "string" }, "description": "Use `data` to send data messages. https://firebase.google.com/docs/cloud-messaging/concept-options#data_messages" } }, "required": ["data", "to"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "failedDevices": { "type": "array", "items": { "type": "string" }, "description": "Devices to which delivery failed" } }, "required": ["failedDevices"], "definitions": {} } };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/firebase-messaging-plugin",
-  "version": "0.7.0-alpha.0",
+  "version": "0.11.0",
   "description": "Flink plugin to send Firebase cloud messages",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@flink-app/management-api-plugin": "^0.7.0-alpha.0",
-    "fcm-push": "^1.1.3"
+    "@flink-app/management-api-plugin": "^0.11.0",
+    "firebase-admin": "^12.1.1"
   },
   "devDependencies": {
-    "@flink-app/flink": "^0.7.0-alpha.0",
+    "@flink-app/flink": "^0.11.0",
     "@types/express": "^4.17.12",
     "@types/node": "^15.6.2",
     "nodemon": "^2.0.7",
@@ -28,5 +28,5 @@
     "tsc-watch": "^4.2.9",
     "typescript": "^4.2.4"
   },
-  "gitHead": "1e656eeb0e76d6ad8c6cc48200161aa445e365df"
+  "gitHead": "3869def3e7e7e7105373ad31bc23a8ed68108015"
 }

package/readme.md

@@ -75,3 +75,5 @@ const notificationManagementModule = GetNotificationManagementModule({
 
 
 
+
+

package/src/firebaseMessagingPlugin.ts

@@ -1,13 +1,15 @@
 import { FlinkPlugin, log } from "@flink-app/flink";
-import FCM from "fcm-push";
+
 import * as PostMessage from "./handlers/PostMessage";
 import Message from "./schemas/Message";
+import admin from "firebase-admin"
 
 export type FirebaseMessagingPluginOptions = {
   /**
    * Firebase server key
    */
-  serverKey: string;
+
+  serviceAccountKey: string
 
   /**
    * If to expose endpoints for sending push notification.
@@ -22,13 +24,18 @@ export type FirebaseMessagingPluginOptions = {
 export const firebaseMessagingPlugin = (
   options: FirebaseMessagingPluginOptions
 ): FlinkPlugin => {
-  const fcmClient = new FCM(options.serverKey);
+
+  const decodedKey = Buffer.from(options.serviceAccountKey, "base64").toString("utf-8");
+
+  const adminAdpp = admin.initializeApp({
+    credential: admin.credential.cert(JSON.parse(decodedKey))
+  });
+
 
   return {
     id: "firebaseMessaging",
     ctx: {
-      fcmClient,
-      send: (message: Message) => send(message, fcmClient),
+      send: (message: Message) => send(message, adminAdpp),
     },
     init: async (app) => {
       app.addHandler(PostMessage, {
@@ -41,20 +48,26 @@ export const firebaseMessagingPlugin = (
 /**
  * Send push notification.
  */
-function send(message: Message, fcmClient: any) {
+function send(message: Message, adminApp: admin.app.App) {
   const messages = message.to.map((to) => {
-    return { ...message, to };
+    const { to : toArray, ...rest} = message;
+    return { ...rest, token : to };
   });
 
   return Promise.all(
-    messages.map((m) =>
-      fcmClient
-        .send(m)
+    messages.map((m) => {
+
+      adminApp
+        .messaging().send(m)
         .catch((err: any) =>
           log.debug(
-            `[firebaseMessaging] Failed sending to device ${m.to}: ${err}`
+            `[firebaseMessaging] Failed sending to device ${m.token}: ${err}`
           )
         )
-    )
+
+
+
+    })
+
   );
 }

package/dist/.flink/schemas.json

@@ -1,57 +0,0 @@
-{
-    "Message": {
-        "type": "object",
-        "properties": {
-            "to": {
-                "description": "Devices to send to",
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            },
-            "notification": {
-                "description": "Use `notification` if sending a standard push notification\nhttps://firebase.google.com/docs/cloud-messaging/concept-options#notifications",
-                "type": "object",
-                "properties": {
-                    "title": {
-                        "description": "Optional push notification title",
-                        "type": "string"
-                    },
-                    "body": {
-                        "description": "Optional body",
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false
-            },
-            "data": {
-                "description": "Use `data` to send data messages.\nhttps://firebase.google.com/docs/cloud-messaging/concept-options#data_messages",
-                "type": "object",
-                "additionalProperties": {
-                    "type": "string"
-                }
-            }
-        },
-        "additionalProperties": false,
-        "required": [
-            "data",
-            "to"
-        ]
-    },
-    "SendResult": {
-        "type": "object",
-        "properties": {
-            "failedDevices": {
-                "description": "Devices to which delivery failed",
-                "type": "array",
-                "items": {
-                    "type": "string"
-                }
-            }
-        },
-        "additionalProperties": false,
-        "required": [
-            "failedDevices"
-        ]
-    }
-}