README.md

@@ -77,7 +77,7 @@ for the same Firefox publishing flow.
 For an explicit version check, pass the current tag after `--`:
 
 ```bash
-VERSTAK_BROWSER_ENV=/path/to/.env npm run publish:github -- v2.0.4
+VERSTAK_BROWSER_ENV=/path/to/.env npm run publish:github -- v2.0.3
 ```
 
 Release output:

chromium/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Verstak Bridge",
-  "version": "2.0.4",
+  "version": "2.0.3",
   "description": "Send pages, selections, links, and files to the local Verstak browser inbox.",
   "author": "Verstak",
   "homepage_url": "https://github.com/mirivlad/verstak-browser-extension",

firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Verstak Bridge",
-  "version": "2.0.4",
+  "version": "2.0.3",
   "description": "Send pages, selections, links, and files to the local Verstak browser inbox.",
   "author": "Verstak",
   "homepage_url": "https://github.com/mirivlad/verstak-browser-extension",

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "verstak-browser-extension",
-  "version": "2.0.4",
+  "version": "2.0.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "verstak-browser-extension",
-      "version": "2.0.4",
+      "version": "2.0.3",
       "devDependencies": {
         "web-ext": "^8.3.0"
       }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "verstak-browser-extension",
-  "version": "2.0.4",
+  "version": "2.0.3",
   "private": true,
   "description": "Verstak browser capture extension for Chromium and Firefox",
   "license": "AGPL-3.0-or-later",

scripts/test-firefox-github-release.js

@@ -6,23 +6,23 @@ const packageManifest = require('../package.json');
 const chromiumManifest = require('../chromium/manifest.json');
 const firefoxManifest = require('../firefox/manifest.json');
 
-const version = '2.0.4';
+const version = '2.0.3';
-const asset = 'verstak-firefox-2.0.4.xpi';
+const asset = 'verstak-firefox-2.0.3.xpi';
 
 assert.equal(packageManifest.version, version);
 assert.equal(chromiumManifest.version, version);
 assert.equal(firefoxManifest.version, version);
-assert.equal(release.releaseTag(version), 'v2.0.4');
+assert.equal(release.releaseTag(version), 'v2.0.3');
 assert.equal(
   release.releaseAssetURL(version, asset),
-  'https://github.com/mirivlad/verstak-browser-extension/releases/download/v2.0.4/verstak-firefox-2.0.4.xpi',
+  'https://github.com/mirivlad/verstak-browser-extension/releases/download/v2.0.3/verstak-firefox-2.0.3.xpi',
 );
 assert.deepEqual(release.updateManifest('verstak-bridge@verstak.app', version, asset), {
   addons: {
     'verstak-bridge@verstak.app': {
       updates: [{
-        version: '2.0.4',
+        version: '2.0.3',
-        update_link: 'https://github.com/mirivlad/verstak-browser-extension/releases/download/v2.0.4/verstak-firefox-2.0.4.xpi',
+        update_link: 'https://github.com/mirivlad/verstak-browser-extension/releases/download/v2.0.3/verstak-firefox-2.0.3.xpi',
       }],
     },
   },

scripts/test-i18n.js

@@ -29,7 +29,7 @@ assert.ok(Object.values(ru).every((value) => typeof value === 'string'));
 const tEn = i18n.createTranslator({ en, ru }, 'en');
 const tRu = i18n.createTranslator({ en, ru }, 'ru');
 assert.strictEqual(tRu('status.queued'), 'В очереди до запуска Верстака');
-assert.strictEqual(tEn('error.sendCapture'), 'Could not send the capture. Please try again.');
+assert.strictEqual(tEn('error.value', { error: 'offline' }), 'Error: offline');
 assert.strictEqual(tRu('missing', null, 'Fallback'), 'Fallback');
 assert.strictEqual(tRu('missing.key'), 'missing.key');
 

scripts/test-popup-settings.js

@@ -65,8 +65,6 @@ const elements = {};
 });
 
 let savedSettings = null;
