Changed the loader
WolverinDEV
parent
c97987828e
commit
15ab95c1f9
|
|
@ -1,54 +1,193 @@
|
|||
namespace app {
|
||||
export enum Type {
|
||||
UNDEFINED,
|
||||
RELEASE,
|
||||
DEBUG
|
||||
namespace loader {
|
||||
type Task = {
|
||||
name: string,
|
||||
priority: number, /* tasks with the same priority will be executed in sync */
|
||||
function: () => Promise<void>
|
||||
};
|
||||
|
||||
export enum Stage {
|
||||
/*
|
||||
loading loader required files (incl this)
|
||||
*/
|
||||
INITIALIZING,
|
||||
/*
|
||||
setting up the loading process
|
||||
*/
|
||||
SETUP,
|
||||
/*
|
||||
loading all javascript files
|
||||
*/
|
||||
JAVASCRIPT,
|
||||
/*
|
||||
loading all template files
|
||||
*/
|
||||
TEMPLATES,
|
||||
/*
|
||||
initializing static/global stuff
|
||||
*/
|
||||
JAVASCRIPT_INITIALIZING,
|
||||
/*
|
||||
finalizing load process
|
||||
*/
|
||||
FINALIZING,
|
||||
/*
|
||||
invoking main task
|
||||
*/
|
||||
LOADED
|
||||
}
|
||||
|
||||
let moduleInitialized: boolean;
|
||||
let applicationLoaded: boolean;
|
||||
export let type: Type = Type.UNDEFINED;
|
||||
export let loadedListener: (() => any)[];
|
||||
export const appLoaded = Date.now();
|
||||
let current_stage: Stage = Stage.INITIALIZING;
|
||||
const tasks: {[key:number]:Task[]} = {};
|
||||
|
||||
export function initialized() : boolean {
|
||||
return moduleInitialized && applicationLoaded;
|
||||
export function register_task(stage: Stage, task: Task) {
|
||||
const task_array = tasks[stage] || (tasks[stage] = []);
|
||||
task_array.push(task);
|
||||
task_array.sort((a, b) => a.priority < b.priority ? 1 : 0);
|
||||
}
|
||||
|
||||
export function callbackApp(errorMessage?: string) {
|
||||
if(errorMessage) {
|
||||
console.error("Could not load application!");
|
||||
} else {
|
||||
applicationLoaded = true;
|
||||
testInitialisation();
|
||||
export async function execute() {
|
||||
while(current_stage <= Stage.LOADED) {
|
||||
let current_tasks: Task[] = [];
|
||||
while((tasks[current_stage] || []).length > 0) {
|
||||
if(current_tasks.length == 0 || current_tasks[0].priority == tasks[current_stage][0].priority) {
|
||||
current_tasks.push(tasks[current_stage].pop());
|
||||
} else break;
|
||||
}
|
||||
|
||||
const errors: {
|
||||
error: any,
|
||||
task: Task
|
||||
}[] = [];
|
||||
|
||||
const promises: Promise<void>[] = [];
|
||||
for(const task of current_tasks) {
|
||||
try {
|
||||
promises.push(task.function().catch(error => {
|
||||
errors.push({
|
||||
task: task,
|
||||
error: error
|
||||
});
|
||||
return Promise.resolve();
|
||||
}));
|
||||
} catch(error) {
|
||||
errors.push({
|
||||
task: task,
|
||||
error: error
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
await Promise.all([...promises]);
|
||||
|
||||
if(errors.length > 0) {
|
||||
console.error("Failed to execute loader. The following tasks failed (%d):", errors.length);
|
||||
for(const error of errors)
|
||||
console.error(" - %s: %o", error.task.name, error.error);
|
||||
|
||||
throw "failed to process step " + Stage[current_stage];
|
||||
}
|
||||
|
||||
if(current_tasks.length == 0) {
|
||||
if(current_stage < Stage.LOADED)
|
||||
console.debug("[loader] entering next state (%s)", Stage[current_stage + 1]);
|
||||
current_stage += 1;
|
||||
}
|
||||
}
|
||||
console.debug("[loader] finished loader.");
|
||||
}
|
||||
|
||||
type Script = string | string[];
|
||||
|
||||
function script_name(path: string | string[]) {
|
||||
if(Array.isArray(path)) {
|
||||
let buffer = "";
|
||||
let _or = " or ";
|
||||
for(let entry of path)
|
||||
buffer += _or + formatPath(entry);
|
||||
return buffer.slice(_or.length);
|
||||
} else return "<code>" + path + "</code>";
|
||||
}
|
||||
|
||||
class SyntaxError {
|
||||
source: any;
|
||||
|
||||
constructor(source: any) {
|
||||
this.source = source;
|
||||
}
|
||||
}
|
||||
|
||||
export function initialize() {
|
||||
moduleInitialized = false;
|
||||
applicationLoaded = false;
|
||||
loadedListener = [];
|
||||
export async function load_script(path: Script) : Promise<void> {
|
||||
if(Array.isArray(path)) { //We have some fallback
|
||||
return load_script(path[0]).catch(error => {
|
||||
if(error instanceof SyntaxError)
|
||||
return error.source;
|
||||
|
||||
Module['onRuntimeInitialized'] = function() {
|
||||
console.log("Runtime init!");
|
||||
moduleInitialized = true;
|
||||
testInitialisation();
|
||||
};
|
||||
if(path.length > 1)
|
||||
return load_script(path.slice(1));
|
||||
|
||||
Module['onAbort'] = message => {
|
||||
Module['onAbort'] = undefined;
|
||||
displayCriticalError("Could not load webassembly files!<br>Message: <code>" + message + "</code>");
|
||||
};
|
||||
return error;
|
||||
});
|
||||
} else {
|
||||
return new Promise((resolve, reject) => {
|
||||
const tag: HTMLScriptElement = document.createElement("script");
|
||||
|
||||
Module['locateFile'] = file => {
|
||||
return "wasm/" + file;
|
||||
};
|
||||
const error_handler = (event: ErrorEvent) => {
|
||||
if(event.filename == tag.src) { //Our tag throw an uncaught error
|
||||
//console.log("msg: %o, url: %o, line: %o, col: %o, error: %o", event.message, event.filename, event.lineno, event.colno, event.error);
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
|
||||
reject(new SyntaxError(event.error));
|
||||
event.preventDefault();
|
||||
}
|
||||
};
|
||||
window.addEventListener('error', error_handler as any);
|
||||
|
||||
tag.type = "application/javascript";
|
||||
tag.async = true;
|
||||
tag.defer = true;
|
||||
tag.onerror = error => {
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
console.error("ERROR: %o", error);
|
||||
tag.remove();
|
||||
reject(error);
|
||||
};
|
||||
tag.onload = () => {
|
||||
window.removeEventListener('error', error_handler as any);
|
||||
console.debug("Script %o loaded", path);
|
||||
resolve();
|
||||
};
|
||||
document.getElementById("scripts").appendChild(tag);
|
||||
tag.src = path;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function testInitialisation() {
|
||||
if(moduleInitialized && applicationLoaded)
|
||||
for(let l of loadedListener)
|
||||
l();
|
||||
export async function load_scripts(paths: Script[]) : Promise<void> {
|
||||
const promises: Promise<void>[] = [];
|
||||
const errors: {
|
||||
script: Script,
|
||||
error: any
|
||||
}[] = [];
|
||||
|
||||
for(const script of paths)
|
||||
promises.push(load_script(script).catch(error => {
|
||||
errors.push({
|
||||
script: script,
|
||||
error: error
|
||||
});
|
||||
return Promise.resolve();
|
||||
}));
|
||||
|
||||
await Promise.all([...promises]);
|
||||
|
||||
if(errors.length > 0) {
|
||||
console.error("Failed to load the following scripts:");
|
||||
for(const script of errors)
|
||||
console.log(" - %o: %o", script.script, script.error);
|
||||
|
||||
displayCriticalError("Failed to load script " + script_name(errors[0].script) + " <br>" + "View the browser console for more information!");
|
||||
throw "failed to load script " + script_name(errors[0].script);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -67,7 +206,7 @@ const display_critical_load = message => {
|
|||
};
|
||||
|
||||
const loader_impl_display_critical_error = message => {
|
||||
if(typeof(createErrorModal) !== 'undefined') {
|
||||
if(typeof(createErrorModal) !== 'undefined' && typeof((<any>window).ModalFunctions) !== 'undefined') {
|
||||
createErrorModal("A critical error occurred while loading the page!", message, {closeable: false}).open();
|
||||
} else {
|
||||
display_critical_load(message);
|
||||
|
|
@ -89,207 +228,213 @@ function displayCriticalError(message: string) {
|
|||
loader_impl_display_critical_error(message);
|
||||
}
|
||||
|
||||
/* all javascript loaders */
|
||||
const loader_javascript = {
|
||||
load_scripts: async () => {
|
||||
/*
|
||||
if(window.require !== undefined) {
|
||||
console.log("Loading node specific things");
|
||||
const remote = require('electron').remote;
|
||||
module.paths.push(remote.app.getAppPath() + "/node_modules");
|
||||
module.paths.push(remote.app.getAppPath() + "/app");
|
||||
module.paths.push(remote.getGlobal("browser-root") + "js/");
|
||||
window.$ = require("assets/jquery.min.js");
|
||||
require("native/loader_adapter.js");
|
||||
}
|
||||
*/
|
||||
|
||||
function load_scripts(paths: (string | string[])[]) : {path: string, promise: Promise<Boolean>}[] {
|
||||
let result = [];
|
||||
for(let path of paths)
|
||||
result.push({path: path, promise: load_script(path)});
|
||||
return result;
|
||||
}
|
||||
if(!window.require) {
|
||||
await loader.load_script(["vendor/jquery/jquery.min.js"]);
|
||||
}
|
||||
await loader.load_script("vendor/jsrender/jsrender.min.js");
|
||||
await loader.load_scripts([
|
||||
["vendor/bbcode/xbbcode.js"],
|
||||
["vendor/moment/moment.js"],
|
||||
["https://webrtc.github.io/adapter/adapter-latest.js"]
|
||||
]);
|
||||
|
||||
function load_script(path: string | string[]) : Promise<Boolean> {
|
||||
if(Array.isArray(path)) { //Having fallbacks
|
||||
return new Promise<Boolean>((resolve, reject) => {
|
||||
load_script(path[0]).then(resolve).catch(error => {
|
||||
if(path.length >= 2) {
|
||||
load_script(path.slice(1)).then(resolve).catch(() => reject("could not load file " + formatPath(path)));
|
||||
} else {
|
||||
reject("could not load file");
|
||||
}
|
||||
try {
|
||||
await loader.load_script("js/proto.js");
|
||||
//we're loading for debug
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "scripts debug",
|
||||
priority: 20,
|
||||
function: loader_javascript.load_scripts_debug
|
||||
});
|
||||
});
|
||||
} else {
|
||||
return new Promise((resolve, reject) => {
|
||||
const tag: HTMLScriptElement = document.createElement("script");
|
||||
tag.type = "application/javascript";
|
||||
tag.async = true;
|
||||
tag.defer = true;
|
||||
tag.onerror = error => {
|
||||
console.log(error);
|
||||
tag.remove();
|
||||
reject(error);
|
||||
};
|
||||
tag.onload = () => {
|
||||
console.debug("Script %o loaded", path);
|
||||
resolve();
|
||||
};
|
||||
document.getElementById("scripts").appendChild(tag);
|
||||
tag.src = path;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function formatPath(path: string | string[]) {
|
||||
if(Array.isArray(path)) {
|
||||
let buffer = "";
|
||||
let _or = " or ";
|
||||
for(let entry of path)
|
||||
buffer += _or + formatPath(entry);
|
||||
return buffer.slice(_or.length);
|
||||
} else return "<code>" + path + "</code>";
|
||||
}
|
||||
|
||||
function loadRelease() {
|
||||
app.type = app.Type.RELEASE;
|
||||
console.log("Load for release!");
|
||||
awaitLoad(load_scripts([
|
||||
//Load general API's
|
||||
["wasm/TeaWeb-Identity.js"],
|
||||
["js/client.min.js", "js/client.js"]
|
||||
])).then(() => {
|
||||
console.log("Loaded successfully all scripts!");
|
||||
app.callbackApp();
|
||||
}).catch((error) => {
|
||||
console.error("Could not load " + error.path);
|
||||
});
|
||||
}
|
||||
|
||||
/** Only possible for developers! **/
|
||||
function loadDebug() {
|
||||
app.type = app.Type.DEBUG;
|
||||
console.log("Load for debug!");
|
||||
|
||||
let custom_scripts: (string | string[])[] = [];
|
||||
|
||||
if(!window.require) {
|
||||
console.log("Adding browser audio player");
|
||||
custom_scripts.push(["js/audio/AudioPlayer.js"]);
|
||||
custom_scripts.push(["js/audio/WebCodec.js"]);
|
||||
custom_scripts.push(["js/WebPPTListener.js"]);
|
||||
}
|
||||
|
||||
load_wait_scripts([
|
||||
["wasm/TeaWeb-Identity.js"],
|
||||
|
||||
//Load general API's
|
||||
"js/i18n/localize.js",
|
||||
"js/log.js",
|
||||
|
||||
"js/sound/Sounds.js",
|
||||
|
||||
"js/utils/modal.js",
|
||||
"js/utils/tab.js",
|
||||
"js/utils/helpers.js",
|
||||
|
||||
"js/crypto/sha.js",
|
||||
"js/crypto/hex.js",
|
||||
|
||||
//load the profiles
|
||||
"js/profiles/ConnectionProfile.js",
|
||||
"js/profiles/Identity.js",
|
||||
|
||||
//Load UI
|
||||
"js/ui/modal/ModalQuery.js",
|
||||
"js/ui/modal/ModalQueryManage.js",
|
||||
"js/ui/modal/ModalBookmarks.js",
|
||||
"js/ui/modal/ModalConnect.js",
|
||||
"js/ui/modal/ModalSettings.js",
|
||||
"js/ui/modal/ModalCreateChannel.js",
|
||||
"js/ui/modal/ModalServerEdit.js",
|
||||
"js/ui/modal/ModalConnect.js",
|
||||
"js/ui/modal/ModalChangeVolume.js",
|
||||
"js/ui/modal/ModalBanClient.js",
|
||||
"js/ui/modal/ModalBanCreate.js",
|
||||
"js/ui/modal/ModalBanList.js",
|
||||
"js/ui/modal/ModalYesNo.js",
|
||||
"js/ui/modal/ModalPoke.js",
|
||||
"js/ui/modal/ModalPermissionEdit.js",
|
||||
"js/ui/modal/ModalServerGroupDialog.js",
|
||||
|
||||
"js/ui/channel.js",
|
||||
"js/ui/client.js",
|
||||
"js/ui/server.js",
|
||||
"js/ui/view.js",
|
||||
"js/ui/client_move.js",
|
||||
|
||||
"js/ui/frames/SelectedItemInfo.js",
|
||||
"js/ui/frames/ControlBar.js",
|
||||
|
||||
//Load permissions
|
||||
"js/permission/PermissionManager.js",
|
||||
"js/permission/GroupManager.js",
|
||||
|
||||
//Load audio
|
||||
"js/voice/VoiceHandler.js",
|
||||
"js/voice/VoiceRecorder.js",
|
||||
"js/voice/AudioResampler.js",
|
||||
"js/voice/AudioController.js",
|
||||
|
||||
//Load codec
|
||||
"js/codec/Codec.js",
|
||||
"js/codec/BasicCodec.js",
|
||||
|
||||
//Load general stuff
|
||||
"js/settings.js",
|
||||
"js/bookmarks.js",
|
||||
"js/contextMenu.js",
|
||||
"js/connection.js",
|
||||
"js/FileManager.js",
|
||||
"js/client.js",
|
||||
"js/chat.js",
|
||||
|
||||
"js/PPTListener.js",
|
||||
...custom_scripts
|
||||
]).then(() => load_wait_scripts([
|
||||
"js/codec/CodecWrapperWorker.js",
|
||||
"js/profiles/identities/NameIdentity.js", //Depends on Identity
|
||||
"js/profiles/identities/TeaForumIdentity.js", //Depends on Identity
|
||||
"js/profiles/identities/TeamSpeakIdentity.js", //Depends on Identity
|
||||
])).then(() => load_wait_scripts([
|
||||
"js/main.js"
|
||||
])).then(() => {
|
||||
console.log("Loaded successfully all scripts!");
|
||||
app.callbackApp();
|
||||
});
|
||||
}
|
||||
|
||||
function awaitLoad(promises: {path: string, promise: Promise<Boolean>}[]) : Promise<void> {
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
let awaiting = promises.length;
|
||||
let success = true;
|
||||
|
||||
for(let entry of promises) {
|
||||
entry.promise.then(() => {
|
||||
awaiting--;
|
||||
if(awaiting == 0) resolve();
|
||||
}).catch(error => {
|
||||
success = false;
|
||||
if(error instanceof TypeError) {
|
||||
console.error(error);
|
||||
let name = (error as any).fileName + "@" + (error as any).lineNumber + ":" + (error as any).columnNumber;
|
||||
displayCriticalError("Failed to execute script <code>" + name + "</code>.<hr>If you believe that it isn't your mistake<br>then please contact an administrator!");
|
||||
return;
|
||||
} else {
|
||||
console.error("Failed to load script " + entry.path);
|
||||
}
|
||||
displayCriticalError("Failed to load script " + formatPath(entry.path) + ".<hr>If you believe that it isn't your mistake<br>then please contact an administrator!");
|
||||
} catch(error) {
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "scripts release",
|
||||
priority: 20,
|
||||
function: loadRelease /* fixme */
|
||||
});
|
||||
}
|
||||
},
|
||||
load_scripts_debug: async () => {
|
||||
/* test if we're loading as TeaClient or WebClient */
|
||||
if(!window.require) {
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "javascript web",
|
||||
priority: 10,
|
||||
function: loader_javascript.load_scripts_debug_web
|
||||
})
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function load_wait_scripts(paths: (string | string[])[]) : Promise<void> {
|
||||
return awaitLoad(load_scripts(paths));
|
||||
}
|
||||
await loader.load_scripts([
|
||||
["wasm/TeaWeb-Identity.js"],
|
||||
|
||||
//Load general API's
|
||||
"js/i18n/localize.js",
|
||||
"js/log.js",
|
||||
|
||||
"js/sound/Sounds.js",
|
||||
|
||||
"js/utils/modal.js",
|
||||
"js/utils/tab.js",
|
||||
"js/utils/helpers.js",
|
||||
|
||||
"js/crypto/sha.js",
|
||||
"js/crypto/hex.js",
|
||||
|
||||
//load the profiles
|
||||
"js/profiles/ConnectionProfile.js",
|
||||
"js/profiles/Identity.js",
|
||||
|
||||
//Load UI
|
||||
"js/ui/modal/ModalQuery.js",
|
||||
"js/ui/modal/ModalQueryManage.js",
|
||||
"js/ui/modal/ModalBookmarks.js",
|
||||
"js/ui/modal/ModalConnect.js",
|
||||
"js/ui/modal/ModalSettings.js",
|
||||
"js/ui/modal/ModalCreateChannel.js",
|
||||
"js/ui/modal/ModalServerEdit.js",
|
||||
"js/ui/modal/ModalConnect.js",
|
||||
"js/ui/modal/ModalChangeVolume.js",
|
||||
"js/ui/modal/ModalBanClient.js",
|
||||
"js/ui/modal/ModalBanCreate.js",
|
||||
"js/ui/modal/ModalBanList.js",
|
||||
"js/ui/modal/ModalYesNo.js",
|
||||
"js/ui/modal/ModalPoke.js",
|
||||
"js/ui/modal/ModalPermissionEdit.js",
|
||||
"js/ui/modal/ModalServerGroupDialog.js",
|
||||
|
||||
"js/ui/channel.js",
|
||||
"js/ui/client.js",
|
||||
"js/ui/server.js",
|
||||
"js/ui/view.js",
|
||||
"js/ui/client_move.js",
|
||||
|
||||
"js/ui/frames/SelectedItemInfo.js",
|
||||
"js/ui/frames/ControlBar.js",
|
||||
|
||||
//Load permissions
|
||||
"js/permission/PermissionManager.js",
|
||||
"js/permission/GroupManager.js",
|
||||
|
||||
//Load audio
|
||||
"js/voice/VoiceHandler.js",
|
||||
"js/voice/VoiceRecorder.js",
|
||||
"js/voice/AudioResampler.js",
|
||||
"js/voice/AudioController.js",
|
||||
|
||||
//Load codec
|
||||
"js/codec/Codec.js",
|
||||
"js/codec/BasicCodec.js",
|
||||
|
||||
//Load general stuff
|
||||
"js/settings.js",
|
||||
"js/bookmarks.js",
|
||||
"js/contextMenu.js",
|
||||
"js/connection.js",
|
||||
"js/FileManager.js",
|
||||
"js/client.js",
|
||||
"js/chat.js",
|
||||
|
||||
"js/PPTListener.js"
|
||||
]);
|
||||
|
||||
await loader.load_scripts([
|
||||
"js/codec/CodecWrapperWorker.js",
|
||||
"js/profiles/identities/NameIdentity.js", //Depends on Identity
|
||||
"js/profiles/identities/TeaForumIdentity.js", //Depends on Identity
|
||||
"js/profiles/identities/TeamSpeakIdentity.js", //Depends on Identity
|
||||
]);
|
||||
|
||||
await loader.load_script("js/main.js");
|
||||
},
|
||||
load_scripts_debug_web: async () => {
|
||||
await loader.load_scripts([
|
||||
["js/audio/AudioPlayer.js"],
|
||||
["js/audio/WebCodec.js"],
|
||||
["js/WebPPTListener.js"]
|
||||
]);
|
||||
},
|
||||
|
||||
loadRelease: async () => {
|
||||
console.log("Load for release!");
|
||||
|
||||
await loader.load_scripts([
|
||||
//Load general API's
|
||||
["wasm/TeaWeb-Identity.js"],
|
||||
["js/client.min.js", "js/client.js"]
|
||||
]);
|
||||
}
|
||||
};
|
||||
|
||||
const loader_webassembly = {
|
||||
test_webassembly: async () => {
|
||||
if(typeof (WebAssembly) === "undefined" || typeof (WebAssembly.compile) === "undefined") {
|
||||
console.log(navigator.browserSpecs);
|
||||
if (navigator.browserSpecs.name == 'Safari') {
|
||||
if (parseInt(navigator.browserSpecs.version) < 11) {
|
||||
displayCriticalError("You require Safari 11 or higher to use the web client!<br>Safari " + navigator.browserSpecs.version + " does not support WebAssambly!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Do something for all other browsers.
|
||||
}
|
||||
displayCriticalError("You require WebAssembly for TeaSpeak-Web!");
|
||||
throw "Missing web assembly";
|
||||
}
|
||||
},
|
||||
setup_awaiter: async () => {
|
||||
Module['_initialized'] = false;
|
||||
Module['_initialized_callback'] = undefined;
|
||||
|
||||
Module['onRuntimeInitialized'] = () => {
|
||||
Module['_initialized'] = true;
|
||||
if(Module['_initialized_callback'])
|
||||
Module['_initialized_callback']();
|
||||
};
|
||||
|
||||
Module['onAbort'] = message => {
|
||||
Module['onAbort'] = undefined;
|
||||
Module['_initialized'] = false;
|
||||
displayCriticalError("Could not load webassembly files!<br>Message: <code>" + message + "</code>");
|
||||
};
|
||||
|
||||
Module['locateFile'] = file => "wasm/" + file;
|
||||
},
|
||||
awaiter: () => new Promise<void>((resolve, reject) => {
|
||||
if(!Module['onAbort']) /* an error has been already encountered */
|
||||
reject();
|
||||
else if(!Module['_initialized'])
|
||||
Module['_initialized_callback'] = resolve;
|
||||
else
|
||||
resolve();
|
||||
})
|
||||
};
|
||||
|
||||
|
||||
function loadTemplates() {
|
||||
//Load the templates
|
||||
$.ajax("templates.html", {
|
||||
cache: false, //Change this when in release mode
|
||||
}).then((element, status) => {
|
||||
async function load_templates() {
|
||||
try {
|
||||
const response = await $.ajax("templates.html", {
|
||||
cache: false, //Change this when in release mode
|
||||
});
|
||||
|
||||
let node = document.createElement("html");
|
||||
node.innerHTML = element;
|
||||
node.innerHTML = response;
|
||||
let tags: HTMLCollection;
|
||||
if(node.getElementsByTagName("body").length > 0)
|
||||
tags = node.getElementsByTagName("body")[0].children;
|
||||
|
|
@ -306,66 +451,17 @@ function loadTemplates() {
|
|||
root.appendChild(tag);
|
||||
|
||||
}
|
||||
}).catch(error => {
|
||||
console.error("Could not load templates!");
|
||||
console.log(error);
|
||||
displayCriticalError("Could not load HTML templates!");
|
||||
});
|
||||
} catch(error) {
|
||||
console.dir(error);
|
||||
displayCriticalError("Failed to find template tag!");
|
||||
throw "template error";
|
||||
}
|
||||
}
|
||||
|
||||
interface Window {
|
||||
$: JQuery;
|
||||
}
|
||||
|
||||
//TODO release config!
|
||||
function loadSide() {
|
||||
if(window.require !== undefined) {
|
||||
console.log("Loading node specific things");
|
||||
const remote = require('electron').remote;
|
||||
module.paths.push(remote.app.getAppPath() + "/node_modules");
|
||||
module.paths.push(remote.app.getAppPath() + "/app");
|
||||
module.paths.push(remote.getGlobal("browser-root") + "js/");
|
||||
window.$ = require("assets/jquery.min.js");
|
||||
require("native/loader_adapter.js");
|
||||
}
|
||||
|
||||
if(typeof (WebAssembly) === "undefined" || typeof (WebAssembly.compile) === "undefined") {
|
||||
console.log(navigator.browserSpecs);
|
||||
if (navigator.browserSpecs.name == 'Safari') {
|
||||
if (parseInt(navigator.browserSpecs.version) < 11) {
|
||||
displayCriticalError("You require Safari 11 or higher to use the web client!<br>Safari " + navigator.browserSpecs.version + " does not support WebAssambly!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
// Do something for all other browsers.
|
||||
}
|
||||
displayCriticalError("You require WebAssembly for TeaSpeak-Web!");
|
||||
return;
|
||||
}
|
||||
//Load the general scripts and required scripts
|
||||
(window.require !== undefined ?
|
||||
Promise.resolve() :
|
||||
load_wait_scripts([
|
||||
"vendor/jquery/jquery.min.js"
|
||||
])
|
||||
).then(() => load_wait_scripts([
|
||||
"vendor/jsrender/jsrender.min.js"
|
||||
])).then(() => load_wait_scripts([
|
||||
["vendor/bbcode/xbbcode.js"],
|
||||
["vendor/moment/moment.js"],
|
||||
["https://webrtc.github.io/adapter/adapter-latest.js"]
|
||||
])).then(() => {
|
||||
//Load the teaweb scripts
|
||||
load_script("js/proto.js").then(loadDebug).catch(loadRelease);
|
||||
//Load the teaweb templates
|
||||
loadTemplates();
|
||||
}).catch(error => {
|
||||
displayCriticalError("Failed to load scripts.<br>Lookup the console for more details.");
|
||||
console.error(error);
|
||||
});
|
||||
}
|
||||
|
||||
//FUN: loader_ignore_age=0&loader_default_duration=1500&loader_default_age=5000
|
||||
let _fadeout_warned = false;
|
||||
function fadeoutLoader(duration = undefined, minAge = undefined, ignoreAge = undefined) {
|
||||
|
|
@ -393,11 +489,13 @@ function fadeoutLoader(duration = undefined, minAge = undefined, ignoreAge = und
|
|||
else ignoreAge = false;
|
||||
}
|
||||
|
||||
/*
|
||||
let age = Date.now() - app.appLoaded;
|
||||
if(age < minAge && !ignoreAge) {
|
||||
setTimeout(() => fadeoutLoader(duration, 0, true), minAge - age);
|
||||
return;
|
||||
}
|
||||
*/
|
||||
|
||||
$(".loader .bookshelf_wrapper").animate({top: 0, opacity: 0}, duration);
|
||||
$(".loader .half").animate({width: 0}, duration, () => {
|
||||
|
|
@ -405,21 +503,9 @@ function fadeoutLoader(duration = undefined, minAge = undefined, ignoreAge = und
|
|||
});
|
||||
}
|
||||
|
||||
/* safari remove "fix" */
|
||||
if(Element.prototype.remove === undefined)
|
||||
Object.defineProperty(Element.prototype, "remove", {
|
||||
enumerable: false,
|
||||
configurable: false,
|
||||
writable: false,
|
||||
value: function(){
|
||||
this.parentElement.removeChild(this);
|
||||
}
|
||||
});
|
||||
|
||||
if(typeof Module === "undefined")
|
||||
this["Module"] = {};
|
||||
app.initialize();
|
||||
app.loadedListener.push(fadeoutLoader);
|
||||
|
||||
navigator.browserSpecs = (function(){
|
||||
let ua = navigator.userAgent, tem, M = ua.match(/(opera|chrome|safari|firefox|msie|trident(?=\/))\/?\s*(\d+)/i) || [];
|
||||
|
|
@ -438,9 +524,67 @@ navigator.browserSpecs = (function(){
|
|||
})();
|
||||
|
||||
console.log(navigator.browserSpecs); //Object { name: "Firefox", version: "42" }
|
||||
try {
|
||||
loadSide();
|
||||
} catch(error) {
|
||||
displayCriticalError("Failed to invoke main loader function.");
|
||||
console.error(error);
|
||||
}
|
||||
|
||||
/* register tasks */
|
||||
loader.register_task(loader.Stage.INITIALIZING, {
|
||||
name: "safari fix",
|
||||
function: async () => {
|
||||
/* safari remove "fix" */
|
||||
if(Element.prototype.remove === undefined)
|
||||
Object.defineProperty(Element.prototype, "remove", {
|
||||
enumerable: false,
|
||||
configurable: false,
|
||||
writable: false,
|
||||
value: function(){
|
||||
this.parentElement.removeChild(this);
|
||||
}
|
||||
});
|
||||
},
|
||||
priority: 50
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.INITIALIZING, {
|
||||
name: "webassembly tester",
|
||||
function: loader_webassembly.test_webassembly,
|
||||
priority: 20
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.INITIALIZING, {
|
||||
name: "webassembly setup",
|
||||
function: loader_webassembly.setup_awaiter,
|
||||
priority: 10
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT_INITIALIZING, {
|
||||
name: "javascript webassembly",
|
||||
function: loader_webassembly.awaiter,
|
||||
priority: 10
|
||||
});
|
||||
|
||||
|
||||
loader.register_task(loader.Stage.JAVASCRIPT, {
|
||||
name: "javascript",
|
||||
function: loader_javascript.load_scripts,
|
||||
priority: 10
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.TEMPLATES, {
|
||||
name: "templates",
|
||||
function: load_templates,
|
||||
priority: 10
|
||||
});
|
||||
|
||||
loader.register_task(loader.Stage.LOADED, {
|
||||
name: "loaded handler",
|
||||
function: async () => {
|
||||
fadeoutLoader();
|
||||
},
|
||||
priority: 10
|
||||
});
|
||||
|
||||
loader.execute().then(() => {
|
||||
console.log("app successfully loaded!");
|
||||
}).catch(error => {
|
||||
displayCriticalError("failed to load app!<br>Please lookup the browser console for more details");
|
||||
console.error("Failed to load app!\nError: %o", error);
|
||||
});
|
||||
|
|
@ -120,6 +120,7 @@ async function initialize() {
|
|||
const main = $("#tmpl_main").renderTag();
|
||||
$("body").append(main);
|
||||
} catch(error) {
|
||||
console.error(error);
|
||||
display_load_error(tr("Failed to setup main page!"));
|
||||
return;
|
||||
}
|
||||
|
|
@ -159,39 +160,14 @@ function main() {
|
|||
//Modals.spawnSettingsModal();
|
||||
//Modals.createChannelModal(undefined);
|
||||
|
||||
/*
|
||||
//FIXME
|
||||
if(settings.static("default_connect_url")) {
|
||||
switch (settings.static("default_connect_type")) {
|
||||
case "teaforo":
|
||||
if(forumIdentity && forumIdentity.valid())
|
||||
globalClient.startConnection(settings.static("default_connect_url"), forumIdentity);
|
||||
else
|
||||
Modals.spawnConnectModal({
|
||||
url: settings.static<string>("default_connect_url"),
|
||||
enforce: true
|
||||
}, { identity: IdentitifyType.TEAFORO, enforce: true});
|
||||
break;
|
||||
if(settings.static("connect_default") && settings.static("connect_address", "")) {
|
||||
const profile_uuid = settings.static("connect_profile") as string;
|
||||
const profile = profiles.find_profile(profile_uuid) || profiles.default_profile();
|
||||
const address = settings.static("connect_address", "");
|
||||
const username = settings.static("connect_username", "Another TeaSpeak user");
|
||||
|
||||
case "teamspeak":
|
||||
let connectIdentity = TSIdentityHelper.loadIdentity(settings.global("connect_identity_teamspeak_identity", ""));
|
||||
if(!connectIdentity || !connectIdentity.valid())
|
||||
Modals.spawnConnectModal({
|
||||
url: settings.static<string>("default_connect_url"),
|
||||
enforce: true
|
||||
}, { identity: IdentitifyType.TEAMSPEAK, enforce: true});
|
||||
else
|
||||
globalClient.startConnection(settings.static("default_connect_url"), connectIdentity);
|
||||
break;
|
||||
|
||||
default:
|
||||
Modals.spawnConnectModal({
|
||||
url: settings.static<string>("default_connect_url"),
|
||||
enforce: true
|
||||
});
|
||||
}
|
||||
globalClient.startConnection(address, profile, username);
|
||||
}
|
||||
|
||||
/*
|
||||
let tag = $("#tmpl_music_frame").renderTag({
|
||||
//thumbnail: "img/loading_image.svg"
|
||||
|
|
@ -220,21 +196,26 @@ function main() {
|
|||
});
|
||||
}
|
||||
|
||||
app.loadedListener.push(async () => {
|
||||
try {
|
||||
await initialize();
|
||||
main();
|
||||
if(!audio.player.initialized()) {
|
||||
log.info(LogCategory.VOICE, tr("Initialize audio controller later!"));
|
||||
if(!audio.player.initializeFromGesture) {
|
||||
console.error(tr("Missing audio.player.initializeFromGesture"));
|
||||
} else
|
||||
$(document).one('click', event => audio.player.initializeFromGesture());
|
||||
loader.register_task(loader.Stage.LOADED, {
|
||||
name: "async main invoke",
|
||||
function: async () => {
|
||||
try {
|
||||
await initialize();
|
||||
main();
|
||||
if(!audio.player.initialized()) {
|
||||
log.info(LogCategory.VOICE, tr("Initialize audio controller later!"));
|
||||
if(!audio.player.initializeFromGesture) {
|
||||
console.error(tr("Missing audio.player.initializeFromGesture"));
|
||||
} else
|
||||
$(document).one('click', event => audio.player.initializeFromGesture());
|
||||
}
|
||||
} catch (ex) {
|
||||
console.error(ex.stack);
|
||||
if(ex instanceof ReferenceError || ex instanceof TypeError)
|
||||
ex = ex.name + ": " + ex.message;
|
||||
displayCriticalError("Failed to invoke main function:<br>" + ex);
|
||||
}
|
||||
} catch (ex) {
|
||||
console.error(ex.stack);
|
||||
if(ex instanceof ReferenceError || ex instanceof TypeError)
|
||||
ex = ex.name + ": " + ex.message;
|
||||
displayCriticalError("Failed to invoke main function:<br>" + ex);
|
||||
}
|
||||
},
|
||||
priority: 10
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue