Merge pull request #167 from TeaSpeak/develop

Develop
TeaSpeak · Feb 12, 2021 · f75a6e2 · f75a6e2
2 parents 9618350 + c297c44
commit f75a6e2
Show file tree

Hide file tree

Showing 89 changed files with 2,553 additions and 1,513 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,4 +1,19 @@
 # Changelog:
+* **22.01.21**
+    - Allowing the user to easily change the channel name mode
+    - Fixed channel name mode parsing
+    - Improved the modal algorithms as preparation for easier popoutable modals
+
+* **16.01.21**
+    - Various bugfixes (Thanks to Vafin)
+
+* **15.01.21**
+    - Fixed the history toggle (Thanks to Vafin)
+
+* **12.01.21**
+    - Fixed bug where the quick video select popup did not start the video broadcasting
+    - Fixed a bug where an invalid H264 codec may caused video connection setup failure
+
 * **09.01.21**
     - The connect modal now connects when pressing `Enter` on the address line
 

diff --git a/loader/app/loader/script_loader.ts b/loader/app/loader/script_loader.ts
@@ -33,7 +33,7 @@ function load_script_url(url: string) : Promise<void> {
         const timeout_handle = setTimeout(() => {
             cleanup();
             reject("timeout");
-        }, 15 * 1000);
+        }, 120 * 1000);
         script_tag.type = "application/javascript";
         script_tag.async = true;
         script_tag.defer = true;

diff --git a/shared/js/ConnectionHandler.ts b/shared/js/ConnectionHandler.ts
@@ -41,6 +41,9 @@ import {ServerEventLog} from "tc-shared/connectionlog/ServerEventLog";
 import {PlaylistManager} from "tc-shared/music/PlaylistManager";
 import {connectionHistory} from "tc-shared/connectionlog/History";
 import {ConnectParameters} from "tc-shared/ui/modal/connect/Controller";
+import {assertMainApplication} from "tc-shared/ui/utils";
+
+assertMainApplication();
 
 export enum InputHardwareState {
     MISSING,
@@ -240,7 +243,7 @@ export class ConnectionHandler {
         this.localClient = new LocalClientEntry(this);
         this.localClient.channelTree = this.channelTree;
 
-        this.events_.register_handler(this);
+        this.events_.registerHandler(this);
         this.pluginCmdRegistry.registerHandler(new W2GPluginCmdHandler());
 
         this.events_.fire("notify_handler_initialized");
@@ -1073,7 +1076,7 @@ export class ConnectionHandler {
     }
 
     destroy() {
-        this.events_.unregister_handler(this);
+        this.events_.unregisterHandler(this);
         this.cancelAutoReconnect(true);
 
         this.pluginCmdRegistry?.destroy();

diff --git a/shared/js/ConnectionManager.ts b/shared/js/ConnectionManager.ts
@@ -2,6 +2,9 @@ import {ConnectionHandler, DisconnectReason} from "./ConnectionHandler";
 import {Registry} from "./events";
 import {Stage} from "tc-loader";
 import * as loader from "tc-loader";
+import {assertMainApplication} from "tc-shared/ui/utils";
+
+assertMainApplication();
 
 export interface ConnectionManagerEvents {
     notify_handler_created: {

diff --git a/shared/js/clientservice/index.ts b/shared/js/clientservice/index.ts
@@ -74,6 +74,7 @@ class ClientServiceConnection {
         let address;
         address = "client-services.teaspeak.de:27791";
         //address = "localhost:1244";
+        //address = "192.168.40.135:1244";
 
         this.connection = new WebSocket(`wss://${address}/ws-api/v${kApiVersion}`);
         this.connection.onclose = event => {
@@ -375,7 +376,7 @@ export class ClientServices {
         } else {
             const os = window.detectedBrowser.os;
             const osParts = os.split(" ");
-            if(osParts.last().match(/^[0-9]+$/)) {
+            if(osParts.last().match(/^[0-9\.]+$/)) {
                 payload.platform_version = osParts.last();
                 osParts.splice(osParts.length - 1, 1);
             }

diff --git a/shared/js/connection/ServerFeatures.ts b/shared/js/connection/ServerFeatures.ts
@@ -29,7 +29,7 @@ export class ServerFeatures {
     readonly events: Registry<ServerFeatureEvents>;
     private readonly connection: ConnectionHandler;
     private readonly explicitCommandHandler: ExplicitCommandHandler;
-    private readonly stateChangeListener: (event: ConnectionEvents["notify_connection_state_changed"]) => void;
+    private readonly stateChangeListener: () => void;
 
     private featureAwait: Promise<boolean>;
     private featureAwaitCallback: (success: boolean) => void;
@@ -68,7 +68,7 @@ export class ServerFeatures {
             }
         });
 
-        this.connection.events().on("notify_connection_state_changed", this.stateChangeListener = event => {
+        this.stateChangeListener = this.connection.events().on("notify_connection_state_changed", event => {
             if(event.newState === ConnectionState.CONNECTED) {
                 this.connection.getServerConnection().send_command("listfeaturesupport").catch(error => {
                     this.disableAllFeatures();
@@ -95,7 +95,7 @@ export class ServerFeatures {
     }
 
     destroy() {
-        this.connection.events().off(this.stateChangeListener);
+        this.stateChangeListener();
         this.connection.getServerConnection()?.command_handler_boss()?.unregister_explicit_handler("notifyfeaturesupport", this.explicitCommandHandler);
 
         if(this.featureAwaitCallback) {

diff --git a/shared/js/connection/rtc/Connection.ts b/shared/js/connection/rtc/Connection.ts
@@ -63,7 +63,6 @@ class RetryTimeCalculator {
     }
 
     calculateRetryTime() {
-        return 0;
         if(this.retryCount >= 5) {
             /* no more retries */
             return 0;
@@ -542,6 +541,8 @@ export class RTCConnection {
         this.reset(true);
 
         this.connection.events.on("notify_connection_state_changed", event => this.handleConnectionStateChanged(event));
+
+        (window as any).rtp = this;
     }
 
     destroy() {

diff --git a/shared/js/connection/rtc/SdpUtils.ts b/shared/js/connection/rtc/SdpUtils.ts
@@ -48,7 +48,7 @@ export class SdpProcessor {
             rate: 90000,
             rtcpFb: [ "nack", "nack pli", "ccm fir", "transport-cc" ],
         },
-        {
+        window.detectedBrowser.name.indexOf("ios") === -1 && window.detectedBrowser.name !== "safari" ? {
             payload: H264_PAYLOAD_TYPE,
             codec: "H264",
             rate: 90000,
@@ -57,10 +57,10 @@ export class SdpProcessor {
             fmtp: {
                 "level-asymmetry-allowed": 1,
                 "packetization-mode": 1,
-                "profile-level-id": "4d0028",
+                "profile-level-id": "42001f",
                 "max-fr": 30,
             }
-        },
+        } : undefined,
     ];
 
     private rtpRemoteChannelMapping: {[key: string]: number};
@@ -150,7 +150,11 @@ export class SdpProcessor {
             media.rtcpFb = [];
             media.rtcpFbTrrInt = [];
 
-            for(let codec of (media.type === "audio" ? this.kAudioCodecs : this.kVideoCodecs)) {
+            for(const codec of (media.type === "audio" ? this.kAudioCodecs : this.kVideoCodecs)) {
+                if(!codec) {
+                    continue;
+                }
+
                 media.rtp.push({
                     payload: codec.payload,
                     codec: codec.codec,