noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #218 from thecodingmachine/develop 

Deploy to prod
This commit is contained in:
David Négrier 2020-07-05 17:20:56 +02:00 committed by GitHub
parent c422f3ccef b01958107b
commit 89007e7a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
back/src/Controller/IoSocketController.ts
View File

@ -48,12 +48,12 @@ export class IoSocketController {
this.nbClientsGauge = new Gauge({
name: 'workadventure_nb_sockets',
help: 'Number of connected sockets',
labelNames: [ 'host' ]
labelNames: [ ]
});
this.nbClientsPerRoomGauge = new Gauge({
name: 'workadventure_nb_clients_per_room',
help: 'Number of clients per room',
labelNames: [ 'host', 'room' ]
labelNames: [ 'room' ]
});
// Authentication with token. it will be decoded and stored in the socket.
@ -139,7 +139,7 @@ export class IoSocketController {
// Let's log server load when a user joins
const srvSockets = this.Io.sockets.sockets;
this.nbClientsGauge.inc({ host: os.hostname() });
this.nbClientsGauge.inc();
console.log(new Date().toISOString() + ' A user joined (', Object.keys(srvSockets).length, ' connected users)');
si.currentLoad().then(data => console.log(' Current load: ', data.avgload));
si.currentLoad().then(data => console.log(' CPU: ', data.currentload, '%'));
@ -262,7 +262,7 @@ export class IoSocketController {
// Let's log server load when a user leaves
const srvSockets = this.Io.sockets.sockets;
this.nbClientsGauge.dec({ host: os.hostname() });
this.nbClientsGauge.dec();
console.log('A user left (', Object.keys(srvSockets).length, ' connected users)');
si.currentLoad().then(data => console.log('Current load: ', data.avgload));
si.currentLoad().then(data => console.log('CPU: ', data.currentload, '%'));
@ -295,27 +295,30 @@ export class IoSocketController {
leaveRoom(Client : ExSocketInterface){
// leave previous room and world
if(Client.roomId){
Client.to(Client.roomId).emit(SockerIoEvent.USER_LEFT, Client.userId);
try {
Client.to(Client.roomId).emit(SockerIoEvent.USER_LEFT, Client.userId);
//user leave previous world
const world : World|undefined = this.Worlds.get(Client.roomId);
if(world){
world.leave(Client);
if (world.isEmpty()) {
this.Worlds.delete(Client.roomId);
//user leave previous world
const world: World | undefined = this.Worlds.get(Client.roomId);
if (world) {
world.leave(Client);
if (world.isEmpty()) {
this.Worlds.delete(Client.roomId);
}
}
//user leave previous room
Client.leave(Client.roomId);
} finally {
this.nbClientsPerRoomGauge.dec({ room: Client.roomId });
delete Client.roomId;
}
//user leave previous room
Client.leave(Client.roomId);
this.nbClientsPerRoomGauge.dec({ host: os.hostname(), room: Client.roomId });
delete Client.roomId;
}
}
private joinRoom(Client : ExSocketInterface, roomId: string, position: PointInterface): World {
//join user in room
Client.join(roomId);
this.nbClientsPerRoomGauge.inc({ host: os.hostname(), room: roomId });
this.nbClientsPerRoomGauge.inc({ room: roomId });
Client.roomId = roomId;
Client.position = position;

44
back/src/Model/Group.ts
View File

@ -7,13 +7,13 @@ export class Group {
static readonly MAX_PER_GROUP = 4;
private id: string;
private users: UserInterface[];
private users: Set<UserInterface>;
private connectCallback: ConnectCallback;
private disconnectCallback: DisconnectCallback;
constructor(users: UserInterface[], connectCallback: ConnectCallback, disconnectCallback: DisconnectCallback) {
this.users = [];
this.users = new Set<UserInterface>();
this.connectCallback = connectCallback;
this.disconnectCallback = disconnectCallback;
this.id = uuid();
@ -24,7 +24,7 @@ export class Group {
}
getUsers(): UserInterface[] {
return this.users;
return Array.from(this.users.values());
}
getId() : string{
@ -42,8 +42,8 @@ export class Group {
x += user.position.x;
y += user.position.y;
});
x /= this.users.length;
y /= this.users.length;
x /= this.users.size;
y /= this.users.size;
return {
x,
y
@ -51,45 +51,27 @@ export class Group {
}
isFull(): boolean {
return this.users.length >= Group.MAX_PER_GROUP;
return this.users.size >= Group.MAX_PER_GROUP;
}
isEmpty(): boolean {
return this.users.length <= 1;
return this.users.size <= 1;
}
join(user: UserInterface): void
{
// Broadcast on the right event
this.connectCallback(user.id, this);
this.users.push(user);
this.users.add(user);
user.group = this;
}
isPartOfGroup(user: UserInterface): boolean
{
return this.users.includes(user);
}
/*removeFromGroup(users: UserInterface[]): void
{
for(let i = 0; i < users.length; i++){
let user = users[i];
const index = this.users.indexOf(user, 0);
if (index > -1) {
this.users.splice(index, 1);
}
}
}*/
leave(user: UserInterface): void
{
const index = this.users.indexOf(user, 0);
if (index === -1) {
throw new Error("Could not find user in the group");
const success = this.users.delete(user);
if (success === false) {
throw new Error("Could not find user "+user.id+" in the group "+this.id);
}
this.users.splice(index, 1);
user.group = undefined;
// Broadcast on the right event
@ -102,8 +84,8 @@ export class Group {
*/
destroy(): void
{
this.users.forEach((user: UserInterface) => {
for (const user of this.users) {
this.leave(user);
})
}
}
}

15
back/src/Model/World.ts
View File

@ -20,7 +20,7 @@ export class World {
// Users, sorted by ID
private readonly users: Map<string, UserInterface>;
private readonly groups: Group[];
private readonly groups: Set<Group>;
private readonly connectCallback: ConnectCallback;
private readonly disconnectCallback: DisconnectCallback;
@ -35,7 +35,7 @@ export class World {
groupDeletedCallback: GroupDeletedCallback)
{
this.users = new Map<string, UserInterface>();
this.groups = [];
this.groups = new Set<Group>();
this.connectCallback = connectCallback;
this.disconnectCallback = disconnectCallback;
this.minDistance = minDistance;
@ -45,7 +45,7 @@ export class World {
}
public getGroups(): Group[] {
return this.groups;
return Array.from(this.groups.values());
}
public getUsers(): Map<string, UserInterface> {
@ -99,7 +99,7 @@ export class World {
user,
closestUser
], this.connectCallback, this.disconnectCallback);
this.groups.push(group);
this.groups.add(group);
}
}
@ -132,11 +132,10 @@ export class World {
if (group.isEmpty()) {
this.groupDeletedCallback(group.getId(), user);
group.destroy();
const index = this.groups.indexOf(group, 0);
if (index === -1) {
throw new Error("Could not find group");
if (!this.groups.has(group)) {
throw new Error("Could not find group "+group.getId()+" referenced by user "+user.id+" in World.");
}
this.groups.splice(index, 1);
this.groups.delete(group);
} else {
this.groupUpdatedCallback(group);
}

1
back/tsconfig.json
View File

@ -4,6 +4,7 @@
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
"downlevelIteration": true,
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */

5
front/package.json
View File

@ -15,7 +15,8 @@
"typescript": "^3.8.3",
"webpack": "^4.42.1",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3"
"webpack-dev-server": "^3.10.3",
"webpack-merge": "^4.2.2"
},
"dependencies": {
"@types/axios": "^0.14.0",
@ -28,7 +29,7 @@
},
"scripts": {
"start": "webpack-dev-server --open",
"build": "webpack",
"build": "webpack --config webpack.prod.js",
"test": "ts-node node_modules/jasmine/bin/jasmine --config=jasmine.json",
"lint": "node_modules/.bin/eslint src/ . --ext .ts",
"fix": "node_modules/.bin/eslint --fix src/ . --ext .ts"

2
front/src/Phaser/Game/GameScene.ts
View File

@ -247,7 +247,7 @@ export class GameScene extends Phaser.Scene {
//initalise map
this.Map = this.add.tilemap(this.MapKey);
this.mapFile.tilesets.forEach((tileset: ITiledTileSet) => {
this.Terrains.push(this.Map.addTilesetImage(tileset.name, tileset.name));
this.Terrains.push(this.Map.addTilesetImage(tileset.name, tileset.name, tileset.tilewidth, tileset.tileheight, tileset.margin, tileset.spacing/*, tileset.firstgid*/));
});
//permit to set bound collision

7
front/webpack.prod.js Normal file
View File

@ -0,0 +1,7 @@
const merge = require('webpack-merge');
const common = require('./webpack.config.js');
module.exports = merge(common, {
mode: 'production',
devtool: 'source-map'
});

7
front/yarn.lock
View File

@ -4494,6 +4494,13 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"
webpack-merge@^4.2.2:
version "4.2.2"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
dependencies:
lodash "^4.17.15"
webpack-sources@^1.4.0, webpack-sources@^1.4.1:
version "1.4.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"