mbuzz 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

mbuzz/middleware/flask.py

@@ -8,6 +8,7 @@ from ..config import config
 from ..context import RequestContext, set_context, clear_context
 from ..cookies import VISITOR_COOKIE, SESSION_COOKIE, VISITOR_MAX_AGE, SESSION_MAX_AGE
 from ..utils.identifier import generate_id
+from ..utils.session_id import generate_deterministic, generate_from_fingerprint
 from ..client.session import create_session
 
 
@@ -55,8 +56,29 @@ def _get_or_create_visitor_id() -> str:
 
 
 def _get_or_create_session_id() -> str:
-    """Get session ID from cookie or generate new one."""
-    return request.cookies.get(SESSION_COOKIE) or generate_id()
+    """Get session ID from cookie or generate deterministic one."""
+    existing = request.cookies.get(SESSION_COOKIE)
+    if existing:
+        return existing
+
+    existing_visitor_id = request.cookies.get(VISITOR_COOKIE)
+    if existing_visitor_id:
+        return generate_deterministic(existing_visitor_id)
+    else:
+        return generate_from_fingerprint(_get_client_ip(), _get_user_agent())
+
+
+def _get_client_ip() -> str:
+    """Get client IP from request headers."""
+    forwarded = request.headers.get("X-Forwarded-For", "")
+    if forwarded:
+        return forwarded.split(",")[0].strip()
+    return request.remote_addr or "unknown"
+
+
+def _get_user_agent() -> str:
+    """Get user agent from request."""
+    return request.headers.get("User-Agent", "unknown")
 
 
 def _set_request_context(visitor_id: str, session_id: str) -> None:

mbuzz/utils/session_id.py

@@ -0,0 +1,39 @@
+"""Deterministic session ID generation."""
+
+import hashlib
+import secrets
+import time
+
+SESSION_TIMEOUT_SECONDS = 1800
+SESSION_ID_LENGTH = 64
+FINGERPRINT_LENGTH = 32
+
+
+def generate_deterministic(visitor_id: str, timestamp: int | None = None) -> str:
+    """Generate session ID for returning visitors."""
+    if timestamp is None:
+        timestamp = int(time.time())
+    time_bucket = timestamp // SESSION_TIMEOUT_SECONDS
+    raw = f"{visitor_id}_{time_bucket}"
+    return hashlib.sha256(raw.encode()).hexdigest()[:SESSION_ID_LENGTH]
+
+
+def generate_from_fingerprint(
+    client_ip: str,
+    user_agent: str,
+    timestamp: int | None = None
+) -> str:
+    """Generate session ID for new visitors using IP+UA fingerprint."""
+    if timestamp is None:
+        timestamp = int(time.time())
+    fingerprint = hashlib.sha256(
+        f"{client_ip}|{user_agent}".encode()
+    ).hexdigest()[:FINGERPRINT_LENGTH]
+    time_bucket = timestamp // SESSION_TIMEOUT_SECONDS
+    raw = f"{fingerprint}_{time_bucket}"
+    return hashlib.sha256(raw.encode()).hexdigest()[:SESSION_ID_LENGTH]
+
+
+def generate_random() -> str:
+    """Generate random session ID (fallback)."""
+    return secrets.token_hex(32)

{mbuzz-0.1.0.dist-info → mbuzz-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbuzz
-Version: 0.1.0
+Version: 0.1.1
 Summary: Multi-touch attribution SDK for Python
 Project-URL: Homepage, https://mbuzz.co
 Project-URL: Documentation, https://mbuzz.co/docs/getting-started

{mbuzz-0.1.0.dist-info → mbuzz-0.1.1.dist-info}/RECORD

@@ -9,9 +9,10 @@ mbuzz/client/identify.py,sha256=duyd-OWdBo4w7-7Nv5X-GeG2IpMI-1G_kYwnDXup0FE,859
 mbuzz/client/session.py,sha256=mk8v892bvpeW-VNKFQYDsW442w881yfXBiM4sr9a0SU,835
 mbuzz/client/track.py,sha256=-leW3yJcg9Vm6dL7fLQvFwgUN-nZF-OmDRMeR_9Blz8,3725
 mbuzz/middleware/__init__.py,sha256=gIjwTArToaQNB2NC0iPE_RcmzuHjH7-7jjd7_Dyq4Pw,37
-mbuzz/middleware/flask.py,sha256=dRn8rnOTSrd0w7GjwzjxFFFGuCe7J84MvaNGTT5w4_k,3453
+mbuzz/middleware/flask.py,sha256=s3U77A2986L-KvWUH9MmqSwJwQWzQTYlZPZXH-wzE9o,4182
 mbuzz/utils/__init__.py,sha256=-ejtRN6CTkV3D8uujDtAPDoMT0DAG-ULpWOF-Ae55dY,103
 mbuzz/utils/identifier.py,sha256=iAYmd4he2RTtTNlmszb6KQmD9McZbSMgZZdkMuoGOCE,174
-mbuzz-0.1.0.dist-info/METADATA,sha256=HvgtdBRMTA3QqdpOrlkMUqIMoeq5LKnYPUuNrnwF9Hs,1849
-mbuzz-0.1.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-mbuzz-0.1.0.dist-info/RECORD,,
+mbuzz/utils/session_id.py,sha256=3XJkzPg5iUIbRYzz5LThfS8WTAmlmtn60WZTA_TlVhk,1185
+mbuzz-0.1.1.dist-info/METADATA,sha256=bs7g2oYQ3tRv5sHTWyA7wx4J5WC0z0OOTRUmQEdqKcQ,1849
+mbuzz-0.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mbuzz-0.1.1.dist-info/RECORD,,