mirror of
https://github.com/xtr-dev/rondevu-server.git
synced 2025-12-10 19:03:24 +00:00
Replace KV storage with D1, add peer_id field, simplify README
Storage changes: - Remove KV storage adapter - Add D1 storage adapter for Cloudflare Workers - Update schema to use peer_id instead of info field - Add database migrations for D1 Documentation: - Simplify README to be more concise - Update deployment instructions for D1 - Add D1_SETUP.md explaining migration from KV - Update DEPLOYMENT.md with D1 setup steps API changes: - Replace info field with peerId in session creation - Update all storage interfaces and implementations 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
24
src/app.ts
24
src/app.ts
@@ -67,8 +67,8 @@ export function createApp(storage: Storage, config: AppConfig) {
|
||||
return c.json({ error: 'Missing required parameter: topic' }, 400);
|
||||
}
|
||||
|
||||
if (topic.length > 256) {
|
||||
return c.json({ error: 'Topic string must be 256 characters or less' }, 400);
|
||||
if (topic.length > 1024) {
|
||||
return c.json({ error: 'Topic string must be 1024 characters or less' }, 400);
|
||||
}
|
||||
|
||||
const sessions = await storage.listSessionsByTopic(origin, topic);
|
||||
@@ -76,7 +76,7 @@ export function createApp(storage: Storage, config: AppConfig) {
|
||||
return c.json({
|
||||
sessions: sessions.map(s => ({
|
||||
code: s.code,
|
||||
info: s.info,
|
||||
peerId: s.peerId,
|
||||
offer: s.offer,
|
||||
offerCandidates: s.offerCandidates,
|
||||
createdAt: s.createdAt,
|
||||
@@ -92,29 +92,29 @@ export function createApp(storage: Storage, config: AppConfig) {
|
||||
/**
|
||||
* POST /:topic/offer
|
||||
* Creates a new offer and returns a unique session code
|
||||
* Body: { info: string, offer: string }
|
||||
* Body: { peerId: string, offer: string }
|
||||
*/
|
||||
app.post('/:topic/offer', async (c) => {
|
||||
try {
|
||||
const origin = c.req.header('Origin') || c.req.header('origin') || 'unknown';
|
||||
const topic = c.req.param('topic');
|
||||
const body = await c.req.json();
|
||||
const { info, offer } = body;
|
||||
const { peerId, offer, code: customCode } = body;
|
||||
|
||||
if (!topic || typeof topic !== 'string') {
|
||||
return c.json({ error: 'Missing or invalid required parameter: topic' }, 400);
|
||||
}
|
||||
|
||||
if (topic.length > 256) {
|
||||
return c.json({ error: 'Topic string must be 256 characters or less' }, 400);
|
||||
if (topic.length > 1024) {
|
||||
return c.json({ error: 'Topic string must be 1024 characters or less' }, 400);
|
||||
}
|
||||
|
||||
if (!info || typeof info !== 'string') {
|
||||
return c.json({ error: 'Missing or invalid required parameter: info' }, 400);
|
||||
if (!peerId || typeof peerId !== 'string') {
|
||||
return c.json({ error: 'Missing or invalid required parameter: peerId' }, 400);
|
||||
}
|
||||
|
||||
if (info.length > 1024) {
|
||||
return c.json({ error: 'Info string must be 1024 characters or less' }, 400);
|
||||
if (peerId.length > 1024) {
|
||||
return c.json({ error: 'PeerId string must be 1024 characters or less' }, 400);
|
||||
}
|
||||
|
||||
if (!offer || typeof offer !== 'string') {
|
||||
@@ -122,7 +122,7 @@ export function createApp(storage: Storage, config: AppConfig) {
|
||||
}
|
||||
|
||||
const expiresAt = Date.now() + config.sessionTimeout;
|
||||
const code = await storage.createSession(origin, topic, info, offer, expiresAt);
|
||||
const code = await storage.createSession(origin, topic, peerId, offer, expiresAt, customCode);
|
||||
|
||||
return c.json({ code }, 200);
|
||||
} catch (err) {
|
||||
|
||||
286
src/storage/d1.ts
Normal file
286
src/storage/d1.ts
Normal file
@@ -0,0 +1,286 @@
|
||||
import { Storage, Session } from './types.ts';
|
||||
|
||||
// Generate a UUID v4
|
||||
function generateUUID(): string {
|
||||
return crypto.randomUUID();
|
||||
}
|
||||
|
||||
/**
|
||||
* D1 storage adapter for session management using Cloudflare D1
|
||||
*/
|
||||
export class D1Storage implements Storage {
|
||||
private db: D1Database;
|
||||
|
||||
/**
|
||||
* Creates a new D1 storage instance
|
||||
* @param db D1Database instance from Cloudflare Workers environment
|
||||
*/
|
||||
constructor(db: D1Database) {
|
||||
this.db = db;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initializes database schema
|
||||
* This should be run once during setup, not on every request
|
||||
*/
|
||||
async initializeDatabase(): Promise<void> {
|
||||
await this.db.exec(`
|
||||
CREATE TABLE IF NOT EXISTS sessions (
|
||||
code TEXT PRIMARY KEY,
|
||||
origin TEXT NOT NULL,
|
||||
topic TEXT NOT NULL,
|
||||
peer_id TEXT NOT NULL CHECK(length(peer_id) <= 1024),
|
||||
offer TEXT NOT NULL,
|
||||
answer TEXT,
|
||||
offer_candidates TEXT NOT NULL DEFAULT '[]',
|
||||
answer_candidates TEXT NOT NULL DEFAULT '[]',
|
||||
created_at INTEGER NOT NULL,
|
||||
expires_at INTEGER NOT NULL
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_expires_at ON sessions(expires_at);
|
||||
CREATE INDEX IF NOT EXISTS idx_origin_topic ON sessions(origin, topic);
|
||||
CREATE INDEX IF NOT EXISTS idx_origin_topic_expires ON sessions(origin, topic, expires_at);
|
||||
`);
|
||||
}
|
||||
|
||||
async listTopics(origin: string, page: number = 1, limit: number = 100): Promise<{
|
||||
topics: Array<{ topic: string; count: number }>;
|
||||
pagination: {
|
||||
page: number;
|
||||
limit: number;
|
||||
total: number;
|
||||
hasMore: boolean;
|
||||
};
|
||||
}> {
|
||||
// Clamp limit to maximum of 1000
|
||||
const effectiveLimit = Math.min(limit, 1000);
|
||||
const offset = (page - 1) * effectiveLimit;
|
||||
|
||||
try {
|
||||
// Get total count of topics for this origin
|
||||
const countResult = await this.db.prepare(`
|
||||
SELECT COUNT(DISTINCT topic) as total
|
||||
FROM sessions
|
||||
WHERE origin = ? AND expires_at > ? AND answer IS NULL
|
||||
`).bind(origin, Date.now()).first();
|
||||
|
||||
const total = countResult ? Number(countResult.total) : 0;
|
||||
|
||||
// Get paginated topics
|
||||
const result = await this.db.prepare(`
|
||||
SELECT topic, COUNT(*) as count
|
||||
FROM sessions
|
||||
WHERE origin = ? AND expires_at > ? AND answer IS NULL
|
||||
GROUP BY topic
|
||||
ORDER BY topic ASC
|
||||
LIMIT ? OFFSET ?
|
||||
`).bind(origin, Date.now(), effectiveLimit, offset).all();
|
||||
|
||||
// D1 returns results in the results array, or empty array if no results
|
||||
if (!result.results) {
|
||||
console.error('[D1] listTopics: No results property in response:', result);
|
||||
return {
|
||||
topics: [],
|
||||
pagination: {
|
||||
page,
|
||||
limit: effectiveLimit,
|
||||
total: 0,
|
||||
hasMore: false,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
const topics = result.results.map((row: any) => ({
|
||||
topic: row.topic,
|
||||
count: Number(row.count),
|
||||
}));
|
||||
|
||||
return {
|
||||
topics,
|
||||
pagination: {
|
||||
page,
|
||||
limit: effectiveLimit,
|
||||
total,
|
||||
hasMore: offset + topics.length < total,
|
||||
},
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('[D1] listTopics error:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async listSessionsByTopic(origin: string, topic: string): Promise<Session[]> {
|
||||
try {
|
||||
const result = await this.db.prepare(`
|
||||
SELECT * FROM sessions
|
||||
WHERE origin = ? AND topic = ? AND expires_at > ? AND answer IS NULL
|
||||
ORDER BY created_at DESC
|
||||
`).bind(origin, topic, Date.now()).all();
|
||||
|
||||
if (!result.results) {
|
||||
console.error('[D1] listSessionsByTopic: No results property in response:', result);
|
||||
return [];
|
||||
}
|
||||
|
||||
return result.results.map((row: any) => ({
|
||||
code: row.code,
|
||||
origin: row.origin,
|
||||
topic: row.topic,
|
||||
peerId: row.peer_id,
|
||||
offer: row.offer,
|
||||
answer: row.answer || undefined,
|
||||
offerCandidates: JSON.parse(row.offer_candidates),
|
||||
answerCandidates: JSON.parse(row.answer_candidates),
|
||||
createdAt: row.created_at,
|
||||
expiresAt: row.expires_at,
|
||||
}));
|
||||
} catch (error) {
|
||||
console.error('[D1] listSessionsByTopic error:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async createSession(
|
||||
origin: string,
|
||||
topic: string,
|
||||
peerId: string,
|
||||
offer: string,
|
||||
expiresAt: number,
|
||||
customCode?: string
|
||||
): Promise<string> {
|
||||
let code: string;
|
||||
let attempts = 0;
|
||||
const maxAttempts = 10;
|
||||
|
||||
// Generate unique code or use custom
|
||||
do {
|
||||
code = customCode || generateUUID();
|
||||
attempts++;
|
||||
|
||||
if (attempts > maxAttempts) {
|
||||
throw new Error('Failed to generate unique session code');
|
||||
}
|
||||
|
||||
try {
|
||||
await this.db.prepare(`
|
||||
INSERT INTO sessions (code, origin, topic, peer_id, offer, created_at, expires_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||
`).bind(code, origin, topic, peerId, offer, Date.now(), expiresAt).run();
|
||||
|
||||
break;
|
||||
} catch (err: any) {
|
||||
// If unique constraint failed with custom code, throw error
|
||||
if (err.message?.includes('UNIQUE constraint failed')) {
|
||||
if (customCode) {
|
||||
throw new Error(`Session code '${customCode}' already exists`);
|
||||
}
|
||||
// Try again with new generated code
|
||||
continue;
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
} while (true);
|
||||
|
||||
return code;
|
||||
}
|
||||
|
||||
async getSession(code: string, origin: string): Promise<Session | null> {
|
||||
try {
|
||||
const result = await this.db.prepare(`
|
||||
SELECT * FROM sessions
|
||||
WHERE code = ? AND origin = ? AND expires_at > ?
|
||||
`).bind(code, origin, Date.now()).first();
|
||||
|
||||
if (!result) {
|
||||
return null;
|
||||
}
|
||||
|
||||
const row: any = result;
|
||||
|
||||
return {
|
||||
code: row.code,
|
||||
origin: row.origin,
|
||||
topic: row.topic,
|
||||
peerId: row.peer_id,
|
||||
offer: row.offer,
|
||||
answer: row.answer || undefined,
|
||||
offerCandidates: JSON.parse(row.offer_candidates || '[]'),
|
||||
answerCandidates: JSON.parse(row.answer_candidates || '[]'),
|
||||
createdAt: row.created_at,
|
||||
expiresAt: row.expires_at,
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('[D1] getSession error:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
async updateSession(code: string, origin: string, update: Partial<Session>): Promise<void> {
|
||||
// Verify session exists and origin matches
|
||||
const current = await this.getSession(code, origin);
|
||||
|
||||
if (!current) {
|
||||
throw new Error('Session not found or origin mismatch');
|
||||
}
|
||||
|
||||
// Build update query dynamically based on what fields are being updated
|
||||
const updates: string[] = [];
|
||||
const values: any[] = [];
|
||||
|
||||
if (update.answer !== undefined) {
|
||||
updates.push('answer = ?');
|
||||
values.push(update.answer);
|
||||
}
|
||||
|
||||
if (update.offerCandidates !== undefined) {
|
||||
updates.push('offer_candidates = ?');
|
||||
values.push(JSON.stringify(update.offerCandidates));
|
||||
}
|
||||
|
||||
if (update.answerCandidates !== undefined) {
|
||||
updates.push('answer_candidates = ?');
|
||||
values.push(JSON.stringify(update.answerCandidates));
|
||||
}
|
||||
|
||||
if (updates.length === 0) {
|
||||
return; // Nothing to update
|
||||
}
|
||||
|
||||
// Add WHERE clause values
|
||||
values.push(code, origin);
|
||||
|
||||
// D1 provides strong consistency, so this update is atomic and immediately visible
|
||||
const query = `
|
||||
UPDATE sessions
|
||||
SET ${updates.join(', ')}
|
||||
WHERE code = ? AND origin = ?
|
||||
`;
|
||||
|
||||
await this.db.prepare(query).bind(...values).run();
|
||||
}
|
||||
|
||||
async deleteSession(code: string): Promise<void> {
|
||||
await this.db.prepare(`
|
||||
DELETE FROM sessions WHERE code = ?
|
||||
`).bind(code).run();
|
||||
}
|
||||
|
||||
async cleanupExpiredSessions(): Promise<number> {
|
||||
const result = await this.db.prepare(`
|
||||
DELETE FROM sessions WHERE expires_at <= ?
|
||||
`).bind(Date.now()).run();
|
||||
|
||||
return result.meta.changes || 0;
|
||||
}
|
||||
|
||||
async cleanup(): Promise<void> {
|
||||
await this.cleanupExpiredSessions();
|
||||
}
|
||||
|
||||
async close(): Promise<void> {
|
||||
// D1 doesn't require explicit connection closing
|
||||
// Connections are managed by the Cloudflare Workers runtime
|
||||
}
|
||||
}
|
||||
@@ -1,241 +0,0 @@
|
||||
import { Storage, Session } from './types.ts';
|
||||
|
||||
/**
|
||||
* Cloudflare KV storage adapter for session management
|
||||
*/
|
||||
export class KVStorage implements Storage {
|
||||
private kv: KVNamespace;
|
||||
|
||||
/**
|
||||
* Creates a new KV storage instance
|
||||
* @param kv Cloudflare KV namespace binding
|
||||
*/
|
||||
constructor(kv: KVNamespace) {
|
||||
this.kv = kv;
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates a unique code using Web Crypto API
|
||||
*/
|
||||
private generateCode(): string {
|
||||
return crypto.randomUUID();
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the key for storing a session
|
||||
*/
|
||||
private sessionKey(code: string): string {
|
||||
return `session:${code}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the key for the topic index
|
||||
*/
|
||||
private topicIndexKey(origin: string, topic: string): string {
|
||||
return `index:${origin}:${topic}`;
|
||||
}
|
||||
|
||||
async createSession(origin: string, topic: string, info: string, offer: string, expiresAt: number): Promise<string> {
|
||||
// Validate info length
|
||||
if (info.length > 1024) {
|
||||
throw new Error('Info string must be 1024 characters or less');
|
||||
}
|
||||
|
||||
const code = this.generateCode();
|
||||
const createdAt = Date.now();
|
||||
|
||||
const session: Session = {
|
||||
code,
|
||||
origin,
|
||||
topic,
|
||||
info,
|
||||
offer,
|
||||
answer: undefined,
|
||||
offerCandidates: [],
|
||||
answerCandidates: [],
|
||||
createdAt,
|
||||
expiresAt,
|
||||
};
|
||||
|
||||
// Calculate TTL in seconds for KV
|
||||
const ttl = Math.max(60, Math.floor((expiresAt - createdAt) / 1000));
|
||||
|
||||
// Store the session
|
||||
await this.kv.put(
|
||||
this.sessionKey(code),
|
||||
JSON.stringify(session),
|
||||
{ expirationTtl: ttl }
|
||||
);
|
||||
|
||||
// Update the topic index
|
||||
const indexKey = this.topicIndexKey(origin, topic);
|
||||
const existingIndex = await this.kv.get(indexKey, 'json') as string[] | null;
|
||||
const updatedIndex = existingIndex ? [...existingIndex, code] : [code];
|
||||
|
||||
// Set index TTL to slightly longer than session TTL to avoid race conditions
|
||||
await this.kv.put(
|
||||
indexKey,
|
||||
JSON.stringify(updatedIndex),
|
||||
{ expirationTtl: ttl + 300 }
|
||||
);
|
||||
|
||||
return code;
|
||||
}
|
||||
|
||||
async listSessionsByTopic(origin: string, topic: string): Promise<Session[]> {
|
||||
const indexKey = this.topicIndexKey(origin, topic);
|
||||
const codes = await this.kv.get(indexKey, 'json') as string[] | null;
|
||||
|
||||
if (!codes || codes.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// Fetch all sessions in parallel
|
||||
const sessionPromises = codes.map(async (code) => {
|
||||
const sessionData = await this.kv.get(this.sessionKey(code), 'json') as Session | null;
|
||||
return sessionData;
|
||||
});
|
||||
|
||||
const sessions = await Promise.all(sessionPromises);
|
||||
|
||||
// Filter out expired or answered sessions, and null values
|
||||
const now = Date.now();
|
||||
const validSessions = sessions.filter(
|
||||
(session): session is Session =>
|
||||
session !== null &&
|
||||
session.expiresAt > now &&
|
||||
session.answer === undefined
|
||||
);
|
||||
|
||||
// Sort by creation time (newest first)
|
||||
return validSessions.sort((a, b) => b.createdAt - a.createdAt);
|
||||
}
|
||||
|
||||
async listTopics(origin: string, page: number, limit: number): Promise<{
|
||||
topics: Array<{ topic: string; count: number }>;
|
||||
pagination: {
|
||||
page: number;
|
||||
limit: number;
|
||||
total: number;
|
||||
hasMore: boolean;
|
||||
};
|
||||
}> {
|
||||
// Ensure limit doesn't exceed 1000
|
||||
const safeLimit = Math.min(Math.max(1, limit), 1000);
|
||||
const safePage = Math.max(1, page);
|
||||
|
||||
const prefix = `index:${origin}:`;
|
||||
const topicCounts = new Map<string, number>();
|
||||
|
||||
// List all index keys for this origin
|
||||
const list = await this.kv.list({ prefix });
|
||||
|
||||
// Process each topic index
|
||||
for (const key of list.keys) {
|
||||
// Extract topic from key: "index:{origin}:{topic}"
|
||||
const topic = key.name.substring(prefix.length);
|
||||
|
||||
// Get the session codes for this topic
|
||||
const codes = await this.kv.get(key.name, 'json') as string[] | null;
|
||||
|
||||
if (!codes || codes.length === 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Fetch sessions to count only valid ones (unexpired and unanswered)
|
||||
const sessionPromises = codes.map(async (code) => {
|
||||
const sessionData = await this.kv.get(this.sessionKey(code), 'json') as Session | null;
|
||||
return sessionData;
|
||||
});
|
||||
|
||||
const sessions = await Promise.all(sessionPromises);
|
||||
|
||||
// Count valid sessions
|
||||
const now = Date.now();
|
||||
const validCount = sessions.filter(
|
||||
(session) =>
|
||||
session !== null &&
|
||||
session.expiresAt > now &&
|
||||
session.answer === undefined
|
||||
).length;
|
||||
|
||||
if (validCount > 0) {
|
||||
topicCounts.set(topic, validCount);
|
||||
}
|
||||
}
|
||||
|
||||
// Convert to array and sort by topic name
|
||||
const allTopics = Array.from(topicCounts.entries())
|
||||
.map(([topic, count]) => ({ topic, count }))
|
||||
.sort((a, b) => a.topic.localeCompare(b.topic));
|
||||
|
||||
// Apply pagination
|
||||
const total = allTopics.length;
|
||||
const offset = (safePage - 1) * safeLimit;
|
||||
const topics = allTopics.slice(offset, offset + safeLimit);
|
||||
|
||||
return {
|
||||
topics,
|
||||
pagination: {
|
||||
page: safePage,
|
||||
limit: safeLimit,
|
||||
total,
|
||||
hasMore: offset + topics.length < total,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
async getSession(code: string, origin: string): Promise<Session | null> {
|
||||
const sessionData = await this.kv.get(this.sessionKey(code), 'json') as Session | null;
|
||||
|
||||
if (!sessionData) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// Validate origin and expiration
|
||||
if (sessionData.origin !== origin || sessionData.expiresAt <= Date.now()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return sessionData;
|
||||
}
|
||||
|
||||
async updateSession(code: string, origin: string, update: Partial<Session>): Promise<void> {
|
||||
const current = await this.getSession(code, origin);
|
||||
|
||||
if (!current) {
|
||||
throw new Error('Session not found or origin mismatch');
|
||||
}
|
||||
|
||||
// Merge updates
|
||||
const updated: Session = {
|
||||
...current,
|
||||
...(update.answer !== undefined && { answer: update.answer }),
|
||||
...(update.offerCandidates !== undefined && { offerCandidates: update.offerCandidates }),
|
||||
...(update.answerCandidates !== undefined && { answerCandidates: update.answerCandidates }),
|
||||
};
|
||||
|
||||
// Calculate remaining TTL
|
||||
const ttl = Math.max(60, Math.floor((updated.expiresAt - Date.now()) / 1000));
|
||||
|
||||
// Update the session
|
||||
await this.kv.put(
|
||||
this.sessionKey(code),
|
||||
JSON.stringify(updated),
|
||||
{ expirationTtl: ttl }
|
||||
);
|
||||
}
|
||||
|
||||
async deleteSession(code: string): Promise<void> {
|
||||
await this.kv.delete(this.sessionKey(code));
|
||||
}
|
||||
|
||||
async cleanup(): Promise<void> {
|
||||
// KV automatically expires keys based on TTL
|
||||
// No manual cleanup needed
|
||||
}
|
||||
|
||||
async close(): Promise<void> {
|
||||
// No connection to close for KV
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@ export class SQLiteStorage implements Storage {
|
||||
code TEXT PRIMARY KEY,
|
||||
origin TEXT NOT NULL,
|
||||
topic TEXT NOT NULL,
|
||||
info TEXT NOT NULL CHECK(length(info) <= 1024),
|
||||
peer_id TEXT NOT NULL CHECK(length(peer_id) <= 1024),
|
||||
offer TEXT NOT NULL,
|
||||
answer TEXT,
|
||||
offer_candidates TEXT NOT NULL DEFAULT '[]',
|
||||
@@ -62,19 +62,19 @@ export class SQLiteStorage implements Storage {
|
||||
return randomUUID();
|
||||
}
|
||||
|
||||
async createSession(origin: string, topic: string, info: string, offer: string, expiresAt: number): Promise<string> {
|
||||
// Validate info length
|
||||
if (info.length > 1024) {
|
||||
throw new Error('Info string must be 1024 characters or less');
|
||||
async createSession(origin: string, topic: string, peerId: string, offer: string, expiresAt: number, customCode?: string): Promise<string> {
|
||||
// Validate peerId length
|
||||
if (peerId.length > 1024) {
|
||||
throw new Error('PeerId string must be 1024 characters or less');
|
||||
}
|
||||
|
||||
let code: string;
|
||||
let attempts = 0;
|
||||
const maxAttempts = 10;
|
||||
|
||||
// Try to generate a unique code
|
||||
// Try to generate or use custom code
|
||||
do {
|
||||
code = this.generateCode();
|
||||
code = customCode || this.generateCode();
|
||||
attempts++;
|
||||
|
||||
if (attempts > maxAttempts) {
|
||||
@@ -83,15 +83,19 @@ export class SQLiteStorage implements Storage {
|
||||
|
||||
try {
|
||||
const stmt = this.db.prepare(`
|
||||
INSERT INTO sessions (code, origin, topic, info, offer, created_at, expires_at)
|
||||
INSERT INTO sessions (code, origin, topic, peer_id, offer, created_at, expires_at)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?)
|
||||
`);
|
||||
|
||||
stmt.run(code, origin, topic, info, offer, Date.now(), expiresAt);
|
||||
stmt.run(code, origin, topic, peerId, offer, Date.now(), expiresAt);
|
||||
break;
|
||||
} catch (err: any) {
|
||||
// If unique constraint failed, try again
|
||||
// If unique constraint failed with custom code, throw error
|
||||
if (err.code === 'SQLITE_CONSTRAINT_PRIMARYKEY') {
|
||||
if (customCode) {
|
||||
throw new Error(`Session code '${customCode}' already exists`);
|
||||
}
|
||||
// Try again with new generated code
|
||||
continue;
|
||||
}
|
||||
throw err;
|
||||
@@ -114,7 +118,7 @@ export class SQLiteStorage implements Storage {
|
||||
code: row.code,
|
||||
origin: row.origin,
|
||||
topic: row.topic,
|
||||
info: row.info,
|
||||
peerId: row.peer_id,
|
||||
offer: row.offer,
|
||||
answer: row.answer || undefined,
|
||||
offerCandidates: JSON.parse(row.offer_candidates),
|
||||
@@ -189,7 +193,7 @@ export class SQLiteStorage implements Storage {
|
||||
code: row.code,
|
||||
origin: row.origin,
|
||||
topic: row.topic,
|
||||
info: row.info,
|
||||
peerId: row.peer_id,
|
||||
offer: row.offer,
|
||||
answer: row.answer || undefined,
|
||||
offerCandidates: JSON.parse(row.offer_candidates),
|
||||
|
||||
@@ -5,7 +5,7 @@ export interface Session {
|
||||
code: string;
|
||||
origin: string;
|
||||
topic: string;
|
||||
info: string;
|
||||
peerId: string;
|
||||
offer: string;
|
||||
answer?: string;
|
||||
offerCandidates: string[];
|
||||
@@ -23,12 +23,13 @@ export interface Storage {
|
||||
* Creates a new session with the given offer
|
||||
* @param origin The Origin header from the request
|
||||
* @param topic The topic to post the offer to
|
||||
* @param info User info string (max 1024 chars)
|
||||
* @param peerId Peer identifier string (max 1024 chars)
|
||||
* @param offer The WebRTC SDP offer message
|
||||
* @param expiresAt Unix timestamp when the session should expire
|
||||
* @param customCode Optional custom code (if not provided, generates UUID)
|
||||
* @returns The unique session code
|
||||
*/
|
||||
createSession(origin: string, topic: string, info: string, offer: string, expiresAt: number): Promise<string>;
|
||||
createSession(origin: string, topic: string, peerId: string, offer: string, expiresAt: number, customCode?: string): Promise<string>;
|
||||
|
||||
/**
|
||||
* Lists all unanswered sessions for a given origin and topic
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
import { createApp } from './app.ts';
|
||||
import { KVStorage } from './storage/kv.ts';
|
||||
import { D1Storage } from './storage/d1.ts';
|
||||
|
||||
/**
|
||||
* Cloudflare Workers environment bindings
|
||||
*/
|
||||
export interface Env {
|
||||
SESSIONS: KVNamespace;
|
||||
DB: D1Database;
|
||||
SESSION_TIMEOUT?: string;
|
||||
CORS_ORIGINS?: string;
|
||||
}
|
||||
@@ -15,8 +15,8 @@ export interface Env {
|
||||
*/
|
||||
export default {
|
||||
async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
|
||||
// Initialize KV storage
|
||||
const storage = new KVStorage(env.SESSIONS);
|
||||
// Initialize D1 storage
|
||||
const storage = new D1Storage(env.DB);
|
||||
|
||||
// Parse configuration
|
||||
const sessionTimeout = env.SESSION_TIMEOUT
|
||||
|
||||
Reference in New Issue
Block a user