Skip to content
This repository has been archived by the owner on Feb 25, 2023. It is now read-only.

Send message updates #864

Merged
merged 7 commits into from
Sep 26, 2020
+44 −44
Merged

Send message updates #864

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6f29d4
Use _sendMessageTab
toasted-nutbread Sep 25, 2020
6083153
Move _sendMessageAllTabs next to _sendMessageTab
toasted-nutbread Sep 25, 2020
d4aa71f
Rename function
toasted-nutbread Sep 25, 2020
b81e8c4
Add and use _sendMessageTabIgnoreResponse
toasted-nutbread Sep 26, 2020
6669415
Add and use _sendMessageIgnoreResponse
toasted-nutbread Sep 26, 2020
61ed716
Always include params
toasted-nutbread Sep 26, 2020
df249ea
Update function consistency
toasted-nutbread Sep 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 44 additions & 44 deletions ext/bg/js/backend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,8 @@ class Backend {

this._clipboardMonitor.on('change', this._onClipboardTextChange.bind(this));

this._sendMessageAllTabs('backendReady');
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.runtime.sendMessage({action: 'backendReady'}, callback);
this._sendMessageAllTabsIgnoreResponse('backendReady', {});
this._sendMessageIgnoreResponse({action: 'backendReady', params: {}});
} catch (e) {
yomichan.logError(e);
throw e;
Expand Down Expand Up @@ -353,21 +352,19 @@ class Backend {
}

_onZoomChange({tabId, oldZoomFactor, newZoomFactor}) {
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.tabs.sendMessage(tabId, {action: 'zoomChanged', params: {oldZoomFactor, newZoomFactor}}, callback);
this._sendMessageTabIgnoreResponse(tabId, {action: 'zoomChanged', params: {oldZoomFactor, newZoomFactor}});
}

// Message handlers

_onApiRequestBackendReadySignal(_params, sender) {
// tab ID isn't set in background (e.g. browser_action)
const callback = () => this._checkLastError(chrome.runtime.lastError);
const data = {action: 'backendReady'};
const data = {action: 'backendReady', params: {}};
if (typeof sender.tab === 'undefined') {
chrome.runtime.sendMessage(data, callback);
this._sendMessageIgnoreResponse(data);
return false;
} else {
chrome.tabs.sendMessage(sender.tab.id, data, callback);
this._sendMessageTabIgnoreResponse(sender.tab.id, data);
return true;
}
}
Expand Down Expand Up @@ -508,8 +505,7 @@ class Backend {

const tabId = sender.tab.id;
const frameId = sender.frameId;
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.tabs.sendMessage(tabId, {action, params, frameId}, {frameId: targetFrameId}, callback);
this._sendMessageTabIgnoreResponse(tabId, {action, params, frameId}, {frameId: targetFrameId});
return true;
}

Expand All @@ -520,8 +516,7 @@ class Backend {

const tabId = sender.tab.id;
const frameId = sender.frameId;
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.tabs.sendMessage(tabId, {action, params, frameId}, callback);
this._sendMessageTabIgnoreResponse(tabId, {action, params, frameId});
return true;
}

Expand Down Expand Up @@ -861,7 +856,7 @@ class Backend {
const tab = tabs[0];
await this._waitUntilTabFrameIsReady(tab.id, 0, 2000);

await this._sendMessageTab(
await this._sendMessageTabPromise(
tab.id,
{action: 'setMode', params: {mode: 'popup'}},
{frameId: 0}
Expand All @@ -872,22 +867,13 @@ class Backend {
}

_updateSearchQuery(tabId, text, animate) {
return this._sendMessageTab(
return this._sendMessageTabPromise(
tabId,
{action: 'updateSearchQuery', params: {text, animate}},
{frameId: 0}
);
}

_sendMessageAllTabs(action, params={}) {
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.tabs.query({}, (tabs) => {
for (const tab of tabs) {
chrome.tabs.sendMessage(tab.id, {action, params}, callback);
}
});
}

_applyOptions(source) {
const options = this.getOptions({current: true});
this._updateBadge();
Expand All @@ -907,7 +893,7 @@ class Backend {
this._clipboardMonitor.stop();
}

this._sendMessageAllTabs('optionsUpdated', {source});
this._sendMessageAllTabsIgnoreResponse('optionsUpdated', {source});
}

_getProfile(optionsContext, useSchema=false) {
Expand Down Expand Up @@ -1272,7 +1258,7 @@ class Backend {

async _getTabUrl(tabId) {
try {
const {url} = await this._sendMessageTab(
const {url} = await this._sendMessageTabPromise(
tabId,
{action: 'getUrl', params: {}},
{frameId: 0}
Expand Down Expand Up @@ -1390,20 +1376,15 @@ class Backend {

chrome.runtime.onMessage.addListener(onMessage);

chrome.tabs.sendMessage(tabId, {action: 'isReady'}, {frameId}, (response) => {
const error = chrome.runtime.lastError;
if (error) { return; }

try {
const value = yomichan.getMessageResponseResult(response);
if (!value) { return; }

cleanup();
resolve();
} catch (e) {
// NOP
}
});
this._sendMessageTabPromise(tabId, {action: 'isReady'}, {frameId})
.then(
(value) => {
if (!value) { return; }
cleanup();
resolve();
},
() => {} // NOP
);

if (timeout !== null) {
timer = setTimeout(() => {
Expand All @@ -1430,7 +1411,26 @@ class Backend {
return await (json ? response.json() : response.text());
}

_sendMessageTab(...args) {
_sendMessageIgnoreResponse(...args) {
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.runtime.sendMessage(...args, callback);
}

_sendMessageTabIgnoreResponse(...args) {
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.tabs.sendMessage(...args, callback);
}

_sendMessageAllTabsIgnoreResponse(action, params) {
const callback = () => this._checkLastError(chrome.runtime.lastError);
chrome.tabs.query({}, (tabs) => {
for (const tab of tabs) {
chrome.tabs.sendMessage(tab.id, {action, params}, callback);
}
});
}

_sendMessageTabPromise(...args) {
return new Promise((resolve, reject) => {
const callback = (response) => {
try {
Expand Down Expand Up @@ -1485,7 +1485,7 @@ class Backend {
if (typeof tabId === 'number' && typeof ownerFrameId === 'number') {
const action = 'setAllVisibleOverride';
const params = {value: false, priority: 0, awaitFrame: true};
token = await this._sendMessageTab(tabId, {action, params}, {frameId: ownerFrameId});
token = await this._sendMessageTabPromise(tabId, {action, params}, {frameId: ownerFrameId});
}

return await new Promise((resolve, reject) => {
Expand All @@ -1503,7 +1503,7 @@ class Backend {
const action = 'clearAllVisibleOverride';
const params = {token};
try {
await this._sendMessageTab(tabId, {action, params}, {frameId: ownerFrameId});
await this._sendMessageTabPromise(tabId, {action, params}, {frameId: ownerFrameId});
} catch (e) {
// NOP
}
Expand Down Expand Up @@ -1652,7 +1652,7 @@ class Backend {

_triggerDatabaseUpdated(type, cause) {
this._translator.clearDatabaseCaches();
this._sendMessageAllTabs('databaseUpdated', {type, cause});
this._sendMessageAllTabsIgnoreResponse('databaseUpdated', {type, cause});
}

async _saveOptions(source) {
Expand Down