captchakraken 3.2.1 → 4.0.0

package/python/src/captchakraken/verdicts.py

@@ -14,6 +14,7 @@ from typing import Any, Callable, List, Mapping, Optional, Sequence, Tuple
 from .kinds import Verdict, Vendor
 
 # The vendors' own HTTP refusal: hCaptcha's frame words a 429 as "Your computer or network has sent too many requests".
+_SCRIPTED_REQUESTS = ("xhr", "fetch", "script")
 _TOO_MANY_REQUESTS = 429
 
 
@@ -104,6 +105,13 @@ def read_verdict(url: str, status: int, body: str) -> Optional[RoundVerdict]:
     return RoundVerdict(vendor, verdict) if verdict is not None else None
 
 
+def _is_a_scripted_request(response: Any) -> bool:
+    try:
+        return response.request.resource_type in _SCRIPTED_REQUESTS
+    except Exception:
+        return False
+
+
 class VerdictLog:
     """Every verdict the page's network carries while a solve runs.
 
@@ -113,6 +121,8 @@ class VerdictLog:
 
     def __init__(self, page: Any) -> None:
         self.verdicts: List[RoundVerdict] = []
+        #: Requests the page's scripts have made. A board that answers a press with none has refused nothing.
+        self.exchanges = 0
         self._read = 0
         self._page = page
         self._attached = False
@@ -125,6 +135,8 @@ class VerdictLog:
     def _on_response(self, response: Any) -> None:
         try:
             url, status = response.url, response.status
+            if _is_a_scripted_request(response):
+                self.exchanges += 1
             if endpoint_for(url) is None:
                 return
             # Decoded leniently, as a browser's text() is: one deal endpoint answers in ciphertext, and its URL alone
@@ -136,6 +148,10 @@ class VerdictLog:
         if verdict is not None:
             self.verdicts.append(verdict)
 
+    @property
+    def listening(self) -> bool:
+        return self._attached
+
     def fresh(self) -> List[RoundVerdict]:
         """The verdicts that arrived since the last call."""
         new, self._read = self.verdicts[self._read:], len(self.verdicts)

package/dist/slide-geometry.d.ts

@@ -1,6 +0,0 @@
-export declare function solveSlideGeometry(widths: Array<[number, number]>, widgetWidth: number): {
-    pieceWidth: number | null;
-    ratio: number;
-};
-export declare const MIN_PIECE_PX = 3;
-export declare const MAX_PIECE_FRACTION = 0.6;

package/dist/slide-geometry.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MAX_PIECE_FRACTION = exports.MIN_PIECE_PX = void 0;
-exports.solveSlideGeometry = solveSlideGeometry;
-// Literals here match page_solver.py::_solve_slide_geometry; the ratio is assumed 1:1 unless two probes prove otherwise,
-// which is true of every vendor observed.
-function solveSlideGeometry(widths, widgetWidth) {
-    if (!widths.length)
-        return { pieceWidth: null, ratio: 1 };
-    let ratio = 1;
-    let pieceWidth = null;
-    // The widest-apart pair, not the last two: 1px rounding between neighbouring probes once gave a ratio of 0.5.
-    const sorted = [...widths].sort((a, b) => a[0] - b[0]);
-    const [o1, w1] = sorted[0];
-    const [o2, w2] = sorted[sorted.length - 1];
-    if (o2 - o1 >= MIN_OFFSET_SPREAD_PX) {
-        const candidate = (w2 - w1) / (o2 - o1);
-        if (candidate >= MIN_RATIO && candidate <= MAX_RATIO) {
-            ratio = candidate;
-            pieceWidth = w1 - ratio * o1;
-        }
-    }
-    if (pieceWidth === null) {
-        const [o, w] = widths[widths.length - 1];
-        pieceWidth = w - ratio * o;
-    }
-    if (pieceWidth < exports.MIN_PIECE_PX || pieceWidth > widgetWidth * exports.MAX_PIECE_FRACTION) {
-        return { pieceWidth: null, ratio };
-    }
-    return { pieceWidth, ratio };
-}
-// Box widths are ±1px, so the ratio error is ±2/spread: ±0.13 at 16px against ±0.5 at 4px, multiplied into every correction.
-const MIN_OFFSET_SPREAD_PX = 16.0;
-// A ratio of 0.02 from a redraw sends the handle off the track and, under camoufox, into a mouse move that never returns.
-const MIN_RATIO = 0.2;
-const MAX_RATIO = 3.0;
-exports.MIN_PIECE_PX = 3.0;
-exports.MAX_PIECE_FRACTION = 0.6;

package/python/src/captchakraken/tool_calls/track_piece.py

@@ -1,120 +0,0 @@
-"""Track a slide captcha's piece by what MOVED between two shots, not by what it is.
-
-Vendors vary the handle-to-piece ratio so the offset cannot be computed from the gap, so the driver sweeps,
-looks at what changed, and corrects. The changed box's left edge is the vacated ground and its right edge the
-piece's current edge; a sweep that clears the ground leaves two marks, and the right one IS the piece.
-"""
-
-from __future__ import annotations
-
-from typing import Optional, Sequence
-
-import cv2
-import numpy as np
-
-# Low enough to catch a piece over similar-luminance ground, above JPEG ringing and antialiased-edge jitter.
-_DIFF_THRESHOLD = 18
-
-# A press that has not moved yet leaves stray pixels; calling that a piece hands the caller a box it steers by.
-_MIN_CHANGED_PIXELS = 40
-
-# Two marks are the piece and its ghost only if they are the same object, so the same width to a quarter.
-_SAME_WIDTH_TOLERANCE = 0.25
-
-# Two regimes: a mark no more than half the travel is the piece, a mark of about the travel is the sliver at
-# either end of an overlap. `travel` is only believed, so the regimes have to sit far apart.
-_CLEARED_MARK_FRACTION = 0.5
-
-# A piece with a notch can go still for several columns; the two marks are a whole sweep apart.
-_MARK_GAP_PX = 10
-
-_MIN_COLUMN_PIXELS = 2
-
-
-def _change_mask(
-    before_path: str,
-    after_path: str,
-    exclude: Optional[Sequence[float]] = None,
-):
-    a = cv2.imread(before_path, cv2.IMREAD_GRAYSCALE)
-    b = cv2.imread(after_path, cv2.IMREAD_GRAYSCALE)
-    if a is None or b is None or a.shape != b.shape:
-        return None
-
-    mask = (cv2.absdiff(a, b) > _DIFF_THRESHOLD).astype(np.uint8)
-
-    if exclude is not None:
-        x1, y1, x2, y2 = (int(round(float(v))) for v in exclude)
-        x1, y1 = max(0, x1), max(0, y1)
-        x2, y2 = min(mask.shape[1], x2), min(mask.shape[0], y2)
-        if x2 > x1 and y2 > y1:
-            mask[y1:y2, x1:x2] = 0
-
-    # Erode speckle before measuring: the box is an EXTREME of the mask, so one stray pixel moves it as much as the piece.
-    mask = cv2.morphologyEx(mask, cv2.MORPH_OPEN, np.ones((3, 3), np.uint8))
-
-    if int(mask.sum()) < _MIN_CHANGED_PIXELS:
-        return None
-    return mask
-
-
-def _marks(mask) -> list:
-    """X-projection, not 2-D components: a piece that splits vertically (a notch, a highlight) is still one mark."""
-    on = (mask.sum(axis=0) >= _MIN_COLUMN_PIXELS)
-    marks: list = []
-    for x in np.nonzero(on)[0]:
-        x = int(x)
-        if marks and x - marks[-1][1] <= _MARK_GAP_PX:
-            marks[-1][1] = x + 1
-        else:
-            marks.append([x, x + 1])
-    return marks
-
-
-def changed_bbox(
-    before_path: str,
-    after_path: str,
-    exclude: Optional[Sequence[float]] = None,
-) -> Optional[list]:
-    """`exclude` is the handle's own box: left in, the handle and progress bar would dominate the union."""
-    mask = _change_mask(before_path, after_path, exclude)
-    if mask is None:
-        return None
-    ys, xs = np.nonzero(mask)
-    return [int(xs.min()), int(ys.min()), int(xs.max()) + 1, int(ys.max()) + 1]
-
-
-def locate_piece(
-    before_path: str,
-    after_path: str,
-    travel: float,
-    exclude: Optional[Sequence[float]] = None,
-) -> Optional[dict]:
-    mask = _change_mask(before_path, after_path, exclude)
-    if mask is None:
-        return None
-    marks = _marks(mask)
-    if not marks:
-        return None
-
-    # The piece is the RIGHTMOST mark that is still the same object; searched rather than `marks[-1]` because
-    # a board animating a badge elsewhere puts a mark in the frame that is neither.
-    ghost_w = float(marks[0][1] - marks[0][0])
-    for x1, x2 in reversed(marks[1:]):
-        piece_w = float(x2 - x1)
-        if (piece_w <= _CLEARED_MARK_FRACTION * travel
-                and abs(piece_w - ghost_w) <= max(3.0, _SAME_WIDTH_TOLERANCE * ghost_w)):
-            return {"centre": (x1 + x2) / 2.0, "width": piece_w}
-
-    left, right = float(marks[0][0]), float(marks[-1][1])
-    width = right - left
-    # Too narrow to hold both: one mark only. If it were the piece it began a `travel` to the left, and when that
-    # is off the board it cannot be, so it is the vacated ground and the piece is a travel beyond it.
-    if travel > 0 and width < travel:
-        centre = left + width / 2.0
-        return {"centre": centre + travel if centre - travel < 0 else centre,
-                "width": width}
-    piece_w = width - max(0.0, travel)
-    if piece_w <= 0:
-        return None
-    return {"centre": right - piece_w / 2.0, "width": piece_w}