@nocobase/plugin-notification-in-app-message 2.1.0-beta.33 → 2.1.0-beta.35

package/dist/externalVersion.js

@@ -9,21 +9,21 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "2.1.0-beta.33",
-  "@nocobase/plugin-notification-manager": "2.1.0-beta.33",
-  "@nocobase/plugin-mobile": "2.1.0-beta.33",
-  "@nocobase/utils": "2.1.0-beta.33",
+  "@nocobase/client": "2.1.0-beta.35",
+  "@nocobase/plugin-notification-manager": "2.1.0-beta.35",
+  "@nocobase/plugin-mobile": "2.1.0-beta.35",
+  "@nocobase/utils": "2.1.0-beta.35",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "2.1.0-beta.33",
+  "@nocobase/database": "2.1.0-beta.35",
+  "@nocobase/server": "2.1.0-beta.35",
   "sequelize": "6.35.2",
-  "@nocobase/actions": "2.1.0-beta.33",
-  "@nocobase/database": "2.1.0-beta.33",
+  "@nocobase/actions": "2.1.0-beta.35",
   "antd": "5.24.2",
-  "@nocobase/flow-engine": "2.1.0-beta.33",
+  "@nocobase/flow-engine": "2.1.0-beta.35",
   "antd-style": "3.7.1",
   "@emotion/css": "11.13.0",
   "@formily/react": "2.3.7",
-  "@nocobase/plugin-workflow": "2.1.0-beta.33",
+  "@nocobase/plugin-workflow": "2.1.0-beta.35",
   "react-router-dom": "6.30.1",
   "@formily/reactive": "2.3.7",
   "@formily/shared": "2.3.7"

package/dist/node_modules/uuid/package.json

