Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits: 67136454 by Pier Angelo Vendrame at 2025-02-26T11:52:52+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Update types to be compatible with future RR eslint settings.
- - - - - e687a9b7 by Pier Angelo Vendrame at 2025-02-26T11:52:58+01:00 fixup! TB 40933: Add tor-launcher functionality
Update types to be compatible with future RR eslint settings.
- - - - -
4 changed files:
- browser/components/torpreferences/content/connectionPane.js - toolkit/components/tor-launcher/TorControlPort.sys.mjs - toolkit/components/tor-launcher/TorProvider.sys.mjs - toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs
Changes:
===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -343,7 +343,7 @@ const gBridgeGrid = {
observe(subject, topic) { switch (topic) { - case TorSettingsTopics.SettingsChanged: + case TorSettingsTopics.SettingsChanged: { const { changes } = subject.wrappedJSObject; if ( changes.includes("bridges.source") || @@ -352,6 +352,7 @@ const gBridgeGrid = { this._updateRows(); } break; + } case TorProviderTopics.BridgeChanged: this._updateConnectedBridge(); break; @@ -1019,7 +1020,7 @@ const gBuiltinBridgesArea = {
observe(subject, topic) { switch (topic) { - case TorSettingsTopics.SettingsChanged: + case TorSettingsTopics.SettingsChanged: { const { changes } = subject.wrappedJSObject; if ( changes.includes("bridges.source") || @@ -1031,6 +1032,7 @@ const gBuiltinBridgesArea = { this._updateBridgeIds(); } break; + } case TorProviderTopics.BridgeChanged: this._updateConnectedBridge(); break; @@ -1365,7 +1367,7 @@ const gLoxStatus = {
observe(subject, topic) { switch (topic) { - case TorSettingsTopics.SettingsChanged: + case TorSettingsTopics.SettingsChanged: { const { changes } = subject.wrappedJSObject; if (changes.includes("bridges.source")) { this._updateLoxId(); @@ -1376,6 +1378,7 @@ const gLoxStatus = { // *before* we do. In particular, we want to make sure the invites and // event data has been cleared. break; + } case LoxTopics.UpdateActiveLoxId: this._updateLoxId(); break; @@ -1881,7 +1884,7 @@ const gBridgeSettings = {
observe(subject, topic) { switch (topic) { - case TorSettingsTopics.SettingsChanged: + case TorSettingsTopics.SettingsChanged: { const { changes } = subject.wrappedJSObject; if (changes.includes("bridges.enabled")) { this._updateEnabled(); @@ -1893,6 +1896,7 @@ const gBridgeSettings = { this._updateBridgeStrings(); } break; + } } },
===================================== toolkit/components/tor-launcher/TorControlPort.sys.mjs ===================================== @@ -973,7 +973,7 @@ export class TorController { throw new Error(`Unsupported type ${typeof value} (key ${key})`); }) .join(" "); - return this.#sendCommandSimple(`SETCONF ${args}`); + await this.#sendCommandSimple(`SETCONF ${args}`); }
/** @@ -984,14 +984,14 @@ export class TorController { * @param {boolean} enabled Tell whether the network should be enabled */ async setNetworkEnabled(enabled) { - return this.setConf([["DisableNetwork", !enabled]]); + await this.setConf([["DisableNetwork", !enabled]]); }
/** * Ask Tor to write out its config options into its torrc. */ async flushSettings() { - return this.#sendCommandSimple("SAVECONF"); + await this.#sendCommandSimple("SAVECONF"); }
// Onion service authentication @@ -1075,7 +1075,7 @@ export class TorController { * them is closed. */ async takeOwnership() { - return this.#sendCommandSimple("TAKEOWNERSHIP"); + await this.#sendCommandSimple("TAKEOWNERSHIP"); }
/** @@ -1085,7 +1085,7 @@ export class TorController { * should be stopped by calling this function. */ async resetOwningControllerProcess() { - return this.#sendCommandSimple("RESETCONF __OwningControllerProcess"); + await this.#sendCommandSimple("RESETCONF __OwningControllerProcess"); }
// Signals @@ -1094,7 +1094,7 @@ export class TorController { * Ask Tor to swtich to new circuits and clear the DNS cache. */ async newnym() { - return this.#sendCommandSimple("SIGNAL NEWNYM"); + await this.#sendCommandSimple("SIGNAL NEWNYM"); }
// Events monitoring
===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -489,7 +489,7 @@ export class TorProvider { * @param {boolean} isPermanent Tell whether the key should be saved forever */ async onionAuthAdd(address, b64PrivateKey, isPermanent) { - return this.#controller.onionAuthAdd(address, b64PrivateKey, isPermanent); + await this.#controller.onionAuthAdd(address, b64PrivateKey, isPermanent); }
/** @@ -498,7 +498,7 @@ export class TorProvider { * @param {string} address The address of the onion service */ async onionAuthRemove(address) { - return this.#controller.onionAuthRemove(address); + await this.#controller.onionAuthRemove(address); }
/**
===================================== toolkit/components/tor-launcher/TorProviderBuilder.sys.mjs ===================================== @@ -142,6 +142,8 @@ export class TorProviderBuilder { * Build a provider. * This method will wait for the system to be initialized, and allows you to * catch also any initialization errors. + * + * @returns {TorProvider} A TorProvider instance */ static async build() { if (!this.#provider && this.providerType === TorProviders.none) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/82698f9...