botschat 0.1.12 → 0.1.13

package/packages/web/src/main.tsx

@@ -11,7 +11,8 @@ initAnalytics();
 if (Capacitor.isNativePlatform()) {
   // Configure status bar and keyboard for native app
   import("@capacitor/status-bar").then(({ StatusBar, Style }) => {
-    StatusBar.setStyle({ style: Style.Dark }).catch(() => {});
+    const isDark = document.documentElement.getAttribute("data-theme") !== "light";
+    StatusBar.setStyle({ style: isDark ? Style.Dark : Style.Light }).catch(() => {});
     StatusBar.setOverlaysWebView({ overlay: true }).catch(() => {});
   });
   import("@capacitor/keyboard").then(({ Keyboard }) => {

package/packages/web/src/push.ts

@@ -0,0 +1,205 @@
+/**
+ * Push notification initialization for Web (FCM) and Native (Capacitor).
+ *
+ * - Web: Firebase Cloud Messaging + Service Worker
+ * - iOS/Android: @capacitor/push-notifications
+ *
+ * For E2E encrypted messages, the E2E key is synced to IndexedDB so the
+ * Service Worker (web) or native handler can decrypt before showing.
+ */
+
+import { Capacitor } from "@capacitor/core";
+import { pushApi } from "./api";
+import { dlog } from "./debug-log";
+import { E2eService } from "./e2e";
+
+let initialized = false;
+
+// ---- IndexedDB helpers for SW E2E key sync ----
+
+const IDB_NAME = "botschat-sw";
+const IDB_STORE = "keys";
+const IDB_KEY = "e2e_key";
+
+function openDB(): Promise<IDBDatabase> {
+  return new Promise((resolve, reject) => {
+    const req = indexedDB.open(IDB_NAME, 1);
+    req.onupgradeneeded = () => {
+      req.result.createObjectStore(IDB_STORE);
+    };
+    req.onsuccess = () => resolve(req.result);
+    req.onerror = () => reject(req.error);
+  });
+}
+
+/** Sync the current E2E key to IndexedDB so the Service Worker can decrypt. */
+export async function syncE2eKeyToSW(): Promise<void> {
+  try {
+    const db = await openDB();
+    const tx = db.transaction(IDB_STORE, "readwrite");
+    const store = tx.objectStore(IDB_STORE);
+
+    // Read the cached key from localStorage (base64-encoded Uint8Array)
+    const cachedKeyB64 = localStorage.getItem("botschat_e2e_key_cache");
+    if (cachedKeyB64) {
+      // Decode base64 to Uint8Array and store in IDB
+      const binary = atob(cachedKeyB64);
+      const key = new Uint8Array(binary.length);
+      for (let i = 0; i < binary.length; i++) {
+        key[i] = binary.charCodeAt(i);
+      }
+      store.put(key, IDB_KEY);
+    } else {
+      store.delete(IDB_KEY);
+    }
+
+    await new Promise<void>((resolve, reject) => {
+      tx.oncomplete = () => resolve();
+      tx.onerror = () => reject(tx.error);
+    });
+  } catch (err) {
+    dlog.warn("Push", "Failed to sync E2E key to SW IndexedDB", err);
+  }
+}
+
+/** Clear the E2E key from SW IndexedDB (call on logout or key clear). */
+export async function clearE2eKeyFromSW(): Promise<void> {
+  try {
+    const db = await openDB();
+    const tx = db.transaction(IDB_STORE, "readwrite");
+    tx.objectStore(IDB_STORE).delete(IDB_KEY);
+    await new Promise<void>((resolve, reject) => {
+      tx.oncomplete = () => resolve();
+      tx.onerror = () => reject(tx.error);
+    });
+  } catch {
+    // Ignore — best effort
+  }
+}
+
+// ---- Push initialization ----
+
+export async function initPushNotifications(): Promise<void> {
+  if (initialized) return;
+
+  // Sync E2E key so push notifications can be decrypted
+  await syncE2eKeyToSW();
+
+  // Subscribe to E2E key changes to keep SW in sync
+  E2eService.subscribe(() => {
+    syncE2eKeyToSW().catch(() => {});
+  });
+
+  if (Capacitor.isNativePlatform()) {
+    await initNativePush();
+  } else {
+    await initWebPush();
+  }
+
+  initialized = true;
+}
+
+// ---- Web Push (Firebase Cloud Messaging) ----
+
+async function initWebPush(): Promise<void> {
+  try {
+    if (!("Notification" in self)) {
+      dlog.warn("Push", "Notifications not supported in this browser");
+      return;
+    }
+
+    const permission = await Notification.requestPermission();
+    if (permission !== "granted") {
+      dlog.warn("Push", "Notification permission denied");
+      return;
+    }
+
+    const { getMessaging, getToken, onMessage } = await import("firebase/messaging");
+    const { ensureFirebaseApp } = await import("./firebase");
+
+    const firebaseApp = ensureFirebaseApp();
+    if (!firebaseApp) {
+      dlog.warn("Push", "Firebase not configured (missing env vars)");
+      return;
+    }
+
+    const messaging = getMessaging(firebaseApp);
+
+    // Get service worker registration
+    const registration = await navigator.serviceWorker.getRegistration();
+    if (!registration) {
+      dlog.warn("Push", "No service worker registration found");
+      return;
+    }
+
+    const vapidKey = import.meta.env.VITE_FIREBASE_VAPID_KEY as string;
+    if (!vapidKey) {
+      dlog.warn("Push", "VITE_FIREBASE_VAPID_KEY not set — skipping web push");
+      return;
+    }
+
+    const fcmToken = await getToken(messaging, {
+      vapidKey,
+      serviceWorkerRegistration: registration,
+    });
+
+    if (fcmToken) {
+      dlog.info("Push", `FCM token obtained (${fcmToken.slice(0, 20)}...)`);
+      await pushApi.register(fcmToken, "web");
+      dlog.info("Push", "Token registered with backend");
+    }
+
+    // Suppress foreground notifications (WS already delivers the message)
+    onMessage(messaging, (_payload) => {
+      dlog.info("Push", "Foreground FCM message received (suppressed)");
+    });
+  } catch (err) {
+    dlog.error("Push", "Web push init failed", err);
+  }
+}
+
+// ---- Native Push (Capacitor) ----
+
+async function initNativePush(): Promise<void> {
+  try {
+    const { PushNotifications } = await import("@capacitor/push-notifications");
+
+    const permResult = await PushNotifications.requestPermissions();
+    if (permResult.receive !== "granted") {
+      dlog.warn("Push", "Native push permission denied");
+      return;
+    }
+
+    await PushNotifications.register();
+
+    PushNotifications.addListener("registration", async (token) => {
+      dlog.info("Push", `Native push token: ${token.value.slice(0, 20)}...`);
+      const platform = Capacitor.getPlatform() as "ios" | "android";
+      await pushApi.register(token.value, platform);
+      dlog.info("Push", "Native token registered with backend");
+    });
+
+    PushNotifications.addListener("registrationError", (error) => {
+      dlog.error("Push", "Native push registration failed", error);
+    });
+
+    // Data-only messages arrive here in foreground — suppress (WS handles it)
+    PushNotifications.addListener("pushNotificationReceived", (_notification) => {
+      dlog.info("Push", "Foreground native notification (suppressed)");
+    });
+
+    // User tapped a notification (app was in background)
+    PushNotifications.addListener("pushNotificationActionPerformed", (action) => {
+      dlog.info("Push", "Notification tapped", action);
+      // TODO: navigate to specific session from action.notification.data
+    });
+  } catch (err) {
+    dlog.error("Push", "Native push init failed", err);
+  }
+}
+
+/** Unregister push token (call on logout). */
+export async function unregisterPush(): Promise<void> {
+  initialized = false;
+  await clearE2eKeyFromSW();
+}

package/scripts/dev.sh

@@ -1,24 +1,44 @@
 #!/usr/bin/env bash
 # BotsChat local dev startup script
 # Usage:
-#   ./scripts/dev.sh          — build web + migrate + start server
-#   ./scripts/dev.sh reset    — nuke local DB, re-migrate, then start
+#   ./scripts/dev.sh          — full dev env: build + migrate + server + mock AI + open browser
+#   ./scripts/dev.sh reset    — nuke local DB, re-migrate, then start full dev env
+#   ./scripts/dev.sh server   — only start wrangler dev server (no mock, no browser)
 #   ./scripts/dev.sh migrate  — only run D1 migrations (no server)
 #   ./scripts/dev.sh build    — only build web frontend (no server)
 #   ./scripts/dev.sh sync     — sync plugin to mini.local + rebuild + restart gateway
 #   ./scripts/dev.sh logs     — tail gateway logs on mini.local
+#   ./scripts/dev.sh mock     — start mock OpenClaw standalone (foreground)
 set -euo pipefail
 
 cd "$(dirname "$0")/.."
 ROOT="$(pwd)"
 
+# ── Auto-set DEV_AUTH_SECRET ──────────────────────────────────────────
+# For local dev, any string works. Use a fixed default so new developers
+# can run `./scripts/dev.sh` without setting env vars first.
+if [[ -z "${DEV_AUTH_SECRET:-}" ]]; then
+  DEV_AUTH_SECRET="botschat-local-dev-secret"
+  export DEV_AUTH_SECRET
+fi
+
 # ── Colours ──────────────────────────────────────────────────────────
-RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[0;33m'; CYAN='\033[0;36m'; NC='\033[0m'
+RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[0;33m'; CYAN='\033[0;36m'; DIM='\033[2m'; NC='\033[0m'
 info()  { echo -e "${CYAN}▸${NC} $*"; }
 ok()    { echo -e "${GREEN}✔${NC} $*"; }
 warn()  { echo -e "${YELLOW}▲${NC} $*"; }
 fail()  { echo -e "${RED}✖${NC} $*"; exit 1; }
 
+# ── Process tracking ─────────────────────────────────────────────────
+WRANGLER_PID=""
+MOCK_PID=""
+
+cleanup() {
+  [[ -n "$MOCK_PID" ]] && kill "$MOCK_PID" 2>/dev/null || true
+  [[ -n "$WRANGLER_PID" ]] && kill "$WRANGLER_PID" 2>/dev/null || true
+  wait 2>/dev/null || true
+}
+
 # ── Helpers ──────────────────────────────────────────────────────────
 
 kill_port() {
@@ -32,6 +52,55 @@ kill_port() {
   fi
 }
 
+wait_for_server() {
+  info "Waiting for server…"
+  local max=60 i=0
+  while ! curl -sf --max-time 1 -o /dev/null http://localhost:8787/ 2>/dev/null; do
+    sleep 1
+    i=$((i + 1))
+    if [[ $i -ge $max ]]; then
+      fail "Server didn't start within ${max}s"
+    fi
+  done
+}
+
+get_mock_token() {
+  local BASE_URL="http://localhost:8787"
+  local TOKEN_JSON AUTH_TOKEN PAT_JSON PAT
+
+  TOKEN_JSON=$(curl -sf -X POST "$BASE_URL/api/dev-auth/login" \
+    -H 'Content-Type: application/json' \
+    -d "{\"secret\":\"$DEV_AUTH_SECRET\",\"userId\":\"dev-test-user\"}" 2>&1) || {
+    fail "Cannot reach $BASE_URL — is the server running?"
+  }
+  AUTH_TOKEN=$(echo "$TOKEN_JSON" | python3 -c "import sys,json; print(json.load(sys.stdin)['token'])" 2>/dev/null) || {
+    fail "Failed to parse auth token: $TOKEN_JSON"
+  }
+
+  PAT_JSON=$(curl -sf -X POST "$BASE_URL/api/pairing-tokens" \
+    -H "Authorization: Bearer $AUTH_TOKEN" \
+    -H 'Content-Type: application/json' \
+    -d '{"label":"mock-openclaw"}' 2>&1) || {
+    fail "Failed to create pairing token"
+  }
+  PAT=$(echo "$PAT_JSON" | python3 -c "import sys,json; print(json.load(sys.stdin)['token'])" 2>/dev/null) || {
+    fail "Failed to parse pairing token: $PAT_JSON"
+  }
+
+  echo "$PAT"
+}
+
+open_browser() {
+  local url="http://localhost:8787/?dev_token=${DEV_AUTH_SECRET}"
+  if command -v open &>/dev/null; then
+    open "$url"
+  elif command -v xdg-open &>/dev/null; then
+    xdg-open "$url"
+  else
+    warn "Open in browser: $url"
+  fi
+}
+
 do_migrate() {
   info "Applying D1 migrations (local)…"
   npx wrangler d1 migrations apply botschat-db --local
@@ -51,20 +120,68 @@ do_build_web() {
   ok "Web build complete (packages/web/dist)"
 }
 
+# ── Server-only start (foreground, no mock/browser) ──────────────────
+
 do_start() {
   kill_port 8787
   info "Starting wrangler dev on 0.0.0.0:8787…"
-  exec npx wrangler dev --config wrangler.toml --ip 0.0.0.0 --var ENVIRONMENT:development --var DEV_AUTH_SECRET:"${DEV_AUTH_SECRET:?Set DEV_AUTH_SECRET env var}"
+  exec npx wrangler dev --config wrangler.toml --ip 0.0.0.0 --var ENVIRONMENT:development --var DEV_AUTH_SECRET:"$DEV_AUTH_SECRET"
+}
+
+# ── Full dev environment (server + mock + browser) ───────────────────
+
+do_start_full() {
+  kill_port 8787
+  trap cleanup EXIT INT TERM
+
+  info "Starting wrangler dev on 0.0.0.0:8787…"
+  npx wrangler dev --config wrangler.toml --ip 0.0.0.0 \
+    --var ENVIRONMENT:development \
+    --var DEV_AUTH_SECRET:"$DEV_AUTH_SECRET" &
+  WRANGLER_PID=$!
+
+  wait_for_server
+  ok "Server ready on http://localhost:8787"
+
+  info "Starting Mock OpenClaw…"
+  local PAT
+  PAT=$(get_mock_token)
+  mkdir -p "$ROOT/.wrangler"
+  node "$ROOT/scripts/mock-openclaw.mjs" --token "$PAT" > "$ROOT/.wrangler/mock-openclaw.log" 2>&1 &
+  MOCK_PID=$!
+  ok "Mock OpenClaw connected (pid=$MOCK_PID)"
+
+  open_browser
+
+  echo ""
+  echo -e "${CYAN}╭──────────────────────────────────────────────────╮${NC}"
+  echo -e "${CYAN}│${NC}  ${GREEN}BotsChat Dev Environment Ready${NC}                  ${CYAN}│${NC}"
+  echo -e "${CYAN}│${NC}                                                  ${CYAN}│${NC}"
+  echo -e "${CYAN}│${NC}  Server:   http://localhost:8787                 ${CYAN}│${NC}"
+  echo -e "${CYAN}│${NC}  Mock AI:  running ${DIM}(log: .wrangler/mock-openclaw.log)${NC}"
+  echo -e "${CYAN}│${NC}  Auth:     auto-login enabled                   ${CYAN}│${NC}"
+  echo -e "${CYAN}│${NC}                                                  ${CYAN}│${NC}"
+  echo -e "${CYAN}│${NC}  Press ${YELLOW}Ctrl+C${NC} to stop all services              ${CYAN}│${NC}"
+  echo -e "${CYAN}╰──────────────────────────────────────────────────╯${NC}"
+  echo ""
+
+  wait $WRANGLER_PID 2>/dev/null || true
+}
+
+# ── Standalone mock (foreground) ─────────────────────────────────────
+
+do_mock() {
+  info "Getting auth token via dev-auth…"
+  local PAT
+  PAT=$(get_mock_token)
+  ok "Pairing token: ${PAT:0:16}***"
+  info "Starting Mock OpenClaw…"
+  exec node "$ROOT/scripts/mock-openclaw.mjs" --token "$PAT" "$@"
 }
 
+# ── Sync plugin to mini.local ────────────────────────────────────────
+
 do_sync_plugin() {
-  # ── IMPORTANT ──────────────────────────────────────────────────
-  # Development repo and production plugin MUST be kept separate:
-  #   Dev repo:    mini:~/Projects/botschat-app/botsChat/packages/plugin/
-  #   Production:  mini:~/.openclaw/extensions/botschat/
-  # NEVER edit files directly in ~/.openclaw/extensions/botschat/.
-  # Always: edit dev repo → build → deploy artifacts to extensions.
-  # ────────────────────────────────────────────────────────────────
   local REMOTE="mini.local"
   local DEV_DIR="~/Projects/botschat-app/botsChat/packages/plugin"
   local EXT_DIR="~/.openclaw/extensions/botschat"
@@ -105,6 +222,11 @@ case "$cmd" in
   reset)
     do_reset
     do_build_web
+    do_start_full
+    ;;
+  server)
+    do_build_web
+    do_migrate
     do_start
     ;;
   migrate)
@@ -119,10 +241,14 @@ case "$cmd" in
   logs)
     do_logs
     ;;
+  mock)
+    shift
+    do_mock "$@"
+    ;;
   *)
-    # Default: build + migrate + start
+    # Default: full dev experience — build + migrate + server + mock + browser
     do_build_web
     do_migrate
-    do_start
+    do_start_full
     ;;
 esac