feat(instances): beacon on connect and relay self-entry
parent
280c7c851f
commit
38c4f4f76c
|
|
@ -1,5 +1,6 @@
|
||||||
import Foundation
|
import Foundation
|
||||||
import OSLog
|
import OSLog
|
||||||
|
import SwiftUI
|
||||||
|
|
||||||
struct ControlHeartbeatEvent: Codable {
|
struct ControlHeartbeatEvent: Codable {
|
||||||
let ts: Double
|
let ts: Double
|
||||||
|
|
@ -91,6 +92,7 @@ final class ControlChannel: ObservableObject {
|
||||||
self.state = .connecting
|
self.state = .connecting
|
||||||
try await AgentRPC.shared.start()
|
try await AgentRPC.shared.start()
|
||||||
self.state = .connected
|
self.state = .connected
|
||||||
|
PresenceReporter.shared.sendImmediate(reason: "connect")
|
||||||
} catch {
|
} catch {
|
||||||
self.state = .degraded(error.localizedDescription)
|
self.state = .degraded(error.localizedDescription)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,11 @@ final class PresenceReporter {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Fire an immediate presence beacon (e.g., right after connecting).
|
||||||
|
func sendImmediate(reason: String = "connect") {
|
||||||
|
Task { await self.push(reason: reason) }
|
||||||
|
}
|
||||||
|
|
||||||
private static func composePresenceSummary(mode: String, reason: String) -> String {
|
private static func composePresenceSummary(mode: String, reason: String) -> String {
|
||||||
let host = Host.current().localizedName ?? "unknown-host"
|
let host = Host.current().localizedName ?? "unknown-host"
|
||||||
let ip = Self.primaryIPv4Address() ?? "ip-unknown"
|
let ip = Self.primaryIPv4Address() ?? "ip-unknown"
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,3 +1,5 @@
|
||||||
|
import os from "node:os";
|
||||||
|
|
||||||
export type SystemPresence = {
|
export type SystemPresence = {
|
||||||
host?: string;
|
host?: string;
|
||||||
ip?: string;
|
ip?: string;
|
||||||
|
|
@ -11,6 +13,45 @@ export type SystemPresence = {
|
||||||
|
|
||||||
const entries = new Map<string, SystemPresence>();
|
const entries = new Map<string, SystemPresence>();
|
||||||
|
|
||||||
|
function resolvePrimaryIPv4(): string | undefined {
|
||||||
|
const nets = os.networkInterfaces();
|
||||||
|
const prefer = ["en0", "eth0"];
|
||||||
|
const pick = (names: string[]) => {
|
||||||
|
for (const name of names) {
|
||||||
|
const list = nets[name];
|
||||||
|
const entry = list?.find((n) => n.family === "IPv4" && !n.internal);
|
||||||
|
if (entry?.address) return entry.address;
|
||||||
|
}
|
||||||
|
for (const list of Object.values(nets)) {
|
||||||
|
const entry = list?.find((n) => n.family === "IPv4" && !n.internal);
|
||||||
|
if (entry?.address) return entry.address;
|
||||||
|
}
|
||||||
|
return undefined;
|
||||||
|
};
|
||||||
|
return pick(prefer) ?? os.hostname();
|
||||||
|
}
|
||||||
|
|
||||||
|
function initSelfPresence() {
|
||||||
|
const host = os.hostname();
|
||||||
|
const ip = resolvePrimaryIPv4() ?? undefined;
|
||||||
|
const version =
|
||||||
|
process.env.CLAWDIS_VERSION ?? process.env.npm_package_version ?? "unknown";
|
||||||
|
const text = `Relay: ${host}${ip ? ` (${ip})` : ""} · app ${version} · mode relay · reason self`;
|
||||||
|
const selfEntry: SystemPresence = {
|
||||||
|
host,
|
||||||
|
ip,
|
||||||
|
version,
|
||||||
|
mode: "relay",
|
||||||
|
reason: "self",
|
||||||
|
text,
|
||||||
|
ts: Date.now(),
|
||||||
|
};
|
||||||
|
const key = host.toLowerCase();
|
||||||
|
entries.set(key, selfEntry);
|
||||||
|
}
|
||||||
|
|
||||||
|
initSelfPresence();
|
||||||
|
|
||||||
function parsePresence(text: string): SystemPresence {
|
function parsePresence(text: string): SystemPresence {
|
||||||
const trimmed = text.trim();
|
const trimmed = text.trim();
|
||||||
const pattern =
|
const pattern =
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue