@leafer/task 1.0.0-beta → 1.0.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/task",
-  "version": "1.0.0-beta",
+  "version": "1.0.0-beta.11",
   "description": "@leafer/task",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -19,10 +19,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.0.0-beta",
-    "@leafer/debug": "1.0.0-beta"
+    "@leafer/math": "1.0.0-beta.11",
+    "@leafer/debug": "1.0.0-beta.11"
   },
   "devDependencies": {
-    "@leafer/interface": "1.0.0-beta"
+    "@leafer/interface": "1.0.0-beta.11"
   }
 }

package/src/TaskItem.ts

@@ -1,30 +1,35 @@
-import { IFunction } from '@leafer/interface'
+import { IFunction, ITaskItem } from '@leafer/interface'
 import { IncrementId } from '@leafer/math'
+import { Debug } from '@leafer/debug'
 
 import { TaskProcessor } from './TaskProcessor'
 
 
-export class TaskItem {
+const debug = Debug.get('TaskProcessor')
+export class TaskItem implements ITaskItem {
 
     readonly id: number
 
     public parent: TaskProcessor
 
-    public parallel: boolean
+    public parallel = true
+    public time = 1 // 预估任务需要运行的时间， 毫秒为单位
+
     public isComplete: boolean
+    public isCancel: boolean
 
     private task: IFunction
 
-    public taskTime = 1 // 预估任务需要运行的时间， 毫秒为单位
-
     constructor(task?: IFunction) {
         this.id = IncrementId.create(IncrementId.TASK)
         this.task = task
     }
 
     async run(): Promise<void> {
-        if (this.task && !this.isComplete && this.parent.running) {
-            await this.task()
+        try {
+            if (this.task && !this.isComplete && this.parent.running) await this.task()
+        } catch (error) {
+            debug.error(error)
         }
     }
 
@@ -34,4 +39,9 @@ export class TaskItem {
         this.task = null
     }
 
+    public cancel(): void {
+        this.isCancel = true
+        this.complete()
+    }
+
 }

package/src/TaskProcessor.ts

@@ -1,106 +1,119 @@
-import { IFunction } from '@leafer/interface'
-import { Debug } from '@leafer/debug'
+import { IFunction, ITaskProcessor, ITaskProcessorConfig, ITaskOptions, ITaskItem } from '@leafer/interface'
+import { DataHelper } from '@leafer/data'
 
 import { TaskItem } from './TaskItem'
 
 
-const debug = Debug.get('TaskProcessor')
+export class TaskProcessor implements ITaskProcessor {
 
+    public config: ITaskProcessorConfig = { parallel: 6 }
 
-export interface ITaskProcessorParams {
-    onComplete?: IFunction
-    onTask?: IFunction
-    onError?: IFunction
-    parallel?: number
-}
+    protected list: ITaskItem[] = []
 
+    protected parallelList: ITaskItem[]
+    protected parallelSuccessNumber: number
 
-export class TaskProcessor {
+    public running = false
+    public isComplete = true
 
-    private parallel = 6
-    private params: ITaskProcessorParams = {}
+    protected timer: any
 
-    // 需要初始化的动态数据
-    private list: Array<TaskItem> = []
-    private index = 0
+    public get total(): number {
+        return this.list.length
+    }
 
-    private parallelList: Array<TaskItem>
-    private parallelSuccessNumber: number
+    public index = 0
 
-    private _isComplete: boolean
-    public get isComplete(): boolean {
-        return this._isComplete
+    public get finishedIndex(): number {
+        return this.isComplete ? 0 : this.index + this.parallelSuccessNumber
     }
 
-    private _running: boolean
-    public get running(): boolean {
-        return this._running
+    public get remain(): number {
+        return this.isComplete ? this.total : this.total - this.finishedIndex
     }
 
-    constructor(params?: ITaskProcessorParams) {
-        if (params) {
-            this.params = params
-            if (params.parallel) this.parallel = params.parallel
-        }
-        this.init()
-    }
+    public get percent(): number {
+        const { total } = this
+        let totalTime = 0, runTime = 0
 
-    get percent(): number {
-        const len = this.list.length
-        let totalTime = 0
-        let runTime = 0
-        for (let i = 0; i < len; i++) {
-            if (i <= this.index) {
-                runTime += this.list[i].taskTime
-                if (i === this.index) totalTime = runTime
+        for (let i = 0; i < total; i++) {
+            if (i <= this.finishedIndex) {
+                runTime += this.list[i].time
+                if (i === this.finishedIndex) totalTime = runTime
             } else {
-                totalTime += this.list[i].taskTime
+                totalTime += this.list[i].time
             }
         }
 
-        let percent = this._isComplete ? 1 : (runTime / totalTime)
-        if (Number.isNaN(percent)) percent = 0
-        return percent
-
+        return this.isComplete ? 1 : (runTime / totalTime)
     }
 
-    get total(): number {
-        return this.list.length
+
+    constructor(config?: ITaskProcessorConfig) {
+        if (config) DataHelper.assign(this.config, config)
+        this.empty()
     }
 
-    get runIndex(): number {
-        return this.index
+    // list
+
+    public add(taskCallback: IFunction, options?: ITaskOptions | number): ITaskItem {
+        let start: boolean, parallel: boolean, time: number, delay: number
+
+        const task = new TaskItem(taskCallback)
+        task.parent = this
+
+        if (typeof options === 'number') {
+            delay = options
+        } else if (options) {
+            parallel = options.parallel
+            start = options.start
+            time = options.time
+            delay = options.delay
+        }
+
+        if (time) task.time = time
+        if (parallel === false) task.parallel = false
+        if (delay === undefined) {
+            this.push(task, start)
+        } else {
+            setTimeout(() => this.push(task, start), delay)
+        }
+
+        return task
     }
 
-    protected init(): void {
-        this.empty()
-        this.index = 0
-        this.parallelSuccessNumber = 0
-        this._running = false
-        this._isComplete = false
+    protected push(task: ITaskItem, start?: boolean): void {
+        this.list.push(task)
+        if (start !== false && !this.timer) {
+            this.timer = setTimeout(() => this.start())
+        }
     }
 
     protected empty(): void {
+        this.index = 0
+        this.parallelSuccessNumber = 0
         this.list = []
         this.parallelList = []
     }
 
-
+    // control
 
     public start(): void {
-        this._running = true
-        this._isComplete = false
-        this.run()
+        if (!this.running) {
+            this.running = true
+            this.isComplete = false
+            this.run()
+        }
     }
 
     public pause(): void {
-        this._running = false
+        clearTimeout(this.timer)
+        this.timer = null
+        this.running = false
     }
 
     public resume(): void {
-        this._running = true
-        this._isComplete = false
-        this.run()
+        this.start()
     }
 
     public skip(): void {
@@ -109,49 +122,26 @@ export class TaskProcessor {
     }
 
     public stop(): void {
-        this._running = false
-        this.list.forEach(item => {
-            item.complete()
-        })
+        this.isComplete = true
+        this.list.forEach(task => { if (!task.isComplete) task.cancel() })
+        this.pause()
         this.empty()
     }
 
+    // run 
 
-
-    public add(taskCallback: IFunction, taskTime?: number): void {
-        this.push(new TaskItem(taskCallback), taskTime)
-    }
-
-    public addParallel(taskCallback: IFunction, taskTime?: number): void {
-        const task = new TaskItem(taskCallback)
-        task.parallel = true
-        this.push(task, taskTime)
-    }
-
-    public addEmpty(callback?: IFunction): void {
-        this.push(new TaskItem(callback))
-    }
-
-
-
-    private push(task: TaskItem, taskTime?: number): void {
-        if (taskTime) task.taskTime = taskTime
-        task.parent = this
-        this.list.push(task)
-    }
-
-    private run(): void {
-        if (!this._running) return
+    protected run(): void {
+        if (!this.running) return
 
         this.setParallelList()
 
         if (this.parallelList.length > 1) {
 
-            this.runParallelTask()
+            this.runParallelTasks()
 
         } else {
 
-            this.runTask()
+            this.remain ? this.runTask() : this.onComplete()
 
         }
     }
@@ -170,24 +160,35 @@ export class TaskProcessor {
         })
     }
 
-    protected runParallelTask(): void {
-        this.parallelList.forEach(task => {
-            task.run().then(() => {
+    protected runParallelTasks(): void {
+        this.parallelList.forEach(task => this.runParallelTask(task))
+    }
+
+    protected runParallelTask(task: ITaskItem): void {
+        task.run().then(() => {
 
-                this.onTask(task)
-                this.fillParallelTask()
-            }).catch(error => {
-                this.onParallelError(error)
-            })
+            this.onTask(task)
+            this.fillParallelTask()
+
+        }).catch(error => {
+            this.onParallelError(error)
         })
     }
 
+    private nextTask(): void {
+        if (this.total === this.finishedIndex) {
+            this.onComplete()
+        } else {
+            this.timer = setTimeout(() => this.run())
+        }
+    }
+
     protected setParallelList(): void {
-        let task: TaskItem
+        let task: ITaskItem
 
         this.parallelList = []
         this.parallelSuccessNumber = 0
-        let end = this.index + this.parallel
+        let end = this.index + this.config.parallel
 
         if (end > this.list.length) end = this.list.length
 
@@ -203,8 +204,7 @@ export class TaskProcessor {
 
 
     protected fillParallelTask(): void {
-
-        let task: TaskItem
+        let task: ITaskItem
         const parallelList = this.parallelList
 
         // 完成一个任务
@@ -213,60 +213,45 @@ export class TaskProcessor {
 
         // 找到下一个可以并行的任务
         const parallelWaitNumber = parallelList.length
-        const nextIndex = this.index + this.parallelSuccessNumber + parallelWaitNumber
+        const nextIndex = this.finishedIndex + parallelWaitNumber
 
         if (parallelList.length) {
 
-            if (!this._running) return
+            if (!this.running) return
 
-            if (nextIndex < this.list.length) {
+            if (nextIndex < this.total) {
 
                 task = this.list[nextIndex]
 
                 if (task.parallel) {
-
                     parallelList.push(task)
-
-                    task.run().then(() => {
-
-                        this.onTask(task)
-                        this.fillParallelTask()
-                    }).catch(error => {
-                        this.onParallelError(error)
-                    })
-
+                    this.runParallelTask(task)
                 }
+
             }
 
         } else {
 
             this.index += this.parallelSuccessNumber
+            this.parallelSuccessNumber = 0
             this.nextTask()
 
         }
     }
 
-    private nextTask(): void {
-        setTimeout(() => {
-            this.run()
-        }, 0)
-    }
+    // event
 
-    private onComplete(): void {
+    protected onComplete(): void {
         this.stop()
-        this._isComplete = true
-        if (this.params.onComplete) this.params.onComplete()
+        if (this.config.onComplete) this.config.onComplete()
     }
 
-    private onTask(task: TaskItem): void {
+    protected onTask(task: ITaskItem): void {
         task.complete()
-        if (this.params.onTask) this.params.onTask()
-        if (this.index === this.list.length - 1) this.onComplete()
+        if (this.config.onTask) this.config.onTask()
     }
 
-    private onParallelError(error: unknown): void {
-        debug.error('ParallelError')
-
+    protected onParallelError(error: unknown): void {
         // 并行变串行, 以便下次重试
         this.parallelList.forEach(task => {
             task.parallel = false
@@ -277,8 +262,13 @@ export class TaskProcessor {
         this.onError(error)
     }
 
-    private onError(error: unknown): void {
+    protected onError(error: unknown): void {
         this.pause()
-        if (this.params.onError) this.params.onError(error)
+        if (this.config.onError) this.config.onError(error)
+    }
+
+    public destroy(): void {
+        this.empty()
+        this.config = {}
     }
 }