aboutsummaryrefslogtreecommitdiffstats
path: root/mascara
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-10-05 14:03:47 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-10-05 14:03:47 +0800
commit7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0 (patch)
tree0dff417975467cf0d7a7d2acaddc65efdace1ca2 /mascara
parent2dba03ffc530e3e2a176aea9712ffc3e189bebc2 (diff)
downloadtangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.tar
tangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.tar.gz
tangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.tar.bz2
tangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.tar.lz
tangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.tar.xz
tangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.tar.zst
tangerine-wallet-browser-7a9e2aa4f0fe8a12d1fac838f62ca4fbf6763af0.zip
mascara: linting and code clean up
Diffstat (limited to 'mascara')
-rw-r--r--mascara/server/index.js8
-rw-r--r--mascara/server/util.js10
-rw-r--r--mascara/src/background.js67
-rw-r--r--mascara/src/proxy.js4
-rw-r--r--mascara/src/ui.js10
5 files changed, 41 insertions, 58 deletions
diff --git a/mascara/server/index.js b/mascara/server/index.js
index 14e3fa18e..12b527e5d 100644
--- a/mascara/server/index.js
+++ b/mascara/server/index.js
@@ -5,7 +5,7 @@ const serveBundle = require('./util').serveBundle
module.exports = createMetamascaraServer
-function createMetamascaraServer(){
+function createMetamascaraServer () {
// start bundlers
const metamascaraBundle = createBundle(__dirname + '/../src/mascara.js')
@@ -17,13 +17,13 @@ function createMetamascaraServer(){
const server = express()
// ui window
serveBundle(server, '/ui.js', uiBundle)
- server.use(express.static(__dirname+'/../ui/'))
- server.use(express.static(__dirname+'/../../dist/chrome'))
+ server.use(express.static(__dirname + '/../ui/'))
+ server.use(express.static(__dirname + '/../../dist/chrome'))
// metamascara
serveBundle(server, '/metamascara.js', metamascaraBundle)
// proxy
serveBundle(server, '/proxy/proxy.js', proxyBundle)
- server.use('/proxy/', express.static(__dirname+'/../proxy'))
+ server.use('/proxy/', express.static(__dirname + '/../proxy'))
// background
serveBundle(server, '/background.js', backgroundBuild)
diff --git a/mascara/server/util.js b/mascara/server/util.js
index 6e25b35d8..6ab41b729 100644
--- a/mascara/server/util.js
+++ b/mascara/server/util.js
@@ -7,14 +7,14 @@ module.exports = {
}
-function serveBundle(server, path, bundle){
- server.get(path, function(req, res){
+function serveBundle (server, path, bundle) {
+ server.get(path, function (req, res) {
res.setHeader('Content-Type', 'application/javascript; charset=UTF-8')
res.send(bundle.latest)
})
}
-function createBundle(entryPoint){
+function createBundle (entryPoint) {
var bundleContainer = {}
@@ -30,8 +30,8 @@ function createBundle(entryPoint){
return bundleContainer
- function bundle() {
- bundler.bundle(function(err, result){
+ function bundle () {
+ bundler.bundle(function (err, result) {
if (err) {
console.log(`Bundle failed! (${entryPoint})`)
console.error(err)
diff --git a/mascara/src/background.js b/mascara/src/background.js
index 5ba865ad8..79bf9d378 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -1,44 +1,37 @@
global.window = global
-const self = global
-const pipe = require('pump')
const SwGlobalListener = require('sw-stream/lib/sw-global-listener.js')
-const connectionListener = new SwGlobalListener(self)
+const connectionListener = new SwGlobalListener(global)
const setupMultiplex = require('../../app/scripts/lib/stream-utils.js').setupMultiplex
-const PortStream = require('../../app/scripts/lib/port-stream.js')
const DbController = require('idb-global')
const SwPlatform = require('../../app/scripts/platforms/sw')
const MetamaskController = require('../../app/scripts/metamask-controller')
-const extension = {} //require('../../app/scripts/lib/extension')
-const storeTransform = require('obs-store/lib/transform')
const Migrator = require('../../app/scripts/lib/migrator/')
const migrations = require('../../app/scripts/migrations/')
const firstTimeState = require('../../app/scripts/first-time-state')
const STORAGE_KEY = 'metamask-config'
const METAMASK_DEBUG = process.env.METAMASK_DEBUG
-let popupIsOpen = false
-let connectedClientCount = 0
+global.metamaskPopupIsOpen = false
const log = require('loglevel')
global.log = log
log.setDefaultLevel(METAMASK_DEBUG ? 'debug' : 'warn')
-self.addEventListener('install', function(event) {
- event.waitUntil(self.skipWaiting())
+global.addEventListener('install', function (event) {
+ event.waitUntil(global.skipWaiting())
})
-self.addEventListener('activate', function(event) {
- event.waitUntil(self.clients.claim())
+global.addEventListener('activate', function (event) {
+ event.waitUntil(global.clients.claim())
})
console.log('inside:open')
// // state persistence
-let diskStore
const dbController = new DbController({
key: STORAGE_KEY,
})
@@ -47,23 +40,18 @@ loadStateFromPersistence()
.then(() => console.log('MetaMask initialization complete.'))
.catch((err) => console.error('WHILE SETTING UP:', err))
-// initialization flow
-
//
// State and Persistence
//
-function loadStateFromPersistence() {
+async function loadStateFromPersistence () {
// migrations
- let migrator = new Migrator({ migrations })
+ const migrator = new Migrator({ migrations })
const initialState = migrator.generateInitialState(firstTimeState)
dbController.initialState = initialState
- return dbController.open()
- .then((versionedData) => migrator.migrateData(versionedData))
- .then((versionedData) => {
- dbController.put(versionedData)
- return Promise.resolve(versionedData)
- })
- .then((versionedData) => Promise.resolve(versionedData.data))
+ const versionedData = await dbController.open()
+ const migratedData = await migrator.migrateData(versionedData)
+ await dbController.put(migratedData)
+ return migratedData.data
}
function setupController (initState, client) {
@@ -89,15 +77,16 @@ function setupController (initState, client) {
controller.store.subscribe((state) => {
versionifyData(state)
.then((versionedData) => dbController.put(versionedData))
- .catch((err) => {console.error(err)})
+ .catch((err) => { console.error(err) })
})
- function versionifyData(state) {
+ function versionifyData (state) {
return dbController.get()
.then((rawData) => {
return Promise.resolve({
data: state,
meta: rawData.meta,
- })}
+ })
+}
)
}
@@ -107,7 +96,6 @@ function setupController (initState, client) {
connectionListener.on('remote', (portStream, messageEvent) => {
console.log('REMOTE CONECTION FOUND***********')
- connectedClientCount += 1
connectRemote(portStream, messageEvent.data.context)
})
@@ -116,7 +104,7 @@ function setupController (initState, client) {
if (isMetaMaskInternalProcess) {
// communication with popup
controller.setupTrustedCommunication(connectionStream, 'MetaMask')
- popupIsOpen = true
+ global.metamaskPopupIsOpen = true
} else {
// communication with page
setupUntrustedCommunication(connectionStream, context)
@@ -131,24 +119,19 @@ function setupController (initState, client) {
controller.setupPublicConfig(mx.createStream('publicConfig'))
}
- function setupTrustedCommunication (connectionStream, originDomain) {
- // setup multiplexing
- var mx = setupMultiplex(connectionStream)
- // connect features
- controller.setupProviderConnection(mx.createStream('provider'), originDomain)
- }
//
// User Interface setup
//
return Promise.resolve()
}
+// // this will be useful later but commented out for linting for now (liiiinting)
+// function sendMessageToAllClients (message) {
+// global.clients.matchAll().then(function (clients) {
+// clients.forEach(function (client) {
+// client.postMessage(message)
+// })
+// })
+// }
-function sendMessageToAllClients (message) {
- self.clients.matchAll().then(function(clients) {
- clients.forEach(function(client) {
- client.postMessage(message)
- })
- })
-}
function noop () {}
diff --git a/mascara/src/proxy.js b/mascara/src/proxy.js
index 07c5b0e3c..54c5d5cf4 100644
--- a/mascara/src/proxy.js
+++ b/mascara/src/proxy.js
@@ -2,7 +2,7 @@ const createParentStream = require('iframe-stream').ParentStream
const SWcontroller = require('client-sw-ready-event/lib/sw-client.js')
const SwStream = require('sw-stream/lib/sw-stream.js')
-let intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
+const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
const background = new SWcontroller({
fileName: '/background.js',
letBeIdle: false,
@@ -12,7 +12,7 @@ const background = new SWcontroller({
const pageStream = createParentStream()
background.on('ready', () => {
- let swStream = SwStream({
+ const swStream = SwStream({
serviceWorker: background.controller,
context: 'dapp',
})
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index 2f940ad1a..b272a2e06 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -17,17 +17,17 @@ var name = 'popup'
window.METAMASK_UI_TYPE = name
window.METAMASK_PLATFORM_TYPE = 'mascara'
-let intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
+const intervalDelay = Math.floor(Math.random() * (30000 - 1000)) + 1000
const background = new SWcontroller({
fileName: '/background.js',
letBeIdle: false,
intervalDelay,
- wakeUpInterval: 20000
+ wakeUpInterval: 20000,
})
// Setup listener for when the service worker is read
const connectApp = function (readSw) {
- let connectionStream = SwStream({
+ const connectionStream = SwStream({
serviceWorker: background.controller,
context: name,
})
@@ -57,7 +57,7 @@ background.on('updatefound', windowReload)
background.startWorker()
-function windowReload() {
+function windowReload () {
if (window.METAMASK_SKIP_RELOAD) return
window.location.reload()
}
@@ -66,4 +66,4 @@ function timeout (time) {
return new Promise((resolve) => {
setTimeout(resolve, time || 1500)
})
-} \ No newline at end of file
+}