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

package/dist/server/plugins/irc-events/invite.js

@@ -1,20 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const msg_1 = __importDefault(require("../../models/msg"));
-const msg_2 = require("../../../shared/types/msg");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("invite", function (data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+export default (function (irc, network) {
+    irc.on("invite", (data) => {
         let chan = network.getChannel(data.channel);
         if (typeof chan === "undefined") {
             chan = network.getLobby();
         }
         const invitedYou = data.invited === irc.user.nick;
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.INVITE,
+        const msg = new Msg({
+            type: MessageType.INVITE,
             time: data.time,
             from: chan.getUser(data.nick),
             target: chan.getUser(data.invited),
@@ -22,6 +16,6 @@ exports.default = (function (irc, network) {
             highlight: invitedYou,
             invitedYou: invitedYou,
         });
-        chan.pushMessage(client, msg);
+        chan.pushMessage(this, msg);
     });
 });

package/dist/server/plugins/irc-events/join.js

@@ -1,53 +1,56 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const msg_1 = __importDefault(require("../../models/msg"));
-const user_1 = __importDefault(require("../../models/user"));
-const msg_2 = require("../../../shared/types/msg");
-const chan_1 = require("../../../shared/types/chan");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("join", function (data) {
+import Msg from "../../models/msg.js";
+import User from "../../models/user.js";
+import { MessageType } from "../../../shared/types/msg.js";
+import { ChanState } from "../../../shared/types/chan.js";
+export default (function (irc, network) {
+    irc.on("join", (data) => {
         let chan = network.getChannel(data.channel);
         if (typeof chan === "undefined") {
-            chan = client.createChannel({
+            chan = this.createChannel({
                 name: data.channel,
-                state: chan_1.ChanState.JOINED,
+                state: ChanState.JOINED,
             });
-            client.emit("join", {
+            this.emit("join", {
                 network: network.uuid,
                 chan: chan.getFilteredClone(true),
                 shouldOpen: false,
                 index: network.addChannel(chan),
             });
-            client.save();
-            chan.loadMessages(client, network);
+            this.save();
+            chan.loadMessages(this, network);
             // Request channels' modes
             network.irc.raw("MODE", chan.name);
         }
         else if (data.nick === irc.user.nick) {
-            chan.state = chan_1.ChanState.JOINED;
-            client.emit("channel:state", {
+            chan.state = ChanState.JOINED;
+            this.emit("channel:state", {
                 chan: chan.id,
                 state: chan.state,
             });
         }
-        const user = new user_1.default({ nick: data.nick });
-        const msg = new msg_1.default({
+        const user = new User({ nick: data.nick });
+        const msg = new Msg({
             time: data.time,
             from: user,
             hostmask: data.ident + "@" + data.hostname,
             gecos: data.gecos,
             account: data.account,
-            type: msg_2.MessageType.JOIN,
+            type: MessageType.JOIN,
             self: data.nick === irc.user.nick,
         });
-        chan.pushMessage(client, msg);
-        chan.setUser(new user_1.default({ nick: data.nick }));
-        client.emit("users", {
-            chan: chan.id,
-        });
+        // User list update callback - executed regardless of buffering
+        const updateUserList = () => {
+            chan.setUser(new User({ nick: data.nick }));
+            this.emit("users", {
+                chan: chan.id,
+            });
+        };
+        // Try to process through mass event aggregator
+        const wasBuffered = this.massEventAggregator.processMessage(network, chan, msg, updateUserList);
+        if (!wasBuffered) {
+            // Not in mass event mode - process normally
+            chan.pushMessage(this, msg);
+            updateUserList();
+        }
     });
 });

package/dist/server/plugins/irc-events/kick.js

@@ -1,21 +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 msg_1 = __importDefault(require("../../models/msg"));
-const msg_2 = require("../../../shared/types/msg");
-const chan_1 = require("../../../shared/types/chan");
-exports.default = (function (irc, network) {
-    const client = this;
-    irc.on("kick", function (data) {
+import Msg from "../../models/msg.js";
+import { MessageType } from "../../../shared/types/msg.js";
+import { ChanState } from "../../../shared/types/chan.js";
+export default (function (irc, network) {
+    irc.on("kick", (data) => {
         const chan = network.getChannel(data.channel);
         if (typeof chan === "undefined") {
             return;
         }
         const user = chan.getUser(data.kicked);
-        const msg = new msg_1.default({
-            type: msg_2.MessageType.KICK,
+        const msg = new Msg({
+            type: MessageType.KICK,
             time: data.time,
             from: chan.getUser(data.nick),
             target: user,
@@ -23,17 +17,27 @@ exports.default = (function (irc, network) {
             highlight: data.kicked === irc.user.nick,
             self: data.nick === irc.user.nick,
         });
-        chan.pushMessage(client, msg);
+        // Self kicks should not be buffered and need special handling
         if (data.kicked === irc.user.nick) {
+            chan.pushMessage(this, msg);
             chan.users = new Map();
-            chan.state = chan_1.ChanState.PARTED;
-            client.emit("channel:state", {
+            chan.state = ChanState.PARTED;
+            this.emit("channel:state", {
                 chan: chan.id,
                 state: chan.state,
             });
+            return;
         }
-        else {
+        // User list update callback - executed regardless of buffering
+        const updateUserList = () => {
             chan.removeUser(user);
+        };
+        // Try to process through mass event aggregator
+        const wasBuffered = this.massEventAggregator.processMessage(network, chan, msg, updateUserList);
+        if (!wasBuffered) {
+            // Not in mass event mode - process normally
+            chan.pushMessage(this, msg);
+            updateUserList();
         }
     });
 });

package/dist/server/plugins/irc-events/link.js

@@ -1,47 +1,18 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const cheerio = __importStar(require("cheerio"));
-const got_1 = __importDefault(require("got"));
-const url_1 = require("url");
-const mime_types_1 = __importDefault(require("mime-types"));
-const log_1 = __importDefault(require("../../log"));
-const config_1 = __importDefault(require("../../config"));
-const linkify_1 = require("../../../shared/linkify");
-const storage_1 = __importDefault(require("../storage"));
+import * as cheerio from "cheerio";
+import { URL } from "url";
+import mime from "mime-types";
+import log from "../../log.js";
+import Config from "../../config.js";
+import { findLinksWithSchema } from "../../../shared/linkify.js";
+import storage from "../storage.js";
 const currentFetchPromises = new Map();
 const imageTypeRegex = /^image\/.+/;
 const mediaTypeRegex = /^(audio|video)\/.+/;
-function default_1(client, chan, msg, cleanText) {
-    if (!config_1.default.values.prefetch) {
+export default function (client, chan, msg, cleanText) {
+    if (!Config.values.prefetch) {
         return;
     }
-    msg.previews = (0, linkify_1.findLinksWithSchema)(cleanText).reduce((cleanLinks, link) => {
+    msg.previews = findLinksWithSchema(cleanText).reduce((cleanLinks, link) => {
         const url = normalizeURL(link.link);
         // If the URL is invalid and cannot be normalized, don't fetch it
         if (!url) {
@@ -65,23 +36,56 @@ function default_1(client, chan, msg, cleanText) {
             shown: null,
         };
         cleanLinks.push(preview);
-        fetch(url, {
-            accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-            language: client.config.browser?.language || "",
-        })
-            .then((res) => {
-            parse(msg, chan, preview, res, client);
-        })
-            .catch((err) => {
-            preview.type = "error";
-            preview.error = "message";
-            preview.message = err.message;
-            emitPreview(client, chan, msg, preview);
-        });
+        const urlObj = new URL(url);
+        if ((urlObj.hostname.endsWith("youtube.com") && urlObj.pathname.includes("watch")) ||
+            urlObj.hostname.endsWith("youtu.be")) {
+            fetchYoutube(url, msg, chan, preview, client);
+        }
+        else {
+            fetchUrl(url, msg, chan, preview, client);
+        }
         return cleanLinks;
     }, []);
 }
-exports.default = default_1;
+function fetchUrl(url, msg, chan, preview, client) {
+    fetch(url, {
+        accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        language: client.config.browser?.language || "",
+    })
+        .then((res) => {
+        parse(msg, chan, preview, res, client);
+    })
+        .catch((err) => {
+        preview.type = "error";
+        preview.error = "message";
+        preview.message = err.message;
+        emitPreview(client, chan, msg, preview);
+    });
+}
+function fetchYoutube(url, msg, chan, preview, client) {
+    const api_url = `https://www.youtube.com/oembed?url=${encodeURIComponent(url)}&format=json`;
+    fetch(api_url, {
+        accept: "application/json",
+        language: client.config.browser?.language || "",
+    })
+        .then((res) => {
+        const data = JSON.parse(res.data.toString());
+        let author = data.author_name || "";
+        author = author ? ` ~ ${author}` : "";
+        preview.type = "link";
+        preview.link = url;
+        preview.thumbActualUrl = data.thumbnail_url || "";
+        preview.head = data.title || "";
+        preview.body = author;
+        handlePreview(client, chan, msg, preview, res);
+    })
+        .catch((err) => {
+        preview.type = "error";
+        preview.error = "message";
+        preview.message = err.message;
+        emitPreview(client, chan, msg, preview);
+    });
+}
 function parseHtml(preview, res, client) {
     // TODO:
     // eslint-disable-next-line @typescript-eslint/no-misused-promises
@@ -105,7 +109,7 @@ function parseHtml(preview, res, client) {
             if (preview.body.length) {
                 preview.body = preview.body.substr(0, 300);
             }
-            if (!config_1.default.values.prefetchStorage && config_1.default.values.disableMediaPreview) {
+            if (!Config.values.prefetchStorage && Config.values.disableMediaPreview) {
                 resolve(res);
                 return;
             }
@@ -123,7 +127,7 @@ function parseHtml(preview, res, client) {
                     .then((resThumb) => {
                     if (resThumb !== null &&
                         imageTypeRegex.test(resThumb.type) &&
-                        resThumb.size <= config_1.default.values.prefetchMaxImageSize * 1024) {
+                        resThumb.size <= Config.values.prefetchMaxImageSize * 1024) {
                         preview.thumbActualUrl = thumb;
                     }
                     resolve(resThumb);
@@ -136,11 +140,10 @@ function parseHtml(preview, res, client) {
         });
     });
 }
-// TODO: type $
 function parseHtmlMedia($, preview, client) {
     return new Promise((resolve, reject) => {
-        if (config_1.default.values.disableMediaPreview) {
-            reject();
+        if (Config.values.disableMediaPreview) {
+            reject(new Error("Media preview is disabled"));
             return;
         }
         let foundMedia = false;
@@ -151,7 +154,7 @@ function parseHtmlMedia($, preview, client) {
         if (openGraphType &&
             !openGraphType.startsWith("video") &&
             !openGraphType.startsWith("music")) {
-            reject();
+            reject(new Error("Open Graph type is not video or music"));
             return;
         }
         ["video", "audio"].forEach((type) => {
@@ -184,7 +187,7 @@ function parseHtmlMedia($, preview, client) {
                     })
                         .then((resMedia) => {
                         if (resMedia === null || !mediaTypeRegex.test(resMedia.type)) {
-                            return reject();
+                            return reject(new Error("Invalid media type"));
                         }
                         preview.type = type;
                         preview.media = mediaUrl;
@@ -197,7 +200,7 @@ function parseHtmlMedia($, preview, client) {
             });
         });
         if (!foundMedia) {
-            reject();
+            reject(new Error("No media found"));
         }
     });
 }
@@ -220,13 +223,13 @@ function parse(msg, chan, preview, res, client) {
         case "image/jxl":
         case "image/webp":
         case "image/avif":
-            if (!config_1.default.values.prefetchStorage && config_1.default.values.disableMediaPreview) {
+            if (!Config.values.prefetchStorage && Config.values.disableMediaPreview) {
                 return removePreview(msg, preview);
             }
-            if (res.size > config_1.default.values.prefetchMaxImageSize * 1024) {
+            if (res.size > Config.values.prefetchMaxImageSize * 1024) {
                 preview.type = "error";
                 preview.error = "image-too-big";
-                preview.maxSize = config_1.default.values.prefetchMaxImageSize * 1024;
+                preview.maxSize = Config.values.prefetchMaxImageSize * 1024;
             }
             else {
                 preview.type = "image";
@@ -250,7 +253,7 @@ function parse(msg, chan, preview, res, client) {
             if (!preview.link.startsWith("https://")) {
                 break;
             }
-            if (config_1.default.values.disableMediaPreview) {
+            if (Config.values.disableMediaPreview) {
                 return removePreview(msg, preview);
             }
             preview.type = "audio";
@@ -263,7 +266,7 @@ function parse(msg, chan, preview, res, client) {
             if (!preview.link.startsWith("https://")) {
                 break;
             }
-            if (config_1.default.values.disableMediaPreview) {
+            if (Config.values.disableMediaPreview) {
                 return removePreview(msg, preview);
             }
             preview.type = "video";
@@ -281,13 +284,16 @@ function parse(msg, chan, preview, res, client) {
 function handlePreview(client, chan, msg, preview, res) {
     const thumb = preview.thumbActualUrl || "";
     delete preview.thumbActualUrl;
-    if (!thumb.length || !config_1.default.values.prefetchStorage) {
+    if (!thumb.length || !Config.values.prefetchStorage) {
         preview.thumb = thumb;
         return emitPreview(client, chan, msg, preview);
     }
+    if (!res) {
+        return emitPreview(client, chan, msg, preview);
+    }
     // Get the correct file extension for the provided content-type
     // This is done to prevent user-input being stored in the file name (extension)
-    const extension = mime_types_1.default.extension(res.type);
+    const extension = mime.extension(res.type);
     if (!extension) {
         // For link previews, drop the thumbnail
         // For other types, do not display preview at all
@@ -296,7 +302,7 @@ function handlePreview(client, chan, msg, preview, res) {
         }
         return emitPreview(client, chan, msg, preview);
     }
-    storage_1.default.store(res.data, extension, (uri) => {
+    storage.store(res.data, extension, (uri) => {
         preview.thumb = uri;
         emitPreview(client, chan, msg, preview);
     });
@@ -330,7 +336,7 @@ function getRequestHeaders(headers) {
     const formattedHeaders = {
         // Certain websites like Amazon only add <meta> tags to known bots,
         // lets pretend to be them to get the metadata
-        "User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/thelounge/thelounge)" +
+        "User-Agent": "Mozilla/5.0 (compatible; The Lounge IRC Client; +https://github.com/lordbex/thelounge)" +
             " facebookexternalhit/1.1 Twitterbot/1.0",
         Accept: headers.accept || "*/*",
         "X-Purpose": "preview",
@@ -347,69 +353,76 @@ function fetch(uri, headers) {
     if (promise) {
         return promise;
     }
-    const prefetchTimeout = config_1.default.values.prefetchTimeout;
+    const prefetchTimeout = Config.values.prefetchTimeout;
     if (!prefetchTimeout) {
-        log_1.default.warn("prefetchTimeout is missing from your The Lounge configuration, defaulting to 5000 ms");
+        log.warn("prefetchTimeout is missing from your The Lounge configuration, defaulting to 5000 ms");
     }
     promise = new Promise((resolve, reject) => {
         let buffer = Buffer.from("");
         let contentLength = 0;
         let contentType;
-        let limit = config_1.default.values.prefetchMaxImageSize * 1024;
+        let limit = Config.values.prefetchMaxImageSize * 1024;
         try {
-            const gotStream = got_1.default.stream(uri, {
-                retry: 0,
-                timeout: prefetchTimeout || 5000, // milliseconds
+            const requestOptions = {
+                method: "GET",
                 headers: getRequestHeaders(headers),
-                localAddress: config_1.default.values.bind,
-            });
-            gotStream
-                .on("response", function (res) {
-                contentLength = parseInt(res.headers["content-length"], 10) || 0;
-                contentType = res.headers["content-type"];
+                signal: AbortSignal.timeout(prefetchTimeout || 5000),
+            };
+            globalThis
+                .fetch(uri, requestOptions)
+                .then(async (response) => {
+                contentLength = parseInt(response.headers.get("content-length") || "0", 10);
+                contentType = response.headers.get("content-type") || undefined;
                 if (contentType && imageTypeRegex.test(contentType)) {
                     // response is an image
-                    // if Content-Length header reports a size exceeding the prefetch limit, abort fetch
-                    // and if file is not to be stored we don't need to download further either
-                    if (contentLength > limit || !config_1.default.values.prefetchStorage) {
-                        gotStream.destroy();
+                    if (contentLength > limit || !Config.values.prefetchStorage) {
+                        resolve({
+                            data: Buffer.alloc(0),
+                            type: contentType,
+                            size: contentLength,
+                        });
+                        return;
                     }
                 }
                 else if (contentType && mediaTypeRegex.test(contentType)) {
-                    // We don't need to download the file any further after we received content-type header
-                    gotStream.destroy();
+                    // We don't need to download the file any further
+                    resolve({ data: Buffer.alloc(0), type: contentType, size: contentLength });
+                    return;
                 }
                 else {
-                    // if not image, limit download to the max search size, since we need only meta tags
-                    // twitter.com sends opengraph meta tags within ~20kb of data for individual tweets, the default is set to 50.
-                    // for sites like Youtube the og tags are in the first 300K and hence this is configurable by the admin
+                    // if not image, limit download to the max search size
                     limit =
-                        "prefetchMaxSearchSize" in config_1.default.values
-                            ? config_1.default.values.prefetchMaxSearchSize * 1024
-                            : // set to the previous size if config option is unset
-                                50 * 1024;
+                        "prefetchMaxSearchSize" in Config.values
+                            ? Config.values.prefetchMaxSearchSize * 1024
+                            : 50 * 1024;
                 }
-            })
-                .on("error", (e) => reject(e))
-                .on("data", (data) => {
-                buffer = Buffer.concat([buffer, data], buffer.length + data.length);
-                if (buffer.length >= limit) {
-                    gotStream.destroy();
+                if (!response.body) {
+                    throw new Error("Response body is null");
+                }
+                const reader = response.body.getReader();
+                while (true) {
+                    const { done, value } = await reader.read();
+                    if (done) {
+                        break;
+                    }
+                    const chunkBuffer = Buffer.from(value);
+                    buffer = Buffer.concat([buffer, chunkBuffer]);
+                    if (buffer.length >= limit) {
+                        await reader.cancel();
+                        break;
+                    }
                 }
-            })
-                .on("end", () => gotStream.destroy())
-                .on("close", () => {
                 let type = "";
-                // If we downloaded more data then specified in Content-Length, use real data size
                 const size = contentLength > buffer.length ? contentLength : buffer.length;
                 if (contentType) {
                     type = contentType.split(/ *; */).shift() || "";
                 }
                 resolve({ data: buffer, type, size });
-            });
+            })
+                .catch((e) => reject(e instanceof Error ? e : new Error(String(e))));
         }
         catch (e) {
-            return reject(e);
+            return reject(e instanceof Error ? e : new Error(String(e)));
         }
     });
     const removeCache = () => currentFetchPromises.delete(cacheKey);
@@ -419,7 +432,7 @@ function fetch(uri, headers) {
 }
 function normalizeURL(link, baseLink, disallowHttp = false) {
     try {
-        const url = new url_1.URL(link, baseLink);
+        const url = new URL(link, baseLink);
         // Only fetch http and https links
         if (url.protocol !== "http:" && url.protocol !== "https:") {
             return undefined;
@@ -435,7 +448,7 @@ function normalizeURL(link, baseLink, disallowHttp = false) {
         url.hash = "";
         return url.toString();
     }
-    catch (e) {
+    catch {
         // if an exception was thrown, the url is not valid
     }
     return undefined;

package/dist/server/plugins/irc-events/list.js

@@ -1,35 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const chan_1 = require("../../../shared/types/chan");
-exports.default = (function (irc, network) {
-    const client = this;
+import { ChanType, SpecialChanType } from "../../../shared/types/chan.js";
+export default (function (irc, network) {
     const MAX_CHANS = 500;
-    irc.on("channel list start", function () {
-        network.chanCache = [];
-        updateListStatus({
-            text: "Loading channel list, this can take a moment...",
-        });
-    });
-    irc.on("channel list", function (channels) {
-        Array.prototype.push.apply(network.chanCache, channels);
-        updateListStatus({
-            text: `Loaded ${network.chanCache.length} channels...`,
-        });
-    });
-    irc.on("channel list end", function () {
-        updateListStatus(network.chanCache.sort((a, b) => b.num_users - a.num_users).slice(0, MAX_CHANS));
-        network.chanCache = [];
-    });
     function updateListStatus(msg) {
         let chan = network.getChannel("Channel List");
         if (typeof chan === "undefined") {
-            chan = client.createChannel({
-                type: chan_1.ChanType.SPECIAL,
-                special: chan_1.SpecialChanType.CHANNELLIST,
+            chan = this.createChannel({
+                type: ChanType.SPECIAL,
+                special: SpecialChanType.CHANNELLIST,
                 name: "Channel List",
                 data: msg,
             });
-            client.emit("join", {
+            this.emit("join", {
                 network: network.uuid,
                 chan: chan.getFilteredClone(true),
                 shouldOpen: false,
@@ -38,10 +19,26 @@ exports.default = (function (irc, network) {
         }
         else {
             chan.data = msg;
-            client.emit("msg:special", {
+            this.emit("msg:special", {
                 chan: chan.id,
                 data: msg,
             });
         }
     }
+    irc.on("channel list start", () => {
+        network.chanCache = [];
+        updateListStatus.call(this, {
+            text: "Loading channel list, this can take a moment...",
+        });
+    });
+    irc.on("channel list", (channels) => {
+        Array.prototype.push.apply(network.chanCache, channels);
+        updateListStatus.call(this, {
+            text: `Loaded ${network.chanCache.length} channels...`,
+        });
+    });
+    irc.on("channel list end", () => {
+        updateListStatus.call(this, network.chanCache.sort((a, b) => b.num_users - a.num_users).slice(0, MAX_CHANS));
+        network.chanCache = [];
+    });
 });