Fixed some client and build related issues
This commit is contained in:
parent
2b00136e6e
commit
a7a5467253
3 changed files with 67 additions and 4 deletions
|
@ -250,17 +250,17 @@ namespace bipc {
|
|||
}
|
||||
}
|
||||
|
||||
interface MethodProxyInvokeData {
|
||||
export interface MethodProxyInvokeData {
|
||||
method_name: string;
|
||||
arguments: any[];
|
||||
promise_id: string;
|
||||
}
|
||||
interface MethodProxyResultData {
|
||||
export interface MethodProxyResultData {
|
||||
promise_id: string;
|
||||
result: any;
|
||||
success: boolean;
|
||||
}
|
||||
interface MethodProxyCallback {
|
||||
export interface MethodProxyCallback {
|
||||
promise: Promise<any>;
|
||||
promise_id: string;
|
||||
|
||||
|
|
|
@ -57,7 +57,13 @@ namespace bookmarks {
|
|||
return _bookmark_config;
|
||||
|
||||
let bookmark_json = localStorage.getItem("bookmarks");
|
||||
let bookmarks = JSON.parse(bookmark_json) || {} as BookmarkConfig;
|
||||
let bookmarks;
|
||||
try {
|
||||
bookmarks = JSON.parse(bookmark_json) || {} as BookmarkConfig;
|
||||
} catch(error) {
|
||||
console.error(tr("Failed to load bookmarks: %o"), error);
|
||||
bookmarks = {} as any;
|
||||
}
|
||||
|
||||
_bookmark_config = bookmarks;
|
||||
_bookmark_config.root_bookmark = _bookmark_config.root_bookmark || { content: [], display_name: "root", type: BookmarkType.DIRECTORY} as DirectoryBookmark;
|
||||
|
|
|
@ -239,7 +239,64 @@ function Base64DecodeUrl(str: string, pad?: boolean){
|
|||
return str.replace(/-/g, '+').replace(/_/g, '/');
|
||||
}
|
||||
|
||||
/*
|
||||
class TestProxy extends bipc.MethodProxy {
|
||||
constructor(params: bipc.MethodProxyConnectParameters) {
|
||||
super(bipc.get_handler(), params.channel_id && params.client_id ? params : undefined);
|
||||
|
||||
if(!this.is_slave()) {
|
||||
this.register_method(this.add_slave);
|
||||
}
|
||||
if(!this.is_master()) {
|
||||
this.register_method(this.say_hello);
|
||||
this.register_method(this.add_master);
|
||||
}
|
||||
}
|
||||
|
||||
setup() {
|
||||
super.setup();
|
||||
}
|
||||
|
||||
protected on_connected() {
|
||||
console.log("Test proxy connected");
|
||||
}
|
||||
|
||||
protected on_disconnected() {
|
||||
console.log("Test proxy disconnected");
|
||||
}
|
||||
|
||||
private async say_hello() : Promise<void> {
|
||||
console.log("Hello World");
|
||||
}
|
||||
|
||||
private async add_slave(a: number, b: number) : Promise<number> {
|
||||
return a + b;
|
||||
}
|
||||
|
||||
private async add_master(a: number, b: number) : Promise<number> {
|
||||
return a * b;
|
||||
}
|
||||
}
|
||||
interface Window {
|
||||
proxy_instance: TestProxy & {url: () => string};
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
function main() {
|
||||
/*
|
||||
window.proxy_instance = new TestProxy({
|
||||
client_id: settings.static_global<string>("proxy_client_id", undefined),
|
||||
channel_id: settings.static_global<string>("proxy_channel_id", undefined)
|
||||
}) as any;
|
||||
if(window.proxy_instance.is_master()) {
|
||||
window.proxy_instance.setup();
|
||||
window.proxy_instance.url = () => {
|
||||
const data = window.proxy_instance.generate_connect_parameters();
|
||||
return "proxy_channel_id=" + data.channel_id + "&proxy_client_id=" + data.client_id;
|
||||
};
|
||||
}
|
||||
*/
|
||||
//http://localhost:63343/Web-Client/index.php?_ijt=omcpmt8b9hnjlfguh8ajgrgolr&default_connect_url=true&default_connect_type=teamspeak&default_connect_url=localhost%3A9987&disableUnloadDialog=1&loader_ignore_age=1
|
||||
|
||||
server_connections = new ServerConnectionManager($("#connection-handlers"));
|
||||
|
|
Loading…
Add table
Reference in a new issue