Compare commits

...

11 Commits

Author SHA1 Message Date
gapodo 4c5e744f62 build...
ci/woodpecker/push/base Pipeline was successful Details
2023-11-20 14:17:03 +01:00
gapodo 86351e336c build
ci/woodpecker/push/base Pipeline was successful Details
2023-11-20 13:56:13 +01:00
gapodo 24c6a1e22e update build 2023-11-20 13:52:23 +01:00
gapodo 2a1fd11e2d stun change
ci/woodpecker/push/base Pipeline was successful Details
2023-11-20 01:13:22 +01:00
gapodo 063fdae679 autotag
ci/woodpecker/push/base Pipeline was successful Details
2023-11-19 23:38:50 +01:00
gapodo e5551cea09 fix?
ci/woodpecker/push/base Pipeline was successful Details
2023-11-19 23:07:07 +01:00
gapodo 3ec3db37e0 ci
ci/woodpecker/push/base Pipeline failed Details
2023-11-19 23:00:03 +01:00
gapodo feb564d4a0 save all with +x as script changes them anyways 2023-11-18 20:58:15 +01:00
gapodo bde4bbf5ad build... 2023-11-18 19:25:19 +01:00
gapodo ef0813dd84 hard lock wabt (has breaking change within minor version) 2023-11-17 22:25:04 +01:00
gapodo 5b8b4d07c3 updates... 2023-11-17 21:47:09 +01:00
45 changed files with 5753 additions and 3519 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
.idea/ .idea/
node_modules/ node_modules/
.sass-cache/ .sass-cache/
.npm/
/auth/certs/ /auth/certs/
/auth/js/auth.js.map /auth/js/auth.js.map

4
.npmrc Normal file
View File

@ -0,0 +1,4 @@
audit=false
fund=false
update-notifier=false
package-lock=true

89
.woodpecker/base.yaml Normal file
View File

@ -0,0 +1,89 @@
when:
event: [push, deployment, manual, cron]
labels:
platform: linux/amd64
variables:
- &node_image 'node:14-bullseye'
- &buildx_image 'woodpeckerci/plugin-docker-buildx:2.2.1'
- &platforms 'linux/amd64'
- &dockerfile 'docker/Dockerfile.ci'
steps:
prepare-npm:
image: *node_image
secrets:
- npmconf
commands:
- git config --add safe.directory '*'
- if [ "$${NPMCONF:-}" != "" ]; then echo "$${NPMCONF}" >> "$${HOME}/.npmrc"; fi
- npm ci
- npx browserslist@latest --update-db
build-npm:
image: *node_image
commands:
- bash ./scripts/build.sh web rel
build-docker-next:
image: *buildx_image
pull: true
settings:
platforms: *platforms
dockerfile: *dockerfile
context: .
registry:
from_secret: registry_domain
repo:
from_secret: target_image_name
password:
from_secret: registry_token
username:
from_secret: registry_user
auto_tag: true
tag: [next, "next-${CI_COMMIT_SHA:0:8}"]
when:
branch: ${CI_REPO_DEFAULT_BRANCH}
event: push
build-docker-branch:
image: *buildx_image
pull: true
settings:
platforms: *platforms
dockerfile: *dockerfile
context: .
registry:
from_secret: registry_domain
repo:
from_secret: target_image_name
password:
from_secret: registry_token
username:
from_secret: registry_user
auto_tag: true
tag: ["${CI_COMMIT_BRANCH}", "${CI_COMMIT_BRANCH}-${CI_COMMIT_SHA:0:8}"]
when:
event: [push, manual]
build-docker-tag:
image: *buildx_image
pull: true
settings:
platforms: *platforms
dockerfile: *dockerfile
context: .
registry:
from_secret: registry_domain
repo:
from_secret: target_image_name
password:
from_secret: registry_token
username:
from_secret: registry_user
auto_tag: true
tag: [latest, "${CI_COMMIT_TAG}", "tag-${CI_COMMIT_SHA:0:8}"]
when:
event: [tag]

View File

