chatwire 0.2.2__tar.gz → 0.3.0__tar.gz

{chatwire-0.2.2/chatwire.egg-info → chatwire-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatwire
-Version: 0.2.2
+Version: 0.3.0
 Summary: macOS chat-relay bridge: iMessage <-> Telegram, web UI, and pluggable integrations
 Author: Allen Bina
 License: MIT License
@@ -184,6 +184,22 @@ the first install, and it's the same on every Mac.
 `scripts/check-permissions.sh` (or `chatwire doctor`) will tell you
 which prompts you still need to click.
 
+## Privacy
+
+**No telemetry.** chatwire collects no analytics, sends no usage data, and
+includes no third-party SDKs that report back. Your messages, contacts,
+and `chat.db` stay on your Mac; outbound traffic only goes to integrations
+you configure (e.g. Telegram via your own bot token).
+
+Two narrow third-party requests the web UI does make, neither carrying any
+of your data:
+
+- The update-check banner fetches `api.github.com/repos/<repo>/releases/latest`
+  once a day to surface new-version notices. Disable by setting
+  `UPDATE_CHECK_REPO=""` in the launchd agent's environment.
+- Static assets (htmx, emoji-picker-element) load from `unpkg.com` and
+  `cdn.jsdelivr.net`.
+
 ## Repo layout
 
 ```

{chatwire-0.2.2 → chatwire-0.3.0}/README.md

@@ -128,6 +128,22 @@ the first install, and it's the same on every Mac.
 `scripts/check-permissions.sh` (or `chatwire doctor`) will tell you
 which prompts you still need to click.
 
+## Privacy
+
+**No telemetry.** chatwire collects no analytics, sends no usage data, and
+includes no third-party SDKs that report back. Your messages, contacts,
+and `chat.db` stay on your Mac; outbound traffic only goes to integrations
+you configure (e.g. Telegram via your own bot token).
+
+Two narrow third-party requests the web UI does make, neither carrying any
+of your data:
+
+- The update-check banner fetches `api.github.com/repos/<repo>/releases/latest`
+  once a day to surface new-version notices. Disable by setting
+  `UPDATE_CHECK_REPO=""` in the launchd agent's environment.
+- Static assets (htmx, emoji-picker-element) load from `unpkg.com` and
+  `cdn.jsdelivr.net`.
+
 ## Repo layout
 
 ```

{chatwire-0.2.2 → chatwire-0.3.0}/_version.py

@@ -9,4 +9,4 @@ Format: PEP 440-flavored semver. Pre-1.0 dev builds carry a `-dev` suffix
 which the update-check JS treats as "skip the check" (no point pinging
 GitHub when you cloned from main).
 """
-__version__ = "0.2.2"
+__version__ = "0.3.0"

{chatwire-0.2.2 → chatwire-0.3.0}/bridge.py

@@ -30,6 +30,7 @@ import inspect
 
 import config as _bridge_config  # noqa: E402 — must run before env-consuming imports
 CFG = _bridge_config.apply_to_environ()
+from config import STATE_DIR  # noqa: E402
 
 from chat_db import ChatDBReader, InboundMessage
 from contacts import load_lookup as load_contacts
@@ -66,7 +67,6 @@ POLL_INTERVAL_S = float(os.environ.get("POLL_INTERVAL_S", "2"))
 # normal operation; safe to `tail -f` from a separate SSH session.
 DEBUG_MIRROR_FILE = os.environ.get("DEBUG_MIRROR_FILE", "").strip() or None
 
-STATE_DIR = Path.home() / ".imessage-tg"
 STATE_DIR.mkdir(parents=True, exist_ok=True)
 STATE_PATH = STATE_DIR / "state.json"
 

{chatwire-0.2.2 → chatwire-0.3.0/chatwire.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chatwire
-Version: 0.2.2
+Version: 0.3.0
 Summary: macOS chat-relay bridge: iMessage <-> Telegram, web UI, and pluggable integrations
 Author: Allen Bina
 License: MIT License
@@ -184,6 +184,22 @@ the first install, and it's the same on every Mac.
 `scripts/check-permissions.sh` (or `chatwire doctor`) will tell you
 which prompts you still need to click.
 
+## Privacy
+
+**No telemetry.** chatwire collects no analytics, sends no usage data, and
+includes no third-party SDKs that report back. Your messages, contacts,
+and `chat.db` stay on your Mac; outbound traffic only goes to integrations
+you configure (e.g. Telegram via your own bot token).
+
+Two narrow third-party requests the web UI does make, neither carrying any
+of your data:
+
+- The update-check banner fetches `api.github.com/repos/<repo>/releases/latest`
+  once a day to surface new-version notices. Disable by setting
+  `UPDATE_CHECK_REPO=""` in the launchd agent's environment.
+- Static assets (htmx, emoji-picker-element) load from `unpkg.com` and
+  `cdn.jsdelivr.net`.
+
 ## Repo layout
 
 ```

{chatwire-0.2.2 → chatwire-0.3.0}/chatwire.egg-info/SOURCES.txt

@@ -24,6 +24,7 @@ integrations/web/__init__.py
 integrations/webhook/__init__.py
 migrations/0001_initial.py
 migrations/0002_integration_split.py
+migrations/0003_state_dir_paths.py
 migrations/__init__.py
 templates/__init__.py
 templates/launchd/bridge.plist.template

{chatwire-0.2.2 → chatwire-0.3.0}/chatwire_cli.py

@@ -276,10 +276,20 @@ def cmd_doctor(args: argparse.Namespace) -> int:
 
 
 def cmd_migrate(args: argparse.Namespace) -> int:
-    ran = config.migrate_legacy_env()
-    if ran:
+    env_ran = config.migrate_legacy_env()
+    if env_ran:
         print(f"migrated {config.LEGACY_ENV_PATH} → {config.CONFIG_PATH}")
         print(f"chmod 600 enforced. legacy file left in place — delete after verification.")
+
+    state_copied = config.migrate_state_dir()
+    if state_copied:
+        print(f"copied {len(state_copied)} state file(s) "
+              f"{config.LEGACY_STATE_DIR} → {config.STATE_DIR}: "
+              f"{', '.join(state_copied)}")
+        print(f"legacy dir left in place — `rm -rf {config.LEGACY_STATE_DIR}` "
+              f"after verifying agents are healthy.")
+
+    if env_ran or state_copied:
         return 0
     if config.CONFIG_PATH.exists():
         print(f"already migrated: {config.CONFIG_PATH} exists. nothing to do.")

{chatwire-0.2.2 → chatwire-0.3.0}/config.py

@@ -22,6 +22,7 @@ from __future__ import annotations
 import json
 import logging
 import os
+import shutil
 import stat
 from pathlib import Path
 
@@ -30,6 +31,13 @@ log = logging.getLogger("chatwire.config")
 CONFIG_DIR = Path.home() / ".chatwire"
 CONFIG_PATH = CONFIG_DIR / "config.json"
 
+# Runtime state files (state.json, whitelist.json, echo_log.jsonl, mirror.jsonl,
+# push_subs.json, thumb_cache/) live alongside config under the same dir.
+# Same path as CONFIG_DIR by design — exposing it as its own name lets state
+# consumers (bridge.py, whitelist.py, echo_log.py, web/main.py) import the
+# concept without pretending they're reading config.
+STATE_DIR = CONFIG_DIR
+
 # Read-only fallbacks for prior config locations. First save under the new
 # CONFIG_PATH migrates a user off the legacy path. Order matters: most
 # recent first, so a user mid-rename gets the freshest snapshot.
@@ -41,7 +49,19 @@ LEGACY_CONFIG_PATHS: list[Path] = [
 LEGACY_ENV_DIR = Path.home() / ".imessage-tg"
 LEGACY_ENV_PATH = LEGACY_ENV_DIR / ".env"
 
-CURRENT_VERSION = 2
+# Pre-0.3.0 the runtime state lived alongside the legacy .env in this dir.
+# `migrate_state_dir()` copies these into STATE_DIR on first 0.3.0 boot.
+LEGACY_STATE_DIR = LEGACY_ENV_DIR
+STATE_FILES = (
+    "state.json",
+    "whitelist.json",
+    "echo_log.jsonl",
+    "mirror.jsonl",
+    "push_subs.json",
+    "thumb_cache",  # directory
+)
+
+CURRENT_VERSION = 3
 
 
 def _read_legacy_env() -> dict[str, str]:
@@ -122,6 +142,7 @@ def apply_to_environ() -> dict:
         if path.exists():
             _ensure_secure(path)
             break
+    migrate_state_dir()
     cfg = load_config()
     cfg = _run_migrations(cfg)
     for k, v in _flatten_v2_to_env(cfg).items():
@@ -217,6 +238,39 @@ def save_config(cfg: dict) -> None:
     tmp.replace(CONFIG_PATH)
 
 
+def migrate_state_dir() -> list[str]:
+    """Copy any pre-0.3.0 state files from LEGACY_STATE_DIR into STATE_DIR.
+
+    Idempotent by file-existence check: a file is only copied when the
+    destination doesn't already exist. The legacy dir is left in place so
+    the operator can verify and remove it manually.
+
+    Returns the list of file/dir names that were copied (empty list = no-op).
+    """
+    if not LEGACY_STATE_DIR.exists() or LEGACY_STATE_DIR == STATE_DIR:
+        return []
+    STATE_DIR.mkdir(parents=True, exist_ok=True)
+    copied: list[str] = []
+    for name in STATE_FILES:
+        src = LEGACY_STATE_DIR / name
+        dst = STATE_DIR / name
+        if not src.exists() or dst.exists():
+            continue
+        try:
+            if src.is_dir():
+                shutil.copytree(src, dst)
+            else:
+                shutil.copy2(src, dst)
+        except OSError:
+            log.exception("failed to copy %s → %s", src, dst)
+            continue
+        copied.append(name)
+    if copied:
+        log.info("migrated %d state file(s) from %s → %s: %s",
+                 len(copied), LEGACY_STATE_DIR, STATE_DIR, ", ".join(copied))
+    return copied
+
+
 def migrate_legacy_env() -> bool:
     """If config.json is absent and a legacy .env exists, write config.json
     from it. Returns True if a migration ran. Idempotent: a no-op once

{chatwire-0.2.2 → chatwire-0.3.0}/echo_log.py

@@ -2,7 +2,7 @@
 agree on "what we just sent" — used to suppress chat.db echoes of bridge-
 originated outbound. Both processes append; the bridge consults on each poll.
 
-Format: JSONL at ~/.imessage-tg/echo_log.jsonl
+Format: JSONL at ~/.chatwire/echo_log.jsonl
   {"t": <epoch>, "h": <handle_lc>, "k": "text"|"photo", "b": <body or null>}
 
 Tail-only consumer: `seen_recently` reads the last ~200 lines and checks
@@ -12,9 +12,10 @@ from __future__ import annotations
 
 import json
 import time
-from pathlib import Path
 
-LOG = Path.home() / ".imessage-tg" / "echo_log.jsonl"
+from config import STATE_DIR
+
+LOG = STATE_DIR / "echo_log.jsonl"
 LOG.parent.mkdir(parents=True, exist_ok=True)
 TAIL_LINES = 200
 

chatwire-0.3.0/migrations/0003_state_dir_paths.py

@@ -0,0 +1,30 @@
+"""Repoint `debug.mirror_file` from the legacy state dir to the new one.
+
+0.3.0 moves runtime state from `~/.imessage-tg/` to `~/.chatwire/` (see
+`config.migrate_state_dir`). The mirror file is the one piece of state
+whose location the user can override via config, so an explicit user
+value at the legacy *default* gets bumped here. Anything pointed
+elsewhere on purpose is left alone.
+
+Pairs with the filesystem-level copy in `migrate_state_dir()` — that
+moves the file's bytes; this updates the pointer in config.json.
+"""
+from __future__ import annotations
+
+from pathlib import Path
+
+target_version = 3
+
+
+def migrate(cfg: dict) -> dict:
+    debug = cfg.get("debug")
+    if not isinstance(debug, dict):
+        return cfg
+    current = debug.get("mirror_file")
+    if not isinstance(current, str):
+        return cfg
+    legacy_default = str(Path.home() / ".imessage-tg" / "mirror.jsonl")
+    new_default = str(Path.home() / ".chatwire" / "mirror.jsonl")
+    if current == legacy_default:
+        debug["mirror_file"] = new_default
+    return cfg

{chatwire-0.2.2 → chatwire-0.3.0}/web/main.py

@@ -26,7 +26,7 @@ import logging
 from fastapi import FastAPI, File, Form, HTTPException, Request, UploadFile
 
 logging.basicConfig(level=logging.INFO, format="%(asctime)s %(name)s %(levelname)s %(message)s")
-log = logging.getLogger("imessage-tg-web")
+log = logging.getLogger("chatwire.web")
 from fastapi.responses import HTMLResponse, StreamingResponse, FileResponse
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
@@ -49,6 +49,7 @@ from whitelist import (  # noqa: E402
 # Load config from ~/.chatwire/config.json (or legacy fallbacks).
 import config as _bridge_config  # noqa: E402
 _bridge_config.apply_to_environ()
+from config import STATE_DIR  # noqa: E402
 
 SELF_HANDLES = {h.strip().lower() for h in os.environ.get("SELF_HANDLES", "").split(",") if h.strip()}
 
@@ -57,7 +58,7 @@ def relay_handles() -> set[str]:
     return SELF_HANDLES | wl_all()
 
 
-MIRROR_FILE = Path(os.environ.get("DEBUG_MIRROR_FILE", str(Path.home() / ".imessage-tg/mirror.jsonl")))
+MIRROR_FILE = Path(os.environ.get("DEBUG_MIRROR_FILE", str(STATE_DIR / "mirror.jsonl")))
 
 WEB_PORT = int(os.environ.get("WEB_PORT", "8723"))
 HISTORY_LIMIT = 100
@@ -66,7 +67,7 @@ CONVO_LIMIT = 50
 VAPID_PRIVATE_KEY = os.environ.get("VAPID_PRIVATE_KEY", "")
 VAPID_PUBLIC_KEY = os.environ.get("VAPID_PUBLIC_KEY", "")
 VAPID_CONTACT = os.environ.get("VAPID_CONTACT", "mailto:admin@example.com")
-PUSH_SUBS_FILE = Path.home() / ".imessage-tg" / "push_subs.json"
+PUSH_SUBS_FILE = STATE_DIR / "push_subs.json"
 
 CONTACTS = load_contacts()
 IMAGE_INDEX = load_image_index()
@@ -232,7 +233,7 @@ ATTACHMENTS_BASE = (Path.home() / "Library" / "Messages" / "Attachments").resolv
 # On-disk thumb cache. Lives outside the Messages.app attachments dir so we
 # never risk Messages noticing extra files alongside the originals. Keyed by
 # (path, mtime) so renamed/replaced originals invalidate cleanly.
-THUMB_CACHE_DIR = (Path.home() / ".imessage-tg" / "thumb_cache").resolve()
+THUMB_CACHE_DIR = (STATE_DIR / "thumb_cache").resolve()
 THUMB_MAX_EDGE = 720  # px; covers retina at the chat's ~280–360 displayed size
 THUMB_TTL_DAYS = 180
 

{chatwire-0.2.2 → chatwire-0.3.0}/web/static/update-check.js

@@ -58,12 +58,17 @@
   }
 
   function showBanner(latestTag, releaseUrl) {
+    if (!latestTag) return;
     const banner = document.getElementById('update-banner');
     if (!banner) return;
     const v = banner.querySelector('.update-banner-version');
     const a = banner.querySelector('.update-banner-link');
     if (v) v.textContent = latestTag;
-    if (a && releaseUrl) a.setAttribute('href', releaseUrl);
+    if (a) {
+      const repo = meta('update-check-repo');
+      const fallback = repo ? 'https://github.com/' + repo + '/releases' : '#';
+      a.setAttribute('href', releaseUrl || fallback);
+    }
     banner.hidden = false;
     document.body.classList.add('has-update-banner');
 

{chatwire-0.2.2 → chatwire-0.3.0}/web/templates/index.html

@@ -20,7 +20,7 @@
       <strong>Update available:</strong>
       <span class="update-banner-version"></span>
       &mdash;
-      <a class="update-banner-link" href="" target="_blank" rel="noopener">release notes</a>
+      <a class="update-banner-link" href="#" target="_blank" rel="noopener">release notes</a>
     </span>
     <button type="button" class="update-banner-dismiss" aria-label="Dismiss">&times;</button>
   </div>

{chatwire-0.2.2 → chatwire-0.3.0}/whitelist.py

@@ -20,11 +20,12 @@ import json
 import logging
 import os
 import threading
-from pathlib import Path
+
+from config import STATE_DIR
 
 log = logging.getLogger("whitelist")
 
-WHITELIST_FILE = Path.home() / ".imessage-tg" / "whitelist.json"
+WHITELIST_FILE = STATE_DIR / "whitelist.json"
 
 _lock = threading.Lock()
 _cached_handles: set[str] = set()