@nocobase/plugin-notification-in-app-message 2.1.0-beta.13 → 2.1.0-beta.15

package/dist/server/InAppNotificationChannel.js

@@ -40,11 +40,61 @@ __export(InAppNotificationChannel_exports, {
 });
 module.exports = __toCommonJS(InAppNotificationChannel_exports);
 var import_plugin_notification_manager = require("@nocobase/plugin-notification-manager");
+var import_uuid = require("uuid");
 var import_types2 = require("../types");
 var import_parseUserSelectionConf = require("./parseUserSelectionConf");
 var import_defineMyInAppMessages = __toESM(require("./defineMyInAppMessages"));
 var import_defineMyInAppChannels = __toESM(require("./defineMyInAppChannels"));
 class InAppNotificationChannel extends import_plugin_notification_manager.BaseNotificationChannel {
+  static SLOW_SEND_THRESHOLD_MS = 200;
+  getMessagePayload(message) {
+    return typeof (message == null ? void 0 : message.toJSON) === "function" ? message.toJSON() : message;
+  }
+  emitMessageEventsAsync(type, messages) {
+    setImmediate(() => {
+      try {
+        const startedAt = Date.now();
+        this.emitMessageEvents(type, messages);
+        const elapsed = Date.now() - startedAt;
+        if (elapsed >= InAppNotificationChannel.SLOW_SEND_THRESHOLD_MS) {
+          this.app.logger.warn("in-app notification websocket dispatch is slow", {
+            type,
+            count: messages.length,
+            elapsed
+          });
+        }
+      } catch (error) {
+        this.app.logger.error(`failed to emit in-app message events: ${error.message}`, {
+          error,
+          type,
+          count: messages.length
+        });
+      }
+    });
+  }
+  scheduleMessageEvents(type, messages, transaction) {
+    if (!messages.length) {
+      return;
+    }
+    if (transaction == null ? void 0 : transaction.afterCommit) {
+      transaction.afterCommit(() => {
+        this.emitMessageEventsAsync(type, messages);
+      });
+      return;
+    }
+    this.emitMessageEventsAsync(type, messages);
+  }
+  emitMessageEvents(type, messages) {
+    for (const message of messages) {
+      this.app.emit("ws:sendToUser", {
+        userId: message.userId,
+        message: {
+          type: `in-app-message:${type}`,
+          payload: message
+        }
+      });
+    }
+  }
   async load() {
     this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterCreate`, this.onMessageCreated);
     this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterBulkCreate`, this.onMessageCreated);
@@ -53,53 +103,61 @@ class InAppNotificationChannel extends import_plugin_notification_manager.BaseNo
     this.defineActions();
   }
   onMessageCreated = async (model, options) => {
-    const models = Array.isArray(model) ? model : [model];
-    for (const m of models) {
-      const userId = m.userId;
-      this.app.emit("ws:sendToUser", {
-        userId,
-        message: {
-          type: "in-app-message:created",
-          payload: m.toJSON()
-        }
-      });
-    }
+    const messages = (Array.isArray(model) ? model : [model]).map((item) => this.getMessagePayload(item));
+    this.scheduleMessageEvents("created", messages, options == null ? void 0 : options.transaction);
   };
   onMessageUpdated = async (model, options) => {
-    const models = Array.isArray(model) ? model : [model];
-    for (const m of models) {
-      const userId = m.userId;
-      this.app.emit("ws:sendToUser", {
-        userId,
-        message: {
-          type: "in-app-message:updated",
-          payload: m.toJSON()
-        }
-      });
-    }
+    const messages = (Array.isArray(model) ? model : [model]).map((item) => this.getMessagePayload(item));
+    this.scheduleMessageEvents("updated", messages, options == null ? void 0 : options.transaction);
   };
   send = async (params) => {
-    const { channel, message, receivers } = params;
+    const startedAt = Date.now();
+    const { channel, message, receivers, transaction } = params;
     let userIds;
     const { content, title, options = {} } = message;
     const userRepo = this.app.db.getRepository("users");
+    const resolveReceiversStartedAt = Date.now();
     if ((receivers == null ? void 0 : receivers.type) === "userId") {
       userIds = receivers.value;
     } else {
-      userIds = (await (0, import_parseUserSelectionConf.parseUserSelectionConf)(message.receivers, userRepo)).map((i) => parseInt(i));
+      userIds = (await (0, import_parseUserSelectionConf.parseUserSelectionConf)(message.receivers, userRepo, { transaction })).map((i) => parseInt(i));
     }
+    const resolveReceiversMs = Date.now() - resolveReceiversStartedAt;
+    const uniqueUserIds = [...new Set(userIds)];
+    if (!uniqueUserIds.length) {
+      return { status: "success", message };
+    }
+    const receiveTimestamp = Date.now();
+    const messages = uniqueUserIds.map((userId) => ({
+      id: (0, import_uuid.v4)(),
+      title,
+      content,
+      status: "unread",
+      userId,
+      channelName: channel.name,
+      receiveTimestamp,
+      options
+    }));
     const MessageModel = this.app.db.getModel(import_types2.InAppMessagesDefinition.name);
-    await MessageModel.bulkCreate(
-      userIds.map((userId) => ({
-        title,
-        content,
-        status: "unread",
-        userId,
+    const persistStartedAt = Date.now();
+    await MessageModel.bulkCreate(messages, {
+      hooks: false,
+      transaction,
+      validate: false,
+      returning: false
+    });
+    const persistMs = Date.now() - persistStartedAt;
+    this.scheduleMessageEvents("created", messages, transaction);
+    const totalMs = Date.now() - startedAt;
+    if (totalMs >= InAppNotificationChannel.SLOW_SEND_THRESHOLD_MS) {
+      this.app.logger.warn("in-app notification send is slow", {
         channelName: channel.name,
-        receiveTimestamp: Date.now(),
-        options
-      }))
-    );
+        userCount: messages.length,
+        resolveReceiversMs,
+        persistMs,
+        totalMs
+      });
+    }
     return { status: "success", message };
   };
   defineActions() {

package/dist/server/parseUserSelectionConf.d.ts

@@ -6,5 +6,6 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
+import { Transactionable } from '@nocobase/database';
 import { Repository } from '@nocobase/database';
-export declare function parseUserSelectionConf(userSelectionConfig: Array<Record<any, any> | string>, UserRepo: Repository): Promise<string[]>;
+export declare function parseUserSelectionConf(userSelectionConfig: Array<Record<any, any> | string>, UserRepo: Repository, options?: Transactionable): Promise<string[]>;

package/dist/server/parseUserSelectionConf.js

@@ -30,7 +30,7 @@ __export(parseUserSelectionConf_exports, {
 });
 module.exports = __toCommonJS(parseUserSelectionConf_exports);
 var import_utils = require("@nocobase/utils");
-async function parseUserSelectionConf(userSelectionConfig, UserRepo) {
+async function parseUserSelectionConf(userSelectionConfig, UserRepo, options = {}) {
   const SelectionConfigs = userSelectionConfig.flat().filter(Boolean);
   const users = /* @__PURE__ */ new Set();
   for (const item of SelectionConfigs) {
@@ -40,7 +40,8 @@ async function parseUserSelectionConf(userSelectionConfig, UserRepo) {
       }
       const result = await UserRepo.find({
         ...item,
-        fields: ["id"]
+        fields: ["id"],
+        transaction: options.transaction
       });
       result.forEach((item2) => users.add(item2.id));
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "2.1.0-beta.13",
+  "version": "2.1.0-beta.15",
   "displayName": "Notification: In-app message",
   "displayName.ru-RU": "Уведомления: Всплывающие сообщения внутри приложения",
   "displayName.zh-CN": "通知：站内信",
@@ -25,10 +25,11 @@
     "@formily/reactive-react": "^2",
     "@nocobase/client": "2.x",
     "@nocobase/plugin-notification-manager": "2.x",
+    "@nocobase/plugin-workflow": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x",
     "react-router-dom": "^6.x"
   },
   "license": "Apache-2.0",
-  "gitHead": "691716e5f4e5f8bd3859d65bc8a29b4e3c32209b"
+  "gitHead": "dc1aceea6357e6ab149976c2a236fc4b6bee1370"
 }

package/dist/client/components/UsersAddition.d.ts

@@ -1,10 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import React from 'react';
-export declare function UsersAddition(): React.JSX.Element;

package/dist/client/components/UsersSelect.d.ts

@@ -1,18 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This program is offered under a commercial license.
- * For more information, see <https://www.nocobase.com/agreement>
- */
-import React from 'react';
-export declare function UsersSelect(props: any): React.JSX.Element;