TeaSpeak/TeaWeb
TeaSpeak/TeaWeb
1
0
Fork 0
Code Issues 1 Pull requests Activity

Starting with webpack

Browse source
This commit is contained in:
WolverinDEV 2020-03-27 23:36:57 +01:00
parent a6f0fcdda9
commit 13b65a1f35
114 changed files with 14384 additions and 3963 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6186
dist/bundle.js vendored Normal file
View file

File diff suppressed because one or more lines are too long

3889
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

22
package.json
View file

@ -17,29 +17,41 @@
"csso": "csso", "csso": "csso",
"rebuild-structure-web-dev": "php files.php generate web dev", "rebuild-structure-web-dev": "php files.php generate web dev",
"minify-web-rel-file": "terser --compress --mangle --ecma 6 --keep_classnames --keep_fnames --output", "minify-web-rel-file": "terser --compress --mangle --ecma 6 --keep_classnames --keep_fnames --output",
"start": "npm run compile-file-helper && node file.js ndevelop" "start": "npm run compile-file-helper && node file.js ndevelop",
"build": "webpack --config webpack.config.js",
"watch": "webpack --watch"
}, },
"author": "TeaSpeak (WolverinDEV)", "author": "TeaSpeak (WolverinDEV)",
"license": "ISC", "license": "ISC",
"devDependencies": { "devDependencies": {
"@types/emscripten": "^1.38.0", "@types/emscripten": "^1.38.0",
"@types/jquery": "^3.3.31", "@types/jquery": "^3.3.34",
"@types/lodash": "^4.14.149",
"@types/moment": "^2.13.0", "@types/moment": "^2.13.0",
"@types/node": "^12.7.2", "@types/node": "^12.7.2",
"@types/react-dom": "^16.9.5",
"@types/sha256": "^0.2.0", "@types/sha256": "^0.2.0",
"@types/websocket": "0.0.40", "@types/websocket": "0.0.40",
"clean-css": "^4.2.1", "clean-css": "^4.2.1",
"css-loader": "^3.4.2",
"csso-cli": "^2.0.2", "csso-cli": "^2.0.2",
"fs-extra": "latest",
"gulp": "^4.0.2", "gulp": "^4.0.2",
"mime-types": "^2.1.24", "mime-types": "^2.1.24",
"mini-css-extract-plugin": "^0.9.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"node-sass": "^4.13.1",
"sass": "1.22.10", "sass": "1.22.10",
"sass-loader": "^8.0.2",
"sha256": "^0.2.0", "sha256": "^0.2.0",
"style-loader": "^1.1.3",
"terser": "^4.2.1", "terser": "^4.2.1",
"ts-loader": "^6.2.2",
"ttypescript": "^1.5.10", "ttypescript": "^1.5.10",
"typescript": "3.6.5", "typescript": "3.6.5",
"wat2wasm": "^1.0.2", "wat2wasm": "^1.0.2",
"fs-extra": "latest" "webpack": "^4.42.1",
"webpack-cli": "^3.3.11"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -50,6 +62,8 @@
}, },
"homepage": "https://www.teaspeak.de", "homepage": "https://www.teaspeak.de",
"dependencies": { "dependencies": {
"@types/fs-extra": "^8.0.1" "@types/fs-extra": "^8.0.1",
"react": "^16.13.1",
"react-dom": "^16.13.1"
} }
} }

123
shared/css/static/channel-tree.scss
View file

@ -94,96 +94,7 @@
} }
&.channel { &.channel {
display: flex;
flex-direction: column;
.container-channel {
position: relative;
display: flex;
flex-direction: row;
justify-content: stretch;
width: 100%;
min-height: 16px;
align-items: center;
cursor: pointer;
.channel-type {
flex-grow: 0;
flex-shrink: 0;
margin-right: 2px;
}
.container-channel-name {
display: flex;
flex-direction: row;
flex-grow: 1;
flex-shrink: 1;
justify-content: left;
max-width: 100%; /* important for the repetitive channel name! */
overflow-x: hidden;
height: 16px;
&.align-right {
justify-content: right;
}
&.align-center, &.align-repetitive {
justify-content: center;
}
.channel-name {
align-self: center;
color: $channel_tree_entry_text_color;
min-width: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
&.align-repetitive {
.channel-name {
text-overflow: clip;
}
}
}
.icons {
display: flex;
flex-direction: row;
flex-grow: 0;
flex-shrink: 0;
}
&.move-selected {
border-bottom: 1px solid black;
}
.show-channel-normal-only {
display: none;
&.channel-normal {
display: block;
}
}
.icon_no_sound {
display: flex;
}
}
.container-clients {
display: flex;
flex-direction: column;
}
} }
&.client { &.client {
@ -272,40 +183,6 @@
} }
} }
&.channel .container-channel, &.client, &.server {
.marker-text-unread {
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 1px;
background-color: #a814147F;
opacity: 1;
&:before {
content: '';
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 24px;
background: -moz-linear-gradient(left, rgba(168,20,20,.18) 0%, rgba(168,20,20,0) 100%); /* FF3.6-15 */
background: -webkit-linear-gradient(left, rgba(168,20,20,.18) 0%,rgba(168,20,20,0) 100%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to right, rgba(168,20,20,.18) 0%,rgba(168,20,20,0) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
}
&.hidden {
opacity: 0;
}
@include transition(opacity $button_hover_animation_time);
}
}
} }
} }

4
shared/js/BrowserIPC.ts
View file

