From 936faad1b941dd091a708317cc9420c788d79e9f Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 19:35:53 +0800
Subject: [PATCH 01/34] fix(base.jinja2): change script with term.js

---
 templates/jlog/static.jinja2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/jlog/static.jinja2 b/templates/jlog/static.jinja2
index 6e41b7ee5..069f41685 100644
--- a/templates/jlog/static.jinja2
+++ b/templates/jlog/static.jinja2
@@ -1,7 +1,7 @@
 {% extends "base.jinja2" %}
 {% block head %}
         <!-- term.js released and distributed under the MIT License; Copyright (c) 2012-2013, Christopher Jeffrey (https://github.com/chjj/) -->
-        <script>(function(){var i=this,p=this.document;function h(){this._events=this._events||{}}h.prototype.addListener=function(y,z){this._events[y]=this._events[y]||[];this._events[y].push(z)};h.prototype.on=h.prototype.addListener;h.prototype.removeListener=function(z,A){if(!this._events[z]){return}var B=this._events[z],y=B.length;while(y--){if(B[y]===A||B[y].listener===A){B.splice(y,1);return}}};h.prototype.off=h.prototype.removeListener;h.prototype.removeAllListeners=function(y){if(this._events[y]){delete this._events[y]}};h.prototype.once=function(z,A){function y(){var B=Array.prototype.slice.call(arguments);this.removeListener(z,y);return A.apply(this,B)}y.listener=A;return this.on(z,y)};h.prototype.emit=function(B){if(!this._events[B]){return}var z=Array.prototype.slice.call(arguments,1),C=this._events[B],y=C.length,A=0;for(;A<y;A++){C[A].apply(this,z)}};h.prototype.listeners=function(y){return this._events[y]=this._events[y]||[]};var x=0,g=1,q=2,j=3,f=4,o=5,s=6;function t(z){var y=this;if(!(this instanceof t)){return new t(arguments[0],arguments[1],arguments[2])}h.call(this);if(typeof z==="number"){z={cols:arguments[0],rows:arguments[1],handler:arguments[2]}}z=z||{};e(n(t.defaults),function(B){if(z[B]==null){z[B]=t.options[B];if(t[B]!==t.defaults[B]){z[B]=t[B]}}y[B]=z[B]});if(z.colors.length===8){z.colors=z.colors.concat(t._colors.slice(8))}else{if(z.colors.length===16){z.colors=z.colors.concat(t._colors.slice(16))}else{if(z.colors.length===10){z.colors=z.colors.slice(0,-2).concat(t._colors.slice(8,-2),z.colors.slice(-2))}else{if(z.colors.length===18){z.colors=z.colors.concat(t._colors.slice(16,-2),z.colors.slice(-2))}}}}this.colors=z.colors;this.options=z;this.parent=z.body||z.parent||(p?p.getElementsByTagName("body")[0]:null);this.cols=z.cols||z.geometry[0];this.rows=z.rows||z.geometry[1];if(z.handler){this.on("data",z.handler)}this.ybase=0;this.ydisp=0;this.x=0;this.y=0;this.cursorState=0;this.cursorHidden=false;this.convertEol;this.state=0;this.queue="";this.scrollTop=0;this.scrollBottom=this.rows-1;this.applicationKeypad=false;this.applicationCursor=false;this.originMode=false;this.insertMode=false;this.wraparoundMode=false;this.normal=null;this.prefixMode=false;this.selectMode=false;this.visualMode=false;this.searchMode=false;this.searchDown;this.entry="";this.entryPrefix="Search: ";this._real;this._selected;this._textarea;this.charset=null;this.gcharset=null;this.glevel=0;this.charsets=[null];this.decLocator;this.x10Mouse;this.vt200Mouse;this.vt300Mouse;this.normalMouse;this.mouseEvents;this.sendFocus;this.utfMouse;this.sgrMouse;this.urxvtMouse;this.element;this.children;this.refreshStart;this.refreshEnd;this.savedX;this.savedY;this.savedCols;this.readable=true;this.writable=true;this.defAttr=(0<<18)|(257<<9)|(256<<0);this.curAttr=this.defAttr;this.params=[];this.currentParam=0;this.prefix="";this.postfix="";this.lines=[];var A=this.rows;while(A--){this.lines.push(this.blankLine())}this.tabs;this.setupStops()}l(t,h);t.prototype.eraseAttr=function(){return(this.defAttr&~511)|(this.curAttr&511)};t.tangoColors=["#2e3436","#cc0000","#4e9a06","#c4a000","#3465a4","#75507b","#06989a","#d3d7cf","#555753","#ef2929","#8ae234","#fce94f","#729fcf","#ad7fa8","#34e2e2","#eeeeec"];t.xtermColors=["#000000","#cd0000","#00cd00","#cdcd00","#0000ee","#cd00cd","#00cdcd","#e5e5e5","#7f7f7f","#ff0000","#00ff00","#ffff00","#5c5cff","#ff00ff","#00ffff","#ffffff"];t.colors=(function(){var y=t.tangoColors.slice(),C=[0,95,135,175,215,255],A;A=0;for(;A<216;A++){z(C[(A/36)%6|0],C[(A/6)%6|0],C[A%6])}A=0;for(;A<24;A++){C=8+A*10;z(C,C,C)}function z(F,E,D){y.push("#"+B(F)+B(E)+B(D))}function B(D){D=D.toString(16);return D.length<2?"0"+D:D}return y})();t.colors[256]="#000000";t.colors[257]="#f0f0f0";t._colors=t.colors.slice();t.vcolors=(function(){var A=[],y=t.colors,B=0,z;for(;B<256;B++){z=parseInt(y[B].substring(1),16);A.push([(z>>16)&255,(z>>8)&255,z&255])}return A})();t.defaults={colors:t.colors,convertEol:false,termName:"xterm",geometry:[80,24],cursorBlink:true,visualBell:false,popOnBell:false,scrollback:1000,screenKeys:false,debug:false,useStyle:false};t.options={};e(n(t.defaults),function(y){t[y]=t.defaults[y];t.options[y]=t.defaults[y]});t.focus=null;t.prototype.focus=function(){if(t.focus===this){return}if(t.focus){t.focus.blur()}if(this.sendFocus){this.send("\x1b[I")}this.showCursor();t.focus=this};t.prototype.blur=function(){if(t.focus!==this){return}this.cursorState=0;this.refresh(this.y,this.y);if(this.sendFocus){this.send("\x1b[O")}t.focus=null};t.prototype.initGlobal=function(){var y=this.document;t._boundDocs=t._boundDocs||[];if(~c(t._boundDocs,y)){return}t._boundDocs.push(y);t.bindPaste(y);t.bindKeys(y);t.bindCopy(y);if(this.isIpad||this.isIphone){t.fixIpad(y)}if(this.useStyle){t.insertStyle(y,this.colors[256],this.colors[257])}};t.bindPaste=function(y){var z=y.defaultView;k(z,"paste",function(B){var A=t.focus;if(!A){return}if(B.clipboardData){A.send(B.clipboardData.getData("text/plain"))}else{if(A.context.clipboardData){A.send(A.context.clipboardData.getData("Text"))}}A.element.contentEditable="inherit";return d(B)})};t.bindKeys=function(y){k(y,"keydown",function(z){if(!t.focus){return}var A=z.target||z.srcElement;if(!A){return}if(A===t.focus.element||A===t.focus.context||A===t.focus.document||A===t.focus.body||A===t._textarea||A===t.focus.parent){return t.focus.keyDown(z)}},true);k(y,"keypress",function(z){if(!t.focus){return}var A=z.target||z.srcElement;if(!A){return}if(A===t.focus.element||A===t.focus.context||A===t.focus.document||A===t.focus.body||A===t._textarea||A===t.focus.parent){return t.focus.keyPress(z)}},true);k(y,"mousedown",function(A){if(!t.focus){return}var z=A.target||A.srcElement;if(!z){return}do{if(z===t.focus.element){return}}while(z=z.parentNode);t.focus.blur()})};t.bindCopy=function(y){var z=y.defaultView;k(z,"copy",function(C){var B=t.focus;if(!B){return}if(!B._selected){return}var A=B.getCopyTextarea();var D=B.grabText(B._selected.x1,B._selected.x2,B._selected.y1,B._selected.y2);B.emit("copy",D);A.focus();A.textContent=D;A.value=D;A.setSelectionRange(0,D.length);b(function(){B.element.focus();B.focus()},1)})};t.fixIpad=function(y){var z=y.createElement("textarea");z.style.position="absolute";z.style.left="-32000px";z.style.top="-32000px";z.style.width="0px";z.style.height="0px";z.style.opacity="0";z.style.backgroundColor="transparent";z.style.borderStyle="none";z.style.outlineStyle="none";z.autocapitalize="none";z.autocorrect="off";y.getElementsByTagName("body")[0].appendChild(z);t._textarea=z;b(function(){z.focus()},1000)};t.insertStyle=function(y,B,z){var C=y.getElementById("term-style");if(C){return}var A=y.getElementsByTagName("head")[0];if(!A){return}var C=y.createElement("style");C.id="term-style";C.innerHTML=".terminal {\n  float: left;\n  border: "+B+' solid 5px;\n  font-family: "DejaVu Sans Mono", "Liberation Mono", monospace;\n  font-size: 11px;\n  color: '+z+";\n  background: "+B+";\n}\n\n.terminal-cursor {\n  color: "+B+";\n  background: "+z+";\n}\n";A.insertBefore(C,A.firstChild)};t.prototype.open=function(A){var y=this,z=0,B;this.parent=A||this.parent;if(!this.parent){throw new Error("Terminal requires a parent element.")}this.context=this.parent.ownerDocument.defaultView;this.document=this.parent.ownerDocument;this.body=this.document.getElementsByTagName("body")[0];if(this.context.navigator&&this.context.navigator.userAgent){this.isMac=!!~this.context.navigator.userAgent.indexOf("Mac");this.isIpad=!!~this.context.navigator.userAgent.indexOf("iPad");this.isIphone=!!~this.context.navigator.userAgent.indexOf("iPhone");this.isMSIE=!!~this.context.navigator.userAgent.indexOf("MSIE")}this.element=this.document.createElement("div");this.element.className="terminal";this.element.style.outline="none";this.element.setAttribute("tabindex",0);this.element.style.backgroundColor=this.colors[256];this.element.style.color=this.colors[257];this.children=[];for(;z<this.rows;z++){B=this.document.createElement("div");this.element.appendChild(B);this.children.push(B)}this.parent.appendChild(this.element);this.refresh(0,this.rows-1);this.initGlobal();this.focus();this.startBlink();k(this.element,"focus",function(){y.focus();if(y.isIpad||y.isIphone){t._textarea.focus()}});k(this.element,"mousedown",function(){y.focus()});k(this.element,"mousedown",function(D){var C=D.button!=null?+D.button:D.which!=null?D.which-1:null;if(y.isMSIE){C=C===1?0:C===4?1:C}if(C!==2){return}y.element.contentEditable="true";b(function(){y.element.contentEditable="inherit"},1)},true);this.bindMouse();if(t.brokenBold==null){t.brokenBold=v(this.document)}b(function(){y.element.focus()},100)};t.prototype.bindMouse=function(){var z=this.element,H=this,B=32;var C="onmousewheel" in this.context?"mousewheel":"DOMMouseScroll";function F(J){var I,K;I=y(J);K=A(J);if(!K){return}G(I,K);switch(J.type){case"mousedown":B=I;break;case"mouseup":B=32;break;case C:break}}function E(J){var I=B,K;K=A(J);if(!K){return}I+=32;G(I,K)}function D(J,I){if(!H.utfMouse){if(I===255){return J.push(0)}if(I>127){I=127}J.push(I)}else{if(I===2047){return J.push(0)}if(I<127){J.push(I)}else{if(I>2047){I=2047}J.push(192|(I>>6));J.push(128|(I&63))}}}function G(I,K){if(H.vt300Mouse){I&=3;K.x-=32;K.y-=32;var J="\x1b[24";if(I===0){J+="1"}else{if(I===1){J+="3"}else{if(I===2){J+="5"}else{if(I===3){return}else{J+="0"}}}}J+="~["+K.x+","+K.y+"]\r";H.send(J);return}if(H.decLocator){I&=3;K.x-=32;K.y-=32;if(I===0){I=2}else{if(I===1){I=4}else{if(I===2){I=6}else{if(I===3){I=3}}}}H.send("\x1b["+I+";"+(I===3?4:0)+";"+K.y+";"+K.x+";"+(K.page||0)+"&w");return}if(H.urxvtMouse){K.x-=32;K.y-=32;K.x++;K.y++;H.send("\x1b["+I+";"+K.x+";"+K.y+"M");return}if(H.sgrMouse){K.x-=32;K.y-=32;H.send("\x1b[<"+((I&3)===3?I&~3:I)+";"+K.x+";"+K.y+((I&3)===3?"m":"M"));return}var J=[];D(J,I);D(J,K.x);D(J,K.y);H.send("\x1b[M"+u.fromCharCode.apply(u,J))}function y(L){var K,I,N,M,J;switch(L.type){case"mousedown":K=L.button!=null?+L.button:L.which!=null?L.which-1:null;if(H.isMSIE){K=K===1?0:K===4?1:K}break;case"mouseup":K=3;break;case"DOMMouseScroll":K=L.detail<0?64:65;break;case"mousewheel":K=L.wheelDeltaY>0?64:65;break}I=L.shiftKey?4:0;N=L.metaKey?8:0;M=L.ctrlKey?16:0;J=I|N|M;if(H.vt200Mouse){J&=M}else{if(!H.normalMouse){J=0}}K=(32+(J<<2))+K;return K}function A(M){var I,N,J,L,K;if(M.pageX==null){return}I=M.pageX;N=M.pageY;K=H.element;while(K&&K!==H.document.documentElement){I-=K.offsetLeft;N-=K.offsetTop;K="offsetParent" in K?K.offsetParent:K.parentNode}J=H.element.clientWidth;L=H.element.clientHeight;I=Math.round((I/J)*H.cols);N=Math.round((N/L)*H.rows);if(I<0){I=0}if(I>H.cols){I=H.cols}if(N<0){N=0}if(N>H.rows){N=H.rows}I+=32;N+=32;return{x:I,y:N,type:M.type===C?"mousewheel":M.type}}k(z,"mousedown",function(J){if(!H.mouseEvents){return}F(J);H.focus();if(H.vt200Mouse){F({__proto__:J,type:"mouseup"});return d(J)}if(H.normalMouse){k(H.document,"mousemove",E)}if(!H.x10Mouse){k(H.document,"mouseup",function I(K){F(K);if(H.normalMouse){w(H.document,"mousemove",E)}w(H.document,"mouseup",I);return d(K)})}return d(J)});k(z,C,function(I){if(!H.mouseEvents){return}if(H.x10Mouse||H.vt300Mouse||H.decLocator){return}F(I);return d(I)});k(z,C,function(I){if(H.mouseEvents){return}if(H.applicationKeypad){return}if(I.type==="DOMMouseScroll"){H.scrollDisp(I.detail<0?-5:5)}else{H.scrollDisp(I.wheelDeltaY>0?-5:5)}return d(I)})};t.prototype.destroy=function(){this.readable=false;this.writable=false;this._events={};this.handler=function(){};this.write=function(){};if(this.element.parentNode){this.element.parentNode.removeChild(this.element)}};t.prototype.refresh=function(C,E){var L,K,I,O,F,A,B,H,J,G,z,D,N,M;if(E-C>=this.rows/2){M=this.element.parentNode;if(M){M.removeChild(this.element)}}B=this.cols;K=C;if(E>=this.lines.length){this.log("`end` is too large. Most likely a bad CSR.");E=this.lines.length-1}for(;K<=E;K++){N=K+this.ydisp;O=this.lines[N];F="";if(K===this.y&&this.cursorState&&(this.ydisp===this.ybase||this.selectMode)&&!this.cursorHidden){L=this.x}else{L=-1}J=this.defAttr;I=0;for(;I<B;I++){H=O[I][0];A=O[I][1];if(I===L){H=-1}if(H!==J){if(J!==this.defAttr){F+="</span>"}if(H!==this.defAttr){if(H===-1){F+='<span class="reverse-video terminal-cursor">'}else{F+='<span style="';G=H&511;z=(H>>9)&511;D=H>>18;if(D&1){if(!t.brokenBold){F+="font-weight:bold;"}if(z<8){z+=8}}if(D&2){F+="text-decoration:underline;"}if(D&4){if(D&2){F=F.slice(0,-1);F+=" blink;"}else{F+="text-decoration:blink;"}}if(D&8){G=(H>>9)&511;z=H&511;if((D&1)&&z<8){z+=8}}if(D&16){F+="visibility:hidden;"}if(G!==256){F+="background-color:"+this.colors[G]+";"}if(z!==257){F+="color:"+this.colors[z]+";"}F+='">'}}}switch(A){case"&":F+="&amp;";break;case"<":F+="&lt;";break;case">":F+="&gt;";break;default:if(A<=" "){F+="&nbsp;"}else{if(r(A)){I++}F+=A}break}J=H}if(J!==this.defAttr){F+="</span>"}this.children[K].innerHTML=F}if(M){M.appendChild(this.element)}};t.prototype._cursorBlink=function(){if(t.focus!==this){return}this.cursorState^=1;this.refresh(this.y,this.y)};t.prototype.showCursor=function(){if(!this.cursorState){this.cursorState=1;this.refresh(this.y,this.y)}else{}};t.prototype.startBlink=function(){if(!this.cursorBlink){return}var y=this;this._blinker=function(){y._cursorBlink()};this._blink=a(this._blinker,500)};t.prototype.refreshBlink=function(){if(!this.cursorBlink){return}clearInterval(this._blink);this._blink=a(this._blinker,500)};t.prototype.scroll=function(){var y;if(++this.ybase===this.scrollback){this.ybase=this.ybase/2|0;this.lines=this.lines.slice(-(this.ybase+this.rows)+1)}this.ydisp=this.ybase;y=this.ybase+this.rows-1;y-=this.rows-1-this.scrollBottom;if(y===this.lines.length){this.lines.push(this.blankLine())}else{this.lines.splice(y,0,this.blankLine())}if(this.scrollTop!==0){if(this.ybase!==0){this.ybase--;this.ydisp=this.ybase}this.lines.splice(this.ybase+this.scrollTop,1)}this.updateRange(this.scrollTop);this.updateRange(this.scrollBottom)};t.prototype.scrollDisp=function(y){this.ydisp+=y;if(this.ydisp>this.ybase){this.ydisp=this.ybase}else{if(this.ydisp<0){this.ydisp=0}}this.refresh(0,this.rows-1)};t.prototype.write=function(E){var y=E.length,A=0,z,C,B;this.refreshStart=this.y;this.refreshEnd=this.y;if(this.ybase!==this.ydisp){this.ydisp=this.ybase;this.maxRange()}for(;A<y;A++){B=E[A];switch(this.state){case x:switch(B){case"\x07":this.bell();break;case"\n":case"\x0b":case"\x0c":if(this.convertEol){this.x=0}this.y++;if(this.y>this.scrollBottom){this.y--;this.scroll()}break;case"\r":this.x=0;break;case"\x08":if(this.x>0){this.x--}break;case"\t":this.x=this.nextStop();break;case"\x0e":this.setgLevel(1);break;case"\x0f":this.setgLevel(0);break;case"\x1b":this.state=g;break;default:if(B>=" "){if(this.charset&&this.charset[B]){B=this.charset[B]}if(this.x>=this.cols){this.x=0;this.y++;if(this.y>this.scrollBottom){this.y--;this.scroll()}}this.lines[this.y+this.ybase][this.x]=[this.curAttr,B];this.x++;this.updateRange(this.y);if(r(B)){z=this.y+this.ybase;if(this.cols<2||this.x>=this.cols){this.lines[z][this.x-1]=[this.curAttr," "];break}this.lines[z][this.x]=[this.curAttr," "];this.x++}}break}break;case g:switch(B){case"[":this.params=[];this.currentParam=0;this.state=q;break;case"]":this.params=[];this.currentParam=0;this.state=j;break;case"P":this.params=[];this.currentParam=0;this.state=o;break;case"_":this.state=s;break;case"^":this.state=s;break;case"c":this.reset();break;case"E":this.x=0;case"D":this.index();break;case"M":this.reverseIndex();break;case"%":this.setgLevel(0);this.setgCharset(0,t.charsets.US);this.state=x;A++;break;case"(":case")":case"*":case"+":case"-":case".":switch(B){case"(":this.gcharset=0;break;case")":this.gcharset=1;break;case"*":this.gcharset=2;break;case"+":this.gcharset=3;break;case"-":this.gcharset=1;break;case".":this.gcharset=2;break}this.state=f;break;case"/":this.gcharset=3;this.state=f;A--;break;case"N":break;case"O":break;case"n":this.setgLevel(2);break;case"o":this.setgLevel(3);break;case"|":this.setgLevel(3);break;case"}":this.setgLevel(2);break;case"~":this.setgLevel(1);break;case"7":this.saveCursor();this.state=x;break;case"8":this.restoreCursor();this.state=x;break;case"#":this.state=x;A++;break;case"H":this.tabSet();break;case"=":this.log("Serial port requested application keypad.");this.applicationKeypad=true;this.state=x;break;case">":this.log("Switching back to normal keypad.");this.applicationKeypad=false;this.state=x;break;default:this.state=x;this.error("Unknown ESC control: %s.",B);break}break;case f:switch(B){case"0":C=t.charsets.SCLD;break;case"A":C=t.charsets.UK;break;case"B":C=t.charsets.US;break;case"4":C=t.charsets.Dutch;break;case"C":case"5":C=t.charsets.Finnish;break;case"R":C=t.charsets.French;break;case"Q":C=t.charsets.FrenchCanadian;break;case"K":C=t.charsets.German;break;case"Y":C=t.charsets.Italian;break;case"E":case"6":C=t.charsets.NorwegianDanish;break;case"Z":C=t.charsets.Spanish;break;case"H":case"7":C=t.charsets.Swedish;break;case"=":C=t.charsets.Swiss;break;case"/":C=t.charsets.ISOLatin;A++;break;default:C=t.charsets.US;break}this.setgCharset(this.gcharset,C);this.gcharset=null;this.state=x;break;case j:if(B==="\x1b"||B==="\x07"){if(B==="\x1b"){A++}this.params.push(this.currentParam);switch(this.params[0]){case 0:case 1:case 2:if(this.params[1]){this.title=this.params[1];this.handleTitle(this.title)}break;case 3:break;case 4:case 5:break;case 10:case 11:case 12:case 13:case 14:case 15:case 16:case 17:case 18:case 19:break;case 46:break;case 50:break;case 51:break;case 52:break;case 104:case 105:case 110:case 111:case 112:case 113:case 114:case 115:case 116:case 117:case 118:break}this.params=[];this.currentParam=0;this.state=x}else{if(!this.params.length){if(B>="0"&&B<="9"){this.currentParam=this.currentParam*10+B.charCodeAt(0)-48}else{if(B===";"){this.params.push(this.currentParam);this.currentParam=""}}}else{this.currentParam+=B}}break;case q:if(B==="?"||B===">"||B==="!"){this.prefix=B;break}if(B>="0"&&B<="9"){this.currentParam=this.currentParam*10+B.charCodeAt(0)-48;break}if(B==="$"||B==='"'||B===" "||B==="'"){this.postfix=B;break}this.params.push(this.currentParam);this.currentParam=0;if(B===";"){break}this.state=x;switch(B){case"A":this.cursorUp(this.params);break;case"B":this.cursorDown(this.params);break;case"C":this.cursorForward(this.params);break;case"D":this.cursorBackward(this.params);break;case"H":this.cursorPos(this.params);break;case"J":this.eraseInDisplay(this.params);break;case"K":this.eraseInLine(this.params);break;case"m":if(!this.prefix){this.charAttributes(this.params)}break;case"n":if(!this.prefix){this.deviceStatus(this.params)}break;case"@":this.insertChars(this.params);break;case"E":this.cursorNextLine(this.params);break;case"F":this.cursorPrecedingLine(this.params);break;case"G":this.cursorCharAbsolute(this.params);break;case"L":this.insertLines(this.params);break;case"M":this.deleteLines(this.params);break;case"P":this.deleteChars(this.params);break;case"X":this.eraseChars(this.params);break;case"`":this.charPosAbsolute(this.params);break;case"a":this.HPositionRelative(this.params);break;case"c":this.sendDeviceAttributes(this.params);break;case"d":this.linePosAbsolute(this.params);break;case"e":this.VPositionRelative(this.params);break;case"f":this.HVPosition(this.params);break;case"h":this.setMode(this.params);break;case"l":this.resetMode(this.params);break;case"r":this.setScrollRegion(this.params);break;case"s":this.saveCursor(this.params);break;case"u":this.restoreCursor(this.params);break;case"I":this.cursorForwardTab(this.params);break;case"S":this.scrollUp(this.params);break;case"T":if(this.params.length<2&&!this.prefix){this.scrollDown(this.params)}break;case"Z":this.cursorBackwardTab(this.params);break;case"b":this.repeatPrecedingCharacter(this.params);break;case"g":this.tabClear(this.params);break;case"p":switch(this.prefix){case"!":this.softReset(this.params);break}break;default:this.error("Unknown CSI code: %s.",B);break}this.prefix="";this.postfix="";break;case o:if(B==="\x1b"||B==="\x07"){if(B==="\x1b"){A++}switch(this.prefix){case"":break;case"$q":var F=this.currentParam,D=false;switch(F){case'"q':F='0"q';break;case'"p':F='61"p';break;case"r":F=""+(this.scrollTop+1)+";"+(this.scrollBottom+1)+"r";break;case"m":F="0m";break;default:this.error("Unknown DCS Pt: %s.",F);F="";break}this.send("\x1bP"+ +D+"$r"+F+"\x1b\\");break;case"+p":break;case"+q":var F=this.currentParam,D=false;this.send("\x1bP"+ +D+"+r"+F+"\x1b\\");break;default:this.error("Unknown DCS prefix: %s.",this.prefix);break}this.currentParam=0;this.prefix="";this.state=x}else{if(!this.currentParam){if(!this.prefix&&B!=="$"&&B!=="+"){this.currentParam=B}else{if(this.prefix.length===2){this.currentParam=B}else{this.prefix+=B}}}else{this.currentParam+=B}}break;case s:if(B==="\x1b"||B==="\x07"){if(B==="\x1b"){A++}this.state=x}break}}this.updateRange(this.y);this.refresh(this.refreshStart,this.refreshEnd)};t.prototype.writeln=function(y){this.write(y+"\r\n")};t.prototype.keyDown=function(A){var y=this,z;switch(A.keyCode){case 8:if(A.shiftKey){z="\x08";break}z="\x7f";break;case 9:if(A.shiftKey){z="\x1b[Z";break}z="\t";break;case 13:z="\r";break;case 27:z="\x1b";break;case 37:if(this.applicationCursor){z="\x1bOD";break}z="\x1b[D";break;case 39:if(this.applicationCursor){z="\x1bOC";break}z="\x1b[C";break;case 38:if(this.applicationCursor){z="\x1bOA";break}if(A.ctrlKey){this.scrollDisp(-1);return d(A)}else{z="\x1b[A"}break;case 40:if(this.applicationCursor){z="\x1bOB";break}if(A.ctrlKey){this.scrollDisp(1);return d(A)}else{z="\x1b[B"}break;case 46:z="\x1b[3~";break;case 45:z="\x1b[2~";break;case 36:if(this.applicationKeypad){z="\x1bOH";break}z="\x1bOH";break;case 35:if(this.applicationKeypad){z="\x1bOF";break}z="\x1bOF";break;case 33:if(A.shiftKey){this.scrollDisp(-(this.rows-1));return d(A)}else{z="\x1b[5~"}break;case 34:if(A.shiftKey){this.scrollDisp(this.rows-1);return d(A)}else{z="\x1b[6~"}break;case 112:z="\x1bOP";break;case 113:z="\x1bOQ";break;case 114:z="\x1bOR";break;case 115:z="\x1bOS";break;case 116:z="\x1b[15~";break;case 117:z="\x1b[17~";break;case 118:z="\x1b[18~";break;case 119:z="\x1b[19~";break;case 120:z="\x1b[20~";break;case 121:z="\x1b[21~";break;case 122:z="\x1b[23~";break;case 123:z="\x1b[24~";break;default:if(A.ctrlKey){if(A.keyCode>=65&&A.keyCode<=90){if(this.screenKeys){if(!this.prefixMode&&!this.selectMode&&A.keyCode===65){this.enterPrefix();return d(A)}}if(this.prefixMode&&A.keyCode===86){this.leavePrefix();return}if((this.prefixMode||this.selectMode)&&A.keyCode===67){if(this.visualMode){b(function(){y.leaveVisual()},1)}return}z=u.fromCharCode(A.keyCode-64)}else{if(A.keyCode===32){z=u.fromCharCode(0)}else{if(A.keyCode>=51&&A.keyCode<=55){z=u.fromCharCode(A.keyCode-51+27)}else{if(A.keyCode===56){z=u.fromCharCode(127)}else{if(A.keyCode===219){z=u.fromCharCode(27)}else{if(A.keyCode===221){z=u.fromCharCode(29)}}}}}}}else{if((!this.isMac&&A.altKey)||(this.isMac&&A.metaKey)){if(A.keyCode>=65&&A.keyCode<=90){z="\x1b"+u.fromCharCode(A.keyCode+32)}else{if(A.keyCode===192){z="\x1b`"}else{if(A.keyCode>=48&&A.keyCode<=57){z="\x1b"+(A.keyCode-48)}}}}}break}if(!z){return true}if(this.prefixMode){this.leavePrefix();return d(A)}if(this.selectMode){this.keySelect(A,z);return d(A)}this.emit("keydown",A);this.emit("key",z,A);this.showCursor();this.handler(z);return d(A)};t.prototype.setgLevel=function(y){this.glevel=y;this.charset=this.charsets[y]};t.prototype.setgCharset=function(y,z){this.charsets[y]=z;if(this.glevel===y){this.charset=z}};t.prototype.keyPress=function(z){var y;d(z);if(z.charCode){y=z.charCode}else{if(z.which==null){y=z.keyCode}else{if(z.which!==0&&z.charCode!==0){y=z.which}else{return false}}}if(!y||z.ctrlKey||z.altKey||z.metaKey){return false}y=u.fromCharCode(y);if(this.prefixMode){this.leavePrefix();this.keyPrefix(z,y);return false}if(this.selectMode){this.keySelect(z,y);return false}this.emit("keypress",y,z);this.emit("key",y,z);this.showCursor();this.handler(y);return false};t.prototype.send=function(z){var y=this;if(!this.queue){b(function(){y.handler(y.queue);y.queue=""},1)}this.queue+=z};t.prototype.bell=function(){if(!this.visualBell){return}var y=this;this.element.style.borderColor="white";b(function(){y.element.style.borderColor=""},10);if(this.popOnBell){this.focus()}};t.prototype.log=function(){if(!this.debug){return}if(!this.context.console||!this.context.console.log){return}var y=Array.prototype.slice.call(arguments);this.context.console.log.apply(this.context.console,y)};t.prototype.error=function(){if(!this.debug){return}if(!this.context.console||!this.context.console.error){return}var y=Array.prototype.slice.call(arguments);this.context.console.error.apply(this.context.console,y)};t.prototype.resize=function(z,F){var A,E,C,B,D;if(z<1){z=1}if(F<1){F=1}B=this.cols;if(B<z){D=[this.defAttr," "];C=this.lines.length;while(C--){while(this.lines[C].length<z){this.lines[C].push(D)}}}else{if(B>z){C=this.lines.length;while(C--){while(this.lines[C].length>z){this.lines[C].pop()}}}}this.setupStops(B);this.cols=z;B=this.rows;if(B<F){E=this.element;while(B++<F){if(this.lines.length<F+this.ybase){this.lines.push(this.blankLine())}if(this.children.length<F){A=this.document.createElement("div");E.appendChild(A);this.children.push(A)}}}else{if(B>F){while(B-->F){if(this.lines.length>F+this.ybase){this.lines.pop()}if(this.children.length>F){E=this.children.pop();if(!E){continue}E.parentNode.removeChild(E)}}}}this.rows=F;if(this.y>=F){this.y=F-1}if(this.x>=z){this.x=z-1}this.scrollTop=0;this.scrollBottom=F-1;this.refresh(0,this.rows-1);this.normal=null};t.prototype.updateRange=function(z){if(z<this.refreshStart){this.refreshStart=z}if(z>this.refreshEnd){this.refreshEnd=z}};t.prototype.maxRange=function(){this.refreshStart=0;this.refreshEnd=this.rows-1};t.prototype.setupStops=function(y){if(y!=null){if(!this.tabs[y]){y=this.prevStop(y)}}else{this.tabs={};y=0}for(;y<this.cols;y+=8){this.tabs[y]=true}};t.prototype.prevStop=function(y){if(y==null){y=this.x}while(!this.tabs[--y]&&y>0){}return y>=this.cols?this.cols-1:y<0?0:y};t.prototype.nextStop=function(y){if(y==null){y=this.x}while(!this.tabs[++y]&&y<this.cols){}return y>=this.cols?this.cols-1:y<0?0:y};t.prototype.eraseRight=function(z,C){var A=this.lines[this.ybase+C],B=[this.eraseAttr()," "];for(;z<this.cols;z++){A[z]=B}this.updateRange(C)};t.prototype.eraseLeft=function(z,C){var A=this.lines[this.ybase+C],B=[this.eraseAttr()," "];z++;while(z--){A[z]=B}this.updateRange(C)};t.prototype.eraseLine=function(z){this.eraseRight(0,z)};t.prototype.blankLine=function(C){var y=C?this.eraseAttr():this.defAttr;var B=[y," "],z=[],A=0;for(;A<this.cols;A++){z[A]=B}return z};t.prototype.ch=function(y){return y?[this.eraseAttr()," "]:[this.defAttr," "]};t.prototype.is=function(z){var y=this.termName;return(y+"").indexOf(z)===0};t.prototype.handler=function(y){this.emit("data",y)};t.prototype.handleTitle=function(y){this.emit("title",y)};t.prototype.index=function(){this.y++;if(this.y>this.scrollBottom){this.y--;this.scroll()}this.state=x};t.prototype.reverseIndex=function(){var y;this.y--;if(this.y<this.scrollTop){this.y++;this.lines.splice(this.y+this.ybase,0,this.blankLine(true));y=this.rows-1-this.scrollBottom;this.lines.splice(this.rows-1+this.ybase-y+1,1);this.updateRange(this.scrollTop);this.updateRange(this.scrollBottom)}this.state=x};t.prototype.reset=function(){this.options.rows=this.rows;this.options.cols=this.cols;t.call(this,this.options);this.refresh(0,this.rows-1)};t.prototype.tabSet=function(){this.tabs[this.x]=true;this.state=x};t.prototype.cursorUp=function(z){var y=z[0];if(y<1){y=1}this.y-=y;if(this.y<0){this.y=0}};t.prototype.cursorDown=function(z){var y=z[0];if(y<1){y=1}this.y+=y;if(this.y>=this.rows){this.y=this.rows-1}};t.prototype.cursorForward=function(z){var y=z[0];if(y<1){y=1}this.x+=y;if(this.x>=this.cols){this.x=this.cols-1}};t.prototype.cursorBackward=function(z){var y=z[0];if(y<1){y=1}this.x-=y;if(this.x<0){this.x=0}};t.prototype.cursorPos=function(A){var z,y;z=A[0]-1;if(A.length>=2){y=A[1]-1}else{y=0}if(z<0){z=0}else{if(z>=this.rows){z=this.rows-1}}if(y<0){y=0}else{if(y>=this.cols){y=this.cols-1}}this.x=y;this.y=z};t.prototype.eraseInDisplay=function(z){var y;switch(z[0]){case 0:this.eraseRight(this.x,this.y);y=this.y+1;for(;y<this.rows;y++){this.eraseLine(y)}break;case 1:this.eraseLeft(this.x,this.y);y=this.y;while(y--){this.eraseLine(y)}break;case 2:y=this.rows;while(y--){this.eraseLine(y)}break;case 3:break}};t.prototype.eraseInLine=function(y){switch(y[0]){case 0:this.eraseRight(this.x,this.y);break;case 1:this.eraseLeft(this.x,this.y);break;case 2:this.eraseLine(this.y);break}};t.prototype.charAttributes=function(E){if(E.length===1&&E[0]===0){this.curAttr=this.defAttr;return}var A=E.length,C=0,z=this.curAttr>>18,y=(this.curAttr>>9)&511,B=this.curAttr&511,D;for(;C<A;C++){D=E[C];if(D>=30&&D<=37){y=D-30}else{if(D>=40&&D<=47){B=D-40}else{if(D>=90&&D<=97){D+=8;y=D-90}else{if(D>=100&&D<=107){D+=8;B=D-100}else{if(D===0){z=this.defAttr>>18;y=(this.defAttr>>9)&511;B=this.defAttr&511}else{if(D===1){z|=1}else{if(D===4){z|=2}else{if(D===5){z|=4}else{if(D===7){z|=8}else{if(D===8){z|=16}else{if(D===22){z&=~1}else{if(D===24){z&=~2}else{if(D===25){z&=~4}else{if(D===27){z&=~8}else{if(D===28){z&=~16}else{if(D===39){y=(this.defAttr>>9)&511}else{if(D===49){B=this.defAttr&511}else{if(D===38){if(E[C+1]===2){C+=2;y=m(E[C]&255,E[C+1]&255,E[C+2]&255);if(y===-1){y=511}C+=2}else{if(E[C+1]===5){C+=2;D=E[C]&255;y=D}}}else{if(D===48){if(E[C+1]===2){C+=2;B=m(E[C]&255,E[C+1]&255,E[C+2]&255);if(B===-1){B=511}C+=2}else{if(E[C+1]===5){C+=2;D=E[C]&255;B=D}}}else{if(D===100){y=(this.defAttr>>9)&511;B=this.defAttr&511}else{this.error("Unknown SGR attribute: %d.",D)}}}}}}}}}}}}}}}}}}}}}this.curAttr=(z<<18)|(y<<9)|B};t.prototype.deviceStatus=function(y){if(!this.prefix){switch(y[0]){case 5:this.send("\x1b[0n");break;case 6:this.send("\x1b["+(this.y+1)+";"+(this.x+1)+"R");break}}else{if(this.prefix==="?"){switch(y[0]){case 6:this.send("\x1b[?"+(this.y+1)+";"+(this.x+1)+"R");break;case 15:break;case 25:break;case 26:break;case 53:break}}}};t.prototype.insertChars=function(C){var B,A,y,z;B=C[0];if(B<1){B=1}A=this.y+this.ybase;y=this.x;z=[this.eraseAttr()," "];while(B--&&y<this.cols){this.lines[A].splice(y++,0,z);this.lines[A].pop()}};t.prototype.cursorNextLine=function(z){var y=z[0];if(y<1){y=1}this.y+=y;if(this.y>=this.rows){this.y=this.rows-1}this.x=0};t.prototype.cursorPrecedingLine=function(z){var y=z[0];if(y<1){y=1}this.y-=y;if(this.y<0){this.y=0}this.x=0};t.prototype.cursorCharAbsolute=function(z){var y=z[0];if(y<1){y=1}this.x=y-1};t.prototype.insertLines=function(B){var A,z,y;A=B[0];if(A<1){A=1}z=this.y+this.ybase;y=this.rows-1-this.scrollBottom;y=this.rows-1+this.ybase-y+1;while(A--){this.lines.splice(z,0,this.blankLine(true));this.lines.splice(y,1)}this.updateRange(this.y);this.updateRange(this.scrollBottom)};t.prototype.deleteLines=function(B){var A,z,y;A=B[0];if(A<1){A=1}z=this.y+this.ybase;y=this.rows-1-this.scrollBottom;y=this.rows-1+this.ybase-y;while(A--){this.lines.splice(y+1,0,this.blankLine(true));this.lines.splice(z,1)}this.updateRange(this.y);this.updateRange(this.scrollBottom)};t.prototype.deleteChars=function(B){var A,z,y;A=B[0];if(A<1){A=1}z=this.y+this.ybase;y=[this.eraseAttr()," "];while(A--){this.lines[z].splice(this.x,1);this.lines[z].push(y)}};t.prototype.eraseChars=function(C){var B,A,y,z;B=C[0];if(B<1){B=1}A=this.y+this.ybase;y=this.x;z=[this.eraseAttr()," "];while(B--&&y<this.cols){this.lines[A][y++]=z}};t.prototype.charPosAbsolute=function(z){var y=z[0];if(y<1){y=1}this.x=y-1;if(this.x>=this.cols){this.x=this.cols-1}};t.prototype.HPositionRelative=function(z){var y=z[0];if(y<1){y=1}this.x+=y;if(this.x>=this.cols){this.x=this.cols-1}};t.prototype.sendDeviceAttributes=function(y){if(y[0]>0){return}if(!this.prefix){if(this.is("xterm")||this.is("rxvt-unicode")||this.is("screen")){this.send("\x1b[?1;2c")}else{if(this.is("linux")){this.send("\x1b[?6c")}}}else{if(this.prefix===">"){if(this.is("xterm")){this.send("\x1b[>0;276;0c")}else{if(this.is("rxvt-unicode")){this.send("\x1b[>85;95;0c")}else{if(this.is("linux")){this.send(y[0]+"c")}else{if(this.is("screen")){this.send("\x1b[>83;40003;0c")}}}}}}};t.prototype.linePosAbsolute=function(z){var y=z[0];if(y<1){y=1}this.y=y-1;if(this.y>=this.rows){this.y=this.rows-1}};t.prototype.VPositionRelative=function(z){var y=z[0];if(y<1){y=1}this.y+=y;if(this.y>=this.rows){this.y=this.rows-1}};t.prototype.HVPosition=function(y){if(y[0]<1){y[0]=1}if(y[1]<1){y[1]=1}this.y=y[0]-1;if(this.y>=this.rows){this.y=this.rows-1}this.x=y[1]-1;if(this.x>=this.cols){this.x=this.cols-1}};t.prototype.setMode=function(B){if(typeof B==="object"){var y=B.length,z=0;for(;z<y;z++){this.setMode(B[z])}return}if(!this.prefix){switch(B){case 4:this.insertMode=true;break;case 20:break}}else{if(this.prefix==="?"){switch(B){case 1:this.applicationCursor=true;break;case 2:this.setgCharset(0,t.charsets.US);this.setgCharset(1,t.charsets.US);this.setgCharset(2,t.charsets.US);this.setgCharset(3,t.charsets.US);break;case 3:this.savedCols=this.cols;this.resize(132,this.rows);break;case 6:this.originMode=true;break;case 7:this.wraparoundMode=true;break;case 12:break;case 66:this.log("Serial port requested application keypad.");this.applicationKeypad=true;break;case 9:case 1000:case 1002:case 1003:this.x10Mouse=B===9;this.vt200Mouse=B===1000;this.normalMouse=B>1000;this.mouseEvents=true;this.element.style.cursor="default";this.log("Binding to mouse events.");break;case 1004:this.sendFocus=true;break;case 1005:this.utfMouse=true;break;case 1006:this.sgrMouse=true;break;case 1015:this.urxvtMouse=true;break;case 25:this.cursorHidden=false;break;case 1049:case 47:case 1047:if(!this.normal){var A={lines:this.lines,ybase:this.ybase,ydisp:this.ydisp,x:this.x,y:this.y,scrollTop:this.scrollTop,scrollBottom:this.scrollBottom,tabs:this.tabs};this.reset();this.normal=A;this.showCursor()}break}}}};t.prototype.resetMode=function(A){if(typeof A==="object"){var y=A.length,z=0;for(;z<y;z++){this.resetMode(A[z])}return}if(!this.prefix){switch(A){case 4:this.insertMode=false;break;case 20:break}}else{if(this.prefix==="?"){switch(A){case 1:this.applicationCursor=false;break;case 3:if(this.cols===132&&this.savedCols){this.resize(this.savedCols,this.rows)}delete this.savedCols;break;case 6:this.originMode=false;break;case 7:this.wraparoundMode=false;break;case 12:break;case 66:this.log("Switching back to normal keypad.");this.applicationKeypad=false;break;case 9:case 1000:case 1002:case 1003:this.x10Mouse=false;this.vt200Mouse=false;this.normalMouse=false;this.mouseEvents=false;this.element.style.cursor="";break;case 1004:this.sendFocus=false;break;case 1005:this.utfMouse=false;break;case 1006:this.sgrMouse=false;break;case 1015:this.urxvtMouse=false;break;case 25:this.cursorHidden=true;break;case 1049:case 47:case 1047:if(this.normal){this.lines=this.normal.lines;this.ybase=this.normal.ybase;this.ydisp=this.normal.ydisp;this.x=this.normal.x;this.y=this.normal.y;this.scrollTop=this.normal.scrollTop;this.scrollBottom=this.normal.scrollBottom;this.tabs=this.normal.tabs;this.normal=null;this.refresh(0,this.rows-1);this.showCursor()}break}}}};t.prototype.setScrollRegion=function(y){if(this.prefix){return}this.scrollTop=(y[0]||1)-1;this.scrollBottom=(y[1]||this.rows)-1;this.x=0;this.y=0};t.prototype.saveCursor=function(y){this.savedX=this.x;this.savedY=this.y};t.prototype.restoreCursor=function(y){this.x=this.savedX||0;this.y=this.savedY||0};t.prototype.cursorForwardTab=function(z){var y=z[0]||1;while(y--){this.x=this.nextStop()}};t.prototype.scrollUp=function(z){var y=z[0]||1;while(y--){this.lines.splice(this.ybase+this.scrollTop,1);this.lines.splice(this.ybase+this.scrollBottom,0,this.blankLine())}this.updateRange(this.scrollTop);this.updateRange(this.scrollBottom)};t.prototype.scrollDown=function(z){var y=z[0]||1;while(y--){this.lines.splice(this.ybase+this.scrollBottom,1);this.lines.splice(this.ybase+this.scrollTop,0,this.blankLine())}this.updateRange(this.scrollTop);this.updateRange(this.scrollBottom)};t.prototype.initMouseTracking=function(y){};t.prototype.resetTitleModes=function(y){};t.prototype.cursorBackwardTab=function(z){var y=z[0]||1;while(y--){this.x=this.prevStop()}};t.prototype.repeatPrecedingCharacter=function(B){var A=B[0]||1,y=this.lines[this.ybase+this.y],z=y[this.x-1]||[this.defAttr," "];while(A--){y[this.x++]=z}};t.prototype.tabClear=function(z){var y=z[0];if(y<=0){delete this.tabs[this.x]}else{if(y===3){this.tabs={}}}};t.prototype.mediaCopy=function(y){};t.prototype.setResources=function(y){};t.prototype.disableModifiers=function(y){};t.prototype.setPointerMode=function(y){};t.prototype.softReset=function(y){this.cursorHidden=false;this.insertMode=false;this.originMode=false;this.wraparoundMode=false;this.applicationKeypad=false;this.applicationCursor=false;this.scrollTop=0;this.scrollBottom=this.rows-1;this.curAttr=this.defAttr;this.x=this.y=0;this.charset=null;this.glevel=0;this.charsets=[null]};t.prototype.requestAnsiMode=function(y){};t.prototype.requestPrivateMode=function(y){};t.prototype.setConformanceLevel=function(y){};t.prototype.loadLEDs=function(y){};t.prototype.setCursorStyle=function(y){};t.prototype.setCharProtectionAttr=function(y){};t.prototype.restorePrivateValues=function(y){};t.prototype.setAttrInRectangle=function(F){var D=F[0],B=F[1],z=F[2],E=F[3],y=F[4];var A,C;for(;D<z+1;D++){A=this.lines[this.ybase+D];for(C=B;C<E;C++){A[C]=[y,A[C][1]]}}this.updateRange(F[0]);this.updateRange(F[2])};t.prototype.savePrivateValues=function(y){};t.prototype.manipulateWindow=function(y){};t.prototype.reverseAttrInRectangle=function(y){};t.prototype.setTitleModeFeature=function(y){};t.prototype.setWarningBellVolume=function(y){};t.prototype.setMarginBellVolume=function(y){};t.prototype.copyRectangle=function(y){};t.prototype.enableFilterRectangle=function(y){};t.prototype.requestParameters=function(y){};t.prototype.selectChangeExtent=function(y){};t.prototype.fillRectangle=function(F){var D=F[0],C=F[1],A=F[2],y=F[3],E=F[4];var z,B;for(;C<y+1;C++){z=this.lines[this.ybase+C];for(B=A;B<E;B++){z[B]=[z[B][0],u.fromCharCode(D)]}}this.updateRange(F[1]);this.updateRange(F[3])};t.prototype.enableLocatorReporting=function(z){var y=z[0]>0};t.prototype.eraseRectangle=function(F){var C=F[0],A=F[1],y=F[2],E=F[3];var z,B,D;D=[this.eraseAttr()," "];for(;C<y+1;C++){z=this.lines[this.ybase+C];for(B=A;B<E;B++){z[B]=D}}this.updateRange(F[0]);this.updateRange(F[2])};t.prototype.setLocatorEvents=function(y){};t.prototype.selectiveEraseRectangle=function(y){};t.prototype.requestLocatorPosition=function(y){};t.prototype.insertColumns=function(){var B=params[0],y=this.ybase+this.rows,A=[this.eraseAttr()," "],z;while(B--){for(z=this.ybase;z<y;z++){this.lines[z].splice(this.x+1,0,A);this.lines[z].pop()}}this.maxRange()};t.prototype.deleteColumns=function(){var B=params[0],y=this.ybase+this.rows,A=[this.eraseAttr()," "],z;while(B--){for(z=this.ybase;z<y;z++){this.lines[z].splice(this.x,1);this.lines[z].push(A)}}this.maxRange()};t.prototype.enterPrefix=function(){this.prefixMode=true};t.prototype.leavePrefix=function(){this.prefixMode=false};t.prototype.enterSelect=function(){this._real={x:this.x,y:this.y,ydisp:this.ydisp,ybase:this.ybase,cursorHidden:this.cursorHidden,lines:this.copyBuffer(this.lines),write:this.write};this.write=function(){};this.selectMode=true;this.visualMode=false;this.cursorHidden=false;this.refresh(this.y,this.y)};t.prototype.leaveSelect=function(){this.x=this._real.x;this.y=this._real.y;this.ydisp=this._real.ydisp;this.ybase=this._real.ybase;this.cursorHidden=this._real.cursorHidden;this.lines=this._real.lines;this.write=this._real.write;delete this._real;this.selectMode=false;this.visualMode=false;this.refresh(0,this.rows-1)};t.prototype.enterVisual=function(){this._real.preVisual=this.copyBuffer(this.lines);this.selectText(this.x,this.x,this.ydisp+this.y,this.ydisp+this.y);this.visualMode=true};t.prototype.leaveVisual=function(){this.lines=this._real.preVisual;delete this._real.preVisual;delete this._selected;this.visualMode=false;this.refresh(0,this.rows-1)};t.prototype.enterSearch=function(A){this.entry="";this.searchMode=true;this.searchDown=A;this._real.preSearch=this.copyBuffer(this.lines);this._real.preSearchX=this.x;this._real.preSearchY=this.y;var y=this.ydisp+this.rows-1;for(var z=0;z<this.entryPrefix.length;z++){this.lines[y][z]=[(this.defAttr&~511)|4,this.entryPrefix[z]]}this.y=this.rows-1;this.x=this.entryPrefix.length;this.refresh(this.rows-1,this.rows-1)};t.prototype.leaveSearch=function(){this.searchMode=false;if(this._real.preSearch){this.lines=this._real.preSearch;this.x=this._real.preSearchX;this.y=this._real.preSearchY;delete this._real.preSearch;delete this._real.preSearchX;delete this._real.preSearchY}this.refresh(this.rows-1,this.rows-1)};t.prototype.copyBuffer=function(A){var A=A||this.lines,B=[];for(var C=0;C<A.length;C++){B[C]=[];for(var z=0;z<A[C].length;z++){B[C][z]=[A[C][z][0],A[C][z][1]]}}return B};t.prototype.getCopyTextarea=function(A){var z=this._copyTextarea,y=this.document;if(!z){z=y.createElement("textarea");z.style.position="absolute";z.style.left="-32000px";z.style.top="-32000px";z.style.width="0px";z.style.height="0px";z.style.opacity="0";z.style.backgroundColor="transparent";z.style.borderStyle="none";z.style.outlineStyle="none";y.getElementsByTagName("body")[0].appendChild(z);this._copyTextarea=z}return z};t.prototype.copyText=function(A){var z=this,y=this.getCopyTextarea();this.emit("copy",A);y.focus();y.textContent=A;y.value=A;y.setSelectionRange(0,A.length);b(function(){z.element.focus();z.focus()},1)};t.prototype.selectText=function(A,z,J,H){var C,B,L,K,D,I,G,E,F;if(this._selected){C=this._selected.x1;B=this._selected.x2;L=this._selected.y1;K=this._selected.y2;if(K<L){D=B;B=C;C=D;D=K;K=L;L=D}if(B<C&&L===K){D=B;B=C;C=D}for(G=L;G<=K;G++){I=0;E=this.cols-1;if(G===L){I=C}if(G===K){E=B}for(;I<=E;I++){if(this.lines[G][I].old!=null){F=this.lines[G][I].old;delete this.lines[G][I].old;this.lines[G][I]=[F,this.lines[G][I][1]]}}}J=this._selected.y1;A=this._selected.x1}J=Math.max(J,0);J=Math.min(J,this.ydisp+this.rows-1);H=Math.max(H,0);H=Math.min(H,this.ydisp+this.rows-1);this._selected={x1:A,x2:z,y1:J,y2:H};if(H<J){D=z;z=A;A=D;D=H;H=J;J=D}if(z<A&&J===H){D=z;z=A;A=D}for(G=J;G<=H;G++){I=0;E=this.cols-1;if(G===J){I=A}if(G===H){E=z}for(;I<=E;I++){F=this.lines[G][I][0];this.lines[G][I]=[(F&~511)|((511<<9)|4),this.lines[G][I][1]];this.lines[G][I].old=F}}J=J-this.ydisp;H=H-this.ydisp;J=Math.max(J,0);J=Math.min(J,this.rows-1);H=Math.max(H,0);H=Math.min(H,this.rows-1);this.refresh(0,this.rows-1)};t.prototype.grabText=function(B,A,I,H){var D="",C="",z,J,G,F,E;if(H<I){E=A;A=B;B=E;E=H;H=I;I=E}if(A<B&&I===H){E=A;A=B;B=E}for(G=I;G<=H;G++){J=0;F=this.cols-1;if(G===I){J=B}if(G===H){F=A}for(;J<=F;J++){z=this.lines[G][J][1];if(z===" "){C+=z;continue}if(C){D+=C;C=""}D+=z;if(r(z)){J++}}C="";D+="\n"}for(J=A,G=H;J<this.cols;J++){if(this.lines[G][J][1]!==" "){D=D.slice(0,-1);break}}return D};t.prototype.keyPrefix=function(z,y){if(y==="k"||y==="&"){this.destroy()}else{if(y==="p"||y==="]"){this.emit("request paste")}else{if(y==="c"){this.emit("request create")}else{if(y>="0"&&y<="9"){y=+y-1;if(!~y){y=9}this.emit("request term",y)}else{if(y==="n"){this.emit("request term next")}else{if(y==="P"){this.emit("request term previous")}else{if(y===":"){this.emit("request command mode")}else{if(y==="["){this.enterSelect()}}}}}}}}};t.prototype.keySelect=function(H,J){this.showCursor();if(this.searchMode||J==="n"||J==="N"){return this.keySearch(H,J)}if(J==="\x04"){var G=this.ydisp+this.y;if(this.ydisp===this.ybase){this.y=Math.min(this.y+(this.rows-1)/2|0,this.rows-1);this.refresh(0,this.rows-1)}else{this.scrollDisp((this.rows-1)/2|0)}if(this.visualMode){this.selectText(this.x,this.x,G,this.ydisp+this.y)}return}if(J==="\x15"){var G=this.ydisp+this.y;if(this.ydisp===0){this.y=Math.max(this.y-(this.rows-1)/2|0,0);this.refresh(0,this.rows-1)}else{this.scrollDisp(-(this.rows-1)/2|0)}if(this.visualMode){this.selectText(this.x,this.x,G,this.ydisp+this.y)}return}if(J==="\x06"){var G=this.ydisp+this.y;this.scrollDisp(this.rows-1);if(this.visualMode){this.selectText(this.x,this.x,G,this.ydisp+this.y)}return}if(J==="\x02"){var G=this.ydisp+this.y;this.scrollDisp(-(this.rows-1));if(this.visualMode){this.selectText(this.x,this.x,G,this.ydisp+this.y)}return}if(J==="k"||J==="\x1b[A"){var G=this.ydisp+this.y;this.y--;if(this.y<0){this.y=0;this.scrollDisp(-1)}if(this.visualMode){this.selectText(this.x,this.x,G,this.ydisp+this.y)}else{this.refresh(this.y,this.y+1)}return}if(J==="j"||J==="\x1b[B"){var G=this.ydisp+this.y;this.y++;if(this.y>=this.rows){this.y=this.rows-1;this.scrollDisp(1)}if(this.visualMode){this.selectText(this.x,this.x,G,this.ydisp+this.y)}else{this.refresh(this.y-1,this.y)}return}if(J==="h"||J==="\x1b[D"){var I=this.x;this.x--;if(this.x<0){this.x=0}if(this.visualMode){this.selectText(I,this.x,this.ydisp+this.y,this.ydisp+this.y)}else{this.refresh(this.y,this.y)}return}if(J==="l"||J==="\x1b[C"){var I=this.x;this.x++;if(this.x>=this.cols){this.x=this.cols-1}if(this.visualMode){this.selectText(I,this.x,this.ydisp+this.y,this.ydisp+this.y)}else{this.refresh(this.y,this.y)}return}if(J==="v"||J===" "){if(!this.visualMode){this.enterVisual()}else{this.leaveVisual()}return}if(J==="y"){if(this.visualMode){var L=this.grabText(this._selected.x1,this._selected.x2,this._selected.y1,this._selected.y2);this.copyText(L);this.leaveVisual()}return}if(J==="q"||J==="\x1b"){if(this.visualMode){this.leaveVisual()}else{this.leaveSelect()}return}if(J==="w"||J==="W"){var B=this.x;var A=this.y;var F=this.ydisp;var I=this.x;var G=this.y;var E=this.ydisp;var z=false;for(;;){var N=this.lines[E+G];while(I<this.cols){if(N[I][1]<=" "){z=true}else{if(z){break}}I++}if(I>=this.cols){I=this.cols-1}if(I===this.cols-1&&N[I][1]<=" "){I=0;if(++G>=this.rows){G--;if(++E>this.ybase){E=this.ybase;I=this.x;break}}continue}break}this.x=I,this.y=G;this.scrollDisp(-this.ydisp+E);if(this.visualMode){this.selectText(B,this.x,A+F,this.ydisp+this.y)}return}if(J==="b"||J==="B"){var B=this.x;var A=this.y;var F=this.ydisp;var I=this.x;var G=this.y;var E=this.ydisp;for(;;){var N=this.lines[E+G];var z=I>0&&N[I][1]>" "&&N[I-1][1]>" ";while(I>=0){if(N[I][1]<=" "){if(z&&(I+1<this.cols&&N[I+1][1]>" ")){I++;break}else{z=true}}I--}if(I<0){I=0}if(I===0&&(N[I][1]<=" "||!z)){I=this.cols-1;if(--G<0){G++;if(--E<0){E++;I=0;break}}continue}break}this.x=I,this.y=G;this.scrollDisp(-this.ydisp+E);if(this.visualMode){this.selectText(B,this.x,A+F,this.ydisp+this.y)}return}if(J==="e"||J==="E"){var I=this.x+1;var G=this.y;var E=this.ydisp;if(I>=this.cols){I--}for(;;){var N=this.lines[E+G];while(I<this.cols){if(N[I][1]<=" "){I++}else{break}}while(I<this.cols){if(N[I][1]<=" "){if(I-1>=0&&N[I-1][1]>" "){I--;break}}I++}if(I>=this.cols){I=this.cols-1}if(I===this.cols-1&&N[I][1]<=" "){I=0;if(++G>=this.rows){G--;if(++E>this.ybase){E=this.ybase;break}}continue}break}this.x=I,this.y=G;this.scrollDisp(-this.ydisp+E);if(this.visualMode){this.selectText(B,this.x,A+F,this.ydisp+this.y)}return}if(J==="^"||J==="0"){var B=this.x;if(J==="0"){this.x=0}else{if(J==="^"){var N=this.lines[this.ydisp+this.y];var I=0;while(I<this.cols){if(N[I][1]>" "){break}I++}if(I>=this.cols){I=this.cols-1}this.x=I}}if(this.visualMode){this.selectText(B,this.x,this.ydisp+this.y,this.ydisp+this.y)}else{this.refresh(this.y,this.y)}return}if(J==="$"){var B=this.x;var N=this.lines[this.ydisp+this.y];var I=this.cols-1;while(I>=0){if(N[I][1]>" "){if(this.visualMode&&I<this.cols-1){I++}break}I--}if(I<0){I=0}this.x=I;if(this.visualMode){this.selectText(B,this.x,this.ydisp+this.y,this.ydisp+this.y)}else{this.refresh(this.y,this.y)}return}if(J==="g"||J==="G"){var B=this.x;var A=this.y;var F=this.ydisp;if(J==="g"){this.x=0,this.y=0;this.scrollDisp(-this.ydisp)}else{if(J==="G"){this.x=0,this.y=this.rows-1;this.scrollDisp(this.ybase)}}if(this.visualMode){this.selectText(B,this.x,A+F,this.ydisp+this.y)}return}if(J==="H"||J==="M"||J==="L"){var B=this.x;var A=this.y;if(J==="H"){this.x=0,this.y=0}else{if(J==="M"){this.x=0,this.y=this.rows/2|0}else{if(J==="L"){this.x=0,this.y=this.rows-1}}}if(this.visualMode){this.selectText(B,this.x,this.ydisp+A,this.ydisp+this.y)}else{this.refresh(A,A);this.refresh(this.y,this.y)}return}if(J==="{"||J==="}"){var B=this.x;var A=this.y;var F=this.ydisp;var N;var K=false;var M=false;var C=-1;var G=this.y+(J==="{"?-1:1);var E=this.ydisp;var D;if(J==="{"){if(G<0){G++;if(E>0){E--}}}else{if(J==="}"){if(G>=this.rows){G--;if(E<this.ybase){E++}}}}for(;;){N=this.lines[E+G];for(D=0;D<this.cols;D++){if(N[D][1]>" "){if(C===-1){C=0}K=true;break}else{if(D===this.cols-1){if(C===-1){C=1}else{if(C===0){M=true}else{if(C===1){if(K){M=true}}}}break}}}if(M){break}if(J==="{"){G--;if(G<0){G++;if(E>0){E--}else{break}}}else{if(J==="}"){G++;if(G>=this.rows){G--;if(E<this.ybase){E++}else{break}}}}}if(!M){if(J==="{"){G=0;E=0}else{if(J==="}"){G=this.rows-1;E=this.ybase}}}this.x=0,this.y=G;this.scrollDisp(-this.ydisp+E);if(this.visualMode){this.selectText(B,this.x,A+F,this.ydisp+this.y)}return}if(J==="/"||J==="?"){if(!this.visualMode){this.enterSearch(J==="/")}return}return false};t.prototype.keySearch=function(I,L){if(L==="\x1b"){this.leaveSearch();return}if(L==="\r"||(!this.searchMode&&(L==="n"||L==="N"))){this.leaveSearch();var K=this.entry;if(!K){this.refresh(0,this.rows-1);return}var B=this.x;var A=this.y;var G=this.ydisp;var N;var M=false;var F=false;var J=this.x+1;var H=this.ydisp+this.y;var E,D;var C=L==="N"?this.searchDown:!this.searchDown;for(;;){N=this.lines[H];while(J<this.cols){for(D=0;D<K.length;D++){if(J+D>=this.cols){break}if(N[J+D][1]!==K[D]){break}else{if(N[J+D][1]===K[D]&&D===K.length-1){M=true;break}}}if(M){break}J+=D+1}if(M){break}J=0;if(!C){H++;if(H>this.ybase+this.rows-1){if(F){break}F=true;H=0}}else{H--;if(H<0){if(F){break}F=true;H=this.ybase+this.rows-1}}}if(M){if(H-this.ybase<0){E=H;H=0;if(E>this.ybase){H=E-this.ybase;E=this.ybase}}else{E=this.ybase;H-=this.ybase}this.x=J,this.y=H;this.scrollDisp(-this.ydisp+E);if(this.visualMode){this.selectText(B,this.x,A+G,this.ydisp+this.y)}return}this.refresh(0,this.rows-1);return}if(L==="\b"||L==="\x7f"){if(this.entry.length===0){return}var z=this.ydisp+this.rows-1;this.entry=this.entry.slice(0,-1);var D=this.entryPrefix.length+this.entry.length;this.lines[z][D]=[this.lines[z][D][0]," "];this.x--;this.refresh(this.rows-1,this.rows-1);this.refresh(this.y,this.y);return}if(L.length===1&&L>=" "&&L<="~"){var z=this.ydisp+this.rows-1;this.entry+=L;var D=this.entryPrefix.length+this.entry.length-1;this.lines[z][D]=[(this.defAttr&~511)|4,L];this.x++;this.refresh(this.rows-1,this.rows-1);this.refresh(this.y,this.y);return}return false};t.charsets={};t.charsets.SCLD={"`":"\u25c6",a:"\u2592",b:"\u0009",c:"\u000c",d:"\u000d",e:"\u000a",f:"\u00b0",g:"\u00b1",h:"\u2424",i:"\u000b",j:"\u2518",k:"\u2510",l:"\u250c",m:"\u2514",n:"\u253c",o:"\u23ba",p:"\u23bb",q:"\u2500",r:"\u23bc",s:"\u23bd",t:"\u251c",u:"\u2524",v:"\u2534",w:"\u252c",x:"\u2502",y:"\u2264",z:"\u2265","{":"\u03c0","|":"\u2260","}":"\u00a3","~":"\u00b7"};t.charsets.UK=null;t.charsets.US=null;t.charsets.Dutch=null;t.charsets.Finnish=null;t.charsets.French=null;t.charsets.FrenchCanadian=null;t.charsets.German=null;t.charsets.Italian=null;t.charsets.NorwegianDanish=null;t.charsets.Spanish=null;t.charsets.Swedish=null;t.charsets.Swiss=null;t.charsets.ISOLatin=null;function k(B,A,z,y){B.addEventListener(A,z,y||false)}function w(B,A,z,y){B.removeEventListener(A,z,y||false)}function d(y){if(y.preventDefault){y.preventDefault()}y.returnValue=false;if(y.stopPropagation){y.stopPropagation()}y.cancelBubble=true;return false}function l(A,y){function z(){this.constructor=A}z.prototype=y.prototype;A.prototype=new z}function v(A){var z=A.getElementsByTagName("body")[0];var C=A.createElement("span");C.innerHTML="hello world";z.appendChild(C);var B=C.scrollWidth;C.style.fontWeight="bold";var y=C.scrollWidth;z.removeChild(C);return B!==y}var u=this.String;var b=this.setTimeout;var a=this.setInterval;function c(A,z){var y=A.length;while(y--){if(A[y]===z){return y}}return -1}function r(y){if(y<="\uff00"){return false}return(y>="\uff01"&&y<="\uffbe")||(y>="\uffc2"&&y<="\uffc7")||(y>="\uffca"&&y<="\uffcf")||(y>="\uffd2"&&y<="\uffd7")||(y>="\uffda"&&y<="\uffdc")||(y>="\uffe0"&&y<="\uffe6")||(y>="\uffe8"&&y<="\uffee")}function m(A,y,G){var B=(A<<16)|(y<<8)|G;if(m._cache[B]!=null){return m._cache[B]}var C=Infinity,I=-1,D=0,E,z,J,F,H;for(;D<t.vcolors.length;D++){E=t.vcolors[D];z=E[0];J=E[1];F=E[2];H=m.distance(A,y,G,z,J,F);if(H===0){I=D;break}if(H<C){C=H;I=D}}return m._cache[B]=I}m._cache={};m.distance=function(C,B,D,z,y,A){return Math.pow(30*(C-z),2)+Math.pow(59*(B-y),2)+Math.pow(11*(D-A),2)};function e(B,z,y){if(B.forEach){return B.forEach(z,y)}for(var A=0;A<B.length;A++){z.call(y,B[A],A,B)}}function n(A){if(Object.keys){return Object.keys(A)}var y,z=[];for(y in A){if(Object.prototype.hasOwnProperty.call(A,y)){z.push(y)}}return z}t.EventEmitter=h;t.inherits=l;t.on=k;t.off=w;t.cancel=d;if(typeof module!=="undefined"){module.exports=t}else{this.Terminal=t}}).call(function(){return this||(typeof window!=="undefined"?window:global)}());</script>
+        <script type="application/javascript" src="/static/js/term.js"></script>
         <style>
             @font-face {
                          font-family: 'Ubuntu Mono';

From f73d34b9cc52a362193484494f117554aed5219a Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 19:48:52 +0800
Subject: [PATCH 02/34] fix(monitor): change monitor url

---
 run_server.py                  | 2 +-
 templates/jlog/log_online.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/run_server.py b/run_server.py
index 6c85d2dc6..389ae597a 100755
--- a/run_server.py
+++ b/run_server.py
@@ -460,7 +460,7 @@ def main():
     }
     tornado_app = tornado.web.Application(
         [
-            (r'/monitor', MonitorHandler),
+            (r'/ws/monitor', MonitorHandler),
             (r'/ws/terminal', WebTerminalHandler),
             (r'/kill', WebTerminalKillHandler),
             (r'/ws/exec', ExecHandler),
diff --git a/templates/jlog/log_online.html b/templates/jlog/log_online.html
index 3e8898b79..ae2a80f52 100644
--- a/templates/jlog/log_online.html
+++ b/templates/jlog/log_online.html
@@ -136,7 +136,7 @@
             var protocol = 'ws://';
         }
 
-        var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/monitor';
+        var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/monitor';
         var file_path = obj.attr('file_path');
         var socket = new WebSocket(endpoint + '?file_path=' + file_path);
 

From 234f79857ceea6a78ba6e5482a4c3bb99ec756e2 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:07:05 +0800
Subject: [PATCH 03/34] fix(webterminal): change it to HTML5 websocket

---
 static/js/webterminal.js | 150 ++++++++++++++++++++++-----------------
 1 file changed, 86 insertions(+), 64 deletions(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 8d6942d9b..e4a66e934 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -1,12 +1,60 @@
 /**
  * Created by liuzheng on 3/3/16.
  */
-var rowHeight = 1;
-var colWidth = 1;
-function WSSHClient() {
-}
-WSSHClient.prototype._generateEndpoint = function (options) {
-    console.log(options);
+//var rowHeight = 1;
+//var colWidth = 1;
+//function WSSHClient() {
+//}
+//WSSHClient.prototype._generateEndpoint = function (options) {
+//    console.log(options);
+//    if (window.location.protocol == 'https:') {
+//        var protocol = 'wss://';
+//    } else {
+//        var protocol = 'ws://';
+//    }
+//
+//    var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
+//    return endpoint;
+//};
+//WSSHClient.prototype.connect = function (options) {
+//    var endpoint = this._generateEndpoint(options);
+//
+//    if (window.WebSocket) {
+//        this._connection = new WebSocket(endpoint);
+//    }
+//    else if (window.MozWebSocket) {
+//        this._connection = MozWebSocket(endpoint);
+//    }
+//    else {
+//        options.onError('WebSocket Not Supported');
+//        return;
+//    }
+//
+//    this._connection.onopen = function () {
+//        options.onConnect();
+//    };
+//
+//    this._connection.onmessage = function (evt) {
+//        var data = JSON.parse(evt.data.toString());
+//        if (data.error !== undefined) {
+//            options.onError(data.error);
+//        }
+//        else {
+//            options.onData(data.data);
+//        }
+//    };
+//
+//    this._connection.onclose = function (evt) {
+//        options.onClose();
+//    };
+//};
+//
+//WSSHClient.prototype.send = function (data) {
+//    this._connection.send(JSON.stringify({'data': data}));
+//};
+
+
+function openTerminal(options) {
     if (window.location.protocol == 'https:') {
         var protocol = 'wss://';
     } else {
@@ -14,47 +62,8 @@ WSSHClient.prototype._generateEndpoint = function (options) {
     }
 
     var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
-    return endpoint;
-};
-WSSHClient.prototype.connect = function (options) {
-    var endpoint = this._generateEndpoint(options);
-
-    if (window.WebSocket) {
-        this._connection = new WebSocket(endpoint);
-    }
-    else if (window.MozWebSocket) {
-        this._connection = MozWebSocket(endpoint);
-    }
-    else {
-        options.onError('WebSocket Not Supported');
-        return;
-    }
-
-    this._connection.onopen = function () {
-        options.onConnect();
-    };
-
-    this._connection.onmessage = function (evt) {
-        var data = JSON.parse(evt.data.toString());
-        if (data.error !== undefined) {
-            options.onError(data.error);
-        }
-        else {
-            options.onData(data.data);
-        }
-    };
-
-    this._connection.onclose = function (evt) {
-        options.onClose();
-    };
-};
-
-WSSHClient.prototype.send = function (data) {
-    this._connection.send(JSON.stringify({'data': data}));
-};
-
-function openTerminal(options) {
-    var client = new WSSHClient();
+    var sock = new WebSocket(endpoint);
+    //var client = new WSSHClient();
     var term = new Terminal({
         rows: rowHeight,
         cols: colWidth,
@@ -63,29 +72,42 @@ function openTerminal(options) {
     });
     term.open();
     term.on('data', function (data) {
-        client.send(data)
+        sock.send(data)
     });
     $('.terminal').detach().appendTo('#term');
     term.resize(80, 24);
     term.write('Connecting...');
-    client.connect($.extend(options, {
-        onError: function (error) {
-            term.write('Error: ' + error + '\r\n');
-        },
-        onConnect: function () {
-            // Erase our connecting message
-            term.write('\r');
-        },
-        onClose: function () {
-            term.write('Connection Reset By Peer');
-        },
-        onData: function (data) {
-            term.write(data);
-        }
-    }));
+    sock.onopen = function () {
+        // Erase our connecting message
+        term.write('\r');
+    };
+    sock.onclose = function () {
+        term.write('Connection Reset By Peer');
+    };
+    sock.onmessage= function (data) {
+         term.write(data);
+    };
+    sock.onerror= function () {
+        term.write('Connection Reset By Peer');
+    };
+    //client.connect($.extend(options, {
+    //    onError: function (error) {
+    //        term.write('Error: ' + error + '\r\n');
+    //    },
+    //    onConnect: function () {
+    //        // Erase our connecting message
+    //        term.write('\r');
+    //    },
+    //    onClose: function () {
+    //        term.write('Connection Reset By Peer');
+    //    },
+    //    onData: function (data) {
+    //        term.write(data);
+    //    }
+    //}));
     rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24;
     colWidth = 0.0 + 1.00 * $('.terminal').width() / 80;
-    return {'term': term, 'client': client};
+    return {'term': term, 'client': sock};
 }
 
 function resize() {

From b879e724e25cf9769c7ecc9d26ff84ef426180e9 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:09:05 +0800
Subject: [PATCH 04/34] fix(webterminal.js): forget rowHeight and colWidth

---
 static/js/webterminal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index e4a66e934..7be5a7ce4 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -1,8 +1,8 @@
 /**
  * Created by liuzheng on 3/3/16.
  */
-//var rowHeight = 1;
-//var colWidth = 1;
+var rowHeight = 1;
+var colWidth = 1;
 //function WSSHClient() {
 //}
 //WSSHClient.prototype._generateEndpoint = function (options) {

From 94a4d68be25eee22bc2768ad569a85a37c17334f Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:12:09 +0800
Subject: [PATCH 05/34] fix(webterminal.js): send bug

---
 static/js/webterminal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 7be5a7ce4..e41e315a7 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -72,7 +72,7 @@ function openTerminal(options) {
     });
     term.open();
     term.on('data', function (data) {
-        sock.send(data)
+        sock.send(JSON.stringify({'data': data}))
     });
     $('.terminal').detach().appendTo('#term');
     term.resize(80, 24);
@@ -131,7 +131,7 @@ $(document).ready(function () {
         var geom = resize();
         console.log(geom);
         term_client.term.resize(geom.cols, geom.rows);
-        term_client.client.send({'resize': {'rows': geom.rows, 'cols': geom.cols}});
+        term_client.client.send(JSON.stringify({'data':{'resize': {'rows': geom.rows, 'cols': geom.cols}}}));
         $('#ssh').show();
     }
 

From 2bd3fdb4e7b87bd6968e81e1a33fa81c2f82bff7 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:21:20 +0800
Subject: [PATCH 06/34] fix(webterminal): url bug

---
 static/js/webterminal.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index e41e315a7..8fc30ed4d 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -61,7 +61,7 @@ function openTerminal(options) {
         var protocol = 'ws://';
     }
 
-    var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
+    var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/)[1];
     var sock = new WebSocket(endpoint);
     //var client = new WSSHClient();
     var term = new Terminal({
@@ -131,7 +131,7 @@ $(document).ready(function () {
         var geom = resize();
         console.log(geom);
         term_client.term.resize(geom.cols, geom.rows);
-        term_client.client.send(JSON.stringify({'data':{'resize': {'rows': geom.rows, 'cols': geom.cols}}}));
+        term_client.client.send(JSON.stringify({'data':{'resize': {'rows': geom.rows, 'cols': geom.cols}});
         $('#ssh').show();
     }
 

From e7976e423565ed3f68da213e28a95300bc33d368 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:22:46 +0800
Subject: [PATCH 07/34] fix(webterminal.js): }) bug

---
 static/js/webterminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 8fc30ed4d..a9d229126 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -131,7 +131,7 @@ $(document).ready(function () {
         var geom = resize();
         console.log(geom);
         term_client.term.resize(geom.cols, geom.rows);
-        term_client.client.send(JSON.stringify({'data':{'resize': {'rows': geom.rows, 'cols': geom.cols}});
+        term_client.client.send(JSON.stringify({'data':{'resize': {'rows': geom.rows, 'cols': geom.cols}}}));
         $('#ssh').show();
     }
 

From 6a0edb63f0220f06ec0f37b2d2a39d71836e12ca Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:28:52 +0800
Subject: [PATCH 08/34] fix(webterminal): data.data

---
 static/js/webterminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index a9d229126..e4b70110a 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -85,7 +85,7 @@ function openTerminal(options) {
         term.write('Connection Reset By Peer');
     };
     sock.onmessage= function (data) {
-         term.write(data);
+         term.write(data.data);
     };
     sock.onerror= function () {
         term.write('Connection Reset By Peer');

From f7eda41a54b9023905a9998e046556313f91d596 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:29:54 +0800
Subject: [PATCH 09/34] fix(webterminal): data.data.data

---
 static/js/webterminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index e4b70110a..8f855842f 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -85,7 +85,7 @@ function openTerminal(options) {
         term.write('Connection Reset By Peer');
     };
     sock.onmessage= function (data) {
-         term.write(data.data);
+         term.write(data.data.data);
     };
     sock.onerror= function () {
         term.write('Connection Reset By Peer');

From 20b5facc38c1d1b9bea7ec0faced0579b2ba5c90 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:30:58 +0800
Subject: [PATCH 10/34] fix(webterminal): data

---
 static/js/webterminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 8f855842f..3e576b4f8 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -85,7 +85,7 @@ function openTerminal(options) {
         term.write('Connection Reset By Peer');
     };
     sock.onmessage= function (data) {
-         term.write(data.data.data);
+         term.write(JSON.parse(data.data)['data']);
     };
     sock.onerror= function () {
         term.write('Connection Reset By Peer');

From 8e30ffb840507cf22e9d6b813a1e4af7566d459e Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:40:37 +0800
Subject: [PATCH 11/34] fix(run_server.py): test if it invoke_shell bug

---
 run_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_server.py b/run_server.py
index 389ae597a..3f6310cfb 100755
--- a/run_server.py
+++ b/run_server.py
@@ -338,7 +338,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
         if not self.term.remote_ip:
             self.term.remote_ip = self.request.remote_ip
         self.ssh = self.term.get_connection()
-        self.channel = self.ssh.invoke_shell(term='xterm')
+        self.channel = self.ssh.invoke_shell(term='vt100')
         WebTerminalHandler.tasks.append(MyThread(target=self.forward_outbound))
         WebTerminalHandler.clients.append(self)
 

From 95a7557acf7a2c34313f23566985d63072754105 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 20:42:08 +0800
Subject: [PATCH 12/34] fix:

---
 run_server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/run_server.py b/run_server.py
index 3f6310cfb..42d5bb3e6 100755
--- a/run_server.py
+++ b/run_server.py
@@ -338,7 +338,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
         if not self.term.remote_ip:
             self.term.remote_ip = self.request.remote_ip
         self.ssh = self.term.get_connection()
-        self.channel = self.ssh.invoke_shell(term='vt100')
+        self.channel = self.ssh.invoke_shell()
         WebTerminalHandler.tasks.append(MyThread(target=self.forward_outbound))
         WebTerminalHandler.clients.append(self)
 

From ef3156e6f748bc075aba432ec2847791cd1962f0 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 23:15:39 +0800
Subject: [PATCH 13/34] fix(test): monkey patch

---
 connect.py | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/connect.py b/connect.py
index 603f57f60..8f4e3699b 100755
--- a/connect.py
+++ b/connect.py
@@ -32,6 +32,27 @@ from jperm.ansible_api import MyRunner
 # from jlog.log_api import escapeString
 from jlog.models import ExecLog, FileLog
 
+def _patched_exec_command(self,
+                          command,
+                          bufsize=-1,
+                          timeout=None,
+                          get_pty=False,
+                          stdin_binary=True,
+                          stdout_binary=False,
+                          stderr_binary=False):
+
+    chan = self._transport.open_session()
+    if get_pty:
+        chan.get_pty()
+    chan.settimeout(timeout)
+    chan.exec_command(command)
+    stdin = chan.makefile('wb' if stdin_binary else 'w', bufsize)
+    stdout = chan.makefile('rb' if stdin_binary else 'r', bufsize)
+    stderr = chan.makefile_stderr('rb' if stdin_binary else 'r', bufsize)
+    return stdin, stdout, stderr
+
+paramiko.SSHClient.exec_command = _patched_exec_command
+
 login_user = get_object(User, username=getpass.getuser())
 try:
     remote_ip = os.environ.get('SSH_CLIENT').split()[0]

From 1ac9bebb8da734de920effe93d6f96f75b996f2f Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 23:17:19 +0800
Subject: [PATCH 14/34] fix: delete monkey patch

---
 connect.py | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/connect.py b/connect.py
index 8f4e3699b..603f57f60 100755
--- a/connect.py
+++ b/connect.py
@@ -32,27 +32,6 @@ from jperm.ansible_api import MyRunner
 # from jlog.log_api import escapeString
 from jlog.models import ExecLog, FileLog
 
-def _patched_exec_command(self,
-                          command,
-                          bufsize=-1,
-                          timeout=None,
-                          get_pty=False,
-                          stdin_binary=True,
-                          stdout_binary=False,
-                          stderr_binary=False):
-
-    chan = self._transport.open_session()
-    if get_pty:
-        chan.get_pty()
-    chan.settimeout(timeout)
-    chan.exec_command(command)
-    stdin = chan.makefile('wb' if stdin_binary else 'w', bufsize)
-    stdout = chan.makefile('rb' if stdin_binary else 'r', bufsize)
-    stderr = chan.makefile_stderr('rb' if stdin_binary else 'r', bufsize)
-    return stdin, stdout, stderr
-
-paramiko.SSHClient.exec_command = _patched_exec_command
-
 login_user = get_object(User, username=getpass.getuser())
 try:
     remote_ip = os.environ.get('SSH_CLIENT').split()[0]

From bdf6d97478e4b4d2f19ae1403d3505d4f5885023 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 23:50:19 +0800
Subject: [PATCH 15/34] test

---
 connect.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/connect.py b/connect.py
index 603f57f60..ae6b7c212 100755
--- a/connect.py
+++ b/connect.py
@@ -384,6 +384,9 @@ class SshTty(Tty):
                 if self.channel in r:
                     try:
                         x = self.channel.recv(10240)
+                        print x
+                        print '===='
+                        print len(x)
                         if len(x) == 0:
                             break
                         if self.vim_flag:

From 210b3c858868c249b6cc709e4312a5102f6bd20d Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 23:57:39 +0800
Subject: [PATCH 16/34] test

---
 connect.py               | 3 ---
 run_server.py            | 2 +-
 static/js/webterminal.js | 6 +++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/connect.py b/connect.py
index ae6b7c212..603f57f60 100755
--- a/connect.py
+++ b/connect.py
@@ -384,9 +384,6 @@ class SshTty(Tty):
                 if self.channel in r:
                     try:
                         x = self.channel.recv(10240)
-                        print x
-                        print '===='
-                        print len(x)
                         if len(x) == 0:
                             break
                         if self.vim_flag:
diff --git a/run_server.py b/run_server.py
index 42d5bb3e6..e46c941a3 100755
--- a/run_server.py
+++ b/run_server.py
@@ -412,7 +412,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                     if self.term.vim_flag:
                         self.term.vim_data += recv
                     try:
-                        self.write_message(json.dumps({'data': data}))
+                        self.write_message(data)
                         now_timestamp = time.time()
                         self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))
                         self.log_file_f.write(data)
diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 3e576b4f8..0767affd8 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -85,7 +85,11 @@ function openTerminal(options) {
         term.write('Connection Reset By Peer');
     };
     sock.onmessage= function (data) {
-         term.write(JSON.parse(data.data)['data']);
+        try {
+            term.write(data)
+        } catch (e) {
+            term.write(JSON.parse(data.data)['data'])
+        }
     };
     sock.onerror= function () {
         term.write('Connection Reset By Peer');

From d48020a919bdc6c5fbb541645b373e57001591cb Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 4 Mar 2016 23:59:18 +0800
Subject: [PATCH 17/34] test

---
 static/js/webterminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 0767affd8..d17b45e27 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -86,7 +86,7 @@ function openTerminal(options) {
     };
     sock.onmessage= function (data) {
         try {
-            term.write(data)
+            term.write(data.data)
         } catch (e) {
             term.write(JSON.parse(data.data)['data'])
         }

From 9b3a51469e7e4029418a471023e19867c7ae3654 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 15 Mar 2016 14:46:25 +0800
Subject: [PATCH 18/34] install_chardet

---
 run_server.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/run_server.py b/run_server.py
index e46c941a3..e8ee5b728 100755
--- a/run_server.py
+++ b/run_server.py
@@ -10,7 +10,7 @@ import os.path
 import threading
 import re
 import functools
-
+import chardet
 from django.core.signals import request_started, request_finished
 
 import tornado.ioloop
@@ -412,6 +412,9 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                     if self.term.vim_flag:
                         self.term.vim_data += recv
                     try:
+                        print chardet.detect(data)
+                        if chardet.detect(data).encoding == 'GB2312':
+                            data = data.encode('gbk').decode('utf8')
                         self.write_message(data)
                         now_timestamp = time.time()
                         self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))

From 31708c0d246e84b0eb8ef73cff00c9eb0347c995 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 15 Mar 2016 14:53:30 +0800
Subject: [PATCH 19/34] udpate

---
 run_server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/run_server.py b/run_server.py
index e8ee5b728..9ae28220d 100755
--- a/run_server.py
+++ b/run_server.py
@@ -413,8 +413,8 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                         self.term.vim_data += recv
                     try:
                         print chardet.detect(data)
-                        if chardet.detect(data).encoding == 'GB2312':
-                            data = data.encode('gbk').decode('utf8')
+                        if chardet.detect(data)['encoding'] == 'GB2312':
+                            data = data.decode('gb2312').encode('utf8')
                         self.write_message(data)
                         now_timestamp = time.time()
                         self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))

From ade8fb927c487f348fa2bbf5c4fdeda25ea3292d Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 15 Mar 2016 15:02:16 +0800
Subject: [PATCH 20/34] test

---
 run_server.py            |   4 +-
 static/js/webterminal.js | 153 ++++++++++++++++-----------------------
 2 files changed, 66 insertions(+), 91 deletions(-)

diff --git a/run_server.py b/run_server.py
index 9ae28220d..d91fd0ccd 100755
--- a/run_server.py
+++ b/run_server.py
@@ -338,7 +338,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
         if not self.term.remote_ip:
             self.term.remote_ip = self.request.remote_ip
         self.ssh = self.term.get_connection()
-        self.channel = self.ssh.invoke_shell()
+        self.channel = self.ssh.invoke_shell(term='xterm')
         WebTerminalHandler.tasks.append(MyThread(target=self.forward_outbound))
         WebTerminalHandler.clients.append(self)
 
@@ -412,7 +412,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                     if self.term.vim_flag:
                         self.term.vim_data += recv
                     try:
-                        print chardet.detect(data)
+                        # print chardet.detect(data)
                         if chardet.detect(data)['encoding'] == 'GB2312':
                             data = data.decode('gb2312').encode('utf8')
                         self.write_message(data)
diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index d17b45e27..657e17b3b 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -1,69 +1,61 @@
+
 /**
  * Created by liuzheng on 3/3/16.
  */
 var rowHeight = 1;
 var colWidth = 1;
-//function WSSHClient() {
-//}
-//WSSHClient.prototype._generateEndpoint = function (options) {
-//    console.log(options);
-//    if (window.location.protocol == 'https:') {
-//        var protocol = 'wss://';
-//    } else {
-//        var protocol = 'ws://';
-//    }
-//
-//    var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
-//    return endpoint;
-//};
-//WSSHClient.prototype.connect = function (options) {
-//    var endpoint = this._generateEndpoint(options);
-//
-//    if (window.WebSocket) {
-//        this._connection = new WebSocket(endpoint);
-//    }
-//    else if (window.MozWebSocket) {
-//        this._connection = MozWebSocket(endpoint);
-//    }
-//    else {
-//        options.onError('WebSocket Not Supported');
-//        return;
-//    }
-//
-//    this._connection.onopen = function () {
-//        options.onConnect();
-//    };
-//
-//    this._connection.onmessage = function (evt) {
-//        var data = JSON.parse(evt.data.toString());
-//        if (data.error !== undefined) {
-//            options.onError(data.error);
-//        }
-//        else {
-//            options.onData(data.data);
-//        }
-//    };
-//
-//    this._connection.onclose = function (evt) {
-//        options.onClose();
-//    };
-//};
-//
-//WSSHClient.prototype.send = function (data) {
-//    this._connection.send(JSON.stringify({'data': data}));
-//};
-
-
-function openTerminal(options) {
+function WSSHClient() {
+}
+WSSHClient.prototype._generateEndpoint = function (options) {
+    console.log(options);
     if (window.location.protocol == 'https:') {
         var protocol = 'wss://';
     } else {
         var protocol = 'ws://';
     }
 
-    var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/)[1];
-    var sock = new WebSocket(endpoint);
-    //var client = new WSSHClient();
+    var endpoint = protocol + document.URL.match(RegExp('//(.*?)/'))[1] + '/ws/terminal' + document.URL.match(/(\?.*)/);
+    return endpoint;
+};
+WSSHClient.prototype.connect = function (options) {
+    var endpoint = this._generateEndpoint(options);
+
+    if (window.WebSocket) {
+        this._connection = new WebSocket(endpoint);
+    }
+    else if (window.MozWebSocket) {
+        this._connection = MozWebSocket(endpoint);
+    }
+    else {
+        options.onError('WebSocket Not Supported');
+        return;
+    }
+
+    this._connection.onopen = function () {
+        options.onConnect();
+    };
+
+    this._connection.onmessage = function (evt) {
+        var data = JSON.parse(evt.data.toString());
+        if (data.error !== undefined) {
+            options.onError(data.error);
+        }
+        else {
+            options.onData(data.data);
+        }
+    };
+
+    this._connection.onclose = function (evt) {
+        options.onClose();
+    };
+};
+
+WSSHClient.prototype.send = function (data) {
+    this._connection.send(JSON.stringify({'data': data}));
+};
+
+function openTerminal(options) {
+    var client = new WSSHClient();
     var term = new Terminal({
         rows: rowHeight,
         cols: colWidth,
@@ -72,46 +64,29 @@ function openTerminal(options) {
     });
     term.open();
     term.on('data', function (data) {
-        sock.send(JSON.stringify({'data': data}))
+        client.send(data)
     });
     $('.terminal').detach().appendTo('#term');
     term.resize(80, 24);
     term.write('Connecting...');
-    sock.onopen = function () {
-        // Erase our connecting message
-        term.write('\r');
-    };
-    sock.onclose = function () {
-        term.write('Connection Reset By Peer');
-    };
-    sock.onmessage= function (data) {
-        try {
-            term.write(data.data)
-        } catch (e) {
-            term.write(JSON.parse(data.data)['data'])
+    client.connect($.extend(options, {
+        onError: function (error) {
+            term.write('Error: ' + error + '\r\n');
+        },
+        onConnect: function () {
+            // Erase our connecting message
+            term.write('\r');
+        },
+        onClose: function () {
+            term.write('Connection Reset By Peer');
+        },
+        onData: function (data) {
+            term.write(data);
         }
-    };
-    sock.onerror= function () {
-        term.write('Connection Reset By Peer');
-    };
-    //client.connect($.extend(options, {
-    //    onError: function (error) {
-    //        term.write('Error: ' + error + '\r\n');
-    //    },
-    //    onConnect: function () {
-    //        // Erase our connecting message
-    //        term.write('\r');
-    //    },
-    //    onClose: function () {
-    //        term.write('Connection Reset By Peer');
-    //    },
-    //    onData: function (data) {
-    //        term.write(data);
-    //    }
-    //}));
+    }));
     rowHeight = 0.0 + 1.00 * $('.terminal').height() / 24;
     colWidth = 0.0 + 1.00 * $('.terminal').width() / 80;
-    return {'term': term, 'client': sock};
+    return {'term': term, 'client': client};
 }
 
 function resize() {
@@ -135,7 +110,7 @@ $(document).ready(function () {
         var geom = resize();
         console.log(geom);
         term_client.term.resize(geom.cols, geom.rows);
-        term_client.client.send(JSON.stringify({'data':{'resize': {'rows': geom.rows, 'cols': geom.cols}}}));
+        term_client.client.send({'resize': {'rows': geom.rows, 'cols': geom.cols}});
         $('#ssh').show();
     }
 

From b0d1dd9485b4da169484ff8d8a3b6cd73aa8aaca Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 15 Mar 2016 15:04:15 +0800
Subject: [PATCH 21/34] test

---
 static/js/webterminal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 657e17b3b..9dde424df 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -41,7 +41,7 @@ WSSHClient.prototype.connect = function (options) {
             options.onError(data.error);
         }
         else {
-            options.onData(data.data);
+            options.onData(data);
         }
     };
 

From 5f35b740df616e8fc081b246767c37747e4c595d Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 15 Mar 2016 15:06:37 +0800
Subject: [PATCH 22/34] test

---
 static/js/webterminal.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/static/js/webterminal.js b/static/js/webterminal.js
index 9dde424df..e5ea997f2 100644
--- a/static/js/webterminal.js
+++ b/static/js/webterminal.js
@@ -36,13 +36,12 @@ WSSHClient.prototype.connect = function (options) {
     };
 
     this._connection.onmessage = function (evt) {
-        var data = JSON.parse(evt.data.toString());
-        if (data.error !== undefined) {
+        try{
+            options.onData(evt.data);
+        } catch (e) {
+            var data = JSON.parse(evt.data.toString());
             options.onError(data.error);
         }
-        else {
-            options.onData(data);
-        }
     };
 
     this._connection.onclose = function (evt) {

From 8adf1c5d7168fea78113f3b61a55b5133f23b46c Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Tue, 15 Mar 2016 15:11:33 +0800
Subject: [PATCH 23/34] requirement

---
 install/requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/requirements.txt b/install/requirements.txt
index 23ab9d3b0..405b35882 100644
--- a/install/requirements.txt
+++ b/install/requirements.txt
@@ -14,4 +14,5 @@ ansible==1.9.4
 pyinotify==0.9.6
 passlib==1.6.5
 argparse==1.4.0
-django_crontab==0.6.0
\ No newline at end of file
+django_crontab==0.6.0
+chardet==2.3.0
\ No newline at end of file

From ca75484eb8d14f93915f7d22366ad529c7ff2da3 Mon Sep 17 00:00:00 2001
From: yumaojun <719118794@qq.com>
Date: Wed, 16 Mar 2016 22:30:39 +0800
Subject: [PATCH 24/34] =?UTF-8?q?fix=20(jperm):=20=20=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=20?=
 =?UTF-8?q?=E4=BB=85=E4=BD=BF=E7=94=A8=E7=A7=98=E9=92=A5=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=80=9A=E4=BF=A1=EF=BC=8C=20=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E4=B8=8D=E4=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. perm_role_push 模板取消密码选项，但是为了 那么留下秘钥推送可勾选，允许空推送
2. perm_role_add 同上 取消 密码选项
3. perm_role_edit 同上 取消 密码选项
4. views 调整role push add edit 相关视图
5. perm_api，调整 gen_resource，仅支持秘钥认证（是否需要支持密码认证，我觉得没必要，如果需要请提出)

close #100
close #127
---
 jperm/perm_api.py                   |  3 ++-
 jperm/views.py                      |  8 ++++----
 jumpserver.conf                     | 12 ++++++------
 templates/jperm/perm_role_add.html  | 14 +++++++-------
 templates/jperm/perm_role_edit.html | 14 +++++++-------
 templates/jperm/perm_role_push.html | 10 ----------
 6 files changed, 26 insertions(+), 35 deletions(-)

diff --git a/jperm/perm_api.py b/jperm/perm_api.py
index de5cbcdb7..fb020ea07 100644
--- a/jperm/perm_api.py
+++ b/jperm/perm_api.py
@@ -182,8 +182,9 @@ def gen_resource(ob, perm=None):
                 info = {'hostname': asset.hostname,
                         'ip': asset.ip,
                         'port': asset_info.get('port', 22),
+                        'ansible_ssh_private_key_file': role_key,
                         'username': role.name,
-                        'password': CRYPTOR.decrypt(role.password)
+                        # 'password': CRYPTOR.decrypt(role.password)
                        }
 
                 if os.path.isfile(role_key):
diff --git a/jperm/views.py b/jperm/views.py
index b4eb6a1c1..7ff572bcf 100644
--- a/jperm/views.py
+++ b/jperm/views.py
@@ -519,12 +519,12 @@ def perm_role_push(request):
             ret["pass_push"] = task.add_user(role.name)
             ret["key_push"] = task.push_key(role.name, os.path.join(role.key_path, 'id_rsa.pub'))
 
-        # 2. 推送账号密码
-        elif password_push:
-            ret["pass_push"] = task.add_user(role.name, CRYPTOR.decrypt(role.password))
+        # 2. 推送账号密码 <为了安全 系统用户统一使用秘钥进行通信， 不再提供密码方式的推送>
+        # elif password_push:
+        #     ret["pass_push"] = task.add_user(role.name, CRYPTOR.decrypt(role.password))
 
         # 3. 推送sudo配置文件
-        if password_push or key_push:
+        if key_push:
             sudo_list = set([sudo for sudo in role.sudo.all()])  # set(sudo1, sudo2, sudo3)
             if sudo_list:
                 ret['sudo'] = task.push_sudo_file([role], sudo_list)
diff --git a/jumpserver.conf b/jumpserver.conf
index cee5fd8e5..9f16edfc9 100644
--- a/jumpserver.conf
+++ b/jumpserver.conf
@@ -1,6 +1,6 @@
 [base]
-url = http://192.168.244.129
-key = i6k2zeu8x6mncl76
+url = http://192.168.10.165
+key = 941enj9neshd1wes
 ip = 0.0.0.0
 port = 80
 log = debug
@@ -14,9 +14,9 @@ database = jumpserver
 
 [mail]
 mail_enable = 1
-email_host = smtp.exmail.qq.com
-email_port = 25
-email_host_user = noreply@jumpserver.org
-email_host_password = xxxxxxxxxx
+email_host = 
+email_port = 587
+email_host_user = 
+email_host_password = 
 email_use_tls = True
 
diff --git a/templates/jperm/perm_role_add.html b/templates/jperm/perm_role_add.html
index 59ec3b3b6..e2af64104 100644
--- a/templates/jperm/perm_role_add.html
+++ b/templates/jperm/perm_role_add.html
@@ -40,13 +40,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>
-                                <div class="col-sm-8">
-                                    <input id="role_password" name="role_password" placeholder="Role Password" type="password" class="form-control">
-                                    <span class="help-block m-b-none">如果不添加密码，会自动生成</span>
-                                </div>
-                            </div>
+{#                            <div class="form-group">#}
+{#                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>#}
+{#                                <div class="col-sm-8">#}
+{#                                    <input id="role_password" name="role_password" placeholder="Role Password" type="password" class="form-control">#}
+{#                                    <span class="help-block m-b-none">如果不添加密码，会自动生成</span>#}
+{#                                </div>#}
+{#                            </div>#}
                             <div class="form-group">
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>
                                 <div class="col-sm-8">
diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html
index 420eb300a..00ff59eda 100644
--- a/templates/jperm/perm_role_edit.html
+++ b/templates/jperm/perm_role_edit.html
@@ -40,13 +40,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-                            <div class="form-group">
-                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>
-                                <div class="col-sm-8">
-                                    <input id="role_password" name="role_password" type="password" class="form-control">
-                                    <span class="help-block m-b-none">不修改请留空</span>
-                                </div>
-                            </div>
+{#                            <div class="form-group">#}
+{#                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>#}
+{#                                <div class="col-sm-8">#}
+{#                                    <input id="role_password" name="role_password" type="password" class="form-control">#}
+{#                                    <span class="help-block m-b-none">不修改请留空</span>#}
+{#                                </div>#}
+{#                            </div>#}
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>
diff --git a/templates/jperm/perm_role_push.html b/templates/jperm/perm_role_push.html
index 7e0541cc0..c8dfd0e63 100644
--- a/templates/jperm/perm_role_push.html
+++ b/templates/jperm/perm_role_push.html
@@ -74,16 +74,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="form-group">
-                                    <label for="j_group" class="col-sm-2 control-label">使用密码</label>
-                                    <div class="col-sm-1">
-                                        <div class="radio i-checks">
-                                            <label>
-                                                <input type="checkbox" value="1" id="use_password" name="use_password">
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
                             </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">

From c0e8ff86202e2669df221123690fa5fcc2ec57ee Mon Sep 17 00:00:00 2001
From: yumaojun <719118794@qq.com>
Date: Wed, 16 Mar 2016 23:03:43 +0800
Subject: [PATCH 25/34] =?UTF-8?q?fix=20(jperm):=20=20=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7=20?=
 =?UTF-8?q?=E4=BB=85=E4=BD=BF=E7=94=A8=E7=A7=98=E9=92=A5=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E9=80=9A=E4=BF=A1=EF=BC=8C=20=E5=B7=B2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=88=B7=E4=B8=8D=E4=BC=9A=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. perm_role_add 同上 保留 密码选项
2. perm_role_edit 同上 保留 密码选项
3. 仅保持入数据，不设计远程操作

close #100
close #127
---
 templates/jperm/perm_role_add.html  | 14 +++++++-------
 templates/jperm/perm_role_edit.html | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/templates/jperm/perm_role_add.html b/templates/jperm/perm_role_add.html
index e2af64104..59ec3b3b6 100644
--- a/templates/jperm/perm_role_add.html
+++ b/templates/jperm/perm_role_add.html
@@ -40,13 +40,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-{#                            <div class="form-group">#}
-{#                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>#}
-{#                                <div class="col-sm-8">#}
-{#                                    <input id="role_password" name="role_password" placeholder="Role Password" type="password" class="form-control">#}
-{#                                    <span class="help-block m-b-none">如果不添加密码，会自动生成</span>#}
-{#                                </div>#}
-{#                            </div>#}
+                            <div class="form-group">
+                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>
+                                <div class="col-sm-8">
+                                    <input id="role_password" name="role_password" placeholder="Role Password" type="password" class="form-control">
+                                    <span class="help-block m-b-none">如果不添加密码，会自动生成</span>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>
                                 <div class="col-sm-8">
diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html
index 00ff59eda..420eb300a 100644
--- a/templates/jperm/perm_role_edit.html
+++ b/templates/jperm/perm_role_edit.html
@@ -40,13 +40,13 @@
                                 </div>
                             </div>
                             <div class="hr-line-dashed"></div>
-{#                            <div class="form-group">#}
-{#                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>#}
-{#                                <div class="col-sm-8">#}
-{#                                    <input id="role_password" name="role_password" type="password" class="form-control">#}
-{#                                    <span class="help-block m-b-none">不修改请留空</span>#}
-{#                                </div>#}
-{#                            </div>#}
+                            <div class="form-group">
+                                <label for="role_password" class="col-sm-2 control-label">用户密码</label>
+                                <div class="col-sm-8">
+                                    <input id="role_password" name="role_password" type="password" class="form-control">
+                                    <span class="help-block m-b-none">不修改请留空</span>
+                                </div>
+                            </div>
                             <div class="hr-line-dashed"></div>
                             <div class="form-group">
                                 <label for="role_key" class="col-sm-2 control-label">用户密钥</label>

From 3ccf7adac1404f44b0e0b2016a377a982a31ea32 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 18 Mar 2016 15:01:07 +0800
Subject: [PATCH 26/34] =?UTF-8?q?=E7=BB=88=E4=BA=8E=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BA=86=E4=B9=B1=E7=A0=81=E5=95=A6=E5=95=A6=E5=95=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 run_server.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/run_server.py b/run_server.py
index d91fd0ccd..011f0f2b8 100755
--- a/run_server.py
+++ b/run_server.py
@@ -413,9 +413,9 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                         self.term.vim_data += recv
                     try:
                         # print chardet.detect(data)
-                        if chardet.detect(data)['encoding'] == 'GB2312':
-                            data = data.decode('gb2312').encode('utf8')
-                        self.write_message(data)
+                        # if chardet.detect(data)['encoding'] == 'GB2312':
+                        #     data = data.decode('gb2312').encode('utf8')
+                        self.write_message(data.decode('utf-8', 'replace'))
                         now_timestamp = time.time()
                         self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))
                         self.log_file_f.write(data)

From 5af9dd655e7045234096513bdc076c1ab0da6c95 Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 18 Mar 2016 17:08:15 +0800
Subject: [PATCH 27/34] delete_require_chardet

---
 install/requirements.txt | 1 -
 run_server.py            | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/install/requirements.txt b/install/requirements.txt
index 405b35882..5035a6995 100644
--- a/install/requirements.txt
+++ b/install/requirements.txt
@@ -15,4 +15,3 @@ pyinotify==0.9.6
 passlib==1.6.5
 argparse==1.4.0
 django_crontab==0.6.0
-chardet==2.3.0
\ No newline at end of file
diff --git a/run_server.py b/run_server.py
index 011f0f2b8..c15ab9b5c 100755
--- a/run_server.py
+++ b/run_server.py
@@ -10,7 +10,6 @@ import os.path
 import threading
 import re
 import functools
-import chardet
 from django.core.signals import request_started, request_finished
 
 import tornado.ioloop
@@ -412,9 +411,6 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                     if self.term.vim_flag:
                         self.term.vim_data += recv
                     try:
-                        # print chardet.detect(data)
-                        # if chardet.detect(data)['encoding'] == 'GB2312':
-                        #     data = data.decode('gb2312').encode('utf8')
                         self.write_message(data.decode('utf-8', 'replace'))
                         now_timestamp = time.time()
                         self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))

From 598d6cffa47622e6492081399857903bc3706853 Mon Sep 17 00:00:00 2001
From: kelianchun_miller <kelianchun@qq.com>
Date: Fri, 18 Mar 2016 20:43:25 +0800
Subject: [PATCH 28/34] pull issue #120

---
 connect.py | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/connect.py b/connect.py
index 974868f8f..843e776c6 100755
--- a/connect.py
+++ b/connect.py
@@ -95,8 +95,18 @@ class Tty(object):
         self.ps1_pattern = re.compile('\[.*@.*\][\$#]\s')
         self.vim_pattern = re.compile(r'\Wvi[m]+\s.* | \Wfg\s.*', re.X)
         self.vim_data = ''
-        self.stream = pyte.ByteStream()
+        self.stream = None
         self.screen = None
+        self.__init_screen_stream()
+
+    def __init_screen_stream(self):
+        """
+        初始化虚拟屏幕和字符流
+        :return:
+        """
+        self.stream = pyte.ByteStream()
+        self.screen = pyte.Screen(80, 24)
+        self.stream.attach(self.screen)
 
     @staticmethod
     def is_output(strings):
@@ -125,12 +135,14 @@ class Tty(object):
                 result = match[-1].strip()
         return result
 
-    def deal_command(self):
+    def deal_command(self, data):
         """
         处理截获的命令
+        :param data: 要处理的命令
         :return:返回最后的处理结果
         """
         command = ''
+        self.stream.feed(data)
         # 从虚拟屏幕中获取处理后的数据
         for line in reversed(self.screen.buffer):
             line_data = "".join(map(operator.attrgetter("data"), line)).strip()
@@ -348,16 +360,15 @@ class SshTty(Tty):
                         # 这个是用来处理用户的复制操作
                         if input_str != x:
                             data += input_str
-                        self.stream.feed(data)
                         if self.vim_flag:
                             match = self.ps1_pattern.search(self.vim_data)
                             if match:
                                 self.vim_flag = False
-                                data = self.deal_command()[0:200]
+                                data = self.deal_command(data)[0:200]
                                 if len(data) > 0:
                                     TtyLog(log=log, datetime=datetime.datetime.now(), cmd=data).save()
                         else:
-                            data = self.deal_command()[0:200]
+                            data = self.deal_command(data)[0:200]
                             if len(data) > 0:
                                 TtyLog(log=log, datetime=datetime.datetime.now(), cmd=data).save()
                         data = ''
@@ -395,8 +406,6 @@ class SshTty(Tty):
         win_size = self.get_win_size()
         #self.channel = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1], term='xterm')
         self.channel = channel = transport.open_session()
-        self.screen = pyte.Screen(win_size[1], win_size[0])
-        self.stream.attach(self.screen)
         channel.get_pty(term='xterm', height=win_size[0], width=win_size[1])
         channel.invoke_shell()
         try:

From 7dcf050dc4c59bf0b139af851bd1b9d0ad716e45 Mon Sep 17 00:00:00 2001
From: kelianchun_miller <kelianchun@qq.com>
Date: Fri, 18 Mar 2016 22:06:40 +0800
Subject: [PATCH 29/34] pull issue #120

---
 connect.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/connect.py b/connect.py
index 843e776c6..ad25b1511 100755
--- a/connect.py
+++ b/connect.py
@@ -102,7 +102,6 @@ class Tty(object):
     def __init_screen_stream(self):
         """
         初始化虚拟屏幕和字符流
-        :return:
         """
         self.stream = pyte.ByteStream()
         self.screen = pyte.Screen(80, 24)

From b2ccbc3f9ec7bad3f1fb4545eddc1e26f2aba158 Mon Sep 17 00:00:00 2001
From: kelianchun_miller <kelianchun@qq.com>
Date: Fri, 18 Mar 2016 23:36:31 +0800
Subject: [PATCH 30/34] pull issue #120

---
 connect.py | 47 +++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/connect.py b/connect.py
index ad25b1511..269eea07c 100755
--- a/connect.py
+++ b/connect.py
@@ -92,8 +92,8 @@ class Tty(object):
         self.remote_ip = ''
         self.login_type = login_type
         self.vim_flag = False
-        self.ps1_pattern = re.compile('\[.*@.*\][\$#]\s')
-        self.vim_pattern = re.compile(r'\Wvi[m]+\s.* | \Wfg\s.*', re.X)
+        self.ps1_pattern = re.compile('\[?.*@.*\]?[\$#]\s')
+        self.vim_pattern = re.compile(r'\W?vi[m]?\s.* | \W?fg\s.*', re.X)
         self.vim_data = ''
         self.stream = None
         self.screen = None
@@ -141,25 +141,28 @@ class Tty(object):
         :return:返回最后的处理结果
         """
         command = ''
-        self.stream.feed(data)
-        # 从虚拟屏幕中获取处理后的数据
-        for line in reversed(self.screen.buffer):
-            line_data = "".join(map(operator.attrgetter("data"), line)).strip()
-            if len(line_data) > 0:
-                parser_result = self.command_parser(line_data)
-                if parser_result is not None:
-                    # 2个条件写一起会有错误的数据
-                    if len(parser_result) > 0:
-                        command = parser_result
-                else:
-                    command = line_data
-                break
-        if command != '':
-            # 判断用户输入的是否是vim 或者fg命令
-            if self.vim_pattern.search(command):
-                self.vim_flag = True
-        # 虚拟屏幕清空
-        self.screen.reset()
+        try:
+            self.stream.feed(data)
+            # 从虚拟屏幕中获取处理后的数据
+            for line in reversed(self.screen.buffer):
+                line_data = "".join(map(operator.attrgetter("data"), line)).strip()
+                if len(line_data) > 0:
+                    parser_result = self.command_parser(line_data)
+                    if parser_result is not None:
+                        # 2个条件写一起会有错误的数据
+                        if len(parser_result) > 0:
+                            command = parser_result
+                    else:
+                        command = line_data
+                    break
+            if command != '':
+                # 判断用户输入的是否是vim 或者fg命令
+                if self.vim_pattern.search(command):
+                    self.vim_flag = True
+            # 虚拟屏幕清空
+            self.screen.reset()
+        except Exception:
+            pass
         return command
 
     def get_log(self):
@@ -403,7 +406,7 @@ class SshTty(Tty):
         # 获取连接的隧道并设置窗口大小 Make a channel and set windows size
         global channel
         win_size = self.get_win_size()
-        #self.channel = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1], term='xterm')
+        # self.channel = channel = ssh.invoke_shell(height=win_size[0], width=win_size[1], term='xterm')
         self.channel = channel = transport.open_session()
         channel.get_pty(term='xterm', height=win_size[0], width=win_size[1])
         channel.invoke_shell()

From 9efa9e979c7ca2fa1b0f8b1b7d8801513aceaf6e Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 18 Mar 2016 23:51:25 +0800
Subject: [PATCH 31/34] len(vim_data)

---
 run_server.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/run_server.py b/run_server.py
index c15ab9b5c..baf53e1c7 100755
--- a/run_server.py
+++ b/run_server.py
@@ -370,9 +370,11 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                         vim_data = self.term.deal_command(self.term.vim_data)[0:200]
                         if len(data) > 0:
                             TtyLog(log=self.log, datetime=datetime.datetime.now(), cmd=vim_data).save()
-
-                TtyLog(log=self.log, datetime=datetime.datetime.now(),
-                       cmd=self.term.deal_command(self.term.data)[0:200]).save()
+                else:
+                    vim_data = self.term.deal_command(self.term.vim_data)[0:200]
+                    if len(vim_data) > 0:
+                        TtyLog(log=self.log, datetime=datetime.datetime.now(),
+                               cmd=vim_data).save()
                 self.term.vim_data = ''
                 self.term.data = ''
                 self.term.input_mode = False

From 1103ee8f5204fdf1b59f54a9a613a3eb56d2512d Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 18 Mar 2016 23:55:06 +0800
Subject: [PATCH 32/34] len(vim_data)

---
 run_server.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/run_server.py b/run_server.py
index baf53e1c7..88e0bc625 100755
--- a/run_server.py
+++ b/run_server.py
@@ -370,11 +370,10 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
                         vim_data = self.term.deal_command(self.term.vim_data)[0:200]
                         if len(data) > 0:
                             TtyLog(log=self.log, datetime=datetime.datetime.now(), cmd=vim_data).save()
-                else:
-                    vim_data = self.term.deal_command(self.term.vim_data)[0:200]
-                    if len(vim_data) > 0:
-                        TtyLog(log=self.log, datetime=datetime.datetime.now(),
-                               cmd=vim_data).save()
+                vim_data = self.term.deal_command(self.term.vim_data)[0:200]
+                if len(vim_data) > 0:
+                    TtyLog(log=self.log, datetime=datetime.datetime.now(),
+                           cmd=vim_data).save()
                 self.term.vim_data = ''
                 self.term.data = ''
                 self.term.input_mode = False

From 4c88ea3c05efa5da157dde96565c0a3af75e8ddf Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 21 Mar 2016 10:30:29 +0800
Subject: [PATCH 33/34] =?UTF-8?q?fix(perm=5Frole=5Fadd)=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=BF=87=E9=95=BF=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修改表结构password长度
2. 修改template添加js验证
---
 jperm/models.py                    | 2 +-
 templates/jperm/perm_role_add.html | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/jperm/models.py b/jperm/models.py
index 425d01410..0ba12354a 100644
--- a/jperm/models.py
+++ b/jperm/models.py
@@ -26,7 +26,7 @@ class PermSudo(models.Model):
 class PermRole(models.Model):
     name = models.CharField(max_length=100, unique=True)
     comment = models.CharField(max_length=100, null=True, blank=True, default='')
-    password = models.CharField(max_length=100)
+    password = models.CharField(max_length=128)
     key_path = models.CharField(max_length=100)
     date_added = models.DateTimeField(auto_now=True)
     sudo = models.ManyToManyField(PermSudo, related_name='perm_role')
diff --git a/templates/jperm/perm_role_add.html b/templates/jperm/perm_role_add.html
index 59ec3b3b6..9928afa80 100644
--- a/templates/jperm/perm_role_add.html
+++ b/templates/jperm/perm_role_add.html
@@ -104,6 +104,10 @@ $('#roleForm').validator({
             ok: "",
             msg: {required: "系统用户名称必填"}
         },
+        "role_password": {
+            rule: "length[0~64]",
+            tip: "系统密码"
+        },
         "role_key": {
             rule: "check_begin",
             ok: "",

From 6e4b2918089e199da456fe2e61e67db77e358d68 Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Mon, 21 Mar 2016 10:32:08 +0800
Subject: [PATCH 34/34] =?UTF-8?q?fix(perm=5Frole=5Fedit)=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=BC=96=E8=BE=91=E7=B3=BB=E7=BB=9F=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=BF=87=E9=95=BFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 添加前端验证

close #173
---
 templates/jperm/perm_role_edit.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html
index 420eb300a..8ad8ed973 100644
--- a/templates/jperm/perm_role_edit.html
+++ b/templates/jperm/perm_role_edit.html
@@ -105,12 +105,16 @@ $('#roleForm').validator({
             tip: "输入系统用户名称",
             ok: "",
             msg: {required: "系统用户名称必填"}
+        },
+         "role_password": {
+            rule: "length[0~64]",
+            tip: "系统密码"
         },
         "role_key": {
             rule: "check_begin",
             ok: "",
             empty: true
-        },
+        }
 
     },
     valid: function(form) {