Andreas/gotty
1
0
Fork 0
mirror of https://github.com/yudai/gotty.git synced 2026-01-18 23:36:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3 from ghthor/tsfmt

Browse source 
Add `tsfmt` to Makefile and reformat all typscript
This commit is contained in:
Will Owens 2022-02-27 21:53:48 -05:00 • committed by GitHub
commit d801d9ec51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 227 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -1,5 +1,5 @@
OUTPUT_DIR = ./builds
GIT_COMMIT = `git rev-parse HEAD | cut -c1-7`
GIT_COMMIT = $$(git rev-parse HEAD | cut -c1-7)
VERSION = 3.0.0-alpha.1
BUILD_OPTIONS = -ldflags "-X main.Version=$(VERSION) -X main.CommitID=$(GIT_COMMIT)"
@ -70,8 +70,14 @@ tools:
go get github.com/mitchellh/gox # for crosscompiling
go get github.com/tcnksm/ghr # for making gihub releases
.PHONY: test
test:
if [ `go fmt $(go list ./... | grep -v /vendor/) | wc -l` -gt 0 ]; then echo "go fmt error"; exit 1; fi
if [ $$(go fmt $$(go list ./...) | wc -l) -gt 0 ]; then echo "go fmt error"; exit 1; fi
cd js && npx tsfmt -r --verify
.PHONY: tsfmt
tsfmt:
cd js && npx tsfmt -r
cross_compile:
GOARM=5 gox -os="darwin linux freebsd netbsd openbsd" -arch="386 amd64 arm" -osarch="!darwin/arm" -output "${OUTPUT_DIR}/pkg/{{.OS}}_{{.Arch}}/{{.Dir}}"

2
js/dist/gotty-bundle.js vendored
View file

File diff suppressed because one or more lines are too long

2
js/dist/gotty-bundle.js.map vendored
View file

File diff suppressed because one or more lines are too long

3
js/dist/main.d.ts vendored
View file

@ -1 +1,2 @@
export {};
export declare class GoTTY {
}

2
js/dist/xterm.d.ts vendored
View file

