Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
Route changes
Hakan Shehu6409958e5500
diff --git a/server/src/api.ts b/server/src/api.tsindex 8192ea9a..5ee73c43 100644--- a/server/src/api.ts+++ b/server/src/api.ts@@ -1,9 +1,13 @@import express, { Request, Response } from 'express';import cors from 'cors';+import http from 'http';+import { WebSocketServer } from 'ws';+import { accountsRouter } from '@/routes/accounts';import { workspacesRouter } from '@/routes/workspaces';import { transactionsRouter } from '@/routes/transactions';import { authMiddleware } from '@/middlewares/auth';+import { sockets } from '@/lib/sockets';export const initApi = () => {const app = express();@@ -20,7 +24,32 @@ export const initApi = () => {app.use('/v1/workspaces', authMiddleware, workspacesRouter);app.use('/v1/transactions', authMiddleware, transactionsRouter);- app.listen(port, () => {+ const server = http.createServer(app);++ const wss = new WebSocketServer({+ server,+ path: '/synapse',+ });++ wss.on('connection', (socket, req) => {+ const deviceId = req.url?.split('device_id=')[1];+ if (!deviceId) {+ socket.close();+ return;+ }++ sockets.addSocket(deviceId, socket);++ socket.on('message', (message) => {+ console.log(`Received message: ${message}`);+ });++ socket.on('close', () => {+ sockets.removeSocket(deviceId);+ });+ });++ server.listen(port, () => {console.log(`Server is running at http://localhost:${port}`);});};diff --git a/server/src/routes/accounts.ts b/server/src/routes/accounts.tsindex ea9d3948..fbec8374 100644--- a/server/src/routes/accounts.ts+++ b/server/src/routes/accounts.ts@@ -10,15 +10,12 @@ import {import axios from 'axios';import { ApiError } from '@/types/api';import { NeuronId } from '@/lib/id';-import jwt from 'jsonwebtoken';import { prisma } from '@/data/prisma';import bcrypt from 'bcrypt';import { WorkspaceOutput } from '@/types/workspaces';+import { createJwtToken } from '@/lib/jwt';const GoogleUserInfoUrl = 'https://www.googleapis.com/oauth2/v1/userinfo';-const JwtSecretKey = process.env.JWT_SECRET ?? '';-const JwtAudience = process.env.JWT_AUDIENCE ?? '';-const JwtIssuer = process.env.JWT_ISSUER ?? '';const SaltRounds = 10;export const accountsRouter = Router();@@ -184,19 +181,11 @@ const buildLoginOutput = async (name: string,email: string,): Promise<LoginOutput> => {- const signOptions: jwt.SignOptions = {- issuer: JwtIssuer,- audience: JwtAudience,- subject: id,- expiresIn: '1y',- };-- const payload = {- name: name,- email: email,- };-- const token = jwt.sign(payload, JwtSecretKey, signOptions);+ const token = createJwtToken({+ id,+ name,+ email,+ });const accountWorkspaces = await prisma.workspaceAccounts.findMany({where: {@@ -237,7 +226,7 @@ const buildLoginOutput = async (const accountDevice = await prisma.accountDevices.create({data: {id: NeuronId.generate(NeuronId.Type.Device),- account_id: id,+ accountId: id,type: 1,createdAt: new Date(),version: '0.1.0',diff --git a/server/src/routes/workspaces.ts b/server/src/routes/workspaces.tsindex 95f4e952..4071f4ec 100644--- a/server/src/routes/workspaces.ts+++ b/server/src/routes/workspaces.ts@@ -85,6 +85,7 @@ workspacesRouter.post('/', async (req: NeuronRequest, res: NeuronResponse) => {createdAt: new Date(),createdBy: userNodeId,versionId: NeuronId.generate(NeuronId.Type.Version),+ serverCreatedAt: new Date(),},}),prisma.workspaceAccounts.create({@@ -350,6 +351,8 @@ workspacesRouter.get('/:id/nodes', async (req: Request, res: Response) => {content: node.content as NodeBlock[],updatedAt: node.updatedAt,updatedBy: node.updatedBy,+ serverCreatedAt: node.serverCreatedAt,+ serverUpdatedAt: node.serverUpdatedAt,state: node.state,};});