yaver-feedback-react-native 0.7.7 → 0.7.9

package/dist/Discovery.js

@@ -1,4 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YaverDiscovery = void 0;
 function getAsyncStorage() {
@@ -201,38 +234,20 @@ class YaverDiscovery {
      * does on same-LAN.
      */
     static async raceProbe(urls) {
-        if (!urls || urls.length === 0)
-            return null;
-        const attempts = urls.map((url) => YaverDiscovery.probe(url).then((r) => {
-            if (!r)
-                throw new Error('no-200');
-            return r;
-        }));
-        try {
-            // `Promise.any` isn't on every RN runtime yet (older Hermes).
-            // Hand-roll the same behaviour so we don't need a polyfill.
-            return await new Promise((resolve) => {
-                let remaining = attempts.length;
-                let settled = false;
-                attempts.forEach((p) => {
-                    p.then((r) => {
-                        if (settled)
-                            return;
-                        settled = true;
-                        resolve(r);
-                    }).catch(() => {
-                        remaining -= 1;
-                        if (remaining <= 0 && !settled) {
-                            settled = true;
-                            resolve(null);
-                        }
-                    });
-                });
-            });
-        }
-        catch {
+        // Delegate to the canonical client-core implementation so mobile +
+        // SDK run the same race logic. Returned shape is `ProbeResult` —
+        // structurally compatible with DiscoveryResult minus the required
+        // hostname/version fields, which we backfill with sane defaults.
+        const { raceHealthProbes } = await Promise.resolve().then(() => __importStar(require('./_core/device')));
+        const res = await raceHealthProbes(urls, { timeoutMs: PROBE_TIMEOUT_MS });
+        if (!res)
             return null;
-        }
+        return {
+            url: res.url,
+            hostname: res.hostname ?? 'Unknown',
+            version: res.version ?? 'unknown',
+            latency: res.latency ?? 0,
+        };
     }
     /**
      * Discover agent via relay HTTP proxy. Uses the user's configured

package/dist/MachinePickerScreen.js

@@ -37,6 +37,7 @@ exports.YaverMachinePickerScreen = void 0;
 const react_1 = __importStar(require("react"));
 const react_native_1 = require("react-native");
 const auth_1 = require("./auth");
+const PairDeviceModal_1 = require("./PairDeviceModal");
 /**
  * List of remote dev machines the signed-in user can reach. Split into
  *   - Owned machines (user is the host)
@@ -51,6 +52,7 @@ const YaverMachinePickerScreen = ({ token, currentDeviceId, onPick, onCancel, })
     const [refreshing, setRefreshing] = (0, react_1.useState)(false);
     const [error, setError] = (0, react_1.useState)(null);
     const [list, setList] = (0, react_1.useState)({ owned: [], shared: [] });
+    const [pairingDevice, setPairingDevice] = (0, react_1.useState)(null);
     const load = (0, react_1.useCallback)(async (silent = false) => {
         if (!silent)
             setLoading(true);
@@ -74,6 +76,15 @@ const YaverMachinePickerScreen = ({ token, currentDeviceId, onPick, onCancel, })
         void load();
     }, [load]);
     const handlePick = async (device) => {
+        // Needs-auth device — show the in-SDK pair modal instead of
+        // treating the tap as a "pick". The user enters the 6-char code
+        // from their Mac terminal; the SDK POSTs it to /auth/pair/submit
+        // on the agent directly. Once the device flips out of bootstrap
+        // mode, the next load() picks up the fresh state.
+        if (device.isOnline && device.needsAuth) {
+            setPairingDevice(device);
+            return;
+        }
         await (0, auth_1.saveSelectedDeviceId)(device.deviceId);
         onPick(device);
     };
@@ -149,6 +160,13 @@ const YaverMachinePickerScreen = ({ token, currentDeviceId, onPick, onCancel, })
             {error && <react_native_1.Text style={styles.error}>{error}</react_native_1.Text>}
           </>)}
       </react_native_1.ScrollView>
+
+      <PairDeviceModal_1.PairDeviceModal device={pairingDevice} onClose={() => setPairingDevice(null)} onPaired={() => {
+            // Give the agent a moment to flip bootstrap → owner mode,
+            // then reload the list so the now-authenticated device shows
+            // up with a green dot and can be selected normally.
+            setTimeout(() => void load(true), 1500);
+        }}/>
     </react_native_1.SafeAreaView>);
 };
 exports.YaverMachinePickerScreen = YaverMachinePickerScreen;

package/dist/PairDeviceModal.d.ts

@@ -0,0 +1,28 @@
+import React from 'react';
+import type { RemoteDevice } from './auth';
+/**
+ * In-SDK remote-pair modal. Shown when the user taps a device in the
+ * machine picker that's in `needsAuth` state.
+ *
+ * Flow:
+ *   1. User types the 6-char bootstrap passkey printed in the
+ *      `yaver serve` terminal on the Mac (also shown in Yaver mobile
+ *      app when pairing interactively).
+ *   2. SDK POSTs to `http://<device.quicHost>:<device.httpPort>/auth/pair/submit?code=XXXXXX`
+ *      with the user's Convex session token (same one the SDK already
+ *      has after Apple / Google / email sign-in).
+ *   3. Agent validates the token against Convex, persists it, flips
+ *      out of bootstrap mode — within a couple of seconds it'll
+ *      report `needsAuth=false` in /devices/list.
+ *
+ * This avoids making the user bounce to the Yaver mobile app just to
+ * adopt a machine. Works for owners and shared-scope guests since the
+ * pair endpoint accepts any valid Convex session that matches the
+ * expected account type.
+ */
+export interface PairDeviceModalProps {
+    device: RemoteDevice | null;
+    onClose: () => void;
+    onPaired?: (device: RemoteDevice) => void;
+}
+export declare const PairDeviceModal: React.FC<PairDeviceModalProps>;

package/dist/PairDeviceModal.js

@@ -0,0 +1,198 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PairDeviceModal = void 0;
+const react_1 = __importStar(require("react"));
+const react_native_1 = require("react-native");
+const auth_1 = require("./auth");
+const PairDeviceModal = ({ device, onClose, onPaired, }) => {
+    const [code, setCode] = (0, react_1.useState)('');
+    const [busy, setBusy] = (0, react_1.useState)(false);
+    const [error, setError] = (0, react_1.useState)(null);
+    const [success, setSuccess] = (0, react_1.useState)(false);
+    (0, react_1.useEffect)(() => {
+        if (device) {
+            setCode('');
+            setError(null);
+            setSuccess(false);
+        }
+    }, [device?.deviceId]);
+    const handleSubmit = async () => {
+        if (!device)
+            return;
+        const trimmed = code.trim().toUpperCase();
+        if (trimmed.length !== 6) {
+            setError('Code must be 6 characters.');
+            return;
+        }
+        const token = await (0, auth_1.getToken)();
+        if (!token) {
+            setError('Not signed in.');
+            return;
+        }
+        const host = (device.quicHost || '').trim();
+        const port = device.httpPort || device.quicPort || 18080;
+        if (!host) {
+            setError('No reachable address for this machine.');
+            return;
+        }
+        setBusy(true);
+        setError(null);
+        try {
+            const url = `http://${host}:${port}/auth/pair/submit?code=${encodeURIComponent(trimmed)}`;
+            const res = await fetch(url, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    token,
+                    convexSiteUrl: (0, auth_1.getConvexSiteUrl)(),
+                    // Backend reads userId from the session, but older agents
+                    // expect it in the body. Pass empty string if unknown.
+                    userId: '',
+                }),
+            });
+            if (!res.ok) {
+                let msg = `Agent rejected pair (HTTP ${res.status}).`;
+                try {
+                    const body = await res.json();
+                    if (body?.error)
+                        msg = String(body.error);
+                }
+                catch {
+                    // body not JSON
+                }
+                throw new Error(msg);
+            }
+            setSuccess(true);
+            onPaired?.(device);
+            setTimeout(() => {
+                onClose();
+            }, 1200);
+        }
+        catch (err) {
+            setError(err instanceof Error ? err.message : String(err));
+        }
+        finally {
+            setBusy(false);
+        }
+    };
+    return (<react_native_1.Modal visible={!!device} animationType="slide" transparent onRequestClose={onClose}>
+      <react_native_1.Pressable style={styles.overlay} onPress={onClose}>
+        <react_native_1.Pressable style={styles.card} onPress={(e) => e.stopPropagation()}>
+          <react_native_1.View style={styles.header}>
+            <react_native_1.Text style={styles.title}>Pair this Mac</react_native_1.Text>
+            <react_native_1.Pressable onPress={onClose} hitSlop={12} style={styles.closeBtn}>
+              <react_native_1.Text style={styles.closeIcon}>×</react_native_1.Text>
+            </react_native_1.Pressable>
+          </react_native_1.View>
+
+          <react_native_1.Text style={styles.deviceName}>{device?.name || device?.deviceId}</react_native_1.Text>
+          <react_native_1.Text style={styles.body}>
+            On the Mac where `yaver serve` is running, look for the 6-character code in the terminal output. Enter it here to adopt this machine.
+          </react_native_1.Text>
+
+          <react_native_1.TextInput style={styles.codeInput} value={code} onChangeText={(v) => setCode(v.toUpperCase().replace(/[^A-Z0-9]/g, '').slice(0, 6))} placeholder="ABCDEF" placeholderTextColor="#555" autoCapitalize="characters" autoCorrect={false} maxLength={6} keyboardType={react_native_1.Platform.OS === 'ios' ? 'ascii-capable' : 'visible-password'}/>
+
+          {error && <react_native_1.Text style={styles.error}>{error}</react_native_1.Text>}
+          {success && <react_native_1.Text style={styles.success}>Paired ✓</react_native_1.Text>}
+
+          <react_native_1.Pressable onPress={handleSubmit} disabled={busy || success || code.length !== 6} style={({ pressed }) => [
+            styles.submit,
+            (busy || success || code.length !== 6) && styles.submitDisabled,
+            pressed && { opacity: 0.7 },
+        ]}>
+            {busy ? (<react_native_1.ActivityIndicator color="#fff"/>) : (<react_native_1.Text style={styles.submitText}>{success ? 'Paired' : 'Pair'}</react_native_1.Text>)}
+          </react_native_1.Pressable>
+        </react_native_1.Pressable>
+      </react_native_1.Pressable>
+    </react_native_1.Modal>);
+};
+exports.PairDeviceModal = PairDeviceModal;
+const styles = react_native_1.StyleSheet.create({
+    overlay: {
+        flex: 1,
+        backgroundColor: 'rgba(0,0,0,0.55)',
+        justifyContent: 'flex-end',
+    },
+    card: {
+        backgroundColor: '#141422',
+        borderTopLeftRadius: 22,
+        borderTopRightRadius: 22,
+        padding: 24,
+        paddingBottom: 36,
+        gap: 14,
+    },
+    header: {
+        flexDirection: 'row',
+        alignItems: 'center',
+        justifyContent: 'space-between',
+    },
+    title: { fontSize: 20, fontWeight: '700', color: '#fff' },
+    closeBtn: {
+        width: 36,
+        height: 36,
+        borderRadius: 18,
+        alignItems: 'center',
+        justifyContent: 'center',
+        backgroundColor: 'rgba(255,255,255,0.08)',
+    },
+    closeIcon: { color: '#fff', fontSize: 22, lineHeight: 24 },
+    deviceName: { fontSize: 15, fontWeight: '600', color: '#c7c8ff' },
+    body: { fontSize: 13, color: '#9ca3af', lineHeight: 18 },
+    codeInput: {
+        backgroundColor: 'rgba(255,255,255,0.06)',
+        borderWidth: 1,
+        borderColor: 'rgba(255,255,255,0.14)',
+        borderRadius: 12,
+        paddingHorizontal: 16,
+        paddingVertical: 16,
+        fontSize: 22,
+        fontWeight: '700',
+        letterSpacing: 4,
+        textAlign: 'center',
+        color: '#fff',
+        fontFamily: react_native_1.Platform.OS === 'ios' ? 'Menlo' : 'monospace',
+    },
+    error: { color: '#ef4444', fontSize: 13 },
+    success: { color: '#22c55e', fontSize: 14, fontWeight: '600' },
+    submit: {
+        backgroundColor: '#818cf8',
+        borderRadius: 12,
+        paddingVertical: 14,
+        alignItems: 'center',
+    },
+    submitDisabled: { opacity: 0.35 },
+    submitText: { color: '#fff', fontSize: 16, fontWeight: '700' },
+});