@ -1,6 +1,6 @@
/// <reference types="node" />
import { lib } from "libapps";
import { IDisposable, Terminal } from 'xterm';
import { IDisposable, Terminal } from "xterm";
import { FitAddon } from "xterm-addon-fit";
export declare class Xterm {
elem: HTMLElement;

154
js/package-lock.json generated
View file

@ -14,6 +14,7 @@
"license-loader": "^0.5.0",
"ts-loader": "^9.1.2",
"typescript": "^4.4.4",
"typescript-formatter": "^7.2.2",
"webpack": "^5",
"webpack-cli": "^4.9.2"
}
@ -455,6 +456,12 @@
"node": ">= 10"
}
},
"node_modules/commandpost": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
"integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
"dev": true
},
"node_modules/cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -469,6 +476,36 @@
"node": ">= 8"
}
},
"node_modules/editorconfig": {
"version": "0.15.3",
"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
"dev": true,
"dependencies": {
"commander": "^2.19.0",
"lru-cache": "^4.1.5",
"semver": "^5.6.0",
"sigmund": "^1.0.1"
},
"bin": {
"editorconfig": "bin/editorconfig"
}
},
"node_modules/editorconfig/node_modules/commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
},
"node_modules/editorconfig/node_modules/semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true,
"bin": {
"semver": "bin/semver"
}
},
"node_modules/electron-to-chromium": {
"version": "1.4.73",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz",
@ -852,6 +889,16 @@
"node": ">=8"
}
},
"node_modules/lru-cache": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
"dev": true,
"dependencies": {
"pseudomap": "^1.0.2",
"yallist": "^2.1.2"
}
},
"node_modules/merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@ -1030,6 +1077,12 @@
"node": ">=8"
}
},
"node_modules/pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true
},
"node_modules/punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@ -1179,6 +1232,12 @@
"node": ">=8"
}
},
"node_modules/sigmund": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
"dev": true
},
"node_modules/signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@ -1384,6 +1443,25 @@
"node": ">=4.2.0"
}
},
"node_modules/typescript-formatter": {
"version": "7.2.2",
"resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
"integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
"dev": true,
"dependencies": {
"commandpost": "^1.0.0",
"editorconfig": "^0.15.0"
},
"bin": {
"tsfmt": "bin/tsfmt"
},
"engines": {
"node": ">= 4.2.0"
},
"peerDependencies": {
"typescript": "^2.1.6 || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >=3.0.0-dev"
}
},
"node_modules/uri-js": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@ -1577,6 +1655,12 @@
"peerDependencies": {
"xterm": "^4.0.0"
}
},
"node_modules/yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
"dev": true
}
},
"dependencies": {
@ -1948,6 +2032,12 @@
"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
"dev": true
},
"commandpost": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/commandpost/-/commandpost-1.4.0.tgz",
"integrity": "sha512-aE2Y4MTFJ870NuB/+2z1cXBhSBBzRydVVjzhFC4gtenEhpnj15yu0qptWGJsO9YGrcPZ3ezX8AWb1VA391MKpQ==",
"dev": true
},
"cross-spawn": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
@ -1959,6 +2049,32 @@
"which": "^2.0.1"
}
},
"editorconfig": {
"version": "0.15.3",
"resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz",
"integrity": "sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==",
"dev": true,
"requires": {
"commander": "^2.19.0",
"lru-cache": "^4.1.5",
"semver": "^5.6.0",
"sigmund": "^1.0.1"
},
"dependencies": {
"commander": {
"version": "2.20.3",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
"dev": true
},
"semver": {
"version": "5.7.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
"dev": true
}
}
},
"electron-to-chromium": {
"version": "1.4.73",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz",
@ -2243,6 +2359,16 @@
"p-locate": "^4.1.0"
}
},
"lru-cache": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
"dev": true,
"requires": {
"pseudomap": "^1.0.2",
"yallist": "^2.1.2"
}
},
"merge-stream": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@ -2373,6 +2499,12 @@
"find-up": "^4.0.0"
}
},
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
"integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
"dev": true
},
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@ -2488,6 +2620,12 @@
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
"dev": true
},
"sigmund": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
"integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
"dev": true
},
"signal-exit": {
"version": "3.0.7",
"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@ -2624,6 +2762,16 @@
"integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
"dev": true
},
"typescript-formatter": {
"version": "7.2.2",
"resolved": "https://registry.npmjs.org/typescript-formatter/-/typescript-formatter-7.2.2.tgz",
"integrity": "sha512-V7vfI9XArVhriOTYHPzMU2WUnm5IMdu9X/CPxs8mIMGxmTBFpDABlbkBka64PZJ9/xgQeRpK8KzzAG4MPzxBDQ==",
"dev": true,
"requires": {
"commandpost": "^1.0.0",
"editorconfig": "^0.15.0"
}
},
"uri-js": {
"version": "4.4.1",
"resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@ -2755,6 +2903,12 @@
"resolved": "https://registry.npmjs.org/xterm-addon-webgl/-/xterm-addon-webgl-0.11.4.tgz",
"integrity": "sha512-/a/VFeftc+etGXQYWaaks977j1P7/wickBXn15zDxZzXYYMT9RN17ztqyIDVLXg9krtg28+icKK6lvgIYghJ0w==",
"requires": {}
},
"yallist": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
"integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
"dev": true
}
}
}

1
js/package.json
View file

@ -3,6 +3,7 @@
"license-loader": "^0.5.0",
"ts-loader": "^9.1.2",
"typescript": "^4.4.4",
"typescript-formatter": "^7.2.2",
"webpack": "^5",
"webpack-cli": "^4.9.2"
},

16
js/src/hterm.ts
View file

