notherbase-fs 1.4.4 → 1.5.1

package/controllers/user.js

@@ -1,11 +1,11 @@
-const express = require("express");
+import express from "express";
 const router = express.Router();
-const bcrypt = require("bcrypt");
+import bcrypt from "bcrypt";
 
 // Import my Data
-const { user, inventory, sendMail } = require("../models");
+import { user, inventory, sendMail } from "../models/index.js";
 
-const authCheck = require("./authCheck");
+import authCheck from "./authCheck.js";
 
 let getAttributes = async function getAttributes(userID) {
     try {
@@ -71,7 +71,7 @@ router.post("/logout", authCheck, async function(req, res) {
 
 router.get("/all", async function(req, res) {
     try {
-        let foundUsers = await user.find({}, 'username coin home authLevels location attributes');
+        let foundUsers = await user.find({}, 'username coin home authLevels location attributes email');
 
         res.status(200).send({ foundUsers: foundUsers });
     }
@@ -410,5 +410,4 @@ router.delete("/", authCheck, async function(req, res) {
     }
 });
 
-module.exports = router;
-
+export default router;

package/controllers/void.js

@@ -0,0 +1,16 @@
+import express from "express";
+let router = express.Router();
+
+//the void
+router.use(function(req, res){
+    res.render(`explorer`, 
+    {
+        siteTitle: "NotherBase | The Void",
+        user: null,
+        inventory: null,
+        main: `${req.voidDir}/index`,
+        route: `/void`
+    });
+});
+
+export default router;

package/models/chat.js

@@ -1,9 +1,9 @@
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
-const chatSchema = new mongoose.Schema({
+const chat = mongoose.model('chats', new mongoose.Schema({
     name: String,
 	text: String,
     date: Number
-});
+}));
 
-module.exports = mongoose.model('chat', chatSchema);
+export default chat;

package/models/contact.js

@@ -1,8 +1,7 @@
-// This allows us to use Mongoose to connect to MongoDB
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
 // This shows the kind of documents we're interacting with in the db
-const contact = new mongoose.Schema({
+const contact = mongoose.model('contacts', new mongoose.Schema({
 	user: { 
 		type: mongoose.Schema.Types.ObjectId, 
 		ref: "users",
@@ -10,8 +9,6 @@ const contact = new mongoose.Schema({
 	},
 	location: String,
 	content: String
-});
+}));
 
-// This tells Mongoose to use the exampleSchema to access the examples collection
-// in our db and then exports the model so we can use it.
-module.exports = mongoose.model('contacts', contact);
+export default contact;

package/models/detail.js

@@ -1,7 +1,6 @@
-// This allows us to use Mongoose to connect to MongoDB
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
-const detail = new mongoose.Schema({
+const detail = mongoose.model('details', new mongoose.Schema({
     _lastUpdate: Number,
     route: String,
 	service: String,
@@ -12,8 +11,6 @@ const detail = new mongoose.Schema({
         required: false
     },
     data: {}
-});
+}));
 
-// This tells Mongoose to use the exampleSchema to access the examples collection
-// in our db and then exports the model so we can use it.
-module.exports = mongoose.model('details', detail);
+export default detail;

package/models/game.js

@@ -1,11 +1,8 @@
-// This allows us to use Mongoose to connect to MongoDB
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
-const game = new mongoose.Schema({
+const game = mongoose.model('games', new mongoose.Schema({
 	name: String,
 	data: {}
-});
+}));
 
-// This tells Mongoose to use the exampleSchema to access the examples collection
-// in our db and then exports the model so we can use it.
-module.exports = mongoose.model('games', game);
+export default game;

package/models/index.js

@@ -1,12 +1,41 @@
-module.exports = {
-    connectionSuccess: require("./start-mongoose"),
-    chat: require("./chat"),
-    item: require("./item"),
-    user: require("./user"),
-    contact: require("./contact"),
-    inventory: require("./inventory"),
-    game: require("./game"),
-    sendMail: require("./send-mail"),
-    detail: require("./detail"),
-    page: require("./page")
+import mongoose from "mongoose";
+import dotenv from "dotenv";
+dotenv.config();
+
+mongoose.connection.on('connected', (err) => {
+    console.log(`Mongoose connected to db`);
+});
+
+mongoose.connection.on('error', (err) => {
+    console.log(`Mongoose ${err}`);
+});
+
+mongoose.connection.on('disconnected', () => {
+    console.log('Mongoose disconnected');
+});
+
+let connectionSuccess = false;
+
+try {
+    mongoose.connect(process.env.MONGODB_URI, { 
+        useNewUrlParser: true,
+        useUnifiedTopology: true
+    });
+
+    connectionSuccess = true;
 }
+catch (err) {
+    console.log(`Mongoose on connect: ${err}`);
+}
+
+
+export {default as chat} from "./chat.js";
+export {default as item} from "./item.js";
+export {default as user} from "./user.js";
+export {default as contact} from "./contact.js";
+export {default as inventory} from "./inventory.js";
+export {default as game} from "./game.js";
+export {default as sendMail} from "./send-mail.js";
+export {default as detail} from "./detail.js";
+export {default as page} from "./page.js";
+export { connectionSuccess };

package/models/inventory.js

@@ -1,8 +1,7 @@
-// This allows us to use Mongoose to connect to MongoDB
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
 // This shows the kind of documents we're interacting with in the db
-const inventory = new mongoose.Schema({
+const inventory = mongoose.model('inventories', new mongoose.Schema({
 	user: { 
 		type: mongoose.Schema.Types.ObjectId, 
 		ref: "users",
@@ -15,8 +14,6 @@ const inventory = new mongoose.Schema({
 		},
 		amount: Number
 	}]
-});
+}));
 
-// This tells Mongoose to use the exampleSchema to access the examples collection
-// in our db and then exports the model so we can use it.
-module.exports = mongoose.model('inventories', inventory);
+export default inventory;

package/models/item.js

@@ -1,15 +1,12 @@
-// This allows us to use Mongoose to connect to MongoDB
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
-const item = new mongoose.Schema({
+const item = mongoose.model('items', new mongoose.Schema({
 	name: String,
 	shortDescription: String,
 	fullDescription: String,
 	icon: String,
 	tags: [ String ],
 	image: String
-});
+}));
 
-// This tells Mongoose to use the exampleSchema to access the examples collection
-// in our db and then exports the model so we can use it.
-module.exports = mongoose.model('items', item);
+export default item;

package/models/page.js

@@ -1,6 +1,6 @@
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
-const page = new mongoose.Schema({
+const page = mongoose.model('pages', new mongoose.Schema({
 	name: String,
 	type: String,
     user: { 
@@ -9,6 +9,6 @@ const page = new mongoose.Schema({
         required: false
     },
     data: {}
-});
+}));
 
-module.exports = mongoose.model('pages', page);
+export default page;

package/models/send-mail.js

@@ -1,4 +1,4 @@
-const nodemailer = require("nodemailer");
+import nodemailer from "nodemailer";
 
 const passwordReset = async (toEmail, resetToken) => {
     var transporter = nodemailer.createTransport({
@@ -42,7 +42,5 @@ const send = async (toEmail, subject, html) => {
     });
 }
 
-module.exports = {
-    passwordReset: passwordReset,
-    send: send
-};
+
+export default { passwordReset, send };

package/models/user.js

@@ -1,8 +1,7 @@
-const mongoose = require("mongoose");
+import mongoose from "mongoose";
 
 //convert schema to model
-const user = mongoose.model('users',
-    new mongoose.Schema({
+const user = mongoose.model('users', new mongoose.Schema({
         username: String,
         password: String,
         email: String,
@@ -23,4 +22,4 @@ const user = mongoose.model('users',
     })
 );
 
-module.exports = user;
+export default user;

package/notherbase-fs.js

@@ -1,91 +1,116 @@
-require("dotenv").config();
+import dotenv from "dotenv";
+dotenv.config();
+import * as db from "./models/index.js";
+import { Server } from "socket.io";
+import express from "express";
+import session from 'express-session';
+import methodOverride from 'method-override';
+import MongoStore from 'connect-mongo';
+import favicon from 'serve-favicon';
+import http from 'http';
+import { fileURLToPath } from 'node:url';
+const __dirname = fileURLToPath(new URL('./', import.meta.url));
 
-class NotherBaseFS {
-    constructor() {
-        this.express = require("express");
-        this.session = require('express-session');
-        this.methodOverride = require('method-override');
-        this.MongoStore = require('connect-mongo');
-        this.favicon = require('serve-favicon');
-        this.http = require('http');
-        this.app = this.express();
-        this.server = this.http.createServer(this.app);
-        this.io = new (require("socket.io").Server)(this.server);
-        this.db = require("./models");
-        this.started = false;
-    }
+import { stripHtml } from "string-strip-html";
 
-    async start(worldPath, voidPath, frontPath, pagesPath) {
-        if (!this.started) {
-            //set views path
-            this.app.set("view engine", "ejs");
-            this.app.set("views", `${__dirname}/views`); 
-        
-            // allows us to delete
-            this.app.use(this.methodOverride('_method'));
+import * as controllers from "./controllers/index.js";
 
-            // allows us to use post body data
-            this.app.use(this.express.urlencoded({ extended: true }));
-        
-            // allows us to get static files like css
-            this.app.use(this.express.static('public'));
-            this.app.use(this.express.static(`${__dirname}/public`));
-        
-            // sets the favicon image
-            this.app.use(this.favicon(__dirname + '/public/img/logo.png'));
-        
-            // Import my Controller
-            const controllers = require("./controllers");
-        
-            //enable cookies
-            if (this.db.connectionSuccess) {
-                this.app.use(this.session({
-                    store: this.MongoStore.create({ mongoUrl: process.env.MONGODB_URI }),
-                    secret: process.env.SECRET || "won",
-                    resave: false,
-                    saveUninitialized: false
-                }));
-
-                console.log("sessions enabled");
-            }
-            else console.log("sessions disabled");
+class NotherBaseFS {
+    constructor(worldPath, voidPath, frontPath, pagesPath) {
+        this.app = express();
+        this.server = http.createServer(this.app);
+        this.io = new Server(this.server);
+        this.db = db;
         
-            this.io.on('connection', (socket) => {
-                socket.join(socket.handshake.query.room);
-
-                console.log(socket.rooms);
-
-                socket.to(socket.handshake.query.room).emit(`${socket.handshake.query.name} has joined the room`);
+        //set views path
+        this.app.set("view engine", "ejs");
+        this.app.set("views", `${__dirname}/views`); 
+    
+        // allows us to delete
+        this.app.use(methodOverride('_method'));
+    
+        // allows us to use post body data
+        this.app.use(express.urlencoded({ extended: true }));
+    
+        // allows us to get static files like css
+        this.app.use(express.static('public'));
+        this.app.use(express.static(`${__dirname}/public`));
+    
+        // sets the favicon image
+        this.app.use(favicon(__dirname + '/public/img/logo.png'));
+    
+        //enable cookies
+        if (this.db.connectionSuccess) {
+            this.app.use(session({
+                store: MongoStore.create({ mongoUrl: process.env.MONGODB_URI }),
+                secret: process.env.SECRET,
+                resave: false,
+                saveUninitialized: false
+            }));
+    
+            console.log("sessions enabled");
+        }
+        else console.log("sessions disabled");
+    
+        this.io.on('connection', (socket) => {
+            socket.join(socket.handshake.query.room);
         
-                socket.on('disconnect', () => {});
+            this.io.to(socket.handshake.query.room).emit("chat message", {
+                name: "Server",
+                time: Date.now(),
+                text: `${socket.handshake.query.name} has joined the room.`
             });
         
-            this.app.use("/user", controllers.user);
-        
-            this.app.use("/chat", controllers.chat(this.io));
-        
-            this.app.use("/contact", controllers.contact);
-
-            this.app.use("/game", controllers.game);
-        
-            this.app.use("/inventory", controllers.authCheck, controllers.inventory);
-        
-            this.app.use("/item", controllers.item);
+            socket.on("chat message", (msg) => {
+                this.io.to(socket.handshake.query.room).emit("chat message", {
+                    name: msg.name,
+                    time: msg.time,
+                    text: stripHtml(msg.text).result
+                });
+            });
         
-            this.app.use("/the-front", await controllers.front(frontPath));
+            socket.on('disconnect', () => {
+                this.io.to(socket.handshake.query.room).emit("chat message", {
+                    name: "Server",
+                    time: Date.now(),
+                    text: `${socket.handshake.query.name} has left the room.`
+                });
+            });
+        });
 
-            this.app.use("/", controllers.pages(pagesPath));
+        this.app.use((req, res, next) => {
+            req.db = this.db;
+            req.worldDir = worldPath;
+            req.frontDir = frontPath;
+            req.pagesDir = pagesPath;
+            req.voidDir = voidPath;
 
-            this.app.use("/", controllers.authCheck, await controllers.explorer(worldPath, voidPath));
+            next();
+        });
         
-            this.server.listen(process.env.PORT, function () {
-                console.log(`Server started at ${process.env.PORT}`);
-                this.started = true;
-            });
+        this.app.use("/user", controllers.user);
+    
+        this.app.use("/contact", controllers.contact);
+    
+        this.app.use("/game", controllers.game);
+    
+        this.app.use("/inventory", controllers.authCheck, controllers.inventory);
+    
+        this.app.use("/item", controllers.item);
+    
+        this.app.use("/the-front", controllers.front);
+    
+        this.app.use("/", controllers.authCheck, controllers.explorer);
+        
+        this.app.use("/", controllers.pages);
 
-        }
-        else console.log("Server already started!");
+        this.app.use(controllers.void);
+    
+        this.server.listen(process.env.PORT, function () {
+            console.log(`Server started at ${process.env.PORT}`);
+            this.started = true;
+        });
     }
 }
 
-module.exports = new NotherBaseFS();
+export default NotherBaseFS;

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "notherbase-fs",
-  "version": "1.4.4",
+  "version": "1.5.1",
   "description": "Functions to help make developing for NotherBase easier.",
-  "main": "notherbase-fs.js",
+  "exports": "./notherbase-fs.js",
   "scripts": {
     "test": "nodemon test/test-index.js",
     "gmail-auth": "node gmail-auth.js",
@@ -30,6 +30,11 @@
     "mongoose": "^6.1.7",
     "nodemailer": "^6.7.5",
     "serve-favicon": "^2.5.0",
-    "socket.io": "^4.4.1"
+    "socket.io": "^4.4.1",
+    "string-strip-html": "^13.0.0"
+  },
+  "type": "module",
+  "engines": {
+    "node": ">=14.16"
   }
 }

package/public/js/chat-box.js

@@ -1,30 +1,34 @@
 class ChatBox {
-    constructor(name, box, room) {
+    constructor(username, room) {
         this.socket = null;
-        import("/socket.io/socket.io.js").then(() => {
-            this.socket = io({
-                query: {
-                    room: room,
-                    name: name
-                }
-            });
+        this.username = username;
+        this.room = room;
+        this.$div = $(`.chat-box#${room}`);
+        this.$chatLog = null;
+        this.$entry = null;
+        this.maxMessages = 100;
 
-            this.socket.on('chat message', this.newMessage);
-            $(".chat-send").on("click", this.sendMessage);
-            this.$entry.on("keyup", function(e) {
-                if (e.keyCode == 13) sendMessage();
-            });
+        this.socket = io({
+            query: {
+                room: this.room,
+                name: this.username
+            }
         });
 
-        this.room = room;
-        this.$div = $(`.chat-box #${box}`)
-        this.$chatLog = this.$div.find(".chat-log");
-        this.$entry = this.$div.find(".chat-entry");
+        this.socket.on('chat message', this.newMessage);
+        this.render();
     }
 
     newMessage = (msg) => {
         let time = new Date(msg.time);
         this.$chatLog.append(`<p>[${time.toLocaleTimeString('en-US')}] ${msg.name}: ${msg.text}</p>`);
+        this.$chatLog.scrollTop(this.$chatLog.prop("scrollHeight"));
+        let msgs = this.$chatLog.find("p");
+        if (msgs.length > this.maxMessages) {
+            for (let i = 0; i < msgs.length - this.maxMessages; i++) {
+                msgs[i].remove();
+            }
+        }
     }
 
     sendMessage = () => {
@@ -32,19 +36,29 @@ class ChatBox {
             let val = this.$entry.val();
             this.$entry.val("");
 
-            // $.post("/chat", {
-            //     room: "<%= room %>",
-            //     text: val
-            // }, function () {
-            //     $chatLog.scrollTop($chatLog[0].scrollHeight);
-            // });
-
             this.socket.emit('chat message', {
-                name: name,
+                name: this.username,
                 time: Date.now(),
                 text: val
             });
         }
     }
+
+    render() {
+        this.$div.empty();
+
+        this.$div.append(`<h4>Chatting with the name ${this.username}:`);
+        this.$div.append(`<div class="chat-log"> </div>`);
+        this.$div.append(`<input autocomplete="off" type="text" class="chat-entry">`);
+        this.$div.append(`<button class="chat-send">Send</button>`);
+
+        this.$chatLog = this.$div.find(".chat-log");
+        this.$entry = this.$div.find(".chat-entry");
+
+        this.$div.find("button").on("click", this.sendMessage);
+        this.$entry.on("keyup", (e) => {
+            if (e.keyCode == 13) this.sendMessage();
+        });
+    }
 }
 

package/public/styles/chat.css

@@ -1,9 +1,8 @@
 .chat-box {
     position: relative;
-    box-shadow: 5px 5px 10px 5px var(--shadowColor);
-    margin-top: 20px;
+    box-shadow: var(--boxShadow);
     width: 100%;
-    min-height: 200px;
+    height: 400px;
 }
 
 .chat-name {
@@ -13,24 +12,23 @@
 
 .chat-log {
     width: 100%;
-    height: calc(100% - 65px);
+    height: 300px;
     background-color: rgba(0, 0, 0, 0.534);
     overflow: auto;
     padding: 5px;
 }
 
 .chat-send {
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    height: 25px;
+    height: calc(var(--pSize) + 2 * var(--padding));
     width: 5em;
     outline: none;
     background-color: var(--bgColor);
-    border: 1px solid var(--textColor);
+    border: var(--standardBorder);
     color: var(--textColor);
     text-align: center;
-    padding: 2px;
+    padding: 0;
+    margin: 0;
+    border-radius: 0;
 }
 
 .chat-send:hover {
@@ -40,21 +38,20 @@
 }
 
 .chat-entry {
-    position: absolute;
-    left: 0;
-    bottom: 0;
-    height: 25px;
+    height: calc(var(--pSize) + 2 * var(--padding));
     width: calc(100% - 5em);
     outline: none;
     background-color: var(--bgColor);
-    border: 1px solid var(--textColor);
+    border: var(--standardBorder);
     color: var(--textColor);
+    margin: 0;
+    padding: var(--padding);
 }
 
 .chat-log > p {
     color: var(--textColor);
     margin: 0;
-    padding: 0;
+    padding: 2px;
     line-height: 1em;
     text-align: left;
 }