Add support for the soju.im/bouncer-networks extension

components/app.js

@@ -160,6 +160,7 @@ export default class App extends Component {
 		},
 		networks: new Map(),
 		buffers: new Map(),
+		bouncerNetworks: new Map(),
 		activeBuffer: null,
 		dialog: null,
 		error: null,
@@ -541,6 +542,15 @@ export default class App extends Component {
 		var client = this.clients.get(netID);
 		switch (msg.command) {
 		case irc.RPL_WELCOME:
+			if (client.enabledCaps["soju.im/bouncer-networks"] && !client.params.bouncerNetwork) {
+				client.listBouncerNetworks().then((bouncerNetworks) => {
+					this.setState((state) => {
+						return { bouncerNetworks };
+					});
+					this.openSecondaryClients(client, bouncerNetworks);
+				});
+			}
+
 			if (this.state.connectParams.autojoin.length > 0) {
 				client.send({
 					command: "JOIN",
@@ -735,6 +745,7 @@ export default class App extends Component {
 		case "AUTHENTICATE":
 		case "PING":
 		case "BATCH":
+		case "BOUNCER":
 			// Ignore these
 			break;
 		default:
@@ -742,6 +753,15 @@ export default class App extends Component {
 		}
 	}
 
+	openSecondaryClients(client, bouncerNetworks) {
+		bouncerNetworks.forEach((attrs, id) => {
+			this.connect({
+				...client.params,
+				bouncerNetwork: id,
+			});
+		});
+	}
+
 	handleConnectSubmit(connectParams) {
 		this.setState({ error: null });
 
@@ -1053,6 +1073,7 @@ export default class App extends Component {
 				<${BufferList}
 					buffers=${this.state.buffers}
 					networks=${this.state.networks}
+					bouncerNetworks=${this.state.bouncerNetworks}
 					activeBuffer=${this.state.activeBuffer}
 					onBufferClick=${this.handleBufferListClick}
 				/>

components/buffer-list.js

@@ -2,13 +2,12 @@ import * as irc from "../lib/irc.js";
 import { html, Component } from "../lib/index.js";
 import { BufferType, Unread, getBufferURL } from "../state.js";
 
-function getNetworkName(network) {
-	var bouncerStr = network.isupport.get("BOUNCER");
-	if (bouncerStr) {
-		var bouncerProps = irc.parseTags(bouncerStr);
-		if (bouncerProps["network"]) {
-			return bouncerProps["network"];
-		}
+function getNetworkName(network, bouncerNetwork, bouncer) {
+	if (bouncerNetwork && bouncerNetwork.name) {
+		return bouncerNetwork.name;
+	}
+	if (bouncer) {
+		return "bouncer";
 	}
 
 	var netName = network.isupport.get("NETWORK");
@@ -27,7 +26,7 @@ function BufferItem(props) {
 
 	var name = props.buffer.name;
 	if (props.buffer.type == BufferType.SERVER) {
-		name = getNetworkName(props.network);
+		name = getNetworkName(props.network, props.bouncerNetwork, props.bouncer);
 	}
 
 	var activeClass = props.active ? "active" : "";
@@ -46,11 +45,22 @@ function BufferItem(props) {
 
 
 export default function BufferList(props) {
-	return html`
-		<ul>
-			${Array.from(props.buffers.values()).map((buf) => html`
-				<${BufferItem} key=${buf.id} buffer=${buf} network=${props.networks.get(buf.network)} onClick=${() => props.onBufferClick(buf)} active=${props.activeBuffer == buf.id}/>
-			`)}
-		</ul>
-	`;
+	// TODO: check bouncer-networks cap instead
+	var bouncer = props.bouncerNetworks.size > 0;
+
+	var items = Array.from(props.buffers.values()).map((buf) => {
+		var network = props.networks.get(buf.network);
+
+		var bouncerNetwork = null;
+		var bouncerNetID = network.isupport.get("BOUNCER_NETID");
+		if (bouncerNetID) {
+			bouncerNetwork = props.bouncerNetworks.get(bouncerNetID);
+		}
+
+		return html`
+			<${BufferItem} key=${buf.id} buffer=${buf} network=${network} bouncer=${bouncer} bouncerNetwork=${bouncerNetwork} onClick=${() => props.onBufferClick(buf)} active=${props.activeBuffer == buf.id}/>
+		`;
+	});
+
+	return html`<ul>${items}</ul>`;
 }

lib/client.js

@@ -10,6 +10,7 @@ const permanentCaps = [
 	"message-tags",
 	"multi-prefix",
 	"server-time",
+	"soju.im/bouncer-networks",
 ];
 
 const RECONNECT_DELAY_SEC = 10;
@@ -37,6 +38,7 @@ export default class Client extends EventTarget {
 		nick: null,
 		pass: null,
 		saslPlain: null,
+		bouncerNetwork: null,
 	};
 	batches = new Map();
 	autoReconnect = true;
@@ -178,6 +180,9 @@ export default class Client extends EventTarget {
 		case irc.RPL_SASLSUCCESS:
 			console.log("SASL authentication success");
 			if (this.status != Client.Status.REGISTERED) {
+				if (this.enabledCaps["soju.im/bouncer-networks"] && this.params.bouncerNetwork) {
+					this.send({ command: "BOUNCER", params: ["BIND", this.params.bouncerNetwork] });
+				}
 				this.send({ command: "CAP", params: ["END"] });
 			}
 			break;
@@ -454,4 +459,22 @@ export default class Client extends EventTarget {
 			return null;
 		});
 	}
+
+	listBouncerNetworks() {
+		if (!this.enabledCaps["soju.im/bouncer-networks"]) {
+			return Promise.reject(new Error("Server doesn't support the BOUNCER extension"));
+		}
+
+		var req = { command: "BOUNCER", params: ["LISTNETWORKS"] };
+		return this.fetchBatch(req, "bouncer-networks").then((batch) => {
+			var networks = new Map();
+			for (var msg of batch.messages) {
+				console.assert(msg.command === "BOUNCER" && msg.params[0] === "NETWORK");
+				var id = msg.params[1];
+				var params = irc.parseTags(msg.params[2]);
+				networks.set(id, params);
+			}
+			return networks;
+		});
+	}
 }