From b3d01173c1def7f32bc9bfb8433d2aa49f93ee6c Mon Sep 17 00:00:00 2001
From: anatas <luolongjuna@gmail.com>
Date: Fri, 12 Apr 2019 12:08:07 +0800
Subject: [PATCH] fix bug of application exit

---
 .idea/workspace.xml | 134 ++++++++++++++------------------------------
 main.js             |  43 +++++++++-----
 main.js.map         |   2 +-
 main.ts             |  46 ++++++++++-----
 package.json        |   2 +-
 5 files changed, 105 insertions(+), 122 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f5c1e4e..797853d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,10 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="2a27c0ce-fe61-45a2-8044-562a85d08921" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README_zh.md" beforeDir="false" afterPath="$PROJECT_DIR$/README_zh.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/backend/engine/engineTorrent.go" beforeDir="false" afterPath="$PROJECT_DIR$/backend/engine/engineTorrent.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.js" beforeDir="false" afterPath="$PROJECT_DIR$/main.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.js.map" beforeDir="false" afterPath="$PROJECT_DIR$/main.js.map" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/main.ts" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/package.json" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -31,71 +30,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/package.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-847">
+            <state relative-caret-position="252">
               <caret line="36" column="57" selection-start-line="36" selection-start-column="57" selection-end-line="36" selection-end-column="57" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="210">
-              <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/backend/engine/engineTorrent.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7000">
-              <caret line="200" column="29" selection-start-line="200" selection-start-column="29" selection-end-line="200" selection-end-column="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/backend/engine/info.go">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4655">
-              <caret line="133" column="30" selection-start-line="133" selection-start-column="30" selection-end-line="133" selection-end-column="30" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="1225">
-                <caret line="35" column="49" selection-start-line="35" selection-start-column="49" selection-end-line="35" selection-end-column="49" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/README_zh.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="1225">
-                <caret line="35" selection-start-line="35" selection-end-line="35" selection-end-column="49" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/main.ts">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1855">
-              <caret line="58" column="39" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
+            <state relative-caret-position="109">
+              <caret line="133" column="1" selection-start-line="133" selection-start-column="1" selection-end-line="133" selection-end-column="1" />
               <folding>
                 <element signature="e#0#88#0" expanded="true" />
               </folding>
@@ -116,8 +64,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>getBaseHost</find>
-      <find>TorrentLogs</find>
       <find>Num</find>
       <find>torrentDownload</find>
       <find>globalReflesh</find>
@@ -146,6 +92,8 @@
       <find>buttons</find>
       <find>comple</find>
       <find>process</find>
+      <find>serve</find>
+      <find>sys</find>
     </findStrings>
     <replaceStrings>
       <replace>TorrentLog</replace>
@@ -211,20 +159,20 @@
         <option value="$PROJECT_DIR$/src/app/components/local-download/local-download.component.html" />
         <option value="$PROJECT_DIR$/src/app/components/local-download/local-download.component.ts" />
         <option value="$PROJECT_DIR$/backend/engine/engine.go" />
-        <option value="$PROJECT_DIR$/main.ts" />
         <option value="$PROJECT_DIR$/backend/engine/engineTorrent.go" />
         <option value="$PROJECT_DIR$/README_zh.md" />
         <option value="$PROJECT_DIR$/README.md" />
-        <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/.gitignore" />
+        <option value="$PROJECT_DIR$/main.ts" />
+        <option value="$PROJECT_DIR$/package.json" />
       </list>
     </option>
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="601" />
-    <option name="y" value="516" />
-    <option name="width" value="1272" />
-    <option name="height" value="686" />
+    <option name="x" value="734" />
+    <option name="y" value="372" />
+    <option name="width" value="1923" />
+    <option name="height" value="1328" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -234,6 +182,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -245,7 +194,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -259,7 +207,7 @@
     <property name="go.gopath.indexing.explicitly.defined" value="true" />
     <property name="go.sdk.automatically.set" value="true" />
     <property name="go.vendoring.notification.had.been.shown" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../torrent" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.tslint" value="project" />
     <property name="node.js.selected.package.tslint" value="$PROJECT_DIR$/node_modules/tslint" />
@@ -384,11 +332,13 @@
       <workItem from="1554973355686" duration="155000" />
       <workItem from="1554973549199" duration="21000" />
       <workItem from="1554973600850" duration="116000" />
