pervert-monkey 1.0.13 → 1.0.15

package/src/core/data-handler/data-manager.ts

@@ -3,7 +3,10 @@ import { checkHomogenity, LazyImgLoader } from '../../utils';
 import type { Rules } from '../rules';
 import { DataFilter } from './data-filter';
 
-export type DataElement = Record<string, string | number | boolean | HTMLElement>;
+export type DataElement = {
+  element: HTMLElement;
+  [key: string]: HTMLElement | string | number | boolean;
+};
 
 export class DataManager {
   public data = new Map<string, DataElement>();
@@ -14,7 +17,7 @@ export class DataManager {
 
   constructor(
     private rules: Rules,
-    private parentHomogenity?: Parameters<typeof checkHomogenity>[2],
+    private containerHomogenity?: Parameters<typeof checkHomogenity>[2],
   ) {
     this.dataFilter = new DataFilter(this.rules);
   }
@@ -29,10 +32,10 @@ export class DataManager {
     const iterator = this.data.values().drop(offset);
     let finished = false;
 
+    const updates: { e: HTMLElement; tag: string; condition: boolean }[] = [];
+
     await new Promise((resolve) => {
       function runBatch(deadline: IdleDeadline) {
-        const updates: { e: HTMLElement; tag: string; condition: boolean }[] = [];
-
         while (deadline.timeRemaining() > 0) {
           const { value, done } = iterator.next();
           finished = !!done;
@@ -44,14 +47,6 @@ export class DataManager {
           }
         }
 
-        if (updates.length > 0) {
-          requestAnimationFrame(() => {
-            updates.forEach((u) => {
-              u.e.classList.toggle(u.tag, u.condition);
-            });
-          });
-        }
-
         if (!finished) {
           requestIdleCallback(runBatch);
         } else {
@@ -61,6 +56,32 @@ export class DataManager {
 
       requestIdleCallback(runBatch);
     });
+
+    const parents = new Set(updates.map((u) => u.e.parentElement));
+
+    requestAnimationFrame(() => {
+      const revertDisplayStyle = [...parents].map((p) => {
+        const display = p?.style.display;
+        if (!display) return undefined;
+        p.style.display = 'none';
+        p.style.contain = 'layout style paint';
+        p.style.willChange = 'contents';
+        return () => {
+          p.style.display = display;
+          requestAnimationFrame(() => {
+            p.style.willChange = 'auto';
+          });
+        };
+      });
+
+      updates.forEach((u) => {
+        u.e.classList.toggle(u.tag, u.condition);
+      });
+
+      revertDisplayStyle.forEach((f) => {
+        f?.();
+      });
+    });
   };
 
   public filterAll = async (offset?: number): Promise<void> => {
@@ -82,7 +103,12 @@ export class DataManager {
     const dataOffset = this.data.size;
     const fragment = document.createDocumentFragment();
     const parent = container || this.rules.container;
-    const homogenity = !!this.parentHomogenity;
+    const homogenity = !!this.containerHomogenity;
+
+    if (parent) {
+      parent.style.contain = 'layout style paint';
+      parent.style.willChange = 'contents';
+    }
 
     for (const thumbElement of thumbs) {
       const url = this.rules.thumbDataParser.getUrl(thumbElement);
@@ -94,7 +120,7 @@ export class DataManager {
           !checkHomogenity(
             parent,
             thumbElement.parentElement as HTMLElement,
-            this.parentHomogenity as object,
+            this.containerHomogenity as object,
           ))
       ) {
         if (removeDuplicates) thumbElement.remove();
@@ -114,7 +140,7 @@ export class DataManager {
 
     this.filterAll(dataOffset).then(() => {
       requestAnimationFrame(() => {
-        parent.appendChild(fragment);
+        parent?.appendChild(fragment);
       });
     });
   };
@@ -122,23 +148,46 @@ export class DataManager {
   public sortBy<K extends keyof DataElement>(key: K, direction = true): void {
     if (this.data.size < 2) return;
 
-    let sorted: DataElement[] = this.data
+    const elements = this.data
       .values()
       .toArray()
-      .sort((a: DataElement, b: DataElement) => {
-        return (a[key] as number) - (b[key] as number);
-      });
+      .filter((e) => e.element.parentElement !== null)
+      .map((e) => e);
 
-    if (!direction) sorted = sorted.reverse();
-
-    const container = (sorted[0].element as HTMLElement).parentElement as HTMLElement;
+    const containers = new Set(elements.map((e) => e.element.parentElement as HTMLElement));
+    containers.forEach((c) => {
+      c.style.contain = 'layout style paint';
+      c.style.willChange = 'contents';
+    });
 
-    container.style.visibility = 'hidden';
+    const elementsByContainers = new Map<HTMLElement, DataElement[]>();
+    containers.forEach((c) => {
+      elementsByContainers.set(c, []);
+    });
 
-    sorted.forEach((s) => {
-      container.append(s.element as HTMLElement);
+    elements.forEach((e) => {
+      const parent = e.element.parentElement as HTMLElement;
+      const container = elementsByContainers.get(parent);
+      container?.push(e);
     });
 
-    container.style.visibility = 'visible';
+    const dir = direction ? -1 : 1;
+
+    for (const [container, items] of elementsByContainers) {
+      items.sort((a, b) => ((a[key] as number) - (b[key] as number)) * dir);
+      const domNodes = items.map((e) => e.element);
+
+      const display = container.style.display;
+      container.style.display = 'none';
+
+      container.replaceChildren(...domNodes);
+
+      requestAnimationFrame(() => {
+        container.style.display = display;
+        requestAnimationFrame(() => {
+          container.style.willChange = 'auto';
+        });
+      });
+    }
   }
 }

package/src/core/jabroni-config/default-scheme.ts

@@ -2,7 +2,7 @@ import type { JabroniTypes, SchemeInput, setupScheme } from 'jabroni-outfit';
 
 export const DefaultScheme = [
   {
-    title: 'Text Filter',
+    title: 'Title Filter',
     collapsed: true,
     content: [
       { filterExclude: false, label: 'exclude' },
@@ -21,6 +21,26 @@ export const DefaultScheme = [
       },
     ],
   },
+  {
+    title: 'Uploader Filter',
+    collapsed: true,
+    content: [
+      { filterUploaderExclude: false, label: 'exclude' },
+      {
+        filterUploaderExcludeWords: '',
+        label: 'keywords',
+        watch: 'filterUploaderExclude',
+        placeholder: 'word, f:full_word, r:RegEx...',
+      },
+      { filterUploaderInclude: false, label: 'include' },
+      {
+        filterUploaderIncludeWords: '',
+        label: 'keywords',
+        watch: 'filterUploaderInclude',
+        placeholder: 'word, f:full_word, r:RegEx...',
+      },
+    ],
+  },
   {
     title: 'Duration Filter',
     collapsed: true,
@@ -42,6 +62,7 @@ export const DefaultScheme = [
   },
   {
     title: 'Sort By',
+    collapsed: true,
     content: [
       {
         'sort by views': () => {},
@@ -51,14 +72,40 @@ export const DefaultScheme = [
       },
     ],
   },
+  {
+    title: 'Sort By Duration',
+    collapsed: true,
+    content: [
+      {
+        'sort by duration': () => {},
+      },
+    ],
+  },
+  {
+    title: 'Sort By Views',
+    collapsed: true,
+    content: [
+      {
+        'sort by views': () => {},
+      },
+    ],
+  },
   {
     title: 'Privacy Filter',
+    collapsed: true,
     content: [
       { filterPrivate: false, label: 'private' },
       { filterPublic: false, label: 'public' },
       { 'check access 🔓': () => {} },
     ],
   },
+  {
+    title: 'HD Filter',
+    content: [
+      { filterHD: false, label: 'hd' },
+      { filterNonHD: false, label: 'non-hd' },
+    ],
+  },
   {
     title: 'Advanced',
     collapsed: true,
@@ -79,6 +126,9 @@ export const DefaultScheme = [
         writeHistory: false,
         label: 'write history',
       },
+      {
+        reset: () => { localStorage.removeItem('state_acephale'); }
+      }
     ],
   },
   {
@@ -92,7 +142,6 @@ export const DefaultScheme = [
   },
 ] as const satisfies SchemeInput;
 
-export type SchemeOptions = (
-  | Parameters<typeof setupScheme>[0][0]
-  | JabroniTypes.ExtractValuesByKey<typeof DefaultScheme, 'title'>
-)[];
+export type SchemeKeys = JabroniTypes.ExtractValuesByKey<typeof DefaultScheme, 'title'>;
+
+export type SchemeOptions = (Parameters<typeof setupScheme>[0][0] | SchemeKeys)[];

package/src/core/jabroni-config/index.ts

@@ -1,3 +1,4 @@
 export * from './default-scheme';
 export * from './default-store';
 export * from './jabroni-gui-controller';
+export * from './scheme-selectors-mapping';

package/src/core/jabroni-config/jabroni-gui-controller.ts

@@ -51,7 +51,7 @@ export class JabronioGuiController {
 
   private setupStoreListeners() {
     this.directionalEventObservable$?.subscribe((e) => {
-      this.eventsMap[e.type](e.direction);
+      this.eventsMap[e.type]?.(e.direction);
     });
 
     this.store.stateSubject.pipe(takeUntil(this.destroy$)).subscribe((a) => {

package/src/core/jabroni-config/scheme-selectors-mapping.ts

@@ -0,0 +1,12 @@
+import { defaultDataFilterFns } from '../data-handler/data-filter-fn-defaults';
+import { DefaultScheme, type SchemeKeys } from './default-scheme';
+
+export function getSelectorFnsFromScheme(xs: SchemeKeys[]) {
+  const keys = xs.flatMap((s) => {
+    const schemeBlock = DefaultScheme.find((e) => e.title === s);
+    if (!schemeBlock) return [];
+    return schemeBlock.content.flatMap((c) => Object.keys(c));
+  });
+
+  return keys.filter((k) => k in defaultDataFilterFns);
+}

package/src/core/parsers/thumb-data-parser.ts

@@ -56,6 +56,7 @@ export class ThumbDataParser {
       selector: '[class *= uploader], [class *= user], [class *= name]',
     },
     { name: 'duration', type: 'duration', selector: '[class *= duration]' },
+    // { name: 'views', type: 'float', selector: '[class *= view]' },
   ];
 
   private getThumbDataWith(
@@ -82,17 +83,14 @@ export class ThumbDataParser {
     public strategy: 'manual' | 'auto-select' | 'auto-text' = 'manual',
     public selectors: ThumbDataSelectorsRaw = {},
     public callback?: (thumb: HTMLElement, thumbData: ThumbData) => void,
-    public stringsMeltInTitle = true,
   ) {
     this.preprocessCustomThumbDataSelectors();
   }
 
   public static create(
-    o: Partial<
-      Pick<ThumbDataParser, 'strategy' | 'selectors' | 'callback' | 'stringsMeltInTitle'>
-    > = {},
+    o: Partial<Pick<ThumbDataParser, 'strategy' | 'selectors' | 'callback'>> = {},
   ) {
-    return new ThumbDataParser(o.strategy, o.selectors, o.callback, o.stringsMeltInTitle);
+    return new ThumbDataParser(o.strategy, o.selectors, o.callback);
   }
 
   public getThumbData(thumb: HTMLElement): ThumbData {
@@ -101,22 +99,13 @@ export class ThumbDataParser {
     }
 
     if (this.strategy === 'auto-select') {
-      this.thumbDataSelectors = this.defaultThumbDataSelectors;
+      this.thumbDataSelectors.push(...this.defaultThumbDataSelectors);
     }
 
     const thumbData = Object.fromEntries(
       this.thumbDataSelectors.map((s) => [s.name, this.getThumbDataWith(thumb, s)]),
     );
 
-    if (this.stringsMeltInTitle) {
-      Object.entries(thumbData).forEach(([k, v]) => {
-        if (typeof v === 'string' && k !== 'title') {
-          thumbData.title = `${thumbData.title} ${k}:${v}`;
-          delete thumbData[k];
-        }
-      });
-    }
-
     this.callback?.(thumb, thumbData);
 
     return thumbData;

package/src/core/rules/index.ts

@@ -4,10 +4,12 @@ import {
   querySelectorLast,
   waitForElementToDisappear,
 } from '../../utils';
-import { DataManager, type DataSelectorFn } from '../data-handler';
+import { DataManager } from '../data-handler';
+import type { DataFilterFnFrom } from '../data-handler/data-filter-fn';
 import { InfiniteScroller, type OffsetGenerator } from '../infinite-scroll';
 import {
   DefaultScheme,
+  getSelectorFnsFromScheme,
   JabronioGuiController,
   type SchemeOptions,
   StoreStateDefault,
@@ -61,12 +63,15 @@ export class Rules {
   public paginationStrategy: PaginationStrategy;
 
   public dataManager: DataManager;
-  public dataHomogenity: ConstructorParameters<typeof DataManager>[1];
-  public customDataSelectorFns: (Record<string, DataSelectorFn<any>> | string)[] = [
-    'filterInclude',
-    'filterExclude',
-    'filterDuration',
-  ];
+  public containerHomogenity: ConstructorParameters<typeof DataManager>[1];
+
+  public customDataFilterFns: (Record<string, DataFilterFnFrom<any>> | string)[] = [];
+  private hookDataFilterFns() {
+    const defaultFilterFns = getSelectorFnsFromScheme(
+      this.schemeOptions.filter((s) => typeof s === 'string'),
+    );
+    this.customDataFilterFns.push(...defaultFilterFns);
+  }
 
   public animatePreview?: (doc: HTMLElement) => void;
 
@@ -151,7 +156,7 @@ export class Rules {
 
     this.paginationStrategy = getPaginationStrategy(this.paginationStrategyOptions);
 
-    this.dataManager = new DataManager(this, this.dataHomogenity);
+    this.dataManager = new DataManager(this, this.containerHomogenity);
 
     this.inputController.dispose();
     this.inputController = new JabronioGuiController(this.store, this.dataManager);
@@ -181,7 +186,8 @@ export class Rules {
     this.store = this.createStore();
     this.gui = this.createGui();
 
-    this.dataManager = new DataManager(this, this.dataHomogenity);
+    this.hookDataFilterFns();
+    this.dataManager = new DataManager(this, this.containerHomogenity);
     this.inputController = new JabronioGuiController(this.store, this.dataManager);
 
     this.reset();

package/src/userscripts/index.ts

@@ -1 +1 @@
-import './scripts/motherless'
+import './scripts/ebalka';

package/src/userscripts/scripts/3hentai.ts

@@ -4,7 +4,7 @@ import { circularShift, OnHover, Tick } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: '3Hentai PervertMonkey',
-  version: '1.0.4',
+  version: '1.0.7',
   description: 'Infinite scroll [optional], Filter by Title',
   match: 'https://*.3hentai.net/*',
 };
@@ -23,8 +23,7 @@ const rules = new Rules({
     strategy: 'auto',
   },
   gropeStrategy: 'all-in-all',
-  customDataSelectorFns: ['filterInclude', 'filterExclude'],
-  schemeOptions: ['Text Filter', 'Badge', 'Advanced'],
+  schemeOptions: ['Title Filter', 'Badge', 'Advanced'],
   animatePreview,
 });
 
@@ -42,9 +41,7 @@ function animatePreview() {
     img.src = img.src.replace(/\w+\.\w+$/, '1t.jpg');
     img.onerror = (_) => tick.stop();
     tick.start(
-      () => {
-        img.src = rotate(img.src);
-      },
+      () => img.setAttribute('src', img.src),
       () => {
         img.src = origin;
       },

package/src/userscripts/scripts/camgirlfinder.ts

@@ -2,7 +2,7 @@ import type { MonkeyUserScript } from 'vite-plugin-monkey';
 
 export const meta: MonkeyUserScript = {
   name: 'CamGirlFinder PervertMonkey',
-  version: '1.6.2',
+  version: '1.6.5',
   description:
     'Adds model links for CamWhores, webcamrecordings, recu.me, camvideos, privat-zapisi',
   match: ['https://camgirlfinder.net/*'],

package/src/userscripts/scripts/camwhores.ts

@@ -17,9 +17,9 @@ import {
 
 export const meta: MonkeyUserScript = {
   name: 'CamWhores PervertMonkey',
-  version: '3.0.6',
+  version: '3.0.9',
   description:
-    'Infinite scroll [optional]. Filter by Title, Duration and Private/Public. Mass friend request button. Download button',
+    'Infinite scroll [optional]. Filter by Title, Duration and Private/Public. Sort by Duration and Views. Mass friend request button. Download button',
   match: ['https://*.camwhores.tv', 'https://*.camwhores.*/*'],
   exclude: 'https://*.camwhores.tv/*mode=async*',
 };
@@ -54,27 +54,18 @@ const rules = new Rules({
     strategy: 'auto-select',
     selectors: {
       private: { type: 'boolean', selector: '[class*=private]' },
+      views: { selector: '.views', type: 'float' },
     },
   },
   thumbImg: {
     selector: 'data-original',
   },
   gropeStrategy: 'all-in-all',
-  customDataSelectorFns: [
-    'filterInclude',
-    'filterExclude',
-    'filterDuration',
-    {
-      filterPrivate: (e, state) => (state.filterPrivate && e.private) as boolean,
-    },
-    {
-      filterPublic: (e, state) => (state.filterPublic && !e.private) as boolean,
-    },
-  ],
   schemeOptions: [
-    'Text Filter',
+    'Title Filter',
     'Duration Filter',
     'Privacy Filter',
+    'Sort By',
     'Badge',
     {
       title: 'Advanced',

package/src/userscripts/scripts/e-hentai.ts

@@ -4,7 +4,7 @@ import { fetchHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'E-Hentai PervertMonkey',
-  version: '1.0.2',
+  version: '1.0.5',
   description: 'Infinite scroll [optional], Filter by Title',
   match: ['https://*.e-hentai.org/*'],
 };
@@ -13,16 +13,15 @@ const rules = new Rules({
   thumbs: { selector: '.gl1t' },
   thumb: {
     selectors: {
-      title: '.glname'
-    }
+      title: '.glname',
+    },
   },
   thumbImg: {
     selector: 'data-lazy-load',
   },
   containerSelectorLast: '.itg.gld',
   paginationStrategyOptions: createPaginationStrategyOptions(),
-  customDataSelectorFns: ['filterInclude', 'filterExclude'],
-  schemeOptions: ['Text Filter', 'Badge', 'Advanced'],
+  schemeOptions: ['Title Filter', 'Badge', 'Advanced'],
 });
 
 function createPaginationStrategyOptions(): Rules['paginationStrategyOptions'] {
@@ -39,7 +38,6 @@ function createPaginationStrategyOptions(): Rules['paginationStrategyOptions'] {
         nextLink = getNextLink();
         return nextLink;
       }
-      // need cache or reuse infinite scroller request
       const doc = await fetchHtml(nextLink);
       nextLink = getNextLink(doc);
       return nextLink;

package/src/userscripts/scripts/ebalka.ts

@@ -4,8 +4,8 @@ import { exterminateVideo, OnHover, parseHtml } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Ebalka PervertMonkey',
-  version: '3.0.3',
-  description: 'Infinite scroll [optional], Filter by Title and Duration',
+  version: '3.0.6',
+  description: 'Infinite scroll [optional], Filter by Title and Duration, Sort by Duration',
   match: [
     'https://b.ebalka.zip/*',
     'https://a.ebalka.love/*',
@@ -27,10 +27,18 @@ const rules = new Rules({
     selectors: {
       title: '.card__title',
       duration: '.card__spot > span:last-child',
+      hd: { selector: '.card__icons > .card__icon', type: 'boolean' },
     },
   },
   animatePreview,
-  schemeOptions: ['Text Filter', 'Badge', 'Duration Filter', 'Advanced'],
+  schemeOptions: [
+    'Title Filter',
+    'Duration Filter',
+    'HD Filter',
+    'Sort By Duration',
+    'Badge',
+    'Advanced',
+  ],
 });
 
 function animatePreview(container: HTMLElement) {

package/src/userscripts/scripts/eporner.ts

@@ -5,8 +5,9 @@ import { OnHover } from '../../utils';
 
 export const meta: MonkeyUserScript = {
   name: 'Eporner PervertMonkey',
-  version: '2.0.4',
-  description: 'Infinite scroll [optional], Filter by Title, Duration and HD',
+  version: '2.0.7',
+  description:
+    'Infinite scroll [optional], Filter by Title, Uploader, Duration and HD, Sort by Views and Duration',
   match: ['https://*.eporner.com/*', 'https://*.eporner.*/*'],
 };
 
@@ -19,10 +20,11 @@ const rules = new Rules({
   thumbs: { selector: 'div[id^=vf][data-id]' },
   thumb: {
     selectors: {
-      quality: { type: 'number', selector: '[title="Quality"]' },
       title: 'a',
       uploader: '[title="Uploader"]',
       duration: '[title="Duration"]',
+      views: { selector: '[title="Views"]', type: 'float' },
+      quality: { selector: '[title="Quality"]', type: 'number' },
     },
   },
   thumbImg: {
@@ -30,50 +32,29 @@ const rules = new Rules({
     remove: 'auto',
   },
   containerSelectorLast: '#vidresults',
-  customDataSelectorFns: [
-    'filterInclude',
-    'filterExclude',
-    'filterDuration',
-    {
-      quality360: (el, state) => !!state.quality360 && el.quality !== 360,
-    },
-    {
-      quality480: (el, state) => !!state.quality480 && el.quality !== 480,
-    },
-    {
-      quality720: (el, state) => !!state.quality720 && el.quality !== 720,
-    },
-    {
-      quality1080: (el, state) => !!state.quality1080 && el.quality !== 1080,
-    },
-    {
-      quality4k: (el, state) => !!state.quality4k && el.quality !== 4,
-    },
+  customDataFilterFns: [
+    { quality360: (el, state) => !!state.quality360 && el.quality !== 360 },
+    { quality480: (el, state) => !!state.quality480 && el.quality !== 480 },
+    { quality720: (el, state) => !!state.quality720 && el.quality !== 720 },
+    { quality1080: (el, state) => !!state.quality1080 && el.quality !== 1080 },
+    { quality4k: (el, state) => !!state.quality4k && el.quality !== 4 },
   ],
   schemeOptions: [
-    'Text Filter',
-    'Badge',
+    'Title Filter',
+    'Uploader Filter',
     'Duration Filter',
     {
       title: 'Quality Filter ',
       content: [
-        {
-          quality360: false,
-        },
-        {
-          quality480: false,
-        },
-        {
-          quality720: false,
-        },
-        {
-          quality1080: false,
-        },
-        {
-          quality4k: false,
-        },
+        { quality360: false },
+        { quality480: false },
+        { quality720: false },
+        { quality1080: false },
+        { quality4k: false },
       ],
     },
+    'Sort By',
+    'Badge',
     'Advanced',
   ],
   animatePreview,