@steedos-labs/plugin-workflow 3.0.62 → 3.0.64

package/src/instance_record_queue.js

@@ -484,9 +484,16 @@ InstanceRecordQueue.Configure = function (options) {
     }
 
     // Universal send function
-    var _querySend = function (doc) {
+    var _querySend = async function (doc) {
         if (InstanceRecordQueue.sendDoc) {
-            InstanceRecordQueue.sendDoc(doc);
+            try {
+                await InstanceRecordQueue.sendDoc(doc);
+            } catch (error) {
+                console.error(`${new Date().toISOString()} [InstanceRecordQueue._querySend] sendDoc 异常: docId=${doc._id}, error=${error.message}`);
+                throw error;
+            }
+        } else {
+            console.warn(`[InstanceRecordQueue._querySend] InstanceRecordQueue.sendDoc 未定义! docId=${doc._id}`);
         }
 
         return {
@@ -494,9 +501,9 @@ InstanceRecordQueue.Configure = function (options) {
         };
     };
 
-    self.serverSend = function (doc) {
+    self.serverSend = async function (doc) {
         doc = doc || {};
-        return _querySend(doc);
+        return await _querySend(doc);
     };
 
     var isSendingDoc = false;
@@ -543,6 +550,8 @@ InstanceRecordQueue.Configure = function (options) {
                         }
                     });
                 }
+            } else {
+                console.warn(`[InstanceRecordQueue.sendDoc-queue] 文档 reserve 失败（可能被其他实例处理）: docId=${doc._id}`);
             } // Else could not reserve
         }; // EO sendDoc
 
@@ -584,10 +593,13 @@ InstanceRecordQueue.Configure = function (options) {
                 },
                 limit: batchSize
             }).toArray();