@@ -1 +1 @@
-{"name":"uuid","version":"10.0.0","description":"RFC9562 UUIDs","funding":["https://github.com/sponsors/broofa","https://github.com/sponsors/ctavan"],"commitlint":{"extends":["@commitlint/config-conventional"]},"keywords":["uuid","guid","rfc4122","rfc9562"],"license":"MIT","bin":{"uuid":"dist/bin/uuid"},"sideEffects":false,"main":"./dist/index.js","exports":{".":{"node":{"module":"./dist/esm-node/index.js","require":"./dist/index.js","import":"./wrapper.mjs"},"browser":{"import":"./dist/esm-browser/index.js","require":"./dist/commonjs-browser/index.js"},"default":"./dist/esm-browser/index.js"},"./package.json":"./package.json"},"module":"./dist/esm-node/index.js","browser":{"./dist/esm-node/index.js":"./dist/esm-browser/index.js","./dist/md5.js":"./dist/md5-browser.js","./dist/native.js":"./dist/native-browser.js","./dist/rng.js":"./dist/rng-browser.js","./dist/sha1.js":"./dist/sha1-browser.js"},"files":["CHANGELOG.md","CONTRIBUTING.md","LICENSE.md","README.md","dist","wrapper.mjs"],"devDependencies":{"@babel/cli":"7.24.6","@babel/core":"7.24.6","@babel/eslint-parser":"7.24.6","@babel/plugin-syntax-import-attributes":"7.24.6","@babel/preset-env":"7.24.6","@commitlint/cli":"19.3.0","@commitlint/config-conventional":"19.2.2","@wdio/browserstack-service":"7.16.10","@wdio/cli":"7.16.10","@wdio/jasmine-framework":"7.16.6","@wdio/local-runner":"7.16.10","@wdio/spec-reporter":"7.16.9","@wdio/static-server-service":"7.16.6","bundlewatch":"0.3.3","eslint":"9.4.0","eslint-plugin-prettier":"5.1.3","globals":"15.3.0","husky":"9.0.11","jest":"29.7.0","lint-staged":"15.2.5","neostandard":"0.5.1","npm-run-all":"4.1.5","optional-dev-dependency":"2.0.1","prettier":"3.3.0","random-seed":"0.3.0","runmd":"1.3.9","standard-version":"9.5.0"},"optionalDevDependencies":{"@wdio/browserstack-service":"7.16.10","@wdio/cli":"7.16.10","@wdio/jasmine-framework":"7.16.6","@wdio/local-runner":"7.16.10","@wdio/spec-reporter":"7.16.9","@wdio/static-server-service":"7.16.6"},"scripts":{"examples:browser:webpack:build":"cd examples/browser-webpack && npm install && npm run build","examples:browser:rollup:build":"cd examples/browser-rollup && npm install && npm run build","examples:node:commonjs:test":"cd examples/node-commonjs && npm install && npm test","examples:node:esmodules:test":"cd examples/node-esmodules && npm install && npm test","examples:node:jest:test":"cd examples/node-jest && npm install && npm test","prepare":"husky install","lint":"npm run eslint:check && npm run prettier:check","eslint:check":"eslint src/ test/ examples/ *.js","eslint:fix":"eslint --fix src/ test/ examples/ *.js","pretest":"npm run build","test":"BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/","test:matching":"BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/ -t","pretest:browser":"optional-dev-dependency && npm run build && npm-run-all --parallel examples:browser:**","test:browser":"wdio run ./wdio.conf.js","pretest:node":"npm run build","test:node":"npm-run-all --parallel examples:node:**","test:pack":"./scripts/testpack.sh","pretest:benchmark":"npm run build","test:benchmark":"cd examples/benchmark && HUSKY=0 npm install && npm test","prettier:check":"prettier --check .","prettier:fix":"prettier --write .","bundlewatch":"npm run pretest:browser && bundlewatch --config bundlewatch.config.json","md":"runmd --watch --output=README.md README_js.md","docs":"npm run build && npx runmd --output=README.md README_js.md","docs:diff":"npm run docs && git diff --quiet README.md","build":"./scripts/build.sh","prepack":"npm run build","release":"standard-version --no-verify"},"repository":{"type":"git","url":"git+https://github.com/uuidjs/uuid.git"},"lint-staged":{"*":["prettier --no-error-on-unmatched-pattern --write"],"*.{js,jsx}":["eslint --no-error-on-unmatched-pattern --fix"]},"standard-version":{"scripts":{"postchangelog":"prettier --write CHANGELOG.md"}},"packageManager":"npm@10.8.1+sha256.b8807aebb9656758e2872fa6e7c564b506aa2faa9297439a478d471d2fe32483","_lastModified":"2026-05-15T15:55:26.884Z"}
+{"name":"uuid","version":"10.0.0","description":"RFC9562 UUIDs","funding":["https://github.com/sponsors/broofa","https://github.com/sponsors/ctavan"],"commitlint":{"extends":["@commitlint/config-conventional"]},"keywords":["uuid","guid","rfc4122","rfc9562"],"license":"MIT","bin":{"uuid":"dist/bin/uuid"},"sideEffects":false,"main":"./dist/index.js","exports":{".":{"node":{"module":"./dist/esm-node/index.js","require":"./dist/index.js","import":"./wrapper.mjs"},"browser":{"import":"./dist/esm-browser/index.js","require":"./dist/commonjs-browser/index.js"},"default":"./dist/esm-browser/index.js"},"./package.json":"./package.json"},"module":"./dist/esm-node/index.js","browser":{"./dist/esm-node/index.js":"./dist/esm-browser/index.js","./dist/md5.js":"./dist/md5-browser.js","./dist/native.js":"./dist/native-browser.js","./dist/rng.js":"./dist/rng-browser.js","./dist/sha1.js":"./dist/sha1-browser.js"},"files":["CHANGELOG.md","CONTRIBUTING.md","LICENSE.md","README.md","dist","wrapper.mjs"],"devDependencies":{"@babel/cli":"7.24.6","@babel/core":"7.24.6","@babel/eslint-parser":"7.24.6","@babel/plugin-syntax-import-attributes":"7.24.6","@babel/preset-env":"7.24.6","@commitlint/cli":"19.3.0","@commitlint/config-conventional":"19.2.2","@wdio/browserstack-service":"7.16.10","@wdio/cli":"7.16.10","@wdio/jasmine-framework":"7.16.6","@wdio/local-runner":"7.16.10","@wdio/spec-reporter":"7.16.9","@wdio/static-server-service":"7.16.6","bundlewatch":"0.3.3","eslint":"9.4.0","eslint-plugin-prettier":"5.1.3","globals":"15.3.0","husky":"9.0.11","jest":"29.7.0","lint-staged":"15.2.5","neostandard":"0.5.1","npm-run-all":"4.1.5","optional-dev-dependency":"2.0.1","prettier":"3.3.0","random-seed":"0.3.0","runmd":"1.3.9","standard-version":"9.5.0"},"optionalDevDependencies":{"@wdio/browserstack-service":"7.16.10","@wdio/cli":"7.16.10","@wdio/jasmine-framework":"7.16.6","@wdio/local-runner":"7.16.10","@wdio/spec-reporter":"7.16.9","@wdio/static-server-service":"7.16.6"},"scripts":{"examples:browser:webpack:build":"cd examples/browser-webpack && npm install && npm run build","examples:browser:rollup:build":"cd examples/browser-rollup && npm install && npm run build","examples:node:commonjs:test":"cd examples/node-commonjs && npm install && npm test","examples:node:esmodules:test":"cd examples/node-esmodules && npm install && npm test","examples:node:jest:test":"cd examples/node-jest && npm install && npm test","prepare":"husky install","lint":"npm run eslint:check && npm run prettier:check","eslint:check":"eslint src/ test/ examples/ *.js","eslint:fix":"eslint --fix src/ test/ examples/ *.js","pretest":"npm run build","test":"BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/","test:matching":"BABEL_ENV=commonjsNode node --throw-deprecation node_modules/.bin/jest test/unit/ -t","pretest:browser":"optional-dev-dependency && npm run build && npm-run-all --parallel examples:browser:**","test:browser":"wdio run ./wdio.conf.js","pretest:node":"npm run build","test:node":"npm-run-all --parallel examples:node:**","test:pack":"./scripts/testpack.sh","pretest:benchmark":"npm run build","test:benchmark":"cd examples/benchmark && HUSKY=0 npm install && npm test","prettier:check":"prettier --check .","prettier:fix":"prettier --write .","bundlewatch":"npm run pretest:browser && bundlewatch --config bundlewatch.config.json","md":"runmd --watch --output=README.md README_js.md","docs":"npm run build && npx runmd --output=README.md README_js.md","docs:diff":"npm run docs && git diff --quiet README.md","build":"./scripts/build.sh","prepack":"npm run build","release":"standard-version --no-verify"},"repository":{"type":"git","url":"git+https://github.com/uuidjs/uuid.git"},"lint-staged":{"*":["prettier --no-error-on-unmatched-pattern --write"],"*.{js,jsx}":["eslint --no-error-on-unmatched-pattern --fix"]},"standard-version":{"scripts":{"postchangelog":"prettier --write CHANGELOG.md"}},"packageManager":"npm@10.8.1+sha256.b8807aebb9656758e2872fa6e7c564b506aa2faa9297439a478d471d2fe32483","_lastModified":"2026-05-19T16:50:39.357Z"}

