From 6590f0bc16aa4a25e8f5ae8207054d6516cfc1a0 Mon Sep 17 00:00:00 2001 From: openbuilds-engineer Date: Mon, 29 Oct 2018 21:18:59 +0200 Subject: [PATCH] Enhanched Update Check --- app/js/updates.js | 10 +++++++++- index.js | 10 ++++++++-- package-lock.json | 24 ++++++++++++------------ package.json | 20 +++++++++++++------- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/app/js/updates.js b/app/js/updates.js index d028f4c..9c62a83 100644 --- a/app/js/updates.js +++ b/app/js/updates.js @@ -1,5 +1,9 @@ var time = 10 $(document).ready(function() { + checkUpdate() +}); + +function checkUpdate() { if (!isMac && webgl) { setTimeout(function() { console.log('checking for update') @@ -19,11 +23,15 @@ $(document).ready(function() { }, 1000); } else { printLog("[ update ] You are already running OpenBuilds Machine Driver " + currentVersion + "") + setTimeout(function() { + checkUpdate() + }, 15 * 60 * 1000) // 15 mins } }); }, 1000) } -}); +} + function updateTime() { time-- diff --git a/index.js b/index.js index b0ae0c6..3052571 100644 --- a/index.js +++ b/index.js @@ -168,19 +168,26 @@ if (isElectron()) { // repeat every minute setTimeout(function() { io.sockets.emit('updateready', availversion); - }, 15 * 60 * 1000) // 5 mins + }, 15 * 60 * 1000) // 15 mins if (jogWindow && !jogWindow.isFocused()) { appIcon.displayBalloon({ icon: nativeImage.createFromPath(iconPath), title: "OpenBuilds Machine Driver", content: string }) + // Launch Gui to run Update } }); + + // Schedule AutoUpdater to run from Tray + // if (process.platform == 'win32') { + // autoUpdater.checkForUpdates(); + // } } else { console.log("Running outside Electron: Disabled AutoUpdater") } + if (isElectron()) { var uploadsDir = electronApp.getPath('userData') + '/upload/'; } else { @@ -2134,7 +2141,6 @@ if (isElectron()) { electronApp.dock.setMenu(dockMenu) }; - } function createJogWindow() { diff --git a/package-lock.json b/package-lock.json index 7a1e731..e88709f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsMachineDriver", - "version": "1.0.75", + "version": "1.0.109", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -566,7 +566,7 @@ "concat-stream": { "version": "1.6.2", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", + "integrity": "sha1-kEvfGUzTEi/Gdcd/xKw9T/D9GjQ=", "dev": true, "requires": { "buffer-from": "1.1.0", @@ -584,7 +584,7 @@ "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", "dev": true, "requires": { "core-util-is": "1.0.2", @@ -599,7 +599,7 @@ "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", "dev": true, "requires": { "safe-buffer": "5.1.1" @@ -944,7 +944,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { "ms": "2.0.0" @@ -1123,7 +1123,7 @@ "error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", "dev": true, "requires": { "is-arrayish": "0.2.1" @@ -1132,7 +1132,7 @@ "es6-promise": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", - "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==", + "integrity": "sha1-3EIhwrFlGHYL2MOaUtjzVvwA7Sk=", "dev": true }, "escape-html": { @@ -1239,7 +1239,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { "ms": "2.0.0" @@ -1490,7 +1490,7 @@ "home-path": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz", - "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==", + "integrity": "sha1-1UncJGU4in+GZyQsWzFYjSmvKfw=", "dev": true }, "hosted-git-info": { @@ -2106,7 +2106,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { "ms": "2.0.0" @@ -4003,7 +4003,7 @@ "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "integrity": "sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8=", "dev": true, "requires": { "ms": "2.0.0" @@ -4250,7 +4250,7 @@ "uuid": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", + "integrity": "sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE=", "dev": true }, "validate-npm-package-license": { diff --git a/package.json b/package.json index b7cfde1..19c4613 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "OpenBuildsMachineDriver", - "version": "1.0.110", + "version": "1.0.111", "license": "AGPL-3.0", "description": "Machine Interface Driver for OpenBuilds", "author": "github.com/openbuilds ", @@ -50,12 +50,18 @@ "artifactName": "${productName}-Setup-${version}.${ext}" }, "fileAssociations": [ - { - "ext": [".gcode", ".gc", ".tap", ".nc", ".cnc"], - "description": "GCODE File", - "role": "none" - } - ], + { + "ext": [ + ".gcode", + ".gc", + ".tap", + ".nc", + ".cnc" + ], + "description": "GCODE File", + "role": "none" + } + ], "files": [ "**/*", "ssl/**/*"