Fix fireshit, and some possible init order issues.

README.md

@@ -25,7 +25,7 @@ Please report any issue you have with those (only for mainstream browsers)
 Also, use this if you plan to use b4k's archive.
 
 - [Install 4chanX (recommended)](https://www.4chan-x.net/builds/4chan-X.user.js)
-- Install the correct WebExtension for your Browser ([Firefox](https://git.coom.tech/fuckjannies/lolipiss/raw/branch/%E4%B8%AD%E5%87%BA%E3%81%97/pngextraembedder-0.302.xpi) or Chrome-based (Down for "maintainance"))
+- Install the correct WebExtension for your Browser ([Firefox](https://git.coom.tech/fuckjannies/lolipiss/raw/branch/%E4%B8%AD%E5%87%BA%E3%81%97/pngextraembedder-0.305.xpi) or Chrome-based (Down for "maintainance"))
 
 For FF users, the extension is signed so you can just drag and drop it on your about:addons tab.
 

chrome/dist/background.js

@@ -1877,22 +1877,6 @@
   var localSet = (key, value) => localStorage.setItem("__pee__" + key, JSON.stringify(value));
   var port1;
   console.log("chrome_api", true);
-  if (false) {
-    iframe = document.createElement("iframe");
-    iframe.style.display = "none";
-    iframe.name = location.origin;
-    const iframeloaded = new Promise((_) => {
-      iframe.onload = _;
-    });
-    iframe.src = `${chrome.runtime.getURL("")}options.html`;
-    document.documentElement.appendChild(iframe);
-    iframeloaded.then(() => {
-      port1 = genPort();
-      port1.onmessage = (ev) => {
-        lqueue[ev.data.id](ev.data);
-      };
-    });
-  }
   if (false) {
     port1 = {
       onmessage(ev) {

chrome/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "PngExtraEmbedder",
   "description": "Discover embedded files on 4chan and archives!",
-  "version": "0.302",
+  "version": "0.305",
   "icons": {
     "64": "1449696017588.png"
   },

firefox/dist/background.js

@@ -1877,22 +1877,6 @@
   var localSet = (key, value) => localStorage.setItem("__pee__" + key, JSON.stringify(value));
   var port1;
   console.log("ff_api", true);
-  if (false) {
-    iframe = document.createElement("iframe");
-    iframe.style.display = "none";
-    iframe.name = location.origin;
-    const iframeloaded = new Promise((_) => {
-      iframe.onload = _;
-    });
-    iframe.src = `${chrome.runtime.getURL("")}options.html`;
-    document.documentElement.appendChild(iframe);
-    iframeloaded.then(() => {
-      port1 = genPort();
-      port1.onmessage = (ev) => {
-        lqueue[ev.data.id](ev.data);
-      };
-    });
-  }
   if (false) {
     port1 = {
       onmessage(ev) {

firefox/manifest.json

@@ -7,7 +7,7 @@
   },
   "name": "PngExtraEmbedder",
   "description": "Discover embedded files on 4chan and archives!",
-  "version": "0.302",
+  "version": "0.305",
   "icons": {
     "64": "1449696017588.png"
   },

firefox_update.json

@@ -1 +1 @@
-{"addons":{"{34ac4994-07f2-44d2-8599-682516a6c6a6}":{"updates":[{"version":"0.302","update_link":"https://git.coom.tech/fuckjannies/lolipiss/raw/branch/%E4%B8%AD%E5%87%BA%E3%81%97/pngextraembedder-0.302.xpi"}]}}}
+{"addons":{"{34ac4994-07f2-44d2-8599-682516a6c6a6}":{"updates":[{"version":"0.305","update_link":"https://git.coom.tech/fuckjannies/lolipiss/raw/branch/%E4%B8%AD%E5%87%BA%E3%81%97/pngextraembedder-0.305.xpi"}]}}}

main.meta.js

@@ -1,7 +1,7 @@
 // ==UserScript==
 // @name         PNGExtraEmbed
 // @namespace    https://coom.tech/
-// @version      0.302
+// @version      0.305
 // @description  uhh
 // @author       You
 // @match        https://boards.4channel.org/*

src/main.ts

@@ -23,7 +23,7 @@ import NotificationsHandler from './Components/NotificationsHandler.svelte';
 
 import { fireNotification, getEmbedsFromCache, getSelectedFile } from "./utils";
 import { getQueryProcessor, QueryProcessor } from "./websites";
-import { ifetch, Platform, sendCmd, lqueue, supportedAltDomain, supportedMainDomain, genPort } from "./platform";
+import { ifetch, Platform, sendCmd, lqueue, supportedAltDomain, supportedMainDomain, genPort, initMainIPC } from "./platform";
 import TextEmbeddingsSvelte from "./Components/TextEmbeddings.svelte";
 import { HydrusClient } from "./hydrus";
 import { registerPlugin } from 'linkifyjs';
@@ -401,10 +401,10 @@ class CommandProcessor {
 
 const convertToLocalEmbed = (wef: WorkerEmbeddedFile) => {
     let ret: EmbeddedFileWithPreview;
-    ret = wef as any;
+    ret = {...wef} as any;
     // handles bigger files where data is represented as a {url, header} object
     if (typeof wef.data == "object") {
-        if (!(wef.data instanceof Uint8Array)) {
+        if ('url' in wef.data) {
             const ref = wef.data;
             if (!wef.thumbnail)
                 return wef;
@@ -418,10 +418,10 @@ const convertToLocalEmbed = (wef: WorkerEmbeddedFile) => {
         }
     }
 
-    if (wef.data instanceof Uint8Array) {
+    if (typeof wef.data != "string" && !('url' in wef.data)) {
         ret.data = Buffer.from(wef.data);
     }
-    if (wef.thumbnail instanceof Uint8Array) {
+    if (wef.thumbnail && typeof wef.thumbnail != "string") {
         ret.thumbnail = Buffer.from(wef.thumbnail);
     }
     return ret!;
@@ -681,6 +681,9 @@ const startup = async (is4chanX = true) => {
     else
         qp = lqp;
 
+    if (execution_mode != 'userscript')
+        await initMainIPC();
+
     const nset = await localLoad('settingsv2', initial_settings);
     settings.set(nset);
 
@@ -759,8 +762,6 @@ const startup = async (is4chanX = true) => {
                             el = [e];
                         if (el) {
                             appState.update(v => {
-                                console.log("ADDED FROM MUTATION UPDATE", el.length);
-
                                 v.processing += el.length;
                                 return v;
                             });
@@ -849,9 +850,7 @@ const startup = async (is4chanX = true) => {
     //console.log(posts);
     const range = ~~(posts.length / n) + 1;
     appState.update(v => {
-        console.log("ADDED FROM INIT", posts.length);
         v.processing += posts.length;
-        console.log("NOW IS", v.processing);
         return v;
     });
 

src/platform.ts

@@ -22,8 +22,7 @@ export const genPort = () => {
     return port1;
 };
 
-if (execution_mode != 'userscript' && !isBackground && execution_mode != 'worker') {
+export const initMainIPC = async () => {
-    // It has to be a content script
     iframe = document.createElement('iframe');
     iframe.style.display = 'none';
     iframe.name = location.origin;
@@ -33,13 +32,12 @@ if (execution_mode != 'userscript' && !isBackground && execution_mode != 'worker
     iframe.src = `${chrome.runtime.getURL('')}options.html`;
     //const meself = new URL(chrome.runtime.getURL('')).origin;
     document.documentElement.appendChild(iframe);
-    iframeloaded.then(() => {
+    await iframeloaded;
-        port1 = genPort();
+    port1 = genPort();
-        port1.onmessage = (ev) => {
+    port1.onmessage = (ev) => {
-            lqueue[ev.data.id](ev.data);
+        lqueue[ev.data.id](ev.data);
-        };
+    };
-    });
+};
-}
 
 let msgBuff: [any, Transferable[] | undefined][] = [];
 

src/processor.worker.ts

@@ -188,9 +188,9 @@ let init = false;
                         const tr: Transferable[] = [];
                         for (const ef of res) {
                             for (const e of ef[0]) {
-                                if (Buffer.isBuffer(e.thumbnail) || e.thumbnail instanceof Uint8Array)
+                                if (e.thumbnail && Buffer.isBuffer(e.thumbnail) || typeof e.thumbnail != "string")
-                                    tr.push(e.thumbnail.buffer);
+                                    tr.push(e.thumbnail!.buffer);
-                                if (Buffer.isBuffer(e.data) || e.data instanceof Uint8Array)
+                                if (Buffer.isBuffer(e.data) || (typeof e.data != 'string' && !('url' in e.data)))
                                     tr.push(e.data.buffer);
                             }
                         }