package/dist/server/InAppNotificationChannel.d.ts

@@ -10,10 +10,12 @@ import { SendFnType, BaseNotificationChannel } from '@nocobase/plugin-notificati
 import { InAppMessageFormValues } from '../types';
 export default class InAppNotificationChannel extends BaseNotificationChannel {
     private static readonly SLOW_SEND_THRESHOLD_MS;
+    private static readonly MESSAGE_BATCH_SIZE;
     private getMessagePayload;
     private emitMessageEventsAsync;
     private scheduleMessageEvents;
     private emitMessageEvents;
+    private persistMessagesInBatches;
     load(): Promise<void>;
     onMessageCreated: (model: any, options: any) => Promise<void>;
     onMessageUpdated: (model: any, options: any) => Promise<void>;

package/dist/server/InAppNotificationChannel.js

@@ -47,6 +47,7 @@ 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;
+  static MESSAGE_BATCH_SIZE = 100;
   getMessagePayload(message) {
     return typeof (message == null ? void 0 : message.toJSON) === "function" ? message.toJSON() : message;
   }
@@ -95,6 +96,47 @@ class InAppNotificationChannel extends import_plugin_notification_manager.BaseNo
       });
     }
   }
+  async persistMessagesInBatches(options) {
+    const { userIds, title, content, channelName, receiveTimestamp, messageOptions, transaction } = options;
+    const MessageModel = this.app.db.getModel(import_types2.InAppMessagesDefinition.name);
+    const persist = async (activeTransaction) => {
+      let persistedCount = 0;
+      for (let index = 0; index < userIds.length; index += InAppNotificationChannel.MESSAGE_BATCH_SIZE) {
+        const batchUserIds = userIds.slice(index, index + InAppNotificationChannel.MESSAGE_BATCH_SIZE);
+        const messageBatch = batchUserIds.map((userId) => ({
+          id: (0, import_uuid.v4)(),
+          title,
+          content,
+          status: "unread",
+          userId,
+          channelName,
+          receiveTimestamp,
+          options: messageOptions
+        }));
+        await MessageModel.bulkCreate(messageBatch, {
+          hooks: false,
+          transaction: activeTransaction,
+          validate: false,
+          returning: false
+        });
+        persistedCount += messageBatch.length;
+        this.scheduleMessageEvents("created", messageBatch, activeTransaction);
+      }
+      return persistedCount;
+    };
+    if (transaction) {
+      return persist(transaction);
+    }
+    const internalTransaction = await this.app.db.sequelize.transaction();
+    try {
+      const persistedCount = await persist(internalTransaction);
+      await internalTransaction.commit();
+      return persistedCount;
+    } catch (error) {
+      await internalTransaction.rollback();
+      throw error;
+    }
+  }
   async load() {
     this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterCreate`, this.onMessageCreated);
     this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterBulkCreate`, this.onMessageCreated);
