[APD-chore] graceful shutdown for account setup

appodeal · Aug 7, 2019 · a92b582 · a92b582
1 parent a6dde89
commit a92b582
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 18 deletions.
diff --git a/src/core/accounts-connector.ts b/src/core/accounts-connector.ts
@@ -104,9 +104,9 @@ export class AccountsConnector extends Connector {
     }
 
     async destroy (): Promise<void> {
-        await super.destroy();
         for (let setup of this.setups.values()) {
             await setup.stop();
         }
+        await super.destroy();
     }
 }
diff --git a/src/core/admob-api/account-setup.helper.ts b/src/core/admob-api/account-setup.helper.ts
@@ -68,9 +68,12 @@ export class AccountSetup extends EventEmitter {
                     }
                 })
                 .catch(err => {
+                    console.error('AccountSetup: runTasks error', err);
                     if (this.runner.state !== TaskRunnerState.cancelled) {
                         this.emit('error', err);
                         Sentry.captureException(err);
+                    } else {
+                        console.error('AccountSetup: is Canceled');
                     }
                 })
                 .finally(() => {

diff --git a/src/lib/task-runner.ts b/src/lib/task-runner.ts
@@ -65,18 +65,45 @@ export class TaskRunner extends EventEmitter {
         });
     }
 
+    cancelableJob<T> (jobFn: () => Promise<T>): Promise<T> {
+        return new Promise(((resolve, reject) => {
+            let jobFullFiled = false;
+            let timerID;
+
+            const done = (cb: Function) => v => {
+                clearTimeout(timerID);
+                jobFullFiled = true;
+                cb(v);
+            };
+
+            jobFn().then(done(resolve), done(reject));
+            const check = () => {
+                if (jobFullFiled) {
+                    return;
+                }
+                if (this.state === TaskRunnerState.cancelled) {
+                    console.log(`Execution terminated. Stop waiting task execution`);
+                    return reject(new Error('Canceled'));
+                }
+                timerID = setTimeout(check, 100);
+            };
+            check();
+        }));
+    }
+
     private exec () {
         return new Promise(async (resolve, reject) => {
 
             const runNext = () => {
                 if (this.state === TaskRunnerState.cancelled) {
+                    console.log(`Execution terminated`);
                     return reject(new Error('Canceled'));
                 }
                 const activeTask = this.tasks[this.activeTaskNum];
                 let taskArgs = this.taskArgs || [];
                 this.taskArgs = null;
                 console.log(`Execute task: ${activeTask['func'].toString()}`);
-                return activeTask.execute(...taskArgs)
+                return this.cancelableJob(() => activeTask.execute(...taskArgs))
                     .then(() => {
                         if (!this.hasSkip() && !this.hasReturn()) {
                             this.activeTaskNum++;

diff --git a/src/main.ts b/src/main.ts
@@ -170,22 +170,23 @@ function runApp () {
                 .then(() => store.updateUserWhenOnline());
         });
 
-
-        const cleanUpOnExit = () => Promise.all([
-            closeAllWindows(),
-            trayIcon.destroy(),
-            tray.destroy(),
-            onlineConnector.destroy(),
-            accountsConnector.destroy(),
-            aboutConnector.destroy(),
-            syncConnector.destroy(),
-            logsConnector.destroy(),
-            syncService.destroy(),
-            updatesConnector.destroy(),
-            onlineService.destroy(),
-            syncScheduler.destroy(),
-            deleteDataConnector.destroy()
-        ]);
+        const cleanUpOnExit = async () => {
+            await accountsConnector.destroy().catch(console.error);
+            return Promise.all([
+                syncService.destroy(),
+                closeAllWindows(),
+                trayIcon.destroy(),
+                tray.destroy(),
+                onlineConnector.destroy(),
+                aboutConnector.destroy(),
+                syncConnector.destroy(),
+                logsConnector.destroy(),
+                updatesConnector.destroy(),
+                onlineService.destroy(),
+                syncScheduler.destroy(),
+                deleteDataConnector.destroy()
+            ]);
+        };
 
         onlineService.on('statusChange', isOnline => {
             console.warn('online', isOnline);