Compare commits
4 Commits
group-8067
...
343a55a673
| Author | SHA1 | Date | |
|---|---|---|---|
| 343a55a673 | |||
| a76f00a08a | |||
| 1d773dcb07 | |||
| 812098a6bb |
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
node_modules/
|
||||
279
README.md
279
README.md
@@ -1,280 +1 @@
|
||||
|
||||
# P2P Poll App
|
||||
|
||||
A peer-to-peer polling application built with React, TypeScript, Tailwind CSS, Node.js, Yjs, and WebSocket for real-time collaborative voting.
|
||||
|
||||
**Users can create polls, add answers, and vote in real-time with automatic P2P synchronization across all connected clients.**
|
||||
|
||||
## Architecture
|
||||
|
||||
**Hybrid P2P Approach:**
|
||||
- Backend serves as both a Yjs WebSocket provider (for state synchronization) and signaling server (for WebRTC peer discovery)
|
||||
- Clients sync poll data via Yjs CRDT for conflict-free merging
|
||||
- Direct P2P connections via WebRTC for real-time updates when possible
|
||||
- Server fallback ensures reliability when P2P fails
|
||||
|
||||
## Tech Stack
|
||||
|
||||
**Backend:**
|
||||
- Node.js + TypeScript
|
||||
- Express.js
|
||||
- WebSocket (ws)
|
||||
- y-websocket (Yjs WebSocket provider)
|
||||
- CORS support
|
||||
|
||||
**Frontend:**
|
||||
- React 18 + TypeScript
|
||||
- Vite (build tool)
|
||||
- Tailwind CSS
|
||||
- Yjs (CRDT library)
|
||||
- y-websocket (server sync)
|
||||
- y-webrtc (P2P sync)
|
||||
- lucide-react (icons)
|
||||
|
||||
## Project Structure
|
||||
|
||||
```
|
||||
quicgroup/
|
||||
├── server/ # Backend Node.js server
|
||||
│ ├── src/
|
||||
│ │ ├── index.ts # Main server entry
|
||||
│ │ ├── yjs-server.ts # Yjs WebSocket provider
|
||||
│ │ ├── signaling-server.ts # WebRTC signaling
|
||||
│ │ ├── types/ # TypeScript types
|
||||
│ │ └── utils/ # Utilities
|
||||
│ ├── package.json
|
||||
│ └── tsconfig.json
|
||||
│
|
||||
└── frontend/ # React frontend
|
||||
├── src/
|
||||
│ ├── components/ # React components
|
||||
│ ├── hooks/ # Custom React hooks
|
||||
│ ├── lib/ # Yjs setup and utilities
|
||||
│ ├── types/ # TypeScript types
|
||||
│ └── styles/ # CSS styles
|
||||
├── package.json
|
||||
└── vite.config.ts
|
||||
```
|
||||
|
||||
## Setup Instructions
|
||||
|
||||
### Prerequisites
|
||||
- Node.js 18+ and npm
|
||||
|
||||
### Backend Setup
|
||||
|
||||
1. Navigate to server directory:
|
||||
```bash
|
||||
cd server
|
||||
```
|
||||
|
||||
2. Install dependencies:
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
3. Copy environment file:
|
||||
```bash
|
||||
cp .env.example .env
|
||||
```
|
||||
|
||||
4. Start the development server:
|
||||
```bash
|
||||
npm run dev
|
||||
```
|
||||
|
||||
The server will run on `http://localhost:3000` with:
|
||||
- Yjs WebSocket: `ws://localhost:3000/yjs`
|
||||
- Signaling WebSocket: `ws://localhost:3000/signal`
|
||||
|
||||
### Frontend Setup
|
||||
|
||||
1. Navigate to frontend directory:
|
||||
```bash
|
||||
cd frontend
|
||||
```
|
||||
|
||||
2. Install dependencies:
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
3. Copy environment file (optional):
|
||||
```bash
|
||||
cp .env.example .env
|
||||
```
|
||||
|
||||
4. Start the development server:
|
||||
```bash
|
||||
npm run dev
|
||||
```
|
||||
|
||||
The frontend will run on `http://localhost:5173`
|
||||
|
||||
## Running the Application
|
||||
|
||||
1. **Start Backend** (Terminal 1):
|
||||
```bash
|
||||
cd server
|
||||
npm run dev
|
||||
```
|
||||
|
||||
2. **Start Frontend** (Terminal 2):
|
||||
```bash
|
||||
cd frontend
|
||||
npm run dev
|
||||
```
|
||||
|
||||
3. **Open Browser:**
|
||||
- Navigate to `http://localhost:5173`
|
||||
- Open multiple tabs/windows to test P2P synchronization
|
||||
|
||||
## Features
|
||||
|
||||
### Dynamic Poll Creation
|
||||
- **Create Polls** - Any user can create new polls with custom questions
|
||||
- **Add Answers** - Anyone can add answer options to any poll
|
||||
- **Real-time Voting** - Vote on options with instant updates across all clients
|
||||
- **Smart Vote Tracking** - One vote per user per option (prevents duplicate voting)
|
||||
- **Visual Feedback** - Green border and " Voted" indicator on voted options
|
||||
- **User Attribution** - See who created each poll and option
|
||||
- **Live Vote Counts** - See vote percentages and counts update in real-time
|
||||
- **P2P Synchronization** - Uses Yjs CRDT for conflict-free state merging
|
||||
- **Connection Status** - Visual indicator showing WebSocket and peer connections
|
||||
- **Hybrid Architecture** - Combines WebSocket server sync with WebRTC P2P
|
||||
- **Beautiful UI** - Modern gradient design with Tailwind CSS
|
||||
|
||||
## How to Use
|
||||
|
||||
### Create a Poll
|
||||
1. Enter your question in the "Create a New Poll" form at the top
|
||||
2. Click "Create Poll"
|
||||
3. Your poll appears instantly for all connected users
|
||||
|
||||
### Add Answer Options
|
||||
1. Find the poll you want to add an answer to
|
||||
2. Type your answer in the "Add a new option..." field
|
||||
3. Click "Add"
|
||||
4. Your answer appears instantly for all users
|
||||
|
||||
### Vote on Options
|
||||
1. Click the vote button (thumbs up icon) on any option
|
||||
2. You can only vote once per option
|
||||
3. Voted options show a green border and " Voted" indicator
|
||||
4. Vote counts update in real-time across all clients
|
||||
|
||||
### Multi-User Testing
|
||||
1. Open multiple browser tabs/windows
|
||||
2. Create polls from different tabs
|
||||
3. Add answers from different tabs
|
||||
4. Vote from different tabs
|
||||
5. Watch real-time synchronization in action!
|
||||
|
||||
## How It Works
|
||||
|
||||
### CRDT Synchronization
|
||||
The app uses Yjs (a CRDT library) to ensure all clients converge to the same state without conflicts:
|
||||
- Each client maintains a local Yjs document
|
||||
- Changes are automatically synced via WebSocket to the server
|
||||
- WebRTC provides direct P2P connections between clients
|
||||
- Yjs handles merge conflicts automatically
|
||||
- One vote per user per option is enforced via `votedBy` tracking
|
||||
|
||||
## Data Model
|
||||
```typescript
|
||||
{
|
||||
polls: Array<{
|
||||
id: string,
|
||||
question: string,
|
||||
createdBy: string,
|
||||
timestamp: number,
|
||||
options: Array<{
|
||||
id: string,
|
||||
text: string,
|
||||
votes: number,
|
||||
votedBy: string[], // Tracks which users have voted
|
||||
createdBy: string,
|
||||
timestamp: number
|
||||
}>
|
||||
}>
|
||||
}
|
||||
```
|
||||
|
||||
## Testing P2P Functionality
|
||||
|
||||
1. Open the app in multiple browser tabs/windows
|
||||
2. **Create polls** from different tabs - they appear everywhere instantly
|
||||
3. **Add answer options** from different tabs to the same poll
|
||||
4. **Vote** from different tabs - watch vote counts update in real-time
|
||||
5. Try voting twice on the same option - it won't let you!
|
||||
6. Check the connection status indicator for peer count
|
||||
7. Verify visual feedback (green border) on options you've voted on
|
||||
|
||||
## Development
|
||||
|
||||
### Backend Scripts
|
||||
- `npm run dev` - Start development server with hot reload
|
||||
- `npm run build` - Build for production
|
||||
- `npm start` - Run production build
|
||||
|
||||
### Frontend Scripts
|
||||
- `npm run dev` - Start Vite dev server
|
||||
- `npm run build` - Build for production
|
||||
- `npm run preview` - Preview production build
|
||||
|
||||
## Environment Variables
|
||||
|
||||
### Backend (.env)
|
||||
```
|
||||
PORT=3000
|
||||
YJS_WS_PORT=1234
|
||||
NODE_ENV=development
|
||||
CORS_ORIGIN=http://localhost:5173
|
||||
```
|
||||
|
||||
### Frontend (.env)
|
||||
```
|
||||
VITE_WS_URL=ws://localhost:3000
|
||||
```
|
||||
|
||||
## Components
|
||||
|
||||
### Frontend Components
|
||||
- **PollView** - Main view showing all polls and create poll form
|
||||
- **CreatePoll** - Form to create new polls
|
||||
- **PollCard** - Individual poll display with metadata
|
||||
- **OptionList** - List of answer options with vote tracking
|
||||
- **AddOption** - Form to add new answer options
|
||||
- **VoteButton** - Vote button with disabled state for voted options
|
||||
- **ConnectionStatus** - Shows WebSocket and P2P connection status
|
||||
|
||||
### Key Functions
|
||||
- `createPoll(question)` - Create a new poll
|
||||
- `addOption(pollId, text)` - Add an option to a specific poll
|
||||
- `vote(pollId, optionId)` - Vote on an option (one vote per user)
|
||||
- `hasVoted(option)` - Check if current user has voted on an option
|
||||
|
||||
## User Tracking
|
||||
|
||||
Each user gets a unique ID stored in localStorage:
|
||||
- Format: `user-xxxxxxxxx`
|
||||
- Used to track poll/option creators
|
||||
- Used to prevent duplicate voting
|
||||
- Persists across browser sessions
|
||||
|
||||
## Future Enhancements
|
||||
|
||||
- [ ] Edit/delete polls and options
|
||||
- [ ] User nicknames instead of IDs
|
||||
- [ ] Poll expiration/closing
|
||||
- [ ] Vote history and analytics
|
||||
- [ ] Export poll results
|
||||
- [ ] Persistent storage (database)
|
||||
- [ ] Dark mode toggle
|
||||
- [ ] Mobile responsive improvements
|
||||
- [ ] Poll categories/tags
|
||||
- [ ] Search/filter polls
|
||||
|
||||
## License
|
||||
|
||||
MIT
|
||||
214
app.js
Normal file
214
app.js
Normal file
@@ -0,0 +1,214 @@
|
||||
import {
|
||||
Repo,
|
||||
BroadcastChannelNetworkAdapter,
|
||||
WebSocketClientAdapter,
|
||||
IndexedDBStorageAdapter,
|
||||
isValidAutomergeUrl,
|
||||
} from "@automerge/vanillajs";
|
||||
|
||||
const REPO = new Repo({
|
||||
network: [
|
||||
new BroadcastChannelNetworkAdapter(),
|
||||
new WebSocketClientAdapter("wss://sync.automerge.org"),
|
||||
],
|
||||
storage: new IndexedDBStorageAdapter(),
|
||||
});
|
||||
|
||||
let HANDLE;
|
||||
|
||||
function getVotedKey(docUrl) {
|
||||
return `p2p-poll-voted:${docUrl}`;
|
||||
}
|
||||
|
||||
function getVotedOptions() {
|
||||
const key = getVotedKey(document.location.hash);
|
||||
return new Set(JSON.parse(localStorage.getItem(key) || "[]"));
|
||||
}
|
||||
|
||||
function markVoted(opt) {
|
||||
const key = getVotedKey(document.location.hash);
|
||||
const voted = getVotedOptions();
|
||||
voted.add(opt);
|
||||
localStorage.setItem(key, JSON.stringify([...voted]));
|
||||
}
|
||||
|
||||
function unmarkVoted(opt) {
|
||||
const key = getVotedKey(document.location.hash);
|
||||
const voted = getVotedOptions();
|
||||
voted.delete(opt);
|
||||
localStorage.setItem(key, JSON.stringify([...voted]));
|
||||
}
|
||||
|
||||
const locationHash = document.location.hash.substring(1);
|
||||
const statusEl = document.getElementById("status");
|
||||
const optionsList = document.getElementById("options-list");
|
||||
const optionInput = document.getElementById("option-input");
|
||||
const addBtn = document.getElementById("add-btn");
|
||||
const duplicateMsg = document.getElementById("duplicate-msg");
|
||||
const copyBtn = document.getElementById("copy-btn");
|
||||
const timerEl = document.getElementById("timer");
|
||||
const startVotingBtn = document.getElementById("start-voting-btn");
|
||||
|
||||
if (isValidAutomergeUrl(locationHash)) {
|
||||
statusEl.textContent = "Loading document…";
|
||||
try {
|
||||
HANDLE = await REPO.find(locationHash);
|
||||
statusEl.textContent = "";
|
||||
} catch (err) {
|
||||
statusEl.textContent = "Could not load document. Starting a new one.";
|
||||
HANDLE = REPO.create({ options: [], votes: {}, deadline: null });
|
||||
document.location.hash = HANDLE.url;
|
||||
}
|
||||
} else {
|
||||
HANDLE = REPO.create({ options: [], votes: {}, deadline: null });
|
||||
document.location.hash = HANDLE.url;
|
||||
}
|
||||
|
||||
HANDLE.on("change", ({ doc }) => render(doc));
|
||||
|
||||
const initialDoc = HANDLE.doc();
|
||||
if (initialDoc) render(initialDoc);
|
||||
|
||||
let timerInterval = null;
|
||||
|
||||
function render(doc) {
|
||||
renderOptions(doc);
|
||||
renderTimer(doc);
|
||||
}
|
||||
|
||||
function renderOptions(doc) {
|
||||
const votes = doc.votes || {};
|
||||
const deadline = doc.deadline ?? null;
|
||||
const now = Date.now();
|
||||
const votingClosed = deadline !== null && now >= deadline;
|
||||
const votedOptions = getVotedOptions();
|
||||
|
||||
const sorted = [...(doc.options || [])].sort(
|
||||
(a, b) => (votes[b] || 0) - (votes[a] || 0),
|
||||
);
|
||||
|
||||
optionsList.innerHTML = "";
|
||||
sorted.forEach((opt) => {
|
||||
const count = votes[opt] || 0;
|
||||
const alreadyVoted = votedOptions.has(opt);
|
||||
|
||||
const item = document.createElement("div");
|
||||
item.className = "option-item";
|
||||
|
||||
const label = document.createElement("span");
|
||||
label.className = "option-label";
|
||||
label.textContent = opt;
|
||||
|
||||
const voteBtn = document.createElement("button");
|
||||
voteBtn.className = alreadyVoted ? "vote-btn voted" : "vote-btn";
|
||||
voteBtn.textContent = alreadyVoted ? `✓ ${count}` : `▲ ${count}`;
|
||||
voteBtn.disabled = votingClosed;
|
||||
if (votingClosed) voteBtn.title = "Voting is closed";
|
||||
else if (alreadyVoted) voteBtn.title = "Click to remove your vote";
|
||||
|
||||
voteBtn.addEventListener("click", () => {
|
||||
if (alreadyVoted) {
|
||||
unmarkVoted(opt);
|
||||
HANDLE.change((d) => {
|
||||
if (!d.votes) d.votes = {};
|
||||
d.votes[opt] = Math.max(0, (d.votes[opt] || 0) - 1);
|
||||
});
|
||||
} else {
|
||||
markVoted(opt);
|
||||
HANDLE.change((d) => {
|
||||
if (!d.votes) d.votes = {};
|
||||
d.votes[opt] = (d.votes[opt] || 0) + 1;
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
item.appendChild(label);
|
||||
item.appendChild(voteBtn);
|
||||
optionsList.appendChild(item);
|
||||
});
|
||||
}
|
||||
|
||||
function renderTimer(doc) {
|
||||
const deadline = doc?.deadline ?? null;
|
||||
const now = Date.now();
|
||||
|
||||
if (deadline === null) {
|
||||
timerEl.textContent = "";
|
||||
startVotingBtn.hidden = false;
|
||||
return;
|
||||
}
|
||||
|
||||
startVotingBtn.hidden = true;
|
||||
|
||||
if (now >= deadline) {
|
||||
timerEl.textContent = "Voting closed.";
|
||||
timerEl.className = "timer closed";
|
||||
clearInterval(timerInterval);
|
||||
timerInterval = null;
|
||||
return;
|
||||
}
|
||||
|
||||
const remaining = Math.ceil((deadline - now) / 1000);
|
||||
const mins = Math.floor(remaining / 60);
|
||||
const secs = remaining % 60;
|
||||
timerEl.textContent = `Voting closes in ${mins}:${secs.toString().padStart(2, "0")}`;
|
||||
timerEl.className = "timer active";
|
||||
|
||||
if (!timerInterval) {
|
||||
timerInterval = setInterval(() => {
|
||||
const d = HANDLE.doc();
|
||||
if (!d) return;
|
||||
renderTimer(d);
|
||||
renderOptions(d);
|
||||
if (Date.now() >= d.deadline) {
|
||||
clearInterval(timerInterval);
|
||||
timerInterval = null;
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
|
||||
startVotingBtn.addEventListener("click", () => {
|
||||
HANDLE.change((d) => {
|
||||
d.deadline = Date.now() + 2 * 60 * 1000;
|
||||
});
|
||||
});
|
||||
|
||||
addBtn.addEventListener("click", () => {
|
||||
const value = optionInput.value.trim();
|
||||
if (!value) return;
|
||||
|
||||
const doc = HANDLE.doc();
|
||||
const valueLower = value.toLowerCase();
|
||||
const isDuplicate = (doc?.options || []).some(
|
||||
(opt) => opt.toLowerCase() === valueLower,
|
||||
);
|
||||
|
||||
if (isDuplicate) {
|
||||
duplicateMsg.textContent = `"${value}" is already in the list.`;
|
||||
duplicateMsg.hidden = false;
|
||||
return;
|
||||
}
|
||||
|
||||
duplicateMsg.hidden = true;
|
||||
HANDLE.change((d) => {
|
||||
if (!d.options) d.options = [];
|
||||
d.options.push(value);
|
||||
});
|
||||
optionInput.value = "";
|
||||
});
|
||||
|
||||
optionInput.addEventListener("keydown", (e) => {
|
||||
if (e.key === "Enter") addBtn.click();
|
||||
});
|
||||
|
||||
optionInput.addEventListener("input", () => {
|
||||
duplicateMsg.hidden = true;
|
||||
});
|
||||
|
||||
copyBtn.addEventListener("click", () => {
|
||||
navigator.clipboard.writeText(window.location.href).then(() => {
|
||||
copyBtn.textContent = "Copied!";
|
||||
setTimeout(() => (copyBtn.textContent = "Copy URL"), 1500);
|
||||
});
|
||||
});
|
||||
@@ -1 +0,0 @@
|
||||
VITE_WS_URL=ws://localhost:5000
|
||||
6
frontend/.gitignore
vendored
6
frontend/.gitignore
vendored
@@ -1,6 +0,0 @@
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
.env
|
||||
.DS_Store
|
||||
@@ -1,13 +0,0 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>P2P Poll App</title>
|
||||
</head>
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
4857
frontend/package-lock.json
generated
4857
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,35 +0,0 @@
|
||||
{
|
||||
"name": "p2p-poll-frontend",
|
||||
"private": true,
|
||||
"version": "1.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
|
||||
},
|
||||
"dependencies": {
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"yjs": "^13.6.8",
|
||||
"y-websocket": "^1.5.0",
|
||||
"y-webrtc": "^10.2.5",
|
||||
"lucide-react": "^0.294.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/react": "^18.2.37",
|
||||
"@types/react-dom": "^18.2.15",
|
||||
"@typescript-eslint/eslint-plugin": "^6.10.0",
|
||||
"@typescript-eslint/parser": "^6.10.0",
|
||||
"@vitejs/plugin-react": "^4.2.0",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"eslint": "^8.53.0",
|
||||
"eslint-plugin-react-hooks": "^4.6.0",
|
||||
"eslint-plugin-react-refresh": "^0.4.4",
|
||||
"postcss": "^8.4.31",
|
||||
"tailwindcss": "^3.3.5",
|
||||
"typescript": "^5.2.2",
|
||||
"vite": "^5.0.0"
|
||||
}
|
||||
}
|
||||
@@ -1,6 +0,0 @@
|
||||
export default {
|
||||
plugins: {
|
||||
tailwindcss: {},
|
||||
autoprefixer: {},
|
||||
},
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
import { PollView } from './components/PollView';
|
||||
import './styles/index.css';
|
||||
|
||||
function App() {
|
||||
return <PollView />;
|
||||
}
|
||||
|
||||
export default App;
|
||||
@@ -1,38 +0,0 @@
|
||||
import { useState } from 'react';
|
||||
import { Plus } from 'lucide-react';
|
||||
|
||||
interface AddOptionProps {
|
||||
onAdd: (text: string) => void;
|
||||
}
|
||||
|
||||
export function AddOption({ onAdd }: AddOptionProps) {
|
||||
const [text, setText] = useState('');
|
||||
|
||||
const handleSubmit = (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (text.trim()) {
|
||||
onAdd(text);
|
||||
setText('');
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="flex gap-2">
|
||||
<input
|
||||
type="text"
|
||||
value={text}
|
||||
onChange={(e) => setText(e.target.value)}
|
||||
placeholder="Add a new option..."
|
||||
className="flex-1 px-4 py-3 rounded-lg bg-white/10 border border-white/20 text-white placeholder-white/50 focus:outline-none focus:ring-2 focus:ring-white/30"
|
||||
/>
|
||||
<button
|
||||
type="submit"
|
||||
disabled={!text.trim()}
|
||||
className="px-6 py-3 bg-white text-purple-600 rounded-lg font-semibold hover:bg-white/90 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200 flex items-center gap-2"
|
||||
>
|
||||
<Plus className="w-5 h-5" />
|
||||
Add
|
||||
</button>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -1,34 +0,0 @@
|
||||
import { Wifi, WifiOff, Users } from 'lucide-react';
|
||||
|
||||
interface ConnectionStatusProps {
|
||||
isConnected: boolean;
|
||||
wsProvider: any;
|
||||
webrtcProvider: any;
|
||||
}
|
||||
|
||||
export function ConnectionStatus({ isConnected, wsProvider, webrtcProvider }: ConnectionStatusProps) {
|
||||
const peerCount = webrtcProvider?.room?.peers?.size || 0;
|
||||
|
||||
return (
|
||||
<div className="flex items-center gap-4 text-white/90 text-sm">
|
||||
<div className="flex items-center gap-2">
|
||||
{isConnected ? (
|
||||
<>
|
||||
<Wifi className="w-4 h-4 text-green-400" />
|
||||
<span>Connected</span>
|
||||
</>
|
||||
) : (
|
||||
<>
|
||||
<WifiOff className="w-4 h-4 text-red-400" />
|
||||
<span>Disconnected</span>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<Users className="w-4 h-4" />
|
||||
<span>{peerCount} peer{peerCount !== 1 ? 's' : ''}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
import { useState } from 'react';
|
||||
import { Plus } from 'lucide-react';
|
||||
|
||||
interface CreatePollProps {
|
||||
onCreate: (question: string) => void;
|
||||
}
|
||||
|
||||
export function CreatePoll({ onCreate }: CreatePollProps) {
|
||||
const [question, setQuestion] = useState('');
|
||||
|
||||
const handleSubmit = (e: React.FormEvent) => {
|
||||
e.preventDefault();
|
||||
if (question.trim()) {
|
||||
onCreate(question);
|
||||
setQuestion('');
|
||||
}
|
||||
};
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="mb-8">
|
||||
<div className="bg-white/10 backdrop-blur-lg rounded-2xl shadow-2xl p-6 border border-white/20">
|
||||
<h2 className="text-xl font-bold text-white mb-4">Create a New Poll</h2>
|
||||
<div className="flex gap-2">
|
||||
<input
|
||||
type="text"
|
||||
value={question}
|
||||
onChange={(e) => setQuestion(e.target.value)}
|
||||
placeholder="Enter your question..."
|
||||
className="flex-1 px-4 py-3 rounded-lg bg-white/10 border border-white/20 text-white placeholder-white/50 focus:outline-none focus:ring-2 focus:ring-white/30"
|
||||
/>
|
||||
<button
|
||||
type="submit"
|
||||
disabled={!question.trim()}
|
||||
className="px-6 py-3 bg-white text-purple-600 rounded-lg font-semibold hover:bg-white/90 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-200 flex items-center gap-2"
|
||||
>
|
||||
<Plus className="w-5 h-5" />
|
||||
Create Poll
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
);
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
import { PollOption } from '../types/poll.types';
|
||||
import { VoteButton } from './VoteButton';
|
||||
|
||||
interface OptionListProps {
|
||||
options: PollOption[];
|
||||
onVote: (optionId: string) => void;
|
||||
hasVoted?: (option: PollOption) => boolean;
|
||||
}
|
||||
|
||||
export function OptionList({ options, onVote, hasVoted }: OptionListProps) {
|
||||
const totalVotes = options.reduce((sum, opt) => sum + opt.votes, 0);
|
||||
|
||||
const sortedOptions = [...options].sort((a, b) => b.votes - a.votes);
|
||||
|
||||
return (
|
||||
<div className="space-y-3">
|
||||
{sortedOptions.length === 0 ? (
|
||||
<div className="text-center py-8 text-white/60">
|
||||
No options yet. Add one to get started!
|
||||
</div>
|
||||
) : (
|
||||
sortedOptions.map((option) => {
|
||||
const percentage = totalVotes > 0 ? (option.votes / totalVotes) * 100 : 0;
|
||||
const userHasVoted = hasVoted ? hasVoted(option) : false;
|
||||
|
||||
return (
|
||||
<div
|
||||
key={option.id}
|
||||
className={`bg-white/10 backdrop-blur-sm rounded-lg p-4 border transition-all duration-200 ${
|
||||
userHasVoted
|
||||
? 'border-green-400/50 bg-green-400/10'
|
||||
: 'border-white/20 hover:border-white/30'
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center justify-between mb-2">
|
||||
<span className="text-white font-medium text-lg">
|
||||
{option.text}
|
||||
{userHasVoted && <span className="ml-2 text-green-400 text-sm">✓ Voted</span>}
|
||||
</span>
|
||||
<VoteButton optionId={option.id} votes={option.votes} onVote={onVote} disabled={userHasVoted} />
|
||||
</div>
|
||||
|
||||
<div className="w-full bg-white/10 rounded-full h-2 overflow-hidden">
|
||||
<div
|
||||
className="bg-gradient-to-r from-green-400 to-blue-500 h-full transition-all duration-500 ease-out"
|
||||
style={{ width: `${percentage}%` }}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="mt-2 flex justify-between text-xs text-white/60">
|
||||
<span>by {option.createdBy}</span>
|
||||
<span>{percentage.toFixed(1)}%</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
import { Poll } from '../types/poll.types';
|
||||
import { AddOption } from './AddOption';
|
||||
import { OptionList } from './OptionList';
|
||||
import { User, Clock } from 'lucide-react';
|
||||
|
||||
interface PollCardProps {
|
||||
poll: Poll;
|
||||
onAddOption: (pollId: string, text: string) => void;
|
||||
onVote: (pollId: string, optionId: string) => void;
|
||||
hasVoted: (option: any) => boolean;
|
||||
}
|
||||
|
||||
export function PollCard({ poll, onAddOption, onVote, hasVoted }: PollCardProps) {
|
||||
const handleAddOption = (text: string) => {
|
||||
onAddOption(poll.id, text);
|
||||
};
|
||||
|
||||
const handleVote = (optionId: string) => {
|
||||
onVote(poll.id, optionId);
|
||||
};
|
||||
|
||||
const formatTime = (timestamp: number) => {
|
||||
const date = new Date(timestamp);
|
||||
return date.toLocaleString();
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="bg-white/10 backdrop-blur-lg rounded-2xl shadow-2xl p-8 border border-white/20 mb-6">
|
||||
<div className="mb-6">
|
||||
<h2 className="text-3xl font-bold text-white mb-3">{poll.question}</h2>
|
||||
<div className="flex items-center gap-4 text-white/60 text-sm">
|
||||
<div className="flex items-center gap-1">
|
||||
<User className="w-4 h-4" />
|
||||
<span>{poll.createdBy}</span>
|
||||
</div>
|
||||
<div className="flex items-center gap-1">
|
||||
<Clock className="w-4 h-4" />
|
||||
<span>{formatTime(poll.timestamp)}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="mb-6">
|
||||
<AddOption onAdd={handleAddOption} />
|
||||
</div>
|
||||
|
||||
<OptionList options={poll.options} onVote={handleVote} hasVoted={hasVoted} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
import { RefreshCw } from 'lucide-react';
|
||||
import { usePoll } from '../hooks/usePoll';
|
||||
import { CreatePoll } from './CreatePoll';
|
||||
import { PollCard } from './PollCard';
|
||||
import { ConnectionStatus } from './ConnectionStatus';
|
||||
|
||||
export function PollView() {
|
||||
const { polls, createPoll, addOption, vote, hasVoted, isConnected, wsProvider, webrtcProvider } = usePoll();
|
||||
|
||||
return (
|
||||
<div className="min-h-screen p-4 py-8">
|
||||
<div className="max-w-4xl mx-auto">
|
||||
<div className="mb-8 flex items-center justify-between">
|
||||
<div>
|
||||
<h1 className="text-4xl font-bold text-white mb-2">P2P Polling App</h1>
|
||||
<p className="text-white/70">Create polls, add answers, and vote in real-time</p>
|
||||
</div>
|
||||
<ConnectionStatus
|
||||
isConnected={isConnected}
|
||||
wsProvider={wsProvider}
|
||||
webrtcProvider={webrtcProvider}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<CreatePoll onCreate={createPoll} />
|
||||
|
||||
{polls.length === 0 ? (
|
||||
<div className="bg-white/10 backdrop-blur-lg rounded-2xl shadow-2xl p-12 border border-white/20 text-center">
|
||||
<p className="text-white/60 text-lg mb-2">No polls yet!</p>
|
||||
<p className="text-white/40">Create the first poll to get started.</p>
|
||||
</div>
|
||||
) : (
|
||||
<div className="space-y-6">
|
||||
{polls.map((poll) => (
|
||||
<PollCard
|
||||
key={poll.id}
|
||||
poll={poll}
|
||||
onAddOption={addOption}
|
||||
onVote={vote}
|
||||
hasVoted={hasVoted}
|
||||
/>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="mt-8 text-center text-white/50 text-sm">
|
||||
<p>QUIC P2P Experiment !</p>
|
||||
<p className="flex items-center justify-center gap-2 mt-1">
|
||||
<RefreshCw className="w-4 h-4" />
|
||||
Real-time P2P synchronization with Yjs
|
||||
</p>
|
||||
<p className="mt-1">Open multiple tabs to see live updates!</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
import { ThumbsUp } from 'lucide-react';
|
||||
|
||||
interface VoteButtonProps {
|
||||
optionId: string;
|
||||
votes: number;
|
||||
onVote: (optionId: string) => void;
|
||||
disabled?: boolean;
|
||||
}
|
||||
|
||||
export function VoteButton({ optionId, votes, onVote, disabled = false }: VoteButtonProps) {
|
||||
return (
|
||||
<button
|
||||
onClick={() => !disabled && onVote(optionId)}
|
||||
disabled={disabled}
|
||||
className={`flex items-center gap-2 px-4 py-2 rounded-lg transition-all duration-200 text-white font-medium ${
|
||||
disabled
|
||||
? 'bg-white/10 cursor-not-allowed opacity-60'
|
||||
: 'bg-white/20 hover:bg-white/30'
|
||||
}`}
|
||||
>
|
||||
<ThumbsUp className="w-4 h-4" />
|
||||
<span>{votes}</span>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
import { useCallback } from 'react';
|
||||
import { pollManager } from '../lib/poll-manager';
|
||||
import { useYjsSync } from './useYjsSync';
|
||||
|
||||
export function usePoll() {
|
||||
const { polls, isConnected, wsProvider, webrtcProvider } = useYjsSync();
|
||||
|
||||
const createPoll = useCallback((question: string) => {
|
||||
return pollManager.createPoll(question);
|
||||
}, []);
|
||||
|
||||
const addOption = useCallback((pollId: string, text: string) => {
|
||||
pollManager.addOption(pollId, text);
|
||||
}, []);
|
||||
|
||||
const vote = useCallback((pollId: string, optionId: string) => {
|
||||
pollManager.vote(pollId, optionId);
|
||||
}, []);
|
||||
|
||||
const hasVoted = useCallback((option: any) => {
|
||||
return pollManager.hasVoted(option);
|
||||
}, []);
|
||||
|
||||
const userId = pollManager.getUserId();
|
||||
|
||||
return {
|
||||
polls,
|
||||
createPoll,
|
||||
addOption,
|
||||
vote,
|
||||
hasVoted,
|
||||
userId,
|
||||
isConnected,
|
||||
wsProvider,
|
||||
webrtcProvider
|
||||
};
|
||||
}
|
||||
@@ -1,50 +0,0 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Poll } from '../types/poll.types';
|
||||
import {
|
||||
initializeProviders,
|
||||
destroyProviders,
|
||||
yPolls,
|
||||
wsProvider,
|
||||
webrtcProvider
|
||||
} from '../lib/yjs-setup';
|
||||
|
||||
export function useYjsSync() {
|
||||
const [polls, setPolls] = useState<Poll[]>([]);
|
||||
const [isConnected, setIsConnected] = useState(false);
|
||||
|
||||
useEffect(() => {
|
||||
console.log('[SYNC] Initializing Yjs sync hook');
|
||||
const { wsProvider: ws } = initializeProviders();
|
||||
|
||||
const updatePolls = () => {
|
||||
const currentPolls = Array.from(yPolls.values());
|
||||
console.log('[SYNC] Polls updated, count:', currentPolls.length);
|
||||
setPolls(currentPolls);
|
||||
};
|
||||
|
||||
yPolls.observe(updatePolls);
|
||||
updatePolls();
|
||||
|
||||
const handleStatus = (event: { status: string }) => {
|
||||
console.log('[SYNC] WebSocket status event:', event.status);
|
||||
const connected = event.status === 'connected';
|
||||
setIsConnected(connected);
|
||||
console.log('[SYNC] Connection state set to:', connected);
|
||||
};
|
||||
|
||||
ws?.on('status', handleStatus);
|
||||
|
||||
return () => {
|
||||
yPolls.unobserve(updatePolls);
|
||||
ws?.off('status', handleStatus);
|
||||
destroyProviders();
|
||||
};
|
||||
}, []);
|
||||
|
||||
return {
|
||||
polls,
|
||||
isConnected,
|
||||
wsProvider,
|
||||
webrtcProvider
|
||||
};
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
import { PollOption } from '../types/poll.types';
|
||||
import { createPoll as yjsCreatePoll, addOption as yjsAddOption, voteForOption as yjsVoteForOption } from './yjs-setup';
|
||||
|
||||
export class PollManager {
|
||||
private userId: string;
|
||||
|
||||
constructor() {
|
||||
this.userId = this.generateUserId();
|
||||
}
|
||||
|
||||
private generateUserId(): string {
|
||||
const stored = localStorage.getItem('p2p-poll-user-id');
|
||||
if (stored) return stored;
|
||||
|
||||
const newId = 'user-' + Math.random().toString(36).substr(2, 9);
|
||||
localStorage.setItem('p2p-poll-user-id', newId);
|
||||
return newId;
|
||||
}
|
||||
|
||||
getUserId(): string {
|
||||
return this.userId;
|
||||
}
|
||||
|
||||
createPoll(question: string): string {
|
||||
if (!question.trim()) return '';
|
||||
return yjsCreatePoll(question.trim(), this.userId);
|
||||
}
|
||||
|
||||
addOption(pollId: string, text: string): void {
|
||||
if (!text.trim()) return;
|
||||
yjsAddOption(pollId, text.trim(), this.userId);
|
||||
}
|
||||
|
||||
vote(pollId: string, optionId: string): void {
|
||||
yjsVoteForOption(pollId, optionId, this.userId);
|
||||
}
|
||||
|
||||
hasVoted(option: PollOption): boolean {
|
||||
return option.votedBy.includes(this.userId);
|
||||
}
|
||||
}
|
||||
|
||||
export const pollManager = new PollManager();
|
||||
@@ -1,287 +0,0 @@
|
||||
import * as Y from 'yjs';
|
||||
import { WebsocketProvider } from 'y-websocket';
|
||||
import { WebrtcProvider } from 'y-webrtc';
|
||||
import { Poll, PollOption } from '../types/poll.types';
|
||||
|
||||
const WS_URL = import.meta.env.VITE_WS_URL || 'ws://localhost:5000';
|
||||
const ROOM_NAME = 'default-poll';
|
||||
|
||||
function getSignalingUrl(wsUrl: string): string {
|
||||
try {
|
||||
const url = new URL(wsUrl);
|
||||
const protocol = url.protocol === 'ws:' ? 'ws' : 'wss';
|
||||
return `${protocol}://${url.host}/signal`;
|
||||
} catch (error) {
|
||||
console.error('Invalid WebSocket URL:', wsUrl, error);
|
||||
return wsUrl + '/signal';
|
||||
}
|
||||
}
|
||||
|
||||
export const ydoc = new Y.Doc();
|
||||
|
||||
export const yPolls = ydoc.getMap<Poll>('polls');
|
||||
|
||||
export let wsProvider: WebsocketProvider | null = null;
|
||||
export let webrtcProvider: WebrtcProvider | null = null;
|
||||
|
||||
let wsReconnectAttempts = 0;
|
||||
let webrtcReconnectAttempts = 0;
|
||||
const MAX_RECONNECT_ATTEMPTS = 5;
|
||||
const BASE_RECONNECT_DELAY = 1000;
|
||||
|
||||
interface ConnectionMetrics {
|
||||
rtt: number;
|
||||
bandwidth: number;
|
||||
packetLoss: number;
|
||||
lastUpdated: number;
|
||||
}
|
||||
|
||||
const connectionMetrics: ConnectionMetrics = {
|
||||
rtt: 0,
|
||||
bandwidth: 0,
|
||||
packetLoss: 0,
|
||||
lastUpdated: Date.now()
|
||||
};
|
||||
|
||||
function getReconnectDelay(attempts: number): number {
|
||||
return Math.min(BASE_RECONNECT_DELAY * Math.pow(2, attempts), 30000);
|
||||
}
|
||||
|
||||
export function getConnectionMetrics(): ConnectionMetrics {
|
||||
return { ...connectionMetrics };
|
||||
}
|
||||
|
||||
export function initializeProviders() {
|
||||
console.log('[INIT] Initializing providers with WS_URL:', WS_URL);
|
||||
console.log('[INIT] Connecting to WebSocket:', WS_URL + '/yjs');
|
||||
console.log('[INIT] Room name:', ROOM_NAME);
|
||||
console.log('[INIT] Signaling URL:', getSignalingUrl(WS_URL));
|
||||
|
||||
wsProvider = new WebsocketProvider(
|
||||
WS_URL + '/yjs',
|
||||
ROOM_NAME,
|
||||
ydoc,
|
||||
{ connect: true }
|
||||
);
|
||||
|
||||
webrtcProvider = new WebrtcProvider(
|
||||
ROOM_NAME,
|
||||
ydoc,
|
||||
{
|
||||
signaling: [getSignalingUrl(WS_URL)],
|
||||
password: null,
|
||||
awareness: wsProvider.awareness,
|
||||
maxConns: 20,
|
||||
filterBcConns: true,
|
||||
peerOpts: {}
|
||||
}
|
||||
);
|
||||
|
||||
wsProvider.on('status', (event: { status: string }) => {
|
||||
console.log('[WS] WebSocket status changed:', event.status);
|
||||
|
||||
if (event.status === 'connected') {
|
||||
wsReconnectAttempts = 0;
|
||||
console.log('[WS] Successfully connected to WebSocket');
|
||||
} else if (event.status === 'disconnected') {
|
||||
console.log('[WS] WebSocket disconnected');
|
||||
if (wsReconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
|
||||
const delay = getReconnectDelay(wsReconnectAttempts);
|
||||
console.log(`[WS] Reconnecting in ${delay}ms (attempt ${wsReconnectAttempts + 1})`);
|
||||
setTimeout(() => {
|
||||
wsReconnectAttempts++;
|
||||
try {
|
||||
wsProvider?.connect();
|
||||
} catch (error) {
|
||||
console.error('[WS] Failed to reconnect:', error);
|
||||
}
|
||||
}, delay);
|
||||
} else {
|
||||
console.error('[WS] Max reconnection attempts reached');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
wsProvider.on('connection-error', (error: any) => {
|
||||
console.error('[WS] Connection error:', error);
|
||||
});
|
||||
|
||||
webrtcProvider.on('synced', (synced: boolean) => {
|
||||
console.log('[WEBRTC] Synced:', synced);
|
||||
if (synced) {
|
||||
webrtcReconnectAttempts = 0;
|
||||
}
|
||||
});
|
||||
|
||||
webrtcProvider.on('peers', (peers: any) => {
|
||||
console.log('[WEBRTC] Peers changed:', peers.size, 'peers');
|
||||
if (peers.size === 0 && webrtcReconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
|
||||
const delay = getReconnectDelay(webrtcReconnectAttempts);
|
||||
console.log(`[WEBRTC] No peers, reconnecting in ${delay}ms (attempt ${webrtcReconnectAttempts + 1})`);
|
||||
setTimeout(() => {
|
||||
webrtcReconnectAttempts++;
|
||||
try {
|
||||
webrtcProvider?.connect();
|
||||
} catch (error) {
|
||||
console.error('[WEBRTC] Failed to reconnect:', error);
|
||||
}
|
||||
}, delay);
|
||||
} else if (peers.size > 0) {
|
||||
webrtcReconnectAttempts = 0;
|
||||
console.log('[WEBRTC] Connected to', peers.size, 'peers');
|
||||
}
|
||||
});
|
||||
|
||||
// Periodically collect WebRTC stats
|
||||
const statsInterval = setInterval(async () => {
|
||||
if (webrtcProvider && webrtcProvider.room) {
|
||||
let totalRtt = 0;
|
||||
let totalBandwidth = 0;
|
||||
let peerCount = 0;
|
||||
|
||||
// Access peers through the room's internal structure
|
||||
const room = webrtcProvider.room as any;
|
||||
if (room.peers) {
|
||||
for (const peer of room.peers.values()) {
|
||||
try {
|
||||
if (peer.peerConnection) {
|
||||
const stats = await peer.peerConnection.getStats();
|
||||
stats.forEach((report: any) => {
|
||||
if (report.type === 'remote-inbound-rtp' || report.type === 'inbound-rtp') {
|
||||
totalRtt += report.roundTripTime || 0;
|
||||
}
|
||||
if (report.type === 'outbound-rtp') {
|
||||
totalBandwidth += report.bytesSent || 0;
|
||||
}
|
||||
});
|
||||
peerCount++;
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to get WebRTC stats:', error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (peerCount > 0) {
|
||||
connectionMetrics.rtt = totalRtt / peerCount;
|
||||
connectionMetrics.bandwidth = totalBandwidth;
|
||||
connectionMetrics.packetLoss = 0; // Would need more complex calculation
|
||||
connectionMetrics.lastUpdated = Date.now();
|
||||
}
|
||||
}
|
||||
}, 5000);
|
||||
|
||||
// Cleanup stats interval on destroy
|
||||
const originalDestroy = webrtcProvider.destroy;
|
||||
webrtcProvider.destroy = function() {
|
||||
clearInterval(statsInterval);
|
||||
originalDestroy.call(this);
|
||||
};
|
||||
|
||||
return { wsProvider, webrtcProvider };
|
||||
}
|
||||
|
||||
export function destroyProviders() {
|
||||
wsProvider?.destroy();
|
||||
webrtcProvider?.destroy();
|
||||
}
|
||||
|
||||
export function createPoll(question: string, createdBy: string): string {
|
||||
const pollId = crypto.randomUUID();
|
||||
const poll: Poll = {
|
||||
id: pollId,
|
||||
question,
|
||||
createdBy,
|
||||
timestamp: Date.now(),
|
||||
options: []
|
||||
};
|
||||
|
||||
yPolls.set(pollId, poll);
|
||||
return pollId;
|
||||
}
|
||||
|
||||
export function addOption(pollId: string, text: string, createdBy: string): void {
|
||||
try {
|
||||
ydoc.transact(() => {
|
||||
const poll = yPolls.get(pollId);
|
||||
|
||||
if (!poll) {
|
||||
console.error(`Poll not found: ${pollId}`);
|
||||
throw new Error('Poll not found');
|
||||
}
|
||||
|
||||
const option: PollOption = {
|
||||
id: crypto.randomUUID(),
|
||||
text,
|
||||
votes: 0,
|
||||
votedBy: [],
|
||||
createdBy,
|
||||
timestamp: Date.now()
|
||||
};
|
||||
|
||||
const updatedPoll = {
|
||||
...poll,
|
||||
options: [...poll.options, option]
|
||||
};
|
||||
|
||||
yPolls.set(pollId, updatedPoll);
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to add option:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
export function voteForOption(pollId: string, optionId: string, userId: string): void {
|
||||
try {
|
||||
ydoc.transact(() => {
|
||||
const poll = yPolls.get(pollId);
|
||||
|
||||
if (!poll) {
|
||||
console.error(`Poll not found: ${pollId}`);
|
||||
throw new Error('Poll not found');
|
||||
}
|
||||
|
||||
const optionIndex = poll.options.findIndex(opt => opt.id === optionId);
|
||||
|
||||
if (optionIndex === -1) {
|
||||
console.error(`Option not found: ${optionId}`);
|
||||
throw new Error('Option not found');
|
||||
}
|
||||
|
||||
const option = poll.options[optionIndex];
|
||||
|
||||
if (option.votedBy.includes(userId)) {
|
||||
console.log(`User ${userId} already voted for option ${optionId}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const updatedOption = {
|
||||
...option,
|
||||
votes: option.votes + 1,
|
||||
votedBy: [...option.votedBy, userId]
|
||||
};
|
||||
|
||||
const updatedOptions = [...poll.options];
|
||||
updatedOptions[optionIndex] = updatedOption;
|
||||
|
||||
const updatedPoll = {
|
||||
...poll,
|
||||
options: updatedOptions
|
||||
};
|
||||
|
||||
yPolls.set(pollId, updatedPoll);
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Failed to vote for option:', error);
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
export function getPolls(): Poll[] {
|
||||
return Array.from(yPolls.values());
|
||||
}
|
||||
|
||||
export function getPoll(pollId: string): Poll | undefined {
|
||||
return yPolls.get(pollId);
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import App from './App';
|
||||
|
||||
ReactDOM.createRoot(document.getElementById('root')!).render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>,
|
||||
);
|
||||
@@ -1,17 +0,0 @@
|
||||
@tailwind base;
|
||||
@tailwind components;
|
||||
@tailwind utilities;
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
|
||||
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
|
||||
sans-serif;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
#root {
|
||||
min-height: 100vh;
|
||||
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
export interface PollOption {
|
||||
id: string;
|
||||
text: string;
|
||||
votes: number;
|
||||
votedBy: string[];
|
||||
createdBy: string;
|
||||
timestamp: number;
|
||||
}
|
||||
|
||||
export interface Poll {
|
||||
id: string;
|
||||
question: string;
|
||||
createdBy: string;
|
||||
timestamp: number;
|
||||
options: PollOption[];
|
||||
}
|
||||
|
||||
export interface ConnectionStatus {
|
||||
websocket: boolean;
|
||||
webrtc: boolean;
|
||||
peers: number;
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
/** @type {import('tailwindcss').Config} */
|
||||
export default {
|
||||
content: [
|
||||
"./index.html",
|
||||
"./src/**/*.{js,ts,jsx,tsx}",
|
||||
],
|
||||
theme: {
|
||||
extend: {},
|
||||
},
|
||||
plugins: [],
|
||||
}
|
||||
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES2020",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["ES2020", "DOM", "DOM.Iterable"],
|
||||
"module": "ESNext",
|
||||
"skipLibCheck": true,
|
||||
"moduleResolution": "bundler",
|
||||
"allowImportingTsExtensions": true,
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx",
|
||||
"strict": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true,
|
||||
"noFallthroughCasesInSwitch": true
|
||||
},
|
||||
"include": ["src"],
|
||||
"references": [{ "path": "./tsconfig.node.json" }]
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"skipLibCheck": true,
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "bundler",
|
||||
"allowSyntheticDefaultImports": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
server: {
|
||||
port: 5173,
|
||||
host: true
|
||||
}
|
||||
})
|
||||
31
index.html
Normal file
31
index.html
Normal file
@@ -0,0 +1,31 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>P2P Polling App</title>
|
||||
<link rel="stylesheet" href="./styles.css" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="app">
|
||||
<h1>P2P Polling App</h1>
|
||||
<div id="status"></div>
|
||||
<div id="add-option">
|
||||
<input
|
||||
type="text"
|
||||
id="option-input"
|
||||
placeholder="Enter an option..."
|
||||
/>
|
||||
<button id="add-btn">Add Option</button>
|
||||
</div>
|
||||
<div id="duplicate-msg" hidden></div>
|
||||
<div id="timer-section">
|
||||
<div id="timer"></div>
|
||||
<button id="start-voting-btn">Start 2-min Vote</button>
|
||||
</div>
|
||||
<div id="options-list"></div>
|
||||
<button id="copy-btn">Copy URL</button>
|
||||
</div>
|
||||
<script type="module" src="./app.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
23
package.json
Normal file
23
package.json
Normal file
@@ -0,0 +1,23 @@
|
||||
{
|
||||
"name": "p2p-poll-app",
|
||||
"type": "module",
|
||||
"engines": {
|
||||
"node": ">=24"
|
||||
},
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "vite build",
|
||||
"preview": "vite preview"
|
||||
},
|
||||
"dependencies": {
|
||||
"@automerge/automerge-repo": "^2.0.0",
|
||||
"@automerge/automerge-repo-network-websocket": "^2.0.0",
|
||||
"@automerge/automerge-repo-storage-indexeddb": "^2.0.0",
|
||||
"@automerge/vanillajs": "^2.5.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
"vite": "^6.0.0",
|
||||
"vite-plugin-top-level-await": "^1.4.0",
|
||||
"vite-plugin-wasm": "^3.3.0"
|
||||
}
|
||||
}
|
||||
1083
pnpm-lock.yaml
generated
Normal file
1083
pnpm-lock.yaml
generated
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,4 +0,0 @@
|
||||
PORT=3000
|
||||
YJS_WS_PORT=1234
|
||||
NODE_ENV=development
|
||||
CORS_ORIGIN=http://localhost:5173
|
||||
5
server/.gitignore
vendored
5
server/.gitignore
vendored
@@ -1,5 +0,0 @@
|
||||
node_modules/
|
||||
dist/
|
||||
.env
|
||||
*.log
|
||||
.DS_Store
|
||||
2112
server/package-lock.json
generated
2112
server/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,36 +0,0 @@
|
||||
{
|
||||
"name": "p2p-poll-server",
|
||||
"version": "1.0.0",
|
||||
"description": "Backend server for P2P polling app with Yjs and WebRTC signaling",
|
||||
"main": "dist/index.js",
|
||||
"scripts": {
|
||||
"dev": "tsx watch src/index.ts",
|
||||
"build": "tsc",
|
||||
"start": "node dist/index.js"
|
||||
},
|
||||
"keywords": [
|
||||
"yjs",
|
||||
"websocket",
|
||||
"webrtc",
|
||||
"p2p"
|
||||
],
|
||||
"author": "",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"cors": "^2.8.5",
|
||||
"dotenv": "^16.3.1",
|
||||
"express": "^4.18.2",
|
||||
"ws": "^8.14.2",
|
||||
"y-websocket": "^1.5.0",
|
||||
"yjs": "^13.6.8",
|
||||
"zod": "^4.3.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/cors": "^2.8.15",
|
||||
"@types/express": "^4.17.20",
|
||||
"@types/node": "^20.9.0",
|
||||
"@types/ws": "^8.5.8",
|
||||
"tsx": "^4.6.2",
|
||||
"typescript": "^5.2.2"
|
||||
}
|
||||
}
|
||||
@@ -1,59 +0,0 @@
|
||||
import express from 'express';
|
||||
import http from 'http';
|
||||
import cors from 'cors';
|
||||
import dotenv from 'dotenv';
|
||||
import { createYjsServer } from './yjs-server';
|
||||
import { createSignalingServer } from './signaling-server';
|
||||
import { logger } from './utils/logger';
|
||||
|
||||
dotenv.config();
|
||||
|
||||
const app = express();
|
||||
const PORT = process.env.PORT || 5000;
|
||||
|
||||
app.use(cors({
|
||||
origin: process.env.CORS_ORIGIN || ['http://localhost:5173', 'http://localhost:5174', 'http://localhost:5175'],
|
||||
credentials: true
|
||||
}));
|
||||
|
||||
app.use(express.json());
|
||||
|
||||
app.get('/health', (req, res) => {
|
||||
res.json({
|
||||
status: 'ok',
|
||||
timestamp: new Date().toISOString(),
|
||||
services: {
|
||||
yjs: 'running',
|
||||
signaling: 'running'
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
app.get('/', (req, res) => {
|
||||
res.json({
|
||||
message: 'P2P Poll Server',
|
||||
endpoints: {
|
||||
health: '/health',
|
||||
yjs: 'ws://localhost:' + PORT + '/yjs',
|
||||
signaling: 'ws://localhost:' + PORT + '/signal'
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
const server = http.createServer(app);
|
||||
|
||||
createYjsServer(server, PORT as number);
|
||||
createSignalingServer(server);
|
||||
|
||||
server.listen(PORT, () => {
|
||||
logger.info(`Server running on port ${PORT}`);
|
||||
logger.info(`Yjs WebSocket: ws://localhost:${PORT}/yjs`);
|
||||
logger.info(`Signaling WebSocket: ws://localhost:${PORT}/signal`);
|
||||
});
|
||||
|
||||
process.on('SIGTERM', () => {
|
||||
logger.info('SIGTERM signal received: closing HTTP server');
|
||||
server.close(() => {
|
||||
logger.info('HTTP server closed');
|
||||
});
|
||||
});
|
||||
@@ -1,305 +0,0 @@
|
||||
import { WebSocketServer, WebSocket } from 'ws';
|
||||
import http from 'http';
|
||||
import { SignalingMessage, SignalingMessageSchema } from './types/poll.types';
|
||||
import { logger } from './utils/logger';
|
||||
|
||||
interface Client {
|
||||
id: string;
|
||||
ws: WebSocket;
|
||||
roomId: string;
|
||||
lastSeen: number;
|
||||
messageCount: number;
|
||||
lastMessageTime: number;
|
||||
}
|
||||
|
||||
export function createSignalingServer(server: http.Server) {
|
||||
const wss = new WebSocketServer({
|
||||
noServer: true
|
||||
});
|
||||
|
||||
// Handle upgrade requests for /signal path
|
||||
server.on('upgrade', (request, socket, head) => {
|
||||
const pathname = request.url || '';
|
||||
|
||||
if (pathname === '/signal' || pathname.startsWith('/signal?')) {
|
||||
logger.info(`[SIGNALING] Upgrade request for path: ${pathname}`);
|
||||
wss.handleUpgrade(request, socket, head, (ws) => {
|
||||
wss.emit('connection', ws, request);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
const clients = new Map<string, Client>();
|
||||
const rooms = new Map<string, Set<string>>();
|
||||
const roomPasswords = new Map<string, string>();
|
||||
const HEARTBEAT_INTERVAL = 30000;
|
||||
const CLIENT_TIMEOUT = 60000;
|
||||
const RATE_LIMIT_WINDOW = 1000;
|
||||
const RATE_LIMIT_MAX = 10;
|
||||
|
||||
const heartbeatInterval = setInterval(() => {
|
||||
const now = Date.now();
|
||||
clients.forEach((client, clientId) => {
|
||||
if (now - client.lastSeen > CLIENT_TIMEOUT) {
|
||||
logger.info(`Client ${clientId} timed out, removing...`);
|
||||
handleClientLeave(clientId);
|
||||
} else {
|
||||
client.ws.send(JSON.stringify({ type: 'ping' }));
|
||||
}
|
||||
});
|
||||
}, HEARTBEAT_INTERVAL);
|
||||
|
||||
wss.on('connection', (ws: WebSocket) => {
|
||||
let clientId: string | null = null;
|
||||
const tempClientId = `temp-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
|
||||
logger.info(`[SIGNALING] New WebSocket connection (temp: ${tempClientId})`);
|
||||
|
||||
ws.on('message', (data: Buffer) => {
|
||||
try {
|
||||
const parsed = JSON.parse(data.toString());
|
||||
const validationResult = SignalingMessageSchema.safeParse(parsed);
|
||||
|
||||
if (!validationResult.success) {
|
||||
logger.error('Invalid signaling message:', validationResult.error);
|
||||
ws.send(JSON.stringify({
|
||||
type: 'error',
|
||||
message: 'Invalid message format',
|
||||
errors: validationResult.error.issues
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
const message: SignalingMessage = validationResult.data;
|
||||
|
||||
if (clientId) {
|
||||
const client = clients.get(clientId);
|
||||
if (client) {
|
||||
const now = Date.now();
|
||||
if (now - client.lastMessageTime < RATE_LIMIT_WINDOW) {
|
||||
client.messageCount++;
|
||||
if (client.messageCount > RATE_LIMIT_MAX) {
|
||||
logger.warn(`Client ${clientId} exceeded rate limit`);
|
||||
ws.send(JSON.stringify({
|
||||
type: 'error',
|
||||
message: 'Rate limit exceeded'
|
||||
}));
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
client.messageCount = 1;
|
||||
client.lastMessageTime = now;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
switch (message.type) {
|
||||
case 'subscribe':
|
||||
// y-webrtc subscribe message - client wants to join topics
|
||||
if (message.topics) {
|
||||
message.topics.forEach((topic: string) => {
|
||||
if (!rooms.has(topic)) {
|
||||
rooms.set(topic, new Set());
|
||||
}
|
||||
const tempId = `sub-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
|
||||
clientId = tempId;
|
||||
rooms.get(topic)!.add(tempId);
|
||||
clients.set(tempId, {
|
||||
id: tempId,
|
||||
ws,
|
||||
roomId: topic,
|
||||
lastSeen: Date.now(),
|
||||
messageCount: 0,
|
||||
lastMessageTime: Date.now()
|
||||
});
|
||||
logger.info(`[SIGNALING] Client subscribed to topic: ${topic}`);
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
case 'unsubscribe':
|
||||
// y-webrtc unsubscribe message
|
||||
if (message.topics && clientId) {
|
||||
message.topics.forEach((topic: string) => {
|
||||
const room = rooms.get(topic);
|
||||
if (room && clientId) {
|
||||
room.delete(clientId);
|
||||
if (room.size === 0) {
|
||||
rooms.delete(topic);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
break;
|
||||
|
||||
case 'publish':
|
||||
// y-webrtc publish message - broadcast to all subscribers of a topic
|
||||
if (message.topic) {
|
||||
const topic = message.topic;
|
||||
const room = rooms.get(topic);
|
||||
if (room) {
|
||||
room.forEach((subscriberId) => {
|
||||
const subscriber = clients.get(subscriberId);
|
||||
if (subscriber && subscriber.ws !== ws && subscriber.ws.readyState === WebSocket.OPEN) {
|
||||
subscriber.ws.send(JSON.stringify({
|
||||
type: 'publish',
|
||||
topic: topic,
|
||||
data: message.data
|
||||
}));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'join':
|
||||
clientId = message.from || `client-${Date.now()}`;
|
||||
const roomId = message.roomId || 'default-room';
|
||||
|
||||
const roomPassword = roomPasswords.get(roomId);
|
||||
if (roomPassword && message.password !== roomPassword) {
|
||||
logger.warn(`Client ${clientId} failed password authentication for room ${roomId}`);
|
||||
ws.send(JSON.stringify({
|
||||
type: 'error',
|
||||
message: 'Invalid room password'
|
||||
}));
|
||||
return;
|
||||
}
|
||||
|
||||
clients.set(clientId, {
|
||||
id: clientId,
|
||||
ws,
|
||||
roomId,
|
||||
lastSeen: Date.now(),
|
||||
messageCount: 0,
|
||||
lastMessageTime: Date.now()
|
||||
});
|
||||
|
||||
if (!rooms.has(roomId)) {
|
||||
rooms.set(roomId, new Set());
|
||||
}
|
||||
rooms.get(roomId)!.add(clientId);
|
||||
|
||||
logger.info(`Client ${clientId} joined room ${roomId}`);
|
||||
|
||||
const roomClients = Array.from(rooms.get(roomId)!).filter(id => id !== clientId);
|
||||
ws.send(JSON.stringify({
|
||||
type: 'peers',
|
||||
peers: roomClients
|
||||
}));
|
||||
|
||||
roomClients.forEach(peerId => {
|
||||
const peer = clients.get(peerId);
|
||||
if (peer && peer.ws.readyState === WebSocket.OPEN) {
|
||||
peer.ws.send(JSON.stringify({
|
||||
type: 'peer-joined',
|
||||
peerId: clientId
|
||||
}));
|
||||
}
|
||||
});
|
||||
break;
|
||||
|
||||
case 'offer':
|
||||
case 'answer':
|
||||
case 'ice-candidate':
|
||||
if (message.to) {
|
||||
const targetClient = clients.get(message.to);
|
||||
if (targetClient && targetClient.ws.readyState === WebSocket.OPEN) {
|
||||
targetClient.ws.send(JSON.stringify({
|
||||
type: message.type,
|
||||
from: message.from,
|
||||
data: message.data
|
||||
}));
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'leave':
|
||||
if (message.from) {
|
||||
handleClientLeave(message.from);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'create-room':
|
||||
if (message.roomId && message.password) {
|
||||
roomPasswords.set(message.roomId, message.password);
|
||||
logger.info(`Room ${message.roomId} created with password protection`);
|
||||
ws.send(JSON.stringify({
|
||||
type: 'room-created',
|
||||
roomId: message.roomId
|
||||
}));
|
||||
}
|
||||
break;
|
||||
|
||||
case 'ping':
|
||||
if (clientId) {
|
||||
const client = clients.get(clientId);
|
||||
if (client) {
|
||||
client.lastSeen = Date.now();
|
||||
client.ws.send(JSON.stringify({ type: 'pong', from: 'server' }));
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 'pong':
|
||||
if (clientId) {
|
||||
const client = clients.get(clientId);
|
||||
if (client) {
|
||||
client.lastSeen = Date.now();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
} catch (error) {
|
||||
logger.error('Error processing signaling message:', error);
|
||||
}
|
||||
});
|
||||
|
||||
ws.on('close', () => {
|
||||
if (clientId) {
|
||||
handleClientLeave(clientId);
|
||||
}
|
||||
});
|
||||
|
||||
ws.on('error', (error) => {
|
||||
logger.error('WebSocket error:', error);
|
||||
});
|
||||
});
|
||||
|
||||
function handleClientLeave(clientId: string) {
|
||||
const client = clients.get(clientId);
|
||||
if (client) {
|
||||
const roomId = client.roomId;
|
||||
const room = rooms.get(roomId);
|
||||
|
||||
if (room) {
|
||||
room.delete(clientId);
|
||||
|
||||
room.forEach(peerId => {
|
||||
const peer = clients.get(peerId);
|
||||
if (peer && peer.ws.readyState === WebSocket.OPEN) {
|
||||
peer.ws.send(JSON.stringify({
|
||||
type: 'peer-left',
|
||||
peerId: clientId
|
||||
}));
|
||||
}
|
||||
});
|
||||
|
||||
if (room.size === 0) {
|
||||
rooms.delete(roomId);
|
||||
}
|
||||
}
|
||||
|
||||
clients.delete(clientId);
|
||||
logger.info(`Client ${clientId} left room ${roomId}`);
|
||||
}
|
||||
}
|
||||
|
||||
wss.on('close', () => {
|
||||
clearInterval(heartbeatInterval);
|
||||
logger.info('Signaling server closed');
|
||||
});
|
||||
|
||||
logger.info('Signaling server running at path /signal');
|
||||
|
||||
return wss;
|
||||
}
|
||||
@@ -1,40 +0,0 @@
|
||||
import { z } from 'zod';
|
||||
|
||||
export interface PollOption {
|
||||
id: string;
|
||||
text: string;
|
||||
votes: number;
|
||||
votedBy: string[];
|
||||
createdBy: string;
|
||||
timestamp: number;
|
||||
}
|
||||
|
||||
export interface Poll {
|
||||
id: string;
|
||||
question: string;
|
||||
createdBy: string;
|
||||
timestamp: number;
|
||||
options: PollOption[];
|
||||
}
|
||||
|
||||
export const SignalingMessageSchema = z.object({
|
||||
type: z.enum(['offer', 'answer', 'ice-candidate', 'join', 'leave', 'ping', 'pong', 'create-room', 'subscribe', 'unsubscribe', 'publish', 'signal']),
|
||||
from: z.string().optional(),
|
||||
to: z.string().optional(),
|
||||
data: z.any().optional(),
|
||||
roomId: z.string().optional(),
|
||||
password: z.string().optional(),
|
||||
topics: z.array(z.string()).optional(),
|
||||
topic: z.string().optional()
|
||||
});
|
||||
|
||||
export interface SignalingMessage {
|
||||
type: 'offer' | 'answer' | 'ice-candidate' | 'join' | 'leave' | 'ping' | 'pong' | 'create-room' | 'subscribe' | 'unsubscribe' | 'publish' | 'signal';
|
||||
from?: string;
|
||||
to?: string;
|
||||
data?: any;
|
||||
roomId?: string;
|
||||
password?: string;
|
||||
topics?: string[];
|
||||
topic?: string;
|
||||
}
|
||||
@@ -1,115 +0,0 @@
|
||||
type LogLevel = 'info' | 'error' | 'warn' | 'debug';
|
||||
type LogContext = Record<string, any>;
|
||||
|
||||
interface LogEntry {
|
||||
timestamp: string;
|
||||
level: LogLevel;
|
||||
message: string;
|
||||
context?: LogContext;
|
||||
}
|
||||
|
||||
class Logger {
|
||||
private context: LogContext = {};
|
||||
private timers: Map<string, number> = new Map();
|
||||
|
||||
setContext(ctx: LogContext): void {
|
||||
this.context = { ...this.context, ...ctx };
|
||||
}
|
||||
|
||||
clearContext(): void {
|
||||
this.context = {};
|
||||
}
|
||||
|
||||
private formatLog(level: LogLevel, message: string, args: any[]): LogEntry {
|
||||
const entry: LogEntry = {
|
||||
timestamp: new Date().toISOString(),
|
||||
level,
|
||||
message,
|
||||
context: Object.keys(this.context).length > 0 ? { ...this.context } : undefined
|
||||
};
|
||||
|
||||
if (args.length > 0) {
|
||||
if (entry.context) {
|
||||
entry.context.args = args;
|
||||
} else {
|
||||
entry.context = { args };
|
||||
}
|
||||
}
|
||||
|
||||
return entry;
|
||||
}
|
||||
|
||||
private log(level: LogLevel, message: string, ...args: any[]): void {
|
||||
const entry = this.formatLog(level, message, args);
|
||||
const logString = JSON.stringify(entry);
|
||||
|
||||
switch (level) {
|
||||
case 'info':
|
||||
console.log(logString);
|
||||
break;
|
||||
case 'error':
|
||||
console.error(logString);
|
||||
break;
|
||||
case 'warn':
|
||||
console.warn(logString);
|
||||
break;
|
||||
case 'debug':
|
||||
if (process.env.NODE_ENV === 'development') {
|
||||
console.debug(logString);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
info(message: string, ...args: any[]): void {
|
||||
this.log('info', message, ...args);
|
||||
}
|
||||
|
||||
error(message: string, ...args: any[]): void {
|
||||
this.log('error', message, ...args);
|
||||
}
|
||||
|
||||
warn(message: string, ...args: any[]): void {
|
||||
this.log('warn', message, ...args);
|
||||
}
|
||||
|
||||
debug(message: string, ...args: any[]): void {
|
||||
this.log('debug', message, ...args);
|
||||
}
|
||||
|
||||
startTimer(label: string): void {
|
||||
this.timers.set(label, Date.now());
|
||||
}
|
||||
|
||||
endTimer(label: string): number {
|
||||
const startTime = this.timers.get(label);
|
||||
if (!startTime) {
|
||||
this.warn(`Timer '${label}' not found`);
|
||||
return 0;
|
||||
}
|
||||
const duration = Date.now() - startTime;
|
||||
this.timers.delete(label);
|
||||
this.debug(`Timer '${label}': ${duration}ms`);
|
||||
return duration;
|
||||
}
|
||||
|
||||
time<T>(label: string, fn: () => T): T {
|
||||
this.startTimer(label);
|
||||
try {
|
||||
return fn();
|
||||
} finally {
|
||||
this.endTimer(label);
|
||||
}
|
||||
}
|
||||
|
||||
async timeAsync<T>(label: string, fn: () => Promise<T>): Promise<T> {
|
||||
this.startTimer(label);
|
||||
try {
|
||||
return await fn();
|
||||
} finally {
|
||||
this.endTimer(label);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const logger = new Logger();
|
||||
@@ -1,51 +0,0 @@
|
||||
import { WebSocketServer } from 'ws';
|
||||
// @ts-ignore
|
||||
import { setupWSConnection } from 'y-websocket/bin/utils';
|
||||
import http from 'http';
|
||||
import { logger } from './utils/logger';
|
||||
|
||||
export function createYjsServer(server: http.Server, port: number) {
|
||||
const wss = new WebSocketServer({
|
||||
noServer: true
|
||||
});
|
||||
|
||||
// Handle upgrade requests for /yjs/* paths
|
||||
server.on('upgrade', (request, socket, head) => {
|
||||
const pathname = request.url || '';
|
||||
|
||||
if (pathname.startsWith('/yjs')) {
|
||||
logger.info(`[YJS] Upgrade request for path: ${pathname}`);
|
||||
wss.handleUpgrade(request, socket, head, (ws) => {
|
||||
wss.emit('connection', ws, request);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
wss.on('connection', (ws, req) => {
|
||||
const url = req.url || 'unknown';
|
||||
const remoteAddress = req.socket.remoteAddress || 'unknown';
|
||||
logger.info(`[YJS] New connection from ${remoteAddress}, URL: ${url}`);
|
||||
|
||||
// Log when connection closes
|
||||
ws.on('close', () => {
|
||||
logger.info(`[YJS] Connection closed from ${remoteAddress}`);
|
||||
});
|
||||
|
||||
ws.on('error', (error) => {
|
||||
logger.error(`[YJS] Connection error from ${remoteAddress}:`, error);
|
||||
});
|
||||
|
||||
// y-websocket automatically handles docName from the URL path
|
||||
// The room name is passed as part of the URL: /yjs/room-name
|
||||
// We don't need to manually extract it
|
||||
setupWSConnection(ws, req, { gc: true });
|
||||
});
|
||||
|
||||
wss.on('error', (error) => {
|
||||
logger.error('Yjs WebSocket server error:', error);
|
||||
});
|
||||
|
||||
logger.info(`Yjs WebSocket server running on port ${port} at path /yjs`);
|
||||
|
||||
return wss;
|
||||
}
|
||||
@@ -1,20 +0,0 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ES2020",
|
||||
"module": "commonjs",
|
||||
"lib": ["ES2020"],
|
||||
"outDir": "./dist",
|
||||
"rootDir": "./src",
|
||||
"strict": true,
|
||||
"esModuleInterop": true,
|
||||
"skipLibCheck": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"resolveJsonModule": true,
|
||||
"moduleResolution": "node",
|
||||
"declaration": true,
|
||||
"declarationMap": true,
|
||||
"sourceMap": true
|
||||
},
|
||||
"include": ["src/**/*"],
|
||||
"exclude": ["node_modules", "dist"]
|
||||
}
|
||||
93
styles.css
Normal file
93
styles.css
Normal file
@@ -0,0 +1,93 @@
|
||||
body {
|
||||
font-family: sans-serif;
|
||||
max-width: 480px;
|
||||
margin: 40px auto;
|
||||
padding: 0 16px;
|
||||
}
|
||||
|
||||
#add-option {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
#option-input {
|
||||
flex: 1;
|
||||
padding: 8px;
|
||||
font-size: 1rem;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
#duplicate-msg {
|
||||
color: #c00;
|
||||
font-size: 0.9rem;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 8px 16px;
|
||||
font-size: 1rem;
|
||||
cursor: pointer;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
button:hover:not(:disabled) {
|
||||
background: #f0f0f0;
|
||||
}
|
||||
|
||||
button:disabled {
|
||||
opacity: 0.5;
|
||||
cursor: default;
|
||||
}
|
||||
|
||||
#timer-section {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.timer.active {
|
||||
font-weight: bold;
|
||||
color: #1a6e1a;
|
||||
}
|
||||
|
||||
.timer.closed {
|
||||
font-weight: bold;
|
||||
color: #c00;
|
||||
}
|
||||
|
||||
.option-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 10px 12px;
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 4px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.option-label {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.vote-btn {
|
||||
padding: 4px 12px;
|
||||
font-size: 0.9rem;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.vote-btn.voted {
|
||||
background: #e6f4e6;
|
||||
border-color: #4a9e4a;
|
||||
color: #2a6e2a;
|
||||
}
|
||||
|
||||
|
||||
#copy-btn {
|
||||
margin-top: 16px;
|
||||
width: 100%;
|
||||
}
|
||||
7
vite.config.js
Normal file
7
vite.config.js
Normal file
@@ -0,0 +1,7 @@
|
||||
import { defineConfig } from 'vite'
|
||||
import wasm from 'vite-plugin-wasm'
|
||||
import topLevelAwait from 'vite-plugin-top-level-await'
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [wasm(), topLevelAwait()]
|
||||
})
|
||||
Reference in New Issue
Block a user