@@ -12,8 +12,6 @@ const log = debug('ipfs-companion:redirect-handler:blockOrObserve')
1212log . error = debug ( 'ipfs-companion:redirect-handler:blockOrObserve:error' )
1313
1414export const DEFAULT_NAMESPACES = new Set ( [ 'ipfs' , 'ipns' ] )
15-
16- export const GLOBAL_STATE_CHANGE = 'GLOBAL_STATE_CHANGE'
1715export const GLOBAL_STATE_OPTION_CHANGE = 'GLOBAL_STATE_OPTION_CHANGE'
1816export const DELETE_RULE_REQUEST = 'DELETE_RULE_REQUEST'
1917export const DELETE_RULE_REQUEST_SUCCESS = 'DELETE_RULE_REQUEST_SUCCESS'
@@ -32,7 +30,7 @@ interface redirectHandlerInput {
3230 getPort : ( state : CompanionState ) => string
3331}
3432
35- type messageToSelfType = typeof GLOBAL_STATE_CHANGE | typeof GLOBAL_STATE_OPTION_CHANGE | typeof DELETE_RULE_REQUEST
33+ type messageToSelfType = typeof GLOBAL_STATE_OPTION_CHANGE | typeof DELETE_RULE_REQUEST
3634interface messageToSelf {
3735 type : messageToSelfType
3836 value ?: string | Record < string , unknown >
@@ -50,36 +48,38 @@ export const defaultNSRegexStr = `(${[...DEFAULT_NAMESPACES].join('|')})`
5048export const supportsBlock = ( ) : boolean => ! ( browser . declarativeNetRequest ?. MAX_NUMBER_OF_DYNAMIC_AND_SESSION_RULES > 0 )
5149
5250/**
53- * Notify self about state change.
54- * @returns void
51+ * Sends message to self to notify about change.
52+ *
53+ * @param msg
5554 */
56- export async function notifyStateChange ( ) : Promise < void > {
57- return await sendMessageToSelf ( GLOBAL_STATE_CHANGE )
55+ async function sendMessageToSelf ( msg : messageToSelfType , value ?: any ) : Promise < void > {
56+ // this check ensures we don't send messages to ourselves if blocking mode is enabled.
57+ if ( ! supportsBlock ( ) ) {
58+ const message : messageToSelf = { type : msg , value }
59+ // on FF, this call waits for the response from the listener.
60+ // on Chrome, this needs a callback.
61+ await browser . runtime . sendMessage ( message )
62+ }
5863}
5964
6065/**
6166 * Notify self about option change.
67+ *
6268 * @returns void
6369 */
6470export async function notifyOptionChange ( ) : Promise < void > {
71+ log ( 'notifyOptionChange' )
6572 return await sendMessageToSelf ( GLOBAL_STATE_OPTION_CHANGE )
6673}
6774
68- export async function notifyDeleteRule ( id : number ) : Promise < void > {
69- return await sendMessageToSelf ( DELETE_RULE_REQUEST , id )
70- }
71-
7275/**
73- * Sends message to self to notify about change .
76+ * Notify self about rule deletion .
7477 *
75- * @param msg
78+ * @param id number
79+ * @returns void
7680 */
77- async function sendMessageToSelf ( msg : messageToSelfType , value ?: any ) : Promise < void > {
78- // this check ensures we don't send messages to ourselves if blocking mode is enabled.
79- if ( ! supportsBlock ( ) ) {
80- const message : messageToSelf = { type : msg }
81- await browser . runtime . sendMessage ( message )
82- }
81+ export async function notifyDeleteRule ( id : number ) : Promise < void > {
82+ return await sendMessageToSelf ( DELETE_RULE_REQUEST , id )
8383}
8484
8585const savedRegexFilters : Map < string , regexFilterMap > = new Map ( )
@@ -205,7 +205,8 @@ async function cleanupRuleById (id: number): Promise<void> {
205205 * @param {function } handlerFn
206206 */
207207function setupListeners ( handlers : Record < messageToSelfType , ( value : any ) => Promise < void > > ) : void {
208- browser . runtime . onMessage . addListener ( async ( { message : { type, value } } : { message : messageToSelf } ) : Promise < void > => {
208+ browser . runtime . onMessage . addListener ( async ( message : messageToSelf ) : Promise < void > => {
209+ const { type, value } = message
209210 if ( type in handlers ) {
210211 await handlers [ type ] ( value )
211212 }
@@ -340,6 +341,23 @@ export function generateAddRule (
340341 */
341342export function addRuleToDynamicRuleSetGenerator (
342343 getState : ( ) => CompanionState ) : ( input : redirectHandlerInput ) => Promise < void > {
344+ // setup listeners for the extension.
345+ setupListeners ( {
346+ [ GLOBAL_STATE_OPTION_CHANGE ] : async ( ) : Promise < void > => {
347+ log ( 'GLOBAL_STATE_OPTION_CHANGE' )
348+ await cleanupRules ( true )
349+ await reconcileRulesAndRemoveOld ( getState ( ) )
350+ } ,
351+ [ DELETE_RULE_REQUEST ] : async ( value : number ) : Promise < void > => {
352+ if ( value != null ) {
353+ await cleanupRuleById ( value )
354+ await browser . runtime . sendMessage ( { type : DELETE_RULE_REQUEST_SUCCESS } )
355+ } else {
356+ await cleanupRules ( true )
357+ }
358+ }
359+ } )
360+
343361 // returning a closure to avoid passing `getState` as an argument to `addRuleToDynamicRuleSet`.
344362 return async function ( { originUrl, redirectUrl } : redirectHandlerInput ) : Promise < void > {
345363 // update the rules so that the next request is handled correctly.
@@ -378,24 +396,6 @@ export function addRuleToDynamicRuleSetGenerator (
378396 }
379397 )
380398 }
381-
382- setupListeners ( {
383- [ GLOBAL_STATE_CHANGE ] : async ( ) : Promise < void > => {
384- await reconcileRulesAndRemoveOld ( getState ( ) )
385- } ,
386- [ GLOBAL_STATE_OPTION_CHANGE ] : async ( ) : Promise < void > => {
387- await cleanupRules ( true )
388- await reconcileRulesAndRemoveOld ( getState ( ) )
389- } ,
390- [ DELETE_RULE_REQUEST ] : async ( value : number ) : Promise < void > => {
391- if ( value != null ) {
392- await cleanupRuleById ( value )
393- await browser . runtime . sendMessage ( { type : DELETE_RULE_REQUEST_SUCCESS } )
394- } else {
395- await cleanupRules ( true )
396- }
397- }
398- } )
399399 // call to reconcile rules and remove old ones.
400400 await reconcileRulesAndRemoveOld ( state )
401401 }
0 commit comments