Browse Source

Merge branch 'master' of https://github.com/gorhill/uMatrix

pull/2/head
Raymond Hill 7 years ago
parent
commit
6d85d53868
No known key found for this signature in database GPG Key ID: 25E1490B761470C2
  1. 173
      platform/firefox/vapi-client.js

173
platform/firefox/vapi-client.js

@ -73,59 +73,77 @@ vAPI.shutdown = (function() {
/******************************************************************************/ /******************************************************************************/
var messagingConnector = function(response) {
if ( !response ) {
return;
}
var channels = vAPI.messaging.channels;
var channel, listener;
vAPI.messaging = {
listeners: new Set(),
pending: new Map(),
requestId: 1,
connected: false,
if ( response.broadcast && !response.channelName ) {
for ( channel in channels ) {
if ( channels.hasOwnProperty(channel) === false ) {
continue;
setup: function() {
this.addListener(this.builtinListener);
if ( this.toggleListenerCallback === null ) {
this.toggleListenerCallback = this.toggleListener.bind(this);
} }
listener = channels[channel].listener;
if ( typeof listener === 'function' ) {
listener(response.msg);
window.addEventListener('pagehide', this.toggleListenerCallback, true);
window.addEventListener('pageshow', this.toggleListenerCallback, true);
},
shutdown: function() {
if ( this.toggleListenerCallback !== null ) {
window.removeEventListener('pagehide', this.toggleListenerCallback, true);
window.removeEventListener('pageshow', this.toggleListenerCallback, true);
} }
this.removeAllListeners();
//service pending callbacks
var pending = this.pending;
this.pending.clear();
for ( var callback of pending.values() ) {
if ( typeof callback === 'function' ) {
callback(null);
} }
return;
} }
},
if ( response.requestId ) {
listener = vAPI.messaging.listeners[response.requestId];
delete vAPI.messaging.listeners[response.requestId];
delete response.requestId;
connect: function() {
if ( !this.connected ) {
if ( this.messageListenerCallback === null ) {
this.messageListenerCallback = this.messageListener.bind(this);
} }
if ( !listener ) {
channel = channels[response.channelName];
listener = channel && channel.listener;
addMessageListener(this.messageListenerCallback);
this.connected = true;
} }
},
if ( typeof listener === 'function' ) {
listener(response.msg);
disconnect: function() {
if ( this.connected ) {
removeMessageListener();
this.connected = false;
} }
};
/******************************************************************************/
},
vAPI.messaging = {
channels: {},
listeners: {},
requestId: 1,
messageListener: function(msg) {
var details = JSON.parse(msg);
if ( !details ) {
return;
}
setup: function() {
this.connector = function(msg) {
messagingConnector(JSON.parse(msg));
};
if ( details.broadcast ) {
this.sendToListeners(details.msg);
return;
}
addMessageListener(this.connector);
if ( details.requestId ) {
var listener = this.pending.get(details.requestId);
if ( listener !== undefined ) {
this.pending.delete(details.requestId);
listener(details.msg);
return;
}
}
},
messageListenerCallback: null,
this.channels.vAPI = {
listener: function(msg) {
builtinListener: function(msg) {
if ( typeof msg.cmd === 'string' && msg.cmd === 'injectScript' ) { if ( typeof msg.cmd === 'string' && msg.cmd === 'injectScript' ) {
var details = msg.details; var details = msg.details;
if ( !details.allFrames && window !== window.top ) { if ( !details.allFrames && window !== window.top ) {
@ -133,72 +151,61 @@ vAPI.messaging = {
} }
self.injectScript(details.file); self.injectScript(details.file);
} }
}
};
},
close: function() {
if ( !this.connector ) {
return;
}
removeMessageListener();
this.connector = null;
this.channels = {};
this.listeners = {};
}, },
channel: function(channelName, callback) {
if ( !channelName ) {
return;
}
this.channels[channelName] = {
channelName: channelName,
listener: typeof callback === 'function' ? callback : null,
send: function(message, callback) {
if ( !vAPI.messaging.connector ) {
vAPI.messaging.setup();
}
send: function(channelName, message, callback) {
this.connect()
message = { message = {
channelName: self._sandboxId_ + '|' + this.channelName,
channelName: self._sandboxId_ + '|' + channelName,
msg: message msg: message
}; };
if ( callback ) { if ( callback ) {
message.requestId = vAPI.messaging.requestId++;
vAPI.messaging.listeners[message.requestId] = callback;
message.requestId = this.requestId++;
this.pending.set(message.requestId, callback);
} }
sendAsyncMessage('umatrix:background', message); sendAsyncMessage('umatrix:background', message);
}, },
close: function() {
delete vAPI.messaging.channels[this.channelName];
}
};
return this.channels[channelName];
},
toggleListener: function({type, persisted}) { toggleListener: function({type, persisted}) {
if ( !vAPI.messaging.connector ) {
if ( type === 'pagehide' && !persisted ) {
vAPI.shutdown.exec();
this.shutdown();
return; return;
} }
if ( type === 'pagehide' ) { if ( type === 'pagehide' ) {
removeMessageListener();
return;
this.disconnect();
} else /* if ( type === 'pageshow' ) */ {
this.connect();
} }
},
toggleListenerCallback: null,
if ( persisted ) {
addMessageListener(vAPI.messaging.connector);
sendToListeners: function(msg) {
for ( var listener of this.listeners ) {
listener(msg);
} }
},
addListener: function(listener) {
this.listeners.add(listener);
this.connect()
},
removeListener: function(listener) {
this.listeners.delete(listener);
},
removeAllListeners: function() {
this.disconnect();
this.listeners.clear();;
} }
}; };
window.addEventListener('pagehide', vAPI.messaging.toggleListener, true);
window.addEventListener('pageshow', vAPI.messaging.toggleListener, true);
vAPI.messaging.setup()
/******************************************************************************/ /******************************************************************************/
@ -206,7 +213,9 @@ window.addEventListener('pageshow', vAPI.messaging.toggleListener, true);
// we are not a top window (because element picker can still // we are not a top window (because element picker can still
// be injected in top window). // be injected in top window).
if ( window !== window.top ) { if ( window !== window.top ) {
// Can anything be done?
vAPI.shutdown.add(function() {
vAPI = null;
});
} }
/******************************************************************************/ /******************************************************************************/

Loading…
Cancel
Save