AsgardEternal/SquadJSDocker
1
0
Fork 0
mirror of https://github.com/AsgardEternal/SquadJSDocker.git synced 2024-12-30 15:19:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4 from AsgardEternal/Development

Browse Source 
update Testing
This commit is contained in:
Skillet 2023-03-06 16:12:22 -05:00 committed by GitHub
commit 4c7eba4d82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 94 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/main.yml vendored
View File

@ -3,7 +3,7 @@ name: Docker Image CI
on:
workflow_dispatch:
schedule:
- cron: '30 17 * * *'
- cron: '45 18 * * *'
push:
branches:
- Development
@ -33,6 +33,4 @@ jobs:
context: .
file: ./Dockerfile
push: true
cache-from: type=registry,ref=${{ vars.DOCKER_REGISTRY_URL }}/squadjs:latest
cache-to: type=inline
tags: "${{ vars.DOCKER_REGISTRY_URL }}/squadjs:latest"

129
squadjsPlugins/db-log-addOn.js
View File

@ -30,6 +30,8 @@ export default class DBLogPlayerTime extends DBLog {
super(server, options, connectors);
this.seeding = false;
this.repairSessions = true;
this.lastTickTime = null;
this.createModel(
'PlayerTime',
@ -39,9 +41,6 @@ export default class DBLogPlayerTime extends DBLog {
primaryKey: true,
autoIncrement: true
},
playerName: {
type: DataTypes.STRING
},
joinTime: {
type: DataTypes.DATE
},
@ -77,59 +76,117 @@ export default class DBLogPlayerTime extends DBLog {
async prepareToMount() {
await super.prepareToMount();
await this.models.PlayerTime.sync();
await this.models.PlayerTime.sync();
}
async mount() {
console.log('Mounting db-log');
await super.mount();
this.server.on('PLAYER_CONNECTED', this.onPlayerConnected);
this.server.on('PLAYER_DISCONNECTED', this.onPlayerDisconnected);
console.log('finished mounting db-log');
this.server.on('PLAYER_CONNECTED', this.onPlayerConnected);
this.server.on('PLAYER_DISCONNECTED', this.onPlayerDisconnected);
console.log('finished mounting db-log-addOn');
}
async repairDB() {
console.log('starting DB repair');
await super.repairDB();
console.log('starting DB repair for addOn');
let lastTickTime = await this.models.TickRate.findOne({
where: { server: this.options.overrideServerID || this.server.id},
order: [['id', 'DESC']],
logging: console.log
}
);
console.log('last tick found:', lastTickTime);
let lastServerDate = lastTickTime.time;
let lastServerTime = lastServerDate.getFullYear() + '-' + (lastServerDate.getMonth() + 1) + '-' + lastServerDate.getDate()+' '+lastServerDate.getHours()+':'+lastServerDate.getMinutes()+':'+lastServerDate.getSeconds();
console.log('last time found:', lastServerTime);
let playerOnlineID = [];
playerOnlineID.push(0);
for (const player of this.server.players){
playerOnlineID.push(player.steamID);
}
console.log('players online:', playerOnlineID);
const {ne, not, notIn, is} = Sequelize.Op;
let updateVals = { leaveTime: lastServerTime };
let whereStuff = {
leaveTime: {[is]: null},
server: this.options.overrideServerID || this.server.id,
player: {[notIn]: playerOnlineID}
};
console.log(updateVals);
console.log(whereStuff);
let rowUpdate = await this.models.PlayerTime.update(
updateVals, {
where: whereStuff,
logging: console.log
}
);
console.log('updated playerTimes row count: %i', rowUpdate[0]);
console.log('finish DB repair');
}
async unmount() {
this.models.PlayerTime.update(
{ leaveTime: 0 },
{ where: { leaveTime: null , server: this.options.overrideServerID || this.server.id } }
);
this.models.PlayerTime.update(
{ leaveTime: 0 },
{ where: { leaveTime: null , server: this.options.overrideServerID || this.server.id } }
);
await super.unmount();
this.server.removeEventListener('PLAYER_CONNECTED', this.onPlayerConnected);
this.server.removeEventListener('PLAYER_DISCONNECTED', this.onPlayerDisconnected);
this.server.removeEventListener('PLAYER_CONNECTED', this.onPlayerConnected);
this.server.removeEventListener('PLAYER_DISCONNECTED', this.onPlayerDisconnected);
}
async onUpdatedA2SInformation(info) {
await super.onUpdatedA2SInformation(info);
if(info.a2sPlayerCount >= this.options.seedingThreshold && this.seeding === true) {
await this.models.PlayerTime.update(
{ seedTime: info.time },
{ where: { seedTime: null, joinedSeeding: 1, leaveTime: null, server: this.options.overrideServerID || this.server.id } }
);
}
if(this.seeding === true && info.a2sPlayerCount >= this.options.seedingThreshold) this.seeding = false;
else if(this.seeding === false && (info.a2sPlayerCount-20) < this.options.seedingThreshold) this.seeding = true;
if((this.seeding == true) && (info.a2sPlayerCount >= this.options.seedingThreshold)){
console.log('switching to Live');
this.seeding = false;
let curDateTime = new Date();
let timeNow = curDateTime.getFullYear() + '-' + (curDateTime.getMonth() + 1) + '-' + curDateTime.getDate()+' '+curDateTime.getHours()+':'+curDateTime.getMinutes()+':'+curDateTime.getSeconds();
console.log(timeNow);
await this.models.PlayerTime.update(
{ seedTime: timeNow },
{ where: { seedTime: null, joinedSeeding: 1, leaveTime: null, server: this.options.overrideServerID || this.server.id } }
);
}else if(this.seeding == false && (info.a2sPlayerCount-20) < this.options.seedingThreshold){
console.log('switching to seeding');
this.seeding = true;
}
}
async onPlayerConnected(info) {
console.log(info);
if(info.player){
await this.models.PlayerTime.create({
server: this.options.overrideServerID || this.server.id,
player: info.player.steamID,
playerName: info.player.name,
joinTime: info.time,
joinedSeeding: this.seeding
});
}
if(info.player){
await this.models.SteamUser.upsert({
steamID: info.player.steamID,
lastName: info.player.name
});
await this.models.PlayerTime.create({
server: this.options.overrideServerID || this.server.id,
player: info.steamID,
joinTime: info.time,
joinedSeeding: this.seeding
});
console.log('player connect complete');
} else console.log('player is null');
}
async onPlayerDisconnected(info) {
await sleep (500);
console.log(info);
if(info.player){
await this.models.PlayerTime.update(
{ leaveTime: info.time },
{ where: { player: info.player.steamID, leaveTime: null, server: this.options.overrideServerID || this.server.id } }
);
}
if(info.player){
await this.models.SteamUser.upsert({
steamID: info.player.steamID,
lastName: info.player.name
});
}
let rowAffect = await this.models.PlayerTime.update(
{ leaveTime: info.time },
{ where: { player: info.steamID, leaveTime: null, server: this.options.overrideServerID || this.server.id } }
);
console.log('player disconnect rows update: %i', rowAffect[0]);
}
}