diff --git a/.claude/skills/orbitmem-cli/SKILL.md b/.claude/skills/orbitmem-cli/SKILL.md index 0eef006..548babf 100644 --- a/.claude/skills/orbitmem-cli/SKILL.md +++ b/.claude/skills/orbitmem-cli/SKILL.md @@ -23,15 +23,14 @@ packages/cli/src/ | File | Contents | |------|----------| -| `config.json` | `{ relay, chain, registryAddress, reputationAddress }` | -| `key.json` | Generated EVM private key | -| `vault/` | Local OrbitDB data directory | +| `config.json` | `{ walletName, network, relay, chain, registryAddress, reputationAddress }` | +| `vault/` | OrbitDB data directory (blocks, keystore, database logs) | ## Command → SDK layer mapping | Command | SDK Layer(s) | |---------|-------------| -| `init` | Identity (key gen via viem) | +| `init` | Identity (OWS wallet creation) | | `vault store/get/ls` | Data (vault) + Encryption | | `register` | Discovery (on-chain registry) | | `discover` | Discovery (findData) | diff --git a/.claude/skills/orbitmem-discover/SKILL.md b/.claude/skills/orbitmem-discover/SKILL.md index 123a639..7de0c06 100644 --- a/.claude/skills/orbitmem-discover/SKILL.md +++ b/.claude/skills/orbitmem-discover/SKILL.md @@ -13,7 +13,7 @@ or quality thresholds. Returns data IDs, names, tags, quality scores, and vault ## Search Command ```bash -cd examples/agent-research && bun run tools/search-research.ts --tags , --keyword "" --min-quality <1-5> +npx orbitmem discover --tags , --min-quality ``` ### Flags (all optional, use at least one) @@ -21,10 +21,9 @@ cd examples/agent-research && bun run tools/search-research.ts --tags , --dimension --tags , +npx orbitmem rate --tag ``` ### Arguments @@ -21,9 +21,9 @@ cd examples/agent-research && bun run tools/submit-feedback.ts | Arg | Required | Description | |-----|----------|-------------| | `dataId` | yes | The on-chain data ID (number from discover results) | -| `score` | yes | Quality score from 1 (poor) to 5 (excellent) | -| `--dimension` | no | One of: `accuracy`, `freshness`, `completeness`, `usefulness` (default: `usefulness`) | -| `--tags` | no | Up to 2 tags describing the feedback (e.g. `accurate,fresh`) | +| `score` | yes | Quality score (number) | +| `--tag` | no | Tag describing the feedback (e.g. `accurate`, `fresh`) | +| `--json` | no | Machine-readable output | ## OrbitMem Layers Used diff --git a/.claude/skills/orbitmem-store/SKILL.md b/.claude/skills/orbitmem-store/SKILL.md index 92dedfb..51113dd 100644 --- a/.claude/skills/orbitmem-store/SKILL.md +++ b/.claude/skills/orbitmem-store/SKILL.md @@ -14,17 +14,18 @@ making it discoverable by other agents. ## Store Command ```bash -cd examples/agent-research && bun run tools/store-research.ts "" "" --tags , --visibility public +npx orbitmem vault store --public +npx orbitmem register --tags , ``` ### Arguments | Arg | Required | Description | |-----|----------|-------------| -| `key` | yes | Kebab-case path identifier (e.g. `notes/bun-vs-deno`) | +| `key` | yes | Kebab-case path identifier (e.g. `research/bun-vs-deno`) | | `value` | yes | The data to store (plain text, JSON string, markdown) | -| `--tags` | no | Comma-separated tags for discovery (default: `research`) | -| `--visibility` | no | `public` (default) or `private` | +| `--public` | no | Store as public (default: private, AES encrypted) | +| `--tags` | no | Comma-separated tags for on-chain registration | ## OrbitMem Layers Used diff --git a/.gitignore b/.gitignore index b4eed25..65a6112 100644 --- a/.gitignore +++ b/.gitignore @@ -82,4 +82,5 @@ orbitdb/ worktrees/ # Project-specific -orbitmem-cli/ +/orbitmem-cli/ +.orbitmem diff --git a/CLAUDE.md b/CLAUDE.md index a2085a5..4991f47 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -61,7 +61,8 @@ OWNER= forge script script/Deploy.s.sol --broadcast --rpc-url # Store data in vault bun run cli vault get # Read data from vault diff --git a/apps/web/app/components/Layout.tsx b/apps/web/app/components/Layout.tsx index 681c530..91cc08c 100644 --- a/apps/web/app/components/Layout.tsx +++ b/apps/web/app/components/Layout.tsx @@ -3,10 +3,7 @@ import { type ReactNode, useState } from "react"; import { ConnectButton } from "./ConnectButton"; -const navLinks = [ - { to: "/explore", label: "Explore" }, - { to: "/dashboard", label: "Dashboard" }, -] as const; +const navLinks = [{ to: "/explore", label: "Explore" }] as const; export function Layout({ children }: { children: ReactNode }) { const routerState = useRouterState(); @@ -139,6 +136,15 @@ export function Layout({ children }: { children: ReactNode }) { > ERC-8128 + · + + Open Wallet Standard + diff --git a/apps/web/app/lib/api.ts b/apps/web/app/lib/api.ts index e4b13ca..c9112ab 100644 --- a/apps/web/app/lib/api.ts +++ b/apps/web/app/lib/api.ts @@ -1,4 +1,6 @@ -const BASE = "/api"; +const BASE = import.meta.env.VITE_RELAY_URL + ? `${import.meta.env.VITE_RELAY_URL}/v1` + : "/api"; async function fetchJSON(path: string, init?: RequestInit): Promise { const res = await fetch(`${BASE}${path}`, { diff --git a/apps/web/app/lib/pino-noop.ts b/apps/web/app/lib/pino-noop.ts new file mode 100644 index 0000000..142f08b --- /dev/null +++ b/apps/web/app/lib/pino-noop.ts @@ -0,0 +1,38 @@ +const noop = () => {}; +const logger = { + trace: noop, + debug: noop, + info: noop, + warn: noop, + error: noop, + fatal: noop, + silent: noop, + child: () => logger, + bindings: () => ({}), + level: "silent", +}; + +export const levels = { + values: { + fatal: 60, + error: 50, + warn: 40, + info: 30, + debug: 20, + trace: 10, + }, + labels: { + 60: "fatal", + 50: "error", + 40: "warn", + 30: "info", + 20: "debug", + 10: "trace", + }, +}; + +export default function pino(_opts?: unknown, _stream?: unknown) { + return logger; +} + +export { pino }; diff --git a/apps/web/app/routes/__root.tsx b/apps/web/app/routes/__root.tsx index 83a87ef..5502ee7 100644 --- a/apps/web/app/routes/__root.tsx +++ b/apps/web/app/routes/__root.tsx @@ -11,9 +11,8 @@ import type { ReactNode } from "react"; import { WagmiProvider } from "wagmi"; import { Layout } from "../components/Layout"; -import { wagmiConfig } from "../lib/wagmi"; - import appCss from "../index.css?url"; +import { wagmiConfig } from "../lib/wagmi"; interface RouterContext { queryClient: QueryClient; @@ -30,7 +29,10 @@ export const Route = createRootRouteWithContext()({ content: "Decentralized data layer for agentic web.", }, { property: "og:type", content: "website" }, - { property: "og:title", content: "OrbitMem — Decentralized data layer for agentic web." }, + { + property: "og:title", + content: "OrbitMem — Decentralized data layer for agentic web.", + }, { property: "og:description", content: "Decentralized data layer for agentic web.", @@ -43,7 +45,11 @@ export const Route = createRootRouteWithContext()({ { rel: "stylesheet", href: appCss }, { rel: "icon", type: "image/png", href: "/logo.png" }, { rel: "preconnect", href: "https://fonts.googleapis.com" }, - { rel: "preconnect", href: "https://fonts.gstatic.com", crossorigin: "anonymous" }, + { + rel: "preconnect", + href: "https://fonts.gstatic.com", + crossorigin: "anonymous", + }, { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap", diff --git a/apps/web/app/routes/explore/index.tsx b/apps/web/app/routes/explore/index.tsx index 726095a..6793e31 100644 --- a/apps/web/app/routes/explore/index.tsx +++ b/apps/web/app/routes/explore/index.tsx @@ -4,34 +4,37 @@ import { useCallback, useState } from "react"; import { DataTable } from "../../components/DataTable"; import { SearchBar } from "../../components/SearchBar"; -import { type DataRegistration, getDataStats, searchData } from "../../lib/api"; +import { type DataRegistration, searchData } from "../../lib/api"; export const Route = createFileRoute("/explore/")({ component: DataPage, }); function DataPage() { - const [schema, setSchema] = useState(""); + const [query, setQuery] = useState(""); const [verifiedOnly, setVerifiedOnly] = useState(false); - const { data: stats, isLoading: statsLoading } = useQuery({ - queryKey: ["dataStats"], - queryFn: getDataStats, - refetchInterval: 60_000, - }); - const { data: result, isLoading } = useQuery({ - queryKey: ["dataSearch", schema, verifiedOnly], + queryKey: ["dataSearch", verifiedOnly], queryFn: () => searchData({ - schema: schema || undefined, verifiedOnly: verifiedOnly || undefined, }), }); - const entries = result?.results ?? []; + // Client-side text search across name, description, tags, schema, key + const entries = (result?.results ?? []).filter((d) => { + if (!query) return true; + const q = query.toLowerCase(); + return ( + d.name?.toLowerCase().includes(q) || + d.description?.toLowerCase().includes(q) || + d.schema?.toLowerCase().includes(q) || + d.tags?.some((t) => t.toLowerCase().includes(q)) + ); + }); - const onSearch = useCallback((q: string) => setSchema(q), []); + const onSearch = useCallback((q: string) => setQuery(q), []); return (
@@ -40,6 +43,7 @@ function DataPage() {

Browse data entries with quality scores and tags

+ {/* TODO: re-enable stats when relay is live

Data Entries

@@ -54,9 +58,10 @@ function DataPage() {

{statsLoading ? "—" : (stats?.avgQuality ?? 0)}

+ */}
- +
@@ -370,12 +370,12 @@

Decentralized data layer for agentic web.

Video QR > Video QR); +} catch { + // Porto not available — EVM wallets only +} export const config = createConfig({ chains: [baseSepolia], diff --git a/package.json b/package.json index d9d7a39..9e736bf 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { "name": "orbitmem", "private": true, + "bin": { + "orbitmem": "./packages/cli/dist/index.js" + }, "workspaces": [ "packages/*", "apps/*" ], - "bin": { - "orbitmem": "./packages/cli/dist/index.js" - }, "scripts": { "build": "bun run --filter '*' build", "test": "bun test packages/sdk packages/relay packages/cli apps", @@ -18,7 +18,7 @@ "build:contracts": "bun run --filter @orbitmem/contracts build", "test:contracts": "bun run --filter @orbitmem/contracts test", "deploy:web": "bun run --filter @orbitmem/web deploy", - "deploy:relay": "fly deploy --config packages/relay/fly.toml --dockerfile packages/relay/Dockerfile", + "deploy:relay": "fly deploy --config ./fly.toml --dockerfile packages/relay/Dockerfile", "lint": "vp lint packages apps", "lint:fix": "vp lint --fix packages apps && vp fmt --write packages apps", "format": "vp fmt --write packages apps", diff --git a/packages/cli/README.md b/packages/cli/README.md index 94b2942..0a5bb8f 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -31,7 +31,9 @@ orbitmem status ### `init` -Generate keys and create `~/.orbitmem/config.json`. +Generate an OWS wallet and create `~/.orbitmem/config.json`. Vault data is stored at `~/.orbitmem/vault/`. + +If the OWS wallet already exists (e.g. after removing `~/.orbitmem/`), use `--force` to re-link it. ```bash orbitmem init --name --network [--force] diff --git a/packages/cli/package.json b/packages/cli/package.json index c0b7496..d7059c0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "orbitmem", - "version": "0.1.2", + "version": "0.1.9", "description": "CLI for OrbitMem — manage vaults, discover data, and interact with on-chain registries", "keywords": [ "agents", @@ -37,7 +37,7 @@ "@hono/node-server": "^1.13.0", "@open-wallet-standard/core": "^1.1.0", "@orbitmem/relay": "^0.1.0", - "@orbitmem/sdk": "^0.1.0", + "@orbitmem/sdk": "^0.1.4", "viem": "^2.0.0" }, "devDependencies": { diff --git a/packages/cli/src/commands/discover.ts b/packages/cli/src/commands/discover.ts index 0dea474..6cdbffd 100644 --- a/packages/cli/src/commands/discover.ts +++ b/packages/cli/src/commands/discover.ts @@ -13,10 +13,17 @@ export async function discover(args: string[], flags: Record): P try { const query: Record = {}; if (args[0]) query.schema = args[0]; - if (flags.tags) query.tags = flags.tags.split(","); if (flags["min-quality"]) query.minQuality = Number(flags["min-quality"]); - const results = await client.discovery.findData(query); + let results = await client.discovery.findData(query); + + // Client-side tag filtering + const filterTags = flags.tags?.split(",").map((t) => t.trim().toLowerCase()); + if (filterTags?.length) { + results = results.filter((r: any) => + filterTags.some((ft) => r.tags?.some((t: string) => t.toLowerCase().includes(ft))), + ); + } if (flags.json !== undefined) { output(results, true); @@ -25,9 +32,10 @@ export async function discover(args: string[], flags: Record): P } else { const rows = results.map((r: any) => ({ id: r.dataId, - name: r.name, - quality: r.quality, - vault: `${String(r.vaultAddress ?? "").slice(0, 10)}...`, + name: r.name || "(unnamed)", + tags: (r.tags ?? []).join(", "), + owner: `${String(r.owner ?? "").slice(0, 10)}...`, + active: r.active ? "yes" : "no", })); output(rows, false); } diff --git a/packages/cli/src/commands/init.ts b/packages/cli/src/commands/init.ts index 72b192d..35938a9 100644 --- a/packages/cli/src/commands/init.ts +++ b/packages/cli/src/commands/init.ts @@ -21,7 +21,11 @@ export async function init(_args: string[], flags: Record): Prom } const walletName = flags.name ?? "orbitmem"; - createWallet(walletName); + try { + createWallet(walletName); + } catch { + // Wallet already exists in OWS keystore — reuse it + } const network = (flags.network ?? "base-sepolia") as NetworkId; saveConfig({ walletName, network }); diff --git a/packages/cli/src/commands/register.ts b/packages/cli/src/commands/register.ts index 721f84d..4b9936a 100644 --- a/packages/cli/src/commands/register.ts +++ b/packages/cli/src/commands/register.ts @@ -1,5 +1,6 @@ import { loadConfig } from "../config.js"; import { createClient } from "../utils/client.js"; +import { createRelayVaultClient } from "../utils/relay-client.js"; import { error, output } from "../utils/output.js"; export async function register(args: string[], flags: Record): Promise { @@ -11,18 +12,47 @@ export async function register(args: string[], flags: Record): P if (!config.registryAddress) error("No registry address configured. Set registryAddress in ~/.orbitmem/config.json"); + // Fetch vault entry via relay (fast) or local OrbitDB (--local) + let entry: { value: unknown } | null = null; + if (flags.local === undefined && config.relay) { + const relay = await createRelayVaultClient(config); + entry = await relay.get(path); + } + const client = await createClient(config); try { - const entry = await client.vault.get(path); + if (!entry) { + entry = await client.vault.get(path); + } if (!entry) error(`Vault entry not found: ${path}`); + // Auto-extract tags/name/description from stored data if available + // Relay may return value as a JSON string — parse it if needed + let parsed = entry.value; + if (typeof parsed === "string") { + try { + // Normalize literal newlines/tabs that may have leaked from shell input + parsed = JSON.parse(parsed.replace(/[\n\r\t]/g, " ")); + } catch { + // not JSON, keep as string + } + } + const data = typeof parsed === "object" && parsed !== null ? parsed as Record : {}; + const name = flags.name ?? (typeof data.name === "string" ? data.name : path); + const description = flags.description ?? (typeof data.description === "string" ? data.description : ""); + const tags = flags.tags + ? flags.tags.split(",") + : Array.isArray(data.tags) + ? data.tags.filter((t): t is string => typeof t === "string") + : []; + const result = await client.discovery.registerData({ key: path, - name: flags.name ?? path, - description: flags.description ?? "", + name, + description, schema: flags.schema, - tags: flags.tags ? flags.tags.split(",") : [], + tags, }); if (flags.json !== undefined) { @@ -30,6 +60,7 @@ export async function register(args: string[], flags: Record): P } else { process.stdout.write(`Registered "${path}" on-chain\n`); process.stdout.write(` Data ID: ${(result as any).dataId}\n`); + if (tags.length > 0) process.stdout.write(` Tags: ${tags.join(", ")}\n`); } } finally { await client.destroy(); diff --git a/packages/cli/src/commands/vault.ts b/packages/cli/src/commands/vault.ts index 3b550d3..f9df607 100644 --- a/packages/cli/src/commands/vault.ts +++ b/packages/cli/src/commands/vault.ts @@ -9,8 +9,14 @@ import type { import { loadConfig } from "../config.js"; import { createClient, type LitNetwork } from "../utils/client.js"; +import { createRelayVaultClient } from "../utils/relay-client.js"; import { error, output } from "../utils/output.js"; +/** True when the user passes --local or when no relay URL is configured */ +function useLocal(flags: Record, relay: string): boolean { + return flags.local !== undefined || !relay; +} + export async function vault(args: string[], flags: Record): Promise { const sub = args[0]; switch (sub) { @@ -38,9 +44,41 @@ async function vaultStore(args: string[], flags: Record): Promis if (flags.relay) config.relay = flags.relay; const engine = (flags.engine as EncryptionEngine) ?? "aes"; - const litNetwork = (flags["lit-network"] as LitNetwork) ?? "cayenne"; const useLit = engine === "lit"; + // Lit encryption requires the full SDK client + if (!useLit && !useLocal(flags, config.relay)) { + const relay = await createRelayVaultClient(config); + + let visibility: Visibility; + if (flags.public !== undefined) { + visibility = "public"; + } else if (flags.shared !== undefined) { + visibility = "shared"; + } else { + visibility = "private"; + } + + // Parse value as JSON if possible, otherwise store as string + // Normalize literal newlines from shell multiline input + let parsed: unknown; + try { + parsed = JSON.parse(value.replace(/[\n\r\t]/g, " ")); + } catch { + parsed = value; + } + + await relay.store(path, parsed, visibility); + if (flags.json !== undefined) { + output({ path, visibility, engine }, true); + } else { + process.stdout.write(`Stored "${path}" (${visibility})\n`); + } + return; + } + + // Fallback: full SDK client (--local or Lit encryption) + const litNetwork = (flags["lit-network"] as LitNetwork) ?? "cayenne"; const client = await createClient(config, useLit ? { litNetwork } : undefined); try { @@ -113,6 +151,69 @@ async function vaultStore(args: string[], flags: Record): Promis } } +async function vaultGet(args: string[], flags: Record): Promise { + const [path] = args; + if (!path) error("Usage: orbitmem vault get "); + + const config = loadConfig(); + if (flags.relay) config.relay = flags.relay; + + if (!useLocal(flags, config.relay)) { + const relay = await createRelayVaultClient(config); + const entry = await relay.get(path); + if (!entry) error(`Not found: ${path}`); + output(flags.json !== undefined ? entry : entry.value, flags.json !== undefined); + return; + } + + const client = await createClient(config); + try { + const entry = await client.vault.get(path); + if (!entry) error(`Not found: ${path}`); + output(flags.json !== undefined ? entry : entry.value, flags.json !== undefined); + } finally { + await client.destroy(); + } +} + +async function vaultLs(args: string[], flags: Record): Promise { + const [prefix] = args; + + const config = loadConfig(); + if (flags.relay) config.relay = flags.relay; + + if (!useLocal(flags, config.relay)) { + const relay = await createRelayVaultClient(config); + const keys = await relay.keys(prefix); + if (flags.json !== undefined) { + output(keys, true); + } else if (keys.length === 0) { + process.stdout.write("(no entries)\n"); + } else { + for (const key of keys) { + process.stdout.write(`${key}\n`); + } + } + return; + } + + const client = await createClient(config); + try { + const keys = await client.vault.keys(prefix); + if (flags.json !== undefined) { + output(keys, true); + } else if (keys.length === 0) { + process.stdout.write("(no entries)\n"); + } else { + for (const key of keys) { + process.stdout.write(`${key}\n`); + } + } + } finally { + await client.destroy(); + } +} + async function vaultUpdateAccess(args: string[], flags: Record): Promise { const [path] = args; if (!path) @@ -174,46 +275,6 @@ async function vaultUpdateAccess(args: string[], flags: Record): } } -async function vaultGet(args: string[], flags: Record): Promise { - const [path] = args; - if (!path) error("Usage: orbitmem vault get "); - - const config = loadConfig(); - if (flags.relay) config.relay = flags.relay; - const client = await createClient(config); - - try { - const entry = await client.vault.get(path); - if (!entry) error(`Not found: ${path}`); - output(flags.json !== undefined ? entry : entry.value, flags.json !== undefined); - } finally { - await client.destroy(); - } -} - -async function vaultLs(args: string[], flags: Record): Promise { - const [prefix] = args; - - const config = loadConfig(); - if (flags.relay) config.relay = flags.relay; - const client = await createClient(config); - - try { - const keys = await client.vault.keys(prefix); - if (flags.json !== undefined) { - output(keys, true); - } else if (keys.length === 0) { - process.stdout.write("(no entries)\n"); - } else { - for (const key of keys) { - process.stdout.write(`${key}\n`); - } - } - } finally { - await client.destroy(); - } -} - async function vaultPrice(args: string[], flags: Record): Promise { const action = args[0]; switch (action) { diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 93a4abb..f0524ed 100755 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -55,6 +55,7 @@ Commands: Options: --relay Override relay URL --chain Override chain + --local Use local OrbitDB instead of relay --json Output as JSON --help Show this help diff --git a/packages/cli/src/utils/client.ts b/packages/cli/src/utils/client.ts index 05918e9..eaff5dc 100644 --- a/packages/cli/src/utils/client.ts +++ b/packages/cli/src/utils/client.ts @@ -1,10 +1,12 @@ +import { join } from "node:path"; + import { createOrbitMem, getNetwork } from "@orbitmem/sdk"; import { createOwsAdapter } from "@orbitmem/sdk/identity"; import type { EncryptionConfig } from "@orbitmem/sdk/types"; import { createPublicClient, createWalletClient, http } from "viem"; import { base, baseSepolia } from "viem/chains"; -import type { CliConfig } from "../config.js"; +import { getConfigDir, type CliConfig } from "../config.js"; const CHAINS = { "base-sepolia": baseSepolia, @@ -39,7 +41,7 @@ export async function createClient(config: CliConfig, opts?: CreateClientOpts) { const client = await createOrbitMem({ network: config.network, identity: { owsWallet: config.walletName }, - vault: { dbName: "orbitmem-cli" }, + vault: { dbName: join(getConfigDir(), "vault") }, encryption, persistence: { relayUrl: config.relay, diff --git a/packages/cli/src/utils/relay-client.ts b/packages/cli/src/utils/relay-client.ts new file mode 100644 index 0000000..670918a --- /dev/null +++ b/packages/cli/src/utils/relay-client.ts @@ -0,0 +1,120 @@ +/** + * Lightweight relay-only vault client for CLI. + * Uses ERC-8128 signed HTTP requests — no OrbitDB/libp2p/Helia overhead. + */ + +import { createSignerClient } from "@slicekit/erc8128"; +import type { EthHttpSigner } from "@slicekit/erc8128"; +import { createOwsAdapter } from "@orbitmem/sdk/identity"; + +import { type CliConfig, toCaip2 } from "../config.js"; + +export interface RelayVaultClient { + store(path: string, value: unknown, visibility: string): Promise<{ ok: boolean; hash: string }>; + get(path: string): Promise<{ key: string; value: unknown; visibility: string } | null>; + keys(prefix?: string): Promise; + del(path: string): Promise<{ ok: boolean }>; + address: string; +} + +export async function createRelayVaultClient(config: CliConfig): Promise { + const relayUrl = config.relay; + if (!relayUrl) throw new Error("No relay URL configured"); + + const caip2 = toCaip2(config.network); + const adapter = createOwsAdapter(config.walletName, caip2); + const address = await adapter.getAddress(); + const chainId = Number.parseInt(caip2.split(":")[1], 10); + + const signer: EthHttpSigner = { + address: address as `0x${string}`, + chainId, + signMessage: async (message: Uint8Array) => { + const viemAccount = await adapter.toViemAccount(); + return viemAccount.signMessage({ message: { raw: message } }); + }, + }; + + const client = createSignerClient(signer, { + preferReplayable: true, + ttlSeconds: 60, + }); + + // Acquire a session token for faster subsequent requests + let sessionToken: string | null = null; + + async function acquireSession(): Promise { + if (sessionToken) return sessionToken; + const res = await client.fetch( + `${relayUrl}/v1/auth/session`, + { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ ttl: 300 }), + }, + { + binding: "class-bound", + replay: "replayable", + components: ["@authority"], + }, + ); + if (!res.ok) throw new Error(`Session auth failed: ${res.status} ${await res.text()}`); + const data = await res.json(); + sessionToken = data.token; + return sessionToken; + } + + async function authFetch(path: string, init?: RequestInit): Promise { + const token = await acquireSession(); + return globalThis.fetch(`${relayUrl}${path}`, { + ...init, + headers: { + "Content-Type": "application/json", + ...init?.headers, + Authorization: `Bearer ${token}`, + }, + }); + } + + return { + address, + + async store(path, value, visibility) { + const res = await authFetch("/v1/vault/write", { + method: "POST", + body: JSON.stringify({ path, value, visibility }), + }); + if (!res.ok) throw new Error(`Vault write failed: ${res.status} ${await res.text()}`); + return res.json(); + }, + + async get(path) { + const res = await authFetch("/v1/vault/read", { + method: "POST", + body: JSON.stringify({ path }), + }); + if (res.status === 404) return null; + if (!res.ok) throw new Error(`Vault read failed: ${res.status} ${await res.text()}`); + return res.json(); + }, + + async keys(prefix?) { + const res = await authFetch("/v1/vault/keys", { + method: "POST", + body: JSON.stringify({ prefix }), + }); + if (!res.ok) throw new Error(`Vault keys failed: ${res.status} ${await res.text()}`); + const data = await res.json(); + return data.keys; + }, + + async del(path) { + const res = await authFetch("/v1/vault/delete", { + method: "POST", + body: JSON.stringify({ path }), + }); + if (!res.ok) throw new Error(`Vault delete failed: ${res.status} ${await res.text()}`); + return res.json(); + }, + }; +} diff --git a/packages/relay/src/services/live-discovery.ts b/packages/relay/src/services/live-discovery.ts index f3e5371..30f04d8 100644 --- a/packages/relay/src/services/live-discovery.ts +++ b/packages/relay/src/services/live-discovery.ts @@ -7,6 +7,10 @@ export class LiveDiscoveryService implements IDiscoveryService { private registry: OnChainRegistry; private config: OnChainRegistryConfig; + /** Cached search results with TTL */ + private searchCache: { data: unknown[]; expiry: number } | null = null; + private static CACHE_TTL = 60_000; // 60s + constructor(config: OnChainRegistryConfig) { this.config = config; this.registry = new OnChainRegistry(config); @@ -18,28 +22,38 @@ export class LiveDiscoveryService implements IDiscoveryService { verifiedOnly?: boolean; minQuality?: number; }): Promise { - const results = await this.registry.findData({ activeOnly: query.verifiedOnly }); - - // Enrich each entry with tokenURI metadata - const enriched = await Promise.all( - results.map(async (entry) => { - try { - const uri = (await this.config.publicClient.readContract({ - address: this.config.dataRegistry, - abi: DataRegistryAbi, - functionName: "tokenURI", - args: [BigInt(entry.dataId)], - })) as string; - const meta = JSON.parse(uri); - return { ...entry, ...meta }; - } catch { - return entry; - } - }), - ); + // Use cached results if available (full scan is expensive) + const now = Date.now(); + let allEntries: unknown[]; + + if (this.searchCache && this.searchCache.expiry > now) { + allEntries = this.searchCache.data; + } else { + const results = await this.registry.findData({ activeOnly: query.verifiedOnly }); + + // Enrich each entry with tokenURI metadata + allEntries = await Promise.all( + results.map(async (entry) => { + try { + const uri = (await this.config.publicClient.readContract({ + address: this.config.dataRegistry, + abi: DataRegistryAbi, + functionName: "tokenURI", + args: [BigInt(entry.dataId)], + })) as string; + const meta = JSON.parse(uri); + return { ...entry, ...meta }; + } catch { + return entry; + } + }), + ); + + this.searchCache = { data: allEntries, expiry: now + LiveDiscoveryService.CACHE_TTL }; + } // Client-side filtering by schema / tags - return enriched.filter((entry: any) => { + return allEntries.filter((entry: any) => { if (query.schema && entry.schema !== query.schema) return false; if (query.tags?.length && !query.tags.some((t: string) => entry.tags?.includes(t))) return false; diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 5b4e727..53646fc 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -1,17 +1,31 @@ { "name": "@orbitmem/sdk", - "version": "0.1.0", + "version": "0.1.4", "description": "Sovereign data layer for AI agents — encrypted P2P vaults, multi-chain identity, and on-chain data trust", - "type": "module", + "keywords": [ + "agents", + "ai", + "data", + "encryption", + "identity", + "orbitmem", + "p2p", + "vault", + "web3" + ], + "homepage": "https://github.com/oboroxyz/orbitmem/tree/main/packages/sdk", "license": "MIT", "author": "Oboro Inc. (https://oboro.xyz)", - "homepage": "https://github.com/oboroxyz/orbitmem/tree/main/packages/sdk", - "keywords": ["ai", "agents", "data", "encryption", "p2p", "vault", "identity", "web3", "orbitmem"], "repository": { "type": "git", "url": "https://github.com/oboroxyz/orbitmem", "directory": "packages/sdk" }, + "files": [ + "dist", + "src" + ], + "type": "module", "main": "./dist/index.js", "types": "./dist/index.d.ts", "exports": { @@ -51,10 +65,6 @@ "import": "./dist/types.js" } }, - "files": [ - "dist", - "src" - ], "scripts": { "build": "bunx tsc -p tsconfig.build.json", "test": "bun test", diff --git a/packages/sdk/src/client.ts b/packages/sdk/src/client.ts index 53bbe8a..f27e39a 100644 --- a/packages/sdk/src/client.ts +++ b/packages/sdk/src/client.ts @@ -20,11 +20,13 @@ export async function createOrbitMem(config: OrbitMemConfig): Promise ); // Initialize OrbitDB + vault + const vaultDir = config.vault?.dbName ?? "./orbitdb"; const { orbitdb, cleanup: orbitdbCleanup } = await createOrbitDBInstance({ - directory: config.vault?.dbName ? `./${config.vault.dbName}` : "./orbitdb", + id: "default", + directory: vaultDir, }); const vault = await createVault(orbitdb, { - dbName: config.vault?.dbName, + dbName: "orbitmem-vault", aesEngine: encryption.aes, encryptionLayer: encryption, }); diff --git a/packages/sdk/src/data/orbitdb.ts b/packages/sdk/src/data/orbitdb.ts index 2a77905..35d7855 100644 --- a/packages/sdk/src/data/orbitdb.ts +++ b/packages/sdk/src/data/orbitdb.ts @@ -16,10 +16,12 @@ import { createLibp2p } from "libp2p"; useDatabaseType(Nested); export async function createOrbitDBInstance(opts: { + id?: string; directory?: string; listenAddrs?: string[]; }): Promise<{ orbitdb: any; ipfs: any; libp2p: any; cleanup: () => Promise }> { - const blockstore = new LevelBlockstore(opts.directory ?? "./orbitdb/blocks"); + const dir = opts.directory ?? "./orbitdb"; + const blockstore = new LevelBlockstore(`${dir}/blocks`); const libp2p = await createLibp2p({ addresses: { listen: opts.listenAddrs ?? ["/ip4/0.0.0.0/tcp/0"] }, @@ -33,7 +35,7 @@ export async function createOrbitDBInstance(opts: { }); const ipfs = await createHelia({ libp2p, blockstore }); - const orbitdb = await createOrbitDB({ ipfs }); + const orbitdb = await createOrbitDB({ ipfs, id: opts.id ?? "default", directory: dir }); return { orbitdb, @@ -42,6 +44,7 @@ export async function createOrbitDBInstance(opts: { cleanup: async () => { await orbitdb.stop(); await ipfs.stop(); + await libp2p.stop(); }, }; } diff --git a/packages/sdk/src/discovery/on-chain-registry.ts b/packages/sdk/src/discovery/on-chain-registry.ts index 102ed7b..f826646 100644 --- a/packages/sdk/src/discovery/on-chain-registry.ts +++ b/packages/sdk/src/discovery/on-chain-registry.ts @@ -38,6 +38,20 @@ export class OnChainRegistry { async registerData(dataURI: string): Promise { const wallet = this.requireWallet(); + // Estimate gas first to catch errors before submitting + const gas = await this.pub.estimateContractGas({ + address: this.dataReg, + abi: DataRegistryAbi, + functionName: "register", + args: [dataURI], + account: wallet.account!, + }); + // Add global BigInt JSON serialization support for viem error handling + if (!(BigInt.prototype as any).toJSON) { + (BigInt.prototype as any).toJSON = function () { + return this.toString(); + }; + } const hash = await wallet.writeContract({ address: this.dataReg, abi: DataRegistryAbi, @@ -45,6 +59,7 @@ export class OnChainRegistry { args: [dataURI], chain: wallet.chain, account: wallet.account!, + gas, }); const receipt = await this.pub.waitForTransactionReceipt({ hash }); const logs = parseEventLogs({ @@ -57,7 +72,7 @@ export class OnChainRegistry { async findData(query: { activeOnly?: boolean }): Promise { const latestBlock = await this.pub.getBlockNumber(); - const CHUNK = 1000n; + const CHUNK = 9999n; const logs: { args: { dataId: bigint; owner: string; dataURI: string } }[] = []; for (let from = this.deployBlock; from <= latestBlock; from += CHUNK) { const to = from + CHUNK - 1n > latestBlock ? latestBlock : from + CHUNK - 1n; @@ -82,7 +97,7 @@ export class OnChainRegistry { })) as boolean; if (query.activeOnly && !active) continue; - const [owner] = await Promise.all([ + const [owner, tokenURI] = await Promise.all([ this.pub.readContract({ address: this.dataReg, abi: DataRegistryAbi, @@ -97,15 +112,24 @@ export class OnChainRegistry { }), ]); + // Parse metadata from tokenURI (JSON string stored on-chain) + let meta: { name?: string; description?: string; key?: string; schema?: string; tags?: string[] } = {}; + try { + meta = JSON.parse(tokenURI as string); + } catch { + // malformed URI, keep defaults + } + results.push({ dataId, dataRegistry: this.dataReg, vaultAddress: "", - vaultKey: "", - name: "", - description: "", + vaultKey: meta.key ?? "", + name: meta.name ?? "", + description: meta.description ?? "", visibility: "public", - tags: [], + schema: meta.schema, + tags: meta.tags ?? [], active, owner: owner as WalletAddress, ownerChain: "evm", diff --git a/packages/sdk/src/identity/ows-adapter.ts b/packages/sdk/src/identity/ows-adapter.ts index b76fc3a..ef726ae 100644 --- a/packages/sdk/src/identity/ows-adapter.ts +++ b/packages/sdk/src/identity/ows-adapter.ts @@ -47,34 +47,13 @@ export function createOwsAdapter(walletName: string, chain: string): OwsAdapter }, async toViemAccount(): Promise { - const address = await this.getAddress(); - const { toAccount } = await import("viem/accounts"); - return toAccount({ - address: address as `0x${string}`, - async signMessage({ message }) { - const { signMessage: owsSign } = await ows(); - const msg = - typeof message === "string" - ? message - : typeof message === "object" && "raw" in message - ? typeof message.raw === "string" - ? message.raw - : new TextDecoder().decode(message.raw) - : String(message); - const result = owsSign(walletName, chain, msg); - return result.signature as `0x${string}`; - }, - async signTransaction(tx) { - const { signTransaction: owsSignTx } = await ows(); - const result = owsSignTx(walletName, chain, JSON.stringify(tx)); - return result.signature as `0x${string}`; - }, - async signTypedData(typedData) { - const { signTypedData: owsSignTyped } = await ows(); - const result = owsSignTyped(walletName, chain, JSON.stringify(typedData)); - return result.signature as `0x${string}`; - }, - }); + // Export mnemonic from OWS and derive a full viem account that can + // natively sign transactions (OWS signTransaction expects RLP hex, + // but viem passes a JS object — so we use viem's own signer). + const { exportWallet } = await ows(); + const mnemonic = exportWallet(walletName); + const { mnemonicToAccount } = await import("viem/accounts"); + return mnemonicToAccount(mnemonic); }, }; }