@ -4,14 +4,12 @@ export default api => {
[ [
"@babel/preset-env", "@babel/preset-env",
{ {
"corejs": {"version": 3}, "corejs": {"version": '3.33', "proposals": false},
"useBuiltIns": "usage", "useBuiltIns": "usage",
"targets": { "targets": {
"edge": "17", "edge": "111",
"firefox": "60", "firefox": "100",
"chrome": "67", "chrome": "109"
"safari": "11.1",
"ie": "11"
} }
} }
] ]

0
client/generate_packed.sh Normal file → Executable file
View File

17
docker/Dockerfile.base Normal file
View File

@ -0,0 +1,17 @@
FROM nginx:mainline-alpine
COPY ./docker/default.conf /etc/nginx/conf.d/default.conf
COPY ./docker/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/entrypoint.sh /
RUN apk update --no-cache && apk upgrade --no-cache \
&& apk add --no-cache openssl tzdata \
&& mkdir -p /var/www/TeaWeb /etc/ssl/certs \
&& chmod +x /entrypoint.sh
ENV TZ="Europe/Berlin"
EXPOSE 80 443
ENTRYPOINT ["/entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]

19
docker/Dockerfile.ci Normal file
View File

@ -0,0 +1,19 @@
FROM nginx:mainline-alpine
COPY ./docker/default.conf /etc/nginx/conf.d/default.conf
COPY ./docker/nginx.conf /etc/nginx/nginx.conf
COPY ./docker/entrypoint.sh /
RUN apk update --no-cache && apk upgrade --no-cache \
&& apk add --no-cache openssl tzdata \
&& mkdir -p /var/www/TeaWeb /etc/ssl/certs \
&& chmod +x /entrypoint.sh
ENV TZ="Europe/Berlin"
EXPOSE 80 443
ENTRYPOINT ["/entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]
COPY ./dist/ /var/www/TeaWeb/

36
docker/default.conf Normal file
View File

@ -0,0 +1,36 @@
server {
listen 80;
server_name _;
return 301 https://$host$request_uri;
}
server {
listen 443 default_server ssl http2;
server_name _;
ssl_ciphers EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:TLS-CHACHA20-POLY1305-SHA256:TLS-AES-256-GCM-SHA384:TLS-AES-128-GCM-SHA256;
ssl_protocols TLSv1.2 TLSv1.3;
ssl_dhparam /etc/ssl/certs/dhparam.pem;
ssl_ecdh_curve secp384r1;
ssl_certificate /etc/ssl/certs/tea_bundle.crt;
ssl_certificate_key /etc/ssl/certs/tea.key;
ssl_session_cache shared:MozSSL:10m;
ssl_session_timeout 1d;
ssl_prefer_server_ciphers on;
location / {
root /var/www/TeaWeb;
index index.html;
}
#error_page 404 /404.html;
# redirect server error pages to the static page /50x.html
#
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root /usr/share/nginx/html;
}
gzip off;
}

29
docker/entrypoint.sh Executable file
View File

@ -0,0 +1,29 @@
#!/usr/bin/env sh
set -e
gen_self_signed() {
echo "[WRN] No certificates found, generating self signed cert with key"
openssl req -x509 -nodes -days 1780 -newkey rsa:4096 \
-keyout /etc/ssl/certs/tea.key \
-out /etc/ssl/certs/tea_bundle.crt \
-subj "/C=DE/ST=Berlin/L=Germany/O=TeaSpeak/OU=TeaWeb/CN=localhost/emailAddress=noreply@teaspeak.de"
}
gen_diffie_hellman() {
echo "[INF] No Diffie-Hellman pem found, generating new with 2048 byte"
openssl dhparam -out /etc/ssl/certs/dhparam.pem 2048
}
if [ "$1" = "nginx" ]; then
if [ ! -f /etc/ssl/certs/tea.key ] && [ ! -f /etc/ssl/certs/tea_bundle.crt ]; then
gen_self_signed
elif [ ! -f /etc/ssl/certs/tea.key ] || [ ! -f /etc/ssl/certs/tea_bundle.crt ]; then
echo "[ERR] Only found a key or crt-bundle file but both files are REQUIRED!"
exit 1
fi
if [ ! -f /etc/ssl/certs/dhparam.pem ]; then
gen_diffie_hellman
fi
fi
exec "$@"

32
docker/nginx.conf Normal file
View File

@ -0,0 +1,32 @@
user nginx;
worker_processes auto;
error_log /var/log/nginx/error.log warn;
pid /var/run/nginx.pid;
events {
worker_connections 1024;
}
http {
include /etc/nginx/mime.types;
default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main;
sendfile on;
#tcp_nopush on;
server_tokens off;
keepalive_timeout 75;
#gzip on;
include /etc/nginx/conf.d/*.conf;
}

View File

@ -24,7 +24,7 @@ export {};
if (__build.target === "client") { if (__build.target === "client") {
/* do this so we don't get a react dev tools warning within the client */ /* do this so we don't get a react dev tools warning within the client */
if (!('__REACT_DEVTOOLS_GLOBAL_HOOK__' in window)) { if (!('__REACT_DEVTOOLS_GLOBAL_HOOK__' in window)) {
window.__REACT_DEVTOOLS_GLOBAL_HOOK__ = {}; (window as Window).__REACT_DEVTOOLS_GLOBAL_HOOK__ = {};
} }
window.__REACT_DEVTOOLS_GLOBAL_HOOK__.inject = function () { }; window.__REACT_DEVTOOLS_GLOBAL_HOOK__.inject = function () { };

6999
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -17,74 +17,75 @@
"author": "TeaSpeak (WolverinDEV)", "author": "TeaSpeak (WolverinDEV)",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@babel/core": "^7.10.4", "@babel/core": "^7.23.3",
"@babel/plugin-transform-runtime": "^7.10.4", "@babel/plugin-transform-runtime": "^7.23.3",
"@babel/preset-env": "^7.10.4", "@babel/preset-env": "^7.23.3",
"@google-cloud/translate": "^5.3.0", "@google-cloud/translate": "^5.3.0",
"@svgr/webpack": "^5.5.0", "@svgr/webpack": "^5.5.0",
"@types/dompurify": "^2.0.1", "@types/dompurify": "^2.4.0",
"@types/ejs": "^3.0.2", "@types/ejs": "^3.1.5",
"@types/emoji-mart": "^3.0.2", "@types/emoji-mart": "^3.0.12",
"@types/emscripten": "^1.38.0", "@types/emscripten": "^1.39.10",
"@types/fs-extra": "^8.0.1", "@types/fs-extra": "^8.1.5",
"@types/html-minifier": "^3.5.3", "@types/html-minifier": "^3.5.3",
"@types/jquery": "^3.3.34", "@types/jquery": "^3.5.27",
"@types/jsrender": "^1.0.5", "@types/jsrender": "^1.0.5",
"@types/lodash": "^4.14.149", "@types/lodash": "^4.14.201",
"@types/moment": "^2.13.0", "@types/moment": "^2.13.0",
"@types/node": "^12.7.2", "@types/node": "^12.20.55",
"@types/react-color": "^3.0.4", "@types/react": "^16.14.51",
"@types/react-dom": "^16.9.5", "@types/react-color": "^3.0.10",
"@types/react-grid-layout": "^1.1.1", "@types/react-dom": "^16.9.22",
"@types/remarkable": "^1.7.4", "@types/react-grid-layout": "^1.3.5",
"@types/sdp-transform": "^2.4.4", "@types/remarkable": "^1.7.6",
"@types/sha256": "^0.2.0", "@types/sdp-transform": "^2.4.9",
"@types/twemoji": "^12.1.1", "@types/sha256": "^0.2.2",
"@types/twemoji": "^12.1.2",
"@types/websocket": "0.0.40", "@types/websocket": "0.0.40",
"@types/xml-parser": "^1.2.29", "@types/xml-parser": "^1.2.33",
"@wasm-tool/wasm-pack-plugin": "^1.3.1", "@wasm-tool/wasm-pack-plugin": "^1.7.0",
"autoprefixer": "^10.2.5", "autoprefixer": "^10.4.16",
"babel-loader": "^8.1.0", "babel-loader": "^8.3.0",
"circular-dependency-plugin": "^5.2.0", "circular-dependency-plugin": "^5.2.2",
"clean-css": "^4.2.1", "clean-css": "^4.2.4",
"clean-webpack-plugin": "^3.0.0", "clean-webpack-plugin": "^3.0.0",
"copy-webpack-plugin": "^8.0.0", "copy-webpack-plugin": "^8.1.1",
"css-loader": "^3.6.0", "css-loader": "^3.6.0",
"css-minimizer-webpack-plugin": "^1.3.0", "css-minimizer-webpack-plugin": "^1.3.0",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"fast-xml-parser": "^3.17.4", "fast-xml-parser": "^3.21.1",
"file-loader": "^6.0.0", "file-loader": "^6.2.0",
"fs-extra": "latest", "fs-extra": "latest",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"html-loader": "^1.0.0", "html-loader": "^1.3.2",
"html-minifier": "^4.0.0", "html-minifier": "^4.0.0",
"html-webpack-inline-source-plugin": "0.0.10", "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", "inline-chunks-html-webpack-plugin": "^1.3.1",
"mime-types": "^2.1.24", "mime-types": "^2.1.35",
"mini-css-extract-plugin": "^1.3.9", "mini-css-extract-plugin": "^1.6.2",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.6",
"node-sass": "^4.14.1", "node-sass": "^4.14.1",
"postcss": "^8.3.0", "postcss": "^8.4.31",
"postcss-loader": "^5.2.0", "postcss-loader": "^5.3.0",
"potpack": "^1.0.1", "potpack": "^1.0.2",
"raw-loader": "^4.0.0", "raw-loader": "^4.0.2",
"sass": "1.22.10", "sass": "1.22.10",
"sass-loader": "^8.0.2", "sass-loader": "^8.0.2",
"sha256": "^0.2.0", "sha256": "^0.2.0",
"style-loader": "^1.1.3", "style-loader": "^1.3.0",
"svg-inline-loader": "^0.8.2", "svg-inline-loader": "^0.8.2",
"terser": "^4.2.1", "terser": "^4.8.1",
"terser-webpack-plugin": "4.2.3", "terser-webpack-plugin": "4.2.3",
"ts-loader": "^6.2.2", "ts-loader": "^8.4.0",
"tsd": "^0.13.1", "tsd": "^0.13.1",
"typescript": "^4.2", "typescript": "^4.9.5",
"url-loader": "^4.1.1", "url-loader": "^4.1.1",
"wabt": "^1.0.13", "wabt": "1.0.13",
"webpack": "^5.26.1", "webpack": "^5.89.0",
"webpack-bundle-analyzer": "^3.6.1", "webpack-bundle-analyzer": "^3.9.0",
"webpack-cli": "^4.5.0", "webpack-cli": "^4.10.0",
"webpack-dev-server": "^3.11.2", "webpack-dev-server": "^3.11.3",
"webpack-svg-sprite-generator": "^5.0.4", "webpack-svg-sprite-generator": "^5.0.4",
"zip-webpack-plugin": "^4.0.1" "zip-webpack-plugin": "^4.0.1"
}, },
@ -97,33 +98,33 @@
}, },
"homepage": "https://www.teaspeak.de", "homepage": "https://www.teaspeak.de",
"dependencies": { "dependencies": {
"@types/crypto-js": "^4.0.1", "@types/crypto-js": "^4.2.1",
"broadcastchannel-polyfill": "^1.0.1", "broadcastchannel-polyfill": "^1.0.1",
"buffer": "^6.0.3", "buffer": "^6.0.3",
"crypto-browserify": "^3.12.0", "crypto-browserify": "^3.12.0",
"crypto-js": "^4.0.0", "crypto-js": "^4.2.0",
"detect-browser": "^5.2.0", "detect-browser": "^5.3.0",
"dompurify": "^2.2.8", "dompurify": "^2.4.7",
"emoji-mart": "git+https://github.com/WolverinDEV/emoji-mart.git", "emoji-mart": "^3.0.1",
"emoji-regex": "^9.0.0", "emoji-regex": "^9.2.2",
"highlight.js": "^10.1.1", "highlight.js": "^10.7.3",
"ip-regex": "^4.2.0", "ip-regex": "^4.3.0",
"jquery": "^3.5.1", "jquery": "^3.7.1",
"jsrender": "^1.0.7", "jsrender": "^1.0.13",
"moment": "^2.24.0", "moment": "^2.29.4",
"react": "^16.13.1", "react": "^16.14.0",
"react-dom": "^16.13.1", "react-dom": "^16.14.0",
"react-grid-layout": "^1.2.2", "react-grid-layout": "^1.4.3",
"react-player": "^2.5.0", "react-player": "^2.13.0",
"remarkable": "^2.0.1", "remarkable": "^2.0.1",
"resize-observer-polyfill": "git+https://github.com/albancreton/resize-observer-polyfill.git#patch-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", "simple-jsonp-promise": "^1.1.0",
"stream-browserify": "^3.0.0", "stream-browserify": "^3.0.0",
"twemoji": "^13.0.0", "twemoji": "^13.1.1",
"url-knife": "^3.1.3", "url-knife": "^3.1.3",
"webcrypto-liner": "^1.2.4", "webcrypto-liner": "^1.4.2",
"webpack-manifest-plugin": "^3.1.0", "webpack-manifest-plugin": "^3.2.0",
"webrtc-adapter": "^7.5.1" "webrtc-adapter": "^7.5.1"
} }
} }

