flaresolverr-cli 0.2.1__tar.gz → 0.2.2__tar.gz

{flaresolverr_cli-0.2.1/flaresolverr_cli.egg-info → flaresolverr_cli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flaresolverr-cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: A requests.Session that proxies through a FlareSolverr instance.
 Home-page: https://github.com/Xavier-Lam/FlareSolverrSession
 Author: Xavier-Lam
@@ -114,16 +114,14 @@ All exceptions defined in the module based on `FlareSolverrError`, which inherit
     requests.RequestException
     └── FlareSolverrError
         ├── FlareSolverrResponseError
-        │   ├── FlareSolverrCaptchaError
-        │   └── FlareSolverrTimeoutError
+        │   ├── FlareSolverrChallengeError
         └── FlareSolverrUnsupportedMethodError
 
 
 | Exception | Description |
 |---|---|
 | `FlareSolverrResponseError` | FlareSolverr returned an error response. The response dict is available as `response_data` attribute. |
-| `FlareSolverrCaptchaError` | CAPTCHA detected. |
-| `FlareSolverrTimeoutError` | Request timed out. |
+| `FlareSolverrChallengeError` | Challenge solving failed. |
 | `FlareSolverrUnsupportedMethodError` | Unsupported HTTP method or content type. |
 
 ### Command-Line Interface
@@ -149,14 +147,20 @@ flaresolverr-cli https://example.com -d "key=value&foo=bar"
 #### Managing sessions
 
 ```bash
-# Create a session (auto-generated name)
+# Create a session
 flaresolverr-cli -f http://localhost:8191/v1 session create my-session
 
+# Create multiple sessions at once
+flaresolverr-cli session create session1 session2 session3
+
 # List all active sessions
 flaresolverr-cli session list
 
 # Destroy a session
 flaresolverr-cli session destroy my-session
+
+# Clear all sessions
+flaresolverr-cli session clear
 ```
 
 ### RPC Tool
@@ -164,7 +168,7 @@ flaresolverr-cli session destroy my-session
 The `flaresolverr_rpc` module provides a programmatic interface to the FlareSolverr JSON API, useful when you need low-level access to the raw API responses.
 
 ```python
-from flaresolverr_rpc import RPC
+from flaresolverr_session import RPC
 
 with RPC("http://localhost:8191/v1") as rpc:
     # Session management

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/README.md

@@ -70,16 +70,14 @@ All exceptions defined in the module based on `FlareSolverrError`, which inherit
     requests.RequestException
     └── FlareSolverrError
         ├── FlareSolverrResponseError
-        │   ├── FlareSolverrCaptchaError
-        │   └── FlareSolverrTimeoutError
+        │   ├── FlareSolverrChallengeError
         └── FlareSolverrUnsupportedMethodError
 
 
 | Exception | Description |
 |---|---|
 | `FlareSolverrResponseError` | FlareSolverr returned an error response. The response dict is available as `response_data` attribute. |
-| `FlareSolverrCaptchaError` | CAPTCHA detected. |
-| `FlareSolverrTimeoutError` | Request timed out. |
+| `FlareSolverrChallengeError` | Challenge solving failed. |
 | `FlareSolverrUnsupportedMethodError` | Unsupported HTTP method or content type. |
 
 ### Command-Line Interface
@@ -105,14 +103,20 @@ flaresolverr-cli https://example.com -d "key=value&foo=bar"
 #### Managing sessions
 
 ```bash
-# Create a session (auto-generated name)
+# Create a session
 flaresolverr-cli -f http://localhost:8191/v1 session create my-session
 
+# Create multiple sessions at once
+flaresolverr-cli session create session1 session2 session3
+
 # List all active sessions
 flaresolverr-cli session list
 
 # Destroy a session
 flaresolverr-cli session destroy my-session
+
+# Clear all sessions
+flaresolverr-cli session clear
 ```
 
 ### RPC Tool
@@ -120,7 +124,7 @@ flaresolverr-cli session destroy my-session
 The `flaresolverr_rpc` module provides a programmatic interface to the FlareSolverr JSON API, useful when you need low-level access to the raw API responses.
 
 ```python
-from flaresolverr_rpc import RPC
+from flaresolverr_session import RPC
 
 with RPC("http://localhost:8191/v1") as rpc:
     # Session management

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2/flaresolverr_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flaresolverr-cli
-Version: 0.2.1
+Version: 0.2.2
 Summary: A requests.Session that proxies through a FlareSolverr instance.
 Home-page: https://github.com/Xavier-Lam/FlareSolverrSession
 Author: Xavier-Lam
@@ -114,16 +114,14 @@ All exceptions defined in the module based on `FlareSolverrError`, which inherit
     requests.RequestException
     └── FlareSolverrError
         ├── FlareSolverrResponseError
-        │   ├── FlareSolverrCaptchaError
-        │   └── FlareSolverrTimeoutError
+        │   ├── FlareSolverrChallengeError
         └── FlareSolverrUnsupportedMethodError
 
 
 | Exception | Description |
 |---|---|
 | `FlareSolverrResponseError` | FlareSolverr returned an error response. The response dict is available as `response_data` attribute. |
-| `FlareSolverrCaptchaError` | CAPTCHA detected. |
-| `FlareSolverrTimeoutError` | Request timed out. |
+| `FlareSolverrChallengeError` | Challenge solving failed. |
 | `FlareSolverrUnsupportedMethodError` | Unsupported HTTP method or content type. |
 
 ### Command-Line Interface
@@ -149,14 +147,20 @@ flaresolverr-cli https://example.com -d "key=value&foo=bar"
 #### Managing sessions
 
 ```bash
-# Create a session (auto-generated name)
+# Create a session
 flaresolverr-cli -f http://localhost:8191/v1 session create my-session
 
+# Create multiple sessions at once
+flaresolverr-cli session create session1 session2 session3
+
 # List all active sessions
 flaresolverr-cli session list
 
 # Destroy a session
 flaresolverr-cli session destroy my-session
+
+# Clear all sessions
+flaresolverr-cli session clear
 ```
 
 ### RPC Tool
@@ -164,7 +168,7 @@ flaresolverr-cli session destroy my-session
 The `flaresolverr_rpc` module provides a programmatic interface to the FlareSolverr JSON API, useful when you need low-level access to the raw API responses.
 
 ```python
-from flaresolverr_rpc import RPC
+from flaresolverr_session import RPC
 
 with RPC("http://localhost:8191/v1") as rpc:
     # Session management

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/flaresolverr_cli.egg-info/SOURCES.txt

@@ -1,8 +1,5 @@
 LICENSE
 README.md
-cli.py
-flaresolverr_rpc.py
-flaresolverr_session.py
 setup.py
 flaresolverr_cli.egg-info/PKG-INFO
 flaresolverr_cli.egg-info/SOURCES.txt
@@ -10,6 +7,11 @@ flaresolverr_cli.egg-info/dependency_links.txt
 flaresolverr_cli.egg-info/entry_points.txt
 flaresolverr_cli.egg-info/requires.txt
 flaresolverr_cli.egg-info/top_level.txt
+flaresolverr_session/__init__.py
+flaresolverr_session/cli.py
+flaresolverr_session/exceptions.py
+flaresolverr_session/rpc.py
+flaresolverr_session/session.py
 tests/test_cli.py
 tests/test_rpc.py
 tests/test_session.py

flaresolverr_cli-0.2.2/flaresolverr_cli.egg-info/entry_points.txt

@@ -0,0 +1,2 @@
+[console_scripts]
+flaresolverr-cli = flaresolverr_session.cli:main

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/flaresolverr_cli.egg-info/top_level.txt

@@ -1,3 +1 @@
-cli
-flaresolverr_rpc
 flaresolverr_session

flaresolverr_cli-0.2.2/flaresolverr_session/__init__.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from flaresolverr_session.exceptions import (
+    FlareSolverrError,
+    FlareSolverrResponseError,
+    FlareSolverrChallengeError,
+    FlareSolverrUnsupportedMethodError,
+)
+from flaresolverr_session.rpc import RPC
+from flaresolverr_session.session import Session, Response
+
+__title__ = "flaresolverr-session"
+__description__ = "A requests.Session that proxies through a FlareSolverr instance."
+__url__ = "https://github.com/Xavier-Lam/FlareSolverrSession"
+__version__ = "0.2.2"
+__author__ = "Xavier-Lam"
+__author_email__ = "xavierlam7@hotmail.com"
+
+__all__ = [
+    "Session",
+    "Response",
+    "RPC",
+    "FlareSolverrError",
+    "FlareSolverrResponseError",
+    "FlareSolverrChallengeError",
+    "FlareSolverrUnsupportedMethodError",
+    "__version__",
+]

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2/flaresolverr_session}/cli.py

@@ -9,8 +9,8 @@ import json
 import os
 import sys
 
-from flaresolverr_rpc import RPC
-from flaresolverr_session import FlareSolverrResponseError
+from flaresolverr_session.rpc import RPC
+from flaresolverr_session.exceptions import FlareSolverrResponseError
 
 
 def main(argv=None):
@@ -101,9 +101,8 @@ def _build_session_parser():
     create_parser = session_sub.add_parser("create", help="Create a session")
     create_parser.add_argument(
         "name",
-        nargs="?",
-        default=None,
-        help="Optional session name",
+        nargs="+",
+        help="One or more session names to create",
     )
     create_parser.add_argument(
         "--proxy",
@@ -121,6 +120,9 @@ def _build_session_parser():
         help="Session identifier to destroy",
     )
 
+    # session clear
+    session_sub.add_parser("clear", help="Destroy all sessions")
+
     return parser
 
 
@@ -213,14 +215,16 @@ def _handle_session(rpc, args):
     action = args.session_action
 
     if action == "create":
-        return rpc.session.create(
-            session_id=getattr(args, "name", None),
-            proxy=getattr(args, "proxy", None),
-        )
+        names = getattr(args, "name", None)
+        proxy = getattr(args, "proxy", None)
+        return [rpc.session.create(session_id=n, proxy=proxy) for n in names]
     elif action == "list":
         return rpc.session.list()
     elif action == "destroy":
         return rpc.session.destroy(args.session_id)
+    elif action == "clear":
+        payload = rpc.session.list()
+        return [rpc.session.destroy(s) for s in payload["sessions"]]
     else:
         raise ValueError("Unknown session action: %s" % action)
 

flaresolverr_cli-0.2.2/flaresolverr_session/exceptions.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+import requests
+
+__all__ = [
+    "FlareSolverrError",
+    "FlareSolverrResponseError",
+    "FlareSolverrChallengeError",
+    "FlareSolverrUnsupportedMethodError",
+]
+
+
+class FlareSolverrError(requests.RequestException):
+    """Base exception for FlareSolverr errors."""
+
+
+class FlareSolverrResponseError(FlareSolverrError):
+    """Raised when FlareSolverr returns a non-ok response.
+
+    Attributes:
+        message (str): The error message from FlareSolverr.
+        response_data (dict or None): The original FlareSolverr response dict.
+    """
+
+    def __init__(self, message, response_data=None, **kwargs):
+        super(FlareSolverrResponseError, self).__init__(message, **kwargs)
+        self.message = message or ""
+        self.response_data = response_data
+
+
+class FlareSolverrChallengeError(FlareSolverrResponseError):
+    """Raised when a challenge could not be solved."""
+
+
+class FlareSolverrUnsupportedMethodError(FlareSolverrError):
+    """Raised when an unsupported HTTP method or content type is used."""

flaresolverr_cli-0.2.1/flaresolverr_rpc.py → flaresolverr_cli-0.2.2/flaresolverr_session/rpc.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function
 
+import json
 import os
 
 try:
@@ -10,10 +11,69 @@ except ImportError:
 
 import requests
 
-from flaresolverr_session import Session
+from flaresolverr_session.exceptions import FlareSolverrError, FlareSolverrResponseError
 
+__all__ = [
+    "RPC",
+    "SessionCommand",
+    "RequestCommand",
+    "FlareSolverrError",
+    "FlareSolverrResponseError",
+]
 
-__all__ = ["RPC", "SessionCommand", "RequestCommand"]
+
+class RPC(object):
+    """RPC client for FlareSolverr.
+
+    Provides two sub-command namespaces:
+
+    - :attr:`session` -- :class:`SessionCommand` for session management.
+    - :attr:`request` -- :class:`RequestCommand` for HTTP requests.
+
+    Parameters:
+        flaresolverr_url (str): The FlareSolverr API endpoint
+            (e.g. ``"http://localhost:8191/v1"``).
+        api_session (requests.Session or None): An optional pre-configured
+            session to use for API calls.
+    """
+
+    def __init__(self, flaresolverr_url=None, api_session=None):
+        if flaresolverr_url is None:
+            flaresolverr_url = os.environ.get(
+                "FLARESOLVERR_URL", "http://localhost:8191/v1"
+            )
+        if api_session is None:
+            api_session = requests.Session()
+
+        self._flaresolverr_url = flaresolverr_url
+        self._api_session = api_session
+        self.session = SessionCommand(self)
+        self.request = RequestCommand(self)
+
+    def send(self, payload):
+        """Send a JSON payload to the FlareSolverr endpoint.
+
+        Parameters:
+            payload (dict): The JSON-serialisable payload to send.
+
+        Returns:
+            dict: The parsed JSON response from FlareSolverr.
+
+        Raises:
+            FlareSolverrResponseError: If the response status is
+                not ``"ok"``.
+        """
+        headers = {"Content-Type": "application/json"}
+        resp = self._api_session.post(
+            self._flaresolverr_url,
+            headers=headers,
+            data=json.dumps(payload),
+        )
+        data = resp.json()
+        status = data.get("status", "")
+        if status != "ok":
+            raise FlareSolverrResponseError(data.get("message"), data, response=resp)
+        return data
 
 
 class SessionCommand(object):
@@ -59,7 +119,7 @@ class SessionCommand(object):
                 payload["proxy"] = proxy
             else:
                 payload["proxy"] = {"url": proxy}
-        return self._rpc._session.send(payload)
+        return self._rpc.send(payload)
 
     def list(self):
         """List all active FlareSolverr browser sessions.
@@ -78,7 +138,7 @@ class SessionCommand(object):
                   timestamp (ms).
         """
         payload = {"cmd": "sessions.list"}
-        return self._rpc._session.send(payload)
+        return self._rpc.send(payload)
 
     def destroy(self, session_id):
         """Destroy an existing FlareSolverr browser session.
@@ -102,7 +162,7 @@ class SessionCommand(object):
             "cmd": "sessions.destroy",
             "session": session_id,
         }
-        return self._rpc._session.send(payload)
+        return self._rpc.send(payload)
 
 
 class RequestCommand(object):
@@ -344,43 +404,4 @@ class RequestCommand(object):
         elif cmd == "request.post":
             # FlareSolverr requires postData for request.post; send empty string
             payload["postData"] = ""
-        return self._rpc._session.send(payload)
-
-
-class RPC(object):
-    """RPC client for FlareSolverr.
-
-    Provides two sub-command namespaces:
-
-    - :attr:`session` -- :class:`SessionCommand` for session management.
-    - :attr:`request` -- :class:`RequestCommand` for HTTP requests.
-
-    The underlying transport reuses
-    :meth:`flaresolverr_session.Session.send`, which is the same
-    low-level method used by the high-level
-    :class:`~flaresolverr_session.Session`.
-
-    Parameters:
-        flaresolverr_url (str): The FlareSolverr API endpoint
-            (e.g. ``"http://localhost:8191/v1"``).
-        api_session (requests.Session or None): An optional pre-configured
-            session to use for API calls.
-    """
-
-    def __init__(self, flaresolverr_url=None, api_session=None):
-        if flaresolverr_url is None:
-            flaresolverr_url = os.environ.get(
-                "FLARESOLVERR_URL", "http://localhost:8191/v1"
-            )
-        if api_session is None:
-            api_session = requests.Session()
-
-        self._session = Session(flaresolverr_url, session=api_session)
-        self.session = SessionCommand(self)
-        self.request = RequestCommand(self)
-
-    def __enter__(self):
-        return self
-
-    def __exit__(self, *args):
-        pass
+        return self._rpc.send(payload)

flaresolverr_cli-0.2.1/flaresolverr_session.py → flaresolverr_cli-0.2.2/flaresolverr_session/session.py

@@ -1,6 +1,6 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
-import json
+import warnings
 
 try:
     from urllib import urlencode
@@ -10,47 +10,12 @@ except ImportError:
 import requests
 from requests.structures import CaseInsensitiveDict
 
-__title__ = "flaresolverr-session"
-__description__ = "A requests.Session that proxies through a FlareSolverr instance."
-__url__ = "https://github.com/Xavier-Lam/FlareSolverrSession"
-__version__ = "0.2.1"
-__author__ = "Xavier-Lam"
-__author_email__ = "xavierlam7@hotmail.com"
-
-__all__ = ["Session", "FlareSolverr", "Response", "FlareSolverrError",
-           "FlareSolverrResponseError", "FlareSolverrCaptchaError",
-           "FlareSolverrTimeoutError", "FlareSolverrUnsupportedMethodError",
-           "__version__",]
-
-
-class FlareSolverrError(requests.RequestException):
-    """Base exception for FlareSolverr errors."""
-
-
-class FlareSolverrResponseError(FlareSolverrError):
-    """Raised when FlareSolverr returns a non-ok response.
-
-    Attributes:
-        message (str): The error message from FlareSolverr.
-        response_data (dict or None): The original FlareSolverr response dict.
-    """
-
-    def __init__(self, message, response_data=None, **kwargs):
-        super(FlareSolverrResponseError, self).__init__(message, **kwargs)
-        self.message = message or ""
-        self.response_data = response_data
-
-
-class FlareSolverrCaptchaError(FlareSolverrResponseError):
-    """Raised when a CAPTCHA was encountered but could not be solved."""
-
-
-class FlareSolverrTimeoutError(FlareSolverrResponseError):
-    """Raised when FlareSolverr timed out while solving the challenge."""
-
-
-class FlareSolverrUnsupportedMethodError(FlareSolverrError):
-    """Raised when an unsupported HTTP method or content type is used."""
+from flaresolverr_session.rpc import RPC
+from flaresolverr_session.exceptions import (
+    FlareSolverrResponseError,
+    FlareSolverrChallengeError,
+    FlareSolverrUnsupportedMethodError,
+)
 
 
 class Session(requests.Session):
@@ -62,8 +27,9 @@ class Session(requests.Session):
     FlareSolverr-specific attributes.
 
     Parameters:
-        flaresolverr_url (str): The FlareSolverr API endpoint
-            (e.g. ``"http://localhost:8191/v1"``).
+        flaresolverr_url (str or None): The FlareSolverr API endpoint
+            (e.g. ``"http://localhost:8191/v1"``).  Ignored when *rpc*
+            is provided.
         session_id (str or None): An optional FlareSolverr session id.
             When *None* a new session is automatically created.
         proxy (str, dict or None): A proxy specification.
@@ -72,8 +38,9 @@ class Session(requests.Session):
             ``"username"`` and ``"password"`` keys.
         timeout (int or None): ``maxTimeout`` in **milliseconds**
             passed to FlareSolverr.  Defaults to *60000* (60 s).
-        session (requests.Session or None): An optional pre-configured
-            session to use for API calls.
+        rpc (RPC or None): An optional pre-configured
+            :class:`~flaresolverr_session.rpc.RPC` instance.  When provided,
+            *flaresolverr_url* is ignored.
 
     .. note::
 
@@ -87,15 +54,28 @@ class Session(requests.Session):
 
     _SUPPORTED_METHODS = ("GET", "POST")
 
-    def __init__(self, flaresolverr_url, session_id=None, proxy=None,
-                 timeout=None, session=None):
+    def __init__(
+        self, flaresolverr_url=None, session_id=None, proxy=None, timeout=None, rpc=None
+    ):
         super(Session, self).__init__()
-        self._flaresolverr_url = flaresolverr_url
-        self._timeout = timeout or self.DEFAULT_TIMEOUT
-        self._proxy = self._normalise_proxy(proxy)
 
+        if rpc is not None and flaresolverr_url is not None:
+            warnings.warn(
+                "Both 'rpc' and 'flaresolverr_url' are provided. "
+                "The 'rpc' instance will be used and 'flaresolverr_url' "
+                "will be ignored.",
+                stacklevel=2,
+            )
+
+        if not rpc:
+            rpc = RPC(flaresolverr_url)
+        self._rpc = rpc
+
+        self._timeout = timeout or self.DEFAULT_TIMEOUT
+        if proxy and not isinstance(proxy, dict):
+            proxy = {"url": proxy}
+        self._proxy = proxy
         self._session_id = session_id
-        self._api_session = session or requests.Session()
         self._session_created = False
 
     @property
@@ -126,12 +106,9 @@ class Session(requests.Session):
             FlareSolverrUnsupportedMethodError: If *method* is not
                 ``GET`` or ``POST``, or if ``json`` data is passed.
             FlareSolverrResponseError: If FlareSolverr returns a
-                non-ok status for any reason (challenge not solved,
-                timeout, session error, etc.).  The original response
-                dict is available on the exception's ``response``
-                attribute.
-            FlareSolverrCaptchaError: If a CAPTCHA was detected.
-            FlareSolverrTimeoutError: If FlareSolverr timed out.
+                non-ok status for a reason not related to a challenge.
+            FlareSolverrChallengeError: If a challenge, CAPTCHA, or
+                timeout was encountered.
         """
         method = method.upper()
         if method not in self._SUPPORTED_METHODS:
@@ -146,28 +123,31 @@ class Session(requests.Session):
                 "POST requests. JSON POST is not supported."
             )
 
-        payload = self._build_payload(method, url, **kwargs)
+        request_kwargs = self._build_request_kwargs(method, url, **kwargs)
         try:
-            resp_data = self.send(payload)
+            if method == "GET":
+                resp_data = self._rpc.request.get(**request_kwargs)
+            else:
+                resp_data = self._rpc.request.post(**request_kwargs)
         except FlareSolverrResponseError as e:
-            if "captcha" in e.message.lower():
-                raise FlareSolverrCaptchaError(e.message, response_data=e.response_data)
-            elif "timeout" in e.message.lower():
-                raise FlareSolverrTimeoutError(e.message, response_data=e.response_data)
+            msg = e.message.lower()
+            if "captcha" in msg or "timeout" in msg or "challenge" in msg:
+                raise FlareSolverrChallengeError(
+                    e.message, response_data=e.response_data
+                )
             raise
         return Response(resp_data)
 
     def close(self):
-        """Destroy the FlareSolverr session and close both the API
-        session and the inherited ``requests.Session``."""
+        """Destroy the FlareSolverr session and close the inherited
+        ``requests.Session``."""
         try:
             if self._session_created:
                 self._destroy_session()
         finally:
-            self._api_session.close()
             super(Session, self).close()
 
-    def _build_payload(self, method, url, **kwargs):
+    def _build_request_kwargs(self, method, url, **kwargs):
         params = kwargs.get("params")
         if params:
             if isinstance(params, dict):
@@ -177,12 +157,10 @@ class Session(requests.Session):
                 else:
                     url = url + "?" + encoded_params
 
-        cmd = "request.get" if method == "GET" else "request.post"
-        payload = {
-            "cmd": cmd,
+        request_kwargs = {
             "url": url,
-            "session": self.session_id,
-            "maxTimeout": kwargs.get("timeout", self._timeout),
+            "session_id": self.session_id,
+            "max_timeout": kwargs.get("timeout", self._timeout),
         }
 
         # POST data
@@ -199,64 +177,29 @@ class Session(requests.Session):
                     except NameError:
                         pass
                     data = str(data)
-                payload["postData"] = data
+                request_kwargs["data"] = data
 
         # Optional cookies
         cookies = kwargs.get("cookies")
         if cookies:
-            payload["cookies"] = cookies
-
-        return payload
-
-    @staticmethod
-    def _normalise_proxy(proxy):
-        if proxy is None:
-            return None
-        if isinstance(proxy, dict):
-            return proxy
-        return {"url": proxy}
-
-    def send(self, payload):
-        headers = {"Content-Type": "application/json"}
-        resp = self._api_session.post(
-            self._flaresolverr_url,
-            headers=headers,
-            data=json.dumps(payload),
-        )
-        data = resp.json()
-        status = data.get("status", "")
-        if status != "ok":
-            raise FlareSolverrResponseError(
-                data.get("message"), data, response=resp)
-        return data
-
-    def _create_session(self):
-        payload = {
-            "cmd": "sessions.create",
-        }
-        if self._session_id:
-            payload["session"] = self._session_id
-        if self._proxy:
-            payload["proxy"] = self._proxy
+            request_kwargs["cookies"] = cookies
 
-        data = self.send(payload)
+        return request_kwargs
 
+    def _create_session(self):
+        """Create a FlareSolverr browser session via RPC."""
+        data = self._rpc.session.create(session_id=self._session_id, proxy=self._proxy)
         self._session_id = data.get("session", self._session_id)
         self._session_created = True
 
     def _destroy_session(self):
+        """Destroy the FlareSolverr browser session via RPC."""
         if not self._session_id:
             return
-
-        payload = {
-            "cmd": "sessions.destroy",
-            "session": self._session_id,
-        }
         try:
-            self.send(payload)
+            self._rpc.session.destroy(self._session_id)
         except Exception:
             return  # Best-effort cleanup
-
         self._session_created = False
 
 
@@ -273,8 +216,9 @@ class FlareSolverr(object):
         version (str): FlareSolverr server version.
     """
 
-    def __init__(self, status="", message="", user_agent="",
-                 start=0, end=0, version=""):
+    def __init__(
+        self, status="", message="", user_agent="", start=0, end=0, version=""
+    ):
         self.status = status
         self.message = message
         self.user_agent = user_agent
@@ -284,7 +228,10 @@ class FlareSolverr(object):
 
     def __repr__(self):
         return "FlareSolverr(status=%r, message=%r, version=%r)" % (
-            self.status, self.message, self.version)
+            self.status,
+            self.message,
+            self.version,
+        )
 
 
 class Response(requests.Response):

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/setup.py

@@ -11,15 +11,16 @@ with io.open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
     long_description = f.read()
 
 package = dict()
-with io.open(os.path.join(this_directory, "flaresolverr_session.py"),
-             encoding="utf-8") as f:
+with io.open(
+    os.path.join(this_directory, "flaresolverr_session", "__init__.py"),
+    encoding="utf-8",
+) as f:
     for line in f:
         match = re.match(r"(__\w+?__)\s*=\s*(.+)$", line)
         if match and match.group(1) != "__all__":
             package[match.group(1)] = eval(match.group(2))
 
-package_name = os.environ.get("FLARESOLVERR_PACKAGE_NAME",
-                              package["__title__"])
+package_name = os.environ.get("FLARESOLVERR_PACKAGE_NAME", package["__title__"])
 
 setup(
     name=package_name,
@@ -31,14 +32,14 @@ setup(
     long_description=long_description,
     long_description_content_type="text/markdown",
     license="MIT",
-    py_modules=["flaresolverr_session", "flaresolverr_rpc", "cli"],
+    packages=["flaresolverr_session"],
     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*",
     install_requires=[
         "requests",
     ],
     entry_points={
         "console_scripts": [
-            "flaresolverr-cli=cli:main",
+            "flaresolverr-cli=flaresolverr_session.cli:main",
         ],
     },
     extras_require={

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/tests/test_cli.py

@@ -21,11 +21,9 @@ if sys.version_info[0] >= 3:
 else:
     from StringIO import StringIO  # Python 2
 
-from cli import main, _truncate_response_body
+from flaresolverr_session.cli import main, _truncate_response_body
 from flaresolverr_session import (
     FlareSolverrResponseError,
-    FlareSolverrCaptchaError,
-    FlareSolverrTimeoutError,
     FlareSolverrError,
 )
 
@@ -60,6 +58,14 @@ def _fake_rpc():
         "startTimestamp": 100,
         "endTimestamp": 200,
     }
+    rpc.session.clear.return_value = {
+        "status": "ok",
+        "message": "All sessions cleared successfully.",
+        "sessions": ["s1", "s2"],
+        "version": "3.3.21",
+        "startTimestamp": 100,
+        "endTimestamp": 200,
+    }
     rpc.request.get.return_value = {
         "status": "ok",
         "message": "Challenge solved!",
@@ -107,7 +113,7 @@ def _run_cli(argv, rpc=None):
     if rpc is None:
         rpc = _fake_rpc()
 
-    with mock.patch("cli.RPC", return_value=rpc):
+    with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc):
         old_stdout = sys.stdout
         old_stderr = sys.stderr
         sys.stdout = captured_out = StringIO()
@@ -126,23 +132,28 @@ class TestSessionCreate(unittest.TestCase):
 
     def test_create_no_args(self):
         """session create with no extra args."""
-        code, out, _err, rpc = _run_cli(["session", "create"])
-        self.assertEqual(code, 0)
-        rpc.session.create.assert_called_once_with(session_id=None, proxy=None)
-        data = json.loads(out)
-        self.assertEqual(data["status"], "ok")
+        with self.assertRaises(SystemExit):
+            main(["session", "create"])
 
     def test_create_with_name(self):
         """session create with a session name."""
         code, out, _err, rpc = _run_cli(["session", "create", "my-sess"])
         self.assertEqual(code, 0)
+        self.assertEqual(rpc.session.create.call_count, 1)
         rpc.session.create.assert_called_once_with(session_id="my-sess", proxy=None)
+        data = json.loads(out)
+        self.assertIsInstance(data, list)
+        self.assertEqual(len(data), 1)
 
     def test_create_with_proxy(self):
         """session create with --proxy."""
-        code, out, _err, rpc = _run_cli(["session", "create", "--proxy", "http://p:80"])
+        code, out, _err, rpc = _run_cli(
+            ["session", "create", "my-sess", "--proxy", "http://p:80"]
+        )
         self.assertEqual(code, 0)
-        rpc.session.create.assert_called_once_with(session_id=None, proxy="http://p:80")
+        rpc.session.create.assert_called_once_with(
+            session_id="my-sess", proxy="http://p:80"
+        )
 
     def test_create_with_name_and_proxy(self):
         """session create with name and proxy."""
@@ -157,15 +168,26 @@ class TestSessionCreate(unittest.TestCase):
     def test_create_with_flaresolverr_url(self):
         """session create with -f flag."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc) as rpc_cls:
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc) as rpc_cls:
             old_stdout = sys.stdout
             sys.stdout = StringIO()
             try:
-                main(["-f", "http://custom:9999/v1", "session", "create"])
+                main(["-f", "http://custom:9999/v1", "session", "create", "n1"])
             finally:
                 sys.stdout = old_stdout
             rpc_cls.assert_called_once_with("http://custom:9999/v1")
 
+    def test_create_with_multiple_names(self):
+        """session create with multiple names."""
+        code, out, _err, rpc = _run_cli(["session", "create", "a", "b"])
+        self.assertEqual(code, 0)
+        self.assertEqual(rpc.session.create.call_count, 2)
+        rpc.session.create.assert_any_call(session_id="a", proxy=None)
+        rpc.session.create.assert_any_call(session_id="b", proxy=None)
+        data = json.loads(out)
+        self.assertIsInstance(data, list)
+        self.assertEqual(len(data), 2)
+
 
 class TestSessionList(unittest.TestCase):
     """Tests for 'session list' CLI command."""
@@ -191,6 +213,22 @@ class TestSessionDestroy(unittest.TestCase):
         self.assertEqual(data["status"], "ok")
 
 
+class TestSessionClear(unittest.TestCase):
+    """Tests for 'session clear' CLI command."""
+
+    def test_clear(self):
+        """session clear invokes RPC.session.clear()."""
+        code, out, _err, rpc = _run_cli(["session", "clear"])
+        self.assertEqual(code, 0)
+        rpc.session.list.assert_called_once()
+        self.assertEqual(rpc.session.destroy.call_count, 2)
+        rpc.session.destroy.assert_any_call("s1")
+        rpc.session.destroy.assert_any_call("s2")
+        data = json.loads(out)
+        self.assertIsInstance(data, list)
+        self.assertEqual(len(data), 2)
+
+
 class TestRequestDefault(unittest.TestCase):
     """Tests for the default request command (URL as first arg)."""
 
@@ -368,7 +406,7 @@ class TestRequestWithOptions(unittest.TestCase):
     def test_flaresolverr_url_passed_to_rpc(self):
         """The -f flag is forwarded to RPC constructor."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc) as rpc_cls:
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc) as rpc_cls:
             old_stdout = sys.stdout
             sys.stdout = StringIO()
             try:
@@ -380,7 +418,7 @@ class TestRequestWithOptions(unittest.TestCase):
     def test_flaresolverr_url_with_request_command(self):
         """The -f flag works with explicit request command."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc) as rpc_cls:
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc) as rpc_cls:
             old_stdout = sys.stdout
             sys.stdout = StringIO()
             try:
@@ -396,10 +434,15 @@ class TestRequestOutputFile(unittest.TestCase):
     def test_output_file(self):
         """Response body is written to file."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc):
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc):
             m = mock.mock_open()
             with mock.patch(
-                "cli.open" if sys.version_info[0] >= 3 else "__builtin__.open", m
+                (
+                    "flaresolverr_session.cli.open"
+                    if sys.version_info[0] >= 3
+                    else "__builtin__.open"
+                ),
+                m,
             ):
                 old_stdout = sys.stdout
                 sys.stdout = StringIO()
@@ -434,10 +477,15 @@ class TestRequestOutputFile(unittest.TestCase):
             "endTimestamp": 200,
         }
 
-        with mock.patch("cli.RPC", return_value=rpc):
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc):
             m = mock.mock_open()
             with mock.patch(
-                "cli.open" if sys.version_info[0] >= 3 else "__builtin__.open", m
+                (
+                    "flaresolverr_session.cli.open"
+                    if sys.version_info[0] >= 3
+                    else "__builtin__.open"
+                ),
+                m,
             ):
                 old_stdout = sys.stdout
                 sys.stdout = StringIO()
@@ -537,7 +585,7 @@ class TestTwoPassParsing(unittest.TestCase):
     def test_f_flag_before_command(self):
         """-f before session command."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc) as rpc_cls:
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc) as rpc_cls:
             old_stdout = sys.stdout
             sys.stdout = StringIO()
             try:
@@ -549,7 +597,7 @@ class TestTwoPassParsing(unittest.TestCase):
     def test_f_flag_before_url(self):
         """-f before URL (implicit request)."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc) as rpc_cls:
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc) as rpc_cls:
             old_stdout = sys.stdout
             sys.stdout = StringIO()
             try:
@@ -562,7 +610,7 @@ class TestTwoPassParsing(unittest.TestCase):
     def test_f_flag_after_url(self):
         """-f after URL (implicit request)."""
         rpc = _fake_rpc()
-        with mock.patch("cli.RPC", return_value=rpc) as rpc_cls:
+        with mock.patch("flaresolverr_session.cli.RPC", return_value=rpc) as rpc_cls:
             old_stdout = sys.stdout
             sys.stdout = StringIO()
             try:
@@ -652,9 +700,9 @@ class TestCliErrorHandling(unittest.TestCase):
         self.assertEqual(str(e), "Connection refused")
 
     def test_captcha_error_exits_nonzero(self):
-        """FlareSolverrCaptchaError causes exit code 1."""
+        """FlareSolverrResponseError with captcha message causes exit code 1."""
         fake_resp = {"status": "error", "message": "Captcha detected"}
-        exc = FlareSolverrCaptchaError("Captcha detected", response_data=fake_resp)
+        exc = FlareSolverrResponseError("Captcha detected", response_data=fake_resp)
         rpc = self._make_rpc_raising(exc)
         code, out, err, _ = _run_cli(["https://example.com"], rpc=rpc)
         self.assertEqual(code, 1)
@@ -662,9 +710,9 @@ class TestCliErrorHandling(unittest.TestCase):
         self.assertEqual(data["message"], "Captcha detected")
 
     def test_timeout_error_exits_nonzero(self):
-        """FlareSolverrTimeoutError causes exit code 1."""
+        """FlareSolverrResponseError with timeout message causes exit code 1."""
         fake_resp = {"status": "error", "message": "Error: Timeout reached"}
-        exc = FlareSolverrTimeoutError(
+        exc = FlareSolverrResponseError(
             "Error: Timeout reached", response_data=fake_resp
         )
         rpc = self._make_rpc_raising(exc)

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/tests/test_rpc.py

@@ -2,7 +2,7 @@
 
 import unittest
 
-from flaresolverr_rpc import RPC
+from flaresolverr_session import RPC
 
 # Python 2/3 compatible string type check
 try:
@@ -254,18 +254,5 @@ class TestRequestPost(RPCTestCase):
         _assert_solution(result["solution"])
 
 
-class TestRPCContextManager(unittest.TestCase):
-    def test_context_manager_returns_rpc(self):
-        """The context manager yields the RPC instance itself."""
-        with RPC() as rpc:
-            assert isinstance(rpc, RPC)
-
-    def test_context_manager_executes_request(self):
-        """Requests work inside a context manager block."""
-        with RPC() as rpc:
-            result = rpc.session.list()
-            _assert_ok(result)
-
-
 if __name__ == "__main__":
     unittest.main()

{flaresolverr_cli-0.2.1 → flaresolverr_cli-0.2.2}/tests/test_session.py

@@ -28,10 +28,9 @@ except ImportError:
 import requests
 
 from flaresolverr_session import (
-    FlareSolverrCaptchaError,
+    FlareSolverrChallengeError,
     FlareSolverrError,
     FlareSolverrResponseError,
-    FlareSolverrTimeoutError,
     FlareSolverrUnsupportedMethodError,
     Session,
     Response,
@@ -84,8 +83,7 @@ def _assert_response(response, entry):
 
 
 def _list_sessions(session=None):
-    payload = {"cmd": "sessions.list"}
-    data = session.send(payload)
+    data = session._rpc.session.list()
     return data.get("sessions", [])
 
 
@@ -157,7 +155,7 @@ class TestUnsolvedChallenge(unittest.TestCase):
     """Mock an unsolved challenge to verify exception handling."""
 
     def test_challenge_not_solved(self):
-        """FlareSolverrResponseError raised on failed challenge."""
+        """FlareSolverrChallengeError raised on failed challenge."""
         fake_json = {
             "status": "error",
             "message": "Challenge not solved",
@@ -169,19 +167,19 @@ class TestUnsolvedChallenge(unittest.TestCase):
         with _make_session() as session:
             # Force session creation before mock
             _ = session.session_id
-            with mock.patch.object(session._api_session, "post") as mocked_post:
+            with mock.patch.object(session._rpc._api_session, "post") as mocked_post:
                 mock_resp = mock.MagicMock()
                 mock_resp.json.return_value = fake_json
                 mocked_post.return_value = mock_resp
 
-                with self.assertRaises(FlareSolverrResponseError) as ctx:
+                with self.assertRaises(FlareSolverrChallengeError) as ctx:
                     session.get("https://example.com")
                 self.assertEqual(ctx.exception.response_data, fake_json)
                 self.assertIsInstance(ctx.exception, FlareSolverrResponseError)
                 self.assertEqual(ctx.exception.message, "Challenge not solved")
 
     def test_captcha_detected(self):
-        """FlareSolverrCaptchaError raised when captcha is detected."""
+        """FlareSolverrChallengeError raised when captcha is detected."""
         fake_json = {
             "status": "error",
             "message": ("Captcha detected but no automatic solver is configured."),
@@ -193,18 +191,18 @@ class TestUnsolvedChallenge(unittest.TestCase):
         with _make_session() as session:
             # Force session creation before mock
             _ = session.session_id
-            with mock.patch.object(session._api_session, "post") as mocked_post:
+            with mock.patch.object(session._rpc._api_session, "post") as mocked_post:
                 mock_resp = mock.MagicMock()
                 mock_resp.json.return_value = fake_json
                 mocked_post.return_value = mock_resp
 
-                with self.assertRaises(FlareSolverrCaptchaError) as ctx:
+                with self.assertRaises(FlareSolverrChallengeError) as ctx:
                     session.get("https://example.com")
                 self.assertEqual(ctx.exception.response_data, fake_json)
                 self.assertIsInstance(ctx.exception, FlareSolverrResponseError)
 
     def test_timeout_error(self):
-        """FlareSolverrTimeoutError raised on timeout."""
+        """FlareSolverrChallengeError raised on timeout."""
         fake_json = {
             "status": "error",
             "message": "Error: Timeout reached",
@@ -216,12 +214,12 @@ class TestUnsolvedChallenge(unittest.TestCase):
         with _make_session() as session:
             # Force session creation before mock
             _ = session.session_id
-            with mock.patch.object(session._api_session, "post") as mocked_post:
+            with mock.patch.object(session._rpc._api_session, "post") as mocked_post:
                 mock_resp = mock.MagicMock()
                 mock_resp.json.return_value = fake_json
                 mocked_post.return_value = mock_resp
 
-                with self.assertRaises(FlareSolverrTimeoutError) as ctx:
+                with self.assertRaises(FlareSolverrChallengeError) as ctx:
                     session.get("https://example.com")
                 self.assertEqual(ctx.exception.response_data, fake_json)
                 self.assertIsInstance(ctx.exception, FlareSolverrResponseError)
@@ -535,11 +533,8 @@ class TestExceptionHierarchy(unittest.TestCase):
     def test_response_error_inherits_from_base(self):
         assert issubclass(FlareSolverrResponseError, FlareSolverrError)
 
-    def test_captcha_error_inherits_from_response_error(self):
-        assert issubclass(FlareSolverrCaptchaError, FlareSolverrResponseError)
-
-    def test_timeout_error_inherits_from_response_error(self):
-        assert issubclass(FlareSolverrTimeoutError, FlareSolverrResponseError)
+    def test_challenge_error_inherits_from_response_error(self):
+        assert issubclass(FlareSolverrChallengeError, FlareSolverrResponseError)
 
     def test_unsupported_method_error(self):
         assert issubclass(FlareSolverrUnsupportedMethodError, FlareSolverrError)
@@ -550,16 +545,10 @@ class TestExceptionHierarchy(unittest.TestCase):
         exc = FlareSolverrResponseError("oops", response_data=data)
         assert exc.response_data is data
 
-    def test_captcha_error_carries_response_dict(self):
-        """FlareSolverrCaptchaError stores the raw response."""
-        data = {"status": "error", "message": "captcha"}
-        exc = FlareSolverrCaptchaError("captcha", response_data=data)
-        assert exc.response_data is data
-
-    def test_timeout_error_carries_response_dict(self):
-        """FlareSolverrTimeoutError stores the raw response."""
-        data = {"status": "error", "message": "timeout"}
-        exc = FlareSolverrTimeoutError("timeout", response_data=data)
+    def test_challenge_error_carries_response_dict(self):
+        """FlareSolverrChallengeError stores the raw response."""
+        data = {"status": "error", "message": "challenge"}
+        exc = FlareSolverrChallengeError("challenge", response_data=data)
         assert exc.response_data is data
 
 

flaresolverr_cli-0.2.1/flaresolverr_cli.egg-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-flaresolverr-cli = cli:main