package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuke",
-  "version": "1.5.0",
+  "version": "1.1.9",
   "description": "APL Esports' Nuke Server",
   "main": "index.js",
   "scripts": {
@@ -11,19 +11,17 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "axios": "^1",
+    "axios": "^0.21.1",
-    "bufferutil": "^4.0.8",
     "cors": "^2.8.5",
-    "dotenv": "^8",
+    "dotenv": "^8.2.0",
-    "express": "^4",
+    "express": "^4.17.1",
-    "helmet": "^7",
+    "helmet": "^4.1.0",
-    "mongoose": "^8",
+    "mongoose": "^5.11.19",
-    "morgan": "^1.10",
+    "morgan": "^1.10.0",
-    "utf-8-validate": "^6.0.3",
+    "uuid": "^8.3.2",
-    "uuid": "^9",
+    "ws": "^7.4.4"
-    "ws": "^8"
   },
   "devDependencies": {
-    "nodemon": "^3.0"
+    "nodemon": "^2.0.4"
   }
 }

src/index.js

@@ -6,7 +6,11 @@ const { get } = require('./uuids')
 const handler = require('./ws/handler')
 const { subscribe } = require('./ws/streams')
 
-mongoose.connect(process.env.MONGO_URI)
+mongoose.connect(process.env.MONGO_URI, {
+    useNewUrlParser: true,
+    useUnifiedTopology: true,
+    useFindAndModify: false,
+})
 
 const db = mongoose.connection
 db.once('open', () => console.log('Connected to mongodb instance!'))
