TypeScript and ESLint fixes

.eslintrc.json

@@ -35,6 +35,12 @@
                 "nestedBinaryExpressions": false
             }
         ],
+        "no-unused-vars": [
+            "error",
+            {
+                "argsIgnorePattern": "^_"
+            }
+        ],
         "require-atomic-updates": "warn",
         // Best Practices
         "array-callback-return": "warn",

WebExtensions.d.ts

@@ -26,7 +26,7 @@ declare module browser {
     declare module folder {
         interface MailFolder {
             accountId: string,
-            type?: string,
+            type?: string | undefined,
         }
     }
 

content/background.mjs.js

@@ -80,6 +80,9 @@ async function verifyMessage(tabId, message) {
 
 		const verifier = new AuthVerifier();
 		const res = await verifier.verify(message);
+		if (!res.dkim[0]) {
+			throw new Error("Result does not contain a DKIM result.");
+		}
 		displayedResultsCache.set(tabId, res);
 		const warnings = res.dkim[0].warnings_str || [];
 		/** @type {Parameters<typeof browser.dkimHeader.setDkimHeaderResult>[5]} */
@@ -113,8 +116,7 @@ async function verifyMessage(tabId, message) {
 		if (prefs.colorFrom) {
 			switch (res.dkim[0].res_num) {
 				case AuthVerifier.DKIM_RES.SUCCESS: {
-					const dkim = res.dkim[0];
-					if (!dkim.warnings_str || dkim.warnings_str.length === 0) {
+					if (!res.dkim[0].warnings_str || res.dkim[0].warnings_str.length === 0) {
 						browser.dkimHeader.highlightFromAddress(tabId, message.id, prefs["color.success.text"], prefs["color.success.background"]);
 					} else {
 						browser.dkimHeader.highlightFromAddress(tabId, message.id, prefs["color.warning.text"], prefs["color.warning.background"]);
@@ -219,19 +221,19 @@ class DisplayAction {
 	static queryButtonState(tabId) {
 		const res = displayedResultsCache.get(tabId);
 		const keyStored = prefs["key.storing"] !== KeyStore.KEY_STORING.DISABLED &&
-			res?.dkim[0].sdid !== undefined && res?.dkim[0].selector !== undefined;
+			res?.dkim[0]?.sdid !== undefined && res?.dkim[0].selector !== undefined;
 		/** @type {RuntimeMessage.DisplayAction.queryButtonStateResult} */
 		const state = {
 			reverifyDKIMSignature: res !== undefined,
 			policyAddUserException:
-				res?.dkim[0].errorType === "DKIM_POLICYERROR_MISSING_SIG" ||
-				res?.dkim[0].errorType === "DKIM_POLICYERROR_WRONG_SDID" || (
-					res?.dkim[0].warnings !== undefined &&
+				res?.dkim[0]?.errorType === "DKIM_POLICYERROR_MISSING_SIG" ||
+				res?.dkim[0]?.errorType === "DKIM_POLICYERROR_WRONG_SDID" || (
+					res?.dkim[0]?.warnings !== undefined &&
 					res?.dkim[0].warnings.findIndex((e) => {
 						return e.name === "DKIM_POLICYERROR_WRONG_SDID";
 					}) !== -1
 				),
-			markKeyAsSecure: keyStored && res?.dkim[0].keySecure === false,
+			markKeyAsSecure: keyStored && res?.dkim[0]?.keySecure === false,
 			updateKey: keyStored,
 		};
 		return state;
@@ -285,8 +287,8 @@ class DisplayAction {
 	 */
 	static async markKeyAsSecure(tabId) {
 		const res = displayedResultsCache.get(tabId);
-		const sdid = res?.dkim[0].sdid;
-		const selector = res?.dkim[0].selector;
+		const sdid = res?.dkim[0]?.sdid;
+		const selector = res?.dkim[0]?.selector;
 		if (sdid === undefined || selector === undefined) {
 			log.error("Can not mark key as secure, result does not contain an sdid or selector", res);
 			return;
@@ -357,4 +359,6 @@ browser.runtime.onMessage.addListener((runtimeMessage, sender, /*sendResponse*/)
 		// eslint-disable-next-line consistent-return
 		return promise;
 	}
+	log.error("DisplayAction receiver got unknown request.", request);
+	throw new Error("DisplayAction receiver got unknown request.");
 });

content/displayAction.mjs.js

@@ -19,7 +19,7 @@ import { getElementById } from "./domUtils.mjs.js";
  */
 async function getCurrentTabId() {
 	const tab = await browser.tabs.query({ currentWindow: true, active: true });
-	const tabId = tab[0].id;
+	const tabId = tab[0]?.id;
 	if (tabId === undefined) {
 		throw new Error("active tab has no id");
 	}

content/domUtils.mjs.js

@@ -33,11 +33,9 @@ export function uploadJsonData() {
 	const inputElement = document.createElement("input");
 	inputElement.type = "file";
 	inputElement.accept = "application/json";
-	inputElement.addEventListener("change", (event) => {
+	inputElement.addEventListener("change", (_event) => {
 		try {
-			console.log("event:", event);
-			console.log("files:", inputElement.files);
-			if (!inputElement.files) {
+			if (!inputElement.files || !inputElement.files[0]) {
 				throw new Error("Input element has no file");
 			}
 

content/options.mjs.js

@@ -70,6 +70,9 @@ function initNavigation() {
 	for (const navElement of navElements) {
 		/** @type {HTMLElement[]} */
 		const navSelectors = Array.from(navElement.querySelectorAll(":scope>[pane]"));
+		if (!navSelectors[0]) {
+			throw new Error("No nav selector found under nav element.");
+		}
 		// initialize the navigation to the first navigation selector
 		setNavigation(navSelectors[0]);
 		// add navigation callback to click event
@@ -415,7 +418,7 @@ async function initAccount() {
 	}
 
 	// select first account at start
-	items[0].click();
+	items[0]?.click();
 }
 
 /**

content/table.mjs.js

@@ -135,6 +135,9 @@ export default class DataTable {
 	 */
 	constructor(tableElement, editable = false, updatedCellValueCallback = undefined, deleteRowCallback = undefined) {
 		this._tbody = tableElement.getElementsByTagName("tbody")[0];
+		if (!this._tbody) {
+			throw new Error("No tbody element found.");
+		}
 		this._isEditable = editable;
 		this._isEditing = false;
 		this._updatedCellValueCallback = updatedCellValueCallback;
@@ -154,12 +157,14 @@ export default class DataTable {
 	 */
 	showData(data, sortOrder) {
 		if (sortOrder) {
-			data.sort((a,b) => {
+			data.sort((a, b) => {
 				for (const column of sortOrder) {
-					if (a[column] < b[column]) {
+					const aColumn = a[column] ?? "";
+					const bColumn = b[column] ?? "";
+					if (aColumn < bColumn) {
 						return -1;
 					}
-					if (a[column] > b[column]) {
+					if (aColumn > bColumn) {
 						return 1;
 					}
 				}

experiments/dkimHeader.js

@@ -919,11 +919,10 @@ this.dkimHeader = class extends ExtensionCommon.ExtensionAPI {
 	}
 
 	/**
-	 * @param {ExtensionCommon.Context} context
+	 * @param {ExtensionCommon.Context} _context
 	 * @returns {{dkimHeader: browser.dkimHeader}}
 	 */
-	// eslint-disable-next-line no-unused-vars
-	getAPI(context) {
+	getAPI(_context) {
 		return {
 			dkimHeader: {
 				showDkimHeader: (tabId, messageId, show) => {

experiments/jsdns.js

@@ -27,7 +27,7 @@ var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
  */
 function toType(obj) {
 	const typeMatch = Object.prototype.toString.call(obj).match(/\s([a-zA-Z]+)/);
-	if (!typeMatch) {
+	if (!typeMatch || !typeMatch[1]) {
 		throw new Error(`Failed to get type for ${obj}`);
 	}
 	return typeMatch[1];
@@ -65,7 +65,7 @@ this.jsdns = class extends ExtensionCommon.ExtensionAPI {
 					return Promise.resolve();
 				},
 				txt(name) {
-					/** @type {QueryDnsCallback<{resolve: function(browser.jsdns.TxtResult): void, reject: function(Error): void}>} */
+					/** @type {QueryDnsCallback<{resolve: function(browser.jsdns.TxtResult): void, reject: function(unknown): void}>} */
 					function dnsCallback(dnsResult, defer, queryError, rcode) {
 						try {
 							let resRcode = RCODE.NoError;
@@ -76,7 +76,7 @@ this.jsdns = class extends ExtensionCommon.ExtensionAPI {
 								let error = "";
 								if (typeof queryError === "string") {
 									error = context.extension.localeData.localizeMessage(queryError);
-								} else if (toType(queryError) === "Array") {
+								} else if (toType(queryError) === "Array" && queryError[0]) {
 									error = context.extension.localeData.localizeMessage(queryError[0], queryError[1]);
 								}
 								if (!error) {

experiments/libunbound.d.ts

@@ -38,8 +38,8 @@ namespace Libunbound {
         getNameserversFromOS: boolean,
         nameservers: string[],
         trustAnchors: string[],
-        conf?: string,
-        debuglevel?: number,
+        conf?: string | undefined,
+        debuglevel?: number| undefined,
     }
     interface WorkerRequest extends MessageEvent {
         data: Request;

experiments/libunbound.js

@@ -349,7 +349,10 @@ this.libunbound = class extends ExtensionCommon.ExtensionAPI {
 
 		const aomStartup = Cc[
 			"@mozilla.org/addons/addon-manager-startup;1"
-		].getService(Ci.amIAddonManagerStartup);
+		]?.getService(Ci.amIAddonManagerStartup);
+		if (!aomStartup) {
+			throw new Error("Failed to get amIAddonManagerStartup");
+		}
 		const manifestURI = Services.io.newURI(
 			"manifest.json",
 			null,
@@ -364,11 +367,10 @@ this.libunbound = class extends ExtensionCommon.ExtensionAPI {
 	}
 
 	/**
-	 * @param {ExtensionCommon.Context} context
+	 * @param {ExtensionCommon.Context} _context
 	 * @returns {{libunbound: browser.libunbound}}
 	 */
-	// eslint-disable-next-line no-unused-vars
-	getAPI(context) {
+	getAPI(_context) {
 		const RCODE = {
 			NoError: 0, // No Error [RFC1035]
 			FormErr: 1, // Format Error [RFC1035]

experiments/libunboundWorker.jsm.js

@@ -207,6 +207,7 @@ function resolve(name, rrtype) {
 			/** @type {number[]} */
 			const rdata = new Array(tmp.length);
 			for (let i = 0; i < tmp.length; i++) {
+				// @ts-expect-error
 				rdata[i] = tmp[i];
 			}
 			data_raw.push(rdata);
@@ -222,6 +223,7 @@ function resolve(name, rrtype) {
 					// read all <character-string>s
 					while (i < rdata.length) {
 						// get length of current <character-string>
+						// @ts-expect-error
 						j = rdata[i];
 						i += 1;
 						// read current <character-string>
@@ -306,7 +308,7 @@ function load(paths) {
 		postLog.debug(`loading dependency: ${libDepPath}`);
 		libDeps.push(ctypes.open(libDepPath));
 	}
-	const path = libPaths.slice(-1)[0];
+	const path = libPaths.slice(-1)[0] ?? "";
 	postLog.debug(`loading libunbound: ${path}`);
 	lib = ctypes.open(path);
 
@@ -422,40 +424,35 @@ function update_ctx(conf, debuglevel, getNameserversFromOS, nameservers, trustAn
 	// read config file if specified
 	if (conf) {
 		if ((retval = ub_ctx_config(ctx, conf)) !== 0) {
-			throw new Error(`error in ub_ctx_config: ${
-				ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
+			throw new Error(`error in ub_ctx_config: ${ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
 		}
 	}
 
 	// set debuglevel if specified
 	if (debuglevel) {
 		if ((retval = ub_ctx_debuglevel(ctx, debuglevel)) !== 0) {
-			throw new Error(`error in ub_ctx_debuglevel: ${
-				ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
+			throw new Error(`error in ub_ctx_debuglevel: ${ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
 		}
 	}
 
 	// get DNS servers form OS
 	if (getNameserversFromOS) {
 		if ((retval = ub_ctx_resolvconf(ctx, null)) !== 0) {
-			throw new Error(`error in ub_ctx_resolvconf: ${
-				ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
+			throw new Error(`error in ub_ctx_resolvconf: ${ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
 		}
 	}
 
 	// set additional DNS servers
 	nameservers.forEach(function (element /*, index, array*/) {
 		if ((retval = ub_ctx_set_fwd(ctx, element.trim())) !== 0) {
-			throw new Error(`error in ub_ctx_set_fwd: ${
-				ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
+			throw new Error(`error in ub_ctx_set_fwd: ${ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
 		}
 	});
 
 	// add root trust anchors
 	trustAnchors.forEach(function (element /*, index, array*/) {
 		if ((retval = ub_ctx_add_ta(ctx, element.trim())) !== 0) {
-			throw new Error(`error in ub_ctx_add_ta: ${
-				ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
+			throw new Error(`error in ub_ctx_add_ta: ${ub_strerror(retval).readString()}. errno: ${ctypes.errno}`);
 		}
 	});
 
@@ -508,18 +505,21 @@ onmessage = function (msg) {
 				result: res,
 			});
 		} catch (exception) {
+			// @ts-expect-error
 			postLog.debug(`Posting exception back to main script: ${exception}; stack: ${exception.stack}`);
 			postMessage({
 				type: "error",
 				subType: "DKIM_DNSERROR_UNKNOWN",
 				callId: msg.data.callId,
 				message: `libunboundWorker: ${exception}`,
+				// @ts-expect-error
 				stack: exception.stack,
 			});
 		}
 	} catch (e) {
 		// @ts-expect-error
 		dump(`${e}\n`);
+		// @ts-expect-error
 		postLog.error(`Exception: ${e}; stack: ${e.stack}`);
 	}
 };

experiments/mailUtils.js

@@ -21,11 +21,10 @@ var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 // eslint-disable-next-line no-invalid-this
 this.mailUtils = class extends ExtensionCommon.ExtensionAPI {
 	/**
-	 * @param {ExtensionCommon.Context} context
+	 * @param {ExtensionCommon.Context} _context
 	 * @returns {{mailUtils: browser.mailUtils}}
 	 */
-	// eslint-disable-next-line no-unused-vars
-	getAPI(context) {
+	getAPI(_context) {
 		return {
 			mailUtils: {
 				/**
@@ -44,6 +43,7 @@ this.mailUtils = class extends ExtensionCommon.ExtensionAPI {
 						// domains like "blogspot.co.uk", "blogspot.com", "googlecode.com"
 						// are on the public suffix list, but should be valid base domains
 						// because e-mails may be send from them
+						// @ts-expect-error
 						if (e.result === Cr.NS_ERROR_INSUFFICIENT_DOMAIN_LEVELS) {
 							// add "invalid" subdomain to avoid error
 							const invalidSub = "invalid.";

experiments/migration.js

@@ -78,11 +78,10 @@ this.migration = class extends ExtensionCommon.ExtensionAPI {
 	}
 
 	/**
-	 * @param {ExtensionCommon.Context} context
+	 * @param {ExtensionCommon.Context} _context
 	 * @returns {{migration: browser.migration}}
 	 */
-	// eslint-disable-next-line no-unused-vars
-	getAPI(context) {
+	getAPI(_context) {
 		return {
 			migration: {
 				getUserPrefs: () => {

experiments/storageMessage.js

@@ -29,11 +29,10 @@ this.storageMessage = class extends ExtensionCommon.ExtensionAPI {
 	}
 
 	/**
-	 * @param {ExtensionCommon.Context} context
+	 * @param {ExtensionCommon.Context} _context
 	 * @returns {{storageMessage: browser.storageMessage}}
 	 */
-	// eslint-disable-next-line no-unused-vars
-	getAPI(context) {
+	getAPI(_context) {
 		return {
 			storageMessage: {
 				set: (messageId, key, value) => {