@lordbex/thelounge 4.4.3-blowfish → 4.5.0-blowfish-pre

package/dist/server/models/network.js

@@ -1,20 +1,15 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
-const uuid_1 = require("uuid");
-const irc_framework_1 = __importDefault(require("irc-framework"));
-const chan_1 = __importDefault(require("./chan"));
-const msg_1 = __importDefault(require("./msg"));
-const prefix_1 = __importDefault(require("./prefix"));
-const helper_1 = __importDefault(require("../helper"));
-const config_1 = __importDefault(require("../config"));
-const sts_1 = __importDefault(require("../plugins/sts"));
-const clientCertificate_1 = __importDefault(require("../plugins/clientCertificate"));
-const msg_2 = require("../../shared/types/msg");
-const chan_2 = require("../../shared/types/chan");
+import _ from "lodash";
+import { v4 as uuidv4 } from "uuid";
+import IrcFramework from "irc-framework";
+import Chan from "./chan.js";
+import Msg from "./msg.js";
+import Prefix from "./prefix.js";
+import Helper from "../helper.js";
+import Config from "../config.js";
+import STSPolicies from "../plugins/sts.js";
+import ClientCertificate from "../plugins/clientCertificate.js";
+import { MessageType } from "../../shared/types/msg.js";
+import { ChanType } from "../../shared/types/chan.js";
 class Network {
     nick;
     name;
@@ -52,7 +47,7 @@ class Network {
     // TODO: this is only available on export
     hasSTSPolicy;
     constructor(attr) {
-        lodash_1.default.defaults(this, attr, {
+        _.defaults(this, attr, {
             name: "",
             nick: "",
             host: "",
@@ -73,7 +68,7 @@ class Network {
             irc: null,
             serverOptions: {
                 CHANTYPES: ["#", "&"],
-                PREFIX: new prefix_1.default([
+                PREFIX: new Prefix([
                     { symbol: "!", mode: "Y" },
                     { symbol: "@", mode: "o" },
                     { symbol: "%", mode: "h" },
@@ -94,18 +89,18 @@ class Network {
             keepNick: null,
         });
         if (!this.uuid) {
-            this.uuid = (0, uuid_1.v4)();
+            this.uuid = uuidv4();
         }
         if (!this.name) {
             this.name = this.host;
         }
-        this.channels.unshift(new chan_1.default({
+        this.channels.unshift(new Chan({
             name: this.name,
-            type: chan_2.ChanType.LOBBY,
+            type: ChanType.LOBBY,
             // The lobby only starts as muted if every channel (unless it's special) is muted.
             // This is A) easier to implement and B) stops some confusion on startup.
             muted: this.channels.length >= 1 &&
-                this.channels.every((chan) => chan.muted || chan.type === chan_2.ChanType.SPECIAL),
+                this.channels.every((chan) => chan.muted || chan.type === ChanType.SPECIAL),
         }));
         // Ensure FiSH keys are applied to any pre-existing channels loaded from disk
         this.applyBlowKeysToChannels();
@@ -115,7 +110,7 @@ class Network {
         const cleanNick = (str) => str.replace(/[\x00\s:!@]/g, "_").substring(0, 100);
         // Remove new lines and limit length
         const cleanString = (str) => str.replace(/[\x00\r\n]/g, "").substring(0, 300);
-        this.setNick(cleanNick(String(this.nick || config_1.default.getDefaultNick())));
+        this.setNick(cleanNick(String(this.nick || Config.getDefaultNick())));
         if (!this.username) {
             // If username is empty, make one from the provided nick
             this.username = this.nick.replace(/[^a-zA-Z0-9]/g, "");
@@ -134,8 +129,8 @@ class Network {
         this.proxyPassword = cleanString(this.proxyPassword);
         this.proxyEnabled = !!this.proxyEnabled;
         const error = function (network, text) {
-            network.getLobby().pushMessage(client, new msg_1.default({
-                type: msg_2.MessageType.ERROR,
+            network.getLobby().pushMessage(client, new Msg({
+                type: MessageType.ERROR,
                 text: text,
             }), true);
         };
@@ -145,30 +140,30 @@ class Network {
         if (!["", "plain", "external"].includes(this.sasl)) {
             this.sasl = "";
         }
-        if (config_1.default.values.lockNetwork) {
+        if (Config.values.lockNetwork) {
             // This check is needed to prevent invalid user configurations
-            if (!config_1.default.values.public &&
+            if (!Config.values.public &&
                 this.host &&
                 this.host.length > 0 &&
-                this.host !== config_1.default.values.defaults.host) {
+                this.host !== Config.values.defaults.host) {
                 error(this, `The hostname you specified (${this.host}) is not allowed.`);
                 return false;
             }
-            if (config_1.default.values.public) {
-                this.name = config_1.default.values.defaults.name;
+            if (Config.values.public) {
+                this.name = Config.values.defaults.name;
                 // Sync lobby channel name
-                this.getLobby().name = config_1.default.values.defaults.name;
+                this.getLobby().name = Config.values.defaults.name;
             }
-            this.host = config_1.default.values.defaults.host;
-            this.port = config_1.default.values.defaults.port;
-            this.tls = config_1.default.values.defaults.tls;
-            this.rejectUnauthorized = config_1.default.values.defaults.rejectUnauthorized;
+            this.host = Config.values.defaults.host;
+            this.port = Config.values.defaults.port;
+            this.tls = Config.values.defaults.tls;
+            this.rejectUnauthorized = Config.values.defaults.rejectUnauthorized;
         }
         if (this.host.length === 0) {
             error(this, "You must specify a hostname to connect.");
             return false;
         }
-        const stsPolicy = sts_1.default.get(this.host);
+        const stsPolicy = STSPolicies.get(this.host);
         if (stsPolicy && !this.tls) {
             error(this, `${this.host} has an active strict transport security policy, will connect to port ${stsPolicy.port} over a secure connection.`);
             this.port = stsPolicy.port;
@@ -178,9 +173,9 @@ class Network {
         return true;
     }
     createIrcFramework(client) {
-        this.irc = new irc_framework_1.default.Client({
+        this.irc = new IrcFramework.Client({
             version: false, // We handle it ourselves
-            outgoing_addr: config_1.default.values.bind,
+            outgoing_addr: Config.values.bind,
             enable_chghost: true,
             enable_echomessage: true,
             enable_setname: true,
@@ -191,18 +186,21 @@ class Network {
             // TODO: this type should be set after setIrcFrameworkOptions
         });
         this.setIrcFrameworkOptions(client);
-        this.irc.requestCap([
+        // Request custom capabilities
+        const customCaps = [
             "znc.in/self-message", // Legacy echo-message for ZNC
             "znc.in/playback", // See http://wiki.znc.in/Playback
-        ]);
+            "seedpool/enhanced", // THC enhanced client features
+        ];
+        this.irc.requestCap(customCaps);
     }
     setIrcFrameworkOptions(client) {
         this.irc.options.host = this.host;
         this.irc.options.port = this.port;
         this.irc.options.password = this.password;
         this.irc.options.nick = this.nick;
-        this.irc.options.username = config_1.default.values.useHexIp
-            ? helper_1.default.ip2hex(client.config.browser.ip)
+        this.irc.options.username = Config.values.useHexIp
+            ? Helper.ip2hex(client.config.browser.ip)
             : this.username;
         this.irc.options.gecos = this.realname;
         this.irc.options.tls = this.tls;
@@ -222,12 +220,15 @@ class Network {
         }
         if (!this.sasl) {
             delete this.irc.options.sasl_mechanism;
-            delete this.irc.options.account;
+            // irc-framework has a funny fallback where it uses nick + server pw
+            // in the sasl handshake, if account is undefined, so we need an empty
+            // object here to really turn it off
+            this.irc.options.account = {};
         }
         else if (this.sasl === "external") {
             this.irc.options.sasl_mechanism = "EXTERNAL";
             this.irc.options.account = {};
-            this.irc.options.client_certificate = clientCertificate_1.default.get(this.uuid);
+            this.irc.options.client_certificate = ClientCertificate.get(this.uuid);
         }
         else if (this.sasl === "plain") {
             delete this.irc.options.sasl_mechanism;
@@ -247,19 +248,19 @@ class Network {
     }
     applyBlowKeysToChannels() {
         for (const c of this.channels) {
-            if (c.type !== chan_2.ChanType.CHANNEL && c.type !== chan_2.ChanType.QUERY) {
+            if (c.type !== ChanType.CHANNEL && c.type !== ChanType.QUERY) {
                 continue;
             }
             c.blowfishKey = this.resolveBlowKeyFor(c.name);
         }
     }
     createWebIrc(client) {
-        if (!config_1.default.values.webirc ||
-            !Object.prototype.hasOwnProperty.call(config_1.default.values.webirc, this.host)) {
+        if (!Config.values.webirc ||
+            !Object.prototype.hasOwnProperty.call(Config.values.webirc, this.host)) {
             return null;
         }
         const webircObject = {
-            password: config_1.default.values.webirc[this.host],
+            password: Config.values.webirc[this.host],
             username: "thelounge",
             address: client.config.browser?.ip,
             hostname: client.config.browser?.hostname,
@@ -271,9 +272,9 @@ class Network {
                 secure: true,
             };
         }
-        if (typeof config_1.default.values.webirc[this.host] === "function") {
+        if (typeof Config.values.webirc[this.host] === "function") {
             webircObject.password = null;
-            return config_1.default.values.webirc[this.host](webircObject, this);
+            return Config.values.webirc[this.host](webircObject, this);
         }
         return webircObject;
     }
@@ -282,52 +283,49 @@ class Network {
         const oldNick = this.nick;
         const oldRealname = this.realname;
         this.keepNick = null;
-        this.nick = args.nick;
-        this.host = String(args.host || "");
-        this.name = String(args.name || "") || this.host;
-        this.port = parseInt(args.port, 10);
+        this.nick = String(args.nick ?? "");
+        this.host = String(args.host ?? "");
+        this.name = String(args.name ?? "") || this.host;
+        this.port = parseInt(String(args.port ?? 6667), 10);
         this.tls = !!args.tls;
         this.rejectUnauthorized = !!args.rejectUnauthorized;
-        this.password = String(args.password || "");
-        this.username = String(args.username || "");
-        this.realname = String(args.realname || "");
-        this.leaveMessage = String(args.leaveMessage || "");
-        this.sasl = String(args.sasl || "");
-        this.saslAccount = String(args.saslAccount || "");
-        this.saslPassword = String(args.saslPassword || "");
-        this.proxyHost = String(args.proxyHost || "");
-        this.proxyPort = parseInt(args.proxyPort, 10);
-        this.proxyUsername = String(args.proxyUsername || "");
-        this.proxyPassword = String(args.proxyPassword || "");
+        this.password = String(args.password ?? "");
+        this.username = String(args.username ?? "");
+        this.realname = String(args.realname ?? "");
+        this.leaveMessage = String(args.leaveMessage ?? "");
+        this.sasl = String(args.sasl ?? "");
+        this.saslAccount = String(args.saslAccount ?? "");
+        this.saslPassword = String(args.saslPassword ?? "");
+        this.proxyHost = String(args.proxyHost ?? "");
+        this.proxyPort = parseInt(String(args.proxyPort ?? 1080), 10);
+        this.proxyUsername = String(args.proxyUsername ?? "");
+        this.proxyPassword = String(args.proxyPassword ?? "");
         this.proxyEnabled = !!args.proxyEnabled;
         // Split commands into an array
-        this.commands = String(args.commands || "")
+        const commandsStr = Array.isArray(args.commands)
+            ? args.commands.join("\n")
+            : String(args.commands ?? "");
+        this.commands = commandsStr
             .replace(/\r\n|\r|\n/g, "\n")
             .split("\n")
             .filter((command) => command.length > 0);
         // FiSH: read global key and per-target keys (only update when provided)
         if (Object.prototype.hasOwnProperty.call(args, "fishGlobalKey")) {
-            this.fishGlobalKey = String(args.fishGlobalKey || "").trim();
+            this.fishGlobalKey = Helper.toTrimmedString(args.fishGlobalKey || "");
         }
-        if (Object.prototype.hasOwnProperty.call(args, "fishKeysText")) {
-            const fishKeysText = String(args.fishKeysText || "").replace(/\r\n|\r|\n/g, "\n");
+        // FiSH: read per-target keys (only update when provided)
+        if (Object.prototype.hasOwnProperty.call(args, "fishKeys")) {
+            const value = args.fishKeys;
             const map = {};
-            fishKeysText.split("\n").forEach((line) => {
-                const trimmed = line.trim();
-                if (!trimmed) {
-                    return;
-                }
-                const spaceIdx = trimmed.indexOf(" ");
-                if (spaceIdx === -1) {
-                    return;
+            if (value && typeof value === "object") {
+                for (const [rawName, rawKey] of Object.entries(value)) {
+                    const name = Helper.toTrimmedString(rawName).toLowerCase();
+                    const key = Helper.toTrimmedString(rawKey);
+                    if (name && key) {
+                        map[name] = key;
+                    }
                 }
-                const name = trimmed.substring(0, spaceIdx).toLowerCase();
-                const key = trimmed.substring(spaceIdx + 1).trim();
-                if (!name || !key) {
-                    return;
-                }
-                map[name] = key;
-            });
+            }
             this.fishKeys = map;
         }
         // Sync lobby channel name
@@ -383,7 +381,7 @@ class Network {
         // Do not match characters and numbers (unless IRC color)
         "(?:^|[^a-z0-9]|\x03[0-9]{1,2})" +
             // Escape nickname, as it may contain regex stuff
-            lodash_1.default.escapeRegExp(nick) +
+            _.escapeRegExp(nick) +
             // Do not match characters and numbers
             "(?:[^a-z0-9]|$)", 
         // Case insensitive search
@@ -413,7 +411,7 @@ class Network {
         if (this.irc && this.irc.connection && this.irc.connection.transport) {
             const transport = this.irc.connection.transport;
             if (transport.socket) {
-                const isLocalhost = transport.socket.remoteAddress === "127.0.0.1";
+                const isLocalhost = ["127.0.0.1", "::1"].includes(transport.socket.remoteAddress);
                 const isAuthorized = transport.socket.encrypted && transport.socket.authorized;
                 status.connected = transport.isConnected();
                 status.secure = isAuthorized || isLocalhost;
@@ -423,12 +421,12 @@ class Network {
     }
     addChannel(newChan) {
         // Assign FiSH key based on network configuration when adding
-        if (newChan && (newChan.type === chan_2.ChanType.CHANNEL || newChan.type === chan_2.ChanType.QUERY)) {
+        if (newChan && (newChan.type === ChanType.CHANNEL || newChan.type === ChanType.QUERY)) {
             newChan.blowfishKey = this.resolveBlowKeyFor(newChan.name);
         }
         let index = this.channels.length; // Default to putting as the last item in the array
         // Don't sort special channels in amongst channels/users.
-        if (newChan.type === chan_2.ChanType.CHANNEL || newChan.type === chan_2.ChanType.QUERY) {
+        if (newChan.type === ChanType.CHANNEL || newChan.type === ChanType.QUERY) {
             // We start at 1 so we don't test against the lobby
             for (let i = 1; i < this.channels.length; i++) {
                 const compareChan = this.channels[i];
@@ -436,7 +434,7 @@ class Network {
                 if (newChan.name.localeCompare(compareChan.name, undefined, {
                     sensitivity: "base",
                 }) <= 0 ||
-                    (compareChan.type !== chan_2.ChanType.CHANNEL && compareChan.type !== chan_2.ChanType.QUERY)) {
+                    (compareChan.type !== ChanType.CHANNEL && compareChan.type !== ChanType.QUERY)) {
                     index = i;
                     break;
                 }
@@ -450,8 +448,8 @@ class Network {
             return;
         }
         // https://ircv3.net/specs/extensions/sts#rescheduling-expiry-on-disconnect
-        sts_1.default.refreshExpiration(this.host);
-        this.irc.quit(quitMessage || this.leaveMessage || config_1.default.values.leaveMessage);
+        STSPolicies.refreshExpiration(this.host);
+        this.irc.quit(quitMessage || this.leaveMessage || Config.values.leaveMessage);
     }
     exportForEdit() {
         const fieldsToReturn = [
@@ -472,22 +470,21 @@ class Network {
             "proxyUsername",
             "proxyPassword",
         ];
-        if (!config_1.default.values.lockNetwork) {
+        if (!Config.values.lockNetwork) {
             fieldsToReturn.push("host");
             fieldsToReturn.push("port");
             fieldsToReturn.push("tls");
             fieldsToReturn.push("rejectUnauthorized");
         }
-        const data = lodash_1.default.pick(this, fieldsToReturn);
-        data.hasSTSPolicy = !!sts_1.default.get(this.host);
+        const data = _.pick(this, fieldsToReturn);
+        data.hasSTSPolicy = !!STSPolicies.get(this.host);
         // Include FiSH fields for editing UI
         data.fishGlobalKey = this.fishGlobalKey || "";
-        const lines = Object.entries(this.fishKeys || {}).map(([name, key]) => `${name} ${key}`);
-        data.fishKeysText = lines.join("\n");
+        data.fishKeys = { ...(this.fishKeys || {}) };
         return data;
     }
     export() {
-        const network = lodash_1.default.pick(this, [
+        const network = _.pick(this, [
             "uuid",
             "awayMessage",
             "nick",
@@ -517,24 +514,25 @@ class Network {
         ]);
         network.channels = this.channels
             .filter(function (channel) {
-            return channel.type === chan_2.ChanType.CHANNEL || channel.type === chan_2.ChanType.QUERY;
+            return channel.type === ChanType.CHANNEL || channel.type === ChanType.QUERY;
         })
             .map(function (chan) {
             const keys = ["name", "muted"];
-            if (chan.type === chan_2.ChanType.CHANNEL) {
+            if (chan.type === ChanType.CHANNEL) {
                 keys.push("key");
             }
-            else if (chan.type === chan_2.ChanType.QUERY) {
+            else if (chan.type === ChanType.QUERY) {
                 keys.push("type");
+                keys.push("pinned");
             }
-            return lodash_1.default.pick(chan, keys);
+            return _.pick(chan, keys);
             // Override the type because we're omitting ID
         });
         return network;
     }
     getChannel(name) {
         name = name.toLowerCase();
-        return lodash_1.default.find(this.channels, function (that, i) {
+        return _.find(this.channels, function (that, i) {
             // Skip network lobby (it's always unshifted into first position)
             return i > 0 && that.name.toLowerCase() === name;
         });
@@ -543,4 +541,4 @@ class Network {
         return this.channels[0];
     }
 }
-exports.default = Network;
+export default Network;

package/dist/server/models/prefix.js

@@ -1,5 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 class Prefix {
     prefix;
     modeToSymbol;
@@ -14,10 +12,9 @@ class Prefix {
         // clean out the old cruft
         this.modeToSymbol = {};
         this.symbols = [];
-        const that = this;
-        this.prefix.forEach(function (p) {
-            that.modeToSymbol[p.mode] = p.symbol;
-            that.symbols.push(p.symbol);
+        this.prefix.forEach((p) => {
+            this.modeToSymbol[p.mode] = p.symbol;
+            this.symbols.push(p.symbol);
         });
     }
     update(prefix) {
@@ -28,4 +25,4 @@ class Prefix {
         return this.prefix.forEach(f);
     }
 }
-exports.default = Prefix;
+export default Prefix;

package/dist/server/models/user.js

@@ -1,10 +1,5 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const lodash_1 = __importDefault(require("lodash"));
-const prefix_1 = __importDefault(require("./prefix"));
+import _ from "lodash";
+import Prefix from "./prefix.js";
 class User {
     modes;
     // Users in the channel have only one mode assigned
@@ -13,7 +8,7 @@ class User {
     nick;
     lastMessage;
     constructor(attr, prefix) {
-        lodash_1.default.defaults(this, attr, {
+        _.defaults(this, attr, {
             modes: [],
             away: "",
             nick: "",
@@ -25,7 +20,7 @@ class User {
                 return this.modes[0] || "";
             },
         });
-        this.setModes(this.modes, prefix || new prefix_1.default([]));
+        this.setModes(this.modes, prefix || new Prefix([]));
     }
     setModes(modes, prefix) {
         // irc-framework sets character mode, but The Lounge works with symbols
@@ -39,4 +34,4 @@ class User {
         };
     }
 }
-exports.default = User;
+export default User;

package/dist/server/path-helper.js

@@ -0,0 +1,8 @@
+import { fileURLToPath } from "node:url";
+import { dirname } from "node:path";
+export function getDirname(importMetaUrl) {
+    return dirname(fileURLToPath(importMetaUrl));
+}
+export function getFilename(importMetaUrl) {
+    return fileURLToPath(importMetaUrl);
+}