Skip to content
This repository has been archived by the owner on Oct 3, 2023. It is now read-only.

Developer client ids rework #417

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions server/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ var Server = IgeClass.extend({
self.postReqTimestamps = []
self.started_at = new Date();
self.lastSnapshot = [];
self.developerClientIds = [];

self.logTriggers = {

Expand Down Expand Up @@ -521,14 +522,14 @@ var Server = IgeClass.extend({
// send dev logs to developer every second
var logInterval = setInterval(function () {
// send only if developer client is connect
if (ige.isServer && ((self.developerClientId && ige.server.clients[self.developerClientId]) || process.env.ENV == 'standalone')) {
if (ige.isServer && self.developerClientIds.length) {
ige.variable.devLogs.status = ige.server.getStatus();
ige.network.send('devLogs', ige.variable.devLogs, self.developerClientId);

if (ige.script.errorLogs != {}) {
ige.network.send('errorLogs', ige.script.errorLogs, self.developerClientId);
ige.script.errorLogs = {};
}
const sendErrors = Object.keys(ige.script.errorLogs).length;
self.developerClientIds.forEach(id => {
ige.network.send('devLogs', ige.variable.devLogs, id);
if (sendErrors) ige.network.send('errorLogs', ige.script.errorLogs, id);
});
if (sendErrors) ige.script.errorLogs = {};
}
ige.physicsTickCount = 0;
ige.unitBehaviourCount = 0;
Expand Down
4 changes: 4 additions & 0 deletions src/gameClasses/Player.js
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@ var Player = IgeEntity.extend({
},

remove: function () {
if (ige.isServer) {
const i = ige.server.developerClientIds.indexOf(this._stats.clientId);
if (i != -1) ige.server.developerClientIds.splice(i, 1);
}
if (this._stats.controlledBy == 'human' && ige.script) // do not send trigger for neutral player
{
ige.trigger.fire('playerLeavesGame', { playerId: this.id() });
Expand Down
6 changes: 2 additions & 4 deletions src/gameClasses/components/GameComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,7 @@ var GameComponent = IgeEntity.extend({
var isOwner = ige.server.owner == data._id;
var isInvitedUser = false;
if (ige.game.data.defaultData && ige.game.data.defaultData.invitedUsers) {
isInvitedUser = ige.game.data.defaultData.invitedUsers.includes(
data._id
);
isInvitedUser = ige.game.data.defaultData.invitedUsers.some(e => e._id == data._id);
}
var isUserAdmin = false;
var isUserMod = false;
Expand All @@ -136,7 +134,7 @@ var GameComponent = IgeEntity.extend({
// if User/Admin has access to game then show developer logs
if (isOwner || isInvitedUser || isUserAdmin) {
GameComponent.prototype.log(`owner connected. _id: ${data._id}`);
ige.server.developerClientId = data.clientId;
ige.server.developerClientIds.push(data.clientId);
}
}

Expand Down
8 changes: 6 additions & 2 deletions src/gameClasses/components/script/VariableComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -2005,10 +2005,14 @@ var VariableComponent = IgeEntity.extend({
updateDevConsole: function (data) {
var self = this;
// if a developer is connected, send
if (ige.isServer && (ige.server.developerClientId || process.env.ENV === 'standalone' || process.env.ENV == 'standalone-remote')) {
if (ige.isServer && (ige.server.developerClientIds.length || process.env.ENV === 'standalone' || process.env.ENV == 'standalone-remote')) {
// only show 'object' string if env variable is object
if (typeof data.params.newValue == 'object') {
self.devLogs[data.params.variableName] = `object ${(data.params.newValue._stats) ? `(${data.params.newValue._category}): ${data.params.newValue._stats.name}` : ''}`;
if (data.params.newValue._stats) {
self.devLogs[data.params.variableName] = `object (${data.params.newValue._category}): ${data.params.newValue._stats.name}`;
} else {
self.devLogs[data.params.variableName] = 'object';
}
} else // otherwise, show the actual value
{
self.devLogs[data.params.variableName] = data.params.newValue;
Expand Down