+
             for (const doc of pendingDocs) {
                 try {
+                    console.log(`${new Date().toISOString()} [InstanceRecordQueue.sendWorker] 处理文档: docId=${doc._id}, insId=${doc.info.instance_id}`);
                     await sendDoc(doc);
                 } catch (error) {
+                    console.error(`${new Date().toISOString()} [InstanceRecordQueue.sendWorker] 文档处理异常: docId=${doc._id}`);
                     console.error(error.stack);
                     console.log('InstanceRecordQueue: Could not send doc id: "' + doc._id + '", Error: ' + error.message);
                     await InstanceRecordQueue.collection.update({
@@ -954,6 +966,10 @@ InstanceRecordQueue.syncValues = async function (field_map_back, values, ins, ob
             var relatedObjectName = key;
             var relatedObjectValues = [];
             var relatedObjectFields = await getObjectFields(relatedObjectName)
+            if (!values[tableCode] || !Array.isArray(values[tableCode])) {
+                console.warn(`[InstanceRecordQueue.syncValues] tableToRelated: values['${tableCode}'] is empty or not an array, skipping related object '${relatedObjectName}'`);
+                continue;
+            }
             for (const tableValueItem of values[tableCode]) {
                 let relateRecord;
                 if (tableValueItem._id) {
@@ -1073,7 +1089,7 @@ InstanceRecordQueue.sendDoc = async function (doc) {
     const docId = doc._id;
     const insId = doc.info.instance_id;
 
-    console.log(`[InstanceRecordQueue.sendDoc] 开始处理文档: docId=${docId}, insId=${insId}, 时间=${startTime.toISOString()}`);
+    console.log(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 开始处理: insId=${insId}`);
 
     if (InstanceRecordQueue.debug) {
         console.log("sendDoc:");
@@ -1081,7 +1097,6 @@ InstanceRecordQueue.sendDoc = async function (doc) {
     }
 
     var records = doc.info.records;
-    console.log(`[InstanceRecordQueue.sendDoc] 文档中的记录数: ${records ? records.length : 0}`);
 
     var fields = {
         flow: 1,
@@ -1099,18 +1114,15 @@ InstanceRecordQueue.sendDoc = async function (doc) {
         fields[f] = 1;
     })
 
-    console.log(`[InstanceRecordQueue.sendDoc] 查询实例: insId=${insId}`);
     var ins = await objectql.getObject('instances').findOne(insId, {
         fields: fields
     })
 
     if (!ins) {
-        console.error(`[InstanceRecordQueue.sendDoc] 无法找到实例: insId=${insId}`);
+        console.error(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 实例不存在: insId=${insId}`);
         throw new Error(`Instance not found: ${insId}`);
     }
 
-    console.log(`[InstanceRecordQueue.sendDoc] 获取实例成功: insId=${insId}, 实例状态=${ins.state}, 实例名称=${ins.name}`);
-
     var values = ins.values,
         spaceId = ins.space;
 
@@ -1120,21 +1132,18 @@ InstanceRecordQueue.sendDoc = async function (doc) {
     }
 
     const flowId = ins.flow
-    console.log(`[InstanceRecordQueue.sendDoc] 查询流程: flowId=${flowId}`);
     const flow = await objectql.getObject('flows').findOne(flowId, { fields: { enable_amisform: 1 } })
 
     if (!flow) {
-        console.error(`[InstanceRecordQueue.sendDoc] 无法找到流程: flowId=${flowId}`);
+        console.error(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 流程不存在: flowId=${flowId}`);
         throw new Error(`Flow not found: ${flowId}`);
     }
 
     const enableAmisform = flow.enable_amisform
-    console.log(`[InstanceRecordQueue.sendDoc] 流程启用Amisform: ${enableAmisform}`);
 
     if (records && !_.isEmpty(records)) {
         // 此情况属于从creator中发起审批，或者已经从Apps同步到了creator
         var objectName = records[0].o;
-        console.log(`[InstanceRecordQueue.sendDoc] 检测到记录: objectName=${objectName}, recordIds=${JSON.stringify(records[0].ids)}`);
 
         var ow = await objectql.getObject('object_workflows').findOne({
             object_name: objectName,
@@ -1142,39 +1151,32 @@ InstanceRecordQueue.sendDoc = async function (doc) {
         });
 
         if (!ow) {
-            console.error(`[InstanceRecordQueue.sendDoc] 无法找到对象工作流配置: objectName=${objectName}, flowId=${ins.flow}`);
+            console.error(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 对象工作流配置不存在: objectName=${objectName}, flowId=${ins.flow}`);
             throw new Error(`ObjectWorkflow not found for object=${objectName}, flow=${ins.flow}`);
         }
 
-        console.log(`[InstanceRecordQueue.sendDoc] 获取对象工作流配置: objectName=${objectName}`);
+        console.log(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 同步到对象: objectName=${objectName}`);
 
         var objectCollection = objectql.getObject(objectName),
             sync_attachment = ow.sync_attachment;
         syncDirection = ow.sync_direction || 'both';
-        console.log(`[InstanceRecordQueue.sendDoc] 同步方向: ${syncDirection}, 同步附件: ${sync_attachment}`);
 
         var objectInfo = await getObjectConfig(objectName);
-        console.log(`[InstanceRecordQueue.sendDoc] 对象配置获取成功: objectName=${objectName}, 字段数=${Object.keys(objectInfo.fields || {}).length}`);
 
         const recordsToProcess = await objectFind(objectName, { filters: [['_id', 'in', records[0].ids]] });
-        console.log(`[InstanceRecordQueue.sendDoc] 查询得到的记录数: ${recordsToProcess.length}`);
 
         for (const record of recordsToProcess) {
             const recordId = record._id;
-            console.log(`[InstanceRecordQueue.sendDoc] 处理记录: recordId=${recordId}`);
             try {
                 if (!['both', 'ins_to_obj'].includes(syncDirection)) {
-                    console.log(`[InstanceRecordQueue.sendDoc] 跳过记录，同步方向不匹配: ${syncDirection}`);
                     continue;
                 }
                 var lock_record_after_approval = ow.lock_record_after_approval || false;
-                console.log(`[InstanceRecordQueue.sendDoc] 同步值: recordId=${recordId}, flowId=${ins.flow}`);
                 var syncValues = await InstanceRecordQueue.syncValues(ow.field_map_back, values, ins, objectInfo, ow.field_map_back_script, record, enableAmisform)
                 var setObj = syncValues.mainObjectValue;
 
-                console.log(`[InstanceRecordQueue.sendDoc] 字段映射结果: recordId=${recordId}, 映射字段数=${Object.keys(setObj).length}`);
                 if (InstanceRecordQueue.debug) {
-                    console.log(`[InstanceRecordQueue.sendDoc] 映射值详情:`, JSON.stringify(setObj, null, 2));
+                    console.log(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 映射值详情:`, JSON.stringify(setObj, null, 2));
                 }
 
                 var instance_state = ins.state;
@@ -1186,13 +1188,10 @@ InstanceRecordQueue.sendDoc = async function (doc) {
                 }
                 setObj['instances.0.state'] = setObj.instance_state = instance_state;
 
-                console.log(`[InstanceRecordQueue.sendDoc] 更新记录: recordId=${recordId}, instanceState=${instance_state}`);
                 await objectUpdate(objectName, record._id, setObj);
-                console.log(`[InstanceRecordQueue.sendDoc] 记录更新成功: recordId=${recordId}`);
 
                 var relatedObjects = await getRelateds(ow.object_name);
                 var relatedObjectsValue = syncValues.relatedObjectsValue;
-                console.log(`[InstanceRecordQueue.sendDoc] 处理关联对象: 数量=${relatedObjects.length}`);
                 await InstanceRecordQueue.syncRelatedObjectsValue(record._id, relatedObjects, relatedObjectsValue, spaceId, ins);
 
                 // 以最终申请单附件为准，旧的record中附件删除
@@ -1204,7 +1203,6 @@ InstanceRecordQueue.sendDoc = async function (doc) {
                         ids: [record._id]
                     }
                 });
-                console.log(`[InstanceRecordQueue.sendDoc] 删除旧附件: recordId=${recordId}`);
 
                 const cfsColl = await getCollection('cfs.files.filerecord');
                 await cfsColl.deleteMany({
@@ -1212,16 +1210,11 @@ InstanceRecordQueue.sendDoc = async function (doc) {
                 })
 
                 // 同步新附件
-                console.log(`[InstanceRecordQueue.sendDoc] 同步新附件: recordId=${recordId}, insId=${insId}`);
                 await InstanceRecordQueue.syncAttach(sync_attachment, insId, record.space, record._id, objectName);
                 // 执行公式
-                console.log(`[InstanceRecordQueue.sendDoc] 执行公式: recordId=${recordId}`);
                 await runQuoted(objectName, record._id);
-                console.log(`[InstanceRecordQueue.sendDoc] 记录处理完成: recordId=${recordId}`);
             } catch (error) {
-                console.error(`[InstanceRecordQueue.sendDoc] 记录处理失败: recordId=${recordId}`);
-                console.error(`[InstanceRecordQueue.sendDoc] 错误信息:`, error.message);
-                console.error(`[InstanceRecordQueue.sendDoc] 错误堆栈:`, error.stack);
+                console.error(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 记录处理失败: recordId=${recordId}, error=${error.message}`);
 
                 await objectUpdateMany(objectName, [['_id', '=', record._id], ['instances._id', '=', insId]], {
                     'instances.$.state': 'pending',
@@ -1246,38 +1239,31 @@ InstanceRecordQueue.sendDoc = async function (doc) {
         }
     } else {
         // 此情况属于从apps中发起审批
-        console.log(`[InstanceRecordQueue.sendDoc] 从Apps发起的审批，创建新记录`);
         const owsColl = await getCollection('object_workflows');
         const ows = await owsColl.find({
             flow_id: ins.flow
         }).toArray();
 
-        console.log(`[InstanceRecordQueue.sendDoc] 找到的对象工作流配置数: ${ows.length}`);
         for (const ow of ows) {
             const objectName = ow.object_name;
-            console.log(`[InstanceRecordQueue.sendDoc] 处理对象工作流: objectName=${objectName}`);
             try {
                 var sync_attachment = ow.sync_attachment,
                     newRecordId = await makeNewID(ow.object_name),
                     syncDirection = ow.sync_direction || 'both';
                 lock_record_after_approval = ow.lock_record_after_approval || false;
+                var recordInserted = false;
 
-                console.log(`[InstanceRecordQueue.sendDoc] 新建记录: recordId=${newRecordId}, objectName=${objectName}, syncDirection=${syncDirection}`);
+                console.log(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 新建记录: objectName=${objectName}, recordId=${newRecordId}`);
 
                 if (!['both', 'ins_to_obj'].includes(syncDirection)) {
-                    console.log(`[InstanceRecordQueue.sendDoc] 跳过对象工作流，同步方向不匹配: ${syncDirection}`);
                     continue;
                 }
 
                 var objectInfo = await getObjectConfig(ow.object_name);
-                console.log(`[InstanceRecordQueue.sendDoc] 获取对象配置: objectName=${objectName}, 字段数=${Object.keys(objectInfo.fields || {}).length}`);
 
-                console.log(`[InstanceRecordQueue.sendDoc] 同步字段值: objectName=${objectName}`);
                 var syncValues = await InstanceRecordQueue.syncValues(ow.field_map_back, values, ins, objectInfo, ow.field_map_back_script, null, enableAmisform);
                 var newObj = syncValues.mainObjectValue;
 
-                console.log(`[InstanceRecordQueue.sendDoc] 字段映射完成: objectName=${objectName}, 映射字段数=${Object.keys(newObj).length}`);
-
                 newObj.space = spaceId;
                 newObj.name = newObj.name || ins.name;
 
@@ -1299,6 +1285,7 @@ InstanceRecordQueue.sendDoc = async function (doc) {
                 newObj.modified_by = ins.applicant;
                 
                 var r = await objectInsert(ow.object_name, newObj);
+                recordInserted = !!r;
                 const insColl = await getCollection('instances');
                 if (r) {
                     await insColl.update({_id: ins._id}, {
@@ -1329,32 +1316,38 @@ InstanceRecordQueue.sendDoc = async function (doc) {
             } catch (error) {
                 console.error(error);
 
-                await objectRemove(ow.object_name, newRecordId);
-                const insColl = await getObject('instances');
-                await insColl.update(ins._id, {
-                    $pull: {
-                        record_ids: {
-                            o: objectName,
-                            ids: [newRecordId]
-                        }
-                    },
-                    $set: {
-                        modified: new Date()
-                    }
-                });
+                if (recordInserted) {
+                    try {
+                        await objectRemove(ow.object_name, newRecordId);
+                        const insColl = await getObject('instances');
+                        await insColl.update(ins._id, {
+                            $pull: {
+                                record_ids: {
+                                    o: objectName,
+                                    ids: [newRecordId]
+                                }
+                            },
+                            $set: {
+                                modified: new Date()
+                            }
+                        });
 
-                const cfColl = await getCollection('cms_files');
-                await cfColl.deleteMany({
-                    'parent': {
-                        o: objectName,
-                        ids: [newRecordId]
-                    }
-                });
+                        const cfColl = await getCollection('cms_files');
+                        await cfColl.deleteMany({
+                            'parent': {
+                                o: objectName,
+                                ids: [newRecordId]
+                            }
+                        });
 
-                const cfsColl = await getCollection('cfs.files.filerecord');
-                await cfsColl.deleteMany({
-                    'metadata.record_id': newRecordId
-                })
+                        const cfsColl = await getCollection('cfs.files.filerecord');
+                        await cfsColl.deleteMany({
+                            'metadata.record_id': newRecordId
+                        })
+                    } catch (cleanupError) {
+                        console.error(`${new Date().toISOString()} [InstanceRecordQueue.sendDoc] 清理记录失败: objectName=${objectName}, recordId=${newRecordId}`, cleanupError);
+                    }
+                }
                 throw error;
             }
         }

package/src/rests/getPageSchema.js

@@ -16,7 +16,7 @@ module.exports = {
             return {};
         }
 
-        // 直接 broker.call page.getMeSchema，完全绕过 vm2 沙箱
+        // 直接 broker.call page.getMeSchema 获取页面 schema
         // 参考 steedos-platform/services/service-pages/main/default/routes/page_schema.router.js
         // flow_selector 这个 page 的 type 固定为 'page'
         const result = await objectql.getSteedosSchema().broker.call('page.getMeSchema', {

package/src/timeout_auto_submit.js

@@ -35,7 +35,7 @@ TimeoutAutoSubmit.Configure = function (options = {}) {
         _job = null;
     }
 
-    console.log(`[timeout_auto_submit] Configured with interval: ${sendInterval}ms`);
+    console.log(`${new Date().toISOString()} [timeout_auto_submit] Configured with interval: ${sendInterval}ms`);
 
     // Convert milliseconds interval to a cron-compatible schedule using node-schedule's RecurrenceRule
     const intervalSeconds = Math.max(Math.round(sendInterval / 1000), 1);
@@ -54,12 +54,17 @@ TimeoutAutoSubmit.Configure = function (options = {}) {
             return;
         }
         _isProcessing = true;
+        const startTime = Date.now();
         try {
-            console.time('[timeout_auto_submit] execution');
             await UUFlowManager.timeoutAutoSubmit();
-            console.timeEnd('[timeout_auto_submit] execution');
+            const duration = Date.now() - startTime;
+            if (duration > 5000) {
+                console.log(`${new Date().toISOString()} [timeout_auto_submit] Completed in ${duration}ms`);
+            }
         } catch (error) {
-            console.error('[timeout_auto_submit] Error during scheduled execution:', error.stack || error);
+            const duration = Date.now() - startTime;
+            console.error(`${new Date().toISOString()} [timeout_auto_submit] Fatal error after ${duration}ms: ${error.message}`);
+            console.error(`${new Date().toISOString()} [timeout_auto_submit] Stack trace:`, error.stack);
         } finally {
             _isProcessing = false;
         }
@@ -75,7 +80,7 @@ TimeoutAutoSubmit.Stop = function () {
         _job = null;
     }
     _isProcessing = false;
-    console.log('[timeout_auto_submit] Stopped');
+    console.log(`${new Date().toISOString()} [timeout_auto_submit] Stopped`);
 };
 
 module.exports = TimeoutAutoSubmit;