check did

.idea/workspace.xml

@@ -5,6 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="f0cbce64-0ebc-4f60-8c2d-2fe9e214a8c0" name="Default" comment="">
+      <change type="DELETED" beforePath="$PROJECT_DIR$/src/serives/Queue.ts" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config.ts" afterPath="$PROJECT_DIR$/config.ts" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/upload.ts" afterPath="$PROJECT_DIR$/src/routes/upload.ts" />
     </list>
     <ignored path="mycard-console-backend.iws" />
@@ -65,8 +68,8 @@
       <file leaf-file-name="upload.ts" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="182" column="27" lean-forward="true" selection-start-line="182" selection-start-column="27" selection-end-line="182" selection-end-column="27" />
+            <state relative-caret-position="-584">
+              <caret line="161" column="15" lean-forward="true" selection-start-line="161" selection-start-column="15" selection-end-line="161" selection-end-column="15" />
               <folding>
                 <element signature="e#0#28#0" expanded="true" />
               </folding>
@@ -74,16 +77,6 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Queue.ts" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/serives/Queue.ts">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-51">
-              <caret line="11" column="3" lean-forward="true" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -168,11 +161,11 @@
         <option value="$PROJECT_DIR$/src/models/App.ts" />
         <option value="$PROJECT_DIR$/package/utils.ts" />
         <option value="$PROJECT_DIR$/aria2.conf" />
-        <option value="$PROJECT_DIR$/config.ts" />
         <option value="$PROJECT_DIR$/package/main.ts" />
         <option value="$PROJECT_DIR$/src/utils.ts" />
         <option value="$PROJECT_DIR$/src/serives/download.ts" />
         <option value="$PROJECT_DIR$/migrate.ts" />
+        <option value="$PROJECT_DIR$/config.ts" />
         <option value="$PROJECT_DIR$/src/routes/upload.ts" />
       </list>
     </option>
@@ -230,6 +223,20 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="moecube-console" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="moecube-console" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="src" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
         </subPane>
       </pane>
     </panes>
@@ -405,12 +412,12 @@
       <workItem from="1493198225466" duration="47067000" />
       <workItem from="1493371982129" duration="6000" />
       <workItem from="1493372010655" duration="3472000" />
-      <workItem from="1493692283332" duration="15219000" />
+      <workItem from="1493692283332" duration="16251000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="216990000" />
+    <option name="totallyTimeSpent" value="218022000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -423,7 +430,6 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="55" y="23" width="1377" height="872" extended-state="0" />
-    <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="DB Browser" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -433,7 +439,7 @@
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32975295" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.31794873" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TypeScript" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32820514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14011799" sideWeight="0.49384886" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14011799" sideWeight="0.49384886" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32846716" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23725356" sideWeight="0.50615114" order="2" side_tool="true" content_ui="tabs" />
@@ -762,14 +768,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="2" lean-forward="false" selection-start-line="6" selection-start-column="2" selection-end-line="6" selection-end-column="2" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="342">
@@ -838,10 +836,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/config.ts">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="108">
+          <caret line="6" column="53" lean-forward="true" selection-start-line="6" selection-start-column="53" selection-end-line="6" selection-end-column="53" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/upload.ts">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="182" column="27" lean-forward="true" selection-start-line="182" selection-start-column="27" selection-end-line="182" selection-end-column="27" />
+        <state relative-caret-position="-584">
+          <caret line="161" column="15" lean-forward="true" selection-start-line="161" selection-start-column="15" selection-end-line="161" selection-end-column="15" />
           <folding>
             <element signature="e#0#28#0" expanded="true" />
           </folding>

config.ts

@@ -7,7 +7,7 @@ export default {
   upload_path: path.join(__dirname, './test/upload'),
   download_path: path.join(__dirname, './test/release/downloads'),
   new_apps_json: `${baseUrl}/v2/apps`,
-  upload_url: `${testUrl}/v1/upload/packageUrl`,
+  upload_url: `${baseUrl}/v1/upload/packageUrl`,
   old_apps_json: 'https://api.moecube.com/apps.json',
   new_package: `${baseUrl}/v1/package/`,
   new_app: (appId) => `${baseUrl}/v1/app/${appId}`,

src/routes/upload.ts

@@ -152,18 +152,20 @@ const uploadPackageUrl = async (ctx: Context) => {
     ctx.throw(400, 'params error');
   }
   // testUrl: https://r.my-card.in/release/dist/0c16a3ecb115fd7cf575ccdd64f62a8f3edc635b087950e4ed4f3f781972bbfd.tar.gz
-  DownloadQueue.run(async (queue, _next) => {
-    let pack = await mongodb.Packages.findOne({_id: toObjectID(ctx.request.body._id)});
-    if (!pack) {
-      return ctx.throw(400, 'pack not exists');
-    }
+  let pack = await mongodb.Packages.findOne({_id: toObjectID(ctx.request.body._id)});
+  let _gid;
+  if (!pack) {
+    return ctx.throw(400, 'pack not exists');
+  }
 
-    downloader.onDownloadStart = async () => {
-      pack!.status = 'uploading';
-      await pack!.save();
-    };
+  downloader.onDownloadStart = async (gid) => {
+    _gid = gid;
+    pack!.status = 'uploading';
+    await pack!.save();
+  };
 
-    downloader.onDownloadComplete = async (m) => {
+  downloader.onDownloadComplete = async (m) => {
+    if (m.gid = _gid) {
       const {files} = await downloader.send('tellStatus', m.gid);
       const [file] = files;
 
@@ -184,23 +186,22 @@ const uploadPackageUrl = async (ctx: Context) => {
 
         // 上传完，干掉本地目录
         await fs.removeAsync(bundled.distPath);
-        _next();
       } catch (e) {
         console.trace(e);
         pack!.status = 'failed';
         await pack!.save();
-        _next();
       }
-    };
+    }
+  };
 
-    downloader.onDownloadError = async (err) => {
-      // console.log(await downloader.send('tellStatus', err.gid))
+  downloader.onDownloadError = async (err) => {
+    // console.log(await downloader.send('tellStatus', err.gid))
+    if (err.gid = _gid) {
       pack!.status = 'failed';
       await pack!.save();
       console.log(err);
-      _next();
-    };
-  });
+    }
+  };
 
   ctx.body = await new Promise((resolve, reject) => {
 

src/serives/Queue.ts

-
-export default class Queue {
-
-  running: number;
-  queue: Function[];
-  concurrency: number;
-
-  constructor() {
-    this.concurrency = 1;
-    this.running = 0;
-    this.queue = [];
-  }
-
-  set(args) {
-    return Object.assign(this, args);
-  }
-
-  run(task) {
-    this.queue.push(task);
-    this.next();
-    return this;
-  }
-
-  next() {
-    while (this.running < this.concurrency && this.queue.length) {
-      let task = this.queue.shift();
-      if (task) {
-        task(this, () => {
-          this.running--;
-          this.next();
-        });
-        this.running++;
-      }
-    }
-  }
-}