From 9800f701e66a7fcd0f65dc871c005e7a69f197ff Mon Sep 17 00:00:00 2001 From: DanyLE Date: Wed, 17 Aug 2022 00:44:36 +0200 Subject: [PATCH] Update RemoteDesktop --- RemoteDesktop/README.md | 1 + RemoteDesktop/build/debug/README.md | 1 + RemoteDesktop/build/debug/main.js | 2 +- RemoteDesktop/build/debug/package.json | 2 +- RemoteDesktop/build/release/RemoteDesktop.zip | Bin 72321 -> 72589 bytes RemoteDesktop/coffees/WVNC.coffee | 35 ++++++++++++++++-- RemoteDesktop/package.json | 2 +- packages.json | 2 +- 8 files changed, 37 insertions(+), 8 deletions(-) diff --git a/RemoteDesktop/README.md b/RemoteDesktop/README.md index 9dad03b..988bb32 100644 --- a/RemoteDesktop/README.md +++ b/RemoteDesktop/README.md @@ -7,6 +7,7 @@ Further information on **wvnc**: [https://blog.lxsang.me/post/id/23](https://blo ## Change logs +* v0.1.7-8 - remove package dependencies, use web assembly for jpeg decoding, improve rendering performance and connection stability * v0.1.6 - Change category * v0.1.5 - add package dependencies and use the new **libwvnc** * v0.1.0 - adapt to the new AntOS API diff --git a/RemoteDesktop/build/debug/README.md b/RemoteDesktop/build/debug/README.md index 9dad03b..988bb32 100644 --- a/RemoteDesktop/build/debug/README.md +++ b/RemoteDesktop/build/debug/README.md @@ -7,6 +7,7 @@ Further information on **wvnc**: [https://blog.lxsang.me/post/id/23](https://blo ## Change logs +* v0.1.7-8 - remove package dependencies, use web assembly for jpeg decoding, improve rendering performance and connection stability * v0.1.6 - Change category * v0.1.5 - add package dependencies and use the new **libwvnc** * v0.1.0 - adapt to the new AntOS API diff --git a/RemoteDesktop/build/debug/main.js b/RemoteDesktop/build/debug/main.js index fd4240e..447a753 100644 --- a/RemoteDesktop/build/debug/main.js +++ b/RemoteDesktop/build/debug/main.js @@ -1 +1 @@ -(function(){var e,t,n,a;(e=class e extends this.OS.GUI.BasicDialog{constructor(){super("ConnectionDialog",e.scheme)}main(){return super.main(),this.find("jq").value=40,this.find("bt-ok").onbtclick=e=>{var t;if(this.handle)return t={wvnc:this.find("txtWVNC").value,server:this.find("txtServer").value,quality:this.find("jq").value},this.handle(t),this.quit()},this.find("bt-cancel").onbtclick=e=>this.quit()}}).scheme='\n \n
\n \n \n \n \n \n
\n \n \n \n
\n \n \n
\n
\n \n \n
\n \n\n',(t=class e extends this.OS.GUI.BasicDialog{constructor(){super("CredentialDialog",e.scheme)}main(){return this.find("bt-ok").onbtclick=()=>{var e;return this.handle?(e={username:this.find("txtUser").value,password:this.find("txtPass").value},this.handle(e),this.quit()):this.quit()},this.find("bt-cancel").onbtclick=()=>this.quit()}}).scheme='\n \n \n \n \n \n \n
\n \n \n
\n
\n \n \n',n=class extends this.OS.application.BaseApplication{constructor(e){super("RemoteDesktop",e)}main(){return this.canvas=this.find("screen"),this.container=this.find("container"),this.client=new a({element:this.canvas}),this.client.onerror=e=>(this.error(e),this.showConnectionDialog()),this.client.onresize=()=>this.setScale(),this.client.onpassword=()=>new Promise((e,t)=>this.openDialog("PromptDialog",{title:__("VNC password"),label:__("VNC password"),value:"password",type:"password"}).then((function(t){return e(t)}))),this.client.oncredential=()=>new Promise((e,n)=>this.openDialog(new t,{title:__("User credential")}).then((function(t){return e(t.username,t.password)}))),this.on("resize",e=>this.setScale()),this.on("focus",e=>$(this.canvas).focus()),this.client.init().then(()=>this.showConnectionDialog())}setScale(){var e,t,n,a;if(this.client&&this.client.resolution)return a=$(this.container).width(),e=$(this.container).height(),(t=a/this.client.resolution.w)>(n=e/this.client.resolution.h)?this.client.setScale(n):this.client.setScale(t)}menu(){return[{text:"__(Connection)",nodes:[{text:"__(New Connection)",dataid:this.name+"-new"},{text:"__(Disconnect)",dataid:this.name+"-close"}],onchildselect:e=>this.actionConnection()}]}actionConnection(e){return this.client&&this.client.disconnect(!1),this.showConnectionDialog()}showConnectionDialog(){return this.openDialog(new e,{title:__("Connection")}).then(e=>(this.client.ws=e.wvnc,this.client.connect(e.server,e)))}cleanup(){if(this.client)return this.client.disconnect(!0)}},this.OS.register("RemoteDesktop",n),a=class{constructor(e){var t,n;this.socket=void 0,this.ws=void 0,this.canvas=void 0,n="pkg://RemoteDesktop/decoder_asm.js".asFileHandle().getlink(),this.scale=1,e.ws&&(this.ws=e.ws),this.canvas=e.element,"string"==typeof this.canvas&&(this.canvas=document.getElementById(this.canvas)),this.decoder=new Worker(n),this.enableEvent=!0,t=this,this.mouseMask=0,this.decoder.onmessage=function(e){return t.process(e.data)}}init(){var e;return e=this,new Promise((function(t,n){return e.canvas?($(e.canvas).attr("tabindex","1"),e.initInputEvent(),t()):n("Canvas is not set")}))}initInputEvent(){var e,t,n,a;if(n=this,this.canvas&&(t=function(e){var t;return t=n.canvas.getBoundingClientRect(),{x:Math.floor((e.clientX-t.left)/n.scale),y:Math.floor((e.clientY-t.top)/n.scale)}},a=function(e){var a;if(n.enableEvent)return a=t(e),n.sendPointEvent(a.x,a.y,n.mouseMask)},n.canvas))return n.canvas.oncontextmenu=function(e){return e.preventDefault(),!1},n.canvas.onmousemove=function(e){return a(e)},n.canvas.onmousedown=function(e){var t;return t=1<this.disconnect(!0),window.addEventListener("unload",e),window.addEventListener("beforeunload",e)}initCanvas(e,t,n){return this.depth=n,this.canvas.width=e,this.canvas.height=t,this.resolution={w:e,h:t,depth:this.depth},this.decoder.postMessage(this.resolution),this.setScale(this.scale)}process(e){var t,n,a;if(this.socket)return n=new Uint8Array(e.pixels),(a=(t=this.canvas.getContext("2d",{alpha:!1})).createImageData(e.w,e.h)).data.set(n),t.putImageData(a,e.x,e.y)}setScale(e){if(this.scale=e,this.canvas)return this.canvas.style.transformOrigin="0 0",this.canvas.style.transform="scale("+e+")"}connect(e,t){var n;if(n=this,this.disconnect(!1),this.ws)return this.socket=new WebSocket(this.ws),this.socket.binaryType="arraybuffer",this.socket.onopen=function(){return console.log("socket opened"),n.initConnection(e,t)},this.socket.onmessage=function(e){return n.consume(e)},this.socket.onclose=function(){return n.socket=null,n.canvas.style.cursor="auto",n.canvas&&n.resolution&&n.canvas.getContext("2d").clearRect(0,0,n.resolution.w,n.resolution.h),console.log("socket closed")}}disconnect(e){if(this.socket&&this.socket.close(),this.socket=void 0,e)return this.decoder.terminate()}initConnection(e,t){var n;return(n=new Uint8Array(e.length+1))[0]=50,t&&t.quality&&(n[0]=t.quality),n.set((new TextEncoder).encode(e),1),this.socket.send(this.buildCommand(1,n))}sendPointEvent(e,t,n){var a;if(this.socket)return(a=new Uint8Array(5))[0]=255&e,a[1]=e>>8,a[2]=255&t,a[3]=t>>8,a[4]=n,this.socket.send(this.buildCommand(5,a))}sendKeyEvent(e,t){var n;if(this.socket&&this.enableEvent)return(n=new Uint8Array(3))[0]=255&e,n[1]=e>>8,n[2]=t,this.socket.send(this.buildCommand(6,n))}buildCommand(e,t){var n,a;switch(a=void 0,typeof t){case"string":a=(new TextEncoder).encode(t);break;case"number":a=new Uint8Array([t]);break;default:a=t}return(n=new Uint8Array(a.length+3))[0]=e,n[2]=a.length>>8,n[1]=15&a.length,n.set(a,3),n.buffer}oncopy(e){return console.log("Get clipboard text: "+e)}onpassword(){return new Promise((function(e,t){return t("onpassword is not implemented")}))}sendTextAsClipboard(e){if(this.socket)return console.log("send ",e),this.socket.send(this.buildCommand(7,e))}oncredential(){return new Promise((function(e,t){return t("oncredential is not implemented")}))}onerror(e){return console.log("Error",e)}onresize(){return console.log("resize")}consume(e){var t,n,a,s,i,o;switch(t=(n=new Uint8Array(e.data))[0],i=this,t){case 254:return n=n.subarray(1,n.length-1),a=new TextDecoder("utf-8"),this.onerror(a.decode(n));case 129:return console.log("Request for password"),this.enableEvent=!1,this.onpassword().then((function(e){return i.socket.send(i.buildCommand(2,e)),i.enableEvent=!0}));case 130:return console.log("Request for login"),this.enableEvent=!1,this.oncredential().then((function(e,t){var n;return(n=new Uint8Array(e.length+t.length+1)).set((new TextEncoder).encode(e),0),n.set(["\0"],e.length),n.set((new TextEncoder).encode(t),e.length+1),i.socket.send(i.buildCommand(3,n)),i.enableEvent=!0}));case 131:return o=n[1]|n[2]<<8,s=n[3]|n[4]<<8,this.initCanvas(o,s,32),this.socket.send(this.buildCommand(4,1)),this.onresize();case 132:return this.decoder.postMessage(n.buffer,[n.buffer]),this.socket.send(this.buildCommand(4,1));case 133:return n=n.subarray(1),a=new TextDecoder("utf-8"),this.oncopy(a.decode(n)),this.socket.send(this.buildCommand(4,1));default:return console.log(t)}}},window.WVNC=a}).call(this); \ No newline at end of file +(function(){var e,t,n,s;(e=class e extends this.OS.GUI.BasicDialog{constructor(){super("ConnectionDialog",e.scheme)}main(){return super.main(),this.find("jq").value=40,this.find("bt-ok").onbtclick=e=>{var t;if(this.handle)return t={wvnc:this.find("txtWVNC").value,server:this.find("txtServer").value,quality:this.find("jq").value},this.handle(t),this.quit()},this.find("bt-cancel").onbtclick=e=>this.quit()}}).scheme='\n \n
\n \n \n \n \n \n
\n \n \n \n
\n \n \n
\n
\n \n \n
\n \n\n',(t=class e extends this.OS.GUI.BasicDialog{constructor(){super("CredentialDialog",e.scheme)}main(){return this.find("bt-ok").onbtclick=()=>{var e;return this.handle?(e={username:this.find("txtUser").value,password:this.find("txtPass").value},this.handle(e),this.quit()):this.quit()},this.find("bt-cancel").onbtclick=()=>this.quit()}}).scheme='\n \n \n \n \n \n \n
\n \n \n
\n
\n \n \n',n=class extends this.OS.application.BaseApplication{constructor(e){super("RemoteDesktop",e)}main(){return this.canvas=this.find("screen"),this.container=this.find("container"),this.client=new s({element:this.canvas}),this.client.onerror=e=>(this.error(e),this.showConnectionDialog()),this.client.onresize=()=>this.setScale(),this.client.onpassword=()=>new Promise((e,t)=>this.openDialog("PromptDialog",{title:__("VNC password"),label:__("VNC password"),value:"password",type:"password"}).then((function(t){return e(t)}))),this.client.oncredential=()=>new Promise((e,n)=>this.openDialog(new t,{title:__("User credential")}).then((function(t){return e(t.username,t.password)}))),this.on("resize",e=>this.setScale()),this.on("focus",e=>$(this.canvas).focus()),this.client.init().then(()=>this.showConnectionDialog())}setScale(){var e,t,n,s;if(this.client&&this.client.resolution)return s=$(this.container).width(),e=$(this.container).height(),(t=s/this.client.resolution.w)>(n=e/this.client.resolution.h)?this.client.setScale(n):this.client.setScale(t)}menu(){return[{text:"__(Connection)",nodes:[{text:"__(New Connection)",dataid:this.name+"-new"},{text:"__(Disconnect)",dataid:this.name+"-close"}],onchildselect:e=>this.actionConnection()}]}actionConnection(e){return this.client&&this.client.disconnect(!1),this.showConnectionDialog()}showConnectionDialog(){return this.openDialog(new e,{title:__("Connection")}).then(e=>(this.client.ws=e.wvnc,this.client.connect(e.server,e)))}cleanup(){if(this.client)return this.client.disconnect(!0)}},this.OS.register("RemoteDesktop",n),s=class{constructor(e){var t,n;this.socket=void 0,this.ws=void 0,this.canvas=void 0,n="pkg://RemoteDesktop/decoder_asm.js".asFileHandle().getlink(),this.scale=1,e.ws&&(this.ws=e.ws),this.canvas=e.element,"string"==typeof this.canvas&&(this.canvas=document.getElementById(this.canvas)),this.decoder=new Worker(n),this.enableEvent=!1,this.pingto=!1,t=this,this.mouseMask=0,this.decoder.onmessage=function(e){return t.process(e.data)}}init(){var e;return e=this,new Promise((function(t,n){return e.canvas?($(e.canvas).attr("tabindex","1"),$(e.canvas).on("focus",()=>e.resetModifierKeys()),e.initInputEvent(),t()):n("Canvas is not set")}))}initInputEvent(){var e,t,n,s;if(n=this,this.canvas&&(t=function(e){var t;return t=n.canvas.getBoundingClientRect(),{x:Math.floor((e.clientX-t.left)/n.scale),y:Math.floor((e.clientY-t.top)/n.scale)}},s=function(e){var s;if(n.enableEvent)return s=t(e),n.sendPointEvent(s.x,s.y,n.mouseMask)},n.canvas))return n.canvas.oncontextmenu=function(e){return e.preventDefault(),!1},n.canvas.onmousemove=function(e){return s(e)},n.canvas.onmousedown=function(e){var t;return t=1<this.disconnect(!0),window.addEventListener("unload",e),window.addEventListener("beforeunload",e)}initCanvas(e,t,n){return this.depth=n,this.canvas.width=e,this.canvas.height=t,this.resolution={w:e,h:t,depth:this.depth},this.decoder.postMessage(this.resolution),this.setScale(this.scale)}process(e){var t,n,s;if(this.socket)return n=new Uint8Array(e.pixels),(s=(t=this.canvas.getContext("2d",{alpha:!1})).createImageData(e.w,e.h)).data.set(n),t.putImageData(s,e.x,e.y)}setScale(e){if(this.scale=e,this.canvas)return this.canvas.style.transformOrigin="0 0",this.canvas.style.transform="scale("+e+")"}connect(e,t){var n;if(n=this,this.disconnect(!1),this.ws)return this.socket=new WebSocket(this.ws),this.socket.binaryType="arraybuffer",this.socket.onopen=function(){return console.log("socket opened"),n.initConnection(e,t)},this.socket.onmessage=function(e){return n.consume(e)},this.socket.onclose=function(){return n.socket=null,n.canvas.style.cursor="auto",n.canvas&&n.resolution&&n.canvas.getContext("2d").clearRect(0,0,n.resolution.w,n.resolution.h),n.pingto&&clearTimeout(n.pingto),n.pingto=void 0,console.log("socket closed")}}disconnect(e){return this.socket&&this.socket.close(),this.socket=void 0,e&&this.decoder.terminate(),this.enableEvent=!1}initConnection(e,t){var n;return(n=new Uint8Array(e.length+1))[0]=50,t&&t.quality&&(n[0]=t.quality),n.set((new TextEncoder).encode(e),1),this.socket.send(this.buildCommand(1,n))}resetModifierKeys(){if(this.socket&&this.enableEvent)return this.sendKeyEvent(65511,0),this.sendKeyEvent(65512,0),this.sendKeyEvent(65505,0),this.sendKeyEvent(65507,0),this.sendKeyEvent(65513,0)}sendPointEvent(e,t,n){var s;if(this.socket&&this.enableEvent)return(s=new Uint8Array(5))[0]=255&e,s[1]=e>>8,s[2]=255&t,s[3]=t>>8,s[4]=n,this.socket.send(this.buildCommand(5,s))}sendKeyEvent(e,t){var n;if(this.socket&&this.enableEvent)return(n=new Uint8Array(3))[0]=255&e,n[1]=e>>8&255,n[2]=t,this.socket.send(this.buildCommand(6,n))}sendPing(){if(this.socket)return this.socket.send(this.buildCommand(8,"PING WVNC"))}buildCommand(e,t){var n,s;switch(s=void 0,typeof t){case"string":s=(new TextEncoder).encode(t);break;case"number":s=new Uint8Array([t]);break;default:s=t}return(n=new Uint8Array(s.length+3))[0]=e,n[2]=s.length>>8,n[1]=15&s.length,n.set(s,3),n.buffer}oncopy(e){return console.log("Get clipboard text: "+e)}onpassword(){return new Promise((function(e,t){return t("onpassword is not implemented")}))}sendTextAsClipboard(e){if(this.socket)return console.log("send ",e),this.socket.send(this.buildCommand(7,e))}oncredential(){return new Promise((function(e,t){return t("oncredential is not implemented")}))}onerror(e){return console.log("Error",e)}onresize(){return console.log("resize")}consume(e){var t,n,s,i,a,o,r;switch(t=(n=new Uint8Array(e.data))[0],o=this,t){case 254:return n=n.subarray(1,n.length-1),s=new TextDecoder("utf-8"),this.onerror(s.decode(n));case 129:return console.log("Request for password"),this.enableEvent=!1,this.onpassword().then((function(e){return o.socket.send(o.buildCommand(2,e)),o.enableEvent=!0}));case 130:return console.log("Request for login"),this.enableEvent=!1,this.oncredential().then((function(e,t){var n;return(n=new Uint8Array(e.length+t.length+1)).set((new TextEncoder).encode(e),0),n.set(["\0"],e.length),n.set((new TextEncoder).encode(t),e.length+1),o.socket.send(o.buildCommand(3,n)),o.enableEvent=!0}));case 131:if(r=n[1]|n[2]<<8,a=n[3]|n[4]<<8,this.initCanvas(r,a,32),this.socket.send(this.buildCommand(4,1)),this.enableEvent=!0,this.onresize(),this.pingto)return;return i=()=>(this.sendPing(),this.pingto=setTimeout(i,5e3)),this.pingto=setTimeout(i,5e3);case 132:return this.decoder.postMessage(n.buffer,[n.buffer]),this.socket.send(this.buildCommand(4,1));case 133:return n=n.subarray(1),s=new TextDecoder("utf-8"),this.oncopy(s.decode(n)),this.socket.send(this.buildCommand(4,1));default:return console.log(t)}}},window.WVNC=s}).call(this); \ No newline at end of file diff --git a/RemoteDesktop/build/debug/package.json b/RemoteDesktop/build/debug/package.json index 4ae4afd..caf57c9 100644 --- a/RemoteDesktop/build/debug/package.json +++ b/RemoteDesktop/build/debug/package.json @@ -7,7 +7,7 @@ "author": "Dany LE", "email": "contact@iohub.dev" }, - "version":"0.1.7-b", + "version":"0.1.8-b", "dependencies": [], "category":"Internet", "icon": "icon.png", diff --git a/RemoteDesktop/build/release/RemoteDesktop.zip b/RemoteDesktop/build/release/RemoteDesktop.zip index 06c662ef8b33adac2c3dae837758fec59a0e8e35..cee9eced661ea57a6b512e8d05be7860a4d2d52c 100644 GIT binary patch delta 5587 zcmZu#WmMGNyB$i>A(U?E4rvJqL8K9oknS3~<3|l8of47)QX??Z-9rqi(mjNvwDk2| z_pbGibRuBnB|=#<?-i|{0i#%-jPd2_XXDC8R{QPj=+JjiZAC(z5omZymz34b7e9pe9I>g} z`Y6-ssZRH+8)lOym!=e1YDtQ?=gf9;c!ob-&CAL($S{)X%RX9ODp?bEW67(y!AoEF z4ZEzxG@e>dAd~t-KWoV};Nq3k_ai(uER48@Hj}n@YV5t$+@8sCyBiR_vfH$aT3#Pv zs7~u;cx>*v9bV3%QzLvK&^MlGYMY!c%8oZzK0dK7w z)K^bkn>C(l$*8wvabmzJw3qf^YHor7U6@3_lBGB~ak>q5jX4`G*5VW&#lLAH(OM^& zulkZKIM;bMoqn=)2%@V#vG1x8x4g!)3T{fiTieGsf{5_H$hm>rmfer$%gC7Ks+Ebr zjM9Z8ZY1Cbhce41z>?VT-~nNNrZRyUG7rJxZkSbA_$cEA1>r4e5`J$@#CvR$b9N13FM zBbWYltT3us2$-ERDY_~D_PLpcxqT$|OVlx$$*l)-YvPcX%@P>t1&5~W2~CS)_T@+1 z%7{^9qu(9tJU&y+yfcHWZ&yzo4xYS~LM3Ta8M$4Y4ss9ntQ73ro*^W~I02skG1uUA zGpAS>#xOGvXr#N5T-lF7mnuypwnF2a2v4C4iC*;x5J;Q)+OqO^O^6*bZ1P%{EW~#> z1pG)NY13E}JyRQ#y*F&?yVeU5{Z8~ic7ms~7q#HLzSZBLoGIG9$wglG3Cuv5>M?6@ z_Jny6x_LC&t4OX^BOW{f{tGgbEGE@`jIIs&jtgyK}%jVp@!Jfol~B4P!4^l(zsc2%Tc%P!XR?Zutjb zCR~Mja*Hox5BIuM#0bRPDmH15kyNd@7C&MF<`$Z$s^<5S4QttD1`!X=fznUgRVPaIvg1+HkruA$A+|9HGWn??v~s>Ohys?mRNb?qDh z3f+)R?4$!S#*|D?_T~1n*iz*;Le(rKI3!1g*>&&CdSo(NC3HebBBr>DHk%`0shUH9 zAEccbp+JpDbRp}*=IP2@=>$G~A_K{75lA`#8+OUb+gnOc+o1Q+isgr1YH$GG+fYzb zOzM}2TdJNgshK{Rx>)pvJ;(!$O2;3l9t-F%_Mg>0jqqkM2rXlCGN;kv0{hU0aQL;H z5_nw>48=3FI8$N-5UPOpwKb1G3%<*J?s02(^9oL0QNnttjoIP%B{)rrbjjmNB}Avr zj6AA#Nk5xkyxxy2Vg4m=UXE|NyPW;3zChH?Aj?5*(`J z-&z7qar=WJMl4xRV0{U9Wi{wMZK%^-aoe30K{bkQr^fVLGZ!%`B&}~3EM9kJB+#dQ z-H5npJs1c%a6&oVsmT9E0RXohl`MwNo{^ zsT?+TSp0O3*2)r981ZLw=16LwdCSvOx-BN{y|a}vqNIE~i@=!ojV_tcV?EsVj*Whq zQ-{qUFo9myeQZ4X?{@T7WWmW5E4$lu!LD8nMmi!R!`d}`$C=~RWADzAU=u4wQ0w=1 zrOb)38preU&y~3{BU9=&!!k2ynW`#4A`xk7q-_lDuELLx7Cz1~?5#Pm;!OadNPU@$qjgcjn z0DyW2Zbf{jx?psH8B#L)K~&rVbr%6+{H@_iOqQ8OcGw+v+xUpGxG`>l1760vS~X*L z*4JVBl3Z##sc3M5NjbOXHK&{XN}cPAuDJznbtvwp^wYcMhY;ZB6f`S%+self?(CTj zH6+0EW52EGsE6c?f>go#)SNKF6Un2kE36;rwDZ zD0)K*XY@Np7eOewygTH=HFMq^!@fLzd5~`Vc zan_|M@F77Ueib03jY=}lH*vXZIPx;+tPXaLou9$GB1^#@r?;U^0POUNi z2XQ9DZF%3E`Jr6bry`0;&=3DjWOmEbCfk< zoe%-9IRS}4Cu;0l9%0e*#_7L*!6tksSN|7xS?<^|g9QEyS_t7@s;uX}cRk9@yq!W} z5TdC9(cH5Q-DzG9HLsHs8eeUqk@vrQD{&3BUspBi1Hd!I25y;H>|uA^Q* z(IKL;it%W*-%v*LO}tBCi0^w6 zP5irS0-K+^v78@4D(*Knk&VrVSpUvsAj_O&%SMHm8)c#zos$bk<2yn_st0J=4qiK) z&T-^1d-9)N)ov?O&+<{=CdDryqri#PrK8FY*k%b+x|{(e`Ry65WS;h2h7VLt%_J?sO3CbZhzv8nYoJ$1VG7$800?Y zZG6FbfcBfiU0^KWG_Q-b7A8!pImwzq?D{%0qouI51XmKlp;QKSB!(L6Rzlk3Rl0I? zoTORovwd89K$n-A&e;By{GJ*l#fkKbfaNE;mP=uq1JDF;TwMXkCLh83L|d?1$OwF})f@R2rR}v8!mA zXQzMY0uAP$nMnR|*Zn%f@Dx@Ku$T&V7$wDHK07Pv1|1=TzCx_pQK@P(SxUpuVum5n zZt=@$lL#`SL8k8AWx~QYRXaI6b}?8ui)a+=_wY%rS-;1_rtQm|Y2n|2la}4rxZLXd zc@L)r6%{|ME0!W1)la56A|n$*tPR{2DqXuiWa;UPml8{@BwF|>vM31!C~Oa- zZ>g2nju6xw)DGzC#?0&ME7NU@-ryByK-6>ZK#S)E`{zpf*&~QNs)%s!>$(s-U9c4v zgB!Y#JtQpwS3>1@-$Wfi3EEEGPI_VT;b<@oek9co*+1m>MBj%xr$?=ACm^)iOGhoPJ49pn+daZE28Xwslm`ybi^$2MQN^y>}#WB~4C=>E{waWemw9xLH`nsGJmT zMqn7)J-2%6O(xHEt&twPd`5yud`FRcd>Ycxp&3@xPZn4vIFYF~;?K%Qj{AvlvBcct zl9@2ptP<1xOVQRj~8 zF4>8>%(B0@hc)hitsM6LI*DPYI?y_u^h`@#JH{P5zXRK8g&4Zr6bE-)CP{3I}8oL-e;@K%j*12ex^QyOtku6QG= z8h&^IV#cOK)j<79DI zVL4CEXjv-@_+rS>i;ih!I`pKD?drEjXq8Ic4eu6VQpp+Z#FNh)9fG|YqZe}{!swx@ z4H6>2LrZBVEtXMWSn(1HVx-`K8U8TkI*M&>>Am6BdnDeFD(ZonfVH?^lK<+LAhvt< z?B!(`qgB?Phh&HxGV|E6qfh`m`tIlad6}FBBHMC3=1kFMD&JtVaMe+j1 zGA?dyq-}Ej@ZO#1%UXlkkb)M{AcB3cQ!K17frMOsXblgfy{E|Bh z!c#liWK)7(Nj#zQOOz?6XYeZU>Cz5RT6}5wtor&)cs7!h>X8XyPQQS9S*(UV=`euy z0E;0^>U~gOEKLeLmU}_6DC9awyBLE86PFgtyWB4a1Vd}^L>jzwHGfze;S_{E8vc}L zZm@&7a40WQt%9HNFg0Pir_j>H$J98@IPFvkID85I(NCB~VCqtj^P%#tFlj%~e6W4;cR$^?*{|NpyfxiHVs3$ds}swk!>eXA*c@ z_@_LdIILFl^UBg5Jt;OkqU~}-C69>||F)XpfJl3`*s_~6L)4sbWBKRu13a>R!@NiZ3KwiE{M+1Qx(Lo^GzZsVHD_I4#SG>+v zUdgg9-}#B4M^~ib7urQjO(A$+8g;c;ctb$lh3l(g(|yJZmUD3G>m$k+)bkjN+woI(FZeA9+sDLS){2hBvfFLjHJD?vvMa_c zzR@ck^K{Ke$miRU<$*gia4Zh0CY?A!khbQ2jR%2vrOu57jI0)dMPGVBH+=M=Y)FPI zcj%B681VsqIjD&uvcbKlkp*ZpEart82m79|)~w~FnC9kFn)EKsn;zNiXH-Zea%$UH zW1n9m-}XPyCRb!5A3<2JWRuDlzqz*Tn|K|0ADO=!QpeHC38x#mdKQTmUi-0;#Zax( zLvf{5iAdWwT5LGCP}YAr>|FZ;`{%mMH|NA})t(akEJcCQ)R375mp^3mM`_WZDA%XF{17OM%A5@K5c3tqcMw{8gRcuj2n&2;$613N)&} z44DTMXf$FqB>$IbT6%bBs-U4i1^p}gEU>1WzI+M--Ms{X@c%{ecW3z|Q8?wu~DD^02hCcDClV^K^FluPZoIXf#xo jJRp$0r3-}D6=M5eed)h_bc5%a@2Sw}9|cnW9Ub&Pj#7jL delta 5315 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 @@ -20,6 +21,8 @@ class WVNC return e('Canvas is not set') if not me.canvas # fix keyboard event problem $(me.canvas).attr 'tabindex', '1' + $(me.canvas).on "focus", () => + me.resetModifierKeys() me.initInputEvent() r() @@ -64,7 +67,7 @@ class WVNC #console.log e switch keycode when 8 then code = 0xFF08 #back space - when 9 then code = 0xff89 #0xFF09 # tab ? + when 9 then code = 0xFF09 # tab ? 0xff89 when 13 then code = 0xFF0D # return when 27 then code = 0xFF1B # esc when 46 then code = 0xFFFF # delete to verify @@ -180,12 +183,15 @@ class WVNC me.socket = null me.canvas.style.cursor = "auto" me.canvas.getContext('2d').clearRect 0,0, me.resolution.w, me.resolution.h if me.canvas and me.resolution + clearTimeout(me.pingto) if me.pingto + me.pingto = undefined console.log "socket closed" disconnect: (close_worker) -> @socket.close() if @socket @socket = undefined @decoder.terminate() if close_worker + @enableEvent = false initConnection: (vncserver, params) -> #vncserver = "192.168.1.20:5901" @@ -198,8 +204,18 @@ class WVNC data.set (new TextEncoder()).encode(vncserver), 1 @socket.send(@buildCommand 0x01, data) + resetModifierKeys: () -> + return unless @socket + return unless @enableEvent + @sendKeyEvent 0xFFE7, 0 # meta left + @sendKeyEvent 0xFFE8, 0 # meta right + @sendKeyEvent 0xFFE1, 0 # shift left + @sendKeyEvent 0xFFE3, 0 # ctrl left + @sendKeyEvent 0xFFE9, 0 # alt left + sendPointEvent: (x, y, mask) -> return unless @socket + return unless @enableEvent data = new Uint8Array 5 data[0] = x & 0xFF data[1] = x >> 8 @@ -209,14 +225,18 @@ class WVNC @socket.send( @buildCommand 0x05, data ) sendKeyEvent: (code, v) -> - #console.log code, v + # console.log code, v return unless @socket return unless @enableEvent data = new Uint8Array 3 data[0] = code & 0xFF - data[1] = code >> 8 + data[1] = (code >> 8) & 0xFF data[2] = v @socket.send( @buildCommand 0x06, data ) + + sendPing: () -> + return unless @socket + @socket.send( @buildCommand 0x08, 'PING WVNC' ) buildCommand: (hex, o) -> data = undefined @@ -289,7 +309,14 @@ class WVNC @initCanvas w, h, depth # status command for ack @socket.send(@buildCommand 0x04, 1) + @enableEvent = true + # @resetModifierKeys() @onresize() + return if @pingto + fn = () => + @sendPing() + @pingto = setTimeout(fn, 5000) + @pingto = setTimeout(fn, 5000) when 0x84 # send data to web assembly for decoding @decoder.postMessage data.buffer, [data.buffer] diff --git a/RemoteDesktop/package.json b/RemoteDesktop/package.json index 4ae4afd..caf57c9 100644 --- a/RemoteDesktop/package.json +++ b/RemoteDesktop/package.json @@ -7,7 +7,7 @@ "author": "Dany LE", "email": "contact@iohub.dev" }, - "version":"0.1.7-b", + "version":"0.1.8-b", "dependencies": [], "category":"Internet", "icon": "icon.png", diff --git a/packages.json b/packages.json index 09bd2a1..ee8b95b 100644 --- a/packages.json +++ b/packages.json @@ -365,7 +365,7 @@ "description": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/RemoteDesktop/README.md", "category": "Internet", "author": "Dany LE", - "version": "0.1.7-b", + "version": "0.1.8-b", "dependencies": [],"category":"Internet","icon":"icon.png","mimes":["none"], "download": "https://raw.githubusercontent.com/lxsang/antosdk-apps/master/RemoteDesktop/build/release/RemoteDesktop.zip" },