Refactored base structure

This commit is contained in:
2021-05-24 00:58:17 +02:00
parent eacddc0667
commit 0601f52661
7 changed files with 486 additions and 285 deletions

View File

@ -0,0 +1,214 @@
"use strict";
import * as USIMP from "./usimp.js";
export class App {
account;
defaultLocation;
main;
windows;
session;
constructor() {
if (localStorage.session === undefined) {
this.defaultLocation = '/welcome';
this.account = null;
} else {
let session = JSON.parse(localStorage.session);
this.defaultLocation = '/';
this.account = session.account;
}
this.main = document.getElementsByTagName("main")[0];
this.windows = document.getElementById("windows");
window.addEventListener("hashchange", event => {
this.handleUrl(event.newURL);
});
this.handleUrl(document.URL);
}
setHash(hash) {
let url = new URL(document.URL);
url.hash = hash;
location.href = url.toString();
}
handleUrl(url) {
this.handleHash(new URL(url).hash);
}
handleHash(hash) {
console.log(hash);
if (hash[0] === '#') hash = hash.substr(1);
let defaultCase = () => {
history.replaceState(null, null, `#${this.defaultLocation}`);
this.handleHash(this.defaultLocation);
}
switch (hash) {
case "/":
if (!this.session) {
return defaultCase();
}
this.hideWindows();
this.showMain();
this.removeAllWindows();
this.setupMain();
break;
case "/welcome":
this.hideMain();
this.showWindows();
this.removeAllWindows();
this.addWelcomeWindow();
break;
case "/login":
if (this.session) {
return defaultCase();
}
this.hideMain();
this.showWindows();
this.removeAllWindows();
this.addLoginWindow();
break;
default:
console.warn(`Invalid url hash #${hash}`);
return defaultCase();
}
//this.setHash(hash);
}
login(accountName, domainName, password) {
return USIMP.Domain.fromName(domainName).then(domain => {
let session = new USIMP.Session(domain);
session.authenticate(accountName, password)
.catch((event) => {
console.error(`Unable to reach domain server: ${event}`);
})
.then(() => {
this.session = session;
this.defaultLocation = "/";
this.setHash("/");
});
});
}
hideMain() {
this.main.style.visibility = "hidden";
}
showMain() {
this.main.style.visibility = "visible";
}
hideWindows() {
this.windows.style.visibility = "hidden";
}
showWindows() {
this.windows.style.visibility = "visible";
}
removeAllWindows() {
while (this.windows.lastChild) this.windows.removeChild(this.windows.lastChild);
}
addWelcomeWindow() {
let win = document.createElement("div");
win.classList.add("window-welcome");
win.innerHTML = `
<h1>Welcome to Locutus!</h1>
<a href="#/login" class="button">Login</a>`;
this.windows.appendChild(win);
}
addMessage(message) {
let msg = document.createElement("div");
msg.classList.add("message");
msg.innerText = message;
let chat = this.main.getElementsByClassName("chat-history")[0];
chat.appendChild(msg);
chat.scrollTop = chat.scrollHeight;
}
addLoginWindow() {
let win = document.createElement("div");
win.classList.add("window-login");
win.innerHTML = `
<h1>Login to USIMP Account</h1>
<form>
<input name="account" placeholder="Account name" type="text" required/>
<input name="domain" placeholder="Domain" type="text" pattern="([a-zA-Z0-9_-]+\\.)+[a-zA-Z]{2,}" required/>
<input name="password" placeholder="Password" type="password" required/>
<button type="submit">Login</button>
</form>`;
win.getElementsByTagName("form")[0].addEventListener("submit", async (evt) => {
evt.preventDefault();
let form = evt.target;
for (let e of form) e.disabled = true;
for (let d of form.getElementsByTagName("div")) {
form.removeChild(d);
}
function formError(msg) {
let div = document.createElement("div");
div.classList.add("error");
div.innerText = msg;
form.appendChild(div);
}
this.login(form.account.value, form.domain.value, form.password.value)
.catch(reason => {
document.getElementsByName("domain")[0].setAttribute("invalid", "invalid");
formError("Invalid USIMP domain");
console.error(reason);
})
.finally(() => {
for (let e of form) e.disabled = false;
});
});
this.windows.appendChild(win);
document.getElementsByName("domain")[0].addEventListener("input", (event) => {
event.target.removeAttribute("invalid");
});
document.getElementsByName("account")[0].focus();
}
setupMain() {
this.main.innerHTML = `
<div class="chat">
<div class="chat-history"></div>
<div class="chat-input-wrapper">
<input name="message" type="text"/>
</div>
</div>`;
let input = document.getElementsByName("message")[0];
input.addEventListener("keyup", (event) => {
if (event.key === "Enter" && input.value.length > 0) {
this.session.sendEvent("60nc0XXDIYUh6QzX4p0rMpCdzDmxghZLZk8dLuQh628", {
message: input.value,
});
this.addMessage(input.value);
input.value = "";
}
});
this.session.subscribe(response => {
this.addMessage(response.event.data.message);
});
}
}

