Use Extension API to save settings

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.273.xpi) or [Chrome-based](https://chrome.google.com/webstore/detail/pngextraembedder/bfhpobiikighljcapcfmfganodihbicj))
+- 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.275.xpi) or [Chrome-based](https://chrome.google.com/webstore/detail/pngextraembedder/bfhpobiikighljcapcfmfganodihbicj))
 
 For FF users, the extension is signed so you can just drag and drop it on your about:addons tab.
 

build-chrome.js

@@ -44,6 +44,7 @@ const manif3 = {
     64: "1449696017588.png"
   },
   permissions: [
+    "storage"
   ],
   "host_permissions":["<all_urls>"],
   web_accessible_resources: [{

chrome/manifest.json

@@ -2,11 +2,13 @@
   "manifest_version": 3,
   "name": "PngExtraEmbedder",
   "description": "Discover embedded files on 4chan and archives!",
-  "version": "0.273",
+  "version": "0.275",
   "icons": {
     "64": "1449696017588.png"
   },
-  "permissions": [],
+  "permissions": [
+    "storage"
+  ],
   "host_permissions": [
     "<all_urls>"
   ],

firefox/manifest.json

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

firefox_update.json

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

main.meta.js

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

src/jpg.ts

@@ -1,15 +1,9 @@
 import { Buffer } from "buffer";
 import type { ImageProcessor } from "./main";
-import {f5stego} from './f5stego';
+import { f5stego } from './f5stego';
 import { settings } from "./stores";
 import { decodeCoom3Payload } from "./utils";
 
-export let csettings: Parameters<typeof settings['set']>[0];
-
-settings.subscribe(b => {
-    csettings = b;
-});
-
 const key = Buffer.from("CUNNYCUNNYCUNNY");
 const f5inst = new f5stego(key);
 

src/main.ts

@@ -38,12 +38,13 @@ export interface ImageProcessor {
 }
 let qp: QueryProcessor;
 
-export let csettings: Parameters<typeof settings['set']>[0] = initial_settings;
+export let csettings: Parameters<typeof settings['set']>[0];
 let processors: ImageProcessor[] =
     [thirdeye, pomf, pngv3, jpg, webm, gif];
 
 let cappState: Parameters<typeof appState['set']>[0];
 settings.subscribe(async b => {
+    if (!b) return;
     if (b.hyd) {
         // transition from disable to enabled
         if (b.ak) {
@@ -164,6 +165,8 @@ let pendingPosts: { id: number, op: number }[] = [];
 // should be equivalent to buildCumFun(signalNewEmbeds, 5000, {trailing: true})
 const signalNewEmbeds = debounce(async () => {
     // ensure user explicitely enabled telemetry
+    if (!csettings)
+        return;
     if (!csettings.tm)
         return;
     try {
@@ -190,6 +193,8 @@ const signalNewEmbeds = debounce(async () => {
 const shouldUseCache = () => {
     if (cappState.isCatalog)
         return false;
+    if (!csettings)
+        return false;
     return typeof csettings.cache == "boolean"
         ? csettings.cache
         : location.hostname.includes('b4k');
@@ -205,6 +210,8 @@ const processPost = async (post: HTMLDivElement) => {
     let res2: [EmbeddedFile[], boolean][] | undefined = undefined;
 
     const reportEmbed = () => {
+        if (!csettings)
+            return false;
         if (csettings.tm) {
             // dont report results from archive, only live threads
             if (['boards.4chan.org', 'boards.4channel.org'].includes(location.host)) {
@@ -261,6 +268,8 @@ function copyTextToClipboard(text: string) {
 }
 
 const scrapeBoard = async (self: HTMLButtonElement) => {
+    if (!csettings)
+        return false;
     if (csettings.tm) {
         fireNotification("success", "Scrapping board with telemetry on! Thank you for your service, selfless stranger ;_;7");
     }
@@ -451,6 +460,16 @@ const startup = async (is4chanX = true) => {
     else
         qp = lqp;
 
+    await new Promise<void>(_ => {
+        settings.subscribe(val => {
+            if (val)
+                _();
+        });
+    });
+
+    if (!csettings)
+        return false;
+
     if (csettings.vercheck)
         versionCheck();
 
@@ -513,6 +532,8 @@ const startup = async (is4chanX = true) => {
                     rec.addedNodes.forEach(e => {
                         if (!(e instanceof HTMLElement))
                             return;
+                        if (!csettings)
+                            return false;
                         if (cappState.isCatalog && csettings.notcata)
                             return;
                         // apparently querySelector cannot select the root element if it matches
@@ -528,7 +549,7 @@ const startup = async (is4chanX = true) => {
             mo.observe(e!, { childList: true, subtree: true });
         });
     }
-    
+
     if (!document.body) {
         let bodyRes: any;
         const bodyInit = new Promise(r => bodyRes = r);

src/pomf.ts

@@ -42,6 +42,8 @@ const getExt = (fn: string) => {
 };
 
 const extract = async (b: Buffer, fn?: string) => {
+    if (!csettings)
+        throw new Error("Settings uninit");
     const { ext, source } = getExt(fn!);
 
     let rsource: string;

src/stores.ts

@@ -2,18 +2,40 @@ import { writable } from "svelte/store";
 import type { HydrusClient } from "./hydrus";
 import type { Booru } from "./thirdeye";
 
-export const localLoad = <T>(key: string, def: T) =>
+// Todo: use GM get/setValue instead?
-    ('__pee__' + key) in localStorage
+export const localLoad = async <T>(key: string, def: T) => {
-        ? JSON.parse(localStorage.getItem('__pee__' + key)!) as T
+    const isinls = ('__pee__' + key) in localStorage;
+    const ret = isinls
+        ? { ...def, ...JSON.parse(localStorage.getItem('__pee__' + key)!) } as T
         : def;
 
-const localSet = (key: string, value: any) =>
+    if (execution_mode != "userscript") {
-    localStorage.setItem('__pee__' + key, JSON.stringify(value));
+        if (isinls) {
+            delete localStorage[('__pee__' + key)];
+            await chrome.storage.local.set({
+                [key]: JSON.stringify(ret)
+            });
+        } else {
+            const d = await chrome.storage.local.get([key]);
+            if (typeof d[key] == "string")
+                return { ...def, ...(await JSON.parse('' + d[key] || '{}')) } as T;
+        }
+    }
+
+    return ret;
+};
+
+const localSet = (key: string, value: any) => {
+    if (execution_mode != "userscript")
+        chrome.storage.local.set({ [key]: JSON.stringify(value) });
+    else
+        localStorage.setItem('__pee__' + key, JSON.stringify(value));
+};
 
 export const initial_settings = localLoad('settingsv2', {
-    ...localLoad('settings', {}),
     loop: true,
     dh: false,
+    pmeth: 4,
     xpv: false,
     xpi: false,
     hyd: false,
@@ -42,11 +64,14 @@ export const initial_settings = localLoad('settingsv2', {
     conc: 8,
     ho: false,
     blacklist: [] as string[],
-    rsources: [] as (Omit<Booru, 'quirks'> & {view: string, disabled?: boolean})[],
+    rsources: [] as (Omit<Booru, 'quirks'> & { view: string, disabled?: boolean })[],
-    ...localLoad('settingsv2', {}),
 });
 
-export const settings = writable(initial_settings);
+export const settings = writable<Awaited<typeof initial_settings>>();
+
+initial_settings.then(v => {
+    settings.set(v);
+});
 
 export const appState = writable({
     isCatalog: false,

src/thirdeye.ts

@@ -60,6 +60,8 @@ let black = new Set<string>();
 let phashEn = false;
 let mindist = 5;
 settings.subscribe(s => {
+    if (!s)
+        return;
     experimentalApi = s.expte;
     boorus = s.rsources.map(e => ({
         ...e,
@@ -70,12 +72,7 @@ settings.subscribe(s => {
     phashEn = s.phash;
 });
 
-export let boorus: Booru[] =
+export let boorus: Booru[] = [];
-    localLoad('settingsv2', { rsources: [] as (Omit<Booru, 'quirks'> & { view: string, disabled?: boolean })[] })
-        .rsources.map(e => ({
-            ...e,
-            quirks: gelquirk(e.view)
-        }));
 
 const bufferingTime = 2000;
 let expired: number | NodeJS.Timeout | undefined = undefined;
@@ -151,6 +148,8 @@ const findFileFrom = async (b: Booru, hex: string, abort?: EventTarget) => {
 };
 
 const extract = async (b: Buffer, fn?: string) => {
+    if (!csettings)
+        throw new Error("Settings uninit");
     let result!: BooruMatch[];
     let booru!: string;
     for (const e of Object.values(boorus)) {

src/utils.ts

@@ -168,6 +168,8 @@ export const getThreadDataCache = async (board: string, op: number) => {
     Semantic difference: Empty array means there is nothing, undefined means it wasn't found in the cache
 */
 export const getEmbedsFromCache = async (board: string, op: number, pid: string): Promise<[EmbeddedFile[], boolean][] | undefined> => {
+    if (!csettings)
+        throw new Error("Settings uninit");
     await getThreadDataCache(board, op);
     const target = +pid.slice(pid.match(/\d/)!.index);
     const cachedData = cthreadDataCache![target];
@@ -217,6 +219,8 @@ rest: [X bytes of thumbnail data])[file bytes]
 &4 => has thumbnail
 */
 export const decodeCoom3Payload = async (buff: Buffer) => {
+    if (!csettings)
+        throw new Error("Settings uninit");
     const allowed_domains = filehosts.map(e => e.serving.replaceAll('.', '\\.'));
     const pees = buff
         .toString()
@@ -313,6 +317,8 @@ export const uploadFiles = async (injs: File[]) => {
     let total = 0;
     fireNotification('info', `Uploading ${injs.length} files...`);
     return await Promise.all(injs.map(async inj => {
+        if (!csettings)
+            throw new Error("Settings uninit");
         const peefile = await buildPeeFile(inj);
         const ret = await filehosts[csettings.fhost || 0].uploadFile(peefile);
         fireNotification('info', `Uploaded files [${++total}/${injs.length}] ${ret}`);