From 719d0f4ad5ba7da2b807641a2afdc969d74d913c Mon Sep 17 00:00:00 2001 From: frankiebee Date: Thu, 6 Apr 2017 18:56:13 +0200 Subject: Ping service worker to keep it from going idle --- mascara/src/proxy.js | 10 +++++++++- mascara/src/ui.js | 5 ++++- package.json | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index e580076c1..8d91e4553 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -3,10 +3,18 @@ const SWcontroller = require('client-sw-ready-event/lib/sw-client.js') const SwStream = require('sw-stream/lib/sw-stream.js') const SetupUntrustedComunication = ('./lib/setup-untrusted-connection.js') +let intervalDelay = Math.floor(Math.random() * (60000 - 1000)) + 1000 const background = new SWcontroller({ fileName: '/background.js', + letBeIdle: false, + intervalDelay, }) - +window.onfocus = () => { + background.sendMessage('wakeUp') + .catch((err) => { + console.error('problem with wake up', err) + }) +} const pageStream = new ParentStream() background.on('ready', (_) => { let swStream = SwStream({ diff --git a/mascara/src/ui.js b/mascara/src/ui.js index c4866867b..37bb043b8 100644 --- a/mascara/src/ui.js +++ b/mascara/src/ui.js @@ -18,10 +18,13 @@ const container = document.getElementById('app-content') var name = 'popup' window.METAMASK_UI_TYPE = name +let intervalDelay = Math.floor(Math.random() * (60000 - 1000)) + 1000 + const background = new SWcontroller({ fileName: '/background.js', + letBeIdel: false, + intervalDelay, }) - // Setup listener for when the service worker is read background.on('ready', (readSw) => { let connectionStream = SwStream({ diff --git a/package.json b/package.json index 78a8520f4..c0e1057a4 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "bluebird": "^3.5.0", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", - "client-sw-ready-event": "^1.0.2", + "client-sw-ready-event": "^2.1.1", "clone": "^1.0.2", "copy-to-clipboard": "^2.0.0", "debounce": "^1.0.0", -- cgit From 478a07ea81556a62a39c229d4feecf9c0d9a7cdb Mon Sep 17 00:00:00 2001 From: frankiebee Date: Thu, 6 Apr 2017 18:58:41 +0200 Subject: remove unnecessary listner --- mascara/src/proxy.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index 8d91e4553..5ead75f94 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -9,12 +9,7 @@ const background = new SWcontroller({ letBeIdle: false, intervalDelay, }) -window.onfocus = () => { - background.sendMessage('wakeUp') - .catch((err) => { - console.error('problem with wake up', err) - }) -} + const pageStream = new ParentStream() background.on('ready', (_) => { let swStream = SwStream({ -- cgit From 94df1681133fde038c76095d45e4203ca6afe4e8 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Thu, 6 Apr 2017 19:32:45 +0200 Subject: Bump sw-client version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c0e1057a4..67648d781 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "bluebird": "^3.5.0", "browser-passworder": "^2.0.3", "browserify-derequire": "^0.9.4", - "client-sw-ready-event": "^2.1.1", + "client-sw-ready-event": "^2.2.1", "clone": "^1.0.2", "copy-to-clipboard": "^2.0.0", "debounce": "^1.0.0", -- cgit