IRC message builder

Author: prawnsalad

index.js

@@ -9,3 +9,4 @@ module.exports.Client = require('./src/client');
 module.exports.Client.setDefaultTransport(require('./src/transports/net'));
 
 module.exports.ircLineParser = require('./src/irclineparser');
+module.exports.Message = require('./src/ircmessage');

src/client.js

@@ -4,6 +4,7 @@ var EventEmitter = require('eventemitter3');
 var _ = require('lodash');
 var MiddlewareHandler = require('middleware-handler');
 var IrcCommandHandler = require('./commands/').CommandHandler;
+var IrcMessage = require('./ircmessage');
 var Connection = require('./connection');
 var NetworkInfo = require('./networkinfo');
 var User = require('./user');
@@ -308,7 +309,11 @@ module.exports = class IrcClient extends EventEmitter {
      * Client API
      */
     raw(input) {
-        this.connection.write(this.rawString.apply(this, arguments));
+        if (input instanceof IrcMessage) {
+            this.connection.write(input.to1459());
+        } else {
+            this.connection.write(this.rawString.apply(this, arguments));
+        }
     }
 
 

src/irclineparser.js

@@ -2,6 +2,7 @@
 
 var _ = require('lodash');
 var MessageTags = require('./messagetags');
+var IrcMessage = require('./ircmessage');
 
 module.exports = parseIrcLine;
 
@@ -13,38 +14,31 @@ module.exports = parseIrcLine;
 var parse_regex = /^(?:@([^ ]+) )?(?::((?:(?:([^\s!@]+)(?:!([^\s@]+))?)@)?(\S+)) )?((?:[a-zA-Z]+)|(?:[0-9]{3}))(?: ([^:].*?))?(?: :(.*))?$/i;
 
 function parseIrcLine(line) {
-    var msg;
-    var tags = Object.create(null);
-    var msg_obj;
-
     // Parse the complete line, removing any carriage returns
-    msg = parse_regex.exec(line.replace(/^\r+|\r+$/, ''));
-
-    if (!msg) {
+    let matches = parse_regex.exec(line.replace(/^\r+|\r+$/, ''));
+    if (!matches) {
         // The line was not parsed correctly, must be malformed
         return;
     }
 
-    // Extract any tags (msg[1])
-    if (msg[1]) {
-        tags = MessageTags.decode(msg[1]);
+    let msg = new IrcMessage();
+
+    if (matches[1]) {
+        msg.tags = MessageTags.decode(matches[1]);
     }
 
-    // Nick value will be in the prefix slot if a full user mask is not used
-    msg_obj = {
-        tags:       tags,
-        prefix:     msg[2],
-        nick:       msg[3] || msg[2],
-        ident:      msg[4] || '',
-        hostname:   msg[5] || '',
-        command:    msg[6],
-        params:     msg[7] ? msg[7].split(/ +/) : []
-    };
+    msg.prefix = matches[2];
+    // Nick will be in the prefix slot if a full user mask is not used
+    msg.nick = matches[3] || matches[2];
+    msg.ident = matches[4] || '';
+    msg.hostname = matches[5] || '';
+    msg.command = matches[6];
+    msg.params = matches[7] ? matches[7].split(/ +/) : [];
 
     // Add the trailing param to the params list
-    if (typeof msg[8] !== 'undefined') {
-        msg_obj.params.push(_.trimEnd(msg[8]));
+    if (typeof matches[8] !== 'undefined') {
+        msg.params.push(_.trimEnd(matches[8]));
     }
 
-    return msg_obj;
+    return msg;
 }

src/ircmessage.js

@@ -0,0 +1,54 @@
+let MessageTags = require('./messagetags');
+
+module.exports = class IrcMessage {
+    static fromRaw(rawMessage) {
+
+    }
+
+    constructor(command, ...args) {
+        this.tags = Object.create(null);
+        this.prefix = '';
+        this.nick = '';
+        this.ident = '';
+        this.hostname = '';
+        this.command = command || '';
+        this.params = args || [];
+    }
+
+    to1459() {
+        let parts = [];
+
+        let tags = MessageTags.encode(this.tags);
+        if (tags) {
+            parts.push('@' + tags);
+        }
+
+        if (this.prefix) {
+            // TODO: If prefix is empty, build it from the nick!ident@hostname
+            parts.push(':' + this.prefix);
+        }
+
+        parts.push(this.command);
+
+        if (this.params.length > 0) {
+            this.params.forEach((param, idx) => {
+                if (idx === this.params.length - 1 && param.indexOf(' ') > -1) {
+                    parts.push(':' + param);
+                } else {
+                    parts.push(param);
+                }
+            });
+        }
+
+        return parts.join(' ');
+    }
+
+    toJson() {
+        return {
+            tags: Object.assign({}, this.tags),
+            source: this.prefix,
+            command: this.command,
+            params: this.params,
+        };
+    }
+};