Merge pull request #19 from LINCnil/develop

Develop

.gitignore

@@ -1,3 +1,5 @@
-node_modules
-release-builds
-dist
+node_modules/
+dist/
+releases/
+private/
+*.log

main.js

@@ -1,9 +1,9 @@
 const electron = require('electron')
 // Module to control application life.
-const app = electron.app
-const globalShortcut = electron.globalShortcut
-// Module to create native browser window.
-const BrowserWindow = electron.BrowserWindow
+const { app, BrowserWindow } = electron
+const updater = require('./updater')
+// Keep window state
+const windowStateKeeper = require('electron-window-state')
 
 const path = require('path')
 const url = require('url')
@@ -12,18 +12,105 @@ const url = require('url')
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow
 
-function createWindow () {
+const template = [
+  {
+    label: 'Edit',
+    submenu: [
+      {role: 'undo'},
+      {role: 'redo'},
+      {type: 'separator'},
+      {role: 'cut'},
+      {role: 'copy'},
+      {role: 'paste'},
+      {role: 'pasteandmatchstyle'},
+      {role: 'delete'},
+      {role: 'selectall'}
+    ]
+  },
+  {
+    label: 'View',
+    submenu: [
+      {role: 'resetzoom'},
+      {role: 'zoomin'},
+      {role: 'zoomout'},
+      {type: 'separator'},
+      {role: 'togglefullscreen'}
+    ]
+  },
+  {
+    role: 'window',
+    submenu: [
+      {role: 'minimize'},
+      {role: 'close'}
+    ]
+  }
+]
+
+if (process.platform === 'darwin') {
+  template.unshift({
+    label: 'PIA',
+    submenu: [
+      {role: 'hide'},
+      {role: 'hideothers'},
+      {role: 'unhide'},
+      {type: 'separator'},
+      {role: 'quit'}
+    ]
+  })
+
+  // Edit menu
+  template[1].submenu.push(
+    {type: 'separator'},
+    {
+      label: 'Speech',
+      submenu: [
+        {role: 'startspeaking'},
+        {role: 'stopspeaking'}
+      ]
+    }
+  )
+
+  // Window menu
+  template[3].submenu = [
+    {role: 'close'},
+    {role: 'minimize'},
+    {role: 'zoom'},
+    {type: 'separator'},
+    {role: 'front'}
+  ]
+}
+
+const menu = electron.Menu.buildFromTemplate(template)
+
+
+
+function createWindow() {
+  let winState = windowStateKeeper({
+    defaultWidth: 900,
+    defaultHeight: 600
+  })
+
+  electron.Menu.setApplicationMenu(menu)
+
   // Create the browser window.
   mainWindow = new BrowserWindow({
+    width: winState.width,
+    height: winState.height,
+    x: winState.x,
+    y: winState.y,
+    minWidth: 900,
+    minHeight: 600,
     alwaysOnTop: false,
     fullscreen: false,
     kiosk: false,
-    icon: path.join(__dirname, 'icons/default/icon.png'),
+    icon: `$(__dirname)/icons/64x64.png`,
     webPreferences: {
       nodeIntegration: false, plugins: true
     }
   })
 
+  winState.manage(mainWindow)
+
   // and load the index.html of the app.
   mainWindow.loadURL(url.format({
     pathname: path.join(__dirname, 'dist', 'index.html'),
@@ -46,6 +133,8 @@ function createWindow () {
     e.preventDefault();
     require('electron').shell.openExternal(url);
   });
+
+  setTimeout(updater.check, 2000);
 }
 
 // This method will be called when Electron has finished

package.json

@@ -1,19 +1,50 @@
 {
   "name": "PIA",
-  "version": "0.0.5",
+  "version": "1.5.0",
   "description": "Version Portable Outil PIA",
   "main": "main.js",
   "scripts": {
-    "start": "./node_modules/.bin/electron .",
-    "package-mac":   "electron-packager . --electron-version=1.7.9 --overwrite --prune=true --asar=true --platform=darwin --arch=x64 --icon=icons/mac/icon.icns --out=release-builds",
-    "package-win32": "electron-packager . --electron-version=1.7.9 --overwrite --prune=true --asar=true --platform=win32 --arch=ia32 --icon=icons/win/icon.ico --out=release-builds",
-    "package-win":   "electron-packager . --electron-version=1.7.9 --overwrite --prune=true --asar=true --platform=win32 --arch=x64 --icon=icons/win/icon.ico --out=release-builds",
-    "package-linux": "electron-packager . --electron-version=1.7.9 --overwrite --prune=true --asar=true --platform=linux --arch=x64 --out=release-builds"
+    "start": "electron .",
+    "mac": "electron-builder -m",
+    "win": "electron-builder -w --x64 --ia32",
+    "linux": "electron-builder -l",
+    "win-cert": "electron-builder create-self-signed-cert -p atnos",
+    "publish-to-github": "electron-builder build -mwl --x64 --ia32 -p onTagOrDraft"
   },
+  "author": "ATNOS",
   "repository": "https://github.com/LINCnil/pia-app",
   "keywords": [
     "Electron",
     "PIA"
   ],
-  "author": "ATNOS"
+  "build": {
+    "appId": "com.atnos.pia",
+    "directories": {
+      "buildResources": ".",
+      "output": "releases"
+    },
+    "mac": {
+      "publish": ["github"],
+      "category": "public.app.category.productivity"
+    },
+    "win": {
+      "publish": ["github"],
+      "certificateFile": "private/atnos.pfx",
+      "verifyUpdateCodeSignature": false,
+      "publisherName": "ATNOS"
+    },
+    "linux": {
+      "publish": ["github"],
+      "category": "Network"
+    }
+  },
+  "devDependencies": {
+    "electron": "~1.7.10",
+    "electron-builder": "^19.54.0"
+  },
+  "dependencies": {
+    "electron-window-state": "^4.1.1",
+    "electron-log": "^2.2.14",
+    "electron-updater": "^2.19.1"
+  }
 }

renderer/progress.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Downloading PIA Update</title>
+  </head>
+  <body>
+    <progress style="width:100%;" value="0" max="100"></progress>
+    <script>
+      const {ipcRenderer} = require('electron')
+      setInterval(() => {
+        let progress = ipcRenderer.sendSync('download-progress-request')
+        document.querySelector('progress').value = progress
+      }, 1000)
+    </script>
+  </body>
+</html>

updater.js

@@ -0,0 +1,72 @@
+const {dialog, BrowserWindow, ipcMain} = require('electron')
+const {autoUpdater} = require('electron-updater')
+
+const path = require('path')
+const url = require('url')
+
+autoUpdater.logger = require('electron-log')
+autoUpdater.logger.transports.file.level = 'info'
+
+autoUpdater.autoDownload = false
+
+exports.check = () => {
+  autoUpdater.checkForUpdates()
+
+  autoUpdater.on('update-available', () => {
+
+    let downloadProgress = 0
+
+    dialog.showMessageBox({
+      type: 'info',
+      title: 'Update Available',
+      message: 'A new version of PIA is available. Do you want to update now?',
+      buttons: ['Update', 'No']
+    }, (buttonIndex) => {
+      if(buttonIndex !== 0) return
+
+      autoUpdater.downloadUpdate()
+
+      let progressWin = new BrowserWindow({
+        width: 350,
+        height: 35,
+        useContentSize: true,
+        autoHideMenuBar: true,
+        maximizable: false,
+        fullscreen: false,
+        fullscreenable: false,
+        resizable: false
+      })
+
+      progressWin.loadURL(url.format({
+        pathname: path.join(__dirname, 'renderer', 'progress.html'),
+        protocol: 'file:',
+        slashes: true
+      }))
+
+      progressWin.on('closed', () => {
+        progressWin = null
+      })
+
+      ipcMain.on('download-progress-request', (e) => {
+        e.returnValue = downloadProgress
+      })
+
+      autoUpdater.on('download-progress', (d) => {
+        console.log(d.percent);
+        downloadProgress = d.percent
+      })
+
+      autoUpdater.on('update-downloaded', () => {
+        if (progressWin) progressWin.close()
+        dialog.showMessageBox({
+          type: 'info',
+          title: 'Update ready',
+          message: 'A new version of PIA is ready. Quit and install now?',
+          buttons: ['Yes', 'Later']
+        }, (buttonIndex) => {
+          if (buttonIndex === 0) autoUpdater.quitAndInstall()
+        })
+      })
+    })
+  })
+}