Merge pull request #17 from SilverCore-Git/new/ws

New/ws

Author: MisterPapaye

.env.example

@@ -18,6 +18,7 @@ GOOGLE_API_KEY=key
 
 CLERK_PUBLISHABLE_KEY=key
 CLERK_SECRET_KEY=key
+CLERK_JWT_KEY=key
 
 MCP_SERVER_PATH=./src/mcp-server/index.js
 

src/app.ts

@@ -1,2 +1,2 @@
 import './express.js';
-import './ws.js';
+import './wsocket/ws.js';

src/routes/api.ai.ts

@@ -41,6 +41,17 @@ router.post('/create', verify_auth, async (req: Request, res: Response) => {
  const mcpService = getMCPService();
  await mcpService.ensureConnected();
 
+ const existingSession = chats.find(chat => chat.userID === user.id);
+
+ if (existingSession)
+ {
+ res.json({ 
+ success: true, 
+ session: existingSession,
+ mcpConnected: mcpService.isConnected()
+ });
+ }
+
  const session: Chat = { 
  uuid: randomUUID(),
  userID: user.id,

src/ws.ts src/wsocket/routes/collaboration.tssrc/ws.ts renamed to src/wsocket/routes/collaboration.ts

@@ -1,16 +1,11 @@
-import { Server } from "socket.io";
-import { createServer } from 'http';
+import { Server, Socket } from "socket.io";
+import notes from "../../assets/ts/notes.js";
+import { Note } from "../../assets/ts/types.js";
 import * as Y from "yjs";
 import * as awarenessProtocol from "y-protocols/awareness";
-import fs from 'fs';
-import path from 'path';
-import __dirname from "./assets/ts/_dirname.js";
-const config = JSON.parse(fs.readFileSync(path.join(__dirname, '../../config.json'), 'utf-8'))
-import notes from "./assets/ts/notes.js";
-import { Note } from "./assets/ts/types.js";
-import Share from "./assets/ts/db/share/Share.js";
+import Share from "../../assets/ts/db/share/Share.js";
+
 
-const httpServer = createServer();
 
 const save_note = async (note: Note): Promise<void> => {
  await notes.updateNote({
@@ -26,12 +21,6 @@ const get_note = async (uuid: string): Promise<Note | undefined> => {
 }
 
 
-const io = new Server(httpServer, {
- cors: { origin: config.corsOptions.origin },
- path: "/socket.io/share",
- transports: ["websocket", "polling"]
-});
-
 const docs = new Map<string, { 
  ydoc: Y.Doc, 
  awareness: awarenessProtocol.Awareness,
@@ -40,11 +29,10 @@ const docs = new Map<string, {
  icon: string
 }>();
 
-io.on("connection", (socket) => {
 
- console.log("Client connected :", socket.id);
 
- // Stocker la room du socket pour l'utiliser dans les autres événements
+export default (io: Server, socket: Socket) => {
+
  let currentRoom: string | null = null;
 
  socket.on("join-room", async ({ room, userId }: { room: string, userId: string }) => {
@@ -263,10 +251,4 @@ io.on("connection", (socket) => {
  console.log("Client disconnected:", socket.id);
  });
 
-});
-
-console.log("Socket.IO server running...");
-
-httpServer.listen('3434', () => {
- console.log(`Serveur WebSocket sur le port 3434`);
-});
+};

src/wsocket/routes/index.ts

@@ -0,0 +1,12 @@
+import collaboration from "./collaboration.js";
+import user from "./user.js";
+import notes from "./notes.js";
+import tags from "./tags.js";
+
+
+export default [
+ collaboration,
+ user,
+ notes,
+ tags
+]

src/wsocket/routes/notes.ts

@@ -0,0 +1,74 @@
+import { Server, Socket } from "socket.io";
+import type { Note } from "../../assets/ts/types.js";
+import notes from "../../assets/ts/notes.js";
+
+
+export default (io: Server, socket: Socket) => {
+
+ socket.on('note:create', async (note: Note) => {
+
+ const userId = socket.data.userId;
+
+ if (note.user_id !== userId)
+ {
+ socket.emit('error', 'Unauthorized');
+ return;
+ }
+
+ const res = await notes.createNote(note);
+
+ if (res.error)
+ {
+ socket.emit('error', res.error);
+ return;
+ }
+
+ socket.to(`user:${userId}`).emit('note:create', res.note);
+
+ })
+
+ socket.on('note:update', async (note: Note) => {
+
+ const userId = socket.data.userId;
+
+ if (note.user_id !== userId)
+ {
+ socket.emit('error', 'Unauthorized');
+ return;
+ }
+
+ const res = await notes.updateNote(note);
+
+ if (res.error)
+ {
+ socket.emit('error', res.error);
+ return;
+ }
+
+ socket.to(`user:${userId}`).emit('note:update', note);
+
+ })
+
+ socket.on('note:delete', async (note: Note) => {
+
+ const userId = socket.data.userId;
+
+ if (note.user_id !== userId)
+ {
+ socket.emit('error', 'Unauthorized');
+ return;
+ }
+
+ const res = await notes.deleteNoteByUUID(note.user_id, note.uuid!);
+
+ if (res.error)
+ {
+ socket.emit('error', res.error);
+ return;
+ }
+
+ socket.to(`user:${userId}`).emit('note:delete', note);
+
+ })
+
+};

src/wsocket/routes/tags.ts

@@ -0,0 +1,74 @@
+import { Server, Socket } from "socket.io";
+import type { Tag } from "../../assets/ts/types.js";
+import tags from "../../assets/ts/tags.js";
+
+
+export default (io: Server, socket: Socket) => {
+
+ socket.on('tag:create', async (tag: Tag) => {
+
+ const userId = socket.data.userId;
+
+ if (tag.user_id !== userId)
+ {
+ socket.emit('error', 'Unauthorized');
+ return;
+ }
+
+ const res = await tags.createTag(tag);
+
+ if (res.error)
+ {
+ socket.emit('error', res.error);
+ return;
+ }
+
+ socket.to(`user:${userId}`).emit('tag:create', res.tag);
+
+ })
+
+ socket.on('tag:update', async (tag: Tag) => {
+
+ const userId = socket.data.userId;
+
+ if (tag.user_id !== userId)
+ {
+ socket.emit('error', 'Unauthorized');
+ return;
+ }
+
+ const res = await tags.updateTag(tag);
+
+ if (res.error)
+ {
+ socket.emit('error', res.error);
+ return;
+ }
+
+ socket.to(`user:${userId}`).emit('tag:update', res.tag);
+
+ })
+
+ socket.on('tag:delete', async (tag: Tag) => {
+
+ const userId = socket.data.userId;
+
+ if (tag.user_id !== userId)
+ {
+ socket.emit('error', 'Unauthorized');
+ return;
+ }
+
+ const res = await tags.deleteTagByUUID(tag.user_id!, tag.uuid!);
+
+ if (res.error)
+ {
+ socket.emit('error', res.error);
+ return;
+ }
+
+ socket.to(`user:${userId}`).emit('tag:delete', tag);
+
+ })
+
+};

src/wsocket/routes/user.ts

@@ -0,0 +1,26 @@
+import { Server, Socket } from "socket.io";
+
+
+export default (io: Server, socket: Socket) => {
+
+ socket.on('user-connect', () => {
+
+ const userId = socket.data.userId;
+
+ socket.join(`user:${userId}`);
+
+ console.log(`[WS] User ${userId} joined silvernote socket.`);
+
+ })
+
+ socket.on('disconnect', () => {
+
+ const userId = socket.data.userId;
+
+ socket.leave(`user:${userId}`);
+
+ console.log(`[WS] User ${userId} left silvernote socket.`);
+
+ })
+
+};

src/wsocket/ws.ts

@@ -0,0 +1,62 @@
+import { Server } from "socket.io";
+import { createServer } from 'http';
+import fs from 'fs';
+import path from 'path';
+import __dirname from "../assets/ts/_dirname.js";
+const config = JSON.parse(fs.readFileSync(path.join(__dirname, '../../config.json'), 'utf-8'))
+import routes from "./routes/index.js";
+import { verifyToken } from "@clerk/express";
+
+const httpServer = createServer();
+
+
+const io = new Server(httpServer, {
+ cors: { origin: config.corsOptions.origin },
+ path: "/socket",
+ transports: ["websocket", "polling"]
+});
+
+
+io.use(async (socket, next) => {
+ 
+ const token = socket.handshake.auth.token; // on client in socket init 
+
+ if (!token)
+ {
+ return next(new Error("Unauthorized: No token provided"));
+ }
+
+ try {
+ 
+ const sessionClaims = await verifyToken(token, {
+ jwtKey: process.env.CLERK_JWT_KEY as string
+ });
+ 
+ socket.data.userId = sessionClaims.sub;
+
+ next();
+
+ } 
+ catch (error) 
+ {
+ console.error("Erreur d'auth Socket.io :", error);
+ next(new Error("Unauthorized: Invalid token"));
+ }
+
+});
+
+io.on("connection", (socket) => {
+
+ routes.forEach((registerRoutes) => {
+ registerRoutes(io, socket);
+ });
+
+});
+
+
+
+console.log("Socket.IO server running...");
+
+httpServer.listen('3434', () => {
+ console.log(`Serveur WebSocket sur le port 3434`);
+});