CI

.travis.yml

@@ -4,11 +4,12 @@ node_js: node
 os:
   - linux
   - osx
-sudo: required
 dist: trusty
+sudo: false
+group: beta
 
 env:
-  npm_config_target: 1.2.3
+  npm_config_target: 1.4.5
   npm_config_arch: x64
   npm_config_target_arch: x64
   npm_config_disturl: https://atom.io/download/atom-shell
@@ -30,13 +31,8 @@ cache:
   - $HOME/.cache
 
 install:
-- npm install electron-builder # force install next version to test electron-builder
 - npm install
 - npm prune
 
 script:
-- npm run release
-
-branches:
-  only:
-    - v3
\ No newline at end of file
+- npm run dist
\ No newline at end of file

appveyor.yml

@@ -34,20 +34,13 @@ init:
   - git config --global core.autocrlf input
 
 install:
-  - ps: Install-Product node # 6 $env:platform
-  #- git reset --hard HEAD
-  - npm install npm -g
-  - npm install electron-builder
+  - ps: Install-Product node
   - npm install
   - npm prune
 
 build_script:
-  - node --version
-  - npm --version
   - npm run dist
 
-test: off
-
 artifacts:
   - path: dist/MyCard Setup $(APPVEYOR_REPO_TAG_NAME).exe
   - path: dist/latest.yml

aria2.js

-"use strict";
-/**
- * Created by weijian on 2016/10/27.
- */
-const Rx = require("rxjs/Rx");
-const { ipcMain } = require('electron');
-const child_process_1 = require("child_process");
-// import * as Aria2 from "aria2";
-const Aria2 = require("aria2");
-let a = (createProcess("D:/Github/mycard/bin/aria2c.exe", ['--enable-rpc', '--rpc-allow-origin-all', "--continue", "--split=10", "--min-split-size=1M", "--max-connection-per-server=10"]));
-a.on('error', (error) => {
-    console.log(error);
-});
-// console.log(Aria2,2);
-function createProcess(aria2c_path, args = []) {
-    return child_process_1.spawn(aria2c_path, args);
-}
-let options = { 'host': 'localhost', 'port': 6800, 'secure': false };
-let aria2 = new Aria2(options);
-aria2.onDownloadComplete = (response) => {
-    console.log(response);
-};
-let open = aria2.open();
-function addUri(uri, path) {
-    return open.then(() => {
-        return aria2.addUri(uri, { 'dir': path });
-    });
-}
-function pause(gid) {
-    return aria2.pause(gid);
-}
-function reportStatus() {
-    aria2.tellActive();
-}
-//ipcMain.on()
-//# sourceMappingURL=aria2.js.map
\ No newline at end of file

aria2.js.map

-{"version":3,"file":"aria2.js","sourceRoot":"","sources":["aria2.ts"],"names":[],"mappings":";AAAA;;GAEG;AACH,MAAM,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAC9B,MAAM,EAAC,OAAO,EAAC,GAAE,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,gCAAkC,eAAe,CAAC,CAAA;AAClD,kCAAkC;AAClC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,iCAAiC,EAAE,CAAC,cAAc,EAAE,wBAAwB,EAAE,YAAY,EAAE,YAAY,EAAE,qBAAqB,EAAE,gCAAgC,CAAC,CAAC,CAAC,CAAA;AAC3L,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK;IAChB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AACH,wBAAwB;AACxB,uBAAuB,WAAmB,EAAE,IAAI,GAAa,EAAE;IAC3D,MAAM,CAAC,qBAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,IAAI,OAAO,GAAG,EAAC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAC,CAAA;AAClE,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAE/B,KAAK,CAAC,kBAAkB,GAAG,CAAC,QAAQ;IAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC,CAAC;AAEF,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;AACxB,gBAAgB,GAAa,EAAE,IAAY;IACvC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;AACP,CAAC;AACD,eAAe,GAAW;IACtB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;AAC3B,CAAC;AAED;IACI,KAAK,CAAC,UAAU,EAAE,CAAA;AACtB,CAAC;AAED,cAAc"}
\ No newline at end of file

