@xtr-dev/rondevu-server 0.5.15 → 0.5.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtr-dev/rondevu-server",
-  "version": "0.5.15",
+  "version": "0.5.16",
   "description": "DNS-like WebRTC signaling server with credential-based authentication and service discovery",
   "main": "dist/index.js",
   "scripts": {

package/src/config.ts

@@ -20,6 +20,7 @@ export interface Config {
   offerDefaultTtl: number;
   offerMaxTtl: number;
   offerMinTtl: number;
+  answeredOfferTtl: number; // TTL after offer is answered (for ICE exchange)
   cleanupInterval: number;
   maxOffersPerRequest: number;
   maxBatchSize: number;
@@ -66,6 +67,7 @@ export function loadConfig(): Config {
     offerDefaultTtl: parsePositiveInt(process.env.OFFER_DEFAULT_TTL, '60000', 'OFFER_DEFAULT_TTL', 1000),
     offerMaxTtl: parsePositiveInt(process.env.OFFER_MAX_TTL, '86400000', 'OFFER_MAX_TTL', 1000),
     offerMinTtl: parsePositiveInt(process.env.OFFER_MIN_TTL, '60000', 'OFFER_MIN_TTL', 1000),
+    answeredOfferTtl: parsePositiveInt(process.env.ANSWERED_OFFER_TTL, '30000', 'ANSWERED_OFFER_TTL', 1000),
     cleanupInterval: parsePositiveInt(process.env.CLEANUP_INTERVAL, '60000', 'CLEANUP_INTERVAL', 1000),
     maxOffersPerRequest: parsePositiveInt(process.env.MAX_OFFERS_PER_REQUEST, '100', 'MAX_OFFERS_PER_REQUEST', 1),
     maxBatchSize: parsePositiveInt(process.env.MAX_BATCH_SIZE, '100', 'MAX_BATCH_SIZE', 1),
@@ -93,6 +95,7 @@ export const CONFIG_DEFAULTS = {
   offerDefaultTtl: 60000,
   offerMaxTtl: 86400000,
   offerMinTtl: 60000,
+  answeredOfferTtl: 30000, // 30 seconds TTL after offer is answered
   cleanupInterval: 60000,
   maxOffersPerRequest: 100,
   maxBatchSize: 100,
@@ -133,6 +136,7 @@ export function buildWorkerConfig(env: {
     offerDefaultTtl: env.OFFER_DEFAULT_TTL ? parseInt(env.OFFER_DEFAULT_TTL, 10) : CONFIG_DEFAULTS.offerDefaultTtl,
     offerMaxTtl: env.OFFER_MAX_TTL ? parseInt(env.OFFER_MAX_TTL, 10) : CONFIG_DEFAULTS.offerMaxTtl,
     offerMinTtl: env.OFFER_MIN_TTL ? parseInt(env.OFFER_MIN_TTL, 10) : CONFIG_DEFAULTS.offerMinTtl,
+    answeredOfferTtl: CONFIG_DEFAULTS.answeredOfferTtl,
     cleanupInterval: CONFIG_DEFAULTS.cleanupInterval,
     maxOffersPerRequest: env.MAX_OFFERS_PER_REQUEST ? parseInt(env.MAX_OFFERS_PER_REQUEST, 10) : CONFIG_DEFAULTS.maxOffersPerRequest,
     maxBatchSize: env.MAX_BATCH_SIZE ? parseInt(env.MAX_BATCH_SIZE, 10) : CONFIG_DEFAULTS.maxBatchSize,

package/src/rpc.ts

@@ -454,7 +454,9 @@ const handlers: Record<string, RpcHandler> = {
       }
     }
 
-    await storage.answerOffer(offerId, publicKey, sdp, matchedTags);
+    // Reduce TTL after answer for faster cleanup (answered offers no longer appear in discovery)
+    const newExpiresAt = Date.now() + config.answeredOfferTtl;
+    await storage.answerOffer(offerId, publicKey, sdp, matchedTags, newExpiresAt);
 
     return { success: true, offerId };
   },

package/src/storage/d1.ts

@@ -166,7 +166,8 @@ export class D1Storage implements Storage {
     offerId: string,
     answererPublicKey: string,
     answerSdp: string,
-    matchedTags?: string[]
+    matchedTags?: string[],
+    newExpiresAt?: number
   ): Promise<{ success: boolean; error?: string }> {
     const offer = await this.getOfferById(offerId);
 
@@ -178,12 +179,19 @@ export class D1Storage implements Storage {
       return { success: false, error: 'Offer already answered' };
     }
 
+    const now = Date.now();
     const matchedTagsJson = matchedTags ? JSON.stringify(matchedTags) : null;
-    const result = await this.db.prepare(`
-      UPDATE offers
-      SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ?
-      WHERE id = ? AND answerer_public_key IS NULL
-    `).bind(answererPublicKey, answerSdp, Date.now(), matchedTagsJson, offerId).run();
+
+    // Optionally reduce TTL for faster cleanup after answer
+    const query = newExpiresAt
+      ? `UPDATE offers SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ?, expires_at = ? WHERE id = ? AND answerer_public_key IS NULL`
+      : `UPDATE offers SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ? WHERE id = ? AND answerer_public_key IS NULL`;
+
+    const params = newExpiresAt
+      ? [answererPublicKey, answerSdp, now, matchedTagsJson, newExpiresAt, offerId]
+      : [answererPublicKey, answerSdp, now, matchedTagsJson, offerId];
+
+    const result = await this.db.prepare(query).bind(...params).run();
 
     if ((result.meta.changes || 0) === 0) {
       return { success: false, error: 'Offer already answered (race condition)' };

package/src/storage/memory.ts

@@ -135,7 +135,8 @@ export class MemoryStorage implements Storage {
     offerId: string,
     answererPublicKey: string,
     answerSdp: string,
-    matchedTags?: string[]
+    matchedTags?: string[],
+    newExpiresAt?: number
   ): Promise<{ success: boolean; error?: string }> {
     const offer = await this.getOfferById(offerId);
 
@@ -154,6 +155,11 @@ export class MemoryStorage implements Storage {
     offer.answeredAt = now;
     offer.matchedTags = matchedTags;
 
+    // Optionally reduce TTL for faster cleanup after answer
+    if (newExpiresAt !== undefined) {
+      offer.expiresAt = newExpiresAt;
+    }
+
     // Update answerer index
     if (!this.offersByAnswerer.has(answererPublicKey)) {
       this.offersByAnswerer.set(answererPublicKey, new Set());

package/src/storage/mysql.ts

@@ -187,7 +187,8 @@ export class MySQLStorage implements Storage {
     offerId: string,
     answererPublicKey: string,
     answerSdp: string,
-    matchedTags?: string[]
+    matchedTags?: string[],
+    newExpiresAt?: number
   ): Promise<{ success: boolean; error?: string }> {
     const offer = await this.getOfferById(offerId);
 
@@ -199,12 +200,19 @@ export class MySQLStorage implements Storage {
       return { success: false, error: 'Offer already answered' };
     }
 
+    const now = Date.now();
     const matchedTagsJson = matchedTags ? JSON.stringify(matchedTags) : null;
-    const [result] = await this.pool.query<ResultSetHeader>(
-      `UPDATE offers SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ?
-       WHERE id = ? AND answerer_public_key IS NULL`,
-      [answererPublicKey, answerSdp, Date.now(), matchedTagsJson, offerId]
-    );
+
+    // Optionally reduce TTL for faster cleanup after answer
+    const query = newExpiresAt
+      ? `UPDATE offers SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ?, expires_at = ? WHERE id = ? AND answerer_public_key IS NULL`
+      : `UPDATE offers SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ? WHERE id = ? AND answerer_public_key IS NULL`;
+
+    const params = newExpiresAt
+      ? [answererPublicKey, answerSdp, now, matchedTagsJson, newExpiresAt, offerId]
+      : [answererPublicKey, answerSdp, now, matchedTagsJson, offerId];
+
+    const [result] = await this.pool.query<ResultSetHeader>(query, params);
 
     if (result.affectedRows === 0) {
       return { success: false, error: 'Offer already answered (race condition)' };

package/src/storage/postgres.ts

@@ -189,7 +189,8 @@ export class PostgreSQLStorage implements Storage {
     offerId: string,
     answererPublicKey: string,
     answerSdp: string,
-    matchedTags?: string[]
+    matchedTags?: string[],
+    newExpiresAt?: number
   ): Promise<{ success: boolean; error?: string }> {
     const offer = await this.getOfferById(offerId);
 
@@ -201,12 +202,19 @@ export class PostgreSQLStorage implements Storage {
       return { success: false, error: 'Offer already answered' };
     }
 
+    const now = Date.now();
     const matchedTagsJson = matchedTags ? JSON.stringify(matchedTags) : null;
-    const result = await this.pool.query(
-      `UPDATE offers SET answerer_public_key = $1, answer_sdp = $2, answered_at = $3, matched_tags = $4
-       WHERE id = $5 AND answerer_public_key IS NULL`,
-      [answererPublicKey, answerSdp, Date.now(), matchedTagsJson, offerId]
-    );
+
+    // Optionally reduce TTL for faster cleanup after answer
+    const query = newExpiresAt
+      ? `UPDATE offers SET answerer_public_key = $1, answer_sdp = $2, answered_at = $3, matched_tags = $4, expires_at = $5 WHERE id = $6 AND answerer_public_key IS NULL`
+      : `UPDATE offers SET answerer_public_key = $1, answer_sdp = $2, answered_at = $3, matched_tags = $4 WHERE id = $5 AND answerer_public_key IS NULL`;
+
+    const params = newExpiresAt
+      ? [answererPublicKey, answerSdp, now, matchedTagsJson, newExpiresAt, offerId]
+      : [answererPublicKey, answerSdp, now, matchedTagsJson, offerId];
+
+    const result = await this.pool.query(query, params);
 
     if ((result.rowCount ?? 0) === 0) {
       return { success: false, error: 'Offer already answered (race condition)' };

package/src/storage/sqlite.ts

@@ -193,7 +193,8 @@ export class SQLiteStorage implements Storage {
     offerId: string,
     answererPublicKey: string,
     answerSdp: string,
-    matchedTags?: string[]
+    matchedTags?: string[],
+    newExpiresAt?: number
   ): Promise<{ success: boolean; error?: string }> {
     // Check if offer exists and is not expired
     const offer = await this.getOfferById(offerId);
@@ -213,15 +214,19 @@ export class SQLiteStorage implements Storage {
       };
     }
 
-    // Update offer with answer
+    // Update offer with answer (optionally reduce TTL for faster cleanup)
+    const now = Date.now();
     const stmt = this.db.prepare(`
       UPDATE offers
-      SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ?
+      SET answerer_public_key = ?, answer_sdp = ?, answered_at = ?, matched_tags = ?${newExpiresAt ? ', expires_at = ?' : ''}
       WHERE id = ? AND answerer_public_key IS NULL
     `);
 
     const matchedTagsJson = matchedTags ? JSON.stringify(matchedTags) : null;
-    const result = stmt.run(answererPublicKey, answerSdp, Date.now(), matchedTagsJson, offerId);
+    const params = newExpiresAt
+      ? [answererPublicKey, answerSdp, now, matchedTagsJson, newExpiresAt, offerId]
+      : [answererPublicKey, answerSdp, now, matchedTagsJson, offerId];
+    const result = stmt.run(...params);
 
     if (result.changes === 0) {
       return {

package/src/storage/types.ts

@@ -100,9 +100,10 @@ export interface Storage {
    * @param answererPublicKey Answerer's public key
    * @param answerSdp WebRTC answer SDP
    * @param matchedTags Optional tags the answerer searched for to find this offer
+   * @param newExpiresAt Optional new expiry time (to reduce TTL after answer for faster cleanup)
    * @returns Success status and optional error message
    */
-  answerOffer(offerId: string, answererPublicKey: string, answerSdp: string, matchedTags?: string[]): Promise<{
+  answerOffer(offerId: string, answererPublicKey: string, answerSdp: string, matchedTags?: string[], newExpiresAt?: number): Promise<{
     success: boolean;
     error?: string;
   }>;

package/wrangler.toml

@@ -6,6 +6,8 @@ compatibility_flags = ["nodejs_compat"]
 workers_dev = true
 preview_urls = true
 
+# Note: api.ronde.vu is a standalone VPS deployment (manual deployment)
+# This worker is deployed to test.ronde.vu for testing purposes
 routes = [{ pattern = "test.ronde.vu/*", zone_name = "ronde.vu" }]
 
 # Cleanup runs every 5 minutes