diff --git a/web/app/assets/javascripts/JamServer.js b/web/app/assets/javascripts/JamServer.js index 703563d39..156dccdee 100644 --- a/web/app/assets/javascripts/JamServer.js +++ b/web/app/assets/javascripts/JamServer.js @@ -1200,10 +1200,10 @@ async function connect() { if (context.JK.isQWebEngine) { - await context.jamClient.SendP2PMessage.connect(server.sendP2PMessage); + //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); + //await context.jamClient.SendLogin.connect(server.sendLogin); + //await context.jamClient.SendLogin.connect(server.sendLogout); //} } } diff --git a/web/app/assets/javascripts/asyncJamClient.js b/web/app/assets/javascripts/asyncJamClient.js index 0618dfa19..99deae96a 100644 --- a/web/app/assets/javascripts/asyncJamClient.js +++ b/web/app/assets/javascripts/asyncJamClient.js @@ -503,20 +503,30 @@ (d) => d.request_id !== deferred.request_id ); } else if (evt_id) { - //logger.log("[asyncJamClient] event received:", evt_id, Object.keys(response)[0]) + logger.log("[asyncJamClient] event received:", evt_id, Object.keys(response)[0]) let method = Object.keys(response)[0] - switch (method) { - case 'execute_script': - //logger.log(`execute_script: ${response['execute_script']}`); + + switch (evt_id.toString()) { + case '3006': //execute_script + logger.log(`3006 execute_script: ${response['execute_script']}`); try { eval(response['execute_script']); } catch (error) { logger.log(`[asyncJamClient] error: execute_script: ${response['execute_script']}`); logger.log(error); } - break; - + case '3007': //message + logger.log(`3007 message: ${response['message']}`); + try { + const msg = response['message']; + const clientId = response['targetClientID']; + context.JK.JamServer.sendP2PMessage(clientId, msg) + } catch (error) { + logger.log(`[asyncJamClient] error: sendP2PMessage: ${response['message']}`); + logger.log(error); + } + break; default: break; }