CringeStudios/gamja
5
0
Fork 1
mirror of https://codeberg.org/emersion/gamja synced 2025-03-13 07:48:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce state.networks

Browse Source
This commit is contained in:
Simon Ser 2021-01-21 19:01:50 +01:00
parent 218b131608
commit 5a1e6ba813
2 changed files with 73 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
commands.js
View File

@ -89,9 +89,9 @@ export default {
app.client.send({ command: "TOPIC", params }); app.client.send({ command: "TOPIC", params });
}, },
"reconnect": (app, args) => { "reconnect": (app, args) => {
app.reconnect(); app.reconnect(app.state.activeNetwork);
}, },
"disconnect": (app, args) => { "disconnect": (app, args) => {
app.disconnect(); app.disconnect(app.state.activeNetwork);
}, },
}; };

105
components/app.js
View File

@ -17,6 +17,8 @@ const CHATHISTORY_PAGE_SIZE = 100;
const CHATHISTORY_MAX_SIZE = 4000; const CHATHISTORY_MAX_SIZE = 4000;
const RECONNECT_DELAY_SEC = 10; const RECONNECT_DELAY_SEC = 10;
const DEFAULT_NETWORK = "network"; // TODO: remove this global
var messagesCount = 0; var messagesCount = 0;
function parseQueryString() { function parseQueryString() {
@ -84,6 +86,19 @@ function compareBuffers(a, b) {
return 0; return 0;
} }
function updateState(state, updater) {
var updated;
if (typeof updater === "function") {
updated = updater(state, state);
} else {
updated = updater;
}
if (state === updated || !updated) {
return;
}
return { ...state, ...updated };
}
export default class App extends Component { export default class App extends Component {
client = null; client = null;
state = { state = {
@ -98,7 +113,9 @@ export default class App extends Component {
autojoin: [], autojoin: [],
}, },
status: Status.DISCONNECTED, status: Status.DISCONNECTED,
networks: new Map(),
buffers: new Map(), buffers: new Map(),
activeNetwork: DEFAULT_NETWORK,
activeBuffer: null, activeBuffer: null,
error: null, error: null,
}; };
@ -112,7 +129,6 @@ export default class App extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.handleClose = this.handleClose.bind(this);
this.handleConnectSubmit = this.handleConnectSubmit.bind(this); this.handleConnectSubmit = this.handleConnectSubmit.bind(this);
this.handleBufferListClick = this.handleBufferListClick.bind(this); this.handleBufferListClick = this.handleBufferListClick.bind(this);
this.handleComposerSubmit = this.handleComposerSubmit.bind(this); this.handleComposerSubmit = this.handleComposerSubmit.bind(this);
@ -168,6 +184,21 @@ export default class App extends Component {
this.setState({ error: null }); this.setState({ error: null });
} }
setNetworkState(id, updater, callback) {
this.setState((state) => {
var net = state.networks.get(id);
if (!net) {
return;
}
var updated = updateState(net, updater);
var networks = new Map(state.networks);
networks.set(id, updated);
return { networks };
}, callback);
}
setBufferState(name, updater, callback) { setBufferState(name, updater, callback) {
this.setState((state) => { this.setState((state) => {
var buf = state.buffers.get(name); var buf = state.buffers.get(name);
@ -175,16 +206,7 @@ export default class App extends Component {
return; return;
} }
var updated; var updated = updateState(buf, updater);
if (typeof updater === "function") {
updated = updater(buf, state);
} else {
updated = updater;
}
if (buf === updated || !updated) {
return;
}
updated = { ...buf, ...updated };
var buffers = new Map(state.buffers); var buffers = new Map(state.buffers);
buffers.set(name, updated); buffers.set(name, updated);
@ -348,10 +370,18 @@ export default class App extends Component {
}); });
} }
connect(params) { connect(netID, params) {
this.disconnect(); this.disconnect(netID);
this.setState({ status: Status.CONNECTING, connectParams: params }); this.setState((state) => {
var networks = new Map(state.networks);
networks.set(netID, {
id: netID,
status: Status.CONNECTING,
});
return { networks };
});
this.setState({ connectParams: params });
this.client = new Client({ this.client = new Client({
url: params.serverURL, url: params.serverURL,
@ -362,10 +392,12 @@ export default class App extends Component {
saslPlain: params.saslPlain, saslPlain: params.saslPlain,
}); });
this.client.addEventListener("close", this.handleClose); this.client.addEventListener("close", () => {
this.handleClose(netID);
});
this.client.addEventListener("message", (event) => { this.client.addEventListener("message", (event) => {
this.handleMessage(event.detail.message); this.handleMessage(netID, event.detail.message);
}); });
this.client.addEventListener("error", (event) => { this.client.addEventListener("error", (event) => {
@ -378,8 +410,8 @@ export default class App extends Component {
this.switchBuffer(SERVER_BUFFER); this.switchBuffer(SERVER_BUFFER);
} }
handleClose() { handleClose(netID) {
this.setState((state) => { this.setNetworkState(netID, (state) => {
if (state.status == Status.DISCONNECTED) { if (state.status == Status.DISCONNECTED) {
// User decided to logout // User decided to logout
return null; return null;
@ -387,13 +419,13 @@ export default class App extends Component {
console.log("Reconnecting to server in " + RECONNECT_DELAY_SEC + " seconds"); console.log("Reconnecting to server in " + RECONNECT_DELAY_SEC + " seconds");
clearTimeout(this.reconnectTimeoutID); clearTimeout(this.reconnectTimeoutID);
this.reconnectTimeoutID = setTimeout(() => { this.reconnectTimeoutID = setTimeout(() => {
this.connect(this.state.connectParams); this.connect(netID, this.state.connectParams);
}, RECONNECT_DELAY_SEC * 1000); }, RECONNECT_DELAY_SEC * 1000);
return { status: Status.DISCONNECTED }; return { status: Status.DISCONNECTED };
}); });
} }
disconnect() { disconnect(netID) {
clearTimeout(this.reconnectTimeoutID); clearTimeout(this.reconnectTimeoutID);
this.reconnectTimeoutID = null; this.reconnectTimeoutID = null;
@ -403,17 +435,17 @@ export default class App extends Component {
this.client.close(); this.client.close();
} }
this.setState({ status: Status.DISCONNECTED }); this.setNetworkState(netID, { status: Status.DISCONNECTED });
} }
reconnect() { reconnect(netID) {
this.connect(this.state.connectParams); this.connect(netID, this.state.connectParams);
} }
handleMessage(msg) { handleMessage(netID, msg) {
switch (msg.command) { switch (msg.command) {
case irc.RPL_WELCOME: case irc.RPL_WELCOME:
this.setState({ status: Status.REGISTERED }); this.setNetworkState(netID, { status: Status.REGISTERED });
if (this.state.connectParams.autojoin.length > 0) { if (this.state.connectParams.autojoin.length > 0) {
this.client.send({ this.client.send({
@ -613,7 +645,7 @@ export default class App extends Component {
} }
} }
this.connect(connectParams); this.connect(DEFAULT_NETWORK, connectParams);
} }
handleNickClick(nick) { handleNickClick(nick) {
@ -641,7 +673,7 @@ export default class App extends Component {
buffers: new Map(), buffers: new Map(),
activeBuffer: null, activeBuffer: null,
}); });
this.disconnect(); this.disconnect(DEFAULT_NETWORK);
return; return;
} }
@ -839,19 +871,16 @@ export default class App extends Component {
componentDidMount() { componentDidMount() {
if (this.state.connectParams.autoconnect) { if (this.state.connectParams.autoconnect) {
this.connect(this.state.connectParams); this.connect(DEFAULT_NETWORK, this.state.connectParams);
} }
setupKeybindings(this); setupKeybindings(this);
} }
render() { render() {
if (this.state.status != Status.REGISTERED && !this.state.activeBuffer) { var activeNetwork = null;
return html` if (this.state.activeNetwork) {
<section id="connect"> activeNetwork = this.state.networks.get(this.state.activeNetwork);
<${Connect} error=${this.state.error} params=${this.state.connectParams} disabled=${this.state.status != Status.DISCONNECTED} onSubmit=${this.handleConnectSubmit}/>
</section>
`;
} }
var activeBuffer = null; var activeBuffer = null;
@ -859,6 +888,14 @@ export default class App extends Component {
activeBuffer = this.state.buffers.get(this.state.activeBuffer); activeBuffer = this.state.buffers.get(this.state.activeBuffer);
} }
if (!activeNetwork || (activeNetwork.status != Status.REGISTERED && !activeBuffer)) {
return html`
<section id="connect">
<${Connect} error=${this.state.error} params=${this.state.connectParams} disabled=${this.state.status != Status.DISCONNECTED} onSubmit=${this.handleConnectSubmit}/>
</section>
`;
}
var bufferHeader = null; var bufferHeader = null;
if (activeBuffer) { if (activeBuffer) {
bufferHeader = html` bufferHeader = html`