seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

work continues on changing jamClient calls to asynchronous

This commit is contained in:
Nuwan 2022-04-18 19:08:02 +05:30
parent cd93211406
commit 43caffb85e
12 changed files with 147 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/app/assets/javascripts/JamServer.js
View File

@ -669,9 +669,9 @@
}
if(!mode) {
mode = 'client'
if (context.jamClient && context.jamClient.getOperatingMode) {
//if (context.jamClient && context.jamClient.getOperatingMode) {
mode = context.jamClient.getOperatingMode()
}
//}
isLatencyTesterMode = mode == 'server';
}
@ -937,7 +937,6 @@
async function connect(){
if (context.jamClient !== undefined && await context.jamClient.IsNativeClient()) {
await context.jamClient.SendP2PMessage.connect(server.sendP2PMessage);
//if (context.jamClient.SendLogin) {
await context.jamClient.SendLogin.connect(server.sendLogin);
await context.jamClient.SendLogin.connect(server.sendLogout);

143
web/app/assets/javascripts/asyncJamClient.js
View File

@ -3,10 +3,24 @@
context.JK = context.JK || {};
class Deferred {
constructor(request_id) {
var self = this;
this.request_id = request_id;
this.promise = new Promise(function (resolve, reject) {
self.reject = reject;
self.resolve = resolve;
});
}
}
context.JK.AsyncJamClient = function (app) {
const self = this;
let proxy, jkfrontendchannel;
let deferredQueue = [];
let jkfrontendchannel;
let enumAppCounter = 1000;
let request_id = 1;
const JKFrontendMethods = Object.freeze({
UnknownJKAppMessage: enumAppCounter++,
AbortRecording: enumAppCounter++,
@ -275,7 +289,7 @@
VST_ScanForMidiDevices: enumAppCounter++
});
function setupWebSocket() {
function setupWebSocketConnection(){
const baseUrl = "ws://localhost:3060";
console.log("connecting to WebSocket server at " + baseUrl + ".");
@ -288,9 +302,9 @@
// Try to reconnect.
if (!navigator.onLine) {
//alert("You are offline. Please connect to the Internet and try again.");
//alert("You are offline. Please connect to the Internet and try again.");
}
}
}
};
socket.onerror = function (error) {
@ -301,81 +315,80 @@
console.log("WebSocket connected, setting up QWebChannel.");
new QWebChannel(socket, function (channel) {
jkfrontendchannel = channel.objects.jkfrontendchannel;
console.log(">>>> jkfrontendchannel", jkfrontendchannel);
if(jkfrontendchannel){
jkfrontendchannel.sendText.connect(function (message) {
console.log("Received message: " + message);
});
console.log("Connected to WebChannel, ready to send/receive messages!");
let deferred;
try{
jkfrontendchannel.sendText.connect(function (message) {
//console.log("Message received via QWebChannel: " + message);
let msg = JSON.parse(message)
let req_id = msg.request_id
let response = msg.response;
deferred = deferredQueue.find(d => {
return d.request_id === req_id
});
if(deferred){
deferred.resolve(response)
//remove this deferred object from queue
deferredQueue = deferredQueue.filter((d) => d.request_id !== deferred.request_id)
}
});
//TODO: handle method does not exist
}catch(e){
console.log("Error when receving message via QWebChannel");
if(deferred){
deferred.reject(e.message)
deferred = null
}
}
}
});
};
}
function init() {
let request_id = 1;
setupWebSocket();
function setupAsyncProxy(){
let proxy;
const handler = {
get(target, prop) {
return function () {
console.log('[asyncJamClient] calling method:', prop);
//console.log(Array.from(arguments));
get(target, prop, receiver) {
const origMethod = target[prop];
//console.log('[asyncJamClient] get:', target, prop);
return function(...args){
// let result = origMethod.apply(this, args);
// console.log(prop + JSON.stringify(args)+ ' -> ' + JSON.stringify(result));
// return result;
let appMessage = new Object();
let appMessage = new Object();
appMessage.request_id = ++request_id;
appMessage.arguments = Array.from(arguments) || [];
appMessage.arguments = Array.from(arguments) || [];
let method = JKFrontendMethods[prop];
appMessage.method = method
let deferred = new Deferred(appMessage.request_id)
let method = JKFrontendMethods[prop];
if(!method || !jkfrontendchannel) return
appMessage.method = method
console.log("[asyncJamClient] appMessage:", appMessage);
try {
//console.log('[asyncJamClient] diverting to backend:', prop, appMessage);
jkfrontendchannel.receiveText(JSON.stringify(appMessage));
deferredQueue.push(deferred)
return deferred.promise;
} catch (e) {
console.log("Native app not connected");
}
new Promise(function (resolve, reject) {
try {
jkfrontendchannel.receiveText(
JSON.stringify(appMessage),
function (resp) {
console.log("[asyncJamClient] response received:", resp);
resolve(resp);
}
);
//TODO: handle 404 error - return null if method does not exist
} catch (e) {
console.log("[asyncJamClient] error: Native app not connected");
reject(Error(e.message)); //TODO: reject with custom error object QWebChannelError(e.message, e.data)
}
});
return true; //return true to prevent raising undefined method error
};
},
};
//let jamClient = context.jamClient;
}
}
}
proxy = new Proxy(self, handler);
// let proxy = new Proxy(obj, {
// get(target, prop){
// let value = target[prop]
// console.log(`target: ${target} | prop: ${prop} | value: ${value}`);
// if (typeof value === 'function') {
// return value.bind(target);
// }else{
// return value
// }
// }
// })
console.log("Connected to WebChannel, ready to send/receive messages!");
return proxy;
}
//this.initialize = initialize;
init();
return proxy;
setupWebSocketConnection()
return setupAsyncProxy()
};
})(window, jQuery);

