This commit is contained in:
mrfry 2021-05-29 21:44:48 +02:00
parent b0fad8d4a2
commit aea8ad22d1
6 changed files with 115 additions and 69 deletions

View file

@ -1,16 +1,24 @@
import { Server as socket } from 'socket.io'
import { Server as socket, Socket } from 'socket.io'
import utils from '../../../utils/utils'
import dbtools from '../../../utils/dbtools'
import logger from '../../../utils/logger'
import { Request, SubmoduleData } from '../../../types/basicTypes'
import { Request, SubmoduleData, User } from '../../../types/basicTypes'
import socketAuth from '../../../middlewares/socketAuth.middleware'
const msgDbPath = './data/dbs/msgs.db'
const msgPaginationLimit = 15
interface ExtendedSocket extends Socket {
user: User
}
function setup(data: SubmoduleData): void {
const { app, httpServer, httpsServer, userDB } = data
const { app, httpServer, httpsServer, userDB, publicdirs } = data
const msgDB = dbtools.GetDB(msgDbPath)
const publicDir = publicdirs[0]
const uloadFiles = publicDir + 'chatFiles'
logger.Log(`Starting Socket.io Server on ${httpsServer ? 'https' : 'http'}`)
// https://socket.io/docs/v4/handling-cors/#Configuration
const io = new socket(httpsServer || httpServer, {
@ -29,29 +37,28 @@ function setup(data: SubmoduleData): void {
where sender = ${sender} and reciever = ${reciever}`,
'run'
)
io.sockets.in(sender).emit('chat message read', {
io.sockets.in(sender.toString()).emit('chat message read', {
userReadMsg: reciever,
})
}
io.use(socketAuth({ userDB: userDB }))
io.on('connection', (socket) => {
// TODO
// https://stackoverflow.com/questions/19106861/authorizing-and-handshaking-with-socket-io#19106961
// socket.handshake.headers
// if (data.id !== user.id) {
// socket.disconnect()
// socket.emit('connectData', {
// success: false,
// msg: `You are only authorized to connect as ${user.id}!`
// })
// return
// }
io.on('connection', (socket: ExtendedSocket) => {
// TODO: UNCOMMENT
// -----------------------------------------------------------------
// const userid = socket.user.id
// logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
// -----------------------------------------------------------------
socket.on('join', function (data) {
socket.join(data.id)
const userid = data.id
// TODO: REMOVE
// -----------------------------------------------------------------
const userid = parseInt(data.id)
logger.Log(`Chat connect: ${userid}`, logger.GetColor('green'))
// -----------------------------------------------------------------
socket.join(userid.toString())
let currUser = dbtools.Select(msgDB, 'users', {
id: userid,
})[0]
@ -66,16 +73,16 @@ function setup(data: SubmoduleData): void {
.runStatement(
msgDB,
`select * from
(
select sender as a
from msgs
where sender = ${userid} or reciever = ${userid}
union
select reciever
from msgs
where sender = ${userid} or reciever = ${userid}
)t
order by t.a asc`
(
select sender as a
from msgs
where sender = ${userid} or reciever = ${userid}
union
select reciever
from msgs
where sender = ${userid} or reciever = ${userid}
)t
order by t.a asc`
)
.reduce((acc, x) => {
if (x.a !== userid) acc.push(x.a)
@ -87,30 +94,33 @@ function setup(data: SubmoduleData): void {
const first = dbtools.runStatement(
msgDB,
`select * from msgs
where sender = ${userid} and reciever = ${to} or
sender = ${to} and reciever = ${userid}
order by date desc
limit 1`
where sender = ${userid} and reciever = ${to} or
sender = ${to} and reciever = ${userid}
order by date desc
limit 1`
)[0]
return first
}),
})
socket.on('chat message open', (data) => {
const { chatPartner } = data
socket.on('get chat messages', (data) => {
const { chatPartner, from } = data
// TODO: pagination
socket.emit(
'chat message open',
dbtools.runStatement(
msgDB,
`select * from msgs
where sender = ${userid} and reciever = ${chatPartner} or
sender = ${chatPartner} and reciever = ${userid}
order by date asc`
)
const msgs = dbtools.runStatement(
msgDB,
`select * from msgs
where (sender = ${userid} and reciever = ${chatPartner} or
sender = ${chatPartner} and reciever = ${userid})
${from ? `and date < ${from}` : ''}
order by date desc
limit ${msgPaginationLimit}`
)
socket.emit('get chat messages', {
requestsdMsgs: msgs,
hasMore: msgs.length === msgPaginationLimit,
})
// Read update
chatMessageRead({ sender: chatPartner, reciever: userid })
})
@ -121,7 +131,7 @@ function setup(data: SubmoduleData): void {
})
socket.on('chat message', (message) => {
const { reciever, msg } = message
const { reciever, msg, type } = message
const recieverUser = dbtools.Select(msgDB, 'users', {
id: reciever,
})[0]
@ -131,26 +141,45 @@ function setup(data: SubmoduleData): void {
date: new Date().getTime(),
sender: reciever,
reciever: userid,
type: 'text',
msg: `A #${reciever} számú felhasználó nem létezik`,
})
return
}
const msgObj = {
sender: parseInt(userid),
sender: userid,
reciever: parseInt(reciever),
msg: msg,
type: type || 'text',
date: new Date().getTime(),
unread: 1,
}
dbtools.Insert(msgDB, 'msgs', msgObj)
if (userid !== reciever) {
io.sockets.in(reciever).emit('chat message', msgObj)
io.sockets.in(reciever.toString()).emit('chat message', msgObj)
}
})
})
// socket.on('disconnect', () => {})
// socket.on('close', () => {})
})
app.post('/postchatfile', function (req: Request, res: any) {
logger.LogReq(req)
utils
.uploadFile(req, uloadFiles)
.then((result) => {
res.json({
success: true,
path: result.filePath.replace(publicDir, ''),
})
})
.catch(() => {
res.json({ success: false, msg: 'error during uploading' })
return
})
})
app.get('/hasNewMsg', (req: Request, res) => {