Include both offerer and answerer ICE candidates in polling endpoint

- Add role and peerId to ICE candidate responses for matching
- Offerers can now see their own candidates (for debugging/sync)
- Answerers can poll same endpoint to get offerer candidates
- Each candidate tagged with role ('offerer' or 'answerer') and peerId
- Enables proper bidirectional ICE candidate exchange

migrations/0007_simplify_schema.sql

@@ -0,0 +1,54 @@
+-- V0.4.1 Migration: Simplify schema and add service discovery
+-- Remove privacy layer (service_index) and add extracted fields for discovery
+
+-- Step 1: Drop service_index table (privacy layer removal)
+DROP TABLE IF EXISTS service_index;
+
+-- Step 2: Create new services table with extracted fields for discovery
+CREATE TABLE services_new (
+  id TEXT PRIMARY KEY,
+  service_fqn TEXT NOT NULL,
+  service_name TEXT NOT NULL,
+  version TEXT NOT NULL,
+  username TEXT NOT NULL,
+  created_at INTEGER NOT NULL,
+  expires_at INTEGER NOT NULL,
+  FOREIGN KEY (username) REFERENCES usernames(username) ON DELETE CASCADE,
+  UNIQUE(service_fqn)
+);
+
+-- Step 3: Migrate existing data (if any) - parse FQN to extract components
+-- Note: This migration assumes FQN format is already "service:version@username"
+-- If there's old data with different format, manual intervention may be needed
+INSERT INTO services_new (id, service_fqn, service_name, version, username, created_at, expires_at)
+SELECT
+  id,
+  service_fqn,
+  -- Extract service_name: everything before first ':'
+  substr(service_fqn, 1, instr(service_fqn, ':') - 1) as service_name,
+  -- Extract version: between ':' and '@'
+  substr(
+    service_fqn,
+    instr(service_fqn, ':') + 1,
+    instr(service_fqn, '@') - instr(service_fqn, ':') - 1
+  ) as version,
+  username,
+  created_at,
+  expires_at
+FROM services
+WHERE service_fqn LIKE '%:%@%'; -- Only migrate properly formatted FQNs
+
+-- Step 4: Drop old services table
+DROP TABLE services;
+
+-- Step 5: Rename new table to services
+ALTER TABLE services_new RENAME TO services;
+
+-- Step 6: Create indexes for efficient querying
+CREATE INDEX idx_services_fqn ON services(service_fqn);
+CREATE INDEX idx_services_discovery ON services(service_name, version);
+CREATE INDEX idx_services_username ON services(username);
+CREATE INDEX idx_services_expires ON services(expires_at);
+
+-- Step 7: Create index on offers for available offer filtering
+CREATE INDEX IF NOT EXISTS idx_offers_available ON offers(answerer_peer_id) WHERE answerer_peer_id IS NULL;

migrations/fresh_schema.sql

@@ -0,0 +1,77 @@
+-- Fresh schema for Rondevu v0.4.1+
+-- This is the complete schema without migration steps
+
+-- Drop existing tables if they exist
+DROP TABLE IF EXISTS ice_candidates;
+DROP TABLE IF EXISTS services;
+DROP TABLE IF EXISTS offers;
+DROP TABLE IF EXISTS usernames;
+
+-- Offers table
+CREATE TABLE offers (
+  id TEXT PRIMARY KEY,
+  peer_id TEXT NOT NULL,
+  service_id TEXT,
+  sdp TEXT NOT NULL,
+  created_at INTEGER NOT NULL,
+  expires_at INTEGER NOT NULL,
+  last_seen INTEGER NOT NULL,
+  secret TEXT,
+  answerer_peer_id TEXT,
+  answer_sdp TEXT,
+  answered_at INTEGER
+);
+
+CREATE INDEX idx_offers_peer ON offers(peer_id);
+CREATE INDEX idx_offers_service ON offers(service_id);
+CREATE INDEX idx_offers_expires ON offers(expires_at);
+CREATE INDEX idx_offers_last_seen ON offers(last_seen);
+CREATE INDEX idx_offers_answerer ON offers(answerer_peer_id);
+
+-- ICE candidates table
+CREATE TABLE ice_candidates (
+  id INTEGER PRIMARY KEY AUTOINCREMENT,
+  offer_id TEXT NOT NULL,
+  peer_id TEXT NOT NULL,
+  role TEXT NOT NULL CHECK(role IN ('offerer', 'answerer')),
+  candidate TEXT NOT NULL,
+  created_at INTEGER NOT NULL,
+  FOREIGN KEY (offer_id) REFERENCES offers(id) ON DELETE CASCADE
+);
+
+CREATE INDEX idx_ice_offer ON ice_candidates(offer_id);
+CREATE INDEX idx_ice_peer ON ice_candidates(peer_id);
+CREATE INDEX idx_ice_role ON ice_candidates(role);
+CREATE INDEX idx_ice_created ON ice_candidates(created_at);
+
+-- Usernames table
+CREATE TABLE usernames (
+  username TEXT PRIMARY KEY,
+  public_key TEXT NOT NULL UNIQUE,
+  claimed_at INTEGER NOT NULL,
+  expires_at INTEGER NOT NULL,
+  last_used INTEGER NOT NULL,
+  metadata TEXT,
+  CHECK(length(username) >= 3 AND length(username) <= 32)
+);
+
+CREATE INDEX idx_usernames_expires ON usernames(expires_at);
+CREATE INDEX idx_usernames_public_key ON usernames(public_key);
+
+-- Services table with discovery fields
+CREATE TABLE services (
+  id TEXT PRIMARY KEY,
+  service_fqn TEXT NOT NULL,
+  service_name TEXT NOT NULL,
+  version TEXT NOT NULL,
+  username TEXT NOT NULL,
+  created_at INTEGER NOT NULL,
+  expires_at INTEGER NOT NULL,
+  FOREIGN KEY (username) REFERENCES usernames(username) ON DELETE CASCADE,
+  UNIQUE(service_name, version, username)
+);
+
+CREATE INDEX idx_services_fqn ON services(service_fqn);
+CREATE INDEX idx_services_discovery ON services(service_name, version);
+CREATE INDEX idx_services_username ON services(username);
+CREATE INDEX idx_services_expires ON services(expires_at);

package-lock.json

@@ -10,6 +10,7 @@
       "dependencies": {
         "@hono/node-server": "^1.19.6",
         "@noble/ed25519": "^3.0.0",
+        "@xtr-dev/rondevu-client": "^0.13.0",
         "better-sqlite3": "^12.4.1",
         "hono": "^4.10.4"
       },
@@ -23,9 +24,9 @@
       }
     },
     "node_modules/@cloudflare/workers-types": {
-      "version": "4.20251115.0",
+      "version": "4.20251209.0",
-      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20251115.0.tgz",
+      "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20251209.0.tgz",
-      "integrity": "sha512-aM7jp7IfKhqKvfSaK1IhVTbSzxB6KQ4gX8e/W29tOuZk+YHlYXuRd/bMm4hWkfd7B1HWNWdsx1GTaEUoZIuVsw==",
+      "integrity": "sha512-O+cbUVwgb4NgUB39R1cITbRshlAAPy1UQV0l8xEy2xcZ3wTh3fMl9f5oBwLsVmE9JRhIZx6llCLOBVf53eI5xA==",
       "dev": true,
       "license": "MIT OR Apache-2.0"
     },
