pervert-monkey 1.0.10 → 1.0.11

package/dist/core/pervertmonkey.core.umd.js

@@ -375,20 +375,24 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       this.observer.disconnect();
     }
     static observeWhile(target, callback, throttleTime) {
-      const observer_ = new Observer(async (target2) => {
+      const observer = new Observer(async (target2) => {
         const condition = await callback();
-        if (condition) observer_.throttle(target2, throttleTime);
+        if (condition) {
+          observer.throttle(target2, throttleTime);
+        } else {
+          observer.dispose();
+        }
       });
-      observer_.observe(target);
-      return observer_;
+      observer.observe(target);
+      return observer;
     }
   }
   function formatTimeToHHMMSS(timeStr) {
     var _a3, _b2, _c2;
     const pad = (num) => num.toString().padStart(2, "0");
     const h = ((_a3 = timeStr.match(/(\d+)\s*h/)) == null ? void 0 : _a3[1]) || "0";
-    const m = ((_b2 = timeStr.match(/(\d+)\s*mi?n/)) == null ? void 0 : _b2[1]) || "0";
-    const s = ((_c2 = timeStr.match(/(\d+)\s*sec/)) == null ? void 0 : _c2[1]) || "0";
+    const m = ((_b2 = timeStr.match(/(\d+)\s*mi?n?/)) == null ? void 0 : _b2[1]) || "0";
+    const s = ((_c2 = timeStr.match(/(\d+)\s*se?c?/)) == null ? void 0 : _c2[1]) || "0";
     return `${pad(+h)}:${pad(+m)}:${pad(+s)}`;
   }
   function timeToSeconds(timeStr) {
@@ -438,11 +442,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
     applyCSSFilters(wrapper) {
       this.filters.forEach((_2, name) => {
         const cssRule = `.filter-${name} { display: none !important; }`;
-        if (wrapper) {
-          client.GM_addStyle(wrapper(cssRule));
-        } else {
-          client.GM_addStyle(cssRule);
-        }
+        client.GM_addStyle(wrapper ? wrapper(cssRule) : cssRule);
       });
     }
     registerFilters(customFilters) {
@@ -1285,14 +1285,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __publicField(this, "subject", new Subject());
       __publicField(this, "generatorConsumer", async () => {
         if (!this.enabled) return false;
-        const {
-          value: { url, offset },
-          done
-        } = await this.paginationGenerator.next();
-        if (!done && url) {
-          await this.doScroll(url, offset);
-        }
-        return !done;
+        const { value, done } = await this.paginationGenerator.next();
+        if (done) return false;
+        const { url, offset } = value;
+        await this.doScroll(url, offset);
+        return true;
       });
       this.rules = options.rules;
       this.paginationOffset = this.rules.paginationStrategy.getPaginationOffset();
@@ -1320,7 +1317,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       const autoScrollWrapper = async () => {
         if (this.rules.store.state.autoScroll) {
           await wait(this.rules.store.state.delay);
-          await this.generatorConsumer();
+          const res = await this.generatorConsumer();
+          if (!res) return;
           await autoScrollWrapper();
         }
       };
@@ -2382,7 +2380,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       __publicField(this, "thumbDataSelectors", []);
       __publicField(this, "defaultThumbDataSelectors", [
         { name: "title", type: "string", selector: "[class *= title],[title]" },
-        { name: "uploader", type: "string", selector: "[class *= uploader], [class *= user], [class *= name]" },
+        {
+          name: "uploader",
+          type: "string",
+          selector: "[class *= uploader], [class *= user], [class *= name]"
+        },
         { name: "duration", type: "duration", selector: "[class *= duration]" }
       ]);
       this.strategy = strategy;
@@ -2437,9 +2439,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
       if (this.strategy === "auto-select") {
         this.thumbDataSelectors = this.defaultThumbDataSelectors;
       }
-      const thumbData = Object.fromEntries(this.thumbDataSelectors.map(
-        (s) => [s.name, this.getThumbDataWith(thumb, s)]
-      ));
+      const thumbData = Object.fromEntries(
+        this.thumbDataSelectors.map((s) => [s.name, this.getThumbDataWith(thumb, s)])
+      );
       if (this.stringsMeltInTitle) {
         Object.entries(thumbData).forEach(([k2, v2]) => {
           if (typeof v2 === "string" && k2 !== "title") {
@@ -2455,50 +2457,47 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
   class ThumbImgParser {
     constructor() {
       __publicField(this, "selector");
-      __publicField(this, "shouldDelete");
+      __publicField(this, "remove");
       __publicField(this, "strategy", "default");
     }
     static create(options = {}) {
       return Object.assign(new ThumbImgParser(), options);
     }
-    getImgData(thumb) {
-      const result = {};
-      if (this.strategy === "auto") {
-        const img = thumb.querySelector("img");
-        if (!img) return {};
-        result.img = img;
-        if (typeof this.selector === "function") {
-          result.imgSrc = this.selector(img);
+    removeAttrs(img) {
+      if (!this.remove) return;
+      if (this.remove === "auto") {
+        removeClassesAndDataAttributes(img, "lazy");
+      } else {
+        if (this.remove.startsWith(".")) {
+          img.classList.remove(this.remove.slice(1));
         } else {
-          const possibleAttrs = this.selector ? [this.selector].flat() : ["data-src", "src"];
-          for (const attr of possibleAttrs) {
-            const imgSrc = img.getAttribute(attr);
-            if (imgSrc) {
-              result.imgSrc = imgSrc;
-              img.removeAttribute(attr);
-              break;
-            }
-          }
+          img.removeAttribute(this.remove);
         }
-        if (this.shouldDelete) {
-          if (this.shouldDelete === "auto") {
-            removeClassesAndDataAttributes(img, "lazy");
-          } else {
-            if (this.shouldDelete.startsWith(".")) {
-              img.classList.remove(this.shouldDelete.slice(1));
-            } else {
-              img.removeAttribute(this.shouldDelete);
-            }
-          }
-          if (img.src.includes("data:image")) {
-            result.img.src = "";
-          }
-          if (img.complete && img.naturalWidth > 0) {
-            return {};
-          }
+      }
+    }
+    getImgSrc(img) {
+      const possibleAttrs = this.selector ? [this.selector].flat() : ["data-src", "src"];
+      for (const attr of possibleAttrs) {
+        const imgSrc = img.getAttribute(attr);
+        if (imgSrc) {
+          return imgSrc;
         }
       }
-      return result;
+      return "";
+    }
+    getImgData(thumb) {
+      if (this.strategy === "default" && !this.selector) return {};
+      const img = thumb.querySelector("img");
+      if (!img) return {};
+      const imgSrc = typeof this.selector === "function" ? this.selector(img) : this.getImgSrc(img);
+      this.removeAttrs(img);
+      if (img.src.includes("data:image")) {
+        img.src = "";
+      }
+      if (img.complete && img.naturalWidth > 0) {
+        return {};
+      }
+      return { img, imgSrc };
     }
   }
   class ThumbsParser {