Added logic that allows socket events to exist in sub directories, moved said events for better DX, added logics for tile management (upload & read), started working on (zone) object logics too

This commit is contained in:
2024-06-22 21:00:24 +02:00
parent 1851df8059
commit f5191aa81f
17 changed files with 270 additions and 71 deletions

View File

@ -1,6 +1,6 @@
import { Socket, Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import CharacterRepository from "../repositories/CharacterRepository";
import {TSocket} from "../../utilities/Types";
import CharacterRepository from "../../repositories/CharacterRepository";
import {Character, User} from "@prisma/client";
type SocketResponseT = {

View File

@ -1,8 +1,8 @@
import { Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import {TSocket} from "../../utilities/Types";
import {Character} from "@prisma/client";
import CharacterRepository from "../repositories/CharacterRepository";
import {ZCharacterCreate} from "../utilities/ZodTypes";
import CharacterRepository from "../../repositories/CharacterRepository";
import {ZCharacterCreate} from "../../utilities/ZodTypes";
export default function (socket: TSocket, io: Server) {
socket.on('character:create', async (data: any) => {

View File

@ -1,8 +1,8 @@
import {Server} from "socket.io";
import {TSocket} from "../utilities/Types";
import {TSocket} from "../../utilities/Types";
import {Character} from "@prisma/client";
import CharacterRepository from "../repositories/CharacterRepository";
import {ZCharacterDelete} from "../utilities/ZodTypes";
import CharacterRepository from "../../repositories/CharacterRepository";
import {ZCharacterDelete} from "../../utilities/ZodTypes";
export default function (socket: TSocket, io: Server) {
socket.on('character:delete', async (data: any) => {

View File

@ -1,7 +1,7 @@
import { Socket, Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import {TSocket} from "../../utilities/Types";
import {Character} from "@prisma/client";
import CharacterRepository from "../repositories/CharacterRepository";
import CharacterRepository from "../../repositories/CharacterRepository";
export default function CharacterList(socket: TSocket, io: Server) {
socket.on('character:list', async (data: any) => {

View File

@ -1,7 +1,7 @@
import { Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import CharacterRepository from "../repositories/CharacterRepository";
import ZoneManager from "../ZoneManager";
import {TSocket} from "../../utilities/Types";
import CharacterRepository from "../../repositories/CharacterRepository";
import ZoneManager from "../../ZoneManager";
type SocketResponseT = {
position_x: number,

View File

@ -1,7 +1,7 @@
import { Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import ZoneRepository from "../repositories/ZoneRepository";
import ZoneManager from "../ZoneManager";
import {TSocket} from "../../utilities/Types";
import ZoneRepository from "../../repositories/ZoneRepository";
import ZoneManager from "../../ZoneManager";
import {Character, Zone} from "@prisma/client";
/**

View File

@ -1,10 +1,10 @@
import { Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import ZoneRepository from "../repositories/ZoneRepository";
import ZoneManager from "../ZoneManager";
import {TSocket} from "../../utilities/Types";
import ZoneRepository from "../../repositories/ZoneRepository";
import ZoneManager from "../../ZoneManager";
import {Character, Zone} from "@prisma/client";
interface IZoneLoad {
interface IPayload {
zoneId: number;
}
@ -14,7 +14,7 @@ interface IZoneLoad {
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('character:zone:request', async (data: IZoneLoad) => {
socket.on('character:zone:request', async (data: IPayload) => {
console.log(`---User ${socket.character?.id} has requested zone.`);
if (!data.zoneId) {

View File

@ -0,0 +1,37 @@
import { Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import fs from 'fs';
interface IPayload {
}
/**
* Handle game master list tiles event
* @param socket
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:tile:list', async (data: any, callback: (response: string[]) => void) => {
// get root path
const root_folder = process.cwd();
const folder = `${root_folder}/public/tiles`;
// list the files in the folder
let tiles: string[] = [];
fs.readdir(folder, (err, files) => {
if (err) {
console.log(err);
return;
}
files.forEach(file => {
tiles.push(file);
});
// send over the list of tiles to the socket
callback(tiles);
});
});
}

View File

@ -0,0 +1,33 @@
import { Server } from "socket.io";
import {TSocket} from "../../utilities/Types";
import {writeFile} from "node:fs";
import {randomUUID} from "node:crypto";
interface IPayload {
}
/**
* Handle game master upload tile event
* @param socket
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:tile:upload', async (data: any) => {
// get root path
const root_folder = process.cwd();
const public_folder = `${root_folder}/public`;
for (const key in data) {
const filename = randomUUID();
const path = `${public_folder}/tiles/${filename}.png`;
const tile = data[key];
// save the tile to the disk, for example
writeFile(path, tile, (err) => {
// pajeet INC
});
}
});
}

View File

@ -1,10 +1,10 @@
import { Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import ZoneRepository from "../repositories/ZoneRepository";
import ZoneManager from "../ZoneManager";
import {TSocket} from "../../utilities/Types";
import ZoneRepository from "../../repositories/ZoneRepository";
import ZoneManager from "../../ZoneManager";
import {Character, Zone} from "@prisma/client";
interface IZoneLoad {
interface IPayload {
zoneId: number;
}
@ -14,7 +14,7 @@ interface IZoneLoad {
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:request', async (data: IZoneLoad) => {
socket.on('gm:zone_editor:zone:request', async (data: IPayload) => {
console.log(`---GM ${socket.character?.id} has requested zone via zone editor.`);
if (!data.zoneId) {

View File

@ -1,10 +1,10 @@
import { Server } from "socket.io";
import {TSocket} from "../utilities/Types";
import ZoneRepository from "../repositories/ZoneRepository";
import ZoneManager from "../ZoneManager";
import {TSocket} from "../../utilities/Types";
import ZoneRepository from "../../repositories/ZoneRepository";
import ZoneManager from "../../ZoneManager";
import {Character, Zone} from "@prisma/client";
interface IZoneLoad {
interface IPayload {
zoneId: number;
name: string;
width: number;
@ -19,7 +19,7 @@ interface IZoneLoad {
* @param io
*/
export default function (socket: TSocket, io: Server) {
socket.on('gm:zone_editor:zone:save', async (data: IZoneLoad) => {
socket.on('gm:zone_editor:zone:save', async (data: IPayload) => {
console.log(`---GM ${socket.character?.id} has saved zone via zone editor.`);
console.log(data);

View File

@ -8,8 +8,33 @@ import UserService from '../services/UserService';
import jwt from "jsonwebtoken";
import config from "./Config";
import {loginAccountSchema, registerAccountSchema} from "./ZodTypes";
import path from "path";
function isValidAsset(assetName: string) {
const assetPath = path.join(__dirname, 'public', 'assets', assetName);
return assetPath.startsWith(path.join(__dirname, 'public', 'assets'));
}
async function addAuthRoutes(app: Application) {
app.get('/assets/:asset', (req: Request, res: Response) => {
const assetName = req.params.asset;
if (!isValidAsset(assetName)) {
return res.status(400).send('Invalid asset name');
}
const options = {
root: path.join(__dirname, 'public', 'assets'),
};
res.sendFile(assetName, options, (err) => {
if (err) {
console.error('Error sending file:', err);
res.status(500).send('Error downloading the asset');
}
});
});
app.post('/login', async (req: Request, res: Response) => {
const { username, password } = req.body;

View File

@ -12,6 +12,7 @@ import ZoneManager from "./app/ZoneManager";
import UserManager from "./app/UserManager";
import {Authentication} from "./app/middleware/Authentication";
import CommandManager from "./app/CommandManager";
import {Dirent} from "node:fs";
export class Server
{
@ -76,15 +77,26 @@ export class Server
private async handleConnection(socket: TSocket) {
const eventsPath = path.join(__dirname, 'app', 'events');
try {
const files: string[] = await fs.promises.readdir(eventsPath);
for (const file of files) {
const module = await import(path.join(eventsPath, file));
module.default(socket, this.io);
}
await this.loadEventHandlers(eventsPath, socket);
} catch (error: any) {
throw new Error('[❌] Failed to load event handlers: ' + error.message);
}
}
private async loadEventHandlers(dir: string, socket: TSocket) {
const files: Dirent[] = await fs.promises.readdir(dir, { withFileTypes: true });
for (const file of files) {
const fullPath = path.join(dir, file.name);
if (file.isDirectory()) {
await this.loadEventHandlers(fullPath, socket);
} else if (file.isFile()) {
const module = await import(fullPath);
module.default(socket, this.io);
}
}
}
}
// Start the server