Compare commits
4 Commits
main
...
optimize_b
| Author | SHA1 | Date |
|---|---|---|
 gapodo
|
feb564d4a0 | |
|
gapodo
|
bde4bbf5ad | |
|
gapodo
|
ef0813dd84 | |
|
gapodo
|
5b8b4d07c3 |
|
|
@ -2,6 +2,7 @@
|
|||
.idea/
|
||||
node_modules/
|
||||
.sass-cache/
|
||||
.npm/
|
||||
|
||||
/auth/certs/
|
||||
/auth/js/auth.js.map
|
||||
|
|
|
|||
|
|
@ -4,14 +4,12 @@ export default api => {
|
|||
[
|
||||
"@babel/preset-env",
|
||||
{
|
||||
"corejs": {"version": 3},
|
||||
"corejs": {"version": '3.33', "proposals": false},
|
||||
"useBuiltIns": "usage",
|
||||
"targets": {
|
||||
"edge": "17",
|
||||
"firefox": "60",
|
||||
"chrome": "67",
|
||||
"safari": "11.1",
|
||||
"ie": "11"
|
||||
"edge": "111",
|
||||
"firefox": "100",
|
||||
"chrome": "109"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,32 +2,32 @@ import "core-js/stable";
|
|||
import "./polifill";
|
||||
import "./css";
|
||||
|
||||
import {ApplicationLoader} from "./loader/loader";
|
||||
import {getUrlParameter} from "./loader/Utils";
|
||||
import { ApplicationLoader } from "./loader/loader";
|
||||
import { getUrlParameter } from "./loader/Utils";
|
||||
|
||||
/* let the loader register himself at the window first */
|
||||
const target = getUrlParameter("loader-target") || "app";
|
||||
console.info("Loading app with loader \"%s\"", target);
|
||||
|
||||
let appLoader: ApplicationLoader;
|
||||
if(target === "empty") {
|
||||
if (target === "empty") {
|
||||
appLoader = new (require("./targets/empty").default);
|
||||
} else if(target === "manifest") {
|
||||
} else if (target === "manifest") {
|
||||
appLoader = new (require("./targets/maifest-target").default);
|
||||
} else {
|
||||
appLoader = new (require("./targets/app").default);
|
||||
}
|
||||
setTimeout(() => appLoader.execute(), 0);
|
||||
|
||||
export {};
|
||||
export { };
|
||||
|
||||
if(__build.target === "client") {
|
||||
if (__build.target === "client") {
|
||||
/* do this so we don't get a react dev tools warning within the client */
|
||||
if(!('__REACT_DEVTOOLS_GLOBAL_HOOK__' in window)) {
|
||||
window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = {};
|
||||
if (!('__REACT_DEVTOOLS_GLOBAL_HOOK__' in window)) {
|
||||
(window as Window).__REACT_DEVTOOLS_GLOBAL_HOOK__ = {};
|
||||
}
|
||||
|
||||
window.__REACT_DEVTOOLS_GLOBAL_HOOK__.inject = function () {};
|
||||
window.__REACT_DEVTOOLS_GLOBAL_HOOK__.inject = function () { };
|
||||
}
|
||||
|
||||
/* Hello World message */
|
||||
|
|
@ -89,7 +89,7 @@ if(__build.target === "client") {
|
|||
].join(";");
|
||||
|
||||
const display_detect = /./;
|
||||
display_detect.toString = function() { print_security(); return ""; };
|
||||
display_detect.toString = function () { print_security(); return ""; };
|
||||
|
||||
clog("%cLovely to see you using and debugging the TeaSpeak-Web client.", css);
|
||||
clog("%cIf you have some good ideas or already done some incredible changes,", css);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
129
package.json
129
package.json
|
|
@ -17,74 +17,75 @@
|
|||
"author": "TeaSpeak (WolverinDEV)",
|
||||
"license": "ISC",
|
||||
"devDependencies": {
|
||||
"@babel/core": "^7.10.4",
|
||||
"@babel/plugin-transform-runtime": "^7.10.4",
|
||||
"@babel/preset-env": "^7.10.4",
|
||||
"@babel/core": "^7.23.3",
|
||||
"@babel/plugin-transform-runtime": "^7.23.3",
|
||||
"@babel/preset-env": "^7.23.3",
|
||||
"@google-cloud/translate": "^5.3.0",
|
||||
"@svgr/webpack": "^5.5.0",
|
||||
"@types/dompurify": "^2.0.1",
|
||||
"@types/ejs": "^3.0.2",
|
||||
"@types/emoji-mart": "^3.0.2",
|
||||
"@types/emscripten": "^1.38.0",
|
||||
"@types/fs-extra": "^8.0.1",
|
||||
"@types/dompurify": "^2.4.0",
|
||||
"@types/ejs": "^3.1.5",
|
||||
"@types/emoji-mart": "^3.0.12",
|
||||
"@types/emscripten": "^1.39.10",
|
||||
"@types/fs-extra": "^8.1.5",
|
||||
"@types/html-minifier": "^3.5.3",
|
||||
"@types/jquery": "^3.3.34",
|
||||
"@types/jquery": "^3.5.27",
|
||||
"@types/jsrender": "^1.0.5",
|
||||
"@types/lodash": "^4.14.149",
|
||||
"@types/lodash": "^4.14.201",
|
||||
"@types/moment": "^2.13.0",
|
||||
"@types/node": "^12.7.2",
|
||||
"@types/react-color": "^3.0.4",
|
||||
"@types/react-dom": "^16.9.5",
|
||||
"@types/react-grid-layout": "^1.1.1",
|
||||
"@types/remarkable": "^1.7.4",
|
||||
"@types/sdp-transform": "^2.4.4",
|
||||
"@types/sha256": "^0.2.0",
|
||||
"@types/twemoji": "^12.1.1",
|
||||
"@types/node": "^12.20.55",
|
||||
"@types/react": "^16.14.51",
|
||||
"@types/react-color": "^3.0.10",
|
||||
"@types/react-dom": "^16.9.22",
|
||||
"@types/react-grid-layout": "^1.3.5",
|
||||
"@types/remarkable": "^1.7.6",
|
||||
"@types/sdp-transform": "^2.4.9",
|
||||
"@types/sha256": "^0.2.2",
|
||||
"@types/twemoji": "^12.1.2",
|
||||
"@types/websocket": "0.0.40",
|
||||
"@types/xml-parser": "^1.2.29",
|
||||
"@wasm-tool/wasm-pack-plugin": "^1.3.1",
|
||||
"autoprefixer": "^10.2.5",
|
||||
"babel-loader": "^8.1.0",
|
||||
"circular-dependency-plugin": "^5.2.0",
|
||||
"clean-css": "^4.2.1",
|
||||
"@types/xml-parser": "^1.2.33",
|
||||
"@wasm-tool/wasm-pack-plugin": "^1.7.0",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"babel-loader": "^8.3.0",
|
||||
"circular-dependency-plugin": "^5.2.2",
|
||||
"clean-css": "^4.2.4",
|
||||
"clean-webpack-plugin": "^3.0.0",
|
||||
"copy-webpack-plugin": "^8.0.0",
|
||||
"copy-webpack-plugin": "^8.1.1",
|
||||
"css-loader": "^3.6.0",
|
||||
"css-minimizer-webpack-plugin": "^1.3.0",
|
||||
"exports-loader": "^0.7.0",
|
||||
"fast-xml-parser": "^3.17.4",
|
||||
"file-loader": "^6.0.0",
|
||||
"fast-xml-parser": "^3.21.1",
|
||||
"file-loader": "^6.2.0",
|
||||
"fs-extra": "latest",
|
||||
"gulp": "^4.0.2",
|
||||
"html-loader": "^1.0.0",
|
||||
"html-loader": "^1.3.2",
|
||||
"html-minifier": "^4.0.0",
|
||||
"html-webpack-inline-source-plugin": "0.0.10",
|
||||
"html-webpack-plugin": "^5.3.1",
|
||||
"html-webpack-plugin": "^5.5.3",
|
||||
"inline-chunks-html-webpack-plugin": "^1.3.1",
|
||||
"mime-types": "^2.1.24",
|
||||
"mini-css-extract-plugin": "^1.3.9",
|
||||
"mkdirp": "^0.5.1",
|
||||
"mime-types": "^2.1.35",
|
||||
"mini-css-extract-plugin": "^1.6.2",
|
||||
"mkdirp": "^0.5.6",
|
||||
"node-sass": "^4.14.1",
|
||||
"postcss": "^8.3.0",
|
||||
"postcss-loader": "^5.2.0",
|
||||
"potpack": "^1.0.1",
|
||||
"raw-loader": "^4.0.0",
|
||||
"postcss": "^8.4.31",
|
||||
"postcss-loader": "^5.3.0",
|
||||
"potpack": "^1.0.2",
|
||||
"raw-loader": "^4.0.2",
|
||||
"sass": "1.22.10",
|
||||
"sass-loader": "^8.0.2",
|
||||
"sha256": "^0.2.0",
|
||||
"style-loader": "^1.1.3",
|
||||
"style-loader": "^1.3.0",
|
||||
"svg-inline-loader": "^0.8.2",
|
||||
"terser": "^4.2.1",
|
||||
"terser": "^4.8.1",
|
||||
"terser-webpack-plugin": "4.2.3",
|
||||
"ts-loader": "^6.2.2",
|
||||
"ts-loader": "^8.4.0",
|
||||
"tsd": "^0.13.1",
|
||||
"typescript": "^4.2",
|
||||
"typescript": "^4.9.5",
|
||||
"url-loader": "^4.1.1",
|
||||
"wabt": "^1.0.13",
|
||||
"webpack": "^5.26.1",
|
||||
"webpack-bundle-analyzer": "^3.6.1",
|
||||
"webpack-cli": "^4.5.0",
|
||||
"webpack-dev-server": "^3.11.2",
|
||||
"wabt": "1.0.13",
|
||||
"webpack": "^5.89.0",
|
||||
"webpack-bundle-analyzer": "^3.9.0",
|
||||
"webpack-cli": "^4.10.0",
|
||||
"webpack-dev-server": "^3.11.3",
|
||||
"webpack-svg-sprite-generator": "^5.0.4",
|
||||
"zip-webpack-plugin": "^4.0.1"
|
||||
},
|
||||
|
|
@ -97,33 +98,33 @@
|
|||
},
|
||||
"homepage": "https://www.teaspeak.de",
|
||||
"dependencies": {
|
||||
"@types/crypto-js": "^4.0.1",
|
||||
"@types/crypto-js": "^4.2.1",
|
||||
"broadcastchannel-polyfill": "^1.0.1",
|
||||
"buffer": "^6.0.3",
|
||||
"crypto-browserify": "^3.12.0",
|
||||
"crypto-js": "^4.0.0",
|
||||
"detect-browser": "^5.2.0",
|
||||
"dompurify": "^2.2.8",
|
||||
"emoji-mart": "git+https://github.com/WolverinDEV/emoji-mart.git",
|
||||
"emoji-regex": "^9.0.0",
|
||||
"highlight.js": "^10.1.1",
|
||||
"ip-regex": "^4.2.0",
|
||||
"jquery": "^3.5.1",
|
||||
"jsrender": "^1.0.7",
|
||||
"moment": "^2.24.0",
|
||||
"react": "^16.13.1",
|
||||
"react-dom": "^16.13.1",
|
||||
"react-grid-layout": "^1.2.2",
|
||||
"react-player": "^2.5.0",
|
||||
"crypto-js": "^4.2.0",
|
||||
"detect-browser": "^5.3.0",
|
||||
"dompurify": "^2.4.7",
|
||||
"emoji-mart": "^3.0.1",
|
||||
"emoji-regex": "^9.2.2",
|
||||
"highlight.js": "^10.7.3",
|
||||
"ip-regex": "^4.3.0",
|
||||
"jquery": "^3.7.1",
|
||||
"jsrender": "^1.0.13",
|
||||
"moment": "^2.29.4",
|
||||
"react": "^16.14.0",
|
||||
"react-dom": "^16.14.0",
|
||||
"react-grid-layout": "^1.4.3",
|
||||
"react-player": "^2.13.0",
|
||||
"remarkable": "^2.0.1",
|
||||
"resize-observer-polyfill": "git+https://github.com/albancreton/resize-observer-polyfill.git#patch-1",
|
||||
"sdp-transform": "^2.14.0",
|
||||
"sdp-transform": "^2.14.1",
|
||||
"simple-jsonp-promise": "^1.1.0",
|
||||
"stream-browserify": "^3.0.0",
|
||||
"twemoji": "^13.0.0",
|
||||
"twemoji": "^13.1.1",
|
||||
"url-knife": "^3.1.3",
|
||||
"webcrypto-liner": "^1.2.4",
|
||||
"webpack-manifest-plugin": "^3.1.0",
|
||||
"webcrypto-liner": "^1.4.2",
|
||||
"webpack-manifest-plugin": "^3.2.0",
|
||||
"webrtc-adapter": "^7.5.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,45 @@
|
|||
#!/bin/bash
|
||||
|
||||
SCRIPT=$(realpath "$0")
|
||||
SCRIPTPATH=$(dirname "$SCRIPT")
|
||||
BASEPATH="$(realpath "${SCRIPTPATH}/../")"
|
||||
|
||||
NPM_DIR="${BASEPATH}/.npm"
|
||||
|
||||
if [[ ! -d "${NPM_DIR}" ]]; then
|
||||
mkdir "${NPM_DIR}" || exit 1
|
||||
fi
|
||||
|
||||
if [[ "${BUILDINDOCKER:-}" != "yes" ]]; then
|
||||
docker run --rm --workdir "/work" -v "${NPM_DIR}:/home/" -v "${BASEPATH}:/work" -e BUILDINDOCKER=yes node:14-bullseye /bin/bash -c 'chmod +x /work/scripts/build_in_docker.sh && /work/scripts/build_in_docker.sh'
|
||||
exit
|
||||
fi
|
||||
|
||||
## in docker
|
||||
|
||||
echo "adding npmrc"
|
||||
cat >>"${HOME}/.npmrc" <<'EOF'
|
||||
cache=/work/.npm
|
||||
fund=false
|
||||
EOF
|
||||
|
||||
echo "adding secure git dir"
|
||||
git config --global --add safe.directory /work
|
||||
|
||||
echo "running chmods"
|
||||
find "${BASEPATH}" -iname "*.sh" -exec chmod +x {} +
|
||||
|
||||
echo "Cleaning up old files"
|
||||
"${BASEPATH}/scripts/cleanup.sh" full >/dev/null 2>&1 || exit 1
|
||||
|
||||
echo "Installing npm packages"
|
||||
npm i || exit 1
|
||||
|
||||
echo "Updating browser list"
|
||||
npx browserslist@latest --update-db || exit 1
|
||||
|
||||
echo "running build"
|
||||
"${BASEPATH}/scripts/build.sh" web rel
|
||||
|
||||
echo "fixing perms"
|
||||
chown -R 1000:1000 /work
|
||||
|
|
@ -40,15 +40,15 @@ export interface KeyBoardBackend {
|
|||
registerListener(listener: (event: KeyEvent) => void);
|
||||
unregisterListener(listener: (event: KeyEvent) => void);
|
||||
|
||||
registerHook(hook: KeyHook) : () => void;
|
||||
registerHook(hook: KeyHook): () => void;
|
||||
unregisterHook(hook: KeyHook);
|
||||
|
||||
isKeyPressed(key: string | SpecialKey) : boolean;
|
||||
isKeyPressed(key: string | SpecialKey): boolean;
|
||||
}
|
||||
|
||||
export class AbstractKeyBoard implements KeyBoardBackend {
|
||||
protected readonly registeredListener: ((event: KeyEvent) => void)[];
|
||||
protected readonly activeSpecialKeys: { [key: number] : boolean };
|
||||
protected readonly activeSpecialKeys: { [key: number]: boolean };
|
||||
protected readonly activeKeys;
|
||||
|
||||
protected registeredKeyHooks: RegisteredKeyHook[] = [];
|
||||
|
|
@ -59,10 +59,10 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
this.registeredListener = [];
|
||||
}
|
||||
|
||||
protected destroy() {}
|
||||
protected destroy() { }
|
||||
|
||||
isKeyPressed(key: string | SpecialKey): boolean {
|
||||
if(typeof(key) === 'string') {
|
||||
if (typeof (key) === 'string') {
|
||||
return typeof this.activeKeys[key] !== "undefined";
|
||||
}
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
};
|
||||
|
||||
this.registeredKeyHooks.push(registeredHook);
|
||||
if(this.shouldHookBeActive(registeredHook)) {
|
||||
if (this.shouldHookBeActive(registeredHook)) {
|
||||
registeredHook.triggered = true;
|
||||
registeredHook.callbackPress();
|
||||
}
|
||||
|
|
@ -85,11 +85,11 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
}
|
||||
|
||||
unregisterHook(hook: KeyHook) {
|
||||
if(!("triggered" in hook)) {
|
||||
if (!("triggered" in hook)) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.registeredKeyHooks.remove(hook);
|
||||
this.registeredKeyHooks.remove(hook as RegisteredKeyHook);
|
||||
}
|
||||
|
||||
registerListener(listener: (event: KeyEvent) => void) {
|
||||
|
|
@ -101,19 +101,19 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
}
|
||||
|
||||
private shouldHookBeActive(hook: KeyHook) {
|
||||
if(typeof hook.keyAlt !== "undefined" && hook.keyAlt != this.activeSpecialKeys[SpecialKey.ALT]) {
|
||||
if (typeof hook.keyAlt !== "undefined" && hook.keyAlt != this.activeSpecialKeys[SpecialKey.ALT]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(typeof hook.keyCtrl !== "undefined" && hook.keyCtrl != this.activeSpecialKeys[SpecialKey.CTRL]) {
|
||||
if (typeof hook.keyCtrl !== "undefined" && hook.keyCtrl != this.activeSpecialKeys[SpecialKey.CTRL]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(typeof hook.keyShift !== "undefined" && hook.keyShift != this.activeSpecialKeys[SpecialKey.SHIFT]) {
|
||||
if (typeof hook.keyShift !== "undefined" && hook.keyShift != this.activeSpecialKeys[SpecialKey.SHIFT]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(typeof hook.keyWindows !== "undefined" && hook.keyWindows != this.activeSpecialKeys[SpecialKey.WINDOWS]) {
|
||||
if (typeof hook.keyWindows !== "undefined" && hook.keyWindows != this.activeSpecialKeys[SpecialKey.WINDOWS]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -122,11 +122,11 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
|
||||
protected fireKeyEvent(event: KeyEvent) {
|
||||
//console.debug("Trigger key event %o", key_event);
|
||||
for(const listener of this.registeredListener) {
|
||||
for (const listener of this.registeredListener) {
|
||||
listener(event);
|
||||
}
|
||||
|
||||
if(event.type == EventType.KEY_TYPED) {
|
||||
if (event.type == EventType.KEY_TYPED) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -134,26 +134,26 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
this.activeSpecialKeys[SpecialKey.CTRL] = event.keyCtrl;
|
||||
this.activeSpecialKeys[SpecialKey.SHIFT] = event.keyShift;
|
||||
this.activeSpecialKeys[SpecialKey.WINDOWS] = event.keyWindows;
|
||||
if(event.type == EventType.KEY_PRESS) {
|
||||
if (event.type == EventType.KEY_PRESS) {
|
||||
this.activeKeys[event.keyCode] = event;
|
||||
} else {
|
||||
delete this.activeKeys[event.keyCode];
|
||||
}
|
||||
|
||||
|
||||
for(const hook of this.registeredKeyHooks) {
|
||||
for (const hook of this.registeredKeyHooks) {
|
||||
const hookActive = this.shouldHookBeActive(hook);
|
||||
if(hookActive === hook.triggered) {
|
||||
if (hookActive === hook.triggered) {
|
||||
continue;
|
||||
}
|
||||
|
||||
hook.triggered = hookActive;
|
||||
if(hookActive) {
|
||||
if(hook.callbackPress) {
|
||||
if (hookActive) {
|
||||
if (hook.callbackPress) {
|
||||
hook.callbackPress();
|
||||
}
|
||||
} else {
|
||||
if(hook.callbackRelease) {
|
||||
if (hook.callbackRelease) {
|
||||
hook.callbackRelease();
|
||||
}
|
||||
}
|
||||
|
|
@ -166,13 +166,13 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
this.activeSpecialKeys[SpecialKey.SHIFT] = false;
|
||||
this.activeSpecialKeys[SpecialKey.WINDOWS] = false;
|
||||
|
||||
for(const code of Object.keys(this.activeKeys)) {
|
||||
for (const code of Object.keys(this.activeKeys)) {
|
||||
delete this.activeKeys[code];
|
||||
}
|
||||
|
||||
for(const hook of this.registeredKeyHooks) {
|
||||
if(hook.triggered) {
|
||||
if(hook.callbackRelease) {
|
||||
for (const hook of this.registeredKeyHooks) {
|
||||
if (hook.triggered) {
|
||||
if (hook.callbackRelease) {
|
||||
hook.callbackRelease();
|
||||
}
|
||||
|
||||
|
|
@ -183,7 +183,7 @@ export class AbstractKeyBoard implements KeyBoardBackend {
|
|||
}
|
||||
|
||||
let keyBoardBackend: KeyBoardBackend;
|
||||
export function getKeyBoard() : KeyBoardBackend {
|
||||
export function getKeyBoard(): KeyBoardBackend {
|
||||
return keyBoardBackend;
|
||||
}
|
||||
|
||||
|
|
@ -193,29 +193,29 @@ export function setKeyBoardBackend(newBackend: KeyBoardBackend) {
|
|||
|
||||
export function getKeyDescription(key: KeyDescriptor) {
|
||||
let result = "";
|
||||
if(key.keyShift) {
|
||||
if (key.keyShift) {
|
||||
result += " + " + tr("Shift");
|
||||
}
|
||||
|
||||
if(key.keyAlt) {
|
||||
if (key.keyAlt) {
|
||||
result += " + " + tr("Alt");
|
||||
}
|
||||
|
||||
if(key.keyCtrl) {
|
||||
if (key.keyCtrl) {
|
||||
result += " + " + tr("CTRL");
|
||||
}
|
||||
|
||||
if(key.keyWindows) {
|
||||
if (key.keyWindows) {
|
||||
result += " + " + tr("Win");
|
||||
}
|
||||
|
||||
if(key.keyCode) {
|
||||
if (key.keyCode) {
|
||||
let keyName;
|
||||
if(key.keyCode.startsWith("Key")) {
|
||||
if (key.keyCode.startsWith("Key")) {
|
||||
keyName = key.keyCode.substr(3);
|
||||
} else if(key.keyCode.startsWith("Digit")) {
|
||||
} else if (key.keyCode.startsWith("Digit")) {
|
||||
keyName = key.keyCode.substr(5);
|
||||
} else if(key.keyCode.startsWith("Numpad")) {
|
||||
} else if (key.keyCode.startsWith("Numpad")) {
|
||||
keyName = "Numpad " + key.keyCode.substr(6);
|
||||
} else {
|
||||
keyName = key.keyCode;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,7 +1,7 @@
|
|||
import {Registry} from "tc-shared/events";
|
||||
import {LogCategory, logTrace, logWarn} from "tc-shared/log";
|
||||
import {tr} from "tc-shared/i18n/localize";
|
||||
import {getAudioBackend} from "tc-shared/audio/Player";
|
||||
import { Registry } from "tc-shared/events";
|
||||
import { LogCategory, logTrace, logWarn } from "tc-shared/log";
|
||||
import { tr } from "tc-shared/i18n/localize";
|
||||
import { getAudioBackend } from "tc-shared/audio/Player";
|
||||
|
||||
export interface TrackClientInfo {
|
||||
media?: number,
|
||||
|
|
@ -56,34 +56,34 @@ export class RemoteRTPTrack {
|
|||
this.events.destroy();
|
||||
}
|
||||
|
||||
getEvents() : Registry<RemoteRTPTrackEvents> {
|
||||
getEvents(): Registry<RemoteRTPTrackEvents> {
|
||||
return this.events;
|
||||
}
|
||||
|
||||
getState() : RemoteRTPTrackState {
|
||||
getState(): RemoteRTPTrackState {
|
||||
return this.currentState;
|
||||
}
|
||||
|
||||
getSsrc() : number {
|
||||
getSsrc(): number {
|
||||
return this.ssrc >>> 0;
|
||||
}
|
||||
|
||||
getTrack() : MediaStreamTrack {
|
||||
getTrack(): MediaStreamTrack {
|
||||
return this.transceiver.receiver.track;
|
||||
}
|
||||
|
||||
getTransceiver() : RTCRtpTransceiver {
|
||||
getTransceiver(): RTCRtpTransceiver {
|
||||
return this.transceiver;
|
||||
}
|
||||
|
||||
getCurrentAssignment() : TrackClientInfo | undefined {
|
||||
getCurrentAssignment(): TrackClientInfo | undefined {
|
||||
return this.currentAssignment;
|
||||
}
|
||||
|
||||
protected setState(state: RemoteRTPTrackState) {
|
||||
if(this.currentState === state) {
|
||||
if (this.currentState === state) {
|
||||
return;
|
||||
} else if(this.currentState === RemoteRTPTrackState.Destroyed) {
|
||||
} else if (this.currentState === RemoteRTPTrackState.Destroyed) {
|
||||
logWarn(LogCategory.WEBRTC, tr("Tried to change the track state for track %d from destroyed to %s."), this.getSsrc(), RemoteRTPTrackState[state]);
|
||||
return;
|
||||
}
|
||||
|
|
@ -107,10 +107,9 @@ export class RemoteRTPVideoTrack extends RemoteRTPTrack {
|
|||
track.onended = () => logTrace(LogCategory.VIDEO, "Track %d ended", ssrc);
|
||||
track.onmute = () => logTrace(LogCategory.VIDEO, "Track %d muted", ssrc);
|
||||
track.onunmute = () => logTrace(LogCategory.VIDEO, "Track %d unmuted", ssrc);
|
||||
track.onisolationchange = () => logTrace(LogCategory.VIDEO, "Track %d isolation changed", ssrc);
|
||||
}
|
||||
|
||||
getMediaStream() : MediaStream {
|
||||
getMediaStream(): MediaStream {
|
||||
return this.mediaStream;
|
||||
}
|
||||
|
||||
|
|
@ -170,7 +169,7 @@ export class RemoteRTPAudioTrack extends RemoteRTPTrack {
|
|||
*/
|
||||
|
||||
getAudioBackend().executeWhenInitialized(() => {
|
||||
if(!this.mediaStream) {
|
||||
if (!this.mediaStream) {
|
||||
/* we've already been destroyed */
|
||||
return;
|
||||
}
|
||||
|
|
@ -200,7 +199,7 @@ export class RemoteRTPAudioTrack extends RemoteRTPTrack {
|
|||
this.setState(RemoteRTPTrackState.Destroyed);
|
||||
}
|
||||
|
||||
getGain() : GainNode | undefined {
|
||||
getGain(): GainNode | undefined {
|
||||
return this.gainNode;
|
||||
}
|
||||
|
||||
|
|
@ -213,13 +212,13 @@ export class RemoteRTPAudioTrack extends RemoteRTPTrack {
|
|||
* Mutes this track until the next setGain(..) call or a new sequence begins (state update)
|
||||
*/
|
||||
abortCurrentReplay() {
|
||||
if(this.gainNode) {
|
||||
if (this.gainNode) {
|
||||
this.gainNode.gain.value = 0;
|
||||
}
|
||||
}
|
||||
|
||||
protected updateGainNode() {
|
||||
if(!this.gainNode) {
|
||||
if (!this.gainNode) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
/* Note: This will be included into the controller and renderer process */
|
||||
import {LogCategory, logError, logWarn} from "tc-shared/log";
|
||||
import { LogCategory, logError, logWarn } from "tc-shared/log";
|
||||
import * as loader from "tc-loader";
|
||||
import {Stage} from "tc-loader";
|
||||
import { Stage } from "tc-loader";
|
||||
import * as crypto from "crypto-js";
|
||||
import {tra} from "tc-shared/i18n/localize";
|
||||
import { tra } from "tc-shared/i18n/localize";
|
||||
|
||||
export type LocalAvatarInfo = {
|
||||
fileName: string,
|
||||
|
|
@ -43,12 +43,12 @@ export type OwnAvatarMode = "uploading" | "server";
|
|||
export class OwnAvatarStorage {
|
||||
private openedCache: Cache | undefined;
|
||||
|
||||
private static generateRequestUrl(serverUniqueId: string, mode: OwnAvatarMode) : string {
|
||||
private static generateRequestUrl(serverUniqueId: string, mode: OwnAvatarMode): string {
|
||||
return "https://_local_avatar/" + serverUniqueId + "/" + mode;
|
||||
}
|
||||
|
||||
async initialize() {
|
||||
if(!("caches" in window)) {
|
||||
if (!("caches" in window)) {
|
||||
/* Not available (may unsecure context?) */
|
||||
this.openedCache = undefined;
|
||||
return;
|
||||
|
|
@ -62,8 +62,8 @@ export class OwnAvatarStorage {
|
|||
}
|
||||
}
|
||||
|
||||
private async loadAvatarRequest(serverUniqueId: string, mode: OwnAvatarMode) : Promise<LocalAvatarLoadResult<Response>> {
|
||||
if(!this.openedCache) {
|
||||
private async loadAvatarRequest(serverUniqueId: string, mode: OwnAvatarMode): Promise<LocalAvatarLoadResult<Response>> {
|
||||
if (!this.openedCache) {
|
||||
return { status: "cache-unavailable" };
|
||||
}
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ export class OwnAvatarStorage {
|
|||
ignoreSearch: true,
|
||||
});
|
||||
|
||||
if(!response) {
|
||||
if (!response) {
|
||||
return { status: "empty-result" };
|
||||
}
|
||||
|
||||
|
|
@ -84,9 +84,9 @@ export class OwnAvatarStorage {
|
|||
}
|
||||
}
|
||||
|
||||
async loadAvatarImage(serverUniqueId: string, mode: OwnAvatarMode) : Promise<LocalAvatarLoadResult<ArrayBuffer>> {
|
||||
async loadAvatarImage(serverUniqueId: string, mode: OwnAvatarMode): Promise<LocalAvatarLoadResult<ArrayBuffer>> {
|
||||
const loadResult = await this.loadAvatarRequest(serverUniqueId, mode);
|
||||
if(loadResult.status !== "success") {
|
||||
if (loadResult.status !== "success") {
|
||||
return loadResult;
|
||||
}
|
||||
|
||||
|
|
@ -98,9 +98,9 @@ export class OwnAvatarStorage {
|
|||
}
|
||||
}
|
||||
|
||||
async loadAvatar(serverUniqueId: string, mode: OwnAvatarMode, createResourceUrl: boolean) : Promise<LocalAvatarLoadResult<LocalAvatarInfo>> {
|
||||
async loadAvatar(serverUniqueId: string, mode: OwnAvatarMode, createResourceUrl: boolean): Promise<LocalAvatarLoadResult<LocalAvatarInfo>> {
|
||||
const loadResult = await this.loadAvatarRequest(serverUniqueId, mode);
|
||||
if(loadResult.status !== "success") {
|
||||
if (loadResult.status !== "success") {
|
||||
return loadResult;
|
||||
}
|
||||
|
||||
|
|
@ -112,28 +112,28 @@ export class OwnAvatarStorage {
|
|||
const avatarDateModified = parseInt(headers.get("X-File-Date-Modified"));
|
||||
const avatarDateUploaded = parseInt(headers.get("X-File-Uploaded"));
|
||||
|
||||
if(!avatarHash) {
|
||||
if (!avatarHash) {
|
||||
return { status: "error", reason: tr("missing response header file hash") };
|
||||
}
|
||||
|
||||
if(!avatarName) {
|
||||
if (!avatarName) {
|
||||
return { status: "error", reason: tr("missing response header file name") };
|
||||
}
|
||||
|
||||
if(isNaN(avatarSize)) {
|
||||
if (isNaN(avatarSize)) {
|
||||
return { status: "error", reason: tr("missing/invalid response header file size") };
|
||||
}
|
||||
|
||||
if(isNaN(avatarDateModified)) {
|
||||
if (isNaN(avatarDateModified)) {
|
||||
return { status: "error", reason: tr("missing/invalid response header file modify date") };
|
||||
}
|
||||
|
||||
if(isNaN(avatarDateUploaded)) {
|
||||
if (isNaN(avatarDateUploaded)) {
|
||||
return { status: "error", reason: tr("missing/invalid response header file upload date") };
|
||||
}
|
||||
|
||||
let resourceUrl;
|
||||
if(createResourceUrl) {
|
||||
if (createResourceUrl) {
|
||||
try {
|
||||
resourceUrl = URL.createObjectURL(await loadResult.result.blob());
|
||||
} catch (error) {
|
||||
|
|
@ -159,12 +159,12 @@ export class OwnAvatarStorage {
|
|||
};
|
||||
}
|
||||
|
||||
async updateAvatar(serverUniqueId: string, mode: OwnAvatarMode, target: File) : Promise<LocalAvatarUpdateResult> {
|
||||
if(!this.openedCache) {
|
||||
async updateAvatar(serverUniqueId: string, mode: OwnAvatarMode, target: File): Promise<LocalAvatarUpdateResult> {
|
||||
if (!this.openedCache) {
|
||||
return { status: "cache-unavailable" };
|
||||
}
|
||||
|
||||
if(target.size > kMaxAvatarSize) {
|
||||
if (target.size > kMaxAvatarSize) {
|
||||
return { status: "error", reason: tra("Image exceeds maximum software size of {} bytes", kMaxAvatarSize) };
|
||||
}
|
||||
|
||||
|
|
@ -173,7 +173,7 @@ export class OwnAvatarStorage {
|
|||
const hasher = crypto.algo.MD5.create();
|
||||
await target.stream().pipeTo(new WritableStream({
|
||||
write(data) {
|
||||
hasher.update(crypto.lib.WordArray.create(data));
|
||||
hasher.update(crypto.lib.WordArray.create(Array.from(data)));
|
||||
}
|
||||
}));
|
||||
|
||||
|
|
@ -203,7 +203,7 @@ export class OwnAvatarStorage {
|
|||
}
|
||||
|
||||
async removeAvatar(serverUniqueId: string, mode: OwnAvatarMode) {
|
||||
if(!this.openedCache) {
|
||||
if (!this.openedCache) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -219,13 +219,13 @@ export class OwnAvatarStorage {
|
|||
* @param serverUniqueId
|
||||
*/
|
||||
async avatarUploadSucceeded(serverUniqueId: string) {
|
||||
if(!this.openedCache) {
|
||||
if (!this.openedCache) {
|
||||
return;
|
||||
}
|
||||
|
||||
const request = await this.loadAvatarRequest(serverUniqueId, "uploading");
|
||||
if(request.status !== "success") {
|
||||
if(request.status !== "empty-result") {
|
||||
if (request.status !== "success") {
|
||||
if (request.status !== "empty-result") {
|
||||
logError(LogCategory.GENERAL, tr("Failed to save uploaded avatar. Request failed to load: %o"), request);
|
||||
}
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import {InputStartError} from "tc-shared/voice/RecorderBase";
|
||||
import {LogCategory, logInfo, logWarn} from "tc-shared/log";
|
||||
import {tr} from "tc-shared/i18n/localize";
|
||||
import { InputStartError } from "tc-shared/voice/RecorderBase";
|
||||
import { LogCategory, logInfo, logWarn } from "tc-shared/log";
|
||||
import { tr } from "tc-shared/i18n/localize";
|
||||
|
||||
export type MediaStreamType = "audio" | "video";
|
||||
|
||||
|
|
@ -18,15 +18,15 @@ export interface MediaStreamEvents {
|
|||
export const mediaStreamEvents = new Registry<MediaStreamEvents>();
|
||||
*/
|
||||
|
||||
export async function requestMediaStreamWithConstraints(constraints: MediaTrackConstraints, type: MediaStreamType) : Promise<InputStartError | MediaStream> {
|
||||
export async function requestMediaStreamWithConstraints(constraints: MediaTrackConstraints, type: MediaStreamType): Promise<InputStartError | MediaStream> {
|
||||
const beginTimestamp = Date.now();
|
||||
try {
|
||||
logInfo(LogCategory.AUDIO, tr("Requesting a %s stream for device %s in group %s"), type, constraints.deviceId, constraints.groupId);
|
||||
return await navigator.mediaDevices.getUserMedia(type === "audio" ? { audio: constraints } : { video: constraints });
|
||||
} catch(error) {
|
||||
if('name' in error) {
|
||||
if(error.name === "NotAllowedError") {
|
||||
if(Date.now() - beginTimestamp < 250) {
|
||||
} catch (error) {
|
||||
if ('name' in error) {
|
||||
if (error.name === "NotAllowedError") {
|
||||
if (Date.now() - beginTimestamp < 250) {
|
||||
logWarn(LogCategory.AUDIO, tr("Media stream request failed (System denied). Browser message: %o"), error.message);
|
||||
return InputStartError.ESYSTEMDENIED;
|
||||
} else {
|
||||
|
|
@ -46,21 +46,21 @@ export async function requestMediaStreamWithConstraints(constraints: MediaTrackC
|
|||
|
||||
/* request permission for devices only one per time! */
|
||||
let currentMediaStreamRequest: Promise<MediaStream | InputStartError>;
|
||||
export async function requestMediaStream(deviceId: string | undefined, groupId: string | undefined, type: MediaStreamType) : Promise<MediaStream | InputStartError> {
|
||||
export async function requestMediaStream(deviceId: string | undefined, groupId: string | undefined, type: MediaStreamType): Promise<MediaStream | InputStartError> {
|
||||
/* wait for the current media stream requests to finish */
|
||||
while(currentMediaStreamRequest) {
|
||||
while (currentMediaStreamRequest) {
|
||||
try {
|
||||
await currentMediaStreamRequest;
|
||||
} catch(error) { }
|
||||
} catch (error) { }
|
||||
}
|
||||
|
||||
const constrains: MediaTrackConstraints = {};
|
||||
if(window.detectedBrowser?.name === "firefox") {
|
||||
if (window.detectedBrowser?.name === "firefox") {
|
||||
/*
|
||||
* Firefox only allows to open one mic/video as well deciding whats the input device it.
|
||||
* It does not respect the deviceId nor the groupId
|
||||
*/
|
||||
} else if(deviceId !== undefined) {
|
||||
} else if (deviceId !== undefined) {
|
||||
constrains.deviceId = deviceId;
|
||||
constrains.groupId = groupId;
|
||||
} else {
|
||||
|
|
@ -75,25 +75,28 @@ export async function requestMediaStream(deviceId: string | undefined, groupId:
|
|||
try {
|
||||
return await currentMediaStreamRequest;
|
||||
} finally {
|
||||
if(currentMediaStreamRequest === promise) {
|
||||
if (currentMediaStreamRequest === promise) {
|
||||
currentMediaStreamRequest = undefined;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export async function queryMediaPermissions(type: MediaStreamType, changeListener?: (value: PermissionState) => void) : Promise<PermissionState> {
|
||||
if('permissions' in navigator && 'query' in navigator.permissions) {
|
||||
export async function queryMediaPermissions(type: MediaStreamType, changeListener?: (value: PermissionState) => void): Promise<PermissionState> {
|
||||
try {
|
||||
// @ts-ignore needed, as firefox doesn't allow microphone or camera, caught using the catch below
|
||||
const result = await navigator.permissions.query({ name: type === "audio" ? "microphone" : "camera" });
|
||||
if(changeListener) {
|
||||
if (changeListener) {
|
||||
result.addEventListener("change", () => {
|
||||
changeListener(result.state);
|
||||
});
|
||||
}
|
||||
return result.state;
|
||||
} catch (error) {
|
||||
logWarn(LogCategory.GENERAL, tr("Failed to query for %s permissions: %s"), type, error);
|
||||
// Firefox doesn't support querying for the camera / microphone permission, so return undetermined status
|
||||
if (error instanceof TypeError) {
|
||||
return "prompt";
|
||||
}
|
||||
logWarn(LogCategory.GENERAL, tr("Failed to query for %s permissions: %s"), type, error);
|
||||
}
|
||||
return "prompt";
|
||||
}
|
||||
|
|
@ -101,7 +104,7 @@ export async function queryMediaPermissions(type: MediaStreamType, changeListene
|
|||
export function stopMediaStream(stream: MediaStream) {
|
||||
stream.getVideoTracks().forEach(track => track.stop());
|
||||
stream.getAudioTracks().forEach(track => track.stop());
|
||||
if('stop' in stream) {
|
||||
if ('stop' in stream) {
|
||||
(stream as any).stop();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
/* setup jsrenderer */
|
||||
import "jsrender";
|
||||
import {tr} from "./i18n/localize";
|
||||
import {LogCategory, logError, logTrace} from "tc-shared/log";
|
||||
import { tr } from "./i18n/localize";
|
||||
import { LogCategory, logError, logTrace } from "tc-shared/log";
|
||||
|
||||
(window as any).$ = require("jquery");
|
||||
(window as any).jQuery = $;
|
||||
|
|
@ -22,7 +22,7 @@ declare global {
|
|||
* @param entry The entry to toggle
|
||||
* @returns `true` if the entry has been inserted and false if the entry has been deleted
|
||||
*/
|
||||
toggle(entry: T) : boolean;
|
||||
toggle(entry: T): boolean;
|
||||
|
||||
/**
|
||||
* @param entry The entry to toggle
|
||||
|
|
@ -33,21 +33,21 @@ declare global {
|
|||
}
|
||||
|
||||
interface JSON {
|
||||
map_to<T>(object: T, json: any, variables?: string | string[], validator?: (map_field: string, map_value: string) => boolean, variable_direction?: number) : number;
|
||||
map_field_to<T>(object: T, value: any, field: string) : boolean;
|
||||
map_to<T>(object: T, json: any, variables?: string | string[], validator?: (map_field: string, map_value: string) => boolean, variable_direction?: number): number;
|
||||
map_field_to<T>(object: T, value: any, field: string): boolean;
|
||||
}
|
||||
|
||||
type JQueryScrollType = "height" | "width";
|
||||
interface JQuery<TElement = HTMLElement> {
|
||||
renderTag(values?: any) : JQuery<TElement>;
|
||||
hasScrollBar(direction?: JQueryScrollType) : boolean;
|
||||
renderTag(values?: any): JQuery<TElement>;
|
||||
hasScrollBar(direction?: JQueryScrollType): boolean;
|
||||
|
||||
|
||||
visible_height() : number;
|
||||
visible_width() : number;
|
||||
visible_height(): number;
|
||||
visible_width(): number;
|
||||
|
||||
/* first element which matches the selector, could be the element itself or a parent */
|
||||
firstParent(selector: string) : JQuery;
|
||||
firstParent(selector: string): JQuery;
|
||||
}
|
||||
|
||||
interface JQueryStatic<TElement extends Node = HTMLElement> {
|
||||
|
|
@ -73,9 +73,6 @@ declare global {
|
|||
name: string,
|
||||
version: string
|
||||
};
|
||||
|
||||
mozGetUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
|
||||
webkitGetUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
|
||||
}
|
||||
|
||||
interface ObjectConstructor {
|
||||
|
|
@ -83,7 +80,7 @@ declare global {
|
|||
}
|
||||
}
|
||||
|
||||
export type IfEquals<X, Y, A=X, B=never> =
|
||||
export type IfEquals<X, Y, A = X, B = never> =
|
||||
(<T>() => T extends X ? 1 : 2) extends
|
||||
(<T>() => T extends Y ? 1 : 2) ? A : B;
|
||||
|
||||
|
|
@ -95,7 +92,7 @@ export type ReadonlyKeys<T> = {
|
|||
[P in keyof T]: IfEquals<{ [Q in P]: T[P] }, { -readonly [Q in P]: T[P] }, never, P>
|
||||
}[keyof T];
|
||||
|
||||
if(!Object.isSimilar) {
|
||||
if (!Object.isSimilar) {
|
||||
Object.isSimilar = function (a, b) {
|
||||
const aType = typeof a;
|
||||
const bType = typeof b;
|
||||
|
|
@ -106,8 +103,8 @@ if(!Object.isSimilar) {
|
|||
if (aType === "object") {
|
||||
const aKeys = Object.keys(a);
|
||||
const bKeys = Object.keys(b);
|
||||
if(aKeys.length != bKeys.length) { return false; }
|
||||
if(aKeys.findIndex(key => bKeys.indexOf(key) !== -1) !== -1) { return false; }
|
||||
if (aKeys.length != bKeys.length) { return false; }
|
||||
if (aKeys.findIndex(key => bKeys.indexOf(key) !== -1) !== -1) { return false; }
|
||||
return aKeys.findIndex(key => !Object.isSimilar(a[key], b[key])) === -1;
|
||||
} else {
|
||||
return a === b;
|
||||
|
|
@ -115,7 +112,7 @@ if(!Object.isSimilar) {
|
|||
};
|
||||
}
|
||||
|
||||
if(!JSON.map_to) {
|
||||
if (!JSON.map_to) {
|
||||
JSON.map_to = function <T>(object: T, json: any, variables?: string | string[], validator?: (map_field: string, map_value: string) => boolean, variable_direction?: number): number {
|
||||
if (!validator)
|
||||
validator = () => true;
|
||||
|
|
@ -145,29 +142,29 @@ if(!JSON.map_to) {
|
|||
continue;
|
||||
}
|
||||
|
||||
if(JSON.map_field_to(object, json[field], field))
|
||||
if (JSON.map_field_to(object, json[field], field))
|
||||
updates++;
|
||||
}
|
||||
return updates;
|
||||
}
|
||||
}
|
||||
|
||||
if(!JSON.map_field_to) {
|
||||
JSON.map_field_to = function<T>(object: T, value: any, field: string) : boolean {
|
||||
if (!JSON.map_field_to) {
|
||||
JSON.map_field_to = function <T>(object: T, value: any, field: string): boolean {
|
||||
let fieldType = typeof object[field];
|
||||
let newValue;
|
||||
if(fieldType == "string" || fieldType == "object" || fieldType == "undefined") {
|
||||
if (fieldType == "string" || fieldType == "object" || fieldType == "undefined") {
|
||||
newValue = value;
|
||||
} else if(fieldType == "number") {
|
||||
} else if (fieldType == "number") {
|
||||
newValue = parseFloat(value);
|
||||
} else if(fieldType == "boolean") {
|
||||
} else if (fieldType == "boolean") {
|
||||
newValue = typeof value === "boolean" && value || value === "1" || value === "true";
|
||||
} else {
|
||||
console.warn(tr("Invalid object type %s for entry %s"), fieldType, field);
|
||||
return false;
|
||||
}
|
||||
|
||||
if(newValue === object[field]) {
|
||||
if (newValue === object[field]) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -177,7 +174,7 @@ if(!JSON.map_field_to) {
|
|||
}
|
||||
|
||||
if (!Array.prototype.remove) {
|
||||
Array.prototype.remove = function<T>(elem?: T): boolean {
|
||||
Array.prototype.remove = function <T>(elem?: T): boolean {
|
||||
const index = this.indexOf(elem);
|
||||
if (index > -1) {
|
||||
this.splice(index, 1);
|
||||
|
|
@ -188,18 +185,18 @@ if (!Array.prototype.remove) {
|
|||
}
|
||||
|
||||
if (!Array.prototype.pop_front) {
|
||||
Array.prototype.pop_front = function<T>(): T {
|
||||
if(this.length == 0) return undefined;
|
||||
Array.prototype.pop_front = function <T>(): T {
|
||||
if (this.length == 0) return undefined;
|
||||
return this.splice(0, 1)[0];
|
||||
}
|
||||
}
|
||||
|
||||
if (!Array.prototype.toggle) {
|
||||
Array.prototype.toggle = function<T>(element: T, insert?: boolean): boolean {
|
||||
Array.prototype.toggle = function <T>(element: T, insert?: boolean): boolean {
|
||||
const index = this.findIndex(e => e === element);
|
||||
if((index !== -1) === insert) {
|
||||
if ((index !== -1) === insert) {
|
||||
return false;
|
||||
} else if(index === -1) {
|
||||
} else if (index === -1) {
|
||||
this.push(element);
|
||||
return true;
|
||||
} else {
|
||||
|
|
@ -209,25 +206,25 @@ if (!Array.prototype.toggle) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!Array.prototype.last){
|
||||
Array.prototype.last = function(){
|
||||
if(this.length == 0) return undefined;
|
||||
if (!Array.prototype.last) {
|
||||
Array.prototype.last = function () {
|
||||
if (this.length == 0) return undefined;
|
||||
return this[this.length - 1];
|
||||
};
|
||||
}
|
||||
|
||||
if(typeof ($) !== "undefined") {
|
||||
if(!$.spawn) {
|
||||
$.spawn = function<K extends keyof HTMLElementTagNameMap>(tagName: K): JQuery<HTMLElementTagNameMap[K]> {
|
||||
if (typeof ($) !== "undefined") {
|
||||
if (!$.spawn) {
|
||||
$.spawn = function <K extends keyof HTMLElementTagNameMap>(tagName: K): JQuery<HTMLElementTagNameMap[K]> {
|
||||
return $(document.createElement(tagName) as any);
|
||||
}
|
||||
}
|
||||
|
||||
if(!$.fn.renderTag) {
|
||||
$.fn.renderTag = function (this: JQuery, values?: any) : JQuery {
|
||||
if (!$.fn.renderTag) {
|
||||
$.fn.renderTag = function (this: JQuery, values?: any): JQuery {
|
||||
let result;
|
||||
const template = $.views.templates[this.attr("id")];
|
||||
if(!template) {
|
||||
if (!template) {
|
||||
console.error("Tried to render template %o, but template is not available!", this.attr("id"));
|
||||
throw "missing template " + this.attr("id");
|
||||
}
|
||||
|
|
@ -243,24 +240,24 @@ if(typeof ($) !== "undefined") {
|
|||
return result;
|
||||
}
|
||||
}
|
||||
if(!$.fn.hasScrollBar)
|
||||
$.fn.hasScrollBar = function(direction?: "height" | "width") {
|
||||
if(this.length <= 0)
|
||||
if (!$.fn.hasScrollBar)
|
||||
$.fn.hasScrollBar = function (direction?: "height" | "width") {
|
||||
if (this.length <= 0)
|
||||
return false;
|
||||
|
||||
const scroll_height = this.get(0).scrollHeight > this.height();
|
||||
const scroll_width = this.get(0).scrollWidth > this.width();
|
||||
|
||||
if(typeof(direction) === "string") {
|
||||
if(direction === "height")
|
||||
if (typeof (direction) === "string") {
|
||||
if (direction === "height")
|
||||
return scroll_height;
|
||||
if(direction === "width")
|
||||
if (direction === "width")
|
||||
return scroll_width;
|
||||
}
|
||||
return scroll_width || scroll_height;
|
||||
};
|
||||
|
||||
if(!$.fn.visible_height)
|
||||
if (!$.fn.visible_height)
|
||||
$.fn.visible_height = function (this: JQuery<HTMLElement>) {
|
||||
const original_style = this.attr("style");
|
||||
this.css({
|
||||
|
|
@ -274,7 +271,7 @@ if(typeof ($) !== "undefined") {
|
|||
return result;
|
||||
};
|
||||
|
||||
if(!$.fn.visible_width)
|
||||
if (!$.fn.visible_width)
|
||||
$.fn.visible_width = function (this: JQuery<HTMLElement>) {
|
||||
const original_style = this.attr("style");
|
||||
this.css({
|
||||
|
|
@ -288,20 +285,20 @@ if(typeof ($) !== "undefined") {
|
|||
return result;
|
||||
};
|
||||
|
||||
if(!$.fn.firstParent)
|
||||
if (!$.fn.firstParent)
|
||||
$.fn.firstParent = function (this: JQuery<HTMLElement>, selector: string) {
|
||||
if(this.is(selector))
|
||||
if (this.is(selector))
|
||||
return this;
|
||||
return this.parent(selector);
|
||||
}
|
||||
}
|
||||
|
||||
if(!Object.values) {
|
||||
if (!Object.values) {
|
||||
Object.values = object => Object.keys(object).map(e => object[e]);
|
||||
}
|
||||
|
||||
export function crashOnThrow<T>(promise: Promise<T> | (() => Promise<T>)) : Promise<T> {
|
||||
if(typeof promise === "function") {
|
||||
export function crashOnThrow<T>(promise: Promise<T> | (() => Promise<T>)): Promise<T> {
|
||||
if (typeof promise === "function") {
|
||||
try {
|
||||
promise = promise();
|
||||
} catch (error) {
|
||||
|
|
@ -314,11 +311,11 @@ export function crashOnThrow<T>(promise: Promise<T> | (() => Promise<T>)) : Prom
|
|||
logError(LogCategory.GENERAL, tr("Critical app error: %o"), error);
|
||||
|
||||
/* Lets make this promise stuck for ever */
|
||||
return new Promise(() => {});
|
||||
return new Promise(() => { });
|
||||
});
|
||||
}
|
||||
|
||||
export function ignorePromise<T>(_promise: Promise<T>) {}
|
||||
export function ignorePromise<T>(_promise: Promise<T>) { }
|
||||
|
||||
export function NoThrow(target: any, methodName: string, descriptor: PropertyDescriptor) {
|
||||
const crashApp = error => {
|
||||
|
|
@ -332,13 +329,13 @@ export function NoThrow(target: any, methodName: string, descriptor: PropertyDes
|
|||
descriptor.value = function () {
|
||||
try {
|
||||
const result = originalMethod.apply(this, arguments);
|
||||
if(result instanceof Promise) {
|
||||
if (result instanceof Promise) {
|
||||
promiseAccepted.value = true;
|
||||
return result.catch(error => {
|
||||
crashApp(error);
|
||||
|
||||
/* Lets make this promise stuck for ever since we're in a not well defined state */
|
||||
return new Promise(() => {});
|
||||
return new Promise(() => { });
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -346,14 +343,14 @@ export function NoThrow(target: any, methodName: string, descriptor: PropertyDes
|
|||
} catch (error) {
|
||||
crashApp(error);
|
||||
|
||||
if(!promiseAccepted.value) {
|
||||
if (!promiseAccepted.value) {
|
||||
throw error;
|
||||
} else {
|
||||
/*
|
||||
* We don't know if we can return a promise or if just the object is expected.
|
||||
* Since we don't know that, we're just rethrowing the error for now.
|
||||
*/
|
||||
return new Promise(() => {});
|
||||
return new Promise(() => { });
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -365,7 +362,7 @@ export function CallOnce(target: any, methodName: string, descriptor: PropertyDe
|
|||
|
||||
const originalMethod: Function = descriptor.value;
|
||||
descriptor.value = function () {
|
||||
if(callOnceData[methodName]) {
|
||||
if (callOnceData[methodName]) {
|
||||
debugger;
|
||||
throw "method " + methodName + " has already been called";
|
||||
}
|
||||
|
|
@ -378,7 +375,7 @@ const kNonNullSymbol = Symbol("non-null-data");
|
|||
export function NonNull(target: any, methodName: string, parameterIndex: number) {
|
||||
const nonNullInfo = target[kNonNullSymbol] || (target[kNonNullSymbol] = {});
|
||||
const methodInfo = nonNullInfo[methodName] || (nonNullInfo[methodName] = {});
|
||||
if(!Array.isArray(methodInfo.indexes)) {
|
||||
if (!Array.isArray(methodInfo.indexes)) {
|
||||
/* Initialize method info */
|
||||
methodInfo.overloaded = false;
|
||||
methodInfo.indexes = [];
|
||||
|
|
@ -386,7 +383,7 @@ export function NonNull(target: any, methodName: string, parameterIndex: number)
|
|||
|
||||
methodInfo.indexes.push(parameterIndex);
|
||||
setImmediate(() => {
|
||||
if(methodInfo.overloaded || methodInfo.missingWarned) {
|
||||
if (methodInfo.overloaded || methodInfo.missingWarned) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -401,21 +398,21 @@ export function NonNull(target: any, methodName: string, parameterIndex: number)
|
|||
*/
|
||||
export function ParameterConstrained(target: any, methodName: string, descriptor: PropertyDescriptor) {
|
||||
const nonNullInfo = target[kNonNullSymbol];
|
||||
if(!nonNullInfo) {
|
||||
if (!nonNullInfo) {
|
||||
return;
|
||||
}
|
||||
|
||||
const methodInfo = nonNullInfo[methodName] || (nonNullInfo[methodName] = {});
|
||||
if(!methodInfo) {
|
||||
if (!methodInfo) {
|
||||
return;
|
||||
}
|
||||
|
||||
methodInfo.overloaded = true;
|
||||
const originalMethod: Function = descriptor.value;
|
||||
descriptor.value = function () {
|
||||
for(let index = 0; index < methodInfo.indexes.length; index++) {
|
||||
for (let index = 0; index < methodInfo.indexes.length; index++) {
|
||||
const argument = arguments[methodInfo.indexes[index]];
|
||||
if(typeof argument === undefined || typeof argument === null) {
|
||||
if (typeof argument === undefined || typeof argument === null) {
|
||||
throw "parameter " + methodInfo.indexes[index] + " should not be null or undefined";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
import * as React from "react";
|
||||
import {IpcInviteInfo, IpcInviteInfoLoaded} from "tc-shared/text/bbcode/InviteDefinitions";
|
||||
import {ChannelMessage, getIpcInstance, IPCChannel} from "tc-shared/ipc/BrowserIPC";
|
||||
import { IpcInviteInfo, IpcInviteInfoLoaded } from "tc-shared/text/bbcode/InviteDefinitions";
|
||||
import { ChannelMessage, getIpcInstance, IPCChannel } from "tc-shared/ipc/BrowserIPC";
|
||||
import * as loader from "tc-loader";
|
||||
import {useEffect, useState} from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import _ = require("lodash");
|
||||
import {Translatable} from "tc-shared/ui/react-elements/i18n";
|
||||
import {Button} from "tc-shared/ui/react-elements/Button";
|
||||
import {SimpleUrlRenderer} from "tc-shared/text/bbcode/url";
|
||||
import {LoadingDots} from "tc-shared/ui/react-elements/LoadingDots";
|
||||
import {ClientIconRenderer} from "tc-shared/ui/react-elements/Icons";
|
||||
import {ClientIcon} from "svg-sprites/client-icons";
|
||||
import { Translatable } from "tc-shared/ui/react-elements/i18n";
|
||||
import { Button } from "tc-shared/ui/react-elements/Button";
|
||||
import { SimpleUrlRenderer } from "tc-shared/text/bbcode/url";
|
||||
import { LoadingDots } from "tc-shared/ui/react-elements/LoadingDots";
|
||||
import { ClientIconRenderer } from "tc-shared/ui/react-elements/Icons";
|
||||
import { ClientIcon } from "svg-sprites/client-icons";
|
||||
|
||||
const cssStyle = require("./InviteRenderer.scss");
|
||||
const kInviteUrlRegex = /^(https:\/\/)?(teaspeak.de\/|join.teaspeak.de\/(invite\/)?)([a-zA-Z0-9]{4})$/gm;
|
||||
|
||||
export function isInviteLink(url: string) : boolean {
|
||||
export function isInviteLink(url: string): boolean {
|
||||
kInviteUrlRegex.lastIndex = 0;
|
||||
return !!url.match(kInviteUrlRegex);
|
||||
}
|
||||
|
|
@ -26,25 +26,25 @@ const localInviteCache: { [key: string]: InviteCacheEntry } = {};
|
|||
const localInviteCallbacks: { [key: string]: (() => void)[] } = {};
|
||||
|
||||
const useInviteLink = (linkId: string): LocalInviteInfo => {
|
||||
if(!localInviteCache[linkId]) {
|
||||
if (!localInviteCache[linkId]) {
|
||||
localInviteCache[linkId] = { status: { status: "loading" }, timeout: setTimeout(() => delete localInviteCache[linkId], 60 * 1000) };
|
||||
ipcChannel?.sendMessage("query", { linkId });
|
||||
}
|
||||
|
||||
const [ value, setValue ] = useState(localInviteCache[linkId].status);
|
||||
const [value, setValue] = useState(localInviteCache[linkId].status);
|
||||
|
||||
useEffect(() => {
|
||||
if(typeof localInviteCache[linkId]?.status === "undefined") {
|
||||
if (typeof localInviteCache[linkId]?.status === "undefined") {
|
||||
return;
|
||||
}
|
||||
|
||||
if(!_.isEqual(value, localInviteCache[linkId].status)) {
|
||||
if (!_.isEqual(value, localInviteCache[linkId].status)) {
|
||||
setValue(localInviteCache[linkId].status);
|
||||
}
|
||||
|
||||
const callback = () => setValue(localInviteCache[linkId].status);
|
||||
(localInviteCallbacks[linkId] || (localInviteCallbacks[linkId] = [])).push(callback);
|
||||
return () => localInviteCallbacks[linkId]?.remove(callback);
|
||||
return () => { localInviteCallbacks[linkId]?.remove(callback); }
|
||||
}, [linkId]);
|
||||
|
||||
return value;
|
||||
|
|
@ -69,14 +69,14 @@ const LoadedInviteRenderer = React.memo((props: { info: IpcInviteInfoLoaded }) =
|
|||
</div>
|
||||
);
|
||||
|
||||
const [, setRevision ] = useState(0);
|
||||
const [, setRevision] = useState(0);
|
||||
useEffect(() => {
|
||||
if(props.info.expireTimestamp === 0) {
|
||||
if (props.info.expireTimestamp === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const timeout = props.info.expireTimestamp - (Date.now() / 1000);
|
||||
if(timeout <= 0) {
|
||||
if (timeout <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -84,7 +84,7 @@ const LoadedInviteRenderer = React.memo((props: { info: IpcInviteInfoLoaded }) =
|
|||
return () => clearTimeout(timeoutId);
|
||||
});
|
||||
|
||||
if(props.info.expireTimestamp > 0 && Date.now() / 1000 >= props.info.expireTimestamp) {
|
||||
if (props.info.expireTimestamp > 0 && Date.now() / 1000 >= props.info.expireTimestamp) {
|
||||
return (
|
||||
<InviteErrorRenderer noTitle={true} key={"expired"}>
|
||||
<Translatable>Link expired</Translatable>
|
||||
|
|
@ -92,7 +92,7 @@ const LoadedInviteRenderer = React.memo((props: { info: IpcInviteInfoLoaded }) =
|
|||
);
|
||||
}
|
||||
|
||||
if(props.info.channelName) {
|
||||
if (props.info.channelName) {
|
||||
return (
|
||||
<div className={cssStyle.container + " " + cssStyle.info} key={"with-channel"}>
|
||||
<div className={cssStyle.left}>
|
||||
|
|
@ -215,8 +215,8 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
|||
|
||||
|
||||
function handleIpcMessage(remoteId: string, broadcast: boolean, message: ChannelMessage) {
|
||||
if(message.type === "query-result") {
|
||||
if(!localInviteCache[message.data.linkId]) {
|
||||
if (message.type === "query-result") {
|
||||
if (!localInviteCache[message.data.linkId]) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
import * as contextmenu from "../ui/elements/ContextMenu";
|
||||
import {Registry} from "../events";
|
||||
import {ChannelTree} from "./ChannelTree";
|
||||
import { Registry } from "../events";
|
||||
import { ChannelTree } from "./ChannelTree";
|
||||
import * as log from "../log";
|
||||
import {LogCategory, logDebug, logError, logInfo, LogType} from "../log";
|
||||
import {Settings, settings} from "../settings";
|
||||
import {Sound} from "../audio/Sounds";
|
||||
import {Group, GroupManager, GroupTarget, GroupType} from "../permission/GroupManager";
|
||||
import { LogCategory, logDebug, logError, logInfo, LogType } from "../log";
|
||||
import { Settings, settings } from "../settings";
|
||||
import { Sound } from "../audio/Sounds";
|
||||
import { Group, GroupManager, GroupTarget, GroupType } from "../permission/GroupManager";
|
||||
import PermissionType from "../permission/PermissionType";
|
||||
import {createErrorModal, createInputModal} from "../ui/elements/Modal";
|
||||
import { createErrorModal, createInputModal } from "../ui/elements/Modal";
|
||||
import * as htmltags from "../ui/htmltags";
|
||||
import {CommandResult} from "../connection/ServerConnectionDeclaration";
|
||||
import {ChannelEntry} from "./Channel";
|
||||
import {ConnectionHandler, ViewReasonId} from "../ConnectionHandler";
|
||||
import {openClientInfo} from "../ui/modal/ModalClientInfo";
|
||||
import {spawnBanClient} from "../ui/modal/ModalBanClient";
|
||||
import {spawnChangeLatency} from "../ui/modal/ModalChangeLatency";
|
||||
import { CommandResult } from "../connection/ServerConnectionDeclaration";
|
||||
import { ChannelEntry } from "./Channel";
|
||||
import { ConnectionHandler, ViewReasonId } from "../ConnectionHandler";
|
||||
import { openClientInfo } from "../ui/modal/ModalClientInfo";
|
||||
import { spawnBanClient } from "../ui/modal/ModalBanClient";
|
||||
import { spawnChangeLatency } from "../ui/modal/ModalChangeLatency";
|
||||
import * as hex from "../crypto/hex";
|
||||
import {ChannelTreeEntry, ChannelTreeEntryEvents} from "./ChannelTreeEntry";
|
||||
import {spawnClientVolumeChange, spawnMusicBotVolumeChange} from "../ui/modal/ModalChangeVolumeNew";
|
||||
import {spawnPermissionEditorModal} from "../ui/modal/permission/ModalController";
|
||||
import {global_client_actions} from "../events/GlobalEvents";
|
||||
import {ClientIcon} from "svg-sprites/client-icons";
|
||||
import {VoiceClient} from "../voice/VoiceClient";
|
||||
import {VoicePlayerEvents, VoicePlayerState} from "../voice/VoicePlayer";
|
||||
import {ChannelTreeUIEvents} from "tc-shared/ui/tree/Definitions";
|
||||
import {VideoClient} from "tc-shared/connection/VideoConnection";
|
||||
import {tr, tra} from "tc-shared/i18n/localize";
|
||||
import {EventClient} from "tc-shared/connectionlog/Definitions";
|
||||
import {W2GPluginCmdHandler} from "tc-shared/ui/modal/video-viewer/W2GPlugin";
|
||||
import {spawnServerGroupAssignments} from "tc-shared/ui/modal/group-assignment/Controller";
|
||||
import {promptYesNo} from "tc-shared/ui/modal/yes-no/Controller";
|
||||
import { ChannelTreeEntry, ChannelTreeEntryEvents } from "./ChannelTreeEntry";
|
||||
import { spawnClientVolumeChange, spawnMusicBotVolumeChange } from "../ui/modal/ModalChangeVolumeNew";
|
||||
import { spawnPermissionEditorModal } from "../ui/modal/permission/ModalController";
|
||||
import { global_client_actions } from "../events/GlobalEvents";
|
||||
import { ClientIcon } from "svg-sprites/client-icons";
|
||||
import { VoiceClient } from "../voice/VoiceClient";
|
||||
import { VoicePlayerEvents, VoicePlayerState } from "../voice/VoicePlayer";
|
||||
import { ChannelTreeUIEvents } from "tc-shared/ui/tree/Definitions";
|
||||
import { VideoClient } from "tc-shared/connection/VideoConnection";
|
||||
import { tr, tra } from "tc-shared/i18n/localize";
|
||||
import { EventClient } from "tc-shared/connectionlog/Definitions";
|
||||
import { W2GPluginCmdHandler } from "tc-shared/ui/modal/video-viewer/W2GPlugin";
|
||||
import { spawnServerGroupAssignments } from "tc-shared/ui/modal/group-assignment/Controller";
|
||||
import { promptYesNo } from "tc-shared/ui/modal/yes-no/Controller";
|
||||
|
||||
/* Must be the same as the TeaSpeak servers enum values */
|
||||
export enum ClientType {
|
||||
|
|
@ -218,11 +218,11 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
|
||||
destroy() {
|
||||
if(this.voiceHandle) {
|
||||
if (this.voiceHandle) {
|
||||
logError(LogCategory.AUDIO, tr("Destroying client with an active audio handle. This could cause memory leaks!"));
|
||||
this.setVoiceClient(undefined);
|
||||
}
|
||||
if(this.videoHandle) {
|
||||
if (this.videoHandle) {
|
||||
logError(LogCategory.AUDIO, tr("Destroying client with an active video handle. This could cause memory leaks!"));
|
||||
this.setVideoClient(undefined);
|
||||
}
|
||||
|
|
@ -232,22 +232,22 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
|
||||
setVoiceClient(handle: VoiceClient) {
|
||||
if(this.voiceHandle === handle)
|
||||
if (this.voiceHandle === handle)
|
||||
return;
|
||||
|
||||
if(this.voiceHandle) {
|
||||
if (this.voiceHandle) {
|
||||
this.voiceHandle.events.off(this.voiceCallbackStateChanged);
|
||||
}
|
||||
|
||||
this.voiceHandle = handle;
|
||||
if(handle) {
|
||||
if (handle) {
|
||||
this.voiceHandle.events.on("notify_state_changed", this.voiceCallbackStateChanged);
|
||||
this.handleVoiceStateChange({ oldState: VoicePlayerState.STOPPED, newState: handle.getState() });
|
||||
}
|
||||
}
|
||||
|
||||
setVideoClient(handle: VideoClient) {
|
||||
if(this.videoHandle === handle) {
|
||||
if (this.videoHandle === handle) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -278,19 +278,19 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
this.voiceHandle?.setVolume(volume);
|
||||
}
|
||||
|
||||
getVoiceClient() : VoiceClient {
|
||||
getVoiceClient(): VoiceClient {
|
||||
return this.voiceHandle;
|
||||
}
|
||||
|
||||
getVideoClient() : VideoClient {
|
||||
getVideoClient(): VideoClient {
|
||||
return this.videoHandle;
|
||||
}
|
||||
|
||||
get properties() : ClientProperties {
|
||||
get properties(): ClientProperties {
|
||||
return this._properties;
|
||||
}
|
||||
|
||||
getStatusIcon() : ClientIcon {
|
||||
getStatusIcon(): ClientIcon {
|
||||
if (this.properties.client_type == ClientType.CLIENT_QUERY) {
|
||||
return ClientIcon.ServerQuery;
|
||||
} else if (this.properties.client_away) {
|
||||
|
|
@ -322,27 +322,27 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
}
|
||||
|
||||
currentChannel() : ChannelEntry { return this._channel; }
|
||||
clientNickName(){ return this.properties.client_nickname; }
|
||||
clientUid(){ return this.properties.client_unique_identifier; }
|
||||
clientId(){ return this._clientId; }
|
||||
currentChannel(): ChannelEntry { return this._channel; }
|
||||
clientNickName() { return this.properties.client_nickname; }
|
||||
clientUid() { return this.properties.client_unique_identifier; }
|
||||
clientId() { return this._clientId; }
|
||||
|
||||
isMuted() { return !!this.voiceMuted; }
|
||||
|
||||
/* TODO: Move this method to the view (e.g. channel tree) and rename with to setClientMuted */
|
||||
setMuted(flagMuted: boolean, force: boolean) {
|
||||
if(this.voiceMuted === flagMuted && !force) {
|
||||
if (this.voiceMuted === flagMuted && !force) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(flagMuted) {
|
||||
if (flagMuted) {
|
||||
this.channelTree.client.serverConnection.send_command('clientmute', {
|
||||
clid: this.clientId()
|
||||
}).then(() => {});
|
||||
} else if(this.voiceMuted) {
|
||||
}).then(() => { });
|
||||
} else if (this.voiceMuted) {
|
||||
this.channelTree.client.serverConnection.send_command('clientunmute', {
|
||||
clid: this.clientId()
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
this.voiceMuted = flagMuted;
|
||||
|
||||
|
|
@ -350,15 +350,15 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
this.updateVoiceVolume();
|
||||
|
||||
this.events.fire("notify_mute_state_change", { muted: flagMuted });
|
||||
for(const client of this.channelTree.clients) {
|
||||
if(client === this as any || client.properties.client_unique_identifier !== this.properties.client_unique_identifier) {
|
||||
for (const client of this.channelTree.clients) {
|
||||
if (client === this as any || client.properties.client_unique_identifier !== this.properties.client_unique_identifier) {
|
||||
continue;
|
||||
}
|
||||
client.setMuted(flagMuted, false);
|
||||
}
|
||||
}
|
||||
|
||||
protected contextmenu_info() : contextmenu.MenuEntry[] {
|
||||
protected contextmenu_info(): contextmenu.MenuEntry[] {
|
||||
return [
|
||||
{
|
||||
type: contextmenu.MenuEntryType.ENTRY,
|
||||
|
|
@ -369,7 +369,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
icon_class: "client-about",
|
||||
visible: !settings.getValue(Settings.KEY_SWITCH_INSTANT_CLIENT)
|
||||
}, {
|
||||
callback: () => {},
|
||||
callback: () => { },
|
||||
type: contextmenu.MenuEntryType.HR,
|
||||
name: "",
|
||||
visible: !settings.getValue(Settings.KEY_SWITCH_INSTANT_CLIENT)
|
||||
|
|
@ -377,22 +377,22 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
]
|
||||
}
|
||||
|
||||
protected assignment_context() : contextmenu.MenuEntry[] {
|
||||
protected assignment_context(): contextmenu.MenuEntry[] {
|
||||
let server_groups: contextmenu.MenuEntry[] = [];
|
||||
for(let group of this.channelTree.client.groups.serverGroups.sort(GroupManager.sorter())) {
|
||||
if(group.type != GroupType.NORMAL) continue;
|
||||
for (let group of this.channelTree.client.groups.serverGroups.sort(GroupManager.sorter())) {
|
||||
if (group.type != GroupType.NORMAL) continue;
|
||||
|
||||
let entry: contextmenu.MenuEntry = {} as any;
|
||||
|
||||
//TODO: May add the server group icon?
|
||||
entry.checkbox_checked = this.groupAssigned(group);
|
||||
entry.name = group.name + " [" + (group.properties.savedb ? "perm" : "tmp") + "]";
|
||||
if(this.groupAssigned(group)) {
|
||||
if (this.groupAssigned(group)) {
|
||||
entry.callback = () => {
|
||||
this.channelTree.client.serverConnection.send_command("servergroupdelclient", {
|
||||
sgid: group.id,
|
||||
cldbid: this.properties.client_database_id
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
};
|
||||
entry.disabled = !this.channelTree.client.permissions.neededPermission(PermissionType.I_GROUP_MEMBER_ADD_POWER).granted(group.requiredMemberRemovePower);
|
||||
} else {
|
||||
|
|
@ -400,7 +400,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
this.channelTree.client.serverConnection.send_command("servergroupaddclient", {
|
||||
sgid: group.id,
|
||||
cldbid: this.properties.client_database_id
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
};
|
||||
entry.disabled = !this.channelTree.client.permissions.neededPermission(PermissionType.I_GROUP_MEMBER_REMOVE_POWER).granted(group.requiredMemberAddPower);
|
||||
}
|
||||
|
|
@ -410,8 +410,8 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
|
||||
let channel_groups: contextmenu.MenuEntry[] = [];
|
||||
for(let group of this.channelTree.client.groups.channelGroups.sort(GroupManager.sorter())) {
|
||||
if(group.type != GroupType.NORMAL) continue;
|
||||
for (let group of this.channelTree.client.groups.channelGroups.sort(GroupManager.sorter())) {
|
||||
if (group.type != GroupType.NORMAL) continue;
|
||||
|
||||
let entry: contextmenu.MenuEntry = {} as any;
|
||||
|
||||
|
|
@ -423,7 +423,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
cldbid: this.properties.client_database_id,
|
||||
cgid: group.id,
|
||||
cid: this.currentChannel().channelId
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
};
|
||||
entry.disabled = !this.channelTree.client.permissions.neededPermission(PermissionType.I_GROUP_MEMBER_ADD_POWER).granted(group.requiredMemberRemovePower);
|
||||
entry.type = contextmenu.MenuEntryType.CHECKBOX;
|
||||
|
|
@ -444,14 +444,14 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
contextmenu.Entry.HR(),
|
||||
...server_groups
|
||||
]
|
||||
},{
|
||||
}, {
|
||||
type: contextmenu.MenuEntryType.SUB_MENU,
|
||||
icon_class: "client-permission_channel",
|
||||
name: tr("Set channel group"),
|
||||
sub_menu: [
|
||||
...channel_groups
|
||||
]
|
||||
},{
|
||||
}, {
|
||||
type: contextmenu.MenuEntryType.SUB_MENU,
|
||||
icon_class: "client-permission_client",
|
||||
name: tr("Permissions"),
|
||||
|
|
@ -530,7 +530,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
name: tr("Poke client"),
|
||||
callback: () => {
|
||||
createInputModal(tr("Poke client"), tr("Poke message:<br>"), () => true, result => {
|
||||
if(typeof(result) === "string") {
|
||||
if (typeof (result) === "string") {
|
||||
this.channelTree.client.serverConnection.send_command("clientpoke", {
|
||||
clid: this.clientId(),
|
||||
msg: result
|
||||
|
|
@ -549,11 +549,11 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
name: tr("Change description"),
|
||||
callback: () => {
|
||||
createInputModal(tr("Change client description"), tr("New description:<br>"), () => true, result => {
|
||||
if(typeof(result) === "string") {
|
||||
if (typeof (result) === "string") {
|
||||
this.channelTree.client.serverConnection.send_command("clientedit", {
|
||||
clid: this.clientId(),
|
||||
client_description: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
|
||||
}
|
||||
}, { width: 400, maxLength: 1024 }).open();
|
||||
|
|
@ -569,7 +569,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
this.channelTree.client.serverConnection.send_command("clientmove", {
|
||||
clid: this.clientId(),
|
||||
cid: this.channelTree.client.getClient().currentChannel().getChannelId()
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
}, {
|
||||
type: contextmenu.MenuEntryType.ENTRY,
|
||||
|
|
@ -577,13 +577,13 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
name: tr("Kick client from channel"),
|
||||
callback: () => {
|
||||
createInputModal(tr("Kick client from channel"), tr("Kick reason:<br>"), () => true, result => {
|
||||
if(typeof(result) !== 'boolean' || result) {
|
||||
if (typeof (result) !== 'boolean' || result) {
|
||||
logInfo(LogCategory.CLIENT, tr("Kicking client %s from channel with reason %s"), this.clientNickName(), result);
|
||||
this.channelTree.client.serverConnection.send_command("clientkick", {
|
||||
clid: this.clientId(),
|
||||
reasonid: ViewReasonId.VREASON_CHANNEL_KICK,
|
||||
reasonmsg: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
|
||||
}
|
||||
}, { width: 400, maxLength: 255 }).open();
|
||||
|
|
@ -594,13 +594,13 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
name: tr("Kick client fom server"),
|
||||
callback: () => {
|
||||
createInputModal(tr("Kick client from server"), tr("Kick reason:<br>"), () => true, result => {
|
||||
if(typeof(result) !== 'boolean' || result) {
|
||||
if (typeof (result) !== 'boolean' || result) {
|
||||
logInfo(LogCategory.CLIENT, tr("Kicking client %s from server with reason %s"), this.clientNickName(), result);
|
||||
this.channelTree.client.serverConnection.send_command("clientkick", {
|
||||
clid: this.clientId(),
|
||||
reasonid: ViewReasonId.VREASON_SERVER_KICK,
|
||||
reasonmsg: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
}, { width: 400, maxLength: 255 }).open();
|
||||
}
|
||||
|
|
@ -678,11 +678,11 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
);
|
||||
}
|
||||
|
||||
static bbcodeTag(id: number, name: string, uid: string) : string {
|
||||
static bbcodeTag(id: number, name: string, uid: string): string {
|
||||
return "[url=client://" + id + "/" + uid + "~" + encodeURIComponent(name) + "]" + name + "[/url]";
|
||||
}
|
||||
|
||||
static chatTag(id: number, name: string, uid: string, braces: boolean = false) : JQuery {
|
||||
static chatTag(id: number, name: string, uid: string, braces: boolean = false): JQuery {
|
||||
return $(htmltags.generate_client({
|
||||
client_name: name,
|
||||
client_id: id,
|
||||
|
|
@ -691,11 +691,11 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}));
|
||||
}
|
||||
|
||||
create_bbcode() : string {
|
||||
create_bbcode(): string {
|
||||
return ClientEntry.bbcodeTag(this.clientId(), this.clientNickName(), this.clientUid());
|
||||
}
|
||||
|
||||
createChatTag(braces: boolean = false) : JQuery {
|
||||
createChatTag(braces: boolean = false): JQuery {
|
||||
return ClientEntry.chatTag(this.clientId(), this.clientNickName(), this.clientUid(), braces);
|
||||
}
|
||||
|
||||
|
|
@ -707,7 +707,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
isSpeaking() { return this._speaking; }
|
||||
|
||||
protected setSpeaking(flag: boolean) {
|
||||
if(this._speaking === flag) {
|
||||
if (this._speaking === flag) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -715,17 +715,17 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
this.events.fire("notify_speak_state_change", { speaking: flag });
|
||||
}
|
||||
|
||||
updateVariables(...variables: {key: string, value: string}[]) {
|
||||
updateVariables(...variables: { key: string, value: string }[]) {
|
||||
|
||||
let reorder_channel = false;
|
||||
let update_avatar = false;
|
||||
|
||||
let group;
|
||||
if(__build.mode === "debug") {
|
||||
if (__build.mode === "debug") {
|
||||
group = log.group(log.LogType.DEBUG, LogCategory.CLIENT, tr("Update properties (%i) of %s (%i)"), variables.length, this.clientNickName(), this.clientId());
|
||||
{
|
||||
const entries = [];
|
||||
for(const variable of variables)
|
||||
for (const variable of variables)
|
||||
entries.push({
|
||||
key: variable.key,
|
||||
value: variable.value,
|
||||
|
|
@ -735,13 +735,13 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
}
|
||||
|
||||
for(const variable of variables) {
|
||||
for (const variable of variables) {
|
||||
const old_value = this._properties[variable.key];
|
||||
JSON.map_field_to(this._properties, variable.value, variable.key);
|
||||
|
||||
if(variable.key == "client_nickname") {
|
||||
if(variable.value !== old_value && typeof(old_value) === "string") {
|
||||
if(!(this instanceof LocalClientEntry)) { /* own changes will be logged somewhere else */
|
||||
if (variable.key == "client_nickname") {
|
||||
if (variable.value !== old_value && typeof (old_value) === "string") {
|
||||
if (!(this instanceof LocalClientEntry)) { /* own changes will be logged somewhere else */
|
||||
this.channelTree.client.log.log("client.nickname.changed", {
|
||||
client: this.log_data(),
|
||||
new_name: variable.value,
|
||||
|
|
@ -752,29 +752,29 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
|
||||
reorder_channel = true;
|
||||
}
|
||||
if(variable.key == "client_unique_identifier") {
|
||||
if (variable.key == "client_unique_identifier") {
|
||||
this.voiceVolume = this.channelTree.client.settings.getValue(Settings.FN_CLIENT_VOLUME(this.clientUid()), 1);
|
||||
const mute_status = this.channelTree.client.settings.getValue(Settings.FN_CLIENT_MUTED(this.clientUid()), false);
|
||||
this.setMuted(mute_status, mute_status); /* force only needed when we want to mute the client */
|
||||
this.updateVoiceVolume();
|
||||
logDebug(LogCategory.CLIENT, tr("Loaded client (%s) server specific properties. Volume: %o Muted: %o."), this.clientUid(), this.voiceVolume, this.voiceMuted);
|
||||
}
|
||||
if(variable.key == "client_talk_power") {
|
||||
if (variable.key == "client_talk_power") {
|
||||
reorder_channel = true;
|
||||
//update_icon_status = true; DONE
|
||||
}
|
||||
if(variable.key == "client_icon_id") {
|
||||
if (variable.key == "client_icon_id") {
|
||||
/* yeah we like javascript. Due to JS wiered integer behaviour parsing for example fails for 18446744073409829863.
|
||||
* parseInt("18446744073409829863") evaluates to 18446744073409829000.
|
||||
* In opposite "18446744073409829863" >>> 0 evaluates to 3995244544, which is the icon id :)
|
||||
*/
|
||||
this.properties.client_icon_id = variable.value as any >>> 0;
|
||||
}
|
||||
else if(variable.key == "client_flag_avatar")
|
||||
else if (variable.key == "client_flag_avatar")
|
||||
update_avatar = true;
|
||||
}
|
||||
|
||||
if(update_avatar) {
|
||||
if (update_avatar) {
|
||||
this.channelTree.client?.fileManager?.avatars.updateCache(this.avatarId(), this.properties.client_flag_avatar);
|
||||
}
|
||||
|
||||
|
|
@ -782,58 +782,58 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
|
||||
{
|
||||
let properties = {};
|
||||
for(const property of variables)
|
||||
for (const property of variables)
|
||||
properties[property.key] = this.properties[property.key];
|
||||
this.events.fire("notify_properties_updated", { updated_properties: properties as any, client_properties: this.properties });
|
||||
}
|
||||
}
|
||||
|
||||
updateClientVariables(force_update?: boolean) : Promise<void> {
|
||||
if(Date.now() - 10 * 60 * 1000 < this.promiseClientInfoTimestamp && this.promiseClientInfo && (typeof(force_update) !== "boolean" || force_update)) {
|
||||
updateClientVariables(force_update?: boolean): Promise<void> {
|
||||
if (Date.now() - 10 * 60 * 1000 < this.promiseClientInfoTimestamp && this.promiseClientInfo && (typeof (force_update) !== "boolean" || force_update)) {
|
||||
return this.promiseClientInfo;
|
||||
}
|
||||
|
||||
this.promiseClientInfoTimestamp = Date.now();
|
||||
return (this.promiseClientInfo = new Promise<void>((resolve, reject) => {
|
||||
this.channelTree.client.serverConnection.send_command("clientgetvariables", {clid: this.clientId()}).then(() => resolve()).catch(error => {
|
||||
this.channelTree.client.serverConnection.send_command("clientgetvariables", { clid: this.clientId() }).then(() => resolve()).catch(error => {
|
||||
this.promiseConnectionInfoTimestamp = 0; /* not succeeded */
|
||||
reject(error);
|
||||
});
|
||||
}));
|
||||
}
|
||||
|
||||
assignedServerGroupIds() : number[] {
|
||||
assignedServerGroupIds(): number[] {
|
||||
let result = [];
|
||||
for(let id of this.properties.client_servergroups.split(",")){
|
||||
if(id.length == 0) continue;
|
||||
for (let id of this.properties.client_servergroups.split(",")) {
|
||||
if (id.length == 0) continue;
|
||||
result.push(Number.parseInt(id));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
assignedChannelGroup() : number {
|
||||
assignedChannelGroup(): number {
|
||||
return this.properties.client_channel_group_id;
|
||||
}
|
||||
|
||||
groupAssigned(group: Group) : boolean {
|
||||
if(group.target == GroupTarget.SERVER) {
|
||||
for(let id of this.assignedServerGroupIds())
|
||||
if(id == group.id) return true;
|
||||
groupAssigned(group: Group): boolean {
|
||||
if (group.target == GroupTarget.SERVER) {
|
||||
for (let id of this.assignedServerGroupIds())
|
||||
if (id == group.id) return true;
|
||||
return false;
|
||||
} else return group.id == this.assignedChannelGroup();
|
||||
}
|
||||
|
||||
onDelete() { }
|
||||
|
||||
calculateOnlineTime() : number {
|
||||
calculateOnlineTime(): number {
|
||||
return Date.now() / 1000 - this.properties.client_lastconnected;
|
||||
}
|
||||
|
||||
avatarId?() : string {
|
||||
avatarId?(): string {
|
||||
function str2ab(str) {
|
||||
let buf = new ArrayBuffer(str.length); // 2 bytes for each char
|
||||
let bufView = new Uint8Array(buf);
|
||||
for (let i=0, strLen = str.length; i<strLen; i++) {
|
||||
for (let i = 0, strLen = str.length; i < strLen; i++) {
|
||||
bufView[i] = str.charCodeAt(i);
|
||||
}
|
||||
return buf;
|
||||
|
|
@ -844,14 +844,14 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
let input = hex.encode(str2ab(raw));
|
||||
|
||||
let result: string = "";
|
||||
for(let index = 0; index < input.length; index++) {
|
||||
for (let index = 0; index < input.length; index++) {
|
||||
let c = input.charAt(index);
|
||||
let offset: number = 0;
|
||||
if(c >= '0' && c <= '9')
|
||||
if (c >= '0' && c <= '9')
|
||||
offset = c.charCodeAt(0) - '0'.charCodeAt(0);
|
||||
else if(c >= 'A' && c <= 'F')
|
||||
else if (c >= 'A' && c <= 'F')
|
||||
offset = c.charCodeAt(0) - 'A'.charCodeAt(0) + 0x0A;
|
||||
else if(c >= 'a' && c <= 'f')
|
||||
else if (c >= 'a' && c <= 'f')
|
||||
offset = c.charCodeAt(0) - 'a'.charCodeAt(0) + 0x0A;
|
||||
result += String.fromCharCode('a'.charCodeAt(0) + offset);
|
||||
}
|
||||
|
|
@ -861,7 +861,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
}
|
||||
|
||||
log_data() : EventClient {
|
||||
log_data(): EventClient {
|
||||
return {
|
||||
client_unique_id: this.properties.client_unique_identifier,
|
||||
client_name: this.clientNickName(),
|
||||
|
|
@ -870,11 +870,11 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
|
||||
/* max 1s ago, so we could update every second */
|
||||
request_connection_info() : Promise<ClientConnectionInfo> {
|
||||
if(Date.now() - 900 < this.promiseConnectionInfoTimestamp && this.promiseConnectionInfo)
|
||||
request_connection_info(): Promise<ClientConnectionInfo> {
|
||||
if (Date.now() - 900 < this.promiseConnectionInfoTimestamp && this.promiseConnectionInfo)
|
||||
return this.promiseConnectionInfo;
|
||||
|
||||
if(this.promiseConnectionInfoReject)
|
||||
if (this.promiseConnectionInfoReject)
|
||||
this.promiseConnectionInfoResolve("timeout");
|
||||
|
||||
let _local_reject; /* to ensure we're using the right resolve! */
|
||||
|
|
@ -885,12 +885,12 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
});
|
||||
|
||||
this.promiseConnectionInfoTimestamp = Date.now();
|
||||
this.channelTree.client.serverConnection.send_command("getconnectioninfo", {clid: this._clientId}).catch(error => _local_reject(error));
|
||||
this.channelTree.client.serverConnection.send_command("getconnectioninfo", { clid: this._clientId }).catch(error => _local_reject(error));
|
||||
return this.promiseConnectionInfo;
|
||||
}
|
||||
|
||||
set_connection_info(info: ClientConnectionInfo) {
|
||||
if(!this.promiseConnectionInfoResolve)
|
||||
if (!this.promiseConnectionInfoResolve)
|
||||
return;
|
||||
this.promiseConnectionInfoResolve(info);
|
||||
this.promiseConnectionInfoResolve = undefined;
|
||||
|
|
@ -898,7 +898,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
}
|
||||
|
||||
setAudioVolume(value: number) {
|
||||
if(this.voiceVolume == value) {
|
||||
if (this.voiceVolume == value) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -914,10 +914,10 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
return this.voiceVolume;
|
||||
}
|
||||
|
||||
getClientType() : ClientType {
|
||||
if(this.properties.client_type_exact === ClientType.CLIENT_UNDEFINED) {
|
||||
getClientType(): ClientType {
|
||||
if (this.properties.client_type_exact === ClientType.CLIENT_UNDEFINED) {
|
||||
/* We're on a TS3 server */
|
||||
switch(this.properties.client_type) {
|
||||
switch (this.properties.client_type) {
|
||||
case 0:
|
||||
return ClientType.CLIENT_VOICE;
|
||||
|
||||
|
|
@ -928,7 +928,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
return ClientType.CLIENT_UNDEFINED;
|
||||
}
|
||||
} else {
|
||||
switch(this.properties.client_type_exact) {
|
||||
switch (this.properties.client_type_exact as ClientType) {
|
||||
case 0:
|
||||
return ClientType.CLIENT_VOICE;
|
||||
|
||||
|
|
@ -943,7 +943,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
|
|||
|
||||
case 5:
|
||||
return ClientType.CLIENT_TEASPEAK;
|
||||
|
||||
// @ts-ignore
|
||||
case 2:
|
||||
/* 2 is the internal client type which should never be visible for the target user */
|
||||
default:
|
||||
|
|
@ -980,12 +980,12 @@ export class LocalClientEntry extends ClientEntry {
|
|||
icon_class: "client-edit",
|
||||
callback: () => {
|
||||
createInputModal(tr("Change own description"), tr("New description:<br>"), () => true, result => {
|
||||
if(result) {
|
||||
if (result) {
|
||||
logInfo(LogCategory.CLIENT, tr("Changing own description to %s"), result);
|
||||
this.channelTree.client.serverConnection.send_command("clientedit", {
|
||||
clid: this.clientId(),
|
||||
client_description: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
|
||||
}
|
||||
}, { width: 400, maxLength: 1024 }).open();
|
||||
|
|
@ -998,7 +998,7 @@ export class LocalClientEntry extends ClientEntry {
|
|||
);
|
||||
}
|
||||
|
||||
renameSelf(new_name: string) : Promise<boolean> {
|
||||
renameSelf(new_name: string): Promise<boolean> {
|
||||
const old_name = this.properties.client_nickname;
|
||||
this.updateVariables({ key: "client_nickname", value: new_name }); /* change it locally */
|
||||
return this.handle.serverConnection.send_command("clientupdate", { client_nickname: new_name }).then(() => {
|
||||
|
|
@ -1020,9 +1020,9 @@ export class LocalClientEntry extends ClientEntry {
|
|||
|
||||
openRenameModal() {
|
||||
createInputModal(tr("Enter your new name"), tr("Enter your new client name"), text => text.length >= 3 && text.length <= 30, value => {
|
||||
if(value) {
|
||||
if (value) {
|
||||
this.renameSelf(value as string).then(result => {
|
||||
if(!result) {
|
||||
if (!result) {
|
||||
createErrorModal(tr("Failed change nickname"), tr("Failed to change your client nickname")).open();
|
||||
}
|
||||
});
|
||||
|
|
@ -1030,7 +1030,7 @@ export class LocalClientEntry extends ClientEntry {
|
|||
}).open();
|
||||
}
|
||||
|
||||
openRename(events: Registry<ChannelTreeUIEvents>) : void {
|
||||
openRename(events: Registry<ChannelTreeUIEvents>): void {
|
||||
events.fire("notify_client_name_edit", { initialValue: this.clientNickName(), treeEntryId: this.uniqueEntryId });
|
||||
}
|
||||
}
|
||||
|
|
@ -1112,24 +1112,24 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
this._info_promise_resolve = undefined;
|
||||
}
|
||||
|
||||
get properties() : MusicClientProperties {
|
||||
get properties(): MusicClientProperties {
|
||||
return this._properties as MusicClientProperties;
|
||||
}
|
||||
|
||||
isSubscribed() : boolean {
|
||||
isSubscribed(): boolean {
|
||||
return this.subscribed;
|
||||
}
|
||||
|
||||
async subscribe() : Promise<void> {
|
||||
if(this.subscribed) {
|
||||
async subscribe(): Promise<void> {
|
||||
if (this.subscribed) {
|
||||
return;
|
||||
}
|
||||
|
||||
await this.channelTree.client.serverConnection.send_command("musicbotsetsubscription", { bot_id: this.properties.client_database_id });
|
||||
|
||||
this.channelTree.clients.forEach(client => {
|
||||
if(client instanceof MusicClientEntry) {
|
||||
if(client.subscribed) {
|
||||
if (client instanceof MusicClientEntry) {
|
||||
if (client.subscribed) {
|
||||
client.subscribed = false;
|
||||
client.events.fire("notify_subscribe_state_changed", { subscribed: false });
|
||||
}
|
||||
|
|
@ -1151,11 +1151,11 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
disabled: false,
|
||||
callback: () => {
|
||||
createInputModal(tr("Change music bots nickname"), tr("New nickname:<br>"), text => text.length >= 3 && text.length <= 31, result => {
|
||||
if(result) {
|
||||
if (result) {
|
||||
this.channelTree.client.serverConnection.send_command("clientedit", {
|
||||
clid: this.clientId(),
|
||||
client_nickname: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
}, { width: "40em", min_width: "10em", maxLength: 255 }).open();
|
||||
},
|
||||
|
|
@ -1166,11 +1166,11 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
disabled: false,
|
||||
callback: () => {
|
||||
createInputModal(tr("Change music bots description"), tr("New description:<br>"), () => true, result => {
|
||||
if(typeof(result) === 'string') {
|
||||
if (typeof (result) === 'string') {
|
||||
this.channelTree.client.serverConnection.send_command("clientedit", {
|
||||
clid: this.clientId(),
|
||||
client_description: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
}, { width: "60em", min_width: "10em", maxLength: 255 }).open();
|
||||
},
|
||||
|
|
@ -1191,13 +1191,13 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
disabled: false,
|
||||
callback: () => {
|
||||
createInputModal(tr("Please enter the URL"), tr("URL:"), () => true, result => {
|
||||
if(result) {
|
||||
if (result) {
|
||||
this.channelTree.client.serverConnection.send_command("musicbotqueueadd", {
|
||||
bot_id: this.properties.client_database_id,
|
||||
type: "yt", //Its a hint not a force!
|
||||
url: result
|
||||
}).catch(error => {
|
||||
if(error instanceof CommandResult) {
|
||||
if (error instanceof CommandResult) {
|
||||
error = error.extra_message || error.message;
|
||||
}
|
||||
//TODO tr
|
||||
|
|
@ -1210,7 +1210,7 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
},
|
||||
contextmenu.Entry.HR(),
|
||||
...super.assignment_context(),
|
||||
contextmenu.Entry.HR(),{
|
||||
contextmenu.Entry.HR(), {
|
||||
type: contextmenu.MenuEntryType.ENTRY,
|
||||
icon_class: "client-move_client_to_own_channel",
|
||||
name: tr("Move client to your channel"),
|
||||
|
|
@ -1218,7 +1218,7 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
this.channelTree.client.serverConnection.send_command("clientmove", {
|
||||
clid: this.clientId(),
|
||||
cid: this.channelTree.client.getClient().currentChannel().getChannelId()
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
}, {
|
||||
type: contextmenu.MenuEntryType.ENTRY,
|
||||
|
|
@ -1226,13 +1226,13 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
name: tr("Kick client from channel"),
|
||||
callback: () => {
|
||||
createInputModal(tr("Kick client from channel"), tr("Kick reason:<br>"), () => true, result => {
|
||||
if(typeof(result) !== 'boolean' || result) {
|
||||
if (typeof (result) !== 'boolean' || result) {
|
||||
logInfo(LogCategory.CLIENT, tr("Kicking client %o from channel with reason %o"), this.clientNickName(), result);
|
||||
this.channelTree.client.serverConnection.send_command("clientkick", {
|
||||
clid: this.clientId(),
|
||||
reasonid: ViewReasonId.VREASON_CHANNEL_KICK,
|
||||
reasonmsg: result
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
}
|
||||
}, { width: 400, maxLength: 255 }).open();
|
||||
}
|
||||
|
|
@ -1250,7 +1250,7 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
name: tr("Change remote volume"),
|
||||
callback: () => {
|
||||
let max_volume = this.channelTree.client.permissions.neededPermission(PermissionType.I_CLIENT_MUSIC_CREATE_MODIFY_MAX_VOLUME).value;
|
||||
if(max_volume < 0) {
|
||||
if (max_volume < 0) {
|
||||
max_volume = 100;
|
||||
}
|
||||
|
||||
|
|
@ -1278,13 +1278,13 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
title: tr("Are you sure?"),
|
||||
question: tra("Do you really want to delete {0}", this.clientNickName())
|
||||
}).then(result => {
|
||||
if(!result) {
|
||||
if (!result) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.channelTree.client.serverConnection.send_command("musicbotdelete", {
|
||||
bot_id: this.properties.client_database_id
|
||||
}).then(() => {});
|
||||
}).then(() => { });
|
||||
});
|
||||
},
|
||||
type: contextmenu.MenuEntryType.ENTRY
|
||||
|
|
@ -1294,25 +1294,25 @@ export class MusicClientEntry extends ClientEntry<MusicClientEvents> {
|
|||
}
|
||||
|
||||
handlePlayerInfo(json) {
|
||||
if(json) {
|
||||
if (json) {
|
||||
const info = new MusicClientPlayerInfo();
|
||||
JSON.map_to(info, json);
|
||||
if(this._info_promise_resolve)
|
||||
if (this._info_promise_resolve)
|
||||
this._info_promise_resolve(info);
|
||||
this._info_promise_reject = undefined;
|
||||
this._info_promise_resolve = undefined;
|
||||
}
|
||||
}
|
||||
|
||||
requestPlayerInfo(max_age: number = 1000) : Promise<MusicClientPlayerInfo> {
|
||||
if(this._info_promise !== undefined && this._info_promise_age > 0 && Date.now() - max_age <= this._info_promise_age) return this._info_promise;
|
||||
requestPlayerInfo(max_age: number = 1000): Promise<MusicClientPlayerInfo> {
|
||||
if (this._info_promise !== undefined && this._info_promise_age > 0 && Date.now() - max_age <= this._info_promise_age) return this._info_promise;
|
||||
this._info_promise_age = Date.now();
|
||||
this._info_promise = new Promise<MusicClientPlayerInfo>((resolve, reject) => {
|
||||
this._info_promise_reject = reject;
|
||||
this._info_promise_resolve = resolve;
|
||||
});
|
||||
|
||||
this.channelTree.client.serverConnection.send_command("musicbotplayerinfo", {bot_id: this.properties.client_database_id }).then(() => {});
|
||||
this.channelTree.client.serverConnection.send_command("musicbotplayerinfo", { bot_id: this.properties.client_database_id }).then(() => { });
|
||||
return this._info_promise;
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -8,14 +8,27 @@
|
|||
"declaration": true,
|
||||
"emitDeclarationOnly": true,
|
||||
"esModuleInterop": true,
|
||||
"skipLibCheck": true,
|
||||
"baseUrl": "../../",
|
||||
"paths": {
|
||||
"tc-shared/*": ["shared/js/*"],
|
||||
"tc-loader": ["loader/exports/loader.d.ts"],
|
||||
"svg-sprites/*": ["shared/svg-sprites/*"],
|
||||
"vendor/xbbcode/*": ["vendor/xbbcode/src/*"],
|
||||
"tc-events": ["vendor/TeaEventBus/src/index.ts"],
|
||||
"tc-services": ["vendor/TeaClientServices/src/index.ts"]
|
||||
"tc-shared/*": [
|
||||
"shared/js/*"
|
||||
],
|
||||
"tc-loader": [
|
||||
"loader/exports/loader.d.ts"
|
||||
],
|
||||
"svg-sprites/*": [
|
||||
"shared/svg-sprites/*"
|
||||
],
|
||||
"vendor/xbbcode/*": [
|
||||
"vendor/xbbcode/src/*"
|
||||
],
|
||||
"tc-events": [
|
||||
"vendor/TeaEventBus/src/index.ts"
|
||||
],
|
||||
"tc-services": [
|
||||
"vendor/TeaClientServices/src/index.ts"
|
||||
]
|
||||
}
|
||||
},
|
||||
"exclude": [
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
"sourceMap": true,
|
||||
"experimentalDecorators": true,
|
||||
"esModuleInterop": true,
|
||||
"skipLibCheck": true,
|
||||
"plugins": [ /* ttypescript */
|
||||
{
|
||||
"transform": "../../tools/trgen/ttsc_transformer.js",
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
{
|
||||
"compilerOptions": {
|
||||
"baseUrl": ".",
|
||||
"skipLibCheck": true,
|
||||
"moduleResolution": "node",
|
||||
"module": "commonjs",
|
||||
"lib": ["es6"],
|
||||
|
||||
"lib": [
|
||||
"es6"
|
||||
],
|
||||
"typeRoots": [],
|
||||
"types": [],
|
||||
|
||||
"esModuleInterop": true
|
||||
},
|
||||
"files": [
|
||||
|
|
|
|||
|
|
@ -4,20 +4,22 @@
|
|||
"target": "es6",
|
||||
"module": "commonjs",
|
||||
"sourceMap": true,
|
||||
"lib": ["es6", "dom"],
|
||||
"lib": [
|
||||
"es6",
|
||||
"dom"
|
||||
],
|
||||
"removeComments": false,
|
||||
"esModuleInterop": true
|
||||
"esModuleInterop": true,
|
||||
"skipLibCheck": true
|
||||
},
|
||||
"include": [
|
||||
"webpack.config.ts",
|
||||
"webpack-client.config.ts",
|
||||
"webpack-web.config.ts",
|
||||
|
||||
"webpack/build-definitions.d.ts",
|
||||
"webpack/HtmlWebpackInlineSource.ts",
|
||||
"webpack/WatLoader.ts",
|
||||
"webpack/ManifestPlugin.ts",
|
||||
|
||||
"babel.config.ts",
|
||||
"postcss.config.ts",
|
||||
"file.ts"
|
||||
|
|
|
|||
|
|
@ -5,19 +5,35 @@
|
|||
"target": "es6",
|
||||
"module": "commonjs",
|
||||
"sourceMap": true,
|
||||
"lib": ["ES7", "dom", "dom.iterable"],
|
||||
"lib": [
|
||||
"ES7",
|
||||
"dom",
|
||||
"dom.iterable"
|
||||
],
|
||||
"removeComments": true, /* we dont really need them within the target files */
|
||||
"jsx": "react",
|
||||
"esModuleInterop": true,
|
||||
"baseUrl": ".",
|
||||
"skipLibCheck": true,
|
||||
"paths": {
|
||||
"tc-shared/*": ["shared/js/*"],
|
||||
"tc-loader": ["loader/exports/loader.d.ts"],
|
||||
"tc-events": ["vendor/TeaEventBus/src/index.ts"],
|
||||
"tc-services": ["vendor/TeaClientServices/src/index.ts"],
|
||||
|
||||
"svg-sprites/*": ["shared/svg-sprites/*"],
|
||||
"vendor/xbbcode/*": ["vendor/xbbcode/src/*"]
|
||||
"tc-shared/*": [
|
||||
"shared/js/*"
|
||||
],
|
||||
"tc-loader": [
|
||||
"loader/exports/loader.d.ts"
|
||||
],
|
||||
"tc-events": [
|
||||
"vendor/TeaEventBus/src/index.ts"
|
||||
],
|
||||
"tc-services": [
|
||||
"vendor/TeaClientServices/src/index.ts"
|
||||
],
|
||||
"svg-sprites/*": [
|
||||
"shared/svg-sprites/*"
|
||||
],
|
||||
"vendor/xbbcode/*": [
|
||||
"vendor/xbbcode/src/*"
|
||||
]
|
||||
}
|
||||
},
|
||||
"exclude": [
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@ const generateLocalBuildInfo = async (target: string): Promise<LocalBuildInfo> =
|
|||
{
|
||||
const gitRevision = fs.readFileSync(path.join(__dirname, ".git", "HEAD")).toString();
|
||||
if(gitRevision.indexOf("/") === -1) {
|
||||
info.gitVersion = (gitRevision || "00000000").substr(0, 8);
|
||||
info.gitVersion = (gitRevision || "00000000").substring(0, 8);
|
||||
} else {
|
||||
info.gitVersion = fs.readFileSync(path.join(__dirname, ".git", gitRevision.substr(5).trim())).toString().substr(0, 8);
|
||||
info.gitVersion = fs.readFileSync(path.join(__dirname, ".git", gitRevision.substring(5).trim())).toString().substring(0, 8);
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
|||
Loading…
Reference in New Issue