4
web/app/assets/javascripts/dialog/shareDialog.js
View File

@ -452,7 +452,7 @@
registerEvents(false);
}
function initialize(_facebookHelper) {
async function initialize(_facebookHelper) {
facebookHelper = _facebookHelper;
var dialogBindings = {
@ -467,7 +467,7 @@
facebookHelper.deferredLoginStatus().done(function(response) { handleFbStateChange(response); });
if(context.jamClient.IsNativeClient()) {
if(await context.jamClient.IsNativeClient()) {
$("#btn-share-copy").unbind('click').click(async function() {
await context.jamClient.SaveToClipboard($("#link-contents").text());
return false;

1
web/app/assets/javascripts/everywhere/everywhere.js
View File

@ -214,6 +214,7 @@
}
function initializeStun(app) {
stun = new context.JK.Stun(app);
context.JK.StunInstance = stun;
stun.initialize();

2
web/app/assets/javascripts/react-components/ConfigureOutputsDialog.js.jsx.coffee
View File

@ -46,7 +46,7 @@ ConfigureTracksStore = @ConfigureTracksStore
$output1 = $root.find('.output-1')
$output2 = $root.find('.output-2')
if @state.configureTracks? && @state.configureTracks.trackAssignments.outputs.assigned.length == 2
if @state.configureTracks? && @state.configureTracks.trackAssignments && @state.configureTracks.trackAssignments.outputs.assigned.length == 2
output1 = @state.configureTracks.trackAssignments.outputs.assigned[0].id
output2 = @state.configureTracks.trackAssignments.outputs.assigned[1].id

23
web/app/assets/javascripts/react-components/stores/ConfigureTracksStore.js.coffee
View File

@ -503,19 +503,22 @@ void removeSearchPath(int typeId, QString pathToRemove);
loadTrackInstruments: `async function(forceInputsToUnassign) {
const result = [];
for (let inputsForTrack of Array.from(this.trackAssignments.inputs.assigned)) {
//following if guard was added after changing to asyncJamClient to prevent null errors as this.trackAssignments return null on the initial page load
if(this.trackAssignments){
for (let inputsForTrack of Array.from(this.trackAssignments.inputs.assigned)) {
let clientInstrument = await context.jamClient.TrackGetInstrument(inputsForTrack.assignment);
let clientInstrument = await context.jamClient.TrackGetInstrument(inputsForTrack.assignment);
if (clientInstrument === 0) {
logger.debug('defaulting track instrument for assignment '+ this.trackNumber);
await context.jamClient.TrackSetInstrument(inputsForTrack.assignment, 50);
clientInstrument = 50;
if (clientInstrument === 0) {
logger.debug('defaulting track instrument for assignment '+ this.trackNumber);
await context.jamClient.TrackSetInstrument(inputsForTrack.assignment, 50);
clientInstrument = 50;
}
const instrument = context.JK.client_to_server_instrument_map[clientInstrument];
result.push(inputsForTrack.instrument_id = instrument != null ? instrument.server_id : undefined);
}
const instrument = context.JK.client_to_server_instrument_map[clientInstrument];
result.push(inputsForTrack.instrument_id = instrument != null ? instrument.server_id : undefined);
}
return result;

25
web/app/assets/javascripts/recordingManager.js
View File

@ -166,6 +166,16 @@
return false;
}
async function registerRecordingManagerCallbacks(){
await context.jamClient.RegisterRecordingManagerCallbacks(
"JK.RecordingManagerCommandStart",
"JK.RecordingManagerCommandProgress",
"JK.RecordingManagerCommandStop",
"JK.RecordingManagerCommandsChanged",
"JK.RecordingManagerAsapCommandStatus"
)
}
$fileManager.click(onClick)
$convertCommand.click(onClick)
$downloadCommand.click(onClick)
@ -178,13 +188,14 @@
context.JK.RecordingManagerCommandsChanged = onCommandsChanged;
context.JK.RecordingManagerAsapCommandStatus = onAsapCommandStatus;
context.jamClient.RegisterRecordingManagerCallbacks(
"JK.RecordingManagerCommandStart",
"JK.RecordingManagerCommandProgress",
"JK.RecordingManagerCommandStop",
"JK.RecordingManagerCommandsChanged",
"JK.RecordingManagerAsapCommandStatus"
)
// context.jamClient.RegisterRecordingManagerCallbacks(
// "JK.RecordingManagerCommandStart",
// "JK.RecordingManagerCommandProgress",
// "JK.RecordingManagerCommandStop",
// "JK.RecordingManagerCommandsChanged",
// "JK.RecordingManagerAsapCommandStatus"
// )
registerRecordingManagerCallbacks()
return this;
}

4
web/app/assets/javascripts/sessionModel.js
View File

@ -687,11 +687,11 @@
})
}
function onWebsocketDisconnected(in_error) {
async function onWebsocketDisconnected(in_error) {
// kill the streaming of the session immediately
if(currentSessionId) {
logger.debug("onWebsocketDisconnect: calling jamClient.LeaveSession for clientId=" + clientId);
client.LeaveSession({ sessionID: currentSessionId });
await client.LeaveSession({ sessionID: currentSessionId });
}
}

16
web/app/assets/javascripts/stun.js
View File

@ -16,16 +16,18 @@
var result = await context.jamClient.NetworkTestResult();
if (udp_blocked === null || (result.remote_udp_blocked != udp_blocked)) {
// update the server
if(result){
if (udp_blocked === null || (result.remote_udp_blocked != udp_blocked)) {
// update the server
if(result.remote_udp_blocked) logger.debug("NO STUN: " + JSON.stringify(result));
else logger.debug("STUN capable: " + JSON.stringify(result));
if(result.remote_udp_blocked) logger.debug("NO STUN: " + JSON.stringify(result));
else logger.debug("STUN capable: " + JSON.stringify(result));
udp_blocked = result.remote_udp_blocked;
udp_blocked = result.remote_udp_blocked;
if (changed) changed(result.remote_udp_blocked)
}
if (changed) changed(result.remote_udp_blocked)
}
}
return udp_blocked;
}

2
web/app/assets/javascripts/utils.js
View File

@ -1127,7 +1127,7 @@
if (!(window.jamClient)) {
var p2pMessageFactory = new JK.FakeJamClientMessages();
//window.jamClient = new JK.FakeJamClient(app, p2pMessageFactory); //legacy jamClient calling directly the C++ backend functions
console.log("SETTING UP AsyncJamClient");
console.log("Setting up AsyncJamClient...");
window.jamClient = new JK.AsyncJamClient(app); //new client that asynchronously connects backend via websocket
await window.jamClient.SetFakeRecordingImpl(new JK.FakeJamClientRecordings(app, jamClient, p2pMessageFactory));
}

2
web/app/assets/javascripts/webcam_viewer.js.coffee
View File

@ -33,8 +33,6 @@ BackendToFrontendFPS = {
5: 10
}
#_loadResolutions = `async function(){const resolutions = (this.client.FTUEGetCaptureResolution != null) ? this.client.FTUEGetCaptureResolution() : {};const selectControl = this.resolutionSelect;this.logger.debug('FOUND THESE RESOLUTIONS', resolutions); context._.each(resolutions, function(resolution, resolutionKey, obj) { const frontendResolution = BackendToFrontend[resolutionKey];if (!frontendResolution) { this.logger.error('unknown resolution!' + resolution); const value = `${resolutionKey}`; const option = $('<option/>', {value, text});return selectControl.append(option); }}) }`
context.JK.WebcamViewer = class WebcamViewer
constructor: (@root) ->
@client = context.jamClient

31
web/app/views/clients/index.html.erb
View File

@ -392,6 +392,15 @@
JK.hideCurtain(300);
}
async function redirectLatencyTester(){
// latency_tester does not want to be here - redirect it
//if(window.jamClient.getOperatingMode && await window.jamClient.getOperatingMode() == "server") {
if(await window.jamClient.getOperatingMode() == "server") {
window.location = "/latency_tester";
return;
}
}
JK.app = JK.JamKazam();
var jamServer = new JK.JamServer(JK.app, function(event_type) {return JK.app.activeElementEvent(event_type)});
jamServer.initialize();
@ -400,10 +409,11 @@
clientInit.init();
// latency_tester does not want to be here - redirect it
if(window.jamClient.getOperatingMode && window.jamClient.getOperatingMode() == "server") {
window.location = "/latency_tester";
return;
}
// if(window.jamClient.getOperatingMode && window.jamClient.getOperatingMode() == "server") {
// window.location = "/latency_tester";
// return;
// }
redirectLatencyTester();
JK.RecordingUtils.init();
@ -417,16 +427,15 @@
JK.ClientUpdateInstance.runCheck(payload.product, payload.version, payload.uri, payload.size)
});
JK.TickDuration('.feed-entry.music-session-history-entry .inprogress .tick-duration');
JK.JamServer.connect() // singleton here defined in JamServer.js
.done(function() {
_initAfterConnect(true);
})
.fail(function() {
_initAfterConnect(false);
});
.done(function() {
_initAfterConnect(true);
})
.fail(function() {
_initAfterConnect(false);
});
// this ensures that there is always a CurrentSessionModel, even if it's for a non-active session
JK.CurrentSessionModel = new JK.SessionModel(JK.app, JK.JamServer, window.jamClient, null);