@xtr-dev/rondevu-server 0.5.20 → 0.5.22

package/.github/workflows/docker-publish.yml

@@ -0,0 +1,58 @@
+name: Build and Publish Docker Image
+
+on:
+  push:
+    branches: [main]
+    tags: ['v*']
+  pull_request:
+    branches: [main]
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha,prefix=
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            VERSION=${{ github.sha }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

package/Dockerfile

@@ -1,12 +1,18 @@
 # Build stage
 FROM node:20-alpine AS builder
 
+# Version is passed as build arg (from git commit hash)
+ARG VERSION=unknown
+
+# Install build tools for better-sqlite3
+RUN apk add --no-cache python3 make g++
+
 WORKDIR /app
 
 # Copy package files
 COPY package*.json ./
 
-# Install dependencies
+# Install dependencies (including native modules)
 RUN npm ci
 
 # Copy source files
@@ -14,22 +20,30 @@ COPY tsconfig.json ./
 COPY build.js ./
 COPY src ./src
 
-# Build TypeScript
-RUN npm run build
+# Build TypeScript with version embedded
+RUN VERSION=$VERSION npm run build
 
 # Production stage
 FROM node:20-alpine
 
+# Install build tools for better-sqlite3 native module
+RUN apk add --no-cache python3 make g++
+
 WORKDIR /app
 
-# Install production dependencies only
+# Copy package files and install production deps
 COPY package*.json ./
 RUN npm ci --omit=dev && \
-    npm cache clean --force
+    npm rebuild better-sqlite3 && \
+    npm cache clean --force && \
+    apk del python3 make g++
 
 # Copy built files from builder
 COPY --from=builder /app/dist ./dist
 
+# Copy migrations for schema setup
+COPY migrations ./migrations
+
 # Create data directory for SQLite
 RUN mkdir -p /app/data && \
     chown -R node:node /app
@@ -39,12 +53,9 @@ USER node
 
 # Environment variables with defaults
 ENV PORT=3000
-ENV STORAGE_TYPE=sqlite
-ENV STORAGE_PATH=/app/data/sessions.db
-ENV SESSION_TIMEOUT=300000
-ENV CODE_CHARS=0123456789
-ENV CODE_LENGTH=9
+ENV STORAGE_TYPE=memory
 ENV CORS_ORIGINS=*
+ENV NODE_ENV=production
 
 # Expose port
 EXPOSE 3000

package/build.js

@@ -2,13 +2,17 @@
 const esbuild = require('esbuild');
 const { execSync } = require('child_process');
 
-// Use git commit hash for version (like Cloudflare Workers deployment)
-let version = 'unknown';
-try {
-  version = execSync('git rev-parse --short HEAD', { encoding: 'utf8' }).trim();
-} catch (e) {
-  console.warn('Could not get git commit hash, using "unknown"');
+// Use VERSION env var first (for Docker builds), then fall back to git commit hash
+let version = process.env.VERSION;
+if (!version || version === 'unknown') {
+  try {
+    version = execSync('git rev-parse --short HEAD', { encoding: 'utf8' }).trim();
+  } catch (e) {
+    console.warn('Could not get git commit hash, using "unknown"');
+    version = 'unknown';
+  }
 }
+console.log(`Building with version: ${version}`);
 
 esbuild.build({
   entryPoints: ['src/index.ts'],

package/package.json

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

package/src/rpc.ts

@@ -128,6 +128,10 @@ export interface DiscoverParams {
   offset?: number;
 }
 
+export interface CountOffersByTagsParams {
+  tags: string[];
+}
+
 export interface PublishOfferParams {
   tags: string[];
   offers: Array<{ sdp: string }>;
@@ -300,6 +304,28 @@ const handlers: Record<string, RpcHandler> = {
     };
   },
 
+  /**
+   * Count available offers by tags
+   */
+  async countOffersByTags(params: CountOffersByTagsParams, publicKey, timestamp, signature, storage, config, request: RpcRequest) {
+    const { tags } = params;
+
+    const tagsValidation = validateTags(tags);
+    if (!tagsValidation.valid) {
+      throw new RpcError(ErrorCodes.INVALID_TAG, tagsValidation.error || 'Invalid tags');
+    }
+
+    const counts = await storage.countOffersByTags(tags);
+
+    // Convert Map to object for JSON serialization
+    const result: Record<string, number> = {};
+    for (const [tag, count] of counts) {
+      result[tag] = count;
+    }
+
+    return { counts: result };
+  },
+
   /**
    * Publish offers with tags
    */
@@ -669,7 +695,7 @@ const handlers: Record<string, RpcHandler> = {
 };
 
 // Methods that don't require authentication
-const UNAUTHENTICATED_METHODS = new Set(['discover']);
+const UNAUTHENTICATED_METHODS = new Set(['discover', 'countOffersByTags']);
 
 /**
  * Handle RPC batch request with header-based authentication

package/src/storage/d1.ts

@@ -508,6 +508,28 @@ export class D1Storage implements Storage {
     return result?.count ?? 0;
   }
 
+  async countOffersByTags(tags: string[]): Promise<Map<string, number>> {
+    const result = new Map<string, number>();
+    if (tags.length === 0) return result;
+
+    const now = Date.now();
+
+    // Query each tag individually using json_each
+    for (const tag of tags) {
+      const queryResult = await this.db.prepare(`
+        SELECT COUNT(DISTINCT o.id) as count
+        FROM offers o, json_each(o.tags) as t
+        WHERE t.value = ?
+          AND o.expires_at > ?
+          AND o.answerer_public_key IS NULL
+      `).bind(tag, now).first() as { count: number } | null;
+
+      result.set(tag, queryResult?.count ?? 0);
+    }
+
+    return result;
+  }
+
   // ===== Helper Methods =====
 
   private rowToOffer(row: any): Offer {

package/src/storage/memory.ts

@@ -445,6 +445,32 @@ export class MemoryStorage implements Storage {
     return candidates ? candidates.length : 0;
   }
 
+  async countOffersByTags(tags: string[]): Promise<Map<string, number>> {
+    const result = new Map<string, number>();
+    if (tags.length === 0) return result;
+
+    const now = Date.now();
+
+    for (const tag of tags) {
+      const offerIds = this.offersByTag.get(tag);
+      if (!offerIds) {
+        result.set(tag, 0);
+        continue;
+      }
+
+      let count = 0;
+      for (const offerId of offerIds) {
+        const offer = this.offers.get(offerId);
+        if (offer && offer.expiresAt > now && !offer.answererPublicKey) {
+          count++;
+        }
+      }
+      result.set(tag, count);
+    }
+
+    return result;
+  }
+
   // ===== Helper Methods =====
 
   private removeOfferFromIndexes(offer: Offer): void {

package/src/storage/mysql.ts

@@ -476,6 +476,28 @@ export class MySQLStorage implements Storage {
     return Number(rows[0].count);
   }
 
+  async countOffersByTags(tags: string[]): Promise<Map<string, number>> {
+    const result = new Map<string, number>();
+    if (tags.length === 0) return result;
+
+    const now = Date.now();
+
+    // Query each tag individually using JSON_CONTAINS
+    for (const tag of tags) {
+      const [rows] = await this.pool.query<RowDataPacket[]>(
+        `SELECT COUNT(DISTINCT id) as count
+         FROM offers
+         WHERE JSON_CONTAINS(tags, ?)
+           AND expires_at > ?
+           AND answerer_public_key IS NULL`,
+        [JSON.stringify(tag), now]
+      );
+      result.set(tag, Number(rows[0].count));
+    }
+
+    return result;
+  }
+
   // ===== Helper Methods =====
 
   private rowToOffer(row: RowDataPacket): Offer {

package/src/storage/postgres.ts

@@ -484,6 +484,28 @@ export class PostgreSQLStorage implements Storage {
     return Number(result.rows[0].count);
   }
 
+  async countOffersByTags(tags: string[]): Promise<Map<string, number>> {
+    const result = new Map<string, number>();
+    if (tags.length === 0) return result;
+
+    const now = Date.now();
+
+    // Query each tag individually using JSONB containment
+    for (const tag of tags) {
+      const queryResult = await this.pool.query(
+        `SELECT COUNT(DISTINCT id) as count
+         FROM offers
+         WHERE tags ? $1
+           AND expires_at > $2
+           AND answerer_public_key IS NULL`,
+        [tag, now]
+      );
+      result.set(tag, Number(queryResult.rows[0].count));
+    }
+
+    return result;
+  }
+
   // ===== Helper Methods =====
 
   private rowToOffer(row: any): Offer {

package/src/storage/sqlite.ts

@@ -543,6 +543,30 @@ export class SQLiteStorage implements Storage {
     return result.count;
   }
 
+  async countOffersByTags(tags: string[]): Promise<Map<string, number>> {
+    const result = new Map<string, number>();
+    if (tags.length === 0) return result;
+
+    const now = Date.now();
+
+    // Query counts for each tag individually for accuracy
+    // (an offer with multiple matching tags should only count once per tag)
+    const stmt = this.db.prepare(`
+      SELECT COUNT(DISTINCT o.id) as count
+      FROM offers o, json_each(o.tags) as t
+      WHERE t.value = ?
+        AND o.expires_at > ?
+        AND o.answerer_public_key IS NULL
+    `);
+
+    for (const tag of tags) {
+      const row = stmt.get(tag, now) as { count: number };
+      result.set(tag, row.count);
+    }
+
+    return result;
+  }
+
   // ===== Helper Methods =====
 
   /**

package/src/storage/types.ts

@@ -255,4 +255,11 @@ export interface Storage {
    * @returns ICE candidate count for offer
    */
   getIceCandidateCount(offerId: string): Promise<number>;
+
+  /**
+   * Counts available (unanswered, non-expired) offers for each of the given tags
+   * @param tags Array of tags to count offers for
+   * @returns Map of tag to offer count
+   */
+  countOffersByTags(tags: string[]): Promise<Map<string, number>>;
 }