diff --git a/puppet/src/contentscript.js b/puppet/src/contentscript.js index 438e2db..22a682a 100644 --- a/puppet/src/contentscript.js +++ b/puppet/src/contentscript.js @@ -21,18 +21,17 @@ * @param {{[forwardDate]: boolean}} [option] - Extra options for parser * @return {Promise} */ -window.__chronoParseDate = function (text, ref, option) { -} +window.__chronoParseDate = function (text, ref, option) {} /** * @param {Set} changes - The hrefs of the chats that changed. + * @return {Promise} */ -window.__mautrixReceiveChanges = function (changes) { -} +window.__mautrixReceiveChanges = function (changes) {} /** * @param {string} url - The URL for the QR code. + * @return {Promise} */ -window.__mautrixReceiveQR = function (url) { -} +window.__mautrixReceiveQR = function (url) {} class MautrixController { constructor() { @@ -128,8 +127,10 @@ class MautrixController { messages.push(this._parseMessage(messageDate, child)) break case "mws-tombstone-message-wrapper": - const dateText = child.querySelector("mws-relative-timestamp")?.innerText - messageDate = await this._parseDate(dateText, messageDate) || messageDate + messageDate = await this._parseDate( + child.querySelector("mws-relative-timestamp")?.innerText, + messageDate + ) || messageDate break } } @@ -214,8 +215,10 @@ class MautrixController { * @return {boolean} - Whether or not the image has been downloaded */ imageExists(id) { - const imageElement = document.querySelector(`mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`) - return !imageElement.classList.contains("not-rendered") && imageElement.getAttribute("src") !== "" + const imageElement = document.querySelector( + `mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`) + return !imageElement.classList.contains("not-rendered") + && imageElement.getAttribute("src") !== "" } /** @@ -226,8 +229,9 @@ class MautrixController { * @return {Promise} - The data URL (containing the mime type and base64 data) */ async readImage(id) { - const imageElement = document.querySelector(`mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`) - const resp = await fetch(imageElement.getAttribute(src)) + const imageElement = document.querySelector( + `mws-message-wrapper[msg-id="${id}"] mws-image-message-part .image-msg`) + const resp = await fetch(imageElement.getAttribute("src")) const reader = new FileReader() const promise = new Promise((resolve, reject) => { reader.onload = () => resolve(reader.result) diff --git a/puppet/src/main.js b/puppet/src/main.js index edcec8b..71a8dac 100644 --- a/puppet/src/main.js +++ b/puppet/src/main.js @@ -33,7 +33,7 @@ const configPath = args["--config"] || "config.json" MessagesPuppeteer.executablePath = args["--browser"] || MessagesPuppeteer.executablePath MessagesPuppeteer.noSandbox = args["--no-sandbox"] -console.log("Reading config from", configPath) +console.log("[Main] Reading config from", configPath) const config = JSON.parse(fs.readFileSync(configPath).toString()) MessagesPuppeteer.profileDir = config.profile_dir || MessagesPuppeteer.profileDir MessagesPuppeteer.disableDebug = !!config.disable_debug @@ -42,7 +42,10 @@ MessagesPuppeteer.url = config.url || MessagesPuppeteer.url const api = new PuppetAPI(config.listen) function stop() { - api.stop().then(() => process.exit(0), err => { + api.stop().then(() => { + console.log("[Main] Everything stopped") + process.exit(0) + }, err => { console.error("[Main] Error stopping:", err) process.exit(3) })