omegga 0.1.80 → 0.1.84

package/.github/workflows/lint.yml

@@ -23,4 +23,4 @@ jobs:
         uses: wearerequired/lint-action@v1
         with:
           github_token: ${{ secrets.github_token }}
-          eslint: true
+          prettier: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "omegga",
-  "version": "0.1.80",
+  "version": "0.1.84",
   "description": "Brickadia server installer, manager, wrapper, configurator, and automator",
   "main": "index.js",
   "bin": {
@@ -13,11 +13,10 @@
     "brs-js": "^2.0.0",
     "child_process": "^1.0.2",
     "chokidar": "^3.4.2",
-    "colors": "^1.4.0",
+    "colors": "1.4.0",
     "commander": "^5.1.0",
     "configstore": "^5.0.1",
     "disrequire": "^1.1.1",
-    "eslint-plugin-prettier": "^4.0.0",
     "express": "^4.17.1",
     "express-session": "^1.17.1",
     "fibers": "^5.0.0",
@@ -26,9 +25,8 @@
     "js-yaml": "^3.14.0",
     "json-rpc-2.0": "^0.2.10",
     "lodash": "^4.17.20",
-    "nedb": "^1.8.0",
-    "nedb-promise": "^2.0.1",
-    "nedb-session-store": "^1.1.2",
+    "nedb-promises": "^5.0.1",
+    "nedb-promises-session-store": "1.0.0",
     "npm": "^7.20.6",
     "password-prompt": "^1.1.2",
     "pem": "^1.14.4",
@@ -37,25 +35,21 @@
     "semver": "^7.3.4",
     "simple-git": "^2.31.0",
     "socket.io": "^2.3.0",
-    "strip-ansi": "^6.0.0",
+    "strip-ansi": "^6.0.1",
     "update-notifier": "^5.0.0",
     "vm2": "3.9.2 || >3.9.4",
     "vue-grid-layout": "^2.3.9"
   },
   "devDependencies": {
     "@babel/core": "^7.13.8",
-    "@babel/eslint-parser": "^7.13.8",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@tabler/icons": "^1.39.1",
     "@vue/babel-helper-vue-jsx-merge-props": "^1.2.1",
     "bufferutil": "^4.0.1",
     "css-loader": "^4.3.0",
-    "eslint": "^7.10.0",
-    "eslint-plugin-vue": "^7.0.1",
     "file-loader": "^6.1.0",
     "jsdoc-to-markdown": "^7.0.1",
     "mini-css-extract-plugin": "^1.0.0",
-    "prettier-eslint": "^8.2.2",
     "sass": "^1.42.1",
     "sass-loader": "^12.1.0",
     "url-loader": "^4.1.1",
@@ -73,8 +67,8 @@
   },
   "scripts": {
     "start": "node index.js",
-    "lint": "npx eslint \"src/\"",
-    "lint:fix": "npx eslint \"src/\" --fix",
+    "lint": "npx prettier --check \"src/\"",
+    "lint:fix": "npx prettier \"src/\"",
     "watch": "npx webpack --watch",
     "dist": "MODE=production npx webpack",
     "build": "npx webpack"

package/src/brickadia/server.js

@@ -220,9 +220,7 @@ class BrickadiaServer extends EventEmitter {
   }
 
   lineListener(line) {
-    line = stripAnsi(line);
-
-    this.emit('line', line);
+    this.emit('line', stripAnsi(line));
   }
 }
 

package/src/info/default_commands.json

@@ -21,5 +21,6 @@
   "spectator",
   "ghost",
   "ping",
-  "gettransform"
-]
+  "gettransform",
+  "back"
+]

package/src/omegga/plugin.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const Datastore = require('nedb-promise');
+const Datastore = require('nedb-promises');
 
 const soft = require('../softconfig.js');
 