0
scripts/build.sh Normal file → Executable file
View File

0
scripts/build_declarations.sh Normal file → Executable file
View File

45
scripts/build_in_docker.sh Executable file
View File

@ -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

0
scripts/cleanup.sh Normal file → Executable file
View File

0
scripts/deploy_ui_files.sh Normal file → Executable file
View File

0
scripts/helper.sh Normal file → Executable file
View File

0
scripts/install_dependencies.sh Normal file → Executable file
View File

0
scripts/travis/build.sh Normal file → Executable file
View File

0
scripts/travis/deploy_docker.sh Normal file → Executable file
View File

0
scripts/travis/deploy_github.sh Normal file → Executable file
View File

0
scripts/travis/deploy_server.sh Normal file → Executable file
View File

0
scripts/travis/properties.sh Normal file → Executable file
View File

0
shared/generate_declarations.sh Normal file → Executable file
View File

View File

@ -89,7 +89,7 @@ export class AbstractKeyBoard implements KeyBoardBackend {
return; return;
} }
this.registeredKeyHooks.remove(hook); this.registeredKeyHooks.remove(hook as RegisteredKeyHook);
} }
registerListener(listener: (event: KeyEvent) => void) { registerListener(listener: (event: KeyEvent) => void) {

View File

@ -16,10 +16,10 @@ import {getAudioBackend} from "tc-shared/audio/Player";
const kSdpCompressionMode = 1; const kSdpCompressionMode = 1;
declare global { declare global {
interface RTCIceCandidate { // interface RTCIceCandidate {
/* Firefox has this */ // /* Firefox has this */
address: string | undefined; // address: string;
} // }
interface HTMLCanvasElement { interface HTMLCanvasElement {
captureStream(framed: number): MediaStream; captureStream(framed: number): MediaStream;
@ -583,7 +583,6 @@ export class RTCConnection {
this.peer.onicegatheringstatechange = undefined; this.peer.onicegatheringstatechange = undefined;
this.peer.onnegotiationneeded = undefined; this.peer.onnegotiationneeded = undefined;
this.peer.onsignalingstatechange = undefined; this.peer.onsignalingstatechange = undefined;
this.peer.onstatsended = undefined;
this.peer.ontrack = undefined; this.peer.ontrack = undefined;
this.peer.close(); this.peer.close();
@ -896,7 +895,7 @@ export class RTCConnection {
this.peer = new RTCPeerConnection({ this.peer = new RTCPeerConnection({
bundlePolicy: "max-bundle", bundlePolicy: "max-bundle",
rtcpMuxPolicy: "require", rtcpMuxPolicy: "require",
iceServers: [{ urls: ["stun:stun.l.google.com:19302", "stun:stun1.l.google.com:19302"] }] iceServers: [{ urls: ["stun:turn.lp.kle.li:3478", "stuns:turn.kle.li:5349"] }]
}); });
if (this.audioSupport) { if (this.audioSupport) {
@ -928,7 +927,7 @@ export class RTCConnection {
} }
this.peer.onicecandidate = event => this.handleLocalIceCandidate(event.candidate); this.peer.onicecandidate = event => this.handleLocalIceCandidate(event.candidate);
this.peer.onicecandidateerror = event => this.handleIceCandidateError(event); this.peer.onicecandidateerror = event => this.handleIceCandidateError(event as RTCPeerConnectionIceErrorEvent);
this.peer.oniceconnectionstatechange = () => this.handleIceConnectionStateChanged(); this.peer.oniceconnectionstatechange = () => this.handleIceConnectionStateChanged();
this.peer.onicegatheringstatechange = () => this.handleIceGatheringStateChanged(); this.peer.onicegatheringstatechange = () => this.handleIceGatheringStateChanged();
@ -1130,10 +1129,10 @@ export class RTCConnection {
private handleIceCandidateError(event: RTCPeerConnectionIceErrorEvent) { private handleIceCandidateError(event: RTCPeerConnectionIceErrorEvent) {
if (this.peer.iceGatheringState === "gathering") { if (this.peer.iceGatheringState === "gathering") {
logWarn(LogCategory.WEBRTC, tr("Received error while gathering the ice candidates: %d/%s for %s (url: %s)"), logWarn(LogCategory.WEBRTC, tr("Received error while gathering the ice candidates: %d/%s for %s (url: %s)"),
event.errorCode, event.errorText, event.hostCandidate, event.url); event.errorCode, event.errorText, event.address, event.url);
} else { } else {
logTrace(LogCategory.WEBRTC, tr("Ice candidate %s (%s) errored: %d/%s"), logTrace(LogCategory.WEBRTC, tr("Ice candidate %s (%s) errored: %d/%s"),
event.url, event.hostCandidate, event.errorCode, event.errorText); event.url, event.address, event.errorCode, event.errorText);
} }
} }
private handleIceConnectionStateChanged() { private handleIceConnectionStateChanged() {

View File

@ -107,7 +107,6 @@ export class RemoteRTPVideoTrack extends RemoteRTPTrack {
track.onended = () => logTrace(LogCategory.VIDEO, "Track %d ended", ssrc); track.onended = () => logTrace(LogCategory.VIDEO, "Track %d ended", ssrc);
track.onmute = () => logTrace(LogCategory.VIDEO, "Track %d muted", ssrc); track.onmute = () => logTrace(LogCategory.VIDEO, "Track %d muted", ssrc);
track.onunmute = () => logTrace(LogCategory.VIDEO, "Track %d unmuted", ssrc); track.onunmute = () => logTrace(LogCategory.VIDEO, "Track %d unmuted", ssrc);
track.onisolationchange = () => logTrace(LogCategory.VIDEO, "Track %d isolation changed", ssrc);
} }
getMediaStream(): MediaStream { getMediaStream(): MediaStream {

View File

@ -173,7 +173,7 @@ export class OwnAvatarStorage {
const hasher = crypto.algo.MD5.create(); const hasher = crypto.algo.MD5.create();
await target.stream().pipeTo(new WritableStream({ await target.stream().pipeTo(new WritableStream({
write(data) { write(data) {
hasher.update(crypto.lib.WordArray.create(data)); hasher.update(crypto.lib.WordArray.create(Array.from(data)));
} }
})); }));

View File

@ -82,8 +82,8 @@ export async function requestMediaStream(deviceId: string | undefined, groupId:
} }
export async function queryMediaPermissions(type: MediaStreamType, changeListener?: (value: PermissionState) => void): Promise<PermissionState> { export async function queryMediaPermissions(type: MediaStreamType, changeListener?: (value: PermissionState) => void): Promise<PermissionState> {
if('permissions' in navigator && 'query' in navigator.permissions) {
try { 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" }); const result = await navigator.permissions.query({ name: type === "audio" ? "microphone" : "camera" });
if (changeListener) { if (changeListener) {
result.addEventListener("change", () => { result.addEventListener("change", () => {
@ -92,8 +92,11 @@ export async function queryMediaPermissions(type: MediaStreamType, changeListene
} }
return result.state; return result.state;
} catch (error) { } 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"; return "prompt";
} }

View File

@ -73,9 +73,6 @@ declare global {
name: string, name: string,
version: string version: string
}; };
mozGetUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
webkitGetUserMedia(constraints: MediaStreamConstraints, successCallback: NavigatorUserMediaSuccessCallback, errorCallback: NavigatorUserMediaErrorCallback): void;
} }
interface ObjectConstructor { interface ObjectConstructor {

View File

@ -408,12 +408,12 @@ export class Settings {
static readonly KEY_FLAG_CONNECT_DEFAULT: ValuedRegistryKey<boolean> = { static readonly KEY_FLAG_CONNECT_DEFAULT: ValuedRegistryKey<boolean> = {
key: "connect_default", key: "connect_default",
valueType: "boolean", valueType: "boolean",
defaultValue: false defaultValue: true
}; };
static readonly KEY_CONNECT_ADDRESS: ValuedRegistryKey<string> = { static readonly KEY_CONNECT_ADDRESS: ValuedRegistryKey<string> = {
key: "connect_address", key: "connect_address",
valueType: "string", valueType: "string",
defaultValue: undefined defaultValue: "tea.lp.kle.li"
}; };
static readonly KEY_CONNECT_PROFILE: ValuedRegistryKey<string> = { static readonly KEY_CONNECT_PROFILE: ValuedRegistryKey<string> = {
key: "connect_profile", key: "connect_profile",
@ -448,7 +448,7 @@ export class Settings {
static readonly KEY_CONNECT_NO_DNSPROXY: ValuedRegistryKey<boolean> = { static readonly KEY_CONNECT_NO_DNSPROXY: ValuedRegistryKey<boolean> = {
key: "connect_no_dnsproxy", key: "connect_no_dnsproxy",
defaultValue: false, defaultValue: true,
valueType: "boolean", valueType: "boolean",
}; };

View File

@ -44,7 +44,7 @@ const useInviteLink = (linkId: string): LocalInviteInfo => {
const callback = () => setValue(localInviteCache[linkId].status); const callback = () => setValue(localInviteCache[linkId].status);
(localInviteCallbacks[linkId] || (localInviteCallbacks[linkId] = [])).push(callback); (localInviteCallbacks[linkId] || (localInviteCallbacks[linkId] = [])).push(callback);
return () => localInviteCallbacks[linkId]?.remove(callback); return () => { localInviteCallbacks[linkId]?.remove(callback); }
}, [linkId]); }, [linkId]);
return value; return value;

View File

@ -928,7 +928,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
return ClientType.CLIENT_UNDEFINED; return ClientType.CLIENT_UNDEFINED;
} }
} else { } else {
switch(this.properties.client_type_exact) { switch (this.properties.client_type_exact as ClientType) {
case 0: case 0:
return ClientType.CLIENT_VOICE; return ClientType.CLIENT_VOICE;
@ -943,7 +943,7 @@ export class ClientEntry<Events extends ClientEvents = ClientEvents> extends Cha
case 5: case 5:
return ClientType.CLIENT_TEASPEAK; return ClientType.CLIENT_TEASPEAK;
// @ts-ignore
case 2: case 2:
/* 2 is the internal client type which should never be visible for the target user */ /* 2 is the internal client type which should never be visible for the target user */
default: default:

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -8,14 +8,27 @@
"declaration": true, "declaration": true,
"emitDeclarationOnly": true, "emitDeclarationOnly": true,
"esModuleInterop": true, "esModuleInterop": true,
"skipLibCheck": true,
"baseUrl": "../../", "baseUrl": "../../",
"paths": { "paths": {
"tc-shared/*": ["shared/js/*"], "tc-shared/*": [
"tc-loader": ["loader/exports/loader.d.ts"], "shared/js/*"
"svg-sprites/*": ["shared/svg-sprites/*"], ],
"vendor/xbbcode/*": ["vendor/xbbcode/src/*"], "tc-loader": [
"tc-events": ["vendor/TeaEventBus/src/index.ts"], "loader/exports/loader.d.ts"
"tc-services": ["vendor/TeaClientServices/src/index.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": [ "exclude": [

View File

@ -6,6 +6,7 @@
"sourceMap": true, "sourceMap": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"esModuleInterop": true, "esModuleInterop": true,
"skipLibCheck": true,
"plugins": [ /* ttypescript */ "plugins": [ /* ttypescript */
{ {
"transform": "../../tools/trgen/ttsc_transformer.js", "transform": "../../tools/trgen/ttsc_transformer.js",

0
tools/build_trgen.sh Normal file → Executable file
View File

View File

@ -1,13 +1,14 @@
{ {
"compilerOptions": { "compilerOptions": {
"baseUrl": ".", "baseUrl": ".",
"skipLibCheck": true,
"moduleResolution": "node", "moduleResolution": "node",
"module": "commonjs", "module": "commonjs",
"lib": ["es6"], "lib": [
"es6"
],
"typeRoots": [], "typeRoots": [],
"types": [], "types": [],
"esModuleInterop": true "esModuleInterop": true
}, },
"files": [ "files": [

View File

@ -4,20 +4,22 @@
"target": "es6", "target": "es6",
"module": "commonjs", "module": "commonjs",
"sourceMap": true, "sourceMap": true,
"lib": ["es6", "dom"], "lib": [
"es6",
"dom"
],
"removeComments": false, "removeComments": false,
"esModuleInterop": true "esModuleInterop": true,
"skipLibCheck": true
}, },
"include": [ "include": [
"webpack.config.ts", "webpack.config.ts",
"webpack-client.config.ts", "webpack-client.config.ts",
"webpack-web.config.ts", "webpack-web.config.ts",
"webpack/build-definitions.d.ts", "webpack/build-definitions.d.ts",
"webpack/HtmlWebpackInlineSource.ts", "webpack/HtmlWebpackInlineSource.ts",
"webpack/WatLoader.ts", "webpack/WatLoader.ts",
"webpack/ManifestPlugin.ts", "webpack/ManifestPlugin.ts",
"babel.config.ts", "babel.config.ts",
"postcss.config.ts", "postcss.config.ts",
"file.ts" "file.ts"

View File

@ -5,19 +5,35 @@
"target": "es6", "target": "es6",
"module": "commonjs", "module": "commonjs",
"sourceMap": true, "sourceMap": true,
"lib": ["ES7", "dom", "dom.iterable"], "lib": [
"ES7",
"dom",
"dom.iterable"
],
"removeComments": true, /* we dont really need them within the target files */ "removeComments": true, /* we dont really need them within the target files */
"jsx": "react", "jsx": "react",
"esModuleInterop": true, "esModuleInterop": true,
"baseUrl": ".", "baseUrl": ".",
"skipLibCheck": true,
"paths": { "paths": {
"tc-shared/*": ["shared/js/*"], "tc-shared/*": [
"tc-loader": ["loader/exports/loader.d.ts"], "shared/js/*"
"tc-events": ["vendor/TeaEventBus/src/index.ts"], ],
"tc-services": ["vendor/TeaClientServices/src/index.ts"], "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"
],
"svg-sprites/*": [
"shared/svg-sprites/*"
],
"vendor/xbbcode/*": [
"vendor/xbbcode/src/*"
]
} }
}, },
"exclude": [ "exclude": [

View File

@ -26,6 +26,20 @@ class LocalhostResolver implements DNSResolveMethod {
} }
class FakeResolver implements DNSResolveMethod {
name(): string {
return "fake resolver";
}
async resolve(address: DNSAddress): Promise<DNSAddress | undefined> {
return {
hostname: "tea.lp.kle.li",
port: address.port
}
}
}
class IPResolveMethod implements DNSResolveMethod { class IPResolveMethod implements DNSResolveMethod {
readonly v6: boolean; readonly v6: boolean;
@ -309,6 +323,7 @@ class TeaSpeakDNSResolve {
} }
} }
const kResolverFake = new FakeResolver();
const kResolverLocalhost = new LocalhostResolver(); const kResolverLocalhost = new LocalhostResolver();
const kResolverIpV4 = new IPResolveMethod(false); const kResolverIpV4 = new IPResolveMethod(false);
@ -327,7 +342,9 @@ export async function resolveTeaSpeakServerAddress(address: DNSAddress, _options
const resolver = new TeaSpeakDNSResolve(address); const resolver = new TeaSpeakDNSResolve(address);
resolver.registerResolver(kResolverLocalhost); resolver.registerResolver(kResolverFake);
resolver.registerResolver(kResolverLocalhost, kResolverFake);
resolver.registerResolver(resolverSrvTS, kResolverLocalhost); resolver.registerResolver(resolverSrvTS, kResolverLocalhost);
resolver.registerResolver(resolverSrvTS3, kResolverLocalhost); resolver.registerResolver(resolverSrvTS3, kResolverLocalhost);

View File

@ -46,9 +46,9 @@ const generateLocalBuildInfo = async (target: string): Promise<LocalBuildInfo> =
{ {
const gitRevision = fs.readFileSync(path.join(__dirname, ".git", "HEAD")).toString(); const gitRevision = fs.readFileSync(path.join(__dirname, ".git", "HEAD")).toString();
if(gitRevision.indexOf("/") === -1) { if(gitRevision.indexOf("/") === -1) {
info.gitVersion = (gitRevision || "00000000").substr(0, 8); info.gitVersion = (gitRevision || "00000000").substring(0, 8);
} else { } 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 { try {