Show differences
Some checks failed
backend / cross (aarch64) (push) Has been cancelled
backend / cross (arm) (push) Has been cancelled
backend / cross (armhf) (push) Has been cancelled
backend / cross (i686) (push) Has been cancelled
backend / cross (mips) (push) Has been cancelled
backend / cross (mips64) (push) Has been cancelled
backend / cross (mips64el) (push) Has been cancelled
backend / cross (mipsel) (push) Has been cancelled
backend / cross (s390x) (push) Has been cancelled
backend / cross (win32) (push) Has been cancelled
backend / cross (x86_64) (push) Has been cancelled
docker / build (push) Has been cancelled
frontend / build (push) Has been cancelled
Some checks failed
backend / cross (aarch64) (push) Has been cancelled
backend / cross (arm) (push) Has been cancelled
backend / cross (armhf) (push) Has been cancelled
backend / cross (i686) (push) Has been cancelled
backend / cross (mips) (push) Has been cancelled
backend / cross (mips64) (push) Has been cancelled
backend / cross (mips64el) (push) Has been cancelled
backend / cross (mipsel) (push) Has been cancelled
backend / cross (s390x) (push) Has been cancelled
backend / cross (win32) (push) Has been cancelled
backend / cross (x86_64) (push) Has been cancelled
docker / build (push) Has been cancelled
frontend / build (push) Has been cancelled
This commit is contained in:
@@ -101,13 +101,9 @@ export class Xterm {
|
||||
private reconnect = true;
|
||||
private doReconnect = true;
|
||||
private closeOnDisconnect = false;
|
||||
private intervalID: NodeJS.Timeout;
|
||||
|
||||
private writeFunc = (data: ArrayBuffer) => this.writeData(new Uint8Array(data));
|
||||
private status = false;
|
||||
private titleStatus = false;
|
||||
private checkStatus = false;
|
||||
private connectStatus = false;
|
||||
private beforeCommand?: string;
|
||||
|
||||
constructor(
|
||||
private options: XtermOptions,
|
||||
private sendCb: () => void
|
||||
@@ -183,16 +179,7 @@ export class Xterm {
|
||||
}
|
||||
})
|
||||
);
|
||||
register(
|
||||
terminal.onData(data =>
|
||||
{
|
||||
if (this.status) {
|
||||
sendData(data);
|
||||
} else {
|
||||
this.writeData('\b \b');
|
||||
}
|
||||
})
|
||||
);
|
||||
register(terminal.onData(data => sendData(data)));
|
||||
register(terminal.onBinary(data => sendData(Uint8Array.from(data, v => v.charCodeAt(0)))));
|
||||
register(
|
||||
terminal.onResize(({ cols, rows }) => {
|
||||
@@ -257,18 +244,6 @@ export class Xterm {
|
||||
}
|
||||
}
|
||||
|
||||
@bind
|
||||
public changeUrl(ip: string, port: string) {
|
||||
const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
|
||||
this.options.wsUrl = [protocol, '//' + ip + ':' + port +'/ws', window.location.search].join('');
|
||||
this.options.tokenUrl = [window.location.protocol, '//' + ip + ':' + port +'/token'].join('');
|
||||
}
|
||||
|
||||
@bind
|
||||
public changeStatus(v: boolean){
|
||||
this.status = v;
|
||||
}
|
||||
|
||||
@bind
|
||||
public connect() {
|
||||
this.socket = new WebSocket(this.options.wsUrl, ['tty']);
|
||||
@@ -279,10 +254,6 @@ export class Xterm {
|
||||
register(addEventListener(socket, 'message', this.onSocketData as EventListener));
|
||||
register(addEventListener(socket, 'close', this.onSocketClose as EventListener));
|
||||
register(addEventListener(socket, 'error', () => (this.doReconnect = false)));
|
||||
const options = new URLSearchParams(decodeURIComponent(window.location.search));
|
||||
if (options.get('type') === 'docker') {
|
||||
this.intervalID = setInterval(this.loadCommand, 3000);
|
||||
}
|
||||
}
|
||||
|
||||
@bind
|
||||
@@ -334,52 +305,6 @@ export class Xterm {
|
||||
}
|
||||
}
|
||||
|
||||
@bind
|
||||
private loadCommand() {
|
||||
const options = new URLSearchParams(decodeURIComponent(window.location.search));
|
||||
const params = new URLSearchParams({
|
||||
repo: options.get('repoid') as string,
|
||||
user: options.get('userid') as string,
|
||||
});
|
||||
|
||||
fetch(
|
||||
'http://' + options.get('domain') + ':'+ options.get('port') +'/' +
|
||||
options.get('user') +
|
||||
'/' +
|
||||
options.get('repo') +
|
||||
'/devcontainer/command?' +
|
||||
params
|
||||
)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
if (data.status !== '4' && data.status !== '0') {
|
||||
this.sendData(data.command);
|
||||
} else {
|
||||
clearInterval(this.intervalID);
|
||||
if (data.status === '4') {
|
||||
fetch(
|
||||
'http://' + options.get('domain') + ':'+ options.get('port') +'/' +
|
||||
options.get('user') +
|
||||
'/' +
|
||||
options.get('repo') +
|
||||
'/devcontainer/command?' +
|
||||
params
|
||||
)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
this.sendData(data.command);
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
.catch(error => {
|
||||
console.error('Error:', error);
|
||||
});
|
||||
}
|
||||
|
||||
@bind
|
||||
private parseOptsFromUrlQuery(query: string): Preferences {
|
||||
const { terminal } = this;
|
||||
@@ -420,60 +345,16 @@ export class Xterm {
|
||||
const rawData = event.data as ArrayBuffer;
|
||||
const cmd = String.fromCharCode(new Uint8Array(rawData)[0]);
|
||||
const data = rawData.slice(1);
|
||||
|
||||
switch (cmd) {
|
||||
case Command.OUTPUT:
|
||||
console.log(this.status + ': ' + textDecoder.decode(data) + this.connectStatus + ' ' + this.checkStatus + ' ' + this.titleStatus );
|
||||
const options = new URLSearchParams(decodeURIComponent(window.location.search));
|
||||
if (options.get('type') === 'docker') {
|
||||
if (
|
||||
this.status === false &&
|
||||
textDecoder.decode(data).replace(/\s/g, '').includes('Successfully connected to the container'.replace(/\s/g, ''))
|
||||
) {
|
||||
if(this.connectStatus == true){
|
||||
this.status = true;
|
||||
}
|
||||
this.connectStatus = true;
|
||||
}
|
||||
if (this.checkStatus) {
|
||||
if (textDecoder.decode(data).replace(/\s/g, '').includes('You have out the container. Please refresh the terminal to reconnect.'.replace(/\s/g, ''))) {
|
||||
this.checkStatus = false;
|
||||
this.status = false;
|
||||
this.connectStatus = false;
|
||||
}
|
||||
if(textDecoder.decode(data).includes('\x1b')){
|
||||
this.checkStatus = false;
|
||||
}
|
||||
}
|
||||
if (this.titleStatus && textDecoder.decode(data).includes('\x1b')) {
|
||||
this.titleStatus = false;
|
||||
this.checkStatus = true;
|
||||
this.sendData(
|
||||
`echo $WEB_TERMINAL\n`
|
||||
);
|
||||
}
|
||||
if (
|
||||
!(this.status === false && (textDecoder.decode(data).includes('\x1b') || textDecoder.decode(data).replace(/\s/g, '').includes('docker'))) &&
|
||||
this.titleStatus !== true &&
|
||||
this.checkStatus !== true
|
||||
){
|
||||
this.writeFunc(data);
|
||||
}
|
||||
if (textDecoder.decode(data).replace(/\s/g, '').includes('exit')) {
|
||||
this.titleStatus = true;
|
||||
}
|
||||
|
||||
} else {
|
||||
this.writeFunc(data);
|
||||
}
|
||||
console.log(this.status + ': ' + textDecoder.decode(data) + this.connectStatus + ' ' + this.checkStatus + ' ' + this.titleStatus );
|
||||
this.writeFunc(data);
|
||||
break;
|
||||
case Command.SET_WINDOW_TITLE:
|
||||
console.log('SET_WINDOW_TITLESET_WINDOW_TITLE');
|
||||
this.title = textDecoder.decode(data);
|
||||
document.title = this.title;
|
||||
break;
|
||||
case Command.SET_PREFERENCES:
|
||||
console.log('SET_PREFERENCESSET_PREFERENCESSET_PREFERENCES');
|
||||
this.applyPreferences({
|
||||
...this.options.clientOptions,
|
||||
...JSON.parse(textDecoder.decode(data)),
|
||||
|
||||
Reference in New Issue
Block a user