Merge branch 'master' into more-queue-changes

api/helpers/get-queue-object.js

@@ -20,7 +20,8 @@ module.exports = {
       return exits.success({
         on: function () { },
         process: function () { },
-        empty: function () { }
+        empty: function () { },
+        add: function() {}
       });
     }
     const queue = new Bull(

api/hooks/discordChatBridge/chatBridgeChannel.js

@@ -217,6 +217,9 @@ class ChatBridgeChannel {
 
   async sendRichDisconnectedMessageToDiscord(disconnectedMsg) {
     let disconnectedPlayer = disconnectedMsg.player;
+    if (!disconnectedPlayer) {
+      return;
+    }
 
     let gblBans = await BanEntry.find({
       steamId: disconnectedPlayer.steamId

api/hooks/sdtdLogs/LoggingObject.js

@@ -56,7 +56,6 @@ class LoggingObject extends EventEmitter {
   };
 
   async init(ms = sails.config.custom.logCheckInterval) {
-
     if (!ms) {
       ms = 3000;
     }
@@ -166,14 +165,17 @@ class LoggingObject extends EventEmitter {
     );
   }
 
-  async setLastLogLine() {
+  async setLastLogLine(lastLogLine) {
     const server = await SdtdServer.findOne(this.serverId)
-    const webUIUpdate = await SdtdApi.getWebUIUpdates(SdtdServer.getAPIConfig(server));
-    const lastLogLine = parseInt(webUIUpdate.newlogs) + 1;
+    if (!lastLogLine && lastLogLine !== 0) {
+      const webUIUpdate = await SdtdApi.getWebUIUpdates(SdtdServer.getAPIConfig(server));
+      lastLogLine = parseInt(webUIUpdate.newlogs) + 1;
+    }
     await sails.helpers.redis.set(
       `sdtdserver:${this.serverId}:sdtdLogs:lastLogLine`,
       lastLogLine
     );
+    this.lastLogLine = lastLogLine;
     this.emptyResponses = 0;
     return lastLogLine;
   }

api/hooks/sdtdLogs/logProcessor.js

@@ -3,13 +3,7 @@ const handleLogLine = require("./handleLogLine");
 
 module.exports = async function(job) {
   const resultLogs = [];
-  // Get latest log line from Redis
-  let lastLogLine = parseInt(
-    await sails.helpers.redis.get(
-      `sdtdserver:${job.data.server.id}:sdtdLogs:lastLogLine`
-    )
-  );
-
+  let lastLogLine = job.data.lastLogLine;
   // If latest log line is not found, get it from the server
   if (!lastLogLine) {
     const webUIUpdate = await sails.helpers.sdtdApi.getWebUIUpdates(SdtdServer.getAPIConfig(job.data.server));
@@ -22,12 +16,6 @@ module.exports = async function(job) {
   // Adjust latest log line based on new logs we got
   lastLogLine = lastLogLine + newLogs.entries.length;
 
-  // Set latest log line in Redis
-  await sails.helpers.redis.set(
-    `sdtdserver:${job.data.server.id}:sdtdLogs:lastLogLine`,
-    lastLogLine
-  );
-
   // Parse these logs into usable data
   let index = -1;
   for (const line of newLogs.entries) {
@@ -46,12 +34,6 @@ module.exports = async function(job) {
     }
   }
 
-  // Set last success date in Redis
-  await sails.helpers.redis.set(
-    `sdtdserver:${job.data.server.id}:sdtdLogs:lastSuccess`,
-    Date.now()
-  );
-
   return Promise.resolve({
     serverId: job.data.server.id,
     lastLogLine,

test/integration/cron-job/cron.test.js

@@ -3,16 +3,16 @@ var expect = require("chai").expect;
 
 describe('POST /api/sdtdserver/cron', function () {
 
-  it('should return 200 with valid info', function (done) {
-    supertest(sails.hooks.http.app)
+  it('should return 200 with valid info', async function () {
+    const response = await supertest(sails.hooks.http.app)
       .post('/api/sdtdserver/cron')
       .send({
         serverId: 1,
         command: 'help',
         temporalValue: '0 */6 * * *'
       })
-      .expect('Content-Type', /json/)
-      .expect(200, done);
+    expect(response.statusCode).to.be.eql(200);
+    expect(response.header['content-type']).to.include('json');
   });
   it('should return 400 when command or temporal value is not given', function (done) {
     supertest(sails.hooks.http.app)

test/integration/hooks/sdtdLogs/logProcessor.test.js

@@ -4,10 +4,9 @@ const logProcessor = require("../../../../api/hooks/sdtdLogs/logProcessor");
 
 describe('logProcessor', function () {
   it('Confirm able to fetch log messages', async function () {
-    sails.cache[`sdtdserver:${sails.testServer.id}:sdtdLogs:lastLogLine`] = 1100;
     sinon.stub(sails.helpers.sdtdApi, "getWebUIUpdates").callsFake(async function () {
       return {
-        newlogs: 1100
+        newlogs: 1099
       }
     });
     sinon.stub(sails.helpers.sdtdApi, "getLog").callsFake(async function () {

test/integration/player-teleport/playerTeleport.test.js

@@ -47,19 +47,16 @@ describe('Player teleports', function () {
       newTeleport = _.omit(newTeleport, 'id');
       let requestOptions = newTeleport;
       requestOptions.id = testTeleports[0].id;
-      return supertest(sails.hooks.http.app)
-        .post('/api/teleport')
-        .send(requestOptions)
-        .expect(async function (res) {
-          let record = await PlayerTeleport.findOne(testTeleports[0]);
-          return expect(record).to.be.eq(requestOptions);
-        })
-        .expect(200)
-        .expect('Content-Type', /json/);
+      const res = await supertest(sails.hooks.http.app).post('/api/teleport').send(requestOptions);
+      expect(res.statusCode).to.equal(200);
+      expect(res.headers['content-type']).to.include('json');
+
+      let record = await PlayerTeleport.findOne(testTeleports[0].id);
+      expect(record).to.eql(requestOptions);
     });
 
-    it('should return 400 when id is not given', function () {
-      return supertest(sails.hooks.http.app)
+    it('should return 400 when id is not given', async function () {
+      await supertest(sails.hooks.http.app)
         .post('/api/teleport')
         .expect(400);
     });