@ -1,8 +1,8 @@
interface Window { export interface Window {
BroadcastChannel: BroadcastChannel; BroadcastChannel: BroadcastChannel;
} }
namespace bipc { export namespace bipc {
export interface BroadcastMessage { export interface BroadcastMessage {
timestamp: number; timestamp: number;
receiver: string; receiver: string;

26
shared/js/ConnectionHandler.ts
View file

@ -1,6 +1,6 @@
/// <reference path="log.ts" /> /// <reference path="log.ts" />
/// <reference path="proto.ts" /> /// <reference path="proto.ts" />
/// <reference path="ui/view.ts" /> /// <reference path="channel-tree/view.ts" />
/// <reference path="settings.ts" /> /// <reference path="settings.ts" />
/// <reference path="FileManager.ts" /> /// <reference path="FileManager.ts" />
/// <reference path="permission/PermissionManager.ts" /> /// <reference path="permission/PermissionManager.ts" />
@ -8,7 +8,17 @@
/// <reference path="ui/frames/ControlBar.ts" /> /// <reference path="ui/frames/ControlBar.ts" />
/// <reference path="connection/ConnectionBase.ts" /> /// <reference path="connection/ConnectionBase.ts" />
enum DisconnectReason { import {ChannelTree} from "./channel-tree/view";
import {LocalClientEntry} from "./channel-tree/client";
import {ServerAddress} from "./channel-tree/server";
import {ChannelEntry} from "./channel-tree/channel";
import {AbstractServerConnection} from "./connection/ConnectionBase";
import {PermissionManager} from "./permission/PermissionManager";
import {GroupManager} from "./permission/GroupManager";
import {ServerSettings} from "./settings";
import {Hostbanner} from "./ui/frames/hostbanner";
export enum DisconnectReason {
HANDLER_DESTROYED, HANDLER_DESTROYED,
REQUESTED, REQUESTED,
DNS_FAILED, DNS_FAILED,
@ -28,7 +38,7 @@ enum DisconnectReason {
UNKNOWN UNKNOWN
} }
enum ConnectionState { export enum ConnectionState {
UNCONNECTED, UNCONNECTED,
CONNECTING, CONNECTING,
INITIALISING, INITIALISING,
@ -36,7 +46,7 @@ enum ConnectionState {
DISCONNECTING DISCONNECTING
} }
enum ViewReasonId { export enum ViewReasonId {
VREASON_USER_ACTION = 0, VREASON_USER_ACTION = 0,
VREASON_MOVED = 1, VREASON_MOVED = 1,
VREASON_SYSTEM = 2, VREASON_SYSTEM = 2,
@ -51,7 +61,7 @@ enum ViewReasonId {
VREASON_SERVER_SHUTDOWN = 11 VREASON_SERVER_SHUTDOWN = 11
} }
interface VoiceStatus { export interface VoiceStatus {
input_hardware: boolean; input_hardware: boolean;
input_muted: boolean; input_muted: boolean;
output_muted: boolean; output_muted: boolean;
@ -68,7 +78,7 @@ interface VoiceStatus {
queries_visible: boolean; queries_visible: boolean;
} }
interface ConnectParameters { export interface ConnectParameters {
nickname?: string; nickname?: string;
channel?: { channel?: {
target: string | number; target: string | number;
@ -79,10 +89,10 @@ interface ConnectParameters {
auto_reconnect_attempt?: boolean; auto_reconnect_attempt?: boolean;
} }
class ConnectionHandler { export class ConnectionHandler {
channelTree: ChannelTree; channelTree: ChannelTree;
serverConnection: connection.AbstractServerConnection; serverConnection: AbstractServerConnection;
fileManager: FileManager; fileManager: FileManager;

19
shared/js/FileManager.ts
View file

@ -1,21 +1,26 @@
/// <reference path="connection/CommandHandler.ts" /> import {ChannelEntry} from "./channel-tree/channel";
/// <reference path="connection/ConnectionBase.ts" /> import {AbstractCommandHandler, ServerCommand} from "./connection/ConnectionBase";
import {ConnectionHandler} from "./ConnectionHandler";
import {CommandResult} from "./connection/ServerConnectionDeclaration";
import {log, LogCategory} from "./log";
import {ClientEntry} from "./channel-tree/client";
import {hex} from "./crypto/hex";
class FileEntry { export class FileEntry {
name: string; name: string;
datetime: number; datetime: number;
type: number; type: number;
size: number; size: number;
} }
class FileListRequest { export class FileListRequest {
path: string; path: string;
entries: FileEntry[]; entries: FileEntry[];
callback: (entries: FileEntry[]) => void; callback: (entries: FileEntry[]) => void;
} }
namespace transfer { export namespace transfer {
export interface TransferKey { export interface TransferKey {
client_transfer_id: number; client_transfer_id: number;
server_transfer_id: number; server_transfer_id: number;
@ -152,7 +157,7 @@ class RequestFileUpload implements transfer.UploadTransfer {
} }
} }
class FileManager extends connection.AbstractCommandHandler { class FileManager extends AbstractCommandHandler {
handle: ConnectionHandler; handle: ConnectionHandler;
icons: IconManager; icons: IconManager;
avatars: AvatarManager; avatars: AvatarManager;
@ -191,7 +196,7 @@ class FileManager extends connection.AbstractCommandHandler {
this.avatars = undefined; this.avatars = undefined;
} }
handle_command(command: connection.ServerCommand): boolean { handle_command(command: ServerCommand): boolean {
switch (command.command) { switch (command.command) {
case "notifyfilelist": case "notifyfilelist":
this.notifyFileList(command.arguments); this.notifyFileList(command.arguments);

8
shared/js/MessageFormatter.ts
View file

@ -1,4 +1,10 @@
namespace messages.formatter { import {Settings, settings} from "./settings";
import {contextmenu} from "./ui/elements/context_menu";
import {image_preview} from "./ui/frames/image_preview";
import {guid} from "./crypto/uid";
declare const xbbcode;
export namespace messages.formatter {
export namespace bbcode { export namespace bbcode {
const sanitizer_escaped = (key: string) => "[-- sescaped: " + key + " --]"; 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_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}) --]/;

4
shared/js/PPTListener.ts
View file

@ -1,4 +1,4 @@
enum KeyCode { export enum KeyCode {
KEY_CANCEL = 3, KEY_CANCEL = 3,
KEY_HELP = 6, KEY_HELP = 6,
KEY_BACK_SPACE = 8, KEY_BACK_SPACE = 8,
@ -118,7 +118,7 @@ enum KeyCode {
KEY_META = 224 KEY_META = 224
} }
namespace ppt { export namespace ppt {
export enum EventType { export enum EventType {
KEY_PRESS, KEY_PRESS,
KEY_RELEASE, KEY_RELEASE,

12
shared/js/bookmarks.ts
View file

@ -1,14 +1,6 @@
namespace bookmarks { import {profiles} from "./profiles/ConnectionProfile";
function guid() {
function s4() {
return Math
.floor((1 + Math.random()) * 0x10000)
.toString(16)
.substring(1);
}
return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
}
export namespace bookmarks {
export const boorkmak_connect = (mark: Bookmark, new_tab?: boolean) => { export const boorkmak_connect = (mark: Bookmark, new_tab?: boolean) => {
const profile = profiles.find_profile(mark.connect_profile) || profiles.default_profile(); const profile = profiles.find_profile(mark.connect_profile) || profiles.default_profile();
if(profile.valid()) { if(profile.valid()) {

13
shared/js/channel-tree/channel.ts
View file

@ -1,12 +1,15 @@
/// <reference path="view.ts" /> /// <reference path="view.ts" />
/// <reference path="../utils/helpers.ts" /> /// <reference path="../utils/helpers.ts" />
enum ChannelType { import {ChannelTree} from "./view";
import {ClientEntry} from "./client";
export enum ChannelType {
PERMANENT, PERMANENT,
SEMI_PERMANENT, SEMI_PERMANENT,
TEMPORARY TEMPORARY
} }
namespace ChannelType { export namespace ChannelType {
export function normalize(mode: ChannelType) { export function normalize(mode: ChannelType) {
let value: string = ChannelType[mode]; let value: string = ChannelType[mode];
value = value.toLowerCase(); value = value.toLowerCase();
@ -14,13 +17,13 @@ namespace ChannelType {
} }
} }
enum ChannelSubscribeMode { export enum ChannelSubscribeMode {
SUBSCRIBED, SUBSCRIBED,
UNSUBSCRIBED, UNSUBSCRIBED,
INHERITED INHERITED
} }
class ChannelProperties { export class ChannelProperties {
channel_order: number = 0; channel_order: number = 0;
channel_name: string = ""; channel_name: string = "";
channel_name_phonetic: string = ""; channel_name_phonetic: string = "";
@ -55,7 +58,7 @@ class ChannelProperties {
channel_conversation_history_length: number = -1; channel_conversation_history_length: number = -1;
} }
class ChannelEntry { export class ChannelEntry {
channelTree: ChannelTree; channelTree: ChannelTree;
channelId: number; channelId: number;
parent?: ChannelEntry; parent?: ChannelEntry;

25
shared/js/channel-tree/client.ts
View file

@ -1,8 +1,11 @@
/// <reference path="channel.ts" /> /// <reference path="channel.ts" />
/// <reference path="modal/ModalChangeVolume.ts" /> /// <reference path="../ui/modal/ModalChangeVolume.ts" />
/// <reference path="client_move.ts" /> /// <reference path="../ui/client_move.ts" />
enum ClientType { import {ChannelEntry} from "./channel";
import {ChannelTree} from "./view";
export enum ClientType {
CLIENT_VOICE, CLIENT_VOICE,
CLIENT_QUERY, CLIENT_QUERY,
CLIENT_INTERNAL, CLIENT_INTERNAL,
@ -11,7 +14,7 @@ enum ClientType {
CLIENT_UNDEFINED CLIENT_UNDEFINED
} }
class ClientProperties { export class ClientProperties {
client_type: ClientType = ClientType.CLIENT_VOICE; //TeamSpeaks type client_type: ClientType = ClientType.CLIENT_VOICE; //TeamSpeaks type
client_type_exact: ClientType = ClientType.CLIENT_VOICE; client_type_exact: ClientType = ClientType.CLIENT_VOICE;
@ -57,7 +60,7 @@ class ClientProperties {
client_is_priority_speaker: boolean = false; client_is_priority_speaker: boolean = false;
} }
class ClientConnectionInfo { export class ClientConnectionInfo {
connection_bandwidth_received_last_minute_control: number = -1; connection_bandwidth_received_last_minute_control: number = -1;
connection_bandwidth_received_last_minute_keepalive: number = -1; connection_bandwidth_received_last_minute_keepalive: number = -1;
connection_bandwidth_received_last_minute_speech: number = -1; connection_bandwidth_received_last_minute_speech: number = -1;
@ -109,7 +112,7 @@ class ClientConnectionInfo {
connection_client_port: number = -1; connection_client_port: number = -1;
} }
class ClientEntry { export class ClientEntry {
readonly events: events.Registry<events.channel_tree.client>; readonly events: events.Registry<events.channel_tree.client>;
protected _clientId: number; protected _clientId: number;
@ -1123,7 +1126,7 @@ class ClientEntry {
} }
} }
class LocalClientEntry extends ClientEntry { export class LocalClientEntry extends ClientEntry {
handle: ConnectionHandler; handle: ConnectionHandler;
private renaming: boolean; private renaming: boolean;
@ -1232,7 +1235,7 @@ class LocalClientEntry extends ClientEntry {
} }
} }
class MusicClientProperties extends ClientProperties { export class MusicClientProperties extends ClientProperties {
player_state: number = 0; player_state: number = 0;
player_volume: number = 0; player_volume: number = 0;
@ -1264,7 +1267,7 @@ class MusicClientProperties extends ClientProperties {
} }
*/ */
class SongInfo { export class SongInfo {
song_id: number = 0; song_id: number = 0;
song_url: string = ""; song_url: string = "";
song_invoker: number = 0; song_invoker: number = 0;
@ -1277,7 +1280,7 @@ class SongInfo {
song_length: number = 0; song_length: number = 0;
} }
class MusicClientPlayerInfo extends SongInfo { export class MusicClientPlayerInfo extends SongInfo {
bot_id: number = 0; bot_id: number = 0;
player_state: number = 0; player_state: number = 0;
@ -1290,7 +1293,7 @@ class MusicClientPlayerInfo extends SongInfo {
player_description: string = ""; player_description: string = "";
} }
class MusicClientEntry extends ClientEntry { export class MusicClientEntry extends ClientEntry {
private _info_promise: Promise<MusicClientPlayerInfo>; private _info_promise: Promise<MusicClientPlayerInfo>;
private _info_promise_age: number = 0; private _info_promise_age: number = 0;
private _info_promise_resolve: any; private _info_promise_resolve: any;

12
shared/js/channel-tree/server.ts
View file

@ -1,7 +1,9 @@
/// <reference path="channel.ts" /> /// <reference path="channel.ts" />
/// <reference path="modal/ModalServerEdit.ts" /> /// <reference path="../ui/modal/ModalServerEdit.ts" />
class ServerProperties { import {ChannelTree} from "./view";
export class ServerProperties {
virtualserver_host: string = ""; virtualserver_host: string = "";
virtualserver_port: number = 0; virtualserver_port: number = 0;
@ -78,7 +80,7 @@ class ServerProperties {
virtualserver_total_bytes_uploaded: number = 0; virtualserver_total_bytes_uploaded: number = 0;
} }
interface ServerConnectionInfo { export interface ServerConnectionInfo {
connection_filetransfer_bandwidth_sent: number; connection_filetransfer_bandwidth_sent: number;
connection_filetransfer_bandwidth_received: number; connection_filetransfer_bandwidth_received: number;
@ -103,12 +105,12 @@ interface ServerConnectionInfo {
connection_ping: number; connection_ping: number;
} }
interface ServerAddress { export interface ServerAddress {
host: string; host: string;
port: number; port: number;
} }
class ServerEntry { export class ServerEntry {
remote_address: ServerAddress; remote_address: ServerAddress;
channelTree: ChannelTree; channelTree: ChannelTree;
properties: ServerProperties; properties: ServerProperties;

6
shared/js/channel-tree/view.ts
View file

@ -4,12 +4,12 @@
/// <reference path="client.ts" /> /// <reference path="client.ts" />
/// <reference path="server.ts" /> /// <reference path="server.ts" />
/// <reference path="../bookmarks.ts" /> /// <reference path="../bookmarks.ts" />
/// <reference path="elements/context_menu.ts" /> /// <reference path="../ui/elements/context_menu.ts" />
/// <reference path="modal/ModalCreateChannel.ts" /> /// <reference path="../ui/modal/ModalCreateChannel.ts" />
/// <reference path="../../backend/ppt.d.ts" /> /// <reference path="../../backend/ppt.d.ts" />
class ChannelTree { export class ChannelTree {
client: ConnectionHandler; client: ConnectionHandler;
server: ServerEntry; server: ServerEntry;

70
shared/js/connection/CommandHandler.ts
View file

@ -1,16 +1,37 @@
/// <reference path="ConnectionBase.ts" /> import {ConnectionHandler, DisconnectReason, ViewReasonId} from "../ConnectionHandler";
import {
AbstractCommandHandler,
AbstractCommandHandlerBoss,
AbstractServerConnection,
CommandOptions, ServerCommand
} from "./ConnectionBase";
import {CommandResult, ErrorID} from "./ServerConnectionDeclaration";
import {Sound} from "../sound/Sounds";
import {log, LogCategory} from "../log";
import {MessageHelper} from "../ui/frames/chat";
import {
ClientConnectionInfo,
ClientEntry,
ClientType,
LocalClientEntry,
MusicClientEntry, SongInfo
} from "../channel-tree/client";
import {ChannelEntry} from "../channel-tree/channel";
import {chat as pchat} from "../ui/frames/side/private_conversations";
import {Modals} from "../ui/modal/ModalPoke";
import {chat} from "../ui/frames/side/conversations";
import Conversation = chat.channel.Conversation;
import {createErrorModal, createInfoModal, createInputModal, createModal} from "../ui/elements/modal";
import {server_connections} from "../ui/frames/connection_handlers";
import {server} from "../ui/frames/server_log";
namespace connection { export class ServerConnectionCommandBoss extends AbstractCommandHandlerBoss {
import Conversation = chat.channel.Conversation;
import MusicInfo = chat.MusicInfo;
export class ServerConnectionCommandBoss extends AbstractCommandHandlerBoss {
constructor(connection: AbstractServerConnection) { constructor(connection: AbstractServerConnection) {
super(connection); super(connection);
} }
} }
export class ConnectionCommandHandler extends AbstractCommandHandler { export class ConnectionCommandHandler extends AbstractCommandHandler {
readonly connection: AbstractServerConnection; readonly connection: AbstractServerConnection;
readonly connection_handler: ConnectionHandler; readonly connection_handler: ConnectionHandler;
@ -65,7 +86,7 @@ namespace connection {
this["notifyplaylistsongloaded"] = this.handleNotifyPlaylistSongLoaded; this["notifyplaylistsongloaded"] = this.handleNotifyPlaylistSongLoaded;
} }
private loggable_invoker(unique_id, client_id, name) : log.server.base.Client | undefined { private loggable_invoker(unique_id, client_id, name) : server.base.Client | undefined {
const id = parseInt(client_id); const id = parseInt(client_id);
if(typeof(client_id) === "undefined" || Number.isNaN(id)) if(typeof(client_id) === "undefined" || Number.isNaN(id))
return undefined; return undefined;
@ -84,7 +105,7 @@ namespace connection {
}; };
} }
proxy_command_promise(promise: Promise<CommandResult>, options: connection.CommandOptions) { proxy_command_promise(promise: Promise<CommandResult>, options: CommandOptions) {
if(!options.process_result) if(!options.process_result)
return promise; return promise;
@ -96,18 +117,18 @@ namespace connection {
if(res.id == ErrorID.PERMISSION_ERROR) { //Permission error if(res.id == ErrorID.PERMISSION_ERROR) { //Permission error
const permission = this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number); 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"); res.message = tr("Insufficient client permissions. Failed on permission ") + (permission ? permission.name : "unknown");
this.connection_handler.log.log(log.server.Type.ERROR_PERMISSION, { this.connection_handler.log.log(server.Type.ERROR_PERMISSION, {
permission: this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number) permission: this.connection_handler.permissions.resolveInfo(res.json["failed_permid"] as number)
}); });
this.connection_handler.sound.play(Sound.ERROR_INSUFFICIENT_PERMISSIONS); this.connection_handler.sound.play(Sound.ERROR_INSUFFICIENT_PERMISSIONS);
} else if(res.id != ErrorID.EMPTY_RESULT) { } else if(res.id != ErrorID.EMPTY_RESULT) {
this.connection_handler.log.log(log.server.Type.ERROR_CUSTOM, { this.connection_handler.log.log(server.Type.ERROR_CUSTOM, {
message: res.extra_message.length == 0 ? res.message : res.extra_message message: res.extra_message.length == 0 ? res.message : res.extra_message
}); });
} }
} }
} else if(typeof(ex) === "string") { } else if(typeof(ex) === "string") {
this.connection_handler.log.log(log.server.Type.CONNECTION_COMMAND_ERROR, {error: ex}); this.connection_handler.log.log(server.Type.CONNECTION_COMMAND_ERROR, {error: ex});
} else { } else {
log.error(LogCategory.NETWORKING, tr("Invalid promise result type: %s. Result: %o"), typeof (ex), ex); log.error(LogCategory.NETWORKING, tr("Invalid promise result type: %s. Result: %o"), typeof (ex), ex);
} }
@ -190,7 +211,7 @@ namespace connection {
if(properties.virtualserver_hostmessage_mode > 0) { if(properties.virtualserver_hostmessage_mode > 0) {
if(properties.virtualserver_hostmessage_mode == 1) { if(properties.virtualserver_hostmessage_mode == 1) {
/* show in log */ /* show in log */
this.connection_handler.log.log(log.server.Type.SERVER_HOST_MESSAGE, { this.connection_handler.log.log(server.Type.SERVER_HOST_MESSAGE, {
message: properties.virtualserver_hostmessage message: properties.virtualserver_hostmessage
}); });
} else { } else {
@ -204,7 +225,7 @@ namespace connection {
if(properties.virtualserver_hostmessage_mode == 3) { if(properties.virtualserver_hostmessage_mode == 3) {
/* first let the client initialize his stuff */ /* first let the client initialize his stuff */
setTimeout(() => { setTimeout(() => {
this.connection_handler.log.log(log.server.Type.SERVER_HOST_MESSAGE_DISCONNECT, { this.connection_handler.log.log(server.Type.SERVER_HOST_MESSAGE_DISCONNECT, {
message: properties.virtualserver_welcomemessage message: properties.virtualserver_welcomemessage
}); });
@ -218,7 +239,7 @@ namespace connection {
/* welcome message */ /* welcome message */
if(properties.virtualserver_welcomemessage) { if(properties.virtualserver_welcomemessage) {
this.connection_handler.log.log(log.server.Type.SERVER_WELCOME_MESSAGE, { this.connection_handler.log.log(server.Type.SERVER_WELCOME_MESSAGE, {
message: properties.virtualserver_welcomemessage message: properties.virtualserver_welcomemessage
}); });
} }
@ -240,7 +261,7 @@ namespace connection {
}, { field_placeholder: 'Enter Privilege Key' }).open(); }, { field_placeholder: 'Enter Privilege Key' }).open();
} }
this.connection_handler.log.log(log.server.Type.CONNECTION_CONNECTED, { this.connection_handler.log.log(server.Type.CONNECTION_CONNECTED, {
own_client: this.connection_handler.getClient().log_data() own_client: this.connection_handler.getClient().log_data()
}); });
this.connection_handler.sound.play(Sound.CONNECTION_CONNECTED); this.connection_handler.sound.play(Sound.CONNECTION_CONNECTED);
@ -414,7 +435,7 @@ namespace connection {
if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) { if(this.connection_handler.client_status.queries_visible || client.properties.client_type != ClientType.CLIENT_QUERY) {
const own_channel = this.connection.client.getClient().currentChannel(); const own_channel = this.connection.client.getClient().currentChannel();
this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_ENTER, { this.connection_handler.log.log(server.Type.CLIENT_VIEW_ENTER, {
channel_from: old_channel ? old_channel.log_data() : undefined, channel_from: old_channel ? old_channel.log_data() : undefined,
channel_to: channel ? channel.log_data() : undefined, channel_to: channel ? channel.log_data() : undefined,
client: client.log_data(), client: client.log_data(),
@ -521,7 +542,7 @@ namespace connection {
let channel_to = tree.findChannel(entry["ctid"]); let channel_to = tree.findChannel(entry["ctid"]);
const is_own_channel = channel_from == own_channel; const is_own_channel = channel_from == own_channel;
this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_LEAVE, { this.connection_handler.log.log(server.Type.CLIENT_VIEW_LEAVE, {
channel_from: channel_from ? channel_from.log_data() : undefined, channel_from: channel_from ? channel_from.log_data() : undefined,
channel_to: channel_to ? channel_to.log_data() : undefined, channel_to: channel_to ? channel_to.log_data() : undefined,
client: client.log_data(), client: client.log_data(),
@ -564,7 +585,7 @@ namespace connection {
attach: false attach: false
}); });
if(conversation) { if(conversation) {
conversation.set_state(chat.PrivateConversationState.DISCONNECTED); conversation.set_state(pchat.PrivateConversationState.DISCONNECTED);
} }
} }
} }
@ -635,7 +656,7 @@ namespace connection {
} }
const own_channel = this.connection.client.getClient().currentChannel(); const own_channel = this.connection.client.getClient().currentChannel();
this.connection_handler.log.log(log.server.Type.CLIENT_VIEW_MOVE, { this.connection_handler.log.log(server.Type.CLIENT_VIEW_MOVE, {
channel_from: channel_from ? { channel_from: channel_from ? {
channel_id: channel_from.channelId, channel_id: channel_from.channelId,
channel_name: channel_from.channelName() channel_name: channel_from.channelName()
@ -750,7 +771,7 @@ namespace connection {
const target_own = target_client_id === this.connection.client.getClientId(); const target_own = target_client_id === this.connection.client.getClientId();
if(target_own && target_client_id === json["invokerid"]) { if(target_own && target_client_id === json["invokerid"]) {
log.error(LogCategory.NETWORKING, tr("Received conversation message from invalid client id. Data: %o", json)); log.error(LogCategory.NETWORKING, tr("Received conversation message from invalid client id. Data: %o"), json);
return; return;
} }
@ -808,7 +829,7 @@ namespace connection {
if(conversation.is_unread() && channel) if(conversation.is_unread() && channel)
channel.flag_text_unread = true; channel.flag_text_unread = true;
} else if(mode == 3) { } else if(mode == 3) {
this.connection_handler.log.log(log.server.Type.GLOBAL_MESSAGE, { this.connection_handler.log.log(server.Type.GLOBAL_MESSAGE, {
message: json["msg"], message: json["msg"],
sender: { sender: {
client_unique_id: json["invokeruid"], client_unique_id: json["invokeruid"],
@ -871,7 +892,7 @@ namespace connection {
log.warn(LogCategory.GENERAL, tr("Received chat close for client, but we haven't a chat open.")); log.warn(LogCategory.GENERAL, tr("Received chat close for client, but we haven't a chat open."));
return; return;
} }
conversation.set_state(chat.PrivateConversationState.CLOSED); conversation.set_state(pchat.PrivateConversationState.CLOSED);
} }
handleNotifyClientUpdated(json) { handleNotifyClientUpdated(json) {
@ -1156,5 +1177,4 @@ namespace connection {
metadata: json["song_metadata"] metadata: json["song_metadata"]
}); });
} }
}
} }

20
shared/js/connection/CommandHelper.ts
View file

@ -1,5 +1,18 @@
namespace connection { import {
export class CommandHelper extends AbstractCommandHandler { ClientNameInfo,
CommandResult,
ErrorID,
Playlist, PlaylistInfo, PlaylistSong,
QueryList,
QueryListEntry, ServerGroupClient
} from "./ServerConnectionDeclaration";
import {ChannelEntry} from "../channel-tree/channel";
import {ChatType} from "../ui/frames/chat";
import {ClientEntry} from "../channel-tree/client";
import {AbstractCommandHandler, ServerCommand, SingleCommandHandler} from "./ConnectionBase";
import {log, LogCategory} from "../log";
export class CommandHelper extends AbstractCommandHandler {
private _who_am_i: any; private _who_am_i: any;
private _awaiters_unique_ids: {[unique_id: string]:((resolved: ClientNameInfo) => any)[]} = {}; private _awaiters_unique_ids: {[unique_id: string]:((resolved: ClientNameInfo) => any)[]} = {};
private _awaiters_unique_dbid: {[database_id: number]:((resolved: ClientNameInfo) => any)[]} = {}; private _awaiters_unique_dbid: {[database_id: number]:((resolved: ClientNameInfo) => any)[]} = {};
@ -23,7 +36,7 @@ namespace connection {
this._awaiters_unique_ids = undefined; this._awaiters_unique_ids = undefined;
} }
handle_command(command: connection.ServerCommand): boolean { handle_command(command: ServerCommand): boolean {
if(command.command == "notifyclientnamefromuid") if(command.command == "notifyclientnamefromuid")
this.handle_notifyclientnamefromuid(command.arguments); this.handle_notifyclientnamefromuid(command.arguments);
if(command.command == "notifyclientgetnamefromdbid") if(command.command == "notifyclientgetnamefromdbid")
@ -444,5 +457,4 @@ namespace connection {
}); });
}); });
} }
}
} }

42
shared/js/connection/ConnectionBase.ts
View file

@ -1,18 +1,25 @@
namespace connection { import {ConnectionHandler, ConnectionState} from "../ConnectionHandler";
export interface CommandOptions { import {ServerAddress} from "../channel-tree/server";
import {CommandResult} from "./ServerConnectionDeclaration";
import {RecorderProfile} from "../voice/RecorderProfile";
import {CommandHelper} from "./CommandHelper";
import {connection} from "./HandshakeHandler";
import HandshakeHandler = connection.HandshakeHandler;
export interface CommandOptions {
flagset?: string[]; /* default: [] */ flagset?: string[]; /* default: [] */
process_result?: boolean; /* default: true */ process_result?: boolean; /* default: true */
timeout?: number /* default: 1000 */; timeout?: number /* default: 1000 */;
} }
export const CommandOptionDefaults: CommandOptions = { export const CommandOptionDefaults: CommandOptions = {
flagset: [], flagset: [],
process_result: true, process_result: true,
timeout: 1000 timeout: 1000
}; };
export type ConnectionStateListener = (old_state: ConnectionState, new_state: ConnectionState) => any; export type ConnectionStateListener = (old_state: ConnectionState, new_state: ConnectionState) => any;
export abstract class AbstractServerConnection { export abstract class AbstractServerConnection {
readonly client: ConnectionHandler; readonly client: ConnectionHandler;
readonly command_helper: CommandHelper; readonly command_helper: CommandHelper;
@ -44,9 +51,9 @@ namespace connection {
native: number, native: number,
javascript?: number javascript?: number
}; };
} }
export namespace voice { export namespace voice {
export enum PlayerState { export enum PlayerState {
PREBUFFERING, PREBUFFERING,
PLAYING, PLAYING,
@ -105,14 +112,14 @@ namespace connection {
abstract get_encoder_codec() : number; abstract get_encoder_codec() : number;
abstract set_encoder_codec(codec: number); abstract set_encoder_codec(codec: number);
} }
} }
export class ServerCommand { export class ServerCommand {
command: string; command: string;
arguments: any[]; arguments: any[];
} }
export abstract class AbstractCommandHandler { export abstract class AbstractCommandHandler {
readonly connection: AbstractServerConnection; readonly connection: AbstractServerConnection;
handler_boss: AbstractCommandHandlerBoss | undefined; handler_boss: AbstractCommandHandlerBoss | undefined;
@ -128,18 +135,18 @@ namespace connection {
* @return If the command should be consumed * @return If the command should be consumed
*/ */
abstract handle_command(command: ServerCommand) : boolean; abstract handle_command(command: ServerCommand) : boolean;
} }
export interface SingleCommandHandler { export interface SingleCommandHandler {
name?: string; name?: string;
command?: string; command?: string;
timeout?: number; timeout?: number;
/* if the return is true then the command handler will be removed */ /* if the return is true then the command handler will be removed */
function: (command: ServerCommand) => boolean; function: (command: ServerCommand) => boolean;
} }
export abstract class AbstractCommandHandlerBoss { export abstract class AbstractCommandHandlerBoss {
readonly connection: AbstractServerConnection; readonly connection: AbstractServerConnection;
protected command_handlers: AbstractCommandHandler[] = []; protected command_handlers: AbstractCommandHandler[] = [];
/* TODO: Timeout */ /* TODO: Timeout */
@ -212,5 +219,4 @@ namespace connection {
return flag_consumed; return flag_consumed;
} }
}
} }

19
shared/js/connection/HandshakeHandler.ts
View file

@ -1,4 +1,15 @@
namespace connection { import {AbstractServerConnection} from "./ConnectionBase";
import {ConnectParameters, DisconnectReason} from "../ConnectionHandler";
import {profiles} from "../profiles/ConnectionProfile";
import {profiles as iprofiles} from "../profiles/Identity";
import {profiles as tiprofiles} from "../profiles/identities/TeamSpeakIdentity";
import {native_client} from "../main";
import {settings} from "../settings";
import {CommandResult} from "./ServerConnectionDeclaration";
export namespace connection {
import identities = iprofiles.identities;
export interface HandshakeIdentityHandler { export interface HandshakeIdentityHandler {
connection: AbstractServerConnection; connection: AbstractServerConnection;
@ -48,7 +59,7 @@ namespace connection {
on_teamspeak() { on_teamspeak() {
const type = this.profile.selected_type(); const type = this.profile.selected_type();
if(type == profiles.identities.IdentitifyType.TEAMSPEAK) if(type == identities.IdentitifyType.TEAMSPEAK)
this.handshake_finished(); this.handshake_finished();
else { else {
@ -122,8 +133,8 @@ namespace connection {
} }
/* required to keep compatibility */ /* required to keep compatibility */
if(this.profile.selected_type() === profiles.identities.IdentitifyType.TEAMSPEAK) { if(this.profile.selected_type() === identities.IdentitifyType.TEAMSPEAK) {
data["client_key_offset"] = (this.profile.selected_identity() as profiles.identities.TeaSpeakIdentity).hash_number; data["client_key_offset"] = (this.profile.selected_identity() as tiprofiles.identities.TeaSpeakIdentity).hash_number;
} }
this.connection.send_command("clientinit", data).catch(error => { this.connection.send_command("clientinit", data).catch(error => {

22
shared/js/connection/ServerConnectionDeclaration.ts
View file

@ -1,4 +1,6 @@
enum ErrorID { import {LaterPromise} from "../utils/helpers";
export enum ErrorID {
NOT_IMPLEMENTED = 0x2, NOT_IMPLEMENTED = 0x2,
COMMAND_NOT_FOUND = 0x100, COMMAND_NOT_FOUND = 0x100,
@ -15,7 +17,7 @@ enum ErrorID {
CONVERSATION_IS_PRIVATE = 0x2202 CONVERSATION_IS_PRIVATE = 0x2202
} }
class CommandResult { export class CommandResult {
success: boolean; success: boolean;
id: number; id: number;
message: string; message: string;
@ -35,39 +37,39 @@ class CommandResult {
} }
} }
interface ClientNameInfo { export interface ClientNameInfo {
//cluid=tYzKUryn\/\/Y8VBMf8PHUT6B1eiE= name=Exp clname=Exp cldbid=9 //cluid=tYzKUryn\/\/Y8VBMf8PHUT6B1eiE= name=Exp clname=Exp cldbid=9
client_unique_id: string; client_unique_id: string;
client_nickname: string; client_nickname: string;
client_database_id: number; client_database_id: number;
} }
interface ClientNameFromUid { export interface ClientNameFromUid {
promise: LaterPromise<ClientNameInfo[]>, promise: LaterPromise<ClientNameInfo[]>,
keys: string[], keys: string[],
response: ClientNameInfo[] response: ClientNameInfo[]
} }
interface ServerGroupClient { export interface ServerGroupClient {
client_nickname: string; client_nickname: string;
client_unique_identifier: string; client_unique_identifier: string;
client_database_id: number; client_database_id: number;
} }
interface QueryListEntry { export interface QueryListEntry {
username: string; username: string;
unique_id: string; unique_id: string;
bounded_server: number; bounded_server: number;
} }
interface QueryList { export interface QueryList {
flag_own: boolean; flag_own: boolean;
flag_all: boolean; flag_all: boolean;
queries: QueryListEntry[]; queries: QueryListEntry[];
} }
interface Playlist { export interface Playlist {
playlist_id: number; playlist_id: number;
playlist_bot_id: number; playlist_bot_id: number;
playlist_title: string; playlist_title: string;
@ -83,7 +85,7 @@ interface Playlist {
needed_power_song_remove: number; needed_power_song_remove: number;
} }
interface PlaylistInfo { export interface PlaylistInfo {
playlist_id: number, playlist_id: number,
playlist_title: string, playlist_title: string,
playlist_description: string, playlist_description: string,
@ -100,7 +102,7 @@ interface PlaylistInfo {
playlist_max_songs: number playlist_max_songs: number
} }
interface PlaylistSong { export interface PlaylistSong {
song_id: number; song_id: number;
song_previous_song_id: number; song_previous_song_id: number;
song_invoker: string; song_invoker: string;

2
shared/js/crypto/asn1.ts
View file

@ -14,7 +14,7 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
namespace asn1 { export namespace asn1 {
declare class Int10 { declare class Int10 {
constructor(value?: any); constructor(value?: any);

2
shared/js/crypto/crc32.ts
View file

@ -1,4 +1,4 @@
class Crc32 { export class Crc32 {
private static readonly lookup = [ private static readonly lookup = [
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,

2
shared/js/crypto/hex.ts
View file

@ -1,4 +1,4 @@
namespace hex { export namespace hex {
export function encode(buffer) { export function encode(buffer) {
let hexCodes = []; let hexCodes = [];
let view = new DataView(buffer); let view = new DataView(buffer);

2
shared/js/crypto/sha.ts
View file

@ -10,7 +10,7 @@ interface Window {
} }
*/ */
namespace sha { export namespace sha {
/* /*
* [js-sha1]{@link https://github.com/emn178/js-sha1} * [js-sha1]{@link https://github.com/emn178/js-sha1}
* *

8
shared/js/crypto/uid.ts
View file

@ -0,0 +1,8 @@
export function guid() {
function s4() {
return Math.floor((1 + Math.random()) * 0x10000)
.toString(16)
.substring(1);
}
return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
}

2
shared/js/dns.ts
View file

@ -1,4 +1,4 @@
namespace dns { export namespace dns {
export interface AddressTarget { export interface AddressTarget {
target_ip: string; target_ip: string;
target_port?: number; target_port?: number;

6
shared/js/events.ts
View file

@ -1,4 +1,8 @@
namespace events { import {guid} from "./crypto/uid";
import {PlaylistSong} from "./connection/ServerConnectionDeclaration";
import {MusicClientEntry, SongInfo} from "./channel-tree/client";
export namespace events {
export interface EventConvert<All> { export interface EventConvert<All> {
as<T extends keyof All>() : All[T]; as<T extends keyof All>() : All[T];
} }

3
shared/js/i18n/country.ts
View file

@ -1,5 +1,4 @@
export namespace i18n {
namespace i18n {
interface CountryInfo { interface CountryInfo {
name: string; name: string;
alpha_2: string; alpha_2: string;

15
shared/js/i18n/localize.ts
View file

@ -1,13 +1,10 @@
function guid() { import {guid} from "../crypto/uid";
function s4() { import {log, LogCategory} from "../log";
return Math.floor((1 + Math.random()) * 0x10000) import {MessageHelper} from "../ui/frames/chat";
.toString(16) import {StaticSettings} from "../settings";
.substring(1); import {createErrorModal} from "../ui/elements/modal";
}
return s4() + s4() + '-' + s4() + '-' + s4() + '-' + s4() + '-' + s4() + s4() + s4();
}
namespace i18n { export namespace i18n {
export interface TranslationKey { export interface TranslationKey {
message: string; message: string;
line?: number; line?: number;

6
shared/js/log.ts
View file

@ -1,6 +1,8 @@
//Used by CertAccept popup //Used by CertAccept popup
enum LogCategory { import {settings} from "./settings";
export enum LogCategory {
CHANNEL, CHANNEL,
CHANNEL_PROPERTIES, /* separating channel and channel properties because on channel init logging is a big bottleneck */ CHANNEL_PROPERTIES, /* separating channel and channel properties because on channel init logging is a big bottleneck */
CLIENT, CLIENT,
@ -19,7 +21,7 @@ enum LogCategory {
DNS DNS
} }
namespace log { export namespace log {
export enum LogType { export enum LogType {
TRACE, TRACE,
DEBUG, DEBUG,

46
shared/js/main.ts
View file

@ -1,19 +1,18 @@
/// <reference path="ui/frames/chat.ts" />
/// <reference path="ui/modal/ModalConnect.ts" />
/// <reference path="ui/modal/ModalCreateChannel.ts" />
/// <reference path="ui/modal/ModalBanClient.ts" />
/// <reference path="ui/modal/ModalYesNo.ts" />
/// <reference path="ui/modal/ModalBanList.ts" />
/// <reference path="settings.ts" />
/// <reference path="log.ts" />
/// <reference path="PPTListener.ts" />
import spawnYesNo = Modals.spawnYesNo; import spawnYesNo = Modals.spawnYesNo;
import {ConnectionHandler} from "./ConnectionHandler";
import {bipc} from "./BrowserIPC";
import {log, LogCategory} from "./log";
import {profiles} from "./profiles/ConnectionProfile";
import {Modals} from "./ui/modal/ModalConnect";
import {settings, Settings} from "./settings";
import {i18n} from "./i18n/localize";
import {createInfoModal} from "./ui/elements/modal";
import {MessageHelper} from "./ui/frames/chat";
const js_render = window.jsrender || $; export const js_render = window.jsrender || $;
const native_client = window.require !== undefined; export const native_client = window.require !== undefined;
function getUserMediaFunctionPromise() : (constraints: MediaStreamConstraints) => Promise<MediaStream> { export function getUserMediaFunctionPromise() : (constraints: MediaStreamConstraints) => Promise<MediaStream> {
if('mediaDevices' in navigator && 'getUserMedia' in navigator.mediaDevices) if('mediaDevices' in navigator && 'getUserMedia' in navigator.mediaDevices)
return constraints => navigator.mediaDevices.getUserMedia(constraints); return constraints => navigator.mediaDevices.getUserMedia(constraints);
@ -24,11 +23,12 @@ function getUserMediaFunctionPromise() : (constraints: MediaStreamConstraints) =
return constraints => new Promise<MediaStream>((resolve, reject) => _callbacked_function(constraints, resolve, reject)); return constraints => new Promise<MediaStream>((resolve, reject) => _callbacked_function(constraints, resolve, reject));
} }
interface Window { export interface Window {
open_connected_question: () => Promise<boolean>; open_connected_question: () => Promise<boolean>;
} }
function setup_close() { export declare const nodeRequire: typeof require;
export function setup_close() {
window.onbeforeunload = event => { window.onbeforeunload = event => {
if(profiles.requires_save()) if(profiles.requires_save())
profiles.save(); profiles.save();
@ -50,7 +50,7 @@ function setup_close() {
})); }));
const exit = () => { const exit = () => {
const {remote} = require('electron'); const {remote} = nodeRequire('electron');
remote.getCurrentWindow().close(); remote.getCurrentWindow().close();
}; };
@ -80,8 +80,8 @@ function setup_close() {
}; };
} }
declare function moment(...arguments) : any; export declare function moment(...arguments) : any;
function setup_jsrender() : boolean { export function setup_jsrender() : boolean {
if(!js_render) { if(!js_render) {
loader.critical_error("Missing jsrender extension!"); loader.critical_error("Missing jsrender extension!");
return false; return false;
@ -115,7 +115,7 @@ function setup_jsrender() : boolean {
return true; return true;
} }
async function initialize() { export async function initialize() {
Settings.initialize(); Settings.initialize();
try { try {
@ -129,7 +129,7 @@ async function initialize() {
bipc.setup(); bipc.setup();
} }
async function initialize_app() { export async function initialize_app() {
try { //Initialize main template try { //Initialize main template
const main = $("#tmpl_main").renderTag({ const main = $("#tmpl_main").renderTag({
multi_session: !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION), multi_session: !settings.static_global(Settings.KEY_DISABLE_MULTI_SESSION),
@ -180,7 +180,7 @@ async function initialize_app() {
setup_close(); setup_close();
} }
function str2ab8(str) { export function str2ab8(str) {
const buf = new ArrayBuffer(str.length); const buf = new ArrayBuffer(str.length);
const bufView = new Uint8Array(buf); const bufView = new Uint8Array(buf);
for (let i = 0, strLen = str.length; i < strLen; i++) { for (let i = 0, strLen = str.length; i < strLen; i++) {
@ -190,7 +190,7 @@ function str2ab8(str) {
} }
/* FIXME Dont use atob, because it sucks for non UTF-8 tings */ /* FIXME Dont use atob, because it sucks for non UTF-8 tings */
function arrayBufferBase64(base64: string) { export function arrayBufferBase64(base64: string) {
base64 = atob(base64); base64 = atob(base64);
const buf = new ArrayBuffer(base64.length); const buf = new ArrayBuffer(base64.length);
const bufView = new Uint8Array(buf); const bufView = new Uint8Array(buf);
@ -200,7 +200,7 @@ function arrayBufferBase64(base64: string) {
return buf; return buf;
} }
function base64_encode_ab(source: ArrayBufferLike) { export function base64_encode_ab(source: ArrayBufferLike) {
const encodings = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; const encodings = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
let base64 = ""; let base64 = "";

21
shared/js/permission/GroupManager.ts
View file

@ -1,17 +1,24 @@
/// <reference path="../connection/ConnectionBase.ts" /> /// <reference path="../connection/ConnectionBase.ts" />
enum GroupType { import {LaterPromise} from "../utils/helpers";
import {PermissionManager, PermissionValue} from "./PermissionManager";
import {AbstractCommandHandler, ServerCommand} from "../connection/ConnectionBase";
import {ConnectionHandler} from "../ConnectionHandler";
import {log, LogCategory} from "../log";
import {CommandResult} from "../connection/ServerConnectionDeclaration";
export enum GroupType {
QUERY, QUERY,
TEMPLATE, TEMPLATE,
NORMAL NORMAL
} }
enum GroupTarget { export enum GroupTarget {
SERVER, SERVER,
CHANNEL CHANNEL
} }
class GroupProperties { export class GroupProperties {
iconid: number = 0; iconid: number = 0;
sortid: number = 0; sortid: number = 0;
@ -19,12 +26,12 @@ class GroupProperties {
namemode: number = 0; namemode: number = 0;
} }
class GroupPermissionRequest { export class GroupPermissionRequest {
group_id: number; group_id: number;
promise: LaterPromise<PermissionValue[]>; promise: LaterPromise<PermissionValue[]>;
} }
class Group { export class Group {
properties: GroupProperties = new GroupProperties(); properties: GroupProperties = new GroupProperties();
readonly handle: GroupManager; readonly handle: GroupManager;
@ -63,7 +70,7 @@ class Group {
} }
} }
class GroupManager extends connection.AbstractCommandHandler { export class GroupManager extends AbstractCommandHandler {
readonly handle: ConnectionHandler; readonly handle: ConnectionHandler;
serverGroups: Group[] = []; serverGroups: Group[] = [];
@ -83,7 +90,7 @@ class GroupManager extends connection.AbstractCommandHandler {
this.channelGroups = undefined; this.channelGroups = undefined;
} }
handle_command(command: connection.ServerCommand): boolean { handle_command(command: ServerCommand): boolean {
switch (command.command) { switch (command.command) {
case "notifyservergrouplist": case "notifyservergrouplist":
case "notifychannelgrouplist": case "notifychannelgrouplist":

27
shared/js/permission/PermissionManager.ts
View file

@ -2,7 +2,14 @@
/// <reference path="../connection/ConnectionBase.ts" /> /// <reference path="../connection/ConnectionBase.ts" />
/// <reference path="../i18n/localize.ts" /> /// <reference path="../i18n/localize.ts" />
enum PermissionType { import {ConnectionHandler} from "../ConnectionHandler";
import {log, LogCategory} from "../log";
import {LaterPromise} from "../utils/helpers";
import {AbstractCommandHandler, ServerCommand} from "../connection/ConnectionBase";
import LogType = log.LogType;
import {CommandResult, ErrorID} from "../connection/ServerConnectionDeclaration";
export enum PermissionType {
B_SERVERINSTANCE_HELP_VIEW = "b_serverinstance_help_view", B_SERVERINSTANCE_HELP_VIEW = "b_serverinstance_help_view",
B_SERVERINSTANCE_VERSION_VIEW = "b_serverinstance_version_view", B_SERVERINSTANCE_VERSION_VIEW = "b_serverinstance_version_view",
B_SERVERINSTANCE_INFO_VIEW = "b_serverinstance_info_view", B_SERVERINSTANCE_INFO_VIEW = "b_serverinstance_info_view",
@ -352,7 +359,7 @@ enum PermissionType {
I_FT_QUOTA_MB_UPLOAD_PER_CLIENT = "i_ft_quota_mb_upload_per_client" I_FT_QUOTA_MB_UPLOAD_PER_CLIENT = "i_ft_quota_mb_upload_per_client"
} }
class PermissionInfo { export class PermissionInfo {
name: string; name: string;
id: number; id: number;
description: string; description: string;
@ -363,21 +370,21 @@ class PermissionInfo {
} }
} }
class PermissionGroup { export class PermissionGroup {
begin: number; begin: number;
end: number; end: number;
deep: number; deep: number;
name: string; name: string;
} }
class GroupedPermissions { export class GroupedPermissions {
group: PermissionGroup; group: PermissionGroup;
permissions: PermissionInfo[]; permissions: PermissionInfo[];
children: GroupedPermissions[]; children: GroupedPermissions[];
parent: GroupedPermissions; parent: GroupedPermissions;
} }
class PermissionValue { export class PermissionValue {
readonly type: PermissionInfo; readonly type: PermissionInfo;
value: number; value: number;
flag_skip: boolean; flag_skip: boolean;
@ -411,13 +418,13 @@ class PermissionValue {
} }
} }
class NeededPermissionValue extends PermissionValue { export class NeededPermissionValue extends PermissionValue {
constructor(type, value) { constructor(type, value) {
super(type, value); super(type, value);
} }
} }
namespace permissions { export namespace permissions {
export type PermissionRequestKeys = { export type PermissionRequestKeys = {
client_id?: number; client_id?: number;
channel_id?: number; channel_id?: number;
@ -473,13 +480,13 @@ namespace permissions {
} }
} }
type RequestLists = export type RequestLists =
"requests_channel_permissions" | "requests_channel_permissions" |
"requests_client_permissions" | "requests_client_permissions" |
"requests_client_channel_permissions" | "requests_client_channel_permissions" |
"requests_playlist_permissions" | "requests_playlist_permissions" |
"requests_playlist_client_permissions"; "requests_playlist_client_permissions";
class PermissionManager extends connection.AbstractCommandHandler { export class PermissionManager extends AbstractCommandHandler {
readonly handle: ConnectionHandler; readonly handle: ConnectionHandler;
permissionList: PermissionInfo[] = []; permissionList: PermissionInfo[] = [];
@ -603,7 +610,7 @@ class PermissionManager extends connection.AbstractCommandHandler {
this._cacheNeededPermissions = undefined; this._cacheNeededPermissions = undefined;
} }
handle_command(command: connection.ServerCommand): boolean { handle_command(command: ServerCommand): boolean {
switch (command.command) { switch (command.command) {
case "notifyclientneededpermissions": case "notifyclientneededpermissions":
this.onNeededPermissions(command.arguments); this.onNeededPermissions(command.arguments);

111
shared/js/profiles/ConnectionProfile.ts
View file

@ -1,5 +1,15 @@
namespace profiles { import {MessageHelper} from "../ui/frames/chat";
export class ConnectionProfile { import {createErrorModal} from "../ui/elements/modal";
import {guid} from "../crypto/uid";
import {decode_identity, IdentitifyType, Identity} from "./Identity";
import {static_forum_identity} from "./identities/TeaForumIdentity";
import {TeaSpeakIdentity} from "./identities/TeamSpeakIdentity";
import {AbstractServerConnection} from "../connection/ConnectionBase";
import {connection} from "../connection/HandshakeHandler";
import HandshakeIdentityHandler = connection.HandshakeIdentityHandler;
export class ConnectionProfile {
id: string; id: string;
profile_name: string; profile_name: string;
@ -7,7 +17,7 @@ namespace profiles {
default_password: string; default_password: string;
selected_identity_type: string = "unset"; selected_identity_type: string = "unset";
identities: { [key: string]: identities.Identity } = {}; identities: { [key: string]: Identity } = {};
constructor(id: string) { constructor(id: string) {
this.id = id; this.id = id;
@ -22,31 +32,31 @@ namespace profiles {
return name || "Another TeaSpeak user"; return name || "Another TeaSpeak user";
} }
selected_identity(current_type?: identities.IdentitifyType): identities.Identity { selected_identity(current_type?: IdentitifyType): Identity {
if (!current_type) if (!current_type)
current_type = this.selected_type(); current_type = this.selected_type();
if (current_type === undefined) if (current_type === undefined)
return undefined; return undefined;
if (current_type == identities.IdentitifyType.TEAFORO) { if (current_type == IdentitifyType.TEAFORO) {
return identities.static_forum_identity(); return static_forum_identity();
} else if (current_type == identities.IdentitifyType.TEAMSPEAK || current_type == identities.IdentitifyType.NICKNAME) { } else if (current_type == IdentitifyType.TEAMSPEAK || current_type == IdentitifyType.NICKNAME) {
return this.identities[identities.IdentitifyType[current_type].toLowerCase()]; return this.identities[IdentitifyType[current_type].toLowerCase()];
} }
return undefined; return undefined;
} }
selected_type?(): identities.IdentitifyType { selected_type?(): IdentitifyType {
return this.selected_identity_type ? identities.IdentitifyType[this.selected_identity_type.toUpperCase()] : undefined; return this.selected_identity_type ? IdentitifyType[this.selected_identity_type.toUpperCase()] : undefined;
} }
set_identity(type: identities.IdentitifyType, identity: identities.Identity) { set_identity(type: IdentitifyType, identity: Identity) {
this.identities[identities.IdentitifyType[type].toLowerCase()] = identity; this.identities[IdentitifyType[type].toLowerCase()] = identity;
} }
spawn_identity_handshake_handler?(connection: connection.AbstractServerConnection): connection.HandshakeIdentityHandler { spawn_identity_handshake_handler?(connection: AbstractServerConnection): HandshakeIdentityHandler {
const identity = this.selected_identity(); const identity = this.selected_identity();
if (!identity) if (!identity)
return undefined; return undefined;
@ -76,9 +86,9 @@ namespace profiles {
return true; return true;
} }
} }
async function decode_profile(data): Promise<ConnectionProfile | string> { async function decode_profile(data): Promise<ConnectionProfile | string> {
data = JSON.parse(data); data = JSON.parse(data);
if (data.version !== 1) if (data.version !== 1)
return "invalid version"; return "invalid version";
@ -91,11 +101,11 @@ namespace profiles {
if (data.identity_data) { if (data.identity_data) {
for (const key in data.identity_data) { for (const key in data.identity_data) {
const type = identities.IdentitifyType[key.toUpperCase() as string]; const type = IdentitifyType[key.toUpperCase() as string];
const _data = data.identity_data[key]; const _data = data.identity_data[key];
if (type == undefined) continue; if (type == undefined) continue;
const identity = await identities.decode_identity(type, _data); const identity = await decode_identity(type, _data);
if (identity == undefined) continue; if (identity == undefined) continue;
result.identities[key.toLowerCase()] = identity; result.identities[key.toLowerCase()] = identity;
@ -103,16 +113,16 @@ namespace profiles {
} }
return result; return result;
} }
interface ProfilesData { interface ProfilesData {
version: number; version: number;
profiles: string[]; profiles: string[];
} }
let available_profiles: ConnectionProfile[] = []; let available_profiles: ConnectionProfile[] = [];
export async function load() { export async function load() {
available_profiles = []; available_profiles = [];
const profiles_json = localStorage.getItem("profiles"); const profiles_json = localStorage.getItem("profiles");
@ -153,14 +163,14 @@ namespace profiles {
/* generate default identity */ /* generate default identity */
try { try {
const identity = await identities.TeaSpeakIdentity.generate_new(); const identity = await TeaSpeakIdentity.generate_new();
let active = true; let active = true;
setTimeout(() => { setTimeout(() => {
active = false; active = false;
}, 1000); }, 1000);
await identity.improve_level(8, 1, () => active); await identity.improve_level(8, 1, () => active);
profile.set_identity(identities.IdentitifyType.TEAMSPEAK, identity); profile.set_identity(IdentitifyType.TEAMSPEAK, identity);
profile.selected_identity_type = identities.IdentitifyType[identities.IdentitifyType.TEAMSPEAK]; profile.selected_identity_type = IdentitifyType[IdentitifyType.TEAMSPEAK];
} catch (error) { } catch (error) {
createErrorModal(tr("Failed to generate default identity"), tr("Failed to generate default identity!<br>Please manually generate the identity within your settings => profiles")).open(); createErrorModal(tr("Failed to generate default identity"), tr("Failed to generate default identity!<br>Please manually generate the identity within your settings => profiles")).open();
} }
@ -172,25 +182,25 @@ namespace profiles {
profile.default_username = ""; profile.default_username = "";
profile.profile_name = "TeaSpeak Forum profile"; profile.profile_name = "TeaSpeak Forum profile";
profile.set_identity(identities.IdentitifyType.TEAFORO, identities.static_forum_identity()); profile.set_identity(IdentitifyType.TEAFORO, static_forum_identity());
profile.selected_identity_type = identities.IdentitifyType[identities.IdentitifyType.TEAFORO]; profile.selected_identity_type = IdentitifyType[IdentitifyType.TEAFORO];
} }
save(); save();
} }
} }
export function create_new_profile(name: string, id?: string): ConnectionProfile { export function create_new_profile(name: string, id?: string): ConnectionProfile {
const profile = new ConnectionProfile(id || guid()); const profile = new ConnectionProfile(id || guid());
profile.profile_name = name; profile.profile_name = name;
profile.default_username = ""; profile.default_username = "";
available_profiles.push(profile); available_profiles.push(profile);
return profile; return profile;
} }
let _requires_save = false; let _requires_save = false;
export function save() { export function save() {
const profiles: string[] = []; const profiles: string[] = [];
for (const profile of available_profiles) for (const profile of available_profiles)
profiles.push(profile.encode()); profiles.push(profile.encode());
@ -200,52 +210,51 @@ namespace profiles {
profiles: profiles profiles: profiles
}); });
localStorage.setItem("profiles", data); localStorage.setItem("profiles", data);
} }
export function mark_need_save() { export function mark_need_save() {
_requires_save = true; _requires_save = true;
} }
export function requires_save(): boolean { export function requires_save(): boolean {
return _requires_save; return _requires_save;
} }
export function profiles(): ConnectionProfile[] { export function profiles(): ConnectionProfile[] {
return available_profiles; return available_profiles;
} }
export function find_profile(id: string): ConnectionProfile | undefined { export function find_profile(id: string): ConnectionProfile | undefined {
for (const profile of profiles()) for (const profile of profiles())
if (profile.id == id) if (profile.id == id)
return profile; return profile;
return undefined; return undefined;
} }
export function find_profile_by_name(name: string): ConnectionProfile | undefined { export function find_profile_by_name(name: string): ConnectionProfile | undefined {
name = name.toLowerCase(); name = name.toLowerCase();
for (const profile of profiles()) for (const profile of profiles())
if ((profile.profile_name || "").toLowerCase() == name) if ((profile.profile_name || "").toLowerCase() == name)
return profile; return profile;
return undefined; return undefined;
} }
export function default_profile(): ConnectionProfile { export function default_profile(): ConnectionProfile {
return find_profile("default"); return find_profile("default");
} }
export function set_default_profile(profile: ConnectionProfile) { export function set_default_profile(profile: ConnectionProfile) {
const old_default = default_profile(); const old_default = default_profile();
if (old_default && old_default != profile) { if (old_default && old_default != profile) {
old_default.id = guid(); old_default.id = guid();
} }
profile.id = "default"; profile.id = "default";
return old_default; return old_default;
} }
export function delete_profile(profile: ConnectionProfile) { export function delete_profile(profile: ConnectionProfile) {
available_profiles.remove(profile); available_profiles.remove(profile);
}
} }

42
shared/js/profiles/Identity.ts
View file

@ -1,11 +1,18 @@
namespace profiles.identities { import {AbstractCommandHandler, AbstractServerConnection, ServerCommand} from "../connection/ConnectionBase";
export enum IdentitifyType { import {connection} from "../connection/HandshakeHandler";
import HandshakeIdentityHandler = connection.HandshakeIdentityHandler;
import {NameIdentity} from "./identities/NameIdentity";
import {TeaForumIdentity} from "./identities/TeaForumIdentity";
import {TeaSpeakIdentity} from "./identities/TeamSpeakIdentity";
export enum IdentitifyType {
TEAFORO, TEAFORO,
TEAMSPEAK, TEAMSPEAK,
NICKNAME NICKNAME
} }
export interface Identity { export interface Identity {
fallback_name(): string | undefined ; fallback_name(): string | undefined ;
uid() : string; uid() : string;
type() : IdentitifyType; type() : IdentitifyType;
@ -15,10 +22,10 @@ namespace profiles.identities {
encode?() : string; encode?() : string;
decode(data: string) : Promise<void>; decode(data: string) : Promise<void>;
spawn_identity_handshake_handler(connection: connection.AbstractServerConnection) : connection.HandshakeIdentityHandler; spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler;
} }
export async function decode_identity(type: IdentitifyType, data: string) : Promise<Identity> { export async function decode_identity(type: IdentitifyType, data: string) : Promise<Identity> {
let identity: Identity; let identity: Identity;
switch (type) { switch (type) {
case IdentitifyType.NICKNAME: case IdentitifyType.NICKNAME:
@ -43,9 +50,9 @@ namespace profiles.identities {
} }
return identity; return identity;
} }
export function create_identity(type: IdentitifyType) { export function create_identity(type: IdentitifyType) {
let identity: Identity; let identity: Identity;
switch (type) { switch (type) {
case IdentitifyType.NICKNAME: case IdentitifyType.NICKNAME:
@ -59,18 +66,18 @@ namespace profiles.identities {
break; break;
} }
return identity; return identity;
} }
export class HandshakeCommandHandler<T extends AbstractHandshakeIdentityHandler> extends connection.AbstractCommandHandler { export class HandshakeCommandHandler<T extends AbstractHandshakeIdentityHandler> extends AbstractCommandHandler {
readonly handle: T; readonly handle: T;
constructor(connection: connection.AbstractServerConnection, handle: T) { constructor(connection: AbstractServerConnection, handle: T) {
super(connection); super(connection);
this.handle = handle; this.handle = handle;
} }
handle_command(command: connection.ServerCommand): boolean { handle_command(command: ServerCommand): boolean {
if($.isFunction(this[command.command])) if($.isFunction(this[command.command]))
this[command.command](command.arguments); this[command.command](command.arguments);
else if(command.command == "error") { else if(command.command == "error") {
@ -80,14 +87,14 @@ namespace profiles.identities {
} }
return true; return true;
} }
} }
export abstract class AbstractHandshakeIdentityHandler implements connection.HandshakeIdentityHandler { export abstract class AbstractHandshakeIdentityHandler implements connection.HandshakeIdentityHandler {
connection: connection.AbstractServerConnection; connection: AbstractServerConnection;
protected callbacks: ((success: boolean, message?: string) => any)[] = []; protected callbacks: ((success: boolean, message?: string) => any)[] = [];
protected constructor(connection: connection.AbstractServerConnection) { protected constructor(connection: AbstractServerConnection) {
this.connection = connection; this.connection = connection;
} }
@ -106,5 +113,4 @@ namespace profiles.identities {
for(const callback of this.callbacks) for(const callback of this.callbacks)
callback(false, message); callback(false, message);
} }
}
} }

20
shared/js/profiles/identities/NameIdentity.ts
View file

@ -1,11 +1,16 @@
/// <reference path="../Identity.ts" /> import {CommandResult} from "../../connection/ServerConnectionDeclaration";
import {log, LogCategory} from "../../log";
import {AbstractServerConnection} from "../../connection/ConnectionBase";
import {connection} from "../../connection/HandshakeHandler";
namespace profiles.identities { import HandshakeIdentityHandler = connection.HandshakeIdentityHandler;
class NameHandshakeHandler extends AbstractHandshakeIdentityHandler { import {AbstractHandshakeIdentityHandler, HandshakeCommandHandler, IdentitifyType, Identity} from "../Identity";
class NameHandshakeHandler extends AbstractHandshakeIdentityHandler {
readonly identity: NameIdentity; readonly identity: NameIdentity;
handler: HandshakeCommandHandler<NameHandshakeHandler>; handler: HandshakeCommandHandler<NameHandshakeHandler>;
constructor(connection: connection.AbstractServerConnection, identity: profiles.identities.NameIdentity) { constructor(connection: AbstractServerConnection, identity: NameIdentity) {
super(connection); super(connection);
this.identity = identity; this.identity = identity;
@ -36,9 +41,9 @@ namespace profiles.identities {
this.connection.command_handler_boss().unregister_handler(this.handler); this.connection.command_handler_boss().unregister_handler(this.handler);
super.trigger_success(); super.trigger_success();
} }
} }
export class NameIdentity implements Identity { export class NameIdentity implements Identity {
private _name: string; private _name: string;
constructor(name?: string) { constructor(name?: string) {
@ -81,8 +86,7 @@ namespace profiles.identities {
}); });
} }
spawn_identity_handshake_handler(connection: connection.AbstractServerConnection) : connection.HandshakeIdentityHandler { spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler {
return new NameHandshakeHandler(connection, this); return new NameHandshakeHandler(connection, this);
} }
}
} }

48
shared/js/profiles/identities/TeaForumIdentity.ts
View file

@ -1,11 +1,16 @@
/// <reference path="../Identity.ts" /> import {AbstractServerConnection} from "../../connection/ConnectionBase";
import {log, LogCategory} from "../../log";
import {CommandResult} from "../../connection/ServerConnectionDeclaration";
import {forum} from "./teaspeak-forum";
import {connection} from "../../connection/HandshakeHandler";
import HandshakeIdentityHandler = connection.HandshakeIdentityHandler;
import {AbstractHandshakeIdentityHandler, HandshakeCommandHandler, IdentitifyType, Identity} from "../Identity";
namespace profiles.identities { class TeaForumHandshakeHandler extends AbstractHandshakeIdentityHandler {
class TeaForumHandshakeHandler extends AbstractHandshakeIdentityHandler {
readonly identity: TeaForumIdentity; readonly identity: TeaForumIdentity;
handler: HandshakeCommandHandler<TeaForumHandshakeHandler>; handler: HandshakeCommandHandler<TeaForumHandshakeHandler>;
constructor(connection: connection.AbstractServerConnection, identity: profiles.identities.TeaForumIdentity) { constructor(connection: AbstractServerConnection, identity: TeaForumIdentity) {
super(connection); super(connection);
this.identity = identity; this.identity = identity;
this.handler = new HandshakeCommandHandler(connection, this); this.handler = new HandshakeCommandHandler(connection, this);
@ -49,9 +54,9 @@ namespace profiles.identities {
this.connection.command_handler_boss().unregister_handler(this.handler); this.connection.command_handler_boss().unregister_handler(this.handler);
super.trigger_success(); super.trigger_success();
} }
} }
export class TeaForumIdentity implements Identity { export class TeaForumIdentity implements Identity {
private readonly identity_data: forum.Data; private readonly identity_data: forum.Data;
valid() : boolean { valid() : boolean {
@ -80,7 +85,7 @@ namespace profiles.identities {
}); });
} }
spawn_identity_handshake_handler(connection: connection.AbstractServerConnection) : connection.HandshakeIdentityHandler { spawn_identity_handshake_handler(connection: AbstractServerConnection) : HandshakeIdentityHandler {
return new TeaForumHandshakeHandler(connection, this); return new TeaForumHandshakeHandler(connection, this);
} }
@ -88,7 +93,7 @@ namespace profiles.identities {
return this.identity_data ? this.identity_data.name() : undefined; return this.identity_data ? this.identity_data.name() : undefined;
} }
type(): profiles.identities.IdentitifyType { type(): IdentitifyType {
return IdentitifyType.TEAFORO; return IdentitifyType.TEAFORO;
} }
@ -96,27 +101,26 @@ namespace profiles.identities {
//FIXME: Real UID! //FIXME: Real UID!
return "TeaForo#" + ((this.identity_data ? this.identity_data.name() : "Another TeaSpeak user")); return "TeaForo#" + ((this.identity_data ? this.identity_data.name() : "Another TeaSpeak user"));
} }
} }
let static_identity: TeaForumIdentity; let static_identity: TeaForumIdentity;
export function set_static_identity(identity: TeaForumIdentity) { export function set_static_identity(identity: TeaForumIdentity) {
static_identity = identity; static_identity = identity;
} }
export function update_forum() { export function update_forum() {
if(forum.logged_in() && (!static_identity || static_identity.data() !== forum.data())) { if(forum.logged_in() && (!static_identity || static_identity.data() !== forum.data())) {
static_identity = new TeaForumIdentity(forum.data()); static_identity = new TeaForumIdentity(forum.data());
} else { } else {
static_identity = undefined; static_identity = undefined;
} }
} }
export function valid_static_forum_identity() : boolean { export function valid_static_forum_identity() : boolean {
return static_identity && static_identity.valid(); return static_identity && static_identity.valid();
} }
export function static_forum_identity() : TeaForumIdentity | undefined { export function static_forum_identity() : TeaForumIdentity | undefined {
return static_identity; return static_identity;
}
} }

31
shared/js/profiles/identities/TeamSpeakIdentity.ts
View file

@ -1,7 +1,15 @@
/// <reference path="../Identity.ts" /> import {arrayBufferBase64, base64_encode_ab, str2ab8} from "../../main";
import {sha} from "../../crypto/sha";
import {asn1} from "../../crypto/asn1";
import {AbstractServerConnection} from "../../connection/ConnectionBase";
import {log, LogCategory} from "../../log";
import {CommandResult} from "../../connection/ServerConnectionDeclaration";
import {settings} from "../../settings";
import {connection} from "../../connection/HandshakeHandler";
import HandshakeIdentityHandler = connection.HandshakeIdentityHandler;
import {AbstractHandshakeIdentityHandler, HandshakeCommandHandler, IdentitifyType, Identity} from "../Identity";
namespace profiles.identities { export namespace CryptoHelper {
export namespace CryptoHelper {
export function base64_url_encode(str){ export function base64_url_encode(str){
return str.replace(/\+/g, '-').replace(/\//g, '_').replace(/\=+$/, ''); return str.replace(/\+/g, '-').replace(/\//g, '_').replace(/\=+$/, '');
} }
@ -208,13 +216,13 @@ namespace profiles.identities {
kty:"EC", kty:"EC",
}; };
} }
} }
class TeaSpeakHandshakeHandler extends AbstractHandshakeIdentityHandler { class TeaSpeakHandshakeHandler extends AbstractHandshakeIdentityHandler {
identity: TeaSpeakIdentity; identity: TeaSpeakIdentity;
handler: HandshakeCommandHandler<TeaSpeakHandshakeHandler>; handler: HandshakeCommandHandler<TeaSpeakHandshakeHandler>;
constructor(connection: connection.AbstractServerConnection, identity: TeaSpeakIdentity) { constructor(connection: AbstractServerConnection, identity: TeaSpeakIdentity) {
super(connection); super(connection);
this.identity = identity; this.identity = identity;
this.handler = new HandshakeCommandHandler(connection, this); this.handler = new HandshakeCommandHandler(connection, this);
@ -264,9 +272,9 @@ namespace profiles.identities {
this.connection.command_handler_boss().unregister_handler(this.handler); this.connection.command_handler_boss().unregister_handler(this.handler);
super.trigger_success(); super.trigger_success();
} }
} }
class IdentityPOWWorker { class IdentityPOWWorker {
private _worker: Worker; private _worker: Worker;
private _current_hash: string; private _current_hash: string;
private _best_level: number; private _best_level: number;
@ -418,9 +426,9 @@ namespace profiles.identities {
private handle_message(message: any) { private handle_message(message: any) {
log.info(LogCategory.IDENTITIES, tr("Received message: %o"), message); log.info(LogCategory.IDENTITIES, tr("Received message: %o"), message);
} }
} }
export class TeaSpeakIdentity implements Identity { export class TeaSpeakIdentity implements Identity {
static async generate_new() : Promise<TeaSpeakIdentity> { static async generate_new() : Promise<TeaSpeakIdentity> {
let key: CryptoKeyPair; let key: CryptoKeyPair;
try { try {
@ -864,8 +872,7 @@ namespace profiles.identities {
return base64_encode_ab(buffer.subarray(0, index)); return base64_encode_ab(buffer.subarray(0, index));
} }
spawn_identity_handshake_handler(connection: connection.AbstractServerConnection): connection.HandshakeIdentityHandler { spawn_identity_handshake_handler(connection: AbstractServerConnection): HandshakeIdentityHandler {
return new TeaSpeakHandshakeHandler(connection, this); return new TeaSpeakHandshakeHandler(connection, this);
} }
}
} }

23
shared/js/profiles/identities/teaspeak-forum.ts
View file

@ -1,8 +1,11 @@
interface Window { import {Settings, settings} from "../../settings";
import {update_forum} from "./TeaForumIdentity";
declare interface Window {
grecaptcha: GReCaptcha; grecaptcha: GReCaptcha;
} }
interface GReCaptcha { export interface GReCaptcha {
render(container: string | HTMLElement, parameters: { render(container: string | HTMLElement, parameters: {
sitekey: string; sitekey: string;
theme?: "dark" | "light"; theme?: "dark" | "light";
@ -18,10 +21,10 @@ interface GReCaptcha {
reset(widget_id?: string); reset(widget_id?: string);
} }
namespace forum { export namespace forum {
export namespace gcaptcha { export namespace gcaptcha {
export async function initialize() { export async function initialize() {
if(typeof(window.grecaptcha) === "undefined") { if(typeof((window as any).grecaptcha) === "undefined") {
let script = document.createElement("script"); let script = document.createElement("script");
script.async = true; script.async = true;
@ -50,7 +53,7 @@ namespace forum {
} }
} }
if(typeof(window.grecaptcha) === "undefined") if(typeof((window as any).grecaptcha) === "undefined")
throw tr("failed to load recaptcha"); throw tr("failed to load recaptcha");
} }
@ -62,9 +65,9 @@ namespace forum {
throw tr("initialisation failed"); throw tr("initialisation failed");
} }
if(container.attr("captcha-uuid")) if(container.attr("captcha-uuid"))
window.grecaptcha.reset(container.attr("captcha-uuid")); (window as any).grecaptcha.reset(container.attr("captcha-uuid"));
else { else {
container.attr("captcha-uuid", window.grecaptcha.render(container[0], { container.attr("captcha-uuid", (window as any).grecaptcha.render(container[0], {
"sitekey": key, "sitekey": key,
callback: callback_data callback: callback_data
})); }));
@ -206,7 +209,7 @@ namespace forum {
localStorage.setItem("teaspeak-forum-data", response["data"]); localStorage.setItem("teaspeak-forum-data", response["data"]);
localStorage.setItem("teaspeak-forum-sign", response["sign"]); localStorage.setItem("teaspeak-forum-sign", response["sign"]);
localStorage.setItem("teaspeak-forum-auth", response["auth-key"]); localStorage.setItem("teaspeak-forum-auth", response["auth-key"]);
profiles.identities.update_forum(); update_forum();
} catch(error) { } catch(error) {
console.error(tr("Failed to parse forum given data: %o"), error); console.error(tr("Failed to parse forum given data: %o"), error);
return { return {
@ -266,7 +269,7 @@ namespace forum {
_data = new Data(_data.auth_key, response["data"], response["sign"]); _data = new Data(_data.auth_key, response["data"], response["sign"]);
localStorage.setItem("teaspeak-forum-data", response["data"]); localStorage.setItem("teaspeak-forum-data", response["data"]);
localStorage.setItem("teaspeak-forum-sign", response["sign"]); localStorage.setItem("teaspeak-forum-sign", response["sign"]);
profiles.identities.update_forum(); update_forum();
} catch(error) { } catch(error) {
console.error(tr("Failed to parse forum given data: %o"), error); console.error(tr("Failed to parse forum given data: %o"), error);
throw tr("failed to parse data"); throw tr("failed to parse data");
@ -320,7 +323,7 @@ namespace forum {
localStorage.removeItem("teaspeak-forum-data"); localStorage.removeItem("teaspeak-forum-data");
localStorage.removeItem("teaspeak-forum-sign"); localStorage.removeItem("teaspeak-forum-sign");
localStorage.removeItem("teaspeak-forum-auth"); localStorage.removeItem("teaspeak-forum-auth");
profiles.identities.update_forum(); update_forum();
} }
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, { loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {

2
shared/js/proto.ts
View file

@ -1,5 +1,3 @@
//Used by CertAccept popup
interface Array<T> { interface Array<T> {
remove(elem?: T): boolean; remove(elem?: T): boolean;
last?(): T; last?(): T;

15
shared/js/settings.ts
View file

@ -1,6 +1,9 @@
/// <reference path="ui/elements/modal.ts" /> /// <reference path="ui/elements/modal.ts" />
//Used by CertAccept popup //Used by CertAccept popup
import {log, LogCategory} from "./log";
import {createErrorModal} from "./ui/elements/modal";
if(typeof(customElements) !== "undefined") { if(typeof(customElements) !== "undefined") {
try { try {
class X_Properties extends HTMLElement {} class X_Properties extends HTMLElement {}
@ -14,7 +17,7 @@ if(typeof(customElements) !== "undefined") {
} }
/* T = value type */ /* T = value type */
interface SettingsKey<T> { export interface SettingsKey<T> {
key: string; key: string;
fallback_keys?: string | string[]; fallback_keys?: string | string[];
@ -25,7 +28,7 @@ interface SettingsKey<T> {
require_restart?: boolean; require_restart?: boolean;
} }
class SettingsBase { export class SettingsBase {
protected static readonly UPDATE_DIRECT: boolean = true; protected static readonly UPDATE_DIRECT: boolean = true;
protected static transformStO?<T>(input?: string, _default?: T, default_type?: string) : T { protected static transformStO?<T>(input?: string, _default?: T, default_type?: string) : T {
@ -77,7 +80,7 @@ class SettingsBase {
} }
} }
class StaticSettings extends SettingsBase { export class StaticSettings extends SettingsBase {
private static _instance: StaticSettings; private static _instance: StaticSettings;
static get instance() : StaticSettings { static get instance() : StaticSettings {
if(!this._instance) if(!this._instance)
@ -139,7 +142,7 @@ class StaticSettings extends SettingsBase {
} }
} }
class Settings extends StaticSettings { export class Settings extends StaticSettings {
static readonly KEY_USER_IS_NEW: SettingsKey<boolean> = { static readonly KEY_USER_IS_NEW: SettingsKey<boolean> = {
key: 'user_is_new_user', key: 'user_is_new_user',
default_value: true default_value: true
@ -433,7 +436,7 @@ class Settings extends StaticSettings {
} }
} }
class ServerSettings extends SettingsBase { export class ServerSettings extends SettingsBase {
private cacheServer = {}; private cacheServer = {};
private _server_unique_id: string; private _server_unique_id: string;
private _server_save_worker: NodeJS.Timer; private _server_save_worker: NodeJS.Timer;
@ -511,4 +514,4 @@ class ServerSettings extends SettingsBase {
} }
} }
let settings: Settings; export let settings: Settings;

8
shared/js/sound/Sounds.ts
View file

@ -1,4 +1,8 @@
enum Sound { import {settings} from "../settings";
import {log, LogCategory} from "../log";
import {ConnectionHandler} from "../ConnectionHandler";
export enum Sound {
SOUND_TEST = "sound.test", SOUND_TEST = "sound.test",
SOUND_EGG = "sound.egg", SOUND_EGG = "sound.egg",
@ -61,7 +65,7 @@ enum Sound {
GROUP_CHANNEL_CHANGED_SELF = "group.channel.changed.self" GROUP_CHANNEL_CHANGED_SELF = "group.channel.changed.self"
} }
namespace sound { export namespace sound {
export interface SoundHandle { export interface SoundHandle {
key: string; key: string;
filename: string; filename: string;

4
shared/js/stats.ts
View file

@ -1,4 +1,6 @@
namespace stats { import {log, LogCategory} from "./log";
export namespace stats {
const LOG_PREFIX = "[Statistics] "; const LOG_PREFIX = "[Statistics] ";
export enum CloseCodes { export enum CloseCodes {

81
shared/js/ui/channel-tree/channel.css Normal file
View file

@ -0,0 +1,81 @@
.channel-container {
display: flex;
flex-direction: column;
}
.channel-container .container-channel {
position: relative;
display: flex;
flex-direction: row;
justify-content: stretch;
width: 100%;
min-height: 16px;
align-items: center;
cursor: pointer;
}
.channel-container .container-channel .channel-type {
flex-grow: 0;
flex-shrink: 0;
margin-right: 2px;
}
.channel-container .container-channel .container-channel-name {
display: flex;
flex-direction: row;
flex-grow: 1;
flex-shrink: 1;
justify-content: left;
max-width: 100%;
/* important for the repetitive channel name! */
overflow-x: hidden;
height: 16px;
}
.channel-container .container-channel .container-channel-name.align-right {
justify-content: right;
}
.channel-container .container-channel .container-channel-name.align-center, .channel-container .container-channel .container-channel-name.align-repetitive {
justify-content: center;
}
.channel-container .container-channel .container-channel-name .channel-name {
align-self: center;
color: #828282;
min-width: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.channel-container .container-channel .container-channel-name.align-repetitive .channel-name {
text-overflow: clip;
}
.channel-container .container-channel .icons {
display: flex;
flex-direction: row;
flex-grow: 0;
flex-shrink: 0;
}
.channel-container .container-channel.move-selected {
border-bottom: 1px solid black;
}
.channel-container .container-channel .show-channel-normal-only {
display: none;
}
.channel-container .container-channel .show-channel-normal-only.channel-normal {
display: block;
}
.channel-container .container-channel .icon_no_sound {
position: relative;
display: flex;
}
.channel-container .container-channel .icon_no_sound .background {
width: 10px;
height: 14px;
background: red;
position: absolute;
top: 1px;
left: 3px;
z-index: -1;
}
.channel-container .container-clients {
display: flex;
flex-direction: column;
}
/*# sourceMappingURL=channel.css.map */

1
shared/js/ui/channel-tree/channel.css.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sourceRoot":"","sources":["channel.scss","colors.scss"],"names":[],"mappings":"AAEA;EACI;EACA;;AAEA;EACI;EAEA;EACA;EACA;EAEA;EACA;EAEA;EACA;;AAEA;EACI;EACA;EAEA;;AAGJ;EACI;EACA;EAEA;EACA;EAEA;EAEA;AAAiB;EACjB;EACA;;AAEA;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA,OC/CW;EDiDX;EACA;EACA;EACA;;AAIA;EACI;;AAKZ;EACI;EACA;EAEA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAEA;EACI;;AAIR;EACI;EACA;;AAEA;EACI;EACA;EAEA;EACA;EACA;EACA;EACA;;AAKZ;EACI;EACA","file":"channel.css"}

106
shared/js/ui/channel-tree/channel.scss
View file

@ -0,0 +1,106 @@
@import "colors";
.channel-container {
display: flex;
flex-direction: column;
.container-channel {
position: relative;
display: flex;
flex-direction: row;
justify-content: stretch;
width: 100%;
min-height: 16px;
align-items: center;
cursor: pointer;
.channel-type {
flex-grow: 0;
flex-shrink: 0;
margin-right: 2px;
}
.container-channel-name {
display: flex;
flex-direction: row;
flex-grow: 1;
flex-shrink: 1;
justify-content: left;
max-width: 100%; /* important for the repetitive channel name! */
overflow-x: hidden;
height: 16px;
&.align-right {
justify-content: right;
}
&.align-center, &.align-repetitive {
justify-content: center;
}
.channel-name {
align-self: center;
color: $channel-tree-entry-color;
min-width: 0;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
&.align-repetitive {
.channel-name {
text-overflow: clip;
}
}
}
.icons {
display: flex;
flex-direction: row;
flex-grow: 0;
flex-shrink: 0;
}
&.move-selected {
border-bottom: 1px solid black;
}
.show-channel-normal-only {
display: none;
&.channel-normal {
display: block;
}
}
.icon_no_sound {
position: relative;
display: flex;
.background {
width: 10px;
height: 14px;
background: red;
position: absolute;
top: 1px;
left: 3px;
z-index: -1;
}
}
}
.container-clients {
display: flex;
flex-direction: column;
}
}

120
shared/js/ui/channel-tree/channel.tsx
View file

@ -0,0 +1,120 @@
import * as React from "react";
import {ChannelEntry} from "../../channel-tree/channel";
const cssChannel = require("./channel.scss");
const cssTree = require("./tree.scss");
class ChannelIcon extends React.Component<{ channel: ChannelEntry }, {}> {
channel_icon_classes() {
const class_list = [];
const channel = this.props.channel;
if(channel.formattedChannelName() !== channel.channelName())
return "channel-spacer";
let icon_color;
if(channel.properties.channel_flag_password && !channel.cached_password())
icon_color = "yellow";
else if(channel.properties.channel_flag_maxclients_unlimited && channel.clients().length >= channel.properties.channel_maxclients)
icon_color = "red";
else if(channel.properties.channel_flag_maxfamilyclients_unlimited && channel.clients(true).length >= channel.properties.channel_maxfamilyclients)
icon_color = "red";
else
icon_color = "green";
return "channel-normal client-channel_" + icon_color + (channel.flag_subscribed ? "_subscribed" : "");
}
render() {
return <div className={this.channel_icon_classes()} />;
}
}
class ChannelIcons extends React.Component<{channel: ChannelEntry}, {}> {
render_icon(target: HTMLDivElement) {
const props = this.props.channel.properties;
if(!props.channel_icon_id) return;
const tag = this.props.channel.channelTree.client.fileManager.icons.generateTag(props.channel_icon_id);
tag.appendTo($(target));
}
render() {
const icons = [];
const props = this.props.channel.properties;
if(props.channel_flag_default) {
icons.push(<div className={"show-channel-normal-only icon_entry icon_default icon client-channel_default"} title={tr("Default channel")} />);
}
if(props.channel_flag_password) {
icons.push(<div className={"show-channel-normal-only icon_entry icon_password icon client-register"} title={tr("The channel is password protected")} />);
}
if(props.channel_codec_quality > 4) {
icons.push(<div className={"show-channel-normal-only icon_entry icon_moderated icon client-moderated"} title={tr("Music quality")} />);
}
if(props.channel_needed_talk_power > 0) {
icons.push(<div className={"show-channel-normal-only icon_entry icon_moderated icon client-moderated"} title={tr("Channel is moderated")} />);
}
if(props.channel_icon_id != 0) {
icons.push(<div className={"show-channel-normal-only icon_entry channel_icon"} title={tr("Channel icon")} ref={e => this.render_icon(e) }/>)
}
if(!audio.codec.supported(props.channel_codec)) {
icons.push(<div className={cssChannel.icon_no_sound}>
<div className={cssChannel.background} />
<div className={"icon_entry icon client-conflict-icon"} title={tr("You don't support the channel codec")} />
</div>)
}
return (<div className={cssChannel.icons}>{icons}</div>);
}
}
class ChannelLine extends React.Component<{ channel: ChannelEntry }, {}> {
render() {
let depth = 1;
let parent = this.props.channel;
while((parent = parent.parent))
depth++;
//TODO: On handle spacer alignments in channel name!
return (
<div className={cssChannel.containerChannel}>
<div className={cssTree.markerTextUnread} />
<div className={cssTree.depthFiller} style={{ width: depth + "em" }} />
<ChannelIcon channel={this.props.channel} />
<div className={cssChannel.containerChannelName}>
<a className={cssChannel.channelName}>{this.props.channel.formattedChannelName()}</a>
</div>
<ChannelIcons channel={this.props.channel} />
</div>
);
}
}
class ChannelClientsView extends React.Component<{}, {}> {
}
class SubChannelView extends React.Component<{ channels: ChannelEntry[] }, {}> {
render() {
return this.props.channels.map(e => <ChannelLine channel={e} />);
}
}
export class Channel extends React.Component<{ channel: ChannelEntry }, {}> {
children: ChannelEntry[];
channel_entry() : ChannelEntry { return this.props.channel; }
render() {
return (
<div className={[cssTree.entry, cssChannel.channelContainer].join(" ")}>
<ChannelLine channel={this.props.channel} />
<ChannelClientsView />
<SubChannelView channels={[]} />
</div>
);
}
}

3
shared/js/ui/channel-tree/colors.css Normal file
View file

@ -0,0 +1,3 @@
/*# sourceMappingURL=colors.css.map */

1
shared/js/ui/channel-tree/colors.css.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sourceRoot":"","sources":[],"names":[],"mappings":"","file":"colors.css"}

3
shared/js/ui/channel-tree/colors.scss
View file

@ -0,0 +1,3 @@
$channel-tree-new-message-color: #a814147F;
$channel-tree-entry-color: #828282;

38
shared/js/ui/channel-tree/tree.css Normal file
View file

@ -0,0 +1,38 @@
/* Some general browser helpers */
.tree-container .tree .entry .depth-filler {
font-size: 16px;
flex-shrink: 0;
flex-grow: 0;
}
.tree-container .marker-text-unread {
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 1px;
background-color: #a814147F;
opacity: 1;
-moz-transition: opacity 0.25s;
-o-transition: opacity 0.25s;
-webkit-transition: opacity 0.25s;
transition: opacity 0.25s;
}
.tree-container .marker-text-unread:before {
content: "";
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 24px;
background: -moz-linear-gradient(left, rgba(168, 20, 20, 0.18) 0%, rgba(168, 20, 20, 0) 100%);
/* FF3.6-15 */
background: -webkit-linear-gradient(left, rgba(168, 20, 20, 0.18) 0%, rgba(168, 20, 20, 0) 100%);
/* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to right, rgba(168, 20, 20, 0.18) 0%, rgba(168, 20, 20, 0) 100%);
/* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
}
.tree-container .marker-text-unread.hidden {
opacity: 0;
}
/*# sourceMappingURL=tree.css.map */

1
shared/js/ui/channel-tree/tree.css.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sourceRoot":"","sources":["../../../css/static/mixin.scss","tree.scss"],"names":[],"mappings":"AAAA;ACQY;EACI;EAEA;EACA;;AAKZ;EACI;EACA;EACA;EACA;EAEA;EACA;EAEA;EDvBP,iBC4CO;ED3CP,eC2CO;ED1CP,oBC0CO;EDzCP,YCyCO;;AAnBA;EACI;EACA;EAEA;EACA;EACA;EAEA;EAEA;AAAyF;EACzF;AAA2F;EAC3F;AAAuF;;AAG3F;EACI","file":"tree.css"}

50
shared/js/ui/channel-tree/tree.scss
View file

@ -0,0 +1,50 @@
@import "../../../css/static/mixin";
@import "../../../css/static/properties";
.tree-container {
.tree {
.entry {
.depth-filler {
font-size: 16px;
flex-shrink: 0;
flex-grow: 0;
}
}
}
.marker-text-unread {
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 1px;
background-color: #a814147F;
opacity: 1;
&:before {
content: '';
position: absolute;
left: 0;
top: 0;
bottom: 0;
width: 24px;
background: -moz-linear-gradient(left, rgba(168,20,20,.18) 0%, rgba(168,20,20,0) 100%); /* FF3.6-15 */
background: -webkit-linear-gradient(left, rgba(168,20,20,.18) 0%,rgba(168,20,20,0) 100%); /* Chrome10-25,Safari5.1-6 */
background: linear-gradient(to right, rgba(168,20,20,.18) 0%,rgba(168,20,20,0) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
}
&.hidden {
opacity: 0;
}
@include transition(opacity $button_hover_animation_time);
}
}

5
shared/js/ui/channel-tree/tree.tsx
View file

@ -0,0 +1,5 @@
import * as React from "react";
export class TreeView {
}

4
shared/js/ui/client_move.ts
View file

@ -1,6 +1,4 @@
/// <reference path="client.ts" /> export class ClientMover {
class ClientMover {
static readonly listener_root = $(document); static readonly listener_root = $(document);
static readonly move_element = $("#mouse-move"); static readonly move_element = $("#mouse-move");
readonly channel_tree: ChannelTree; readonly channel_tree: ChannelTree;

6
shared/js/ui/elements/context_divider.ts
View file

@ -1,10 +1,14 @@
import {settings} from "../../settings";
import {log, LogCategory} from "../../log";
declare const $: any;
interface JQuery<TElement = HTMLElement> { interface JQuery<TElement = HTMLElement> {
dividerfy() : this; dividerfy() : this;
} }
if(!$.fn.dividerfy) { if(!$.fn.dividerfy) {
$.fn.dividerfy = function<T extends HTMLElement>(this: JQuery<T>) : JQuery<T> { $.fn.dividerfy = function<T extends HTMLElement>(this: JQuery<T>) : JQuery<T> {
this.find(".container-seperator").each(function (this: T) { (this as any).find(".container-seperator").each(function (this: T) {
if(!this.previousElementSibling) return; if(!this.previousElementSibling) return;
if(!this.nextElementSibling) return; if(!this.nextElementSibling) return;

2
shared/js/ui/elements/context_menu.ts
View file

@ -1,4 +1,4 @@
namespace contextmenu { export namespace contextmenu {
export interface MenuEntry { export interface MenuEntry {
callback?: () => void; callback?: () => void;
type: MenuEntryType; type: MenuEntryType;

94
shared/js/ui/elements/modal.ts
View file

@ -1,13 +1,13 @@
/// <reference path="../../PPTListener.ts" /> import {KeyCode} from "../../PPTListener";
enum ElementType { export enum ElementType {
HEADER, HEADER,
BODY, BODY,
FOOTER FOOTER
} }
type BodyCreator = (() => JQuery | JQuery[] | string) | string | JQuery | JQuery[]; export type BodyCreator = (() => JQuery | JQuery[] | string) | string | JQuery | JQuery[];
const ModalFunctions = { export const ModalFunctions = {
divify: function (val: JQuery) { divify: function (val: JQuery) {
if(val.length > 1) if(val.length > 1)
return $.spawn("div").append(val); return $.spawn("div").append(val);
@ -54,7 +54,7 @@ const ModalFunctions = {
} }
}; };
class ModalProperties { export class ModalProperties {
template?: string; template?: string;
header: BodyCreator = () => "HEADER"; header: BodyCreator = () => "HEADER";
body: BodyCreator = () => "BODY"; body: BodyCreator = () => "BODY";
@ -89,7 +89,7 @@ class ModalProperties {
full_size?: boolean = false; full_size?: boolean = false;
} }
namespace modal { export namespace modal {
export function initialize_modals() { export function initialize_modals() {
register_global_events(); register_global_events();
} }
@ -184,7 +184,7 @@ let _global_modal_count = 0;
let _global_modal_last: HTMLElement; let _global_modal_last: HTMLElement;
let _global_modal_last_time: number; let _global_modal_last_time: number;
class Modal { export class Modal {
private _htmlTag: JQuery; private _htmlTag: JQuery;
properties: ModalProperties; properties: ModalProperties;
shown: boolean; shown: boolean;
@ -296,11 +296,11 @@ class Modal {
} }
} }
function createModal(data: ModalProperties | any) : Modal { export function createModal(data: ModalProperties | any) : Modal {
return new Modal(ModalFunctions.warpProperties(data)); return new Modal(ModalFunctions.warpProperties(data));
} }
class InputModalProperties extends ModalProperties { export class InputModalProperties extends ModalProperties {
maxLength?: number; maxLength?: number;
field_title?: string; field_title?: string;
@ -310,7 +310,7 @@ class InputModalProperties extends ModalProperties {
error_message?: string; error_message?: string;
} }
function createInputModal(headMessage: BodyCreator, question: BodyCreator, validator: (input: string) => boolean, callback: (flag: boolean | string) => void, props: InputModalProperties | any = {}) : Modal { export function createInputModal(headMessage: BodyCreator, question: BodyCreator, validator: (input: string) => boolean, callback: (flag: boolean | string) => void, props: InputModalProperties | any = {}) : Modal {
props = ModalFunctions.warpProperties(props); props = ModalFunctions.warpProperties(props);
props.template_properties || (props.template_properties = {}); props.template_properties || (props.template_properties = {});
props.template_properties.field_title = props.field_title; props.template_properties.field_title = props.field_title;
@ -370,7 +370,7 @@ function createInputModal(headMessage: BodyCreator, question: BodyCreator, valid
return modal; return modal;
} }
function createErrorModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) { export function createErrorModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) {
props = ModalFunctions.warpProperties(props); props = ModalFunctions.warpProperties(props);
(props.template_properties || (props.template_properties = {})).header_class = "modal-header-error"; (props.template_properties || (props.template_properties = {})).header_class = "modal-header-error";
@ -382,7 +382,7 @@ function createErrorModal(header: BodyCreator, message: BodyCreator, props: Moda
return modal; return modal;
} }
function createInfoModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) { export function createInfoModal(header: BodyCreator, message: BodyCreator, props: ModalProperties | any = { footer: undefined }) {
props = ModalFunctions.warpProperties(props); props = ModalFunctions.warpProperties(props);
(props.template_properties || (props.template_properties = {})).header_class = "modal-header-info"; (props.template_properties || (props.template_properties = {})).header_class = "modal-header-info";
@ -393,73 +393,3 @@ function createInfoModal(header: BodyCreator, message: BodyCreator, props: Modal
modal.htmlTag.find(".modal-body").addClass("modal-info"); modal.htmlTag.find(".modal-body").addClass("modal-info");
return modal; return modal;
} }
/* extend jquery */
interface ModalElements {
header?: BodyCreator;
body?: BodyCreator;
footer?: BodyCreator;
}
interface JQuery<TElement = HTMLElement> {
modalize(entry_callback?: (header: JQuery, body: JQuery, footer: JQuery) => ModalElements | void, properties?: ModalProperties | any) : Modal;
}
$.fn.modalize = function (this: JQuery, entry_callback?: (header: JQuery, body: JQuery, footer: JQuery) => ModalElements | void, properties?: ModalProperties | any) : Modal {
properties = properties || {} as ModalProperties;
entry_callback = entry_callback || ((a,b,c) => undefined);
let tag_modal = this[0].tagName.toLowerCase() == "modal" ? this : undefined; /* TODO may throw exception? */
let tag_head = tag_modal ? tag_modal.find("modal-header") : ModalFunctions.jqueriefy(properties.header);
let tag_body = tag_modal ? tag_modal.find("modal-body") : this;
let tag_footer = tag_modal ? tag_modal.find("modal-footer") : ModalFunctions.jqueriefy(properties.footer);
const result = entry_callback(tag_head as any, tag_body, tag_footer as any) || {};
properties.header = result.header || tag_head;
properties.body = result.body || tag_body;
properties.footer = result.footer || tag_footer;
return createModal(properties);
};

2
shared/js/ui/elements/net_graph.ts
View file

@ -1,4 +1,4 @@
namespace net.graph { export namespace net.graph {
export type Entry = { export type Entry = {
timestamp: number; timestamp: number;

6
shared/js/ui/elements/slider.ts
View file

@ -1,4 +1,4 @@
interface SliderOptions { export interface SliderOptions {
min_value?: number; min_value?: number;
max_value?: number; max_value?: number;
initial_value?: number; initial_value?: number;
@ -8,11 +8,11 @@ interface SliderOptions {
value_field?: JQuery | JQuery[]; value_field?: JQuery | JQuery[];
} }
interface Slider { export interface Slider {
value(value?: number) : number; value(value?: number) : number;
} }
function sliderfy(slider: JQuery, options?: SliderOptions) : Slider { export function sliderfy(slider: JQuery, options?: SliderOptions) : Slider {
options = Object.assign( { options = Object.assign( {
initial_value: 0, initial_value: 0,
min_value: 0, min_value: 0,

4
shared/js/ui/elements/tooltip.ts
View file

@ -1,8 +1,8 @@
function tooltip(entry: JQuery) { export function tooltip(entry: JQuery) {
return tooltip.initialize(entry); return tooltip.initialize(entry);
} }
namespace tooltip { export namespace tooltip {
let _global_tooltip: JQuery; let _global_tooltip: JQuery;
export type Handle = { export type Handle = {
show(); show();

27
shared/js/ui/frames/ControlBar.ts
View file

@ -13,12 +13,27 @@
client_away_message Value: '' client_away_message Value: ''
*/ */
let control_bar: ControlBar; /* global variable to access the control bar */ import {ConnectionHandler, DisconnectReason} from "../../ConnectionHandler";
import {top_menu} from "./MenuBar";
import {Settings, settings} from "../../settings";
import {createErrorModal, createInfoModal, createInputModal} from "../elements/modal";
import {default_recorder} from "../../voice/RecorderProfile";
import {sound, Sound} from "../../sound/Sounds";
import {Modals} from "../modal/ModalConnect";
import {Modal as ModalsS} from "../modal/ModalSettings";
import {log} from "./server_log";
import {MessageHelper} from "./chat";
import {CommandResult} from "../../connection/ServerConnectionDeclaration";
import {PermissionType} from "../../permission/PermissionManager";
import {bookmarks} from "../../bookmarks";
import {contextmenu} from "../elements/context_menu";
type MicrophoneState = "disabled" | "muted" | "enabled"; export let control_bar: ControlBar; /* global variable to access the control bar */
type HeadphoneState = "muted" | "enabled";
type AwayState = "away-global" | "away" | "online"; export type MicrophoneState = "disabled" | "muted" | "enabled";
class ControlBar { export type HeadphoneState = "muted" | "enabled";
export type AwayState = "away-global" | "away" | "online";
export class ControlBar {
private _button_away_active: AwayState; private _button_away_active: AwayState;
private _button_microphone: MicrophoneState; private _button_microphone: MicrophoneState;
private _button_speakers: HeadphoneState; private _button_speakers: HeadphoneState;
@ -421,7 +436,7 @@ class ControlBar {
} }
private on_open_settings() { private on_open_settings() {
Modals.spawnSettingsModal(); ModalsS.spawnSettingsModal();
} }
private on_open_connect() { private on_open_connect() {

10
shared/js/ui/frames/MenuBar.ts
View file

@ -1,4 +1,12 @@
namespace top_menu { import {bookmarks} from "../../bookmarks";
import {Modals} from "../modal/ModalBookmarks";
import {DisconnectReason} from "../../ConnectionHandler";
import {control_bar} from "./ControlBar";
import {createErrorModal} from "../elements/modal";
import {PermissionType} from "../../permission/PermissionManager";
import {Sound} from "../../sound/Sounds";
export namespace top_menu {
export interface HRItem { } export interface HRItem { }
export interface MenuItem { export interface MenuItem {

6
shared/js/ui/frames/chat.ts
View file

@ -1,4 +1,6 @@
enum ChatType { import {log, LogCategory} from "../../log";
export enum ChatType {
GENERAL, GENERAL,
SERVER, SERVER,
CHANNEL, CHANNEL,
@ -6,7 +8,7 @@ enum ChatType {
} }
declare const xbbcode: any; declare const xbbcode: any;
namespace MessageHelper { export namespace MessageHelper {
export function htmlEscape(message: string) : string[] { export function htmlEscape(message: string) : string[] {
const div = document.createElement('div'); const div = document.createElement('div');
div.innerText = message; div.innerText = message;

8
shared/js/ui/frames/chat_frame.ts
View file

@ -1,5 +1,11 @@
/* the bar on the right with the chats (Channel & Client) */ /* the bar on the right with the chats (Channel & Client) */
namespace chat { import {ChannelEntry} from "../../channel-tree/channel";
import {Modals} from "../modal/ModalMusicManage";
import {MessageHelper} from "./chat";
import {ServerEntry} from "../../channel-tree/server";
import {ConnectionHandler} from "../../ConnectionHandler";
export namespace chat {
declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;

8
shared/js/ui/frames/connection_handlers.ts
View file

@ -1,7 +1,11 @@
import {ConnectionHandler, DisconnectReason} from "../../ConnectionHandler";
import {Settings, settings} from "../../settings";
import {control_bar} from "./ControlBar";
import {top_menu} from "./MenuBar";
let server_connections: ServerConnectionManager; export let server_connections: ServerConnectionManager;
class ServerConnectionManager { export class ServerConnectionManager {
private connection_handlers: ConnectionHandler[] = []; private connection_handlers: ConnectionHandler[] = [];
private active_handler: ConnectionHandler | undefined; private active_handler: ConnectionHandler | undefined;

6
shared/js/ui/frames/hostbanner.ts
View file

@ -1,4 +1,8 @@
class Hostbanner { import {ConnectionHandler} from "../../ConnectionHandler";
import {Settings, settings} from "../../settings";
import {log, LogCategory} from "../../log";
export class Hostbanner {
readonly html_tag: JQuery<HTMLElement>; readonly html_tag: JQuery<HTMLElement>;
readonly client: ConnectionHandler; readonly client: ConnectionHandler;

2
shared/js/ui/frames/image_preview.ts
View file

@ -1,4 +1,4 @@
namespace image_preview { export namespace image_preview {
let preview_overlay: JQuery<HTMLDivElement>; let preview_overlay: JQuery<HTMLDivElement>;
let container_image: JQuery<HTMLDivElement>; let container_image: JQuery<HTMLDivElement>;
let button_open_in_browser: JQuery; let button_open_in_browser: JQuery;

23
shared/js/ui/frames/server_log.ts
View file

@ -1,5 +1,10 @@
namespace log { import {ConnectionHandler, ViewReasonId} from "../../ConnectionHandler";
export namespace server { import {PermissionInfo} from "../../permission/PermissionManager";
import {htmltags} from "../htmltags";
import {MessageHelper} from "./chat";
import {i18n} from "../../i18n/localize";
export namespace server {
export enum Type { export enum Type {
CONNECTION_BEGIN = "connection_begin", CONNECTION_BEGIN = "connection_begin",
CONNECTION_HOSTNAME_RESOLVE = "connection_hostname_resolve", CONNECTION_HOSTNAME_RESOLVE = "connection_hostname_resolve",
@ -260,9 +265,9 @@ namespace log {
return [$.spawn("div").addClass("log-error").text(data.message)] return [$.spawn("div").addClass("log-error").text(data.message)]
} }
}; };
} }
export class ServerLog { export class ServerLog {
private readonly handle: ConnectionHandler; private readonly handle: ConnectionHandler;
private history_length: number = 100; private history_length: number = 100;
@ -364,13 +369,14 @@ namespace log {
}, 5) as any; }, 5) as any;
} }
} }
}
} }
/* impl of the parsers */ /* impl of the parsers */
namespace log { export namespace server {
export namespace server {
namespace impl { namespace impl {
import MessageBuilders = server.MessageBuilders;
import base = server.base;
import tra = i18n.tra;
const client_tag = (client: base.Client, braces?: boolean) => htmltags.generate_client_object({ const client_tag = (client: base.Client, braces?: boolean) => htmltags.generate_client_object({
client_unique_id: client.client_unique_id, client_unique_id: client.client_unique_id,
client_id: client.client_id, client_id: client.client_id,
@ -384,7 +390,7 @@ namespace log {
add_braces: braces add_braces: braces
}); });
MessageBuilders["connection_begin"] = (data: event.ConnectBegin, options) => { MessageBuilders["connection_begin"] = (data: server.event.ConnectBegin, options) => {
return MessageHelper.formatMessage(tr("Connecting to {0}{1}"), data.address.server_hostname, data.address.server_port == 9987 ? "" : (":" + data.address.server_port)); return MessageHelper.formatMessage(tr("Connecting to {0}{1}"), data.address.server_hostname, data.address.server_port == 9987 ? "" : (":" + data.address.server_port));
}; };
@ -562,5 +568,4 @@ namespace log {
return result.map(e => e.addClass("log-error")); return result.map(e => e.addClass("log-error"));
}; };
} }
}
} }

2
shared/js/ui/frames/side/chat_box.ts
View file

@ -1,4 +1,4 @@
namespace chat { export namespace chat {
declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;

2
shared/js/ui/frames/side/chat_helper.ts
View file

@ -1,4 +1,4 @@
namespace chat { export namespace chat {
export namespace helpers { export namespace helpers {
//https://regex101.com/r/YQbfcX/2 //https://regex101.com/r/YQbfcX/2
//static readonly URL_REGEX = /^(?<hostname>([a-zA-Z0-9-]+\.)+[a-zA-Z0-9-]{2,63})(?:\/(?<path>(?:[^\s?]+)?)(?:\?(?<query>\S+))?)?$/gm; //static readonly URL_REGEX = /^(?<hostname>([a-zA-Z0-9-]+\.)+[a-zA-Z0-9-]{2,63})(?:\/(?<path>(?:[^\s?]+)?)(?:\?(?<query>\S+))?)?$/gm;

9
shared/js/ui/frames/side/client_info.ts
View file

@ -1,4 +1,11 @@
namespace chat { import {ClientEntry, LocalClientEntry} from "../../../channel-tree/client";
import {Modals} from "../../modal/ModalClientInfo";
import {htmltags} from "../../htmltags";
import {image_preview} from "../image_preview";
import {i18n} from "../../../i18n/country";
import {GroupManager} from "../../../permission/GroupManager";
export namespace chat {
declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;

8
shared/js/ui/frames/side/conversations.ts
View file

@ -1,4 +1,10 @@
namespace chat { import {htmltags} from "../../htmltags";
import {MessageHelper} from "../chat";
import {CommandResult, ErrorID} from "../../../connection/ServerConnectionDeclaration";
import {log, LogCategory} from "../../../log";
import {createErrorModal} from "../../elements/modal";
export namespace chat {
declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;

5
shared/js/ui/frames/side/music_info.ts
View file

@ -1,6 +1,7 @@
namespace chat { import {MusicClientEntry} from "../../../channel-tree/client";
import PlayerState = connection.voice.PlayerState; import {image_preview} from "../image_preview";
export namespace chat {
declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;

6
shared/js/ui/frames/side/private_conversations.ts
View file

@ -1,5 +1,9 @@
/* the bar on the right with the chats (Channel & Client) */ /* the bar on the right with the chats (Channel & Client) */
namespace chat { import {log, LogCategory} from "../../../log";
import {htmltags} from "../../htmltags";
import {MessageHelper} from "../chat";
export namespace chat {
declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setInterval(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;
declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number; declare function setTimeout(handler: TimerHandler, timeout?: number, ...arguments: any[]): number;

2
shared/js/ui/htmltags.ts
View file

@ -1,4 +1,4 @@
namespace htmltags { export namespace htmltags {
let mouse_coordinates: {x: number, y: number} = {x: 0, y: 0}; let mouse_coordinates: {x: number, y: number} = {x: 0, y: 0};
function initialize() { function initialize() {

6
shared/js/ui/modal/ModalAbout.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
function format_date(date: number) { function format_date(date: number) {
const d = new Date(date); const d = new Date(date);

6
shared/js/ui/modal/ModalAvatar.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
//TODO: Test if we could render this image and not only the browser by knowing the type. //TODO: Test if we could render this image and not only the browser by knowing the type.
export function spawnAvatarUpload(callback_data: (data: ArrayBuffer | undefined | null) => any) { export function spawnAvatarUpload(callback_data: (data: ArrayBuffer | undefined | null) => any) {
const modal = createModal({ const modal = createModal({

6
shared/js/ui/modal/ModalAvatarList.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
const avatar_to_uid = (id: string) => { const avatar_to_uid = (id: string) => {
const buffer = new Uint8Array(id.length / 2); const buffer = new Uint8Array(id.length / 2);
for(let index = 0; index < id.length; index += 2) { for(let index = 0; index < id.length; index += 2) {

5
shared/js/ui/modal/ModalBanClient.ts
View file

@ -1,8 +1,3 @@
/// <reference path="../../ui/elements/modal.ts" />
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export type BanEntry = { export type BanEntry = {
name?: string; name?: string;
unique_id: string; unique_id: string;

7
shared/js/ui/modal/ModalBanList.ts
View file

@ -1,9 +1,4 @@
/// <reference path="../../ConnectionHandler.ts" /> export namespace Modals {
/// <reference path="../../ui/elements/modal.ts" />
/// <reference path="../../i18n/localize.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function openBanList(client: ConnectionHandler) { export function openBanList(client: ConnectionHandler) {
let modal: Modal; let modal: Modal;

6
shared/js/ui/modal/ModalBookmarks.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function spawnBookmarkModal() { export function spawnBookmarkModal() {
let modal: Modal; let modal: Modal;
modal = createModal({ modal = createModal({

6
shared/js/ui/modal/ModalChangeLatency.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
let modal: Modal; let modal: Modal;
export function spawnChangeLatency(client: ClientEntry, current: connection.voice.LatencySettings, reset: () => connection.voice.LatencySettings, apply: (settings: connection.voice.LatencySettings) => any, callback_flush?: () => any) { export function spawnChangeLatency(client: ClientEntry, current: connection.voice.LatencySettings, reset: () => connection.voice.LatencySettings, apply: (settings: connection.voice.LatencySettings) => any, callback_flush?: () => any) {
if(modal) modal.close(); if(modal) modal.close();

6
shared/js/ui/modal/ModalChangeVolume.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
//TODO: Use the max limit! //TODO: Use the max limit!
let modal: Modal; let modal: Modal;

2
shared/js/ui/modal/ModalChannelInfo.ts
View file

@ -1,4 +1,4 @@
namespace Modals { export namespace Modals {
export function openChannelInfo(channel: ChannelEntry) { export function openChannelInfo(channel: ChannelEntry) {
let modal: Modal; let modal: Modal;

2
shared/js/ui/modal/ModalClientInfo.ts
View file

@ -1,4 +1,4 @@
namespace Modals { export namespace Modals {
type InfoUpdateCallback = (info: ClientConnectionInfo) => any; type InfoUpdateCallback = (info: ClientConnectionInfo) => any;
export function openClientInfo(client: ClientEntry) { export function openClientInfo(client: ClientEntry) {
let modal: Modal; let modal: Modal;

6
shared/js/ui/modal/ModalConnect.ts
View file

@ -1,7 +1,5 @@
/// <reference path="../../ui/elements/modal.ts" />
//FIXME: Move this shit out of this file! //FIXME: Move this shit out of this file!
namespace connection_log { export namespace connection_log {
//TODO: Save password data //TODO: Save password data
export type ConnectionData = { export type ConnectionData = {
name: string; name: string;
@ -91,7 +89,7 @@ namespace connection_log {
}); });
} }
namespace Modals { export namespace Modals {
export function spawnConnectModal(options: { export function spawnConnectModal(options: {
default_connect_new_tab?: boolean /* default false */ default_connect_new_tab?: boolean /* default false */
}, defaultHost: { url: string, enforce: boolean} = { url: "ts.TeaSpeak.de", enforce: false}, connect_profile?: { profile: profiles.ConnectionProfile, enforce: boolean}) { }, defaultHost: { url: string, enforce: boolean} = { url: "ts.TeaSpeak.de", enforce: false}, connect_profile?: { profile: profiles.ConnectionProfile, enforce: boolean}) {

4
shared/js/ui/modal/ModalCreateChannel.ts
View file

@ -1,6 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
namespace Modals {
export function createChannelModal(connection: ConnectionHandler, channel: ChannelEntry | undefined, parent: ChannelEntry | undefined, permissions: PermissionManager, callback: (properties?: ChannelProperties, permissions?: PermissionValue[]) => any) { export function createChannelModal(connection: ConnectionHandler, channel: ChannelEntry | undefined, parent: ChannelEntry | undefined, permissions: PermissionManager, callback: (properties?: ChannelProperties, permissions?: PermissionValue[]) => any) {
let properties: ChannelProperties = { } as ChannelProperties; //The changes properties let properties: ChannelProperties = { } as ChannelProperties; //The changes properties
const modal = createModal({ const modal = createModal({

2
shared/js/ui/modal/ModalGroupAssignment.ts
View file

@ -1,4 +1,4 @@
namespace Modals { export namespace Modals {
let current_modal: Modal; let current_modal: Modal;
export function createServerGroupAssignmentModal(client: ClientEntry, callback: (groups: number[], flag: boolean) => Promise<boolean>) { export function createServerGroupAssignmentModal(client: ClientEntry, callback: (groups: number[], flag: boolean) => Promise<boolean>) {
if(current_modal) if(current_modal)

6
shared/js/ui/modal/ModalIconSelect.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function spawnIconSelect(client: ConnectionHandler, callback_icon?: (id: number) => any, selected_icon?: number) { export function spawnIconSelect(client: ConnectionHandler, callback_icon?: (id: number) => any, selected_icon?: number) {
selected_icon = selected_icon || 0; selected_icon = selected_icon || 0;
let allow_manage = client.permissions.neededPermission(PermissionType.B_ICON_MANAGE).granted(1); let allow_manage = client.permissions.neededPermission(PermissionType.B_ICON_MANAGE).granted(1);

2
shared/js/ui/modal/ModalIdentity.ts
View file

@ -1,4 +1,4 @@
namespace Modals { export namespace Modals {
export function spawnTeamSpeakIdentityImprove(identity: profiles.identities.TeaSpeakIdentity, name: string): Modal { export function spawnTeamSpeakIdentityImprove(identity: profiles.identities.TeaSpeakIdentity, name: string): Modal {
let modal: Modal; let modal: Modal;
let elapsed_timer: NodeJS.Timer; let elapsed_timer: NodeJS.Timer;

6
shared/js/ui/modal/ModalInvite.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
type URLGeneratorSettings = { type URLGeneratorSettings = {
flag_direct: boolean, flag_direct: boolean,
flag_resolved: boolean flag_resolved: boolean

2
shared/js/ui/modal/ModalKeySelect.ts
View file

@ -1,4 +1,4 @@
namespace Modals { export namespace Modals {
export function spawnKeySelect(callback: (key?: ppt.KeyEvent) => void) { export function spawnKeySelect(callback: (key?: ppt.KeyEvent) => void) {
let modal = createModal({ let modal = createModal({
header: tr("Select a key"), header: tr("Select a key"),

6
shared/js/ui/modal/ModalMusicManage.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function openMusicManage(client: ConnectionHandler, bot: MusicClientEntry) { export function openMusicManage(client: ConnectionHandler, bot: MusicClientEntry) {
const ev_registry = new events.Registry<events.modal.music_manage>(); const ev_registry = new events.Registry<events.modal.music_manage>();
ev_registry.enable_debug("music-manage"); ev_registry.enable_debug("music-manage");

6
shared/js/ui/modal/ModalNewcomer.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
const next_step: {[key: string]:string} = { const next_step: {[key: string]:string} = {
"welcome": "microphone", "welcome": "microphone",
//"microphone": app.is_web() ? "identity" : "speaker", /* speaker setup only for the native client! */ //"microphone": app.is_web() ? "identity" : "speaker", /* speaker setup only for the native client! */

6
shared/js/ui/modal/ModalPlaylistEdit.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function spawnPlaylistSongInfo(song: PlaylistSong) { export function spawnPlaylistSongInfo(song: PlaylistSong) {
let modal: Modal; let modal: Modal;

7
shared/js/ui/modal/ModalPlaylistList.ts
View file

@ -1,9 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../i18n/localize.ts" />
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function spawnPlaylistManage(client: ConnectionHandler) { export function spawnPlaylistManage(client: ConnectionHandler) {
{ {
createErrorModal(tr("Not implemented"), tr("Playlist management hasn't yet been implemented")).open(); createErrorModal(tr("Not implemented"), tr("Playlist management hasn't yet been implemented")).open();

6
shared/js/ui/modal/ModalPoke.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
let global_modal: PokeModal; let global_modal: PokeModal;
interface ServerEntry { interface ServerEntry {

6
shared/js/ui/modal/ModalQuery.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
export function spawnQueryCreate(connection: ConnectionHandler, callback_created?: (user, pass) => any) { export function spawnQueryCreate(connection: ConnectionHandler, callback_created?: (user, pass) => any) {
let modal; let modal;
modal = createModal({ modal = createModal({

6
shared/js/ui/modal/ModalQueryManage.ts
View file

@ -1,8 +1,4 @@
/// <reference path="../../ui/elements/modal.ts" /> export namespace Modals {
/// <reference path="../../ConnectionHandler.ts" />
/// <reference path="../../proto.ts" />
namespace Modals {
/* /*
export function spawnQueryManage(client: ConnectionHandler) { export function spawnQueryManage(client: ConnectionHandler) {
let modal: Modal; let modal: Modal;

2
shared/js/ui/modal/ModalServerEdit.ts
View file

@ -1,4 +1,4 @@
namespace Modals { export namespace Modals {
export function createServerModal(server: ServerEntry, callback: (properties?: ServerProperties) => Promise<void>) { export function createServerModal(server: ServerEntry, callback: (properties?: ServerProperties) => Promise<void>) {
const properties = Object.assign({}, server.properties); const properties = Object.assign({}, server.properties);

Some files were not shown because too many files have changed in this diff Show more