From db4800dc3593fa2d5988f1e3c1cb1acf6eac763d Mon Sep 17 00:00:00 2001 From: gasolin Date: Tue, 27 Mar 2018 13:19:44 +0800 Subject: remove unavailable goToBuyEtherView propType --- mascara/src/app/first-time/index.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'mascara/src') diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js index c0bba53d6..0cc3b4b0e 100644 --- a/mascara/src/app/first-time/index.js +++ b/mascara/src/app/first-time/index.js @@ -20,7 +20,6 @@ class FirstTimeFlow extends Component { seedWords: PropTypes.string, address: PropTypes.string, noActiveNotices: PropTypes.bool, - goToBuyEtherView: PropTypes.func.isRequired, }; static defaultProps = { @@ -171,4 +170,3 @@ export default connect( openBuyEtherModal: () => dispatch(showModal({ name: 'DEPOSIT_ETHER'})), }) )(FirstTimeFlow) - -- cgit From bdf99269e275590b31347322961e773ad980b812 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Mar 2018 14:06:59 -0700 Subject: mascara - move file locations to match extension structure --- mascara/src/proxy.js | 2 +- mascara/src/ui.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'mascara/src') diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index 54c5d5cf4..3958f7d50 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -4,7 +4,7 @@ const SwStream = require('sw-stream/lib/sw-stream.js') const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000 const background = new SWcontroller({ - fileName: '/background.js', + fileName: './scripts/background.js', letBeIdle: false, wakeUpInterval: 30000, intervalDelay, diff --git a/mascara/src/ui.js b/mascara/src/ui.js index b272a2e06..21e5f32a9 100644 --- a/mascara/src/ui.js +++ b/mascara/src/ui.js @@ -20,7 +20,7 @@ window.METAMASK_PLATFORM_TYPE = 'mascara' const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000 const background = new SWcontroller({ - fileName: '/background.js', + fileName: './scripts/background.js', letBeIdle: false, intervalDelay, wakeUpInterval: 20000, -- cgit From c9a47923042ca01c1968cf72e6d43d19890f4cd5 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 28 Mar 2018 21:33:04 -0700 Subject: mascara - use sw-controller and other cleanups --- mascara/src/background.js | 16 ++++++++------ mascara/src/proxy.js | 12 +++++------ mascara/src/ui.js | 54 +++++++++++++++++++++++++---------------------- 3 files changed, 45 insertions(+), 37 deletions(-) (limited to 'mascara/src') diff --git a/mascara/src/background.js b/mascara/src/background.js index 8aa1d8fe2..40a684f3d 100644 --- a/mascara/src/background.js +++ b/mascara/src/background.js @@ -30,15 +30,19 @@ global.addEventListener('activate', function (event) { log.debug('inside:open') - -// // state persistence +// state persistence const dbController = new DbController({ key: STORAGE_KEY, }) -loadStateFromPersistence() -.then((initState) => setupController(initState)) -.then(() => log.debug('MetaMask initialization complete.')) -.catch((err) => console.error('WHILE SETTING UP:', err)) + +start().catch(log.error) + +async function start() { + log.debug('MetaMask initializing...') + const initState = await loadStateFromPersistence() + await setupController(initState) + log.debug('MetaMask initialization complete.') +} // // State and Persistence diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index 3958f7d50..80b4dc516 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -1,13 +1,13 @@ const createParentStream = require('iframe-stream').ParentStream -const SWcontroller = require('client-sw-ready-event/lib/sw-client.js') +const SwController = require('sw-controller') const SwStream = require('sw-stream/lib/sw-stream.js') -const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000 -const background = new SWcontroller({ +const keepAliveDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000 +const background = new SwController({ fileName: './scripts/background.js', - letBeIdle: false, - wakeUpInterval: 30000, - intervalDelay, + keepAlive: true, + keepAliveInterval: 30000, + keepAliveDelay, }) const pageStream = createParentStream() diff --git a/mascara/src/ui.js b/mascara/src/ui.js index 21e5f32a9..f35a11fc4 100644 --- a/mascara/src/ui.js +++ b/mascara/src/ui.js @@ -1,6 +1,6 @@ const injectCss = require('inject-css') -const SWcontroller = require('client-sw-ready-event/lib/sw-client.js') -const SwStream = require('sw-stream/lib/sw-stream.js') +const SwController = require('sw-controller') +const SwStream = require('sw-stream') const MetaMaskUiCss = require('../../ui/css') const MetamascaraPlatform = require('../../app/scripts/platforms/window') const startPopup = require('../../app/scripts/popup-core') @@ -8,27 +8,44 @@ const startPopup = require('../../app/scripts/popup-core') // create platform global global.platform = new MetamascaraPlatform() - var css = MetaMaskUiCss() injectCss(css) const container = document.getElementById('app-content') -var name = 'popup' +const name = 'popup' window.METAMASK_UI_TYPE = name window.METAMASK_PLATFORM_TYPE = 'mascara' -const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000 +const keepAliveDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000 -const background = new SWcontroller({ - fileName: './scripts/background.js', - letBeIdle: false, - intervalDelay, - wakeUpInterval: 20000, +const swController = new SwController({ + fileName: './background.js', + keepAlive: true, + keepAliveDelay, + keepAliveInterval: 20000, }) + +swController.once('updatefound', windowReload) +swController.once('ready', async () => { + try { + swController.removeListener('updatefound', windowReload) + console.log('swController ready') + await timeout(1000) + console.log('connecting to app') + await connectApp() + console.log('app connected') + } catch (err) { + console.error(err) + } +}) + +console.log('starting service worker') +swController.startWorker() + // Setup listener for when the service worker is read -const connectApp = function (readSw) { +function connectApp() { const connectionStream = SwStream({ - serviceWorker: background.controller, + serviceWorker: swController.getWorker(), context: name, }) return new Promise((resolve, reject) => { @@ -43,19 +60,6 @@ const connectApp = function (readSw) { }) }) } -background.on('ready', async (sw) => { - try { - background.removeListener('updatefound', connectApp) - await timeout(1000) - await connectApp(sw) - console.log('hello from cb ready event!') - } catch (e) { - console.error(e) - } -}) -background.on('updatefound', windowReload) - -background.startWorker() function windowReload () { if (window.METAMASK_SKIP_RELOAD) return -- cgit From 99e618d3f2fed0504e9dcc4647b8492440617162 Mon Sep 17 00:00:00 2001 From: kumavis Date: Thu, 29 Mar 2018 23:06:01 -0700 Subject: mascara - server - serve bundles from dist --- mascara/src/mascara.js | 1 - mascara/src/metamascara.js | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 mascara/src/mascara.js create mode 100644 mascara/src/metamascara.js (limited to 'mascara/src') diff --git a/mascara/src/mascara.js b/mascara/src/mascara.js deleted file mode 100644 index 0af6f532f..000000000 --- a/mascara/src/mascara.js +++ /dev/null @@ -1 +0,0 @@ -global.metamask = require('metamascara') diff --git a/mascara/src/metamascara.js b/mascara/src/metamascara.js new file mode 100644 index 000000000..0af6f532f --- /dev/null +++ b/mascara/src/metamascara.js @@ -0,0 +1 @@ +global.metamask = require('metamascara') -- cgit