完善监控程序

pm2_dev.sh

@@ -1 +1,2 @@
 pm2 start npm --name "chain-client" --log-date-format "YYYY-MM-DD HH:mm:ss" -- run "dev:api"
+pm2 start npm --name "chain-monitor" --log-date-format "YYYY-MM-DD HH:mm:ss" -- run "dev:monitor"

src/config/events.json

@@ -1,6 +1,6 @@
 [
   {
-    "address": "0xc195196351566d2c4e13563C4492fB0BdB7894Fb",
+    "address": "0x8135D4F16A7AAA269cbf61CE9659D3A272BF541f",
     "event": "Confirmation",
     "abi": "BEMultiSigWallet",
     "fromBlock": 0,

src/controllers/workflow.controller.ts

@@ -2,14 +2,11 @@ import BaseController, { ROLE_ANON } from 'common/base.controller'
 import { ZError } from 'common/ZError'
 import { role, router } from 'decorators/router'
 import { getSignature, decrypt } from '@wecom/crypto'
-import { XMLParser } from 'fast-xml-parser'
 import { TaskQueue } from 'queue/task.queue'
-import { TaskStatus } from 'service/wechatwork.service'
 import { RequestTask } from 'models/RequestTask'
 import { BlockChain } from 'chain/BlockChain'
 import { ChainTask } from 'models/ChainTask'
 import { isObjectId } from 'utils/string.util'
-import { ChainQueue } from 'queue/chain.queue'
 
 class WorkFlowController extends BaseController {
   @role(ROLE_ANON)

src/models/ScheduleConfirmEvent.ts

@@ -1,5 +1,6 @@
 import { getModelForClass, index, modelOptions, prop } from '@typegoose/typegoose'
 import { dbconn } from 'decorators/dbconn'
+import { TaskSvr } from 'service/task.service'
 import { BaseModule } from './Base'
 
 @dbconn()
@@ -45,7 +46,12 @@ export class ScheduleConfirmEventClass extends BaseModule {
       $inc: { version: 1 },
     }
 
-    return ScheduleConfirmEvent.insertOrUpdate({ transactionHash: event.hash }, data)
+    let record = await ScheduleConfirmEvent.insertOrUpdate({ transactionHash: event.hash }, data)
+    if (record.version === 1) {
+      for (let id of event.ids) {
+        await new TaskSvr().parseOneSchedule(id)
+      }
+    }
   }
 }
 

src/service/task.service.ts

@@ -1,5 +1,6 @@
 import { BlockChain } from 'chain/BlockChain'
 import { singleton } from 'decorators/singleton'
+import logger from 'logger/logger'
 import { ChainTask } from 'models/ChainTask'
 import { ReqTaskStatus, RequestTask } from 'models/RequestTask'
 import { ChainQueue } from 'queue/chain.queue'
@@ -24,7 +25,10 @@ export class TaskSvr {
     if (!record) {
       return
     }
-    record.statue = ReqTaskStatus.WAIT_EXEC
+    if (record.status !== ReqTaskStatus.WAIT_EXEC) {
+      logger.info(`want exec schedule: ${scheduleId}, but status is ${record.status}`)
+      return
+    }
     await record.save()
     new ExecQueue().addTaskToQueue(record)
   }