@@ -485,9 +486,9 @@
       }
     },
     "node_modules/@hono/node-server": {
-      "version": "1.19.6",
+      "version": "1.19.7",
-      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.6.tgz",
+      "resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.7.tgz",
-      "integrity": "sha512-Shz/KjlIeAhfiuE93NDKVdZ7HdBVLQAfdbaXEaoAVO3ic9ibRSLGIQGkcBbFyuLr+7/1D5ZCINM8B+6IvXeMtw==",
+      "integrity": "sha512-vUcD0uauS7EU2caukW8z5lJKtoGMokxNbJtBiwHgpqxEXokaHCBkQUmCHhjFB1VUTWdqj25QoMkMKzgjq+uhrw==",
       "license": "MIT",
       "engines": {
         "node": ">=18.14.1"
@@ -572,15 +573,24 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "24.10.1",
+      "version": "24.10.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.2.tgz",
-      "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+      "integrity": "sha512-WOhQTZ4G8xZ1tjJTvKOpyEVSGgOTvJAfDK3FNFgELyaTpzhdgHVHeqW8V+UJvzF5BT+/B54T/1S2K6gd9c7bbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.16.0"
       }
     },
+    "node_modules/@xtr-dev/rondevu-client": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@xtr-dev/rondevu-client/-/rondevu-client-0.13.0.tgz",
+      "integrity": "sha512-oauCveLga4lploxpoW8U0Fd9Fyz+SAsNQzIDvAIG1fkAnAJu9eajmLsZ5JfzzDi7h2Ew1ClZ7MOrmlRfG4vaBg==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/ed25519": "^3.0.0"
+      }
+    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -635,9 +645,9 @@
       "license": "MIT"
     },
     "node_modules/better-sqlite3": {
-      "version": "12.4.1",
+      "version": "12.5.0",
-      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.5.0.tgz",
-      "integrity": "sha512-3yVdyZhklTiNrtg+4WqHpJpFDd+WHTg2oM7UcR80GqL05AOV0xEJzc6qNvFYoEtE+hRp1n9MpN6/+4yhlGkDXQ==",
+      "integrity": "sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -645,7 +655,7 @@
         "prebuild-install": "^7.1.1"
       },
       "engines": {
-        "node": "20.x || 22.x || 23.x || 24.x"
+        "node": "20.x || 22.x || 23.x || 24.x || 25.x"
       }
     },
     "node_modules/bindings": {
@@ -827,9 +837,9 @@
       "license": "MIT"
     },
     "node_modules/hono": {
-      "version": "4.10.6",
+      "version": "4.10.8",
-      "resolved": "https://registry.npmjs.org/hono/-/hono-4.10.6.tgz",
+      "resolved": "https://registry.npmjs.org/hono/-/hono-4.10.8.tgz",
-      "integrity": "sha512-BIdolzGpDO9MQ4nu3AUuDwHZZ+KViNm+EZ75Ae55eMXMqLVhDFqEMXxtUe9Qh8hjL+pIna/frs2j6Y2yD5Ua/g==",
+      "integrity": "sha512-DDT0A0r6wzhe8zCGoYOmMeuGu3dyTAE40HHjwUsWFTEy5WxK1x2WDSsBPlEXgPbRIFY6miDualuUDbasPogIww==",
       "license": "MIT",
       "engines": {
         "node": ">=16.9.0"

package.json

@@ -22,6 +22,7 @@
   "dependencies": {
     "@hono/node-server": "^1.19.6",
     "@noble/ed25519": "^3.0.0",
+    "@xtr-dev/rondevu-client": "^0.13.0",
     "better-sqlite3": "^12.4.1",
     "hono": "^4.10.4"
   }

src/app.ts

@@ -157,83 +157,133 @@ export function createApp(storage: Storage, config: Config) {
     }
   });
 
+  // ===== Service Discovery and Management =====
+
   /**
-   * GET /users/:username/services/:fqn
+   * GET /services/:fqn
-   * Get service by username and FQN with semver-compatible matching
+   * Get service by FQN with optional discovery
+   * Supports three modes:
+   * 1. Direct lookup: /services/chat:1.0.0@alice - Returns specific user's offer
+   * 2. Random discovery: /services/chat:1.0.0 - Returns random available offer
+   * 3. Paginated discovery: /services/chat:1.0.0?limit=10&offset=0 - Returns array of available offers
    */