@@ -234,10 +234,11 @@ class PluginLoader {
   constructor(pluginsPath, omegga) {
     this.path = pluginsPath;
     this.omegga = omegga;
-    this.store = new Datastore({
+    this.store = Datastore.create({
       filename: path.join(omegga.dataPath, soft.PLUGIN_STORE),
       autoload: true,
     });
+    this.store.persistence.setAutocompactionInterval(1000 * 60 * 5);
     this.formats = [];
     this.plugins = [];
 

package/src/webserver/backend/api.js

@@ -520,7 +520,7 @@ module.exports = (server, io) => {
 
       log(
         'Clearing bricks for player',
-        omegga.getNameCache()?.savedPlayerNames?.[id].yellow ??
+        omegga.getNameCache()?.savedPlayerNames?.[id]?.yellow ??
           'with id ' + id.yellow
       );
 

package/src/webserver/backend/database.js

@@ -1,6 +1,6 @@
 const path = require('path');
 
-const Datastore = require('nedb-promise');
+const Datastore = require('nedb-promises');
 const bcrypt = require('bcrypt');
 const chokidar = require('chokidar');
 
@@ -43,23 +43,23 @@ class Database extends EventEmitter {
 
     // create all the stores
     this.stores = {
-      users: new Datastore({
+      users: Datastore.create({
         filename: path.join(omegga.dataPath, soft.USER_STORE),
         ...dbOpts,
       }),
-      chat: new Datastore({
+      chat: Datastore.create({
         filename: path.join(omegga.dataPath, soft.CHAT_STORE),
         ...dbOpts,
       }),
-      players: new Datastore({
+      players: Datastore.create({
         filename: path.join(omegga.dataPath, soft.PLAYER_STORE),
         ...dbOpts,
       }),
-      status: new Datastore({
+      status: Datastore.create({
         filename: path.join(omegga.dataPath, soft.STATUS_STORE),
         ...dbOpts,
       }),
-      server: new Datastore({
+      server: Datastore.create({
         filename: path.join(omegga.dataPath, soft.SERVER_STORE),
         ...dbOpts,
       }),
@@ -384,7 +384,7 @@ class Database extends EventEmitter {
   // get recent chat activity
   async getChats({ count = 50, sameServer, before, after } = {}) {
     return await this.stores.chat
-      .cfind({
+      .find({
         type: 'chat',
         ...(sameServer ? { instanceId: await this.getInstanceId() } : {}),
         created: before
@@ -453,7 +453,7 @@ class Database extends EventEmitter {
     const [total, players, exactResult] = await Promise.all([
       this.stores.players.count(query),
       this.stores.players
-        .cfind(query)
+        .find(query)
         // TODO: add other sorts and sort directions
         .sort({ [sort]: direction })
         .skip(count * page)
@@ -515,7 +515,7 @@ class Database extends EventEmitter {
     const [total, users] = await Promise.all([
       this.stores.users.count(query),
       this.stores.users
-        .cfind(query)
+        .find(query)
         // TODO: add other sorts and sort directions
         .sort({ [sort]: direction })
         .skip(count * page)
@@ -535,17 +535,17 @@ class Database extends EventEmitter {
     const [player, banHistory, kickHistory, notes] = await Promise.all([
       this.stores.players.findOne({ type: 'userHistory', id }),
       this.stores.players
-        .cfind({ type: 'banHistory', banned: id })
+        .find({ type: 'banHistory', banned: id })
         .sort({ created: -1 })
         .limit(25)
         .exec(),
       this.stores.players
-        .cfind({ type: 'kickHistory', kicked: id })
+        .find({ type: 'kickHistory', kicked: id })
         .sort({ created: -1 })
         .limit(25)
         .exec(),
       this.stores.players
-        .cfind({ type: 'note', id })
+        .find({ type: 'note', id })
         .sort({ created: -1 })
         .limit(25)
         .exec(),

package/src/webserver/backend/index.js

@@ -4,7 +4,7 @@ const https = require('https');
 
 const express = require('express');
 const expressSession = require('express-session');
-const NedbStore = require('nedb-session-store')(expressSession);
+const NedbStore = require('nedb-promises-session-store').default;
 const SocketIo = require('socket.io');
 const bodyParser = require('body-parser');
 
@@ -111,8 +111,9 @@ class Webserver {
         maxAge: 365 * 24 * 60 * 60 * 1000, // 1 year
       },
       // use a nedb database for session store
-      store: new NedbStore({
+      store: NedbStore({
         filename: path.join(this.dataPath, soft.SESSION_STORE),
+        connect: expressSession,
       }),
     });
     this.app.use(session);

package/src/webserver/frontend/views/NotFound.vue

@@ -1,5 +1,4 @@
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
 
 <template>
   <page>

package/.eslintrc.yml

@@ -1,21 +0,0 @@
-env:
-  node: true,
-  es2021: true
-extends:
-  - eslint:recommended
-parser: "@babel/eslint-parser"
-plugins: [prettier]
-parserOptions:
-  ecmaVersion: 12
-  requireConfigFile: false
-globals:
-  Omegga: readonly
-  VERBOSE: readonly
-rules:
-  prettier/prettier: warn
-  linebreak-style:
-    - error
-    - unix
-  no-unused-vars:
-    - error
-    - argsIgnorePattern: ^_