= 0:
- close = html.find(">", head_start)
- if close >= 0:
- return html[:close + 1] + base + html[close + 1:]
- return f"{base}{html}"
-
-
-def _get_mesh_sites():
- db = get_db()
- try:
- return db.execute("SELECT hash, name, added_at FROM mesh_sites ORDER BY added_at DESC").fetchall()
- finally:
- return_db(db)
-
-
-def handle_rns_add_hash(dest_hash, name=""):
- db = get_db()
- errors = []
- try:
- db.execute(
- "INSERT OR REPLACE INTO mesh_sites (hash, name) VALUES (?, ?)",
- (dest_hash, name or ""),
- )
-
- try:
- resp = fetch_remote_page(dest_hash, "/")
- if resp.get("status") == 200:
- body_raw = resp.get("body", "")
- soup = BeautifulSoup(body_raw, 'html.parser')
- for tag in soup(["script", "style", "nav", "footer", "header", "noscript", "aside"]):
- tag.decompose()
- cleaned = soup.get_text(separator=" ", strip=True)
-
- title = name or dest_hash[:16]
- if soup.title and soup.title.string:
- title = soup.title.string.strip()
-
- desc = ""
- m = soup.find("meta", attrs={"name": "description"})
- if m and m.get("content"):
- desc = m["content"].strip()
- if not desc:
- m = soup.find("meta", attrs={"property": "og:description"})
- if m and m.get("content"):
- desc = m["content"].strip()
- if not desc:
- desc = cleaned[:200].strip()
-
- url = f"rns:{dest_hash}"
- now = datetime.datetime.now().strftime("%Y-%m-%dT%H:%M:%S")
- db.execute(
- "INSERT OR REPLACE INTO pages (url, title, body, last_modified, summary) VALUES (?, ?, ?, ?, ?)",
- (url, title, cleaned, now, desc),
- )
- else:
- errors.append(f"Remote returned status {resp.get('status')}")
- except Exception as e:
- errors.append(str(e))
- traceback.print_exc()
-
- db.commit()
- finally:
- return_db(db)
-
- return errors if errors else None
-
-
-def handle_rns_delete_hash(body):
- dest_hash = body.get("hash", [""])[0].strip() if isinstance(body, dict) else body
- db = get_db()
- try:
- db.execute("DELETE FROM mesh_sites WHERE hash = ?", (dest_hash,))
- db.commit()
- finally:
- return_db(db)
- from tinyweb.handlers.pages import _redirect
- return _redirect("/")
-
-
-def handle_rns_browse(path, dest_hash):
- prefix = f"/rns/{dest_hash}"
- sub_path = path[len(prefix):] if path.startswith(prefix) else "/"
- if not sub_path:
- sub_path = "/"
-
- cache_key = (dest_hash, sub_path)
- cached = _page_cache.get(cache_key)
- if cached is not None:
- return {
- "status": 200,
- "content_type": "text/html; charset=utf-8",
- "body": cached,
- "headers": {},
- }
-
- try:
- resp = fetch_remote_page(dest_hash, sub_path)
- except ConnectionError as e:
- return {
- "status": 200,
- "content_type": "text/html; charset=utf-8",
- "body": f"could not connect
{esc(str(e))}
",
- "headers": {},
- }
- except PermissionError:
- return {
- "status": 200,
- "content_type": "text/html; charset=utf-8",
- "body": "forbidden
the remote instance blocked this request.
",
- "headers": {},
- }
-
- if resp.get("status") != 200:
- return {
- "status": 200,
- "content_type": "text/html; charset=utf-8",
- "body": f"error
remote returned status {resp['status']}
",
- "headers": {},
- }
-
- body = resp.get("body", "")
-
- if resp.get("content_type", "").startswith("application/json"):
- try:
- data = json.loads(body)
- body = f"{esc(json.dumps(data, indent=2))}"
- except (json.JSONDecodeError, TypeError):
- body = f"{esc(body[:2000])}"
- else:
- body = _inject_base_tag(body, dest_hash)
-
- _page_cache.put(cache_key, body)
-
- return {
- "status": 200,
- "content_type": "text/html; charset=utf-8",
- "body": body,
- "headers": {},
- }
diff --git a/src/tinyweb/handlers/search.py b/src/tinyweb/handlers/search.py
index 10b87fd..951b4d4 100644
--- a/src/tinyweb/handlers/search.py
+++ b/src/tinyweb/handlers/search.py
@@ -83,17 +83,10 @@ def handle_search(query):
tag_links = " ".join(f'[{esc(t)}]' for t in tags)
tags_html = f'{tag_links}
'
snip_html = f'
{esc(r["summary"])}' if r["summary"] else ""
- url = r["url"]
- if url.startswith("rns:"):
- display_url = url
- link_url = f"/rns/{esc(url[4:])}/"
- else:
- display_url = url
- link_url = url
result_html += (
f''
@@ -169,7 +162,6 @@ def handle_search(query):
sub_count = ""
if q and remote_rows:
sub_count = f" + {len(remote_rows)} from subscriptions"
-
welcome_html = ""
if count == 0 and not q:
welcome_html = (
diff --git a/src/tinyweb/handlers/subscriptions.py b/src/tinyweb/handlers/subscriptions.py
index a7ba389..0113d07 100644
--- a/src/tinyweb/handlers/subscriptions.py
+++ b/src/tinyweb/handlers/subscriptions.py
@@ -1,5 +1,4 @@
import threading
-import time
from datetime import datetime
from tinyweb.db import get_db, return_db, get_setting, set_setting, get_site_name, index_url, clean_url
@@ -11,8 +10,6 @@ from ._helpers import (
)
_sync_threads = {}
-_sync_starts = {}
-_SYNC_TIMEOUT = 120
MAX_API_SITES = 5000
MAX_BROWSE = 5000
@@ -145,13 +142,6 @@ def handle_subscriptions(msg=""):
subs = db.execute("SELECT * FROM subscriptions ORDER BY id DESC").fetchall()
finally:
return_db(db)
- now_t = time.time()
- for sub_id, start_t in list(_sync_starts.items()):
- if now_t - start_t > _SYNC_TIMEOUT:
- set_setting(f"sync_status_{sub_id}", "error:Timed out")
- _sync_threads.pop(sub_id, None)
- _sync_starts.pop(sub_id, None)
-
cards = ""
for s in subs:
sub_id = s["id"]
@@ -162,9 +152,6 @@ def handle_subscriptions(msg=""):
if is_syncing:
status_html = 'syncing...
'
- elif sync_status.startswith("done:"):
- count = sync_status[5:]
- status_html = f'synced {esc(count)} site(s)
'
elif sync_status.startswith("error:"):
err_msg = sync_status[6:]
status_html = f'{esc(err_msg)}
'
@@ -362,10 +349,9 @@ def handle_subscription_pick(body):
def _sync_subscription(sub_id):
- db = None
+ set_setting(f"sync_status_{sub_id}", "syncing")
+ db = get_db()
try:
- set_setting(f"sync_status_{sub_id}", "syncing")
- db = get_db()
sub = db.execute("SELECT * FROM subscriptions WHERE id = ?", (sub_id,)).fetchone()
if not sub:
set_setting(f"sync_status_{sub_id}", "error:Subscription not found.")
@@ -421,17 +407,13 @@ def _sync_subscription(sub_id):
except Exception as e:
set_setting(f"sync_status_{sub_id}", f"error:{e}")
finally:
- if db:
- return_db(db)
- _sync_threads.pop(sub_id, None)
- _sync_starts.pop(sub_id, None)
+ return_db(db)
def handle_subscription_sync(sub_id):
if sub_id in _sync_threads and _sync_threads[sub_id].is_alive():
return _redirect("/subscriptions")
set_setting(f"sync_status_{sub_id}", "syncing")
- _sync_starts[sub_id] = time.time()
t = threading.Thread(target=_sync_subscription, args=(sub_id,), daemon=True)
_sync_threads[sub_id] = t
t.start()
@@ -472,7 +454,6 @@ def handle_subscription_syncall():
if sub_id in _sync_threads and _sync_threads[sub_id].is_alive():
continue
set_setting(f"sync_status_{sub_id}", "syncing")
- _sync_starts[sub_id] = time.time()
t = threading.Thread(target=_sync_subscription, args=(sub_id,), daemon=True)
_sync_threads[sub_id] = t
t.start()
diff --git a/src/tinyweb/rns_client.py b/src/tinyweb/rns_client.py
index a59a654..98df406 100644
--- a/src/tinyweb/rns_client.py
+++ b/src/tinyweb/rns_client.py
@@ -12,32 +12,21 @@ _TIMEOUT_TIERS = [
]
-# Request path for "/tinyweb" destination
-_RNS_REQUEST_PATH = "/tinyweb"
-
-
def fetch_remote_sites(dest_hash_hex, since=""):
- resp = _rns_request(dest_hash_hex, "/api/sites", {"since": [since]} if since else {})
- return json.loads(resp.get("body", "{}"))
+ """
+ Connect to a remote TinyWeb instance over Reticulum and fetch its
+ shared sites. Returns the response dict from /api/sites, or raises
+ an exception on failure. Pass `since` as ISO timestamp for delta sync.
-
-def fetch_remote_page(dest_hash_hex, path, query=None):
- return _rns_request(dest_hash_hex, path, query or {})
-
-
-def _rns_request(dest_hash_hex, path, query=None):
- """Generic RNS request to a remote TinyWeb instance.
-
- Connects over RNS, requests the given path, returns the response dict
- (status, content_type, body, headers). Raises on failure.
- Uses progressive timeouts: fast first, then slow for LoRa/multi-hop.
+ Uses progressive timeouts: tries fast first, then retries with longer
+ timeouts for slow links (LoRa, multi-hop).
"""
last_error = None
for tier in _TIMEOUT_TIERS:
try:
- return _fetch(dest_hash_hex, path, query or {}, tier)
+ return _fetch(dest_hash_hex, since, tier)
except PermissionError:
- raise
+ raise # Don't retry permission errors
except Exception as e:
last_error = e
continue
@@ -46,11 +35,12 @@ def _rns_request(dest_hash_hex, path, query=None):
)
-def _fetch(dest_hash_hex, path, query, timeouts):
- """Single RNS fetch attempt with the given timeout profile."""
+def _fetch(dest_hash_hex, since, timeouts):
+ """Single fetch attempt with the given timeout profile."""
dest_hash = bytes.fromhex(dest_hash_hex)
poll = timeouts["poll"]
+ # Resolve path if needed
if not RNS.Transport.has_path(dest_hash):
RNS.Transport.request_path(dest_hash)
elapsed = 0
@@ -74,6 +64,7 @@ def _fetch(dest_hash_hex, path, query, timeouts):
*ASPECTS,
)
+ # Establish link
link = RNS.Link(destination)
elapsed = 0
while link.status == RNS.Link.PENDING and elapsed < timeouts["link"]:
@@ -86,15 +77,17 @@ def _fetch(dest_hash_hex, path, query, timeouts):
)
try:
+ query = {"since": [since]} if since else {}
request_data = {
"method": "GET",
- "path": path,
+ "path": "/api/sites",
"query": query,
"body": {},
"gateway_host": "",
}
+
req_timeout = timeouts["request"]
- receipt = link.request(_RNS_REQUEST_PATH, data=request_data, timeout=req_timeout)
+ receipt = link.request("/tinyweb", data=request_data, timeout=req_timeout)
elapsed = 0
done = (RNS.RequestReceipt.READY, RNS.RequestReceipt.DELIVERED, RNS.RequestReceipt.FAILED)
@@ -105,10 +98,10 @@ def _fetch(dest_hash_hex, path, query, timeouts):
if receipt.get_status() in (RNS.RequestReceipt.READY, RNS.RequestReceipt.DELIVERED):
resp = receipt.get_response()
if resp["status"] == 403:
- raise PermissionError("Forbidden")
+ raise PermissionError("That instance has sharing disabled.")
if resp["status"] != 200:
raise ConnectionError(f"Remote returned status {resp['status']}")
- return resp
+ return json.loads(resp["body"])
else:
raise ConnectionError(
f"Request failed or timed out ({req_timeout}s timeout)"