+      <workItem from="1554976056655" duration="39000" />
+      <workItem from="1555040458398" duration="1612000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="128962000" />
+    <option name="totallyTimeSpent" value="130613000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -400,10 +350,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="601" y="516" width="1272" height="686" extended-state="0" />
+    <frame x="734" y="372" width="1923" height="1328" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.30378726" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.19947368" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info id="npm" order="3" side_tool="true" />
@@ -418,7 +368,7 @@
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" weight="0.3296582" />
       <window_info anchor="bottom" id="Terminal" order="10" weight="0.32792208" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5009346" side_tool="true" visible="true" weight="0.28333333" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5009346" side_tool="true" visible="true" weight="0.12984823" />
       <window_info anchor="bottom" id="TypeScript" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -480,13 +430,6 @@
     <proxy>http://127.0.0.1:7777/</proxy>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/app/providers/messages.service.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="327">
-          <caret line="22" selection-start-line="22" selection-end-line="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/app/components/messages/messages.component.html">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -770,13 +713,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-847">
-          <caret line="36" column="57" selection-start-line="36" selection-start-column="57" selection-end-line="36" selection-end-column="57" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/backend/engine/engineTorrent.go">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="7000">
@@ -811,20 +747,34 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="630">
+          <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/node_modules/_@types_node@8.9.4@@types/node/index.d.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="232">
+          <caret line="2006" column="8" selection-start-line="2006" selection-start-column="8" selection-end-line="2006" selection-end-column="8" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/main.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1855">
-          <caret line="58" column="39" selection-start-line="58" selection-start-column="39" selection-end-line="58" selection-end-column="39" />
+        <state relative-caret-position="109">
+          <caret line="133" column="1" selection-start-line="133" selection-start-column="1" selection-end-line="133" selection-end-column="1" />
           <folding>
             <element signature="e#0#88#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="210">
-          <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
+        <state relative-caret-position="252">
+          <caret line="36" column="57" selection-start-line="36" selection-start-column="57" selection-end-line="36" selection-end-column="57" />
         </state>
       </provider>
     </entry>
diff --git a/main.js b/main.js
index 4e24c85..f9f72ab 100644
--- a/main.js
+++ b/main.js
@@ -13,7 +13,8 @@ serve = args.some(function (val) { return val === '--serve'; });
 var aimVersion = electron_1.app.getVersion();
 var gotTheLock = electron_1.app.requestSingleInstanceLock();
 var tray = null;