-  app.get('/users/:username/services/:fqn', async (c) => {
+  app.get('/services/:fqn', async (c) => {
     try {
-      const username = c.req.param('username');
       const serviceFqn = decodeURIComponent(c.req.param('fqn'));
+      const limit = c.req.query('limit');
+      const offset = c.req.query('offset');
 
       // Parse the requested FQN
       const parsed = parseServiceFqn(serviceFqn);
       if (!parsed) {
-        return c.json({ error: 'Invalid service FQN format' }, 400);
+        return c.json({ error: 'Invalid service FQN format. Use service:version or service:version@username' }, 400);
       }
 
-      const { serviceName, version: requestedVersion } = parsed;
+      const { serviceName, version, username } = parsed;
 
-      // Find all services with matching service name
+      // Mode 1: Direct lookup with username
-      const matchingServices = await storage.findServicesByName(username, serviceName);
+      if (username) {
+        // Find service by exact FQN
+        const service = await storage.getServiceByFqn(serviceFqn);
 
-      if (matchingServices.length === 0) {
+        if (!service) {
-        return c.json({ error: 'Service not found' }, 404);
+          return c.json({ error: 'Service not found' }, 404);
-      }
+        }
 
-      // Filter to compatible versions
+        // Get available offer from this service
-      const compatibleServices = matchingServices.filter(service => {
+        const serviceOffers = await storage.getOffersForService(service.id);
-        const serviceParsed = parseServiceFqn(service.serviceFqn);
+        const availableOffer = serviceOffers.find(offer => !offer.answererPeerId);
-        if (!serviceParsed) return false;
+
-        return isVersionCompatible(requestedVersion, serviceParsed.version);
+        if (!availableOffer) {
-      });
+          return c.json({
+            error: 'No available offers',
+            message: 'All offers from this service are currently in use.'
+          }, 503);
+        }
 
-      if (compatibleServices.length === 0) {
         return c.json({
-          error: 'No compatible version found',
+          serviceId: service.id,
-          message: `Requested ${serviceFqn}, but no compatible versions available`
+          username: service.username,
-        }, 404);
+          serviceFqn: service.serviceFqn,
+          offerId: availableOffer.id,
+          sdp: availableOffer.sdp,
+          createdAt: service.createdAt,
+          expiresAt: service.expiresAt
+        }, 200);
       }
 
-      // Use the first compatible service (most recently created)
+      // Mode 2 & 3: Discovery without username
-      const service = compatibleServices[0];
+      if (limit || offset) {
+        // Paginated discovery
+        const limitNum = limit ? Math.min(parseInt(limit, 10), 100) : 10;
+        const offsetNum = offset ? parseInt(offset, 10) : 0;
 
-      // Get the UUID for this service
+        const services = await storage.discoverServices(serviceName, version, limitNum, offsetNum);
-      const uuid = await storage.queryService(username, service.serviceFqn);
 
-      if (!uuid) {
+        if (services.length === 0) {
-        return c.json({ error: 'Service index not found' }, 500);
+          return c.json({
-      }
+            error: 'No services found',
+            message: `No available services found for ${serviceName}:${version}`
+          }, 404);
+        }
 
-      // Get all offers for this service
+        // Get available offers for each service
-      const serviceOffers = await storage.getOffersForService(service.id);
+        const servicesWithOffers = await Promise.all(
+          services.map(async (service) => {
+            const offers = await storage.getOffersForService(service.id);
+            const availableOffer = offers.find(offer => !offer.answererPeerId);
+            return availableOffer ? {
+              serviceId: service.id,
+              username: service.username,
+              serviceFqn: service.serviceFqn,
+              offerId: availableOffer.id,
+              sdp: availableOffer.sdp,
+              createdAt: service.createdAt,
+              expiresAt: service.expiresAt
+            } : null;
+          })
+        );
 
-      if (serviceOffers.length === 0) {
+        const availableServices = servicesWithOffers.filter(s => s !== null);
-        return c.json({ error: 'No offers found for this service' }, 404);
-      }
 
-      // Find an unanswered offer
-      const availableOffer = serviceOffers.find(offer => !offer.answererPeerId);
-
-      if (!availableOffer) {
         return c.json({
-          error: 'No available offers',
+          services: availableServices,
-          message: 'All offers from this service are currently in use. Please try again later.'
+          count: availableServices.length,
-        }, 503);
+          limit: limitNum,
-      }
+          offset: offsetNum
+        }, 200);
+      } else {
+        // Random discovery
+        const service = await storage.getRandomService(serviceName, version);
 
-      return c.json({
+        if (!service) {
-        uuid: uuid,
+          return c.json({
-        serviceId: service.id,
+            error: 'No services found',
-        username: service.username,
+            message: `No available services found for ${serviceName}:${version}`
-        serviceFqn: service.serviceFqn,
+          }, 404);
-        offerId: availableOffer.id,
+        }
-        sdp: availableOffer.sdp,
+
-        isPublic: service.isPublic,
+        // Get available offer
-        metadata: service.metadata ? JSON.parse(service.metadata) : undefined,
+        const offers = await storage.getOffersForService(service.id);
-        createdAt: service.createdAt,
+        const availableOffer = offers.find(offer => !offer.answererPeerId);
-        expiresAt: service.expiresAt
+
-      }, 200);
+        if (!availableOffer) {
+          return c.json({
+            error: 'No available offers',
+            message: 'Service found but no available offers.'
+          }, 503);
+        }
+
+        return c.json({
+          serviceId: service.id,
+          username: service.username,
+          serviceFqn: service.serviceFqn,
+          offerId: availableOffer.id,
+          sdp: availableOffer.sdp,
+          createdAt: service.createdAt,
+          expiresAt: service.expiresAt
+        }, 200);
+      }
     } catch (err) {
       console.error('Error getting service:', err);
       return c.json({ error: 'Internal server error' }, 500);
@@ -241,29 +291,36 @@ export function createApp(storage: Storage, config: Config) {
   });
 
   /**
-   * POST /users/:username/services
+   * POST /services
-   * Publish a service with one or more offers (RESTful endpoint)
+   * Publish a service with one or more offers
+   * Service FQN must include username: service:version@username
    */
-  app.post('/users/:username/services', authMiddleware, async (c) => {
+  app.post('/services', authMiddleware, async (c) => {
     let serviceFqn: string | undefined;
     let createdOffers: any[] = [];
 
     try {
-      const username = c.req.param('username');
       const body = await c.req.json();
       serviceFqn = body.serviceFqn;
-      const { offers, ttl, isPublic, metadata, signature, message } = body;
+      const { offers, ttl, signature, message } = body;
 
       if (!serviceFqn || !offers || !Array.isArray(offers) || offers.length === 0) {
         return c.json({ error: 'Missing required parameters: serviceFqn, offers (must be non-empty array)' }, 400);
       }
 
-      // Validate service FQN
+      // Validate and parse service FQN
       const fqnValidation = validateServiceFqn(serviceFqn);
       if (!fqnValidation.valid) {
         return c.json({ error: fqnValidation.error }, 400);
       }
 
+      const parsed = parseServiceFqn(serviceFqn);
+      if (!parsed || !parsed.username) {
+        return c.json({ error: 'Service FQN must include username (format: service:version@username)' }, 400);
+      }
+
+      const username = parsed.username;
+
       // Verify username ownership (signature required)
       if (!signature || !message) {
         return c.json({ error: 'Missing signature or message for username verification' }, 400);
@@ -280,14 +337,7 @@ export function createApp(storage: Storage, config: Config) {
         return c.json({ error: 'Invalid signature for username' }, 403);
       }
 
-      // Delete existing service if one exists (upsert behavior)
+      // Note: createService handles upsert behavior (deletes existing service if it exists)
-      const existingUuid = await storage.queryService(username, serviceFqn);
-      if (existingUuid) {
-        const existingService = await storage.getServiceByUuid(existingUuid);
-        if (existingService) {
-          await storage.deleteService(existingService.id, username);
-        }
-      }
 
       // Validate all offers
       for (const offer of offers) {
@@ -317,11 +367,8 @@ export function createApp(storage: Storage, config: Config) {
 
       // Create service with offers
       const result = await storage.createService({
-        username,
         serviceFqn,
         expiresAt,
-        isPublic: isPublic || false,
-        metadata: metadata ? JSON.stringify(metadata) : undefined,
         offers: offerRequests
       });
 
@@ -329,9 +376,8 @@ export function createApp(storage: Storage, config: Config) {
 
       // Return full service details with all offers
       return c.json({
-        uuid: result.indexUuid,
+        serviceFqn: result.service.serviceFqn,
-        serviceFqn: serviceFqn,
+        username: result.service.username,
-        username: username,
         serviceId: result.service.id,
         offers: result.offers.map(o => ({
           offerId: o.id,
@@ -339,8 +385,6 @@ export function createApp(storage: Storage, config: Config) {
           createdAt: o.createdAt,
           expiresAt: o.expiresAt
         })),
-        isPublic: result.service.isPublic,
-        metadata: metadata,
         createdAt: result.service.createdAt,
         expiresAt: result.service.expiresAt
       }, 201);
@@ -349,7 +393,6 @@ export function createApp(storage: Storage, config: Config) {
       console.error('Error details:', {
         message: (err as Error).message,
         stack: (err as Error).stack,
-        username: c.req.param('username'),
         serviceFqn,
         offerIds: createdOffers.map(o => o.id)
       });
@@ -361,21 +404,23 @@ export function createApp(storage: Storage, config: Config) {
   });
 
   /**
-   * DELETE /users/:username/services/:fqn
+   * DELETE /services/:fqn
-   * Delete a service by username and FQN (RESTful)
+   * Delete a service by FQN (must include username)
    */
-  app.delete('/users/:username/services/:fqn', authMiddleware, async (c) => {
+  app.delete('/services/:fqn', authMiddleware, async (c) => {
     try {
-      const username = c.req.param('username');
       const serviceFqn = decodeURIComponent(c.req.param('fqn'));
 
-      // Find service by username and FQN
+      // Parse and validate FQN
-      const uuid = await storage.queryService(username, serviceFqn);
+      const parsed = parseServiceFqn(serviceFqn);
-      if (!uuid) {
+      if (!parsed || !parsed.username) {
-        return c.json({ error: 'Service not found' }, 404);
+        return c.json({ error: 'Service FQN must include username (format: service:version@username)' }, 400);
       }
 
-      const service = await storage.getServiceByUuid(uuid);
+      const username = parsed.username;
+
+      // Find service by FQN
+      const service = await storage.getServiceByFqn(serviceFqn);
       if (!service) {
         return c.json({ error: 'Service not found' }, 404);
       }
@@ -393,66 +438,16 @@ export function createApp(storage: Storage, config: Config) {
     }
   });
 
-  // ===== Service Management (Legacy - for UUID-based access) =====
+  // ===== WebRTC Signaling (Offer-Specific) =====
 
   /**
-   * GET /services/:uuid
+   * POST /services/:fqn/offers/:offerId/answer
-   * Get service details by index UUID (kept for privacy)
+   * Answer a specific offer from a service
    */
-  app.get('/services/:uuid', async (c) => {
+  app.post('/services/:fqn/offers/:offerId/answer', authMiddleware, async (c) => {
     try {
-      const uuid = c.req.param('uuid');
+      const serviceFqn = decodeURIComponent(c.req.param('fqn'));
-
+      const offerId = c.req.param('offerId');
-      const service = await storage.getServiceByUuid(uuid);
-
-      if (!service) {
-        return c.json({ error: 'Service not found' }, 404);
-      }
-
-      // Get all offers for this service
-      const serviceOffers = await storage.getOffersForService(service.id);
-
-      if (serviceOffers.length === 0) {
-        return c.json({ error: 'No offers found for this service' }, 404);
-      }
-
-      // Find an unanswered offer
-      const availableOffer = serviceOffers.find(offer => !offer.answererPeerId);
-
-      if (!availableOffer) {
-        return c.json({
-          error: 'No available offers',
-          message: 'All offers from this service are currently in use. Please try again later.'
-        }, 503);
-      }
-
-      return c.json({
-        uuid: uuid,
-        serviceId: service.id,
-        username: service.username,
-        serviceFqn: service.serviceFqn,
-        offerId: availableOffer.id,
-        sdp: availableOffer.sdp,
-        isPublic: service.isPublic,
-        metadata: service.metadata ? JSON.parse(service.metadata) : undefined,
-        createdAt: service.createdAt,
-        expiresAt: service.expiresAt
-      }, 200);
-    } catch (err) {
-      console.error('Error getting service:', err);
-      return c.json({ error: 'Internal server error' }, 500);
-    }
-  });
-
-  // ===== Service-Based WebRTC Signaling =====
-
-  /**
-   * POST /services/:uuid/answer
-   * Answer a service offer
-   */
-  app.post('/services/:uuid/answer', authMiddleware, async (c) => {
-    try {
-      const uuid = c.req.param('uuid');
       const body = await c.req.json();
       const { sdp } = body;
 
@@ -468,23 +463,15 @@ export function createApp(storage: Storage, config: Config) {
         return c.json({ error: 'SDP too large (max 64KB)' }, 400);
       }
 
-      // Get the service by UUID
+      // Verify offer exists
-      const service = await storage.getServiceByUuid(uuid);
+      const offer = await storage.getOfferById(offerId);
-      if (!service) {
+      if (!offer) {
-        return c.json({ error: 'Service not found' }, 404);
+        return c.json({ error: 'Offer not found' }, 404);
-      }
-
-      // Get available offer from service
-      const serviceOffers = await storage.getOffersForService(service.id);
-      const availableOffer = serviceOffers.find(offer => !offer.answererPeerId);
-
-      if (!availableOffer) {
-        return c.json({ error: 'No available offers' }, 503);
       }
 
       const answererPeerId = getAuthenticatedPeerId(c);
 
-      const result = await storage.answerOffer(availableOffer.id, answererPeerId, sdp);
+      const result = await storage.answerOffer(offerId, answererPeerId, sdp);
 
       if (!result.success) {
         return c.json({ error: result.error }, 400);
@@ -492,58 +479,161 @@ export function createApp(storage: Storage, config: Config) {
 
       return c.json({
         success: true,
-        offerId: availableOffer.id
+        offerId: offerId
       }, 200);
     } catch (err) {
-      console.error('Error answering service:', err);
+      console.error('Error answering offer:', err);
       return c.json({ error: 'Internal server error' }, 500);
     }
   });
 
   /**
-   * GET /services/:uuid/answer
+   * GET /services/:fqn/offers/:offerId/answer
-   * Get answer for a service (offerer polls this)
+   * Get answer for a specific offer (offerer polls this)
    */
-  app.get('/services/:uuid/answer', authMiddleware, async (c) => {
+  app.get('/services/:fqn/offers/:offerId/answer', authMiddleware, async (c) => {
     try {
-      const uuid = c.req.param('uuid');
+      const serviceFqn = decodeURIComponent(c.req.param('fqn'));
+      const offerId = c.req.param('offerId');
       const peerId = getAuthenticatedPeerId(c);
 
-      // Get the service by UUID
+      // Get the offer
-      const service = await storage.getServiceByUuid(uuid);
+      const offer = await storage.getOfferById(offerId);
-      if (!service) {
+      if (!offer) {
-        return c.json({ error: 'Service not found' }, 404);
+        return c.json({ error: 'Offer not found' }, 404);
       }
 
-      // Get offers for this service owned by the requesting peer
+      // Verify ownership
-      const serviceOffers = await storage.getOffersForService(service.id);
+      if (offer.peerId !== peerId) {
-      const myOffer = serviceOffers.find(offer => offer.peerId === peerId && offer.answererPeerId);
+        return c.json({ error: 'Not authorized to access this offer' }, 403);
+      }
 
-      if (!myOffer || !myOffer.answerSdp) {
+      if (!offer.answerSdp) {
         return c.json({ error: 'Offer not yet answered' }, 404);
       }
 
       return c.json({
-        offerId: myOffer.id,
+        offerId: offer.id,
-        answererId: myOffer.answererPeerId,
+        answererId: offer.answererPeerId,
-        sdp: myOffer.answerSdp,
+        sdp: offer.answerSdp,
-        answeredAt: myOffer.answeredAt
+        answeredAt: offer.answeredAt
       }, 200);
     } catch (err) {
-      console.error('Error getting service answer:', err);
+      console.error('Error getting offer answer:', err);
       return c.json({ error: 'Internal server error' }, 500);
     }
   });
 
   /**
-   * POST /services/:uuid/ice-candidates
+   * GET /offers/answered
-   * Add ICE candidates for a service
+   * Get all answered offers for the authenticated peer (efficient batch polling)
    */
-  app.post('/services/:uuid/ice-candidates', authMiddleware, async (c) => {
+  app.get('/offers/answered', authMiddleware, async (c) => {
     try {
-      const uuid = c.req.param('uuid');
+      const peerId = getAuthenticatedPeerId(c);
+      const since = c.req.query('since');
+      const sinceTimestamp = since ? parseInt(since, 10) : 0;
+
+      const offers = await storage.getAnsweredOffers(peerId);
+
+      // Filter by timestamp if provided
+      const filteredOffers = since
+        ? offers.filter(offer => offer.answeredAt && offer.answeredAt > sinceTimestamp)
+        : offers;
+
+      return c.json({
+        offers: filteredOffers.map(offer => ({
+          offerId: offer.id,
+          serviceId: offer.serviceId,
+          answererId: offer.answererPeerId,
+          sdp: offer.answerSdp,
+          answeredAt: offer.answeredAt
+        }))
+      }, 200);
+    } catch (err) {
+      console.error('Error getting answered offers:', err);
+      return c.json({ error: 'Internal server error' }, 500);
+    }
+  });
+
+  /**
+   * GET /offers/poll
+   * Combined efficient polling endpoint for answers and ICE candidates
+   * Returns all answered offers and ICE candidates for all peer's offers since timestamp
+   */
+  app.get('/offers/poll', authMiddleware, async (c) => {
+    try {
+      const peerId = getAuthenticatedPeerId(c);
+      const since = c.req.query('since');
+      const sinceTimestamp = since ? parseInt(since, 10) : 0;
+
+      // Get all answered offers
+      const answeredOffers = await storage.getAnsweredOffers(peerId);
+      const filteredAnswers = since
+        ? answeredOffers.filter(offer => offer.answeredAt && offer.answeredAt > sinceTimestamp)
+        : answeredOffers;
+
+      // Get all peer's offers
+      const allOffers = await storage.getOffersByPeerId(peerId);
+
+      // For each offer, get ICE candidates from both sides
+      const iceCandidatesByOffer: Record<string, any[]> = {};
+      for (const offer of allOffers) {
+        const allCandidates = [];
+
+        // Get offerer ICE candidates (answerer polls for these, offerer can also see for debugging/sync)
+        const offererCandidates = await storage.getIceCandidates(offer.id, 'offerer', sinceTimestamp);
+        for (const c of offererCandidates) {
+          allCandidates.push({
+            candidate: c.candidate,
+            role: 'offerer',
+            peerId: c.peerId,
+            createdAt: c.createdAt
+          });
+        }
+
+        // Get answerer ICE candidates (offerer polls for these)
+        const answererCandidates = await storage.getIceCandidates(offer.id, 'answerer', sinceTimestamp);
+        for (const c of answererCandidates) {
+          allCandidates.push({
+            candidate: c.candidate,
+            role: 'answerer',
+            peerId: c.peerId,
+            createdAt: c.createdAt
+          });
+        }
+
+        if (allCandidates.length > 0) {
+          iceCandidatesByOffer[offer.id] = allCandidates;
+        }
+      }
+
+      return c.json({
+        answers: filteredAnswers.map(offer => ({
+          offerId: offer.id,
+          serviceId: offer.serviceId,
+          answererId: offer.answererPeerId,
+          sdp: offer.answerSdp,
+          answeredAt: offer.answeredAt
+        })),
+        iceCandidates: iceCandidatesByOffer
+      }, 200);
+    } catch (err) {
+      console.error('Error polling offers:', err);
+      return c.json({ error: 'Internal server error' }, 500);
+    }
+  });
+
+  /**
+   * POST /services/:fqn/offers/:offerId/ice-candidates
+   * Add ICE candidates for a specific offer
+   */
+  app.post('/services/:fqn/offers/:offerId/ice-candidates', authMiddleware, async (c) => {
+    try {
+      const serviceFqn = decodeURIComponent(c.req.param('fqn'));
+      const offerId = c.req.param('offerId');
       const body = await c.req.json();
-      const { candidates, offerId } = body;
+      const { candidates } = body;
 
       if (!Array.isArray(candidates) || candidates.length === 0) {
         return c.json({ error: 'Missing or invalid required parameter: candidates' }, 400);
@@ -551,75 +641,37 @@ export function createApp(storage: Storage, config: Config) {
 
       const peerId = getAuthenticatedPeerId(c);
 
-      // Get the service by UUID
-      const service = await storage.getServiceByUuid(uuid);
-      if (!service) {
-        return c.json({ error: 'Service not found' }, 404);
-      }
-
-      // If offerId is provided, use it; otherwise find the peer's offer
-      let targetOfferId = offerId;
-      if (!targetOfferId) {
-        const serviceOffers = await storage.getOffersForService(service.id);
-        const myOffer = serviceOffers.find(offer =>
-          offer.peerId === peerId || offer.answererPeerId === peerId
-        );
-        if (!myOffer) {
-          return c.json({ error: 'No offer found for this peer' }, 404);
-        }
-        targetOfferId = myOffer.id;
-      }
-
       // Get offer to determine role
-      const offer = await storage.getOfferById(targetOfferId);
+      const offer = await storage.getOfferById(offerId);
       if (!offer) {
         return c.json({ error: 'Offer not found' }, 404);
       }
 
-      // Determine role
+      // Determine role (offerer or answerer)
       const role = offer.peerId === peerId ? 'offerer' : 'answerer';
 
-      const count = await storage.addIceCandidates(targetOfferId, peerId, role, candidates);
+      const count = await storage.addIceCandidates(offerId, peerId, role, candidates);
 
-      return c.json({ count, offerId: targetOfferId }, 200);
+      return c.json({ count, offerId }, 200);
     } catch (err) {
-      console.error('Error adding ICE candidates to service:', err);
+      console.error('Error adding ICE candidates:', err);
       return c.json({ error: 'Internal server error' }, 500);
     }
   });
 
   /**
-   * GET /services/:uuid/ice-candidates
+   * GET /services/:fqn/offers/:offerId/ice-candidates
-   * Get ICE candidates for a service
+   * Get ICE candidates for a specific offer
    */
-  app.get('/services/:uuid/ice-candidates', authMiddleware, async (c) => {
+  app.get('/services/:fqn/offers/:offerId/ice-candidates', authMiddleware, async (c) => {
     try {
-      const uuid = c.req.param('uuid');
+      const serviceFqn = decodeURIComponent(c.req.param('fqn'));
+      const offerId = c.req.param('offerId');
       const since = c.req.query('since');
-      const offerId = c.req.query('offerId');
       const peerId = getAuthenticatedPeerId(c);
 
-      // Get the service by UUID
-      const service = await storage.getServiceByUuid(uuid);
-      if (!service) {
-        return c.json({ error: 'Service not found' }, 404);
-      }
-
-      // If offerId is provided, use it; otherwise find the peer's offer
-      let targetOfferId = offerId;
-      if (!targetOfferId) {
-        const serviceOffers = await storage.getOffersForService(service.id);
-        const myOffer = serviceOffers.find(offer =>
-          offer.peerId === peerId || offer.answererPeerId === peerId
-        );
-        if (!myOffer) {
-          return c.json({ error: 'No offer found for this peer' }, 404);
-        }
-        targetOfferId = myOffer.id;
-      }
-
       // Get offer to determine role
-      const offer = await storage.getOfferById(targetOfferId);
+      const offer = await storage.getOfferById(offerId);
       if (!offer) {
         return c.json({ error: 'Offer not found' }, 404);
       }
@@ -628,17 +680,17 @@ export function createApp(storage: Storage, config: Config) {
       const targetRole = offer.peerId === peerId ? 'answerer' : 'offerer';
       const sinceTimestamp = since ? parseInt(since, 10) : undefined;
 
-      const candidates = await storage.getIceCandidates(targetOfferId, targetRole, sinceTimestamp);
+      const candidates = await storage.getIceCandidates(offerId, targetRole, sinceTimestamp);
 
       return c.json({
         candidates: candidates.map(c => ({
           candidate: c.candidate,
           createdAt: c.createdAt
         })),
-        offerId: targetOfferId
+        offerId
       }, 200);
     } catch (err) {
-      console.error('Error getting ICE candidates for service:', err);
+      console.error('Error getting ICE candidates:', err);
       return c.json({ error: 'Internal server error' }, 500);
     }
   });

src/crypto.ts

@@ -192,31 +192,32 @@ export function validateUsername(username: string): { valid: boolean; error?: st
 }
 
 /**
- * Validates service FQN format (service-name@version)
+ * Validates service FQN format (service:version@username or service:version)
- * Service name: reverse domain notation (com.example.service)
+ * Service name: lowercase alphanumeric with dots/dashes (e.g., chat, file-share, com.example.chat)
  * Version: semantic versioning (1.0.0, 2.1.3-beta, etc.)
+ * Username: optional, lowercase alphanumeric with dashes
  */
 export function validateServiceFqn(fqn: string): { valid: boolean; error?: string } {
   if (typeof fqn !== 'string') {
     return { valid: false, error: 'Service FQN must be a string' };
   }
 
-  // Split into service name and version
+  // Parse the FQN
-  const parts = fqn.split('@');
+  const parsed = parseServiceFqn(fqn);
-  if (parts.length !== 2) {
+  if (!parsed) {
-    return { valid: false, error: 'Service FQN must be in format: service-name@version' };
+    return { valid: false, error: 'Service FQN must be in format: service:version[@username]' };
   }
 
-  const [serviceName, version] = parts;
+  const { serviceName, version, username } = parsed;
 
-  // Validate service name (reverse domain notation)
+  // Validate service name (alphanumeric with dots/dashes)
-  const serviceNameRegex = /^[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)+$/;
+  const serviceNameRegex = /^[a-z0-9]([a-z0-9.-]*[a-z0-9])?$/;
   if (!serviceNameRegex.test(serviceName)) {
-    return { valid: false, error: 'Service name must be reverse domain notation (e.g., com.example.service)' };
+    return { valid: false, error: 'Service name must be lowercase alphanumeric with optional dots/dashes' };
   }
 
-  if (serviceName.length < 3 || serviceName.length > 128) {
+  if (serviceName.length < 1 || serviceName.length > 128) {
-    return { valid: false, error: 'Service name must be 3-128 characters' };
+    return { valid: false, error: 'Service name must be 1-128 characters' };
   }
 
   // Validate version (semantic versioning)
@@ -225,6 +226,14 @@ export function validateServiceFqn(fqn: string): { valid: boolean; error?: strin
     return { valid: false, error: 'Version must be semantic versioning (e.g., 1.0.0, 2.1.3-beta)' };
   }
 
+  // Validate username if present
+  if (username) {
+    const usernameCheck = validateUsername(username);
+    if (!usernameCheck.valid) {
+      return usernameCheck;
+    }
+  }
+
   return { valid: true };
 }
 
@@ -270,15 +279,41 @@ export function isVersionCompatible(requested: string, available: string): boole
 }
 
 /**
- * Parse service FQN into service name and version
+ * Parse service FQN into components
+ * Formats supported:
+ * - service:version@username (e.g., "chat:1.0.0@alice")
+ * - service:version (e.g., "chat:1.0.0") for discovery
  */
-export function parseServiceFqn(fqn: string): { serviceName: string; version: string } | null {
+export function parseServiceFqn(fqn: string): { serviceName: string; version: string; username: string | null } | null {
-  const parts = fqn.split('@');
+  if (!fqn || typeof fqn !== 'string') return null;
-  if (parts.length !== 2) return null;
+
+  // Check if username is present
+  const atIndex = fqn.lastIndexOf('@');
+  let serviceVersion: string;
+  let username: string | null = null;
+
+  if (atIndex > 0) {
+    // Format: service:version@username
+    serviceVersion = fqn.substring(0, atIndex);
+    username = fqn.substring(atIndex + 1);
+  } else {
+    // Format: service:version (no username)
+    serviceVersion = fqn;
+  }
+
+  // Split service:version
+  const colonIndex = serviceVersion.indexOf(':');
+  if (colonIndex <= 0) return null; // No colon or colon at start
+
+  const serviceName = serviceVersion.substring(0, colonIndex);
+  const version = serviceVersion.substring(colonIndex + 1);
+
+  if (!serviceName || !version) return null;
 
   return {
-    serviceName: parts[0],
+    serviceName,
-    version: parts[1],
+    version,
+    username,
   };
 }
 
@@ -390,16 +425,24 @@ export async function validateServicePublish(
   }
 
   // Parse message format: "publish:{username}:{serviceFqn}:{timestamp}"
+  // Note: serviceFqn can contain colons (e.g., "chat:2.0.0@user"), so we need careful parsing
   const parts = message.split(':');
-  if (parts.length !== 4 || parts[0] !== 'publish' || parts[1] !== username || parts[2] !== serviceFqn) {
+  if (parts.length < 4 || parts[0] !== 'publish' || parts[1] !== username) {
     return { valid: false, error: 'Invalid message format (expected: publish:{username}:{serviceFqn}:{timestamp})' };
   }
 
-  const timestamp = parseInt(parts[3], 10);
+  // The timestamp is the last part
+  const timestamp = parseInt(parts[parts.length - 1], 10);
   if (isNaN(timestamp)) {
     return { valid: false, error: 'Invalid timestamp in message' };
   }
 
+  // The serviceFqn is everything between username and timestamp
+  const extractedServiceFqn = parts.slice(2, parts.length - 1).join(':');
+  if (extractedServiceFqn !== serviceFqn) {
+    return { valid: false, error: `Service FQN mismatch (expected: ${serviceFqn}, got: ${extractedServiceFqn})` };
+  }
+
   // Validate timestamp
   const timestampCheck = validateTimestamp(timestamp);
   if (!timestampCheck.valid) {

src/storage/d1.ts

@@ -8,9 +8,9 @@ import {
   ClaimUsernameRequest,
   Service,
   CreateServiceRequest,
-  ServiceInfo,
 } from './types.ts';
 import { generateOfferHash } from './hash-id.ts';
+import { parseServiceFqn } from '../crypto.ts';
 
 const YEAR_IN_MS = 365 * 24 * 60 * 60 * 1000; // 365 days
 
@@ -84,36 +84,23 @@ export class D1Storage implements Storage {
       CREATE INDEX IF NOT EXISTS idx_usernames_expires ON usernames(expires_at);
       CREATE INDEX IF NOT EXISTS idx_usernames_public_key ON usernames(public_key);
 
-      -- Services table
+      -- Services table (new schema with extracted fields for discovery)
       CREATE TABLE IF NOT EXISTS services (
         id TEXT PRIMARY KEY,
-        username TEXT NOT NULL,
         service_fqn TEXT NOT NULL,
+        service_name TEXT NOT NULL,
+        version TEXT NOT NULL,
+        username TEXT NOT NULL,
         created_at INTEGER NOT NULL,
         expires_at INTEGER NOT NULL,
-        is_public INTEGER NOT NULL DEFAULT 0,
-        metadata TEXT,
         FOREIGN KEY (username) REFERENCES usernames(username) ON DELETE CASCADE,
-        UNIQUE(username, service_fqn)
+        UNIQUE(service_fqn)
       );
 
-      CREATE INDEX IF NOT EXISTS idx_services_username ON services(username);
       CREATE INDEX IF NOT EXISTS idx_services_fqn ON services(service_fqn);
+      CREATE INDEX IF NOT EXISTS idx_services_discovery ON services(service_name, version);
+      CREATE INDEX IF NOT EXISTS idx_services_username ON services(username);
       CREATE INDEX IF NOT EXISTS idx_services_expires ON services(expires_at);
-
-      -- Service index table (privacy layer)
-      CREATE TABLE IF NOT EXISTS service_index (
-        uuid TEXT PRIMARY KEY,
-        service_id TEXT NOT NULL,
-        username TEXT NOT NULL,
-        service_fqn TEXT NOT NULL,
-        created_at INTEGER NOT NULL,
-        expires_at INTEGER NOT NULL,
-        FOREIGN KEY (service_id) REFERENCES services(id) ON DELETE CASCADE
-      );
-
-      CREATE INDEX IF NOT EXISTS idx_service_index_username ON service_index(username);
-      CREATE INDEX IF NOT EXISTS idx_service_index_expires ON service_index(expires_at);
     `);
   }
 
@@ -128,13 +115,14 @@ export class D1Storage implements Storage {
       const now = Date.now();
 
       await this.db.prepare(`
-        INSERT INTO offers (id, peer_id, sdp, created_at, expires_at, last_seen, secret)
+        INSERT INTO offers (id, peer_id, service_id, sdp, created_at, expires_at, last_seen, secret)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-      `).bind(id, offer.peerId, offer.sdp, now, offer.expiresAt, now, offer.secret || null).run();
+      `).bind(id, offer.peerId, offer.serviceId || null, offer.sdp, now, offer.expiresAt, now, offer.secret || null).run();
 
       created.push({
         id,
         peerId: offer.peerId,
+        serviceId: offer.serviceId,
         sdp: offer.sdp,
         createdAt: now,
         expiresAt: offer.expiresAt,
@@ -320,36 +308,44 @@ export class D1Storage implements Storage {
     const now = Date.now();
     const expiresAt = now + YEAR_IN_MS;
 
-    // Try to insert or update
+    try {
-    const result = await this.db.prepare(`
+      // Try to insert or update
-      INSERT INTO usernames (username, public_key, claimed_at, expires_at, last_used, metadata)
+      const result = await this.db.prepare(`
-      VALUES (?, ?, ?, ?, ?, NULL)
+        INSERT INTO usernames (username, public_key, claimed_at, expires_at, last_used, metadata)
-      ON CONFLICT(username) DO UPDATE SET
+        VALUES (?, ?, ?, ?, ?, NULL)
-        expires_at = ?,
+        ON CONFLICT(username) DO UPDATE SET
-        last_used = ?
+          expires_at = ?,
-      WHERE public_key = ?
+          last_used = ?
-    `).bind(
+        WHERE public_key = ?
-      request.username,
+      `).bind(
-      request.publicKey,
+        request.username,
-      now,
+        request.publicKey,
-      expiresAt,
+        now,
-      now,
+        expiresAt,
-      expiresAt,
+        now,
-      now,
+        expiresAt,
-      request.publicKey
+        now,
-    ).run();
+        request.publicKey
+      ).run();
 
-    if ((result.meta.changes || 0) === 0) {
+      if ((result.meta.changes || 0) === 0) {
-      throw new Error('Username already claimed by different public key');
+        throw new Error('Username already claimed by different public key');
+      }
+
+      return {
+        username: request.username,
+        publicKey: request.publicKey,
+        claimedAt: now,
+        expiresAt,
+        lastUsed: now,
+      };
+    } catch (err: any) {
+      // Handle UNIQUE constraint on public_key
+      if (err.message?.includes('UNIQUE constraint failed: usernames.public_key')) {
+        throw new Error('This public key has already claimed a different username');
+      }
+      throw err;
     }
-
-    return {
-      username: request.username,
-      publicKey: request.publicKey,
-      claimedAt: now,
-      expiresAt,
-      lastUsed: now,
-    };
   }
 
   async getUsername(username: string): Promise<Username | null> {
@@ -374,18 +370,6 @@ export class D1Storage implements Storage {
     };
   }
 
-  async touchUsername(username: string): Promise<boolean> {
-    const now = Date.now();
-    const expiresAt = now + YEAR_IN_MS;
-
-    const result = await this.db.prepare(`
-      UPDATE usernames
-      SET last_used = ?, expires_at = ?
-      WHERE username = ? AND expires_at > ?
-    `).bind(now, expiresAt, username, now).run();
-
-    return (result.meta.changes || 0) > 0;
-  }
 
   async deleteExpiredUsernames(now: number): Promise<number> {
     const result = await this.db.prepare(`
@@ -399,36 +383,51 @@ export class D1Storage implements Storage {
 
   async createService(request: CreateServiceRequest): Promise<{
     service: Service;
-    indexUuid: string;
     offers: Offer[];
   }> {
     const serviceId = crypto.randomUUID();
-    const indexUuid = crypto.randomUUID();
     const now = Date.now();
 
-    // Insert service
+    // Parse FQN to extract components
+    const parsed = parseServiceFqn(request.serviceFqn);
+    if (!parsed) {
+      throw new Error(`Invalid service FQN: ${request.serviceFqn}`);
+    }
+    if (!parsed.username) {
+      throw new Error(`Service FQN must include username: ${request.serviceFqn}`);
+    }
+
+    const { serviceName, version, username } = parsed;
+
+    // Delete existing service with same (service_name, version, username) and its related offers (upsert behavior)
+    // First get the existing service
+    const existingService = await this.db.prepare(`
+      SELECT id FROM services
+      WHERE service_name = ? AND version = ? AND username = ?
+    `).bind(serviceName, version, username).first();
+
+    if (existingService) {
+      // Delete related offers first (no FK cascade from offers to services)
+      await this.db.prepare(`
+        DELETE FROM offers WHERE service_id = ?
+      `).bind(existingService.id).run();
+
+      // Delete the service
+      await this.db.prepare(`
+        DELETE FROM services WHERE id = ?
+      `).bind(existingService.id).run();
+    }
+
+    // Insert new service with extracted fields
     await this.db.prepare(`
-      INSERT INTO services (id, username, service_fqn, created_at, expires_at, is_public, metadata)
+      INSERT INTO services (id, service_fqn, service_name, version, username, created_at, expires_at)
       VALUES (?, ?, ?, ?, ?, ?, ?)
     `).bind(
       serviceId,
-      request.username,
-      request.serviceFqn,
-      now,
-      request.expiresAt,
-      request.isPublic ? 1 : 0,
-      request.metadata || null
-    ).run();
-
-    // Insert service index
-    await this.db.prepare(`
-      INSERT INTO service_index (uuid, service_id, username, service_fqn, created_at, expires_at)
-      VALUES (?, ?, ?, ?, ?, ?)
-    `).bind(
-      indexUuid,
-      serviceId,
-      request.username,
       request.serviceFqn,
+      serviceName,
+      version,
+      username,
       now,
       request.expiresAt
     ).run();
@@ -440,36 +439,28 @@ export class D1Storage implements Storage {
     }));
     const offers = await this.createOffers(offerRequests);
 
-    // Touch username to extend expiry
+    // Touch username to extend expiry (inline logic)
-    await this.touchUsername(request.username);
+    const expiresAt = now + YEAR_IN_MS;
+    await this.db.prepare(`
+      UPDATE usernames
+      SET last_used = ?, expires_at = ?
+      WHERE username = ? AND expires_at > ?
+    `).bind(now, expiresAt, username, now).run();
 
     return {
       service: {
         id: serviceId,
-        username: request.username,
         serviceFqn: request.serviceFqn,
+        serviceName,
+        version,
+        username,
         createdAt: now,
         expiresAt: request.expiresAt,
-        isPublic: request.isPublic || false,
-        metadata: request.metadata,
       },
-      indexUuid,
       offers,
     };
   }
 
-  async batchCreateServices(requests: CreateServiceRequest[]): Promise<Array<{
-    service: Service;
-    indexUuid: string;
-    offers: Offer[];
-  }>> {
-    const results = [];
-    for (const request of requests) {
-      const result = await this.createService(request);
-      results.push(result);
-    }
-    return results;
-  }
 
   async getOffersForService(serviceId: string): Promise<Offer[]> {
     const result = await this.db.prepare(`
@@ -498,12 +489,11 @@ export class D1Storage implements Storage {
     return this.rowToService(result as any);
   }
 
-  async getServiceByUuid(uuid: string): Promise<Service | null> {
+  async getServiceByFqn(serviceFqn: string): Promise<Service | null> {
     const result = await this.db.prepare(`
-      SELECT s.* FROM services s
+      SELECT * FROM services
-      INNER JOIN service_index si ON s.id = si.service_id
+      WHERE service_fqn = ? AND expires_at > ?
-      WHERE si.uuid = ? AND s.expires_at > ?
+    `).bind(serviceFqn, Date.now()).first();
-    `).bind(uuid, Date.now()).first();
 
     if (!result) {
       return null;
@@ -512,43 +502,29 @@ export class D1Storage implements Storage {
     return this.rowToService(result as any);
   }
 
-  async listServicesForUsername(username: string): Promise<ServiceInfo[]> {
+
+
+
+
+  async discoverServices(
+    serviceName: string,
+    version: string,
+    limit: number,
+    offset: number
+  ): Promise<Service[]> {
+    // Query for unique services with available offers
+    // We join with offers and filter for available ones (answerer_peer_id IS NULL)
     const result = await this.db.prepare(`
-      SELECT si.uuid, s.is_public, s.service_fqn, s.metadata
+      SELECT DISTINCT s.* FROM services s
-      FROM service_index si
+      INNER JOIN offers o ON o.service_id = s.id
-      INNER JOIN services s ON si.service_id = s.id
+      WHERE s.service_name = ?
-      WHERE si.username = ? AND si.expires_at > ?
+        AND s.version = ?
+        AND s.expires_at > ?
+        AND o.answerer_peer_id IS NULL
+        AND o.expires_at > ?
       ORDER BY s.created_at DESC
-    `).bind(username, Date.now()).all();
+      LIMIT ? OFFSET ?
-
+    `).bind(serviceName, version, Date.now(), Date.now(), limit, offset).all();
-    if (!result.results) {
-      return [];
-    }
-
-    return result.results.map((row: any) => ({
-      uuid: row.uuid,
-      isPublic: row.is_public === 1,
-      serviceFqn: row.is_public === 1 ? row.service_fqn : undefined,
-      metadata: row.is_public === 1 ? row.metadata || undefined : undefined,
-    }));
-  }
-
-  async queryService(username: string, serviceFqn: string): Promise<string | null> {
-    const result = await this.db.prepare(`
-      SELECT si.uuid FROM service_index si
-      INNER JOIN services s ON si.service_id = s.id
-      WHERE si.username = ? AND si.service_fqn = ? AND si.expires_at > ?
-    `).bind(username, serviceFqn, Date.now()).first();
-
-    return result ? (result as any).uuid : null;
-  }
-
-  async findServicesByName(username: string, serviceName: string): Promise<Service[]> {
-    const result = await this.db.prepare(`
-      SELECT * FROM services
-      WHERE username = ? AND service_fqn LIKE ? AND expires_at > ?
-      ORDER BY created_at DESC
-    `).bind(username, `${serviceName}@%`, Date.now()).all();
 
     if (!result.results) {
       return [];
@@ -557,6 +533,27 @@ export class D1Storage implements Storage {
     return result.results.map(row => this.rowToService(row as any));
   }
 
+  async getRandomService(serviceName: string, version: string): Promise<Service | null> {
+    // Get a random service with an available offer
+    const result = await this.db.prepare(`
+      SELECT s.* FROM services s
+      INNER JOIN offers o ON o.service_id = s.id
+      WHERE s.service_name = ?
+        AND s.version = ?
+        AND s.expires_at > ?
+        AND o.answerer_peer_id IS NULL
+        AND o.expires_at > ?
+      ORDER BY RANDOM()
+      LIMIT 1
+    `).bind(serviceName, version, Date.now(), Date.now()).first();
+
+    if (!result) {
+      return null;
+    }
+
+    return this.rowToService(result as any);
+  }
+
   async deleteService(serviceId: string, username: string): Promise<boolean> {
     const result = await this.db.prepare(`
       DELETE FROM services
@@ -588,6 +585,7 @@ export class D1Storage implements Storage {
     return {
       id: row.id,
       peerId: row.peer_id,
+      serviceId: row.service_id || undefined,
       sdp: row.sdp,
       createdAt: row.created_at,
       expiresAt: row.expires_at,
@@ -605,12 +603,12 @@ export class D1Storage implements Storage {
   private rowToService(row: any): Service {
     return {
       id: row.id,
-      username: row.username,
       serviceFqn: row.service_fqn,
+      serviceName: row.service_name,
+      version: row.version,
+      username: row.username,
       createdAt: row.created_at,
       expiresAt: row.expires_at,
-      isPublic: row.is_public === 1,
-      metadata: row.metadata || undefined,
     };
   }
 }

src/storage/types.ts

@@ -64,58 +64,27 @@ export interface ClaimUsernameRequest {
 
 /**
  * Represents a published service (can have multiple offers)
+ * New format: service:version@username (e.g., chat:1.0.0@alice)
  */
 export interface Service {
   id: string; // UUID v4
-  username: string;
+  serviceFqn: string; // Full FQN: chat:1.0.0@alice
-  serviceFqn: string; // com.example.chat@1.0.0
+  serviceName: string; // Extracted: chat
+  version: string; // Extracted: 1.0.0
+  username: string; // Extracted: alice
   createdAt: number;
   expiresAt: number;
-  isPublic: boolean;
-  metadata?: string; // JSON service description
 }
 
 /**
  * Request to create a single service
  */
 export interface CreateServiceRequest {
-  username: string;
+  serviceFqn: string; // Full FQN with username: chat:1.0.0@alice
-  serviceFqn: string;
   expiresAt: number;
-  isPublic?: boolean;
-  metadata?: string;
   offers: CreateOfferRequest[]; // Multiple offers per service
 }
 
-/**
- * Request to create multiple services in batch
- */
-export interface BatchCreateServicesRequest {
-  services: CreateServiceRequest[];
-}
-
-/**
- * Represents a service index entry (privacy layer)
- */
-export interface ServiceIndex {
-  uuid: string; // Random UUID for privacy
-  serviceId: string;
-  username: string;
-  serviceFqn: string;
-  createdAt: number;
-  expiresAt: number;
-}
-
-/**
- * Service info for discovery (privacy-aware)
- */
-export interface ServiceInfo {
-  uuid: string;
-  isPublic: boolean;
-  serviceFqn?: string; // Only present if public
-  metadata?: string; // Only present if public
-}
-
 /**
  * Storage interface for rondevu DNS-like system
  * Implementations can use different backends (SQLite, D1, etc.)
@@ -225,13 +194,6 @@ export interface Storage {
    */
   getUsername(username: string): Promise<Username | null>;
 
-  /**
-   * Updates the last_used timestamp for a username (extends expiry)
-   * @param username Username to update
-   * @returns true if updated, false if not found
-   */
-  touchUsername(username: string): Promise<boolean>;
-
   /**
    * Deletes all expired usernames
    * @param now Current timestamp
@@ -244,24 +206,13 @@ export interface Storage {
   /**
    * Creates a new service with offers
    * @param request Service creation request (includes offers)
-   * @returns Created service with generated ID, index UUID, and created offers
+   * @returns Created service with generated ID and created offers
    */
   createService(request: CreateServiceRequest): Promise<{
     service: Service;
-    indexUuid: string;
     offers: Offer[];
   }>;
 
-  /**
-   * Creates multiple services with offers in batch
-   * @param requests Array of service creation requests
-   * @returns Array of created services with IDs, UUIDs, and offers
-   */
-  batchCreateServices(requests: CreateServiceRequest[]): Promise<Array<{
-    service: Service;
-    indexUuid: string;
-    offers: Offer[];
-  }>>;
 
   /**
    * Gets all offers for a service
@@ -278,34 +229,40 @@ export interface Storage {
   getServiceById(serviceId: string): Promise<Service | null>;
 
   /**
-   * Gets a service by its index UUID
+   * Gets a service by its fully qualified name (FQN)
-   * @param uuid Index UUID
+   * @param serviceFqn Full service FQN (e.g., "chat:1.0.0@alice")
    * @returns Service if found, null otherwise
    */
-  getServiceByUuid(uuid: string): Promise<Service | null>;
+  getServiceByFqn(serviceFqn: string): Promise<Service | null>;
+
+
+
+
 
   /**
-   * Lists all services for a username (with privacy filtering)
+   * Discovers services by name and version with pagination
-   * @param username Username to query
+   * Returns unique available offers (where answerer_peer_id IS NULL)
-   * @returns Array of service info (UUIDs only for private services)
+   * @param serviceName Service name (e.g., 'chat')
+   * @param version Version string for semver matching (e.g., '1.0.0')
+   * @param limit Maximum number of unique services to return
+   * @param offset Number of services to skip
+   * @returns Array of services with available offers
    */
-  listServicesForUsername(username: string): Promise<ServiceInfo[]>;
+  discoverServices(
+    serviceName: string,
+    version: string,
+    limit: number,
+    offset: number
+  ): Promise<Service[]>;
 
   /**
-   * Queries a service by username and FQN
+   * Gets a random available service by name and version
-   * @param username Username
+   * Returns a single random offer that is available (answerer_peer_id IS NULL)
-   * @param serviceFqn Service FQN
+   * @param serviceName Service name (e.g., 'chat')
-   * @returns Service index UUID if found, null otherwise
+   * @param version Version string for semver matching (e.g., '1.0.0')
+   * @returns Random service with available offer, or null if none found
    */
-  queryService(username: string, serviceFqn: string): Promise<string | null>;
+  getRandomService(serviceName: string, version: string): Promise<Service | null>;
-
-  /**
-   * Finds all services by username and service name (without version)
-   * @param username Username
-   * @param serviceName Service name (e.g., 'com.example.chat')
-   * @returns Array of services with matching service name
-   */
-  findServicesByName(username: string, serviceName: string): Promise<Service[]>;
 
   /**
    * Deletes a service (with ownership verification)

wrangler.toml

@@ -7,7 +7,7 @@ compatibility_flags = ["nodejs_compat"]
 [[d1_databases]]
 binding = "DB"
 database_name = "rondevu-offers"
-database_id = "b94e3f71-816d-455b-a89d-927fa49532d0"
+database_id = "3d469855-d37f-477b-b139-fa58843a54ff"
 
 # Environment variables
 [vars]
@@ -39,7 +39,7 @@ command = ""
 
 [observability]
 [observability.logs]
-enabled = false
+enabled = true
 head_sampling_rate = 1
 invocation_logs = true
 persist = true