From 9f3445252c766053b7a773d75dceb1c1bbfdc6f5 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Thu, 9 Mar 2017 18:24:41 -0800 Subject: put background in service worker --- library/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index 667b13371..59b70edbb 100644 --- a/library/popup.js +++ b/library/popup.js @@ -11,7 +11,7 @@ var name = 'popup' window.METAMASK_UI_TYPE = name var iframeStream = setupIframe({ - zeroClientProvider: 'http://127.0.0.1:9001', + zeroClientProvider: 'http://localhost:9001', sandboxAttributes: ['allow-scripts', 'allow-popups', 'allow-same-origin'], container: document.body, }) -- cgit v1.2.3 From 45ab81fb45ec1043d617f66c308e2e7911c8e0ad Mon Sep 17 00:00:00 2001 From: frankiebee Date: Thu, 23 Mar 2017 11:06:38 -0700 Subject: WIP: streams->indexdb --- library/popup.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index 59b70edbb..3825661cf 100644 --- a/library/popup.js +++ b/library/popup.js @@ -1,7 +1,10 @@ const injectCss = require('inject-css') const MetaMaskUiCss = require('../ui/css') -const startPopup = require('../app/scripts/popup-core') const setupIframe = require('./lib/setup-iframe.js') +const MetamaskInpageProvider = require('../app/scripts/lib/inpage-provider.js') +const SWcontroller = require('./sw-controller') +const SwStream = require('sw-stream/lib/sw-stream.js') +const startPopup = require('../app/scripts/popup-core') var css = MetaMaskUiCss() @@ -15,5 +18,14 @@ var iframeStream = setupIframe({ sandboxAttributes: ['allow-scripts', 'allow-popups', 'allow-same-origin'], container: document.body, }) - -startPopup(iframeStream) +console.log('outside:open') +const background = new SWcontroller({ + fileName: '/popup/sw-build.js', +}) +background.on('ready', (readSw) => { + // var inpageProvider = new MetamaskInpageProvider(SwStream(background.controller)) + // startPopup(inpageProvider) + startPopup(SwStream(background.controller)) +}) +background.startWorker() +console.log('hello from /library/popup.js') -- cgit v1.2.3 From 79248ae5cd3fb1314c5a7ff71c05f9dbe7b3a4cd Mon Sep 17 00:00:00 2001 From: frankiebee Date: Tue, 28 Mar 2017 18:02:08 -0700 Subject: WIP: Untrusted external connections eg: dapps --- library/popup.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index 3825661cf..d956dc0b1 100644 --- a/library/popup.js +++ b/library/popup.js @@ -19,6 +19,7 @@ var iframeStream = setupIframe({ container: document.body, }) console.log('outside:open') + const background = new SWcontroller({ fileName: '/popup/sw-build.js', }) @@ -27,5 +28,6 @@ background.on('ready', (readSw) => { // startPopup(inpageProvider) startPopup(SwStream(background.controller)) }) +background.on('message', (messageEvent) => {debugger}) background.startWorker() console.log('hello from /library/popup.js') -- cgit v1.2.3 From 84b3415b4479eb849b69d77a7e178c67fcaaf3fb Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 29 Mar 2017 10:53:43 -0700 Subject: WIP: lost enital call from dapp to getAccounts --- library/popup.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index d956dc0b1..bb7051055 100644 --- a/library/popup.js +++ b/library/popup.js @@ -13,11 +13,6 @@ injectCss(css) var name = 'popup' window.METAMASK_UI_TYPE = name -var iframeStream = setupIframe({ - zeroClientProvider: 'http://localhost:9001', - sandboxAttributes: ['allow-scripts', 'allow-popups', 'allow-same-origin'], - container: document.body, -}) console.log('outside:open') const background = new SWcontroller({ -- cgit v1.2.3 From 4cf3beda25e7883aac37ee188d3bb102dea4afa3 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 29 Mar 2017 15:19:46 -0700 Subject: Bump sw-stream and setup "untrusted and trusted comunication" --- library/popup.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index bb7051055..a9d934c43 100644 --- a/library/popup.js +++ b/library/popup.js @@ -21,7 +21,10 @@ const background = new SWcontroller({ background.on('ready', (readSw) => { // var inpageProvider = new MetamaskInpageProvider(SwStream(background.controller)) // startPopup(inpageProvider) - startPopup(SwStream(background.controller)) + swStream = SwStream({ + serviceWorker: background.controller, + }) + startPopup() }) background.on('message', (messageEvent) => {debugger}) background.startWorker() -- cgit v1.2.3 From 19302778ee0dd0535867cde29d4a5ce56d573dec Mon Sep 17 00:00:00 2001 From: frankiebee Date: Wed, 29 Mar 2017 16:19:49 -0700 Subject: fix stream --- library/popup.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index a9d934c43..0c297d9a2 100644 --- a/library/popup.js +++ b/library/popup.js @@ -21,7 +21,7 @@ const background = new SWcontroller({ background.on('ready', (readSw) => { // var inpageProvider = new MetamaskInpageProvider(SwStream(background.controller)) // startPopup(inpageProvider) - swStream = SwStream({ + let swStream = SwStream({ serviceWorker: background.controller, }) startPopup() -- cgit v1.2.3 From 29a602a89b176e7af3f15297c2f586a4ece0a726 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Thu, 30 Mar 2017 11:28:22 -0700 Subject: Clean up --- library/popup.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js index 0c297d9a2..f294e5c69 100644 --- a/library/popup.js +++ b/library/popup.js @@ -19,13 +19,11 @@ const background = new SWcontroller({ fileName: '/popup/sw-build.js', }) background.on('ready', (readSw) => { - // var inpageProvider = new MetamaskInpageProvider(SwStream(background.controller)) - // startPopup(inpageProvider) let swStream = SwStream({ serviceWorker: background.controller, - }) - startPopup() + }) + startPopup(swStream) }) -background.on('message', (messageEvent) => {debugger}) + background.startWorker() console.log('hello from /library/popup.js') -- cgit v1.2.3 From 8d49d519c090d287484008346aba1df6d7ad77e7 Mon Sep 17 00:00:00 2001 From: frankiebee Date: Sun, 2 Apr 2017 22:01:44 -0700 Subject: Rename and move around files --- library/popup.js | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 library/popup.js (limited to 'library/popup.js') diff --git a/library/popup.js b/library/popup.js deleted file mode 100644 index f294e5c69..000000000 --- a/library/popup.js +++ /dev/null @@ -1,29 +0,0 @@ -const injectCss = require('inject-css') -const MetaMaskUiCss = require('../ui/css') -const setupIframe = require('./lib/setup-iframe.js') -const MetamaskInpageProvider = require('../app/scripts/lib/inpage-provider.js') -const SWcontroller = require('./sw-controller') -const SwStream = require('sw-stream/lib/sw-stream.js') -const startPopup = require('../app/scripts/popup-core') - - -var css = MetaMaskUiCss() -injectCss(css) - -var name = 'popup' -window.METAMASK_UI_TYPE = name - -console.log('outside:open') - -const background = new SWcontroller({ - fileName: '/popup/sw-build.js', -}) -background.on('ready', (readSw) => { - let swStream = SwStream({ - serviceWorker: background.controller, - }) - startPopup(swStream) -}) - -background.startWorker() -console.log('hello from /library/popup.js') -- cgit v1.2.3