@nocobase/plugin-notification-in-app-message 1.9.0-beta.4 → 1.9.0-beta.6

package/dist/client/observables/index.d.ts

@@ -8,6 +8,5 @@
  */
 export * from './channel';
 export * from './message';
-export * from './sse';
 export * from './inbox';
 export * from './user';

package/dist/externalVersion.js

@@ -9,24 +9,24 @@
 
 module.exports = {
   "react": "18.2.0",
-  "@nocobase/client": "1.9.0-beta.4",
-  "@nocobase/plugin-notification-manager": "1.9.0-beta.4",
-  "@nocobase/plugin-mobile": "1.9.0-beta.4",
-  "@nocobase/utils": "1.9.0-beta.4",
+  "@nocobase/client": "1.9.0-beta.6",
+  "@nocobase/plugin-notification-manager": "1.9.0-beta.6",
+  "@nocobase/plugin-mobile": "1.9.0-beta.6",
+  "@nocobase/utils": "1.9.0-beta.6",
   "react-i18next": "11.18.6",
-  "@nocobase/server": "1.9.0-beta.4",
+  "@nocobase/server": "1.9.0-beta.6",
   "sequelize": "6.35.2",
-  "@nocobase/actions": "1.9.0-beta.4",
-  "@nocobase/database": "1.9.0-beta.4",
+  "@nocobase/actions": "1.9.0-beta.6",
+  "@nocobase/database": "1.9.0-beta.6",
   "antd": "5.24.2",
   "@formily/reactive-react": "2.3.0",
-  "@formily/reactive": "2.3.0",
   "antd-style": "3.7.1",
   "@emotion/css": "11.13.0",
   "@formily/react": "2.3.0",
   "react-router-dom": "6.28.1",
   "@formily/core": "2.3.0",
   "@ant-design/icons": "5.6.1",
-  "@nocobase/plugin-workflow": "1.9.0-beta.4",
+  "@nocobase/plugin-workflow": "1.9.0-beta.6",
+  "@formily/reactive": "2.3.0",
   "@formily/shared": "2.3.2"
 };

package/dist/locale/zh-CN.json

@@ -22,11 +22,11 @@
   "Plain text": "纯文本",
   "detail URL": "详情链接",
   "Details page for desktop": "桌面端详情页",
-  "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/admin”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
+  "Support two types of links: internal links and external links. If using an internal link, the link starts with \"/\", for example, \"/admin\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/admin”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
   "Mark as read": "标为已读",
   "Mark as unread": "标为未读",
   "Mark all as read": "全部标为已读",
-  "Support two types of links: internal links and external links. If using an internal link, the link starts with\"/\", for example, \"/m\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/m”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
+  "Support two types of links: internal links and external links. If using an internal link, the link starts with \"/\", for example, \"/m\". If using an external link, the link starts with \"http\", for example, \"https://example.com\".": "支持两种链接类型：内部链接和外部链接。如果使用内部链接，链接以“/”开头，例如“/m”。如果使用外部链接，链接以“http”开头，例如“https://example.com”。",
   "Details page for mobile": "移动端详情页",
   "The message page has already been created.": "站内信页面已创建。",
   "When select receivers from node result, only support ID of user (or IDs array of users). Others will not match any user.": "从节点结果中选择接收者时，仅支持用户ID（或用户ID数组）。其他将不匹配任何用户。"

package/dist/server/InAppNotificationChannel.d.ts

@@ -6,26 +6,12 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-/// <reference types="node" />
-import { Application } from '@nocobase/server';
 import { SendFnType, BaseNotificationChannel } from '@nocobase/plugin-notification-manager';
 import { InAppMessageFormValues } from '../types';
-import { PassThrough } from 'stream';
-type UserID = string;
-type ClientID = string;
 export default class InAppNotificationChannel extends BaseNotificationChannel {
-    protected app: Application;
-    userClientsMap: Record<UserID, Record<ClientID, PassThrough>>;
-    constructor(app: Application);
     load(): Promise<void>;
-    onMessageCreatedOrUpdated: () => Promise<void>;
-    addClient: (userId: UserID, clientId: ClientID, stream: PassThrough) => void;
-    getClient: (userId: UserID, clientId: ClientID) => PassThrough;
-    removeClient: (userId: UserID, clientId: ClientID) => void;
-    sendDataToUser(userId: UserID, message: {
-        type: string;
-        data: any;
-    }): void;
+    onMessageCreated: (model: any, options: any) => Promise<void>;
+    onMessageUpdated: (model: any, options: any) => Promise<void>;
     saveMessageToDB: ({ content, status, userId, title, channelName, receiveTimestamp, options, }: {
         content: string;
         userId: number;
@@ -38,4 +24,3 @@ export default class InAppNotificationChannel extends BaseNotificationChannel {
     send: SendFnType<InAppMessageFormValues>;
     defineActions(): void;
 }
-export {};

package/dist/server/InAppNotificationChannel.js

@@ -45,61 +45,38 @@ 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 {
-  constructor(app) {
-    super(app);
-    this.app = app;
-    this.userClientsMap = {};
-  }
-  userClientsMap;
+  // userClientsMap: Record<UserID, Record<ClientID, PassThrough>>;
+  // constructor(protected app: Application) {
+  //   super(app);
+  //   this.userClientsMap = {};
+  // }
   async load() {
-    this.onMessageCreatedOrUpdated();
+    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterCreate`, this.onMessageCreated);
+    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterUpdate`, this.onMessageUpdated);
     this.defineActions();
   }
-  onMessageCreatedOrUpdated = async () => {
-    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterUpdate`, async (model, options) => {
-      const userId = model.userId;
-      this.sendDataToUser(userId, { type: "message:updated", data: model.dataValues });
-    });
-    this.app.db.on(`${import_types2.InAppMessagesDefinition.name}.afterCreate`, async (model, options) => {
-      const userId = model.userId;
-      this.sendDataToUser(userId, { type: "message:created", data: model.dataValues });
+  onMessageCreated = async (model, options) => {
+    const userId = model.userId;
+    this.app.emit("ws:sendToTag", {
+      tagKey: "userId",
+      tagValue: userId,
+      message: {
+        type: "in-app-message:created",
+        payload: model.toJSON()
+      }
     });
   };
-  addClient = (userId, clientId, stream) => {
-    if (!this.userClientsMap[userId]) {
-      this.userClientsMap[userId] = {};
-    }
-    this.userClientsMap[userId][clientId] = stream;
-  };
-  getClient = (userId, clientId) => {
-    var _a;
-    return (_a = this.userClientsMap[userId]) == null ? void 0 : _a[clientId];
-  };
-  removeClient = (userId, clientId) => {
-    if (this.userClientsMap[userId]) {
-      delete this.userClientsMap[userId][clientId];
-    }
-  };
-  sendDataToUser(userId, message) {
-    const clients = this.userClientsMap[userId];
-    if (clients) {
-      for (const clientId in clients) {
-        const stream = clients[clientId];
-        stream.write(
-          `data: ${JSON.stringify({
-            type: message.type,
-            data: {
-              ...message.data,
-              title: message.data.title || "",
-              content: message.data.content || ""
-            }
-          })}
-
-`
-        );
+  onMessageUpdated = async (model, options) => {
+    const userId = model.userId;
+    this.app.emit("ws:sendToTag", {
+      tagKey: "userId",
+      tagValue: userId,
+      message: {
+        type: "in-app-message:updated",
+        payload: model.toJSON()
       }
-    }
-  }
+    });
+  };
   saveMessageToDB = async ({
     content,
     status,
@@ -148,13 +125,8 @@ class InAppNotificationChannel extends import_plugin_notification_manager.BaseNo
     return { status: "success", message };
   };
   defineActions() {
-    (0, import_defineMyInAppMessages.default)({
-      app: this.app,
-      addClient: this.addClient,
-      removeClient: this.removeClient,
-      getClient: this.getClient
-    });
-    (0, import_defineMyInAppChannels.default)({ app: this.app });
+    (0, import_defineMyInAppMessages.default)(this.app);
+    (0, import_defineMyInAppChannels.default)(this.app);
     this.app.acl.allow("myInAppMessages", "*", "loggedIn");
     this.app.acl.allow("myInAppChannels", "*", "loggedIn");
     this.app.acl.allow("notificationInAppMessages", "*", "loggedIn");

package/dist/server/defineMyInAppChannels.d.ts

@@ -7,6 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Application } from '@nocobase/server';
-export default function defineMyInAppChannels({ app }: {
-    app: Application;
-}): void;
+export default function defineMyInAppChannels(app: Application): void;

package/dist/server/defineMyInAppChannels.js

@@ -32,7 +32,7 @@ module.exports = __toCommonJS(defineMyInAppChannels_exports);
 var import_sequelize = require("sequelize");
 var import_plugin_notification_manager = require("@nocobase/plugin-notification-manager");
 var import_types = require("../types");
-function defineMyInAppChannels({ app }) {
+function defineMyInAppChannels(app) {
   app.resourceManager.define({
     name: "myInAppChannels",
     actions: {
@@ -97,7 +97,6 @@ function defineMyInAppChannels({ app }) {
           const channelsRepo = app.db.getRepository(import_plugin_notification_manager.ChannelsCollectionDefinition.name);
           try {
             const channelsRes = channelsRepo.find({
-              logging: console.log,
               limit,
               attributes: {
                 include: [

package/dist/server/defineMyInAppMessages.d.ts

@@ -7,9 +7,4 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 import { Application } from '@nocobase/server';
-export default function defineMyInAppMessages({ app, addClient, removeClient, getClient, }: {
-    app: Application;
-    addClient: any;
-    removeClient: any;
-    getClient?: any;
-}): void;
+export default function defineMyInAppMessages(app: Application): void;

package/dist/server/defineMyInAppMessages.js

@@ -42,14 +42,8 @@ module.exports = __toCommonJS(defineMyInAppMessages_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
 var import_plugin_notification_manager = require("@nocobase/plugin-notification-manager");
 var import_sequelize = require("sequelize");
-var import_stream = require("stream");
 var import_types = require("../types");
-function defineMyInAppMessages({
-  app,
-  addClient,
-  removeClient,
-  getClient
-}) {
+function defineMyInAppMessages(app) {
   const countTotalUnreadMessages = async (userId) => {
     const messagesRepo = app.db.getRepository(import_types.InAppMessagesDefinition.name);
     const channelsCollection = app.db.getCollection(import_plugin_notification_manager.ChannelsCollectionDefinition.name);
@@ -58,7 +52,6 @@ function defineMyInAppMessages({
       name: channelsCollection.getRealFieldName(import_plugin_notification_manager.ChannelsCollectionDefinition.fieldNameMap.name, true)
     };
     const count = await messagesRepo.count({
-      logging: console.log,
       // @ts-ignore
       where: {
         userId,
@@ -73,33 +66,32 @@ function defineMyInAppMessages({
   app.resourceManager.define({
     name: "myInAppMessages",
     actions: {
-      sse: {
-        handler: async (ctx, next) => {
-          var _a, _b;
-          const userId = ctx.state.currentUser.id;
-          const clientId = (_b = (_a = ctx.action) == null ? void 0 : _a.params) == null ? void 0 : _b.id;
-          if (!clientId) return;
-          ctx.request.socket.setTimeout(0);
-          ctx.req.socket.setNoDelay(true);
-          ctx.req.socket.setKeepAlive(true);
-          ctx.set({
-            "Content-Type": "text/event-stream",
-            "Cache-Control": "no-cache",
-            Connection: "keep-alive"
-          });
-          const stream = new import_stream.PassThrough();
-          ctx.status = 200;
-          ctx.body = stream;
-          addClient(userId, clientId, stream);
-          stream.on("close", () => {
-            removeClient(userId, clientId);
-          });
-          stream.on("error", () => {
-            removeClient(userId, clientId);
-          });
-          await next();
-        }
-      },
+      // sse: {
+      //   handler: async (ctx, next) => {
+      //     const userId = ctx.state.currentUser.id;
+      //     const clientId = ctx.action?.params?.id;
+      //     if (!clientId) return;
+      //     ctx.request.socket.setTimeout(0);
+      //     ctx.req.socket.setNoDelay(true);
+      //     ctx.req.socket.setKeepAlive(true);
+      //     ctx.set({
+      //       'Content-Type': 'text/event-stream',
+      //       'Cache-Control': 'no-cache',
+      //       Connection: 'keep-alive',
+      //     });
+      //     const stream = new PassThrough();
+      //     ctx.status = 200;
+      //     ctx.body = stream;
+      //     addClient(userId, clientId, stream);
+      //     stream.on('close', () => {
+      //       removeClient(userId, clientId);
+      //     });
+      //     stream.on('error', () => {
+      //       removeClient(userId, clientId);
+      //     });
+      //     await next();
+      //   },
+      // },
       count: {
         handler: async (ctx) => {
           try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-notification-in-app-message",
-  "version": "1.9.0-beta.4",
+  "version": "1.9.0-beta.6",
   "displayName": "Notification: In-app message",
   "displayName.zh-CN": "通知：站内信",
   "description": "It supports users in receiving real-time message notifications within the NocoBase application.",
@@ -26,5 +26,5 @@
     "@nocobase/test": "1.x",
     "react-router-dom": "^6.x"
   },
-  "gitHead": "0276aa12d87f82c73d62a9712134fe363e2c772a"
+  "gitHead": "ada5e359a91135cb9baf605c04c5c380f067a046"
 }

package/dist/client/observables/sse.d.ts

@@ -1,13 +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 { SSEData } from '../../types';
-export declare const liveSSEObs: {
-    value: SSEData | null;
-};
-export declare const startMsgSSEStreamWithRetry: () => () => void;