diff --git a/leenkx/Sources/leenkx/logicnode/AddPhysicsConstraintNode.hx b/leenkx/Sources/leenkx/logicnode/AddPhysicsConstraintNode.hx index 8590b83..89b5f80 100644 --- a/leenkx/Sources/leenkx/logicnode/AddPhysicsConstraintNode.hx +++ b/leenkx/Sources/leenkx/logicnode/AddPhysicsConstraintNode.hx @@ -2,13 +2,16 @@ package leenkx.logicnode; import iron.object.Object; -#if lnx_bullet -import leenkx.trait.physics.PhysicsConstraint; -import leenkx.trait.physics.bullet.PhysicsConstraint.ConstraintType; -#elseif lnx_oimo -// TODO +#if lnx_physics + import leenkx.trait.physics.PhysicsConstraint; + #if lnx_bullet + import leenkx.trait.physics.bullet.PhysicsConstraint.ConstraintType; + #elseif lnx_jolt + import leenkx.trait.physics.jolt.PhysicsConstraint.ConstraintType; + #else + import leenkx.trait.physics.oimo.PhysicsConstraint.ConstraintType; + #end #end - class AddPhysicsConstraintNode extends LogicNode { public var property0: String;//Type @@ -27,7 +30,7 @@ class AddPhysicsConstraintNode extends LogicNode { if (pivotObject == null || rb1 == null || rb2 == null) return; -#if lnx_bullet +#if lnx_physics var disableCollisions: Bool = inputs[4].get(); var breakable: Bool = inputs[5].get(); @@ -110,8 +113,6 @@ class AddPhysicsConstraintNode extends LogicNode { } pivotObject.addTrait(con); } -#elseif lnx_oimo -// TODO #end runOutput(0); } diff --git a/leenkx/Sources/leenkx/logicnode/CreateLeenkxNode.hx b/leenkx/Sources/leenkx/logicnode/CreateLeenkxNode.hx index 3cac9a7..903a2ac 100644 --- a/leenkx/Sources/leenkx/logicnode/CreateLeenkxNode.hx +++ b/leenkx/Sources/leenkx/logicnode/CreateLeenkxNode.hx @@ -37,86 +37,90 @@ class CreateLeenkxNode extends LogicNode { function onEvent() { #if js - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCxNew = window.get('lxNew'); + var lnxjs:Dynamic = js.Lib.global; + var lnxCxNew = lnxjs.lnxNew; + + if (lnxCxNew == null) { + trace("ERROR: lnxNew not available"); + return; + } - var lxCn:Dynamic = lxCxNew(net_Url); - - lxCn.on("connections", function(c) { - leenkx.network.Leenkx.data.set(net_Url, c + 1); - leenkx.network.Leenkx.connections[net_Url].onconnections(); - }); - lxCn.on("message", function(address,message) { - leenkx.network.Leenkx.data.set(net_Url, message); - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].onmessage(); - }); - lxCn.on("seen", function(address) { - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].onseen(); - }); - lxCn.on("left", function(address) { - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].onleft(); - }); - lxCn.on("server", function(address) { - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].onserver(); - }); - lxCn.on("ping", function(address) { - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].onping(); - }); - lxCn.on("timeout", function(address) { - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].ontimeout(); - }); - lxCn.on("rpc", function(address, call, args, nonce) { - leenkx.network.Leenkx.data.set(net_Url, call); - leenkx.network.Leenkx.id.set(net_Url, address); - call(args); - leenkx.network.Leenkx.connections[net_Url].onrpc(); - }); - lxCn.on("rpc-response", function(address, nonce, response) { - leenkx.network.Leenkx.id.set(net_Url, address); - leenkx.network.Leenkx.connections[net_Url].onrpcresponse(); - }); - lxCn.on("wireleft", function(wirecount, wire) { - leenkx.network.Leenkx.data.set(net_Url, wirecount); - leenkx.network.Leenkx.id.set(net_Url, wire.peerId); - leenkx.network.Leenkx.connections[net_Url].onwireleft(); - }); - lxCn.on("wireseen", function(wirecount, wire) { - leenkx.network.Leenkx.data.set(net_Url, wirecount); - leenkx.network.Leenkx.id.set(net_Url, wire.peerId); - leenkx.network.Leenkx.connections[net_Url].onwireseen(); - }); - lxCn.on("torrent", function(identifier, torrent) { - leenkx.network.Leenkx.data.set(net_Url, torrent); - leenkx.network.Leenkx.id.set(net_Url, identifier); - leenkx.network.Leenkx.connections[net_Url].ontorrent(); - }); - - lxCn.on("tracker", function(identifier) { - leenkx.network.Leenkx.id.set(net_Url, identifier); - leenkx.network.Leenkx.connections[net_Url].ontracker(); - }); - - lxCn.on("announce", function(identifier) { - leenkx.network.Leenkx.id.set(net_Url, identifier); - leenkx.network.Leenkx.connections[net_Url].onannounce(); - }); - window.set("lx_" + net_Url, lxCn); - Leenkx.connections[net_Url].client = lxCn; - var script = ' - window.addEventListener("beforeunload", function (e) { - leenkx.network.Leenkx.connections.h["' + net_Url + '"].client.destroy(); - delete e["returnValue"]; - }); - '; - js.Syntax.code('(1, eval)({0})', script.toString()); - runOutput(0); - #end + var lnxCn:Dynamic = lnxCxNew(net_Url); + + lnxCn.on("connections", function(c) { + leenkx.network.Leenkx.data.set(net_Url, c + 1); + leenkx.network.Leenkx.connections[net_Url].onconnections(); + }); + lnxCn.on("message", function(address, message) { + leenkx.network.Leenkx.data.set(net_Url, message); + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].onmessage(); + }); + lnxCn.on("seen", function(address) { + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].onseen(); + }); + lnxCn.on("left", function(address) { + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].onleft(); + }); + lnxCn.on("server", function(address) { + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].onserver(); + }); + lnxCn.on("ping", function(address) { + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].onping(); + }); + lnxCn.on("timeout", function(address) { + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].ontimeout(); + }); + lnxCn.on("rpc", function(address, call, args, nonce) { + leenkx.network.Leenkx.data.set(net_Url, call); + leenkx.network.Leenkx.id.set(net_Url, address); + call(args); + leenkx.network.Leenkx.connections[net_Url].onrpc(); + }); + lnxCn.on("rpc-response", function(address, nonce, response) { + leenkx.network.Leenkx.id.set(net_Url, address); + leenkx.network.Leenkx.connections[net_Url].onrpcresponse(); + }); + lnxCn.on("wireleft", function(wirecount, wire) { + leenkx.network.Leenkx.data.set(net_Url, wirecount); + leenkx.network.Leenkx.id.set(net_Url, wire.peerId); + leenkx.network.Leenkx.connections[net_Url].onwireleft(); + }); + lnxCn.on("wireseen", function(wirecount, wire) { + leenkx.network.Leenkx.data.set(net_Url, wirecount); + leenkx.network.Leenkx.id.set(net_Url, wire.peerId); + leenkx.network.Leenkx.connections[net_Url].onwireseen(); + }); + lnxCn.on("torrent", function(identifier, torrent) { + leenkx.network.Leenkx.data.set(net_Url, torrent); + leenkx.network.Leenkx.id.set(net_Url, identifier); + leenkx.network.Leenkx.connections[net_Url].ontorrent(); + }); + lnxCn.on("tracker", function(identifier) { + leenkx.network.Leenkx.id.set(net_Url, identifier); + leenkx.network.Leenkx.connections[net_Url].ontracker(); + }); + lnxCn.on("announce", function(identifier) { + leenkx.network.Leenkx.id.set(net_Url, identifier); + leenkx.network.Leenkx.connections[net_Url].onannounce(); + }); + + Reflect.setField(lnxjs, "lnx_" + net_Url, lnxCn); + Leenkx.connections[net_Url].client = lnxCn; + + var script = 'globalThis.addEventListener("beforeunload", function (e) { + leenkx.network.Leenkx.connections.h["' + net_Url + '"].client.destroy(); + delete e["returnValue"]; + });'; + js.Syntax.code('(1, eval)({0})', script); + + runOutput(0); + #end } diff --git a/leenkx/Sources/leenkx/logicnode/LeenkxCloseConnectionNode.hx b/leenkx/Sources/leenkx/logicnode/LeenkxCloseConnectionNode.hx index 7c8da82..6dbd68c 100644 --- a/leenkx/Sources/leenkx/logicnode/LeenkxCloseConnectionNode.hx +++ b/leenkx/Sources/leenkx/logicnode/LeenkxCloseConnectionNode.hx @@ -32,10 +32,15 @@ class LeenkxCloseConnectionNode extends LogicNode { } else { var script = ' try{ - leenkx.network.Leenkx.connections.h["1008"].client.torrent._peers[p].conn._pc.close(); - leenkx.network.Leenkx.connections.h["1008"].client.torrent._peers[p].conn.destroy(); - leenkx.network.Leenkx.id.set("1008",p); - leenkx.network.Leenkx.connections.h["1008"].onclose(); + var lnxConn = leenkx.network.Leenkx.connections.h["' + connection._url + '"]; + if (lnxConn && lnxConn.client && lnxConn.client.torrent && lnxConn.client.torrent._peers) { + for (var p in lnxConn.client.torrent._peers) { + lnxConn.client.torrent._peers[p].conn._pc.close(); + lnxConn.client.torrent._peers[p].conn.destroy(); + leenkx.network.Leenkx.id.set("' + connection._url + '", p); + lnxConn.onclose(); + } + } }catch(error){ console.log("Error: " + error); } diff --git a/leenkx/Sources/leenkx/logicnode/LeenkxEventNode.hx b/leenkx/Sources/leenkx/logicnode/LeenkxEventNode.hx index c487281..c94ded3 100644 --- a/leenkx/Sources/leenkx/logicnode/LeenkxEventNode.hx +++ b/leenkx/Sources/leenkx/logicnode/LeenkxEventNode.hx @@ -40,7 +40,7 @@ class LeenkxEventNode extends LogicNode { default: throw "Failed to set client event type."; } } else if (property0 == "host") { - #if sys + #if (sys || kha_krom) var net_Domain = inputs[0].get(); var net_Port = inputs[1].get(); net_Url = "ws://" + net_Domain + ":" + Std.string(net_Port); @@ -53,7 +53,7 @@ class LeenkxEventNode extends LogicNode { } #end } else if (property0 == "securehost"){ - #if sys + #if (sys || kha_krom) var net_Domain = inputs[0].get(); var net_Port = inputs[1].get(); net_Url = "wss://" + net_Domain + ":" + Std.string(net_Port); diff --git a/leenkx/Sources/leenkx/logicnode/LeenkxSendMessageNode.hx b/leenkx/Sources/leenkx/logicnode/LeenkxSendMessageNode.hx index 792802c..5c66cfd 100644 --- a/leenkx/Sources/leenkx/logicnode/LeenkxSendMessageNode.hx +++ b/leenkx/Sources/leenkx/logicnode/LeenkxSendMessageNode.hx @@ -27,9 +27,9 @@ class LeenkxSendMessageNode extends LogicNode { try { if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send(`'+ api + message + '`); + lnx_' + connection._url +'.torrent._peers[p].conn.send(`'+ api + message + '`); }catch(error){ console.log("Error: " + error); } @@ -37,7 +37,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send(`' + inputs[4].get() + '`, `'+ api + message + '` );'; + var script = 'lnx_' + connection._url +'.send(`' + inputs[4].get() + '`, `'+ api + message + '` );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -58,9 +58,9 @@ class LeenkxSendMessageNode extends LogicNode { try { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); + lnx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); }catch(error){ console.log("Error: " + error); } @@ -68,7 +68,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -77,15 +77,15 @@ class LeenkxSendMessageNode extends LogicNode { } } } else { - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCn = window.get('lx_' + connection._url); - if(inputs[5].get() == true){ - lxCn.send(api+message); - }else{ - lxCn.send(inputs[4].get(), api+message); - } - runOutput(0); - return; + if(inputs[5].get() == true){ + var script = 'lnx_' + connection._url + '.send(`' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); + }else{ + var script = 'lnx_' + connection._url + '.send(`' + inputs[4].get() + '`, `' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); + } + runOutput(0); + return; } case "vector": if(property0 == "client"){ @@ -103,9 +103,9 @@ class LeenkxSendMessageNode extends LogicNode { try { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send("' + api + message + '"); + lnx_' + connection._url +'.torrent._peers[p].conn.send("' + api + message + '"); }catch(error){ console.log("Error: " + error); } @@ -113,7 +113,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -121,12 +121,12 @@ class LeenkxSendMessageNode extends LogicNode { trace("Error: " + error); } } else { - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCn = window.get('lx_' + connection._url); if(inputs[5].get() == true){ - lxCn.send(api+message); + var script = 'lnx_' + connection._url + '.send(`' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); }else{ - lxCn.send(inputs[4].get(), api+message); + var script = 'lnx_' + connection._url + '.send(`' + inputs[4].get() + '`, `' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); } runOutput(0); return; @@ -143,9 +143,9 @@ class LeenkxSendMessageNode extends LogicNode { try { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); + lnx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); }catch(error){ console.log("Error: " + error); } @@ -153,7 +153,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -161,12 +161,12 @@ class LeenkxSendMessageNode extends LogicNode { trace("Error: " + error); } } else { - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCn = window.get('lx_' + connection._url); if(inputs[5].get() == true){ - lxCn.send(api+message); + var script = 'lnx_' + connection._url + '.send(`' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); }else{ - lxCn.send(inputs[4].get(), api+message); + var script = 'lnx_' + connection._url + '.send(`' + inputs[4].get() + '`, `' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); } runOutput(0); return; @@ -183,9 +183,9 @@ class LeenkxSendMessageNode extends LogicNode { try { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); + lnx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); }catch(error){ console.log("Error: " + error); } @@ -193,7 +193,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -201,12 +201,12 @@ class LeenkxSendMessageNode extends LogicNode { trace("Error: " + error); } } else { - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCn = window.get('lx_' + connection._url); if(inputs[5].get() == true){ - lxCn.send(api+message); + var script = 'lnx_' + connection._url + '.send(`' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); }else{ - lxCn.send(inputs[4].get(), api+message); + var script = 'lnx_' + connection._url + '.send(`' + inputs[4].get() + '`, `' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); } runOutput(0); return; @@ -225,9 +225,9 @@ class LeenkxSendMessageNode extends LogicNode { try { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); + lnx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); }catch(error){ console.log("Error: " + error); } @@ -235,7 +235,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -243,12 +243,12 @@ class LeenkxSendMessageNode extends LogicNode { trace("Error: " + error); } } else { - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCn = window.get('lx_' + connection._url); if(inputs[5].get() == true){ - lxCn.send(api+message); + var script = 'lnx_' + connection._url + '.send(`' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); }else{ - lxCn.send(inputs[4].get(), api+message); + var script = 'lnx_' + connection._url + '.send(`' + inputs[4].get() + '`, `' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); } runOutput(0); return; @@ -283,10 +283,10 @@ class LeenkxSendMessageNode extends LogicNode { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ //console.log("Mine: " + lx_8001.torrent.discovery.peerId + " || Incomming: " + p); - lx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); + lnx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); }catch(error){ console.log("Error: " + error); } @@ -294,8 +294,8 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - //var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; - var script = 'lx_' + connection._url +'.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + //var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -319,9 +319,9 @@ class LeenkxSendMessageNode extends LogicNode { try { connection.buffer = buffer; if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); + lnx_' + connection._url +'.torrent._peers[p].conn.send(leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer ); }catch(error){ console.log("Error: " + error); } @@ -329,7 +329,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'lx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; + var script = 'lnx_' + connection._url +'.send("' + inputs[4].get() + '",leenkx.network.Leenkx.connections.h["'+ connection._url +'"].buffer );'; js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } @@ -337,12 +337,12 @@ class LeenkxSendMessageNode extends LogicNode { trace("Error: " + error); } } else { - var window:haxe.DynamicAccess = untyped js.Browser.window; - var lxCn = window.get('lx_' + connection._url); if(inputs[5].get() == true){ - lxCn.send(api+message); + var script = 'lnx_' + connection._url + '.send(`' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); }else{ - lxCn.send(inputs[4].get(), api+message); + var script = 'lnx_' + connection._url + '.send(`' + inputs[4].get() + '`, `' + api + message + '`);'; + js.Syntax.code('(1, eval)({0})', script); } runOutput(0); return; @@ -360,9 +360,9 @@ class LeenkxSendMessageNode extends LogicNode { try { if(inputs[5].get() == true){ - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ - lx_' + connection._url +'.torrent._peers[p].conn.send("' + api + message + '"); + lnx_' + connection._url +'.torrent._peers[p].conn.send("' + api + message + '"); }catch(error){ console.log("Error: " + error); } @@ -370,7 +370,7 @@ class LeenkxSendMessageNode extends LogicNode { js.Syntax.code('(1, eval)({0})', script.toString()); runOutput(0); } else { - var script = 'for (p in lx_' + connection._url +'.torrent._peers){ + var script = 'for (p in lnx_' + connection._url +'.torrent._peers){ try{ lx_' + connection._url +'.torrent._peers[' + inputs[4].get() + '].conn.send("' + api + message + '"); diff --git a/leenkx/Sources/leenkx/logicnode/NetworkCloseConnectionNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkCloseConnectionNode.hx index a22c8da..b267f6b 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkCloseConnectionNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkCloseConnectionNode.hx @@ -16,7 +16,7 @@ class NetworkCloseConnectionNode extends LogicNode { if(property1 == "client") { var connection = cast(inputs[1].get(), leenkx.network.WebSocket); if (connection == null) return; - #if sys + #if (sys || kha_krom) try{ var net_Url = connection._protocol + "://" + connection._host + ":" + connection._port; connection.close(); @@ -44,7 +44,7 @@ class NetworkCloseConnectionNode extends LogicNode { } #end } else if(property1 == "securehost"){ - #if sys + #if (sys || kha_krom) var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); if (connection == null) return; var net_Url = "wss://" + @:privateAccess connection._host + ":" + @:privateAccess connection._port; @@ -56,7 +56,7 @@ class NetworkCloseConnectionNode extends LogicNode { } #end } else { - #if sys + #if (sys || kha_krom) var connection = cast(inputs[1].get(), leenkx.network.WebSocketServer); if (connection == null) return; var net_Url = "ws://" + @:privateAccess connection._host + ":" + @:privateAccess connection._port; diff --git a/leenkx/Sources/leenkx/logicnode/NetworkEventNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkEventNode.hx index d316649..5afbb23 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkEventNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkEventNode.hx @@ -28,7 +28,7 @@ class NetworkEventNode extends LogicNode { default: throw "Failed to set client event type."; } } else if (property0 == "host") { - #if sys + #if (sys || kha_krom) var net_Domain = inputs[0].get(); var net_Port = inputs[1].get(); net_Url = "ws://" + net_Domain + ":" + Std.string(net_Port); @@ -41,7 +41,7 @@ class NetworkEventNode extends LogicNode { } #end } else if (property0 == "securehost"){ - #if sys + #if (sys || kha_krom) var net_Domain = inputs[0].get(); var net_Port = inputs[1].get(); net_Url = "wss://" + net_Domain + ":" + Std.string(net_Port); diff --git a/leenkx/Sources/leenkx/logicnode/NetworkHostCloseClientNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkHostCloseClientNode.hx index b308964..88c7c41 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkHostCloseClientNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkHostCloseClientNode.hx @@ -11,7 +11,7 @@ class NetworkHostCloseClientNode extends LogicNode { } override function run(from:Int) { - #if sys + #if (sys || kha_krom) if(property0 == false){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketServer); if (connection == null) return; diff --git a/leenkx/Sources/leenkx/logicnode/NetworkHostGetIpNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkHostGetIpNode.hx index aacade3..dda8377 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkHostGetIpNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkHostGetIpNode.hx @@ -12,7 +12,7 @@ class NetworkHostGetIpNode extends LogicNode { } override function run(from:Int) { - #if sys + #if (sys || kha_krom) if(property0 == false){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketServer); if (connection == null) return; diff --git a/leenkx/Sources/leenkx/logicnode/NetworkHostNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkHostNode.hx index 87d9ff7..7490006 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkHostNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkHostNode.hx @@ -12,7 +12,7 @@ class NetworkHostNode extends LogicNode { } override function run(from:Int) { - #if sys + #if (sys || kha_krom) if(property0 == false) { final net_Object: Object = tree.object; var net_Domain: String = inputs[1].get(); @@ -49,7 +49,7 @@ class NetworkHostNode extends LogicNode { #end } - #if sys + #if (sys || kha_krom) override function get(from: Int): Dynamic { if(property0 == false) { return switch (from) { diff --git a/leenkx/Sources/leenkx/logicnode/NetworkHttpRequestNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkHttpRequestNode.hx index baf1fb1..2257619 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkHttpRequestNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkHttpRequestNode.hx @@ -85,10 +85,6 @@ class NetworkHttpRequestNode extends LogicNode { } catch( e : Dynamic ) { trace("Could not complete request: " + e); } - - callbackType = 0; - runOutput(0); - } override function get(from: Int): Dynamic { diff --git a/leenkx/Sources/leenkx/logicnode/NetworkOpenConnectionNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkOpenConnectionNode.hx index 1328cbe..ef21fd5 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkOpenConnectionNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkOpenConnectionNode.hx @@ -19,7 +19,7 @@ class NetworkOpenConnectionNode extends LogicNode { var connection = cast(inputs[1].get(), leenkx.network.WebSocket); if (connection == null) return; var object = tree.object; - #if sys + #if (sys || kha_krom) net_Url = connection._protocol + "://" + connection._host + ":" + connection._port; Client.connections[net_Url] = null; var client = new leenkx.network.Connect.Client(net_Url, object); @@ -94,7 +94,7 @@ class NetworkOpenConnectionNode extends LogicNode { #end runOutput(0); } else if (property0 == "securehost"){ - #if sys + #if (sys || kha_krom) var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); if (connection == null) return; net_Url = "wss://" + @:privateAccess connection._host + ":" + @:privateAccess connection._port; @@ -108,7 +108,7 @@ class NetworkOpenConnectionNode extends LogicNode { runOutput(0); #end } else { - #if sys + #if (sys || kha_krom) var connection = cast(inputs[1].get(), leenkx.network.WebSocketServer); if (connection == null) return; net_Url = "ws://" + @:privateAccess connection._host + ":" + @:privateAccess connection._port; @@ -126,7 +126,7 @@ class NetworkOpenConnectionNode extends LogicNode { override function get(from: Int): Dynamic { return switch (property0) { - #if sys + #if (sys || kha_krom) case "host": Host.connections[net_Url]; case "securehost": SecureHost.connections[net_Url]; #end diff --git a/leenkx/Sources/leenkx/logicnode/NetworkSendMessageNode.hx b/leenkx/Sources/leenkx/logicnode/NetworkSendMessageNode.hx index 9422691..ecfc477 100644 --- a/leenkx/Sources/leenkx/logicnode/NetworkSendMessageNode.hx +++ b/leenkx/Sources/leenkx/logicnode/NetworkSendMessageNode.hx @@ -38,7 +38,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); @@ -127,7 +127,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); @@ -233,7 +233,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); @@ -327,7 +327,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); @@ -423,7 +423,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); @@ -541,7 +541,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer); @@ -702,7 +702,7 @@ class NetworkSendMessageNode extends LogicNode { trace("Error: " + error); } } - #if sys + #if (sys || kha_krom) else if(inputs[5].get() == true){ if(property0 == "securehost"){ var connection = cast(inputs[1].get(), leenkx.network.WebSocketSecureServer);