@flink-app/firebase-messaging-plugin 0.7.0-alpha.1 → 0.11.1

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 GMT+0200 (Central European Summer Time)
 import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink";
 import * as PostMessage_0 from "../src/handlers/PostMessage";
 

package/.flink/generatedJobs.ts

@@ -1,4 +1,4 @@
-// Generated Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 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 Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 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 Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:20 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 Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 GMT+0200 (Central European Summer Time)
 import "./generatedHandlers";
 import "./generatedRepos";
 import "./generatedJobs";

package/dist/.flink/generatedHandlers.js

@@ -20,7 +20,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handlers = void 0;
-// Generated Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 GMT+0200 (Central European Summer Time)
 var flink_1 = require("@flink-app/flink");
 var PostMessage_0 = __importStar(require("../src/handlers/PostMessage"));
 exports.handlers = [{ handler: PostMessage_0, assumedHttpMethod: flink_1.HttpMethod.post }];

package/dist/.flink/generatedJobs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.jobs = void 0;
-// Generated Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 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 Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 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 Wed Feb 07 2024 09:08:53 GMT+0100 (Central European Standard Time)
+// Generated Wed Aug 07 2024 10:39:19 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,37 @@ exports.firebaseMessagingPlugin = firebaseMessagingPlugin;
 /**
  * Send push notification.
  */
-function send(message, fcmClient) {
-    var messages = message.to.map(function (to) {
-        return __assign(__assign({}, message), { to: to });
-    });
-    return Promise.all(messages.map(function (m) {
-        return fcmClient
-            .send(m)
-            .catch(function (err) {
-            return flink_1.log.debug("[firebaseMessaging] Failed sending to device " + m.to + ": " + err);
+function send(message, adminApp) {
+    return __awaiter(this, void 0, void 0, function () {
+        var messages, _i, messages_1, message_1, err_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    messages = message.to.map(function (to) {
+                        var toArray = message.to, rest = __rest(message, ["to"]);
+                        return __assign(__assign({}, rest), { token: to });
+                    });
+                    _i = 0, messages_1 = messages;
+                    _a.label = 1;
+                case 1:
+                    if (!(_i < messages_1.length)) return [3 /*break*/, 6];
+                    message_1 = messages_1[_i];
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, adminApp.messaging().send(message_1)];
+                case 3:
+                    _a.sent();
+                    return [3 /*break*/, 5];
+                case 4:
+                    err_1 = _a.sent();
+                    flink_1.log.debug("[firebaseMessaging] Failed sending to device " + message_1.token + ": " + err_1);
+                    return [3 /*break*/, 5];
+                case 5:
+                    _i++;
+                    return [3 /*break*/, 1];
+                case 6: return [2 /*return*/];
+            }
         });
-    }));
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/firebase-messaging-plugin",
-  "version": "0.7.0-alpha.1",
+  "version": "0.11.1",
   "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.1",
-    "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.1",
+    "@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": "2ae3b415967bb4e4b41550ac1978e4c9fed47327"
+  "gitHead": "4d356de156b5f55e8206b17d6ad97875dee559e6"
 }

package/readme.md

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

package/src/firebaseMessagingPlugin.ts

@@ -1,60 +1,60 @@
 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;
-
-  /**
-   * If to expose endpoints for sending push notification.
-   */
-  exposeEndpoints?: boolean;
-
-  permissions?: {
-    send: string;
-  };
+    /**
+     * Firebase server key
+     */
+
+    serviceAccountKey: string;
+
+    /**
+     * If to expose endpoints for sending push notification.
+     */
+    exposeEndpoints?: boolean;
+
+    permissions?: {
+        send: string;
+    };
 };
 
-export const firebaseMessagingPlugin = (
-  options: FirebaseMessagingPluginOptions
-): FlinkPlugin => {
-  const fcmClient = new FCM(options.serverKey);
-
-  return {
-    id: "firebaseMessaging",
-    ctx: {
-      fcmClient,
-      send: (message: Message) => send(message, fcmClient),
-    },
-    init: async (app) => {
-      app.addHandler(PostMessage, {
-        permissions: [options.permissions?.send || "firebase-messaging:send"],
-      });
-    },
-  };
+export const firebaseMessagingPlugin = (options: FirebaseMessagingPluginOptions): FlinkPlugin => {
+    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: {
+            send: (message: Message) => send(message, adminAdpp),
+        },
+        init: async (app) => {
+            app.addHandler(PostMessage, {
+                permissions: [options.permissions?.send || "firebase-messaging:send"],
+            });
+        },
+    };
 };
 
 /**
  * Send push notification.
  */
-function send(message: Message, fcmClient: any) {
-  const messages = message.to.map((to) => {
-    return { ...message, to };
-  });
-
-  return Promise.all(
-    messages.map((m) =>
-      fcmClient
-        .send(m)
-        .catch((err: any) =>
-          log.debug(
-            `[firebaseMessaging] Failed sending to device ${m.to}: ${err}`
-          )
-        )
-    )
-  );
+async function send(message: Message, adminApp: admin.app.App) {
+    const messages = message.to.map((to) => {
+        const { to: toArray, ...rest } = message;
+        return { ...rest, token: to };
+    });
+
+    for (const message of messages) {
+        try {
+            await adminApp.messaging().send(message);
+        } catch (err: any) {
+            log.debug(`[firebaseMessaging] Failed sending to device ${message.token}: ${err}`);
+        }
+    }
 }