Mass replace parameter order (socket,io)>(io,socket), worked on queueing system
This commit is contained in:
parent
10dc9df8a9
commit
9d6de8a1a9
16
src/jobs/characterLeaveZone.ts
Normal file
16
src/jobs/characterLeaveZone.ts
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
import { TSocket } from '../utilities/types'
|
||||||
|
import { Server as SocketServer } from 'socket.io'
|
||||||
|
|
||||||
|
export default class SomeJob {
|
||||||
|
constructor(private params: any) {}
|
||||||
|
|
||||||
|
async execute(io: SocketServer, socket?: TSocket) {
|
||||||
|
// Handle the event
|
||||||
|
console.log('Event params:', this.params)
|
||||||
|
if (socket) {
|
||||||
|
socket.emit('notification', { message: 'Something happened with socket' })
|
||||||
|
}
|
||||||
|
// Use io for broadcasting if needed
|
||||||
|
io.emit('notification', { message: 'Something happened' })
|
||||||
|
}
|
||||||
|
}
|
@ -31,7 +31,7 @@ class CharacterManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public hasResetMovement(character: ExtendedCharacter) {
|
public hasResetMovement(character: ExtendedCharacter) {
|
||||||
return this.characters.find(x => x.id === character.id)?.resetMovement;
|
return this.characters.find((x) => x.id === character.id)?.resetMovement
|
||||||
}
|
}
|
||||||
|
|
||||||
public getCharactersInZone(zone: Zone) {
|
public getCharactersInZone(zone: Zone) {
|
||||||
|
@ -1,29 +1,91 @@
|
|||||||
import IORedis from 'ioredis';
|
import IORedis from 'ioredis'
|
||||||
import { Job, Queue, Worker } from 'bullmq'
|
import { Job, Queue, Worker } from 'bullmq'
|
||||||
import config from '../utilities/config'
|
import config from '../utilities/config'
|
||||||
|
import { Server as SocketServer } from 'socket.io'
|
||||||
|
import { TSocket } from '../utilities/types'
|
||||||
|
import { queueLogger } from '../utilities/logger'
|
||||||
|
|
||||||
class QueueManager {
|
class QueueManager {
|
||||||
private connection!: IORedis;
|
private connection!: IORedis
|
||||||
public queue!: Queue;
|
private queue!: Queue
|
||||||
public worker!: Worker;
|
private worker!: Worker
|
||||||
|
private io!: SocketServer
|
||||||
|
|
||||||
|
public async boot(io: SocketServer) {
|
||||||
|
this.io = io
|
||||||
|
|
||||||
public async boot() {
|
|
||||||
this.connection = new IORedis(config.REDIS_URL, {
|
this.connection = new IORedis(config.REDIS_URL, {
|
||||||
maxRetriesPerRequest: null
|
maxRetriesPerRequest: null
|
||||||
});
|
})
|
||||||
// this.queue = new Queue('myqueue', { connection: this.connection });
|
|
||||||
// this.worker = new Worker('myqueue', async (job: Job)=>{
|
|
||||||
// console.log('hallo')
|
|
||||||
// console.log(job.data);
|
|
||||||
// console.log(job.data.data.classobj);
|
|
||||||
// const test = job.data.data.classobj();
|
|
||||||
// console.log(test);
|
|
||||||
// console.log(job.data);
|
|
||||||
// }, { connection: this.connection, concurrency: 10000 });
|
|
||||||
//
|
|
||||||
|
|
||||||
console.log('hallo')
|
try {
|
||||||
|
await this.connection.ping()
|
||||||
|
queueLogger.info('Successfully connected to Redis')
|
||||||
|
} catch (error) {
|
||||||
|
queueLogger.error('Failed to connect to Redis:', error)
|
||||||
|
process.exit(1)
|
||||||
|
}
|
||||||
|
|
||||||
|
this.queue = new Queue('jobs')
|
||||||
|
this.worker = new Worker('jobs', this.processJob.bind(this), {
|
||||||
|
connection: this.connection,
|
||||||
|
concurrency: 10000
|
||||||
|
})
|
||||||
|
|
||||||
|
this.worker.on('completed', (job) => {
|
||||||
|
queueLogger.info(`Job ${job?.id} has completed`)
|
||||||
|
})
|
||||||
|
|
||||||
|
this.worker.on('failed', (job, err) => {
|
||||||
|
queueLogger.error(`Job ${job?.id} failed with error: ${err}`)
|
||||||
|
})
|
||||||
|
|
||||||
|
queueLogger.info('Queue manager loaded')
|
||||||
|
}
|
||||||
|
|
||||||
|
private async processJob(job: Job) {
|
||||||
|
const { jobClass, params, socketId } = job.data
|
||||||
|
|
||||||
|
console.log('Processing job:', job)
|
||||||
|
try {
|
||||||
|
const JobClass = await import(`../jobs/${jobClass}`)
|
||||||
|
|
||||||
|
if (!JobClass) {
|
||||||
|
queueLogger.warn(`Job class not found: ${jobClass}`)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log('Job class:', JobClass)
|
||||||
|
|
||||||
|
console.log('Job class:', JobClass.name)
|
||||||
|
|
||||||
|
const job = new JobClass(params)
|
||||||
|
|
||||||
|
if (socketId && this.io) {
|
||||||
|
const socket = this.io.sockets.sockets.get(socketId)
|
||||||
|
if (socket) {
|
||||||
|
await job.execute(this.io, socket)
|
||||||
|
} else {
|
||||||
|
queueLogger.warn(`Socket not found for job: ${socketId}`)
|
||||||
|
await job.execute(this.io)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await job.execute(this.io)
|
||||||
|
}
|
||||||
|
} catch (error: any) {
|
||||||
|
queueLogger.error(`Error processing job: ${error.message}`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async addToQueue(jobClass: any, params: any, socket?: TSocket) {
|
||||||
|
const jobData = {
|
||||||
|
jobClass: jobClass.name,
|
||||||
|
params,
|
||||||
|
socketId: socket?.id
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.queue.add('job', jobData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export default new QueueManager();
|
export default new QueueManager()
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
import { Zone, ZoneEventTile, ZoneEventTileType, ZoneObject } from '@prisma/client'
|
import { Zone, ZoneEventTile, ZoneEventTileType, ZoneObject } from '@prisma/client'
|
||||||
import prisma from '../utilities/prisma'
|
import prisma from '../utilities/prisma'
|
||||||
import { ZoneEventTileWithTeleport } from '../events/zone/characterMove'
|
import { ZoneEventTileWithTeleport } from '../socketEvents/zone/characterMove'
|
||||||
import { appLogger } from '../utilities/logger'
|
import { appLogger } from '../utilities/logger'
|
||||||
|
|
||||||
class ZoneRepository {
|
class ZoneRepository {
|
||||||
|
@ -58,14 +58,15 @@ export class Server {
|
|||||||
appLogger.error(`Socket.IO failed to start: ${error.message}`)
|
appLogger.error(`Socket.IO failed to start: ${error.message}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Load queue manager
|
||||||
|
await QueueManager.boot(this.io)
|
||||||
|
|
||||||
// Add http API routes
|
// Add http API routes
|
||||||
await addHttpRoutes(this.app)
|
await addHttpRoutes(this.app)
|
||||||
|
|
||||||
// Load user manager
|
// Load user manager
|
||||||
await UserManager.boot()
|
await UserManager.boot()
|
||||||
|
|
||||||
await QueueManager.boot();
|
|
||||||
|
|
||||||
// Load zoneEditor manager
|
// Load zoneEditor manager
|
||||||
await ZoneManager.boot()
|
await ZoneManager.boot()
|
||||||
|
|
||||||
@ -85,7 +86,7 @@ export class Server {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
private async handleConnection(socket: TSocket) {
|
private async handleConnection(socket: TSocket) {
|
||||||
const eventsPath = path.join(__dirname, 'events')
|
const eventsPath = path.join(__dirname, 'socketEvents')
|
||||||
try {
|
try {
|
||||||
await this.loadEventHandlers(eventsPath, socket)
|
await this.loadEventHandlers(eventsPath, socket)
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
@ -112,7 +113,7 @@ export class Server {
|
|||||||
eventInstance.listen()
|
eventInstance.listen()
|
||||||
} else {
|
} else {
|
||||||
// This is a function-based event
|
// This is a function-based event
|
||||||
module.default(socket, this.io)
|
module.default(this.io, socket)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
appLogger.warn(`Unrecognized export in ${file.name}`)
|
appLogger.warn(`Unrecognized export in ${file.name}`)
|
||||||
|
@ -2,19 +2,22 @@ import { Server } from 'socket.io'
|
|||||||
import { TSocket, ExtendedCharacter } from '../../utilities/types'
|
import { TSocket, ExtendedCharacter } from '../../utilities/types'
|
||||||
import CharacterRepository from '../../repositories/characterRepository'
|
import CharacterRepository from '../../repositories/characterRepository'
|
||||||
import CharacterManager from '../../managers/characterManager'
|
import CharacterManager from '../../managers/characterManager'
|
||||||
|
import QueueManager from '../../managers/queueManager'
|
||||||
|
import SomeJob from '../../jobs/characterLeaveZone'
|
||||||
|
|
||||||
type SocketResponseT = {
|
type SocketResponseT = {
|
||||||
character_id: number
|
character_id: number
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('character:connect', async (data: SocketResponseT) => {
|
socket.on('character:connect', async (data: SocketResponseT) => {
|
||||||
console.log('character:connect requested', data)
|
console.log('character:connect requested', data)
|
||||||
try {
|
try {
|
||||||
const character = await CharacterRepository.getByUserAndId(socket?.user?.id as number, data.character_id);
|
const character = await CharacterRepository.getByUserAndId(socket?.user?.id as number, data.character_id)
|
||||||
if(!character) return;
|
if (!character) return
|
||||||
socket.characterId = character.id;
|
socket.characterId = character.id
|
||||||
CharacterManager.initCharacter(character as ExtendedCharacter);
|
await QueueManager.addToQueue(SomeJob, { someParam: 'value' }, socket)
|
||||||
|
CharacterManager.initCharacter(character as ExtendedCharacter)
|
||||||
socket.emit('character:connect', character)
|
socket.emit('character:connect', character)
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.log('character:connect error', error)
|
console.log('character:connect error', error)
|
@ -6,7 +6,7 @@ import { ZCharacterCreate } from '../../utilities/zodTypes'
|
|||||||
import prisma from '../../utilities/prisma'
|
import prisma from '../../utilities/prisma'
|
||||||
import { gameLogger } from '../../utilities/logger'
|
import { gameLogger } from '../../utilities/logger'
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('character:create', async (data: any) => {
|
socket.on('character:create', async (data: any) => {
|
||||||
console.log('character:create requested', data)
|
console.log('character:create requested', data)
|
||||||
// zod validate
|
// zod validate
|
@ -12,7 +12,7 @@ type TypeResponse = {
|
|||||||
characters: Character[]
|
characters: Character[]
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('character:delete', async (data: TypePayload, callback: (response: TypeResponse) => void) => {
|
socket.on('character:delete', async (data: TypePayload, callback: (response: TypeResponse) => void) => {
|
||||||
// zod validate
|
// zod validate
|
||||||
try {
|
try {
|
@ -3,7 +3,7 @@ import { TSocket } from '../../utilities/types'
|
|||||||
import { Character } from '@prisma/client'
|
import { Character } from '@prisma/client'
|
||||||
import CharacterRepository from '../../repositories/characterRepository'
|
import CharacterRepository from '../../repositories/characterRepository'
|
||||||
|
|
||||||
export default function CharacterList(socket: TSocket, io: Server) {
|
export default function CharacterList(io: Server, socket: TSocket) {
|
||||||
socket.on('character:list', async (data: any) => {
|
socket.on('character:list', async (data: any) => {
|
||||||
try {
|
try {
|
||||||
console.log('character:list requested')
|
console.log('character:list requested')
|
@ -7,7 +7,7 @@ type TypePayload = {
|
|||||||
message: string
|
message: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('chat:send_message', async (data: TypePayload, callback: (response: boolean) => void) => {
|
socket.on('chat:send_message', async (data: TypePayload, callback: (response: boolean) => void) => {
|
||||||
try {
|
try {
|
||||||
if (!isCommand(data.message, 'alert')) return
|
if (!isCommand(data.message, 'alert')) return
|
@ -21,7 +21,7 @@ export default class TeleportCommandEvent {
|
|||||||
|
|
||||||
private async handleTeleportCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
|
private async handleTeleportCommand(data: TypePayload, callback: (response: boolean) => void): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const character = CharacterManager.getCharacterFromSocket(this.socket);
|
const character = CharacterManager.getCharacterFromSocket(this.socket)
|
||||||
if (!character) {
|
if (!character) {
|
||||||
this.socket.emit('notification', { title: 'Server message', message: 'Character not found' })
|
this.socket.emit('notification', { title: 'Server message', message: 'Character not found' })
|
||||||
return
|
return
|
||||||
@ -61,12 +61,11 @@ export default class TeleportCommandEvent {
|
|||||||
this.io.to(zone.id.toString()).emit('zone:character:join', character)
|
this.io.to(zone.id.toString()).emit('zone:character:join', character)
|
||||||
this.socket.join(zone.id.toString())
|
this.socket.join(zone.id.toString())
|
||||||
|
|
||||||
|
|
||||||
character.zoneId = zone.id
|
character.zoneId = zone.id
|
||||||
character.positionX = 0
|
character.positionX = 0
|
||||||
character.positionY = 0
|
character.positionY = 0
|
||||||
|
|
||||||
character.resetMovement = true;
|
character.resetMovement = true
|
||||||
|
|
||||||
this.socket.emit('zone:character:teleport', {
|
this.socket.emit('zone:character:teleport', {
|
||||||
zone,
|
zone,
|
@ -2,7 +2,7 @@ import { Server } from 'socket.io'
|
|||||||
import { TSocket } from '../utilities/types'
|
import { TSocket } from '../utilities/types'
|
||||||
import CharacterManager from '../managers/characterManager'
|
import CharacterManager from '../managers/characterManager'
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('disconnect', async (data: any) => {
|
socket.on('disconnect', async (data: any) => {
|
||||||
if (!socket.user) {
|
if (!socket.user) {
|
||||||
console.log('User disconnected but had no user set')
|
console.log('User disconnected but had no user set')
|
||||||
@ -11,7 +11,7 @@ export default function (socket: TSocket, io: Server) {
|
|||||||
|
|
||||||
io.emit('user:disconnect', socket.user.id)
|
io.emit('user:disconnect', socket.user.id)
|
||||||
|
|
||||||
const character = CharacterManager.getCharacterFromSocket(socket);
|
const character = CharacterManager.getCharacterFromSocket(socket)
|
||||||
|
|
||||||
if (!character) {
|
if (!character) {
|
||||||
console.log('User disconnected but had no character set')
|
console.log('User disconnected but had no character set')
|
@ -12,9 +12,9 @@ interface IPayload {}
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:object:list', async (data: any, callback: (response: Object[]) => void) => {
|
socket.on('gm:object:list', async (data: any, callback: (response: Object[]) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback([])
|
if (!character) return callback([])
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -15,9 +15,9 @@ interface IPayload {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:object:remove', async (data: IPayload, callback: (response: boolean) => void) => {
|
socket.on('gm:object:remove', async (data: IPayload, callback: (response: boolean) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -21,9 +21,9 @@ type Payload = {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:object:update', async (data: Payload, callback: (success: boolean) => void) => {
|
socket.on('gm:object:update', async (data: Payload, callback: (success: boolean) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -24,7 +24,7 @@ export default class ObjectUploadEvent {
|
|||||||
|
|
||||||
private async handleObjectUpload(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
|
private async handleObjectUpload(data: IObjectData, callback: (response: boolean) => void): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const character = await characterRepository.getById(this.socket.characterId as number);
|
const character = await characterRepository.getById(this.socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -11,10 +11,10 @@ import characterRepository from '../../../../repositories/characterRepository'
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:sprite:create', async (data: undefined, callback: (response: boolean) => void) => {
|
socket.on('gm:sprite:create', async (data: undefined, callback: (response: boolean) => void) => {
|
||||||
try {
|
try {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -25,7 +25,7 @@ export default class GMSpriteDeleteEvent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async handleSpriteDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
|
private async handleSpriteDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
|
||||||
const character = CharacterManager.getCharacterFromSocket(this.socket);
|
const character = CharacterManager.getCharacterFromSocket(this.socket)
|
||||||
if (character?.role !== 'gm') {
|
if (character?.role !== 'gm') {
|
||||||
return callback(false)
|
return callback(false)
|
||||||
}
|
}
|
@ -12,9 +12,9 @@ interface IPayload {}
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:sprite:list', async (data: any, callback: (response: Sprite[]) => void) => {
|
socket.on('gm:sprite:list', async (data: any, callback: (response: Sprite[]) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback([])
|
if (!character) return callback([])
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -27,9 +27,9 @@ interface ProcessedSpriteAction extends SpriteActionInput {
|
|||||||
}>
|
}>
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:sprite:update', async (data: Payload, callback: (success: boolean) => void) => {
|
socket.on('gm:sprite:update', async (data: Payload, callback: (success: boolean) => void) => {
|
||||||
const character = CharacterManager.getCharacterFromSocket(socket);
|
const character = CharacterManager.getCharacterFromSocket(socket)
|
||||||
if (character?.role !== 'gm') {
|
if (character?.role !== 'gm') {
|
||||||
return callback(false)
|
return callback(false)
|
||||||
}
|
}
|
@ -25,7 +25,7 @@ export default class GMTileDeleteEvent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async handleTileDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
|
private async handleTileDelete(data: Payload, callback: (response: boolean) => void): Promise<void> {
|
||||||
const character = await characterRepository.getById(this.socket.characterId as number);
|
const character = await characterRepository.getById(this.socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -12,9 +12,9 @@ interface IPayload {}
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:tile:list', async (data: any, callback: (response: Tile[]) => void) => {
|
socket.on('gm:tile:list', async (data: any, callback: (response: Tile[]) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return
|
if (!character) return
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -15,9 +15,9 @@ type Payload = {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:tile:update', async (data: Payload, callback: (success: boolean) => void) => {
|
socket.on('gm:tile:update', async (data: Payload, callback: (success: boolean) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -16,10 +16,10 @@ interface ITileData {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:tile:upload', async (data: ITileData, callback: (response: boolean) => void) => {
|
socket.on('gm:tile:upload', async (data: ITileData, callback: (response: boolean) => void) => {
|
||||||
try {
|
try {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return callback(false)
|
if (!character) return callback(false)
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -17,9 +17,9 @@ type Payload = {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:zone_editor:zone:create', async (data: Payload, callback: (response: Zone[]) => void) => {
|
socket.on('gm:zone_editor:zone:create', async (data: Payload, callback: (response: Zone[]) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return
|
if (!character) return
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -14,11 +14,11 @@ type Payload = {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:zone_editor:zone:delete', async (data: Payload, callback: (response: boolean) => void) => {
|
socket.on('gm:zone_editor:zone:delete', async (data: Payload, callback: (response: boolean) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return
|
if (!character) return
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
||||||
gameMasterLogger.info(`User ${character.id} tried to delete zone but is not a game master.`)
|
gameMasterLogger.info(`User ${character.id} tried to delete zone but is not a game master.`)
|
||||||
return
|
return
|
@ -12,11 +12,11 @@ interface IPayload {}
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:zone_editor:zone:list', async (data: IPayload, callback: (response: Zone[]) => void) => {
|
socket.on('gm:zone_editor:zone:list', async (data: IPayload, callback: (response: Zone[]) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return
|
if (!character) return
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
||||||
gameMasterLogger.info(`User ${character.id} tried to list zones but is not a game master.`)
|
gameMasterLogger.info(`User ${character.id} tried to list zones but is not a game master.`)
|
||||||
return
|
return
|
@ -14,9 +14,9 @@ interface IPayload {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:zone_editor:zone:request', async (data: IPayload, callback: (response: Zone) => void) => {
|
socket.on('gm:zone_editor:zone:request', async (data: IPayload, callback: (response: Zone) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return
|
if (!character) return
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -32,9 +32,9 @@ interface IPayload {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('gm:zone_editor:zone:update', async (data: IPayload, callback: (response: Zone) => void) => {
|
socket.on('gm:zone_editor:zone:update', async (data: IPayload, callback: (response: Zone) => void) => {
|
||||||
const character = await characterRepository.getById(socket.characterId as number);
|
const character = await characterRepository.getById(socket.characterId as number)
|
||||||
if (!character) return
|
if (!character) return
|
||||||
|
|
||||||
if (character.role !== 'gm') {
|
if (character.role !== 'gm') {
|
@ -1,7 +1,7 @@
|
|||||||
import { Server } from 'socket.io'
|
import { Server } from 'socket.io'
|
||||||
import { TSocket } from '../utilities/types'
|
import { TSocket } from '../utilities/types'
|
||||||
|
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('login', () => {
|
socket.on('login', () => {
|
||||||
if (!socket.user) return
|
if (!socket.user) return
|
||||||
socket.emit('logged_in', { user: socket.user })
|
socket.emit('logged_in', { user: socket.user })
|
@ -19,13 +19,13 @@ interface IResponse {
|
|||||||
* @param socket
|
* @param socket
|
||||||
* @param io
|
* @param io
|
||||||
*/
|
*/
|
||||||
export default function (socket: TSocket, io: Server) {
|
export default function (io: Server, socket: TSocket) {
|
||||||
socket.on('zone:character:join', async (callback: (response: IResponse) => void) => {
|
socket.on('zone:character:join', async (callback: (response: IResponse) => void) => {
|
||||||
try {
|
try {
|
||||||
if (!socket.characterId) return
|
if (!socket.characterId) return
|
||||||
const character = CharacterManager.getCharacterFromSocket(socket);
|
const character = CharacterManager.getCharacterFromSocket(socket)
|
||||||
|
|
||||||
if(!character) return
|
if (!character) return
|
||||||
|
|
||||||
const zone = await ZoneRepository.getById(character.zoneId)
|
const zone = await ZoneRepository.getById(character.zoneId)
|
||||||
|
|
@ -16,7 +16,7 @@ export default class ZoneLeaveEvent {
|
|||||||
|
|
||||||
private async handleZoneLeave(): Promise<void> {
|
private async handleZoneLeave(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const character = CharacterManager.getCharacterFromSocket(this.socket);
|
const character = CharacterManager.getCharacterFromSocket(this.socket)
|
||||||
if (!character) {
|
if (!character) {
|
||||||
gameLogger.error('zone:character:leave error', 'Character not found')
|
gameLogger.error('zone:character:leave error', 'Character not found')
|
||||||
return
|
return
|
@ -17,7 +17,7 @@ export default class CharacterMove {
|
|||||||
private characterMoveService: CharacterMoveService
|
private characterMoveService: CharacterMoveService
|
||||||
private zoneEventTileService: ZoneEventTileService
|
private zoneEventTileService: ZoneEventTileService
|
||||||
private nextPath: { [index: number]: { x: number; y: number }[] } = []
|
private nextPath: { [index: number]: { x: number; y: number }[] } = []
|
||||||
private currentZoneId: {[index:number]: number} = []
|
private currentZoneId: { [index: number]: number } = []
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly io: Server,
|
private readonly io: Server,
|
||||||
@ -58,7 +58,7 @@ export default class CharacterMove {
|
|||||||
}
|
}
|
||||||
if (!character.isMoving && !character.resetMovement) {
|
if (!character.isMoving && !character.resetMovement) {
|
||||||
character.isMoving = true
|
character.isMoving = true
|
||||||
this.currentZoneId[character.id] = character.zoneId;
|
this.currentZoneId[character.id] = character.zoneId
|
||||||
await this.moveAlongPath(character, path)
|
await this.moveAlongPath(character, path)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -112,11 +112,11 @@ export default class CharacterMove {
|
|||||||
|
|
||||||
if (CharacterManager.hasResetMovement(character)) {
|
if (CharacterManager.hasResetMovement(character)) {
|
||||||
character.resetMovement = false
|
character.resetMovement = false
|
||||||
if(this.currentZoneId[character.id] === character.zoneId) {
|
if (this.currentZoneId[character.id] === character.zoneId) {
|
||||||
await this.moveAlongPath(character, this.nextPath[character.id])
|
await this.moveAlongPath(character, this.nextPath[character.id])
|
||||||
} else {
|
} else {
|
||||||
delete this.currentZoneId[character.id];
|
delete this.currentZoneId[character.id]
|
||||||
character.isMoving = false;
|
character.isMoving = false
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
this.finalizeMovement(character)
|
this.finalizeMovement(character)
|
@ -75,29 +75,33 @@ async function addHttpRoutes(app: Application) {
|
|||||||
*/
|
*/
|
||||||
app.get('/assets/zone/:zoneId', async (req: Request, res: Response) => {
|
app.get('/assets/zone/:zoneId', async (req: Request, res: Response) => {
|
||||||
const zoneId = req.params.zoneId
|
const zoneId = req.params.zoneId
|
||||||
if(!zoneId || parseInt(zoneId) === 0) {
|
if (!zoneId || parseInt(zoneId) === 0) {
|
||||||
return res.status(400).json({ message: 'Invalid zone ID' })
|
return res.status(400).json({ message: 'Invalid zone ID' })
|
||||||
}
|
}
|
||||||
|
|
||||||
const zone = await zoneRepository.getById(parseInt(zoneId))
|
const zone = await zoneRepository.getById(parseInt(zoneId))
|
||||||
if(!zone) {
|
if (!zone) {
|
||||||
return res.status(404).json({ message: 'Zone not found' })
|
return res.status(404).json({ message: 'Zone not found' })
|
||||||
}
|
}
|
||||||
|
|
||||||
const assets = await zoneManager.getZoneAssets(zone);
|
const assets = await zoneManager.getZoneAssets(zone)
|
||||||
|
|
||||||
res.json([
|
res.json([
|
||||||
...assets.tiles.map(x => { return {
|
...assets.tiles.map((x) => {
|
||||||
key: x,
|
return {
|
||||||
url: '/assets/tiles/' + x + '.png',
|
key: x,
|
||||||
group: 'tiles'
|
url: '/assets/tiles/' + x + '.png',
|
||||||
}}),
|
group: 'tiles'
|
||||||
...assets.objects.map(x => { return {
|
}
|
||||||
key: x,
|
}),
|
||||||
url: '/assets/objects/' + x + '.png',
|
...assets.objects.map((x) => {
|
||||||
group: 'objects'
|
return {
|
||||||
}})
|
key: x,
|
||||||
]);
|
url: '/assets/objects/' + x + '.png',
|
||||||
|
group: 'objects'
|
||||||
|
}
|
||||||
|
})
|
||||||
|
])
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3,46 +3,46 @@ import fs from 'fs'
|
|||||||
import path from 'path'
|
import path from 'path'
|
||||||
|
|
||||||
// Array of log types
|
// Array of log types
|
||||||
const LOG_TYPES = ['http', 'game', 'gameMaster', 'app'] as const
|
const LOG_TYPES = ['http', 'game', 'gameMaster', 'app', 'queue'] as const
|
||||||
type LogType = typeof LOG_TYPES[number]
|
type LogType = (typeof LOG_TYPES)[number]
|
||||||
|
|
||||||
const createLogger = (name: LogType) => pino({
|
const createLogger = (name: LogType) =>
|
||||||
level: process.env.LOG_LEVEL || 'debug',
|
pino({
|
||||||
transport: {
|
level: process.env.LOG_LEVEL || 'debug',
|
||||||
target: 'pino/file',
|
transport: {
|
||||||
options: {
|
target: 'pino/file',
|
||||||
destination: `./logs/${name}.log`,
|
options: {
|
||||||
mkdir: true
|
destination: `./logs/${name}.log`,
|
||||||
}
|
mkdir: true
|
||||||
},
|
}
|
||||||
formatters: {
|
},
|
||||||
level: (label) => {
|
formatters: {
|
||||||
return { level: label.toUpperCase() }
|
level: (label) => {
|
||||||
}
|
return { level: label.toUpperCase() }
|
||||||
},
|
}
|
||||||
timestamp: pino.stdTimeFunctions.isoTime,
|
},
|
||||||
base: null
|
timestamp: pino.stdTimeFunctions.isoTime,
|
||||||
})
|
base: null
|
||||||
|
})
|
||||||
|
|
||||||
// Create logger instances
|
// Create logger instances
|
||||||
const loggers = Object.fromEntries(
|
const loggers = Object.fromEntries(LOG_TYPES.map((type) => [type, createLogger(type)])) as Record<LogType, ReturnType<typeof createLogger>>
|
||||||
LOG_TYPES.map(type => [type, createLogger(type)])
|
|
||||||
) as Record<LogType, ReturnType<typeof createLogger>>
|
|
||||||
|
|
||||||
const watchLogs = () => {
|
const watchLogs = () => {
|
||||||
LOG_TYPES.forEach(type => {
|
LOG_TYPES.forEach((type) => {
|
||||||
const logFile = path.join(__dirname, '../../logs', `${type}.log`)
|
const logFile = path.join(__dirname, '../../logs', `${type}.log`)
|
||||||
|
|
||||||
fs.watchFile(logFile, (curr, prev) => {
|
fs.watchFile(logFile, (curr, prev) => {
|
||||||
if (curr.size > prev.size) {
|
if (curr.size > prev.size) {
|
||||||
const stream = fs.createReadStream(logFile, { start: prev.size, end: curr.size })
|
const stream = fs.createReadStream(logFile, { start: prev.size, end: curr.size })
|
||||||
stream.on('data', (chunk) => {
|
stream.on('data', (chunk) => {
|
||||||
console.log(`[${type}] \n ${chunk.toString()}`)
|
console.log(`[${type}]\n${chunk.toString()}`)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
export const { http: httpLogger, game: gameLogger, gameMaster: gameMasterLogger, app: appLogger } = loggers
|
export const { http: httpLogger, game: gameLogger, gameMaster: gameMasterLogger, app: appLogger, queue: queueLogger } = loggers
|
||||||
export { watchLogs }
|
|
||||||
|
export { watchLogs }
|
||||||
|
Loading…
x
Reference in New Issue
Block a user