Converted socketEvents to new format

Still need to rework 'any' type Promises
This commit is contained in:
2024-09-22 18:35:07 +02:00
parent 81428ea0c2
commit a729371741
13 changed files with 279 additions and 202 deletions

View File

@ -7,14 +7,18 @@ import characterRepository from '../../../../repositories/characterRepository'
interface IPayload {}
/**
* Handle game master list object event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:object:list', async (data: any, callback: (response: Object[]) => void) => {
const character = await characterRepository.getById(socket.characterId as number)
export default class ObjectListEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:object:list', this.handleObjectList.bind(this))
}
private async handleObjectList(data: IPayload, callback: (response: Object[]) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback([])
if (character.role !== 'gm') {
@ -24,5 +28,5 @@ export default function (io: Server, socket: TSocket) {
// get all objects
const objects = await ObjectRepository.getAll()
callback(objects)
})
}
}
}

View File

@ -10,14 +10,18 @@ interface IPayload {
object: string
}
/**
* Handle game master remove object event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:object:remove', async (data: IPayload, callback: (response: boolean) => void) => {
const character = await characterRepository.getById(socket.characterId as number)
export default class ObjectRemoveEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:object:remove', this.handleObjectRemove.bind(this))
}
private async handleObjectRemove(data: IPayload, callback: (response: boolean) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)
if (character.role !== 'gm') {
@ -49,5 +53,5 @@ export default function (io: Server, socket: TSocket) {
console.log(e)
callback(false)
}
})
}
}
}

View File

@ -16,14 +16,18 @@ type Payload = {
frameHeight: number
}
/**
* Handle game master object update event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:object:update', async (data: Payload, callback: (success: boolean) => void) => {
const character = await characterRepository.getById(socket.characterId as number)
export default class ObjectUpdateEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:object:update', this.handleObjectUpdate.bind(this))
}
private async handleObjectUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)
if (character.role !== 'gm') {
@ -51,5 +55,5 @@ export default function (io: Server, socket: TSocket) {
console.error(error)
callback(false)
}
})
}
}
}

View File

@ -6,15 +6,19 @@ import prisma from '../../../../utilities/prisma'
import CharacterManager from '../../../../managers/characterManager'
import characterRepository from '../../../../repositories/characterRepository'
/**
* Handle game master new sprite event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:sprite:create', async (data: undefined, callback: (response: boolean) => void) => {
export default class SpriteCreateEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:sprite:create', this.handleSpriteCreate.bind(this))
}
private async handleSpriteCreate(data: undefined, callback: (response: boolean) => void): Promise<void> {
try {
const character = await characterRepository.getById(socket.characterId as number)
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)
if (character.role !== 'gm') {
@ -42,5 +46,5 @@ export default function (io: Server, socket: TSocket) {
console.error('Error creating sprite:', error)
callback(false)
}
})
}
}
}

View File

@ -7,14 +7,18 @@ import characterRepository from '../../../../repositories/characterRepository'
interface IPayload {}
/**
* Handle game master list sprite event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:sprite:list', async (data: any, callback: (response: Sprite[]) => void) => {
const character = await characterRepository.getById(socket.characterId as number)
export default class SpriteListEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:sprite:list', this.handleSpriteList.bind(this))
}
private async handleSpriteList(data: any, callback: (response: Sprite[]) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback([])
if (character.role !== 'gm') {
@ -24,5 +28,5 @@ export default function (io: Server, socket: TSocket) {
// get all sprites
const sprites = await SpriteRepository.getAll()
callback(sprites)
})
}
}
}

View File

@ -27,9 +27,18 @@ interface ProcessedSpriteAction extends SpriteActionInput {
}>
}
export default function (io: Server, socket: TSocket) {
socket.on('gm:sprite:update', async (data: Payload, callback: (success: boolean) => void) => {
const character = CharacterManager.getCharacterFromSocket(socket)
export default class SpriteUpdateEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:sprite:update', this.handleSpriteUpdate.bind(this))
}
private async handleSpriteUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
const character = CharacterManager.getCharacterFromSocket(this.socket)
if (character?.role !== 'gm') {
return callback(false)
}
@ -46,101 +55,101 @@ export default function (io: Server, socket: TSocket) {
console.error('Error updating sprite:', error)
callback(false)
}
})
}
function validateSpriteActions(spriteActions: Prisma.JsonValue): SpriteActionInput[] {
try {
const parsed = JSON.parse(JSON.stringify(spriteActions)) as SpriteActionInput[]
if (!Array.isArray(parsed)) {
throw new Error('spriteActions is not an array')
}
return parsed
} catch (error) {
console.error('Error parsing spriteActions:', error)
throw error
}
}
async function processSprites(spriteActions: SpriteActionInput[]): Promise<ProcessedSpriteAction[]> {
return Promise.all(
spriteActions.map(async (spriteAction) => {
const { action, sprites } = spriteAction
if (!Array.isArray(sprites) || sprites.length === 0) {
throw new Error(`Invalid sprites array for action: ${action}`)
function validateSpriteActions(spriteActions: Prisma.JsonValue): SpriteActionInput[] {
try {
const parsed = JSON.parse(JSON.stringify(spriteActions)) as SpriteActionInput[]
if (!Array.isArray(parsed)) {
throw new Error('spriteActions is not an array')
}
return parsed
} catch (error) {
console.error('Error parsing spriteActions:', error)
throw error
}
}
const buffersWithDimensions = await Promise.all(
sprites.map(async (sprite: string) => {
const buffer = Buffer.from(sprite.split(',')[1], 'base64')
const { width, height } = await sharp(buffer).metadata()
return { buffer, width, height }
async function processSprites(spriteActions: SpriteActionInput[]): Promise<ProcessedSpriteAction[]> {
return Promise.all(
spriteActions.map(async (spriteAction) => {
const { action, sprites } = spriteAction
if (!Array.isArray(sprites) || sprites.length === 0) {
throw new Error(`Invalid sprites array for action: ${action}`)
}
const buffersWithDimensions = await Promise.all(
sprites.map(async (sprite: string) => {
const buffer = Buffer.from(sprite.split(',')[1], 'base64')
const { width, height } = await sharp(buffer).metadata()
return { buffer, width, height }
})
)
const frameWidth = Math.max(...buffersWithDimensions.map((b) => b.width || 0))
const frameHeight = Math.max(...buffersWithDimensions.map((b) => b.height || 0))
return {
...spriteAction,
frameWidth,
frameHeight,
buffersWithDimensions
}
})
)
const frameWidth = Math.max(...buffersWithDimensions.map((b) => b.width || 0))
const frameHeight = Math.max(...buffersWithDimensions.map((b) => b.height || 0))
return {
...spriteAction,
frameWidth,
frameHeight,
buffersWithDimensions
}
})
)
}
async function updateDatabase(id: string, name: string, processedActions: ProcessedSpriteAction[]) {
await prisma.sprite.update({
where: { id },
data: {
name,
spriteActions: {
deleteMany: { spriteId: id },
create: processedActions.map(({ action, sprites, originX, originY, isAnimated, isLooping, frameWidth, frameHeight, frameSpeed }) => ({
action,
sprites,
originX,
originY,
isAnimated,
isLooping,
frameWidth,
frameHeight,
frameSpeed
}))
}
}
})
}
async function saveSpritesToDisk(id: string, processedActions: ProcessedSpriteAction[]) {
const publicFolder = path.join(process.cwd(), 'public', 'sprites', id)
await mkdir(publicFolder, { recursive: true })
await Promise.all(
processedActions.map(async ({ action, buffersWithDimensions, frameWidth, frameHeight }) => {
const combinedImage = await sharp({
create: {
width: frameWidth * buffersWithDimensions.length,
height: frameHeight,
channels: 4,
background: { r: 0, g: 0, b: 0, alpha: 0 }
async function updateDatabase(id: string, name: string, processedActions: ProcessedSpriteAction[]) {
await prisma.sprite.update({
where: { id },
data: {
name,
spriteActions: {
deleteMany: { spriteId: id },
create: processedActions.map(({ action, sprites, originX, originY, isAnimated, isLooping, frameWidth, frameHeight, frameSpeed }) => ({
action,
sprites,
originX,
originY,
isAnimated,
isLooping,
frameWidth,
frameHeight,
frameSpeed
}))
}
}
})
.composite(
buffersWithDimensions.map(({ buffer }, index) => ({
input: buffer,
left: index * frameWidth,
top: 0
}))
)
.png()
.toBuffer()
}
const filename = path.join(publicFolder, `${action}.png`)
await writeFile(filename, combinedImage)
})
)
}
async function saveSpritesToDisk(id: string, processedActions: ProcessedSpriteAction[]) {
const publicFolder = path.join(process.cwd(), 'public', 'sprites', id)
await mkdir(publicFolder, { recursive: true })
await Promise.all(
processedActions.map(async ({ action, buffersWithDimensions, frameWidth, frameHeight }) => {
const combinedImage = await sharp({
create: {
width: frameWidth * buffersWithDimensions.length,
height: frameHeight,
channels: 4,
background: { r: 0, g: 0, b: 0, alpha: 0 }
}
})
.composite(
buffersWithDimensions.map(({ buffer }, index) => ({
input: buffer,
left: index * frameWidth,
top: 0
}))
)
.png()
.toBuffer()
const filename = path.join(publicFolder, `${action}.png`)
await writeFile(filename, combinedImage)
})
)
}
}
}

View File

@ -7,14 +7,18 @@ import characterRepository from '../../../../repositories/characterRepository'
interface IPayload {}
/**
* Handle game master list tile event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:tile:list', async (data: any, callback: (response: Tile[]) => void) => {
const character = await characterRepository.getById(socket.characterId as number)
export default class TileListEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:tile:list', this.handleTileList.bind(this))
}
private async handleTileList(data: any, callback: (response: Tile[]) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return
if (character.role !== 'gm') {
@ -24,5 +28,5 @@ export default function (io: Server, socket: TSocket) {
// get all tiles
const tiles = await TileRepository.getAll()
callback(tiles)
})
}
}
}

View File

@ -10,14 +10,18 @@ type Payload = {
tags: string[]
}
/**
* Handle game master tile update event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:tile:update', async (data: Payload, callback: (success: boolean) => void) => {
const character = await characterRepository.getById(socket.characterId as number)
export default class TileUpdateEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:tile:update', this.handleTileUpdate.bind(this))
}
private async handleTileUpdate(data: Payload, callback: (success: boolean) => void): Promise<void> {
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)
if (character.role !== 'gm') {
@ -40,5 +44,5 @@ export default function (io: Server, socket: TSocket) {
console.error(error)
callback(false)
}
})
}
}
}

View File

@ -11,15 +11,19 @@ interface ITileData {
[key: string]: Buffer
}
/**
* Handle game master upload tile event
* @param socket
* @param io
*/
export default function (io: Server, socket: TSocket) {
socket.on('gm:tile:upload', async (data: ITileData, callback: (response: boolean) => void) => {
export default class TileUploadEvent {
constructor(
private readonly io: Server,
private readonly socket: TSocket
) {}
public listen(): void {
this.socket.on('gm:tile:upload', this.handleTileUpload.bind(this))
}
private async handleTileUpload(data: ITileData, callback: (response: boolean) => void): Promise<void> {
try {
const character = await characterRepository.getById(socket.characterId as number)
const character = await characterRepository.getById(this.socket.characterId as number)
if (!character) return callback(false)
if (character.role !== 'gm') {
@ -50,5 +54,5 @@ export default function (io: Server, socket: TSocket) {
gameMasterLogger.error('Error uploading tile:', error)
callback(false)
}
})
}
}
}