-let nextRequestError = null;
-const technicalWarnings = [];
 const initialState = {
   settings: {
     receiverUrl: 'http://127.0.0.1:47731/api/browser-inbox/v1/captures',
@@ -82,11 +80,6 @@ const browser = {
   runtime: {
     getURL(relativePath) { return `extension://${relativePath}`; },
     sendMessage(message) {
-      if (nextRequestError) {
-        const error = nextRequestError;
-        nextRequestError = null;
-        return Promise.reject(new Error(error));
-      }
       if (message.action === 'getState') return Promise.resolve(initialState);
       if (message.action === 'saveSettings') {
         savedSettings = message.settings;
@@ -114,24 +107,10 @@ function fetchCatalog(url) {
 }
 const i18nPath = path.join(__dirname, '..', 'shared', 'i18n.js');
 const popupPath = path.join(__dirname, '..', 'shared', 'popup', 'popup.js');
-const popupSource = fs.readFileSync(popupPath, 'utf8');
+const context = vm.createContext({ browser, console, document, Promise, btoa, fetch: fetchCatalog, navigator: { language: 'en-US' } });
-assert.equal(/setStatus\(\s*(?:error\b|err\b|String\()/.test(popupSource), false);
-const context = vm.createContext({
-  browser,
-  console: {
-    error: console.error,
-    log: console.log,
-    warn(...args) { technicalWarnings.push(args.map(String).join(' ')); },
-  },
-  document,
-  Promise,
-  btoa,
-  fetch: fetchCatalog,
-  navigator: { language: 'en-US' },
-});
 context.globalThis = context;
 vm.runInContext(fs.readFileSync(i18nPath, 'utf8'), context, { filename: i18nPath });
-vm.runInContext(popupSource, context, { filename: popupPath });
+vm.runInContext(fs.readFileSync(popupPath, 'utf8'), context, { filename: popupPath });
 
 async function flush() {
   for (let i = 0; i < 16; i += 1) await Promise.resolve();
@@ -177,14 +156,6 @@ async function flush() {
   assert.strictEqual(savedSettings.language, 'en');
   assert.strictEqual(savedSettings.passiveActivityEnabled, true);
   assert.deepStrictEqual(Array.from(savedSettings.passiveActivityExcludedDomains), ['youtube.com', 'x.com']);
-
-  nextRequestError = '[plugin:verstak.browser-inbox] captures.create failed: receiver unavailable';
-  elements['capture-page'].click();
-  await flush();
-  assert.strictEqual(elements.status.textContent, 'Could not send the capture. Please try again.');
-  assert.equal(elements.status.textContent.includes('[plugin:'), false);
-  assert.ok(technicalWarnings.some((message) => message.includes('captures.create failed')));
-
   console.log('browser extension popup localization/settings tests passed');
 })().catch((error) => {
   console.error(error);

shared/locales/en.json

@@ -30,10 +30,7 @@
   "error.chooseFile": "Choose a file first",
   "error.fileTooLarge": "File is too large for browser capture",
   "error.invalidReceiverUrl": "Receiver URL must start with http:// or https://",
-  "error.loadState": "Could not load the extension state. Please try again.",
+  "error.value": "Error: {error}",
-  "error.saveSettings": "Could not save settings. Please try again.",
-  "error.sendCapture": "Could not send the capture. Please try again.",
-  "error.readFile": "Could not read the file. Choose it again.",
   "context.sendPage": "Send page to Verstak",
   "context.sendSelection": "Send selection to Verstak",
   "context.sendLink": "Send link to Verstak"

shared/locales/ru.json

@@ -30,10 +30,7 @@
   "error.chooseFile": "Сначала выберите файл",
   "error.fileTooLarge": "Файл слишком велик для отправки из браузера",
   "error.invalidReceiverUrl": "URL приёмника должен начинаться с http:// или https://",
-  "error.loadState": "Не удалось загрузить данные расширения. Повторите попытку.",
+  "error.value": "Ошибка: {error}",
-  "error.saveSettings": "Не удалось сохранить настройки. Повторите попытку.",
-  "error.sendCapture": "Не удалось отправить материал. Повторите попытку.",
-  "error.readFile": "Не удалось прочитать файл. Выберите его ещё раз.",
   "context.sendPage": "Отправить страницу в Верстак",
   "context.sendSelection": "Отправить выделение в Верстак",
   "context.sendLink": "Отправить ссылку в Верстак"

shared/popup/popup.js

@@ -118,11 +118,6 @@
     statusEl.textContent = text;
   }
 
-  function reportError(key, fallback, error) {
-    console.warn('[verstak.popup] request failed:', error);
-    setStatus(t(key, null, fallback));
-  }
-
   function request(message) {
     return Promise.resolve(ext.runtime.sendMessage(message)).then(function (result) {
       if (result && result.error) throw new Error(result.error);
@@ -153,7 +148,7 @@
       applyLocale(state.settings && state.settings.language || 'system');
       return state;
     }).catch(function (error) {
-      reportError('error.loadState', 'Could not load the extension state. Please try again.', error);
+      setStatus(error && error.message ? error.message : String(error));
     });
   }
 
@@ -179,7 +174,7 @@
       if (successMessage) setStatus(t('status.saved', null, 'Saved'));
       return state;
     }).catch(function (error) {
-      reportError('error.saveSettings', 'Could not save settings. Please try again.', error);
+      setStatus(error && error.message ? error.message : String(error));
     });
   }
 
@@ -193,7 +188,7 @@
         setStatus(t('status.done', null, 'Done'));
       }
     }).catch(function (error) {
-      reportError('error.sendCapture', 'Could not send the capture. Please try again.', error);
+      setStatus(error && error.message ? error.message : String(error));
     });
   }
 
@@ -223,7 +218,7 @@
         fileDataBase64: arrayBufferToBase64(results[0])
       });
     }).catch(function (error) {
-      reportError('error.readFile', 'Could not read the file. Choose it again.', error);
+      setStatus(error && error.message ? error.message : String(error));
     });
   });