@@ -128,31 +170,23 @@ class InAppNotificationChannel extends import_plugin_notification_manager.BaseNo
       return { status: "success", message };
     }
     const receiveTimestamp = Date.now();
-    const messages = uniqueUserIds.map((userId) => ({
-      id: (0, import_uuid.v4)(),
+    const persistStartedAt = Date.now();
+    const persistedCount = await this.persistMessagesInBatches({
+      userIds: uniqueUserIds,
       title,
       content,
-      status: "unread",
-      userId,
       channelName: channel.name,
       receiveTimestamp,
-      options
-    }));
-    const MessageModel = this.app.db.getModel(import_types2.InAppMessagesDefinition.name);
-    const persistStartedAt = Date.now();
-    await MessageModel.bulkCreate(messages, {
-      hooks: false,
-      transaction,
-      validate: false,
-      returning: false
+      messageOptions: options,
+      transaction
     });
     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,
-        userCount: messages.length,
+        userCount: persistedCount,
+        batchSize: InAppNotificationChannel.MESSAGE_BATCH_SIZE,
         resolveReceiversMs,
         persistMs,
         totalMs

package/dist/server/plugin.js

@@ -54,7 +54,7 @@ class PluginNotificationInAppServer extends import_server.Plugin {
     const notificationServer = this.pm.get(import_plugin_notification_manager.default);
     const instance = new import_InAppNotificationChannel.default(this.app);
     instance.load();
-    notificationServer.registerChannelType({ type: import_types.inAppTypeName, Channel: import_InAppNotificationChannel.default });
+    notificationServer.registerChannelType({ type: import_types.inAppTypeName, Channel: import_InAppNotificationChannel.default, useQueue: false });
   }
   async install() {
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "2.1.0-beta.33",
+  "version": "2.1.0-beta.35",
   "displayName": "Notification: In-app message",
   "displayName.ru-RU": "Уведомления: Всплывающие сообщения внутри приложения",
   "displayName.zh-CN": "通知：站内信",
@@ -32,5 +32,5 @@
     "react-router-dom": "^6.x"
   },
   "license": "Apache-2.0",
-  "gitHead": "4815c394e80a264fa8ed619246280923c47aeb72"
+  "gitHead": "74310d8b9e9581fcde14b5a93d12b41ddb5bb325"
 }