@xtr-dev/rondevu-server 0.5.20 → 0.5.25

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

@@ -0,0 +1,59 @@
+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=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            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/dist/index.js

@@ -354,6 +354,38 @@ var init_memory = __esm({
         const candidates = this.iceCandidates.get(offerId);
         return candidates ? candidates.length : 0;
       }
+      async countOffersByTags(tags, unique = false) {
+        const result = /* @__PURE__ */ new Map();
+        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;
+          }
+          if (unique) {
+            const uniquePublicKeys = /* @__PURE__ */ new Set();
+            for (const offerId of offerIds) {
+              const offer = this.offers.get(offerId);
+              if (offer && offer.expiresAt > now && !offer.answererPublicKey) {
+                uniquePublicKeys.add(offer.publicKey);
+              }
+            }
+            result.set(tag, uniquePublicKeys.size);
+          } else {
+            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 =====
       removeOfferFromIndexes(offer) {
         const publicKeyOffers = this.offersByPublicKey.get(offer.publicKey);
@@ -793,6 +825,24 @@ var init_sqlite = __esm({
         const result = this.db.prepare("SELECT COUNT(*) as count FROM ice_candidates WHERE offer_id = ?").get(offerId);
         return result.count;
       }
+      async countOffersByTags(tags, unique = false) {
+        const result = /* @__PURE__ */ new Map();
+        if (tags.length === 0) return result;
+        const now = Date.now();
+        const countColumn = unique ? "COUNT(DISTINCT o.public_key)" : "COUNT(DISTINCT o.id)";
+        const stmt = this.db.prepare(`
+      SELECT ${countColumn} 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);
+          result.set(tag, row.count);
+        }
+        return result;
+      }
       // ===== Helper Methods =====
       /**
        * Helper method to convert database row to Offer object
@@ -1181,6 +1231,24 @@ var init_mysql = __esm({
         );
         return Number(rows[0].count);
       }
+      async countOffersByTags(tags, unique = false) {
+        const result = /* @__PURE__ */ new Map();
+        if (tags.length === 0) return result;
+        const now = Date.now();
+        for (const tag of tags) {
+          const countColumn = unique ? "COUNT(DISTINCT public_key)" : "COUNT(DISTINCT id)";
+          const [rows] = await this.pool.query(
+            `SELECT ${countColumn} 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 =====
       rowToOffer(row) {
         return {
@@ -1581,6 +1649,24 @@ var init_postgres = __esm({
         );
         return Number(result.rows[0].count);
       }
+      async countOffersByTags(tags, unique = false) {
+        const result = /* @__PURE__ */ new Map();
+        if (tags.length === 0) return result;
+        const now = Date.now();
+        for (const tag of tags) {
+          const countColumn = unique ? "COUNT(DISTINCT public_key)" : "COUNT(DISTINCT id)";
+          const queryResult = await this.pool.query(
+            `SELECT ${countColumn} 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 =====
       rowToOffer(row) {
         return {
@@ -2365,6 +2451,22 @@ var handlers = {
       expiresAt: offer.expiresAt
     };
   },
+  /**
+   * Count available offers by tags
+   */
+  async countOffersByTags(params, publicKey, timestamp, signature, storage, config, request) {
+    const { tags, unique } = params;
+    const tagsValidation = validateTags(tags);
+    if (!tagsValidation.valid) {
+      throw new RpcError(ErrorCodes.INVALID_TAG, tagsValidation.error || "Invalid tags");
+    }
+    const counts = await storage.countOffersByTags(tags, unique === true);
+    const result = {};
+    for (const [tag, count] of counts) {
+      result[tag] = count;
+    }
+    return { counts: result };
+  },
   /**
    * Publish offers with tags
    */
@@ -2661,7 +2763,7 @@ var handlers = {
     };
   }
 };
-var UNAUTHENTICATED_METHODS = /* @__PURE__ */ new Set(["discover"]);
+var UNAUTHENTICATED_METHODS = /* @__PURE__ */ new Set(["discover", "countOffersByTags"]);
 async function handleRpc(requests, ctx, storage, config) {
   const responses = [];
   const clientIp = ctx.req.header("cf-connecting-ip") || ctx.req.header("x-real-ip") || ctx.req.header("x-forwarded-for")?.split(",")[0].trim() || void 0;
@@ -2898,7 +3000,7 @@ function createApp(storage, config) {
 }
 
 // src/config.ts
-var BUILD_VERSION = true ? "aa71918" : "unknown";
+var BUILD_VERSION = true ? "33a7f9c" : "unknown";
 function loadConfig() {
   function parsePositiveInt(value, defaultValue, name, min = 1) {
     const parsed = parseInt(value || defaultValue, 10);
@@ -2948,8 +3050,8 @@ var CONFIG_DEFAULTS = {
   offerDefaultTtl: 6e4,
   offerMaxTtl: 864e5,
   offerMinTtl: 6e4,
-  answeredOfferTtl: 3e4,
-  // 30 seconds TTL after offer is answered
+  answeredOfferTtl: 6e4,
+  // 60 seconds TTL after offer is answered
   cleanupInterval: 6e4,
   maxOffersPerRequest: 100,
   maxBatchSize: 100,