Merge branch 'master' of https://git.did.science/WolverinDEV/TeaSpeak-Client

github

@@ -1 +1 @@
-Subproject commit 2dd1f60e8d034a68bbca9afe294070c8a83caa9e
+Subproject commit 06391c6cdd772c2f83c1387960f7224f7cd9f514

main.ts

@@ -14,7 +14,8 @@ if(process_arguments.length > 0 && process_arguments[0] === "crash-handler") {
     /* crash handler callback */
     crash_handler.handle_crash_callback(process_arguments.slice(1));
 } else {
-    crash_handler.initialize_handler("main", is_electron_run);
+    if(process_arguments.length > 0 && process_arguments[0] == "--main-crash-handler")
+        crash_handler.initialize_handler("main", is_electron_run);
     /* app execute */
     {
         const versions = process.versions;

modules/core/ui-loader/loader.ts

@@ -432,8 +432,9 @@ export async function load_files(channel: string, static_cb: (message: string, i
         console.log("Loading UI from data: %o. Target path: %s", ui_info, ui_file_path(ui_info));
         if(ui_info.required_client && !process_args.has_flag(Arguments.DEBUG)) {
             const ui_vers = parse_version(ui_info.required_client);
-            console.log("Checking required client version (Required: %s, Version: %s)", ui_vers.toString(true), (await current_version()).toString(true));
-            if(ui_vers.newer_than(await current_version())) {
+            const current_vers = await current_version();
+            console.log("Checking required client version (Required: %s, Version: %s)", ui_vers.toString(true), current_vers.toString(true));
+            if(ui_vers.newer_than(current_vers) && !current_vers.in_dev()) {
                 const local_available = cache && cache.local_index ? ui_pack_exists(cache.local_index) : undefined;
 
                 const result = await electron.dialog.showMessageBox({

modules/renderer/audio/AudioRecorder.ts

@@ -1,7 +1,8 @@
 window["require_setup"](module);
 
 import {audio as naudio} from "teaclient_connection";
-import {audio, tr} from "../imports/imports_shared";
+//import {audio, tr} from "../imports/imports_shared";
+/// <reference types="./imports/import_shared.d.ts" />
 
 export namespace _audio.recorder {
     import InputDevice = audio.recorder.InputDevice;
@@ -431,7 +432,7 @@ export namespace _audio.recorder {
         return meter;
     }
 
-    class NativeLevelmenter implements audio.recorder.LevelMenter {
+    class NativeLevelmenter implements audio.recorder.LevelMeter {
         readonly _device: NativeDevice;
 
         private _callback: (num: number) => any;

modules/renderer/imports/.gitignore

@@ -1 +1,2 @@
 imports_shared.d.ts
+imports_shared_loader.d.ts

modules/renderer/menu.ts

@@ -3,7 +3,10 @@ import {class_to_image} from "./icon-helper";
 window["require_setup"](module);
 
 import * as electron from "electron";
-import {top_menu as dtop_menu, Icon} from "./imports/imports_shared";
+//import {top_menu as dtop_menu, Icon} from "./imports/imports_shared";
+
+/// <reference types="./imports/import_shared.d.ts" />
+import dtop_menu = top_menu;
 
 namespace _top_menu {
     import ipcRenderer = electron.ipcRenderer;

modules/shared/version/index.ts

@@ -53,6 +53,10 @@ export class Version {
 
         return false;
     }
+
+    in_dev() : boolean {
+        return this.build == 0 && this.major == 0 && this.minor == 0 && this.patch == 0 && this.timestamp == 0;
+    }
 }
 
 //1.0.0-2 [1000]

native/CMakeLists.txt

@@ -23,6 +23,7 @@ function(setup_nodejs)
 	set(NodeJS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 	set(NODEJS_URL "https://atom.io/download/atom-shell")
 	set(NODEJS_VERSION "v6.0.7")
+	#set(NODEJS_VERSION "v8.0.0")
 
 	#set(NODEJS_URL "https://nodejs.org/download/release/")
 	#set(NODEJS_VERSION "v12.7.0")

package.json

@@ -1,13 +1,13 @@
 {
   "name": "TeaClient",
-  "version": "1.3.6-2",
+  "version": "1.4.0",
   "description": "",
   "main": "main.js",
   "scripts": {
     "crash_handler": "electron . crash-handler",
     "test": "echo \"Error: no test specified\" && exit 1",
     "start": "electron --js-flags='--expose-gc' --debug --dev-tools --disable-hardware-acceleration .",
-    "start-d": "electron . --disable-hardware-acceleration --debug -t -su http://dev.clientapi.teaspeak.de/",
+    "start-d": "electron . --disable-hardware-acceleration --debug -t -u http://clientapi.teaspeak.dev/",
     "start-wd": "electron . --disable-hardware-acceleration --debug -t -su http://localhost/TeaWeb/client-api/environment/",
     "start-d1": "electron . --disable-hardware-acceleration --debug -t --gdb -su http://clientapi.teaspeak.de/  --updater-ui-loader_type=0",
     "start-n": "electron . -t --disable-hardware-acceleration --no-single-instance -u=https://clientapi.teaspeak.de/ -d --updater-ui-loader_type=0",
@@ -32,16 +32,16 @@
     "@types/tar-stream": "^1.6.1",
     "asar": "^2.0.1",
     "cmake-js": "^4.0.1",
-    "ejs": "^2.6.2",
+    "ejs": "^2.7.1",
     "electron-packager": "8.7.2",
-    "nodemon": "^1.19.1",
+    "nodemon": "^1.19.2",
     "platform-dependent-modules": "0.0.14",
     "sass": "^1.22.10",
     "typescript": "^3.6.2"
   },
   "dependencies": {
     "@types/minimist": "^1.2.0",
-    "@types/ssh2": "^0.5.38",
+    "@types/ssh2": "^0.5.39",
     "argparse": "^1.0.10",
     "asn1": "^0.2.4",
     "assert-plus": "^1.0.0",
@@ -64,7 +64,7 @@
     "nan": "^2.14.0",
     "node-ssh": "^6.0.0",
     "only": "0.0.2",
-    "psl": "^1.3.0",
+    "psl": "^1.3.1",
     "pure-uuid": "^1.5.7",
     "rc": "^1.2.8",
     "rcedit": "^1.1.2",