204
www/res/js/modules/usimp.js Normal file
View File

@ -0,0 +1,204 @@
"use strict";
export class Domain {
name;
id;
servers;
invalidServers;
toString() {
return `[${this.name}]`;
}
constructor(jsonData, domainServers) {
// FIXME check values
this.name = jsonData.name;
this.id = jsonData.id;
this.servers = [];
for (let domainServer of domainServers) {
this.servers.push(new DomainServer(domainServer));
}
this.invalidServers = [];
}
static async fromName(domainName) {
return fetch(`https://${domainName}/.well-known/usimp.json`, {
redirect: "manual",
}).then(response => {
if (response.ok) {
return response.json();
} else {
throw "Invalid response";
}
}).then(data => {
return new Domain(data.domain, data.domain_servers);
});
}
chooseDomainServer() {
if (this.servers.length === 0) throw Error("No domain servers specified");
this.servers.filter(srv => this.invalidServers.map(srv => srv.id).includes(srv.id));
if (this.servers.length === 0) throw Error("No domain servers reachable");
if (this.servers.length === 1) return this.servers[0];
let priority = this.servers.reduce((min, srv) => Math.min(min, srv.priority), Infinity);
let domainServers = this.servers.filter(srv => srv.priority === priority);
if (domainServers.length === 1) return this.servers[0];
let totalWeight = domainServers.reduce((total, srv) => total + srv.weight, 0);
let w = Math.floor(Math.random() * totalWeight);
let accumulator = 0;
for (let srv of domainServers) {
accumulator += srv.weight;
if (w < accumulator) return srv;
}
throw "Domain server selection did not work correctly";
}
}
export class DomainServer {
host;
id;
priority;
weight;
protocols;
toString() {
return `[${this.host}/${this.priority}/${this.weight}]`;
}
constructor(jsonData) {
// FIXME check values
this.host = jsonData.host;
this.id = jsonData.id;
this.priority = jsonData.priority;
this.weight = jsonData.weight;
this.protocols = jsonData.protocols;
}
}
export class Account {
}
export class Member {
}
export class Room {
}
export class Event {
}
export class Session {
domain;
server;
token;
httpBaseUrl;
wsConnection;
numRequests;
constructor(domain) {
this.domain = domain;
this.server = domain.chooseDomainServer();
this.numRequests = 0;
const host = this.server.host;
const protocols = this.server.protocols;
/*
if ("wss" in protocols) {
this.wsConnection = new WebSocket(`wss://${host}:${protocols.wss}/_usimp/websocket`, ["usimp"]);
} else if ("ws" in protocols) {
this.wsConnection = new WebSocket(`ws://${host}:${protocols.ws}/_usimp/websocket`, ["usimp"])
}
*/
if ("https" in protocols) {
this.httpBaseUrl = `https://${host}:${protocols.https}/_usimp`;
} else if ("http" in protocols) {
this.httpBaseUrl = `http://${host}:${protocols.http}/_usimp`;
} else {
throw "Domain server provides no supported transport protocols";
}
}
send(endpoint, data) {
this.numRequests++;
if (this.wsConnection) {
this.wsConnection.send(JSON.stringify({
'request_num': this.numRequests,
'data': data
}));
} else {
let headers = {
'Content-Type': 'application/json',
'To-Domain': this.domain.id,
'From-Domain': this.domain.id,
};
if (this.token) {
headers['Authorization'] = `usimp ${this.token}`;
}
return fetch(`${this.httpBaseUrl}/${endpoint}`, {
method: "POST",
headers: headers,
body: JSON.stringify(data),
}).then(response => {
return response.json();
});
}
}
authenticate(accountName, password) {
return this.send("authenticate", {
type: "password",
name: accountName,
password: password,
}).then(response => {
this.token = response.token;
return response;
});
}
sendEvent(roomId, data) {
return this.send("send_event", {
room_id: roomId,
data: data,
});
}
subscribe(func) {
this.numRequests++;
if (this.wsConnection) {
// TODO
} else {
let headers = {
'Content-Type': 'application/json',
'To-Domain': this.domain.id,
'From-Domain': this.domain.id,
};
if (this.token) {
headers['Authorization'] = `usimp ${this.token}`;
}
fetch(`${this.httpBaseUrl}/subscribe`, {
method: "POST",
headers: headers,
body: JSON.stringify({}),
}).then(response => {
return response.json();
}).then(response => {
func(response);
this.subscribe(func);
});
}
}
}