aria2.ts

-/**
- * Created by weijian on 2016/10/27.
- */
-const Rx = require("rxjs/Rx");
-const {ipcMain}= require('electron');
-import {ChildProcess, spawn} from "child_process";
-// import * as Aria2 from "aria2";
-const Aria2 = require("aria2");
-
-let a = (createProcess("D:/Github/mycard/bin/aria2c.exe", ['--enable-rpc', '--rpc-allow-origin-all', "--continue", "--split=10", "--min-split-size=1M", "--max-connection-per-server=10"]))
-a.on('error', (error)=> {
-    console.log(error);
-});
-// console.log(Aria2,2);
-function createProcess(aria2c_path: string, args: string[] = []): ChildProcess {
-    return spawn(aria2c_path, args);
-}
-
-let options = {'host': 'localhost', 'port': 6800, 'secure': false}
-let aria2 = new Aria2(options);
-
-aria2.onDownloadComplete = (response)=> {
-    console.log(response);
-};
-
-let open = aria2.open();
-function addUri(uri: string[], path: string) {
-    return open.then(()=> {
-        return aria2.addUri(uri, {'dir': path});
-    });
-}
-function pause(gid: string): Promise<string> {
-    return aria2.pause(gid)
-}
-
-function reportStatus() {
-    aria2.tellActive()
-}
-
-//ipcMain.on()

index.js

 'use strict';
 
 const electron = require('electron');
-// Module to control application life.
+const autoUpdater = require("electron-auto-updater").autoUpdater;
+
+
+// autoUpdater.setFeedURL("https://wudizhanche.mycard.moe/publish");
+autoUpdater.on('error', (event)=>console.log('error', event));
+autoUpdater.on('checking-for-update', (event)=>console.log('checking-for-update', event));
+autoUpdater.on('update-available', (event)=>console.log('update-available', event));
+autoUpdater.on('update-not-available', (event)=>console.log('update-not-available', event));
+autoUpdater.checkForUpdates();
+
+let updateWindow;
+autoUpdater.on('update-downloaded', (event)=> {
+    updateWindow = new BrowserWindow({
+        width: 640,
+        height: 480,
+        // frame: process.platform == 'darwin',
+        // titleBarStyle: process.platform == 'darwin' ? 'hidden' : null
+    });
+
+    // and load the index.html of the app.
+    updateWindow.loadURL(`file://${__dirname}/update.html`);
+
+    // Open the DevTools.
+    // updateWindow.webContents.openDevTools();
+
+    // Emitted when the window is closed.
+    updateWindow.on('closed', function () {
+        // Dereference the window object, usually you would store windows
+        // in an array if your app supports multi windows, this is the time
+        // when you should delete the corresponding element.
+        updateWindow = null
+    })
+});
+
+
 const app = electron.app;
-// Module to create native browser window.
 const BrowserWindow = electron.BrowserWindow;
 
 const child_process = require('child_process');

npm-shrinkwrap.json

-{
-  "name": "mycard",
-  "version": "3.0.0-dev.4",
-  "dependencies": {
-    "@angular/common": {
-      "version": "2.1.2",
-      "from": "@angular/common@latest",
-      "resolved": "https://registry.npmjs.org/@angular/common/-/common-2.1.2.tgz"
-    },
-    "@angular/compiler": {
-      "version": "2.1.2",
-      "from": "@angular/compiler@latest",
-      "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-2.1.2.tgz"
-    },
-    "@angular/core": {
-      "version": "2.1.2",
-      "from": "@angular/core@latest",
-      "resolved": "https://registry.npmjs.org/@angular/core/-/core-2.1.2.tgz"
-    },
-    "@angular/forms": {
-      "version": "2.1.2",
-      "from": "@angular/forms@latest",
-      "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-2.1.2.tgz"
-    },
-    "@angular/http": {
-      "version": "2.1.2",
-      "from": "@angular/http@latest",
-      "resolved": "https://registry.npmjs.org/@angular/http/-/http-2.1.2.tgz"
-    },
-    "@angular/platform-browser": {
-      "version": "2.1.2",
-      "from": "@angular/platform-browser@latest",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-2.1.2.tgz"
-    },
-    "@angular/platform-browser-dynamic": {
-      "version": "2.1.2",
-      "from": "@angular/platform-browser-dynamic@latest",
-      "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-2.1.2.tgz"
-    },
-    "@angular/router": {
-      "version": "3.1.2",
-      "from": "@angular/router@latest",
-      "resolved": "https://registry.npmjs.org/@angular/router/-/router-3.1.2.tgz"
-    },
-    "@angular/router-deprecated": {
-      "version": "2.0.0-rc.2",
-      "from": "@angular/router-deprecated@latest",
-      "resolved": "https://registry.npmjs.org/@angular/router-deprecated/-/router-deprecated-2.0.0-rc.2.tgz"
-    },
-    "@angular/upgrade": {
-      "version": "2.1.2",
-      "from": "@angular/upgrade@latest",
-      "resolved": "https://registry.npmjs.org/@angular/upgrade/-/upgrade-2.1.2.tgz"
-    },
-    "angular2-in-memory-web-api": {
-      "version": "0.0.21",
-      "from": "angular2-in-memory-web-api@latest",
-      "resolved": "https://registry.npmjs.org/angular2-in-memory-web-api/-/angular2-in-memory-web-api-0.0.21.tgz"
-    },
-    "aria2": {
-      "version": "3.0.0",
-      "from": "aria2@latest",
-      "resolved": "https://registry.npmjs.org/aria2/-/aria2-3.0.0.tgz"
-    },
-    "bluebird": {
-      "version": "3.4.6",
-      "from": "bluebird@>=3.4.6 <4.0.0",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
-    },
-    "bootstrap": {
-      "version": "4.0.0-alpha.5",
-      "from": "bootstrap@next",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.5.tgz"
-    },
-    "commander": {
-      "version": "2.9.0",
-      "from": "commander@>=2.9.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
-    },
-    "core-js": {
-      "version": "2.4.1",
-      "from": "core-js@latest",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"
-    },
-    "electron-sudo": {
-      "version": "4.0.7",
-      "from": "electron-sudo@latest",
-      "resolved": "https://registry.npmjs.org/electron-sudo/-/electron-sudo-4.0.7.tgz"
-    },
-    "encoding": {
-      "version": "0.1.12",
-      "from": "encoding@>=0.1.11 <0.2.0",
-      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"
-    },
-    "font-awesome": {
-      "version": "4.7.0",
-      "from": "font-awesome@latest",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz"
-    },
-    "graceful-readlink": {
-      "version": "1.0.1",
-      "from": "graceful-readlink@>=1.0.0",
-      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
-    },
-    "iconv-lite": {
-      "version": "0.4.13",
-      "from": "iconv-lite@>=0.4.13 <0.5.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
-    },
-    "ini": {
-      "version": "1.3.4",
-      "from": "ini@latest",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "from": "is-stream@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"
-    },
-    "jquery": {
-      "version": "3.1.1",
-      "from": "jquery@>=1.9.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.1.1.tgz"
-    },
-    "minimist": {
-      "version": "0.0.8",
-      "from": "minimist@0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "from": "mkdirp@latest",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
-    },
-    "nan": {
-      "version": "2.3.5",
-      "from": "nan@>=2.3.0 <2.4.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"
-    },
-    "ng2-translate": {
-      "version": "3.1.3",
-      "from": "ng2-translate@latest",
-      "resolved": "https://registry.npmjs.org/ng2-translate/-/ng2-translate-3.1.3.tgz"
-    },
-    "node-fetch": {
-      "version": "1.6.3",
-      "from": "node-fetch@>=1.6.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz"
-    },
-    "options": {
-      "version": "0.0.6",
-      "from": "options@>=0.0.5",
-      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
-    },
-    "polygoat": {
-      "version": "1.1.4",
-      "from": "polygoat@>=1.1.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/polygoat/-/polygoat-1.1.4.tgz"
-    },
-    "raw-socket": {
-      "version": "1.5.0",
-      "from": "raw-socket@latest",
-      "resolved": "https://registry.npmjs.org/raw-socket/-/raw-socket-1.5.0.tgz"
-    },
-    "reflect-metadata": {
-      "version": "0.1.8",
-      "from": "reflect-metadata@latest",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.8.tgz"
-    },
-    "regenerator-runtime": {
-      "version": "0.9.5",
-      "from": "regenerator-runtime@latest",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz"
-    },
-    "rxjs": {
-      "version": "5.0.0-beta.12",
-      "from": "rxjs@5.0.0-beta.12",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.0.0-beta.12.tgz"
-    },
-    "symbol-observable": {
-      "version": "1.0.4",
-      "from": "symbol-observable@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz"
-    },
-    "systemjs": {
-      "version": "0.19.40",
-      "from": "systemjs@latest",
-      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.40.tgz"
-    },
-    "tether": {
-      "version": "1.3.7",
-      "from": "tether@latest",
-      "resolved": "https://registry.npmjs.org/tether/-/tether-1.3.7.tgz"
-    },
-    "ultron": {
-      "version": "1.0.2",
-      "from": "ultron@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
-    },
-    "when": {
-      "version": "3.7.7",
-      "from": "when@>=3.7.5 <4.0.0",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.7.7.tgz"
-    },
-    "ws": {
-      "version": "1.1.1",
-      "from": "ws@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"
-    },
-    "zone.js": {
-      "version": "0.6.26",
-      "from": "zone.js@latest",
-      "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.6.26.tgz"
-    }
-  }
-}

