diff options
Diffstat (limited to 'mascara/src')
| -rw-r--r-- | mascara/src/background.js | 19 | ||||
| -rw-r--r-- | mascara/src/lib/index-db-controller.js | 71 | ||||
| -rw-r--r-- | mascara/src/proxy.js | 1 | ||||
| -rw-r--r-- | mascara/src/ui.js | 10 |
4 files changed, 27 insertions, 74 deletions
diff --git a/mascara/src/background.js b/mascara/src/background.js index 957570050..dff5e6a7c 100644 --- a/mascara/src/background.js +++ b/mascara/src/background.js @@ -1,4 +1,5 @@ global.window = global +const self = global const pipe = require('pump') const SwGlobalListener = require('sw-stream/lib/sw-global-listener.js') @@ -6,7 +7,7 @@ const connectionListener = new SwGlobalListener(self) const setupMultiplex = require('../../app/scripts/lib/stream-utils.js').setupMultiplex const PortStream = require('../../app/scripts/lib/port-stream.js') -const DbController = require('./lib/index-db-controller') +const DbController = require('idb-global') const SwPlatform = require('../../app/scripts/platforms/sw') const MetamaskController = require('../../app/scripts/metamask-controller') @@ -21,6 +22,7 @@ const STORAGE_KEY = 'metamask-config' // const METAMASK_DEBUG = 'GULP_METAMASK_DEBUG' const METAMASK_DEBUG = true let popupIsOpen = false +let connectedClientCount = 0 const log = require('loglevel') global.log = log @@ -31,6 +33,11 @@ self.addEventListener('install', function(event) { }) self.addEventListener('activate', function(event) { event.waitUntil(self.clients.claim()) + self.clients.matchAll() + .then((clients) => { + if (connectedClientCount < clients.length) sendMessageToAllClients('reconnect') + }) + }) console.log('inside:open') @@ -40,7 +47,6 @@ console.log('inside:open') let diskStore const dbController = new DbController({ key: STORAGE_KEY, - version: 2, }) loadStateFromPersistence() .then((initState) => setupController(initState)) @@ -107,6 +113,7 @@ function setupController (initState, client) { connectionListener.on('remote', (portStream, messageEvent) => { console.log('REMOTE CONECTION FOUND***********') + connectedClientCount += 1 connectRemote(portStream, messageEvent.data.context) }) @@ -142,4 +149,12 @@ function setupController (initState, client) { return Promise.resolve() } + +function sendMessageToAllClients (message) { + self.clients.matchAll().then(function(clients) { + clients.forEach(function(client) { + client.postMessage(message) + }) + }) +} function noop () {} diff --git a/mascara/src/lib/index-db-controller.js b/mascara/src/lib/index-db-controller.js deleted file mode 100644 index 5aded1cbe..000000000 --- a/mascara/src/lib/index-db-controller.js +++ /dev/null @@ -1,71 +0,0 @@ -const EventEmitter = require('events') -module.exports = class IndexDbController extends EventEmitter { - - constructor (opts) { - super() - global.IDBTransaction = global.IDBTransaction || global.webkitIDBTransaction || global.msIDBTransaction || {READ_WRITE: "readwrite"}; // This line should only be needed if it is needed to support the object's constants for older browsers - global.IDBKeyRange = global.IDBKeyRange || global.webkitIDBKeyRange || global.msIDBKeyRange - this.migrations = opts.migrations - this.key = opts.key - this.version = opts.version - this.initialState = opts.initialState - } - - // Opens the database connection and returns a promise - open () { - return this.get('dataStore') - .then((data) => { - if (!data) { - return this._add('dataStore', this.initialState) - .then(() => this.get('dataStore')) - .then((versionedData) => Promise.resolve(versionedData)) - } - return Promise.resolve(data) - }) - } - - - get (key = 'dataStore') { - return this._request('get', key) - } - put (state) { - return this._request('put', state, 'dataStore') - } - - _add (key = 'dataStore', objStore) { - return this._request('add', objStore, key) - } - - _request (call, ...args) { - return new Promise((resolve, reject) => { - const self = this - const dbOpenRequest = global.indexedDB.open(this.key, this.version) - - dbOpenRequest.addEventListener('upgradeneeded', (event) => { - this.db = event.target.result - this.db.createObjectStore('dataStore') - }) - - dbOpenRequest.onsuccess = (event) => { - this.db = dbOpenRequest.result - this.emit('success') - const dbTransaction = this.db.transaction('dataStore', 'readwrite') - const request = dbTransaction.objectStore('dataStore') - const objRequest = request[call](...args) - objRequest.addEventListener('success', (event) => { - return resolve(objRequest.result) - }) - objRequest.addEventListener('error', (err) => { - return reject(`IndexDBController - ${call} failed to excute on indexedDB`) - }) - dbTransaction.addEventListener('complete', (event) => { - this.emit('complete') - }) - } - - dbOpenRequest.addEventListener('error', (event) => { - return reject({message: `IndexDBController - open:@${call} failed to excute on indexedDB`, errorEvent: event}) - }) - }) - } -} diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js index ec5665240..eabc547b4 100644 --- a/mascara/src/proxy.js +++ b/mascara/src/proxy.js @@ -20,6 +20,7 @@ background.on('ready', (_) => { pageStream.pipe(swStream).pipe(pageStream) }) +background.on('updatefound', () => window.location.reload()) background.on('error', console.error) background.startWorker() diff --git a/mascara/src/ui.js b/mascara/src/ui.js index cdf985ebd..e798847a7 100644 --- a/mascara/src/ui.js +++ b/mascara/src/ui.js @@ -27,7 +27,7 @@ const background = new SWcontroller({ wakeUpInterval: 20000 }) // Setup listener for when the service worker is read -background.on('ready', (readSw) => { +const connectApp = function (readSw) { let connectionStream = SwStream({ serviceWorker: background.controller, context: name, @@ -39,6 +39,14 @@ background.on('ready', (readSw) => { if (state.appState.shouldClose) window.close() }) }) +} + +background.on('ready', (sw) => { + background.removeListener('updatefound', connectApp) + connectApp(sw) }) +background.on('updatefound', () => window.location.reload()) + background.startWorker() +// background.startWorker() console.log('hello from MetaMascara ui!') |