feat(orap)!: the next fn of the middleware and the task object swap positions

Author: murongg

packages/orap/examples/declarativeDemo/app.ts

@@ -43,7 +43,7 @@ export function startDemo(options: ListenOptions, storeConfig?: any) {
     .key(toKey)
     .prefix('ora-stack:orap:demo:TransferTask:', 'ora-stack:orap:demo:Done-TransferTask:')
     .ttl({ taskTtl: 120000, doneTtl: 60000 })
-    .use(CheckTransactionStatus)
+    .use(CheckTransactionStatus(options.wsProvider))
     .handle(handleTask)
     // add another task
     .another()

packages/orap/src/utils.ts

@@ -8,8 +8,8 @@ function checkIsTaskRaplized(task: any): task is TaskRaplized {
 export function getMiddlewareContext(...args: any[]) {
   if (args.length && Array.isArray(args[0])) {
     const newArgs = args[0]
-    const next = newArgs.at(-1) as NextFunction
-    const task = newArgs.at(-2) as TaskRaplized
+    const next = newArgs.at(-2) as NextFunction
+    const task = newArgs.at(-1) as TaskRaplized
     const isTaskRaplized = checkIsTaskRaplized(task)
 
     if (typeof next === 'function' && isTaskRaplized) {
@@ -20,8 +20,8 @@ export function getMiddlewareContext(...args: any[]) {
     }
   }
 
-  const next = args.at(-1) as NextFunction
-  const task = args.at(-2) as TaskRaplized
+  const next = args.at(-2) as NextFunction
+  const task = args.at(-1) as TaskRaplized
   const isTaskRaplized = checkIsTaskRaplized(task)
 
   if (typeof next !== 'function' || !isTaskRaplized)

packages/utils/src/common/fn.ts

@@ -7,9 +7,8 @@ export function composeFns<T>(...beforeNextArgs: Array<any>) {
         return Promise.resolve()
 
       const realArgs = childArgs.length ? childArgs : args
-
       const handle = handles[index]
-      return Promise.resolve(handle(...realArgs, ...beforeNextArgs, (...args: Array<any>) => dispatch(index + 1, ...args)))
+      return Promise.resolve(handle(...realArgs, (...args: Array<any>) => dispatch(index + 1, ...args), ...beforeNextArgs))
     }
 
     return dispatch(0, ...args)