[BRG-494] Fix activeAccount errors. Up version 1.14.0

config/manifest.json

@@ -18,7 +18,7 @@
  "96": "images/96.png",
  "128": "images/128.png"
  },
- "version": "1.13.2",
+ "version": "1.14.0",
  "background": {
  "scripts": [
  "background.js"

extension/background.js

@@ -254,8 +254,6 @@ const resolveAccounts = async () => {
  }
  });
  return accountsRequests.splice(0, accountsRequests.length);
-
-
  } catch (e) {
  return { error: e.message };
  }
@@ -292,6 +290,7 @@ const resolveActiveAccount = async (request) => {
  try {
  const account = await getActiveAccount();
  request.cb({ id: request.id, res: account });
+ request.cb = function cb() {};
  } catch (e) {
  console.log(e.message);
  }
@@ -313,7 +312,7 @@ const updateActiveAccountInpage = async (network) => {
  console.log(e.message);
  }
  });
-
+ activeAccountRequests.splice(0, activeAccountRequests.length);
  return null;
 
  } catch (e) {
@@ -352,6 +351,7 @@ const execGetAccountCallbacks = async () => {
  * @returns {boolean}
  */
 const onMessage = (request, sender, sendResponse) => {
+
  const { hostname } = urlParse(sender.tab.url);
  const { id: tabId } = sender.tab;
 
@@ -373,6 +373,11 @@ const onMessage = (request, sender, sendResponse) => {
  return true;
  }
 
+ if (request.method === 'checkAccess') {
+ sendResponse({ id: request.id, response: !!processedOrigins[hostname] });
+ return true;
+ }
+
  if (typeof processedOrigins[hostname] !== 'boolean') {
 
  if (request.method !== 'getAccess') {
@@ -399,7 +404,9 @@ const onMessage = (request, sender, sendResponse) => {
 
  try {
  emitter.emit('addProviderRequest', request.id, hostname);
- } catch (e) { return null; }
+ } catch (e) {
+ return null;
+ }
 
  triggerPopup(INCOMING_CONNECTION_PATH, providerNotification);
  return true;
@@ -457,7 +464,9 @@ const onMessage = (request, sender, sendResponse) => {
  request.data.accountId,
  request.data.message,
  );
- } catch (e) { return null; }
+ } catch (e) {
+ return null;
+ }
 
  triggerPopup(SIGN_MESSAGE_PATH, signNotification);
  return true;
@@ -492,7 +501,9 @@ const onMessage = (request, sender, sendResponse) => {
 
  try {
  emitter.emit('request', id, operations);
- } catch (e) { return null; }
+ } catch (e) {
+ return null;
+ }
 
  notificationManager.getPopup()
  .then((popup) => {
@@ -516,16 +527,20 @@ const onMessage = (request, sender, sendResponse) => {
  }
 
  } else if (request.method === 'getActiveAccount') {
- const tabIndex = activeAccountRequests.findIndex(({ tabId: reqTabId }) => tabId === reqTabId);
+ const { inPageId } = request;
+ const tabIndex = activeAccountRequests
+ .findIndex(({ inPageId: reqInPageId }) => inPageId === reqInPageId);
  const req = {
- id: request.id, cb: sendResponse, tabId,
+ id: request.id, cb: sendResponse, inPageId,
  };
  if (tabIndex === -1) {
  resolveActiveAccount(req);
  activeAccountRequests.push(req);
  return true;
  }
+
  activeAccountRequests[tabIndex] = req;
+
  return true;
  }
 
@@ -750,6 +765,7 @@ export const onSwitchNetwork = async (network) => {
  console.warn('Switch network callback error', error);
  }
  });
+ networkSubscribers.splice(0, networkSubscribers.length);
  }
 
 };
@@ -765,6 +781,7 @@ const onSwitchActiveAccount = (res) => {
  console.warn('Switch account callback error', error);
  }
  });