@@ -27,7 +31,8 @@ wss1.on('connection', (ws, req) => {
 })
 
 wss2.on('connection', (ws, req) => {
-    subscribe(ws, req.id, req.type)
+    const id = req.id
+    subscribe(ws, id)
 })
 
 const server = app.listen(port, () => {
@@ -46,15 +51,6 @@ server.on('upgrade', (req, socket, head) => {
         if (token != null || token != '' || token != "") {
             wss2.handleUpgrade(req, socket, head, (socket) => {
                     req.id = token
-                    req.type = 'stream'
-                    wss2.emit('connection', socket, req)
-            })
-        }
-    } else if (pathname[1] === 'bracket') {
-        if (token != null || token != '' || token != "") {
-            wss2.handleUpgrade(req, socket, head, (socket) => {
-                    req.id = token
-                    req.type = 'bracket'
                     wss2.emit('connection', socket, req)
             })
         }

src/models/brackets.js

@@ -1,26 +0,0 @@
-const { Schema, model } = require('mongoose')
-
-const brackets = new Schema({
-  name: {
-    type: String,
-    required: true,
-  },
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
-  event: {
-    type: Schema.Types.ObjectId,
-    ref: 'Event',
-  },
-  matches: [{
-    type: Schema.Types.ObjectId,
-    ref: 'Matches',
-  }],
-})
-
-const Bracket = model('Brackets', brackets)
-
-module.exports = Bracket

src/models/casters.js

@@ -9,12 +9,6 @@ const casters = new Schema({
     type: String,
     required: true,
   },
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
   twitter: {
     type: String,
     required: true,

src/models/events.js

@@ -5,17 +5,7 @@ const events = new mongoose.Schema({
     type: String,
     required: true,
     unique: true,
-  },
+  }
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
-  streams: [{
-    type: mongoose.Schema.Types.ObjectId,
-    ref: 'Streams',
-  }]
 });
 
 const Event = mongoose.model('Event', events)

src/models/matches.js

@@ -42,12 +42,6 @@ const matches = new Schema({
     type: String,
     required: true,
   },
-  type_arabic: {
-    type: String,
-  },
-  type_jpn: {
-    type: String,
-  },
   bestOf: {
     type: String,
     required: true,

src/models/rosters.js

@@ -28,12 +28,6 @@ const players = new Schema({
     type: String,
     required: true,
   },
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
   account: {
     type: String,
     required: true,
@@ -45,12 +39,6 @@ const rosters = new Schema({
     type: String,
     required: true,
   },
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
   logo: {
     type: String,
     required: true,

src/models/stats.js

@@ -1,67 +0,0 @@
-const { Schema, model } = require('mongoose')
-
-const stats = new Schema({
-  name: {
-    type: String,
-    required: true,
-  },
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
-  image: {
-    type: String,
-    required: true,
-  },
-  image_full: {
-    type: Boolean,
-    default: false,
-    required: true,
-  },
-  win_name: {
-    type: String,
-    required: true,
-  },
-  win: {
-    type: String,
-    required: true,
-  },
-  goals_name: {
-    type: String,
-    required: true,
-  },
-  goals: {
-    type: String,
-    required: true,
-  },
-  shots_name: {
-    type: String,
-    required: true,
-  },
-  shots: {
-    type: String,
-    required: true,
-  },
-  saves_name: {
-    type: String,
-    required: true,
-  },
-  saves: {
-    type: String,
-    required: true,
-  },
-  assists_name: {
-    type: String,
-    required: true,
-  },
-  assists: {
-    type: String,
-    required: true,
-  },
-})
-
-const Stat = model('Stats', stats)
-
-module.exports = Stat

src/models/streams.js

@@ -5,12 +5,6 @@ const streams = new Schema({
     type: String,
     required: true,
   },
-  name_arabic: {
-    type: String,
-  },
-  name_jpn: {
-    type: String,
-  },
   event: {
     type: Schema.Types.ObjectId,
     ref: 'Event',
@@ -25,11 +19,7 @@ const streams = new Schema({
   }],
   hosts: [{
     type: Schema.Types.ObjectId,
-    ref: 'Casters',
+    ref: 'Hosts',
-  }],
-  stats: [{
-    type: Schema.Types.ObjectId,
-    ref: 'Stats'
   }],
 })
 

src/ws/channels.js

@@ -2,11 +2,9 @@ const channels = [
   'rosters',
   'matches',
   'streams',
-  'stats',
   'events',
   'casters',
   'hosts',
-  'brackets',
 ];
 
 const events = [

src/ws/crud.js

@@ -1,11 +1,9 @@
 const events = require('../models/events')
 const rosters = require('../models/rosters')
 const matches = require('../models/matches')
-const stats = require('../models/stats')
 const streams = require('../models/streams')
 const casters = require('../models/casters')
 const hosts = require('../models/hosts')
-const brackets = require('../models/brackets')
 
 const eventFns = {
   getAll: async () => {
@@ -23,7 +21,10 @@ const eventFns = {
   create: async (data) => {
     try {
       const ev = new events(data)
-      await ev.save();
+      ev.save((err) => {
+        if (err)
+          console.warn(err)
+      })
     } catch (e) {
       console.warn(e)
     }
@@ -46,7 +47,10 @@ const rosterFns = {
   create: async (data) => {
     try {
       const ev = new rosters(data)
-      await ev.save();
+      ev.save((err) => {
+        if (err)
+          console.warn(err)
+      })
     } catch (e) {
       console.warn(e)
     }
@@ -69,30 +73,10 @@ const matchFns = {
   create: async (data) => {
     try {
       const ev = new matches(data)
-      await ev.save();
+      ev.save((err) => {
-    } catch (e) {
+        if (err)
-      console.warn(e)
+          console.warn(err)
-    }
+      })
-  }
-}
-
-const statsFns = {
-  getAll: async () => {
-    return await stats.find().exec()
-  },
-  getById: async (id) => {
-    return await stats.findById(id).exec()
-  },
-  update: async(id, data) => {
-    return await stats.findByIdAndUpdate(id, data).exec()
-  },
-  delete: async (id) => {
-    return await stats.findByIdAndDelete(id).exec()
-  },
-  create: async (data) => {
-    try {
-      const ev = new stats(data)
-      await ev.save();
     } catch (e) {
       console.warn(e)
     }
@@ -107,13 +91,13 @@ const streamFns = {
     return await streams.find().populate('event').populate({
       path: 'matches',
       populate: [{ path: 'orange' }, { path: 'blue' }],
-    }).populate('casters').populate('hosts').populate('stats').lean().exec()
+    }).populate('casters').populate('hosts').exec()
   },
   getById: async (id) => {
     return await streams.findById(id).populate('event').populate({
       path: 'matches',
       populate: [{ path: 'orange' }, { path: 'blue' }],
-    }).populate('casters').populate('hosts').populate('stats').lean().exec()
+    }).populate('casters').populate('hosts').exec()
   },
   update: async(id, data) => {
     return await streams.findByIdAndUpdate(id, data).exec()
@@ -124,7 +108,10 @@ const streamFns = {
   create: async (data) => {
     try {
       const ev = new streams(data)
-      await ev.save();
+      ev.save((err) => {
+        if (err)
+          console.warn(err)
+      })
     } catch (e) {
       console.warn(e)
     }
@@ -147,7 +134,10 @@ const casterFns = {
   create: async (data) => {
     try {
       const ev = new casters(data)
-      await ev.save();
+      ev.save((err) => {
+        if (err)
+          console.warn(err)
+      })
     } catch (e) {
       console.warn(e)
     }
@@ -170,39 +160,10 @@ const hostFns = {
   create: async (data) => {
     try {
       const ev = new hosts(data)
-      await ev.save();
+      ev.save((err) => {
-    } catch (e) {
+        if (err)
-      console.warn(e)
+          console.warn(err)
-    }
+      })
-  }
-}
-
-const bracketFns = {
-  getAll: async () => {
-    return await brackets.find().exec()
-  },
-  getAllPop: async () => {
-    return await brackets.find().populate('event').populate({
-      path: 'matches',
-      populate: [{ path: 'orange' }, { path: 'blue' }],
-    }).exec()
-  },
-  getById: async (id) => {
-    return await brackets.findById(id).populate('event').populate({
-      path: 'matches',
-      populate: [{ path: 'orange' }, { path: 'blue' }],
-    }).exec()
-  },
-  update: async(id, data) => {
-    return await brackets.findByIdAndUpdate(id, data).exec()
-  },
-  delete: async (id) => {
-    return await brackets.findByIdAndDelete(id).exec()
-  },
-  create: async (data) => {
-    try {
-      const ev = new brackets(data)
-      await ev.save();
     } catch (e) {
       console.warn(e)
     }
@@ -213,9 +174,7 @@ module.exports = {
   'events': eventFns,
   'rosters': rosterFns,
   'matches': matchFns,
-  'stats': statsFns,
   'streams': streamFns,
   'casters': casterFns,
   'hosts': hostFns,
-  'brackets': bracketFns,
 }

src/ws/handler.js

@@ -38,11 +38,7 @@ const handleMsg = async (msg, id) => {
         dm.event = 'streams:full'
         dm.data = await crud[channel].getAllPop()
       }
-      try {
+      connections[id].connection.send(JSON.stringify(dm))
-        connections[id].connection.send(JSON.stringify(dm))
-      } catch (e) {
-        console.warn(e)
-      }
     } else if (d.hasOwnProperty('event') && channelEvents.indexOf(d.event) !== -1) {
       const ev = d.event.split(':')
       const channel = ev[0]

src/ws/streams.js

@@ -3,12 +3,11 @@ const crud = require('./crud')
 
 const connections = {}
 
-const subscribe = (ws, tid, type) => {
+const subscribe = (ws, sid) => {
   const id = v4()
   connections[id] = {
     connection: ws,
-    tid,
+    streamid: sid,
-    type,
   }
 
   ws.send(JSON.stringify({
@@ -23,6 +22,13 @@ const subscribe = (ws, tid, type) => {
   })
 }
 
+const cModel = {
+  'events': 'event',
+  'matches': 'matches',
+  'casters': 'casters',
+  'hosts': 'hosts',
+}
+
 const recvUpdate = async (channel, data) => {
   Object.keys(connections).forEach((k) => {
     sendInitial(k)
@@ -30,24 +36,12 @@ const recvUpdate = async (channel, data) => {
 }
 
 const sendInitial = async (id) => {
-  try {
+  const c = connections[id]
-    const c = connections[id]
+  const stream = await crud['streams'].getById(c.streamid)
-    if (c.type === 'stream') {
+  c.connection.send(JSON.stringify({
-      const stream = await crud['streams'].getById(c.tid)
+    event: 'streams:read',
-      c.connection.send(JSON.stringify({
+    data: stream,
-        event: 'streams:read',
+  }))
-        data: stream,
-      }))
-    } else if (c.type === 'bracket') {
-      const bracket = await crud['brackets'].getById(c.tid)
-      c.connection.send(JSON.stringify({
-        event: 'brackets:read',
-        data: bracket,
-      }))
-    }
-  } catch (e) {
-    console.warn(e)
-  }
 }
 
 module.exports = {