-var torrentEngine;
+var torrentEngine = null;
+var processExit = false;
 if (gotTheLock) {
     try {
         // run torrent engine
@@ -32,7 +33,7 @@ if (gotTheLock) {
             // On OS X it is common for applications and their menu bar
             // to stay active until the user quits explicitly with Cmd + Q
             if (process.platform !== 'darwin') {
-                electron_1.app.quit();
+                exitApp();
             }
         });
         electron_1.app.on('activate', function () {
@@ -51,10 +52,8 @@ if (gotTheLock) {
         });
         // handle system restart or shutdown
         process.on('exit', function () {
-            console.log('system restart');
-            if (!serve && !torrentEngine.killed) {
-                torrentEngine.kill();
-            }
+            console.log('process exit');
+            exitApp();
         });
     }
     catch (e) {
@@ -67,6 +66,27 @@ else {
     console.log('Only one instance can run');
     electron_1.app.quit();
 }
+function exitApp() {
+    if (processExit === false) {
+        processExit = true;
+    }
+    else {
+        return;
+    }
+    console.log('Close everything left');
+    if (win !== null) {
+        win.destroy();
+    }
+    if (torrentEngine !== null) {
+        torrentEngine.kill();
+    }
+    if (tray !== null) {
+        tray.destroy();
+    }
+    if (electron_1.app !== null) {
+        electron_1.app.quit();
+    }
+}
 function runEngine() {
     console.log('Engine running');
     var userData = electron_1.app.getPath('userData');
@@ -87,7 +107,7 @@ function runEngine() {
         copyFile(electron_1.app.getAppPath() + '/torrent' + '/config.toml', userData + '/config.toml');
     }
     fs.chmodSync(userData + cmdPath, '0555');
-    torrentEngine = child_process_1.exec(userData + cmdPath, { cwd: userData }, function (error, stdout, stderr) {
+    torrentEngine = child_process_1.execFile(userData + cmdPath, { cwd: userData }, function (error, stdout, stderr) {
         if (error) {
             console.error("Exec Failed: " + error);
             return;
@@ -103,7 +123,7 @@ function runEngine() {
     });
     torrentEngine.on('close', function (code) {
         console.log('out code：' + code);
-        electron_1.app.quit();
+        exitApp();
     });
 }
 function createTray() {
@@ -123,8 +143,7 @@ function createTray() {
         },
         {
             label: 'Quit', click: function () {
-                win.destroy();
-                electron_1.app.quit();
+                exitApp();
             }
         },
     ]);
@@ -174,9 +193,7 @@ function createWindow() {
     });
     win.on('closed', function (evt) {
         console.log('App quit now');
-        if (!serve && !torrentEngine.killed) {
-            torrentEngine.kill();
-        }
+        exitApp();
     });
     win.webContents.session.on('will-download', function (event, item, webContents) {
         var filePath = electron_1.app.getPath('downloads') + '/' + item.getFilename();
diff --git a/main.js.map b/main.js.map
index a1ac31a..8c2a4bf 100644
--- a/main.js.map
+++ b/main.js.map
@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"main.js","sourceRoot":"","sources":["main.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/main.ts b/main.ts
index 93e64b7..65d94f2 100644
--- a/main.ts
+++ b/main.ts
@@ -3,7 +3,7 @@ import * as path from 'path';
 import * as url from 'url';
 import * as fs from 'fs';
 import * as os from 'os';
-import { exec, ChildProcess } from 'child_process';
+import { execFile, ChildProcess } from 'child_process';
 
 require('update-electron-app')();
 
@@ -14,8 +14,9 @@ serve = args.some(val => val === '--serve');
 const aimVersion = app.getVersion();
 const gotTheLock = app.requestSingleInstanceLock();
 
-let tray = null;
-let torrentEngine: ChildProcess;
+let tray: Tray = null;
+let torrentEngine: ChildProcess = null;
+let processExit: Boolean = false;
 
 if (gotTheLock) {
     try {
@@ -35,7 +36,7 @@ if (gotTheLock) {
             // On OS X it is common for applications and their menu bar
             // to stay active until the user quits explicitly with Cmd + Q
             if (process.platform !== 'darwin') {
-                app.quit();
+                exitApp();
             }
         });
 
@@ -57,10 +58,8 @@ if (gotTheLock) {
 
         // handle system restart or shutdown
         process.on('exit', function() {
-            console.log('system restart');
-            if (!serve && !torrentEngine.killed) {
-                torrentEngine.kill();
-            }
+            console.log('process exit');
+            exitApp();
         });
 
     } catch (e) {
@@ -73,6 +72,26 @@ if (gotTheLock) {
     app.quit();
 }
 
+function exitApp() {
+    if (processExit === false) {
+        processExit = true;
+    } else {
+        return;
+    }
+    console.log('Close everything left');
+    if (win !== null) {
+        win.destroy();
+    }
+    if (torrentEngine !== null) {
+        torrentEngine.kill();
+    }
+    if (tray !== null) {
+        tray.destroy();
+    }
+    if (app !== null) {
+        app.quit();
+    }
+}
 function runEngine() {
     console.log('Engine running');
     const userData = app.getPath('userData');
@@ -94,7 +113,7 @@ function runEngine() {
     }
     fs.chmodSync(userData + cmdPath, '0555');
 
-    torrentEngine = exec(userData + cmdPath, {cwd: userData}, (error, stdout, stderr) => {
+    torrentEngine = execFile(userData + cmdPath, {cwd: userData}, (error, stdout, stderr) => {
         if (error) {
             console.error(`Exec Failed: ${error}`);
             return;
@@ -110,7 +129,7 @@ function runEngine() {
     });
     torrentEngine.on('close', function (code) {
         console.log('out code：' + code);
-        app.quit();
+        exitApp();
     });
 }
 
@@ -131,8 +150,7 @@ function createTray() {
         },
         {
             label: 'Quit', click: () => {
-                win.destroy();
-                app.quit();
+                exitApp();
             }
         },
     ]);
@@ -190,9 +208,7 @@ function createWindow() {
 
     win.on('closed', (evt) => {
         console.log('App quit now');
-        if (!serve && !torrentEngine.killed) {
-            torrentEngine.kill();
-        }
+        exitApp();
     });
 
     win.webContents.session.on('will-download', (event, item, webContents) => {
diff --git a/package.json b/package.json
index 4fd4095..771de75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-downloader",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "",
   "homepage": "https://github.com/anatasluo/ant",
   "repository": {