@ -52,11 +52,11 @@ export class Hterm {
};
setPreferences(value: object) {
Object.keys(value).forEach((key) => {
if (key != "enable-webgl") {
this.term.getPrefs().set(key, value[key]);
}
});
Object.keys(value).forEach((key) => {
if (key != "enable-webgl") {
this.term.getPrefs().set(key, value[key]);
}
});
};
onInput(callback: (input: string) => void) {
@ -77,9 +77,9 @@ export class Hterm {
};
deactivate(): void {
this.io.onVTKeystroke = function(){};
this.io.sendString = function(){};
this.io.onTerminalResize = function(){};
this.io.onVTKeystroke = function() { };
this.io.sendString = function() { };
this.io.onTerminalResize = function() { };
this.term.uninstallKeyboard();
}

4
js/src/main.ts
View file

@ -3,6 +3,10 @@ import { Xterm } from "./xterm";
import { Terminal, WebTTY, protocols } from "./webtty";
import { ConnectionFactory } from "./websocket";
// NOTE: This fixes tsfmt diffs in dist with this file
export class GoTTY {
}
// @TODO remove these
declare var gotty_auth_token: string;
declare var gotty_term: string;

49
js/src/xterm.ts
View file

@ -1,9 +1,8 @@
import {lib} from "libapps";
import {IDisposable, Terminal} from 'xterm';
import {FitAddon} from "xterm-addon-fit";
import {WebglAddon} from "xterm-addon-webgl";
import { lib } from "libapps";
import { IDisposable, Terminal } from "xterm";
import { FitAddon } from "xterm-addon-fit";
import { WebglAddon } from "xterm-addon-webgl";
export class Xterm {
elem: HTMLElement;
@ -15,13 +14,13 @@ export class Xterm {
messageTimeout: number;
messageTimer: NodeJS.Timer;
fitAddon: FitAddon;
disposables: IDisposable[] = [];
fitAddon: FitAddon;
disposables: IDisposable[] = [];
constructor(elem: HTMLElement) {
this.elem = elem;
const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
const isWindows = ['Windows', 'Win16', 'Win32', 'WinCE'].indexOf(navigator.platform) >= 0;
this.term = new Terminal({
cursorStyle: "block",
cursorBlink: true,
@ -30,20 +29,20 @@ export class Xterm {
fontSize: 12,
});
this.fitAddon = new FitAddon();
this.term.loadAddon(this.fitAddon);
this.fitAddon = new FitAddon();
this.term.loadAddon(this.fitAddon);
this.message = elem.ownerDocument.createElement("div");
this.message.className = "xterm-overlay";
this.messageTimeout = 2000;
this.resizeListener = () => {
this.fitAddon.fit();
this.fitAddon.fit();
this.term.scrollToBottom();
this.showMessage(String(this.term.cols) + "x" + String(this.term.rows), this.messageTimeout);
};
this.term.open(elem);
this.term.open(elem);
this.term.focus()
this.resizeListener();
@ -85,28 +84,28 @@ export class Xterm {
};
setPreferences(value: object) {
Object.keys(value).forEach((key) => {
if (key && key == "enable-webgl") {
this.term.loadAddon(new WebglAddon());
}
});
Object.keys(value).forEach((key) => {
if (key && key == "enable-webgl") {
this.term.loadAddon(new WebglAddon());
}
});
};
onInput(callback: (input: string) => void) {
this.disposables.push(this.term.onData((data) => {
callback(data);
}));
this.disposables.push(this.term.onData((data) => {
callback(data);
}));
};
onResize(callback: (colmuns: number, rows: number) => void) {
this.disposables.push(this.term.onResize((data) => {
callback(data.cols, data.rows);
}));
this.disposables.push(this.term.onResize((data) => {
callback(data.cols, data.rows);
}));
};
deactivate(): void {
this.disposables.forEach(d => d.dispose())
this.disposables.forEach(d => d.dispose())
this.term.blur();
}
@ -117,6 +116,6 @@ export class Xterm {
close(): void {
window.removeEventListener("resize", this.resizeListener);
this.term.dispose();
this.term.dispose();
}
}

31
js/tsconfig.json
View file

@ -1,20 +1,21 @@
{
"compilerOptions": {
"strictNullChecks": true,
"noUnusedLocals" : true,
"noImplicitThis": true,
"alwaysStrict": true,
"outDir": "./dist/",
"declaration": true,
"sourceMap": true,
"target": "es5",
"module": "commonJS",
"baseUrl": ".",
"paths": {
"*": ["./typings/*"]
}
"newLine": "LF",
"strictNullChecks": true,
"noUnusedLocals" : true,
"noImplicitThis": true,
"alwaysStrict": true,
"outDir": "./dist/",
"declaration": true,
"sourceMap": true,
"target": "es5",
"module": "commonJS",
"baseUrl": ".",
"paths": {
"*": ["./typings/*"]
}
},
"exclude": [
"node_modules"
"exclude": [
"node_modules"
]
}

2
js/typings/libapps/index.d.ts vendored
View file

@ -37,7 +37,7 @@ export declare namespace lib {
}
export interface Memory {
new (): Storage;
new(): Storage;
Memory(): Storage
}

10
server/asset.go
View file

File diff suppressed because one or more lines are too long

2
utils/flags.go
View file

@ -7,8 +7,8 @@ import (
"reflect"
"strings"
"github.com/urfave/cli"
"github.com/fatih/structs"
"github.com/urfave/cli"
"github.com/yudai/hcl"
"github.com/ghthor/gotty/v2/pkg/homedir"