" + path + "" : path;
+ else
+ return html ? "" + path.url + "" : path.url;
+}
+
+class SyntaxError {
+ source: any;
+
+ constructor(source: any) {
+ this.source = source;
+ }
+}
+
+let _script_promises: {[key: string]: Promise" + "View the browser console for more information!"); + throw "failed to load script " + script_name(errors[0].script, false); + } +} + +export async function load_style(path: SourcePath) : Promise
" + "View the browser console for more information!"); + throw "failed to load style sheet " + script_name(errors[0].sheet, false); + } +} + +export async function load_template(path: SourcePath) : Promise
" + "View the browser console for more information!"); + throw "failed to load template " + script_name(errors[0].template, false); + } +} + +let version_: AppVersion; +export function version() : AppVersion { return version_; } +export function set_version(version: AppVersion) { version_ = version; } + +export type ErrorHandler = (message: string, detail: string) => void; + +let _callback_critical_error: ErrorHandler; +let _callback_critical_called: boolean = false; + +export function critical_error(message: string, detail?: string) { + if(_callback_critical_called) { + console.warn("[CRITICAL] %s", message); + if(typeof(detail) === "string") + console.warn("[CRITICAL] %s", detail); + return; + } + + _callback_critical_called = true; + if(_callback_critical_error) { + _callback_critical_error(message, detail); + return; + } + + /* default handling */ + let tag = document.getElementById("critical-load"); + + { + const error_tags = tag.getElementsByClassName("error"); + error_tags[0].innerHTML = message; + } + + if(typeof(detail) === "string") { + let node_detail = tag.getElementsByClassName("detail")[0]; + node_detail.innerHTML = detail; + } + + tag.classList.add("shown"); +} + +export function critical_error_handler(handler?: ErrorHandler, override?: boolean) : ErrorHandler { + if((typeof(handler) === "object" && handler !== _callback_critical_error) || override) + _callback_critical_error = handler; + return _callback_critical_error; +} + +let _fadeout_warned; +export function hide_overlay() { + if(typeof($) === "undefined") { + if(!_fadeout_warned) + console.warn("Could not fadeout loader screen. Missing jquery functions."); + _fadeout_warned = true; + return; + } + const animation_duration = 750; + + $(".loader .bookshelf_wrapper").animate({top: 0, opacity: 0}, animation_duration); + $(".loader .half").animate({width: 0}, animation_duration, () => { + $(".loader").detach(); + }); +} + +{ + + const hello_world = () => { + const clog = console.log; + const print_security = () => { + { + const css = [ + "display: block", + "text-align: center", + "font-size: 42px", + "font-weight: bold", + "-webkit-text-stroke: 2px black", + "color: red" + ].join(";"); + clog("%c ", "font-size: 100px;"); + clog("%cSecurity warning:", css); + } + { + const css = [ + "display: block", + "text-align: center", + "font-size: 18px", + "font-weight: bold" + ].join(";"); + + clog("%cPasting anything in here could give attackers access to your data.", css); + clog("%cUnless you understand exactly what you are doing, close this window and stay safe.", css); + clog("%c ", "font-size: 100px;"); + } + }; + + /* print the hello world */ + { + const css = [ + "display: block", + "text-align: center", + "font-size: 72px", + "font-weight: bold", + "-webkit-text-stroke: 2px black", + "color: #18BC9C" + ].join(";"); + clog("%cHey, hold on!", css); + } + { + const css = [ + "display: block", + "text-align: center", + "font-size: 26px", + "font-weight: bold" + ].join(";"); + + const css_2 = [ + "display: block", + "text-align: center", + "font-size: 26px", + "font-weight: bold", + "color: blue" + ].join(";"); + + const display_detect = /./; + 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); + clog("%cyou'll be may interested to share them here: %chttps://github.com/TeaSpeak/TeaWeb", css, css_2); + clog("%c ", display_detect); + } + }; + + try { /* lets try to print it as VM code :)*/ + let hello_world_code = hello_world.toString(); + hello_world_code = hello_world_code.substr(hello_world_code.indexOf('() => {') + 8); + hello_world_code = hello_world_code.substring(0, hello_world_code.lastIndexOf("}")); + + //Look aheads are not possible with firefox + //hello_world_code = hello_world_code.replace(/(? Promise
+
+
diff --git a/shared/html/templates.html b/shared/html/templates.html
index 017e1d11..b19bb293 100644
--- a/shared/html/templates.html
+++ b/shared/html/templates.html
@@ -2736,13 +2736,13 @@
{{else type == "default" }}
-
+
{{else}}
{{tr "English (Default / Fallback)" /}}
+ title="{{>country_name}}">
{{> name}}
diff --git a/shared/js/BrowserIPC.ts b/shared/js/BrowserIPC.ts
index b7271f6e..45daa140 100644
--- a/shared/js/BrowserIPC.ts
+++ b/shared/js/BrowserIPC.ts
@@ -1,727 +1,724 @@
-interface Window {
- BroadcastChannel: BroadcastChannel;
+import * as log from "tc-shared/log";
+import {LogCategory} from "tc-shared/log";
+
+export interface BroadcastMessage {
+ timestamp: number;
+ receiver: string;
+ sender: string;
+
+ type: string;
+ data: any;
}
-namespace bipc {
- export interface BroadcastMessage {
- timestamp: number;
- receiver: string;
- sender: string;
+function uuidv4() {
+ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+ const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+ return v.toString(16);
+ });
+}
- type: string;
- data: any;
+interface ProcessQuery {
+ timestamp: number
+ query_id: string;
+}
+
+export interface ChannelMessage {
+ channel_id: string;
+ type: string;
+ data: any;
+}
+
+export interface ProcessQueryResponse {
+ request_timestamp: number
+ request_query_id: string;
+
+ device_id: string;
+ protocol: number;
+}
+
+export interface CertificateAcceptCallback {
+ request_id: string;
+}
+export interface CertificateAcceptSucceeded { }
+
+export abstract class BasicIPCHandler {
+ protected static readonly BROADCAST_UNIQUE_ID = "00000000-0000-4000-0000-000000000000";
+ protected static readonly PROTOCOL_VERSION = 1;
+
+ protected _channels: Channel[] = [];
+ protected unique_id;
+
+ protected constructor() { }
+
+ setup() {
+ this.unique_id = uuidv4(); /* lets get an unique identifier */
}
- function uuidv4() {
- return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
- const r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
- return v.toString(16);
- });
+ get_local_address() { return this.unique_id; }
+
+ abstract send_message(type: string, data: any, target?: string);
+
+ protected handle_message(message: BroadcastMessage) {
+ //log.trace(LogCategory.IPC, tr("Received message %o"), message);
+
+ if(message.receiver === BasicIPCHandler.BROADCAST_UNIQUE_ID) {
+ if(message.type == "process-query") {
+ log.debug(LogCategory.IPC, tr("Received a device query from %s."), message.sender);
+ this.send_message("process-query-response", {
+ request_query_id: (message.data).query_id,
+ request_timestamp: (message.data).timestamp,
+
+ device_id: this.unique_id,
+ protocol: BasicIPCHandler.PROTOCOL_VERSION
+ } as ProcessQueryResponse, message.sender);
+ return;
+ }
+ } else if(message.receiver === this.unique_id) {
+ if(message.type == "process-query-response") {
+ const response: ProcessQueryResponse = message.data;
+ if(this._query_results[response.request_query_id])
+ this._query_results[response.request_query_id].push(response);
+ else {
+ log.warn(LogCategory.IPC, tr("Received a query response for an unknown request."));
+ }
+ return;
+ }
+ else if(message.type == "certificate-accept-callback") {
+ const data: CertificateAcceptCallback = message.data;
+ if(!this._cert_accept_callbacks[data.request_id]) {
+ log.warn(LogCategory.IPC, tr("Received certificate accept callback for an unknown request ID."));
+ return;
+ }
+ this._cert_accept_callbacks[data.request_id]();
+ delete this._cert_accept_callbacks[data.request_id];
+
+ this.send_message("certificate-accept-succeeded", {
+
+ } as CertificateAcceptSucceeded, message.sender);
+ return;
+ }
+ else if(message.type == "certificate-accept-succeeded") {
+ if(!this._cert_accept_succeeded[message.sender]) {
+ log.warn(LogCategory.IPC, tr("Received certificate accept succeeded, but haven't a callback."));
+ return;
+ }
+ this._cert_accept_succeeded[message.sender]();
+ return;
+ }
+ }
+ if(message.type === "channel") {
+ const data: ChannelMessage = message.data;
+
+ let channel_invoked = false;
+ for(const channel of this._channels)
+ if(channel.channel_id === data.channel_id && (typeof(channel.target_id) === "undefined" || channel.target_id === message.sender)) {
+ if(channel.message_handler)
+ channel.message_handler(message.sender, message.receiver === BasicIPCHandler.BROADCAST_UNIQUE_ID, data);
+ channel_invoked = true;
+ }
+ if(!channel_invoked) {
+ console.warn(tr("Received channel message for unknown channel (%s)"), data.channel_id);
+ }
+ }
}
- interface ProcessQuery {
- timestamp: number
- query_id: string;
+ create_channel(target_id?: string, channel_id?: string) {
+ let channel: Channel = {
+ target_id: target_id,
+ channel_id: channel_id || uuidv4(),
+ message_handler: undefined,
+ send_message: (type: string, data: any, target?: string) => {
+ if(typeof target !== "undefined") {
+ if(typeof channel.target_id === "string" && target != channel.target_id)
+ throw "target id does not match channel target";
+ }
+
+ this.send_message("channel", {
+ type: type,
+ data: data,
+ channel_id: channel.channel_id
+ } as ChannelMessage, target || channel.target_id || BasicIPCHandler.BROADCAST_UNIQUE_ID);
+ }
+ };
+
+ this._channels.push(channel);
+ return channel;
}
- export interface ChannelMessage {
- channel_id: string;
- type: string;
- data: any;
+ channels() : Channel[] { return this._channels; }
+
+ delete_channel(channel: Channel) {
+ this._channels = this._channels.filter(e => e !== channel);
}
- export interface ProcessQueryResponse {
- request_timestamp: number
- request_query_id: string;
+ private _query_results: {[key: string]:ProcessQueryResponse[]} = {};
+ async query_processes(timeout?: number) : Promise {
+ const query_id = uuidv4();
+ this._query_results[query_id] = [];
- device_id: string;
- protocol: number;
+ this.send_message("process-query", {
+ query_id: query_id,
+ timestamp: Date.now()
+ } as ProcessQuery);
+
+ await new Promise(resolve => setTimeout(resolve, timeout || 250));
+ const result = this._query_results[query_id];
+ delete this._query_results[query_id];
+ return result;
}
- export interface CertificateAcceptCallback {
+ private _cert_accept_callbacks: {[key: string]:(() => any)} = {};
+ register_certificate_accept_callback(callback: () => any) : string {
+ const id = uuidv4();
+ this._cert_accept_callbacks[id] = callback;
+ return this.unique_id + ":" + id;
+ }
+
+ private _cert_accept_succeeded: {[sender: string]:(() => any)} = {};
+ post_certificate_accpected(id: string, timeout?: number) : Promise {
+ return new Promise((resolve, reject) => {
+ const data = id.split(":");
+ const timeout_id = setTimeout(() => {
+ delete this._cert_accept_succeeded[data[0]];
+ clearTimeout(timeout_id);
+ reject("timeout");
+ }, timeout || 250);
+ this._cert_accept_succeeded[data[0]] = () => {
+ delete this._cert_accept_succeeded[data[0]];
+ clearTimeout(timeout_id);
+ resolve();
+ };
+ this.send_message("certificate-accept-callback", {
+ request_id: data[1]
+ } as CertificateAcceptCallback, data[0]);
+ })
+ }
+}
+
+export interface Channel {
+ readonly channel_id: string;
+ target_id?: string;
+
+ message_handler: (remote_id: string, broadcast: boolean, message: ChannelMessage) => any;
+ send_message(type: string, message: any, target?: string);
+}
+
+class BroadcastChannelIPC extends BasicIPCHandler {
+ private static readonly CHANNEL_NAME = "TeaSpeak-Web";
+
+ private channel: BroadcastChannel;
+
+ constructor() {
+ super();
+ }
+
+ setup() {
+ super.setup();
+
+ this.channel = new BroadcastChannel(BroadcastChannelIPC.CHANNEL_NAME);
+ this.channel.onmessage = this.on_message.bind(this);
+ this.channel.onmessageerror = this.on_error.bind(this);
+ }
+
+ private on_message(event: MessageEvent) {
+ if(typeof(event.data) !== "string") {
+ log.warn(LogCategory.IPC, tr("Received message with an invalid type (%s): %o"), typeof(event.data), event.data);
+ return;
+ }
+
+ let message: BroadcastMessage;
+ try {
+ message = JSON.parse(event.data);
+ } catch(error) {
+ log.error(LogCategory.IPC, tr("Received an invalid encoded message: %o"), event.data);
+ return;
+ }
+ super.handle_message(message);
+ }
+
+ private on_error(event: MessageEvent) {
+ log.warn(LogCategory.IPC, tr("Received error: %o"), event);
+ }
+
+ send_message(type: string, data: any, target?: string) {
+ const message: BroadcastMessage = {} as any;
+
+ message.sender = this.unique_id;
+ message.receiver = target ? target : BasicIPCHandler.BROADCAST_UNIQUE_ID;
+ message.timestamp = Date.now();
+ message.type = type;
+ message.data = data;
+
+ this.channel.postMessage(JSON.stringify(message));
+ }
+}
+
+export namespace connect {
+ export type ConnectRequestData = {
+ address: string;
+
+ profile?: string;
+ username?: string;
+ password?: {
+ value: string;
+ hashed: boolean;
+ };
+ }
+
+ export interface ConnectOffer {
+ request_id: string;
+ data: ConnectRequestData;
+ }
+
+ export interface ConnectOfferAnswer {
+ request_id: string;
+ accepted: boolean;
+ }
+
+ export interface ConnectExecute {
request_id: string;
}
- export interface CertificateAcceptSucceeded { }
- export abstract class BasicIPCHandler {
- protected static readonly BROADCAST_UNIQUE_ID = "00000000-0000-4000-0000-000000000000";
- protected static readonly PROTOCOL_VERSION = 1;
+ export interface ConnectExecuted {
+ request_id: string;
+ succeeded: boolean;
+ message?: string;
+ }
- protected _channels: Channel[] = [];
- protected unique_id;
+ /* The connect process:
+ * 1. Broadcast an offer
+ * 2. Wait 50ms for all offer responses or until the first one respond with "ok"
+ * 3. Select (if possible) on accepted offer and execute the connect
+ */
+ export class ConnectHandler {
+ private static readonly CHANNEL_NAME = "connect";
- protected constructor() { }
+ readonly ipc_handler: BasicIPCHandler;
+ private ipc_channel: Channel;
- setup() {
- this.unique_id = uuidv4(); /* lets get an unique identifier */
+ public callback_available: (data: ConnectRequestData) => boolean = () => false;
+ public callback_execute: (data: ConnectRequestData) => boolean | string = () => false;
+
+
+ private _pending_connect_offers: {
+ id: string;
+ data: ConnectRequestData;
+ timeout: number;
+
+ remote_handler: string;
+ }[] = [];
+
+ private _pending_connects_requests: {
+ id: string;
+
+ data: ConnectRequestData;
+ timeout: number;
+
+ callback_success: () => any;
+ callback_failed: (message: string) => any;
+ callback_avail: () => Promise;
+
+ remote_handler?: string;
+ }[] = [];
+
+ constructor(ipc_handler: BasicIPCHandler) {
+ this.ipc_handler = ipc_handler;
}
- get_local_address() { return this.unique_id; }
+ public setup() {
+ this.ipc_channel = this.ipc_handler.create_channel(undefined, ConnectHandler.CHANNEL_NAME);
+ this.ipc_channel.message_handler = this.on_message.bind(this);
+ }
- abstract send_message(type: string, data: any, target?: string);
+ private on_message(sender: string, broadcast: boolean, message: ChannelMessage) {
+ if(broadcast) {
+ if(message.type == "offer") {
+ const data = message.data as ConnectOffer;
- protected handle_message(message: BroadcastMessage) {
- //log.trace(LogCategory.IPC, tr("Received message %o"), message);
+ const response = {
+ accepted: this.callback_available(data.data),
+ request_id: data.request_id
+ } as ConnectOfferAnswer;
- if(message.receiver === BasicIPCHandler.BROADCAST_UNIQUE_ID) {
- if(message.type == "process-query") {
- log.debug(LogCategory.IPC, tr("Received a device query from %s."), message.sender);
- this.send_message("process-query-response", {
- request_query_id: (message.data).query_id,
- request_timestamp: (message.data).timestamp,
+ if(response.accepted) {
+ log.debug(LogCategory.IPC, tr("Received new connect offer from %s: %s"), sender, data.request_id);
- device_id: this.unique_id,
- protocol: BasicIPCHandler.PROTOCOL_VERSION
- } as ProcessQueryResponse, message.sender);
- return;
- }
- } else if(message.receiver === this.unique_id) {
- if(message.type == "process-query-response") {
- const response: ProcessQueryResponse = message.data;
- if(this._query_results[response.request_query_id])
- this._query_results[response.request_query_id].push(response);
- else {
- log.warn(LogCategory.IPC, tr("Received a query response for an unknown request."));
+ const ld = {
+ remote_handler: sender,
+ data: data.data,
+ id: data.request_id,
+ timeout: 0
+ };
+ this._pending_connect_offers.push(ld);
+ ld.timeout = setTimeout(() => {
+ log.debug(LogCategory.IPC, tr("Dropping connect request %s, because we never received an execute."), ld.id);
+ this._pending_connect_offers.remove(ld);
+ }, 120 * 1000) as any;
}
- return;
+ this.ipc_channel.send_message("offer-answer", response, sender);
}
- else if(message.type == "certificate-accept-callback") {
- const data: CertificateAcceptCallback = message.data;
- if(!this._cert_accept_callbacks[data.request_id]) {
- log.warn(LogCategory.IPC, tr("Received certificate accept callback for an unknown request ID."));
+ } else {
+ if(message.type == "offer-answer") {
+ const data = message.data as ConnectOfferAnswer;
+ const request = this._pending_connects_requests.find(e => e.id === data.request_id);
+ if(!request) {
+ log.warn(LogCategory.IPC, tr("Received connect offer answer with unknown request id (%s)."), data.request_id);
return;
}
- this._cert_accept_callbacks[data.request_id]();
- delete this._cert_accept_callbacks[data.request_id];
-
- this.send_message("certificate-accept-succeeded", {
-
- } as CertificateAcceptSucceeded, message.sender);
- return;
- }
- else if(message.type == "certificate-accept-succeeded") {
- if(!this._cert_accept_succeeded[message.sender]) {
- log.warn(LogCategory.IPC, tr("Received certificate accept succeeded, but haven't a callback."));
+ if(!data.accepted) {
+ log.debug(LogCategory.IPC, tr("Client %s rejected the connect offer (%s)."), sender, request.id);
return;
}
- this._cert_accept_succeeded[message.sender]();
- return;
- }
- }
- if(message.type === "channel") {
- const data: ChannelMessage = message.data;
-
- let channel_invoked = false;
- for(const channel of this._channels)
- if(channel.channel_id === data.channel_id && (typeof(channel.target_id) === "undefined" || channel.target_id === message.sender)) {
- if(channel.message_handler)
- channel.message_handler(message.sender, message.receiver === BasicIPCHandler.BROADCAST_UNIQUE_ID, data);
- channel_invoked = true;
+ if(request.remote_handler) {
+ log.debug(LogCategory.IPC, tr("Client %s accepted the connect offer (%s), but offer has already been accepted."), sender, request.id);
+ return;
}
- if(!channel_invoked) {
- console.warn(tr("Received channel message for unknown channel (%s)"), data.channel_id);
+
+ log.debug(LogCategory.IPC, tr("Client %s accepted the connect offer (%s). Request local acceptance."), sender, request.id);
+ request.remote_handler = sender;
+ clearTimeout(request.timeout);
+
+ request.callback_avail().then(flag => {
+ if(!flag) {
+ request.callback_failed("local avail rejected");
+ return;
+ }
+
+ log.debug(LogCategory.IPC, tr("Executing connect with client %s"), request.remote_handler);
+ this.ipc_channel.send_message("execute", {
+ request_id: request.id
+ } as ConnectExecute, request.remote_handler);
+ request.timeout = setTimeout(() => {
+ request.callback_failed("connect execute timeout");
+ }, 1000) as any;
+ }).catch(error => {
+ log.error(LogCategory.IPC, tr("Local avail callback caused an error: %o"), error);
+ request.callback_failed(tr("local avail callback caused an error"));
+ });
+
+ }
+ else if(message.type == "executed") {
+ const data = message.data as ConnectExecuted;
+ const request = this._pending_connects_requests.find(e => e.id === data.request_id);
+ if(!request) {
+ log.warn(LogCategory.IPC, tr("Received connect executed with unknown request id (%s)."), data.request_id);
+ return;
+ }
+
+ if(request.remote_handler != sender) {
+ log.warn(LogCategory.IPC, tr("Received connect executed for request %s, but from wrong client: %s (expected %s)"), data.request_id, sender, request.remote_handler);
+ return;
+ }
+
+ log.debug(LogCategory.IPC, tr("Received connect executed response from client %s for request %s. Succeeded: %o (%s)"), sender, data.request_id, data.succeeded, data.message);
+ clearTimeout(request.timeout);
+ if(data.succeeded)
+ request.callback_success();
+ else
+ request.callback_failed(data.message);
+ }
+ else if(message.type == "execute") {
+ const data = message.data as ConnectExecute;
+ const request = this._pending_connect_offers.find(e => e.id === data.request_id);
+ if(!request) {
+ log.warn(LogCategory.IPC, tr("Received connect execute with unknown request id (%s)."), data.request_id);
+ return;
+ }
+
+ if(request.remote_handler != sender) {
+ log.warn(LogCategory.IPC, tr("Received connect execute for request %s, but from wrong client: %s (expected %s)"), data.request_id, sender, request.remote_handler);
+ return;
+ }
+ clearTimeout(request.timeout);
+ this._pending_connect_offers.remove(request);
+
+ log.debug(LogCategory.IPC, tr("Executing connect for %s"), data.request_id);
+ const cr = this.callback_execute(request.data);
+
+ const response = {
+ request_id: data.request_id,
+
+ succeeded: typeof(cr) !== "string" && cr,
+ message: typeof(cr) === "string" ? cr : "",
+ } as ConnectExecuted;
+ this.ipc_channel.send_message("executed", response, request.remote_handler);
}
}
}
- create_channel(target_id?: string, channel_id?: string) {
- let channel: Channel = {
- target_id: target_id,
- channel_id: channel_id || uuidv4(),
- message_handler: undefined,
- send_message: (type: string, data: any, target?: string) => {
- if(typeof target !== "undefined") {
- if(typeof channel.target_id === "string" && target != channel.target_id)
- throw "target id does not match channel target";
- }
+ post_connect_request(data: ConnectRequestData, callback_avail: () => Promise) : Promise {
+ return new Promise((resolve, reject) => {
+ const pd = {
+ data: data,
+ id: uuidv4(),
+ timeout: 0,
- this.send_message("channel", {
- type: type,
- data: data,
- channel_id: channel.channel_id
- } as ChannelMessage, target || channel.target_id || BasicIPCHandler.BROADCAST_UNIQUE_ID);
- }
- };
+ callback_success: () => {
+ this._pending_connects_requests.remove(pd);
+ clearTimeout(pd.timeout);
+ resolve();
+ },
- this._channels.push(channel);
- return channel;
- }
+ callback_failed: error => {
+ this._pending_connects_requests.remove(pd);
+ clearTimeout(pd.timeout);
+ reject(error);
+ },
- channels() : Channel[] { return this._channels; }
-
- delete_channel(channel: Channel) {
- this._channels = this._channels.filter(e => e !== channel);
- }
-
- private _query_results: {[key: string]:ProcessQueryResponse[]} = {};
- async query_processes(timeout?: number) : Promise {
- const query_id = uuidv4();
- this._query_results[query_id] = [];
-
- this.send_message("process-query", {
- query_id: query_id,
- timestamp: Date.now()
- } as ProcessQuery);
-
- await new Promise(resolve => setTimeout(resolve, timeout || 250));
- const result = this._query_results[query_id];
- delete this._query_results[query_id];
- return result;
- }
-
- private _cert_accept_callbacks: {[key: string]:(() => any)} = {};
- register_certificate_accept_callback(callback: () => any) : string {
- const id = uuidv4();
- this._cert_accept_callbacks[id] = callback;
- return this.unique_id + ":" + id;
- }
-
- private _cert_accept_succeeded: {[sender: string]:(() => any)} = {};
- post_certificate_accpected(id: string, timeout?: number) : Promise {
- return new Promise((resolve, reject) => {
- const data = id.split(":");
- const timeout_id = setTimeout(() => {
- delete this._cert_accept_succeeded[data[0]];
- clearTimeout(timeout_id);
- reject("timeout");
- }, timeout || 250);
- this._cert_accept_succeeded[data[0]] = () => {
- delete this._cert_accept_succeeded[data[0]];
- clearTimeout(timeout_id);
- resolve();
+ callback_avail: callback_avail,
};
- this.send_message("certificate-accept-callback", {
- request_id: data[1]
- } as CertificateAcceptCallback, data[0]);
+ this._pending_connects_requests.push(pd);
+
+ this.ipc_channel.send_message("offer", {
+ request_id: pd.id,
+ data: pd.data
+ } as ConnectOffer);
+ pd.timeout = setTimeout(() => {
+ pd.callback_failed("received no response to offer");
+ }, 50) as any;
})
}
}
+}
- export interface Channel {
- readonly channel_id: string;
- target_id?: string;
+export namespace mproxy {
+ export interface MethodProxyInvokeData {
+ method_name: string;
+ arguments: any[];
+ promise_id: string;
+ }
+ export interface MethodProxyResultData {
+ promise_id: string;
+ result: any;
+ success: boolean;
+ }
+ export interface MethodProxyCallback {
+ promise: Promise;
+ promise_id: string;
- message_handler: (remote_id: string, broadcast: boolean, message: ChannelMessage) => any;
- send_message(type: string, message: any, target?: string);
+ resolve: (object: any) => any;
+ reject: (object: any) => any;
}
- class BroadcastChannelIPC extends BasicIPCHandler {
- private static readonly CHANNEL_NAME = "TeaSpeak-Web";
+ export type MethodProxyConnectParameters = {
+ channel_id: string;
+ client_id: string;
+ }
+ export abstract class MethodProxy {
+ readonly ipc_handler: BasicIPCHandler;
+ private _ipc_channel: Channel;
+ private _ipc_parameters: MethodProxyConnectParameters;
- private channel: BroadcastChannel;
+ private readonly _local: boolean;
+ private readonly _slave: boolean;
- constructor() {
- super();
+ private _connected: boolean;
+ private _proxied_methods: {[key: string]:() => Promise} = {};
+ private _proxied_callbacks: {[key: string]:MethodProxyCallback} = {};
+
+ protected constructor(ipc_handler: BasicIPCHandler, connect_params?: MethodProxyConnectParameters) {
+ this.ipc_handler = ipc_handler;
+ this._ipc_parameters = connect_params;
+ this._connected = false;
+ this._slave = typeof(connect_params) !== "undefined";
+ this._local = typeof(connect_params) !== "undefined" && connect_params.channel_id === "local" && connect_params.client_id === "local";
}
- setup() {
- super.setup();
+ protected setup() {
+ if(this._local) {
+ this._connected = true;
+ this.on_connected();
+ } else {
+ if(this._slave)
+ this._ipc_channel = this.ipc_handler.create_channel(this._ipc_parameters.client_id, this._ipc_parameters.channel_id);
+ else
+ this._ipc_channel = this.ipc_handler.create_channel();
- this.channel = new BroadcastChannel(BroadcastChannelIPC.CHANNEL_NAME);
- this.channel.onmessage = this.on_message.bind(this);
- this.channel.onmessageerror = this.on_error.bind(this);
+ this._ipc_channel.message_handler = this._handle_message.bind(this);
+ if(this._slave)
+ this._ipc_channel.send_message("initialize", {});
+ }
}
- private on_message(event: MessageEvent) {
- if(typeof(event.data) !== "string") {
- log.warn(LogCategory.IPC, tr("Received message with an invalid type (%s): %o"), typeof(event.data), event.data);
+ protected finalize() {
+ if(!this._local) {
+ if(this._connected)
+ this._ipc_channel.send_message("finalize", {});
+
+ this.ipc_handler.delete_channel(this._ipc_channel);
+ this._ipc_channel = undefined;
+ }
+ for(const promise of Object.values(this._proxied_callbacks))
+ promise.reject("disconnected");
+ this._proxied_callbacks = {};
+
+ this._connected = false;
+ this.on_disconnected();
+ }
+
+ protected register_method(method: (...args: any[]) => Promise | string) {
+ let method_name: string;
+ if(typeof method === "function") {
+ log.debug(LogCategory.IPC, tr("Registering method proxy for %s"), method.name);
+ method_name = method.name;
+ } else {
+ log.debug(LogCategory.IPC, tr("Registering method proxy for %s"), method);
+ method_name = method;
+ }
+
+ if(!this[method_name])
+ throw "method is missing in current object";
+
+ this._proxied_methods[method_name] = this[method_name];
+ if(!this._local) {
+ this[method_name] = (...args: any[]) => {
+ if(!this._connected)
+ return Promise.reject("not connected");
+
+ const proxy_callback = {
+ promise_id: uuidv4()
+ } as MethodProxyCallback;
+ this._proxied_callbacks[proxy_callback.promise_id] = proxy_callback;
+ proxy_callback.promise = new Promise((resolve, reject) => {
+ proxy_callback.resolve = resolve;
+ proxy_callback.reject = reject;
+ });
+
+ this._ipc_channel.send_message("invoke", {
+ promise_id: proxy_callback.promise_id,
+ arguments: [...args],
+ method_name: method_name
+ } as MethodProxyInvokeData);
+ return proxy_callback.promise;
+ }
+ }
+ }
+
+ private _handle_message(remote_id: string, boradcast: boolean, message: ChannelMessage) {
+ if(message.type === "finalize") {
+ this._handle_finalize();
+ } else if(message.type === "initialize") {
+ this._handle_remote_callback(remote_id);
+ } else if(message.type === "invoke") {
+ this._handle_invoke(message.data);
+ } else if(message.type === "result") {
+ this._handle_result(message.data);
+ }
+ }
+
+ private _handle_finalize() {
+ this.on_disconnected();
+ this.finalize();
+ this._connected = false;
+ }
+
+ private _handle_remote_callback(remote_id: string) {
+ if(!this._ipc_channel.target_id) {
+ if(this._slave)
+ throw "initialize wrong state!";
+
+ this._ipc_channel.target_id = remote_id; /* now we're able to send messages */
+ this.on_connected();
+ this._ipc_channel.send_message("initialize", true);
+ } else {
+ if(!this._slave)
+ throw "initialize wrong state!";
+
+ this.on_connected();
+ }
+ this._connected = true;
+ }
+
+ private _send_result(promise_id: string, success: boolean, message: any) {
+ this._ipc_channel.send_message("result", {
+ promise_id: promise_id,
+ result: message,
+ success: success
+ } as MethodProxyResultData);
+ }
+
+ private _handle_invoke(data: MethodProxyInvokeData) {
+ if(this._proxied_methods[data.method_name])
+ throw "we could not invoke a local proxied method!";
+
+ if(!this[data.method_name]) {
+ this._send_result(data.promise_id, false, "missing method");
return;
}
- let message: BroadcastMessage;
try {
- message = JSON.parse(event.data);
+ log.info(LogCategory.IPC, tr("Invoking method %s with arguments: %o"), data.method_name, data.arguments);
+
+ const promise = this[data.method_name](...data.arguments);
+ promise.then(result => {
+ log.info(LogCategory.IPC, tr("Result: %o"), result);
+ this._send_result(data.promise_id, true, result);
+ }).catch(error => {
+ this._send_result(data.promise_id, false, error);
+ });
} catch(error) {
- log.error(LogCategory.IPC, tr("Received an invalid encoded message: %o"), event.data);
+ this._send_result(data.promise_id, false, error);
return;
}
- super.handle_message(message);
}
- private on_error(event: MessageEvent) {
- log.warn(LogCategory.IPC, tr("Received error: %o"), event);
+ private _handle_result(data: MethodProxyResultData) {
+ if(!this._proxied_callbacks[data.promise_id]) {
+ console.warn(tr("Received proxy method result for unknown promise"));
+ return;
+ }
+ const callback = this._proxied_callbacks[data.promise_id];
+ delete this._proxied_callbacks[data.promise_id];
+
+ if(data.success)
+ callback.resolve(data.result);
+ else
+ callback.reject(data.result);
}
- send_message(type: string, data: any, target?: string) {
- const message: BroadcastMessage = {} as any;
+ generate_connect_parameters() : MethodProxyConnectParameters {
+ if(this._slave)
+ throw "only masters can generate connect parameters!";
+ if(!this._ipc_channel)
+ throw "please call setup() before";
- message.sender = this.unique_id;
- message.receiver = target ? target : BasicIPCHandler.BROADCAST_UNIQUE_ID;
- message.timestamp = Date.now();
- message.type = type;
- message.data = data;
-
- this.channel.postMessage(JSON.stringify(message));
- }
- }
-
- export namespace connect {
- export type ConnectRequestData = {
- address: string;
-
- profile?: string;
- username?: string;
- password?: {
- value: string;
- hashed: boolean;
+ return {
+ channel_id: this._ipc_channel.channel_id,
+ client_id: this.ipc_handler.get_local_address()
};
}
- export interface ConnectOffer {
- request_id: string;
- data: ConnectRequestData;
- }
+ is_slave() { return this._local || this._slave; } /* the popout modal */
+ is_master() { return this._local || !this._slave; } /* the host (teaweb application) */
- export interface ConnectOfferAnswer {
- request_id: string;
- accepted: boolean;
- }
-
- export interface ConnectExecute {
- request_id: string;
- }
-
- export interface ConnectExecuted {
- request_id: string;
- succeeded: boolean;
- message?: string;
- }
-
- /* The connect process:
- * 1. Broadcast an offer
- * 2. Wait 50ms for all offer responses or until the first one respond with "ok"
- * 3. Select (if possible) on accepted offer and execute the connect
- */
- export class ConnectHandler {
- private static readonly CHANNEL_NAME = "connect";
-
- readonly ipc_handler: BasicIPCHandler;
- private ipc_channel: Channel;
-
- public callback_available: (data: ConnectRequestData) => boolean = () => false;
- public callback_execute: (data: ConnectRequestData) => boolean | string = () => false;
-
-
- private _pending_connect_offers: {
- id: string;
- data: ConnectRequestData;
- timeout: number;
-
- remote_handler: string;
- }[] = [];
-
- private _pending_connects_requests: {
- id: string;
-
- data: ConnectRequestData;
- timeout: number;
-
- callback_success: () => any;
- callback_failed: (message: string) => any;
- callback_avail: () => Promise;
-
- remote_handler?: string;
- }[] = [];
-
- constructor(ipc_handler: BasicIPCHandler) {
- this.ipc_handler = ipc_handler;
- }
-
- public setup() {
- this.ipc_channel = this.ipc_handler.create_channel(undefined, ConnectHandler.CHANNEL_NAME);
- this.ipc_channel.message_handler = this.on_message.bind(this);
- }
-
- private on_message(sender: string, broadcast: boolean, message: ChannelMessage) {
- if(broadcast) {
- if(message.type == "offer") {
- const data = message.data as ConnectOffer;
-
- const response = {
- accepted: this.callback_available(data.data),
- request_id: data.request_id
- } as ConnectOfferAnswer;
-
- if(response.accepted) {
- log.debug(LogCategory.IPC, tr("Received new connect offer from %s: %s"), sender, data.request_id);
-
- const ld = {
- remote_handler: sender,
- data: data.data,
- id: data.request_id,
- timeout: 0
- };
- this._pending_connect_offers.push(ld);
- ld.timeout = setTimeout(() => {
- log.debug(LogCategory.IPC, tr("Dropping connect request %s, because we never received an execute."), ld.id);
- this._pending_connect_offers.remove(ld);
- }, 120 * 1000) as any;
- }
- this.ipc_channel.send_message("offer-answer", response, sender);
- }
- } else {
- if(message.type == "offer-answer") {
- const data = message.data as ConnectOfferAnswer;
- const request = this._pending_connects_requests.find(e => e.id === data.request_id);
- if(!request) {
- log.warn(LogCategory.IPC, tr("Received connect offer answer with unknown request id (%s)."), data.request_id);
- return;
- }
- if(!data.accepted) {
- log.debug(LogCategory.IPC, tr("Client %s rejected the connect offer (%s)."), sender, request.id);
- return;
- }
- if(request.remote_handler) {
- log.debug(LogCategory.IPC, tr("Client %s accepted the connect offer (%s), but offer has already been accepted."), sender, request.id);
- return;
- }
-
- log.debug(LogCategory.IPC, tr("Client %s accepted the connect offer (%s). Request local acceptance."), sender, request.id);
- request.remote_handler = sender;
- clearTimeout(request.timeout);
-
- request.callback_avail().then(flag => {
- if(!flag) {
- request.callback_failed("local avail rejected");
- return;
- }
-
- log.debug(LogCategory.IPC, tr("Executing connect with client %s"), request.remote_handler);
- this.ipc_channel.send_message("execute", {
- request_id: request.id
- } as ConnectExecute, request.remote_handler);
- request.timeout = setTimeout(() => {
- request.callback_failed("connect execute timeout");
- }, 1000) as any;
- }).catch(error => {
- log.error(LogCategory.IPC, tr("Local avail callback caused an error: %o"), error);
- request.callback_failed(tr("local avail callback caused an error"));
- });
-
- }
- else if(message.type == "executed") {
- const data = message.data as ConnectExecuted;
- const request = this._pending_connects_requests.find(e => e.id === data.request_id);
- if(!request) {
- log.warn(LogCategory.IPC, tr("Received connect executed with unknown request id (%s)."), data.request_id);
- return;
- }
-
- if(request.remote_handler != sender) {
- log.warn(LogCategory.IPC, tr("Received connect executed for request %s, but from wrong client: %s (expected %s)"), data.request_id, sender, request.remote_handler);
- return;
- }
-
- log.debug(LogCategory.IPC, tr("Received connect executed response from client %s for request %s. Succeeded: %o (%s)"), sender, data.request_id, data.succeeded, data.message);
- clearTimeout(request.timeout);
- if(data.succeeded)
- request.callback_success();
- else
- request.callback_failed(data.message);
- }
- else if(message.type == "execute") {
- const data = message.data as ConnectExecute;
- const request = this._pending_connect_offers.find(e => e.id === data.request_id);
- if(!request) {
- log.warn(LogCategory.IPC, tr("Received connect execute with unknown request id (%s)."), data.request_id);
- return;
- }
-
- if(request.remote_handler != sender) {
- log.warn(LogCategory.IPC, tr("Received connect execute for request %s, but from wrong client: %s (expected %s)"), data.request_id, sender, request.remote_handler);
- return;
- }
- clearTimeout(request.timeout);
- this._pending_connect_offers.remove(request);
-
- log.debug(LogCategory.IPC, tr("Executing connect for %s"), data.request_id);
- const cr = this.callback_execute(request.data);
-
- const response = {
- request_id: data.request_id,
-
- succeeded: typeof(cr) !== "string" && cr,
- message: typeof(cr) === "string" ? cr : "",
- } as ConnectExecuted;
- this.ipc_channel.send_message("executed", response, request.remote_handler);
- }
- }
- }
-
- post_connect_request(data: ConnectRequestData, callback_avail: () => Promise) : Promise {
- return new Promise((resolve, reject) => {
- const pd = {
- data: data,
- id: uuidv4(),
- timeout: 0,
-
- callback_success: () => {
- this._pending_connects_requests.remove(pd);
- clearTimeout(pd.timeout);
- resolve();
- },
-
- callback_failed: error => {
- this._pending_connects_requests.remove(pd);
- clearTimeout(pd.timeout);
- reject(error);
- },
-
- callback_avail: callback_avail,
- };
- this._pending_connects_requests.push(pd);
-
- this.ipc_channel.send_message("offer", {
- request_id: pd.id,
- data: pd.data
- } as ConnectOffer);
- pd.timeout = setTimeout(() => {
- pd.callback_failed("received no response to offer");
- }, 50) as any;
- })
- }
- }
+ protected abstract on_connected();
+ protected abstract on_disconnected();
}
+}
- export namespace mproxy {
- export interface MethodProxyInvokeData {
- method_name: string;
- arguments: any[];
- promise_id: string;
- }
- export interface MethodProxyResultData {
- promise_id: string;
- result: any;
- success: boolean;
- }
- export interface MethodProxyCallback {
- promise: Promise;
- promise_id: string;
+let handler: BasicIPCHandler;
+let connect_handler: connect.ConnectHandler;
- resolve: (object: any) => any;
- reject: (object: any) => any;
- }
+export function setup() {
+ if(!supported())
+ return;
- export type MethodProxyConnectParameters = {
- channel_id: string;
- client_id: string;
- }
- export abstract class MethodProxy {
- readonly ipc_handler: BasicIPCHandler;
- private _ipc_channel: Channel;
- private _ipc_parameters: MethodProxyConnectParameters;
+ handler = new BroadcastChannelIPC();
+ handler.setup();
- private readonly _local: boolean;
- private readonly _slave: boolean;
+ connect_handler = new connect.ConnectHandler(handler);
+ connect_handler.setup();
+}
- private _connected: boolean;
- private _proxied_methods: {[key: string]:() => Promise} = {};
- private _proxied_callbacks: {[key: string]:MethodProxyCallback} = {};
+export function get_handler() {
+ return handler;
+}
- protected constructor(ipc_handler: BasicIPCHandler, connect_params?: MethodProxyConnectParameters) {
- this.ipc_handler = ipc_handler;
- this._ipc_parameters = connect_params;
- this._connected = false;
- this._slave = typeof(connect_params) !== "undefined";
- this._local = typeof(connect_params) !== "undefined" && connect_params.channel_id === "local" && connect_params.client_id === "local";
- }
+export function get_connect_handler() {
+ return connect_handler;
+}
- protected setup() {
- if(this._local) {
- this._connected = true;
- this.on_connected();
- } else {
- if(this._slave)
- this._ipc_channel = this.ipc_handler.create_channel(this._ipc_parameters.client_id, this._ipc_parameters.channel_id);
- else
- this._ipc_channel = this.ipc_handler.create_channel();
-
- this._ipc_channel.message_handler = this._handle_message.bind(this);
- if(this._slave)
- this._ipc_channel.send_message("initialize", {});
- }
- }
-
- protected finalize() {
- if(!this._local) {
- if(this._connected)
- this._ipc_channel.send_message("finalize", {});
-
- this.ipc_handler.delete_channel(this._ipc_channel);
- this._ipc_channel = undefined;
- }
- for(const promise of Object.values(this._proxied_callbacks))
- promise.reject("disconnected");
- this._proxied_callbacks = {};
-
- this._connected = false;
- this.on_disconnected();
- }
-
- protected register_method(method: (...args: any[]) => Promise | string) {
- let method_name: string;
- if(typeof method === "function") {
- log.debug(LogCategory.IPC, tr("Registering method proxy for %s"), method.name);
- method_name = method.name;
- } else {
- log.debug(LogCategory.IPC, tr("Registering method proxy for %s"), method);
- method_name = method;
- }
-
- if(!this[method_name])
- throw "method is missing in current object";
-
- this._proxied_methods[method_name] = this[method_name];
- if(!this._local) {
- this[method_name] = (...args: any[]) => {
- if(!this._connected)
- return Promise.reject("not connected");
-
- const proxy_callback = {
- promise_id: uuidv4()
- } as MethodProxyCallback;
- this._proxied_callbacks[proxy_callback.promise_id] = proxy_callback;
- proxy_callback.promise = new Promise((resolve, reject) => {
- proxy_callback.resolve = resolve;
- proxy_callback.reject = reject;
- });
-
- this._ipc_channel.send_message("invoke", {
- promise_id: proxy_callback.promise_id,
- arguments: [...args],
- method_name: method_name
- } as MethodProxyInvokeData);
- return proxy_callback.promise;
- }
- }
- }
-
- private _handle_message(remote_id: string, boradcast: boolean, message: ChannelMessage) {
- if(message.type === "finalize") {
- this._handle_finalize();
- } else if(message.type === "initialize") {
- this._handle_remote_callback(remote_id);
- } else if(message.type === "invoke") {
- this._handle_invoke(message.data);
- } else if(message.type === "result") {
- this._handle_result(message.data);
- }
- }
-
- private _handle_finalize() {
- this.on_disconnected();
- this.finalize();
- this._connected = false;
- }
-
- private _handle_remote_callback(remote_id: string) {
- if(!this._ipc_channel.target_id) {
- if(this._slave)
- throw "initialize wrong state!";
-
- this._ipc_channel.target_id = remote_id; /* now we're able to send messages */
- this.on_connected();
- this._ipc_channel.send_message("initialize", true);
- } else {
- if(!this._slave)
- throw "initialize wrong state!";
-
- this.on_connected();
- }
- this._connected = true;
- }
-
- private _send_result(promise_id: string, success: boolean, message: any) {
- this._ipc_channel.send_message("result", {
- promise_id: promise_id,
- result: message,
- success: success
- } as MethodProxyResultData);
- }
-
- private _handle_invoke(data: MethodProxyInvokeData) {
- if(this._proxied_methods[data.method_name])
- throw "we could not invoke a local proxied method!";
-
- if(!this[data.method_name]) {
- this._send_result(data.promise_id, false, "missing method");
- return;
- }
-
- try {
- log.info(LogCategory.IPC, tr("Invoking method %s with arguments: %o"), data.method_name, data.arguments);
-
- const promise = this[data.method_name](...data.arguments);
- promise.then(result => {
- log.info(LogCategory.IPC, tr("Result: %o"), result);
- this._send_result(data.promise_id, true, result);
- }).catch(error => {
- this._send_result(data.promise_id, false, error);
- });
- } catch(error) {
- this._send_result(data.promise_id, false, error);
- return;
- }
- }
-
- private _handle_result(data: MethodProxyResultData) {
- if(!this._proxied_callbacks[data.promise_id]) {
- console.warn(tr("Received proxy method result for unknown promise"));
- return;
- }
- const callback = this._proxied_callbacks[data.promise_id];
- delete this._proxied_callbacks[data.promise_id];
-
- if(data.success)
- callback.resolve(data.result);
- else
- callback.reject(data.result);
- }
-
- generate_connect_parameters() : MethodProxyConnectParameters {
- if(this._slave)
- throw "only masters can generate connect parameters!";
- if(!this._ipc_channel)
- throw "please call setup() before";
-
- return {
- channel_id: this._ipc_channel.channel_id,
- client_id: this.ipc_handler.get_local_address()
- };
- }
-
- is_slave() { return this._local || this._slave; } /* the popout modal */
- is_master() { return this._local || !this._slave; } /* the host (teaweb application) */
-
- protected abstract on_connected();
- protected abstract on_disconnected();
- }
- }
-
- let handler: BasicIPCHandler;
- let connect_handler: connect.ConnectHandler;
-
- export function setup() {
- if(!supported())
- return;
-
- handler = new BroadcastChannelIPC();
- handler.setup();
-
- connect_handler = new connect.ConnectHandler(handler);
- connect_handler.setup();
- }
-
- export function get_handler() {
- return handler;
- }
-
- export function get_connect_handler() {
- return connect_handler;
- }
-
- export function supported() {
- /* ios does not support this */
- return typeof(window.BroadcastChannel) !== "undefined";
- }
+export function supported() {
+ /* ios does not support this */
+ return typeof(window.BroadcastChannel) !== "undefined";
}
\ No newline at end of file
diff --git a/shared/js/ConnectionHandler.ts b/shared/js/ConnectionHandler.ts
index 85c3b8af..8a0b6731 100644
--- a/shared/js/ConnectionHandler.ts
+++ b/shared/js/ConnectionHandler.ts
@@ -1,14 +1,38 @@
-/// ;
- }
-
- export interface UploadTransfer {
- get_key(): UploadKey;
-
- put_data(data: BlobPart | File) : Promise;
- }
-
- export type DownloadKey = TransferKey;
- export type UploadKey = TransferKey;
-
- export function spawn_download_transfer(key: DownloadKey) : DownloadTransfer {
- return new RequestFileDownload(key);
- }
- export function spawn_upload_transfer(key: UploadKey) : UploadTransfer {
- return new RequestFileUpload(key);
- }
+ total_size: number;
}
-class RequestFileDownload implements transfer.DownloadTransfer {
- readonly transfer_key: transfer.DownloadKey;
+export interface UploadOptions {
+ name: string;
+ path: string;
- constructor(key: transfer.DownloadKey) {
+ channel?: ChannelEntry;
+ channel_password?: string;
+
+ size: number;
+ overwrite: boolean;
+}
+
+export interface DownloadTransfer {
+ get_key() : DownloadKey;
+
+ request_file() : Promise;
+}
+
+export interface UploadTransfer {
+ get_key(): UploadKey;
+
+ put_data(data: BlobPart | File) : Promise;
+}
+
+export type DownloadKey = TransferKey;
+export type UploadKey = TransferKey;
+
+export function spawn_download_transfer(key: DownloadKey) : DownloadTransfer {
+ return new RequestFileDownload(key);
+}
+export function spawn_upload_transfer(key: UploadKey) : UploadTransfer {
+ return new RequestFileUpload(key);
+}
+
+export class RequestFileDownload implements DownloadTransfer {
+ readonly transfer_key: DownloadKey;
+
+ constructor(key: DownloadKey) {
this.transfer_key = key;
}
@@ -97,18 +101,18 @@ class RequestFileDownload implements transfer.DownloadTransfer {
return response;
}
- get_key(): transfer.DownloadKey {
+ get_key(): DownloadKey {
return this.transfer_key;
}
}
-class RequestFileUpload implements transfer.UploadTransfer {
- readonly transfer_key: transfer.UploadKey;
- constructor(key: transfer.DownloadKey) {
+export class RequestFileUpload implements UploadTransfer {
+ readonly transfer_key: UploadKey;
+ constructor(key: DownloadKey) {
this.transfer_key = key;
}
- get_key(): transfer.UploadKey {
+ get_key(): UploadKey {
return this.transfer_key;
}
@@ -152,14 +156,14 @@ class RequestFileUpload implements transfer.UploadTransfer {
}
}
-class FileManager extends connection.AbstractCommandHandler {
+export class FileManager extends AbstractCommandHandler {
handle: ConnectionHandler;
icons: IconManager;
avatars: AvatarManager;
private listRequests: FileListRequest[] = [];
- private pending_download_requests: transfer.DownloadKey[] = [];
- private pending_upload_requests: transfer.UploadKey[] = [];
+ private pending_download_requests: DownloadKey[] = [];
+ private pending_upload_requests: UploadKey[] = [];
private transfer_counter : number = 1;
@@ -191,7 +195,7 @@ class FileManager extends connection.AbstractCommandHandler {
this.avatars = undefined;
}
- handle_command(command: connection.ServerCommand): boolean {
+ handle_command(command: ServerCommand): boolean {
switch (command.command) {
case "notifyfilelist":
this.notifyFileList(command.arguments);
@@ -276,15 +280,15 @@ class FileManager extends connection.AbstractCommandHandler {
/******************************** File download/upload ********************************/
- download_file(path: string, file: string, channel?: ChannelEntry, password?: string) : Promise {
- const transfer_data: transfer.DownloadKey = {
+ download_file(path: string, file: string, channel?: ChannelEntry, password?: string) : Promise {
+ const transfer_data: DownloadKey = {
file_name: file,
file_path: path,
client_transfer_id: this.transfer_counter++
} as any;
this.pending_download_requests.push(transfer_data);
- return new Promise((resolve, reject) => {
+ return new Promise((resolve, reject) => {
transfer_data["_callback"] = resolve;
this.handle.serverConnection.send_command("ftinitdownload", {
"path": path,
@@ -301,8 +305,8 @@ class FileManager extends connection.AbstractCommandHandler {
});
}
- upload_file(options: transfer.UploadOptions) : Promise {
- const transfer_data: transfer.UploadKey = {
+ upload_file(options: UploadOptions) : Promise {
+ const transfer_data: UploadKey = {
file_path: options.path,
file_name: options.name,
client_transfer_id: this.transfer_counter++,
@@ -310,7 +314,7 @@ class FileManager extends connection.AbstractCommandHandler {
} as any;
this.pending_upload_requests.push(transfer_data);
- return new Promise((resolve, reject) => {
+ return new Promise((resolve, reject) => {
transfer_data["_callback"] = resolve;
this.handle.serverConnection.send_command("ftinitupload", {
"path": options.path,
@@ -333,7 +337,7 @@ class FileManager extends connection.AbstractCommandHandler {
json = json[0];
let clientftfid = parseInt(json["clientftfid"]);
- let transfer: transfer.DownloadKey;
+ let transfer: DownloadKey;
for(let e of this.pending_download_requests)
if(e.client_transfer_id == clientftfid) {
transfer = e;
@@ -355,14 +359,14 @@ class FileManager extends connection.AbstractCommandHandler {
if(transfer.peer.hosts[0].length == 0 || transfer.peer.hosts[0] == '0.0.0.0')
transfer.peer.hosts[0] = this.handle.serverConnection.remote_address().host;
- (transfer["_callback"] as (val: transfer.DownloadKey) => void)(transfer);
+ (transfer["_callback"] as (val: DownloadKey) => void)(transfer);
this.pending_download_requests.remove(transfer);
}
private notifyStartUpload(json) {
json = json[0];
- let transfer: transfer.UploadKey;
+ let transfer: UploadKey;
let clientftfid = parseInt(json["clientftfid"]);
for(let e of this.pending_upload_requests)
if(e.client_transfer_id == clientftfid) {
@@ -384,7 +388,7 @@ class FileManager extends connection.AbstractCommandHandler {
if(transfer.peer.hosts[0].length == 0 || transfer.peer.hosts[0] == '0.0.0.0')
transfer.peer.hosts[0] = this.handle.serverConnection.remote_address().host;
- (transfer["_callback"] as (val: transfer.UploadKey) => void)(transfer);
+ (transfer["_callback"] as (val: UploadKey) => void)(transfer);
this.pending_upload_requests.remove(transfer);
}
@@ -411,12 +415,12 @@ class FileManager extends connection.AbstractCommandHandler {
}
}
-class Icon {
+export class Icon {
id: number;
url: string;
}
-enum ImageType {
+export enum ImageType {
UNKNOWN,
BITMAP,
PNG,
@@ -425,7 +429,7 @@ enum ImageType {
JPEG
}
-function media_image_type(type: ImageType, file?: boolean) {
+export function media_image_type(type: ImageType, file?: boolean) {
switch (type) {
case ImageType.BITMAP:
return "bmp";
@@ -442,7 +446,7 @@ function media_image_type(type: ImageType, file?: boolean) {
}
}
-function image_type(encoded_data: string | ArrayBuffer, base64_encoded?: boolean) {
+export function image_type(encoded_data: string | ArrayBuffer, base64_encoded?: boolean) {
const ab2str10 = () => {
const buf = new Uint8Array(encoded_data as ArrayBuffer);
if(buf.byteLength < 10)
@@ -472,7 +476,7 @@ function image_type(encoded_data: string | ArrayBuffer, base64_encoded?: boolean
return ImageType.UNKNOWN;
}
-class CacheManager {
+export class CacheManager {
readonly cache_name: string;
private _cache_category: Cache;
@@ -547,7 +551,7 @@ class CacheManager {
}
}
-class IconManager {
+export class IconManager {
private static cache: CacheManager = new CacheManager("icons");
handle: FileManager;
@@ -590,7 +594,7 @@ class IconManager {
return this.handle.requestFileList("/icons");
}
- create_icon_download(id: number) : Promise {
+ create_icon_download(id: number) : Promise {
return this.handle.download_file("", "/icon_" + id);
}
@@ -665,7 +669,7 @@ class IconManager {
private async _load_icon(id: number) : Promise {
try {
- let download_key: transfer.DownloadKey;
+ let download_key: DownloadKey;
try {
download_key = await this.create_icon_download(id);
} catch(error) {
@@ -673,7 +677,7 @@ class IconManager {
throw "Failed to request icon";
}
- const downloader = transfer.spawn_download_transfer(download_key);
+ const downloader = spawn_download_transfer(download_key);
let response: Response;
try {
response = await downloader.request_file();
@@ -801,14 +805,14 @@ class IconManager {
}
}
-class Avatar {
+export class Avatar {
client_avatar_id: string; /* the base64 uid thing from a-m */
avatar_id: string; /* client_flag_avatar */
url: string;
type: ImageType;
}
-class AvatarManager {
+export class AvatarManager {
handle: FileManager;
private static cache: CacheManager;
@@ -867,14 +871,14 @@ class AvatarManager {
};
}
- create_avatar_download(client_avatar_id: string) : Promise {
+ create_avatar_download(client_avatar_id: string) : Promise {
log.debug(LogCategory.GENERAL, "Requesting download for avatar %s", client_avatar_id);
return this.handle.download_file("", "/avatar_" + client_avatar_id);
}
private async _load_avatar(client_avatar_id: string, avatar_version: string) {
try {
- let download_key: transfer.DownloadKey;
+ let download_key: DownloadKey;
try {
download_key = await this.create_avatar_download(client_avatar_id);
} catch(error) {
@@ -882,7 +886,7 @@ class AvatarManager {
throw "failed to request avatar download";
}
- const downloader = transfer.spawn_download_transfer(download_key);
+ const downloader = spawn_download_transfer(download_key);
let response: Response;
try {
response = await downloader.request_file();
diff --git a/shared/js/MessageFormatter.ts b/shared/js/MessageFormatter.ts
index 66bb2d7f..462423c0 100644
--- a/shared/js/MessageFormatter.ts
+++ b/shared/js/MessageFormatter.ts
@@ -1,250 +1,280 @@
-namespace messages.formatter {
- export namespace bbcode {
- const sanitizer_escaped = (key: string) => "[-- sescaped: " + key + " --]";
- const sanitizer_escaped_regex = /\[-- sescaped: ([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}) --]/;
- const sanitizer_escaped_map: {[key: string]: string} = {};
+import {Settings, settings} from "tc-shared/settings";
+import * as contextmenu from "tc-shared/ui/elements/ContextMenu";
+import {copy_to_clipboard} from "tc-shared/utils/helpers";
+import {guid} from "tc-shared/crypto/uid";
+import * as loader from "tc-loader";
+import * as image_preview from "./ui/frames/image_preview"
- const yt_url_regex = /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/;
+declare const xbbcode;
+export namespace bbcode {
+ const sanitizer_escaped = (key: string) => "[-- sescaped: " + key + " --]";
+ const sanitizer_escaped_regex = /\[-- sescaped: ([0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}) --]/;
+ const sanitizer_escaped_map: {[key: string]: string} = {};
- export interface FormatSettings {
- is_chat_message?: boolean
- }
+ const yt_url_regex = /^((?:https?:)?\/\/)?((?:www|m)\.)?((?:youtube\.com|youtu.be))(\/(?:[\w\-]+\?v=|embed\/|v\/)?)([\w\-]+)(\S+)?$/;
- export function format(message: string, fsettings?: FormatSettings) : JQuery[] {
- fsettings = fsettings || {};
-
- single_url_parse:
- if(fsettings.is_chat_message) {
- /* try if its only one url */
- const raw_url = message.replace(/\[url(=\S+)?](\S+)\[\/url]/, "$2");
- let url: URL;
- try {
- url = new URL(raw_url);
- } catch(error) {
- break single_url_parse;
- }
-
- single_url_yt:
- {
- const result = raw_url.match(yt_url_regex);
- if(!result) break single_url_yt;
-
- return format("[yt]https://www.youtube.com/watch?v=" + result[5] + "[/yt]");
- }
-
- single_url_image:
- {
- const ext_index = url.pathname.lastIndexOf(".");
- if(ext_index == -1) break single_url_image;
-
- const ext_name = url.pathname.substr(ext_index + 1).toLowerCase();
- if([
- "jpeg", "jpg",
- "png", "bmp", "gif",
- "tiff", "pdf", "svg"
- ].findIndex(e => e === ext_name) == -1) break single_url_image;
-
- return format("[img]" + message + "[/img]");
- }
- }
-
- const result = xbbcode.parse(message, {
- tag_whitelist: [
- "b", "big",
- "i", "italic",
- "u", "underlined",
- "s", "strikethrough",
- "color",
- "url",
- "code",
- "i-code", "icode",
- "sub", "sup",
- "size",
- "hr", "br",
-
- "ul", "ol", "list",
- "li",
-
- "table",
- "tr", "td", "th",
-
- "yt", "youtube",
- "img"
- ]
- });
- let html = result.build_html();
- if(typeof(window.twemoji) !== "undefined" && settings.static_global(Settings.KEY_CHAT_COLORED_EMOJIES))
- html = twemoji.parse(html);
-
- const container = $.spawn("div");
- let sanitized = DOMPurify.sanitize(html, {
- ADD_ATTR: [
- "x-highlight-type",
- "x-code-type",
- "x-image-url"
- ]
- });
-
- sanitized = sanitized.replace(sanitizer_escaped_regex, data => {
- const uid = data.match(sanitizer_escaped_regex)[1];
- const value = sanitizer_escaped_map[uid];
- if(!value) return data;
- delete sanitizer_escaped_map[uid];
-
- return value;
- });
-
- container[0].innerHTML = sanitized;
-
-
- container.find("a")
- .attr('target', "_blank")
- .on('contextmenu', event => {
- if(event.isDefaultPrevented()) return;
- event.preventDefault();
-
- const url = $(event.target).attr("href");
- contextmenu.spawn_context_menu(event.pageX, event.pageY, {
- callback: () => {
- const win = window.open(url, '_blank');
- win.focus();
- },
- name: tr("Open URL"),
- type: contextmenu.MenuEntryType.ENTRY,
- icon_class: "client-browse-addon-online"
- }, {
- callback: () => {
- //TODO
- },
- name: tr("Open URL in Browser"),
- type: contextmenu.MenuEntryType.ENTRY,
- visible: !app.is_web() && false // Currently not possible
- }, contextmenu.Entry.HR(), {
- callback: () => copy_to_clipboard(url),
- name: tr("Copy URL to clipboard"),
- type: contextmenu.MenuEntryType.ENTRY,
- icon_class: "client-copy"
- });
- });
-
- return [container.contents() as JQuery];
- //return result.root_tag.content.map(e => e.build_html()).map((entry, idx, array) => $.spawn("a").css("display", (idx == 0 ? "inline" : "") + "block").html(entry == "" && idx != 0 ? " " : entry));
- }
-
- export function load_image(entry: HTMLImageElement) {
- const url = decodeURIComponent(entry.getAttribute("x-image-url") || "");
- const proxy_url = "https://images.weserv.nl/?url=" + encodeURIComponent(url);
-
- entry.onload = undefined;
- entry.src = proxy_url;
-
- const parent = $(entry.parentElement);
- parent.on('contextmenu', event => {
- contextmenu.spawn_context_menu(event.pageX, event.pageY, {
- callback: () => {
- const win = window.open(url, '_blank');
- win.focus();
- },
- name: tr("Open image in browser"),
- type: contextmenu.MenuEntryType.ENTRY,
- icon_class: "client-browse-addon-online"
- }, contextmenu.Entry.HR(), {
- callback: () => copy_to_clipboard(url),
- name: tr("Copy image URL to clipboard"),
- type: contextmenu.MenuEntryType.ENTRY,
- icon_class: "client-copy"
- })
- });
- parent.css("cursor", "pointer").on('click', event => image_preview.preview_image(proxy_url, url));
- }
-
- loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
- name: "XBBCode code tag init",
- function: async () => {
- /* override default parser */
- xbbcode.register.register_parser({
- tag: ["code", "icode", "i-code"],
- content_tags_whitelist: [],
-
- build_html(layer) : string {
- const klass = layer.tag_normalized != 'code' ? "tag-hljs-inline-code" : "tag-hljs-code";
- const language = (layer.options || "").replace("\"", "'").toLowerCase();
-
- /* remove heading empty lines */
- let text = layer.content.map(e => e.build_text())
- .reduce((a, b) => a.length == 0 && b.replace(/[ \n\r\t]+/g, "").length == 0 ? "" : a + b, "")
- .replace(/^([ \n\r\t]*)(?=\n)+/g, "");
- if(text.startsWith("\r") || text.startsWith("\n"))
- text = text.substr(1);
-
- let result: HighlightJSResult;
- if(window.hljs.getLanguage(language))
- result = window.hljs.highlight(language, text, true);
- else
- result = window.hljs.highlightAuto(text);
-
- let html = '";
- return sanitizer_escaped(uid);
- }
- });
-
- /* the image parse & displayer */
- xbbcode.register.register_parser({
- tag: ["img", "image"],
- build_html(layer): string {
- const uid = guid();
- const fallback_value = "[img]" + layer.build_text() + "[/img]";
-
- let target;
- let content = layer.content.map(e => e.build_text()).join("");
- if (!layer.options) {
- target = content;
- } else
- target = layer.options;
-
- let url: URL;
- try {
- url = new URL(target);
- if(!url.hostname) throw "";
- } catch(error) {
- return fallback_value;
- }
-
- sanitizer_escaped_map[uid] = "
";
- return sanitizer_escaped(uid);
- }
- })
- },
- priority: 10
- });
+ export interface FormatSettings {
+ is_chat_message?: boolean
}
- export function sanitize_text(text: string) : string {
- return $(DOMPurify.sanitize("" + text + "", {
+ export function format(message: string, fsettings?: FormatSettings) : JQuery[] {
+ fsettings = fsettings || {};
+
+ single_url_parse:
+ if(fsettings.is_chat_message) {
+ /* try if its only one url */
+ const raw_url = message.replace(/\[url(=\S+)?](\S+)\[\/url]/, "$2");
+ let url: URL;
+ try {
+ url = new URL(raw_url);
+ } catch(error) {
+ break single_url_parse;
+ }
+
+ single_url_yt:
+ {
+ const result = raw_url.match(yt_url_regex);
+ if(!result) break single_url_yt;
+
+ return format("[yt]https://www.youtube.com/watch?v=" + result[5] + "[/yt]");
+ }
+
+ single_url_image:
+ {
+ const ext_index = url.pathname.lastIndexOf(".");
+ if(ext_index == -1) break single_url_image;
+
+ const ext_name = url.pathname.substr(ext_index + 1).toLowerCase();
+ if([
+ "jpeg", "jpg",
+ "png", "bmp", "gif",
+ "tiff", "pdf", "svg"
+ ].findIndex(e => e === ext_name) == -1) break single_url_image;
+
+ return format("[img]" + message + "[/img]");
+ }
+ }
+
+ const result = xbbcode.parse(message, {
+ tag_whitelist: [
+ "b", "big",
+ "i", "italic",
+ "u", "underlined",
+ "s", "strikethrough",
+ "color",
+ "url",
+ "code",
+ "i-code", "icode",
+ "sub", "sup",
+ "size",
+ "hr", "br",
+
+ "ul", "ol", "list",
+ "li",
+
+ "table",
+ "tr", "td", "th",
+
+ "yt", "youtube",
+ "img"
+ ]
+ });
+ let html = result.build_html();
+ if(typeof(window.twemoji) !== "undefined" && settings.static_global(Settings.KEY_CHAT_COLORED_EMOJIES))
+ html = twemoji.parse(html);
+
+ const container = $.spawn("div");
+ let sanitized = DOMPurify.sanitize(html, {
ADD_ATTR: [
"x-highlight-type",
"x-code-type",
"x-image-url"
]
- })).text();
+ });
+
+ sanitized = sanitized.replace(sanitizer_escaped_regex, data => {
+ const uid = data.match(sanitizer_escaped_regex)[1];
+ const value = sanitizer_escaped_map[uid];
+ if(!value) return data;
+ delete sanitizer_escaped_map[uid];
+
+ return value;
+ });
+
+ container[0].innerHTML = sanitized;
+
+
+ container.find("a")
+ .attr('target', "_blank")
+ .on('contextmenu', event => {
+ if(event.isDefaultPrevented()) return;
+ event.preventDefault();
+
+ const url = $(event.target).attr("href");
+ contextmenu.spawn_context_menu(event.pageX, event.pageY, {
+ callback: () => {
+ const win = window.open(url, '_blank');
+ win.focus();
+ },
+ name: tr("Open URL"),
+ type: contextmenu.MenuEntryType.ENTRY,
+ icon_class: "client-browse-addon-online"
+ }, {
+ callback: () => {
+ //TODO
+ },
+ name: tr("Open URL in Browser"),
+ type: contextmenu.MenuEntryType.ENTRY,
+ visible: loader.version().type === "native" && false // Currently not possible
+ }, contextmenu.Entry.HR(), {
+ callback: () => copy_to_clipboard(url),
+ name: tr("Copy URL to clipboard"),
+ type: contextmenu.MenuEntryType.ENTRY,
+ icon_class: "client-copy"
+ });
+ });
+
+ return [container.contents() as JQuery];
+ //return result.root_tag.content.map(e => e.build_html()).map((entry, idx, array) => $.spawn("a").css("display", (idx == 0 ? "inline" : "") + "block").html(entry == "" && idx != 0 ? " " : entry));
}
+
+ export function load_image(entry: HTMLImageElement) {
+ const url = decodeURIComponent(entry.getAttribute("x-image-url") || "");
+ const proxy_url = "https://images.weserv.nl/?url=" + encodeURIComponent(url);
+
+ entry.onload = undefined;
+ entry.src = proxy_url;
+
+ const parent = $(entry.parentElement);
+ parent.on('contextmenu', event => {
+ contextmenu.spawn_context_menu(event.pageX, event.pageY, {
+ callback: () => {
+ const win = window.open(url, '_blank');
+ win.focus();
+ },
+ name: tr("Open image in browser"),
+ type: contextmenu.MenuEntryType.ENTRY,
+ icon_class: "client-browse-addon-online"
+ }, contextmenu.Entry.HR(), {
+ callback: () => copy_to_clipboard(url),
+ name: tr("Copy image URL to clipboard"),
+ type: contextmenu.MenuEntryType.ENTRY,
+ icon_class: "client-copy"
+ })
+ });
+ parent.css("cursor", "pointer").on('click', event => image_preview.preview_image(proxy_url, url));
+ }
+
+ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
+ name: "XBBCode code tag init",
+ function: async () => {
+ /* override default parser */
+ xbbcode.register.register_parser({
+ tag: ["code", "icode", "i-code"],
+ content_tags_whitelist: [],
+
+ build_html(layer) : string {
+ const klass = layer.tag_normalized != 'code' ? "tag-hljs-inline-code" : "tag-hljs-code";
+ const language = (layer.options || "").replace("\"", "'").toLowerCase();
+
+ /* remove heading empty lines */
+ let text = layer.content.map(e => e.build_text())
+ .reduce((a, b) => a.length == 0 && b.replace(/[ \n\r\t]+/g, "").length == 0 ? "" : a + b, "")
+ .replace(/^([ \n\r\t]*)(?=\n)+/g, "");
+ if(text.startsWith("\r") || text.startsWith("\n"))
+ text = text.substr(1);
+
+ let result: HighlightJSResult;
+ if(window.hljs.getLanguage(language))
+ result = window.hljs.highlight(language, text, true);
+ else
+ result = window.hljs.highlightAuto(text);
+
+ let html = '";
+ return sanitizer_escaped(uid);
+ }
+ });
+
+ /* the image parse & displayer */
+ xbbcode.register.register_parser({
+ tag: ["img", "image"],
+ build_html(layer): string {
+ const uid = guid();
+ const fallback_value = "[img]" + layer.build_text() + "[/img]";
+
+ let target;
+ let content = layer.content.map(e => e.build_text()).join("");
+ if (!layer.options) {
+ target = content;
+ } else
+ target = layer.options;
+
+ let url: URL;
+ try {
+ url = new URL(target);
+ if(!url.hostname) throw "";
+ } catch(error) {
+ return fallback_value;
+ }
+
+ sanitizer_escaped_map[uid] = "";
+ return sanitizer_escaped(uid);
+ }
+ })
+ },
+ priority: 10
+ });
+}
+
+export function sanitize_text(text: string) : string {
+ return $(DOMPurify.sanitize("" + text + "", {
+ ADD_ATTR: [
+ "x-highlight-type",
+ "x-code-type",
+ "x-image-url"
+ ]
+ })).text();
+}
+
+export function formatDate(secs: number) : string {
+ let years = Math.floor(secs / (60 * 60 * 24 * 365));
+ let days = Math.floor(secs / (60 * 60 * 24)) % 365;
+ let hours = Math.floor(secs / (60 * 60)) % 24;
+ let minutes = Math.floor(secs / 60) % 60;
+ let seconds = Math.floor(secs % 60);
+
+ let result = "";
+ if(years > 0)
+ result += years + " " + tr("years") + " ";
+ if(years > 0 || days > 0)
+ result += days + " " + tr("days") + " ";
+ if(years > 0 || days > 0 || hours > 0)
+ result += hours + " " + tr("hours") + " ";
+ if(years > 0 || days > 0 || hours > 0 || minutes > 0)
+ result += minutes + " " + tr("minutes") + " ";
+ if(years > 0 || days > 0 || hours > 0 || minutes > 0 || seconds > 0)
+ result += seconds + " " + tr("seconds") + " ";
+ else
+ result = tr("now") + " ";
+
+ return result.substr(0, result.length - 1);
}
\ No newline at end of file
diff --git a/shared/js/PPTListener.ts b/shared/js/PPTListener.ts
index b0d32f5d..d0439914 100644
--- a/shared/js/PPTListener.ts
+++ b/shared/js/PPTListener.ts
@@ -1,4 +1,4 @@
-enum KeyCode {
+export enum KeyCode {
KEY_CANCEL = 3,
KEY_HELP = 6,
KEY_BACK_SPACE = 8,
@@ -118,59 +118,57 @@ enum KeyCode {
KEY_META = 224
}
-namespace ppt {
- export enum EventType {
- KEY_PRESS,
- KEY_RELEASE,
- KEY_TYPED
- }
+export enum EventType {
+ KEY_PRESS,
+ KEY_RELEASE,
+ KEY_TYPED
+}
- export enum SpecialKey {
- CTRL,
- WINDOWS,
- SHIFT,
- ALT
- }
+export enum SpecialKey {
+ CTRL,
+ WINDOWS,
+ SHIFT,
+ ALT
+}
- export interface KeyDescriptor {
- key_code: string;
+export interface KeyDescriptor {
+ key_code: string;
- key_ctrl: boolean;
- key_windows: boolean;
- key_shift: boolean;
- key_alt: boolean;
- }
+ key_ctrl: boolean;
+ key_windows: boolean;
+ key_shift: boolean;
+ key_alt: boolean;
+}
- export interface KeyEvent extends KeyDescriptor {
- readonly type: EventType;
+export interface KeyEvent extends KeyDescriptor {
+ readonly type: EventType;
- readonly key: string;
- }
+ readonly key: string;
+}
- export interface KeyHook extends KeyDescriptor {
- cancel: boolean;
+export interface KeyHook extends KeyDescriptor {
+ cancel: boolean;
- callback_press: () => any;
- callback_release: () => any;
- }
+ callback_press: () => any;
+ callback_release: () => any;
+}
- export function key_description(key: KeyDescriptor) {
- let result = "";
- if(key.key_shift)
- result += " + " + tr("Shift");
- if(key.key_alt)
- result += " + " + tr("Alt");
- if(key.key_ctrl)
- result += " + " + tr("CTRL");
- if(key.key_windows)
- result += " + " + tr("Win");
+export function key_description(key: KeyDescriptor) {
+ let result = "";
+ if(key.key_shift)
+ result += " + " + tr("Shift");
+ if(key.key_alt)
+ result += " + " + tr("Alt");
+ if(key.key_ctrl)
+ result += " + " + tr("CTRL");
+ if(key.key_windows)
+ result += " + " + tr("Win");
- if(!result && !key.key_code)
- return tr("unset");
+ if(!result && !key.key_code)
+ return tr("unset");
- if(key.key_code)
- result += " + " + key.key_code;
- return result.substr(3);
- }
+ if(key.key_code)
+ result += " + " + key.key_code;
+ return result.substr(3);
}
\ No newline at end of file
diff --git a/shared/js/audio/audio.ts b/shared/js/audio/audio.ts
deleted file mode 100644
index 4314f775..00000000
--- a/shared/js/audio/audio.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace audio {
- export namespace player {
- export interface Device {
- device_id: string;
-
- driver: string;
- name: string;
- }
- }
-}
\ No newline at end of file
diff --git a/shared/js/audio/player.ts b/shared/js/audio/player.ts
new file mode 100644
index 00000000..0afb5f7c
--- /dev/null
+++ b/shared/js/audio/player.ts
@@ -0,0 +1,6 @@
+export interface Device {
+ device_id: string;
+
+ driver: string;
+ name: string;
+}
\ No newline at end of file
diff --git a/shared/js/bookmarks.ts b/shared/js/bookmarks.ts
index cb12ca5e..c16a79bf 100644
--- a/shared/js/bookmarks.ts
+++ b/shared/js/bookmarks.ts
@@ -1,262 +1,260 @@
-namespace bookmarks {
- function guid() {
- function s4() {
- return Math
- .floor((1 + Math.random()) * 0x10000)
- .toString(16)
- .substring(1);
- }
- return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
+import * as log from "tc-shared/log";
+import {LogCategory} from "tc-shared/log";
+import {guid} from "tc-shared/crypto/uid";
+import {createErrorModal, createInfoModal, createInputModal} from "tc-shared/ui/elements/Modal";
+import {default_profile, find_profile} from "tc-shared/profiles/ConnectionProfile";
+import {server_connections} from "tc-shared/ui/frames/connection_handlers";
+import {spawnConnectModal} from "tc-shared/ui/modal/ModalConnect";
+import {control_bar} from "tc-shared/ui/frames/ControlBar";
+import * as top_menu from "./ui/frames/MenuBar";
+
+export const boorkmak_connect = (mark: Bookmark, new_tab?: boolean) => {
+ const profile = find_profile(mark.connect_profile) || default_profile();
+ if(profile.valid()) {
+ const connection = (typeof(new_tab) !== "boolean" || !new_tab) ? server_connections.active_connection_handler() : server_connections.spawn_server_connection_handler();
+ server_connections.set_active_connection_handler(connection);
+ connection.startConnection(
+ mark.server_properties.server_address + ":" + mark.server_properties.server_port,
+ profile,
+ true,
+ {
+ nickname: mark.nickname === "Another TeaSpeak user" || !mark.nickname ? profile.connect_username() : mark.nickname,
+ password: mark.server_properties.server_password_hash ? {
+ password: mark.server_properties.server_password_hash,
+ hashed: true
+ } : mark.server_properties.server_password ? {
+ hashed: false,
+ password: mark.server_properties.server_password
+ } : undefined
+ }
+ );
+ } else {
+ spawnConnectModal({}, {
+ url: mark.server_properties.server_address + ":" + mark.server_properties.server_port,
+ enforce: true
+ }, {
+ profile: profile,
+ enforce: true
+ })
}
+};
- export const boorkmak_connect = (mark: Bookmark, new_tab?: boolean) => {
- const profile = profiles.find_profile(mark.connect_profile) || profiles.default_profile();
- if(profile.valid()) {
- const connection = (typeof(new_tab) !== "boolean" || !new_tab) ? server_connections.active_connection_handler() : server_connections.spawn_server_connection_handler();
- server_connections.set_active_connection_handler(connection);
- connection.startConnection(
- mark.server_properties.server_address + ":" + mark.server_properties.server_port,
- profile,
- true,
- {
- nickname: mark.nickname === "Another TeaSpeak user" || !mark.nickname ? profile.connect_username() : mark.nickname,
- password: mark.server_properties.server_password_hash ? {
- password: mark.server_properties.server_password_hash,
- hashed: true
- } : mark.server_properties.server_password ? {
- hashed: false,
- password: mark.server_properties.server_password
- } : undefined
- }
- );
- } else {
- Modals.spawnConnectModal({}, {
- url: mark.server_properties.server_address + ":" + mark.server_properties.server_port,
- enforce: true
- }, {
- profile: profile,
- enforce: true
- })
- }
- };
+export interface ServerProperties {
+ server_address: string;
+ server_port: number;
+ server_password_hash?: string;
+ server_password?: string;
+}
- export interface ServerProperties {
- server_address: string;
- server_port: number;
- server_password_hash?: string;
- server_password?: string;
- }
+export enum BookmarkType {
+ ENTRY,
+ DIRECTORY
+}
- export enum BookmarkType {
- ENTRY,
- DIRECTORY
- }
+export interface Bookmark {
+ type: /* BookmarkType.ENTRY */ BookmarkType;
+ /* readonly */ parent: DirectoryBookmark;
- export interface Bookmark {
- type: /* BookmarkType.ENTRY */ BookmarkType;
- /* readonly */ parent: DirectoryBookmark;
+ server_properties: ServerProperties;
+ display_name: string;
+ unique_id: string;
- server_properties: ServerProperties;
- display_name: string;
- unique_id: string;
+ nickname: string;
+ default_channel?: number | string;
+ default_channel_password_hash?: string;
+ default_channel_password?: string;
- nickname: string;
- default_channel?: number | string;
- default_channel_password_hash?: string;
- default_channel_password?: string;
+ connect_profile: string;
- connect_profile: string;
+ last_icon_id?: number;
+}
- last_icon_id?: number;
- }
+export interface DirectoryBookmark {
+ type: /* BookmarkType.DIRECTORY */ BookmarkType;
+ /* readonly */ parent: DirectoryBookmark;
- export interface DirectoryBookmark {
- type: /* BookmarkType.DIRECTORY */ BookmarkType;
- /* readonly */ parent: DirectoryBookmark;
+ readonly content: (Bookmark | DirectoryBookmark)[];
+ unique_id: string;
+ display_name: string;
+}
- readonly content: (Bookmark | DirectoryBookmark)[];
- unique_id: string;
- display_name: string;
- }
+interface BookmarkConfig {
+ root_bookmark?: DirectoryBookmark;
+ default_added?: boolean;
+}
- interface BookmarkConfig {
- root_bookmark?: DirectoryBookmark;
- default_added?: boolean;
- }
-
- let _bookmark_config: BookmarkConfig;
-
- function bookmark_config() : BookmarkConfig {
- if(_bookmark_config)
- return _bookmark_config;
-
- let bookmark_json = localStorage.getItem("bookmarks");
- let bookmarks;
- try {
- bookmarks = JSON.parse(bookmark_json) || {} as BookmarkConfig;
- } catch(error) {
- log.error(LogCategory.BOOKMARKS, tr("Failed to load bookmarks: %o"), error);
- bookmarks = {} as any;
- }
-
- _bookmark_config = bookmarks;
- _bookmark_config.root_bookmark = _bookmark_config.root_bookmark || { content: [], display_name: "root", type: BookmarkType.DIRECTORY} as DirectoryBookmark;
-
- if(!_bookmark_config.default_added) {
- _bookmark_config.default_added = true;
- create_bookmark("TeaSpeak official Test-Server", _bookmark_config.root_bookmark, {
- server_address: "ts.teaspeak.de",
- server_port: 9987
- }, undefined);
-
- save_config();
- }
-
- const fix_parent = (parent: DirectoryBookmark, entry: Bookmark | DirectoryBookmark) => {
- entry.parent = parent;
- if(entry.type === BookmarkType.DIRECTORY)
- for(const child of (entry as DirectoryBookmark).content)
- fix_parent(entry as DirectoryBookmark, child);
- };
- for(const entry of _bookmark_config.root_bookmark.content)
- fix_parent(_bookmark_config.root_bookmark, entry);
+let _bookmark_config: BookmarkConfig;
+function bookmark_config() : BookmarkConfig {
+ if(_bookmark_config)
return _bookmark_config;
+
+ let bookmark_json = localStorage.getItem("bookmarks");
+ let bookmarks;
+ try {
+ bookmarks = JSON.parse(bookmark_json) || {} as BookmarkConfig;
+ } catch(error) {
+ log.error(LogCategory.BOOKMARKS, tr("Failed to load bookmarks: %o"), error);
+ bookmarks = {} as any;
}
- function save_config() {
- localStorage.setItem("bookmarks", JSON.stringify(bookmark_config(), (key, value) => {
- if(key === "parent")
- return undefined;
- return value;
- }));
+ _bookmark_config = bookmarks;
+ _bookmark_config.root_bookmark = _bookmark_config.root_bookmark || { content: [], display_name: "root", type: BookmarkType.DIRECTORY} as DirectoryBookmark;
+
+ if(!_bookmark_config.default_added) {
+ _bookmark_config.default_added = true;
+ create_bookmark("TeaSpeak official Test-Server", _bookmark_config.root_bookmark, {
+ server_address: "ts.teaspeak.de",
+ server_port: 9987
+ }, undefined);
+
+ save_config();
}
- export function bookmarks() : DirectoryBookmark {
- return bookmark_config().root_bookmark;
- }
+ const fix_parent = (parent: DirectoryBookmark, entry: Bookmark | DirectoryBookmark) => {
+ entry.parent = parent;
+ if(entry.type === BookmarkType.DIRECTORY)
+ for(const child of (entry as DirectoryBookmark).content)
+ fix_parent(entry as DirectoryBookmark, child);
+ };
+ for(const entry of _bookmark_config.root_bookmark.content)
+ fix_parent(_bookmark_config.root_bookmark, entry);
- export function bookmarks_flat() : Bookmark[] {
- const result: Bookmark[] = [];
- const _flat = (bookmark: Bookmark | DirectoryBookmark) => {
- if(bookmark.type == BookmarkType.DIRECTORY)
- for(const book of (bookmark as DirectoryBookmark).content)
- _flat(book);
- else
- result.push(bookmark as Bookmark);
- };
- _flat(bookmark_config().root_bookmark);
- return result;
- }
+ return _bookmark_config;
+}
- function find_bookmark_recursive(parent: DirectoryBookmark, uuid: string) : Bookmark | DirectoryBookmark {
- for(const entry of parent.content) {
- if(entry.unique_id == uuid)
- return entry;
- if(entry.type == BookmarkType.DIRECTORY) {
- const result = find_bookmark_recursive(entry as DirectoryBookmark, uuid);
- if(result) return result;
- }
- }
- return undefined;
- }
+function save_config() {
+ localStorage.setItem("bookmarks", JSON.stringify(bookmark_config(), (key, value) => {
+ if(key === "parent")
+ return undefined;
+ return value;
+ }));
+}
- export function find_bookmark(uuid: string) : Bookmark | DirectoryBookmark | undefined {
- return find_bookmark_recursive(bookmarks(), uuid);
- }
+export function bookmarks() : DirectoryBookmark {
+ return bookmark_config().root_bookmark;
+}
- export function parent_bookmark(bookmark: Bookmark) : DirectoryBookmark {
- const books: (DirectoryBookmark | Bookmark)[] = [bookmarks()];
- while(!books.length) {
- const directory = books.pop_front();
- if(directory.type == BookmarkType.DIRECTORY) {
- const cast = directory;
-
- if(cast.content.indexOf(bookmark) != -1)
- return cast;
- books.push(...cast.content);
- }
- }
- return bookmarks();
- }
-
- export function create_bookmark(display_name: string, directory: DirectoryBookmark, server_properties: ServerProperties, nickname: string) : Bookmark {
- const bookmark = {
- display_name: display_name,
- server_properties: server_properties,
- nickname: nickname,
- type: BookmarkType.ENTRY,
- connect_profile: "default",
- unique_id: guid(),
- parent: directory
- } as Bookmark;
-
- directory.content.push(bookmark);
- return bookmark;
- }
-
- export function create_bookmark_directory(parent: DirectoryBookmark, name: string) : DirectoryBookmark {
- const bookmark = {
- type: BookmarkType.DIRECTORY,
-
- display_name: name,
- content: [],
- unique_id: guid(),
- parent: parent
- } as DirectoryBookmark;
-
- parent.content.push(bookmark);
- return bookmark;
- }
-
- //TODO test if the new parent is within the old bookmark
- export function change_directory(parent: DirectoryBookmark, bookmark: Bookmark | DirectoryBookmark) {
- delete_bookmark(bookmark);
- parent.content.push(bookmark)
- }
-
- export function save_bookmark(bookmark?: Bookmark | DirectoryBookmark) {
- save_config(); /* nvm we dont give a fuck... saving everything */
- }
-
- function delete_bookmark_recursive(parent: DirectoryBookmark, bookmark: Bookmark | DirectoryBookmark) {
- const index = parent.content.indexOf(bookmark);
- if(index != -1)
- parent.content.remove(bookmark);
+export function bookmarks_flat() : Bookmark[] {
+ const result: Bookmark[] = [];
+ const _flat = (bookmark: Bookmark | DirectoryBookmark) => {
+ if(bookmark.type == BookmarkType.DIRECTORY)
+ for(const book of (bookmark as DirectoryBookmark).content)
+ _flat(book);
else
- for(const entry of parent.content)
- if(entry.type == BookmarkType.DIRECTORY)
- delete_bookmark_recursive(entry as DirectoryBookmark, bookmark)
- }
+ result.push(bookmark as Bookmark);
+ };
+ _flat(bookmark_config().root_bookmark);
+ return result;
+}
- export function delete_bookmark(bookmark: Bookmark | DirectoryBookmark) {
- delete_bookmark_recursive(bookmarks(), bookmark)
- }
-
- export function add_current_server() {
- const ch = server_connections.active_connection_handler();
- if(ch && ch.connected) {
- const ce = ch.getClient();
- const name = ce ? ce.clientNickName() : undefined;
- createInputModal(tr("Enter bookmarks name"), tr("Please enter the bookmarks name:
"), text => text.length > 0, result => { - if(result) { - const bookmark = create_bookmark(result as string, bookmarks(), { - server_port: ch.serverConnection.remote_address().port, - server_address: ch.serverConnection.remote_address().host, - - server_password: "", - server_password_hash: "" - }, name); - save_bookmark(bookmark); - - control_bar.update_bookmarks(); - top_menu.rebuild_bookmarks(); - - createInfoModal(tr("Server added"), tr("Server has been successfully added to your bookmarks.")).open(); - } - }).open(); - } else { - createErrorModal(tr("You have to be connected"), tr("You have to be connected!")).open(); +function find_bookmark_recursive(parent: DirectoryBookmark, uuid: string) : Bookmark | DirectoryBookmark { + for(const entry of parent.content) { + if(entry.unique_id == uuid) + return entry; + if(entry.type == BookmarkType.DIRECTORY) { + const result = find_bookmark_recursive(entry as DirectoryBookmark, uuid); + if(result) return result; } } + return undefined; +} + +export function find_bookmark(uuid: string) : Bookmark | DirectoryBookmark | undefined { + return find_bookmark_recursive(bookmarks(), uuid); +} + +export function parent_bookmark(bookmark: Bookmark) : DirectoryBookmark { + const books: (DirectoryBookmark | Bookmark)[] = [bookmarks()]; + while(!books.length) { + const directory = books.pop_front(); + if(directory.type == BookmarkType.DIRECTORY) { + const cast =directory;
+
+ if(cast.content.indexOf(bookmark) != -1)
+ return cast;
+ books.push(...cast.content);
+ }
+ }
+ return bookmarks();
+}
+
+export function create_bookmark(display_name: string, directory: DirectoryBookmark, server_properties: ServerProperties, nickname: string) : Bookmark {
+ const bookmark = {
+ display_name: display_name,
+ server_properties: server_properties,
+ nickname: nickname,
+ type: BookmarkType.ENTRY,
+ connect_profile: "default",
+ unique_id: guid(),
+ parent: directory
+ } as Bookmark;
+
+ directory.content.push(bookmark);
+ return bookmark;
+}
+
+export function create_bookmark_directory(parent: DirectoryBookmark, name: string) : DirectoryBookmark {
+ const bookmark = {
+ type: BookmarkType.DIRECTORY,
+
+ display_name: name,
+ content: [],
+ unique_id: guid(),
+ parent: parent
+ } as DirectoryBookmark;
+
+ parent.content.push(bookmark);
+ return bookmark;
+}
+
+//TODO test if the new parent is within the old bookmark
+export function change_directory(parent: DirectoryBookmark, bookmark: Bookmark | DirectoryBookmark) {
+ delete_bookmark(bookmark);
+ parent.content.push(bookmark)
+}
+
+export function save_bookmark(bookmark?: Bookmark | DirectoryBookmark) {
+ save_config(); /* nvm we dont give a fuck... saving everything */
+}
+
+function delete_bookmark_recursive(parent: DirectoryBookmark, bookmark: Bookmark | DirectoryBookmark) {
+ const index = parent.content.indexOf(bookmark);
+ if(index != -1)
+ parent.content.remove(bookmark);
+ else
+ for(const entry of parent.content)
+ if(entry.type == BookmarkType.DIRECTORY)
+ delete_bookmark_recursive(entry as DirectoryBookmark, bookmark)
+}
+
+export function delete_bookmark(bookmark: Bookmark | DirectoryBookmark) {
+ delete_bookmark_recursive(bookmarks(), bookmark)
+}
+
+export function add_current_server() {
+ const ch = server_connections.active_connection_handler();
+ if(ch && ch.connected) {
+ const ce = ch.getClient();
+ const name = ce ? ce.clientNickName() : undefined;
+ createInputModal(tr("Enter bookmarks name"), tr("Please enter the bookmarks name:
"), text => text.length > 0, result => { + if(result) { + const bookmark = create_bookmark(result as string, bookmarks(), { + server_port: ch.serverConnection.remote_address().port, + server_address: ch.serverConnection.remote_address().host, + + server_password: "", + server_password_hash: "" + }, name); + save_bookmark(bookmark); + + control_bar.update_bookmarks(); + top_menu.rebuild_bookmarks(); + + createInfoModal(tr("Server added"), tr("Server has been successfully added to your bookmarks.")).open(); + } + }).open(); + } else { + createErrorModal(tr("You have to be connected"), tr("You have to be connected!")).open(); + } } \ No newline at end of file diff --git a/shared/js/connection/AbstractCommandHandler.ts b/shared/js/connection/AbstractCommandHandler.ts new file mode 100644 index 00000000..c545574c --- /dev/null +++ b/shared/js/connection/AbstractCommandHandler.ts @@ -0,0 +1,98 @@ +import { + AbstractServerConnection, + ServerCommand, + SingleCommandHandler +} from "tc-shared/connection/ConnectionBase"; + +export abstract class AbstractCommandHandler { + readonly connection: AbstractServerConnection; + + handler_boss: AbstractCommandHandlerBoss | undefined; + volatile_handler_boss: boolean = false; /* if true than the command handler could be registered twice to two or more handlers */ + + ignore_consumed: boolean = false; + + protected constructor(connection: AbstractServerConnection) { + this.connection = connection; + } + + /** + * @return If the command should be consumed + */ + abstract handle_command(command: ServerCommand) : boolean; +} + +export abstract class AbstractCommandHandlerBoss { + readonly connection: AbstractServerConnection; + protected command_handlers: AbstractCommandHandler[] = []; + /* TODO: Timeout */ + protected single_command_handler: SingleCommandHandler[] = []; + + protected constructor(connection: AbstractServerConnection) { + this.connection = connection; + } + + destroy() { + this.command_handlers = undefined; + this.single_command_handler = undefined; + } + + register_handler(handler: AbstractCommandHandler) { + if(!handler.volatile_handler_boss && handler.handler_boss) + throw "handler already registered"; + + this.command_handlers.remove(handler); /* just to be sure */ + this.command_handlers.push(handler); + handler.handler_boss = this; + } + + unregister_handler(handler: AbstractCommandHandler) { + if(!handler.volatile_handler_boss && handler.handler_boss !== this) { + console.warn(tr("Tried to unregister command handler which does not belong to the handler boss")); + return; + } + + this.command_handlers.remove(handler); + handler.handler_boss = undefined; + } + + + register_single_handler(handler: SingleCommandHandler) { + this.single_command_handler.push(handler); + } + + remove_single_handler(handler: SingleCommandHandler) { + this.single_command_handler.remove(handler); + } + + handlers() : AbstractCommandHandler[] { + return this.command_handlers; + } + + invoke_handle(command: ServerCommand) : boolean { + let flag_consumed = false; + + for(const handler of this.command_handlers) { + try { + if(!flag_consumed || handler.ignore_consumed) + flag_consumed = flag_consumed || handler.handle_command(command); + } catch(error) { + console.error(tr("Failed to invoke command handler. Invocation results in an exception: %o"), error); + } + } + + for(const handler of [...this.single_command_handler]) { + if(handler.command && handler.command != command.command) + continue; + + try { + if(handler.function(command)) + this.single_command_handler.remove(handler); + } catch(error) { + console.error(tr("Failed to invoke single command handler. Invocation results in an exception: %o"), error); + } + } + + return flag_consumed; + } +} \ No newline at end of file diff --git a/shared/js/connection/CommandHandler.ts b/shared/js/connection/CommandHandler.ts index f5e4bfed..1620d8b5 100644 --- a/shared/js/connection/CommandHandler.ts +++ b/shared/js/connection/CommandHandler.ts @@ -1,309 +1,465 @@ -///, options: CommandOptions) {
+ if(!options.process_result)
+ return promise;
+
+ return promise.catch(ex => {
+ if(options.process_result) {
+ if(ex instanceof CommandResult) {
+ let res = ex;
+ if(!res.success) {
+ if(res.id == ErrorID.PERMISSION_ERROR) { //Permission error
+ const permission = this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number);
+ res.message = tr("Insufficient client permissions. Failed on permission ") + (permission ? permission.name : "unknown");
+ this.connection_handler.log.log(server_log.Type.ERROR_PERMISSION, {
+ permission: this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number)
+ });
+ this.connection_handler.sound.play(Sound.ERROR_INSUFFICIENT_PERMISSIONS);
+ } else if(res.id != ErrorID.EMPTY_RESULT) {
+ this.connection_handler.log.log(server_log.Type.ERROR_CUSTOM, {
+ message: res.extra_message.length == 0 ? res.message : res.extra_message
+ });
+ }
+ }
+ } else if(typeof(ex) === "string") {
+ this.connection_handler.log.log(server_log.Type.CONNECTION_COMMAND_ERROR, {error: ex});
+ } else {
+ log.error(LogCategory.NETWORKING, tr("Invalid promise result type: %s. Result: %o"), typeof (ex), ex);
+ }
+ }
+
+ return Promise.reject(ex);
+ });
+ }
+
+ handle_command(command: ServerCommand) : boolean {
+ if(this[command.command]) {
+ this[command.command](command.arguments);
+ return true;
+ }
+
+ return false;
+ }
+
+ set_handler(command: string, handler: any) {
+ this[command] = handler;
+ }
+
+ unset_handler(command: string, handler?: any) {
+ if(handler && this[command] != handler) return;
+ this[command] = undefined;
+ }
+
+ handleCommandResult(json) {
+ json = json[0]; //Only one bulk
+
+ let code : string = json["return_code"];
+ if(!code || code.length == 0) {
+ log.warn(LogCategory.NETWORKING, tr("Invalid return code! (%o)"), json);
+ return;
+ }
+ let retListeners = this.connection["_retListener"];
+
+ for(let e of retListeners) {
+ if(e.code != code) continue;
+ retListeners.remove(e);
+ let result = new CommandResult(json);
+ if(result.success)
+ e.resolve(result);
+ else
+ e.reject(result);
+ break;
}
}
- export class ConnectionCommandHandler extends AbstractCommandHandler {
- readonly connection: AbstractServerConnection;
- readonly connection_handler: ConnectionHandler;
-
- constructor(connection: AbstractServerConnection) {
- super(connection);
- this.connection_handler = connection.client;
-
- this["error"] = this.handleCommandResult;
- this["channellist"] = this.handleCommandChannelList;
- this["channellistfinished"] = this.handleCommandChannelListFinished;
- this["notifychannelcreated"] = this.handleCommandChannelCreate;
- this["notifychanneldeleted"] = this.handleCommandChannelDelete;
- this["notifychannelhide"] = this.handleCommandChannelHide;
- this["notifychannelshow"] = this.handleCommandChannelShow;
-
- this["notifyserverconnectioninfo"] = this.handleNotifyServerConnectionInfo;
- this["notifyconnectioninfo"] = this.handleNotifyConnectionInfo;
-
- this["notifycliententerview"] = this.handleCommandClientEnterView;
- this["notifyclientleftview"] = this.handleCommandClientLeftView;
- this["notifyclientmoved"] = this.handleNotifyClientMoved;
- this["initserver"] = this.handleCommandServerInit;
- this["notifychannelmoved"] = this.handleNotifyChannelMoved;
- this["notifychanneledited"] = this.handleNotifyChannelEdited;
- this["notifytextmessage"] = this.handleNotifyTextMessage;
- this["notifyclientchatcomposing"] = this.notifyClientChatComposing;
- this["notifyclientchatclosed"] = this.handleNotifyClientChatClosed;
- this["notifyclientupdated"] = this.handleNotifyClientUpdated;
- this["notifyserveredited"] = this.handleNotifyServerEdited;
- this["notifyserverupdated"] = this.handleNotifyServerUpdated;
-
- this["notifyclientpoke"] = this.handleNotifyClientPoke;
-
- this["notifymusicplayerinfo"] = this.handleNotifyMusicPlayerInfo;
-
- this["notifyservergroupclientadded"] = this.handleNotifyServerGroupClientAdd;
- this["notifyservergroupclientdeleted"] = this.handleNotifyServerGroupClientRemove;
- this["notifyclientchannelgroupchanged"] = this.handleNotifyClientChannelGroupChanged;
-
- this["notifychannelsubscribed"] = this.handleNotifyChannelSubscribed;
- this["notifychannelunsubscribed"] = this.handleNotifyChannelUnsubscribed;
-
- this["notifyconversationhistory"] = this.handleNotifyConversationHistory;
- this["notifyconversationmessagedelete"] = this.handleNotifyConversationMessageDelete;
-
- this["notifymusicstatusupdate"] = this.handleNotifyMusicStatusUpdate;
- this["notifymusicplayersongchange"] = this.handleMusicPlayerSongChange;
-
- this["notifyplaylistsongadd"] = this.handleNotifyPlaylistSongAdd;
- this["notifyplaylistsongremove"] = this.handleNotifyPlaylistSongRemove;
- this["notifyplaylistsongreorder"] = this.handleNotifyPlaylistSongReorder;
- this["notifyplaylistsongloaded"] = this.handleNotifyPlaylistSongLoaded;
+ handleCommandServerInit(json){
+ //We could setup the voice channel
+ if(this.connection.support_voice()) {
+ log.debug(LogCategory.NETWORKING, tr("Setting up voice"));
+ } else {
+ log.debug(LogCategory.NETWORKING, tr("Skipping voice setup (No voice bridge available)"));
}
- private loggable_invoker(unique_id, client_id, name) : log.server.base.Client | undefined {
- const id = parseInt(client_id);
- if(typeof(client_id) === "undefined" || Number.isNaN(id))
- return undefined;
- if(id == 0)
- return {
- client_id: 0,
- client_unique_id: this.connection_handler.channelTree.server.properties.virtualserver_unique_identifier,
- client_name: this.connection_handler.channelTree.server.properties.virtualserver_name,
- };
+ json = json[0]; //Only one bulk
- return {
- client_unique_id: unique_id,
- client_name: name,
- client_id: client_id
- };
+ this.connection_handler.channelTree.registerClient(this.connection_handler.getClient());
+ this.connection.client.side_bar.channel_conversations().reset();
+ this.connection.client.clientId = parseInt(json["aclid"]);
+ this.connection.client.getClient().updateVariables( {key: "client_nickname", value: json["acn"]});
+
+ let updates: {
+ key: string,
+ value: string
+ }[] = [];
+ for(let key in json) {
+ if(key === "aclid") continue;
+ if(key === "acn") continue;
+
+ updates.push({key: key, value: json[key]});
}
+ this.connection.client.channelTree.server.updateVariables(false, ...updates);
- proxy_command_promise(promise: Promise, options: connection.CommandOptions) {
- if(!options.process_result)
- return promise;
-
- return promise.catch(ex => {
- if(options.process_result) {
- if(ex instanceof CommandResult) {
- let res = ex;
- if(!res.success) {
- if(res.id == ErrorID.PERMISSION_ERROR) { //Permission error
- const permission = this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number);
- res.message = tr("Insufficient client permissions. Failed on permission ") + (permission ? permission.name : "unknown");
- this.connection_handler.log.log(log.server.Type.ERROR_PERMISSION, {
- permission: this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number)
- });
- this.connection_handler.sound.play(Sound.ERROR_INSUFFICIENT_PERMISSIONS);
- } else if(res.id != ErrorID.EMPTY_RESULT) {
- this.connection_handler.log.log(log.server.Type.ERROR_CUSTOM, {
- message: res.extra_message.length == 0 ? res.message : res.extra_message
- });
- }
- }
- } else if(typeof(ex) === "string") {
- this.connection_handler.log.log(log.server.Type.CONNECTION_COMMAND_ERROR, {error: ex});
- } else {
- log.error(LogCategory.NETWORKING, tr("Invalid promise result type: %s. Result: %o"), typeof (ex), ex);
- }
- }
-
- return Promise.reject(ex);
- });
- }
-
- handle_command(command: ServerCommand) : boolean {
- if(this[command.command]) {
- this[command.command](command.arguments);
- return true;
- }
-
- return false;
- }
-
- set_handler(command: string, handler: any) {
- this[command] = handler;
- }
-
- unset_handler(command: string, handler?: any) {
- if(handler && this[command] != handler) return;
- this[command] = undefined;
- }
-
- handleCommandResult(json) {
- json = json[0]; //Only one bulk
-
- let code : string = json["return_code"];
- if(!code || code.length == 0) {
- log.warn(LogCategory.NETWORKING, tr("Invalid return code! (%o)"), json);
- return;
- }
- let retListeners = this.connection["_retListener"];
-
- for(let e of retListeners) {
- if(e.code != code) continue;
- retListeners.remove(e);
- let result = new CommandResult(json);
- if(result.success)
- e.resolve(result);
- else
- e.reject(result);
- break;
- }
- }
-
- handleCommandServerInit(json){
- //We could setup the voice channel
- if(this.connection.support_voice()) {
- log.debug(LogCategory.NETWORKING, tr("Setting up voice"));
- } else {
- log.debug(LogCategory.NETWORKING, tr("Skipping voice setup (No voice bridge available)"));
- }
-
-
- json = json[0]; //Only one bulk
-
- this.connection_handler.channelTree.registerClient(this.connection_handler.getClient());
- this.connection.client.side_bar.channel_conversations().reset();
- this.connection.client.clientId = parseInt(json["aclid"]);
- this.connection.client.getClient().updateVariables( {key: "client_nickname", value: json["acn"]});
-
- let updates: {
- key: string,
- value: string
- }[] = [];
- for(let key in json) {
- if(key === "aclid") continue;
- if(key === "acn") continue;
-
- updates.push({key: key, value: json[key]});
- }
- this.connection.client.channelTree.server.updateVariables(false, ...updates);
-
- const properties = this.connection.client.channelTree.server.properties;
- /* host message */
- if(properties.virtualserver_hostmessage_mode > 0) {
- if(properties.virtualserver_hostmessage_mode == 1) {
- /* show in log */
- this.connection_handler.log.log(log.server.Type.SERVER_HOST_MESSAGE, {
- message: properties.virtualserver_hostmessage
- });
- } else {
- /* create modal/create modal and quit */
- createModal({
- header: tr("Host message"),
- body: MessageHelper.bbcode_chat(properties.virtualserver_hostmessage),
- footer: undefined
- }).open();
-
- if(properties.virtualserver_hostmessage_mode == 3) {
- /* first let the client initialize his stuff */
- setTimeout(() => {
- this.connection_handler.log.log(log.server.Type.SERVER_HOST_MESSAGE_DISCONNECT, {
- message: properties.virtualserver_welcomemessage
- });
-
- this.connection.disconnect("host message disconnect");
- this.connection_handler.handleDisconnect(DisconnectReason.SERVER_HOSTMESSAGE);
- this.connection_handler.sound.play(Sound.CONNECTION_DISCONNECTED);
- }, 100);
- }
- }
- }
-
- /* welcome message */
- if(properties.virtualserver_welcomemessage) {
- this.connection_handler.log.log(log.server.Type.SERVER_WELCOME_MESSAGE, {
- message: properties.virtualserver_welcomemessage
+ const properties = this.connection.client.channelTree.server.properties;
+ /* host message */
+ if(properties.virtualserver_hostmessage_mode > 0) {
+ if(properties.virtualserver_hostmessage_mode == 1) {
+ /* show in log */
+ this.connection_handler.log.log(server_log.Type.SERVER_HOST_MESSAGE, {
+ message: properties.virtualserver_hostmessage
});
- }
+ } else {
+ /* create modal/create modal and quit */
+ createModal({
+ header: tr("Host message"),
+ body: bbcode_chat(properties.virtualserver_hostmessage),
+ footer: undefined
+ }).open();
- /* priviledge key */
- if(properties.virtualserver_ask_for_privilegekey) {
- createInputModal(tr("Use a privilege key"), tr("This is a newly created server for which administrator privileges have not yet been claimed.
Please enter the \"privilege key\" that was automatically generated when this server was created to gain administrator permissions."), message => message.length > 0, result => { - if(!result) return; - const scon = server_connections.active_connection_handler(); - - if(scon.serverConnection.connected) - scon.serverConnection.send_command("tokenuse", { - token: result - }).then(() => { - createInfoModal(tr("Use privilege key"), tr("Privilege key successfully used!")).open(); - }).catch(error => { - createErrorModal(tr("Use privilege key"), MessageHelper.formatMessage(tr("Failed to use privilege key: {}"), error instanceof CommandResult ? error.message : error)).open(); + if(properties.virtualserver_hostmessage_mode == 3) { + /* first let the client initialize his stuff */ + setTimeout(() => { + this.connection_handler.log.log(server_log.Type.SERVER_HOST_MESSAGE_DISCONNECT, { + message: properties.virtualserver_welcomemessage }); - }, { field_placeholder: 'Enter Privilege Key' }).open(); - } - this.connection_handler.log.log(log.server.Type.CONNECTION_CONNECTED, { - own_client: this.connection_handler.getClient().log_data() - }); - this.connection_handler.sound.play(Sound.CONNECTION_CONNECTED); - this.connection.client.onConnected(); - } - - handleNotifyServerConnectionInfo(json) { - json = json[0]; - - /* everything is a number, so lets parse it */ - for(const key of Object.keys(json)) - json[key] = parseFloat(json[key]); - - this.connection_handler.channelTree.server.set_connection_info(json); - } - - handleNotifyConnectionInfo(json) { - json = json[0]; - - const object = new ClientConnectionInfo(); - /* everything is a number (except ip), so lets parse it */ - for(const key of Object.keys(json)) { - if(key === "connection_client_ip") - object[key] = json[key]; - else - object[key] = parseFloat(json[key]); - } - - const client = this.connection_handler.channelTree.findClient(parseInt(json["clid"])); - if(!client) { - log.warn(LogCategory.NETWORKING, tr("Received client connection info for unknown client (%o)"), json["clid"]); - return; - } - - client.set_connection_info(object); - } - - private createChannelFromJson(json, ignoreOrder: boolean = false) { - let tree = this.connection.client.channelTree; - - let channel = new ChannelEntry(parseInt(json["cid"]), json["channel_name"], tree.findChannel(json["cpid"])); - tree.insertChannel(channel); - if(json["channel_order"] !== "0") { - let prev = tree.findChannel(json["channel_order"]); - if(!prev && json["channel_order"] != 0) { - if(!ignoreOrder) { - log.error(LogCategory.NETWORKING, tr("Invalid channel order id!")); - return; - } + this.connection.disconnect("host message disconnect"); + this.connection_handler.handleDisconnect(DisconnectReason.SERVER_HOSTMESSAGE); + this.connection_handler.sound.play(Sound.CONNECTION_DISCONNECTED); + }, 100); } + } + } - let parent = tree.findChannel(json["cpid"]); - if(!parent && json["cpid"] != 0) { - log.error(LogCategory.NETWORKING, tr("Invalid channel parent")); + /* welcome message */ + if(properties.virtualserver_welcomemessage) { + this.connection_handler.log.log(server_log.Type.SERVER_WELCOME_MESSAGE, { + message: properties.virtualserver_welcomemessage + }); + } + + /* priviledge key */ + if(properties.virtualserver_ask_for_privilegekey) { + createInputModal(tr("Use a privilege key"), tr("This is a newly created server for which administrator privileges have not yet been claimed.
Please enter the \"privilege key\" that was automatically generated when this server was created to gain administrator permissions."), message => message.length > 0, result => { + if(!result) return; + const scon = server_connections.active_connection_handler(); + + if(scon.serverConnection.connected) + scon.serverConnection.send_command("tokenuse", { + token: result + }).then(() => { + createInfoModal(tr("Use privilege key"), tr("Privilege key successfully used!")).open(); + }).catch(error => { + createErrorModal(tr("Use privilege key"), formatMessage(tr("Failed to use privilege key: {}"), error instanceof CommandResult ? error.message : error)).open(); + }); + }, { field_placeholder: 'Enter Privilege Key' }).open(); + } + + this.connection_handler.log.log(server_log.Type.CONNECTION_CONNECTED, { + own_client: this.connection_handler.getClient().log_data() + }); + this.connection_handler.sound.play(Sound.CONNECTION_CONNECTED); + this.connection.client.onConnected(); + } + + handleNotifyServerConnectionInfo(json) { + json = json[0]; + + /* everything is a number, so lets parse it */ + for(const key of Object.keys(json)) + json[key] = parseFloat(json[key]); + + this.connection_handler.channelTree.server.set_connection_info(json); + } + + handleNotifyConnectionInfo(json) { + json = json[0]; + + const object = new ClientConnectionInfo(); + /* everything is a number (except ip), so lets parse it */ + for(const key of Object.keys(json)) { + if(key === "connection_client_ip") + object[key] = json[key]; + else + object[key] = parseFloat(json[key]); + } + + const client = this.connection_handler.channelTree.findClient(parseInt(json["clid"])); + if(!client) { + log.warn(LogCategory.NETWORKING, tr("Received client connection info for unknown client (%o)"), json["clid"]); + return; + } + + client.set_connection_info(object); + } + + private createChannelFromJson(json, ignoreOrder: boolean = false) { + let tree = this.connection.client.channelTree; + + let channel = new ChannelEntry(parseInt(json["cid"]), json["channel_name"], tree.findChannel(json["cpid"])); + tree.insertChannel(channel); + if(json["channel_order"] !== "0") { + let prev = tree.findChannel(json["channel_order"]); + if(!prev && json["channel_order"] != 0) { + if(!ignoreOrder) { + log.error(LogCategory.NETWORKING, tr("Invalid channel order id!")); return; } - tree.moveChannel(channel, prev, parent); //TODO test if channel exists! } - if(ignoreOrder) { - for(let ch of tree.channels) { - if(ch.properties.channel_order == channel.channelId) { - tree.moveChannel(ch, channel, channel.parent); //Corrent the order :) - } + + let parent = tree.findChannel(json["cpid"]); + if(!parent && json["cpid"] != 0) { + log.error(LogCategory.NETWORKING, tr("Invalid channel parent")); + return; + } + tree.moveChannel(channel, prev, parent); //TODO test if channel exists! + } + if(ignoreOrder) { + for(let ch of tree.channels) { + if(ch.properties.channel_order == channel.channelId) { + tree.moveChannel(ch, channel, channel.parent); //Corrent the order :) + } + } + } + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "cid") continue; + if(key === "cpid") continue; + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + + updates.push({key: key, value: json[key]}); + } + channel.updateVariables(...updates); + } + + handleCommandChannelList(json) { + this.connection.client.channelTree.hide_channel_tree(); /* dont perform channel inserts on the dom to prevent style recalculations */ + log.debug(LogCategory.NETWORKING, tr("Got %d new channels"), json.length); + for(let index = 0; index < json.length; index++) + this.createChannelFromJson(json[index], true); + } + + + handleCommandChannelListFinished(json) { + this.connection.client.channelTree.show_channel_tree(); + } + + handleCommandChannelCreate(json) { + this.createChannelFromJson(json[0]); + } + + handleCommandChannelShow(json) { + this.createChannelFromJson(json[0]); //TODO may chat? + } + + handleCommandChannelDelete(json) { + let tree = this.connection.client.channelTree; + const conversations = this.connection.client.side_bar.channel_conversations(); + + log.info(LogCategory.NETWORKING, tr("Got %d channel deletions"), json.length); + for(let index = 0; index < json.length; index++) { + conversations.delete_conversation(parseInt(json[index]["cid"])); + let channel = tree.findChannel(json[index]["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Invalid channel onDelete (Unknown channel)")); + continue; + } + tree.deleteChannel(channel); + } + } + + handleCommandChannelHide(json) { + let tree = this.connection.client.channelTree; + const conversations = this.connection.client.side_bar.channel_conversations(); + + log.info(LogCategory.NETWORKING, tr("Got %d channel hides"), json.length); + for(let index = 0; index < json.length; index++) { + conversations.delete_conversation(parseInt(json[index]["cid"])); + let channel = tree.findChannel(json[index]["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Invalid channel on hide (Unknown channel)")); + continue; + } + tree.deleteChannel(channel); + } + } + + handleCommandClientEnterView(json) { + let tree = this.connection.client.channelTree; + + let client: ClientEntry; + let channel = undefined; + let old_channel = undefined; + let reason_id, reason_msg; + + let invokerid, invokername, invokeruid; + + for(const entry of json) { + /* attempt to update properties if given */ + channel = typeof(entry["ctid"]) !== "undefined" ? tree.findChannel(parseInt(entry["ctid"])) : channel; + old_channel = typeof(entry["cfid"]) !== "undefined" ? tree.findChannel(parseInt(entry["cfid"])) : old_channel; + reason_id = typeof(entry["reasonid"]) !== "undefined" ? entry["reasonid"] : reason_id; + reason_msg = typeof(entry["reason_msg"]) !== "undefined" ? entry["reason_msg"] : reason_msg; + + invokerid = typeof(entry["invokerid"]) !== "undefined" ? parseInt(entry["invokerid"]) : invokerid; + invokername = typeof(entry["invokername"]) !== "undefined" ? entry["invokername"] : invokername; + invokeruid = typeof(entry["invokeruid"]) !== "undefined" ? entry["invokeruid"] : invokeruid; + + client = tree.findClient(parseInt(entry["clid"])); + + if(!client) { + if(parseInt(entry["client_type_exact"]) == ClientType.CLIENT_MUSIC) { + client = new MusicClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); + } else { + client = new ClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); + } + + client.properties.client_type = parseInt(entry["client_type"]); + client = tree.insertClient(client, channel); + } else { + tree.moveClient(client, channel); + } + + if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { + const own_channel = this.connection.client.getClient().currentChannel(); + this.connection_handler.log.log(server_log.Type.CLIENT_VIEW_ENTER, { + channel_from: old_channel ? old_channel.log_data() : undefined, + channel_to: channel ? channel.log_data() : undefined, + client: client.log_data(), + invoker: this.loggable_invoker(invokeruid, invokerid, invokername), + message:reason_msg, + reason: parseInt(reason_id), + own_channel: channel == own_channel + }); + + if(reason_id == ViewReasonId.VREASON_USER_ACTION) { + if(own_channel == channel) + if(old_channel) + this.connection_handler.sound.play(Sound.USER_ENTERED); + else + this.connection_handler.sound.play(Sound.USER_ENTERED_CONNECT); + } else if(reason_id == ViewReasonId.VREASON_MOVED) { + if(own_channel == channel) + this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); + } else if(reason_id == ViewReasonId.VREASON_CHANNEL_KICK) { + if(own_channel == channel) + this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); + } else if(reason_id == ViewReasonId.VREASON_SYSTEM) { + + } else { + console.warn(tr("Unknown reasonid for %o"), reason_id); } } @@ -311,159 +467,113 @@ namespace connection { key: string, value: string }[] = []; - for(let key in json) { - if(key === "cid") continue; - if(key === "cpid") continue; + + for(let key in entry) { + if(key == "cfid") continue; + if(key == "ctid") continue; if(key === "invokerid") continue; if(key === "invokername") continue; if(key === "invokeruid") continue; if(key === "reasonid") continue; - updates.push({key: key, value: json[key]}); + updates.push({key: key, value: entry[key]}); } - channel.updateVariables(...updates); - } - handleCommandChannelList(json) { - this.connection.client.channelTree.hide_channel_tree(); /* dont perform channel inserts on the dom to prevent style recalculations */ - log.debug(LogCategory.NETWORKING, tr("Got %d new channels"), json.length); - for(let index = 0; index < json.length; index++) - this.createChannelFromJson(json[index], true); - } + client.updateVariables(...updates); + /* if its a new client join, or a system reason (like we joined) */ + if(!old_channel || reason_id == 2) { + /* client new join */ + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + unique_id: client.properties.client_unique_identifier, + client_id: client.clientId(), + name: client.clientNickName() + }, { + create: false, + attach: true + }); + if(conversation) + client.flag_text_unread = conversation.is_unread(); + } - handleCommandChannelListFinished(json) { - this.connection.client.channelTree.show_channel_tree(); - } - - handleCommandChannelCreate(json) { - this.createChannelFromJson(json[0]); - } - - handleCommandChannelShow(json) { - this.createChannelFromJson(json[0]); //TODO may chat? - } - - handleCommandChannelDelete(json) { - let tree = this.connection.client.channelTree; - const conversations = this.connection.client.side_bar.channel_conversations(); - - log.info(LogCategory.NETWORKING, tr("Got %d channel deletions"), json.length); - for(let index = 0; index < json.length; index++) { - conversations.delete_conversation(parseInt(json[index]["cid"])); - let channel = tree.findChannel(json[index]["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Invalid channel onDelete (Unknown channel)")); - continue; - } - tree.deleteChannel(channel); + if(client instanceof LocalClientEntry) { + client.initializeListener(); + this.connection_handler.update_voice_status(); + this.connection_handler.side_bar.info_frame().update_channel_talk(); + const conversations = this.connection.client.side_bar.channel_conversations(); + conversations.set_current_channel(client.currentChannel().channelId); } } + } - handleCommandChannelHide(json) { + handleCommandClientLeftView(json) { + let reason_id = -1; + + for(const entry of json) { + reason_id = entry["reasonid"] || reason_id; let tree = this.connection.client.channelTree; - const conversations = this.connection.client.side_bar.channel_conversations(); - - log.info(LogCategory.NETWORKING, tr("Got %d channel hides"), json.length); - for(let index = 0; index < json.length; index++) { - conversations.delete_conversation(parseInt(json[index]["cid"])); - let channel = tree.findChannel(json[index]["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Invalid channel on hide (Unknown channel)")); - continue; - } - tree.deleteChannel(channel); + let client = tree.findClient(entry["clid"]); + if(!client) { + log.error(LogCategory.NETWORKING, tr("Unknown client left!")); + return 0; } - } - - handleCommandClientEnterView(json) { - let tree = this.connection.client.channelTree; - - let client: ClientEntry; - let channel = undefined; - let old_channel = undefined; - let reason_id, reason_msg; - - let invokerid, invokername, invokeruid; - - for(const entry of json) { - /* attempt to update properties if given */ - channel = typeof(entry["ctid"]) !== "undefined" ? tree.findChannel(parseInt(entry["ctid"])) : channel; - old_channel = typeof(entry["cfid"]) !== "undefined" ? tree.findChannel(parseInt(entry["cfid"])) : old_channel; - reason_id = typeof(entry["reasonid"]) !== "undefined" ? entry["reasonid"] : reason_id; - reason_msg = typeof(entry["reason_msg"]) !== "undefined" ? entry["reason_msg"] : reason_msg; - - invokerid = typeof(entry["invokerid"]) !== "undefined" ? parseInt(entry["invokerid"]) : invokerid; - invokername = typeof(entry["invokername"]) !== "undefined" ? entry["invokername"] : invokername; - invokeruid = typeof(entry["invokeruid"]) !== "undefined" ? entry["invokeruid"] : invokeruid; - - client = tree.findClient(parseInt(entry["clid"])); - - if(!client) { - if(parseInt(entry["client_type_exact"]) == ClientType.CLIENT_MUSIC) { - client = new MusicClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); - } else { - client = new ClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); - } - - client.properties.client_type = parseInt(entry["client_type"]); - client = tree.insertClient(client, channel); + if(client == this.connection.client.getClient()) { + if(reason_id == ViewReasonId.VREASON_BAN) { + this.connection.client.handleDisconnect(DisconnectReason.CLIENT_BANNED, entry); + } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { + this.connection.client.handleDisconnect(DisconnectReason.CLIENT_KICKED, entry); + } else if(reason_id == ViewReasonId.VREASON_SERVER_SHUTDOWN) { + this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); + } else if(reason_id == ViewReasonId.VREASON_SERVER_STOPPED) { + this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); } else { - tree.moveClient(client, channel); + this.connection.client.handleDisconnect(DisconnectReason.UNKNOWN, entry); } + this.connection_handler.side_bar.info_frame().update_channel_talk(); + return; + } - if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { - const own_channel = this.connection.client.getClient().currentChannel(); - this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_ENTER, { - channel_from: old_channel ? old_channel.log_data() : undefined, - channel_to: channel ? channel.log_data() : undefined, - client: client.log_data(), - invoker: this.loggable_invoker(invokeruid, invokerid, invokername), - message:reason_msg, - reason: parseInt(reason_id), - own_channel: channel == own_channel - }); + if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { + const own_channel = this.connection.client.getClient().currentChannel(); + let channel_from = tree.findChannel(entry["cfid"]); + let channel_to = tree.findChannel(entry["ctid"]); + + const is_own_channel = channel_from == own_channel; + this.connection_handler.log.log(server_log.Type.CLIENT_VIEW_LEAVE, { + channel_from: channel_from ? channel_from.log_data() : undefined, + channel_to: channel_to ? channel_to.log_data() : undefined, + client: client.log_data(), + invoker: this.loggable_invoker(entry["invokeruid"], entry["invokerid"], entry["invokername"]), + message: entry["reasonmsg"], + reason: parseInt(entry["reasonid"]), + ban_time: parseInt(entry["bantime"]), + own_channel: is_own_channel + }); + + if(is_own_channel) { if(reason_id == ViewReasonId.VREASON_USER_ACTION) { - if(own_channel == channel) - if(old_channel) - this.connection_handler.sound.play(Sound.USER_ENTERED); - else - this.connection_handler.sound.play(Sound.USER_ENTERED_CONNECT); - } else if(reason_id == ViewReasonId.VREASON_MOVED) { - if(own_channel == channel) - this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); + this.connection_handler.sound.play(Sound.USER_LEFT); + } else if(reason_id == ViewReasonId.VREASON_SERVER_LEFT) { + this.connection_handler.sound.play(Sound.USER_LEFT_DISCONNECT); + } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { + this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_SERVER); } else if(reason_id == ViewReasonId.VREASON_CHANNEL_KICK) { - if(own_channel == channel) - this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); - } else if(reason_id == ViewReasonId.VREASON_SYSTEM) { - + this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); + } else if(reason_id == ViewReasonId.VREASON_BAN) { + this.connection_handler.sound.play(Sound.USER_LEFT_BANNED); + } else if(reason_id == ViewReasonId.VREASON_TIMEOUT) { + this.connection_handler.sound.play(Sound.USER_LEFT_TIMEOUT); + } else if(reason_id == ViewReasonId.VREASON_MOVED) { + this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); } else { - console.warn(tr("Unknown reasonid for %o"), reason_id); + log.error(LogCategory.NETWORKING, tr("Unknown client left reason %d!"), reason_id); } } - let updates: { - key: string, - value: string - }[] = []; - - for(let key in entry) { - if(key == "cfid") continue; - if(key == "ctid") continue; - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - - updates.push({key: key, value: entry[key]}); - } - - client.updateVariables(...updates); - - /* if its a new client join, or a system reason (like we joined) */ - if(!old_channel || reason_id == 2) { - /* client new join */ + if(!channel_to) { + /* client left the server */ const conversation_manager = this.connection_handler.side_bar.private_conversations(); const conversation = conversation_manager.find_conversation({ unique_id: client.properties.client_unique_identifier, @@ -471,690 +581,599 @@ namespace connection { name: client.clientNickName() }, { create: false, - attach: true + attach: false }); - if(conversation) - client.flag_text_unread = conversation.is_unread(); - } - - if(client instanceof LocalClientEntry) { - client.initializeListener(); - this.connection_handler.update_voice_status(); - this.connection_handler.side_bar.info_frame().update_channel_talk(); - const conversations = this.connection.client.side_bar.channel_conversations(); - conversations.set_current_channel(client.currentChannel().channelId); - } - } - } - - handleCommandClientLeftView(json) { - let reason_id = -1; - - for(const entry of json) { - reason_id = entry["reasonid"] || reason_id; - let tree = this.connection.client.channelTree; - let client = tree.findClient(entry["clid"]); - if(!client) { - log.error(LogCategory.NETWORKING, tr("Unknown client left!")); - return 0; - } - if(client == this.connection.client.getClient()) { - if(reason_id == ViewReasonId.VREASON_BAN) { - this.connection.client.handleDisconnect(DisconnectReason.CLIENT_BANNED, entry); - } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { - this.connection.client.handleDisconnect(DisconnectReason.CLIENT_KICKED, entry); - } else if(reason_id == ViewReasonId.VREASON_SERVER_SHUTDOWN) { - this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); - } else if(reason_id == ViewReasonId.VREASON_SERVER_STOPPED) { - this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); - } else { - this.connection.client.handleDisconnect(DisconnectReason.UNKNOWN, entry); - } - this.connection_handler.side_bar.info_frame().update_channel_talk(); - return; - } - - - if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { - const own_channel = this.connection.client.getClient().currentChannel(); - let channel_from = tree.findChannel(entry["cfid"]); - let channel_to = tree.findChannel(entry["ctid"]); - - const is_own_channel = channel_from == own_channel; - this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_LEAVE, { - channel_from: channel_from ? channel_from.log_data() : undefined, - channel_to: channel_to ? channel_to.log_data() : undefined, - client: client.log_data(), - invoker: this.loggable_invoker(entry["invokeruid"], entry["invokerid"], entry["invokername"]), - message: entry["reasonmsg"], - reason: parseInt(entry["reasonid"]), - ban_time: parseInt(entry["bantime"]), - own_channel: is_own_channel - }); - - if(is_own_channel) { - if(reason_id == ViewReasonId.VREASON_USER_ACTION) { - this.connection_handler.sound.play(Sound.USER_LEFT); - } else if(reason_id == ViewReasonId.VREASON_SERVER_LEFT) { - this.connection_handler.sound.play(Sound.USER_LEFT_DISCONNECT); - } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { - this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_SERVER); - } else if(reason_id == ViewReasonId.VREASON_CHANNEL_KICK) { - this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); - } else if(reason_id == ViewReasonId.VREASON_BAN) { - this.connection_handler.sound.play(Sound.USER_LEFT_BANNED); - } else if(reason_id == ViewReasonId.VREASON_TIMEOUT) { - this.connection_handler.sound.play(Sound.USER_LEFT_TIMEOUT); - } else if(reason_id == ViewReasonId.VREASON_MOVED) { - this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); - } else { - log.error(LogCategory.NETWORKING, tr("Unknown client left reason %d!"), reason_id); - } - } - - if(!channel_to) { - /* client left the server */ - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - unique_id: client.properties.client_unique_identifier, - client_id: client.clientId(), - name: client.clientNickName() - }, { - create: false, - attach: false - }); - if(conversation) { - conversation.set_state(chat.PrivateConversationState.DISCONNECTED); - } + if(conversation) { + conversation.set_state(PrivateConversationState.DISCONNECTED); } } - - tree.deleteClient(client); - } - } - - handleNotifyClientMoved(json) { - json = json[0]; //Only one bulk - let tree = this.connection.client.channelTree; - let client = tree.findClient(json["clid"]); - let self = client instanceof LocalClientEntry; - - let channel_to = tree.findChannel(parseInt(json["ctid"])); - let channel_from = tree.findChannel(parseInt(json["cfid"])); - - if(!client) { - log.error(LogCategory.NETWORKING, tr("Unknown client move (Client)!")); - return 0; } - if(!channel_to) { - log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel to)!")); - return 0; - } - - if(!self) { - if(!channel_from) { - log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel from)!")); - channel_from = client.currentChannel(); - } else if(channel_from != client.currentChannel()) { - log.error(LogCategory.NETWORKING, - tr("Client move from invalid source channel! Local client registered in channel %d but server send %d."), - client.currentChannel().channelId, channel_from.channelId - ); - } - } else { - channel_from = client.currentChannel(); - } - - tree.moveClient(client, channel_to); - - if(self) { - this.connection_handler.update_voice_status(channel_to); - - for(const entry of client.channelTree.clientsByChannel(channel_from)) { - if(entry !== client && entry.get_audio_handle()) { - entry.get_audio_handle().abort_replay(); - entry.speaking = false; - } - } - - const side_bar = this.connection_handler.side_bar; - side_bar.info_frame().update_channel_talk(); - - const conversation_to = side_bar.channel_conversations().conversation(channel_to.channelId, false); - if(conversation_to) - conversation_to.update_private_state(); - - if(channel_from) { - const conversation_from = side_bar.channel_conversations().conversation(channel_from.channelId, false); - if(conversation_from) - conversation_from.update_private_state(); - } - - side_bar.channel_conversations().update_chat_box(); - } - - const own_channel = this.connection.client.getClient().currentChannel(); - this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_MOVE, { - channel_from: channel_from ? { - channel_id: channel_from.channelId, - channel_name: channel_from.channelName() - } : undefined, - channel_from_own: channel_from == own_channel, - - channel_to: channel_to ? { - channel_id: channel_to.channelId, - channel_name: channel_to.channelName() - } : undefined, - channel_to_own: channel_to == own_channel, - - client: { - client_id: client.clientId(), - client_name: client.clientNickName(), - client_unique_id: client.properties.client_unique_identifier - }, - client_own: self, - - invoker: this.loggable_invoker(json["invokeruid"], json["invokerid"], json["invokername"]), - - message: json["reasonmsg"], - reason: parseInt(json["reasonid"]), - }); - if(json["reasonid"] == ViewReasonId.VREASON_MOVED) { - if(self) - this.connection_handler.sound.play(Sound.USER_MOVED_SELF); - else if(own_channel == channel_to) - this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); - else if(own_channel == channel_from) - this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); - } else if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) { - if(self) {} //If we do an action we wait for the error response - else if(own_channel == channel_to) - this.connection_handler.sound.play(Sound.USER_ENTERED); - else if(own_channel == channel_from) - this.connection_handler.sound.play(Sound.USER_LEFT); - } else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) { - if(self) { - this.connection_handler.sound.play(Sound.CHANNEL_KICKED); - } else if(own_channel == channel_to) - this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); - else if(own_channel == channel_from) - this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); - } else { - console.warn(tr("Unknown reason id %o"), json["reasonid"]); - } - } - - handleNotifyChannelMoved(json) { - json = json[0]; //Only one bulk - - let tree = this.connection.client.channelTree; - let channel = tree.findChannel(json["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Unknown channel move (Channel)!")); - return 0; - } - - let prev = tree.findChannel(json["order"]); - if(!prev && json["order"] != 0) { - log.error(LogCategory.NETWORKING, tr("Unknown channel move (prev)!")); - return 0; - } - - let parent = tree.findChannel(json["cpid"]); - if(!parent && json["cpid"] != 0) { - log.error(LogCategory.NETWORKING, tr("Unknown channel move (parent)!")); - return 0; - } - - tree.moveChannel(channel, prev, parent); - } - - handleNotifyChannelEdited(json) { - json = json[0]; //Only one bulk - - let tree = this.connection.client.channelTree; - let channel = tree.findChannel(json["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Unknown channel edit (Channel)!")); - return 0; - } - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key === "cid") continue; - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - updates.push({key: key, value: json[key]}); - } - channel.updateVariables(...updates); - - if(this.connection_handler.getClient().currentChannel() === channel) { - //TODO: Playback sound that your channel has been edited - this.connection_handler.update_voice_status(); - } - } - - handleNotifyTextMessage(json) { - json = json[0]; //Only one bulk - - let mode = json["targetmode"]; - if(mode == 1){ - //json["invokerid"], json["invokername"], json["invokeruid"] - const target_client_id = parseInt(json["target"]); - const target_own = target_client_id === this.connection.client.getClientId(); - - if(target_own && target_client_id === json["invokerid"]) { - log.error(LogCategory.NETWORKING, tr("Received conversation message from invalid client id. Data: %o", json)); - return; - } - - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - client_id: target_own ? parseInt(json["invokerid"]) : target_client_id, - unique_id: target_own ? json["invokeruid"] : undefined, - name: target_own ? json["invokername"] : undefined - }, { - create: target_own, - attach: target_own - }); - if(!conversation) { - log.error(LogCategory.NETWORKING, tr("Received conversation message for unknown conversation! (%s)"), target_own ? tr("Remote message") : tr("Own message")); - return; - } - - conversation.append_message(json["msg"], { - type: target_own ? "partner" : "self", - name: json["invokername"], - unique_id: json["invokeruid"], - client_id: parseInt(json["invokerid"]) - }); - - if(target_own) { - this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); - const client = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); - if(client) /* the client itself might be invisible */ - client.flag_text_unread = conversation.is_unread(); - } else { - this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); - } - } else if(mode == 2) { - const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); - const own_channel_id = this.connection.client.getClient().currentChannel().channelId; - const channel_id = typeof(json["cid"]) !== "undefined" ? parseInt(json["cid"]) : own_channel_id; - const channel = this.connection_handler.channelTree.findChannel(channel_id) || this.connection_handler.getClient().currentChannel(); - - if(json["invokerid"] == this.connection.client.clientId) - this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); - else if(channel_id == own_channel_id) { - this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); - } - - const conversations = this.connection_handler.side_bar.channel_conversations(); - const conversation = conversations.conversation(channel_id); - conversation.register_new_message({ - sender_database_id: invoker ? invoker.properties.client_database_id : 0, - sender_name: json["invokername"], - sender_unique_id: json["invokeruid"], - - timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), - message: json["msg"] - }); - if(conversation.is_unread() && channel) - channel.flag_text_unread = true; - } else if(mode == 3) { - this.connection_handler.log.log(log.server.Type.GLOBAL_MESSAGE, { - message: json["msg"], - sender: { - client_unique_id: json["invokeruid"], - client_name: json["invokername"], - client_id: parseInt(json["invokerid"]) - } - }); - - const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); - const conversations = this.connection_handler.side_bar.channel_conversations(); - const conversation = conversations.conversation(0); - conversation.register_new_message({ - sender_database_id: invoker ? invoker.properties.client_database_id : 0, - sender_name: json["invokername"], - sender_unique_id: json["invokeruid"], - - timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), - message: json["msg"] - }); - this.connection_handler.channelTree.server.flag_text_unread = conversation.is_unread(); - } - } - - notifyClientChatComposing(json) { - json = json[0]; - - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - client_id: parseInt(json["clid"]), - unique_id: json["cluid"], - name: undefined - }, { - create: false, - attach: false - }); - if(!conversation) - return; - - conversation.trigger_typing(); - } - - handleNotifyClientChatClosed(json) { - json = json[0]; //Only one bulk - - //Chat partner has closed the conversation - - //clid: "6" - //cluid: "YoWmG+dRGKD+Rxb7SPLAM5+B9tY=" - - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - client_id: parseInt(json["clid"]), - unique_id: json["cluid"], - name: undefined - }, { - create: false, - attach: false - }); - if(!conversation) { - log.warn(LogCategory.GENERAL, tr("Received chat close for client, but we haven't a chat open.")); - return; - } - conversation.set_state(chat.PrivateConversationState.CLOSED); - } - - handleNotifyClientUpdated(json) { - json = json[0]; //Only one bulk - - let client = this.connection.client.channelTree.findClient(json["clid"]); - if(!client) { - log.error(LogCategory.NETWORKING, tr("Tried to update an non existing client")); - return; - } - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key == "clid") continue; - updates.push({key: key, value: json[key]}); - } - client.updateVariables(...updates); - } - - handleNotifyServerEdited(json) { - json = json[0]; - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - - updates.push({key: key, value: json[key]}); - } - this.connection.client.channelTree.server.updateVariables(false, ...updates); - } - - handleNotifyServerUpdated(json) { - json = json[0]; - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - - updates.push({key: key, value: json[key]}); - } - this.connection.client.channelTree.server.updateVariables(true, ...updates); - } - - handleNotifyMusicPlayerInfo(json) { - json = json[0]; - - let bot = this.connection.client.channelTree.find_client_by_dbid(json["bot_id"]); - if(!bot || !(bot instanceof MusicClientEntry)) { - log.warn(LogCategory.CLIENT, tr("Got music player info for unknown or invalid bot! (ID: %i, Entry: %o)"), json["bot_id"], bot); - return; - } - - bot.handlePlayerInfo(json); - } - - handleNotifyClientPoke(json) { - json = json[0]; - Modals.spawnPoke(this.connection_handler, { - id: parseInt(json["invokerid"]), - name: json["invokername"], - unique_id: json["invokeruid"] - }, json["msg"]); - - this.connection_handler.sound.play(Sound.USER_POKED_SELF); - } - - //TODO server chat message - handleNotifyServerGroupClientAdd(json) { - json = json[0]; - - const self = this.connection.client.getClient(); - if(json["clid"] == self.clientId()) - this.connection_handler.sound.play(Sound.GROUP_SERVER_ASSIGNED_SELF); - } - - //TODO server chat message - handleNotifyServerGroupClientRemove(json) { - json = json[0]; - - const self = this.connection.client.getClient(); - if(json["clid"] == self.clientId()) { - this.connection_handler.sound.play(Sound.GROUP_SERVER_REVOKED_SELF); - } else { - } - } - - //TODO server chat message - handleNotifyClientChannelGroupChanged(json) { - json = json[0]; - - const self = this.connection.client.getClient(); - if(json["clid"] == self.clientId()) { - this.connection_handler.sound.play(Sound.GROUP_CHANNEL_CHANGED_SELF); - } - } - - handleNotifyChannelSubscribed(json) { - for(const entry of json) { - const channel = this.connection.client.channelTree.findChannel(entry["cid"]); - if(!channel) { - console.warn(tr("Received channel subscribed for not visible channel (cid: %d)"), entry['cid']); - continue; - } - - channel.flag_subscribed = true; - } - } - - handleNotifyChannelUnsubscribed(json) { - for(const entry of json) { - const channel = this.connection.client.channelTree.findChannel(entry["cid"]); - if(!channel) { - console.warn(tr("Received channel unsubscribed for not visible channel (cid: %d)"), entry['cid']); - continue; - } - - channel.flag_subscribed = false; - for(const client of channel.clients(false)) - this.connection.client.channelTree.deleteClient(client); - } - } - - handleNotifyConversationHistory(json: any[]) { - const conversations = this.connection.client.side_bar.channel_conversations(); - const conversation = conversations.conversation(parseInt(json[0]["cid"])); - if(!conversation) { - log.warn(LogCategory.NETWORKING, tr("Received conversation history for invalid or unknown conversation (%o)"), json[0]["cid"]); - return; - } - - for(const entry of json) { - conversation.register_new_message({ - message: entry["msg"], - sender_unique_id: entry["sender_unique_id"], - sender_name: entry["sender_name"], - timestamp: parseInt(entry["timestamp"]), - sender_database_id: parseInt(entry["sender_database_id"]) - }, false); - } - - /* now update the boxes */ - /* No update needed because the command which triggers this notify should update the chat box on success - conversation.fix_scroll(true); - conversation.handle.update_chat_box(); - */ - } - - handleNotifyConversationMessageDelete(json: any[]) { - let conversation: Conversation; - const conversations = this.connection.client.side_bar.channel_conversations(); - for(const entry of json) { - if(typeof(entry["cid"]) !== "undefined") - conversation = conversations.conversation(parseInt(entry["cid"]), false); - if(!conversation) - continue; - - conversation.delete_messages(parseInt(entry["timestamp_begin"]), parseInt(entry["timestamp_end"]), parseInt(entry["cldbid"]), parseInt(entry["limit"])); - } - } - - handleNotifyMusicStatusUpdate(json: any[]) { - json = json[0]; - - const bot_id = parseInt(json["bot_id"]); - const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); - return; - } - - client.events.fire("music_status_update", { - player_replay_index: parseInt(json["player_replay_index"]), - player_buffered_index: parseInt(json["player_buffered_index"]) - }); - } - - handleMusicPlayerSongChange(json: any[]) { - json = json[0]; - - const bot_id = parseInt(json["bot_id"]); - const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); - return; - } - - const song_id = parseInt(json["song_id"]); - let song: SongInfo; - if(song_id) { - song = new SongInfo(); - JSON.map_to(song, json); - } - - client.events.fire("music_song_change", { - song: song - }); - } - - handleNotifyPlaylistSongAdd(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song add event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - client.events.fire("playlist_song_add", { - song: { - song_id: parseInt(json["song_id"]), - song_invoker: json["song_invoker"], - song_previous_song_id: parseInt(json["song_previous_song_id"]), - song_url: json["song_url"], - song_url_loader: json["song_url_loader"], - - song_loaded: json["song_loaded"] == true || json["song_loaded"] == "1", - song_metadata: json["song_metadata"] - } - }); - } - - handleNotifyPlaylistSongRemove(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song remove event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - const song_id = parseInt(json["song_id"]); - client.events.fire("playlist_song_remove", { song_id: song_id }); - } - - handleNotifyPlaylistSongReorder(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song reorder event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - const song_id = parseInt(json["song_id"]); - const previous_song_id = parseInt(json["song_previous_song_id"]); - client.events.fire("playlist_song_reorder", { song_id: song_id, previous_song_id: previous_song_id }); - } - - handleNotifyPlaylistSongLoaded(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song loaded event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - const song_id = parseInt(json["song_id"]); - client.events.fire("playlist_song_loaded", { - song_id: song_id, - success: json["success"] == 1, - error_msg: json["load_error_msg"], - metadata: json["song_metadata"] - }); + tree.deleteClient(client); } } + + handleNotifyClientMoved(json) { + json = json[0]; //Only one bulk + let tree = this.connection.client.channelTree; + let client = tree.findClient(json["clid"]); + let self = client instanceof LocalClientEntry; + + let channel_to = tree.findChannel(parseInt(json["ctid"])); + let channel_from = tree.findChannel(parseInt(json["cfid"])); + + if(!client) { + log.error(LogCategory.NETWORKING, tr("Unknown client move (Client)!")); + return 0; + } + + if(!channel_to) { + log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel to)!")); + return 0; + } + + if(!self) { + if(!channel_from) { + log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel from)!")); + channel_from = client.currentChannel(); + } else if(channel_from != client.currentChannel()) { + log.error(LogCategory.NETWORKING, + tr("Client move from invalid source channel! Local client registered in channel %d but server send %d."), + client.currentChannel().channelId, channel_from.channelId + ); + } + } else { + channel_from = client.currentChannel(); + } + + tree.moveClient(client, channel_to); + + if(self) { + this.connection_handler.update_voice_status(channel_to); + + for(const entry of client.channelTree.clientsByChannel(channel_from)) { + if(entry !== client && entry.get_audio_handle()) { + entry.get_audio_handle().abort_replay(); + entry.speaking = false; + } + } + + const side_bar = this.connection_handler.side_bar; + side_bar.info_frame().update_channel_talk(); + + const conversation_to = side_bar.channel_conversations().conversation(channel_to.channelId, false); + if(conversation_to) + conversation_to.update_private_state(); + + if(channel_from) { + const conversation_from = side_bar.channel_conversations().conversation(channel_from.channelId, false); + if(conversation_from) + conversation_from.update_private_state(); + } + + side_bar.channel_conversations().update_chat_box(); + } + + const own_channel = this.connection.client.getClient().currentChannel(); + this.connection_handler.log.log(server_log.Type.CLIENT_VIEW_MOVE, { + channel_from: channel_from ? { + channel_id: channel_from.channelId, + channel_name: channel_from.channelName() + } : undefined, + channel_from_own: channel_from == own_channel, + + channel_to: channel_to ? { + channel_id: channel_to.channelId, + channel_name: channel_to.channelName() + } : undefined, + channel_to_own: channel_to == own_channel, + + client: { + client_id: client.clientId(), + client_name: client.clientNickName(), + client_unique_id: client.properties.client_unique_identifier + }, + client_own: self, + + invoker: this.loggable_invoker(json["invokeruid"], json["invokerid"], json["invokername"]), + + message: json["reasonmsg"], + reason: parseInt(json["reasonid"]), + }); + if(json["reasonid"] == ViewReasonId.VREASON_MOVED) { + if(self) + this.connection_handler.sound.play(Sound.USER_MOVED_SELF); + else if(own_channel == channel_to) + this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); + else if(own_channel == channel_from) + this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); + } else if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) { + if(self) {} //If we do an action we wait for the error response + else if(own_channel == channel_to) + this.connection_handler.sound.play(Sound.USER_ENTERED); + else if(own_channel == channel_from) + this.connection_handler.sound.play(Sound.USER_LEFT); + } else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) { + if(self) { + this.connection_handler.sound.play(Sound.CHANNEL_KICKED); + } else if(own_channel == channel_to) + this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); + else if(own_channel == channel_from) + this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); + } else { + console.warn(tr("Unknown reason id %o"), json["reasonid"]); + } + } + + handleNotifyChannelMoved(json) { + json = json[0]; //Only one bulk + + let tree = this.connection.client.channelTree; + let channel = tree.findChannel(json["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Unknown channel move (Channel)!")); + return 0; + } + + let prev = tree.findChannel(json["order"]); + if(!prev && json["order"] != 0) { + log.error(LogCategory.NETWORKING, tr("Unknown channel move (prev)!")); + return 0; + } + + let parent = tree.findChannel(json["cpid"]); + if(!parent && json["cpid"] != 0) { + log.error(LogCategory.NETWORKING, tr("Unknown channel move (parent)!")); + return 0; + } + + tree.moveChannel(channel, prev, parent); + } + + handleNotifyChannelEdited(json) { + json = json[0]; //Only one bulk + + let tree = this.connection.client.channelTree; + let channel = tree.findChannel(json["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Unknown channel edit (Channel)!")); + return 0; + } + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "cid") continue; + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + updates.push({key: key, value: json[key]}); + } + channel.updateVariables(...updates); + + if(this.connection_handler.getClient().currentChannel() === channel) { + //TODO: Playback sound that your channel has been edited + this.connection_handler.update_voice_status(); + } + } + + handleNotifyTextMessage(json) { + json = json[0]; //Only one bulk + + let mode = json["targetmode"]; + if(mode == 1){ + //json["invokerid"], json["invokername"], json["invokeruid"] + const target_client_id = parseInt(json["target"]); + const target_own = target_client_id === this.connection.client.getClientId(); + + if(target_own && target_client_id === json["invokerid"]) { + log.error(LogCategory.NETWORKING, tr("Received conversation message from invalid client id. Data: %o"), json); + return; + } + + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + client_id: target_own ? parseInt(json["invokerid"]) : target_client_id, + unique_id: target_own ? json["invokeruid"] : undefined, + name: target_own ? json["invokername"] : undefined + }, { + create: target_own, + attach: target_own + }); + if(!conversation) { + log.error(LogCategory.NETWORKING, tr("Received conversation message for unknown conversation! (%s)"), target_own ? tr("Remote message") : tr("Own message")); + return; + } + + conversation.append_message(json["msg"], { + type: target_own ? "partner" : "self", + name: json["invokername"], + unique_id: json["invokeruid"], + client_id: parseInt(json["invokerid"]) + }); + + if(target_own) { + this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); + const client = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); + if(client) /* the client itself might be invisible */ + client.flag_text_unread = conversation.is_unread(); + } else { + this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); + } + } else if(mode == 2) { + const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); + const own_channel_id = this.connection.client.getClient().currentChannel().channelId; + const channel_id = typeof(json["cid"]) !== "undefined" ? parseInt(json["cid"]) : own_channel_id; + const channel = this.connection_handler.channelTree.findChannel(channel_id) || this.connection_handler.getClient().currentChannel(); + + if(json["invokerid"] == this.connection.client.clientId) + this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); + else if(channel_id == own_channel_id) { + this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); + } + + const conversations = this.connection_handler.side_bar.channel_conversations(); + const conversation = conversations.conversation(channel_id); + conversation.register_new_message({ + sender_database_id: invoker ? invoker.properties.client_database_id : 0, + sender_name: json["invokername"], + sender_unique_id: json["invokeruid"], + + timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), + message: json["msg"] + }); + if(conversation.is_unread() && channel) + channel.flag_text_unread = true; + } else if(mode == 3) { + this.connection_handler.log.log(server_log.Type.GLOBAL_MESSAGE, { + message: json["msg"], + sender: { + client_unique_id: json["invokeruid"], + client_name: json["invokername"], + client_id: parseInt(json["invokerid"]) + } + }); + + const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); + const conversations = this.connection_handler.side_bar.channel_conversations(); + const conversation = conversations.conversation(0); + conversation.register_new_message({ + sender_database_id: invoker ? invoker.properties.client_database_id : 0, + sender_name: json["invokername"], + sender_unique_id: json["invokeruid"], + + timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), + message: json["msg"] + }); + this.connection_handler.channelTree.server.flag_text_unread = conversation.is_unread(); + } + } + + notifyClientChatComposing(json) { + json = json[0]; + + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + client_id: parseInt(json["clid"]), + unique_id: json["cluid"], + name: undefined + }, { + create: false, + attach: false + }); + if(!conversation) + return; + + conversation.trigger_typing(); + } + + handleNotifyClientChatClosed(json) { + json = json[0]; //Only one bulk + + //Chat partner has closed the conversation + + //clid: "6" + //cluid: "YoWmG+dRGKD+Rxb7SPLAM5+B9tY=" + + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + client_id: parseInt(json["clid"]), + unique_id: json["cluid"], + name: undefined + }, { + create: false, + attach: false + }); + if(!conversation) { + log.warn(LogCategory.GENERAL, tr("Received chat close for client, but we haven't a chat open.")); + return; + } + conversation.set_state(PrivateConversationState.CLOSED); + } + + handleNotifyClientUpdated(json) { + json = json[0]; //Only one bulk + + let client = this.connection.client.channelTree.findClient(json["clid"]); + if(!client) { + log.error(LogCategory.NETWORKING, tr("Tried to update an non existing client")); + return; + } + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key == "clid") continue; + updates.push({key: key, value: json[key]}); + } + client.updateVariables(...updates); + } + + handleNotifyServerEdited(json) { + json = json[0]; + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + + updates.push({key: key, value: json[key]}); + } + this.connection.client.channelTree.server.updateVariables(false, ...updates); + } + + handleNotifyServerUpdated(json) { + json = json[0]; + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + + updates.push({key: key, value: json[key]}); + } + this.connection.client.channelTree.server.updateVariables(true, ...updates); + } + + handleNotifyMusicPlayerInfo(json) { + json = json[0]; + + let bot = this.connection.client.channelTree.find_client_by_dbid(json["bot_id"]); + if(!bot || !(bot instanceof MusicClientEntry)) { + log.warn(LogCategory.CLIENT, tr("Got music player info for unknown or invalid bot! (ID: %i, Entry: %o)"), json["bot_id"], bot); + return; + } + + bot.handlePlayerInfo(json); + } + + handleNotifyClientPoke(json) { + json = json[0]; + spawnPoke(this.connection_handler, { + id: parseInt(json["invokerid"]), + name: json["invokername"], + unique_id: json["invokeruid"] + }, json["msg"]); + + this.connection_handler.sound.play(Sound.USER_POKED_SELF); + } + + //TODO server chat message + handleNotifyServerGroupClientAdd(json) { + json = json[0]; + + const self = this.connection.client.getClient(); + if(json["clid"] == self.clientId()) + this.connection_handler.sound.play(Sound.GROUP_SERVER_ASSIGNED_SELF); + } + + //TODO server chat message + handleNotifyServerGroupClientRemove(json) { + json = json[0]; + + const self = this.connection.client.getClient(); + if(json["clid"] == self.clientId()) { + this.connection_handler.sound.play(Sound.GROUP_SERVER_REVOKED_SELF); + } else { + } + } + + //TODO server chat message + handleNotifyClientChannelGroupChanged(json) { + json = json[0]; + + const self = this.connection.client.getClient(); + if(json["clid"] == self.clientId()) { + this.connection_handler.sound.play(Sound.GROUP_CHANNEL_CHANGED_SELF); + } + } + + handleNotifyChannelSubscribed(json) { + for(const entry of json) { + const channel = this.connection.client.channelTree.findChannel(entry["cid"]); + if(!channel) { + console.warn(tr("Received channel subscribed for not visible channel (cid: %d)"), entry['cid']); + continue; + } + + channel.flag_subscribed = true; + } + } + + handleNotifyChannelUnsubscribed(json) { + for(const entry of json) { + const channel = this.connection.client.channelTree.findChannel(entry["cid"]); + if(!channel) { + console.warn(tr("Received channel unsubscribed for not visible channel (cid: %d)"), entry['cid']); + continue; + } + + channel.flag_subscribed = false; + for(const client of channel.clients(false)) + this.connection.client.channelTree.deleteClient(client); + } + } + + handleNotifyConversationHistory(json: any[]) { + const conversations = this.connection.client.side_bar.channel_conversations(); + const conversation = conversations.conversation(parseInt(json[0]["cid"])); + if(!conversation) { + log.warn(LogCategory.NETWORKING, tr("Received conversation history for invalid or unknown conversation (%o)"), json[0]["cid"]); + return; + } + + for(const entry of json) { + conversation.register_new_message({ + message: entry["msg"], + sender_unique_id: entry["sender_unique_id"], + sender_name: entry["sender_name"], + timestamp: parseInt(entry["timestamp"]), + sender_database_id: parseInt(entry["sender_database_id"]) + }, false); + } + + /* now update the boxes */ + /* No update needed because the command which triggers this notify should update the chat box on success + conversation.fix_scroll(true); + conversation.handle.update_chat_box(); + */ + } + + handleNotifyConversationMessageDelete(json: any[]) { + let conversation: Conversation; + const conversations = this.connection.client.side_bar.channel_conversations(); + for(const entry of json) { + if(typeof(entry["cid"]) !== "undefined") + conversation = conversations.conversation(parseInt(entry["cid"]), false); + if(!conversation) + continue; + + conversation.delete_messages(parseInt(entry["timestamp_begin"]), parseInt(entry["timestamp_end"]), parseInt(entry["cldbid"]), parseInt(entry["limit"])); + } + } + + handleNotifyMusicStatusUpdate(json: any[]) { + json = json[0]; + + const bot_id = parseInt(json["bot_id"]); + const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); + return; + } + + client.events.fire("music_status_update", { + player_replay_index: parseInt(json["player_replay_index"]), + player_buffered_index: parseInt(json["player_buffered_index"]) + }); + } + + handleMusicPlayerSongChange(json: any[]) { + json = json[0]; + + const bot_id = parseInt(json["bot_id"]); + const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); + return; + } + + const song_id = parseInt(json["song_id"]); + let song: SongInfo; + if(song_id) { + song = new SongInfo(); + JSON.map_to(song, json); + } + + client.events.fire("music_song_change", { + song: song + }); + } + + handleNotifyPlaylistSongAdd(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song add event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + client.events.fire("playlist_song_add", { + song: { + song_id: parseInt(json["song_id"]), + song_invoker: json["song_invoker"], + song_previous_song_id: parseInt(json["song_previous_song_id"]), + song_url: json["song_url"], + song_url_loader: json["song_url_loader"], + + song_loaded: json["song_loaded"] == true || json["song_loaded"] == "1", + song_metadata: json["song_metadata"] + } + }); + } + + handleNotifyPlaylistSongRemove(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song remove event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + const song_id = parseInt(json["song_id"]); + client.events.fire("playlist_song_remove", { song_id: song_id }); + } + + handleNotifyPlaylistSongReorder(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song reorder event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + const song_id = parseInt(json["song_id"]); + const previous_song_id = parseInt(json["song_previous_song_id"]); + client.events.fire("playlist_song_reorder", { song_id: song_id, previous_song_id: previous_song_id }); + } + + handleNotifyPlaylistSongLoaded(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song loaded event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + const song_id = parseInt(json["song_id"]); + client.events.fire("playlist_song_loaded", { + song_id: song_id, + success: json["success"] == 1, + error_msg: json["load_error_msg"], + metadata: json["song_metadata"] + }); + } } \ No newline at end of file diff --git a/shared/js/connection/CommandHelper.ts b/shared/js/connection/CommandHelper.ts index 9eff210b..6685c841 100644 --- a/shared/js/connection/CommandHelper.ts +++ b/shared/js/connection/CommandHelper.ts @@ -1,448 +1,461 @@ -namespace connection { - export class CommandHelper extends AbstractCommandHandler { - private _who_am_i: any; - private _awaiters_unique_ids: {[unique_id: string]:((resolved: ClientNameInfo) => any)[]} = {}; - private _awaiters_unique_dbid: {[database_id: number]:((resolved: ClientNameInfo) => any)[]} = {}; +import {ServerCommand, SingleCommandHandler} from "tc-shared/connection/ConnectionBase"; +import * as log from "tc-shared/log"; +import {LogCategory} from "tc-shared/log"; +import { + ClientNameInfo, + CommandResult, + ErrorID, Playlist, PlaylistInfo, PlaylistSong, + QueryList, + QueryListEntry, ServerGroupClient +} from "tc-shared/connection/ServerConnectionDeclaration"; +import {ChannelEntry} from "tc-shared/ui/channel"; +import {ClientEntry} from "tc-shared/ui/client"; +import {ChatType} from "tc-shared/ui/frames/chat"; +import {AbstractCommandHandler} from "tc-shared/connection/AbstractCommandHandler"; - constructor(connection) { - super(connection); +export class CommandHelper extends AbstractCommandHandler { + private _who_am_i: any; + private _awaiters_unique_ids: {[unique_id: string]:((resolved: ClientNameInfo) => any)[]} = {}; + private _awaiters_unique_dbid: {[database_id: number]:((resolved: ClientNameInfo) => any)[]} = {}; - this.volatile_handler_boss = false; - this.ignore_consumed = true; + constructor(connection) { + super(connection); + + this.volatile_handler_boss = false; + this.ignore_consumed = true; + } + + initialize() { + this.connection.command_handler_boss().register_handler(this); + } + + destroy() { + if(this.connection) { + const hboss = this.connection.command_handler_boss(); + hboss && hboss.unregister_handler(this); + } + this._awaiters_unique_ids = undefined; + } + + handle_command(command: ServerCommand): boolean { + if(command.command == "notifyclientnamefromuid") + this.handle_notifyclientnamefromuid(command.arguments); + if(command.command == "notifyclientgetnamefromdbid") + this.handle_notifyclientgetnamefromdbid(command.arguments); + else + return false; + return true; + } + + joinChannel(channel: ChannelEntry, password?: string) : Promise {
+ return this.connection.send_command("clientmove", {
+ "clid": this.connection.client.getClientId(),
+ "cid": channel.getChannelId(),
+ "cpw": password || ""
+ });
+ }
+
+ sendMessage(message: string, type: ChatType, target?: ChannelEntry | ClientEntry) : Promise {
+ if(type == ChatType.SERVER)
+ return this.connection.send_command("sendtextmessage", {"targetmode": 3, "target": 0, "msg": message});
+ else if(type == ChatType.CHANNEL)
+ return this.connection.send_command("sendtextmessage", {"targetmode": 2, "target": (target as ChannelEntry).getChannelId(), "msg": message});
+ else if(type == ChatType.CLIENT)
+ return this.connection.send_command("sendtextmessage", {"targetmode": 1, "target": (target as ClientEntry).clientId(), "msg": message});
+ }
+
+ updateClient(key: string, value: string) : Promise {
+ let data = {};
+ data[key] = value;
+ return this.connection.send_command("clientupdate", data);
+ }
+
+ async info_from_uid(..._unique_ids: string[]) : Promise {
+ const response: ClientNameInfo[] = [];
+ const request = [];
+ const unique_ids = new Set(_unique_ids);
+ if(!unique_ids.size) return [];
+
+ const unique_id_resolvers: {[unique_id: string]: (resolved: ClientNameInfo) => any} = {};
+
+
+ for(const unique_id of unique_ids) {
+ request.push({'cluid': unique_id});
+ (this._awaiters_unique_ids[unique_id] || (this._awaiters_unique_ids[unique_id] = []))
+ .push(unique_id_resolvers[unique_id] = info => response.push(info));
}
- initialize() {
- this.connection.command_handler_boss().register_handler(this);
- }
-
- destroy() {
- if(this.connection) {
- const hboss = this.connection.command_handler_boss();
- hboss && hboss.unregister_handler(this);
+ try {
+ await this.connection.send_command("clientgetnamefromuid", request);
+ } catch(error) {
+ if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT) {
+ /* nothing */
+ } else {
+ throw error;
}
- this._awaiters_unique_ids = undefined;
+ } finally {
+ /* cleanup */
+ for(const unique_id of Object.keys(unique_id_resolvers))
+ (this._awaiters_unique_ids[unique_id] || []).remove(unique_id_resolvers[unique_id]);
}
- handle_command(command: connection.ServerCommand): boolean {
- if(command.command == "notifyclientnamefromuid")
- this.handle_notifyclientnamefromuid(command.arguments);
- if(command.command == "notifyclientgetnamefromdbid")
- this.handle_notifyclientgetnamefromdbid(command.arguments);
- else
- return false;
- return true;
+ return response;
+ }
+
+ private handle_notifyclientgetnamefromdbid(json: any[]) {
+ for(const entry of json) {
+ const info: ClientNameInfo = {
+ client_unique_id: entry["cluid"],
+ client_nickname: entry["clname"],
+ client_database_id: parseInt(entry["cldbid"])
+ };
+
+ const functions = this._awaiters_unique_dbid[info.client_database_id] || [];
+ delete this._awaiters_unique_dbid[info.client_database_id];
+
+ for(const fn of functions)
+ fn(info);
+ }
+ }
+
+ async info_from_cldbid(..._cldbid: number[]) : Promise {
+ const response: ClientNameInfo[] = [];
+ const request = [];
+ const unique_cldbid = new Set(_cldbid);
+ if(!unique_cldbid.size) return [];
+
+ const unique_cldbid_resolvers: {[dbid: number]: (resolved: ClientNameInfo) => any} = {};
+
+
+ for(const cldbid of unique_cldbid) {
+ request.push({'cldbid': cldbid});
+ (this._awaiters_unique_dbid[cldbid] || (this._awaiters_unique_dbid[cldbid] = []))
+ .push(unique_cldbid_resolvers[cldbid] = info => response.push(info));
}
- joinChannel(channel: ChannelEntry, password?: string) : Promise {
- return this.connection.send_command("clientmove", {
- "clid": this.connection.client.getClientId(),
- "cid": channel.getChannelId(),
- "cpw": password || ""
- });
+ try {
+ await this.connection.send_command("clientgetnamefromdbid", request);
+ } catch(error) {
+ if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT) {
+ /* nothing */
+ } else {
+ throw error;
+ }
+ } finally {
+ /* cleanup */
+ for(const cldbid of Object.keys(unique_cldbid_resolvers))
+ (this._awaiters_unique_dbid[cldbid] || []).remove(unique_cldbid_resolvers[cldbid]);
}
- sendMessage(message: string, type: ChatType, target?: ChannelEntry | ClientEntry) : Promise {
- if(type == ChatType.SERVER)
- return this.connection.send_command("sendtextmessage", {"targetmode": 3, "target": 0, "msg": message});
- else if(type == ChatType.CHANNEL)
- return this.connection.send_command("sendtextmessage", {"targetmode": 2, "target": (target as ChannelEntry).getChannelId(), "msg": message});
- else if(type == ChatType.CLIENT)
- return this.connection.send_command("sendtextmessage", {"targetmode": 1, "target": (target as ClientEntry).clientId(), "msg": message});
- }
+ return response;
+ }
+
+ private handle_notifyclientnamefromuid(json: any[]) {
+ for(const entry of json) {
+ const info: ClientNameInfo = {
+ client_unique_id: entry["cluid"],
+ client_nickname: entry["clname"],
+ client_database_id: parseInt(entry["cldbid"])
+ };
+
+ const functions = this._awaiters_unique_ids[entry["cluid"]] || [];
+ delete this._awaiters_unique_ids[entry["cluid"]];
+
+ for(const fn of functions)
+ fn(info);
+ }
+ }
+
+ request_query_list(server_id: number = undefined) : Promise {
+ return new Promise((resolve, reject) => {
+ const single_handler = {
+ command: "notifyquerylist",
+ function: command => {
+ const json = command.arguments;
+
+ const result = {} as QueryList;
+
+ result.flag_all = json[0]["flag_all"];
+ result.flag_own = json[0]["flag_own"];
+ result.queries = [];
+
+ for(const entry of json) {
+ const rentry = {} as QueryListEntry;
+ rentry.bounded_server = parseInt(entry["client_bound_server"]);
+ rentry.username = entry["client_login_name"];
+ rentry.unique_id = entry["client_unique_identifier"];
+
+ result.queries.push(rentry);
+ }
+
+ resolve(result);
+ return true;
+ }
+ };
+ this.handler_boss.register_single_handler(single_handler);
- updateClient(key: string, value: string) : Promise {
let data = {};
- data[key] = value;
- return this.connection.send_command("clientupdate", data);
- }
+ if(server_id !== undefined)
+ data["server_id"] = server_id;
- async info_from_uid(..._unique_ids: string[]) : Promise {
- const response: ClientNameInfo[] = [];
- const request = [];
- const unique_ids = new Set(_unique_ids);
- if(!unique_ids.size) return [];
+ this.connection.send_command("querylist", data).catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
- const unique_id_resolvers: {[unique_id: string]: (resolved: ClientNameInfo) => any} = {};
-
-
- for(const unique_id of unique_ids) {
- request.push({'cluid': unique_id});
- (this._awaiters_unique_ids[unique_id] || (this._awaiters_unique_ids[unique_id] = []))
- .push(unique_id_resolvers[unique_id] = info => response.push(info));
- }
-
- try {
- await this.connection.send_command("clientgetnamefromuid", request);
- } catch(error) {
- if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT) {
- /* nothing */
- } else {
- throw error;
+ if(error instanceof CommandResult) {
+ if(error.id == ErrorID.EMPTY_RESULT) {
+ resolve(undefined);
+ return;
+ }
}
- } finally {
- /* cleanup */
- for(const unique_id of Object.keys(unique_id_resolvers))
- (this._awaiters_unique_ids[unique_id] || []).remove(unique_id_resolvers[unique_id]);
- }
+ reject(error);
+ });
+ });
+ }
- return response;
- }
+ request_playlist_list() : Promise {
+ return new Promise((resolve, reject) => {
+ const single_handler: SingleCommandHandler = {
+ command: "notifyplaylistlist",
+ function: command => {
+ const json = command.arguments;
+ const result: Playlist[] = [];
- private handle_notifyclientgetnamefromdbid(json: any[]) {
- for(const entry of json) {
- const info: ClientNameInfo = {
- client_unique_id: entry["cluid"],
- client_nickname: entry["clname"],
- client_database_id: parseInt(entry["cldbid"])
- };
+ for(const entry of json) {
+ try {
+ result.push({
+ playlist_id: parseInt(entry["playlist_id"]),
+ playlist_bot_id: parseInt(entry["playlist_bot_id"]),
+ playlist_title: entry["playlist_title"],
+ playlist_type: parseInt(entry["playlist_type"]),
+ playlist_owner_dbid: parseInt(entry["playlist_owner_dbid"]),
+ playlist_owner_name: entry["playlist_owner_name"],
- const functions = this._awaiters_unique_dbid[info.client_database_id] || [];
- delete this._awaiters_unique_dbid[info.client_database_id];
+ needed_power_modify: parseInt(entry["needed_power_modify"]),
+ needed_power_permission_modify: parseInt(entry["needed_power_permission_modify"]),
+ needed_power_delete: parseInt(entry["needed_power_delete"]),
+ needed_power_song_add: parseInt(entry["needed_power_song_add"]),
+ needed_power_song_move: parseInt(entry["needed_power_song_move"]),
+ needed_power_song_remove: parseInt(entry["needed_power_song_remove"])
+ });
+ } catch(error) {
+ log.error(LogCategory.NETWORKING, tr("Failed to parse playlist entry: %o"), error);
+ }
+ }
- for(const fn of functions)
- fn(info);
- }
- }
-
- async info_from_cldbid(..._cldbid: number[]) : Promise {
- const response: ClientNameInfo[] = [];
- const request = [];
- const unique_cldbid = new Set(_cldbid);
- if(!unique_cldbid.size) return [];
-
- const unique_cldbid_resolvers: {[dbid: number]: (resolved: ClientNameInfo) => any} = {};
-
-
- for(const cldbid of unique_cldbid) {
- request.push({'cldbid': cldbid});
- (this._awaiters_unique_dbid[cldbid] || (this._awaiters_unique_dbid[cldbid] = []))
- .push(unique_cldbid_resolvers[cldbid] = info => response.push(info));
- }
-
- try {
- await this.connection.send_command("clientgetnamefromdbid", request);
- } catch(error) {
- if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT) {
- /* nothing */
- } else {
- throw error;
+ resolve(result);
+ return true;
}
- } finally {
- /* cleanup */
- for(const cldbid of Object.keys(unique_cldbid_resolvers))
- (this._awaiters_unique_dbid[cldbid] || []).remove(unique_cldbid_resolvers[cldbid]);
- }
+ };
+ this.handler_boss.register_single_handler(single_handler);
- return response;
- }
+ this.connection.send_command("playlistlist").catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
- private handle_notifyclientnamefromuid(json: any[]) {
- for(const entry of json) {
- const info: ClientNameInfo = {
- client_unique_id: entry["cluid"],
- client_nickname: entry["clname"],
- client_database_id: parseInt(entry["cldbid"])
- };
-
- const functions = this._awaiters_unique_ids[entry["cluid"]] || [];
- delete this._awaiters_unique_ids[entry["cluid"]];
-
- for(const fn of functions)
- fn(info);
- }
- }
-
- request_query_list(server_id: number = undefined) : Promise {
- return new Promise((resolve, reject) => {
- const single_handler = {
- command: "notifyquerylist",
- function: command => {
- const json = command.arguments;
-
- const result = {} as QueryList;
-
- result.flag_all = json[0]["flag_all"];
- result.flag_own = json[0]["flag_own"];
- result.queries = [];
-
- for(const entry of json) {
- const rentry = {} as QueryListEntry;
- rentry.bounded_server = parseInt(entry["client_bound_server"]);
- rentry.username = entry["client_login_name"];
- rentry.unique_id = entry["client_unique_identifier"];
-
- result.queries.push(rentry);
- }
-
- resolve(result);
- return true;
- }
- };
- this.handler_boss.register_single_handler(single_handler);
-
- let data = {};
- if(server_id !== undefined)
- data["server_id"] = server_id;
-
- this.connection.send_command("querylist", data).catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
-
- if(error instanceof CommandResult) {
- if(error.id == ErrorID.EMPTY_RESULT) {
- resolve(undefined);
- return;
- }
- }
- reject(error);
- });
- });
- }
-
- request_playlist_list() : Promise {
- return new Promise((resolve, reject) => {
- const single_handler: SingleCommandHandler = {
- command: "notifyplaylistlist",
- function: command => {
- const json = command.arguments;
- const result: Playlist[] = [];
-
- for(const entry of json) {
- try {
- result.push({
- playlist_id: parseInt(entry["playlist_id"]),
- playlist_bot_id: parseInt(entry["playlist_bot_id"]),
- playlist_title: entry["playlist_title"],
- playlist_type: parseInt(entry["playlist_type"]),
- playlist_owner_dbid: parseInt(entry["playlist_owner_dbid"]),
- playlist_owner_name: entry["playlist_owner_name"],
-
- needed_power_modify: parseInt(entry["needed_power_modify"]),
- needed_power_permission_modify: parseInt(entry["needed_power_permission_modify"]),
- needed_power_delete: parseInt(entry["needed_power_delete"]),
- needed_power_song_add: parseInt(entry["needed_power_song_add"]),
- needed_power_song_move: parseInt(entry["needed_power_song_move"]),
- needed_power_song_remove: parseInt(entry["needed_power_song_remove"])
- });
- } catch(error) {
- log.error(LogCategory.NETWORKING, tr("Failed to parse playlist entry: %o"), error);
- }
- }
-
- resolve(result);
- return true;
- }
- };
- this.handler_boss.register_single_handler(single_handler);
-
- this.connection.send_command("playlistlist").catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
-
- if(error instanceof CommandResult) {
- if(error.id == ErrorID.EMPTY_RESULT) {
- resolve([]);
- return;
- }
- }
- reject(error);
- })
- });
- }
-
- request_playlist_songs(playlist_id: number) : Promise {
- return new Promise((resolve, reject) => {
- const single_handler: SingleCommandHandler = {
- command: "notifyplaylistsonglist",
- function: command => {
- const json = command.arguments;
-
- if(json[0]["playlist_id"] != playlist_id) {
- log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist songs"));
- return false;
- }
-
- const result: PlaylistSong[] = [];
-
- for(const entry of json) {
- try {
- result.push({
- song_id: parseInt(entry["song_id"]),
- song_invoker: entry["song_invoker"],
- song_previous_song_id: parseInt(entry["song_previous_song_id"]),
- song_url: entry["song_url"],
- song_url_loader: entry["song_url_loader"],
-
- song_loaded: entry["song_loaded"] == true || entry["song_loaded"] == "1",
- song_metadata: entry["song_metadata"]
- });
- } catch(error) {
- log.error(LogCategory.NETWORKING, tr("Failed to parse playlist song entry: %o"), error);
- }
- }
-
- resolve(result);
- return true;
- }
- };
- this.handler_boss.register_single_handler(single_handler);
-
- this.connection.send_command("playlistsonglist", {playlist_id: playlist_id}).catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
- if(error instanceof CommandResult) {
- if(error.id == ErrorID.EMPTY_RESULT) {
- resolve([]);
- return;
- }
- }
- reject(error);
- })
- });
- }
-
- request_playlist_client_list(playlist_id: number) : Promise {
- return new Promise((resolve, reject) => {
- const single_handler: SingleCommandHandler = {
- command: "notifyplaylistclientlist",
- function: command => {
- const json = command.arguments;
-
- if(json[0]["playlist_id"] != playlist_id) {
- log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist clients"));
- return false;
- }
-
- const result: number[] = [];
-
- for(const entry of json)
- result.push(parseInt(entry["cldbid"]));
-
- resolve(result.filter(e => !isNaN(e)));
- return true;
- }
- };
- this.handler_boss.register_single_handler(single_handler);
-
- this.connection.send_command("playlistclientlist", {playlist_id: playlist_id}).catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
- if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT) {
+ if(error instanceof CommandResult) {
+ if(error.id == ErrorID.EMPTY_RESULT) {
resolve([]);
return;
}
- reject(error);
- })
- });
- }
+ }
+ reject(error);
+ })
+ });
+ }
- async request_clients_by_server_group(group_id: number) : Promise {
- //servergroupclientlist sgid=2
- //notifyservergroupclientlist sgid=6 cldbid=2 client_nickname=WolverinDEV client_unique_identifier=xxjnc14LmvTk+Lyrm8OOeo4tOqw=
- return new Promise((resolve, reject) => {
- const single_handler: SingleCommandHandler = {
- command: "notifyservergroupclientlist",
- function: command => {
- if (command.arguments[0]["sgid"] != group_id) {
- log.error(LogCategory.NETWORKING, tr("Received invalid notification for server group client list"));
- return false;
- }
+ request_playlist_songs(playlist_id: number) : Promise {
+ return new Promise((resolve, reject) => {
+ const single_handler: SingleCommandHandler = {
+ command: "notifyplaylistsonglist",
+ function: command => {
+ const json = command.arguments;
- try {
- const result: ServerGroupClient[] = [];
- for(const entry of command.arguments)
- result.push({
- client_database_id: parseInt(entry["cldbid"]),
- client_nickname: entry["client_nickname"],
- client_unique_identifier: entry["client_unique_identifier"]
- });
- resolve(result);
- } catch (error) {
- log.error(LogCategory.NETWORKING, tr("Failed to parse server group client list: %o"), error);
- reject("failed to parse info");
- }
-
- return true;
+ if(json[0]["playlist_id"] != playlist_id) {
+ log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist songs"));
+ return false;
}
- };
- this.handler_boss.register_single_handler(single_handler);
- this.connection.send_command("servergroupclientlist", {sgid: group_id}).catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
- reject(error);
- })
- });
- }
-
- request_playlist_info(playlist_id: number) : Promise {
- return new Promise((resolve, reject) => {
- const single_handler: SingleCommandHandler = {
- command: "notifyplaylistinfo",
- function: command => {
- const json = command.arguments[0];
- if (json["playlist_id"] != playlist_id) {
- log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist info"));
- return;
- }
+ const result: PlaylistSong[] = [];
+ for(const entry of json) {
try {
- //resolve
- resolve({
- playlist_id: parseInt(json["playlist_id"]),
- playlist_title: json["playlist_title"],
- playlist_description: json["playlist_description"],
- playlist_type: parseInt(json["playlist_type"]),
+ result.push({
+ song_id: parseInt(entry["song_id"]),
+ song_invoker: entry["song_invoker"],
+ song_previous_song_id: parseInt(entry["song_previous_song_id"]),
+ song_url: entry["song_url"],
+ song_url_loader: entry["song_url_loader"],
- playlist_owner_dbid: parseInt(json["playlist_owner_dbid"]),
- playlist_owner_name: json["playlist_owner_name"],
-
- playlist_flag_delete_played: json["playlist_flag_delete_played"] == true || json["playlist_flag_delete_played"] == "1",
- playlist_flag_finished: json["playlist_flag_finished"] == true || json["playlist_flag_finished"] == "1",
- playlist_replay_mode: parseInt(json["playlist_replay_mode"]),
- playlist_current_song_id: parseInt(json["playlist_current_song_id"]),
-
- playlist_max_songs: parseInt(json["playlist_max_songs"])
+ song_loaded: entry["song_loaded"] == true || entry["song_loaded"] == "1",
+ song_metadata: entry["song_metadata"]
});
- } catch (error) {
- log.error(LogCategory.NETWORKING, tr("Failed to parse playlist info: %o"), error);
- reject("failed to parse info");
+ } catch(error) {
+ log.error(LogCategory.NETWORKING, tr("Failed to parse playlist song entry: %o"), error);
}
-
- return true;
}
- };
- this.handler_boss.register_single_handler(single_handler);
- this.connection.send_command("playlistinfo", {playlist_id: playlist_id}).catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
- reject(error);
- })
- });
- }
+ resolve(result);
+ return true;
+ }
+ };
+ this.handler_boss.register_single_handler(single_handler);
- /**
- * @deprecated
- * Its just a workaround for the query management.
- * There is no garante that the whoami trick will work forever
- */
- current_virtual_server_id() : Promise {
- if(this._who_am_i)
- return Promise.resolve(parseInt(this._who_am_i["virtualserver_id"]));
-
- return new Promise((resolve, reject) => {
- const single_handler: SingleCommandHandler = {
- function: command => {
- if(command.command != "" && command.command.indexOf("=") == -1)
- return false;
-
- this._who_am_i = command.arguments[0];
- resolve(parseInt(this._who_am_i["virtualserver_id"]));
- return true;
+ this.connection.send_command("playlistsonglist", {playlist_id: playlist_id}).catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
+ if(error instanceof CommandResult) {
+ if(error.id == ErrorID.EMPTY_RESULT) {
+ resolve([]);
+ return;
}
- };
- this.handler_boss.register_single_handler(single_handler);
+ }
+ reject(error);
+ })
+ });
+ }
- this.connection.send_command("whoami").catch(error => {
- this.handler_boss.remove_single_handler(single_handler);
- reject(error);
- });
+ request_playlist_client_list(playlist_id: number) : Promise {
+ return new Promise((resolve, reject) => {
+ const single_handler: SingleCommandHandler = {
+ command: "notifyplaylistclientlist",
+ function: command => {
+ const json = command.arguments;
+
+ if(json[0]["playlist_id"] != playlist_id) {
+ log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist clients"));
+ return false;
+ }
+
+ const result: number[] = [];
+
+ for(const entry of json)
+ result.push(parseInt(entry["cldbid"]));
+
+ resolve(result.filter(e => !isNaN(e)));
+ return true;
+ }
+ };
+ this.handler_boss.register_single_handler(single_handler);
+
+ this.connection.send_command("playlistclientlist", {playlist_id: playlist_id}).catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
+ if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT) {
+ resolve([]);
+ return;
+ }
+ reject(error);
+ })
+ });
+ }
+
+ async request_clients_by_server_group(group_id: number) : Promise {
+ //servergroupclientlist sgid=2
+ //notifyservergroupclientlist sgid=6 cldbid=2 client_nickname=WolverinDEV client_unique_identifier=xxjnc14LmvTk+Lyrm8OOeo4tOqw=
+ return new Promise((resolve, reject) => {
+ const single_handler: SingleCommandHandler = {
+ command: "notifyservergroupclientlist",
+ function: command => {
+ if (command.arguments[0]["sgid"] != group_id) {
+ log.error(LogCategory.NETWORKING, tr("Received invalid notification for server group client list"));
+ return false;
+ }
+
+ try {
+ const result: ServerGroupClient[] = [];
+ for(const entry of command.arguments)
+ result.push({
+ client_database_id: parseInt(entry["cldbid"]),
+ client_nickname: entry["client_nickname"],
+ client_unique_identifier: entry["client_unique_identifier"]
+ });
+ resolve(result);
+ } catch (error) {
+ log.error(LogCategory.NETWORKING, tr("Failed to parse server group client list: %o"), error);
+ reject("failed to parse info");
+ }
+
+ return true;
+ }
+ };
+ this.handler_boss.register_single_handler(single_handler);
+
+ this.connection.send_command("servergroupclientlist", {sgid: group_id}).catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
+ reject(error);
+ })
+ });
+ }
+
+ request_playlist_info(playlist_id: number) : Promise {
+ return new Promise((resolve, reject) => {
+ const single_handler: SingleCommandHandler = {
+ command: "notifyplaylistinfo",
+ function: command => {
+ const json = command.arguments[0];
+ if (json["playlist_id"] != playlist_id) {
+ log.error(LogCategory.NETWORKING, tr("Received invalid notification for playlist info"));
+ return;
+ }
+
+ try {
+ //resolve
+ resolve({
+ playlist_id: parseInt(json["playlist_id"]),
+ playlist_title: json["playlist_title"],
+ playlist_description: json["playlist_description"],
+ playlist_type: parseInt(json["playlist_type"]),
+
+ playlist_owner_dbid: parseInt(json["playlist_owner_dbid"]),
+ playlist_owner_name: json["playlist_owner_name"],
+
+ playlist_flag_delete_played: json["playlist_flag_delete_played"] == true || json["playlist_flag_delete_played"] == "1",
+ playlist_flag_finished: json["playlist_flag_finished"] == true || json["playlist_flag_finished"] == "1",
+ playlist_replay_mode: parseInt(json["playlist_replay_mode"]),
+ playlist_current_song_id: parseInt(json["playlist_current_song_id"]),
+
+ playlist_max_songs: parseInt(json["playlist_max_songs"])
+ });
+ } catch (error) {
+ log.error(LogCategory.NETWORKING, tr("Failed to parse playlist info: %o"), error);
+ reject("failed to parse info");
+ }
+
+ return true;
+ }
+ };
+ this.handler_boss.register_single_handler(single_handler);
+
+ this.connection.send_command("playlistinfo", {playlist_id: playlist_id}).catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
+ reject(error);
+ })
+ });
+ }
+
+ /**
+ * @deprecated
+ * Its just a workaround for the query management.
+ * There is no garante that the whoami trick will work forever
+ */
+ current_virtual_server_id() : Promise {
+ if(this._who_am_i)
+ return Promise.resolve(parseInt(this._who_am_i["virtualserver_id"]));
+
+ return new Promise((resolve, reject) => {
+ const single_handler: SingleCommandHandler = {
+ function: command => {
+ if(command.command != "" && command.command.indexOf("=") == -1)
+ return false;
+
+ this._who_am_i = command.arguments[0];
+ resolve(parseInt(this._who_am_i["virtualserver_id"]));
+ return true;
+ }
+ };
+ this.handler_boss.register_single_handler(single_handler);
+
+ this.connection.send_command("whoami").catch(error => {
+ this.handler_boss.remove_single_handler(single_handler);
+ reject(error);
});
- }
+ });
}
}
\ No newline at end of file
diff --git a/shared/js/connection/ConnectionBase.ts b/shared/js/connection/ConnectionBase.ts
index cf975fdb..d2a87040 100644
--- a/shared/js/connection/ConnectionBase.ts
+++ b/shared/js/connection/ConnectionBase.ts
@@ -1,216 +1,129 @@
-namespace connection {
- export interface CommandOptions {
- flagset?: string[]; /* default: [] */
- process_result?: boolean; /* default: true */
+import {CommandHelper} from "tc-shared/connection/CommandHelper";
+import {HandshakeHandler} from "tc-shared/connection/HandshakeHandler";
+import {CommandResult} from "tc-shared/connection/ServerConnectionDeclaration";
+import {ServerAddress} from "tc-shared/ui/server";
+import {RecorderProfile} from "tc-shared/voice/RecorderProfile";
+import {ConnectionHandler, ConnectionState} from "tc-shared/ConnectionHandler";
+import {AbstractCommandHandlerBoss} from "tc-shared/connection/AbstractCommandHandler";
- timeout?: number /* default: 1000 */;
+export interface CommandOptions {
+ flagset?: string[]; /* default: [] */
+ process_result?: boolean; /* default: true */
+
+ timeout?: number /* default: 1000 */;
+}
+export const CommandOptionDefaults: CommandOptions = {
+ flagset: [],
+ process_result: true,
+ timeout: 1000
+};
+
+export type ConnectionStateListener = (old_state: ConnectionState, new_state: ConnectionState) => any;
+export abstract class AbstractServerConnection {
+ readonly client: ConnectionHandler;
+ readonly command_helper: CommandHelper;
+
+ protected constructor(client: ConnectionHandler) {
+ this.client = client;
+
+ this.command_helper = new CommandHelper(this);
}
- export const CommandOptionDefaults: CommandOptions = {
- flagset: [],
- process_result: true,
- timeout: 1000
+
+ /* resolved as soon a connection has been established. This does not means that the authentication had yet been done! */
+ abstract connect(address: ServerAddress, handshake: HandshakeHandler, timeout?: number) : Promise;
+
+ abstract connected() : boolean;
+ abstract disconnect(reason?: string) : Promise;
+
+ abstract support_voice() : boolean;
+ abstract voice_connection() : voice.AbstractVoiceConnection | undefined;
+
+ abstract command_handler_boss() : AbstractCommandHandlerBoss;
+ abstract send_command(command: string, data?: any | any[], options?: CommandOptions) : Promise;
+
+ abstract get onconnectionstatechanged() : ConnectionStateListener;
+ abstract set onconnectionstatechanged(listener: ConnectionStateListener);
+
+ abstract remote_address() : ServerAddress; /* only valid when connected */
+ abstract handshake_handler() : HandshakeHandler; /* only valid when connected */
+
+ abstract ping() : {
+ native: number,
+ javascript?: number
};
+}
- export type ConnectionStateListener = (old_state: ConnectionState, new_state: ConnectionState) => any;
- export abstract class AbstractServerConnection {
- readonly client: ConnectionHandler;
- readonly command_helper: CommandHelper;
+export namespace voice {
+ export enum PlayerState {
+ PREBUFFERING,
+ PLAYING,
+ BUFFERING,
+ STOPPING,
+ STOPPED
+ }
- protected constructor(client: ConnectionHandler) {
- this.client = client;
+ export type LatencySettings = {
+ min_buffer: number; /* milliseconds */
+ max_buffer: number; /* milliseconds */
+ }
- this.command_helper = new CommandHelper(this);
+ export interface VoiceClient {
+ client_id: number;
+
+ callback_playback: () => any;
+ callback_stopped: () => any;
+
+ callback_state_changed: (new_state: PlayerState) => any;
+
+ get_state() : PlayerState;
+
+ get_volume() : number;
+ set_volume(volume: number) : void;
+
+ abort_replay();
+
+ support_latency_settings() : boolean;
+
+ reset_latency_settings();
+ latency_settings(settings?: LatencySettings) : LatencySettings;
+
+ support_flush() : boolean;
+ flush();
+ }
+
+ export abstract class AbstractVoiceConnection {
+ readonly connection: AbstractServerConnection;
+
+ protected constructor(connection: AbstractServerConnection) {
+ this.connection = connection;
}
- /* resolved as soon a connection has been established. This does not means that the authentication had yet been done! */
- abstract connect(address: ServerAddress, handshake: HandshakeHandler, timeout?: number) : Promise;
-
abstract connected() : boolean;
- abstract disconnect(reason?: string) : Promise;
+ abstract encoding_supported(codec: number) : boolean;
+ abstract decoding_supported(codec: number) : boolean;
- abstract support_voice() : boolean;
- abstract voice_connection() : voice.AbstractVoiceConnection | undefined;
+ abstract register_client(client_id: number) : VoiceClient;
+ abstract available_clients() : VoiceClient[];
+ abstract unregister_client(client: VoiceClient) : Promise;
- abstract command_handler_boss() : AbstractCommandHandlerBoss;
- abstract send_command(command: string, data?: any | any[], options?: CommandOptions) : Promise;
+ abstract voice_recorder() : RecorderProfile;
+ abstract acquire_voice_recorder(recorder: RecorderProfile | undefined) : Promise;
- abstract get onconnectionstatechanged() : ConnectionStateListener;
- abstract set onconnectionstatechanged(listener: ConnectionStateListener);
-
- abstract remote_address() : ServerAddress; /* only valid when connected */
- abstract handshake_handler() : HandshakeHandler; /* only valid when connected */
-
- abstract ping() : {
- native: number,
- javascript?: number
- };
+ abstract get_encoder_codec() : number;
+ abstract set_encoder_codec(codec: number);
}
+}
- export namespace voice {
- export enum PlayerState {
- PREBUFFERING,
- PLAYING,
- BUFFERING,
- STOPPING,
- STOPPED
- }
+export class ServerCommand {
+ command: string;
+ arguments: any[];
+}
- export type LatencySettings = {
- min_buffer: number; /* milliseconds */
- max_buffer: number; /* milliseconds */
- }
+export interface SingleCommandHandler {
+ name?: string;
+ command?: string;
+ timeout?: number;
- export interface VoiceClient {
- client_id: number;
-
- callback_playback: () => any;
- callback_stopped: () => any;
-
- callback_state_changed: (new_state: PlayerState) => any;
-
- get_state() : PlayerState;
-
- get_volume() : number;
- set_volume(volume: number) : void;
-
- abort_replay();
-
- support_latency_settings() : boolean;
-
- reset_latency_settings();
- latency_settings(settings?: LatencySettings) : LatencySettings;
-
- support_flush() : boolean;
- flush();
- }
-
- export abstract class AbstractVoiceConnection {
- readonly connection: AbstractServerConnection;
-
- protected constructor(connection: AbstractServerConnection) {
- this.connection = connection;
- }
-
- abstract connected() : boolean;
- abstract encoding_supported(codec: number) : boolean;
- abstract decoding_supported(codec: number) : boolean;
-
- abstract register_client(client_id: number) : VoiceClient;
- abstract available_clients() : VoiceClient[];
- abstract unregister_client(client: VoiceClient) : Promise;
-
- abstract voice_recorder() : RecorderProfile;
- abstract acquire_voice_recorder(recorder: RecorderProfile | undefined) : Promise;
-
- abstract get_encoder_codec() : number;
- abstract set_encoder_codec(codec: number);
- }
- }
-
- export class ServerCommand {
- command: string;
- arguments: any[];
- }
-
- export abstract class AbstractCommandHandler {
- readonly connection: AbstractServerConnection;
-
- handler_boss: AbstractCommandHandlerBoss | undefined;
- volatile_handler_boss: boolean = false; /* if true than the command handler could be registered twice to two or more handlers */
-
- ignore_consumed: boolean = false;
-
- protected constructor(connection: AbstractServerConnection) {
- this.connection = connection;
- }
-
- /**
- * @return If the command should be consumed
- */
- abstract handle_command(command: ServerCommand) : boolean;
- }
-
- export interface SingleCommandHandler {
- name?: string;
- command?: string;
- timeout?: number;
-
- /* if the return is true then the command handler will be removed */
- function: (command: ServerCommand) => boolean;
- }
-
- export abstract class AbstractCommandHandlerBoss {
- readonly connection: AbstractServerConnection;
- protected command_handlers: AbstractCommandHandler[] = [];
- /* TODO: Timeout */
- protected single_command_handler: SingleCommandHandler[] = [];
-
- protected constructor(connection: AbstractServerConnection) {
- this.connection = connection;
- }
-
- destroy() {
- this.command_handlers = undefined;
- this.single_command_handler = undefined;
- }
-
- register_handler(handler: AbstractCommandHandler) {
- if(!handler.volatile_handler_boss && handler.handler_boss)
- throw "handler already registered";
-
- this.command_handlers.remove(handler); /* just to be sure */
- this.command_handlers.push(handler);
- handler.handler_boss = this;
- }
-
- unregister_handler(handler: AbstractCommandHandler) {
- if(!handler.volatile_handler_boss && handler.handler_boss !== this) {
- console.warn(tr("Tried to unregister command handler which does not belong to the handler boss"));
- return;
- }
-
- this.command_handlers.remove(handler);
- handler.handler_boss = undefined;
- }
-
-
- register_single_handler(handler: SingleCommandHandler) {
- this.single_command_handler.push(handler);
- }
-
- remove_single_handler(handler: SingleCommandHandler) {
- this.single_command_handler.remove(handler);
- }
-
- handlers() : AbstractCommandHandler[] {
- return this.command_handlers;
- }
-
- invoke_handle(command: ServerCommand) : boolean {
- let flag_consumed = false;
-
- for(const handler of this.command_handlers) {
- try {
- if(!flag_consumed || handler.ignore_consumed)
- flag_consumed = flag_consumed || handler.handle_command(command);
- } catch(error) {
- console.error(tr("Failed to invoke command handler. Invocation results in an exception: %o"), error);
- }
- }
-
- for(const handler of [...this.single_command_handler]) {
- if(handler.command && handler.command != command.command)
- continue;
-
- try {
- if(handler.function(command))
- this.single_command_handler.remove(handler);
- } catch(error) {
- console.error(tr("Failed to invoke single command handler. Invocation results in an exception: %o"), error);
- }
- }
-
- return flag_consumed;
- }
- }
+ /* if the return is true then the command handler will be removed */
+ function: (command: ServerCommand) => boolean;
}
\ No newline at end of file
diff --git a/shared/js/connection/HandshakeHandler.ts b/shared/js/connection/HandshakeHandler.ts
index de9c4910..14143346 100644
--- a/shared/js/connection/HandshakeHandler.ts
+++ b/shared/js/connection/HandshakeHandler.ts
@@ -1,146 +1,153 @@
-namespace connection {
- export interface HandshakeIdentityHandler {
- connection: AbstractServerConnection;
+import {CommandResult} from "tc-shared/connection/ServerConnectionDeclaration";
+import {IdentitifyType} from "tc-shared/profiles/Identity";
+import {TeaSpeakIdentity} from "tc-shared/profiles/identities/TeamSpeakIdentity";
+import {AbstractServerConnection} from "tc-shared/connection/ConnectionBase";
+import {ConnectionProfile} from "tc-shared/profiles/ConnectionProfile";
+import {settings} from "tc-shared/settings";
+import {ConnectParameters, DisconnectReason} from "tc-shared/ConnectionHandler";
- start_handshake();
- register_callback(callback: (success: boolean, message?: string) => any);
+export interface HandshakeIdentityHandler {
+ connection: AbstractServerConnection;
+
+ start_handshake();
+ register_callback(callback: (success: boolean, message?: string) => any);
+}
+
+declare const native_client;
+export class HandshakeHandler {
+ private connection: AbstractServerConnection;
+ private handshake_handler: HandshakeIdentityHandler;
+ private failed = false;
+
+ readonly profile: ConnectionProfile;
+ readonly parameters: ConnectParameters;
+
+ constructor(profile: ConnectionProfile, parameters: ConnectParameters) {
+ this.profile = profile;
+ this.parameters = parameters;
}
- export class HandshakeHandler {
- private connection: AbstractServerConnection;
- private handshake_handler: HandshakeIdentityHandler;
- private failed = false;
+ setConnection(con: AbstractServerConnection) {
+ this.connection = con;
+ }
- readonly profile: profiles.ConnectionProfile;
- readonly parameters: ConnectParameters;
-
- constructor(profile: profiles.ConnectionProfile, parameters: ConnectParameters) {
- this.profile = profile;
- this.parameters = parameters;
+ initialize() {
+ this.handshake_handler = this.profile.spawn_identity_handshake_handler(this.connection);
+ if(!this.handshake_handler) {
+ this.handshake_failed("failed to create identity handler");
+ return;
}
- setConnection(con: AbstractServerConnection) {
- this.connection = con;
- }
-
- initialize() {
- this.handshake_handler = this.profile.spawn_identity_handshake_handler(this.connection);
- if(!this.handshake_handler) {
- this.handshake_failed("failed to create identity handler");
- return;
- }
-
- this.handshake_handler.register_callback((flag, message) => {
- if(flag)
- this.handshake_finished();
- else
- this.handshake_failed(message);
- });
- }
-
- get_identity_handler() : HandshakeIdentityHandler {
- return this.handshake_handler;
- }
-
- startHandshake() {
- this.handshake_handler.start_handshake();
- }
-
- on_teamspeak() {
- const type = this.profile.selected_type();
- if(type == profiles.identities.IdentitifyType.TEAMSPEAK)
+ this.handshake_handler.register_callback((flag, message) => {
+ if(flag)
this.handshake_finished();
- else {
+ else
+ this.handshake_failed(message);
+ });
+ }
- if(this.failed) return;
+ get_identity_handler() : HandshakeIdentityHandler {
+ return this.handshake_handler;
+ }
- this.failed = true;
- this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_TEAMSPEAK_REQUIRED);
- }
- }
+ startHandshake() {
+ this.handshake_handler.start_handshake();
+ }
+
+ on_teamspeak() {
+ const type = this.profile.selected_type();
+ if(type == IdentitifyType.TEAMSPEAK)
+ this.handshake_finished();
+ else {
- private handshake_failed(message: string) {
if(this.failed) return;
this.failed = true;
- this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_FAILED, message);
- }
-
- private handshake_finished(version?: string) {
- const _native = window["native"];
- if(native_client && _native && _native.client_version && !version) {
- _native.client_version()
- .then( this.handshake_finished.bind(this))
- .catch(error => {
- console.error(tr("Failed to get version:"));
- console.error(error);
- this.handshake_finished("?.?.?");
- });
- return;
- }
-
- const git_version = settings.static_global("version", "unknown");
- const browser_name = (navigator.browserSpecs || {})["name"] || " ";
- let data = {
- client_nickname: this.parameters.nickname || "Another TeaSpeak user",
- client_platform: (browser_name ? browser_name + " " : "") + navigator.platform,
- client_version: "TeaWeb " + git_version + " (" + navigator.userAgent + ")",
- client_version_sign: undefined,
-
- client_default_channel: (this.parameters.channel || {} as any).target,
- client_default_channel_password: (this.parameters.channel || {} as any).password,
- client_default_token: this.parameters.token,
-
- client_server_password: this.parameters.password ? this.parameters.password.password : undefined,
- client_browser_engine: navigator.product,
-
- client_input_hardware: this.connection.client.client_status.input_hardware,
- client_output_hardware: false,
- client_input_muted: this.connection.client.client_status.input_muted,
- client_output_muted: this.connection.client.client_status.output_muted,
- };
-
- //0.0.1 [Build: 1549713549] Linux 7XvKmrk7uid2ixHFeERGqcC8vupeQqDypLtw2lY9slDNPojEv//F47UaDLG+TmVk4r6S0TseIKefzBpiRtLDAQ==
-
- if(version) {
- data.client_version = "TeaClient ";
- data.client_version += " " + version;
-
- const os = require("os");
- const arch_mapping = {
- "x32": "32bit",
- "x64": "64bit"
- };
-
- data.client_version += " " + (arch_mapping[os.arch()] || os.arch());
-
- const os_mapping = {
- "win32": "Windows",
- "linux": "Linux"
- };
- data.client_platform = (os_mapping[os.platform()] || os.platform());
- }
-
- /* required to keep compatibility */
- if(this.profile.selected_type() === profiles.identities.IdentitifyType.TEAMSPEAK) {
- data["client_key_offset"] = (this.profile.selected_identity() as profiles.identities.TeaSpeakIdentity).hash_number;
- }
-
- this.connection.send_command("clientinit", data).catch(error => {
- if(error instanceof CommandResult) {
- if(error.id == 1028) {
- this.connection.client.handleDisconnect(DisconnectReason.SERVER_REQUIRES_PASSWORD);
- } else if(error.id == 783 || error.id == 519) {
- error.extra_message = isNaN(parseInt(error.extra_message)) ? "8" : error.extra_message;
- this.connection.client.handleDisconnect(DisconnectReason.IDENTITY_TOO_LOW, error);
- } else if(error.id == 3329) {
- this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_BANNED, error);
- } else {
- this.connection.client.handleDisconnect(DisconnectReason.CLIENT_KICKED, error);
- }
- } else
- this.connection.disconnect();
- });
+ this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_TEAMSPEAK_REQUIRED);
}
}
+
+ private handshake_failed(message: string) {
+ if(this.failed) return;
+
+ this.failed = true;
+ this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_FAILED, message);
+ }
+
+ private handshake_finished(version?: string) {
+ const _native = window["native"];
+ if(native_client && _native && _native.client_version && !version) {
+ _native.client_version()
+ .then( this.handshake_finished.bind(this))
+ .catch(error => {
+ console.error(tr("Failed to get version:"));
+ console.error(error);
+ this.handshake_finished("?.?.?");
+ });
+ return;
+ }
+
+ const git_version = settings.static_global("version", "unknown");
+ const browser_name = (navigator.browserSpecs || {})["name"] || " ";
+ let data = {
+ client_nickname: this.parameters.nickname || "Another TeaSpeak user",
+ client_platform: (browser_name ? browser_name + " " : "") + navigator.platform,
+ client_version: "TeaWeb " + git_version + " (" + navigator.userAgent + ")",
+ client_version_sign: undefined,
+
+ client_default_channel: (this.parameters.channel || {} as any).target,
+ client_default_channel_password: (this.parameters.channel || {} as any).password,
+ client_default_token: this.parameters.token,
+
+ client_server_password: this.parameters.password ? this.parameters.password.password : undefined,
+ client_browser_engine: navigator.product,
+
+ client_input_hardware: this.connection.client.client_status.input_hardware,
+ client_output_hardware: false,
+ client_input_muted: this.connection.client.client_status.input_muted,
+ client_output_muted: this.connection.client.client_status.output_muted,
+ };
+
+ //0.0.1 [Build: 1549713549] Linux 7XvKmrk7uid2ixHFeERGqcC8vupeQqDypLtw2lY9slDNPojEv//F47UaDLG+TmVk4r6S0TseIKefzBpiRtLDAQ==
+
+ if(version) {
+ data.client_version = "TeaClient ";
+ data.client_version += " " + version;
+
+ const os = require("os");
+ const arch_mapping = {
+ "x32": "32bit",
+ "x64": "64bit"
+ };
+
+ data.client_version += " " + (arch_mapping[os.arch()] || os.arch());
+
+ const os_mapping = {
+ "win32": "Windows",
+ "linux": "Linux"
+ };
+ data.client_platform = (os_mapping[os.platform()] || os.platform());
+ }
+
+ /* required to keep compatibility */
+ if(this.profile.selected_type() === IdentitifyType.TEAMSPEAK) {
+ data["client_key_offset"] = (this.profile.selected_identity() as TeaSpeakIdentity).hash_number;
+ }
+
+ this.connection.send_command("clientinit", data).catch(error => {
+ if(error instanceof CommandResult) {
+ if(error.id == 1028) {
+ this.connection.client.handleDisconnect(DisconnectReason.SERVER_REQUIRES_PASSWORD);
+ } else if(error.id == 783 || error.id == 519) {
+ error.extra_message = isNaN(parseInt(error.extra_message)) ? "8" : error.extra_message;
+ this.connection.client.handleDisconnect(DisconnectReason.IDENTITY_TOO_LOW, error);
+ } else if(error.id == 3329) {
+ this.connection.client.handleDisconnect(DisconnectReason.HANDSHAKE_BANNED, error);
+ } else {
+ this.connection.client.handleDisconnect(DisconnectReason.CLIENT_KICKED, error);
+ }
+ } else
+ this.connection.disconnect();
+ });
+ }
}
\ No newline at end of file
diff --git a/shared/js/connection/ServerConnectionDeclaration.ts b/shared/js/connection/ServerConnectionDeclaration.ts
index c2a71825..362e9163 100644
--- a/shared/js/connection/ServerConnectionDeclaration.ts
+++ b/shared/js/connection/ServerConnectionDeclaration.ts
@@ -1,4 +1,6 @@
-enum ErrorID {
+import {LaterPromise} from "tc-shared/utils/LaterPromise";
+
+export enum ErrorID {
NOT_IMPLEMENTED = 0x2,
COMMAND_NOT_FOUND = 0x100,
@@ -15,7 +17,7 @@ enum ErrorID {
CONVERSATION_IS_PRIVATE = 0x2202
}
-class CommandResult {
+export class CommandResult {
success: boolean;
id: number;
message: string;
@@ -35,39 +37,39 @@ class CommandResult {
}
}
-interface ClientNameInfo {
+export interface ClientNameInfo {
//cluid=tYzKUryn\/\/Y8VBMf8PHUT6B1eiE= name=Exp clname=Exp cldbid=9
client_unique_id: string;
client_nickname: string;
client_database_id: number;
}
-interface ClientNameFromUid {
+export interface ClientNameFromUid {
promise: LaterPromise,
keys: string[],
response: ClientNameInfo[]
}
-interface ServerGroupClient {
+export interface ServerGroupClient {
client_nickname: string;
client_unique_identifier: string;
client_database_id: number;
}
-interface QueryListEntry {
+export interface QueryListEntry {
username: string;
unique_id: string;
bounded_server: number;
}
-interface QueryList {
+export interface QueryList {
flag_own: boolean;
flag_all: boolean;
queries: QueryListEntry[];
}
-interface Playlist {
+export interface Playlist {
playlist_id: number;
playlist_bot_id: number;
playlist_title: string;
@@ -83,7 +85,7 @@ interface Playlist {
needed_power_song_remove: number;
}
-interface PlaylistInfo {
+export interface PlaylistInfo {
playlist_id: number,
playlist_title: string,
playlist_description: string,
@@ -100,7 +102,7 @@ interface PlaylistInfo {
playlist_max_songs: number
}
-interface PlaylistSong {
+export interface PlaylistSong {
song_id: number;
song_previous_song_id: number;
song_invoker: string;
diff --git a/shared/js/crypto/asn1.ts b/shared/js/crypto/asn1.ts
index 8184a4aa..c11ec360 100644
--- a/shared/js/crypto/asn1.ts
+++ b/shared/js/crypto/asn1.ts
@@ -14,534 +14,532 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-namespace asn1 {
- declare class Int10 {
- constructor(value?: any);
+declare class Int10 {
+ constructor(value?: any);
- sub(sub: number);
- mulAdd(mul: number, add: number);
- simplify();
+ sub(sub: number);
+ mulAdd(mul: number, add: number);
+ simplify();
+}
+
+const ellipsis = "\u2026";
+
+function string_cut(str, len) {
+ if (str.length > len)
+ str = str.substring(0, len) + ellipsis;
+ return str;
+}
+
+export class Stream {
+ private static HEX_DIGITS = "0123456789ABCDEF";
+ private static reTimeS = /^(\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;
+ private static reTimeL = /^(\d\d\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;
+
+ position: number;
+ data: string | ArrayBuffer;
+
+ constructor(data: string | Stream | ArrayBuffer, position: number) {
+ if (data instanceof Stream)
+ this.data = data.data;
+ else
+ this.data = data;
+
+ this.position = position;
}
- const ellipsis = "\u2026";
+ length() : number {
+ if (this.data instanceof ArrayBuffer)
+ return this.data.byteLength;
+ return this.data.length;
+ }
- function string_cut(str, len) {
- if (str.length > len)
- str = str.substring(0, len) + ellipsis;
+ get(position?: number) {
+ if (position === undefined)
+ position = this.position++;
+
+ if (position >= this.length())
+ throw 'Requesting byte offset ' + this.position + ' on a stream of length ' + this.length();
+
+ return (typeof(this.data) === "string") ? this.data.charCodeAt(position) : this.data[position];
+ }
+
+ hexByte(byte: number) {
+ return Stream.HEX_DIGITS.charAt((byte >> 4) & 0xF) + Stream.HEX_DIGITS.charAt(byte & 0xF);
+ }
+
+ parseStringISO(start, end) {
+ let s = "";
+ for (let i = start; i < end; ++i)
+ s += String.fromCharCode(this.get(i));
+ return s;
+ }
+
+ parseStringUTF(start, end) {
+ let s = "";
+ for (let i = start; i < end;) {
+ let c = this.get(i++);
+ if (c < 128)
+ s += String.fromCharCode(c);
+ else if ((c > 191) && (c < 224))
+ s += String.fromCharCode(((c & 0x1F) << 6) | (this.get(i++) & 0x3F));
+ else
+ s += String.fromCharCode(((c & 0x0F) << 12) | ((this.get(i++) & 0x3F) << 6) | (this.get(i++) & 0x3F));
+ }
+ return s;
+ }
+
+ parseStringBMP(start, end) {
+ let str = "", hi, lo;
+ for (let i = start; i < end;) {
+ hi = this.get(i++);
+ lo = this.get(i++);
+ str += String.fromCharCode((hi << 8) | lo);
+ }
return str;
}
- export class Stream {
- private static HEX_DIGITS = "0123456789ABCDEF";
- private static reTimeS = /^(\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;
- private static reTimeL = /^(\d\d\d\d)(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])([01]\d|2[0-3])(?:([0-5]\d)(?:([0-5]\d)(?:[.,](\d{1,3}))?)?)?(Z|[-+](?:[0]\d|1[0-2])([0-5]\d)?)?$/;
-
- position: number;
- data: string | ArrayBuffer;
-
- constructor(data: string | Stream | ArrayBuffer, position: number) {
- if (data instanceof Stream)
- this.data = data.data;
- else
- this.data = data;
-
- this.position = position;
+ parseTime(start, end, shortYear) {
+ let s = this.parseStringISO(start, end),
+ m = (shortYear ? Stream.reTimeS : Stream.reTimeL).exec(s);
+ if (!m)
+ return "Unrecognized time: " + s;
+ if (shortYear) {
+ // to avoid querying the timer, use the fixed range [1970, 2069]
+ // it will conform with ITU X.400 [-10, +40] sliding window until 2030
+ //m[1] = +m[1];
+ //m[1] += (parseInt(m[1]) < 70) ? 2000 : 1900;
+ throw "fixme!";
}
-
- length() : number {
- if (this.data instanceof ArrayBuffer)
- return this.data.byteLength;
- return this.data.length;
+ s = m[1] + "-" + m[2] + "-" + m[3] + " " + m[4];
+ if (m[5]) {
+ s += ":" + m[5];
+ if (m[6]) {
+ s += ":" + m[6];
+ if (m[7])
+ s += "." + m[7];
+ }
}
-
- get(position?: number) {
- if (position === undefined)
- position = this.position++;
-
- if (position >= this.length())
- throw 'Requesting byte offset ' + this.position + ' on a stream of length ' + this.length();
-
- return (typeof(this.data) === "string") ? this.data.charCodeAt(position) : this.data[position];
+ if (m[8]) {
+ s += " UTC";
+ if (m[8] != 'Z') {
+ s += m[8];
+ if (m[9])
+ s += ":" + m[9];
+ }
}
+ return s;
+ };
- hexByte(byte: number) {
- return Stream.HEX_DIGITS.charAt((byte >> 4) & 0xF) + Stream.HEX_DIGITS.charAt(byte & 0xF);
+ parseInteger(start, end) {
+ let current: number = this.get(start);
+
+ let negative = (current > 127);
+ let padding = negative ? 255 : 0;
+ let length;
+ let descriptor: number | string;
+
+ // skip unuseful bits (not allowed in DER)
+ while (current == padding && ++start < end)
+ current = this.get(start);
+
+ length = end - start;
+ if (length === 0)
+ return negative ? '-1' : '0';
+
+ // show bit length of huge integers
+ if (length > 4) {
+ descriptor = current;
+ length <<= 3; /* calculate bit length */
+
+ while (((descriptor ^ padding) & 0x80) == 0) {
+ descriptor <<= 1;
+ --length;
+ }
+ descriptor = "(" + length + " bit)\n";
}
+ // decode the integer
+ if (negative) current = current - 256;
- parseStringISO(start, end) {
- let s = "";
- for (let i = start; i < end; ++i)
- s += String.fromCharCode(this.get(i));
- return s;
- }
-
- parseStringUTF(start, end) {
- let s = "";
- for (let i = start; i < end;) {
- let c = this.get(i++);
- if (c < 128)
- s += String.fromCharCode(c);
- else if ((c > 191) && (c < 224))
- s += String.fromCharCode(((c & 0x1F) << 6) | (this.get(i++) & 0x3F));
- else
- s += String.fromCharCode(((c & 0x0F) << 12) | ((this.get(i++) & 0x3F) << 6) | (this.get(i++) & 0x3F));
- }
- return s;
- }
-
- parseStringBMP(start, end) {
- let str = "", hi, lo;
- for (let i = start; i < end;) {
- hi = this.get(i++);
- lo = this.get(i++);
- str += String.fromCharCode((hi << 8) | lo);
- }
- return str;
- }
-
- parseTime(start, end, shortYear) {
- let s = this.parseStringISO(start, end),
- m = (shortYear ? Stream.reTimeS : Stream.reTimeL).exec(s);
- if (!m)
- return "Unrecognized time: " + s;
- if (shortYear) {
- // to avoid querying the timer, use the fixed range [1970, 2069]
- // it will conform with ITU X.400 [-10, +40] sliding window until 2030
- //m[1] = +m[1];
- //m[1] += (parseInt(m[1]) < 70) ? 2000 : 1900;
- throw "fixme!";
- }
- s = m[1] + "-" + m[2] + "-" + m[3] + " " + m[4];
- if (m[5]) {
- s += ":" + m[5];
- if (m[6]) {
- s += ":" + m[6];
- if (m[7])
- s += "." + m[7];
- }
- }
- if (m[8]) {
- s += " UTC";
- if (m[8] != 'Z') {
- s += m[8];
- if (m[9])
- s += ":" + m[9];
- }
- }
- return s;
- };
-
- parseInteger(start, end) {
- let current: number = this.get(start);
-
- let negative = (current > 127);
- let padding = negative ? 255 : 0;
- let length;
- let descriptor: number | string;
-
- // skip unuseful bits (not allowed in DER)
- while (current == padding && ++start < end)
- current = this.get(start);
-
- length = end - start;
- if (length === 0)
- return negative ? '-1' : '0';
-
- // show bit length of huge integers
- if (length > 4) {
- descriptor = current;
- length <<= 3; /* calculate bit length */
-
- while (((descriptor ^ padding) & 0x80) == 0) {
- descriptor <<= 1;
- --length;
- }
- descriptor = "(" + length + " bit)\n";
- }
- // decode the integer
- if (negative) current = current - 256;
-
- let number = "";
- if(typeof(Int10) !== "undefined") {
- let n = new Int10(current);
- for (let i = start + 1; i < end; ++i)
- n.mulAdd(256, this.get(i));
- number = n.toString();
- } else {
- let n = 0;
- for (let i = start + 1; i < end; ++i) {
- n <<= 8;
- n += this.get(i);
- }
- number = n.toString();
- }
- return descriptor + number;
- };
-
- isASCII(start: number, end: number) {
- for (let i = start; i < end; ++i) {
- const c = this.get(i);
- if (c < 32 || c > 176)
- return false;
- }
- return true;
- };
-
- parseBitString(start, end, maxLength) {
- let unusedBit = this.get(start),
- lenBit = ((end - start - 1) << 3) - unusedBit,
- intro = "(" + lenBit + " bit)\n",
- s = "";
+ let number = "";
+ if(typeof(Int10) !== "undefined") {
+ let n = new Int10(current);
+ for (let i = start + 1; i < end; ++i)
+ n.mulAdd(256, this.get(i));
+ number = n.toString();
+ } else {
+ let n = 0;
for (let i = start + 1; i < end; ++i) {
- let b = this.get(i),
- skip = (i == end - 1) ? unusedBit : 0;
- for (let j = 7; j >= skip; --j)
- s += (b >> j) & 1 ? "1" : "0";
+ n <<= 8;
+ n += this.get(i);
+ }
+ number = n.toString();
+ }
+ return descriptor + number;
+ };
+
+ isASCII(start: number, end: number) {
+ for (let i = start; i < end; ++i) {
+ const c = this.get(i);
+ if (c < 32 || c > 176)
+ return false;
+ }
+ return true;
+ };
+
+ parseBitString(start, end, maxLength) {
+ let unusedBit = this.get(start),
+ lenBit = ((end - start - 1) << 3) - unusedBit,
+ intro = "(" + lenBit + " bit)\n",
+ s = "";
+ for (let i = start + 1; i < end; ++i) {
+ let b = this.get(i),
+ skip = (i == end - 1) ? unusedBit : 0;
+ for (let j = 7; j >= skip; --j)
+ s += (b >> j) & 1 ? "1" : "0";
+ if (s.length > maxLength)
+ return intro + string_cut(s, maxLength);
+ }
+ return intro + s;
+ };
+
+ parseOctetString(start, end, maxLength) {
+ if (this.isASCII(start, end))
+ return string_cut(this.parseStringISO(start, end), maxLength);
+ let len = end - start,
+ s = "(" + len + " byte)\n";
+ maxLength /= 2; // we work in bytes
+ if (len > maxLength)
+ end = start + maxLength;
+ for (let i = start; i < end; ++i)
+ s += this.hexByte(this.get(i));
+ if (len > maxLength)
+ s += ellipsis;
+ return s;
+ };
+
+ parseOID(start, end, maxLength) {
+ let s = '',
+ n = new Int10(),
+ bits = 0;
+ for (let i = start; i < end; ++i) {
+ let v = this.get(i);
+ n.mulAdd(128, v & 0x7F);
+ bits += 7;
+ if (!(v & 0x80)) { // finished
+ if (s === '') {
+ n = n.simplify();
+ if (n instanceof Int10) {
+ n.sub(80);
+ s = "2." + n.toString();
+ } else {
+ let m = n < 80 ? n < 40 ? 0 : 1 : 2;
+ s = m + "." + (n - m * 40);
+ }
+ } else
+ s += "." + n.toString();
if (s.length > maxLength)
- return intro + string_cut(s, maxLength);
- }
- return intro + s;
- };
-
- parseOctetString(start, end, maxLength) {
- if (this.isASCII(start, end))
- return string_cut(this.parseStringISO(start, end), maxLength);
- let len = end - start,
- s = "(" + len + " byte)\n";
- maxLength /= 2; // we work in bytes
- if (len > maxLength)
- end = start + maxLength;
- for (let i = start; i < end; ++i)
- s += this.hexByte(this.get(i));
- if (len > maxLength)
- s += ellipsis;
- return s;
- };
-
- parseOID(start, end, maxLength) {
- let s = '',
- n = new Int10(),
+ return string_cut(s, maxLength);
+ n = new Int10();
bits = 0;
- for (let i = start; i < end; ++i) {
- let v = this.get(i);
- n.mulAdd(128, v & 0x7F);
- bits += 7;
- if (!(v & 0x80)) { // finished
- if (s === '') {
- n = n.simplify();
- if (n instanceof Int10) {
- n.sub(80);
- s = "2." + n.toString();
- } else {
- let m = n < 80 ? n < 40 ? 0 : 1 : 2;
- s = m + "." + (n - m * 40);
- }
- } else
- s += "." + n.toString();
- if (s.length > maxLength)
- return string_cut(s, maxLength);
- n = new Int10();
- bits = 0;
- }
- }
- if (bits > 0)
- s += ".incomplete";
- /* FIXME
- if (typeof oids === 'object') {
- let oid = oids[s];
- if (oid) {
- if (oid.d) s += "\n" + oid.d;
- if (oid.c) s += "\n" + oid.c;
- if (oid.w) s += "\n(warning!)";
- }
- }
- */
- return s;
- };
- }
-
- export enum TagClass {
- UNIVERSAL = 0x00,
- APPLICATION = 0x01,
- CONTEXT = 0x02,
- PRIVATE = 0x03
- }
-
- export enum TagType {
- EOC = 0x00,
- BOOLEAN = 0x01,
- INTEGER = 0x02,
- BIT_STRING = 0x03,
- OCTET_STRING = 0x04,
- NULL = 0x05,
- OBJECT_IDENTIFIER = 0x06,
- ObjectDescriptor = 0x07,
- EXTERNAL = 0x08,
- REAL = 0x09,
- ENUMERATED = 0x0A,
- EMBEDDED_PDV = 0x0B,
- UTF8String = 0x0C,
- SEQUENCE = 0x10,
- SET = 0x11,
- NumericString = 0x12,
- PrintableString = 0x13, // ASCII subset
- TeletextString = 0x14, // aka T61String
- VideotexString = 0x15,
- IA5String = 0x16, // ASCII
- UTCTime = 0x17,
- GeneralizedTime = 0x18,
- GraphicString = 0x19,
- VisibleString = 0x1A, // ASCII subset
- GeneralString = 0x1B,
- UniversalString = 0x1C,
- BMPString = 0x1E
- }
-
- class ASN1Tag {
- tagClass: TagClass;
- type: TagType;
- tagConstructed: boolean;
- tagNumber: number;
-
- constructor(stream: Stream) {
- let buf = stream.get();
- this.tagClass = buf >> 6;
- this.tagConstructed = ((buf & 0x20) !== 0);
- this.tagNumber = buf & 0x1F;
- if (this.tagNumber == 0x1F) { // long tag
- let n = new Int10();
- do {
- buf = stream.get();
- n.mulAdd(128, buf & 0x7F);
- } while (buf & 0x80);
- this.tagNumber = n.simplify();
}
}
+ if (bits > 0)
+ s += ".incomplete";
+ /* FIXME
+ if (typeof oids === 'object') {
+ let oid = oids[s];
+ if (oid) {
+ if (oid.d) s += "\n" + oid.d;
+ if (oid.c) s += "\n" + oid.c;
+ if (oid.w) s += "\n(warning!)";
+ }
+ }
+ */
+ return s;
+ };
+}
- isUniversal() {
- return this.tagClass === 0x00;
- };
+export enum TagClass {
+ UNIVERSAL = 0x00,
+ APPLICATION = 0x01,
+ CONTEXT = 0x02,
+ PRIVATE = 0x03
+}
- isEOC() {
- return this.tagClass === 0x00 && this.tagNumber === 0x00;
- };
+export enum TagType {
+ EOC = 0x00,
+ BOOLEAN = 0x01,
+ INTEGER = 0x02,
+ BIT_STRING = 0x03,
+ OCTET_STRING = 0x04,
+ NULL = 0x05,
+ OBJECT_IDENTIFIER = 0x06,
+ ObjectDescriptor = 0x07,
+ EXTERNAL = 0x08,
+ REAL = 0x09,
+ ENUMERATED = 0x0A,
+ EMBEDDED_PDV = 0x0B,
+ UTF8String = 0x0C,
+ SEQUENCE = 0x10,
+ SET = 0x11,
+ NumericString = 0x12,
+ PrintableString = 0x13, // ASCII subset
+ TeletextString = 0x14, // aka T61String
+ VideotexString = 0x15,
+ IA5String = 0x16, // ASCII
+ UTCTime = 0x17,
+ GeneralizedTime = 0x18,
+ GraphicString = 0x19,
+ VisibleString = 0x1A, // ASCII subset
+ GeneralString = 0x1B,
+ UniversalString = 0x1C,
+ BMPString = 0x1E
+}
+
+class ASN1Tag {
+ tagClass: TagClass;
+ type: TagType;
+ tagConstructed: boolean;
+ tagNumber: number;
+
+ constructor(stream: Stream) {
+ let buf = stream.get();
+ this.tagClass = buf >> 6;
+ this.tagConstructed = ((buf & 0x20) !== 0);
+ this.tagNumber = buf & 0x1F;
+ if (this.tagNumber == 0x1F) { // long tag
+ let n = new Int10();
+ do {
+ buf = stream.get();
+ n.mulAdd(128, buf & 0x7F);
+ } while (buf & 0x80);
+ this.tagNumber = n.simplify();
+ }
}
- export class ASN1 {
- stream: Stream;
- header: number;
- length: number;
- tag: ASN1Tag;
- children: ASN1[];
+ isUniversal() {
+ return this.tagClass === 0x00;
+ };
- constructor(stream: Stream, header: number, length: number, tag: ASN1Tag, children: ASN1[]) {
- this.stream = stream;
- this.header = header;
- this.length = length;
- this.tag = tag;
- this.children = children;
+ isEOC() {
+ return this.tagClass === 0x00 && this.tagNumber === 0x00;
+ };
+}
+
+export class ASN1 {
+ stream: Stream;
+ header: number;
+ length: number;
+ tag: ASN1Tag;
+ children: ASN1[];
+
+ constructor(stream: Stream, header: number, length: number, tag: ASN1Tag, children: ASN1[]) {
+ this.stream = stream;
+ this.header = header;
+ this.length = length;
+ this.tag = tag;
+ this.children = children;
+ }
+
+ content(max_length?: number, type?: TagType) { // a preview of the content (intended for humans)
+ if (this.tag === undefined) return null;
+ if (max_length === undefined)
+ max_length = Infinity;
+
+ let content = this.posContent(),
+ len = Math.abs(this.length);
+
+ if (!this.tag.isUniversal()) {
+ if (this.children !== null)
+ return "(" + this.children.length + " elem)";
+ return this.stream.parseOctetString(content, content + len, max_length);
}
-
- content(max_length?: number, type?: TagType) { // a preview of the content (intended for humans)
- if (this.tag === undefined) return null;
- if (max_length === undefined)
- max_length = Infinity;
-
- let content = this.posContent(),
- len = Math.abs(this.length);
-
- if (!this.tag.isUniversal()) {
+ switch (type || this.tag.tagNumber) {
+ case 0x01: // BOOLEAN
+ return (this.stream.get(content) === 0) ? "false" : "true";
+ case 0x02: // INTEGER
+ return this.stream.parseInteger(content, content + len);
+ case 0x03: // BIT_STRING
+ return this.children ? "(" + this.children.length + " elem)" :
+ this.stream.parseBitString(content, content + len, max_length);
+ case 0x04: // OCTET_STRING
+ return this.children ? "(" + this.children.length + " elem)" :
+ this.stream.parseOctetString(content, content + len, max_length);
+ //case 0x05: // NULL
+ case 0x06: // OBJECT_IDENTIFIER
+ return this.stream.parseOID(content, content + len, max_length);
+ //case 0x07: // ObjectDescriptor
+ //case 0x08: // EXTERNAL
+ //case 0x09: // REAL
+ //case 0x0A: // ENUMERATED
+ //case 0x0B: // EMBEDDED_PDV
+ case 0x10: // SEQUENCE
+ case 0x11: // SET
if (this.children !== null)
return "(" + this.children.length + " elem)";
- return this.stream.parseOctetString(content, content + len, max_length);
- }
- switch (type || this.tag.tagNumber) {
- case 0x01: // BOOLEAN
- return (this.stream.get(content) === 0) ? "false" : "true";
- case 0x02: // INTEGER
- return this.stream.parseInteger(content, content + len);
- case 0x03: // BIT_STRING
- return this.children ? "(" + this.children.length + " elem)" :
- this.stream.parseBitString(content, content + len, max_length);
- case 0x04: // OCTET_STRING
- return this.children ? "(" + this.children.length + " elem)" :
- this.stream.parseOctetString(content, content + len, max_length);
- //case 0x05: // NULL
- case 0x06: // OBJECT_IDENTIFIER
- return this.stream.parseOID(content, content + len, max_length);
- //case 0x07: // ObjectDescriptor
- //case 0x08: // EXTERNAL
- //case 0x09: // REAL
- //case 0x0A: // ENUMERATED
- //case 0x0B: // EMBEDDED_PDV
- case 0x10: // SEQUENCE
- case 0x11: // SET
- if (this.children !== null)
- return "(" + this.children.length + " elem)";
- else
- return "(no elem)";
- case 0x0C: // UTF8String
- return string_cut(this.stream.parseStringUTF(content, content + len), max_length);
- case 0x12: // NumericString
- case 0x13: // PrintableString
- case 0x14: // TeletexString
- case 0x15: // VideotexString
- case 0x16: // IA5String
- //case 0x19: // GraphicString
- case 0x1A: // VisibleString
- //case 0x1B: // GeneralString
- //case 0x1C: // UniversalString
- return string_cut(this.stream.parseStringISO(content, content + len), max_length);
- case 0x1E: // BMPString
- return string_cut(this.stream.parseStringBMP(content, content + len), max_length);
- case 0x17: // UTCTime
- case 0x18: // GeneralizedTime
- return this.stream.parseTime(content, content + len, (this.tag.tagNumber == 0x17));
- }
- return null;
- };
-
- typeName(): string {
- switch (this.tag.tagClass) {
- case 0: // universal
- return TagType[this.tag.tagNumber] || ("Universal_" + this.tag.tagNumber.toString());
- case 1:
- return "Application_" + this.tag.tagNumber.toString();
- case 2:
- return "[" + this.tag.tagNumber.toString() + "]"; // Context
- case 3:
- return "Private_" + this.tag.tagNumber.toString();
- }
- };
-
- toString() {
- return this.typeName() + "@" + this.stream.position + "[header:" + this.header + ",length:" + this.length + ",sub:" + ((this.children === null) ? 'null' : this.children.length) + "]";
+ else
+ return "(no elem)";
+ case 0x0C: // UTF8String
+ return string_cut(this.stream.parseStringUTF(content, content + len), max_length);
+ case 0x12: // NumericString
+ case 0x13: // PrintableString
+ case 0x14: // TeletexString
+ case 0x15: // VideotexString
+ case 0x16: // IA5String
+ //case 0x19: // GraphicString
+ case 0x1A: // VisibleString
+ //case 0x1B: // GeneralString
+ //case 0x1C: // UniversalString
+ return string_cut(this.stream.parseStringISO(content, content + len), max_length);
+ case 0x1E: // BMPString
+ return string_cut(this.stream.parseStringBMP(content, content + len), max_length);
+ case 0x17: // UTCTime
+ case 0x18: // GeneralizedTime
+ return this.stream.parseTime(content, content + len, (this.tag.tagNumber == 0x17));
}
+ return null;
+ };
- toPrettyString(indent) {
- if (indent === undefined) indent = '';
- let s = indent + this.typeName() + " @" + this.stream.position;
- if (this.length >= 0)
- s += "+";
- s += this.length;
- if (this.tag.tagConstructed)
- s += " (constructed)";
- else if ((this.tag.isUniversal() && ((this.tag.tagNumber == 0x03) || (this.tag.tagNumber == 0x04))) && (this.children !== null))
- s += " (encapsulates)";
- let content = this.content();
- if (content)
- s += ": " + content.replace(/\n/g, '|');
- s += "\n";
- if (this.children !== null) {
- indent += ' ';
- for (let i = 0, max = this.children.length; i < max; ++i)
- s += this.children[i].toPrettyString(indent);
- }
- return s;
- };
+ typeName(): string {
+ switch (this.tag.tagClass) {
+ case 0: // universal
+ return TagType[this.tag.tagNumber] || ("Universal_" + this.tag.tagNumber.toString());
+ case 1:
+ return "Application_" + this.tag.tagNumber.toString();
+ case 2:
+ return "[" + this.tag.tagNumber.toString() + "]"; // Context
+ case 3:
+ return "Private_" + this.tag.tagNumber.toString();
+ }
+ };
- posStart() {
- return this.stream.position;
- };
+ toString() {
+ return this.typeName() + "@" + this.stream.position + "[header:" + this.header + ",length:" + this.length + ",sub:" + ((this.children === null) ? 'null' : this.children.length) + "]";
+ }
- posContent() {
- return this.stream.position + this.header;
- };
+ toPrettyString(indent) {
+ if (indent === undefined) indent = '';
+ let s = indent + this.typeName() + " @" + this.stream.position;
+ if (this.length >= 0)
+ s += "+";
+ s += this.length;
+ if (this.tag.tagConstructed)
+ s += " (constructed)";
+ else if ((this.tag.isUniversal() && ((this.tag.tagNumber == 0x03) || (this.tag.tagNumber == 0x04))) && (this.children !== null))
+ s += " (encapsulates)";
+ let content = this.content();
+ if (content)
+ s += ": " + content.replace(/\n/g, '|');
+ s += "\n";
+ if (this.children !== null) {
+ indent += ' ';
+ for (let i = 0, max = this.children.length; i < max; ++i)
+ s += this.children[i].toPrettyString(indent);
+ }
+ return s;
+ };
- posEnd() {
- return this.stream.position + this.header + Math.abs(this.length);
- };
+ posStart() {
+ return this.stream.position;
+ };
- static decodeLength(stream: Stream) {
- let buf = stream.get();
- const len = buf & 0x7F;
- if (len == buf)
- return len;
- if (len > 6) // no reason to use Int10, as it would be a huge buffer anyways
- throw "Length over 48 bits not supported at position " + (stream.position - 1);
- if (len === 0)
- return null; // undefined
+ posContent() {
+ return this.stream.position + this.header;
+ };
- buf = 0;
- for (let i = 0; i < len; ++i)
- buf = (buf << 8) + stream.get();
- return buf;
- };
+ posEnd() {
+ return this.stream.position + this.header + Math.abs(this.length);
+ };
- static encodeLength(buffer: Uint8Array, offset: number, length: number) {
- if(length < 0x7F) {
- buffer[offset] = length;
- } else {
- buffer[offset] = 0x80;
- let index = 1;
- while(length > 0) {
- buffer[offset + index++] = length & 0xFF;
- length >>= 8;
- buffer[offset] += 1;
- }
+ static decodeLength(stream: Stream) {
+ let buf = stream.get();
+ const len = buf & 0x7F;
+ if (len == buf)
+ return len;
+ if (len > 6) // no reason to use Int10, as it would be a huge buffer anyways
+ throw "Length over 48 bits not supported at position " + (stream.position - 1);
+ if (len === 0)
+ return null; // undefined
+
+ buf = 0;
+ for (let i = 0; i < len; ++i)
+ buf = (buf << 8) + stream.get();
+ return buf;
+ };
+
+ static encodeLength(buffer: Uint8Array, offset: number, length: number) {
+ if(length < 0x7F) {
+ buffer[offset] = length;
+ } else {
+ buffer[offset] = 0x80;
+ let index = 1;
+ while(length > 0) {
+ buffer[offset + index++] = length & 0xFF;
+ length >>= 8;
+ buffer[offset] += 1;
}
}
}
+}
- function decode0(stream: Stream) {
- const streamStart = new Stream(stream, 0); /* copy */
- const tag = new ASN1Tag(stream);
- let len = ASN1.decodeLength(stream);
- const start = stream.position;
- const length_header = start - streamStart.position;
- let children = null;
- const query_children = () => {
- children = [];
- if (len !== null) {
- const end = start + len;
- if (end > stream.length())
- throw 'Container at offset ' + start + ' has a length of ' + len + ', which is past the end of the stream';
- while (stream.position < end)
- children[children.length] = decode0(stream);
- if (stream.position != end)
- throw 'Content size is not correct for container at offset ' + start;
- } else {
- // undefined length
- try {
- while (true) {
- const s = decode0(stream);
- if (s.tag.isEOC()) break;
- children[children.length] = s;
- }
- len = start - stream.position; // undefined lengths are represented as negative values
- } catch (e) {
- throw 'Exception while decoding undefined length content at offset ' + start + ': ' + e;
- }
- }
- };
- if (tag.tagConstructed) {
- // must have valid content
- query_children();
- } else if (tag.isUniversal() && ((tag.tagNumber == 0x03) || (tag.tagNumber == 0x04))) {
- // sometimes BitString and OctetString are used to encapsulate ASN.1
+function decode0(stream: Stream) {
+ const streamStart = new Stream(stream, 0); /* copy */
+ const tag = new ASN1Tag(stream);
+ let len = ASN1.decodeLength(stream);
+ const start = stream.position;
+ const length_header = start - streamStart.position;
+ let children = null;
+ const query_children = () => {
+ children = [];
+ if (len !== null) {
+ const end = start + len;
+ if (end > stream.length())
+ throw 'Container at offset ' + start + ' has a length of ' + len + ', which is past the end of the stream';
+ while (stream.position < end)
+ children[children.length] = decode0(stream);
+ if (stream.position != end)
+ throw 'Content size is not correct for container at offset ' + start;
+ } else {
+ // undefined length
try {
- if (tag.tagNumber == 0x03)
- if (stream.get() != 0)
- throw "BIT STRINGs with unused bits cannot encapsulate.";
- query_children();
- for (let i = 0; i < children.length; ++i)
- if (children[i].tag.isEOC())
- throw 'EOC is not supposed to be actual content.';
+ while (true) {
+ const s = decode0(stream);
+ if (s.tag.isEOC()) break;
+ children[children.length] = s;
+ }
+ len = start - stream.position; // undefined lengths are represented as negative values
} catch (e) {
- // but silently ignore when they don't
- children = null;
- //DEBUG console.log('Could not decode structure at ' + start + ':', e);
+ throw 'Exception while decoding undefined length content at offset ' + start + ': ' + e;
}
}
- if (children === null) {
- if (len === null)
- throw "We can't skip over an invalid tag with undefined length at offset " + start;
- stream.position = start + Math.abs(len);
+ };
+ if (tag.tagConstructed) {
+ // must have valid content
+ query_children();
+ } else if (tag.isUniversal() && ((tag.tagNumber == 0x03) || (tag.tagNumber == 0x04))) {
+ // sometimes BitString and OctetString are used to encapsulate ASN.1
+ try {
+ if (tag.tagNumber == 0x03)
+ if (stream.get() != 0)
+ throw "BIT STRINGs with unused bits cannot encapsulate.";
+ query_children();
+ for (let i = 0; i < children.length; ++i)
+ if (children[i].tag.isEOC())
+ throw 'EOC is not supposed to be actual content.';
+ } catch (e) {
+ // but silently ignore when they don't
+ children = null;
+ //DEBUG console.log('Could not decode structure at ' + start + ':', e);
}
- return new ASN1(streamStart, length_header, len, tag, children);
}
+ if (children === null) {
+ if (len === null)
+ throw "We can't skip over an invalid tag with undefined length at offset " + start;
+ stream.position = start + Math.abs(len);
+ }
+ return new ASN1(streamStart, length_header, len, tag, children);
+}
- export function decode(stream: string | ArrayBuffer) {
- return decode0(new Stream(stream, 0));
- }
+export function decode(stream: string | ArrayBuffer) {
+ return decode0(new Stream(stream, 0));
}
\ No newline at end of file
diff --git a/shared/js/crypto/crc32.ts b/shared/js/crypto/crc32.ts
index 8122a8a2..52e14979 100644
--- a/shared/js/crypto/crc32.ts
+++ b/shared/js/crypto/crc32.ts
@@ -1,4 +1,4 @@
-class Crc32 {
+export class Crc32 {
private static readonly lookup = [
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
diff --git a/shared/js/crypto/hex.ts b/shared/js/crypto/hex.ts
index 9c700341..642488d0 100644
--- a/shared/js/crypto/hex.ts
+++ b/shared/js/crypto/hex.ts
@@ -1,20 +1,18 @@
-namespace hex {
- export function encode(buffer) {
- let hexCodes = [];
- let view = new DataView(buffer);
- for (let i = 0; i < view.byteLength % 4; i ++) {
- let value = view.getUint32(i * 4);
- let stringValue = value.toString(16);
- let padding = '00000000';
- let paddedValue = (padding + stringValue).slice(-padding.length);
- hexCodes.push(paddedValue);
- }
- for (let i = (view.byteLength % 4) * 4; i < view.byteLength; i++) {
- let value = view.getUint8(i).toString(16);
- let padding = '00';
- hexCodes.push((padding + value).slice(-padding.length));
- }
-
- return hexCodes.join("");
+export function encode(buffer) {
+ let hexCodes = [];
+ let view = new DataView(buffer);
+ for (let i = 0; i < view.byteLength % 4; i ++) {
+ let value = view.getUint32(i * 4);
+ let stringValue = value.toString(16);
+ let padding = '00000000';
+ let paddedValue = (padding + stringValue).slice(-padding.length);
+ hexCodes.push(paddedValue);
}
+ for (let i = (view.byteLength % 4) * 4; i < view.byteLength; i++) {
+ let value = view.getUint8(i).toString(16);
+ let padding = '00';
+ hexCodes.push((padding + value).slice(-padding.length));
+ }
+
+ return hexCodes.join("");
}
\ No newline at end of file
diff --git a/shared/js/crypto/sha.ts b/shared/js/crypto/sha.ts
index 28998cff..a3d28f9f 100644
--- a/shared/js/crypto/sha.ts
+++ b/shared/js/crypto/sha.ts
@@ -6,405 +6,367 @@ declare class _sha1 {
/*
interface Window {
- TextEncoder: any;
+TextEncoder: any;
}
*/
-namespace sha {
- /*
- * [js-sha1]{@link https://github.com/emn178/js-sha1}
- *
- * @version 0.6.0
- * @author Chen, Yi-Cyuan [emn178@gmail.com]
- * @copyright Chen, Yi-Cyuan 2014-2017
- * @license MIT
- */
- /*jslint bitwise: true */
- (function() {
- 'use strict';
+/*
+ * [js-sha1]{@link https://github.com/emn178/js-sha1}
+ *
+ * @version 0.6.0
+ * @author Chen, Yi-Cyuan [emn178@gmail.com]
+ * @copyright Chen, Yi-Cyuan 2014-2017
+ * @license MIT
+ */
+/*jslint bitwise: true */
+(function() {
+ 'use strict';
- let root: any = typeof window === 'object' ? window : {};
- let NODE_JS = !root.JS_SHA1_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node;
- if (NODE_JS) {
- root = global;
+ let root: any = typeof window === 'object' ? window : {};
+ let HEX_CHARS = '0123456789abcdef'.split('');
+ let EXTRA = [-2147483648, 8388608, 32768, 128];
+ let SHIFT = [24, 16, 8, 0];
+ let OUTPUT_TYPES = ['hex', 'array', 'digest', 'arrayBuffer'];
+
+ let blocks = [];
+
+ let createOutputMethod = function (outputType) {
+ return function (message) {
+ return new Sha1(true).update(message)[outputType]();
+ };
+ };
+
+ let createMethod = function () {
+ let method: any = createOutputMethod('hex');
+ method.create = function () {
+ return new (Sha1 as any)();
+ };
+ method.update = function (message) {
+ return method.create().update(message);
+ };
+ for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
+ var type = OUTPUT_TYPES[i];
+ method[type] = createOutputMethod(type);
}
- let COMMON_JS = !root.JS_SHA1_NO_COMMON_JS && typeof module === 'object' && module.exports;
- let AMD = typeof define === 'function' && (define as any).amd;
- let HEX_CHARS = '0123456789abcdef'.split('');
- let EXTRA = [-2147483648, 8388608, 32768, 128];
- let SHIFT = [24, 16, 8, 0];
- let OUTPUT_TYPES = ['hex', 'array', 'digest', 'arrayBuffer'];
+ return method;
+ };
- let blocks = [];
-
- let createOutputMethod = function (outputType) {
- return function (message) {
- return new Sha1(true).update(message)[outputType]();
- };
- };
-
- let createMethod = function () {
- let method: any = createOutputMethod('hex');
- if (NODE_JS) {
- method = nodeWrap(method);
- }
- method.create = function () {
- return new (Sha1 as any)();
- };
- method.update = function (message) {
- return method.create().update(message);
- };
- for (var i = 0; i < OUTPUT_TYPES.length; ++i) {
- var type = OUTPUT_TYPES[i];
- method[type] = createOutputMethod(type);
- }
- return method;
- };
-
- var nodeWrap = function (method) {
- var crypto = eval("require('crypto')");
- var Buffer = eval("require('buffer').Buffer");
- var nodeMethod = function (message) {
- if (typeof message === 'string') {
- return crypto.createHash('sha1').update(message, 'utf8').digest('hex');
- } else if (message.constructor === ArrayBuffer) {
- message = new Uint8Array(message);
- } else if (message.length === undefined) {
- return method(message);
- }
- return crypto.createHash('sha1').update(new Buffer(message)).digest('hex');
- };
- return nodeMethod;
- };
-
- function Sha1(sharedMemory) {
- if (sharedMemory) {
- blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] =
- blocks[4] = blocks[5] = blocks[6] = blocks[7] =
- blocks[8] = blocks[9] = blocks[10] = blocks[11] =
- blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
- this.blocks = blocks;
- } else {
- this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
- }
-
- this.h0 = 0x67452301;
- this.h1 = 0xEFCDAB89;
- this.h2 = 0x98BADCFE;
- this.h3 = 0x10325476;
- this.h4 = 0xC3D2E1F0;
-
- this.block = this.start = this.bytes = this.hBytes = 0;
- this.finalized = this.hashed = false;
- this.first = true;
+ function Sha1(sharedMemory) {
+ if (sharedMemory) {
+ blocks[0] = blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+ blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+ blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+ blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
+ this.blocks = blocks;
+ } else {
+ this.blocks = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
}
- Sha1.prototype.update = function (message) {
- if (this.finalized) {
- return;
- }
- var notString = typeof(message) !== 'string';
- if (notString && message.constructor === root.ArrayBuffer) {
- message = new Uint8Array(message);
- }
- var code, index = 0, i, length = message.length || 0, blocks = this.blocks;
+ this.h0 = 0x67452301;
+ this.h1 = 0xEFCDAB89;
+ this.h2 = 0x98BADCFE;
+ this.h3 = 0x10325476;
+ this.h4 = 0xC3D2E1F0;
- while (index < length) {
- if (this.hashed) {
- this.hashed = false;
- blocks[0] = this.block;
- blocks[16] = blocks[1] = blocks[2] = blocks[3] =
- blocks[4] = blocks[5] = blocks[6] = blocks[7] =
- blocks[8] = blocks[9] = blocks[10] = blocks[11] =
- blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
- }
+ this.block = this.start = this.bytes = this.hBytes = 0;
+ this.finalized = this.hashed = false;
+ this.first = true;
+ }
- if(notString) {
- for (i = this.start; index < length && i < 64; ++index) {
- blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
- }
- } else {
- for (i = this.start; index < length && i < 64; ++index) {
- code = message.charCodeAt(index);
- if (code < 0x80) {
- blocks[i >> 2] |= code << SHIFT[i++ & 3];
- } else if (code < 0x800) {
- blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3];
- blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
- } else if (code < 0xd800 || code >= 0xe000) {
- blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3];
- blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
- blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
- } else {
- code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
- blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
- blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3];
- blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
- blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
- }
- }
- }
+ Sha1.prototype.update = function (message) {
+ if (this.finalized) {
+ return;
+ }
+ var notString = typeof(message) !== 'string';
+ if (notString && message.constructor === root.ArrayBuffer) {
+ message = new Uint8Array(message);
+ }
+ var code, index = 0, i, length = message.length || 0, blocks = this.blocks;
- this.lastByteIndex = i;
- this.bytes += i - this.start;
- if (i >= 64) {
- this.block = blocks[16];
- this.start = i - 64;
- this.hash();
- this.hashed = true;
- } else {
- this.start = i;
- }
- }
- if (this.bytes > 4294967295) {
- this.hBytes += this.bytes / 4294967296 << 0;
- this.bytes = this.bytes % 4294967296;
- }
- return this;
- };
-
- Sha1.prototype.finalize = function () {
- if (this.finalized) {
- return;
- }
- this.finalized = true;
- var blocks = this.blocks, i = this.lastByteIndex;
- blocks[16] = this.block;
- blocks[i >> 2] |= EXTRA[i & 3];
- this.block = blocks[16];
- if (i >= 56) {
- if (!this.hashed) {
- this.hash();
- }
+ while (index < length) {
+ if (this.hashed) {
+ this.hashed = false;
blocks[0] = this.block;
blocks[16] = blocks[1] = blocks[2] = blocks[3] =
blocks[4] = blocks[5] = blocks[6] = blocks[7] =
blocks[8] = blocks[9] = blocks[10] = blocks[11] =
blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
}
- blocks[14] = this.hBytes << 3 | this.bytes >>> 29;
- blocks[15] = this.bytes << 3;
- this.hash();
- };
- Sha1.prototype.hash = function () {
- var a = this.h0, b = this.h1, c = this.h2, d = this.h3, e = this.h4;
- var f, j, t, blocks = this.blocks;
-
- for(j = 16; j < 80; ++j) {
- t = blocks[j - 3] ^ blocks[j - 8] ^ blocks[j - 14] ^ blocks[j - 16];
- blocks[j] = (t << 1) | (t >>> 31);
+ if(notString) {
+ for (i = this.start; index < length && i < 64; ++index) {
+ blocks[i >> 2] |= message[index] << SHIFT[i++ & 3];
+ }
+ } else {
+ for (i = this.start; index < length && i < 64; ++index) {
+ code = message.charCodeAt(index);
+ if (code < 0x80) {
+ blocks[i >> 2] |= code << SHIFT[i++ & 3];
+ } else if (code < 0x800) {
+ blocks[i >> 2] |= (0xc0 | (code >> 6)) << SHIFT[i++ & 3];
+ blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+ } else if (code < 0xd800 || code >= 0xe000) {
+ blocks[i >> 2] |= (0xe0 | (code >> 12)) << SHIFT[i++ & 3];
+ blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+ blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+ } else {
+ code = 0x10000 + (((code & 0x3ff) << 10) | (message.charCodeAt(++index) & 0x3ff));
+ blocks[i >> 2] |= (0xf0 | (code >> 18)) << SHIFT[i++ & 3];
+ blocks[i >> 2] |= (0x80 | ((code >> 12) & 0x3f)) << SHIFT[i++ & 3];
+ blocks[i >> 2] |= (0x80 | ((code >> 6) & 0x3f)) << SHIFT[i++ & 3];
+ blocks[i >> 2] |= (0x80 | (code & 0x3f)) << SHIFT[i++ & 3];
+ }
+ }
}
- for(j = 0; j < 20; j += 5) {
- f = (b & c) | ((~b) & d);
- t = (a << 5) | (a >>> 27);
- e = t + f + e + 1518500249 + blocks[j] << 0;
- b = (b << 30) | (b >>> 2);
-
- f = (a & b) | ((~a) & c);
- t = (e << 5) | (e >>> 27);
- d = t + f + d + 1518500249 + blocks[j + 1] << 0;
- a = (a << 30) | (a >>> 2);
-
- f = (e & a) | ((~e) & b);
- t = (d << 5) | (d >>> 27);
- c = t + f + c + 1518500249 + blocks[j + 2] << 0;
- e = (e << 30) | (e >>> 2);
-
- f = (d & e) | ((~d) & a);
- t = (c << 5) | (c >>> 27);
- b = t + f + b + 1518500249 + blocks[j + 3] << 0;
- d = (d << 30) | (d >>> 2);
-
- f = (c & d) | ((~c) & e);
- t = (b << 5) | (b >>> 27);
- a = t + f + a + 1518500249 + blocks[j + 4] << 0;
- c = (c << 30) | (c >>> 2);
- }
-
- for(; j < 40; j += 5) {
- f = b ^ c ^ d;
- t = (a << 5) | (a >>> 27);
- e = t + f + e + 1859775393 + blocks[j] << 0;
- b = (b << 30) | (b >>> 2);
-
- f = a ^ b ^ c;
- t = (e << 5) | (e >>> 27);
- d = t + f + d + 1859775393 + blocks[j + 1] << 0;
- a = (a << 30) | (a >>> 2);
-
- f = e ^ a ^ b;
- t = (d << 5) | (d >>> 27);
- c = t + f + c + 1859775393 + blocks[j + 2] << 0;
- e = (e << 30) | (e >>> 2);
-
- f = d ^ e ^ a;
- t = (c << 5) | (c >>> 27);
- b = t + f + b + 1859775393 + blocks[j + 3] << 0;
- d = (d << 30) | (d >>> 2);
-
- f = c ^ d ^ e;
- t = (b << 5) | (b >>> 27);
- a = t + f + a + 1859775393 + blocks[j + 4] << 0;
- c = (c << 30) | (c >>> 2);
- }
-
- for(; j < 60; j += 5) {
- f = (b & c) | (b & d) | (c & d);
- t = (a << 5) | (a >>> 27);
- e = t + f + e - 1894007588 + blocks[j] << 0;
- b = (b << 30) | (b >>> 2);
-
- f = (a & b) | (a & c) | (b & c);
- t = (e << 5) | (e >>> 27);
- d = t + f + d - 1894007588 + blocks[j + 1] << 0;
- a = (a << 30) | (a >>> 2);
-
- f = (e & a) | (e & b) | (a & b);
- t = (d << 5) | (d >>> 27);
- c = t + f + c - 1894007588 + blocks[j + 2] << 0;
- e = (e << 30) | (e >>> 2);
-
- f = (d & e) | (d & a) | (e & a);
- t = (c << 5) | (c >>> 27);
- b = t + f + b - 1894007588 + blocks[j + 3] << 0;
- d = (d << 30) | (d >>> 2);
-
- f = (c & d) | (c & e) | (d & e);
- t = (b << 5) | (b >>> 27);
- a = t + f + a - 1894007588 + blocks[j + 4] << 0;
- c = (c << 30) | (c >>> 2);
- }
-
- for(; j < 80; j += 5) {
- f = b ^ c ^ d;
- t = (a << 5) | (a >>> 27);
- e = t + f + e - 899497514 + blocks[j] << 0;
- b = (b << 30) | (b >>> 2);
-
- f = a ^ b ^ c;
- t = (e << 5) | (e >>> 27);
- d = t + f + d - 899497514 + blocks[j + 1] << 0;
- a = (a << 30) | (a >>> 2);
-
- f = e ^ a ^ b;
- t = (d << 5) | (d >>> 27);
- c = t + f + c - 899497514 + blocks[j + 2] << 0;
- e = (e << 30) | (e >>> 2);
-
- f = d ^ e ^ a;
- t = (c << 5) | (c >>> 27);
- b = t + f + b - 899497514 + blocks[j + 3] << 0;
- d = (d << 30) | (d >>> 2);
-
- f = c ^ d ^ e;
- t = (b << 5) | (b >>> 27);
- a = t + f + a - 899497514 + blocks[j + 4] << 0;
- c = (c << 30) | (c >>> 2);
- }
-
- this.h0 = this.h0 + a << 0;
- this.h1 = this.h1 + b << 0;
- this.h2 = this.h2 + c << 0;
- this.h3 = this.h3 + d << 0;
- this.h4 = this.h4 + e << 0;
- };
-
- Sha1.prototype.hex = function () {
- this.finalize();
-
- var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3, h4 = this.h4;
-
- return HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
- HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
- HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
- HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
- HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
- HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
- HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
- HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
- HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
- HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
- HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
- HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
- HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F] +
- HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
- HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
- HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
- HEX_CHARS[(h4 >> 28) & 0x0F] + HEX_CHARS[(h4 >> 24) & 0x0F] +
- HEX_CHARS[(h4 >> 20) & 0x0F] + HEX_CHARS[(h4 >> 16) & 0x0F] +
- HEX_CHARS[(h4 >> 12) & 0x0F] + HEX_CHARS[(h4 >> 8) & 0x0F] +
- HEX_CHARS[(h4 >> 4) & 0x0F] + HEX_CHARS[h4 & 0x0F];
- };
-
- Sha1.prototype.toString = Sha1.prototype.hex;
-
- Sha1.prototype.digest = function () {
- this.finalize();
-
- var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3, h4 = this.h4;
-
- return [
- (h0 >> 24) & 0xFF, (h0 >> 16) & 0xFF, (h0 >> 8) & 0xFF, h0 & 0xFF,
- (h1 >> 24) & 0xFF, (h1 >> 16) & 0xFF, (h1 >> 8) & 0xFF, h1 & 0xFF,
- (h2 >> 24) & 0xFF, (h2 >> 16) & 0xFF, (h2 >> 8) & 0xFF, h2 & 0xFF,
- (h3 >> 24) & 0xFF, (h3 >> 16) & 0xFF, (h3 >> 8) & 0xFF, h3 & 0xFF,
- (h4 >> 24) & 0xFF, (h4 >> 16) & 0xFF, (h4 >> 8) & 0xFF, h4 & 0xFF
- ];
- };
-
- Sha1.prototype.array = Sha1.prototype.digest;
-
- Sha1.prototype.arrayBuffer = function () {
- this.finalize();
-
- var buffer = new ArrayBuffer(20);
- var dataView = new DataView(buffer);
- dataView.setUint32(0, this.h0);
- dataView.setUint32(4, this.h1);
- dataView.setUint32(8, this.h2);
- dataView.setUint32(12, this.h3);
- dataView.setUint32(16, this.h4);
- return buffer;
- };
-
- var exports = createMethod();
-
- if (COMMON_JS) {
- module.exports = exports;
- } else {
- root._sha1 = exports;
- if (AMD) {
- define(function () {
- return exports;
- });
+ this.lastByteIndex = i;
+ this.bytes += i - this.start;
+ if (i >= 64) {
+ this.block = blocks[16];
+ this.start = i - 64;
+ this.hash();
+ this.hashed = true;
+ } else {
+ this.start = i;
}
}
- })();
+ if (this.bytes > 4294967295) {
+ this.hBytes += this.bytes / 4294967296 << 0;
+ this.bytes = this.bytes % 4294967296;
+ }
+ return this;
+ };
- export function encode_text(buffer: string) : ArrayBuffer {
- if ((window as any).TextEncoder) {
- return new TextEncoder().encode(buffer).buffer;
+ Sha1.prototype.finalize = function () {
+ if (this.finalized) {
+ return;
}
- let utf8 = unescape(encodeURIComponent(buffer));
- let result = new Uint8Array(utf8.length);
- for (let i = 0; i < utf8.length; i++) {
- result[i] = utf8.charCodeAt(i);
+ this.finalized = true;
+ var blocks = this.blocks, i = this.lastByteIndex;
+ blocks[16] = this.block;
+ blocks[i >> 2] |= EXTRA[i & 3];
+ this.block = blocks[16];
+ if (i >= 56) {
+ if (!this.hashed) {
+ this.hash();
+ }
+ blocks[0] = this.block;
+ blocks[16] = blocks[1] = blocks[2] = blocks[3] =
+ blocks[4] = blocks[5] = blocks[6] = blocks[7] =
+ blocks[8] = blocks[9] = blocks[10] = blocks[11] =
+ blocks[12] = blocks[13] = blocks[14] = blocks[15] = 0;
}
- return result.buffer;
+ blocks[14] = this.hBytes << 3 | this.bytes >>> 29;
+ blocks[15] = this.bytes << 3;
+ this.hash();
+ };
+
+ Sha1.prototype.hash = function () {
+ var a = this.h0, b = this.h1, c = this.h2, d = this.h3, e = this.h4;
+ var f, j, t, blocks = this.blocks;
+
+ for(j = 16; j < 80; ++j) {
+ t = blocks[j - 3] ^ blocks[j - 8] ^ blocks[j - 14] ^ blocks[j - 16];
+ blocks[j] = (t << 1) | (t >>> 31);
+ }
+
+ for(j = 0; j < 20; j += 5) {
+ f = (b & c) | ((~b) & d);
+ t = (a << 5) | (a >>> 27);
+ e = t + f + e + 1518500249 + blocks[j] << 0;
+ b = (b << 30) | (b >>> 2);
+
+ f = (a & b) | ((~a) & c);
+ t = (e << 5) | (e >>> 27);
+ d = t + f + d + 1518500249 + blocks[j + 1] << 0;
+ a = (a << 30) | (a >>> 2);
+
+ f = (e & a) | ((~e) & b);
+ t = (d << 5) | (d >>> 27);
+ c = t + f + c + 1518500249 + blocks[j + 2] << 0;
+ e = (e << 30) | (e >>> 2);
+
+ f = (d & e) | ((~d) & a);
+ t = (c << 5) | (c >>> 27);
+ b = t + f + b + 1518500249 + blocks[j + 3] << 0;
+ d = (d << 30) | (d >>> 2);
+
+ f = (c & d) | ((~c) & e);
+ t = (b << 5) | (b >>> 27);
+ a = t + f + a + 1518500249 + blocks[j + 4] << 0;
+ c = (c << 30) | (c >>> 2);
+ }
+
+ for(; j < 40; j += 5) {
+ f = b ^ c ^ d;
+ t = (a << 5) | (a >>> 27);
+ e = t + f + e + 1859775393 + blocks[j] << 0;
+ b = (b << 30) | (b >>> 2);
+
+ f = a ^ b ^ c;
+ t = (e << 5) | (e >>> 27);
+ d = t + f + d + 1859775393 + blocks[j + 1] << 0;
+ a = (a << 30) | (a >>> 2);
+
+ f = e ^ a ^ b;
+ t = (d << 5) | (d >>> 27);
+ c = t + f + c + 1859775393 + blocks[j + 2] << 0;
+ e = (e << 30) | (e >>> 2);
+
+ f = d ^ e ^ a;
+ t = (c << 5) | (c >>> 27);
+ b = t + f + b + 1859775393 + blocks[j + 3] << 0;
+ d = (d << 30) | (d >>> 2);
+
+ f = c ^ d ^ e;
+ t = (b << 5) | (b >>> 27);
+ a = t + f + a + 1859775393 + blocks[j + 4] << 0;
+ c = (c << 30) | (c >>> 2);
+ }
+
+ for(; j < 60; j += 5) {
+ f = (b & c) | (b & d) | (c & d);
+ t = (a << 5) | (a >>> 27);
+ e = t + f + e - 1894007588 + blocks[j] << 0;
+ b = (b << 30) | (b >>> 2);
+
+ f = (a & b) | (a & c) | (b & c);
+ t = (e << 5) | (e >>> 27);
+ d = t + f + d - 1894007588 + blocks[j + 1] << 0;
+ a = (a << 30) | (a >>> 2);
+
+ f = (e & a) | (e & b) | (a & b);
+ t = (d << 5) | (d >>> 27);
+ c = t + f + c - 1894007588 + blocks[j + 2] << 0;
+ e = (e << 30) | (e >>> 2);
+
+ f = (d & e) | (d & a) | (e & a);
+ t = (c << 5) | (c >>> 27);
+ b = t + f + b - 1894007588 + blocks[j + 3] << 0;
+ d = (d << 30) | (d >>> 2);
+
+ f = (c & d) | (c & e) | (d & e);
+ t = (b << 5) | (b >>> 27);
+ a = t + f + a - 1894007588 + blocks[j + 4] << 0;
+ c = (c << 30) | (c >>> 2);
+ }
+
+ for(; j < 80; j += 5) {
+ f = b ^ c ^ d;
+ t = (a << 5) | (a >>> 27);
+ e = t + f + e - 899497514 + blocks[j] << 0;
+ b = (b << 30) | (b >>> 2);
+
+ f = a ^ b ^ c;
+ t = (e << 5) | (e >>> 27);
+ d = t + f + d - 899497514 + blocks[j + 1] << 0;
+ a = (a << 30) | (a >>> 2);
+
+ f = e ^ a ^ b;
+ t = (d << 5) | (d >>> 27);
+ c = t + f + c - 899497514 + blocks[j + 2] << 0;
+ e = (e << 30) | (e >>> 2);
+
+ f = d ^ e ^ a;
+ t = (c << 5) | (c >>> 27);
+ b = t + f + b - 899497514 + blocks[j + 3] << 0;
+ d = (d << 30) | (d >>> 2);
+
+ f = c ^ d ^ e;
+ t = (b << 5) | (b >>> 27);
+ a = t + f + a - 899497514 + blocks[j + 4] << 0;
+ c = (c << 30) | (c >>> 2);
+ }
+
+ this.h0 = this.h0 + a << 0;
+ this.h1 = this.h1 + b << 0;
+ this.h2 = this.h2 + c << 0;
+ this.h3 = this.h3 + d << 0;
+ this.h4 = this.h4 + e << 0;
+ };
+
+ Sha1.prototype.hex = function () {
+ this.finalize();
+
+ var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3, h4 = this.h4;
+
+ return HEX_CHARS[(h0 >> 28) & 0x0F] + HEX_CHARS[(h0 >> 24) & 0x0F] +
+ HEX_CHARS[(h0 >> 20) & 0x0F] + HEX_CHARS[(h0 >> 16) & 0x0F] +
+ HEX_CHARS[(h0 >> 12) & 0x0F] + HEX_CHARS[(h0 >> 8) & 0x0F] +
+ HEX_CHARS[(h0 >> 4) & 0x0F] + HEX_CHARS[h0 & 0x0F] +
+ HEX_CHARS[(h1 >> 28) & 0x0F] + HEX_CHARS[(h1 >> 24) & 0x0F] +
+ HEX_CHARS[(h1 >> 20) & 0x0F] + HEX_CHARS[(h1 >> 16) & 0x0F] +
+ HEX_CHARS[(h1 >> 12) & 0x0F] + HEX_CHARS[(h1 >> 8) & 0x0F] +
+ HEX_CHARS[(h1 >> 4) & 0x0F] + HEX_CHARS[h1 & 0x0F] +
+ HEX_CHARS[(h2 >> 28) & 0x0F] + HEX_CHARS[(h2 >> 24) & 0x0F] +
+ HEX_CHARS[(h2 >> 20) & 0x0F] + HEX_CHARS[(h2 >> 16) & 0x0F] +
+ HEX_CHARS[(h2 >> 12) & 0x0F] + HEX_CHARS[(h2 >> 8) & 0x0F] +
+ HEX_CHARS[(h2 >> 4) & 0x0F] + HEX_CHARS[h2 & 0x0F] +
+ HEX_CHARS[(h3 >> 28) & 0x0F] + HEX_CHARS[(h3 >> 24) & 0x0F] +
+ HEX_CHARS[(h3 >> 20) & 0x0F] + HEX_CHARS[(h3 >> 16) & 0x0F] +
+ HEX_CHARS[(h3 >> 12) & 0x0F] + HEX_CHARS[(h3 >> 8) & 0x0F] +
+ HEX_CHARS[(h3 >> 4) & 0x0F] + HEX_CHARS[h3 & 0x0F] +
+ HEX_CHARS[(h4 >> 28) & 0x0F] + HEX_CHARS[(h4 >> 24) & 0x0F] +
+ HEX_CHARS[(h4 >> 20) & 0x0F] + HEX_CHARS[(h4 >> 16) & 0x0F] +
+ HEX_CHARS[(h4 >> 12) & 0x0F] + HEX_CHARS[(h4 >> 8) & 0x0F] +
+ HEX_CHARS[(h4 >> 4) & 0x0F] + HEX_CHARS[h4 & 0x0F];
+ };
+
+ Sha1.prototype.toString = Sha1.prototype.hex;
+
+ Sha1.prototype.digest = function () {
+ this.finalize();
+
+ var h0 = this.h0, h1 = this.h1, h2 = this.h2, h3 = this.h3, h4 = this.h4;
+
+ return [
+ (h0 >> 24) & 0xFF, (h0 >> 16) & 0xFF, (h0 >> 8) & 0xFF, h0 & 0xFF,
+ (h1 >> 24) & 0xFF, (h1 >> 16) & 0xFF, (h1 >> 8) & 0xFF, h1 & 0xFF,
+ (h2 >> 24) & 0xFF, (h2 >> 16) & 0xFF, (h2 >> 8) & 0xFF, h2 & 0xFF,
+ (h3 >> 24) & 0xFF, (h3 >> 16) & 0xFF, (h3 >> 8) & 0xFF, h3 & 0xFF,
+ (h4 >> 24) & 0xFF, (h4 >> 16) & 0xFF, (h4 >> 8) & 0xFF, h4 & 0xFF
+ ];
+ };
+
+ Sha1.prototype.array = Sha1.prototype.digest;
+
+ Sha1.prototype.arrayBuffer = function () {
+ this.finalize();
+
+ const buffer = new ArrayBuffer(20);
+ const dataView = new DataView(buffer);
+ dataView.setUint32(0, this.h0);
+ dataView.setUint32(4, this.h1);
+ dataView.setUint32(8, this.h2);
+ dataView.setUint32(12, this.h3);
+ dataView.setUint32(16, this.h4);
+ return buffer;
+ };
+
+ createMethod();
+})();
+
+export function encode_text(buffer: string) : ArrayBuffer {
+ if ((window as any).TextEncoder) {
+ return new TextEncoder().encode(buffer).buffer;
}
- export function sha1(message: string | ArrayBuffer) : PromiseLike {
- if(!(typeof(message) === "string" || message instanceof ArrayBuffer)) throw "Invalid type!";
-
- let buffer = message instanceof ArrayBuffer ? message : encode_text(message as string);
-
- if(!crypto || !crypto.subtle || !crypto.subtle.digest || /Edge/.test(navigator.userAgent))
- return new Promise(resolve => {
- resolve(_sha1.arrayBuffer(buffer as ArrayBuffer));
- });
- else
- return crypto.subtle.digest("SHA-1", buffer);
+ let utf8 = unescape(encodeURIComponent(buffer));
+ let result = new Uint8Array(utf8.length);
+ for (let i = 0; i < utf8.length; i++) {
+ result[i] = utf8.charCodeAt(i);
}
+ return result.buffer;
+}
-}
\ No newline at end of file
+export function sha1(message: string | ArrayBuffer) : PromiseLike {
+ if(!(typeof(message) === "string" || message instanceof ArrayBuffer)) throw "Invalid type!";
+
+ let buffer = message instanceof ArrayBuffer ? message : encode_text(message as string);
+
+ if(!crypto || !crypto.subtle || !crypto.subtle.digest || /Edge/.test(navigator.userAgent))
+ return new Promise(resolve => {
+ resolve(_sha1.arrayBuffer(buffer as ArrayBuffer));
+ });
+ else
+ return crypto.subtle.digest("SHA-1", buffer);
+}
diff --git a/shared/js/crypto/uid.ts b/shared/js/crypto/uid.ts
new file mode 100644
index 00000000..c97ab5f0
--- /dev/null
+++ b/shared/js/crypto/uid.ts
@@ -0,0 +1,10 @@
+function s4() {
+ return Math
+ .floor((1 + Math.random()) * 0x10000)
+ .toString(16)
+ .substring(1);
+}
+
+export function guid() {
+ return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
+}
\ No newline at end of file
diff --git a/shared/js/dns.ts b/shared/js/dns.ts
index 866b0daf..146ebcdf 100644
--- a/shared/js/dns.ts
+++ b/shared/js/dns.ts
@@ -1,24 +1,22 @@
-namespace dns {
- export interface AddressTarget {
- target_ip: string;
- target_port?: number;
- }
+export interface AddressTarget {
+ target_ip: string;
+ target_port?: number;
+}
- export interface ResolveOptions {
- timeout?: number;
- allow_cache?: boolean;
- max_depth?: number;
+export interface ResolveOptions {
+ timeout?: number;
+ allow_cache?: boolean;
+ max_depth?: number;
- allow_srv?: boolean;
- allow_cname?: boolean;
- allow_any?: boolean;
- allow_a?: boolean;
- allow_aaaa?: boolean;
- }
+ allow_srv?: boolean;
+ allow_cname?: boolean;
+ allow_any?: boolean;
+ allow_a?: boolean;
+ allow_aaaa?: boolean;
+}
- export const default_options: ResolveOptions = {
- timeout: 5000,
- allow_cache: true,
- max_depth: 5
- };
-}
\ No newline at end of file
+export const default_options: ResolveOptions = {
+ timeout: 5000,
+ allow_cache: true,
+ max_depth: 5
+};
\ No newline at end of file
diff --git a/shared/js/events.ts b/shared/js/events.ts
index 348621a8..d57c9c06 100644
--- a/shared/js/events.ts
+++ b/shared/js/events.ts
@@ -1,604 +1,605 @@
-namespace events {
- export interface EventConvert {
- as() : All[T];
+//TODO: Combine EventConvert and Event?
+import {MusicClientEntry, SongInfo} from "tc-shared/ui/client";
+import {PlaylistSong} from "tc-shared/connection/ServerConnectionDeclaration";
+import {guid} from "tc-shared/crypto/uid";
+
+export interface EventConvert {
+ as() : All[T];
+}
+
+export interface Event {
+ readonly type: T;
+}
+
+export class SingletonEvent implements Event<"singletone-instance"> {
+ static readonly instance = new SingletonEvent();
+
+ readonly type = "singletone-instance";
+ private constructor() { }
+}
+
+export class Registry {
+ private readonly registry_uuid;
+
+ private handler: {[key: string]: ((event) => void)[]} = {};
+ private connections: {[key: string]:Registry[]} = {};
+ private debug_prefix = undefined;
+
+ constructor() {
+ this.registry_uuid = "evreg_data_" + guid();
}
- export interface Event {
- readonly type: T;
+
+ enable_debug(prefix: string) { this.debug_prefix = prefix || "---"; }
+ disable_debug() { this.debug_prefix = undefined; }
+
+ on(event: T, handler: (event?: Events[T] & Event & EventConvert) => void);
+ on(events: (keyof Events)[], handler: (event?: Event & EventConvert) => void);
+ on(events, handler) {
+ if(!Array.isArray(events))
+ events = [events];
+
+ handler[this.registry_uuid] = {
+ singleshot: false
+ };
+ for(const event of events) {
+ const handlers = this.handler[event] || (this.handler[event] = []);
+ handlers.push(handler);
+ }
}
- export class SingletonEvent implements Event<"singletone-instance"> {
- static readonly instance = new SingletonEvent();
+ /* one */
+ one(event: T, handler: (event?: Events[T] & Event & EventConvert) => void);
+ one(events: (keyof Events)[], handler: (event?: Event & EventConvert) => void);
+ one(events, handler) {
+ if(!Array.isArray(events))
+ events = [events];
- readonly type = "singletone-instance";
- private constructor() { }
+ for(const event of events) {
+ const handlers = this.handler[event] || (this.handler[event] = []);
+
+ handler[this.registry_uuid] = { singleshot: true };
+ handlers.push(handler);
+ }
}
- export class Registry {
- private readonly registry_uuid;
+ off(handler: (event?: Event) => void);
+ off(event: T, handler: (event?: Event & EventConvert) => void);
+ off(event: (keyof Events)[], handler: (event?: Event & EventConvert) => void);
+ off(handler_or_events, handler?) {
+ if(typeof handler_or_events === "function") {
+ for(const key of Object.keys(this.handler))
+ this.handler[key].remove(handler_or_events);
+ } else {
+ if(!Array.isArray(handler_or_events))
+ handler_or_events = [handler_or_events];
- private handler: {[key: string]: ((event) => void)[]} = {};
- private connections: {[key: string]:Registry[]} = {};
- private debug_prefix = undefined;
+ for(const event of handler_or_events) {
+ const handlers = this.handler[event];
+ if(handlers) handlers.remove(handler);
+ }
+ }
+ }
- constructor() {
- this.registry_uuid = "evreg_data_" + guid();
+ connect(event: T, target: Registry) {
+ (this.connections[event as string] || (this.connections[event as string] = [])).push(target as any);
+ }
+
+ disconnect(event: T, target: Registry) {
+ (this.connections[event as string] || []).remove(target as any);
+ }
+
+ disconnect_all(target: Registry) {
+ for(const event of Object.keys(this.connections))
+ this.connections[event].remove(target as any);
+ }
+
+ fire(event_type: T, data?: Events[T]) {
+ if(this.debug_prefix) console.log("[%s] Trigger event: %s", this.debug_prefix, event_type);
+
+ const event = Object.assign(typeof data === "undefined" ? SingletonEvent.instance : data, {
+ type: event_type,
+ as: function () { return this; }
+ });
+
+ for(const handler of (this.handler[event_type as string] || [])) {
+ handler(event);
+
+ const reg_data = handler[this.registry_uuid];
+ if(typeof reg_data === "object" && reg_data.singleshot)
+ this.handler[event_type as string].remove(handler);
}
+ for(const evhandler of (this.connections[event_type as string] || []))
+ evhandler.fire(event_type as any, event as any);
+ }
- enable_debug(prefix: string) { this.debug_prefix = prefix || "---"; }
- disable_debug() { this.debug_prefix = undefined; }
+ fire_async(event_type: T, data?: Events[T]) {
+ setTimeout(() => this.fire(event_type, data));
+ }
- on(event: T, handler: (event?: Events[T] & Event & EventConvert) => void);
- on(events: (keyof Events)[], handler: (event?: Event & EventConvert) => void);
- on(events, handler) {
- if(!Array.isArray(events))
- events = [events];
+ destory() {
+ this.handler = {};
+ }
+}
- handler[this.registry_uuid] = {
- singleshot: false
- };
- for(const event of events) {
- const handlers = this.handler[event] || (this.handler[event] = []);
- handlers.push(handler);
+export namespace channel_tree {
+ export interface client {
+ "enter_view": {},
+ "left_view": {},
+
+ "property_update": {
+ properties: string[]
+ },
+
+ "music_status_update": {
+ player_buffered_index: number,
+ player_replay_index: number
+ },
+ "music_song_change": {
+ "song": SongInfo
+ },
+
+ /* TODO: Move this out of the music bots interface? */
+ "playlist_song_add": { song: PlaylistSong },
+ "playlist_song_remove": { song_id: number },
+ "playlist_song_reorder": { song_id: number, previous_song_id: number },
+ "playlist_song_loaded": { song_id: number, success: boolean, error_msg?: string, metadata?: string },
+ }
+}
+
+export namespace sidebar {
+ export interface music {
+ "open": {}, /* triggers when frame should be shown */
+ "close": {}, /* triggers when frame will be closed */
+
+ "bot_change": {
+ old: MusicClientEntry | undefined,
+ new: MusicClientEntry | undefined
+ },
+ "bot_property_update": {
+ properties: string[]
+ },
+
+ "action_play": {},
+ "action_pause": {},
+ "action_song_set": { song_id: number },
+ "action_forward": {},
+ "action_rewind": {},
+ "action_forward_ms": {
+ units: number;
+ },
+ "action_rewind_ms": {
+ units: number;
+ },
+ "action_song_add": {},
+ "action_song_delete": { song_id: number },
+ "action_playlist_reload": {},
+
+ "playtime_move_begin": {},
+ "playtime_move_end": {
+ canceled: boolean,
+ target_time?: number
+ },
+
+ "reorder_begin": { song_id: number; entry: JQuery },
+ "reorder_end": { song_id: number; canceled: boolean; entry: JQuery; previous_entry?: number },
+
+ "player_time_update": channel_tree.client["music_status_update"],
+ "player_song_change": channel_tree.client["music_song_change"],
+
+ "playlist_song_add": channel_tree.client["playlist_song_add"] & { insert_effect?: boolean },
+ "playlist_song_remove": channel_tree.client["playlist_song_remove"],
+ "playlist_song_reorder": channel_tree.client["playlist_song_reorder"],
+ "playlist_song_loaded": channel_tree.client["playlist_song_loaded"] & { html_entry?: JQuery },
+ }
+}
+
+export namespace modal {
+ export type BotStatusType = "name" | "description" | "volume" | "country_code" | "channel_commander" | "priority_speaker";
+ export type PlaylistStatusType = "replay_mode" | "finished" | "delete_played" | "max_size" | "notify_song_change";
+ export interface music_manage {
+ show_container: { container: "settings" | "permissions"; };
+
+ /* setting relevant */
+ query_bot_status: {},
+ bot_status: {
+ status: "success" | "error";
+ error_msg?: string;
+ data?: {
+ name: string,
+ description: string,
+ volume: number,
+
+ country_code: string,
+ default_country_code: string,
+
+ channel_commander: boolean,
+ priority_speaker: boolean,
+
+ client_version: string,
+ client_platform: string,
+
+ uptime_mode: number,
+ bot_type: number
+ }
+ },
+ set_bot_status: {
+ key: BotStatusType,
+ value: any
+ },
+ set_bot_status_result: {
+ key: BotStatusType,
+ status: "success" | "error" | "timeout",
+ error_msg?: string,
+ value?: any
+ }
+
+ query_playlist_status: {},
+ playlist_status: {
+ status: "success" | "error",
+ error_msg?: string,
+ data?: {
+ replay_mode: number,
+ finished: boolean,
+ delete_played: boolean,
+ max_size: number,
+ notify_song_change: boolean
+ }
+ },
+ set_playlist_status: {
+ key: PlaylistStatusType,
+ value: any
+ },
+ set_playlist_status_result: {
+ key: PlaylistStatusType,
+ status: "success" | "error" | "timeout",
+ error_msg?: string,
+ value?: any
+ }
+
+ /* permission relevant */
+ show_client_list: {},
+ hide_client_list: {},
+
+ filter_client_list: { filter: string | undefined },
+
+ "refresh_permissions": {},
+
+ query_special_clients: {},
+ special_client_list: {
+ status: "success" | "error" | "error-permission",
+ error_msg?: string,
+ clients?: {
+ name: string,
+ unique_id: string,
+ database_id: number
+ }[]
+ },
+
+ search_client: { text: string },
+ search_client_result: {
+ status: "error" | "timeout" | "empty" | "success",
+ error_msg?: string,
+ client?: {
+ name: string,
+ unique_id: string,
+ database_id: number
+ }
+ },
+
+ /* sets a client to set the permission for */
+ special_client_set: {
+ client?: {
+ name: string,
+ unique_id: string,
+ database_id: number
+ }
+ },
+
+ "query_general_permissions": {},
+ "general_permissions": {
+ status: "error" | "timeout" | "success",
+ error_msg?: string,
+ permissions?: {[key: string]:number}
+ },
+ "set_general_permission_result": {
+ status: "error" | "success",
+ key: string,
+ value?: number,
+ error_msg?: string
+ },
+ "set_general_permission": { /* try to change a permission for the server */
+ key: string,
+ value: number
+ },
+
+
+ "query_client_permissions": { client_database_id: number },
+ "client_permissions": {
+ status: "error" | "timeout" | "success",
+ client_database_id: number,
+ error_msg?: string,
+ permissions?: {[key: string]:number}
+ },
+ "set_client_permission_result": {
+ status: "error" | "success",
+ client_database_id: number,
+ key: string,
+ value?: number,
+ error_msg?: string
+ },
+ "set_client_permission": { /* try to change a permission for the server */
+ client_database_id: number,
+ key: string,
+ value: number
+ },
+
+ "query_group_permissions": { permission_name: string },
+ "group_permissions": {
+ permission_name: string;
+ status: "error" | "timeout" | "success"
+ groups?: {
+ name: string,
+ value: number,
+ id: number
+ }[],
+ error_msg?: string
+ }
+ }
+
+ export interface newcomer {
+ "show_step": {
+ "step": "welcome" | "microphone" | "identity" | "finish"
+ },
+ "exit_guide": {
+ ask_yesno: boolean
+ },
+
+ "modal-shown": {},
+
+
+ "step-status": {
+ next_button: boolean,
+ previous_button: boolean
+ }
+ }
+
+ export namespace settings {
+ export type ProfileInfo = {
+ id: string,
+ name: string,
+ nickname: string,
+ identity_type: "teaforo" | "teamspeak" | "nickname",
+
+ identity_forum?: {
+ valid: boolean,
+ fallback_name: string
+ },
+ identity_nickname?: {
+ name: string,
+ fallback_name: string
+ },
+ identity_teamspeak?: {
+ unique_id: string,
+ fallback_name: string
}
}
- /* one */
- one(event: T, handler: (event?: Events[T] & Event & EventConvert) => void);
- one(events: (keyof Events)[], handler: (event?: Event & EventConvert) => void);
- one(events, handler) {
- if(!Array.isArray(events))
- events = [events];
+ export interface profiles {
+ "reload-profile": { profile_id?: string },
+ "select-profile": { profile_id: string },
- for(const event of events) {
- const handlers = this.handler[event] || (this.handler[event] = []);
+ "query-profile-list": { },
+ "query-profile-list-result": {
+ status: "error" | "success" | "timeout",
- handler[this.registry_uuid] = { singleshot: true };
- handlers.push(handler);
- }
- }
-
- off(handler: (event?: Event) => void);
- off(event: T, handler: (event?: Event & EventConvert) => void);
- off(event: (keyof Events)[], handler: (event?: Event & EventConvert) => void);
- off(handler_or_events, handler?) {
- if(typeof handler_or_events === "function") {
- for(const key of Object.keys(this.handler))
- this.handler[key].remove(handler_or_events);
- } else {
- if(!Array.isArray(handler_or_events))
- handler_or_events = [handler_or_events];
-
- for(const event of handler_or_events) {
- const handlers = this.handler[event];
- if(handlers) handlers.remove(handler);
- }
- }
- }
-
- connect(event: T, target: Registry) {
- (this.connections[event as string] || (this.connections[event as string] = [])).push(target as any);
- }
-
- disconnect(event: T, target: Registry) {
- (this.connections[event as string] || []).remove(target as any);
- }
-
- disconnect_all(target: Registry) {
- for(const event of Object.keys(this.connections))
- this.connections[event].remove(target as any);
- }
-
- fire(event_type: T, data?: Events[T]) {
- if(this.debug_prefix) console.log("[%s] Trigger event: %s", this.debug_prefix, event_type);
-
- const event = Object.assign(typeof data === "undefined" ? SingletonEvent.instance : data, {
- type: event_type,
- as: function () { return this; }
- });
-
- for(const handler of (this.handler[event_type as string] || [])) {
- handler(event);
-
- const reg_data = handler[this.registry_uuid];
- if(typeof reg_data === "object" && reg_data.singleshot)
- this.handler[event_type as string].remove(handler);
+ error?: string;
+ profiles?: ProfileInfo[]
}
- for(const evhandler of (this.connections[event_type as string] || []))
- evhandler.fire(event_type as any, event as any);
+ "query-profile": { profile_id: string },
+ "query-profile-result": {
+ status: "error" | "success" | "timeout",
+ profile_id: string,
+
+ error?: string;
+ info?: ProfileInfo
+ },
+
+ "select-identity-type": {
+ profile_id: string,
+ identity_type: "teamspeak" | "teaforo" | "nickname" | "unset"
+ },
+
+ "query-profile-validity": { profile_id: string },
+ "query-profile-validity-result": {
+ profile_id: string,
+ status: "error" | "success" | "timeout",
+
+ error?: string,
+ valid?: boolean
+ }
+
+ "create-profile": { name: string },
+ "create-profile-result": {
+ status: "error" | "success" | "timeout",
+ name: string;
+
+ profile_id?: string;
+ error?: string;
+ },
+
+ "delete-profile": { profile_id: string },
+ "delete-profile-result": {
+ status: "error" | "success" | "timeout",
+ profile_id: string,
+ error?: string
+ }
+
+ "set-default-profile": { profile_id: string },
+ "set-default-profile-result": {
+ status: "error" | "success" | "timeout",
+
+ /* the profile which now has the id "default" */
+ old_profile_id: string,
+
+ /* the "default" profile which now has a new id */
+ new_profile_id?: string
+
+ error?: string;
+ }
+
+ /* profile name events */
+ "set-profile-name": {
+ profile_id: string,
+ name: string
+ },
+ "set-profile-name-result": {
+ status: "error" | "success" | "timeout",
+ profile_id: string,
+ name?: string
+ },
+
+ /* profile nickname events */
+ "set-default-name": {
+ profile_id: string,
+ name: string | null
+ },
+ "set-default-name-result": {
+ status: "error" | "success" | "timeout",
+ profile_id: string,
+ name?: string | null
+ },
+
+ "query-identity-teamspeak": { profile_id: string },
+ "query-identity-teamspeak-result": {
+ status: "error" | "success" | "timeout",
+ profile_id: string,
+
+ error?: string,
+ level?: number
+ }
+
+ "set-identity-name-name": { profile_id: string, name: string },
+ "set-identity-name-name-result": {
+ status: "error" | "success" | "timeout",
+ profile_id: string,
+
+ error?: string,
+ name?: string
+ },
+
+ "generate-identity-teamspeak": { profile_id: string },
+ "generate-identity-teamspeak-result": {
+ profile_id: string,
+ status: "error" | "success" | "timeout",
+
+ error?: string,
+
+ level?: number
+ unique_id?: string
+ },
+
+ "improve-identity-teamspeak-level": { profile_id: string },
+ "improve-identity-teamspeak-level-update": {
+ profile_id: string,
+ new_level: number
+ },
+
+ "import-identity-teamspeak": { profile_id: string },
+ "import-identity-teamspeak-result": {
+ profile_id: string,
+
+ level?: number
+ unique_id?: string
+ }
+
+ "export-identity-teamspeak": {
+ profile_id: string,
+ filename: string
+ },
+
+
+ "setup-forum-connection": {}
}
- fire_async(event_type: T, data?: Events[T]) {
- setTimeout(() => this.fire(event_type, data));
- }
+ export type MicrophoneSettings = "volume" | "vad-type" | "ppt-key" | "ppt-release-delay" | "ppt-release-delay-active" | "threshold-threshold";
+ export interface microphone {
+ "query-devices": { refresh_list: boolean },
+ "query-device-result": {
+ status: "success" | "error" | "timeout",
- destory() {
- this.handler = {};
- }
- }
-
- namespace global {
-
- }
-
- export namespace channel_tree {
- export interface client {
- "enter_view": {},
- "left_view": {},
-
- "property_update": {
- properties: string[]
- },
-
- "music_status_update": {
- player_buffered_index: number,
- player_replay_index: number
- },
- "music_song_change": {
- "song": SongInfo
- },
-
- /* TODO: Move this out of the music bots interface? */
- "playlist_song_add": { song: PlaylistSong },
- "playlist_song_remove": { song_id: number },
- "playlist_song_reorder": { song_id: number, previous_song_id: number },
- "playlist_song_loaded": { song_id: number, success: boolean, error_msg?: string, metadata?: string },
- }
- }
-
- export namespace sidebar {
- export interface music {
- "open": {}, /* triggers when frame should be shown */
- "close": {}, /* triggers when frame will be closed */
-
- "bot_change": {
- old: MusicClientEntry | undefined,
- new: MusicClientEntry | undefined
- },
- "bot_property_update": {
- properties: string[]
- },
-
- "action_play": {},
- "action_pause": {},
- "action_song_set": { song_id: number },
- "action_forward": {},
- "action_rewind": {},
- "action_forward_ms": {
- units: number;
- },
- "action_rewind_ms": {
- units: number;
- },
- "action_song_add": {},
- "action_song_delete": { song_id: number },
- "action_playlist_reload": {},
-
- "playtime_move_begin": {},
- "playtime_move_end": {
- canceled: boolean,
- target_time?: number
- },
-
- "reorder_begin": { song_id: number; entry: JQuery },
- "reorder_end": { song_id: number; canceled: boolean; entry: JQuery; previous_entry?: number },
-
- "player_time_update": channel_tree.client["music_status_update"],
- "player_song_change": channel_tree.client["music_song_change"],
-
- "playlist_song_add": channel_tree.client["playlist_song_add"] & { insert_effect?: boolean },
- "playlist_song_remove": channel_tree.client["playlist_song_remove"],
- "playlist_song_reorder": channel_tree.client["playlist_song_reorder"],
- "playlist_song_loaded": channel_tree.client["playlist_song_loaded"] & { html_entry?: JQuery },
- }
- }
-
- export namespace modal {
- export type BotStatusType = "name" | "description" | "volume" | "country_code" | "channel_commander" | "priority_speaker";
- export type PlaylistStatusType = "replay_mode" | "finished" | "delete_played" | "max_size" | "notify_song_change";
- export interface music_manage {
- show_container: { container: "settings" | "permissions"; };
-
- /* setting relevant */
- query_bot_status: {},
- bot_status: {
- status: "success" | "error";
- error_msg?: string;
- data?: {
+ error?: string,
+ devices?: {
+ id: string,
name: string,
- description: string,
+ driver: string
+ }[]
+ active_device?: string;
+ },
+
+ "query-settings": {},
+ "query-settings-result": {
+ status: "success" | "error" | "timeout",
+
+ error?: string,
+ info?: {
volume: number,
+ vad_type: string,
- country_code: string,
- default_country_code: string,
-
- channel_commander: boolean,
- priority_speaker: boolean,
-
- client_version: string,
- client_platform: string,
-
- uptime_mode: number,
- bot_type: number
+ vad_ppt: {
+ key: any, /* ppt.KeyDescriptor */
+ release_delay: number,
+ release_delay_active: boolean
+ },
+ vad_threshold: {
+ threshold: number
+ }
}
},
- set_bot_status: {
- key: BotStatusType,
- value: any
- },
- set_bot_status_result: {
- key: BotStatusType,
+
+ "set-device": { device_id: string },
+ "set-device-result": {
+ device_id: string,
status: "success" | "error" | "timeout",
- error_msg?: string,
- value?: any
- }
- query_playlist_status: {},
- playlist_status: {
- status: "success" | "error",
- error_msg?: string,
- data?: {
- replay_mode: number,
- finished: boolean,
- delete_played: boolean,
- max_size: number,
- notify_song_change: boolean
- }
+ error?: string
},
- set_playlist_status: {
- key: PlaylistStatusType,
- value: any
+
+ "set-setting": {
+ setting: MicrophoneSettings;
+ value: any;
},
- set_playlist_status_result: {
- key: PlaylistStatusType,
+ "set-setting-result": {
+ setting: MicrophoneSettings,
status: "success" | "error" | "timeout",
- error_msg?: string,
+
+ error?: string,
value?: any
- }
+ },
- /* permission relevant */
- show_client_list: {},
- hide_client_list: {},
+ "update-device-level": {
+ devices: {
+ device_id: string,
+ status: "success" | "error",
- filter_client_list: { filter: string | undefined },
-
- "refresh_permissions": {},
-
- query_special_clients: {},
- special_client_list: {
- status: "success" | "error" | "error-permission",
- error_msg?: string,
- clients?: {
- name: string,
- unique_id: string,
- database_id: number
+ level?: number,
+ error?: string
}[]
},
- search_client: { text: string },
- search_client_result: {
- status: "error" | "timeout" | "empty" | "success",
- error_msg?: string,
- client?: {
- name: string,
- unique_id: string,
- database_id: number
- }
- },
-
- /* sets a client to set the permission for */
- special_client_set: {
- client?: {
- name: string,
- unique_id: string,
- database_id: number
- }
- },
-
- "query_general_permissions": {},
- "general_permissions": {
- status: "error" | "timeout" | "success",
- error_msg?: string,
- permissions?: {[key: string]:number}
- },
- "set_general_permission_result": {
- status: "error" | "success",
- key: string,
- value?: number,
- error_msg?: string
- },
- "set_general_permission": { /* try to change a permission for the server */
- key: string,
- value: number
- },
-
-
- "query_client_permissions": { client_database_id: number },
- "client_permissions": {
- status: "error" | "timeout" | "success",
- client_database_id: number,
- error_msg?: string,
- permissions?: {[key: string]:number}
- },
- "set_client_permission_result": {
- status: "error" | "success",
- client_database_id: number,
- key: string,
- value?: number,
- error_msg?: string
- },
- "set_client_permission": { /* try to change a permission for the server */
- client_database_id: number,
- key: string,
- value: number
- },
-
- "query_group_permissions": { permission_name: string },
- "group_permissions": {
- permission_name: string;
- status: "error" | "timeout" | "success"
- groups?: {
- name: string,
- value: number,
- id: number
- }[],
- error_msg?: string
- }
- }
-
- export interface newcomer {
- "show_step": {
- "step": "welcome" | "microphone" | "identity" | "finish"
- },
- "exit_guide": {
- ask_yesno: boolean
- },
-
- "modal-shown": {},
-
-
- "step-status": {
- next_button: boolean,
- previous_button: boolean
- }
- }
-
- export namespace settings {
- export type ProfileInfo = {
- id: string,
- name: string,
- nickname: string,
- identity_type: "teaforo" | "teamspeak" | "nickname",
-
- identity_forum?: {
- valid: boolean,
- fallback_name: string
- },
- identity_nickname?: {
- name: string,
- fallback_name: string
- },
- identity_teamspeak?: {
- unique_id: string,
- fallback_name: string
- }
- }
-
- export interface profiles {
- "reload-profile": { profile_id?: string },
- "select-profile": { profile_id: string },
-
- "query-profile-list": { },
- "query-profile-list-result": {
- status: "error" | "success" | "timeout",
-
- error?: string;
- profiles?: ProfileInfo[]
- }
-
- "query-profile": { profile_id: string },
- "query-profile-result": {
- status: "error" | "success" | "timeout",
- profile_id: string,
-
- error?: string;
- info?: ProfileInfo
- },
-
- "select-identity-type": {
- profile_id: string,
- identity_type: "teamspeak" | "teaforo" | "nickname" | "unset"
- },
-
- "query-profile-validity": { profile_id: string },
- "query-profile-validity-result": {
- profile_id: string,
- status: "error" | "success" | "timeout",
-
- error?: string,
- valid?: boolean
- }
-
- "create-profile": { name: string },
- "create-profile-result": {
- status: "error" | "success" | "timeout",
- name: string;
-
- profile_id?: string;
- error?: string;
- },
-
- "delete-profile": { profile_id: string },
- "delete-profile-result": {
- status: "error" | "success" | "timeout",
- profile_id: string,
- error?: string
- }
-
- "set-default-profile": { profile_id: string },
- "set-default-profile-result": {
- status: "error" | "success" | "timeout",
-
- /* the profile which now has the id "default" */
- old_profile_id: string,
-
- /* the "default" profile which now has a new id */
- new_profile_id?: string
-
- error?: string;
- }
-
- /* profile name events */
- "set-profile-name": {
- profile_id: string,
- name: string
- },
- "set-profile-name-result": {
- status: "error" | "success" | "timeout",
- profile_id: string,
- name?: string
- },
-
- /* profile nickname events */
- "set-default-name": {
- profile_id: string,
- name: string | null
- },
- "set-default-name-result": {
- status: "error" | "success" | "timeout",
- profile_id: string,
- name?: string | null
- },
-
- "query-identity-teamspeak": { profile_id: string },
- "query-identity-teamspeak-result": {
- status: "error" | "success" | "timeout",
- profile_id: string,
-
- error?: string,
- level?: number
- }
-
- "set-identity-name-name": { profile_id: string, name: string },
- "set-identity-name-name-result": {
- status: "error" | "success" | "timeout",
- profile_id: string,
-
- error?: string,
- name?: string
- },
-
- "generate-identity-teamspeak": { profile_id: string },
- "generate-identity-teamspeak-result": {
- profile_id: string,
- status: "error" | "success" | "timeout",
-
- error?: string,
-
- level?: number
- unique_id?: string
- },
-
- "improve-identity-teamspeak-level": { profile_id: string },
- "improve-identity-teamspeak-level-update": {
- profile_id: string,
- new_level: number
- },
-
- "import-identity-teamspeak": { profile_id: string },
- "import-identity-teamspeak-result": {
- profile_id: string,
-
- level?: number
- unique_id?: string
- }
-
- "export-identity-teamspeak": {
- profile_id: string,
- filename: string
- },
-
-
- "setup-forum-connection": {}
- }
-
- export type MicrophoneSettings = "volume" | "vad-type" | "ppt-key" | "ppt-release-delay" | "ppt-release-delay-active" | "threshold-threshold";
- export interface microphone {
- "query-devices": { refresh_list: boolean },
- "query-device-result": {
- status: "success" | "error" | "timeout",
-
- error?: string,
- devices?: {
- id: string,
- name: string,
- driver: string
- }[]
- active_device?: string;
- },
-
- "query-settings": {},
- "query-settings-result": {
- status: "success" | "error" | "timeout",
-
- error?: string,
- info?: {
- volume: number,
- vad_type: string,
-
- vad_ppt: {
- key: ppt.KeyDescriptor,
- release_delay: number,
- release_delay_active: boolean
- },
- vad_threshold: {
- threshold: number
- }
- }
- },
-
- "set-device": { device_id: string },
- "set-device-result": {
- device_id: string,
- status: "success" | "error" | "timeout",
-
- error?: string
- },
-
- "set-setting": {
- setting: MicrophoneSettings;
- value: any;
- },
- "set-setting-result": {
- setting: MicrophoneSettings,
- status: "success" | "error" | "timeout",
-
- error?: string,
- value?: any
- },
-
- "update-device-level": {
- devices: {
- device_id: string,
- status: "success" | "error",
-
- level?: number,
- error?: string
- }[]
- },
-
- "audio-initialized": {},
- "deinitialize": {}
- }
+ "audio-initialized": {},
+ "deinitialize": {}
}
}
-
}
+/*
+//Some test code
const eclient = new events.Registry();
const emusic = new events.Registry();
eclient.connect("playlist_song_loaded", emusic);
eclient.connect("playlist_song_loaded", emusic);
+*/
\ No newline at end of file
diff --git a/shared/js/i18n/country.ts b/shared/js/i18n/country.ts
index ce152e30..5fe3ce89 100644
--- a/shared/js/i18n/country.ts
+++ b/shared/js/i18n/country.ts
@@ -1,1504 +1,1501 @@
-
-namespace i18n {
- interface CountryInfo {
- name: string;
- alpha_2: string;
- alpha_3: string;
- un_code: number;
- }
- const country_infos: CountryInfo[] = [];
- const alpha_2_map: {[name: string]:CountryInfo} = {};
-
- const fill_country_infos = (array: CountryInfo[]) => {
- array.push({
- name: "Afghanistan",
- alpha_2: "AF",
- alpha_3: "AFG",
- un_code: 4
- });
- array.push({
- name: "Aland Islands",
- alpha_2: "AX",
- alpha_3: "ALA",
- un_code: 248
- });
- array.push({
- name: "Albania",
- alpha_2: "AL",
- alpha_3: "ALB",
- un_code: 8
- });
- array.push({
- name: "Algeria",
- alpha_2: "DZ",
- alpha_3: "DZA",
- un_code: 12
- });
- array.push({
- name: "American Samoa",
- alpha_2: "AS",
- alpha_3: "ASM",
- un_code: 16
- });
- array.push({
- name: "Andorra",
- alpha_2: "AD",
- alpha_3: "AND",
- un_code: 20
- });
- array.push({
- name: "Angola",
- alpha_2: "AO",
- alpha_3: "AGO",
- un_code: 24
- });
- array.push({
- name: "Anguilla",
- alpha_2: "AI",
- alpha_3: "AIA",
- un_code: 660
- });
- array.push({
- name: "Antarctica",
- alpha_2: "AQ",
- alpha_3: "ATA",
- un_code: 10
- });
- array.push({
- name: "Antigua and Barbuda",
- alpha_2: "AG",
- alpha_3: "ATG",
- un_code: 28
- });
- array.push({
- name: "Argentina",
- alpha_2: "AR",
- alpha_3: "ARG",
- un_code: 32
- });
- array.push({
- name: "Armenia",
- alpha_2: "AM",
- alpha_3: "ARM",
- un_code: 51
- });
- array.push({
- name: "Aruba",
- alpha_2: "AW",
- alpha_3: "ABW",
- un_code: 533
- });
- array.push({
- name: "Australia",
- alpha_2: "AU",
- alpha_3: "AUS",
- un_code: 36
- });
- array.push({
- name: "Austria",
- alpha_2: "AT",
- alpha_3: "AUT",
- un_code: 40
- });
- array.push({
- name: "Azerbaijan",
- alpha_2: "AZ",
- alpha_3: "AZE",
- un_code: 31
- });
- array.push({
- name: "Bahamas",
- alpha_2: "BS",
- alpha_3: "BHS",
- un_code: 44
- });
- array.push({
- name: "Bahrain",
- alpha_2: "BH",
- alpha_3: "BHR",
- un_code: 48
- });
- array.push({
- name: "Bangladesh",
- alpha_2: "BD",
- alpha_3: "BGD",
- un_code: 50
- });
- array.push({
- name: "Barbados",
- alpha_2: "BB",
- alpha_3: "BRB",
- un_code: 52
- });
- array.push({
- name: "Belarus",
- alpha_2: "BY",
- alpha_3: "BLR",
- un_code: 112
- });
- array.push({
- name: "Belgium",
- alpha_2: "BE",
- alpha_3: "BEL",
- un_code: 56
- });
- array.push({
- name: "Belize",
- alpha_2: "BZ",
- alpha_3: "BLZ",
- un_code: 84
- });
- array.push({
- name: "Benin",
- alpha_2: "BJ",
- alpha_3: "BEN",
- un_code: 204
- });
- array.push({
- name: "Bermuda",
- alpha_2: "BM",
- alpha_3: "BMU",
- un_code: 60
- });
- array.push({
- name: "Bhutan",
- alpha_2: "BT",
- alpha_3: "BTN",
- un_code: 64
- });
- array.push({
- name: "Bolivia",
- alpha_2: "BO",
- alpha_3: "BOL",
- un_code: 68
- });
- array.push({
- name: "Bosnia and Herzegovina",
- alpha_2: "BA",
- alpha_3: "BIH",
- un_code: 70
- });
- array.push({
- name: "Botswana",
- alpha_2: "BW",
- alpha_3: "BWA",
- un_code: 72
- });
- array.push({
- name: "Bouvet Island",
- alpha_2: "BV",
- alpha_3: "BVT",
- un_code: 74
- });
- array.push({
- name: "Brazil",
- alpha_2: "BR",
- alpha_3: "BRA",
- un_code: 76
- });
- array.push({
- name: "British Virgin Islands",
- alpha_2: "VG",
- alpha_3: "VGB",
- un_code: 92
- });
- array.push({
- name: "British Indian Ocean Territory",
- alpha_2: "IO",
- alpha_3: "IOT",
- un_code: 86
- });
- array.push({
- name: "Brunei Darussalam",
- alpha_2: "BN",
- alpha_3: "BRN",
- un_code: 96
- });
- array.push({
- name: "Bulgaria",
- alpha_2: "BG",
- alpha_3: "BGR",
- un_code: 100
- });
- array.push({
- name: "Burkina Faso",
- alpha_2: "BF",
- alpha_3: "BFA",
- un_code: 854
- });
- array.push({
- name: "Burundi",
- alpha_2: "BI",
- alpha_3: "BDI",
- un_code: 108
- });
- array.push({
- name: "Cambodia",
- alpha_2: "KH",
- alpha_3: "KHM",
- un_code: 116
- });
- array.push({
- name: "Cameroon",
- alpha_2: "CM",
- alpha_3: "CMR",
- un_code: 120
- });
- array.push({
- name: "Canada",
- alpha_2: "CA",
- alpha_3: "CAN",
- un_code: 124
- });
- array.push({
- name: "Cape Verde",
- alpha_2: "CV",
- alpha_3: "CPV",
- un_code: 132
- });
- array.push({
- name: "Cayman Islands",
- alpha_2: "KY",
- alpha_3: "CYM",
- un_code: 136
- });
- array.push({
- name: "Central African Republic",
- alpha_2: "CF",
- alpha_3: "CAF",
- un_code: 140
- });
- array.push({
- name: "Chad",
- alpha_2: "TD",
- alpha_3: "TCD",
- un_code: 148
- });
- array.push({
- name: "Chile",
- alpha_2: "CL",
- alpha_3: "CHL",
- un_code: 152
- });
- array.push({
- name: "China",
- alpha_2: "CN",
- alpha_3: "CHN",
- un_code: 156
- });
- array.push({
- name: "Hong Kong, SAR China",
- alpha_2: "HK",
- alpha_3: "HKG",
- un_code: 344
- });
- array.push({
- name: "Macao, SAR China",
- alpha_2: "MO",
- alpha_3: "MAC",
- un_code: 446
- });
- array.push({
- name: "Christmas Island",
- alpha_2: "CX",
- alpha_3: "CXR",
- un_code: 162
- });
- array.push({
- name: "Cocos (Keeling) Islands",
- alpha_2: "CC",
- alpha_3: "CCK",
- un_code: 166
- });
- array.push({
- name: "Colombia",
- alpha_2: "CO",
- alpha_3: "COL",
- un_code: 170
- });
- array.push({
- name: "Comoros",
- alpha_2: "KM",
- alpha_3: "COM",
- un_code: 174
- });
- array.push({
- name: "Congo (Brazzaville)",
- alpha_2: "CG",
- alpha_3: "COG",
- un_code: 178
- });
- array.push({
- name: "Congo, (Kinshasa)",
- alpha_2: "CD",
- alpha_3: "COD",
- un_code: 180
- });
- array.push({
- name: "Cook Islands",
- alpha_2: "CK",
- alpha_3: "COK",
- un_code: 184
- });
- array.push({
- name: "Costa Rica",
- alpha_2: "CR",
- alpha_3: "CRI",
- un_code: 188
- });
- array.push({
- name: "Côte d'Ivoire",
- alpha_2: "CI",
- alpha_3: "CIV",
- un_code: 384
- });
- array.push({
- name: "Croatia",
- alpha_2: "HR",
- alpha_3: "HRV",
- un_code: 191
- });
- array.push({
- name: "Cuba",
- alpha_2: "CU",
- alpha_3: "CUB",
- un_code: 192
- });
- array.push({
- name: "Cyprus",
- alpha_2: "CY",
- alpha_3: "CYP",
- un_code: 196
- });
- array.push({
- name: "Czech Republic",
- alpha_2: "CZ",
- alpha_3: "CZE",
- un_code: 203
- });
- array.push({
- name: "Denmark",
- alpha_2: "DK",
- alpha_3: "DNK",
- un_code: 208
- });
- array.push({
- name: "Djibouti",
- alpha_2: "DJ",
- alpha_3: "DJI",
- un_code: 262
- });
- array.push({
- name: "Dominica",
- alpha_2: "DM",
- alpha_3: "DMA",
- un_code: 212
- });
- array.push({
- name: "Dominican Republic",
- alpha_2: "DO",
- alpha_3: "DOM",
- un_code: 214
- });
- array.push({
- name: "Ecuador",
- alpha_2: "EC",
- alpha_3: "ECU",
- un_code: 218
- });
- array.push({
- name: "Egypt",
- alpha_2: "EG",
- alpha_3: "EGY",
- un_code: 818
- });
- array.push({
- name: "El Salvador",
- alpha_2: "SV",
- alpha_3: "SLV",
- un_code: 222
- });
- array.push({
- name: "Equatorial Guinea",
- alpha_2: "GQ",
- alpha_3: "GNQ",
- un_code: 226
- });
- array.push({
- name: "Eritrea",
- alpha_2: "ER",
- alpha_3: "ERI",
- un_code: 232
- });
- array.push({
- name: "Estonia",
- alpha_2: "EE",
- alpha_3: "EST",
- un_code: 233
- });
- array.push({
- name: "Ethiopia",
- alpha_2: "ET",
- alpha_3: "ETH",
- un_code: 231
- });
- array.push({
- name: "Falkland Islands (Malvinas)",
- alpha_2: "FK",
- alpha_3: "FLK",
- un_code: 238
- });
- array.push({
- name: "Faroe Islands",
- alpha_2: "FO",
- alpha_3: "FRO",
- un_code: 234
- });
- array.push({
- name: "Fiji",
- alpha_2: "FJ",
- alpha_3: "FJI",
- un_code: 242
- });
- array.push({
- name: "Finland",
- alpha_2: "FI",
- alpha_3: "FIN",
- un_code: 246
- });
- array.push({
- name: "France",
- alpha_2: "FR",
- alpha_3: "FRA",
- un_code: 250
- });
- array.push({
- name: "French Guiana",
- alpha_2: "GF",
- alpha_3: "GUF",
- un_code: 254
- });
- array.push({
- name: "French Polynesia",
- alpha_2: "PF",
- alpha_3: "PYF",
- un_code: 258
- });
- array.push({
- name: "French Southern Territories",
- alpha_2: "TF",
- alpha_3: "ATF",
- un_code: 260
- });
- array.push({
- name: "Gabon",
- alpha_2: "GA",
- alpha_3: "GAB",
- un_code: 266
- });
- array.push({
- name: "Gambia",
- alpha_2: "GM",
- alpha_3: "GMB",
- un_code: 270
- });
- array.push({
- name: "Georgia",
- alpha_2: "GE",
- alpha_3: "GEO",
- un_code: 268
- });
- array.push({
- name: "Germany",
- alpha_2: "DE",
- alpha_3: "DEU",
- un_code: 276
- });
- array.push({
- name: "Ghana",
- alpha_2: "GH",
- alpha_3: "GHA",
- un_code: 288
- });
- array.push({
- name: "Gibraltar",
- alpha_2: "GI",
- alpha_3: "GIB",
- un_code: 292
- });
- array.push({
- name: "Greece",
- alpha_2: "GR",
- alpha_3: "GRC",
- un_code: 300
- });
- array.push({
- name: "Greenland",
- alpha_2: "GL",
- alpha_3: "GRL",
- un_code: 304
- });
- array.push({
- name: "Grenada",
- alpha_2: "GD",
- alpha_3: "GRD",
- un_code: 308
- });
- array.push({
- name: "Guadeloupe",
- alpha_2: "GP",
- alpha_3: "GLP",
- un_code: 312
- });
- array.push({
- name: "Guam",
- alpha_2: "GU",
- alpha_3: "GUM",
- un_code: 316
- });
- array.push({
- name: "Guatemala",
- alpha_2: "GT",
- alpha_3: "GTM",
- un_code: 320
- });
- array.push({
- name: "Guernsey",
- alpha_2: "GG",
- alpha_3: "GGY",
- un_code: 831
- });
- array.push({
- name: "Guinea",
- alpha_2: "GN",
- alpha_3: "GIN",
- un_code: 324
- });
- array.push({
- name: "Guinea-Bissau",
- alpha_2: "GW",
- alpha_3: "GNB",
- un_code: 624
- });
- array.push({
- name: "Guyana",
- alpha_2: "GY",
- alpha_3: "GUY",
- un_code: 328
- });
- array.push({
- name: "Haiti",
- alpha_2: "HT",
- alpha_3: "HTI",
- un_code: 332
- });
- array.push({
- name: "Heard and Mcdonald Islands",
- alpha_2: "HM",
- alpha_3: "HMD",
- un_code: 334
- });
- array.push({
- name: "Holy See (Vatican City State)",
- alpha_2: "VA",
- alpha_3: "VAT",
- un_code: 336
- });
- array.push({
- name: "Honduras",
- alpha_2: "HN",
- alpha_3: "HND",
- un_code: 340
- });
- array.push({
- name: "Hungary",
- alpha_2: "HU",
- alpha_3: "HUN",
- un_code: 348
- });
- array.push({
- name: "Iceland",
- alpha_2: "IS",
- alpha_3: "ISL",
- un_code: 352
- });
- array.push({
- name: "India",
- alpha_2: "IN",
- alpha_3: "IND",
- un_code: 356
- });
- array.push({
- name: "Indonesia",
- alpha_2: "ID",
- alpha_3: "IDN",
- un_code: 360
- });
- array.push({
- name: "Iran, Islamic Republic of",
- alpha_2: "IR",
- alpha_3: "IRN",
- un_code: 364
- });
- array.push({
- name: "Iraq",
- alpha_2: "IQ",
- alpha_3: "IRQ",
- un_code: 368
- });
- array.push({
- name: "Ireland",
- alpha_2: "IE",
- alpha_3: "IRL",
- un_code: 372
- });
- array.push({
- name: "Isle of Man",
- alpha_2: "IM",
- alpha_3: "IMN",
- un_code: 833
- });
- array.push({
- name: "Israel",
- alpha_2: "IL",
- alpha_3: "ISR",
- un_code: 376
- });
- array.push({
- name: "Italy",
- alpha_2: "IT",
- alpha_3: "ITA",
- un_code: 380
- });
- array.push({
- name: "Jamaica",
- alpha_2: "JM",
- alpha_3: "JAM",
- un_code: 388
- });
- array.push({
- name: "Japan",
- alpha_2: "JP",
- alpha_3: "JPN",
- un_code: 392
- });
- array.push({
- name: "Jersey",
- alpha_2: "JE",
- alpha_3: "JEY",
- un_code: 832
- });
- array.push({
- name: "Jordan",
- alpha_2: "JO",
- alpha_3: "JOR",
- un_code: 400
- });
- array.push({
- name: "Kazakhstan",
- alpha_2: "KZ",
- alpha_3: "KAZ",
- un_code: 398
- });
- array.push({
- name: "Kenya",
- alpha_2: "KE",
- alpha_3: "KEN",
- un_code: 404
- });
- array.push({
- name: "Kiribati",
- alpha_2: "KI",
- alpha_3: "KIR",
- un_code: 296
- });
- array.push({
- name: "Korea (North)",
- alpha_2: "KP",
- alpha_3: "PRK",
- un_code: 408
- });
- array.push({
- name: "Korea (South)",
- alpha_2: "KR",
- alpha_3: "KOR",
- un_code: 410
- });
- array.push({
- name: "Kuwait",
- alpha_2: "KW",
- alpha_3: "KWT",
- un_code: 414
- });
- array.push({
- name: "Kyrgyzstan",
- alpha_2: "KG",
- alpha_3: "KGZ",
- un_code: 417
- });
- array.push({
- name: "Lao PDR",
- alpha_2: "LA",
- alpha_3: "LAO",
- un_code: 418
- });
- array.push({
- name: "Latvia",
- alpha_2: "LV",
- alpha_3: "LVA",
- un_code: 428
- });
- array.push({
- name: "Lebanon",
- alpha_2: "LB",
- alpha_3: "LBN",
- un_code: 422
- });
- array.push({
- name: "Lesotho",
- alpha_2: "LS",
- alpha_3: "LSO",
- un_code: 426
- });
- array.push({
- name: "Liberia",
- alpha_2: "LR",
- alpha_3: "LBR",
- un_code: 430
- });
- array.push({
- name: "Libya",
- alpha_2: "LY",
- alpha_3: "LBY",
- un_code: 434
- });
- array.push({
- name: "Liechtenstein",
- alpha_2: "LI",
- alpha_3: "LIE",
- un_code: 438
- });
- array.push({
- name: "Lithuania",
- alpha_2: "LT",
- alpha_3: "LTU",
- un_code: 440
- });
- array.push({
- name: "Luxembourg",
- alpha_2: "LU",
- alpha_3: "LUX",
- un_code: 442
- });
- array.push({
- name: "Macedonia, Republic of",
- alpha_2: "MK",
- alpha_3: "MKD",
- un_code: 807
- });
- array.push({
- name: "Madagascar",
- alpha_2: "MG",
- alpha_3: "MDG",
- un_code: 450
- });
- array.push({
- name: "Malawi",
- alpha_2: "MW",
- alpha_3: "MWI",
- un_code: 454
- });
- array.push({
- name: "Malaysia",
- alpha_2: "MY",
- alpha_3: "MYS",
- un_code: 458
- });
- array.push({
- name: "Maldives",
- alpha_2: "MV",
- alpha_3: "MDV",
- un_code: 462
- });
- array.push({
- name: "Mali",
- alpha_2: "ML",
- alpha_3: "MLI",
- un_code: 466
- });
- array.push({
- name: "Malta",
- alpha_2: "MT",
- alpha_3: "MLT",
- un_code: 470
- });
- array.push({
- name: "Marshall Islands",
- alpha_2: "MH",
- alpha_3: "MHL",
- un_code: 584
- });
- array.push({
- name: "Martinique",
- alpha_2: "MQ",
- alpha_3: "MTQ",
- un_code: 474
- });
- array.push({
- name: "Mauritania",
- alpha_2: "MR",
- alpha_3: "MRT",
- un_code: 478
- });
- array.push({
- name: "Mauritius",
- alpha_2: "MU",
- alpha_3: "MUS",
- un_code: 480
- });
- array.push({
- name: "Mayotte",
- alpha_2: "YT",
- alpha_3: "MYT",
- un_code: 175
- });
- array.push({
- name: "Mexico",
- alpha_2: "MX",
- alpha_3: "MEX",
- un_code: 484
- });
- array.push({
- name: "Micronesia, Federated States of",
- alpha_2: "FM",
- alpha_3: "FSM",
- un_code: 583
- });
- array.push({
- name: "Moldova",
- alpha_2: "MD",
- alpha_3: "MDA",
- un_code: 498
- });
- array.push({
- name: "Monaco",
- alpha_2: "MC",
- alpha_3: "MCO",
- un_code: 492
- });
- array.push({
- name: "Mongolia",
- alpha_2: "MN",
- alpha_3: "MNG",
- un_code: 496
- });
- array.push({
- name: "Montenegro",
- alpha_2: "ME",
- alpha_3: "MNE",
- un_code: 499
- });
- array.push({
- name: "Montserrat",
- alpha_2: "MS",
- alpha_3: "MSR",
- un_code: 500
- });
- array.push({
- name: "Morocco",
- alpha_2: "MA",
- alpha_3: "MAR",
- un_code: 504
- });
- array.push({
- name: "Mozambique",
- alpha_2: "MZ",
- alpha_3: "MOZ",
- un_code: 508
- });
- array.push({
- name: "Myanmar",
- alpha_2: "MM",
- alpha_3: "MMR",
- un_code: 104
- });
- array.push({
- name: "Namibia",
- alpha_2: "NA",
- alpha_3: "NAM",
- un_code: 516
- });
- array.push({
- name: "Nauru",
- alpha_2: "NR",
- alpha_3: "NRU",
- un_code: 520
- });
- array.push({
- name: "Nepal",
- alpha_2: "NP",
- alpha_3: "NPL",
- un_code: 524
- });
- array.push({
- name: "Netherlands",
- alpha_2: "NL",
- alpha_3: "NLD",
- un_code: 528
- });
- array.push({
- name: "Netherlands Antilles",
- alpha_2: "AN",
- alpha_3: "ANT",
- un_code: 530
- });
- array.push({
- name: "New Caledonia",
- alpha_2: "NC",
- alpha_3: "NCL",
- un_code: 540
- });
- array.push({
- name: "New Zealand",
- alpha_2: "NZ",
- alpha_3: "NZL",
- un_code: 554
- });
- array.push({
- name: "Nicaragua",
- alpha_2: "NI",
- alpha_3: "NIC",
- un_code: 558
- });
- array.push({
- name: "Niger",
- alpha_2: "NE",
- alpha_3: "NER",
- un_code: 562
- });
- array.push({
- name: "Nigeria",
- alpha_2: "NG",
- alpha_3: "NGA",
- un_code: 566
- });
- array.push({
- name: "Niue",
- alpha_2: "NU",
- alpha_3: "NIU",
- un_code: 570
- });
- array.push({
- name: "Norfolk Island",
- alpha_2: "NF",
- alpha_3: "NFK",
- un_code: 574
- });
- array.push({
- name: "Northern Mariana Islands",
- alpha_2: "MP",
- alpha_3: "MNP",
- un_code: 580
- });
- array.push({
- name: "Norway",
- alpha_2: "NO",
- alpha_3: "NOR",
- un_code: 578
- });
- array.push({
- name: "Oman",
- alpha_2: "OM",
- alpha_3: "OMN",
- un_code: 512
- });
- array.push({
- name: "Pakistan",
- alpha_2: "PK",
- alpha_3: "PAK",
- un_code: 586
- });
- array.push({
- name: "Palau",
- alpha_2: "PW",
- alpha_3: "PLW",
- un_code: 585
- });
- array.push({
- name: "Palestinian Territory",
- alpha_2: "PS",
- alpha_3: "PSE",
- un_code: 275
- });
- array.push({
- name: "Panama",
- alpha_2: "PA",
- alpha_3: "PAN",
- un_code: 591
- });
- array.push({
- name: "Papua New Guinea",
- alpha_2: "PG",
- alpha_3: "PNG",
- un_code: 598
- });
- array.push({
- name: "Paraguay",
- alpha_2: "PY",
- alpha_3: "PRY",
- un_code: 600
- });
- array.push({
- name: "Peru",
- alpha_2: "PE",
- alpha_3: "PER",
- un_code: 604
- });
- array.push({
- name: "Philippines",
- alpha_2: "PH",
- alpha_3: "PHL",
- un_code: 608
- });
- array.push({
- name: "Pitcairn",
- alpha_2: "PN",
- alpha_3: "PCN",
- un_code: 612
- });
- array.push({
- name: "Poland",
- alpha_2: "PL",
- alpha_3: "POL",
- un_code: 616
- });
- array.push({
- name: "Portugal",
- alpha_2: "PT",
- alpha_3: "PRT",
- un_code: 620
- });
- array.push({
- name: "Puerto Rico",
- alpha_2: "PR",
- alpha_3: "PRI",
- un_code: 630
- });
- array.push({
- name: "Qatar",
- alpha_2: "QA",
- alpha_3: "QAT",
- un_code: 634
- });
- array.push({
- name: "Réunion",
- alpha_2: "RE",
- alpha_3: "REU",
- un_code: 638
- });
- array.push({
- name: "Romania",
- alpha_2: "RO",
- alpha_3: "ROU",
- un_code: 642
- });
- array.push({
- name: "Russian Federation",
- alpha_2: "RU",
- alpha_3: "RUS",
- un_code: 643
- });
- array.push({
- name: "Rwanda",
- alpha_2: "RW",
- alpha_3: "RWA",
- un_code: 646
- });
- array.push({
- name: "Saint-Barthélemy",
- alpha_2: "BL",
- alpha_3: "BLM",
- un_code: 652
- });
- array.push({
- name: "Saint Helena",
- alpha_2: "SH",
- alpha_3: "SHN",
- un_code: 654
- });
- array.push({
- name: "Saint Kitts and Nevis",
- alpha_2: "KN",
- alpha_3: "KNA",
- un_code: 659
- });
- array.push({
- name: "Saint Lucia",
- alpha_2: "LC",
- alpha_3: "LCA",
- un_code: 662
- });
- array.push({
- name: "Saint-Martin (French part)",
- alpha_2: "MF",
- alpha_3: "MAF",
- un_code: 663
- });
- array.push({
- name: "Saint Pierre and Miquelon",
- alpha_2: "PM",
- alpha_3: "SPM",
- un_code: 666
- });
- array.push({
- name: "Saint Vincent and Grenadines",
- alpha_2: "VC",
- alpha_3: "VCT",
- un_code: 670
- });
- array.push({
- name: "Samoa",
- alpha_2: "WS",
- alpha_3: "WSM",
- un_code: 882
- });
- array.push({
- name: "San Marino",
- alpha_2: "SM",
- alpha_3: "SMR",
- un_code: 674
- });
- array.push({
- name: "Sao Tome and Principe",
- alpha_2: "ST",
- alpha_3: "STP",
- un_code: 678
- });
- array.push({
- name: "Saudi Arabia",
- alpha_2: "SA",
- alpha_3: "SAU",
- un_code: 682
- });
- array.push({
- name: "Senegal",
- alpha_2: "SN",
- alpha_3: "SEN",
- un_code: 686
- });
- array.push({
- name: "Serbia",
- alpha_2: "RS",
- alpha_3: "SRB",
- un_code: 688
- });
- array.push({
- name: "Seychelles",
- alpha_2: "SC",
- alpha_3: "SYC",
- un_code: 690
- });
- array.push({
- name: "Sierra Leone",
- alpha_2: "SL",
- alpha_3: "SLE",
- un_code: 694
- });
- array.push({
- name: "Singapore",
- alpha_2: "SG",
- alpha_3: "SGP",
- un_code: 702
- });
- array.push({
- name: "Slovakia",
- alpha_2: "SK",
- alpha_3: "SVK",
- un_code: 703
- });
- array.push({
- name: "Slovenia",
- alpha_2: "SI",
- alpha_3: "SVN",
- un_code: 705
- });
- array.push({
- name: "Solomon Islands",
- alpha_2: "SB",
- alpha_3: "SLB",
- un_code: 90
- });
- array.push({
- name: "Somalia",
- alpha_2: "SO",
- alpha_3: "SOM",
- un_code: 706
- });
- array.push({
- name: "South Africa",
- alpha_2: "ZA",
- alpha_3: "ZAF",
- un_code: 710
- });
- array.push({
- name: "South Georgia and the South Sandwich Islands",
- alpha_2: "GS",
- alpha_3: "SGS",
- un_code: 239
- });
- array.push({
- name: "South Sudan",
- alpha_2: "SS",
- alpha_3: "SSD",
- un_code: 728
- });
- array.push({
- name: "Spain",
- alpha_2: "ES",
- alpha_3: "ESP",
- un_code: 724
- });
- array.push({
- name: "Sri Lanka",
- alpha_2: "LK",
- alpha_3: "LKA",
- un_code: 144
- });
- array.push({
- name: "Sudan",
- alpha_2: "SD",
- alpha_3: "SDN",
- un_code: 736
- });
- array.push({
- name: "Suriname",
- alpha_2: "SR",
- alpha_3: "SUR",
- un_code: 740
- });
- array.push({
- name: "Svalbard and Jan Mayen Islands",
- alpha_2: "SJ",
- alpha_3: "SJM",
- un_code: 744
- });
- array.push({
- name: "Swaziland",
- alpha_2: "SZ",
- alpha_3: "SWZ",
- un_code: 748
- });
- array.push({
- name: "Sweden",
- alpha_2: "SE",
- alpha_3: "SWE",
- un_code: 752
- });
- array.push({
- name: "Switzerland",
- alpha_2: "CH",
- alpha_3: "CHE",
- un_code: 756
- });
- array.push({
- name: "Syrian Arab Republic (Syria)",
- alpha_2: "SY",
- alpha_3: "SYR",
- un_code: 760
- });
- array.push({
- name: "Taiwan, Republic of China",
- alpha_2: "TW",
- alpha_3: "TWN",
- un_code: 158
- });
- array.push({
- name: "Tajikistan",
- alpha_2: "TJ",
- alpha_3: "TJK",
- un_code: 762
- });
- array.push({
- name: "Tanzania, United Republic of",
- alpha_2: "TZ",
- alpha_3: "TZA",
- un_code: 834
- });
- array.push({
- name: "Thailand",
- alpha_2: "TH",
- alpha_3: "THA",
- un_code: 764
- });
- array.push({
- name: "Timor-Leste",
- alpha_2: "TL",
- alpha_3: "TLS",
- un_code: 626
- });
- array.push({
- name: "Togo",
- alpha_2: "TG",
- alpha_3: "TGO",
- un_code: 768
- });
- array.push({
- name: "Tokelau",
- alpha_2: "TK",
- alpha_3: "TKL",
- un_code: 772
- });
- array.push({
- name: "Tonga",
- alpha_2: "TO",
- alpha_3: "TON",
- un_code: 776
- });
- array.push({
- name: "Trinidad and Tobago",
- alpha_2: "TT",
- alpha_3: "TTO",
- un_code: 780
- });
- array.push({
- name: "Tunisia",
- alpha_2: "TN",
- alpha_3: "TUN",
- un_code: 788
- });
- array.push({
- name: "Turkey",
- alpha_2: "TR",
- alpha_3: "TUR",
- un_code: 792
- });
- array.push({
- name: "Turkmenistan",
- alpha_2: "TM",
- alpha_3: "TKM",
- un_code: 795
- });
- array.push({
- name: "Turks and Caicos Islands",
- alpha_2: "TC",
- alpha_3: "TCA",
- un_code: 796
- });
- array.push({
- name: "Tuvalu",
- alpha_2: "TV",
- alpha_3: "TUV",
- un_code: 798
- });
- array.push({
- name: "Uganda",
- alpha_2: "UG",
- alpha_3: "UGA",
- un_code: 800
- });
- array.push({
- name: "Ukraine",
- alpha_2: "UA",
- alpha_3: "UKR",
- un_code: 804
- });
- array.push({
- name: "United Arab Emirates",
- alpha_2: "AE",
- alpha_3: "ARE",
- un_code: 784
- });
- array.push({
- name: "United Kingdom",
- alpha_2: "GB",
- alpha_3: "GBR",
- un_code: 826
- });
- array.push({
- name: "United States of America",
- alpha_2: "US",
- alpha_3: "USA",
- un_code: 840
- });
- array.push({
- name: "US Minor Outlying Islands",
- alpha_2: "UM",
- alpha_3: "UMI",
- un_code: 581
- });
- array.push({
- name: "Uruguay",
- alpha_2: "UY",
- alpha_3: "URY",
- un_code: 858
- });
- array.push({
- name: "Uzbekistan",
- alpha_2: "UZ",
- alpha_3: "UZB",
- un_code: 860
- });
- array.push({
- name: "Vanuatu",
- alpha_2: "VU",
- alpha_3: "VUT",
- un_code: 548
- });
- array.push({
- name: "Venezuela (Bolivarian Republic)",
- alpha_2: "VE",
- alpha_3: "VEN",
- un_code: 862
- });
- array.push({
- name: "Viet Nam",
- alpha_2: "VN",
- alpha_3: "VNM",
- un_code: 704
- });
- array.push({
- name: "Virgin Islands, US",
- alpha_2: "VI",
- alpha_3: "VIR",
- un_code: 850
- });
- array.push({
- name: "Wallis and Futuna Islands",
- alpha_2: "WF",
- alpha_3: "WLF",
- un_code: 876
- });
- array.push({
- name: "Western Sahara",
- alpha_2: "EH",
- alpha_3: "ESH",
- un_code: 732
- });
- array.push({
- name: "Yemen",
- alpha_2: "YE",
- alpha_3: "YEM",
- un_code: 887
- });
- array.push({
- name: "Zambia",
- alpha_2: "ZM",
- alpha_3: "ZMB",
- un_code: 894
- });
- array.push({
- name: "Zimbabwe",
- alpha_2: "ZW",
- alpha_3: "ZWE",
- un_code: 716
- });
- };
-
- export function country_name(alpha_code: string, fallback?: string) {
- return (alpha_2_map[alpha_code.toUpperCase()] || {name: fallback || tr("unknown country")}).name;
- }
-
- fill_country_infos(country_infos);
- for(const country of country_infos)
- alpha_2_map[country.alpha_2] = country;
+interface CountryInfo {
+ name: string;
+ alpha_2: string;
+ alpha_3: string;
+ un_code: number;
}
+const country_infos: CountryInfo[] = [];
+const alpha_2_map: {[name: string]:CountryInfo} = {};
+
+const fill_country_infos = (array: CountryInfo[]) => {
+ array.push({
+ name: "Afghanistan",
+ alpha_2: "AF",
+ alpha_3: "AFG",
+ un_code: 4
+ });
+ array.push({
+ name: "Aland Islands",
+ alpha_2: "AX",
+ alpha_3: "ALA",
+ un_code: 248
+ });
+ array.push({
+ name: "Albania",
+ alpha_2: "AL",
+ alpha_3: "ALB",
+ un_code: 8
+ });
+ array.push({
+ name: "Algeria",
+ alpha_2: "DZ",
+ alpha_3: "DZA",
+ un_code: 12
+ });
+ array.push({
+ name: "American Samoa",
+ alpha_2: "AS",
+ alpha_3: "ASM",
+ un_code: 16
+ });
+ array.push({
+ name: "Andorra",
+ alpha_2: "AD",
+ alpha_3: "AND",
+ un_code: 20
+ });
+ array.push({
+ name: "Angola",
+ alpha_2: "AO",
+ alpha_3: "AGO",
+ un_code: 24
+ });
+ array.push({
+ name: "Anguilla",
+ alpha_2: "AI",
+ alpha_3: "AIA",
+ un_code: 660
+ });
+ array.push({
+ name: "Antarctica",
+ alpha_2: "AQ",
+ alpha_3: "ATA",
+ un_code: 10
+ });
+ array.push({
+ name: "Antigua and Barbuda",
+ alpha_2: "AG",
+ alpha_3: "ATG",
+ un_code: 28
+ });
+ array.push({
+ name: "Argentina",
+ alpha_2: "AR",
+ alpha_3: "ARG",
+ un_code: 32
+ });
+ array.push({
+ name: "Armenia",
+ alpha_2: "AM",
+ alpha_3: "ARM",
+ un_code: 51
+ });
+ array.push({
+ name: "Aruba",
+ alpha_2: "AW",
+ alpha_3: "ABW",
+ un_code: 533
+ });
+ array.push({
+ name: "Australia",
+ alpha_2: "AU",
+ alpha_3: "AUS",
+ un_code: 36
+ });
+ array.push({
+ name: "Austria",
+ alpha_2: "AT",
+ alpha_3: "AUT",
+ un_code: 40
+ });
+ array.push({
+ name: "Azerbaijan",
+ alpha_2: "AZ",
+ alpha_3: "AZE",
+ un_code: 31
+ });
+ array.push({
+ name: "Bahamas",
+ alpha_2: "BS",
+ alpha_3: "BHS",
+ un_code: 44
+ });
+ array.push({
+ name: "Bahrain",
+ alpha_2: "BH",
+ alpha_3: "BHR",
+ un_code: 48
+ });
+ array.push({
+ name: "Bangladesh",
+ alpha_2: "BD",
+ alpha_3: "BGD",
+ un_code: 50
+ });
+ array.push({
+ name: "Barbados",
+ alpha_2: "BB",
+ alpha_3: "BRB",
+ un_code: 52
+ });
+ array.push({
+ name: "Belarus",
+ alpha_2: "BY",
+ alpha_3: "BLR",
+ un_code: 112
+ });
+ array.push({
+ name: "Belgium",
+ alpha_2: "BE",
+ alpha_3: "BEL",
+ un_code: 56
+ });
+ array.push({
+ name: "Belize",
+ alpha_2: "BZ",
+ alpha_3: "BLZ",
+ un_code: 84
+ });
+ array.push({
+ name: "Benin",
+ alpha_2: "BJ",
+ alpha_3: "BEN",
+ un_code: 204
+ });
+ array.push({
+ name: "Bermuda",
+ alpha_2: "BM",
+ alpha_3: "BMU",
+ un_code: 60
+ });
+ array.push({
+ name: "Bhutan",
+ alpha_2: "BT",
+ alpha_3: "BTN",
+ un_code: 64
+ });
+ array.push({
+ name: "Bolivia",
+ alpha_2: "BO",
+ alpha_3: "BOL",
+ un_code: 68
+ });
+ array.push({
+ name: "Bosnia and Herzegovina",
+ alpha_2: "BA",
+ alpha_3: "BIH",
+ un_code: 70
+ });
+ array.push({
+ name: "Botswana",
+ alpha_2: "BW",
+ alpha_3: "BWA",
+ un_code: 72
+ });
+ array.push({
+ name: "Bouvet Island",
+ alpha_2: "BV",
+ alpha_3: "BVT",
+ un_code: 74
+ });
+ array.push({
+ name: "Brazil",
+ alpha_2: "BR",
+ alpha_3: "BRA",
+ un_code: 76
+ });
+ array.push({
+ name: "British Virgin Islands",
+ alpha_2: "VG",
+ alpha_3: "VGB",
+ un_code: 92
+ });
+ array.push({
+ name: "British Indian Ocean Territory",
+ alpha_2: "IO",
+ alpha_3: "IOT",
+ un_code: 86
+ });
+ array.push({
+ name: "Brunei Darussalam",
+ alpha_2: "BN",
+ alpha_3: "BRN",
+ un_code: 96
+ });
+ array.push({
+ name: "Bulgaria",
+ alpha_2: "BG",
+ alpha_3: "BGR",
+ un_code: 100
+ });
+ array.push({
+ name: "Burkina Faso",
+ alpha_2: "BF",
+ alpha_3: "BFA",
+ un_code: 854
+ });
+ array.push({
+ name: "Burundi",
+ alpha_2: "BI",
+ alpha_3: "BDI",
+ un_code: 108
+ });
+ array.push({
+ name: "Cambodia",
+ alpha_2: "KH",
+ alpha_3: "KHM",
+ un_code: 116
+ });
+ array.push({
+ name: "Cameroon",
+ alpha_2: "CM",
+ alpha_3: "CMR",
+ un_code: 120
+ });
+ array.push({
+ name: "Canada",
+ alpha_2: "CA",
+ alpha_3: "CAN",
+ un_code: 124
+ });
+ array.push({
+ name: "Cape Verde",
+ alpha_2: "CV",
+ alpha_3: "CPV",
+ un_code: 132
+ });
+ array.push({
+ name: "Cayman Islands",
+ alpha_2: "KY",
+ alpha_3: "CYM",
+ un_code: 136
+ });
+ array.push({
+ name: "Central African Republic",
+ alpha_2: "CF",
+ alpha_3: "CAF",
+ un_code: 140
+ });
+ array.push({
+ name: "Chad",
+ alpha_2: "TD",
+ alpha_3: "TCD",
+ un_code: 148
+ });
+ array.push({
+ name: "Chile",
+ alpha_2: "CL",
+ alpha_3: "CHL",
+ un_code: 152
+ });
+ array.push({
+ name: "China",
+ alpha_2: "CN",
+ alpha_3: "CHN",
+ un_code: 156
+ });
+ array.push({
+ name: "Hong Kong, SAR China",
+ alpha_2: "HK",
+ alpha_3: "HKG",
+ un_code: 344
+ });
+ array.push({
+ name: "Macao, SAR China",
+ alpha_2: "MO",
+ alpha_3: "MAC",
+ un_code: 446
+ });
+ array.push({
+ name: "Christmas Island",
+ alpha_2: "CX",
+ alpha_3: "CXR",
+ un_code: 162
+ });
+ array.push({
+ name: "Cocos (Keeling) Islands",
+ alpha_2: "CC",
+ alpha_3: "CCK",
+ un_code: 166
+ });
+ array.push({
+ name: "Colombia",
+ alpha_2: "CO",
+ alpha_3: "COL",
+ un_code: 170
+ });
+ array.push({
+ name: "Comoros",
+ alpha_2: "KM",
+ alpha_3: "COM",
+ un_code: 174
+ });
+ array.push({
+ name: "Congo (Brazzaville)",
+ alpha_2: "CG",
+ alpha_3: "COG",
+ un_code: 178
+ });
+ array.push({
+ name: "Congo, (Kinshasa)",
+ alpha_2: "CD",
+ alpha_3: "COD",
+ un_code: 180
+ });
+ array.push({
+ name: "Cook Islands",
+ alpha_2: "CK",
+ alpha_3: "COK",
+ un_code: 184
+ });
+ array.push({
+ name: "Costa Rica",
+ alpha_2: "CR",
+ alpha_3: "CRI",
+ un_code: 188
+ });
+ array.push({
+ name: "Côte d'Ivoire",
+ alpha_2: "CI",
+ alpha_3: "CIV",
+ un_code: 384
+ });
+ array.push({
+ name: "Croatia",
+ alpha_2: "HR",
+ alpha_3: "HRV",
+ un_code: 191
+ });
+ array.push({
+ name: "Cuba",
+ alpha_2: "CU",
+ alpha_3: "CUB",
+ un_code: 192
+ });
+ array.push({
+ name: "Cyprus",
+ alpha_2: "CY",
+ alpha_3: "CYP",
+ un_code: 196
+ });
+ array.push({
+ name: "Czech Republic",
+ alpha_2: "CZ",
+ alpha_3: "CZE",
+ un_code: 203
+ });
+ array.push({
+ name: "Denmark",
+ alpha_2: "DK",
+ alpha_3: "DNK",
+ un_code: 208
+ });
+ array.push({
+ name: "Djibouti",
+ alpha_2: "DJ",
+ alpha_3: "DJI",
+ un_code: 262
+ });
+ array.push({
+ name: "Dominica",
+ alpha_2: "DM",
+ alpha_3: "DMA",
+ un_code: 212
+ });
+ array.push({
+ name: "Dominican Republic",
+ alpha_2: "DO",
+ alpha_3: "DOM",
+ un_code: 214
+ });
+ array.push({
+ name: "Ecuador",
+ alpha_2: "EC",
+ alpha_3: "ECU",
+ un_code: 218
+ });
+ array.push({
+ name: "Egypt",
+ alpha_2: "EG",
+ alpha_3: "EGY",
+ un_code: 818
+ });
+ array.push({
+ name: "El Salvador",
+ alpha_2: "SV",
+ alpha_3: "SLV",
+ un_code: 222
+ });
+ array.push({
+ name: "Equatorial Guinea",
+ alpha_2: "GQ",
+ alpha_3: "GNQ",
+ un_code: 226
+ });
+ array.push({
+ name: "Eritrea",
+ alpha_2: "ER",
+ alpha_3: "ERI",
+ un_code: 232
+ });
+ array.push({
+ name: "Estonia",
+ alpha_2: "EE",
+ alpha_3: "EST",
+ un_code: 233
+ });
+ array.push({
+ name: "Ethiopia",
+ alpha_2: "ET",
+ alpha_3: "ETH",
+ un_code: 231
+ });
+ array.push({
+ name: "Falkland Islands (Malvinas)",
+ alpha_2: "FK",
+ alpha_3: "FLK",
+ un_code: 238
+ });
+ array.push({
+ name: "Faroe Islands",
+ alpha_2: "FO",
+ alpha_3: "FRO",
+ un_code: 234
+ });
+ array.push({
+ name: "Fiji",
+ alpha_2: "FJ",
+ alpha_3: "FJI",
+ un_code: 242
+ });
+ array.push({
+ name: "Finland",
+ alpha_2: "FI",
+ alpha_3: "FIN",
+ un_code: 246
+ });
+ array.push({
+ name: "France",
+ alpha_2: "FR",
+ alpha_3: "FRA",
+ un_code: 250
+ });
+ array.push({
+ name: "French Guiana",
+ alpha_2: "GF",
+ alpha_3: "GUF",
+ un_code: 254
+ });
+ array.push({
+ name: "French Polynesia",
+ alpha_2: "PF",
+ alpha_3: "PYF",
+ un_code: 258
+ });
+ array.push({
+ name: "French Southern Territories",
+ alpha_2: "TF",
+ alpha_3: "ATF",
+ un_code: 260
+ });
+ array.push({
+ name: "Gabon",
+ alpha_2: "GA",
+ alpha_3: "GAB",
+ un_code: 266
+ });
+ array.push({
+ name: "Gambia",
+ alpha_2: "GM",
+ alpha_3: "GMB",
+ un_code: 270
+ });
+ array.push({
+ name: "Georgia",
+ alpha_2: "GE",
+ alpha_3: "GEO",
+ un_code: 268
+ });
+ array.push({
+ name: "Germany",
+ alpha_2: "DE",
+ alpha_3: "DEU",
+ un_code: 276
+ });
+ array.push({
+ name: "Ghana",
+ alpha_2: "GH",
+ alpha_3: "GHA",
+ un_code: 288
+ });
+ array.push({
+ name: "Gibraltar",
+ alpha_2: "GI",
+ alpha_3: "GIB",
+ un_code: 292
+ });
+ array.push({
+ name: "Greece",
+ alpha_2: "GR",
+ alpha_3: "GRC",
+ un_code: 300
+ });
+ array.push({
+ name: "Greenland",
+ alpha_2: "GL",
+ alpha_3: "GRL",
+ un_code: 304
+ });
+ array.push({
+ name: "Grenada",
+ alpha_2: "GD",
+ alpha_3: "GRD",
+ un_code: 308
+ });
+ array.push({
+ name: "Guadeloupe",
+ alpha_2: "GP",
+ alpha_3: "GLP",
+ un_code: 312
+ });
+ array.push({
+ name: "Guam",
+ alpha_2: "GU",
+ alpha_3: "GUM",
+ un_code: 316
+ });
+ array.push({
+ name: "Guatemala",
+ alpha_2: "GT",
+ alpha_3: "GTM",
+ un_code: 320
+ });
+ array.push({
+ name: "Guernsey",
+ alpha_2: "GG",
+ alpha_3: "GGY",
+ un_code: 831
+ });
+ array.push({
+ name: "Guinea",
+ alpha_2: "GN",
+ alpha_3: "GIN",
+ un_code: 324
+ });
+ array.push({
+ name: "Guinea-Bissau",
+ alpha_2: "GW",
+ alpha_3: "GNB",
+ un_code: 624
+ });
+ array.push({
+ name: "Guyana",
+ alpha_2: "GY",
+ alpha_3: "GUY",
+ un_code: 328
+ });
+ array.push({
+ name: "Haiti",
+ alpha_2: "HT",
+ alpha_3: "HTI",
+ un_code: 332
+ });
+ array.push({
+ name: "Heard and Mcdonald Islands",
+ alpha_2: "HM",
+ alpha_3: "HMD",
+ un_code: 334
+ });
+ array.push({
+ name: "Holy See (Vatican City State)",
+ alpha_2: "VA",
+ alpha_3: "VAT",
+ un_code: 336
+ });
+ array.push({
+ name: "Honduras",
+ alpha_2: "HN",
+ alpha_3: "HND",
+ un_code: 340
+ });
+ array.push({
+ name: "Hungary",
+ alpha_2: "HU",
+ alpha_3: "HUN",
+ un_code: 348
+ });
+ array.push({
+ name: "Iceland",
+ alpha_2: "IS",
+ alpha_3: "ISL",
+ un_code: 352
+ });
+ array.push({
+ name: "India",
+ alpha_2: "IN",
+ alpha_3: "IND",
+ un_code: 356
+ });
+ array.push({
+ name: "Indonesia",
+ alpha_2: "ID",
+ alpha_3: "IDN",
+ un_code: 360
+ });
+ array.push({
+ name: "Iran, Islamic Republic of",
+ alpha_2: "IR",
+ alpha_3: "IRN",
+ un_code: 364
+ });
+ array.push({
+ name: "Iraq",
+ alpha_2: "IQ",
+ alpha_3: "IRQ",
+ un_code: 368
+ });
+ array.push({
+ name: "Ireland",
+ alpha_2: "IE",
+ alpha_3: "IRL",
+ un_code: 372
+ });
+ array.push({
+ name: "Isle of Man",
+ alpha_2: "IM",
+ alpha_3: "IMN",
+ un_code: 833
+ });
+ array.push({
+ name: "Israel",
+ alpha_2: "IL",
+ alpha_3: "ISR",
+ un_code: 376
+ });
+ array.push({
+ name: "Italy",
+ alpha_2: "IT",
+ alpha_3: "ITA",
+ un_code: 380
+ });
+ array.push({
+ name: "Jamaica",
+ alpha_2: "JM",
+ alpha_3: "JAM",
+ un_code: 388
+ });
+ array.push({
+ name: "Japan",
+ alpha_2: "JP",
+ alpha_3: "JPN",
+ un_code: 392
+ });
+ array.push({
+ name: "Jersey",
+ alpha_2: "JE",
+ alpha_3: "JEY",
+ un_code: 832
+ });
+ array.push({
+ name: "Jordan",
+ alpha_2: "JO",
+ alpha_3: "JOR",
+ un_code: 400
+ });
+ array.push({
+ name: "Kazakhstan",
+ alpha_2: "KZ",
+ alpha_3: "KAZ",
+ un_code: 398
+ });
+ array.push({
+ name: "Kenya",
+ alpha_2: "KE",
+ alpha_3: "KEN",
+ un_code: 404
+ });
+ array.push({
+ name: "Kiribati",
+ alpha_2: "KI",
+ alpha_3: "KIR",
+ un_code: 296
+ });
+ array.push({
+ name: "Korea (North)",
+ alpha_2: "KP",
+ alpha_3: "PRK",
+ un_code: 408
+ });
+ array.push({
+ name: "Korea (South)",
+ alpha_2: "KR",
+ alpha_3: "KOR",
+ un_code: 410
+ });
+ array.push({
+ name: "Kuwait",
+ alpha_2: "KW",
+ alpha_3: "KWT",
+ un_code: 414
+ });
+ array.push({
+ name: "Kyrgyzstan",
+ alpha_2: "KG",
+ alpha_3: "KGZ",
+ un_code: 417
+ });
+ array.push({
+ name: "Lao PDR",
+ alpha_2: "LA",
+ alpha_3: "LAO",
+ un_code: 418
+ });
+ array.push({
+ name: "Latvia",
+ alpha_2: "LV",
+ alpha_3: "LVA",
+ un_code: 428
+ });
+ array.push({
+ name: "Lebanon",
+ alpha_2: "LB",
+ alpha_3: "LBN",
+ un_code: 422
+ });
+ array.push({
+ name: "Lesotho",
+ alpha_2: "LS",
+ alpha_3: "LSO",
+ un_code: 426
+ });
+ array.push({
+ name: "Liberia",
+ alpha_2: "LR",
+ alpha_3: "LBR",
+ un_code: 430
+ });
+ array.push({
+ name: "Libya",
+ alpha_2: "LY",
+ alpha_3: "LBY",
+ un_code: 434
+ });
+ array.push({
+ name: "Liechtenstein",
+ alpha_2: "LI",
+ alpha_3: "LIE",
+ un_code: 438
+ });
+ array.push({
+ name: "Lithuania",
+ alpha_2: "LT",
+ alpha_3: "LTU",
+ un_code: 440
+ });
+ array.push({
+ name: "Luxembourg",
+ alpha_2: "LU",
+ alpha_3: "LUX",
+ un_code: 442
+ });
+ array.push({
+ name: "Macedonia, Republic of",
+ alpha_2: "MK",
+ alpha_3: "MKD",
+ un_code: 807
+ });
+ array.push({
+ name: "Madagascar",
+ alpha_2: "MG",
+ alpha_3: "MDG",
+ un_code: 450
+ });
+ array.push({
+ name: "Malawi",
+ alpha_2: "MW",
+ alpha_3: "MWI",
+ un_code: 454
+ });
+ array.push({
+ name: "Malaysia",
+ alpha_2: "MY",
+ alpha_3: "MYS",
+ un_code: 458
+ });
+ array.push({
+ name: "Maldives",
+ alpha_2: "MV",
+ alpha_3: "MDV",
+ un_code: 462
+ });
+ array.push({
+ name: "Mali",
+ alpha_2: "ML",
+ alpha_3: "MLI",
+ un_code: 466
+ });
+ array.push({
+ name: "Malta",
+ alpha_2: "MT",
+ alpha_3: "MLT",
+ un_code: 470
+ });
+ array.push({
+ name: "Marshall Islands",
+ alpha_2: "MH",
+ alpha_3: "MHL",
+ un_code: 584
+ });
+ array.push({
+ name: "Martinique",
+ alpha_2: "MQ",
+ alpha_3: "MTQ",
+ un_code: 474
+ });
+ array.push({
+ name: "Mauritania",
+ alpha_2: "MR",
+ alpha_3: "MRT",
+ un_code: 478
+ });
+ array.push({
+ name: "Mauritius",
+ alpha_2: "MU",
+ alpha_3: "MUS",
+ un_code: 480
+ });
+ array.push({
+ name: "Mayotte",
+ alpha_2: "YT",
+ alpha_3: "MYT",
+ un_code: 175
+ });
+ array.push({
+ name: "Mexico",
+ alpha_2: "MX",
+ alpha_3: "MEX",
+ un_code: 484
+ });
+ array.push({
+ name: "Micronesia, Federated States of",
+ alpha_2: "FM",
+ alpha_3: "FSM",
+ un_code: 583
+ });
+ array.push({
+ name: "Moldova",
+ alpha_2: "MD",
+ alpha_3: "MDA",
+ un_code: 498
+ });
+ array.push({
+ name: "Monaco",
+ alpha_2: "MC",
+ alpha_3: "MCO",
+ un_code: 492
+ });
+ array.push({
+ name: "Mongolia",
+ alpha_2: "MN",
+ alpha_3: "MNG",
+ un_code: 496
+ });
+ array.push({
+ name: "Montenegro",
+ alpha_2: "ME",
+ alpha_3: "MNE",
+ un_code: 499
+ });
+ array.push({
+ name: "Montserrat",
+ alpha_2: "MS",
+ alpha_3: "MSR",
+ un_code: 500
+ });
+ array.push({
+ name: "Morocco",
+ alpha_2: "MA",
+ alpha_3: "MAR",
+ un_code: 504
+ });
+ array.push({
+ name: "Mozambique",
+ alpha_2: "MZ",
+ alpha_3: "MOZ",
+ un_code: 508
+ });
+ array.push({
+ name: "Myanmar",
+ alpha_2: "MM",
+ alpha_3: "MMR",
+ un_code: 104
+ });
+ array.push({
+ name: "Namibia",
+ alpha_2: "NA",
+ alpha_3: "NAM",
+ un_code: 516
+ });
+ array.push({
+ name: "Nauru",
+ alpha_2: "NR",
+ alpha_3: "NRU",
+ un_code: 520
+ });
+ array.push({
+ name: "Nepal",
+ alpha_2: "NP",
+ alpha_3: "NPL",
+ un_code: 524
+ });
+ array.push({
+ name: "Netherlands",
+ alpha_2: "NL",
+ alpha_3: "NLD",
+ un_code: 528
+ });
+ array.push({
+ name: "Netherlands Antilles",
+ alpha_2: "AN",
+ alpha_3: "ANT",
+ un_code: 530
+ });
+ array.push({
+ name: "New Caledonia",
+ alpha_2: "NC",
+ alpha_3: "NCL",
+ un_code: 540
+ });
+ array.push({
+ name: "New Zealand",
+ alpha_2: "NZ",
+ alpha_3: "NZL",
+ un_code: 554
+ });
+ array.push({
+ name: "Nicaragua",
+ alpha_2: "NI",
+ alpha_3: "NIC",
+ un_code: 558
+ });
+ array.push({
+ name: "Niger",
+ alpha_2: "NE",
+ alpha_3: "NER",
+ un_code: 562
+ });
+ array.push({
+ name: "Nigeria",
+ alpha_2: "NG",
+ alpha_3: "NGA",
+ un_code: 566
+ });
+ array.push({
+ name: "Niue",
+ alpha_2: "NU",
+ alpha_3: "NIU",
+ un_code: 570
+ });
+ array.push({
+ name: "Norfolk Island",
+ alpha_2: "NF",
+ alpha_3: "NFK",
+ un_code: 574
+ });
+ array.push({
+ name: "Northern Mariana Islands",
+ alpha_2: "MP",
+ alpha_3: "MNP",
+ un_code: 580
+ });
+ array.push({
+ name: "Norway",
+ alpha_2: "NO",
+ alpha_3: "NOR",
+ un_code: 578
+ });
+ array.push({
+ name: "Oman",
+ alpha_2: "OM",
+ alpha_3: "OMN",
+ un_code: 512
+ });
+ array.push({
+ name: "Pakistan",
+ alpha_2: "PK",
+ alpha_3: "PAK",
+ un_code: 586
+ });
+ array.push({
+ name: "Palau",
+ alpha_2: "PW",
+ alpha_3: "PLW",
+ un_code: 585
+ });
+ array.push({
+ name: "Palestinian Territory",
+ alpha_2: "PS",
+ alpha_3: "PSE",
+ un_code: 275
+ });
+ array.push({
+ name: "Panama",
+ alpha_2: "PA",
+ alpha_3: "PAN",
+ un_code: 591
+ });
+ array.push({
+ name: "Papua New Guinea",
+ alpha_2: "PG",
+ alpha_3: "PNG",
+ un_code: 598
+ });
+ array.push({
+ name: "Paraguay",
+ alpha_2: "PY",
+ alpha_3: "PRY",
+ un_code: 600
+ });
+ array.push({
+ name: "Peru",
+ alpha_2: "PE",
+ alpha_3: "PER",
+ un_code: 604
+ });
+ array.push({
+ name: "Philippines",
+ alpha_2: "PH",
+ alpha_3: "PHL",
+ un_code: 608
+ });
+ array.push({
+ name: "Pitcairn",
+ alpha_2: "PN",
+ alpha_3: "PCN",
+ un_code: 612
+ });
+ array.push({
+ name: "Poland",
+ alpha_2: "PL",
+ alpha_3: "POL",
+ un_code: 616
+ });
+ array.push({
+ name: "Portugal",
+ alpha_2: "PT",
+ alpha_3: "PRT",
+ un_code: 620
+ });
+ array.push({
+ name: "Puerto Rico",
+ alpha_2: "PR",
+ alpha_3: "PRI",
+ un_code: 630
+ });
+ array.push({
+ name: "Qatar",
+ alpha_2: "QA",
+ alpha_3: "QAT",
+ un_code: 634
+ });
+ array.push({
+ name: "Réunion",
+ alpha_2: "RE",
+ alpha_3: "REU",
+ un_code: 638
+ });
+ array.push({
+ name: "Romania",
+ alpha_2: "RO",
+ alpha_3: "ROU",
+ un_code: 642
+ });
+ array.push({
+ name: "Russian Federation",
+ alpha_2: "RU",
+ alpha_3: "RUS",
+ un_code: 643
+ });
+ array.push({
+ name: "Rwanda",
+ alpha_2: "RW",
+ alpha_3: "RWA",
+ un_code: 646
+ });
+ array.push({
+ name: "Saint-Barthélemy",
+ alpha_2: "BL",
+ alpha_3: "BLM",
+ un_code: 652
+ });
+ array.push({
+ name: "Saint Helena",
+ alpha_2: "SH",
+ alpha_3: "SHN",
+ un_code: 654
+ });
+ array.push({
+ name: "Saint Kitts and Nevis",
+ alpha_2: "KN",
+ alpha_3: "KNA",
+ un_code: 659
+ });
+ array.push({
+ name: "Saint Lucia",
+ alpha_2: "LC",
+ alpha_3: "LCA",
+ un_code: 662
+ });
+ array.push({
+ name: "Saint-Martin (French part)",
+ alpha_2: "MF",
+ alpha_3: "MAF",
+ un_code: 663
+ });
+ array.push({
+ name: "Saint Pierre and Miquelon",
+ alpha_2: "PM",
+ alpha_3: "SPM",
+ un_code: 666
+ });
+ array.push({
+ name: "Saint Vincent and Grenadines",
+ alpha_2: "VC",
+ alpha_3: "VCT",
+ un_code: 670
+ });
+ array.push({
+ name: "Samoa",
+ alpha_2: "WS",
+ alpha_3: "WSM",
+ un_code: 882
+ });
+ array.push({
+ name: "San Marino",
+ alpha_2: "SM",
+ alpha_3: "SMR",
+ un_code: 674
+ });
+ array.push({
+ name: "Sao Tome and Principe",
+ alpha_2: "ST",
+ alpha_3: "STP",
+ un_code: 678
+ });
+ array.push({
+ name: "Saudi Arabia",
+ alpha_2: "SA",
+ alpha_3: "SAU",
+ un_code: 682
+ });
+ array.push({
+ name: "Senegal",
+ alpha_2: "SN",
+ alpha_3: "SEN",
+ un_code: 686
+ });
+ array.push({
+ name: "Serbia",
+ alpha_2: "RS",
+ alpha_3: "SRB",
+ un_code: 688
+ });
+ array.push({
+ name: "Seychelles",
+ alpha_2: "SC",
+ alpha_3: "SYC",
+ un_code: 690
+ });
+ array.push({
+ name: "Sierra Leone",
+ alpha_2: "SL",
+ alpha_3: "SLE",
+ un_code: 694
+ });
+ array.push({
+ name: "Singapore",
+ alpha_2: "SG",
+ alpha_3: "SGP",
+ un_code: 702
+ });
+ array.push({
+ name: "Slovakia",
+ alpha_2: "SK",
+ alpha_3: "SVK",
+ un_code: 703
+ });
+ array.push({
+ name: "Slovenia",
+ alpha_2: "SI",
+ alpha_3: "SVN",
+ un_code: 705
+ });
+ array.push({
+ name: "Solomon Islands",
+ alpha_2: "SB",
+ alpha_3: "SLB",
+ un_code: 90
+ });
+ array.push({
+ name: "Somalia",
+ alpha_2: "SO",
+ alpha_3: "SOM",
+ un_code: 706
+ });
+ array.push({
+ name: "South Africa",
+ alpha_2: "ZA",
+ alpha_3: "ZAF",
+ un_code: 710
+ });
+ array.push({
+ name: "South Georgia and the South Sandwich Islands",
+ alpha_2: "GS",
+ alpha_3: "SGS",
+ un_code: 239
+ });
+ array.push({
+ name: "South Sudan",
+ alpha_2: "SS",
+ alpha_3: "SSD",
+ un_code: 728
+ });
+ array.push({
+ name: "Spain",
+ alpha_2: "ES",
+ alpha_3: "ESP",
+ un_code: 724
+ });
+ array.push({
+ name: "Sri Lanka",
+ alpha_2: "LK",
+ alpha_3: "LKA",
+ un_code: 144
+ });
+ array.push({
+ name: "Sudan",
+ alpha_2: "SD",
+ alpha_3: "SDN",
+ un_code: 736
+ });
+ array.push({
+ name: "Suriname",
+ alpha_2: "SR",
+ alpha_3: "SUR",
+ un_code: 740
+ });
+ array.push({
+ name: "Svalbard and Jan Mayen Islands",
+ alpha_2: "SJ",
+ alpha_3: "SJM",
+ un_code: 744
+ });
+ array.push({
+ name: "Swaziland",
+ alpha_2: "SZ",
+ alpha_3: "SWZ",
+ un_code: 748
+ });
+ array.push({
+ name: "Sweden",
+ alpha_2: "SE",
+ alpha_3: "SWE",
+ un_code: 752
+ });
+ array.push({
+ name: "Switzerland",
+ alpha_2: "CH",
+ alpha_3: "CHE",
+ un_code: 756
+ });
+ array.push({
+ name: "Syrian Arab Republic (Syria)",
+ alpha_2: "SY",
+ alpha_3: "SYR",
+ un_code: 760
+ });
+ array.push({
+ name: "Taiwan, Republic of China",
+ alpha_2: "TW",
+ alpha_3: "TWN",
+ un_code: 158
+ });
+ array.push({
+ name: "Tajikistan",
+ alpha_2: "TJ",
+ alpha_3: "TJK",
+ un_code: 762
+ });
+ array.push({
+ name: "Tanzania, United Republic of",
+ alpha_2: "TZ",
+ alpha_3: "TZA",
+ un_code: 834
+ });
+ array.push({
+ name: "Thailand",
+ alpha_2: "TH",
+ alpha_3: "THA",
+ un_code: 764
+ });
+ array.push({
+ name: "Timor-Leste",
+ alpha_2: "TL",
+ alpha_3: "TLS",
+ un_code: 626
+ });
+ array.push({
+ name: "Togo",
+ alpha_2: "TG",
+ alpha_3: "TGO",
+ un_code: 768
+ });
+ array.push({
+ name: "Tokelau",
+ alpha_2: "TK",
+ alpha_3: "TKL",
+ un_code: 772
+ });
+ array.push({
+ name: "Tonga",
+ alpha_2: "TO",
+ alpha_3: "TON",
+ un_code: 776
+ });
+ array.push({
+ name: "Trinidad and Tobago",
+ alpha_2: "TT",
+ alpha_3: "TTO",
+ un_code: 780
+ });
+ array.push({
+ name: "Tunisia",
+ alpha_2: "TN",
+ alpha_3: "TUN",
+ un_code: 788
+ });
+ array.push({
+ name: "Turkey",
+ alpha_2: "TR",
+ alpha_3: "TUR",
+ un_code: 792
+ });
+ array.push({
+ name: "Turkmenistan",
+ alpha_2: "TM",
+ alpha_3: "TKM",
+ un_code: 795
+ });
+ array.push({
+ name: "Turks and Caicos Islands",
+ alpha_2: "TC",
+ alpha_3: "TCA",
+ un_code: 796
+ });
+ array.push({
+ name: "Tuvalu",
+ alpha_2: "TV",
+ alpha_3: "TUV",
+ un_code: 798
+ });
+ array.push({
+ name: "Uganda",
+ alpha_2: "UG",
+ alpha_3: "UGA",
+ un_code: 800
+ });
+ array.push({
+ name: "Ukraine",
+ alpha_2: "UA",
+ alpha_3: "UKR",
+ un_code: 804
+ });
+ array.push({
+ name: "United Arab Emirates",
+ alpha_2: "AE",
+ alpha_3: "ARE",
+ un_code: 784
+ });
+ array.push({
+ name: "United Kingdom",
+ alpha_2: "GB",
+ alpha_3: "GBR",
+ un_code: 826
+ });
+ array.push({
+ name: "United States of America",
+ alpha_2: "US",
+ alpha_3: "USA",
+ un_code: 840
+ });
+ array.push({
+ name: "US Minor Outlying Islands",
+ alpha_2: "UM",
+ alpha_3: "UMI",
+ un_code: 581
+ });
+ array.push({
+ name: "Uruguay",
+ alpha_2: "UY",
+ alpha_3: "URY",
+ un_code: 858
+ });
+ array.push({
+ name: "Uzbekistan",
+ alpha_2: "UZ",
+ alpha_3: "UZB",
+ un_code: 860
+ });
+ array.push({
+ name: "Vanuatu",
+ alpha_2: "VU",
+ alpha_3: "VUT",
+ un_code: 548
+ });
+ array.push({
+ name: "Venezuela (Bolivarian Republic)",
+ alpha_2: "VE",
+ alpha_3: "VEN",
+ un_code: 862
+ });
+ array.push({
+ name: "Viet Nam",
+ alpha_2: "VN",
+ alpha_3: "VNM",
+ un_code: 704
+ });
+ array.push({
+ name: "Virgin Islands, US",
+ alpha_2: "VI",
+ alpha_3: "VIR",
+ un_code: 850
+ });
+ array.push({
+ name: "Wallis and Futuna Islands",
+ alpha_2: "WF",
+ alpha_3: "WLF",
+ un_code: 876
+ });
+ array.push({
+ name: "Western Sahara",
+ alpha_2: "EH",
+ alpha_3: "ESH",
+ un_code: 732
+ });
+ array.push({
+ name: "Yemen",
+ alpha_2: "YE",
+ alpha_3: "YEM",
+ un_code: 887
+ });
+ array.push({
+ name: "Zambia",
+ alpha_2: "ZM",
+ alpha_3: "ZMB",
+ un_code: 894
+ });
+ array.push({
+ name: "Zimbabwe",
+ alpha_2: "ZW",
+ alpha_3: "ZWE",
+ un_code: 716
+ });
+};
+
+export function country_name(alpha_code: string, fallback?: string) {
+ return (alpha_2_map[alpha_code.toUpperCase()] || {name: fallback || tr("unknown country")}).name;
+}
+
+fill_country_infos(country_infos);
+for(const country of country_infos)
+ alpha_2_map[country.alpha_2] = country;
diff --git a/shared/js/i18n/localize.ts b/shared/js/i18n/localize.ts
index 1e469c39..11ca2368 100644
--- a/shared/js/i18n/localize.ts
+++ b/shared/js/i18n/localize.ts
@@ -1,324 +1,317 @@
-function guid() {
- function s4() {
- return Math.floor((1 + Math.random()) * 0x10000)
- .toString(16)
- .substring(1);
- }
- return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
+import * as log from "tc-shared/log";
+import {LogCategory} from "tc-shared/log";
+import {guid} from "tc-shared/crypto/uid";
+import {StaticSettings} from "tc-shared/settings";
+import {createErrorModal} from "tc-shared/ui/elements/Modal";
+import * as loader from "tc-loader";
+import {formatMessage} from "tc-shared/ui/frames/chat";
+
+export interface TranslationKey {
+ message: string;
+ line?: number;
+ character?: number;
+ filename?: string;
}
-namespace i18n {
- export interface TranslationKey {
- message: string;
- line?: number;
- character?: number;
- filename?: string;
+export interface Translation {
+ key: TranslationKey;
+ translated: string;
+ flags?: string[];
+}
+
+export interface Contributor {
+ name: string;
+ email: string;
+}
+
+export interface TranslationFile {
+ path: string;
+ full_url: string;
+
+ translations: Translation[];
+}
+
+export interface RepositoryTranslation {
+ key: string;
+ path: string;
+
+ country_code: string;
+ name: string;
+ contributors: Contributor[];
+}
+
+export interface TranslationRepository {
+ unique_id: string;
+ url: string;
+ name?: string;
+ contact?: string;
+ translations?: RepositoryTranslation[];
+ load_timestamp?: number;
+}
+
+let translations: Translation[] = [];
+let fast_translate: { [key:string]:string; } = {};
+export function tr(message: string, key?: string) {
+ const sloppy = fast_translate[message];
+ if(sloppy) return sloppy;
+
+ log.info(LogCategory.I18N, "Translating \"%s\". Default: \"%s\"", key, message);
+
+ let translated = message;
+ for(const translation of translations) {
+ if(translation.key.message == message) {
+ translated = translation.translated;
+ break;
+ }
}
- export interface Translation {
- key: TranslationKey;
- translated: string;
- flags?: string[];
- }
+ fast_translate[message] = translated;
+ return translated;
+}
- export interface Contributor {
- name: string;
- email: string;
- }
+export function tra(message: string, ...args: any[]) {
+ message = tr(message);
+ return formatMessage(message, ...args);
+}
- export interface TranslationFile {
- path: string;
- full_url: string;
+async function load_translation_file(url: string, path: string) : Promise {
+ return new Promise((resolve, reject) => {
+ $.ajax({
+ url: url,
+ async: true,
+ success: result => {
+ try {
+ const file = (typeof(result) === "string" ? JSON.parse(result) : result) as TranslationFile;
+ if(!file) {
+ reject("Invalid json");
+ return;
+ }
- translations: Translation[];
- }
+ file.full_url = url;
+ file.path = path;
- export interface RepositoryTranslation {
- key: string;
- path: string;
-
- country_code: string;
- name: string;
- contributors: Contributor[];
- }
-
- export interface TranslationRepository {
- unique_id: string;
- url: string;
- name?: string;
- contact?: string;
- translations?: RepositoryTranslation[];
- load_timestamp?: number;
- }
-
- let translations: Translation[] = [];
- let fast_translate: { [key:string]:string; } = {};
- export function tr(message: string, key?: string) {
- const sloppy = fast_translate[message];
- if(sloppy) return sloppy;
-
- log.info(LogCategory.I18N, "Translating \"%s\". Default: \"%s\"", key, message);
-
- let translated = message;
- for(const translation of translations) {
- if(translation.key.message == message) {
- translated = translation.translated;
- break;
+ //TODO: Validate file
+ resolve(file);
+ } catch(error) {
+ log.warn(LogCategory.I18N, tr("Failed to load translation file %s. Failed to parse or process json: %o"), url, error);
+ reject(tr("Failed to process or parse json!"));
+ }
+ },
+ error: (xhr, error) => {
+ reject(tr("Failed to load file: ") + error);
}
+ })
+ });
+}
+
+export function load_file(url: string, path: string) : Promise {
+ return load_translation_file(url, path).then(async result => {
+ /* TODO: Improve this test?!*/
+ try {
+ tr("Dummy translation test");
+ } catch(error) {
+ throw "dummy test failed";
}
- fast_translate[message] = translated;
- return translated;
- }
+ log.info(LogCategory.I18N, tr("Successfully initialized up translation file from %s"), url);
+ translations = result.translations;
+ }).catch(error => {
+ log.warn(LogCategory.I18N, tr("Failed to load translation file from \"%s\". Error: %o"), url, error);
+ return Promise.reject(error);
+ });
+}
- export function tra(message: string, ...args: any[]) {
- message = tr(message);
- return MessageHelper.formatMessage(message, ...args);
- }
-
- async function load_translation_file(url: string, path: string) : Promise {
- return new Promise((resolve, reject) => {
+async function load_repository0(repo: TranslationRepository, reload: boolean) {
+ if(!repo.load_timestamp || repo.load_timestamp < 1000 || reload) {
+ const info_json = await new Promise((resolve, reject) => {
$.ajax({
- url: url,
+ url: repo.url + "/info.json",
async: true,
+ cache: !reload,
success: result => {
- try {
- const file = (typeof(result) === "string" ? JSON.parse(result) : result) as TranslationFile;
- if(!file) {
- reject("Invalid json");
- return;
- }
-
- file.full_url = url;
- file.path = path;
-
- //TODO: Validate file
- resolve(file);
- } catch(error) {
- log.warn(LogCategory.I18N, tr("Failed to load translation file %s. Failed to parse or process json: %o"), url, error);
- reject(tr("Failed to process or parse json!"));
+ const file = (typeof(result) === "string" ? JSON.parse(result) : result) as TranslationFile;
+ if(!file) {
+ reject("Invalid json");
+ return;
}
+
+ resolve(file);
},
error: (xhr, error) => {
reject(tr("Failed to load file: ") + error);
}
})
});
+
+ Object.assign(repo, info_json);
}
- export function load_file(url: string, path: string) : Promise {
- return load_translation_file(url, path).then(async result => {
- /* TODO: Improve this test?!*/
- try {
- tr("Dummy translation test");
- } catch(error) {
- throw "dummy test failed";
- }
+ if(!repo.unique_id)
+ repo.unique_id = guid();
- log.info(LogCategory.I18N, tr("Successfully initialized up translation file from %s"), url);
- translations = result.translations;
- }).catch(error => {
- log.warn(LogCategory.I18N, tr("Failed to load translation file from \"%s\". Error: %o"), url, error);
- return Promise.reject(error);
- });
+ repo.translations = repo.translations || [];
+ repo.load_timestamp = Date.now();
+}
+
+export async function load_repository(url: string) : Promise {
+ const result = {} as TranslationRepository;
+ result.url = url;
+ await load_repository0(result, false);
+ return result;
+}
+
+export namespace config {
+ export interface TranslationConfig {
+ current_repository_url?: string;
+ current_language?: string;
+
+ current_translation_url?: string;
+ current_translation_path?: string;
}
- async function load_repository0(repo: TranslationRepository, reload: boolean) {
- if(!repo.load_timestamp || repo.load_timestamp < 1000 || reload) {
- const info_json = await new Promise((resolve, reject) => {
- $.ajax({
- url: repo.url + "/info.json",
- async: true,
- cache: !reload,
- success: result => {
- const file = (typeof(result) === "string" ? JSON.parse(result) : result) as TranslationFile;
- if(!file) {
- reject("Invalid json");
- return;
- }
+ export interface RepositoryConfig {
+ repositories?: {
+ url?: string;
+ repository?: TranslationRepository;
+ }[];
+ }
- resolve(file);
- },
- error: (xhr, error) => {
- reject(tr("Failed to load file: ") + error);
- }
- })
+ const repository_config_key = "i18n.repository";
+ let _cached_repository_config: RepositoryConfig;
+ export function repository_config() {
+ if(_cached_repository_config)
+ return _cached_repository_config;
+
+ const config_string = localStorage.getItem(repository_config_key);
+ let config: RepositoryConfig;
+ try {
+ config = config_string ? JSON.parse(config_string) : {};
+ } catch(error) {
+ log.error(LogCategory.I18N, tr("Failed to parse repository config: %o"), error);
+ }
+ config.repositories = config.repositories || [];
+ for(const repo of config.repositories)
+ (repo.repository || {load_timestamp: 0}).load_timestamp = 0;
+
+ if(config.repositories.length == 0) {
+ //Add the default TeaSpeak repository
+ load_repository(StaticSettings.instance.static("i18n.default_repository", "https://web.teaspeak.de/i18n/")).then(repo => {
+ log.info(LogCategory.I18N, tr("Successfully added default repository from \"%s\"."), repo.url);
+ register_repository(repo);
+ }).catch(error => {
+ log.warn(LogCategory.I18N, tr("Failed to add default repository. Error: %o"), error);
});
-
- Object.assign(repo, info_json);
}
- if(!repo.unique_id)
- repo.unique_id = guid();
-
- repo.translations = repo.translations || [];
- repo.load_timestamp = Date.now();
+ return _cached_repository_config = config;
}
- export async function load_repository(url: string) : Promise {
- const result = {} as TranslationRepository;
- result.url = url;
- await load_repository0(result, false);
- return result;
+ export function save_repository_config() {
+ localStorage.setItem(repository_config_key, JSON.stringify(_cached_repository_config));
}
- export namespace config {
- export interface TranslationConfig {
- current_repository_url?: string;
- current_language?: string;
+ const translation_config_key = "i18n.translation";
+ let _cached_translation_config: TranslationConfig;
- current_translation_url?: string;
- current_translation_path?: string;
- }
-
- export interface RepositoryConfig {
- repositories?: {
- url?: string;
- repository?: TranslationRepository;
- }[];
- }
-
- const repository_config_key = "i18n.repository";
- let _cached_repository_config: RepositoryConfig;
- export function repository_config() {
- if(_cached_repository_config)
- return _cached_repository_config;
-
- const config_string = localStorage.getItem(repository_config_key);
- let config: RepositoryConfig;
- try {
- config = config_string ? JSON.parse(config_string) : {};
- } catch(error) {
- log.error(LogCategory.I18N, tr("Failed to parse repository config: %o"), error);
- }
- config.repositories = config.repositories || [];
- for(const repo of config.repositories)
- (repo.repository || {load_timestamp: 0}).load_timestamp = 0;
-
- if(config.repositories.length == 0) {
- //Add the default TeaSpeak repository
- load_repository(StaticSettings.instance.static("i18n.default_repository", "https://web.teaspeak.de/i18n/")).then(repo => {
- log.info(LogCategory.I18N, tr("Successfully added default repository from \"%s\"."), repo.url);
- register_repository(repo);
- }).catch(error => {
- log.warn(LogCategory.I18N, tr("Failed to add default repository. Error: %o"), error);
- });
- }
-
- return _cached_repository_config = config;
- }
-
- export function save_repository_config() {
- localStorage.setItem(repository_config_key, JSON.stringify(_cached_repository_config));
- }
-
- const translation_config_key = "i18n.translation";
- let _cached_translation_config: TranslationConfig;
-
- export function translation_config() : TranslationConfig {
- if(_cached_translation_config)
- return _cached_translation_config;
-
- const config_string = localStorage.getItem(translation_config_key);
- try {
- _cached_translation_config = config_string ? JSON.parse(config_string) : {};
- } catch(error) {
- log.error(LogCategory.I18N, tr("Failed to initialize translation config. Using default one. Error: %o"), error);
- _cached_translation_config = {} as any;
- }
+ export function translation_config() : TranslationConfig {
+ if(_cached_translation_config)
return _cached_translation_config;
+
+ const config_string = localStorage.getItem(translation_config_key);
+ try {
+ _cached_translation_config = config_string ? JSON.parse(config_string) : {};
+ } catch(error) {
+ log.error(LogCategory.I18N, tr("Failed to initialize translation config. Using default one. Error: %o"), error);
+ _cached_translation_config = {} as any;
}
-
- export function save_translation_config() {
- localStorage.setItem(translation_config_key, JSON.stringify(_cached_translation_config));
- }
+ return _cached_translation_config;
}
- export function register_repository(repository: TranslationRepository) {
- if(!repository) return;
-
- for(const repo of config.repository_config().repositories)
- if(repo.url == repository.url) return;
-
- config.repository_config().repositories.push(repository);
- config.save_repository_config();
- }
-
- export function registered_repositories() : TranslationRepository[] {
- return config.repository_config().repositories.map(e => e.repository || {url: e.url, load_timestamp: 0} as TranslationRepository);
- }
-
- export function delete_repository(repository: TranslationRepository) {
- if(!repository) return;
-
- for(const repo of [...config.repository_config().repositories])
- if(repo.url == repository.url) {
- config.repository_config().repositories.remove(repo);
- }
- config.save_repository_config();
- }
-
- export async function iterate_repositories(callback_entry: (repository: TranslationRepository) => any) {
- const promises = [];
-
- for(const repository of registered_repositories()) {
- promises.push(load_repository0(repository, false).then(() => callback_entry(repository)).catch(error => {
- log.warn(LogCategory.I18N, "Failed to fetch repository %s. error: %o", repository.url, error);
- }));
- }
-
- await Promise.all(promises);
- }
-
- export function select_translation(repository: TranslationRepository, entry: RepositoryTranslation) {
- const cfg = config.translation_config();
-
- if(entry && repository) {
- cfg.current_language = entry.name;
- cfg.current_repository_url = repository.url;
- cfg.current_translation_url = repository.url + entry.path;
- cfg.current_translation_path = entry.path;
- } else {
- cfg.current_language = undefined;
- cfg.current_repository_url = undefined;
- cfg.current_translation_url = undefined;
- cfg.current_translation_path = undefined;
- }
-
- config.save_translation_config();
- }
-
- /* ATTENTION: This method is called before most other library inizialisations! */
- export async function initialize() {
- const rcfg = config.repository_config(); /* initialize */
- const cfg = config.translation_config();
-
- if(cfg.current_translation_url) {
- try {
- await load_file(cfg.current_translation_url, cfg.current_translation_path);
- } catch (error) {
- console.error(tr("Failed to initialize selected translation: %o"), error);
- const show_error = () => {
- createErrorModal(tr("Translation System"), tra("Failed to load current selected translation file.{:br:}File: {0}{:br:}Error: {1}{:br:}{:br:}Using default fallback translations.", cfg.current_translation_url, error)).open()
- };
- if(loader.running())
- loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
- priority: 10,
- function: async () => show_error(),
- name: "I18N error display"
- });
- else
- show_error();
- }
- }
- // await load_file("http://localhost/home/TeaSpeak/TeaSpeak/Web-Client/web/environment/development/i18n/de_DE.translation");
- // await load_file("http://localhost/home/TeaSpeak/TeaSpeak/Web-Client/web/environment/development/i18n/test.json");
+ export function save_translation_config() {
+ localStorage.setItem(translation_config_key, JSON.stringify(_cached_translation_config));
}
}
-// @ts-ignore
-const tr: typeof i18n.tr = i18n.tr;
-const tra: typeof i18n.tra = i18n.tra;
+export function register_repository(repository: TranslationRepository) {
+ if(!repository) return;
-(window as any).tr = i18n.tr;
-(window as any).tra = i18n.tra;
\ No newline at end of file
+ for(const repo of config.repository_config().repositories)
+ if(repo.url == repository.url) return;
+
+ config.repository_config().repositories.push(repository);
+ config.save_repository_config();
+}
+
+export function registered_repositories() : TranslationRepository[] {
+ return config.repository_config().repositories.map(e => e.repository || {url: e.url, load_timestamp: 0} as TranslationRepository);
+}
+
+export function delete_repository(repository: TranslationRepository) {
+ if(!repository) return;
+
+ for(const repo of [...config.repository_config().repositories])
+ if(repo.url == repository.url) {
+ config.repository_config().repositories.remove(repo);
+ }
+ config.save_repository_config();
+}
+
+export async function iterate_repositories(callback_entry: (repository: TranslationRepository) => any) {
+ const promises = [];
+
+ for(const repository of registered_repositories()) {
+ promises.push(load_repository0(repository, false).then(() => callback_entry(repository)).catch(error => {
+ log.warn(LogCategory.I18N, "Failed to fetch repository %s. error: %o", repository.url, error);
+ }));
+ }
+
+ await Promise.all(promises);
+}
+
+export function select_translation(repository: TranslationRepository, entry: RepositoryTranslation) {
+ const cfg = config.translation_config();
+
+ if(entry && repository) {
+ cfg.current_language = entry.name;
+ cfg.current_repository_url = repository.url;
+ cfg.current_translation_url = repository.url + entry.path;
+ cfg.current_translation_path = entry.path;
+ } else {
+ cfg.current_language = undefined;
+ cfg.current_repository_url = undefined;
+ cfg.current_translation_url = undefined;
+ cfg.current_translation_path = undefined;
+ }
+
+ config.save_translation_config();
+}
+
+/* ATTENTION: This method is called before most other library initialisations! */
+export async function initialize() {
+ const rcfg = config.repository_config(); /* initialize */
+ const cfg = config.translation_config();
+
+ if(cfg.current_translation_url) {
+ try {
+ await load_file(cfg.current_translation_url, cfg.current_translation_path);
+ } catch (error) {
+ console.error(tr("Failed to initialize selected translation: %o"), error);
+ const show_error = () => {
+ createErrorModal(tr("Translation System"), tra("Failed to load current selected translation file.{:br:}File: {0}{:br:}Error: {1}{:br:}{:br:}Using default fallback translations.", cfg.current_translation_url, error)).open()
+ };
+ if(loader.running())
+ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
+ priority: 10,
+ function: async () => show_error(),
+ name: "I18N error display"
+ });
+ else
+ show_error();
+ }
+ }
+ // await load_file("http://localhost/home/TeaSpeak/TeaSpeak/Web-Client/web/environment/development/i18n/de_DE.translation");
+ // await load_file("http://localhost/home/TeaSpeak/TeaSpeak/Web-Client/web/environment/development/i18n/test.json");
+}
+
+window.tr = tr;
+window.tra = tra;
\ No newline at end of file
diff --git a/shared/js/log.ts b/shared/js/log.ts
index 4ea9d119..21c4768a 100644
--- a/shared/js/log.ts
+++ b/shared/js/log.ts
@@ -1,6 +1,8 @@
//Used by CertAccept popup
+import {settings} from "tc-shared/settings";
+import * as loader from "tc-loader";
-enum LogCategory {
+export enum LogCategory {
CHANNEL,
CHANNEL_PROPERTIES, /* separating channel and channel properties because on channel init logging is a big bottleneck */
CLIENT,
@@ -19,233 +21,238 @@ enum LogCategory {
DNS
}
-namespace log {
- export enum LogType {
- TRACE,
- DEBUG,
- INFO,
- WARNING,
- ERROR
+export enum LogType {
+ TRACE,
+ DEBUG,
+ INFO,
+ WARNING,
+ ERROR
+}
+
+let category_mapping = new Map([
+ [LogCategory.CHANNEL, "Channel "],
+ [LogCategory.CHANNEL_PROPERTIES, "Channel "],
+ [LogCategory.CLIENT, "Client "],
+ [LogCategory.SERVER, "Server "],
+ [LogCategory.BOOKMARKS, "Bookmark "],
+ [LogCategory.PERMISSIONS, "Permission "],
+ [LogCategory.GENERAL, "General "],
+ [LogCategory.NETWORKING, "Network "],
+ [LogCategory.VOICE, "Voice "],
+ [LogCategory.AUDIO, "Audio "],
+ [LogCategory.CHANNEL, "Chat "],
+ [LogCategory.I18N, "I18N "],
+ [LogCategory.IDENTITIES, "Identities "],
+ [LogCategory.IPC, "IPC "],
+ [LogCategory.STATISTICS, "Statistics "],
+ [LogCategory.DNS, "DNS "]
+]);
+
+export let enabled_mapping = new Map([
+ [LogCategory.CHANNEL, true],
+ [LogCategory.CHANNEL_PROPERTIES, false],
+ [LogCategory.CLIENT, true],
+ [LogCategory.SERVER, true],
+ [LogCategory.BOOKMARKS, true],
+ [LogCategory.PERMISSIONS, true],
+ [LogCategory.GENERAL, true],
+ [LogCategory.NETWORKING, true],
+ [LogCategory.VOICE, true],
+ [LogCategory.AUDIO, true],
+ [LogCategory.CHAT, true],
+ [LogCategory.I18N, false],
+ [LogCategory.IDENTITIES, true],
+ [LogCategory.IPC, true],
+ [LogCategory.STATISTICS, true],
+ [LogCategory.DNS, true]
+]);
+
+//Values will be overridden by initialize()
+export let level_mapping = new Map([
+ [LogType.TRACE, true],
+ [LogType.DEBUG, true],
+ [LogType.INFO, true],
+ [LogType.WARNING, true],
+ [LogType.ERROR, true]
+]);
+
+enum GroupMode {
+ NATIVE,
+ PREFIX
+}
+const group_mode: GroupMode = GroupMode.PREFIX;
+
+//Category Example: ?log.i18n.enabled=0
+//Level Example A: ?log.level.trace.enabled=0
+//Level Example B: ?log.level=0
+export function initialize(default_level: LogType) {
+ for(const category of Object.keys(LogCategory).map(e => parseInt(e))) {
+ if(isNaN(category)) continue;
+ const category_name = LogCategory[category].toLowerCase();
+ enabled_mapping.set(category, settings.static_global("log." + category_name.toLowerCase() + ".enabled", enabled_mapping.get(category)));
}
- let category_mapping = new Map([
- [LogCategory.CHANNEL, "Channel "],
- [LogCategory.CHANNEL_PROPERTIES, "Channel "],
- [LogCategory.CLIENT, "Client "],
- [LogCategory.SERVER, "Server "],
- [LogCategory.BOOKMARKS, "Bookmark "],
- [LogCategory.PERMISSIONS, "Permission "],
- [LogCategory.GENERAL, "General "],
- [LogCategory.NETWORKING, "Network "],
- [LogCategory.VOICE, "Voice "],
- [LogCategory.AUDIO, "Audio "],
- [LogCategory.CHANNEL, "Chat "],
- [LogCategory.I18N, "I18N "],
- [LogCategory.IDENTITIES, "Identities "],
- [LogCategory.IPC, "IPC "],
- [LogCategory.STATISTICS, "Statistics "],
- [LogCategory.DNS, "DNS "]
- ]);
+ const base_level = settings.static_global("log.level", default_level);
- export let enabled_mapping = new Map([
- [LogCategory.CHANNEL, true],
- [LogCategory.CHANNEL_PROPERTIES, false],
- [LogCategory.CLIENT, true],
- [LogCategory.SERVER, true],
- [LogCategory.BOOKMARKS, true],
- [LogCategory.PERMISSIONS, true],
- [LogCategory.GENERAL, true],
- [LogCategory.NETWORKING, true],
- [LogCategory.VOICE, true],
- [LogCategory.AUDIO, true],
- [LogCategory.CHAT, true],
- [LogCategory.I18N, false],
- [LogCategory.IDENTITIES, true],
- [LogCategory.IPC, true],
- [LogCategory.STATISTICS, true],
- [LogCategory.DNS, true]
- ]);
+ for(const level of Object.keys(LogType).map(e => parseInt(e))) {
+ if(isNaN(level)) continue;
- //Values will be overridden by initialize()
- export let level_mapping = new Map([
- [LogType.TRACE, true],
- [LogType.DEBUG, true],
- [LogType.INFO, true],
- [LogType.WARNING, true],
- [LogType.ERROR, true]
- ]);
-
- enum GroupMode {
- NATIVE,
- PREFIX
- }
- const group_mode: GroupMode = GroupMode.PREFIX;
-
- //Category Example: ?log.i18n.enabled=0
- //Level Example A: ?log.level.trace.enabled=0
- //Level Example B: ?log.level=0
- export function initialize(default_level: LogType) {
- for(const category of Object.keys(LogCategory).map(e => parseInt(e))) {
- if(isNaN(category)) continue;
- const category_name = LogCategory[category].toLowerCase();
- enabled_mapping.set(category, settings.static_global("log." + category_name.toLowerCase() + ".enabled", enabled_mapping.get(category)));
- }
-
- const base_level = settings.static_global("log.level", default_level);
-
- for(const level of Object.keys(LogType).map(e => parseInt(e))) {
- if(isNaN(level)) continue;
-
- const level_name = LogType[level].toLowerCase();
- level_mapping.set(level, settings.static_global("log." + level_name + ".enabled", level >= base_level));
- }
- }
-
- function logDirect(type: LogType, message: string, ...optionalParams: any[]) {
- if(!level_mapping.get(type))
- return;
-
- switch (type) {
- case LogType.TRACE:
- case LogType.DEBUG:
- console.debug(message, ...optionalParams);
- break;
- case LogType.INFO:
- console.log(message, ...optionalParams);
- break;
- case LogType.WARNING:
- console.warn(message, ...optionalParams);
- break;
- case LogType.ERROR:
- console.error(message, ...optionalParams);
- break;
- }
- }
-
- export function log(type: LogType, category: LogCategory, message: string, ...optionalParams: any[]) {
- if(!enabled_mapping.get(category)) return;
-
- optionalParams.unshift(category_mapping.get(category));
- message = "[%s] " + message;
- logDirect(type, message, ...optionalParams);
- }
-
- export function trace(category: LogCategory, message: string, ...optionalParams: any[]) {
- log(LogType.TRACE, category, message, ...optionalParams);
- }
-
- export function debug(category: LogCategory, message: string, ...optionalParams: any[]) {
- log(LogType.DEBUG, category, message, ...optionalParams);
- }
-
- export function info(category: LogCategory, message: string, ...optionalParams: any[]) {
- log(LogType.INFO, category, message, ...optionalParams);
- }
-
- export function warn(category: LogCategory, message: string, ...optionalParams: any[]) {
- log(LogType.WARNING, category, message, ...optionalParams);
- }
-
- export function error(category: LogCategory, message: string, ...optionalParams: any[]) {
- log(LogType.ERROR, category, message, ...optionalParams);
- }
-
- export function group(level: LogType, category: LogCategory, name: string, ...optionalParams: any[]) : Group {
- name = "[%s] " + name;
- optionalParams.unshift(category_mapping.get(category));
-
- return new Group(group_mode, level, category, name, optionalParams);
- }
-
- export function table(level: LogType, category: LogCategory, title: string, arguments: any) {
- if(group_mode == GroupMode.NATIVE) {
- console.groupCollapsed(title);
- console.table(arguments);
- console.groupEnd();
- } else {
- if(!enabled_mapping.get(category) || !level_mapping.get(level))
- return;
- logDirect(level, tr("Snipped table \"%s\""), title);
- }
- }
-
- export class Group {
- readonly mode: GroupMode;
- readonly level: LogType;
- readonly category: LogCategory;
- readonly enabled: boolean;
-
- owner: Group = undefined;
-
- private readonly name: string;
- private readonly optionalParams: any[][];
- private _collapsed: boolean = false;
- private initialized = false;
- private _log_prefix: string;
-
- constructor(mode: GroupMode, level: LogType, category: LogCategory, name: string, optionalParams: any[][], owner: Group = undefined) {
- this.level = level;
- this.mode = mode;
- this.category = category;
- this.name = name;
- this.optionalParams = optionalParams;
- this.enabled = enabled_mapping.get(category);
- }
-
- group(level: LogType, name: string, ...optionalParams: any[]) : Group {
- return new Group(this.mode, level, this.category, name, optionalParams, this);
- }
-
- collapsed(flag: boolean = true) : this {
- this._collapsed = flag;
- return this;
- }
-
- log(message: string, ...optionalParams: any[]) : this {
- if(!this.enabled)
- return this;
-
- if(!this.initialized) {
- if(this.mode == GroupMode.NATIVE) {
- if(this._collapsed && console.groupCollapsed)
- console.groupCollapsed(this.name, ...this.optionalParams);
- else
- console.group(this.name, ...this.optionalParams);
- } else {
- this._log_prefix = " ";
- let parent = this.owner;
- while(parent) {
- if(parent.mode == GroupMode.PREFIX)
- this._log_prefix = this._log_prefix + parent._log_prefix;
- else
- break;
- }
- }
- this.initialized = true;
- }
- if(this.mode == GroupMode.NATIVE)
- logDirect(this.level, message, ...optionalParams);
- else {
- logDirect(this.level, "[%s] " + this._log_prefix + message, category_mapping.get(this.category), ...optionalParams);
- }
- return this;
- }
-
- end() {
- if(this.initialized) {
- if(this.mode == GroupMode.NATIVE)
- console.groupEnd();
- }
- }
-
- get prefix() : string {
- return this._log_prefix;
- }
-
- set prefix(prefix: string) {
- this._log_prefix = prefix;
- }
+ const level_name = LogType[level].toLowerCase();
+ level_mapping.set(level, settings.static_global("log." + level_name + ".enabled", level >= base_level));
}
}
-import LogType = log.LogType;
\ No newline at end of file
+function logDirect(type: LogType, message: string, ...optionalParams: any[]) {
+ if(!level_mapping.get(type))
+ return;
+
+ switch (type) {
+ case LogType.TRACE:
+ case LogType.DEBUG:
+ console.debug(message, ...optionalParams);
+ break;
+ case LogType.INFO:
+ console.log(message, ...optionalParams);
+ break;
+ case LogType.WARNING:
+ console.warn(message, ...optionalParams);
+ break;
+ case LogType.ERROR:
+ console.error(message, ...optionalParams);
+ break;
+ }
+}
+
+export function log(type: LogType, category: LogCategory, message: string, ...optionalParams: any[]) {
+ if(!enabled_mapping.get(category)) return;
+
+ optionalParams.unshift(category_mapping.get(category));
+ message = "[%s] " + message;
+ logDirect(type, message, ...optionalParams);
+}
+
+export function trace(category: LogCategory, message: string, ...optionalParams: any[]) {
+ log(LogType.TRACE, category, message, ...optionalParams);
+}
+
+export function debug(category: LogCategory, message: string, ...optionalParams: any[]) {
+ log(LogType.DEBUG, category, message, ...optionalParams);
+}
+
+export function info(category: LogCategory, message: string, ...optionalParams: any[]) {
+ log(LogType.INFO, category, message, ...optionalParams);
+}
+
+export function warn(category: LogCategory, message: string, ...optionalParams: any[]) {
+ log(LogType.WARNING, category, message, ...optionalParams);
+}
+
+export function error(category: LogCategory, message: string, ...optionalParams: any[]) {
+ log(LogType.ERROR, category, message, ...optionalParams);
+}
+
+export function group(level: LogType, category: LogCategory, name: string, ...optionalParams: any[]) : Group {
+ name = "[%s] " + name;
+ optionalParams.unshift(category_mapping.get(category));
+
+ return new Group(group_mode, level, category, name, optionalParams);
+}
+
+export function table(level: LogType, category: LogCategory, title: string, args: any) {
+ if(group_mode == GroupMode.NATIVE) {
+ console.groupCollapsed(title);
+ console.table(args);
+ console.groupEnd();
+ } else {
+ if(!enabled_mapping.get(category) || !level_mapping.get(level))
+ return;
+ logDirect(level, tr("Snipped table \"%s\""), title);
+ }
+}
+
+export class Group {
+ readonly mode: GroupMode;
+ readonly level: LogType;
+ readonly category: LogCategory;
+ readonly enabled: boolean;
+
+ owner: Group = undefined;
+
+ private readonly name: string;
+ private readonly optionalParams: any[][];
+ private _collapsed: boolean = false;
+ private initialized = false;
+ private _log_prefix: string;
+
+ constructor(mode: GroupMode, level: LogType, category: LogCategory, name: string, optionalParams: any[][], owner: Group = undefined) {
+ this.level = level;
+ this.mode = mode;
+ this.category = category;
+ this.name = name;
+ this.optionalParams = optionalParams;
+ this.enabled = enabled_mapping.get(category);
+ }
+
+ group(level: LogType, name: string, ...optionalParams: any[]) : Group {
+ return new Group(this.mode, level, this.category, name, optionalParams, this);
+ }
+
+ collapsed(flag: boolean = true) : this {
+ this._collapsed = flag;
+ return this;
+ }
+
+ log(message: string, ...optionalParams: any[]) : this {
+ if(!this.enabled)
+ return this;
+
+ if(!this.initialized) {
+ if(this.mode == GroupMode.NATIVE) {
+ if(this._collapsed && console.groupCollapsed)
+ console.groupCollapsed(this.name, ...this.optionalParams);
+ else
+ console.group(this.name, ...this.optionalParams);
+ } else {
+ this._log_prefix = " ";
+ let parent = this.owner;
+ while(parent) {
+ if(parent.mode == GroupMode.PREFIX)
+ this._log_prefix = this._log_prefix + parent._log_prefix;
+ else
+ break;
+ }
+ }
+ this.initialized = true;
+ }
+ if(this.mode == GroupMode.NATIVE)
+ logDirect(this.level, message, ...optionalParams);
+ else {
+ logDirect(this.level, "[%s] " + this._log_prefix + message, category_mapping.get(this.category), ...optionalParams);
+ }
+ return this;
+ }
+
+ end() {
+ if(this.initialized) {
+ if(this.mode == GroupMode.NATIVE)
+ console.groupEnd();
+ }
+ }
+
+ get prefix() : string {
+ return this._log_prefix;
+ }
+
+ set prefix(prefix: string) {
+ this._log_prefix = prefix;
+ }
+}
+
+loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
+ name: "log enabled initialisation",
+ function: async () => initialize(loader.version().debug_mode ? LogType.TRACE : LogType.INFO),
+ priority: 150
+});
+
+/* initialize global logging system, use by the loader for example */
+window.log = module.exports;
\ No newline at end of file
diff --git a/shared/js/main.ts b/shared/js/main.ts
index f2e910bc..2c0b1121 100644
--- a/shared/js/main.ts
+++ b/shared/js/main.ts
@@ -1,31 +1,41 @@
-/// {
- if('mediaDevices' in navigator && 'getUserMedia' in navigator.mediaDevices)
- return constraints => navigator.mediaDevices.getUserMedia(constraints);
-
- const _callbacked_function = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
- if(!_callbacked_function)
- return undefined;
-
- return constraints => new Promise((resolve, reject) => _callbacked_function(constraints, resolve, reject));
-}
-
-interface Window {
- open_connected_question: () => Promise;
+declare global {
+ interface Window {
+ open_connected_question: () => Promise;
+ }
}
function setup_close() {
@@ -50,7 +60,7 @@ function setup_close() {
}));
const exit = () => {
- const {remote} = require('electron');
+ const {remote} = window.require('electron');
remote.getCurrentWindow().close();
};
@@ -133,7 +143,7 @@ async function initialize_app() {
try { //Initialize main template
const main = $("#tmpl_main").renderTag({
multi_session: !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION),
- app_version: app.ui_version()
+ app_version: loader.version().ui
}).dividerfy();
$("body").append(main);
@@ -143,21 +153,21 @@ async function initialize_app() {
return;
}
- control_bar = new ControlBar($("#control_bar")); /* setup the control bar */
+ control_bar.set_control_bar(new control_bar.ControlBar($("#control_bar"))); /* setup the control bar */
- if(!audio.player.initialize())
+ if(!aplayer.initialize())
console.warn(tr("Failed to initialize audio controller!"));
- audio.player.on_ready(() => {
- if(audio.player.set_master_volume)
- audio.player.on_ready(() => audio.player.set_master_volume(settings.global(Settings.KEY_SOUND_MASTER) / 100));
+ aplayer.on_ready(() => {
+ if(aplayer.set_master_volume)
+ aplayer.on_ready(() => aplayer.set_master_volume(settings.global(Settings.KEY_SOUND_MASTER) / 100));
else
- log.warn(LogCategory.GENERAL, tr("Client does not support audio.player.set_master_volume()... May client is too old?"));
- if(audio.recorder.device_refresh_available())
- audio.recorder.refresh_devices();
+ log.warn(LogCategory.GENERAL, tr("Client does not support aplayer.set_master_volume()... May client is too old?"));
+ if(arecorder.device_refresh_available())
+ arecorder.refresh_devices();
});
- default_recorder = new RecorderProfile("default");
+ set_default_recorder(new RecorderProfile("default"));
default_recorder.initialize().catch(error => {
log.error(LogCategory.AUDIO, tr("Failed to initialize default recorder: %o"), error);
});
@@ -180,78 +190,6 @@ async function initialize_app() {
setup_close();
}
-function str2ab8(str) {
- const buf = new ArrayBuffer(str.length);
- const bufView = new Uint8Array(buf);
- for (let i = 0, strLen = str.length; i < strLen; i++) {
- bufView[i] = str.charCodeAt(i);
- }
- return buf;
-}
-
-/* FIXME Dont use atob, because it sucks for non UTF-8 tings */
-function arrayBufferBase64(base64: string) {
- base64 = atob(base64);
- const buf = new ArrayBuffer(base64.length);
- const bufView = new Uint8Array(buf);
- for (let i = 0, strLen = base64.length; i < strLen; i++) {
- bufView[i] = base64.charCodeAt(i);
- }
- return buf;
-}
-
-function base64_encode_ab(source: ArrayBufferLike) {
- const encodings = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
- let base64 = "";
-
- const bytes = new Uint8Array(source);
- const byte_length = bytes.byteLength;
- const byte_reminder = byte_length % 3;
- const main_length = byte_length - byte_reminder;
-
- let a, b, c, d;
- let chunk;
-
- // Main loop deals with bytes in chunks of 3
- for (let i = 0; i < main_length; i = i + 3) {
- // Combine the three bytes into a single integer
- chunk = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
-
- // Use bitmasks to extract 6-bit segments from the triplet
- a = (chunk & 16515072) >> 18; // 16515072 = (2^6 - 1) << 18
- b = (chunk & 258048) >> 12; // 258048 = (2^6 - 1) << 12
- c = (chunk & 4032) >> 6; // 4032 = (2^6 - 1) << 6
- d = (chunk & 63) >> 0; // 63 = (2^6 - 1) << 0
-
- // Convert the raw binary segments to the appropriate ASCII encoding
- base64 += encodings[a] + encodings[b] + encodings[c] + encodings[d];
- }
-
- // Deal with the remaining bytes and padding
- if (byte_reminder == 1) {
- chunk = bytes[main_length];
-
- a = (chunk & 252) >> 2; // 252 = (2^6 - 1) << 2
-
- // Set the 4 least significant bits to zero
- b = (chunk & 3) << 4; // 3 = 2^2 - 1
-
- base64 += encodings[a] + encodings[b] + '==';
- } else if (byte_reminder == 2) {
- chunk = (bytes[main_length] << 8) | bytes[main_length + 1];
-
- a = (chunk & 64512) >> 10; // 64512 = (2^6 - 1) << 10
- b = (chunk & 1008) >> 4; // 1008 = (2^6 - 1) << 4
-
- // Set the 2 least significant bits to zero
- c = (chunk & 15) << 2; // 15 = 2^4 - 1
-
- base64 += encodings[a] + encodings[b] + encodings[c] + '=';
- }
-
- return base64
-}
-
/*
class TestProxy extends bipc.MethodProxy {
constructor(params: bipc.MethodProxyConnectParameters) {
@@ -313,7 +251,7 @@ function handle_connect_request(properties: bipc.connect.ConnectRequestData, con
});
server_connections.set_active_connection_handler(connection);
} else {
- Modals.spawnConnectModal({},{
+ spawnConnectModal({},{
url: properties.address,
enforce: true
}, {
@@ -356,14 +294,14 @@ function main() {
top_menu.initialize();
- server_connections = new ServerConnectionManager($("#connection-handlers"));
- control_bar.initialise(); /* before connection handler to allow property apply */
+ cmanager.initialize(new ServerConnectionManager($("#connection-handlers")));
+ control_bar.control_bar.initialise(); /* before connection handler to allow property apply */
const initial_handler = server_connections.spawn_server_connection_handler();
initial_handler.acquire_recorder(default_recorder, false);
- control_bar.set_connection_handler(initial_handler);
+ control_bar.control_bar.set_connection_handler(initial_handler);
/** Setup the XF forum identity **/
- profiles.identities.update_forum();
+ fidentity.update_forum();
let _resize_timeout: NodeJS.Timer;
$(window).on('resize', event => {
@@ -481,7 +419,7 @@ function main() {
/* for testing */
if(settings.static_global(Settings.KEY_USER_IS_NEW)) {
- const modal = Modals.openModalNewcomer();
+ const modal = openModalNewcomer();
modal.close_listener.push(() => settings.changeGlobal(Settings.KEY_USER_IS_NEW, false));
}
}
@@ -492,12 +430,12 @@ const task_teaweb_starter: loader.Task = {
try {
await initialize_app();
main();
- if(!audio.player.initialized()) {
+ if(!aplayer.initialized()) {
log.info(LogCategory.VOICE, tr("Initialize audio controller later!"));
- if(!audio.player.initializeFromGesture) {
- console.error(tr("Missing audio.player.initializeFromGesture"));
+ if(!aplayer.initializeFromGesture) {
+ console.error(tr("Missing aplayer.initializeFromGesture"));
} else
- $(document).one('click', event => audio.player.initializeFromGesture());
+ $(document).one('click', event => aplayer.initializeFromGesture());
}
} catch (ex) {
console.error(ex.stack);
@@ -543,7 +481,7 @@ const task_connect_handler: loader.Task = {
"You could now close this page.";
createInfoModal(
tr("Connecting successfully within other instance"),
- MessageHelper.formatMessage(tr(message), connect_data.address),
+ formatMessage(tr(message), connect_data.address),
{
closeable: false,
footer: undefined
@@ -610,7 +548,7 @@ const task_certificate_callback: loader.Task = {
"This page will close in {0} seconds.";
createInfoModal(
tr("Certificate acccepted successfully"),
- MessageHelper.formatMessage(tr(message), seconds_tag),
+ formatMessage(tr(message), seconds_tag),
{
closeable: false,
footer: undefined
@@ -650,7 +588,7 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
try {
await initialize();
- if(app.is_web()) {
+ if(loader.version().type == "web") {
loader.register_task(loader.Stage.LOADED, task_certificate_callback);
} else {
loader.register_task(loader.Stage.LOADED, task_teaweb_starter);
@@ -667,3 +605,15 @@ loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
priority: 1000
});
+loader.register_task(loader.Stage.LOADED, {
+ name: "error task",
+ function: async () => {
+ if(Settings.instance.static(Settings.KEY_LOAD_DUMMY_ERROR, false)) {
+ loader.critical_error("The tea is cold!", "Argh, this is evil! Cold tea dosn't taste good.");
+ throw "The tea is cold!";
+ }
+ },
+ priority: 20
+});
+
+export = {};
\ No newline at end of file
diff --git a/shared/js/permission/GroupManager.ts b/shared/js/permission/GroupManager.ts
index c781f468..2c27181f 100644
--- a/shared/js/permission/GroupManager.ts
+++ b/shared/js/permission/GroupManager.ts
@@ -1,17 +1,24 @@
-/// ;
}
-class Group {
+export class Group {
properties: GroupProperties = new GroupProperties();
readonly handle: GroupManager;
@@ -63,7 +70,7 @@ class Group {
}
}
-class GroupManager extends connection.AbstractCommandHandler {
+export class GroupManager extends AbstractCommandHandler {
readonly handle: ConnectionHandler;
serverGroups: Group[] = [];
@@ -83,7 +90,7 @@ class GroupManager extends connection.AbstractCommandHandler {
this.channelGroups = undefined;
}
- handle_command(command: connection.ServerCommand): boolean {
+ handle_command(command: ServerCommand): boolean {
switch (command.command) {
case "notifyservergrouplist":
case "notifychannelgrouplist":
@@ -160,7 +167,7 @@ class GroupManager extends connection.AbstractCommandHandler {
}
let group = new Group(this,parseInt(target == GroupTarget.SERVER ? groupData["sgid"] : groupData["cgid"]), target, type, groupData["name"]);
- for(let key in groupData as any) {
+ for(let key in Object.keys(groupData)) {
if(key == "sgid") continue;
if(key == "cgid") continue;
if(key == "type") continue;
diff --git a/shared/js/permission/PermissionManager.ts b/shared/js/permission/PermissionManager.ts
index 9b558d1c..2942df71 100644
--- a/shared/js/permission/PermissionManager.ts
+++ b/shared/js/permission/PermissionManager.ts
@@ -1,358 +1,13 @@
-/// ;
+};
+
+export namespace find {
+ export type Entry = {
+ type: "server" | "channel" | "client" | "client_channel" | "channel_group" | "server_group";
+ value: number;
+ id: number;
}
- export type PermissionRequest = PermissionRequestKeys & {
- timeout_id: any;
- promise: LaterPromise;
- };
+ export type Client = Entry & {
+ type: "client",
- export namespace find {
- export type Entry = {
- type: "server" | "channel" | "client" | "client_channel" | "channel_group" | "server_group";
- value: number;
- id: number;
- }
+ client_id: number;
+ }
- export type Client = Entry & {
- type: "client",
+ export type Channel = Entry & {
+ type: "channel",
- client_id: number;
- }
+ channel_id: number;
+ }
- export type Channel = Entry & {
- type: "channel",
+ export type Server = Entry & {
+ type: "server"
+ }
- channel_id: number;
- }
+ export type ClientChannel = Entry & {
+ type: "client_channel",
- export type Server = Entry & {
- type: "server"
- }
+ client_id: number;
+ channel_id: number;
+ }
- export type ClientChannel = Entry & {
- type: "client_channel",
+ export type ChannelGroup = Entry & {
+ type: "channel_group",
- client_id: number;
- channel_id: number;
- }
+ group_id: number;
+ }
- export type ChannelGroup = Entry & {
- type: "channel_group",
+ export type ServerGroup = Entry & {
+ type: "server_group",
- group_id: number;
- }
-
- export type ServerGroup = Entry & {
- type: "server_group",
-
- group_id: number;
- }
+ group_id: number;
}
}
-type RequestLists =
+export type RequestLists =
"requests_channel_permissions" |
"requests_client_permissions" |
"requests_client_channel_permissions" |
"requests_playlist_permissions" |
"requests_playlist_client_permissions";
-class PermissionManager extends connection.AbstractCommandHandler {
+
+export class PermissionManager extends AbstractCommandHandler {
readonly handle: ConnectionHandler;
permissionList: PermissionInfo[] = [];
@@ -488,11 +142,11 @@ class PermissionManager extends connection.AbstractCommandHandler {
needed_permission_change_listener: {[permission: string]:(() => any)[]} = {};
- requests_channel_permissions: permissions.PermissionRequest[] = [];
- requests_client_permissions: permissions.PermissionRequest[] = [];
- requests_client_channel_permissions: permissions.PermissionRequest[] = [];
- requests_playlist_permissions: permissions.PermissionRequest[] = [];
- requests_playlist_client_permissions: permissions.PermissionRequest[] = [];
+ requests_channel_permissions: PermissionRequest[] = [];
+ requests_client_permissions: PermissionRequest[] = [];
+ requests_client_channel_permissions: PermissionRequest[] = [];
+ requests_playlist_permissions: PermissionRequest[] = [];
+ requests_playlist_client_permissions: PermissionRequest[] = [];
requests_permfind: {
timeout_id: number,
@@ -603,7 +257,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
this._cacheNeededPermissions = undefined;
}
- handle_command(command: connection.ServerCommand): boolean {
+ handle_command(command: ServerCommand): boolean {
switch (command.command) {
case "notifyclientneededpermissions":
this.onNeededPermissions(command.arguments);
@@ -775,7 +429,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}, "success", PermissionManager.parse_permission_bulk(json, this.handle.permissions));
}
- private execute_channel_permission_request(request: permissions.PermissionRequestKeys) {
+ private execute_channel_permission_request(request: PermissionRequestKeys) {
this.handle.serverConnection.send_command("channelpermlist", {"cid": request.channel_id}).catch(error => {
if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT)
this.fullfill_permission_request("requests_channel_permissions", request, "success", []);
@@ -785,7 +439,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
requestChannelPermissions(channelId: number) : Promise {
- const keys: permissions.PermissionRequestKeys = {
+ const keys: PermissionRequestKeys = {
channel_id: channelId
};
return this.execute_permission_request("requests_channel_permissions", keys, this.execute_channel_permission_request.bind(this));
@@ -799,7 +453,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}, "success", PermissionManager.parse_permission_bulk(json, this.handle.permissions));
}
- private execute_client_permission_request(request: permissions.PermissionRequestKeys) {
+ private execute_client_permission_request(request: PermissionRequestKeys) {
this.handle.serverConnection.send_command("clientpermlist", {cldbid: request.client_id}).catch(error => {
if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT)
this.fullfill_permission_request("requests_client_permissions", request, "success", []);
@@ -809,7 +463,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
requestClientPermissions(client_id: number) : Promise {
- const keys: permissions.PermissionRequestKeys = {
+ const keys: PermissionRequestKeys = {
client_id: client_id
};
return this.execute_permission_request("requests_client_permissions", keys, this.execute_client_permission_request.bind(this));
@@ -826,7 +480,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}, "success", PermissionManager.parse_permission_bulk(json, this.handle.permissions));
}
- private execute_client_channel_permission_request(request: permissions.PermissionRequestKeys) {
+ private execute_client_channel_permission_request(request: PermissionRequestKeys) {
this.handle.serverConnection.send_command("channelclientpermlist", {cldbid: request.client_id, cid: request.channel_id})
.catch(error => {
if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT)
@@ -837,7 +491,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
requestClientChannelPermissions(client_id: number, channel_id: number) : Promise {
- const keys: permissions.PermissionRequestKeys = {
+ const keys: PermissionRequestKeys = {
client_id: client_id
};
return this.execute_permission_request("requests_client_channel_permissions", keys, this.execute_client_channel_permission_request.bind(this));
@@ -852,7 +506,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}, "success", PermissionManager.parse_permission_bulk(json, this.handle.permissions));
}
- private execute_playlist_permission_request(request: permissions.PermissionRequestKeys) {
+ private execute_playlist_permission_request(request: PermissionRequestKeys) {
this.handle.serverConnection.send_command("playlistpermlist", {playlist_id: request.playlist_id})
.catch(error => {
if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT)
@@ -863,7 +517,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
requestPlaylistPermissions(playlist_id: number) : Promise {
- const keys: permissions.PermissionRequestKeys = {
+ const keys: PermissionRequestKeys = {
playlist_id: playlist_id
};
return this.execute_permission_request("requests_playlist_permissions", keys, this.execute_playlist_permission_request.bind(this));
@@ -880,7 +534,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}, "success", PermissionManager.parse_permission_bulk(json, this.handle.permissions));
}
- private execute_playlist_client_permission_request(request: permissions.PermissionRequestKeys) {
+ private execute_playlist_client_permission_request(request: PermissionRequestKeys) {
this.handle.serverConnection.send_command("playlistclientpermlist", {playlist_id: request.playlist_id, cldbid: request.client_id})
.catch(error => {
if(error instanceof CommandResult && error.id == ErrorID.EMPTY_RESULT)
@@ -891,7 +545,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
requestPlaylistClientPermissions(playlist_id: number, client_database_id: number) : Promise {
- const keys: permissions.PermissionRequestKeys = {
+ const keys: PermissionRequestKeys = {
playlist_id: playlist_id,
client_id: client_database_id
};
@@ -907,8 +561,8 @@ class PermissionManager extends connection.AbstractCommandHandler {
};
private execute_permission_request(list: RequestLists,
- criteria: permissions.PermissionRequestKeys,
- execute: (criteria: permissions.PermissionRequestKeys) => any) : Promise {
+ criteria: PermissionRequestKeys,
+ execute: (criteria: PermissionRequestKeys) => any) : Promise {
for(const request of this[list])
if(this.criteria_equal(request, criteria) && request.promise.time() + 1000 < Date.now())
return request.promise;
@@ -922,7 +576,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
return result.promise;
};
- private fullfill_permission_request(list: RequestLists, criteria: permissions.PermissionRequestKeys, status: "success" | "error", result: any) {
+ private fullfill_permission_request(list: RequestLists, criteria: PermissionRequestKeys, status: "success" | "error", result: any) {
for(const request of this[list]) {
if(this.criteria_equal(request, criteria)) {
this[list].remove(request);
@@ -932,7 +586,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
}
- find_permission(...permissions: string[]) : Promise {
+ find_permission(...permissions: string[]) : Promise {
const permission_ids = [];
for(const permission of permissions) {
const info = this.resolveInfo(permission);
@@ -942,11 +596,11 @@ class PermissionManager extends connection.AbstractCommandHandler {
}
if(!permission_ids.length) return Promise.resolve([]);
- return new Promise((resolve, reject) => {
+ return new Promise((resolve, reject) => {
const single_handler = {
command: "notifypermfind",
function: command => {
- const result: permissions.find.Entry[] = [];
+ const result: find.Entry[] = [];
for(const entry of command.arguments) {
const perm_id = parseInt(entry["p"]);
if(permission_ids.indexOf(perm_id) === -1) return; /* not our permfind result */
@@ -960,32 +614,32 @@ class PermissionManager extends connection.AbstractCommandHandler {
data = {
type: "server_group",
group_id: parseInt(entry["id1"]),
- } as permissions.find.ServerGroup;
+ } as find.ServerGroup;
break;
case 1:
data = {
type: "client",
client_id: parseInt(entry["id2"]),
- } as permissions.find.Client;
+ } as find.Client;
break;
case 2:
data = {
type: "channel",
channel_id: parseInt(entry["id2"]),
- } as permissions.find.Channel;
+ } as find.Channel;
break;
case 3:
data = {
type: "channel_group",
group_id: parseInt(entry["id1"]),
- } as permissions.find.ChannelGroup;
+ } as find.ChannelGroup;
break;
case 4:
data = {
type: "client_channel",
client_id: parseInt(entry["id1"]),
channel_id: parseInt(entry["id1"]),
- } as permissions.find.ClientChannel;
+ } as find.ClientChannel;
break;
default:
continue;
diff --git a/shared/js/permission/PermissionType.ts b/shared/js/permission/PermissionType.ts
new file mode 100644
index 00000000..99ae8d07
--- /dev/null
+++ b/shared/js/permission/PermissionType.ts
@@ -0,0 +1,350 @@
+export enum PermissionType {
+ B_SERVERINSTANCE_HELP_VIEW = "b_serverinstance_help_view",
+ B_SERVERINSTANCE_VERSION_VIEW = "b_serverinstance_version_view",
+ B_SERVERINSTANCE_INFO_VIEW = "b_serverinstance_info_view",
+ B_SERVERINSTANCE_VIRTUALSERVER_LIST = "b_serverinstance_virtualserver_list",
+ B_SERVERINSTANCE_BINDING_LIST = "b_serverinstance_binding_list",
+ B_SERVERINSTANCE_PERMISSION_LIST = "b_serverinstance_permission_list",
+ B_SERVERINSTANCE_PERMISSION_FIND = "b_serverinstance_permission_find",
+ B_VIRTUALSERVER_CREATE = "b_virtualserver_create",
+ B_VIRTUALSERVER_DELETE = "b_virtualserver_delete",
+ B_VIRTUALSERVER_START_ANY = "b_virtualserver_start_any",
+ B_VIRTUALSERVER_STOP_ANY = "b_virtualserver_stop_any",
+ B_VIRTUALSERVER_CHANGE_MACHINE_ID = "b_virtualserver_change_machine_id",
+ B_VIRTUALSERVER_CHANGE_TEMPLATE = "b_virtualserver_change_template",
+ B_SERVERQUERY_LOGIN = "b_serverquery_login",
+ B_SERVERINSTANCE_TEXTMESSAGE_SEND = "b_serverinstance_textmessage_send",
+ B_SERVERINSTANCE_LOG_VIEW = "b_serverinstance_log_view",
+ B_SERVERINSTANCE_LOG_ADD = "b_serverinstance_log_add",
+ B_SERVERINSTANCE_STOP = "b_serverinstance_stop",
+ B_SERVERINSTANCE_MODIFY_SETTINGS = "b_serverinstance_modify_settings",
+ B_SERVERINSTANCE_MODIFY_QUERYGROUP = "b_serverinstance_modify_querygroup",
+ B_SERVERINSTANCE_MODIFY_TEMPLATES = "b_serverinstance_modify_templates",
+ B_VIRTUALSERVER_SELECT = "b_virtualserver_select",
+ B_VIRTUALSERVER_SELECT_GODMODE = "b_virtualserver_select_godmode",
+ B_VIRTUALSERVER_INFO_VIEW = "b_virtualserver_info_view",
+ B_VIRTUALSERVER_CONNECTIONINFO_VIEW = "b_virtualserver_connectioninfo_view",
+ B_VIRTUALSERVER_CHANNEL_LIST = "b_virtualserver_channel_list",
+ B_VIRTUALSERVER_CHANNEL_SEARCH = "b_virtualserver_channel_search",
+ B_VIRTUALSERVER_CLIENT_LIST = "b_virtualserver_client_list",
+ B_VIRTUALSERVER_CLIENT_SEARCH = "b_virtualserver_client_search",
+ B_VIRTUALSERVER_CLIENT_DBLIST = "b_virtualserver_client_dblist",
+ B_VIRTUALSERVER_CLIENT_DBSEARCH = "b_virtualserver_client_dbsearch",
+ B_VIRTUALSERVER_CLIENT_DBINFO = "b_virtualserver_client_dbinfo",
+ B_VIRTUALSERVER_PERMISSION_FIND = "b_virtualserver_permission_find",
+ B_VIRTUALSERVER_CUSTOM_SEARCH = "b_virtualserver_custom_search",
+ B_VIRTUALSERVER_START = "b_virtualserver_start",
+ B_VIRTUALSERVER_STOP = "b_virtualserver_stop",
+ B_VIRTUALSERVER_TOKEN_LIST = "b_virtualserver_token_list",
+ B_VIRTUALSERVER_TOKEN_ADD = "b_virtualserver_token_add",
+ B_VIRTUALSERVER_TOKEN_USE = "b_virtualserver_token_use",
+ B_VIRTUALSERVER_TOKEN_DELETE = "b_virtualserver_token_delete",
+ B_VIRTUALSERVER_LOG_VIEW = "b_virtualserver_log_view",
+ B_VIRTUALSERVER_LOG_ADD = "b_virtualserver_log_add",
+ B_VIRTUALSERVER_JOIN_IGNORE_PASSWORD = "b_virtualserver_join_ignore_password",
+ B_VIRTUALSERVER_NOTIFY_REGISTER = "b_virtualserver_notify_register",
+ B_VIRTUALSERVER_NOTIFY_UNREGISTER = "b_virtualserver_notify_unregister",
+ B_VIRTUALSERVER_SNAPSHOT_CREATE = "b_virtualserver_snapshot_create",
+ B_VIRTUALSERVER_SNAPSHOT_DEPLOY = "b_virtualserver_snapshot_deploy",
+ B_VIRTUALSERVER_PERMISSION_RESET = "b_virtualserver_permission_reset",
+ B_VIRTUALSERVER_MODIFY_NAME = "b_virtualserver_modify_name",
+ B_VIRTUALSERVER_MODIFY_WELCOMEMESSAGE = "b_virtualserver_modify_welcomemessage",
+ B_VIRTUALSERVER_MODIFY_MAXCLIENTS = "b_virtualserver_modify_maxclients",
+ B_VIRTUALSERVER_MODIFY_RESERVED_SLOTS = "b_virtualserver_modify_reserved_slots",
+ B_VIRTUALSERVER_MODIFY_PASSWORD = "b_virtualserver_modify_password",
+ B_VIRTUALSERVER_MODIFY_DEFAULT_SERVERGROUP = "b_virtualserver_modify_default_servergroup",
+ B_VIRTUALSERVER_MODIFY_DEFAULT_MUSICGROUP = "b_virtualserver_modify_default_musicgroup",
+ B_VIRTUALSERVER_MODIFY_DEFAULT_CHANNELGROUP = "b_virtualserver_modify_default_channelgroup",
+ B_VIRTUALSERVER_MODIFY_DEFAULT_CHANNELADMINGROUP = "b_virtualserver_modify_default_channeladmingroup",
+ B_VIRTUALSERVER_MODIFY_CHANNEL_FORCED_SILENCE = "b_virtualserver_modify_channel_forced_silence",
+ B_VIRTUALSERVER_MODIFY_COMPLAIN = "b_virtualserver_modify_complain",
+ B_VIRTUALSERVER_MODIFY_ANTIFLOOD = "b_virtualserver_modify_antiflood",
+ B_VIRTUALSERVER_MODIFY_FT_SETTINGS = "b_virtualserver_modify_ft_settings",
+ B_VIRTUALSERVER_MODIFY_FT_QUOTAS = "b_virtualserver_modify_ft_quotas",
+ B_VIRTUALSERVER_MODIFY_HOSTMESSAGE = "b_virtualserver_modify_hostmessage",
+ B_VIRTUALSERVER_MODIFY_HOSTBANNER = "b_virtualserver_modify_hostbanner",
+ B_VIRTUALSERVER_MODIFY_HOSTBUTTON = "b_virtualserver_modify_hostbutton",
+ B_VIRTUALSERVER_MODIFY_PORT = "b_virtualserver_modify_port",
+ B_VIRTUALSERVER_MODIFY_HOST = "b_virtualserver_modify_host",
+ B_VIRTUALSERVER_MODIFY_DEFAULT_MESSAGES = "b_virtualserver_modify_default_messages",
+ B_VIRTUALSERVER_MODIFY_AUTOSTART = "b_virtualserver_modify_autostart",
+ B_VIRTUALSERVER_MODIFY_NEEDED_IDENTITY_SECURITY_LEVEL = "b_virtualserver_modify_needed_identity_security_level",
+ B_VIRTUALSERVER_MODIFY_PRIORITY_SPEAKER_DIMM_MODIFICATOR = "b_virtualserver_modify_priority_speaker_dimm_modificator",
+ B_VIRTUALSERVER_MODIFY_LOG_SETTINGS = "b_virtualserver_modify_log_settings",
+ B_VIRTUALSERVER_MODIFY_MIN_CLIENT_VERSION = "b_virtualserver_modify_min_client_version",
+ B_VIRTUALSERVER_MODIFY_ICON_ID = "b_virtualserver_modify_icon_id",
+ B_VIRTUALSERVER_MODIFY_WEBLIST = "b_virtualserver_modify_weblist",
+ B_VIRTUALSERVER_MODIFY_CODEC_ENCRYPTION_MODE = "b_virtualserver_modify_codec_encryption_mode",
+ B_VIRTUALSERVER_MODIFY_TEMPORARY_PASSWORDS = "b_virtualserver_modify_temporary_passwords",
+ B_VIRTUALSERVER_MODIFY_TEMPORARY_PASSWORDS_OWN = "b_virtualserver_modify_temporary_passwords_own",
+ B_VIRTUALSERVER_MODIFY_CHANNEL_TEMP_DELETE_DELAY_DEFAULT = "b_virtualserver_modify_channel_temp_delete_delay_default",
+ B_VIRTUALSERVER_MODIFY_MUSIC_BOT_LIMIT = "b_virtualserver_modify_music_bot_limit",
+ B_VIRTUALSERVER_MODIFY_COUNTRY_CODE = "b_virtualserver_modify_country_code",
+ I_CHANNEL_MIN_DEPTH = "i_channel_min_depth",
+ I_CHANNEL_MAX_DEPTH = "i_channel_max_depth",
+ B_CHANNEL_GROUP_INHERITANCE_END = "b_channel_group_inheritance_end",
+ I_CHANNEL_PERMISSION_MODIFY_POWER = "i_channel_permission_modify_power",
+ I_CHANNEL_NEEDED_PERMISSION_MODIFY_POWER = "i_channel_needed_permission_modify_power",
+ B_CHANNEL_INFO_VIEW = "b_channel_info_view",
+ B_CHANNEL_CREATE_CHILD = "b_channel_create_child",
+ B_CHANNEL_CREATE_PERMANENT = "b_channel_create_permanent",
+ B_CHANNEL_CREATE_SEMI_PERMANENT = "b_channel_create_semi_permanent",
+ B_CHANNEL_CREATE_TEMPORARY = "b_channel_create_temporary",
+ B_CHANNEL_CREATE_PRIVATE = "b_channel_create_private",
+ B_CHANNEL_CREATE_WITH_TOPIC = "b_channel_create_with_topic",
+ B_CHANNEL_CREATE_WITH_DESCRIPTION = "b_channel_create_with_description",
+ B_CHANNEL_CREATE_WITH_PASSWORD = "b_channel_create_with_password",
+ B_CHANNEL_CREATE_MODIFY_WITH_CODEC_SPEEX8 = "b_channel_create_modify_with_codec_speex8",
+ B_CHANNEL_CREATE_MODIFY_WITH_CODEC_SPEEX16 = "b_channel_create_modify_with_codec_speex16",
+ B_CHANNEL_CREATE_MODIFY_WITH_CODEC_SPEEX32 = "b_channel_create_modify_with_codec_speex32",
+ B_CHANNEL_CREATE_MODIFY_WITH_CODEC_CELTMONO48 = "b_channel_create_modify_with_codec_celtmono48",
+ B_CHANNEL_CREATE_MODIFY_WITH_CODEC_OPUSVOICE = "b_channel_create_modify_with_codec_opusvoice",
+ B_CHANNEL_CREATE_MODIFY_WITH_CODEC_OPUSMUSIC = "b_channel_create_modify_with_codec_opusmusic",
+ I_CHANNEL_CREATE_MODIFY_WITH_CODEC_MAXQUALITY = "i_channel_create_modify_with_codec_maxquality",
+ I_CHANNEL_CREATE_MODIFY_WITH_CODEC_LATENCY_FACTOR_MIN = "i_channel_create_modify_with_codec_latency_factor_min",
+ I_CHANNEL_CREATE_MODIFY_CONVERSATION_HISTORY_LENGTH = "i_channel_create_modify_conversation_history_length",
+ B_CHANNEL_CREATE_MODIFY_CONVERSATION_HISTORY_UNLIMITED = "b_channel_create_modify_conversation_history_unlimited",
+ B_CHANNEL_CREATE_MODIFY_CONVERSATION_PRIVATE = "b_channel_create_modify_conversation_private",
+ B_CHANNEL_CREATE_WITH_MAXCLIENTS = "b_channel_create_with_maxclients",
+ B_CHANNEL_CREATE_WITH_MAXFAMILYCLIENTS = "b_channel_create_with_maxfamilyclients",
+ B_CHANNEL_CREATE_WITH_SORTORDER = "b_channel_create_with_sortorder",
+ B_CHANNEL_CREATE_WITH_DEFAULT = "b_channel_create_with_default",
+ B_CHANNEL_CREATE_WITH_NEEDED_TALK_POWER = "b_channel_create_with_needed_talk_power",
+ B_CHANNEL_CREATE_MODIFY_WITH_FORCE_PASSWORD = "b_channel_create_modify_with_force_password",
+ I_CHANNEL_CREATE_MODIFY_WITH_TEMP_DELETE_DELAY = "i_channel_create_modify_with_temp_delete_delay",
+ B_CHANNEL_MODIFY_PARENT = "b_channel_modify_parent",
+ B_CHANNEL_MODIFY_MAKE_DEFAULT = "b_channel_modify_make_default",
+ B_CHANNEL_MODIFY_MAKE_PERMANENT = "b_channel_modify_make_permanent",
+ B_CHANNEL_MODIFY_MAKE_SEMI_PERMANENT = "b_channel_modify_make_semi_permanent",
+ B_CHANNEL_MODIFY_MAKE_TEMPORARY = "b_channel_modify_make_temporary",
+ B_CHANNEL_MODIFY_NAME = "b_channel_modify_name",
+ B_CHANNEL_MODIFY_TOPIC = "b_channel_modify_topic",
+ B_CHANNEL_MODIFY_DESCRIPTION = "b_channel_modify_description",
+ B_CHANNEL_MODIFY_PASSWORD = "b_channel_modify_password",
+ B_CHANNEL_MODIFY_CODEC = "b_channel_modify_codec",
+ B_CHANNEL_MODIFY_CODEC_QUALITY = "b_channel_modify_codec_quality",
+ B_CHANNEL_MODIFY_CODEC_LATENCY_FACTOR = "b_channel_modify_codec_latency_factor",
+ B_CHANNEL_MODIFY_MAXCLIENTS = "b_channel_modify_maxclients",
+ B_CHANNEL_MODIFY_MAXFAMILYCLIENTS = "b_channel_modify_maxfamilyclients",
+ B_CHANNEL_MODIFY_SORTORDER = "b_channel_modify_sortorder",
+ B_CHANNEL_MODIFY_NEEDED_TALK_POWER = "b_channel_modify_needed_talk_power",
+ I_CHANNEL_MODIFY_POWER = "i_channel_modify_power",
+ I_CHANNEL_NEEDED_MODIFY_POWER = "i_channel_needed_modify_power",
+ B_CHANNEL_MODIFY_MAKE_CODEC_ENCRYPTED = "b_channel_modify_make_codec_encrypted",
+ B_CHANNEL_MODIFY_TEMP_DELETE_DELAY = "b_channel_modify_temp_delete_delay",
+ B_CHANNEL_DELETE_PERMANENT = "b_channel_delete_permanent",
+ B_CHANNEL_DELETE_SEMI_PERMANENT = "b_channel_delete_semi_permanent",
+ B_CHANNEL_DELETE_TEMPORARY = "b_channel_delete_temporary",
+ B_CHANNEL_DELETE_FLAG_FORCE = "b_channel_delete_flag_force",
+ I_CHANNEL_DELETE_POWER = "i_channel_delete_power",
+ B_CHANNEL_CONVERSATION_MESSAGE_DELETE = "b_channel_conversation_message_delete",
+ I_CHANNEL_NEEDED_DELETE_POWER = "i_channel_needed_delete_power",
+ B_CHANNEL_JOIN_PERMANENT = "b_channel_join_permanent",
+ B_CHANNEL_JOIN_SEMI_PERMANENT = "b_channel_join_semi_permanent",
+ B_CHANNEL_JOIN_TEMPORARY = "b_channel_join_temporary",
+ B_CHANNEL_JOIN_IGNORE_PASSWORD = "b_channel_join_ignore_password",
+ B_CHANNEL_JOIN_IGNORE_MAXCLIENTS = "b_channel_join_ignore_maxclients",
+ B_CHANNEL_IGNORE_VIEW_POWER = "b_channel_ignore_view_power",
+ I_CHANNEL_JOIN_POWER = "i_channel_join_power",
+ I_CHANNEL_NEEDED_JOIN_POWER = "i_channel_needed_join_power",
+ B_CHANNEL_IGNORE_JOIN_POWER = "b_channel_ignore_join_power",
+ B_CHANNEL_IGNORE_DESCRIPTION_VIEW_POWER = "b_channel_ignore_description_view_power",
+ I_CHANNEL_VIEW_POWER = "i_channel_view_power",
+ I_CHANNEL_NEEDED_VIEW_POWER = "i_channel_needed_view_power",
+ I_CHANNEL_SUBSCRIBE_POWER = "i_channel_subscribe_power",
+ I_CHANNEL_NEEDED_SUBSCRIBE_POWER = "i_channel_needed_subscribe_power",
+ I_CHANNEL_DESCRIPTION_VIEW_POWER = "i_channel_description_view_power",
+ I_CHANNEL_NEEDED_DESCRIPTION_VIEW_POWER = "i_channel_needed_description_view_power",
+ I_ICON_ID = "i_icon_id",
+ I_MAX_ICON_FILESIZE = "i_max_icon_filesize",
+ I_MAX_PLAYLIST_SIZE = "i_max_playlist_size",
+ I_MAX_PLAYLISTS = "i_max_playlists",
+ B_ICON_MANAGE = "b_icon_manage",
+ B_GROUP_IS_PERMANENT = "b_group_is_permanent",
+ I_GROUP_AUTO_UPDATE_TYPE = "i_group_auto_update_type",
+ I_GROUP_AUTO_UPDATE_MAX_VALUE = "i_group_auto_update_max_value",
+ I_GROUP_SORT_ID = "i_group_sort_id",
+ I_GROUP_SHOW_NAME_IN_TREE = "i_group_show_name_in_tree",
+ B_VIRTUALSERVER_SERVERGROUP_CREATE = "b_virtualserver_servergroup_create",
+ B_VIRTUALSERVER_SERVERGROUP_LIST = "b_virtualserver_servergroup_list",
+ B_VIRTUALSERVER_SERVERGROUP_PERMISSION_LIST = "b_virtualserver_servergroup_permission_list",
+ B_VIRTUALSERVER_SERVERGROUP_CLIENT_LIST = "b_virtualserver_servergroup_client_list",
+ B_VIRTUALSERVER_CHANNELGROUP_CREATE = "b_virtualserver_channelgroup_create",
+ B_VIRTUALSERVER_CHANNELGROUP_LIST = "b_virtualserver_channelgroup_list",
+ B_VIRTUALSERVER_CHANNELGROUP_PERMISSION_LIST = "b_virtualserver_channelgroup_permission_list",
+ B_VIRTUALSERVER_CHANNELGROUP_CLIENT_LIST = "b_virtualserver_channelgroup_client_list",
+ B_VIRTUALSERVER_CLIENT_PERMISSION_LIST = "b_virtualserver_client_permission_list",
+ B_VIRTUALSERVER_CHANNEL_PERMISSION_LIST = "b_virtualserver_channel_permission_list",
+ B_VIRTUALSERVER_CHANNELCLIENT_PERMISSION_LIST = "b_virtualserver_channelclient_permission_list",
+ B_VIRTUALSERVER_PLAYLIST_PERMISSION_LIST = "b_virtualserver_playlist_permission_list",
+ I_SERVER_GROUP_MODIFY_POWER = "i_server_group_modify_power",
+ I_SERVER_GROUP_NEEDED_MODIFY_POWER = "i_server_group_needed_modify_power",
+ I_SERVER_GROUP_MEMBER_ADD_POWER = "i_server_group_member_add_power",
+ I_SERVER_GROUP_SELF_ADD_POWER = "i_server_group_self_add_power",
+ I_SERVER_GROUP_NEEDED_MEMBER_ADD_POWER = "i_server_group_needed_member_add_power",
+ I_SERVER_GROUP_MEMBER_REMOVE_POWER = "i_server_group_member_remove_power",
+ I_SERVER_GROUP_SELF_REMOVE_POWER = "i_server_group_self_remove_power",
+ I_SERVER_GROUP_NEEDED_MEMBER_REMOVE_POWER = "i_server_group_needed_member_remove_power",
+ I_CHANNEL_GROUP_MODIFY_POWER = "i_channel_group_modify_power",
+ I_CHANNEL_GROUP_NEEDED_MODIFY_POWER = "i_channel_group_needed_modify_power",
+ I_CHANNEL_GROUP_MEMBER_ADD_POWER = "i_channel_group_member_add_power",
+ I_CHANNEL_GROUP_SELF_ADD_POWER = "i_channel_group_self_add_power",
+ I_CHANNEL_GROUP_NEEDED_MEMBER_ADD_POWER = "i_channel_group_needed_member_add_power",
+ I_CHANNEL_GROUP_MEMBER_REMOVE_POWER = "i_channel_group_member_remove_power",
+ I_CHANNEL_GROUP_SELF_REMOVE_POWER = "i_channel_group_self_remove_power",
+ I_CHANNEL_GROUP_NEEDED_MEMBER_REMOVE_POWER = "i_channel_group_needed_member_remove_power",
+ I_GROUP_MEMBER_ADD_POWER = "i_group_member_add_power",
+ I_GROUP_NEEDED_MEMBER_ADD_POWER = "i_group_needed_member_add_power",
+ I_GROUP_MEMBER_REMOVE_POWER = "i_group_member_remove_power",
+ I_GROUP_NEEDED_MEMBER_REMOVE_POWER = "i_group_needed_member_remove_power",
+ I_GROUP_MODIFY_POWER = "i_group_modify_power",
+ I_GROUP_NEEDED_MODIFY_POWER = "i_group_needed_modify_power",
+ I_PERMISSION_MODIFY_POWER = "i_permission_modify_power",
+ B_PERMISSION_MODIFY_POWER_IGNORE = "b_permission_modify_power_ignore",
+ B_VIRTUALSERVER_SERVERGROUP_DELETE = "b_virtualserver_servergroup_delete",
+ B_VIRTUALSERVER_CHANNELGROUP_DELETE = "b_virtualserver_channelgroup_delete",
+ I_CLIENT_PERMISSION_MODIFY_POWER = "i_client_permission_modify_power",
+ I_CLIENT_NEEDED_PERMISSION_MODIFY_POWER = "i_client_needed_permission_modify_power",
+ I_CLIENT_MAX_CLONES_UID = "i_client_max_clones_uid",
+ I_CLIENT_MAX_CLONES_IP = "i_client_max_clones_ip",
+ I_CLIENT_MAX_CLONES_HWID = "i_client_max_clones_hwid",
+ I_CLIENT_MAX_IDLETIME = "i_client_max_idletime",
+ I_CLIENT_MAX_AVATAR_FILESIZE = "i_client_max_avatar_filesize",
+ I_CLIENT_MAX_CHANNEL_SUBSCRIPTIONS = "i_client_max_channel_subscriptions",
+ I_CLIENT_MAX_CHANNELS = "i_client_max_channels",
+ I_CLIENT_MAX_TEMPORARY_CHANNELS = "i_client_max_temporary_channels",
+ I_CLIENT_MAX_SEMI_CHANNELS = "i_client_max_semi_channels",
+ I_CLIENT_MAX_PERMANENT_CHANNELS = "i_client_max_permanent_channels",
+ B_CLIENT_USE_PRIORITY_SPEAKER = "b_client_use_priority_speaker",
+ B_CLIENT_SKIP_CHANNELGROUP_PERMISSIONS = "b_client_skip_channelgroup_permissions",
+ B_CLIENT_FORCE_PUSH_TO_TALK = "b_client_force_push_to_talk",
+ B_CLIENT_IGNORE_BANS = "b_client_ignore_bans",
+ B_CLIENT_IGNORE_VPN = "b_client_ignore_vpn",
+ B_CLIENT_IGNORE_ANTIFLOOD = "b_client_ignore_antiflood",
+ B_CLIENT_ENFORCE_VALID_HWID = "b_client_enforce_valid_hwid",
+ B_CLIENT_ALLOW_INVALID_PACKET = "b_client_allow_invalid_packet",
+ B_CLIENT_ALLOW_INVALID_BADGES = "b_client_allow_invalid_badges",
+ B_CLIENT_ISSUE_CLIENT_QUERY_COMMAND = "b_client_issue_client_query_command",
+ B_CLIENT_USE_RESERVED_SLOT = "b_client_use_reserved_slot",
+ B_CLIENT_USE_CHANNEL_COMMANDER = "b_client_use_channel_commander",
+ B_CLIENT_REQUEST_TALKER = "b_client_request_talker",
+ B_CLIENT_AVATAR_DELETE_OTHER = "b_client_avatar_delete_other",
+ B_CLIENT_IS_STICKY = "b_client_is_sticky",
+ B_CLIENT_IGNORE_STICKY = "b_client_ignore_sticky",
+ B_CLIENT_MUSIC_CREATE_PERMANENT = "b_client_music_create_permanent",
+ B_CLIENT_MUSIC_CREATE_SEMI_PERMANENT = "b_client_music_create_semi_permanent",
+ B_CLIENT_MUSIC_CREATE_TEMPORARY = "b_client_music_create_temporary",
+ B_CLIENT_MUSIC_MODIFY_PERMANENT = "b_client_music_modify_permanent",
+ B_CLIENT_MUSIC_MODIFY_SEMI_PERMANENT = "b_client_music_modify_semi_permanent",
+ B_CLIENT_MUSIC_MODIFY_TEMPORARY = "b_client_music_modify_temporary",
+ I_CLIENT_MUSIC_CREATE_MODIFY_MAX_VOLUME = "i_client_music_create_modify_max_volume",
+ I_CLIENT_MUSIC_LIMIT = "i_client_music_limit",
+ I_CLIENT_MUSIC_NEEDED_DELETE_POWER = "i_client_music_needed_delete_power",
+ I_CLIENT_MUSIC_DELETE_POWER = "i_client_music_delete_power",
+ I_CLIENT_MUSIC_PLAY_POWER = "i_client_music_play_power",
+ I_CLIENT_MUSIC_NEEDED_PLAY_POWER = "i_client_music_needed_play_power",
+ I_CLIENT_MUSIC_MODIFY_POWER = "i_client_music_modify_power",
+ I_CLIENT_MUSIC_NEEDED_MODIFY_POWER = "i_client_music_needed_modify_power",
+ I_CLIENT_MUSIC_RENAME_POWER = "i_client_music_rename_power",
+ I_CLIENT_MUSIC_NEEDED_RENAME_POWER = "i_client_music_needed_rename_power",
+ B_PLAYLIST_CREATE = "b_playlist_create",
+ I_PLAYLIST_VIEW_POWER = "i_playlist_view_power",
+ I_PLAYLIST_NEEDED_VIEW_POWER = "i_playlist_needed_view_power",
+ I_PLAYLIST_MODIFY_POWER = "i_playlist_modify_power",
+ I_PLAYLIST_NEEDED_MODIFY_POWER = "i_playlist_needed_modify_power",
+ I_PLAYLIST_PERMISSION_MODIFY_POWER = "i_playlist_permission_modify_power",
+ I_PLAYLIST_NEEDED_PERMISSION_MODIFY_POWER = "i_playlist_needed_permission_modify_power",
+ I_PLAYLIST_DELETE_POWER = "i_playlist_delete_power",
+ I_PLAYLIST_NEEDED_DELETE_POWER = "i_playlist_needed_delete_power",
+ I_PLAYLIST_SONG_ADD_POWER = "i_playlist_song_add_power",
+ I_PLAYLIST_SONG_NEEDED_ADD_POWER = "i_playlist_song_needed_add_power",
+ I_PLAYLIST_SONG_REMOVE_POWER = "i_playlist_song_remove_power",
+ I_PLAYLIST_SONG_NEEDED_REMOVE_POWER = "i_playlist_song_needed_remove_power",
+ B_CLIENT_INFO_VIEW = "b_client_info_view",
+ B_CLIENT_PERMISSIONOVERVIEW_VIEW = "b_client_permissionoverview_view",
+ B_CLIENT_PERMISSIONOVERVIEW_OWN = "b_client_permissionoverview_own",
+ B_CLIENT_REMOTEADDRESS_VIEW = "b_client_remoteaddress_view",
+ I_CLIENT_SERVERQUERY_VIEW_POWER = "i_client_serverquery_view_power",
+ I_CLIENT_NEEDED_SERVERQUERY_VIEW_POWER = "i_client_needed_serverquery_view_power",
+ B_CLIENT_CUSTOM_INFO_VIEW = "b_client_custom_info_view",
+ B_CLIENT_MUSIC_CHANNEL_LIST = "b_client_music_channel_list",
+ B_CLIENT_MUSIC_SERVER_LIST = "b_client_music_server_list",
+ I_CLIENT_MUSIC_INFO = "i_client_music_info",
+ I_CLIENT_MUSIC_NEEDED_INFO = "i_client_music_needed_info",
+ I_CLIENT_KICK_FROM_SERVER_POWER = "i_client_kick_from_server_power",
+ I_CLIENT_NEEDED_KICK_FROM_SERVER_POWER = "i_client_needed_kick_from_server_power",
+ I_CLIENT_KICK_FROM_CHANNEL_POWER = "i_client_kick_from_channel_power",
+ I_CLIENT_NEEDED_KICK_FROM_CHANNEL_POWER = "i_client_needed_kick_from_channel_power",
+ I_CLIENT_BAN_POWER = "i_client_ban_power",
+ I_CLIENT_NEEDED_BAN_POWER = "i_client_needed_ban_power",
+ I_CLIENT_MOVE_POWER = "i_client_move_power",
+ I_CLIENT_NEEDED_MOVE_POWER = "i_client_needed_move_power",
+ I_CLIENT_COMPLAIN_POWER = "i_client_complain_power",
+ I_CLIENT_NEEDED_COMPLAIN_POWER = "i_client_needed_complain_power",
+ B_CLIENT_COMPLAIN_LIST = "b_client_complain_list",
+ B_CLIENT_COMPLAIN_DELETE_OWN = "b_client_complain_delete_own",
+ B_CLIENT_COMPLAIN_DELETE = "b_client_complain_delete",
+ B_CLIENT_BAN_LIST = "b_client_ban_list",
+ B_CLIENT_BAN_LIST_GLOBAL = "b_client_ban_list_global",
+ B_CLIENT_BAN_TRIGGER_LIST = "b_client_ban_trigger_list",
+ B_CLIENT_BAN_CREATE = "b_client_ban_create",
+ B_CLIENT_BAN_CREATE_GLOBAL = "b_client_ban_create_global",
+ B_CLIENT_BAN_NAME = "b_client_ban_name",
+ B_CLIENT_BAN_IP = "b_client_ban_ip",
+ B_CLIENT_BAN_HWID = "b_client_ban_hwid",
+ B_CLIENT_BAN_EDIT = "b_client_ban_edit",
+ B_CLIENT_BAN_EDIT_GLOBAL = "b_client_ban_edit_global",
+ B_CLIENT_BAN_DELETE_OWN = "b_client_ban_delete_own",
+ B_CLIENT_BAN_DELETE = "b_client_ban_delete",
+ B_CLIENT_BAN_DELETE_OWN_GLOBAL = "b_client_ban_delete_own_global",
+ B_CLIENT_BAN_DELETE_GLOBAL = "b_client_ban_delete_global",
+ I_CLIENT_BAN_MAX_BANTIME = "i_client_ban_max_bantime",
+ I_CLIENT_PRIVATE_TEXTMESSAGE_POWER = "i_client_private_textmessage_power",
+ I_CLIENT_NEEDED_PRIVATE_TEXTMESSAGE_POWER = "i_client_needed_private_textmessage_power",
+ B_CLIENT_EVEN_TEXTMESSAGE_SEND = "b_client_even_textmessage_send",
+ B_CLIENT_SERVER_TEXTMESSAGE_SEND = "b_client_server_textmessage_send",
+ B_CLIENT_CHANNEL_TEXTMESSAGE_SEND = "b_client_channel_textmessage_send",
+ B_CLIENT_OFFLINE_TEXTMESSAGE_SEND = "b_client_offline_textmessage_send",
+ I_CLIENT_TALK_POWER = "i_client_talk_power",
+ I_CLIENT_NEEDED_TALK_POWER = "i_client_needed_talk_power",
+ I_CLIENT_POKE_POWER = "i_client_poke_power",
+ I_CLIENT_NEEDED_POKE_POWER = "i_client_needed_poke_power",
+ B_CLIENT_SET_FLAG_TALKER = "b_client_set_flag_talker",
+ I_CLIENT_WHISPER_POWER = "i_client_whisper_power",
+ I_CLIENT_NEEDED_WHISPER_POWER = "i_client_needed_whisper_power",
+ B_CLIENT_MODIFY_DESCRIPTION = "b_client_modify_description",
+ B_CLIENT_MODIFY_OWN_DESCRIPTION = "b_client_modify_own_description",
+ B_CLIENT_USE_BBCODE_ANY = "b_client_use_bbcode_any",
+ B_CLIENT_USE_BBCODE_URL = "b_client_use_bbcode_url",
+ B_CLIENT_USE_BBCODE_IMAGE = "b_client_use_bbcode_image",
+ B_CLIENT_MODIFY_DBPROPERTIES = "b_client_modify_dbproperties",
+ B_CLIENT_DELETE_DBPROPERTIES = "b_client_delete_dbproperties",
+ B_CLIENT_CREATE_MODIFY_SERVERQUERY_LOGIN = "b_client_create_modify_serverquery_login",
+ B_CLIENT_QUERY_CREATE = "b_client_query_create",
+ B_CLIENT_QUERY_LIST = "b_client_query_list",
+ B_CLIENT_QUERY_LIST_OWN = "b_client_query_list_own",
+ B_CLIENT_QUERY_RENAME = "b_client_query_rename",
+ B_CLIENT_QUERY_RENAME_OWN = "b_client_query_rename_own",
+ B_CLIENT_QUERY_CHANGE_PASSWORD = "b_client_query_change_password",
+ B_CLIENT_QUERY_CHANGE_OWN_PASSWORD = "b_client_query_change_own_password",
+ B_CLIENT_QUERY_CHANGE_PASSWORD_GLOBAL = "b_client_query_change_password_global",
+ B_CLIENT_QUERY_DELETE = "b_client_query_delete",
+ B_CLIENT_QUERY_DELETE_OWN = "b_client_query_delete_own",
+ B_FT_IGNORE_PASSWORD = "b_ft_ignore_password",
+ B_FT_TRANSFER_LIST = "b_ft_transfer_list",
+ I_FT_FILE_UPLOAD_POWER = "i_ft_file_upload_power",
+ I_FT_NEEDED_FILE_UPLOAD_POWER = "i_ft_needed_file_upload_power",
+ I_FT_FILE_DOWNLOAD_POWER = "i_ft_file_download_power",
+ I_FT_NEEDED_FILE_DOWNLOAD_POWER = "i_ft_needed_file_download_power",
+ I_FT_FILE_DELETE_POWER = "i_ft_file_delete_power",
+ I_FT_NEEDED_FILE_DELETE_POWER = "i_ft_needed_file_delete_power",
+ I_FT_FILE_RENAME_POWER = "i_ft_file_rename_power",
+ I_FT_NEEDED_FILE_RENAME_POWER = "i_ft_needed_file_rename_power",
+ I_FT_FILE_BROWSE_POWER = "i_ft_file_browse_power",
+ I_FT_NEEDED_FILE_BROWSE_POWER = "i_ft_needed_file_browse_power",
+ I_FT_DIRECTORY_CREATE_POWER = "i_ft_directory_create_power",
+ I_FT_NEEDED_DIRECTORY_CREATE_POWER = "i_ft_needed_directory_create_power",
+ I_FT_QUOTA_MB_DOWNLOAD_PER_CLIENT = "i_ft_quota_mb_download_per_client",
+ I_FT_QUOTA_MB_UPLOAD_PER_CLIENT = "i_ft_quota_mb_upload_per_client"
+}
+export default PermissionType;
\ No newline at end of file
diff --git a/shared/js/profiles/ConnectionProfile.ts b/shared/js/profiles/ConnectionProfile.ts
index f30cbe54..b09649f2 100644
--- a/shared/js/profiles/ConnectionProfile.ts
+++ b/shared/js/profiles/ConnectionProfile.ts
@@ -1,251 +1,257 @@
-namespace profiles {
- export class ConnectionProfile {
- id: string;
+import {decode_identity, IdentitifyType, Identity} from "tc-shared/profiles/Identity";
+import {guid} from "tc-shared/crypto/uid";
+import {TeaForumIdentity} from "tc-shared/profiles/identities/TeaForumIdentity";
+import {TeaSpeakIdentity} from "tc-shared/profiles/identities/TeamSpeakIdentity";
+import {AbstractServerConnection} from "tc-shared/connection/ConnectionBase";
+import {HandshakeIdentityHandler} from "tc-shared/connection/HandshakeHandler";
+import {createErrorModal} from "tc-shared/ui/elements/Modal";
+import {formatMessage} from "tc-shared/ui/frames/chat";
- profile_name: string;
- default_username: string;
- default_password: string;
+export class ConnectionProfile {
+ id: string;
- selected_identity_type: string = "unset";
- identities: { [key: string]: identities.Identity } = {};
+ profile_name: string;
+ default_username: string;
+ default_password: string;
- constructor(id: string) {
- this.id = id;
- }
+ selected_identity_type: string = "unset";
+ identities: { [key: string]: Identity } = {};
- connect_username(): string {
- if (this.default_username && this.default_username !== "Another TeaSpeak user")
- return this.default_username;
+ constructor(id: string) {
+ this.id = id;
+ }
- let selected = this.selected_identity();
- let name = selected ? selected.fallback_name() : undefined;
- return name || "Another TeaSpeak user";
- }
+ connect_username(): string {
+ if (this.default_username && this.default_username !== "Another TeaSpeak user")
+ return this.default_username;
- selected_identity(current_type?: identities.IdentitifyType): identities.Identity {
- if (!current_type)
- current_type = this.selected_type();
+ let selected = this.selected_identity();
+ let name = selected ? selected.fallback_name() : undefined;
+ return name || "Another TeaSpeak user";
+ }
- if (current_type === undefined)
- return undefined;
-
- if (current_type == identities.IdentitifyType.TEAFORO) {
- return identities.static_forum_identity();
- } else if (current_type == identities.IdentitifyType.TEAMSPEAK || current_type == identities.IdentitifyType.NICKNAME) {
- return this.identities[identities.IdentitifyType[current_type].toLowerCase()];
- }
+ selected_identity(current_type?: IdentitifyType): Identity {
+ if (!current_type)
+ current_type = this.selected_type();
+ if (current_type === undefined)
return undefined;
+
+ if (current_type == IdentitifyType.TEAFORO) {
+ return TeaForumIdentity.identity();
+ } else if (current_type == IdentitifyType.TEAMSPEAK || current_type == IdentitifyType.NICKNAME) {
+ return this.identities[IdentitifyType[current_type].toLowerCase()];
}
- selected_type?(): identities.IdentitifyType {
- return this.selected_identity_type ? identities.IdentitifyType[this.selected_identity_type.toUpperCase()] : undefined;
- }
-
- set_identity(type: identities.IdentitifyType, identity: identities.Identity) {
- this.identities[identities.IdentitifyType[type].toLowerCase()] = identity;
- }
-
- spawn_identity_handshake_handler?(connection: connection.AbstractServerConnection): connection.HandshakeIdentityHandler {
- const identity = this.selected_identity();
- if (!identity)
- return undefined;
- return identity.spawn_identity_handshake_handler(connection);
- }
-
- encode?(): string {
- const identity_data = {};
- for (const key in this.identities)
- if (this.identities[key])
- identity_data[key] = this.identities[key].encode();
-
- return JSON.stringify({
- version: 1,
- username: this.default_username,
- password: this.default_password,
- profile_name: this.profile_name,
- identity_type: this.selected_identity_type,
- identity_data: identity_data,
- id: this.id
- });
- }
-
- valid(): boolean {
- const identity = this.selected_identity();
- if (!identity || !identity.valid()) return false;
-
- return true;
- }
+ return undefined;
}
- async function decode_profile(data): Promise {
- data = JSON.parse(data);
- if (data.version !== 1)
- return "invalid version";
-
- const result: ConnectionProfile = new ConnectionProfile(data.id);
- result.default_username = data.username;
- result.default_password = data.password;
- result.profile_name = data.profile_name;
- result.selected_identity_type = (data.identity_type || "").toLowerCase();
-
- if (data.identity_data) {
- for (const key in data.identity_data) {
- const type = identities.IdentitifyType[key.toUpperCase() as string];
- const _data = data.identity_data[key];
- if (type == undefined) continue;
-
- const identity = await identities.decode_identity(type, _data);
- if (identity == undefined) continue;
-
- result.identities[key.toLowerCase()] = identity;
- }
- }
-
- return result;
+ selected_type?(): IdentitifyType {
+ return this.selected_identity_type ? IdentitifyType[this.selected_identity_type.toUpperCase()] : undefined;
}
- interface ProfilesData {
- version: number;
- profiles: string[];
+ set_identity(type: IdentitifyType, identity: Identity) {
+ this.identities[IdentitifyType[type].toLowerCase()] = identity;
}
- let available_profiles: ConnectionProfile[] = [];
-
- export async function load() {
- available_profiles = [];
-
- const profiles_json = localStorage.getItem("profiles");
- let profiles_data: ProfilesData = (() => {
- try {
- return profiles_json ? JSON.parse(profiles_json) : {version: 0} as any;
- } catch (error) {
- debugger;
- console.error(tr("Invalid profile json! Resetting profiles :( (%o)"), profiles_json);
- createErrorModal(tr("Profile data invalid"), MessageHelper.formatMessage(tr("The profile data is invalid.{:br:}This might cause data loss."))).open();
- return {version: 0};
- }
- })();
-
- if (profiles_data.version === 0) {
- profiles_data = {
- version: 1,
- profiles: []
- };
- }
- if (profiles_data.version == 1) {
- for (const profile_data of profiles_data.profiles) {
- const profile = await decode_profile(profile_data);
- if (typeof (profile) === 'string') {
- console.error(tr("Failed to load profile. Reason: %s, Profile data: %s"), profile, profiles_data);
- continue;
- }
- available_profiles.push(profile);
- }
- }
-
- if (!find_profile("default")) { //Create a default profile and teaforo profile
- {
- const profile = create_new_profile("default", "default");
- profile.default_password = "";
- profile.default_username = "";
- profile.profile_name = "Default Profile";
-
- /* generate default identity */
- try {
- const identity = await identities.TeaSpeakIdentity.generate_new();
- let active = true;
- setTimeout(() => {
- active = false;
- }, 1000);
- await identity.improve_level(8, 1, () => active);
- profile.set_identity(identities.IdentitifyType.TEAMSPEAK, identity);
- profile.selected_identity_type = identities.IdentitifyType[identities.IdentitifyType.TEAMSPEAK];
- } catch (error) {
- createErrorModal(tr("Failed to generate default identity"), tr("Failed to generate default identity!
Please manually generate the identity within your settings => profiles")).open(); - } - } - - { /* forum identity (works only when connected to the forum) */ - const profile = create_new_profile("TeaSpeak Forum", "teaforo"); - profile.default_password = ""; - profile.default_username = ""; - profile.profile_name = "TeaSpeak Forum profile"; - - profile.set_identity(identities.IdentitifyType.TEAFORO, identities.static_forum_identity()); - profile.selected_identity_type = identities.IdentitifyType[identities.IdentitifyType.TEAFORO]; - } - - save(); - } + spawn_identity_handshake_handler?(connection: AbstractServerConnection): HandshakeIdentityHandler { + const identity = this.selected_identity(); + if (!identity) + return undefined; + return identity.spawn_identity_handshake_handler(connection); } - export function create_new_profile(name: string, id?: string): ConnectionProfile { - const profile = new ConnectionProfile(id || guid()); - profile.profile_name = name; - profile.default_username = ""; - available_profiles.push(profile); - return profile; - } + encode?(): string { + const identity_data = {}; + for (const key in this.identities) + if (this.identities[key]) + identity_data[key] = this.identities[key].encode(); - let _requires_save = false; - - export function save() { - const profiles: string[] = []; - for (const profile of available_profiles) - profiles.push(profile.encode()); - - const data = JSON.stringify({ + return JSON.stringify({ version: 1, - profiles: profiles + username: this.default_username, + password: this.default_password, + profile_name: this.profile_name, + identity_type: this.selected_identity_type, + identity_data: identity_data, + id: this.id }); - localStorage.setItem("profiles", data); } - export function mark_need_save() { - _requires_save = true; + valid(): boolean { + const identity = this.selected_identity(); + + return !!identity && identity.valid(); } +} - export function requires_save(): boolean { - return _requires_save; - } +async function decode_profile(data): Promise {
+ data = JSON.parse(data);
+ if (data.version !== 1)
+ return "invalid version";
- export function profiles(): ConnectionProfile[] {
- return available_profiles;
- }
+ const result: ConnectionProfile = new ConnectionProfile(data.id);
+ result.default_username = data.username;
+ result.default_password = data.password;
+ result.profile_name = data.profile_name;
+ result.selected_identity_type = (data.identity_type || "").toLowerCase();
- export function find_profile(id: string): ConnectionProfile | undefined {
- for (const profile of profiles())
- if (profile.id == id)
- return profile;
+ if (data.identity_data) {
+ for (const key of Object.keys(data.identity_data)) {
+ const type = IdentitifyType[key.toUpperCase() as string];
+ const _data = data.identity_data[key];
+ if (type == undefined) continue;
- return undefined;
- }
+ const identity = await decode_identity(type, _data);
+ if (identity == undefined) continue;
- export function find_profile_by_name(name: string): ConnectionProfile | undefined {
- name = name.toLowerCase();
- for (const profile of profiles())
- if ((profile.profile_name || "").toLowerCase() == name)
- return profile;
-
- return undefined;
- }
-
-
- export function default_profile(): ConnectionProfile {
- return find_profile("default");
- }
-
- export function set_default_profile(profile: ConnectionProfile) {
- const old_default = default_profile();
- if (old_default && old_default != profile) {
- old_default.id = guid();
+ result.identities[key.toLowerCase()] = identity;
}
- profile.id = "default";
- return old_default;
}
- export function delete_profile(profile: ConnectionProfile) {
- available_profiles.remove(profile);
+ return result;
+}
+
+interface ProfilesData {
+ version: number;
+ profiles: string[];
+}
+
+let available_profiles: ConnectionProfile[] = [];
+
+export async function load() {
+ available_profiles = [];
+
+ const profiles_json = localStorage.getItem("profiles");
+ let profiles_data: ProfilesData = (() => {
+ try {
+ return profiles_json ? JSON.parse(profiles_json) : {version: 0} as any;
+ } catch (error) {
+ debugger;
+ console.error(tr("Invalid profile json! Resetting profiles :( (%o)"), profiles_json);
+ createErrorModal(tr("Profile data invalid"), formatMessage(tr("The profile data is invalid.{:br:}This might cause data loss."))).open();
+ return {version: 0};
+ }
+ })();
+
+ if (profiles_data.version === 0) {
+ profiles_data = {
+ version: 1,
+ profiles: []
+ };
}
+ if (profiles_data.version == 1) {
+ for (const profile_data of profiles_data.profiles) {
+ const profile = await decode_profile(profile_data);
+ if (typeof (profile) === 'string') {
+ console.error(tr("Failed to load profile. Reason: %s, Profile data: %s"), profile, profiles_data);
+ continue;
+ }
+ available_profiles.push(profile);
+ }
+ }
+
+ if (!find_profile("default")) { //Create a default profile and teaforo profile
+ {
+ const profile = create_new_profile("default", "default");
+ profile.default_password = "";
+ profile.default_username = "";
+ profile.profile_name = "Default Profile";
+
+ /* generate default identity */
+ try {
+ const identity = await TeaSpeakIdentity.generate_new();
+ let active = true;
+ setTimeout(() => {
+ active = false;
+ }, 1000);
+ await identity.improve_level(8, 1, () => active);
+ profile.set_identity(IdentitifyType.TEAMSPEAK, identity);
+ profile.selected_identity_type = IdentitifyType[IdentitifyType.TEAMSPEAK];
+ } catch (error) {
+ createErrorModal(tr("Failed to generate default identity"), tr("Failed to generate default identity!
Please manually generate the identity within your settings => profiles")).open(); + } + } + + { /* forum identity (works only when connected to the forum) */ + const profile = create_new_profile("TeaSpeak Forum", "teaforo"); + profile.default_password = ""; + profile.default_username = ""; + profile.profile_name = "TeaSpeak Forum profile"; + + profile.set_identity(IdentitifyType.TEAFORO, TeaForumIdentity.identity()); + profile.selected_identity_type = IdentitifyType[IdentitifyType.TEAFORO]; + } + + save(); + } +} + +export function create_new_profile(name: string, id?: string): ConnectionProfile { + const profile = new ConnectionProfile(id || guid()); + profile.profile_name = name; + profile.default_username = ""; + available_profiles.push(profile); + return profile; +} + +let _requires_save = false; + +export function save() { + const profiles: string[] = []; + for (const profile of available_profiles) + profiles.push(profile.encode()); + + const data = JSON.stringify({ + version: 1, + profiles: profiles + }); + localStorage.setItem("profiles", data); +} + +export function mark_need_save() { + _requires_save = true; +} + +export function requires_save(): boolean { + return _requires_save; +} + +export function profiles(): ConnectionProfile[] { + return available_profiles; +} + +export function find_profile(id: string): ConnectionProfile | undefined { + for (const profile of profiles()) + if (profile.id == id) + return profile; + + return undefined; +} + +export function find_profile_by_name(name: string): ConnectionProfile | undefined { + name = name.toLowerCase(); + for (const profile of profiles()) + if ((profile.profile_name || "").toLowerCase() == name) + return profile; + + return undefined; +} + + +export function default_profile(): ConnectionProfile { + return find_profile("default"); +} + +export function set_default_profile(profile: ConnectionProfile) { + const old_default = default_profile(); + if (old_default && old_default != profile) { + old_default.id = guid(); + } + profile.id = "default"; + return old_default; +} + +export function delete_profile(profile: ConnectionProfile) { + available_profiles.remove(profile); } \ No newline at end of file diff --git a/shared/js/profiles/Identity.ts b/shared/js/profiles/Identity.ts index c658f46d..9f79adef 100644 --- a/shared/js/profiles/Identity.ts +++ b/shared/js/profiles/Identity.ts @@ -1,110 +1,119 @@ -namespace profiles.identities { - export enum IdentitifyType { - TEAFORO, - TEAMSPEAK, - NICKNAME +import {AbstractServerConnection, ServerCommand} from "tc-shared/connection/ConnectionBase"; +import {HandshakeIdentityHandler} from "tc-shared/connection/HandshakeHandler"; +import {AbstractCommandHandler} from "tc-shared/connection/AbstractCommandHandler"; + +export enum IdentitifyType { + TEAFORO, + TEAMSPEAK, + NICKNAME +} + +export interface Identity { + fallback_name(): string | undefined ; + uid() : string; + type() : IdentitifyType; + + valid() : boolean; + + encode?() : string; + decode(data: string) : Promise;
+
+ spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler;
+}
+
+/* avoid circular dependencies here */
+export async function decode_identity(type: IdentitifyType, data: string) : Promise {
+ let identity: Identity;
+ switch (type) {
+ case IdentitifyType.NICKNAME:
+ const nidentity = require("tc-shared/profiles/identities/NameIdentity");
+ identity = new nidentity.NameIdentity();
+ break;
+ case IdentitifyType.TEAFORO:
+ const fidentity = require("tc-shared/profiles/identities/TeaForumIdentity");
+ identity = new fidentity.TeaForumIdentity(undefined);
+ break;
+ case IdentitifyType.TEAMSPEAK:
+ const tidentity = require("tc-shared/profiles/identities/TeamSpeakIdentity");
+ identity = new tidentity.TeaSpeakIdentity(undefined, undefined);
+ break;
+ }
+ if(!identity)
+ return undefined;
+
+ try {
+ await identity.decode(data)
+ } catch(error) {
+ /* todo better error handling! */
+ console.error(error);
+ return undefined;
}
- export interface Identity {
- fallback_name(): string | undefined ;
- uid() : string;
- type() : IdentitifyType;
+ return identity;
+}
- valid() : boolean;
+export function create_identity(type: IdentitifyType) {
+ let identity: Identity;
+ switch (type) {
+ case IdentitifyType.NICKNAME:
+ const nidentity = require("tc-shared/profiles/identities/NameIdentity");
+ identity = new nidentity.NameIdentity();
+ break;
+ case IdentitifyType.TEAFORO:
+ const fidentity = require("tc-shared/profiles/identities/TeaForumIdentity");
+ identity = new fidentity.TeaForumIdentity(undefined);
+ break;
+ case IdentitifyType.TEAMSPEAK:
+ const tidentity = require("tc-shared/profiles/identities/TeamSpeakIdentity");
+ identity = new tidentity.TeaSpeakIdentity(undefined, undefined);
+ break;
+ }
+ return identity;
+}
- encode?() : string;
- decode(data: string) : Promise;
+export class HandshakeCommandHandler extends AbstractCommandHandler {
+ readonly handle: T;
- spawn_identity_handshake_handler(connection: connection.AbstractServerConnection) : connection.HandshakeIdentityHandler;
+ constructor(connection: AbstractServerConnection, handle: T) {
+ super(connection);
+ this.handle = handle;
}
- export async function decode_identity(type: IdentitifyType, data: string) : Promise {
- let identity: Identity;
- switch (type) {
- case IdentitifyType.NICKNAME:
- identity = new NameIdentity();
- break;
- case IdentitifyType.TEAFORO:
- identity = new TeaForumIdentity(undefined);
- break;
- case IdentitifyType.TEAMSPEAK:
- identity = new TeaSpeakIdentity(undefined, undefined);
- break;
- }
- if(!identity)
- return undefined;
- try {
- await identity.decode(data)
- } catch(error) {
- /* todo better error handling! */
- console.error(error);
- return undefined;
+ handle_command(command: ServerCommand): boolean {
+ if($.isFunction(this[command.command]))
+ this[command.command](command.arguments);
+ else if(command.command == "error") {
+ return false;
+ } else {
+ console.warn(tr("Received unknown command while handshaking (%o)"), command);
}
+ return true;
+ }
+}
- return identity;
+export abstract class AbstractHandshakeIdentityHandler implements HandshakeIdentityHandler {
+ connection: AbstractServerConnection;
+
+ protected callbacks: ((success: boolean, message?: string) => any)[] = [];
+
+ protected constructor(connection: AbstractServerConnection) {
+ this.connection = connection;
}
- export function create_identity(type: IdentitifyType) {
- let identity: Identity;
- switch (type) {
- case IdentitifyType.NICKNAME:
- identity = new NameIdentity();
- break;
- case IdentitifyType.TEAFORO:
- identity = new TeaForumIdentity(undefined);
- break;
- case IdentitifyType.TEAMSPEAK:
- identity = new TeaSpeakIdentity(undefined, undefined);
- break;
- }
- return identity;
+ register_callback(callback: (success: boolean, message?: string) => any) {
+ this.callbacks.push(callback);
}
- export class HandshakeCommandHandler extends connection.AbstractCommandHandler {
- readonly handle: T;
+ abstract start_handshake();
- constructor(connection: connection.AbstractServerConnection, handle: T) {
- super(connection);
- this.handle = handle;
- }
-
-
- handle_command(command: connection.ServerCommand): boolean {
- if($.isFunction(this[command.command]))
- this[command.command](command.arguments);
- else if(command.command == "error") {
- return false;
- } else {
- console.warn(tr("Received unknown command while handshaking (%o)"), command);
- }
- return true;
- }
+ protected trigger_success() {
+ for(const callback of this.callbacks)
+ callback(true);
}
- export abstract class AbstractHandshakeIdentityHandler implements connection.HandshakeIdentityHandler {
- connection: connection.AbstractServerConnection;
-
- protected callbacks: ((success: boolean, message?: string) => any)[] = [];
-
- protected constructor(connection: connection.AbstractServerConnection) {
- this.connection = connection;
- }
-
- register_callback(callback: (success: boolean, message?: string) => any) {
- this.callbacks.push(callback);
- }
-
- abstract start_handshake();
-
- protected trigger_success() {
- for(const callback of this.callbacks)
- callback(true);
- }
-
- protected trigger_fail(message: string) {
- for(const callback of this.callbacks)
- callback(false, message);
- }
+ protected trigger_fail(message: string) {
+ for(const callback of this.callbacks)
+ callback(false, message);
}
}
\ No newline at end of file
diff --git a/shared/js/profiles/identities/NameIdentity.ts b/shared/js/profiles/identities/NameIdentity.ts
index 51cbefc7..c0a14aa2 100644
--- a/shared/js/profiles/identities/NameIdentity.ts
+++ b/shared/js/profiles/identities/NameIdentity.ts
@@ -1,88 +1,97 @@
-/// ;
+console.error(AbstractHandshakeIdentityHandler);
+class NameHandshakeHandler extends AbstractHandshakeIdentityHandler {
+ readonly identity: NameIdentity;
+ handler: HandshakeCommandHandler;
- constructor(connection: connection.AbstractServerConnection, identity: profiles.identities.NameIdentity) {
- super(connection);
- this.identity = identity;
+ constructor(connection: AbstractServerConnection, identity: NameIdentity) {
+ super(connection);
+ this.identity = identity;
- this.handler = new HandshakeCommandHandler(connection, this);
- this.handler["handshakeidentityproof"] = () => this.trigger_fail("server requested unexpected proof");
- }
-
- start_handshake() {
- this.connection.command_handler_boss().register_handler(this.handler);
- this.connection.send_command("handshakebegin", {
- intention: 0,
- authentication_method: this.identity.type(),
- client_nickname: this.identity.name()
- }).catch(error => {
- log.error(LogCategory.IDENTITIES, tr("Failed to initialize name based handshake. Error: %o"), error);
- if(error instanceof CommandResult)
- error = error.extra_message || error.message;
- this.trigger_fail("failed to execute begin (" + error + ")");
- }).then(() => this.trigger_success());
- }
-
- protected trigger_fail(message: string) {
- this.connection.command_handler_boss().unregister_handler(this.handler);
- super.trigger_fail(message);
- }
-
- protected trigger_success() {
- this.connection.command_handler_boss().unregister_handler(this.handler);
- super.trigger_success();
- }
+ this.handler = new HandshakeCommandHandler(connection, this);
+ this.handler["handshakeidentityproof"] = () => this.trigger_fail("server requested unexpected proof");
}
- export class NameIdentity implements Identity {
- private _name: string;
+ start_handshake() {
+ this.connection.command_handler_boss().register_handler(this.handler);
+ this.connection.send_command("handshakebegin", {
+ intention: 0,
+ authentication_method: this.identity.type(),
+ client_nickname: this.identity.name()
+ }).catch(error => {
+ log.error(LogCategory.IDENTITIES, tr("Failed to initialize name based handshake. Error: %o"), error);
+ if(error instanceof CommandResult)
+ error = error.extra_message || error.message;
+ this.trigger_fail("failed to execute begin (" + error + ")");
+ }).then(() => this.trigger_success());
+ }
- constructor(name?: string) {
- this._name = name;
- }
+ protected trigger_fail(message: string) {
+ this.connection.command_handler_boss().unregister_handler(this.handler);
+ super.trigger_fail(message);
+ }
- set_name(name: string) { this._name = name; }
+ protected trigger_success() {
+ this.connection.command_handler_boss().unregister_handler(this.handler);
+ super.trigger_success();
+ }
+}
- name() : string { return this._name; }
+export class NameIdentity implements Identity {
+ private _name: string;
- fallback_name(): string | undefined {
- return this._name;
- }
+ constructor(name?: string) {
+ this._name = name;
+ }
- uid(): string {
- return btoa(this._name); //FIXME hash!
- }
+ set_name(name: string) { this._name = name; }
- type(): IdentitifyType {
- return IdentitifyType.NICKNAME;
- }
+ name() : string { return this._name; }
- valid(): boolean {
- return this._name != undefined && this._name.length >= 5;
- }
+ fallback_name(): string | undefined {
+ return this._name;
+ }
- decode(data) : Promise {
- data = JSON.parse(data);
- if(data.version !== 1)
- throw "invalid version";
+ uid(): string {
+ return btoa(this._name); //FIXME hash!
+ }
- this._name = data["name"];
- return;
- }
+ type(): IdentitifyType {
+ return IdentitifyType.NICKNAME;
+ }
- encode?() : string {
- return JSON.stringify({
- version: 1,
- name: this._name
- });
- }
+ valid(): boolean {
+ return this._name != undefined && this._name.length >= 5;
+ }
- spawn_identity_handshake_handler(connection: connection.AbstractServerConnection) : connection.HandshakeIdentityHandler {
- return new NameHandshakeHandler(connection, this);
- }
+ decode(data) : Promise {
+ data = JSON.parse(data);
+ if(data.version !== 1)
+ throw "invalid version";
+
+ this._name = data["name"];
+ return;
+ }
+
+ encode?() : string {
+ return JSON.stringify({
+ version: 1,
+ name: this._name
+ });
+ }
+
+ spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler {
+ return new NameHandshakeHandler(connection, this);
}
}
\ No newline at end of file
diff --git a/shared/js/profiles/identities/TeaForumIdentity.ts b/shared/js/profiles/identities/TeaForumIdentity.ts
index 2f44e31e..0e1ebb51 100644
--- a/shared/js/profiles/identities/TeaForumIdentity.ts
+++ b/shared/js/profiles/identities/TeaForumIdentity.ts
@@ -1,122 +1,135 @@
-/// ;
+class TeaForumHandshakeHandler extends AbstractHandshakeIdentityHandler {
+ readonly identity: TeaForumIdentity;
+ handler: HandshakeCommandHandler;
- constructor(connection: connection.AbstractServerConnection, identity: profiles.identities.TeaForumIdentity) {
- super(connection);
- this.identity = identity;
- this.handler = new HandshakeCommandHandler(connection, this);
- this.handler["handshakeidentityproof"] = this.handle_proof.bind(this);
- }
-
- start_handshake() {
- this.connection.command_handler_boss().register_handler(this.handler);
- this.connection.send_command("handshakebegin", {
- intention: 0,
- authentication_method: this.identity.type(),
- data: this.identity.data().data_json()
- }).catch(error => {
- log.error(LogCategory.IDENTITIES, tr("Failed to initialize TeaForum based handshake. Error: %o"), error);
-
- if(error instanceof CommandResult)
- error = error.extra_message || error.message;
- this.trigger_fail("failed to execute begin (" + error + ")");
- });
- }
-
-
- private handle_proof(json) {
- this.connection.send_command("handshakeindentityproof", {
- proof: this.identity.data().data_sign()
- }).catch(error => {
- log.error(LogCategory.IDENTITIES, tr("Failed to proof the identity. Error: %o"), error);
-
- if(error instanceof CommandResult)
- error = error.extra_message || error.message;
- this.trigger_fail("failed to execute proof (" + error + ")");
- }).then(() => this.trigger_success());
- }
-
- protected trigger_fail(message: string) {
- this.connection.command_handler_boss().unregister_handler(this.handler);
- super.trigger_fail(message);
- }
-
- protected trigger_success() {
- this.connection.command_handler_boss().unregister_handler(this.handler);
- super.trigger_success();
- }
+ constructor(connection: AbstractServerConnection, identity: TeaForumIdentity) {
+ super(connection);
+ this.identity = identity;
+ this.handler = new HandshakeCommandHandler(connection, this);
+ this.handler["handshakeidentityproof"] = this.handle_proof.bind(this);
}
- export class TeaForumIdentity implements Identity {
- private readonly identity_data: forum.Data;
+ start_handshake() {
+ this.connection.command_handler_boss().register_handler(this.handler);
+ this.connection.send_command("handshakebegin", {
+ intention: 0,
+ authentication_method: this.identity.type(),
+ data: this.identity.data().data_json()
+ }).catch(error => {
+ log.error(LogCategory.IDENTITIES, tr("Failed to initialize TeaForum based handshake. Error: %o"), error);
- valid() : boolean {
- return !!this.identity_data && !this.identity_data.is_expired();
- }
-
- constructor(data: forum.Data) {
- this.identity_data = data;
- }
-
- data() : forum.Data {
- return this.identity_data;
- }
-
- decode(data) : Promise {
- data = JSON.parse(data);
- if(data.version !== 1)
- throw "invalid version";
-
- return;
- }
-
- encode() : string {
- return JSON.stringify({
- version: 1
- });
- }
-
- spawn_identity_handshake_handler(connection: connection.AbstractServerConnection) : connection.HandshakeIdentityHandler {
- return new TeaForumHandshakeHandler(connection, this);
- }
-
- fallback_name(): string | undefined {
- return this.identity_data ? this.identity_data.name() : undefined;
- }
-
- type(): profiles.identities.IdentitifyType {
- return IdentitifyType.TEAFORO;
- }
-
- uid(): string {
- //FIXME: Real UID!
- return "TeaForo#" + ((this.identity_data ? this.identity_data.name() : "Another TeaSpeak user"));
- }
+ if(error instanceof CommandResult)
+ error = error.extra_message || error.message;
+ this.trigger_fail("failed to execute begin (" + error + ")");
+ });
}
- let static_identity: TeaForumIdentity;
- export function set_static_identity(identity: TeaForumIdentity) {
- static_identity = identity;
+ private handle_proof(json) {
+ this.connection.send_command("handshakeindentityproof", {
+ proof: this.identity.data().data_sign()
+ }).catch(error => {
+ log.error(LogCategory.IDENTITIES, tr("Failed to proof the identity. Error: %o"), error);
+
+ if(error instanceof CommandResult)
+ error = error.extra_message || error.message;
+ this.trigger_fail("failed to execute proof (" + error + ")");
+ }).then(() => this.trigger_success());
}
- export function update_forum() {
- if(forum.logged_in() && (!static_identity || static_identity.data() !== forum.data())) {
- static_identity = new TeaForumIdentity(forum.data());
- } else {
- static_identity = undefined;
- }
+ protected trigger_fail(message: string) {
+ this.connection.command_handler_boss().unregister_handler(this.handler);
+ super.trigger_fail(message);
}
- export function valid_static_forum_identity() : boolean {
- return static_identity && static_identity.valid();
+ protected trigger_success() {
+ this.connection.command_handler_boss().unregister_handler(this.handler);
+ super.trigger_success();
+ }
+}
+
+export class TeaForumIdentity implements Identity {
+ private readonly identity_data: forum.Data;
+
+ valid() : boolean {
+ return !!this.identity_data && !this.identity_data.is_expired();
}
- export function static_forum_identity() : TeaForumIdentity | undefined {
+ constructor(data: forum.Data) {
+ this.identity_data = data;
+ }
+
+ data() {
+ return this.identity_data;
+ }
+
+ decode(data) : Promise {
+ data = JSON.parse(data);
+ if(data.version !== 1)
+ throw "invalid version";
+
+ return;
+ }
+
+ encode() : string {
+ return JSON.stringify({
+ version: 1
+ });
+ }
+
+ spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler {
+ return new TeaForumHandshakeHandler(connection, this);
+ }
+
+ fallback_name(): string | undefined {
+ return this.identity_data ? this.identity_data.name() : undefined;
+ }
+
+ type(): IdentitifyType {
+ return IdentitifyType.TEAFORO;
+ }
+
+ uid(): string {
+ //FIXME: Real UID!
+ return "TeaForo#" + ((this.identity_data ? this.identity_data.name() : "Another TeaSpeak user"));
+ }
+
+ public static identity() {
return static_identity;
}
+}
+
+let static_identity: TeaForumIdentity;
+
+export function set_static_identity(identity: TeaForumIdentity) {
+ static_identity = identity;
+}
+
+export function update_forum() {
+ if(forum.logged_in() && (!static_identity || static_identity.data() !== forum.data())) {
+ static_identity = new TeaForumIdentity(forum.data());
+ } else {
+ static_identity = undefined;
+ }
+}
+
+export function valid_static_forum_identity() : boolean {
+ return static_identity && static_identity.valid();
+}
+
+export function static_forum_identity() : TeaForumIdentity | undefined {
+ return static_identity;
}
\ No newline at end of file
diff --git a/shared/js/profiles/identities/TeamSpeakIdentity.ts b/shared/js/profiles/identities/TeamSpeakIdentity.ts
index b7c5be9c..9c70f1f0 100644
--- a/shared/js/profiles/identities/TeamSpeakIdentity.ts
+++ b/shared/js/profiles/identities/TeamSpeakIdentity.ts
@@ -1,88 +1,121 @@
-/// {
- /* buffer could contains a zero! */
- const hash = new Uint8Array(await sha.sha1(buffer.buffer.slice(20, 20 + c_strlen(buffer, 20))));
- for(let i = 0; i < 20; i++)
- buffer[i] ^= hash[i];
-
- const length = Math.min(buffer.length, 100);
- for(let i = 0; i < length; i++)
- buffer[i] ^= crypt_key.charCodeAt(i);
-
- return arraybuffer_to_string(buffer);
- }
-
- export async function encrypt_ts_identity(buffer: Uint8Array) : Promise {
- const length = Math.min(buffer.length, 100);
- for(let i = 0; i < length; i++)
- buffer[i] ^= crypt_key.charCodeAt(i);
-
- const hash = new Uint8Array(await sha.sha1(buffer.buffer.slice(20, 20 + c_strlen(buffer, 20))));
- for(let i = 0; i < 20; i++)
- buffer[i] ^= hash[i];
-
- return base64_encode_ab(buffer);
- }
-
- /**
- * @param buffer base64 encoded ASN.1 string
- */
- export function decode_tomcrypt_key(buffer: string) {
- let decoded;
-
- try {
- decoded = asn1.decode(atob(buffer));
- } catch(error) {
- if(error instanceof DOMException)
- throw "failed to parse key buffer (invalid base64)";
- throw error;
- }
-
- let {x, y, k} = {
- x: decoded.children[2].content(Infinity, asn1.TagType.VisibleString),
- y: decoded.children[3].content(Infinity, asn1.TagType.VisibleString),
- k: decoded.children[4].content(Infinity, asn1.TagType.VisibleString)
- };
-
- if(x.length > 32) {
- if(x.charCodeAt(0) != 0)
- throw "Invalid X coordinate! (Too long)";
- x = x.substr(1);
- }
-
- if(y.length > 32) {
- if(y.charCodeAt(0) != 0)
- throw "Invalid Y coordinate! (Too long)";
- y = y.substr(1);
- }
-
- if(k.length > 32) {
- if(k.charCodeAt(0) != 0)
- throw "Invalid private coordinate! (Too long)";
- k = k.substr(1);
- }
-
- /*
- console.log("Key x: %s (%d)", btoa(x), x.length);
- console.log("Key y: %s (%d)", btoa(y), y.length);
- console.log("Key k: %s (%d)", btoa(k), k.length);
- */
- return {
- crv: "P-256",
- d: base64_url_encode(btoa(k)),
- x: base64_url_encode(btoa(x)),
- y: base64_url_encode(btoa(y)),
-
- ext: true,
- key_ops:["deriveKey", "sign"],
- kty:"EC",
- };
- }
+ return base64_encode_ab(buffer.buffer.slice(0, index));
}
- class TeaSpeakHandshakeHandler extends AbstractHandshakeIdentityHandler {
- identity: TeaSpeakIdentity;
- handler: HandshakeCommandHandler;
+ const crypt_key = "b9dfaa7bee6ac57ac7b65f1094a1c155e747327bc2fe5d51c512023fe54a280201004e90ad1daaae1075d53b7d571c30e063b5a62a4a017bb394833aa0983e6e";
+ function c_strlen(buffer: Uint8Array, offset: number) : number {
+ let index = 0;
+ while(index + offset < buffer.length && buffer[index + offset] != 0)
+ index++;
+ return index;
+ }
- constructor(connection: connection.AbstractServerConnection, identity: TeaSpeakIdentity) {
- super(connection);
- this.identity = identity;
- this.handler = new HandshakeCommandHandler(connection, this);
- this.handler["handshakeidentityproof"] = this.handle_proof.bind(this);
+ export async function decrypt_ts_identity(buffer: Uint8Array) : Promise {
+ /* buffer could contains a zero! */
+ const hash = new Uint8Array(await sha.sha1(buffer.buffer.slice(20, 20 + c_strlen(buffer, 20))));
+ for(let i = 0; i < 20; i++)
+ buffer[i] ^= hash[i];
+
+ const length = Math.min(buffer.length, 100);
+ for(let i = 0; i < length; i++)
+ buffer[i] ^= crypt_key.charCodeAt(i);
+
+ return arraybuffer_to_string(buffer);
+ }
+
+ export async function encrypt_ts_identity(buffer: Uint8Array) : Promise
';
- html += '';
- html += result.value;
- return html + "";
- }
- });
-
- /* override the yt parser */
- const original_parser = xbbcode.register.find_parser("yt");
- if(original_parser)
- xbbcode.register.register_parser({
- tag: ["yt", "youtube"],
- build_html(layer): string {
- const result = original_parser.build_html(layer);
- if(!result.startsWith("';
+ html += '';
+ html += result.value;
+ return html + "";
+ }
+ });
+
+ /* override the yt parser */
+ const original_parser = xbbcode.register.find_parser("yt");
+ if(original_parser)
+ xbbcode.register.register_parser({
+ tag: ["yt", "youtube"],
+ build_html(layer): string {
+ const result = original_parser.build_html(layer);
+ if(!result.startsWith(""), text => text.length > 0, result => { - if(result) { - const bookmark = create_bookmark(result as string, bookmarks(), { - server_port: ch.serverConnection.remote_address().port, - server_address: ch.serverConnection.remote_address().host, - - server_password: "", - server_password_hash: "" - }, name); - save_bookmark(bookmark); - - control_bar.update_bookmarks(); - top_menu.rebuild_bookmarks(); - - createInfoModal(tr("Server added"), tr("Server has been successfully added to your bookmarks.")).open(); - } - }).open(); - } else { - createErrorModal(tr("You have to be connected"), tr("You have to be connected!")).open(); +function find_bookmark_recursive(parent: DirectoryBookmark, uuid: string) : Bookmark | DirectoryBookmark { + for(const entry of parent.content) { + if(entry.unique_id == uuid) + return entry; + if(entry.type == BookmarkType.DIRECTORY) { + const result = find_bookmark_recursive(entry as DirectoryBookmark, uuid); + if(result) return result; } } + return undefined; +} + +export function find_bookmark(uuid: string) : Bookmark | DirectoryBookmark | undefined { + return find_bookmark_recursive(bookmarks(), uuid); +} + +export function parent_bookmark(bookmark: Bookmark) : DirectoryBookmark { + const books: (DirectoryBookmark | Bookmark)[] = [bookmarks()]; + while(!books.length) { + const directory = books.pop_front(); + if(directory.type == BookmarkType.DIRECTORY) { + const cast =
"), text => text.length > 0, result => { + if(result) { + const bookmark = create_bookmark(result as string, bookmarks(), { + server_port: ch.serverConnection.remote_address().port, + server_address: ch.serverConnection.remote_address().host, + + server_password: "", + server_password_hash: "" + }, name); + save_bookmark(bookmark); + + control_bar.update_bookmarks(); + top_menu.rebuild_bookmarks(); + + createInfoModal(tr("Server added"), tr("Server has been successfully added to your bookmarks.")).open(); + } + }).open(); + } else { + createErrorModal(tr("You have to be connected"), tr("You have to be connected!")).open(); + } } \ No newline at end of file diff --git a/shared/js/connection/AbstractCommandHandler.ts b/shared/js/connection/AbstractCommandHandler.ts new file mode 100644 index 00000000..c545574c --- /dev/null +++ b/shared/js/connection/AbstractCommandHandler.ts @@ -0,0 +1,98 @@ +import { + AbstractServerConnection, + ServerCommand, + SingleCommandHandler +} from "tc-shared/connection/ConnectionBase"; + +export abstract class AbstractCommandHandler { + readonly connection: AbstractServerConnection; + + handler_boss: AbstractCommandHandlerBoss | undefined; + volatile_handler_boss: boolean = false; /* if true than the command handler could be registered twice to two or more handlers */ + + ignore_consumed: boolean = false; + + protected constructor(connection: AbstractServerConnection) { + this.connection = connection; + } + + /** + * @return If the command should be consumed + */ + abstract handle_command(command: ServerCommand) : boolean; +} + +export abstract class AbstractCommandHandlerBoss { + readonly connection: AbstractServerConnection; + protected command_handlers: AbstractCommandHandler[] = []; + /* TODO: Timeout */ + protected single_command_handler: SingleCommandHandler[] = []; + + protected constructor(connection: AbstractServerConnection) { + this.connection = connection; + } + + destroy() { + this.command_handlers = undefined; + this.single_command_handler = undefined; + } + + register_handler(handler: AbstractCommandHandler) { + if(!handler.volatile_handler_boss && handler.handler_boss) + throw "handler already registered"; + + this.command_handlers.remove(handler); /* just to be sure */ + this.command_handlers.push(handler); + handler.handler_boss = this; + } + + unregister_handler(handler: AbstractCommandHandler) { + if(!handler.volatile_handler_boss && handler.handler_boss !== this) { + console.warn(tr("Tried to unregister command handler which does not belong to the handler boss")); + return; + } + + this.command_handlers.remove(handler); + handler.handler_boss = undefined; + } + + + register_single_handler(handler: SingleCommandHandler) { + this.single_command_handler.push(handler); + } + + remove_single_handler(handler: SingleCommandHandler) { + this.single_command_handler.remove(handler); + } + + handlers() : AbstractCommandHandler[] { + return this.command_handlers; + } + + invoke_handle(command: ServerCommand) : boolean { + let flag_consumed = false; + + for(const handler of this.command_handlers) { + try { + if(!flag_consumed || handler.ignore_consumed) + flag_consumed = flag_consumed || handler.handle_command(command); + } catch(error) { + console.error(tr("Failed to invoke command handler. Invocation results in an exception: %o"), error); + } + } + + for(const handler of [...this.single_command_handler]) { + if(handler.command && handler.command != command.command) + continue; + + try { + if(handler.function(command)) + this.single_command_handler.remove(handler); + } catch(error) { + console.error(tr("Failed to invoke single command handler. Invocation results in an exception: %o"), error); + } + } + + return flag_consumed; + } +} \ No newline at end of file diff --git a/shared/js/connection/CommandHandler.ts b/shared/js/connection/CommandHandler.ts index f5e4bfed..1620d8b5 100644 --- a/shared/js/connection/CommandHandler.ts +++ b/shared/js/connection/CommandHandler.ts @@ -1,309 +1,465 @@ -///
Please enter the \"privilege key\" that was automatically generated when this server was created to gain administrator permissions."), message => message.length > 0, result => { - if(!result) return; - const scon = server_connections.active_connection_handler(); - - if(scon.serverConnection.connected) - scon.serverConnection.send_command("tokenuse", { - token: result - }).then(() => { - createInfoModal(tr("Use privilege key"), tr("Privilege key successfully used!")).open(); - }).catch(error => { - createErrorModal(tr("Use privilege key"), MessageHelper.formatMessage(tr("Failed to use privilege key: {}"), error instanceof CommandResult ? error.message : error)).open(); + if(properties.virtualserver_hostmessage_mode == 3) { + /* first let the client initialize his stuff */ + setTimeout(() => { + this.connection_handler.log.log(server_log.Type.SERVER_HOST_MESSAGE_DISCONNECT, { + message: properties.virtualserver_welcomemessage }); - }, { field_placeholder: 'Enter Privilege Key' }).open(); - } - this.connection_handler.log.log(log.server.Type.CONNECTION_CONNECTED, { - own_client: this.connection_handler.getClient().log_data() - }); - this.connection_handler.sound.play(Sound.CONNECTION_CONNECTED); - this.connection.client.onConnected(); - } - - handleNotifyServerConnectionInfo(json) { - json = json[0]; - - /* everything is a number, so lets parse it */ - for(const key of Object.keys(json)) - json[key] = parseFloat(json[key]); - - this.connection_handler.channelTree.server.set_connection_info(json); - } - - handleNotifyConnectionInfo(json) { - json = json[0]; - - const object = new ClientConnectionInfo(); - /* everything is a number (except ip), so lets parse it */ - for(const key of Object.keys(json)) { - if(key === "connection_client_ip") - object[key] = json[key]; - else - object[key] = parseFloat(json[key]); - } - - const client = this.connection_handler.channelTree.findClient(parseInt(json["clid"])); - if(!client) { - log.warn(LogCategory.NETWORKING, tr("Received client connection info for unknown client (%o)"), json["clid"]); - return; - } - - client.set_connection_info(object); - } - - private createChannelFromJson(json, ignoreOrder: boolean = false) { - let tree = this.connection.client.channelTree; - - let channel = new ChannelEntry(parseInt(json["cid"]), json["channel_name"], tree.findChannel(json["cpid"])); - tree.insertChannel(channel); - if(json["channel_order"] !== "0") { - let prev = tree.findChannel(json["channel_order"]); - if(!prev && json["channel_order"] != 0) { - if(!ignoreOrder) { - log.error(LogCategory.NETWORKING, tr("Invalid channel order id!")); - return; - } + this.connection.disconnect("host message disconnect"); + this.connection_handler.handleDisconnect(DisconnectReason.SERVER_HOSTMESSAGE); + this.connection_handler.sound.play(Sound.CONNECTION_DISCONNECTED); + }, 100); } + } + } - let parent = tree.findChannel(json["cpid"]); - if(!parent && json["cpid"] != 0) { - log.error(LogCategory.NETWORKING, tr("Invalid channel parent")); + /* welcome message */ + if(properties.virtualserver_welcomemessage) { + this.connection_handler.log.log(server_log.Type.SERVER_WELCOME_MESSAGE, { + message: properties.virtualserver_welcomemessage + }); + } + + /* priviledge key */ + if(properties.virtualserver_ask_for_privilegekey) { + createInputModal(tr("Use a privilege key"), tr("This is a newly created server for which administrator privileges have not yet been claimed.
Please enter the \"privilege key\" that was automatically generated when this server was created to gain administrator permissions."), message => message.length > 0, result => { + if(!result) return; + const scon = server_connections.active_connection_handler(); + + if(scon.serverConnection.connected) + scon.serverConnection.send_command("tokenuse", { + token: result + }).then(() => { + createInfoModal(tr("Use privilege key"), tr("Privilege key successfully used!")).open(); + }).catch(error => { + createErrorModal(tr("Use privilege key"), formatMessage(tr("Failed to use privilege key: {}"), error instanceof CommandResult ? error.message : error)).open(); + }); + }, { field_placeholder: 'Enter Privilege Key' }).open(); + } + + this.connection_handler.log.log(server_log.Type.CONNECTION_CONNECTED, { + own_client: this.connection_handler.getClient().log_data() + }); + this.connection_handler.sound.play(Sound.CONNECTION_CONNECTED); + this.connection.client.onConnected(); + } + + handleNotifyServerConnectionInfo(json) { + json = json[0]; + + /* everything is a number, so lets parse it */ + for(const key of Object.keys(json)) + json[key] = parseFloat(json[key]); + + this.connection_handler.channelTree.server.set_connection_info(json); + } + + handleNotifyConnectionInfo(json) { + json = json[0]; + + const object = new ClientConnectionInfo(); + /* everything is a number (except ip), so lets parse it */ + for(const key of Object.keys(json)) { + if(key === "connection_client_ip") + object[key] = json[key]; + else + object[key] = parseFloat(json[key]); + } + + const client = this.connection_handler.channelTree.findClient(parseInt(json["clid"])); + if(!client) { + log.warn(LogCategory.NETWORKING, tr("Received client connection info for unknown client (%o)"), json["clid"]); + return; + } + + client.set_connection_info(object); + } + + private createChannelFromJson(json, ignoreOrder: boolean = false) { + let tree = this.connection.client.channelTree; + + let channel = new ChannelEntry(parseInt(json["cid"]), json["channel_name"], tree.findChannel(json["cpid"])); + tree.insertChannel(channel); + if(json["channel_order"] !== "0") { + let prev = tree.findChannel(json["channel_order"]); + if(!prev && json["channel_order"] != 0) { + if(!ignoreOrder) { + log.error(LogCategory.NETWORKING, tr("Invalid channel order id!")); return; } - tree.moveChannel(channel, prev, parent); //TODO test if channel exists! } - if(ignoreOrder) { - for(let ch of tree.channels) { - if(ch.properties.channel_order == channel.channelId) { - tree.moveChannel(ch, channel, channel.parent); //Corrent the order :) - } + + let parent = tree.findChannel(json["cpid"]); + if(!parent && json["cpid"] != 0) { + log.error(LogCategory.NETWORKING, tr("Invalid channel parent")); + return; + } + tree.moveChannel(channel, prev, parent); //TODO test if channel exists! + } + if(ignoreOrder) { + for(let ch of tree.channels) { + if(ch.properties.channel_order == channel.channelId) { + tree.moveChannel(ch, channel, channel.parent); //Corrent the order :) + } + } + } + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "cid") continue; + if(key === "cpid") continue; + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + + updates.push({key: key, value: json[key]}); + } + channel.updateVariables(...updates); + } + + handleCommandChannelList(json) { + this.connection.client.channelTree.hide_channel_tree(); /* dont perform channel inserts on the dom to prevent style recalculations */ + log.debug(LogCategory.NETWORKING, tr("Got %d new channels"), json.length); + for(let index = 0; index < json.length; index++) + this.createChannelFromJson(json[index], true); + } + + + handleCommandChannelListFinished(json) { + this.connection.client.channelTree.show_channel_tree(); + } + + handleCommandChannelCreate(json) { + this.createChannelFromJson(json[0]); + } + + handleCommandChannelShow(json) { + this.createChannelFromJson(json[0]); //TODO may chat? + } + + handleCommandChannelDelete(json) { + let tree = this.connection.client.channelTree; + const conversations = this.connection.client.side_bar.channel_conversations(); + + log.info(LogCategory.NETWORKING, tr("Got %d channel deletions"), json.length); + for(let index = 0; index < json.length; index++) { + conversations.delete_conversation(parseInt(json[index]["cid"])); + let channel = tree.findChannel(json[index]["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Invalid channel onDelete (Unknown channel)")); + continue; + } + tree.deleteChannel(channel); + } + } + + handleCommandChannelHide(json) { + let tree = this.connection.client.channelTree; + const conversations = this.connection.client.side_bar.channel_conversations(); + + log.info(LogCategory.NETWORKING, tr("Got %d channel hides"), json.length); + for(let index = 0; index < json.length; index++) { + conversations.delete_conversation(parseInt(json[index]["cid"])); + let channel = tree.findChannel(json[index]["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Invalid channel on hide (Unknown channel)")); + continue; + } + tree.deleteChannel(channel); + } + } + + handleCommandClientEnterView(json) { + let tree = this.connection.client.channelTree; + + let client: ClientEntry; + let channel = undefined; + let old_channel = undefined; + let reason_id, reason_msg; + + let invokerid, invokername, invokeruid; + + for(const entry of json) { + /* attempt to update properties if given */ + channel = typeof(entry["ctid"]) !== "undefined" ? tree.findChannel(parseInt(entry["ctid"])) : channel; + old_channel = typeof(entry["cfid"]) !== "undefined" ? tree.findChannel(parseInt(entry["cfid"])) : old_channel; + reason_id = typeof(entry["reasonid"]) !== "undefined" ? entry["reasonid"] : reason_id; + reason_msg = typeof(entry["reason_msg"]) !== "undefined" ? entry["reason_msg"] : reason_msg; + + invokerid = typeof(entry["invokerid"]) !== "undefined" ? parseInt(entry["invokerid"]) : invokerid; + invokername = typeof(entry["invokername"]) !== "undefined" ? entry["invokername"] : invokername; + invokeruid = typeof(entry["invokeruid"]) !== "undefined" ? entry["invokeruid"] : invokeruid; + + client = tree.findClient(parseInt(entry["clid"])); + + if(!client) { + if(parseInt(entry["client_type_exact"]) == ClientType.CLIENT_MUSIC) { + client = new MusicClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); + } else { + client = new ClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); + } + + client.properties.client_type = parseInt(entry["client_type"]); + client = tree.insertClient(client, channel); + } else { + tree.moveClient(client, channel); + } + + if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { + const own_channel = this.connection.client.getClient().currentChannel(); + this.connection_handler.log.log(server_log.Type.CLIENT_VIEW_ENTER, { + channel_from: old_channel ? old_channel.log_data() : undefined, + channel_to: channel ? channel.log_data() : undefined, + client: client.log_data(), + invoker: this.loggable_invoker(invokeruid, invokerid, invokername), + message:reason_msg, + reason: parseInt(reason_id), + own_channel: channel == own_channel + }); + + if(reason_id == ViewReasonId.VREASON_USER_ACTION) { + if(own_channel == channel) + if(old_channel) + this.connection_handler.sound.play(Sound.USER_ENTERED); + else + this.connection_handler.sound.play(Sound.USER_ENTERED_CONNECT); + } else if(reason_id == ViewReasonId.VREASON_MOVED) { + if(own_channel == channel) + this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); + } else if(reason_id == ViewReasonId.VREASON_CHANNEL_KICK) { + if(own_channel == channel) + this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); + } else if(reason_id == ViewReasonId.VREASON_SYSTEM) { + + } else { + console.warn(tr("Unknown reasonid for %o"), reason_id); } } @@ -311,159 +467,113 @@ namespace connection { key: string, value: string }[] = []; - for(let key in json) { - if(key === "cid") continue; - if(key === "cpid") continue; + + for(let key in entry) { + if(key == "cfid") continue; + if(key == "ctid") continue; if(key === "invokerid") continue; if(key === "invokername") continue; if(key === "invokeruid") continue; if(key === "reasonid") continue; - updates.push({key: key, value: json[key]}); + updates.push({key: key, value: entry[key]}); } - channel.updateVariables(...updates); - } - handleCommandChannelList(json) { - this.connection.client.channelTree.hide_channel_tree(); /* dont perform channel inserts on the dom to prevent style recalculations */ - log.debug(LogCategory.NETWORKING, tr("Got %d new channels"), json.length); - for(let index = 0; index < json.length; index++) - this.createChannelFromJson(json[index], true); - } + client.updateVariables(...updates); + /* if its a new client join, or a system reason (like we joined) */ + if(!old_channel || reason_id == 2) { + /* client new join */ + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + unique_id: client.properties.client_unique_identifier, + client_id: client.clientId(), + name: client.clientNickName() + }, { + create: false, + attach: true + }); + if(conversation) + client.flag_text_unread = conversation.is_unread(); + } - handleCommandChannelListFinished(json) { - this.connection.client.channelTree.show_channel_tree(); - } - - handleCommandChannelCreate(json) { - this.createChannelFromJson(json[0]); - } - - handleCommandChannelShow(json) { - this.createChannelFromJson(json[0]); //TODO may chat? - } - - handleCommandChannelDelete(json) { - let tree = this.connection.client.channelTree; - const conversations = this.connection.client.side_bar.channel_conversations(); - - log.info(LogCategory.NETWORKING, tr("Got %d channel deletions"), json.length); - for(let index = 0; index < json.length; index++) { - conversations.delete_conversation(parseInt(json[index]["cid"])); - let channel = tree.findChannel(json[index]["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Invalid channel onDelete (Unknown channel)")); - continue; - } - tree.deleteChannel(channel); + if(client instanceof LocalClientEntry) { + client.initializeListener(); + this.connection_handler.update_voice_status(); + this.connection_handler.side_bar.info_frame().update_channel_talk(); + const conversations = this.connection.client.side_bar.channel_conversations(); + conversations.set_current_channel(client.currentChannel().channelId); } } + } - handleCommandChannelHide(json) { + handleCommandClientLeftView(json) { + let reason_id = -1; + + for(const entry of json) { + reason_id = entry["reasonid"] || reason_id; let tree = this.connection.client.channelTree; - const conversations = this.connection.client.side_bar.channel_conversations(); - - log.info(LogCategory.NETWORKING, tr("Got %d channel hides"), json.length); - for(let index = 0; index < json.length; index++) { - conversations.delete_conversation(parseInt(json[index]["cid"])); - let channel = tree.findChannel(json[index]["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Invalid channel on hide (Unknown channel)")); - continue; - } - tree.deleteChannel(channel); + let client = tree.findClient(entry["clid"]); + if(!client) { + log.error(LogCategory.NETWORKING, tr("Unknown client left!")); + return 0; } - } - - handleCommandClientEnterView(json) { - let tree = this.connection.client.channelTree; - - let client: ClientEntry; - let channel = undefined; - let old_channel = undefined; - let reason_id, reason_msg; - - let invokerid, invokername, invokeruid; - - for(const entry of json) { - /* attempt to update properties if given */ - channel = typeof(entry["ctid"]) !== "undefined" ? tree.findChannel(parseInt(entry["ctid"])) : channel; - old_channel = typeof(entry["cfid"]) !== "undefined" ? tree.findChannel(parseInt(entry["cfid"])) : old_channel; - reason_id = typeof(entry["reasonid"]) !== "undefined" ? entry["reasonid"] : reason_id; - reason_msg = typeof(entry["reason_msg"]) !== "undefined" ? entry["reason_msg"] : reason_msg; - - invokerid = typeof(entry["invokerid"]) !== "undefined" ? parseInt(entry["invokerid"]) : invokerid; - invokername = typeof(entry["invokername"]) !== "undefined" ? entry["invokername"] : invokername; - invokeruid = typeof(entry["invokeruid"]) !== "undefined" ? entry["invokeruid"] : invokeruid; - - client = tree.findClient(parseInt(entry["clid"])); - - if(!client) { - if(parseInt(entry["client_type_exact"]) == ClientType.CLIENT_MUSIC) { - client = new MusicClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); - } else { - client = new ClientEntry(parseInt(entry["clid"]), entry["client_nickname"]); - } - - client.properties.client_type = parseInt(entry["client_type"]); - client = tree.insertClient(client, channel); + if(client == this.connection.client.getClient()) { + if(reason_id == ViewReasonId.VREASON_BAN) { + this.connection.client.handleDisconnect(DisconnectReason.CLIENT_BANNED, entry); + } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { + this.connection.client.handleDisconnect(DisconnectReason.CLIENT_KICKED, entry); + } else if(reason_id == ViewReasonId.VREASON_SERVER_SHUTDOWN) { + this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); + } else if(reason_id == ViewReasonId.VREASON_SERVER_STOPPED) { + this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); } else { - tree.moveClient(client, channel); + this.connection.client.handleDisconnect(DisconnectReason.UNKNOWN, entry); } + this.connection_handler.side_bar.info_frame().update_channel_talk(); + return; + } - if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { - const own_channel = this.connection.client.getClient().currentChannel(); - this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_ENTER, { - channel_from: old_channel ? old_channel.log_data() : undefined, - channel_to: channel ? channel.log_data() : undefined, - client: client.log_data(), - invoker: this.loggable_invoker(invokeruid, invokerid, invokername), - message:reason_msg, - reason: parseInt(reason_id), - own_channel: channel == own_channel - }); + if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { + const own_channel = this.connection.client.getClient().currentChannel(); + let channel_from = tree.findChannel(entry["cfid"]); + let channel_to = tree.findChannel(entry["ctid"]); + + const is_own_channel = channel_from == own_channel; + this.connection_handler.log.log(server_log.Type.CLIENT_VIEW_LEAVE, { + channel_from: channel_from ? channel_from.log_data() : undefined, + channel_to: channel_to ? channel_to.log_data() : undefined, + client: client.log_data(), + invoker: this.loggable_invoker(entry["invokeruid"], entry["invokerid"], entry["invokername"]), + message: entry["reasonmsg"], + reason: parseInt(entry["reasonid"]), + ban_time: parseInt(entry["bantime"]), + own_channel: is_own_channel + }); + + if(is_own_channel) { if(reason_id == ViewReasonId.VREASON_USER_ACTION) { - if(own_channel == channel) - if(old_channel) - this.connection_handler.sound.play(Sound.USER_ENTERED); - else - this.connection_handler.sound.play(Sound.USER_ENTERED_CONNECT); - } else if(reason_id == ViewReasonId.VREASON_MOVED) { - if(own_channel == channel) - this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); + this.connection_handler.sound.play(Sound.USER_LEFT); + } else if(reason_id == ViewReasonId.VREASON_SERVER_LEFT) { + this.connection_handler.sound.play(Sound.USER_LEFT_DISCONNECT); + } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { + this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_SERVER); } else if(reason_id == ViewReasonId.VREASON_CHANNEL_KICK) { - if(own_channel == channel) - this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); - } else if(reason_id == ViewReasonId.VREASON_SYSTEM) { - + this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); + } else if(reason_id == ViewReasonId.VREASON_BAN) { + this.connection_handler.sound.play(Sound.USER_LEFT_BANNED); + } else if(reason_id == ViewReasonId.VREASON_TIMEOUT) { + this.connection_handler.sound.play(Sound.USER_LEFT_TIMEOUT); + } else if(reason_id == ViewReasonId.VREASON_MOVED) { + this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); } else { - console.warn(tr("Unknown reasonid for %o"), reason_id); + log.error(LogCategory.NETWORKING, tr("Unknown client left reason %d!"), reason_id); } } - let updates: { - key: string, - value: string - }[] = []; - - for(let key in entry) { - if(key == "cfid") continue; - if(key == "ctid") continue; - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - - updates.push({key: key, value: entry[key]}); - } - - client.updateVariables(...updates); - - /* if its a new client join, or a system reason (like we joined) */ - if(!old_channel || reason_id == 2) { - /* client new join */ + if(!channel_to) { + /* client left the server */ const conversation_manager = this.connection_handler.side_bar.private_conversations(); const conversation = conversation_manager.find_conversation({ unique_id: client.properties.client_unique_identifier, @@ -471,690 +581,599 @@ namespace connection { name: client.clientNickName() }, { create: false, - attach: true + attach: false }); - if(conversation) - client.flag_text_unread = conversation.is_unread(); - } - - if(client instanceof LocalClientEntry) { - client.initializeListener(); - this.connection_handler.update_voice_status(); - this.connection_handler.side_bar.info_frame().update_channel_talk(); - const conversations = this.connection.client.side_bar.channel_conversations(); - conversations.set_current_channel(client.currentChannel().channelId); - } - } - } - - handleCommandClientLeftView(json) { - let reason_id = -1; - - for(const entry of json) { - reason_id = entry["reasonid"] || reason_id; - let tree = this.connection.client.channelTree; - let client = tree.findClient(entry["clid"]); - if(!client) { - log.error(LogCategory.NETWORKING, tr("Unknown client left!")); - return 0; - } - if(client == this.connection.client.getClient()) { - if(reason_id == ViewReasonId.VREASON_BAN) { - this.connection.client.handleDisconnect(DisconnectReason.CLIENT_BANNED, entry); - } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { - this.connection.client.handleDisconnect(DisconnectReason.CLIENT_KICKED, entry); - } else if(reason_id == ViewReasonId.VREASON_SERVER_SHUTDOWN) { - this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); - } else if(reason_id == ViewReasonId.VREASON_SERVER_STOPPED) { - this.connection.client.handleDisconnect(DisconnectReason.SERVER_CLOSED, entry); - } else { - this.connection.client.handleDisconnect(DisconnectReason.UNKNOWN, entry); - } - this.connection_handler.side_bar.info_frame().update_channel_talk(); - return; - } - - - if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { - const own_channel = this.connection.client.getClient().currentChannel(); - let channel_from = tree.findChannel(entry["cfid"]); - let channel_to = tree.findChannel(entry["ctid"]); - - const is_own_channel = channel_from == own_channel; - this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_LEAVE, { - channel_from: channel_from ? channel_from.log_data() : undefined, - channel_to: channel_to ? channel_to.log_data() : undefined, - client: client.log_data(), - invoker: this.loggable_invoker(entry["invokeruid"], entry["invokerid"], entry["invokername"]), - message: entry["reasonmsg"], - reason: parseInt(entry["reasonid"]), - ban_time: parseInt(entry["bantime"]), - own_channel: is_own_channel - }); - - if(is_own_channel) { - if(reason_id == ViewReasonId.VREASON_USER_ACTION) { - this.connection_handler.sound.play(Sound.USER_LEFT); - } else if(reason_id == ViewReasonId.VREASON_SERVER_LEFT) { - this.connection_handler.sound.play(Sound.USER_LEFT_DISCONNECT); - } else if(reason_id == ViewReasonId.VREASON_SERVER_KICK) { - this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_SERVER); - } else if(reason_id == ViewReasonId.VREASON_CHANNEL_KICK) { - this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); - } else if(reason_id == ViewReasonId.VREASON_BAN) { - this.connection_handler.sound.play(Sound.USER_LEFT_BANNED); - } else if(reason_id == ViewReasonId.VREASON_TIMEOUT) { - this.connection_handler.sound.play(Sound.USER_LEFT_TIMEOUT); - } else if(reason_id == ViewReasonId.VREASON_MOVED) { - this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); - } else { - log.error(LogCategory.NETWORKING, tr("Unknown client left reason %d!"), reason_id); - } - } - - if(!channel_to) { - /* client left the server */ - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - unique_id: client.properties.client_unique_identifier, - client_id: client.clientId(), - name: client.clientNickName() - }, { - create: false, - attach: false - }); - if(conversation) { - conversation.set_state(chat.PrivateConversationState.DISCONNECTED); - } + if(conversation) { + conversation.set_state(PrivateConversationState.DISCONNECTED); } } - - tree.deleteClient(client); - } - } - - handleNotifyClientMoved(json) { - json = json[0]; //Only one bulk - let tree = this.connection.client.channelTree; - let client = tree.findClient(json["clid"]); - let self = client instanceof LocalClientEntry; - - let channel_to = tree.findChannel(parseInt(json["ctid"])); - let channel_from = tree.findChannel(parseInt(json["cfid"])); - - if(!client) { - log.error(LogCategory.NETWORKING, tr("Unknown client move (Client)!")); - return 0; } - if(!channel_to) { - log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel to)!")); - return 0; - } - - if(!self) { - if(!channel_from) { - log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel from)!")); - channel_from = client.currentChannel(); - } else if(channel_from != client.currentChannel()) { - log.error(LogCategory.NETWORKING, - tr("Client move from invalid source channel! Local client registered in channel %d but server send %d."), - client.currentChannel().channelId, channel_from.channelId - ); - } - } else { - channel_from = client.currentChannel(); - } - - tree.moveClient(client, channel_to); - - if(self) { - this.connection_handler.update_voice_status(channel_to); - - for(const entry of client.channelTree.clientsByChannel(channel_from)) { - if(entry !== client && entry.get_audio_handle()) { - entry.get_audio_handle().abort_replay(); - entry.speaking = false; - } - } - - const side_bar = this.connection_handler.side_bar; - side_bar.info_frame().update_channel_talk(); - - const conversation_to = side_bar.channel_conversations().conversation(channel_to.channelId, false); - if(conversation_to) - conversation_to.update_private_state(); - - if(channel_from) { - const conversation_from = side_bar.channel_conversations().conversation(channel_from.channelId, false); - if(conversation_from) - conversation_from.update_private_state(); - } - - side_bar.channel_conversations().update_chat_box(); - } - - const own_channel = this.connection.client.getClient().currentChannel(); - this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_MOVE, { - channel_from: channel_from ? { - channel_id: channel_from.channelId, - channel_name: channel_from.channelName() - } : undefined, - channel_from_own: channel_from == own_channel, - - channel_to: channel_to ? { - channel_id: channel_to.channelId, - channel_name: channel_to.channelName() - } : undefined, - channel_to_own: channel_to == own_channel, - - client: { - client_id: client.clientId(), - client_name: client.clientNickName(), - client_unique_id: client.properties.client_unique_identifier - }, - client_own: self, - - invoker: this.loggable_invoker(json["invokeruid"], json["invokerid"], json["invokername"]), - - message: json["reasonmsg"], - reason: parseInt(json["reasonid"]), - }); - if(json["reasonid"] == ViewReasonId.VREASON_MOVED) { - if(self) - this.connection_handler.sound.play(Sound.USER_MOVED_SELF); - else if(own_channel == channel_to) - this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); - else if(own_channel == channel_from) - this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); - } else if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) { - if(self) {} //If we do an action we wait for the error response - else if(own_channel == channel_to) - this.connection_handler.sound.play(Sound.USER_ENTERED); - else if(own_channel == channel_from) - this.connection_handler.sound.play(Sound.USER_LEFT); - } else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) { - if(self) { - this.connection_handler.sound.play(Sound.CHANNEL_KICKED); - } else if(own_channel == channel_to) - this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); - else if(own_channel == channel_from) - this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); - } else { - console.warn(tr("Unknown reason id %o"), json["reasonid"]); - } - } - - handleNotifyChannelMoved(json) { - json = json[0]; //Only one bulk - - let tree = this.connection.client.channelTree; - let channel = tree.findChannel(json["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Unknown channel move (Channel)!")); - return 0; - } - - let prev = tree.findChannel(json["order"]); - if(!prev && json["order"] != 0) { - log.error(LogCategory.NETWORKING, tr("Unknown channel move (prev)!")); - return 0; - } - - let parent = tree.findChannel(json["cpid"]); - if(!parent && json["cpid"] != 0) { - log.error(LogCategory.NETWORKING, tr("Unknown channel move (parent)!")); - return 0; - } - - tree.moveChannel(channel, prev, parent); - } - - handleNotifyChannelEdited(json) { - json = json[0]; //Only one bulk - - let tree = this.connection.client.channelTree; - let channel = tree.findChannel(json["cid"]); - if(!channel) { - log.error(LogCategory.NETWORKING, tr("Unknown channel edit (Channel)!")); - return 0; - } - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key === "cid") continue; - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - updates.push({key: key, value: json[key]}); - } - channel.updateVariables(...updates); - - if(this.connection_handler.getClient().currentChannel() === channel) { - //TODO: Playback sound that your channel has been edited - this.connection_handler.update_voice_status(); - } - } - - handleNotifyTextMessage(json) { - json = json[0]; //Only one bulk - - let mode = json["targetmode"]; - if(mode == 1){ - //json["invokerid"], json["invokername"], json["invokeruid"] - const target_client_id = parseInt(json["target"]); - const target_own = target_client_id === this.connection.client.getClientId(); - - if(target_own && target_client_id === json["invokerid"]) { - log.error(LogCategory.NETWORKING, tr("Received conversation message from invalid client id. Data: %o", json)); - return; - } - - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - client_id: target_own ? parseInt(json["invokerid"]) : target_client_id, - unique_id: target_own ? json["invokeruid"] : undefined, - name: target_own ? json["invokername"] : undefined - }, { - create: target_own, - attach: target_own - }); - if(!conversation) { - log.error(LogCategory.NETWORKING, tr("Received conversation message for unknown conversation! (%s)"), target_own ? tr("Remote message") : tr("Own message")); - return; - } - - conversation.append_message(json["msg"], { - type: target_own ? "partner" : "self", - name: json["invokername"], - unique_id: json["invokeruid"], - client_id: parseInt(json["invokerid"]) - }); - - if(target_own) { - this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); - const client = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); - if(client) /* the client itself might be invisible */ - client.flag_text_unread = conversation.is_unread(); - } else { - this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); - } - } else if(mode == 2) { - const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); - const own_channel_id = this.connection.client.getClient().currentChannel().channelId; - const channel_id = typeof(json["cid"]) !== "undefined" ? parseInt(json["cid"]) : own_channel_id; - const channel = this.connection_handler.channelTree.findChannel(channel_id) || this.connection_handler.getClient().currentChannel(); - - if(json["invokerid"] == this.connection.client.clientId) - this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); - else if(channel_id == own_channel_id) { - this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); - } - - const conversations = this.connection_handler.side_bar.channel_conversations(); - const conversation = conversations.conversation(channel_id); - conversation.register_new_message({ - sender_database_id: invoker ? invoker.properties.client_database_id : 0, - sender_name: json["invokername"], - sender_unique_id: json["invokeruid"], - - timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), - message: json["msg"] - }); - if(conversation.is_unread() && channel) - channel.flag_text_unread = true; - } else if(mode == 3) { - this.connection_handler.log.log(log.server.Type.GLOBAL_MESSAGE, { - message: json["msg"], - sender: { - client_unique_id: json["invokeruid"], - client_name: json["invokername"], - client_id: parseInt(json["invokerid"]) - } - }); - - const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); - const conversations = this.connection_handler.side_bar.channel_conversations(); - const conversation = conversations.conversation(0); - conversation.register_new_message({ - sender_database_id: invoker ? invoker.properties.client_database_id : 0, - sender_name: json["invokername"], - sender_unique_id: json["invokeruid"], - - timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), - message: json["msg"] - }); - this.connection_handler.channelTree.server.flag_text_unread = conversation.is_unread(); - } - } - - notifyClientChatComposing(json) { - json = json[0]; - - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - client_id: parseInt(json["clid"]), - unique_id: json["cluid"], - name: undefined - }, { - create: false, - attach: false - }); - if(!conversation) - return; - - conversation.trigger_typing(); - } - - handleNotifyClientChatClosed(json) { - json = json[0]; //Only one bulk - - //Chat partner has closed the conversation - - //clid: "6" - //cluid: "YoWmG+dRGKD+Rxb7SPLAM5+B9tY=" - - const conversation_manager = this.connection_handler.side_bar.private_conversations(); - const conversation = conversation_manager.find_conversation({ - client_id: parseInt(json["clid"]), - unique_id: json["cluid"], - name: undefined - }, { - create: false, - attach: false - }); - if(!conversation) { - log.warn(LogCategory.GENERAL, tr("Received chat close for client, but we haven't a chat open.")); - return; - } - conversation.set_state(chat.PrivateConversationState.CLOSED); - } - - handleNotifyClientUpdated(json) { - json = json[0]; //Only one bulk - - let client = this.connection.client.channelTree.findClient(json["clid"]); - if(!client) { - log.error(LogCategory.NETWORKING, tr("Tried to update an non existing client")); - return; - } - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key == "clid") continue; - updates.push({key: key, value: json[key]}); - } - client.updateVariables(...updates); - } - - handleNotifyServerEdited(json) { - json = json[0]; - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - - updates.push({key: key, value: json[key]}); - } - this.connection.client.channelTree.server.updateVariables(false, ...updates); - } - - handleNotifyServerUpdated(json) { - json = json[0]; - - let updates: { - key: string, - value: string - }[] = []; - for(let key in json) { - if(key === "invokerid") continue; - if(key === "invokername") continue; - if(key === "invokeruid") continue; - if(key === "reasonid") continue; - - updates.push({key: key, value: json[key]}); - } - this.connection.client.channelTree.server.updateVariables(true, ...updates); - } - - handleNotifyMusicPlayerInfo(json) { - json = json[0]; - - let bot = this.connection.client.channelTree.find_client_by_dbid(json["bot_id"]); - if(!bot || !(bot instanceof MusicClientEntry)) { - log.warn(LogCategory.CLIENT, tr("Got music player info for unknown or invalid bot! (ID: %i, Entry: %o)"), json["bot_id"], bot); - return; - } - - bot.handlePlayerInfo(json); - } - - handleNotifyClientPoke(json) { - json = json[0]; - Modals.spawnPoke(this.connection_handler, { - id: parseInt(json["invokerid"]), - name: json["invokername"], - unique_id: json["invokeruid"] - }, json["msg"]); - - this.connection_handler.sound.play(Sound.USER_POKED_SELF); - } - - //TODO server chat message - handleNotifyServerGroupClientAdd(json) { - json = json[0]; - - const self = this.connection.client.getClient(); - if(json["clid"] == self.clientId()) - this.connection_handler.sound.play(Sound.GROUP_SERVER_ASSIGNED_SELF); - } - - //TODO server chat message - handleNotifyServerGroupClientRemove(json) { - json = json[0]; - - const self = this.connection.client.getClient(); - if(json["clid"] == self.clientId()) { - this.connection_handler.sound.play(Sound.GROUP_SERVER_REVOKED_SELF); - } else { - } - } - - //TODO server chat message - handleNotifyClientChannelGroupChanged(json) { - json = json[0]; - - const self = this.connection.client.getClient(); - if(json["clid"] == self.clientId()) { - this.connection_handler.sound.play(Sound.GROUP_CHANNEL_CHANGED_SELF); - } - } - - handleNotifyChannelSubscribed(json) { - for(const entry of json) { - const channel = this.connection.client.channelTree.findChannel(entry["cid"]); - if(!channel) { - console.warn(tr("Received channel subscribed for not visible channel (cid: %d)"), entry['cid']); - continue; - } - - channel.flag_subscribed = true; - } - } - - handleNotifyChannelUnsubscribed(json) { - for(const entry of json) { - const channel = this.connection.client.channelTree.findChannel(entry["cid"]); - if(!channel) { - console.warn(tr("Received channel unsubscribed for not visible channel (cid: %d)"), entry['cid']); - continue; - } - - channel.flag_subscribed = false; - for(const client of channel.clients(false)) - this.connection.client.channelTree.deleteClient(client); - } - } - - handleNotifyConversationHistory(json: any[]) { - const conversations = this.connection.client.side_bar.channel_conversations(); - const conversation = conversations.conversation(parseInt(json[0]["cid"])); - if(!conversation) { - log.warn(LogCategory.NETWORKING, tr("Received conversation history for invalid or unknown conversation (%o)"), json[0]["cid"]); - return; - } - - for(const entry of json) { - conversation.register_new_message({ - message: entry["msg"], - sender_unique_id: entry["sender_unique_id"], - sender_name: entry["sender_name"], - timestamp: parseInt(entry["timestamp"]), - sender_database_id: parseInt(entry["sender_database_id"]) - }, false); - } - - /* now update the boxes */ - /* No update needed because the command which triggers this notify should update the chat box on success - conversation.fix_scroll(true); - conversation.handle.update_chat_box(); - */ - } - - handleNotifyConversationMessageDelete(json: any[]) { - let conversation: Conversation; - const conversations = this.connection.client.side_bar.channel_conversations(); - for(const entry of json) { - if(typeof(entry["cid"]) !== "undefined") - conversation = conversations.conversation(parseInt(entry["cid"]), false); - if(!conversation) - continue; - - conversation.delete_messages(parseInt(entry["timestamp_begin"]), parseInt(entry["timestamp_end"]), parseInt(entry["cldbid"]), parseInt(entry["limit"])); - } - } - - handleNotifyMusicStatusUpdate(json: any[]) { - json = json[0]; - - const bot_id = parseInt(json["bot_id"]); - const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); - return; - } - - client.events.fire("music_status_update", { - player_replay_index: parseInt(json["player_replay_index"]), - player_buffered_index: parseInt(json["player_buffered_index"]) - }); - } - - handleMusicPlayerSongChange(json: any[]) { - json = json[0]; - - const bot_id = parseInt(json["bot_id"]); - const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); - return; - } - - const song_id = parseInt(json["song_id"]); - let song: SongInfo; - if(song_id) { - song = new SongInfo(); - JSON.map_to(song, json); - } - - client.events.fire("music_song_change", { - song: song - }); - } - - handleNotifyPlaylistSongAdd(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song add event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - client.events.fire("playlist_song_add", { - song: { - song_id: parseInt(json["song_id"]), - song_invoker: json["song_invoker"], - song_previous_song_id: parseInt(json["song_previous_song_id"]), - song_url: json["song_url"], - song_url_loader: json["song_url_loader"], - - song_loaded: json["song_loaded"] == true || json["song_loaded"] == "1", - song_metadata: json["song_metadata"] - } - }); - } - - handleNotifyPlaylistSongRemove(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song remove event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - const song_id = parseInt(json["song_id"]); - client.events.fire("playlist_song_remove", { song_id: song_id }); - } - - handleNotifyPlaylistSongReorder(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song reorder event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - const song_id = parseInt(json["song_id"]); - const previous_song_id = parseInt(json["song_previous_song_id"]); - client.events.fire("playlist_song_reorder", { song_id: song_id, previous_song_id: previous_song_id }); - } - - handleNotifyPlaylistSongLoaded(json: any[]) { - json = json[0]; - - const playlist_id = parseInt(json["playlist_id"]); - const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); - if(!client) { - log.warn(LogCategory.CLIENT, tr("Received playlist song loaded event, but we've no music bot for the playlist (%d)"), playlist_id); - return; - } - - const song_id = parseInt(json["song_id"]); - client.events.fire("playlist_song_loaded", { - song_id: song_id, - success: json["success"] == 1, - error_msg: json["load_error_msg"], - metadata: json["song_metadata"] - }); + tree.deleteClient(client); } } + + handleNotifyClientMoved(json) { + json = json[0]; //Only one bulk + let tree = this.connection.client.channelTree; + let client = tree.findClient(json["clid"]); + let self = client instanceof LocalClientEntry; + + let channel_to = tree.findChannel(parseInt(json["ctid"])); + let channel_from = tree.findChannel(parseInt(json["cfid"])); + + if(!client) { + log.error(LogCategory.NETWORKING, tr("Unknown client move (Client)!")); + return 0; + } + + if(!channel_to) { + log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel to)!")); + return 0; + } + + if(!self) { + if(!channel_from) { + log.error(LogCategory.NETWORKING, tr("Unknown client move (Channel from)!")); + channel_from = client.currentChannel(); + } else if(channel_from != client.currentChannel()) { + log.error(LogCategory.NETWORKING, + tr("Client move from invalid source channel! Local client registered in channel %d but server send %d."), + client.currentChannel().channelId, channel_from.channelId + ); + } + } else { + channel_from = client.currentChannel(); + } + + tree.moveClient(client, channel_to); + + if(self) { + this.connection_handler.update_voice_status(channel_to); + + for(const entry of client.channelTree.clientsByChannel(channel_from)) { + if(entry !== client && entry.get_audio_handle()) { + entry.get_audio_handle().abort_replay(); + entry.speaking = false; + } + } + + const side_bar = this.connection_handler.side_bar; + side_bar.info_frame().update_channel_talk(); + + const conversation_to = side_bar.channel_conversations().conversation(channel_to.channelId, false); + if(conversation_to) + conversation_to.update_private_state(); + + if(channel_from) { + const conversation_from = side_bar.channel_conversations().conversation(channel_from.channelId, false); + if(conversation_from) + conversation_from.update_private_state(); + } + + side_bar.channel_conversations().update_chat_box(); + } + + const own_channel = this.connection.client.getClient().currentChannel(); + this.connection_handler.log.log(server_log.Type.CLIENT_VIEW_MOVE, { + channel_from: channel_from ? { + channel_id: channel_from.channelId, + channel_name: channel_from.channelName() + } : undefined, + channel_from_own: channel_from == own_channel, + + channel_to: channel_to ? { + channel_id: channel_to.channelId, + channel_name: channel_to.channelName() + } : undefined, + channel_to_own: channel_to == own_channel, + + client: { + client_id: client.clientId(), + client_name: client.clientNickName(), + client_unique_id: client.properties.client_unique_identifier + }, + client_own: self, + + invoker: this.loggable_invoker(json["invokeruid"], json["invokerid"], json["invokername"]), + + message: json["reasonmsg"], + reason: parseInt(json["reasonid"]), + }); + if(json["reasonid"] == ViewReasonId.VREASON_MOVED) { + if(self) + this.connection_handler.sound.play(Sound.USER_MOVED_SELF); + else if(own_channel == channel_to) + this.connection_handler.sound.play(Sound.USER_ENTERED_MOVED); + else if(own_channel == channel_from) + this.connection_handler.sound.play(Sound.USER_LEFT_MOVED); + } else if(json["reasonid"] == ViewReasonId.VREASON_USER_ACTION) { + if(self) {} //If we do an action we wait for the error response + else if(own_channel == channel_to) + this.connection_handler.sound.play(Sound.USER_ENTERED); + else if(own_channel == channel_from) + this.connection_handler.sound.play(Sound.USER_LEFT); + } else if(json["reasonid"] == ViewReasonId.VREASON_CHANNEL_KICK) { + if(self) { + this.connection_handler.sound.play(Sound.CHANNEL_KICKED); + } else if(own_channel == channel_to) + this.connection_handler.sound.play(Sound.USER_ENTERED_KICKED); + else if(own_channel == channel_from) + this.connection_handler.sound.play(Sound.USER_LEFT_KICKED_CHANNEL); + } else { + console.warn(tr("Unknown reason id %o"), json["reasonid"]); + } + } + + handleNotifyChannelMoved(json) { + json = json[0]; //Only one bulk + + let tree = this.connection.client.channelTree; + let channel = tree.findChannel(json["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Unknown channel move (Channel)!")); + return 0; + } + + let prev = tree.findChannel(json["order"]); + if(!prev && json["order"] != 0) { + log.error(LogCategory.NETWORKING, tr("Unknown channel move (prev)!")); + return 0; + } + + let parent = tree.findChannel(json["cpid"]); + if(!parent && json["cpid"] != 0) { + log.error(LogCategory.NETWORKING, tr("Unknown channel move (parent)!")); + return 0; + } + + tree.moveChannel(channel, prev, parent); + } + + handleNotifyChannelEdited(json) { + json = json[0]; //Only one bulk + + let tree = this.connection.client.channelTree; + let channel = tree.findChannel(json["cid"]); + if(!channel) { + log.error(LogCategory.NETWORKING, tr("Unknown channel edit (Channel)!")); + return 0; + } + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "cid") continue; + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + updates.push({key: key, value: json[key]}); + } + channel.updateVariables(...updates); + + if(this.connection_handler.getClient().currentChannel() === channel) { + //TODO: Playback sound that your channel has been edited + this.connection_handler.update_voice_status(); + } + } + + handleNotifyTextMessage(json) { + json = json[0]; //Only one bulk + + let mode = json["targetmode"]; + if(mode == 1){ + //json["invokerid"], json["invokername"], json["invokeruid"] + const target_client_id = parseInt(json["target"]); + const target_own = target_client_id === this.connection.client.getClientId(); + + if(target_own && target_client_id === json["invokerid"]) { + log.error(LogCategory.NETWORKING, tr("Received conversation message from invalid client id. Data: %o"), json); + return; + } + + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + client_id: target_own ? parseInt(json["invokerid"]) : target_client_id, + unique_id: target_own ? json["invokeruid"] : undefined, + name: target_own ? json["invokername"] : undefined + }, { + create: target_own, + attach: target_own + }); + if(!conversation) { + log.error(LogCategory.NETWORKING, tr("Received conversation message for unknown conversation! (%s)"), target_own ? tr("Remote message") : tr("Own message")); + return; + } + + conversation.append_message(json["msg"], { + type: target_own ? "partner" : "self", + name: json["invokername"], + unique_id: json["invokeruid"], + client_id: parseInt(json["invokerid"]) + }); + + if(target_own) { + this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); + const client = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); + if(client) /* the client itself might be invisible */ + client.flag_text_unread = conversation.is_unread(); + } else { + this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); + } + } else if(mode == 2) { + const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); + const own_channel_id = this.connection.client.getClient().currentChannel().channelId; + const channel_id = typeof(json["cid"]) !== "undefined" ? parseInt(json["cid"]) : own_channel_id; + const channel = this.connection_handler.channelTree.findChannel(channel_id) || this.connection_handler.getClient().currentChannel(); + + if(json["invokerid"] == this.connection.client.clientId) + this.connection_handler.sound.play(Sound.MESSAGE_SEND, {default_volume: .5}); + else if(channel_id == own_channel_id) { + this.connection_handler.sound.play(Sound.MESSAGE_RECEIVED, {default_volume: .5}); + } + + const conversations = this.connection_handler.side_bar.channel_conversations(); + const conversation = conversations.conversation(channel_id); + conversation.register_new_message({ + sender_database_id: invoker ? invoker.properties.client_database_id : 0, + sender_name: json["invokername"], + sender_unique_id: json["invokeruid"], + + timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), + message: json["msg"] + }); + if(conversation.is_unread() && channel) + channel.flag_text_unread = true; + } else if(mode == 3) { + this.connection_handler.log.log(server_log.Type.GLOBAL_MESSAGE, { + message: json["msg"], + sender: { + client_unique_id: json["invokeruid"], + client_name: json["invokername"], + client_id: parseInt(json["invokerid"]) + } + }); + + const invoker = this.connection_handler.channelTree.findClient(parseInt(json["invokerid"])); + const conversations = this.connection_handler.side_bar.channel_conversations(); + const conversation = conversations.conversation(0); + conversation.register_new_message({ + sender_database_id: invoker ? invoker.properties.client_database_id : 0, + sender_name: json["invokername"], + sender_unique_id: json["invokeruid"], + + timestamp: typeof(json["timestamp"]) === "undefined" ? Date.now() : parseInt(json["timestamp"]), + message: json["msg"] + }); + this.connection_handler.channelTree.server.flag_text_unread = conversation.is_unread(); + } + } + + notifyClientChatComposing(json) { + json = json[0]; + + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + client_id: parseInt(json["clid"]), + unique_id: json["cluid"], + name: undefined + }, { + create: false, + attach: false + }); + if(!conversation) + return; + + conversation.trigger_typing(); + } + + handleNotifyClientChatClosed(json) { + json = json[0]; //Only one bulk + + //Chat partner has closed the conversation + + //clid: "6" + //cluid: "YoWmG+dRGKD+Rxb7SPLAM5+B9tY=" + + const conversation_manager = this.connection_handler.side_bar.private_conversations(); + const conversation = conversation_manager.find_conversation({ + client_id: parseInt(json["clid"]), + unique_id: json["cluid"], + name: undefined + }, { + create: false, + attach: false + }); + if(!conversation) { + log.warn(LogCategory.GENERAL, tr("Received chat close for client, but we haven't a chat open.")); + return; + } + conversation.set_state(PrivateConversationState.CLOSED); + } + + handleNotifyClientUpdated(json) { + json = json[0]; //Only one bulk + + let client = this.connection.client.channelTree.findClient(json["clid"]); + if(!client) { + log.error(LogCategory.NETWORKING, tr("Tried to update an non existing client")); + return; + } + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key == "clid") continue; + updates.push({key: key, value: json[key]}); + } + client.updateVariables(...updates); + } + + handleNotifyServerEdited(json) { + json = json[0]; + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + + updates.push({key: key, value: json[key]}); + } + this.connection.client.channelTree.server.updateVariables(false, ...updates); + } + + handleNotifyServerUpdated(json) { + json = json[0]; + + let updates: { + key: string, + value: string + }[] = []; + for(let key in json) { + if(key === "invokerid") continue; + if(key === "invokername") continue; + if(key === "invokeruid") continue; + if(key === "reasonid") continue; + + updates.push({key: key, value: json[key]}); + } + this.connection.client.channelTree.server.updateVariables(true, ...updates); + } + + handleNotifyMusicPlayerInfo(json) { + json = json[0]; + + let bot = this.connection.client.channelTree.find_client_by_dbid(json["bot_id"]); + if(!bot || !(bot instanceof MusicClientEntry)) { + log.warn(LogCategory.CLIENT, tr("Got music player info for unknown or invalid bot! (ID: %i, Entry: %o)"), json["bot_id"], bot); + return; + } + + bot.handlePlayerInfo(json); + } + + handleNotifyClientPoke(json) { + json = json[0]; + spawnPoke(this.connection_handler, { + id: parseInt(json["invokerid"]), + name: json["invokername"], + unique_id: json["invokeruid"] + }, json["msg"]); + + this.connection_handler.sound.play(Sound.USER_POKED_SELF); + } + + //TODO server chat message + handleNotifyServerGroupClientAdd(json) { + json = json[0]; + + const self = this.connection.client.getClient(); + if(json["clid"] == self.clientId()) + this.connection_handler.sound.play(Sound.GROUP_SERVER_ASSIGNED_SELF); + } + + //TODO server chat message + handleNotifyServerGroupClientRemove(json) { + json = json[0]; + + const self = this.connection.client.getClient(); + if(json["clid"] == self.clientId()) { + this.connection_handler.sound.play(Sound.GROUP_SERVER_REVOKED_SELF); + } else { + } + } + + //TODO server chat message + handleNotifyClientChannelGroupChanged(json) { + json = json[0]; + + const self = this.connection.client.getClient(); + if(json["clid"] == self.clientId()) { + this.connection_handler.sound.play(Sound.GROUP_CHANNEL_CHANGED_SELF); + } + } + + handleNotifyChannelSubscribed(json) { + for(const entry of json) { + const channel = this.connection.client.channelTree.findChannel(entry["cid"]); + if(!channel) { + console.warn(tr("Received channel subscribed for not visible channel (cid: %d)"), entry['cid']); + continue; + } + + channel.flag_subscribed = true; + } + } + + handleNotifyChannelUnsubscribed(json) { + for(const entry of json) { + const channel = this.connection.client.channelTree.findChannel(entry["cid"]); + if(!channel) { + console.warn(tr("Received channel unsubscribed for not visible channel (cid: %d)"), entry['cid']); + continue; + } + + channel.flag_subscribed = false; + for(const client of channel.clients(false)) + this.connection.client.channelTree.deleteClient(client); + } + } + + handleNotifyConversationHistory(json: any[]) { + const conversations = this.connection.client.side_bar.channel_conversations(); + const conversation = conversations.conversation(parseInt(json[0]["cid"])); + if(!conversation) { + log.warn(LogCategory.NETWORKING, tr("Received conversation history for invalid or unknown conversation (%o)"), json[0]["cid"]); + return; + } + + for(const entry of json) { + conversation.register_new_message({ + message: entry["msg"], + sender_unique_id: entry["sender_unique_id"], + sender_name: entry["sender_name"], + timestamp: parseInt(entry["timestamp"]), + sender_database_id: parseInt(entry["sender_database_id"]) + }, false); + } + + /* now update the boxes */ + /* No update needed because the command which triggers this notify should update the chat box on success + conversation.fix_scroll(true); + conversation.handle.update_chat_box(); + */ + } + + handleNotifyConversationMessageDelete(json: any[]) { + let conversation: Conversation; + const conversations = this.connection.client.side_bar.channel_conversations(); + for(const entry of json) { + if(typeof(entry["cid"]) !== "undefined") + conversation = conversations.conversation(parseInt(entry["cid"]), false); + if(!conversation) + continue; + + conversation.delete_messages(parseInt(entry["timestamp_begin"]), parseInt(entry["timestamp_end"]), parseInt(entry["cldbid"]), parseInt(entry["limit"])); + } + } + + handleNotifyMusicStatusUpdate(json: any[]) { + json = json[0]; + + const bot_id = parseInt(json["bot_id"]); + const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); + return; + } + + client.events.fire("music_status_update", { + player_replay_index: parseInt(json["player_replay_index"]), + player_buffered_index: parseInt(json["player_buffered_index"]) + }); + } + + handleMusicPlayerSongChange(json: any[]) { + json = json[0]; + + const bot_id = parseInt(json["bot_id"]); + const client = this.connection.client.channelTree.find_client_by_dbid(bot_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received music bot status update for unknown bot (%d)"), bot_id); + return; + } + + const song_id = parseInt(json["song_id"]); + let song: SongInfo; + if(song_id) { + song = new SongInfo(); + JSON.map_to(song, json); + } + + client.events.fire("music_song_change", { + song: song + }); + } + + handleNotifyPlaylistSongAdd(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song add event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + client.events.fire("playlist_song_add", { + song: { + song_id: parseInt(json["song_id"]), + song_invoker: json["song_invoker"], + song_previous_song_id: parseInt(json["song_previous_song_id"]), + song_url: json["song_url"], + song_url_loader: json["song_url_loader"], + + song_loaded: json["song_loaded"] == true || json["song_loaded"] == "1", + song_metadata: json["song_metadata"] + } + }); + } + + handleNotifyPlaylistSongRemove(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song remove event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + const song_id = parseInt(json["song_id"]); + client.events.fire("playlist_song_remove", { song_id: song_id }); + } + + handleNotifyPlaylistSongReorder(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song reorder event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + const song_id = parseInt(json["song_id"]); + const previous_song_id = parseInt(json["song_previous_song_id"]); + client.events.fire("playlist_song_reorder", { song_id: song_id, previous_song_id: previous_song_id }); + } + + handleNotifyPlaylistSongLoaded(json: any[]) { + json = json[0]; + + const playlist_id = parseInt(json["playlist_id"]); + const client = this.connection.client.channelTree.clients.find(e => e instanceof MusicClientEntry && e.properties.client_playlist_id === playlist_id); + if(!client) { + log.warn(LogCategory.CLIENT, tr("Received playlist song loaded event, but we've no music bot for the playlist (%d)"), playlist_id); + return; + } + + const song_id = parseInt(json["song_id"]); + client.events.fire("playlist_song_loaded", { + song_id: song_id, + success: json["success"] == 1, + error_msg: json["load_error_msg"], + metadata: json["song_metadata"] + }); + } } \ No newline at end of file diff --git a/shared/js/connection/CommandHelper.ts b/shared/js/connection/CommandHelper.ts index 9eff210b..6685c841 100644 --- a/shared/js/connection/CommandHelper.ts +++ b/shared/js/connection/CommandHelper.ts @@ -1,448 +1,461 @@ -namespace connection { - export class CommandHelper extends AbstractCommandHandler { - private _who_am_i: any; - private _awaiters_unique_ids: {[unique_id: string]:((resolved: ClientNameInfo) => any)[]} = {}; - private _awaiters_unique_dbid: {[database_id: number]:((resolved: ClientNameInfo) => any)[]} = {}; +import {ServerCommand, SingleCommandHandler} from "tc-shared/connection/ConnectionBase"; +import * as log from "tc-shared/log"; +import {LogCategory} from "tc-shared/log"; +import { + ClientNameInfo, + CommandResult, + ErrorID, Playlist, PlaylistInfo, PlaylistSong, + QueryList, + QueryListEntry, ServerGroupClient +} from "tc-shared/connection/ServerConnectionDeclaration"; +import {ChannelEntry} from "tc-shared/ui/channel"; +import {ClientEntry} from "tc-shared/ui/client"; +import {ChatType} from "tc-shared/ui/frames/chat"; +import {AbstractCommandHandler} from "tc-shared/connection/AbstractCommandHandler"; - constructor(connection) { - super(connection); +export class CommandHelper extends AbstractCommandHandler { + private _who_am_i: any; + private _awaiters_unique_ids: {[unique_id: string]:((resolved: ClientNameInfo) => any)[]} = {}; + private _awaiters_unique_dbid: {[database_id: number]:((resolved: ClientNameInfo) => any)[]} = {}; - this.volatile_handler_boss = false; - this.ignore_consumed = true; + constructor(connection) { + super(connection); + + this.volatile_handler_boss = false; + this.ignore_consumed = true; + } + + initialize() { + this.connection.command_handler_boss().register_handler(this); + } + + destroy() { + if(this.connection) { + const hboss = this.connection.command_handler_boss(); + hboss && hboss.unregister_handler(this); + } + this._awaiters_unique_ids = undefined; + } + + handle_command(command: ServerCommand): boolean { + if(command.command == "notifyclientnamefromuid") + this.handle_notifyclientnamefromuid(command.arguments); + if(command.command == "notifyclientgetnamefromdbid") + this.handle_notifyclientgetnamefromdbid(command.arguments); + else + return false; + return true; + } + + joinChannel(channel: ChannelEntry, password?: string) : Promise
Please manually generate the identity within your settings => profiles")).open(); - } - } - - { /* forum identity (works only when connected to the forum) */ - const profile = create_new_profile("TeaSpeak Forum", "teaforo"); - profile.default_password = ""; - profile.default_username = ""; - profile.profile_name = "TeaSpeak Forum profile"; - - profile.set_identity(identities.IdentitifyType.TEAFORO, identities.static_forum_identity()); - profile.selected_identity_type = identities.IdentitifyType[identities.IdentitifyType.TEAFORO]; - } - - save(); - } + spawn_identity_handshake_handler?(connection: AbstractServerConnection): HandshakeIdentityHandler { + const identity = this.selected_identity(); + if (!identity) + return undefined; + return identity.spawn_identity_handshake_handler(connection); } - export function create_new_profile(name: string, id?: string): ConnectionProfile { - const profile = new ConnectionProfile(id || guid()); - profile.profile_name = name; - profile.default_username = ""; - available_profiles.push(profile); - return profile; - } + encode?(): string { + const identity_data = {}; + for (const key in this.identities) + if (this.identities[key]) + identity_data[key] = this.identities[key].encode(); - let _requires_save = false; - - export function save() { - const profiles: string[] = []; - for (const profile of available_profiles) - profiles.push(profile.encode()); - - const data = JSON.stringify({ + return JSON.stringify({ version: 1, - profiles: profiles + username: this.default_username, + password: this.default_password, + profile_name: this.profile_name, + identity_type: this.selected_identity_type, + identity_data: identity_data, + id: this.id }); - localStorage.setItem("profiles", data); } - export function mark_need_save() { - _requires_save = true; + valid(): boolean { + const identity = this.selected_identity(); + + return !!identity && identity.valid(); } +} - export function requires_save(): boolean { - return _requires_save; - } +async function decode_profile(data): Promise
Please manually generate the identity within your settings => profiles")).open(); + } + } + + { /* forum identity (works only when connected to the forum) */ + const profile = create_new_profile("TeaSpeak Forum", "teaforo"); + profile.default_password = ""; + profile.default_username = ""; + profile.profile_name = "TeaSpeak Forum profile"; + + profile.set_identity(IdentitifyType.TEAFORO, TeaForumIdentity.identity()); + profile.selected_identity_type = IdentitifyType[IdentitifyType.TEAFORO]; + } + + save(); + } +} + +export function create_new_profile(name: string, id?: string): ConnectionProfile { + const profile = new ConnectionProfile(id || guid()); + profile.profile_name = name; + profile.default_username = ""; + available_profiles.push(profile); + return profile; +} + +let _requires_save = false; + +export function save() { + const profiles: string[] = []; + for (const profile of available_profiles) + profiles.push(profile.encode()); + + const data = JSON.stringify({ + version: 1, + profiles: profiles + }); + localStorage.setItem("profiles", data); +} + +export function mark_need_save() { + _requires_save = true; +} + +export function requires_save(): boolean { + return _requires_save; +} + +export function profiles(): ConnectionProfile[] { + return available_profiles; +} + +export function find_profile(id: string): ConnectionProfile | undefined { + for (const profile of profiles()) + if (profile.id == id) + return profile; + + return undefined; +} + +export function find_profile_by_name(name: string): ConnectionProfile | undefined { + name = name.toLowerCase(); + for (const profile of profiles()) + if ((profile.profile_name || "").toLowerCase() == name) + return profile; + + return undefined; +} + + +export function default_profile(): ConnectionProfile { + return find_profile("default"); +} + +export function set_default_profile(profile: ConnectionProfile) { + const old_default = default_profile(); + if (old_default && old_default != profile) { + old_default.id = guid(); + } + profile.id = "default"; + return old_default; +} + +export function delete_profile(profile: ConnectionProfile) { + available_profiles.remove(profile); } \ No newline at end of file diff --git a/shared/js/profiles/Identity.ts b/shared/js/profiles/Identity.ts index c658f46d..9f79adef 100644 --- a/shared/js/profiles/Identity.ts +++ b/shared/js/profiles/Identity.ts @@ -1,110 +1,119 @@ -namespace profiles.identities { - export enum IdentitifyType { - TEAFORO, - TEAMSPEAK, - NICKNAME +import {AbstractServerConnection, ServerCommand} from "tc-shared/connection/ConnectionBase"; +import {HandshakeIdentityHandler} from "tc-shared/connection/HandshakeHandler"; +import {AbstractCommandHandler} from "tc-shared/connection/AbstractCommandHandler"; + +export enum IdentitifyType { + TEAFORO, + TEAMSPEAK, + NICKNAME +} + +export interface Identity { + fallback_name(): string | undefined ; + uid() : string; + type() : IdentitifyType; + + valid() : boolean; + + encode?() : string; + decode(data: string) : Promise