@flink-app/firebase-messaging-plugin 0.11.0 → 0.11.2

package/.flink/generatedHandlers.ts

@@ -1,4 +1,4 @@
-// Generated Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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 Tue Jun 18 2024 09:50:53 GMT+0200 (Central European Summer Time)
+// Generated Wed Aug 07 2024 11:18:50 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/schemas.json

@@ -0,0 +1,57 @@
+{
+    "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"
+        ]
+    }
+}

package/dist/.flink/start.js

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

package/dist/src/firebaseMessagingPlugin.js

@@ -87,7 +87,7 @@ var firebase_admin_1 = __importDefault(require("firebase-admin"));
 var firebaseMessagingPlugin = function (options) {
     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))
+        credential: firebase_admin_1.default.credential.cert(JSON.parse(decodedKey)),
     });
     return {
         id: "firebaseMessaging",
@@ -110,15 +110,58 @@ exports.firebaseMessagingPlugin = firebaseMessagingPlugin;
  * Send push notification.
  */
 function send(message, adminApp) {
-    var messages = message.to.map(function (to) {
-        var toArray = message.to, rest = __rest(message, ["to"]);
-        return __assign(__assign({}, rest), { token: to });
-    });
-    return Promise.all(messages.map(function (m) {
-        adminApp
-            .messaging().send(m)
-            .catch(function (err) {
-            return flink_1.log.debug("[firebaseMessaging] Failed sending to device " + m.token + ": " + err);
+    return __awaiter(this, void 0, void 0, function () {
+        var messages, batchSize, _loop_1, i;
+        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 });
+                    });
+                    batchSize = 500;
+                    _loop_1 = function (i) {
+                        var batch, response, err_1;
+                        return __generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0:
+                                    batch = messages.slice(i, i + batchSize);
+                                    _b.label = 1;
+                                case 1:
+                                    _b.trys.push([1, 3, , 4]);
+                                    return [4 /*yield*/, adminApp.messaging().sendEach(batch)];
+                                case 2:
+                                    response = _b.sent();
+                                    response.responses.forEach(function (res, idx) {
+                                        if (res.success) {
+                                            flink_1.log.debug("[firebaseMessaging] Successfully sent to device " + batch[idx].token);
+                                        }
+                                        else {
+                                            flink_1.log.debug("[firebaseMessaging] Failed sending to device " + batch[idx].token + ": " + res.error);
+                                        }
+                                    });
+                                    return [3 /*break*/, 4];
+                                case 3:
+                                    err_1 = _b.sent();
+                                    flink_1.log.debug("[firebaseMessaging] Failed sending batch: " + err_1);
+                                    return [3 /*break*/, 4];
+                                case 4: return [2 /*return*/];
+                            }
+                        });
+                    };
+                    i = 0;
+                    _a.label = 1;
+                case 1:
+                    if (!(i < messages.length)) return [3 /*break*/, 4];
+                    return [5 /*yield**/, _loop_1(i)];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    i += batchSize;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
         });
-    }));
+    });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flink-app/firebase-messaging-plugin",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Flink plugin to send Firebase cloud messages",
   "scripts": {
     "test": "echo \"Error: no test specified\"",
@@ -28,5 +28,5 @@
     "tsc-watch": "^4.2.9",
     "typescript": "^4.2.4"
   },
-  "gitHead": "3869def3e7e7e7105373ad31bc23a8ed68108015"
+  "gitHead": "4adbc3dfa43aef1a9a4c0165a0e76a89f4c51429"
 }

package/src/firebaseMessagingPlugin.ts

@@ -2,72 +2,70 @@ import { FlinkPlugin, log } from "@flink-app/flink";
 
 import * as PostMessage from "./handlers/PostMessage";
 import Message from "./schemas/Message";
-import admin from "firebase-admin"
+import admin from "firebase-admin";
 
 export type FirebaseMessagingPluginOptions = {
-  /**
-   * Firebase server key
-   */
+    /**
+     * Firebase server key
+     */
 
-  serviceAccountKey: string
+    serviceAccountKey: string;
 
-  /**
-   * If to expose endpoints for sending push notification.
-   */
-  exposeEndpoints?: boolean;
+    /**
+     * If to expose endpoints for sending push notification.
+     */
+    exposeEndpoints?: boolean;
 
-  permissions?: {
-    send: string;
-  };
+    permissions?: {
+        send: string;
+    };
 };
 
-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"],
-      });
-    },
-  };
+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, adminApp: admin.app.App) {
-  const messages = message.to.map((to) => {
-    const { to : toArray, ...rest} = message;
-    return { ...rest, token : to };
-  });
-
-  return Promise.all(
-    messages.map((m) => {
-
-      adminApp
-        .messaging().send(m)
-        .catch((err: any) =>
-          log.debug(
-            `[firebaseMessaging] Failed sending to device ${m.token}: ${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 };
+    });
+
+    // Split messages into batches of 500
+    const batchSize = 500;
+    for (let i = 0; i < messages.length; i += batchSize) {
+        const batch = messages.slice(i, i + batchSize);
+
+        try {
+            const response = await adminApp.messaging().sendEach(batch);
+            response.responses.forEach((res, idx) => {
+                if (res.success) {
+                    log.debug(`[firebaseMessaging] Successfully sent to device ${batch[idx].token}`);
+                } else {
+                    log.debug(`[firebaseMessaging] Failed sending to device ${batch[idx].token}: ${res.error}`);
+                }
+            });
+        } catch (err: any) {
+            log.debug(`[firebaseMessaging] Failed sending batch: ${err}`);
+        }
+    }
 }