Add new Server --> CEF implementation

This commit is contained in:
Micah Allen 2018-11-01 22:01:11 -04:00
parent d748eb892b
commit 26c110f316

View File

@ -221,6 +221,13 @@ rpc.callClient = (player, name, args) => {
} }
case "cef": { case "cef": {
const id = util.uid(); const id = util.uid();
console.log('CEF IS CALLING THE CLIENT WITH THIS DATA: ', {
req: 1,
id,
name,
env: environment,
args
});
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
pending[id] = { pending[id] = {
resolve, resolve,
@ -238,21 +245,27 @@ rpc.callClient = (player, name, args) => {
} }
}; };
/** function callBrowser(id, browser, name, args, extraData){
* Calls a remote procedure registered in any browser context. return new Promise((resolve, reject) => {
* @param {string} name - The name of the registered procedure. pending[id] = {
* @param args - Any parameters for the procedure. resolve,
* @returns {Promise} - The result from the procedure. reject
*/ };
//serverside passEventToBrowser(browser, util.stringifyData({
//callBrowser(player, name, args) req: 1,
// id,
//clientside or cef name,
//callBrowser(name, args) env: environment,
// args,
//clientside ...extraData
//callBrowser(browser, name, args) }));
rpc.callBrowser = async (name, args) => { });
}
async function callBrowsers(player, name, args, extraData){
switch(environment){
case "client": {
args = name;
name = player;
const id = util.uid(); const id = util.uid();
const numBrowsers = mp.browsers.length; const numBrowsers = mp.browsers.length;
let browser; let browser;
@ -274,22 +287,60 @@ rpc.callBrowser = async (name, args) => {
}); });
if(browser) break; if(browser) break;
} }
if(browser){ if(browser) return callBrowser(id, browser, name, args, extraData);
return new Promise((resolve, reject) => { throw 'PROCEDURE_NOT_FOUND';
pending[id] = {
resolve,
reject
};
passEventToBrowser(browser, util.stringifyData({
req: 1,
id,
name,
env: environment,
args
}));
});
} }
return Promise.reject('PROCEDURE_NOT_FOUND'); case "server": {
return rpc.callClient(player, '__rpc:callBrowsers', [name, args]);
}
case "cef": {
args = name;
name = player;
return rpc.callClient('__rpc:callBrowsers', [name, args]);
}
}
}
/**
* Calls a remote procedure registered in any browser context.
*
* Can be called from any environment.
*
* @param {object} [player] - The player to call the procedure on.
* @param {string} name - The name of the registered procedure.
* @param args - Any parameters for the procedure.
* @returns {Promise} - The result from the procedure.
*/
rpc.callBrowsers = async function(player, name, args){
switch(environment){
case "client":
if(arguments.length !== 1 && arguments.length !== 2) throw 'callBrowsers from the client expects 1 or 2 arguments: "name" and optional "args"';
break;
case "server":
if(arguments.length !== 2 && arguments.length !== 3) throw 'callBrowsers from the server expects 2 or 3 arguments: "player", "name", and optional "args"';
break;
case "cef":
if(arguments.length !== 1 && arguments.length !== 2) throw 'callBrowsers from the browser expects 1 or 2 arguments: "name" and optional "args"';
break;
}
return callBrowsers(player, name, args, {});
};
/**
* Calls a remote procedure registered in a specific browser instance.
*
* Client-side environment only.
*
* @param {object} browser - The browser instance.
* @param {string} name - The name of the registered procedure.
* @param args - Any parameters for the procedure.
* @returns {Promise} - The result from the procedure.
*/
rpc.callBrowser = function(browser, name, args){
if(environment !== "client") throw 'callBrowser can only be used in the client environment';
if(arguments.length !== 2 || arguments.length !== 3) throw 'callBrowser expects 2 or 3 arguments: "browser", "name", and optional "args"';
const id = util.uid();
return callBrowser(id, browser, name, args, {});
}; };
// set up internal pass-through events // set up internal pass-through events
@ -299,6 +350,12 @@ if(environment === "client"){
fenv: info.environment fenv: info.environment
}); });
}); });
rpc.register('__rpc:callBrowsers', ([name, args], info) => {
return callBrowsers(name, args, null, {
fenv: info.environment
});
});
} }
module.exports = rpc; module.exports = rpc;