From a1582dcc62bb23416891eddce0ca2c1f97f8f03a Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sun, 14 Jun 2020 14:50:59 +0200
Subject: [PATCH] Switch to ES6 imports

---
 assets/client.js | 38 ++++++++++++++++++++------------------
 assets/irc.js    | 32 ++++++++++++++++----------------
 index.html       |  5 +++--
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/assets/client.js b/assets/client.js
index 8c49847..6516a4c 100644
--- a/assets/client.js
+++ b/assets/client.js
@@ -1,3 +1,5 @@
+import * as irc from "./irc.js";
+
 var server = {
 	name: "server",
 	username: null,
@@ -77,8 +79,8 @@ function createMessageElement(msg) {
 	case "PRIVMSG":
 		var text = msg.params[1];
 
-		var actionPrefix = "\001ACTION ";
-		if (text.startsWith(actionPrefix) && text.endsWith("\001")) {
+		var actionPrefix = "\x01ACTION ";
+		if (text.startsWith(actionPrefix) && text.endsWith("\x01")) {
 			var action = text.slice(actionPrefix.length, -1);
 
 			line.className += " me-tell";
@@ -314,11 +316,11 @@ function connect() {
 	};
 
 	ws.onmessage = function(event) {
-		var msg = parseMessage(event.data);
+		var msg = irc.parseMessage(event.data);
 		console.log("Received:", msg);
 
 		switch (msg.command) {
-		case RPL_WELCOME:
+		case irc.RPL_WELCOME:
 			if (server.saslPlain && availableCaps["sasl"] === undefined) {
 				console.error("Server doesn't support SASL PLAIN");
 				disconnect();
@@ -336,7 +338,7 @@ function connect() {
 				});
 			}
 			break;
-		case RPL_TOPIC:
+		case irc.RPL_TOPIC:
 			var channel = msg.params[1];
 			var topic = msg.params[2];
 
@@ -346,7 +348,7 @@ function connect() {
 			}
 			buf.topic = topic;
 			break;
-		case RPL_NAMREPLY:
+		case irc.RPL_NAMREPLY:
 			var channel = msg.params[2];
 			var members = msg.params.slice(3);
 
@@ -356,13 +358,13 @@ function connect() {
 			}
 
 			members.forEach(function(s) {
-				var member = parseMembership(s);
+				var member = irc.parseMembership(s);
 				buf.members[member.nick] = member.prefix;
 			});
 			break;
-		case RPL_ENDOFNAMES:
+		case irc.RPL_ENDOFNAMES:
 			break;
-		case ERR_PASSWDMISMATCH:
+		case irc.ERR_PASSWDMISMATCH:
 			console.error("Password mismatch");
 			disconnect();
 			break;
@@ -372,23 +374,23 @@ function connect() {
 		case "AUTHENTICATE":
 			handleAuthenticate(msg);
 			break;
-		case RPL_LOGGEDIN:
+		case irc.RPL_LOGGEDIN:
 			console.log("Logged in");
 			break;
-		case RPL_LOGGEDOUT:
+		case irc.RPL_LOGGEDOUT:
 			console.log("Logged out");
 			break;
-		case RPL_SASLSUCCESS:
+		case irc.RPL_SASLSUCCESS:
 			console.log("SASL authentication success");
 			if (!registered) {
 				sendMessage({ command: "CAP", params: ["END"] });
 			}
 			break;
-		case ERR_NICKLOCKED:
-		case ERR_SASLFAIL:
-		case ERR_SASLTOOLONG:
-		case ERR_SASLABORTED:
-		case ERR_SASLALREADY:
+		case irc.ERR_NICKLOCKED:
+		case irc.ERR_SASLFAIL:
+		case irc.ERR_SASLTOOLONG:
+		case irc.ERR_SASLABORTED:
+		case irc.ERR_SASLALREADY:
 			console.error("SASL error:", msg);
 			disconnect();
 			break;
@@ -473,7 +475,7 @@ function disconnect() {
 }
 
 function sendMessage(msg) {
-	ws.send(formatMessage(msg));
+	ws.send(irc.formatMessage(msg));
 	console.log("Sent:", msg);
 }
 
diff --git a/assets/irc.js b/assets/irc.js
index 6b71acb..37bb4cb 100644
--- a/assets/irc.js
+++ b/assets/irc.js
@@ -1,17 +1,17 @@
-const RPL_WELCOME = "001";
-const RPL_TOPIC = "332";
-const RPL_NAMREPLY = "353";
-const RPL_ENDOFNAMES = "366";
-const ERR_PASSWDMISMATCH = "464";
+export const RPL_WELCOME = "001";
+export const RPL_TOPIC = "332";
+export const RPL_NAMREPLY = "353";
+export const RPL_ENDOFNAMES = "366";
+export const ERR_PASSWDMISMATCH = "464";
 // https://ircv3.net/specs/extensions/sasl-3.1
-const RPL_LOGGEDIN = "900";
-const RPL_LOGGEDOUT = "901";
-const ERR_NICKLOCKED = "902";
-const RPL_SASLSUCCESS = "903";
-const ERR_SASLFAIL = "904";
-const ERR_SASLTOOLONG = "905";
-const ERR_SASLABORTED = "906";
-const ERR_SASLALREADY = "907";
+export const RPL_LOGGEDIN = "900";
+export const RPL_LOGGEDOUT = "901";
+export const ERR_NICKLOCKED = "902";
+export const RPL_SASLSUCCESS = "903";
+export const ERR_SASLFAIL = "904";
+export const ERR_SASLTOOLONG = "905";
+export const ERR_SASLABORTED = "906";
+export const ERR_SASLALREADY = "907";
 
 var tagsEscape = {
 	";": "\\:",
@@ -88,7 +88,7 @@ function formatPrefix(prefix) {
 	return prefix.name + "!" + prefix.user + "@" + prefix.host;
 }
 
-function parseMessage(s) {
+export function parseMessage(s) {
 	if (s.endsWith("\r\n")) {
 		s = s.slice(0, s.length - 2);
 	}
@@ -145,7 +145,7 @@ function parseMessage(s) {
 	return msg;
 }
 
-function formatMessage(msg) {
+export function formatMessage(msg) {
 	var s = "";
 	// TODO: format tags
 	if (msg.tags && Object.keys(msg.tags).length > 0) {
@@ -166,7 +166,7 @@ function formatMessage(msg) {
 	return s;
 }
 
-function parseMembership(s) {
+export function parseMembership(s) {
 	// TODO: use the PREFIX token from RPL_ISUPPORT
 	const STD_MEMBERSHIPS = "~&@%+";
 
diff --git a/index.html b/index.html
index d58ff22..902248f 100644
--- a/index.html
+++ b/index.html
@@ -70,7 +70,8 @@
 			</form>
 		</section>
 
-		<script src="assets/irc.js"></script>
-		<script src="assets/client.js"></script>
+		<script type="module">
+			import "./assets/client.js";
+		</script>
 	</body>
 </html>