+ activeAccountSubscribers.splice(0, activeAccountSubscribers.length);
 };
 
 /**

extension/contentscript.js

@@ -2,6 +2,7 @@
 
 const extensionizer = require('./extensionizer');
 const { APP_ID } = require('../src/constants/GlobalConstants');
+
 const getAccessRequest = {};
 
 /**

extension/inpage.js

@@ -19,6 +19,8 @@ const accountChangedSubscribers = [];
 
 let activeAccount = null;
 
+const INPAGE_ID = IdHelper.getId();
+
 /**
  * network subscription
  *
@@ -134,12 +136,42 @@ const subscribeSwitchNetwork = (subscriberCb) => {
 const subscribeAccountChanged = (subscriberCb) => {
 
  if (!lodash.isFunction(subscriberCb)) {
- throw new Error('Is not a function');
+ throw new Error('The first argument is not a function');
  }
 
- accountChangedSubscribers.push(subscriberCb);
+ const id = IdHelper.getId();
+
+ const result = new Promise((resolve, reject) => { 
+
+ const callback = ({ data }) => {
+
+ if (data.error) {
+ reject(data.error);
+ return;
+ }
+
+ if (data.response) {
+
+ accountChangedSubscribers.push(subscriberCb);
+
+ resolve(activeAccount);
+ subscriberCb(activeAccount);
+ return;
+ }
+
+ reject(new Error('No access'));
+ };
+
+ requestQueue.push({ id, cb: callback });
+
+ window.postMessage({
+ method: 'checkAccess', target: 'content', appId: APP_ID, id,
+ }, '*');
+
+ });
+
+ return result;
 
- subscriberCb(activeAccount);
 
 };
 
@@ -151,6 +183,7 @@ const notifyAccountChanged = (accountId) => {
  accountChangedSubscribers.forEach((cb) => {
  cb(accountId);
  });
+
 };
 
 /**
@@ -242,14 +275,17 @@ echojslib.echo.connect = (url, params) => {
  * @param event
  */
 const onMessage = (event) => {
+
  const { id, target, appId } = event.data;
 
  if (!id || target !== 'inpage' || !appId || appId !== APP_ID) return;
 
  const requestIndex = requestQueue.findIndex(({ id: requestId }) => requestId === id);
  if (requestIndex === -1) return;
 
- requestQueue.splice(requestIndex, 1)[0].cb(event);
+ const request = requestQueue.splice(requestIndex, 1);
+ request[0].cb(event);
+
 };
 
 
@@ -346,27 +382,36 @@ const requestAccount = () => backgroundRequest('requestAccount');
  * @returns {undefined}
  */
 const loadActiveAccount = () => {
- const id = IdHelper.getId();
 
  const cb = ({ data }) => {
+
+ const id = IdHelper.getId();
+
  window.postMessage({
- method: 'getActiveAccount', id, target: 'content', appId: APP_ID,
+ method: 'getActiveAccount', id, target: 'content', appId: APP_ID, inPageId: INPAGE_ID,
  }, '*');
 
  const error = data.error || (data.res && data.res.error);
 
+ const prevAccount = activeAccount;
+
  if (error) {
  activeAccount = null;
  } else {
  activeAccount = data.res;
  requestQueue.push({ id, cb });
  }
- notifyAccountChanged(activeAccount);
+ if (prevAccount !== activeAccount) {
+ notifyAccountChanged(activeAccount);
+ }
+
  };
 
+ const id = IdHelper.getId();
+
  requestQueue.push({ id, cb });
  window.postMessage({
- method: 'getActiveAccount', id, target: 'content', appId: APP_ID,
+ method: 'getActiveAccount', id, target: 'content', appId: APP_ID, inPageId: INPAGE_ID,
  }, '*');
 };
 

package.json

@@ -1,7 +1,7 @@
 {
  "name": "echo-bridge",
  "description": "The bridge between your web site and the Echo",
- "version": "1.13.2",
+ "version": "1.14.0",
  "scripts": {
  "start": "cross-env NODE_ENV=local webpack-dev-server --mode development --progress --colors --history-api-fallback --hot --inline --port 8081",
  "build": "cross-env NODE_ENV=production webpack --progress --display-error-details --colors --mode production",

src/constants/GlobalConstants.js

@@ -156,7 +156,7 @@ export const ALGORITHM_IV_BYTES_LENGTH = 16;
 export const STORE = 'keyval';
 
 export const PATTERN_ID_MESSAGE = '*';
-export const LENGTH_ID_MESSAGE = 10;
+export const LENGTH_ID_MESSAGE = 20;
 
 export const ERC20_HASHES = {
  'totalSupply()': '18160ddd',