package/dist/_core/device.d.ts

@@ -0,0 +1,79 @@
+export interface CoreDevice {
+    /** Convex-issued device id. */
+    deviceId: string;
+    /** Display name — usually hostname. */
+    name: string;
+    /** OS family — "darwin", "linux", "windows". */
+    platform: string;
+    isOnline: boolean;
+    needsAuth: boolean;
+    runnerDown: boolean;
+    /** Unix ms of the latest heartbeat the agent sent to Convex. */
+    lastHeartbeat: number;
+    isGuest: boolean;
+    hostName?: string;
+    hostEmail?: string;
+    accessScope?: 'owner' | 'shared-scoped' | 'shared-legacy';
+    /** Primary LAN IP (or tunnel host) the agent advertised. */
+    quicHost: string;
+    quicPort: number;
+    /** HTTP port the agent listens on (usually 18080). */
+    httpPort?: number;
+    publicKey?: string;
+    /** Stable hardware identifier — dedup key for re-pair events. */
+    hwid?: string;
+    /**
+     * Every LAN IP the agent reported in its last heartbeat. Used by
+     * Discovery.raceProbe to try all interfaces in parallel.
+     */
+    localIps?: string[];
+}
+export declare function deviceIdentityKey(d: CoreDevice): string;
+export declare function deviceAliasKey(d: CoreDevice): string | null;
+export declare function deviceEndpointKey(d: CoreDevice): string | null;
+export declare function mergeDeviceEntries(a: CoreDevice, b: CoreDevice): CoreDevice;
+/**
+ * Collapse duplicate Convex rows so each physical machine appears
+ * exactly once. Three passes — identity key → alias key → endpoint key.
+ * Safe on empty lists; idempotent on already-deduped input.
+ */
+export declare function collapseDevices(devices: CoreDevice[]): CoreDevice[];
+/**
+ * "Fresh" matches the mobile app: online + heartbeat < 90 s. Clients
+ * read Convex's `isOnline` first (backend already applies its own 90 s
+ * gate from the server clock), then use this helper when they need the
+ * phone-side freshness opinion too — e.g. for auto-connect picks.
+ */
+export declare function isDeviceFresh(d: CoreDevice, now?: number): boolean;
+/**
+ * Choose the best candidate for an auto-connect attempt. Preference:
+ *   1. explicit `preferredDeviceId` that's still fresh
+ *   2. fresh (online + recent heartbeat) + has a quicHost
+ *   3. online + has a quicHost
+ *   4. first with a quicHost
+ */
+export declare function pickTargetDevice(devices: CoreDevice[], preferredDeviceId?: string): CoreDevice | null;
+/**
+ * Build the set of `/health` candidate URLs for a target device —
+ * `quicHost` plus every LAN IP the agent reported in `localIps`,
+ * uniqued and formatted. This is the thing that makes direct LAN
+ * reloads "just work" on multi-homed hosts (en0 + utun tailscale +
+ * docker0 etc.) — the mobile app races them in parallel via
+ * Promise.any.
+ */
+export declare function buildProbeCandidates(target: CoreDevice, defaultHttpPort?: number): string[];
+export interface ProbeResult {
+    url: string;
+    hostname?: string;
+    version?: string;
+    latency?: number;
+}
+/**
+ * Race `/health` probes across N URLs. First 200 wins; everything else
+ * is abandoned. Older Hermes doesn't have Promise.any, so we hand-roll
+ * the same semantic.
+ */
+export declare function raceHealthProbes(urls: string[], opts?: {
+    timeoutMs?: number;
+    headers?: Record<string, string>;
+}): Promise<ProbeResult | null>;