package.json

@@ -27,10 +27,11 @@
     "@angular/router-deprecated": "latest",
     "@angular/upgrade": "latest",
     "angular2-in-memory-web-api": "latest",
+    "electron-auto-updater": "latest",
     "aria2": "latest",
     "bootstrap": "next",
     "core-js": "latest",
-    "electron-sudo": "latest",
+    "electron-sudo": "github:mycard/electron-sudo",
     "font-awesome": "latest",
     "ini": "latest",
     "mkdirp": "latest",
@@ -75,9 +76,6 @@
         "nsis"
       ]
     },
-    "mac": {
-      "target": "dmg"
-    },
     "dmg": {
       "title": "MyCard",
       "contents": [
@@ -90,8 +88,7 @@
         {
           "x": 192,
           "y": 344,
-          "type": "file",
-          "path": "mycard.app"
+          "type": "file"
         }
       ]
     }

sort_apps.js

-let apps = require('./apps.json');
-
-let result = apps.map((app)=> {
-    console.error(app.id);
-    let result = {};
-    result.id = app.id;
-    result.name = app.name;
-    result.description = app.description;
-    let parent = apps.find(a=>app.id.startsWith(a.id + '-'));
-    if (parent) {
-        result.category = "module";
-        result.parent = parent.id;
-        result.tags = ["language"]
-    } else {
-        result.category = "game";
-        result.tags = app.tags
-    }
-    result.dependency = {
-        "win32": [],
-        "darwin": ['wine']
-    };
-    let references = apps.filter(a=>a.id.startsWith(app.id + '-')).map(a=>a.id);
-    result.references = {
-        "win32": references,
-        "darwin": references
-    };
-    result.author = app.author;
-    result.homepage = app.homepage;
-    result.locales = app.locales;
-    result.actions = app.actions;
-    result.version = app.version;
-    result.download = app.download;
-    result.news = app.news;
-
-    return result
-})
-    .sort((a, b)=>a.id < b.id ? -1 : 1);
-
-for (let app of result) {
-    console.error(app.id)
-}
-
-console.log(JSON.stringify(result));
\ No newline at end of file

update.html

+update
\ No newline at end of file