Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 137 additions & 0 deletions browser-host/relay-broker.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,34 @@ async function relayAuthority(fetch, relay) {
// NIP-IA snapshots require the explicit relay signing identity. The NIP-11
// contact-key fallback used by older channel reads cannot grant this authority.
...(nip11.self === author ? { archiveAuthority: author } : {}),
// Server-owned read state (`/buzz/v1`). Absent means NIP-RS stays in use.
...(readStateV1(nip11.buzz_v1)
? { readStateV1: readStateV1(nip11.buzz_v1) }
: {}),
};
}
/** The advertised `buzz_v1` descriptor the client needs, or undefined. */
function readStateV1(value) {
if (
!value ||
typeof value !== "object" ||
value.version !== 1 ||
value.base_path !== "/buzz/v1" ||
!Array.isArray(value.capabilities) ||
!value.capabilities.includes("ping")
)
return undefined;
return {
capabilities: value.capabilities.filter((name) => typeof name === "string"),
eligibleKinds: Array.isArray(value.eligible_kinds)
? value.eligible_kinds.filter(Number.isSafeInteger)
: [9, 40002, 45001, 45003],
maxChannels: Number.isSafeInteger(value.max_channels)
? value.max_channels
: 20,
maxIntents: Number.isSafeInteger(value.max_intents)
? value.max_intents
: 100,
};
}
/**
Expand Down Expand Up @@ -1418,6 +1446,115 @@ export function relayBrokerPlugin({
});
}
}
if (
route === "/api/relay/read-v1-sidebar" ||
route === "/api/relay/read-v1-threads" ||
route === "/api/relay/read-v1-write" ||
route === "/api/relay/read-v1-coverage"
) {
// Fixed `/buzz/v1/me` routes only; NIP-98 signing stays in this process.
if (!(await getAuthority(relay)).readStateV1)
return json(res, 404, { error: "Read state API unavailable" });
const coverage = route === "/api/relay/read-v1-coverage";
const write = coverage || route === "/api/relay/read-v1-write";
if (req.method !== (write ? "POST" : "GET"))
return json(res, 405, { error: "Method not allowed" });
let body;
if (write) {
let raw = "";
req.setEncoding("utf8");
for await (const part of req) {
raw += part;
if (Buffer.byteLength(raw) > 64 * 1024)
return json(res, 413, { error: "Read intents too large" });
}
try {
const parsed = JSON.parse(raw);
const items = coverage ? parsed.message_ids : parsed.intents;
if (!Array.isArray(items) || !items.length) throw 0;
body = JSON.stringify(
coverage ? { message_ids: items } : { intents: items },
);
} catch {
return json(res, 400, { error: "Invalid read intents" });
}
}
const query = new URLSearchParams();
for (const name of ["limit", "cursor", "channel_ids"]) {
const value = url.searchParams.get(name);
if (value !== null) query.set(name, value);
}
const path = `/buzz/v1/me/${coverage ? "coverage" : write ? "read-state" : route === "/api/relay/read-v1-threads" ? "threads" : "sidebar"}${query.size ? `?${query}` : ""}`;
const requestSignal = AbortSignal.any([
cancel.signal,
AbortSignal.timeout(UPSTREAM_TIMEOUT_MS),
]);
try {
const response = await admittedApiRequest(
admissions(relay, viewer).api,
() => {
requestSignal.throwIfAborted();
const auth = finalizeEvent(
{
kind: 27235,
created_at: Math.floor(Date.now() / 1000),
content: "",
tags: [
["u", `${relay}${path}`],
["method", write ? "POST" : "GET"],
...(body === undefined
? []
: [
[
"payload",
createHash("sha256").update(body).digest("hex"),
],
]),
["nonce", randomBytes(16).toString("hex")],
],
},
key,
);
return fetchUpstream(`${relay}${path}`, {
method: write ? "POST" : "GET",
headers: {
...(body === undefined
? {}
: { "Content-Type": "application/json" }),
Authorization:
"Nostr " +
Buffer.from(JSON.stringify(auth)).toString("base64"),
},
body,
redirect: "error",
signal: requestSignal,
});
},
requestSignal,
write ? "foreground" : "background",
);
const text = await response.text();
if (Buffer.byteLength(text) > 1024 * 1024)
return json(res, 502, {
error: "Read state response too large",
});
res.writeHead(response.status, {
"Content-Type": "application/json",
"Cache-Control": "no-store",
...(response.headers.get("retry-after")
? { "Retry-After": response.headers.get("retry-after") }
: {}),
});
return res.end(text);
} catch (error) {
if (cancel.signal.aborted) return;
return json(res, 502, {
error:
error instanceof Error ? error.message : "Read state failed",
sent: false,
});
}
}
if (route === "/api/relay/session" && req.method === "GET") {
return json(res, 200, {
viewer,
Expand Down
1 change: 1 addition & 0 deletions src-tauri/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ fn main() {
"relay_sign_read_state",
"relay_publish_read_state",
"relay_http",
"relay_read_v1",
"relay_workflow_runs",
"relay_admin_discover",
"relay_admin_request",
Expand Down
1 change: 1 addition & 0 deletions src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"allow-relay-sign-read-state",
"allow-relay-publish-read-state",
"allow-relay-http",
"allow-relay-read-v1",
"allow-relay-workflow-runs",
"allow-relay-admin-discover",
"allow-relay-admin-request",
Expand Down
1 change: 1 addition & 0 deletions src-tauri/src/browser_permissions_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ fn native_command_permissions_isolate_webviews() {
"relay_sign_read_state",
"relay_publish_read_state",
"relay_http",
"relay_read_v1",
"relay_workflow_runs",
"relay_project_git",
"relay_project_git_cancel",
Expand Down
7 changes: 4 additions & 3 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ use relay::{
relay_channel_publish, relay_channel_sign, relay_decode_read_state, relay_decode_reminders,
relay_decode_sidebar, relay_direct_message, relay_git_authorization, relay_http,
relay_kit_decode, relay_kit_prepare, relay_kit_sign, relay_project_git,
relay_project_git_cancel, relay_publish_read_state, relay_sign, relay_sign_read_state,
relay_sign_reminder, relay_sign_sidebar, relay_upload, relay_upload_begin, relay_upload_cancel,
relay_upload_chunk, relay_workflow_runs,
relay_project_git_cancel, relay_publish_read_state, relay_read_v1, relay_sign,
relay_sign_read_state, relay_sign_reminder, relay_sign_sidebar, relay_upload,
relay_upload_begin, relay_upload_cancel, relay_upload_chunk, relay_workflow_runs,
};
use relay::{huddle_close, huddle_open, huddle_pcm, huddle_touch, Huddles};
mod terminal;
Expand Down Expand Up @@ -515,6 +515,7 @@ fn commands<R: tauri::Runtime>() -> impl Fn(tauri::ipc::Invoke<R>) -> bool + Sen
relay_sign_read_state,
relay_publish_read_state,
relay_http,
relay_read_v1,
relay_workflow_runs,
relay_admin::relay_admin_discover,
relay_admin::relay_admin_request,
Expand Down
2 changes: 2 additions & 0 deletions src-tauri/src/relay.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ mod media_stream;
pub(crate) use media_stream::{media_stream_base, MediaStream};
mod project_git;
pub(crate) use project_git::{relay_project_git, relay_project_git_cancel};
mod read_v1;
pub(crate) use read_v1::relay_read_v1;
type Result<T> = std::result::Result<T, String>;
const MAX_BODY: usize = 1024 * 1024;
const MAX_RESPONSE: usize = 16 * 1024 * 1024;
Expand Down
Loading
Loading