npm - @steedos-labs/plugin-workflow - Versions diffs - 3.0.58 → 3.0.60 - Mend

@steedos-labs/plugin-workflow 3.0.58 → 3.0.60

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/designer/dist/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <link rel="shortcut icon" type="image/svg+xml" href="/images/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>designer</title>
-    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-0cQynRDB.js"></script>
+    <script type="module" crossorigin src="/api/workflow/designer-v2/assets/index-D5-hZ3Ut.js"></script>
     <link rel="stylesheet" crossorigin href="/api/workflow/designer-v2/assets/index-DEEcIiu0.css">
   </head>
   <body>

package/main/default/manager/instance_tasks_manager.js CHANGED Viewed

@@ -9,6 +9,7 @@
 // @ts-check
 const _ = require('lodash')
 const { getObject } = require('@steedos/objectql')
+const { getCollection } = require('../utils/collection')
 const DISABLE_DIRECT = process.env.STEEDOS_INSTANCE_TASKS_DISABLE_DIRECT == true || process.env.STEEDOS_INSTANCE_TASKS_DISABLE_DIRECT == 'true';
@@ -36,8 +37,9 @@ async function _find(query) {
     return await getObject('instance_tasks').find(query);
 }
-async function _count(query) {
-    return await getObject('instance_tasks').count(query);
+async function _count(filter) {
+    const col = await getCollection('instance_tasks');
+    return await col.countDocuments(filter);
 }
 /**
@@ -117,30 +119,22 @@ async function insert_many_instance_tasks(insId, traceId, approveIds) {
  * @returns 更新后的instance_tasks
  */
 async function update_instance_tasks(insId, traceId, approveId, doc) {
-    console.time(`update_instance_tasks ${approveId}`);
     let taskDoc = doc
     if (!taskDoc) {
-        console.time(`update_instance_tasks_makeTaskDoc ${approveId}`);
         taskDoc = await _makeTaskDoc(insId, traceId, approveId)
         delete taskDoc._id
-        console.timeEnd(`update_instance_tasks_makeTaskDoc ${approveId}`);
     }
-    console.time(`update_instance_tasks_update ${approveId}`);
     const result = await _update(approveId, taskDoc)
-    console.timeEnd(`update_instance_tasks_update ${approveId}`);
     // 如果任务已完成，更新相关通知为已读
     if (taskDoc.is_finished) {
-        console.time(`update_instance_tasks_notifications ${approveId}`);
         const instance = taskDoc.instance || insId
         const handler = taskDoc.handler
         if (instance && handler) {
             await _updateNotificationsAsRead(instance, handler)
         }
-        console.timeEnd(`update_instance_tasks_notifications ${approveId}`);
     }
-    console.timeEnd(`update_instance_tasks ${approveId}`);
     return result
 }
@@ -180,23 +174,28 @@ async function update_many_instance_tasks(insId, traceId, approveIds, keys) {
 /**
  * 删除instance_tasks记录
- * @param {String} approveId
+ * @param {String} approveId
  * @returns 1
  */
 async function remove_instance_tasks(approveId) {
+    const col = await getCollection('instance_tasks')
+    const notificationsCol = await getCollection('notifications')
     // 删除前先获取任务信息用于更新通知
-    const taskDoc = await getObject('instance_tasks').findOne(approveId)
-    const result = await _remove(approveId)
+    const taskDoc = await col.findOne({ _id: approveId }, { projection: { instance: 1, handler: 1 } })
+    await col.deleteOne({ _id: approveId })
     // 删除任务后，更新相关通知为已删除
     if (taskDoc) {
         const { instance, handler } = taskDoc
         if (instance && handler) {
-            await _updateNotificationsAsDeleted(instance, handler)
+            await notificationsCol.updateMany(
+                { owner: handler, 'related_to.o': 'instances', 'related_to.ids': instance },
+                { $set: { is_deleted: true } }
+            )
         }
     }
-    return result
+    return 1
 }
 /**
@@ -205,21 +204,26 @@ async function remove_instance_tasks(approveId) {
  * @returns 1
  */
 async function remove_many_instance_tasks(approveIds) {
-    const results = []
-    for (const aId of approveIds) {
+    if (!approveIds || approveIds.length === 0) return []
+    const col = await getCollection('instance_tasks')
+    const notificationsCol = await getCollection('notifications')
+    const results = await Promise.all(approveIds.map(async (aId) => {
         // 删除前先获取任务信息用于更新通知
-        const taskDoc = await getObject('instance_tasks').findOne(aId)
-        const r = await _remove(aId)
-        results.push(r)
+        const taskDoc = await col.findOne({ _id: aId }, { projection: { instance: 1, handler: 1 } })
+        await col.deleteOne({ _id: aId })
         // 删除任务后，更新相关通知为已删除
         if (taskDoc) {
             const { instance, handler } = taskDoc
             if (instance && handler) {
-                await _updateNotificationsAsDeleted(instance, handler)
+                await notificationsCol.updateMany(
+                    { owner: handler, 'related_to.o': 'instances', 'related_to.ids': instance },
+                    { $set: { is_deleted: true } }
+                )
             }
         }
-    }
+        return 1
+    }))
     return results
 }
@@ -269,14 +273,14 @@ async function direct_remove_many_instance_tasks(approveIds) {
 /**
  * 计数instance_tasks
- * @param {object} query
- * @returns 1
+ * @param {object} filter MongoDB原生查询条件
+ * @returns {number}
  */
-async function count_instance_tasks(query) {
+async function count_instance_tasks(filter) {
     if(process.env.STEEDOS_WORKFLOW_DISABLE_BADGE === 'true'){
         return 0;
-    }
-    const result = await _count(query)
+    }
+    const result = await _count(filter)
     return result
 }

package/main/default/manager/push_manager.js CHANGED Viewed

@@ -54,11 +54,12 @@ const uuflowManager = {
 const settings = require('@steedos/objectql').getSteedosConfig();
-async function count_instance_tasks(query) {
+async function count_instance_tasks(filter) {
     if(process.env.STEEDOS_WORKFLOW_DISABLE_BADGE === 'true'){
         return 0;
-    }
-    return await getObject('instance_tasks').count(query)
+    }
+    const col = await getCollection('instance_tasks');
+    return await col.countDocuments(filter);
 }
 // 定义全局变量
@@ -385,29 +386,36 @@ pushManager.get_badge = async function (send_from, user_id) {
     if (!BADGE_SEND_FROM_WHITELIST.has(send_from) || !user_id) {
         return null;
     }
+    if (process.env.STEEDOS_WORKFLOW_DISABLE_BADGE === 'true') {
+        return 0;
+    }
-    let badge = 0;
-    const [spaceUsersCol, categoriesCol, keyvaluesCol] = await Promise.all([
+    const [spaceUsersCol, categoriesCol] = await Promise.all([
         getCollection('space_users'),
         getCollection('categories'),
-        getCollection('steedos_keyvalues')
     ]);
-    const badgeQuery = { user: user_id, key: 'badge' };
-    const badgeFields = { fields: { _id: 1, value: 1 } };
+    const keyvaluesObj = getObject('steedos_keyvalues');
     const userSpaces = await spaceUsersCol.find(
         { user: user_id, user_accepted: true },
-        { fields: { space: 1 } }
+        { projection: { space: 1 } }
     ).toArray();
-    for (const userSpace of userSpaces) {
+    // 各 space 之间并行处理，每个返回该 space 的 taskCount
+    const spaceBadges = await Promise.all(userSpaces.map(async (userSpace) => {
         const spaceId = userSpace.space;
+        // 查出该 space 的 keyvalue 记录（只查一次，app和workflow共用）
+        const spaceKeyValues = await keyvaluesObj.find({
+            filters: [['user', '=', user_id], ['key', '=', 'badge'], ['space', '=', spaceId]],
+            fields: ['_id', 'value']
+        });
+        let spaceKeyValue = spaceKeyValues.length > 0 ? spaceKeyValues[0] : null;
         // 按 app 分组的 category badge 更新
         const categories = await categoriesCol.find(
             { space: spaceId, app: { $ne: null } },
-            { fields: { app: 1 } }
+            { projection: { app: 1 } }
         ).toArray();
         if (categories.length > 0) {
@@ -420,81 +428,70 @@ pushManager.get_badge = async function (send_from, user_id) {
                 if (categoryIds.length === 0) continue;
                 const categoryBadge = await count_instance_tasks({
-                    filters: [
-                        ['handler', '=', user_id],
-                        ['is_finished', '=', false],
-                        ['space', '=', spaceId],
-                        ['category', 'in', categoryIds],
-                    ]
+                    handler: user_id,
+                    is_finished: false,
+                    space: spaceId,
+                    category: { $in: categoryIds },
                 });
-                const appKeyValue = await keyvaluesCol.findOne(
-                    { ...badgeQuery, space: spaceId },
-                    badgeFields
-                );
-                if (appKeyValue) {
-                    if (appKeyValue.value?.[appName] !== categoryBadge) {
-                        await getObject('steedos_keyvalues').update(appKeyValue._id, {
-                            [`value.${appName}`]: categoryBadge
+                if (spaceKeyValue) {
+                    if (spaceKeyValue.value?.[appName] !== categoryBadge) {
+                        await keyvaluesObj.update(spaceKeyValue._id, {
+                            value: { ...spaceKeyValue.value, [appName]: categoryBadge }
                         });
+                        spaceKeyValue.value = { ...spaceKeyValue.value, [appName]: categoryBadge };
                     }
                 } else {
-                    await getObject('steedos_keyvalues').insert({
+                    const inserted = await keyvaluesObj.insert({
                         user: user_id,
                         space: spaceId,
                         key: 'badge',
                         value: { [appName]: categoryBadge }
                     });
+                    spaceKeyValue = inserted;
                 }
             }
         }
         // workflow 记录所有待办数量
         const taskCount = await count_instance_tasks({
-            filters: [
-                ['handler', '=', user_id],
-                ['is_finished', '=', false],
-                ['space', '=', spaceId],
-            ]
+            handler: user_id,
+            is_finished: false,
+            space: spaceId,
         });
-        badge += taskCount;
-        const sk = await keyvaluesCol.findOne(
-            { ...badgeQuery, space: spaceId },
-            badgeFields
-        );
-        if (sk) {
-            if (sk.value?.workflow !== taskCount) {
-                await getObject('steedos_keyvalues').update(sk._id, {
-                    'value.workflow': taskCount
+        if (spaceKeyValue) {
+            if (spaceKeyValue.value?.workflow !== taskCount) {
+                await keyvaluesObj.update(spaceKeyValue._id, {
+                    value: { ...spaceKeyValue.value, workflow: taskCount }
                 });
-                continue;
             }
         } else {
-            await getObject('steedos_keyvalues').insert({
+            await keyvaluesObj.insert({
                 user: user_id,
                 space: spaceId,
                 key: 'badge',
                 value: { workflow: taskCount }
             });
-            continue;
         }
-    }
+        return taskCount;
+    }));
+    const badge = spaceBadges.reduce((sum, count) => sum + count, 0);
     // 更新跨 space 的全局 badge
-    const skAll = await keyvaluesCol.findOne(
-        { ...badgeQuery, space: null },
-        { fields: { _id: 1 } }
-    );
-    if (skAll) {
-        await getObject('steedos_keyvalues').update(skAll._id, {
-            'value.workflow': badge
+    const skAllArr = await keyvaluesObj.find({
+        filters: [['user', '=', user_id], ['key', '=', 'badge'], ['space', '=', null]],
+        fields: ['_id']
+    });
+    if (skAllArr.length > 0) {
+        await keyvaluesObj.update(skAllArr[0]._id, {
+            value: { workflow: badge }
         });
     } else {
-        await getObject('steedos_keyvalues').insert({
+        await keyvaluesObj.insert({
             user: user_id,
             space: null,
             key: 'badge',
@@ -686,7 +683,9 @@ pushManager.send_instance_notification = async function (send_from, instance, de
     try {
         const space_id = instance.space;
         const instance_id = instance._id;
         const flow = flowDoc || await uuflowManager.getFlow(instance.flow);
         const to_users = await pushManager.get_to_users(send_from, instance, cc_user_ids, current_user_info);
         const href = `${process.env.ROOT_URL}workflow/space/${space_id}/inbox/${instance_id}`;
@@ -753,6 +752,7 @@ pushManager.send_instance_notification = async function (send_from, instance, de
             const body = await pushManager.get_body(parameters, lang);
             const title = await pushManager.get_title(parameters, lang);
             const badge = await pushManager.get_badge(send_from, to_user._id);
             const push_body = {
@@ -785,15 +785,14 @@ pushManager.send_instance_notification = async function (send_from, instance, de
 // 发送给当前用户
-pushManager.send_message_current_user = function (user_info) {
+pushManager.send_message_current_user = async function (user_info) {
     if (process.env.STEEDOS_DEBUG_DISABLE_PUSHMANAGER) {
         return;
     }
     try {
-        const badge = this.get_badge("current_user", user_info._id);
+        const badge = await this.get_badge("current_user", user_info._id);
         const push_body = { badge };
         return this.send_message([user_info.steedos_id], push_body, user_info);
     } catch (error) {
         console.error(error.stack);
@@ -805,21 +804,22 @@ pushManager.send_message_to_specifyUser = async function (send_from, to_user) {
     if (process.env.STEEDOS_DEBUG_DISABLE_PUSHMANAGER) {
         return
     }
-    const db = {
-        users: await getCollection("users")
-    }
     var badge, e, push_body, user_info;
     try {
         badge = await pushManager.get_badge(send_from, to_user);
         push_body = new Object;
         push_body["badge"] = badge;
-        user_info = await db.users.findOne({
+        const usersCol = await getCollection("users");
+        user_info = await usersCol.findOne({
             _id: to_user
         }, {
             fields: {
                 steedos_id: 1
             }
         });
         if (user_info) {
             return await pushManager.send_message([user_info.steedos_id], push_body);
         }