+ );
};
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
index af9c72e..9268d7b 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-common/pages/options/src/index.js
@@ -9,7 +9,13 @@ import getApp from './components/App';
chrome.runtime.getBackgroundPage( (bgWindow) =>
bgWindow.apis.errorHandlers.installListenersOn(
window, 'PUP', async() => {
-
+ /*
+ `Extension context invalidated` error is thrown if `window.closed` is true and call to
+ `window.chrome.i18n` or other `window.chrome` api happens. Use bgWindow.chrome instead.
+ Use winChrome for tab-related calls like winChrome.tabs.getCurrent.
+ */
+ window.winChrome = window.chrome;
+ window.chrome = bgWindow.chrome;
let theState;
{
const apis = bgWindow.apis;
@@ -29,15 +35,23 @@ chrome.runtime.getBackgroundPage( (bgWindow) =>
// IF INSIDE OPTIONS TAB
const currentTab = await new Promise(
- (resolve) => chrome.tabs.query(
+ (resolve) => winChrome.tabs.query(
{active: true, currentWindow: true},
- ([tab]) => resolve(tab)
+ ([tab]) => resolve(tab),
)
);
theState.flags.ifInsideOptionsPage = !currentTab || currentTab.url.startsWith('chrome://extensions/?options=') || currentTab.url.startsWith('about:addons');
theState.currentTab = currentTab;
+ // If opened not via popup and not via options modal.
+ // E.g., if opened via copy-pasting an URL into the address bar from somewhere.
+ // If browser is not Chrome (Opera, e.g.) then options page may be opened in a separate tab
+ // and then you will get a false positive.
+ theState.flags.ifOpenedUnsafely = Boolean(await new Promise(
+ (resolve) => winChrome.tabs.getCurrent(resolve),
+ ));
+
// STATE DEFINED, COMPOSE.
appendGlobalCss(document, theState);
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/80-error-menu.js b/extensions/chromium/runet-censorship-bypass/src/extension-full/80-error-menu.js
index b190aee..342ccdb 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-full/80-error-menu.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/80-error-menu.js
@@ -2,7 +2,88 @@
{
- chrome.webNavigation.onErrorOccurred.addListener((details) => {
+ const proxySideErrors = [
+ 'net::ERR_TUNNEL_CONNECTION_FAILED',
+ ];
+
+ const urlToA = (url) => new URL(url).host.link(
+ encodeURIComponent(url),
+ );
+
+ const isProxyErrorHandledAsync = async (details) => {
+
+ if (!proxySideErrors.includes(details.error) || details.type === 'main_frame') {
+ // Main frame websocket errors are followed by webnavigation errors
+ // which chrome-internals code resets the state of the popup.
+ return;
+ }
+ let fromPageHref = '';
+ let fromPageHtml = '';
+ let youMayReportHtml = '';
+ const initiator = details.initiator !== 'null' && details.initiator;
+ try {
+ if (initiator) {
+ fromPageHref = new URL(initiator).href; // Sanitize: only urls, not other stuff.
+ fromPageHtml = ` со страницы ${urlToA(fromPageHref)}`;
+ }
+ youMayReportHtml = ` Вы можете ${'сообщить об ошибке'.link(
+ encodeURIComponent(
+ '/pages/report-proxy-error/index.html?' +
+ new URLSearchParams({
+ fromPageHref,
+ requestFailedTo: new URL(details.url).href,
+ }),
+ ),
+ )} администратору прокси.`;
+ } catch(e) {
+ /* Suppress for malformed urls. */
+ console.log('Error handling malformed URLs:', details);
+ }
+
+ const tabId = details.tabId;
+ const popupPrefix = chrome.runtime.getURL(`/pages/options/index.html?status=🔥 Прокси-сервер отказался обслуживать запрос к `);
+ const oldPopup = await new Promise((resolve) => chrome.browserAction.getPopup({ tabId }, resolve));
+ if (decodeURIComponent(oldPopup).startsWith(popupPrefix)) {
+ return true;
+ }
+ const popup = `${popupPrefix}${urlToA(details.url)}${fromPageHtml}. Это могло быть намеренно или по ошибке.${youMayReportHtml}#tab=exceptions`;
+
+ chrome.browserAction.setPopup({
+ tabId,
+ popup,
+ });
+
+ chrome.browserAction.setBadgeBackgroundColor({
+ tabId,
+ color: 'red',
+ });
+ chrome.browserAction.setBadgeText({
+ tabId,
+ text: '❗',
+ });
+ let limit = 5;
+ let ifOnTurn = true;
+ let ifError = false;
+ const flip = () => {
+
+ if (!ifOnTurn && !--limit || ifError) {
+ clearInterval(timer);
+ return;
+ }
+ chrome.browserAction.setBadgeText({
+ tabId,
+ text: ifOnTurn ? '❗' : '',
+ }, () => {
+ ifError = chrome.runtime.lastError;
+ });
+ ifOnTurn = !ifOnTurn;
+ };
+ flip();
+ const timer = setInterval(flip, 500);
+ return true;
+ };
+
+ chrome.webNavigation.onErrorOccurred.addListener(async (details) => {
const tabId = details.tabId;
if ( !(details.frameId === 0 && tabId >= 0) ||
@@ -12,13 +93,16 @@
].includes(details.error) ) {
return;
}
+ if (await isProxyErrorHandledAsync(details)) {
+ return;
+ }
chrome.browserAction.setPopup({
tabId,
- popup: './pages/options/index.html#tab=exceptions&status=Правый клик по иконке — меню инструментов!',
+ popup: './pages/options/index.html?status=Правый клик по иконке — меню инструментов!#tab=exceptions',
});
- window.chrome.browserAction.setBadgeBackgroundColor({
+ chrome.browserAction.setBadgeBackgroundColor({
tabId,
color: '#4285f4',
});
@@ -29,4 +113,9 @@
});
+ chrome.webRequest.onErrorOccurred.addListener(
+ isProxyErrorHandledAsync,
+ {urls: ['']},
+ );
+
}
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/85-block-informer.js b/extensions/chromium/runet-censorship-bypass/src/extension-full/85-block-informer.js
index 7f1294d..06fb779 100644
--- a/extensions/chromium/runet-censorship-bypass/src/extension-full/85-block-informer.js
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/85-block-informer.js
@@ -41,7 +41,7 @@
const setRedBadge = (opts) => {
- window.chrome.browserAction.setBadgeBackgroundColor({
+ chrome.browserAction.setBadgeBackgroundColor({
color: '#db4b2f',
});
chrome.browserAction.setBadgeText(opts);
diff --git a/extensions/chromium/runet-censorship-bypass/src/extension-full/pages/report-proxy-error/index.html b/extensions/chromium/runet-censorship-bypass/src/extension-full/pages/report-proxy-error/index.html
new file mode 100644
index 0000000..b55b03b
--- /dev/null
+++ b/extensions/chromium/runet-censorship-bypass/src/extension-full/pages/report-proxy-error/index.html
@@ -0,0 +1,32 @@
+
+
+
+
+ Сообщить об ошибке прокси-сервера
+
+
+
+
+
+
Сообщить об ошибке прокси-сервера
+ Перешлите администратору вашего прокси следующее:
+
+ Вот известные нам электронные адреса для популярных прокси-серверов (кликните по email для открытия шаблона письма):
+
+