notherbase-fs 1.2.14 → 1.3.0

package/controllers/explorer.js

@@ -1,150 +1,113 @@
-const { inventory, game, item, user } = require("../models");
-const path = require('path');
-
-let router = require("express").Router();;
-let dir = "";
-
-let complete = function complete(explorerBuild) {
-    dir = explorerBuild.dirname;
-
-    let currentRegion, currentArea, currentPoi = "";
-
-    for (let i = 0; i < explorerBuild.regions.length; i++) {
-        let region = explorerBuild.regions[i];
-        currentRegion = region.name;
-
-        for (let j = 0; j < region.areas.length; j++) {
-            let area = region.areas[j];
-            currentArea = area.name;
-
-            for (let k = 0; k < area.pois.length; k++) {
-                let poi = area.pois[k];
-                currentPoi = poi.name;
-
-                for (let l = 0; l < poi.details.length; l++) {
-                    let detail = poi.details[l];
-
-                    let currentDir = `${dir}/${currentRegion}/${currentArea}/${currentPoi}`;
-                    let currentRoute = `/${currentRegion}/${currentArea}/${currentPoi}/${detail.name}`;
-
-                    detail.options = {
-                        styles: [],
-                        externalStyles: [],
-                        localScripts: [],
-                        serverScripts: [],
-                        requiredItems: [],
-                        needsKey: "",
-                        dropOff: "",
-                        ...detail.options
-                    };
-                
-                    detail.options.styles = detail.options.styles.map(style => {
-                        style = `${currentDir}/styles/${style}`;
-                        return style;
-                    });
-                
-                    detail.options.externalStyles = detail.options.externalStyles.map(style => {
-                        style = `${currentDir}/${style}`;
-                        return style;
-                    });
-                
-                    detail.options.localScripts = detail.options.localScripts.map(script => {
-                        script = `${currentDir}/local-scripts/${script}`;
-                        return script;
-                    });
-
-                    detail.options.serverScripts = detail.options.serverScripts.map(script => {
-                        script = require(`${currentDir}/server-scripts/${script}`);
-                        return script;
-                    });
-                
-                    detail.options.main = "index";
-                    if (detail.name !== "") detail.options.main = detail.name;
-                    detail.options.main = `${currentDir}/views/${detail.options.main}`;
-                
-                    router.get(currentRoute, async function(req, res) {
-                        try {
-                            const foundUser = await user.findById(req.session.currentUser);
-                            const foundInventory = await inventory.findOne({ user: req.session.currentUser }).populate("items.item");
-                        
-                            let serverScriptReturns = [];
-
-                            for (let m = 0; m < detail.options.serverScripts.length; m++) {
-                                serverScriptReturns.push(await detail.options.serverScripts[m]({
-                                    game: game,
-                                    inventory: inventory,
-                                    item: item
-                                }));
-                            }
-
-                            let foundItemIDs = [];
-                            for (let m = 0; m < detail.options.requiredItems.length; m++) {
-                                let foundItem = await item.findOne({name: detail.options.requiredItems[m]});
-
-                                foundItemIDs.push(foundItem._id);
-                            }
-
-                            let context = {
-                                siteTitle: "NotherBase",
-                                user: foundUser,
-                                styles: detail.options.styles,
-                                externalStyles: detail.options.externalStyles,
-                                main: detail.options.main,
-                                localScripts: detail.options.localScripts,
-                                serverScriptReturns: serverScriptReturns,
-                                itemIDs: foundItemIDs,
-                                pov: req.query.pov,
-                                inventory: foundInventory,
-                                query: req.query,
-                                dir: dir,
-                                path: path
-                            }
+const explorer = async function explorer(worldPath, voidPath) {
+    const db = require("../models");
+    const path = require('path');
+    
+    let router = require("express").Router();
+    
+    router.post(`/:region/:area/:poi/:detail/serve/:script`, async function(req, res) {
+        try {
+            let currentAreaRoute = `${req.params.region}/${req.params.area}/${req.params.poi}`;
+            let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
+
+            if (await db.poi.exists({ route: currentRoute, type: "global" }) === false) {
+                await db.poi.create({
+                    route: currentRoute,
+                    name: req.params.detail,
+                    type: "global",
+                    data: {}
+                });
+            }
 
-                            if (detail.options.needsKey !== "" && foundInventory) {
-                                let hasKey = false;
-                
-                                for (let i = 0; i < foundInventory.items.length; i++) {
-                                    if (foundInventory.items[i].item.name === detail.options.needsKey) hasKey = true;
-                                }
-                
-                                if (!hasKey) res.redirect(detail.options.dropOff);
-                                else res.render(`explorer`, context);
-                            }
-                            else res.render(`explorer`, context);
-                        }
-                        catch(err) {
-                            console.log(err);
-                        }
-                    });
-                }
+            if (await db.poi.exists({ route: currentRoute, user: req.session.currentUser }) === false) {
+                await db.poi.create({
+                    route: currentRoute,
+                    name: req.params.detail,
+                    type: "local",
+                    user: req.session.currentUser,
+                    data: {}
+                });
             }
+    
+            let scriptResult = await require(`${worldPath}/${currentAreaRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, req.session.currentUser, req.body);
+            res.send({ scriptResult: scriptResult });
         }
-    }
-
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    });
+    
+    router.get(`/:region/:area/:poi/:detail`, async function(req, res) {
+        try {
+            const foundUser = await db.user.findById(req.session.currentUser);
+            const foundInventory = await db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+    
+            let main = `${worldPath}/${req.params.region}/${req.params.area}/${req.params.poi}/views/${req.params.detail}`;
+    
+            let context = {
+                siteTitle: `NotherBase - ${req.params.detail}`,
+                user: foundUser,
+                main: main,
+                pov: req.query.pov,
+                inventory: foundInventory,
+                query: req.query,
+                dir: worldPath,
+                path: path
+            }
+    
+            await res.render(`explorer`, context);
+        }
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    });
+    
+    router.get(`/:region/:area/:poi`, async function(req, res) {
+        try {
+            const foundUser = await db.user.findById(req.session.currentUser);
+            const foundInventory = await db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+    
+            let main = `${worldPath}/${req.params.region}/${req.params.area}/${req.params.poi}/views/index`;
+    
+            let context = {
+                siteTitle: `NotherBase - ${req.params.poi}`,
+                user: foundUser,
+                main: main,
+                pov: req.query.pov,
+                inventory: foundInventory,
+                query: req.query,
+                dir: worldPath,
+                path: path
+            }
+    
+            await res.render(`explorer`, context);
+        }
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    });
+    
     // start location
     router.get("/", function(req, res) {
         res.redirect("/the-front");
     });
-
+    
     //the void
     router.use(function(req, res, next){
         res.render(`explorer`, 
         {
             siteTitle: "NotherBase | The Void",
             user: null,
-            styles: [`${dir}/${explorerBuild.void}/styles/void`],
-            externalStyles: [],
-            localScripts: [],
             inventory: null,
-            itemIDs: [],
-            main: `${dir}/${explorerBuild.void}/index`,
+            main: `${voidPath}/index`,
             dir: dir,
             path: path
         });
     });
+    
+    return router;
 }
 
-module.exports = {
-    router: router,
-    complete: complete
-}
+module.exports = explorer;

package/controllers/game.js

@@ -47,11 +47,12 @@ router.post("/", async function(req, res) {
             foundGame.markModified("data");
             await foundGame.save();
 
-            res.status(200).send();
+            res.status(200).end();
         }
     }
     catch(err) {
         res.status(500).end();
+        console.log(req.query);
         console.log(err);
     }
 });

package/controllers/inventory.js

@@ -30,13 +30,15 @@ router.post("/", async function(req, res) {
     if (connectionSuccess) {
         try {
             if (req.body.item && req.body.amount) {
-                if (req.session.currentUser) {
+                let foundItem = await item.findOne({name: req.body.item});
+
+                if (foundItem) {
                     let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
         
                     let holding = false;
         
                     for (let j = 0; j < foundInventory.items.length; j++) {
-                        if (foundInventory.items[j].item._id.equals(req.body.item)) {
+                        if (foundInventory.items[j].item.name === req.body.item) {
                             holding = true;
         
                             if (foundInventory.items[j].amount >= -Math.floor(req.body.amount)) {
@@ -74,7 +76,7 @@ router.post("/", async function(req, res) {
                     if (!holding) {
                         if (req.body.amount > 0) {
                             foundInventory.items.push({
-                                item: req.body.item,
+                                item: foundItem._id,
                                 amount: req.body.amount
                             });
         
@@ -94,11 +96,13 @@ router.post("/", async function(req, res) {
                     };
                 }
                 else {
-                    res.status(401).send("User not logged in!");
+                    console.log(`${req.body.item} doesn't exist!`);
+                    res.status(400).send(`${req.body.item} doesn't exist!`);
                 }
             }
             else {
-                res.status(400).send("Check input!");
+                console.log(`${req.body.item} ${req.body.amount} Check Input!`);
+                res.status(400).send(`${req.body.item} ${req.body.amount} Check Input!`);
             }
         }
         catch(err) {

package/controllers/item.js

@@ -16,12 +16,11 @@ router.get("/all", async function(req, res) {
     }
 });
 
-router.get("/findOne", async function(req, res) {
+router.get("/", async function(req, res) {
     try {
-        let foundItem = await items.findOne({name: req.query.name});
+        let foundItem = await items.findOne({ name: req.query.name });
 
-        if (!foundItem) res.status(500).end();
-        else res.status(200).send({ foundItem: foundItem });
+        res.status(200).send({ foundItem: foundItem });
     }
     catch(err) {
         res.status(500).end();
@@ -29,11 +28,27 @@ router.get("/findOne", async function(req, res) {
     }
 });
 
-router.get("/", async function(req, res) {
+router.post("/", async function(req, res) {
     try {
-        let foundItems = await items.find({ name: { $regex: req.query.name } });
+        if (!req.body.id) {
+            await items.create({
+                name: req.body.name,
+                shortDescription: req.body.shortDescription,
+                fullDescription: req.body.fullDescription
+            });
+        }
+        else {
+            let foundItem = await items.findById(req.body.id);
 
-        res.status(200).send({ foundItems: foundItems });
+            if (foundItem) {
+                foundItem.name = req.body.name;
+                foundItem.shortDescription = req.body.shortDescription;
+                foundItem.fullDescription = req.body.fullDescription;
+                await foundItem.save();
+            }
+        }
+
+        res.status(200).end();
     }
     catch(err) {
         res.status(500).end();
@@ -41,13 +56,9 @@ router.get("/", async function(req, res) {
     }
 });
 
-router.post("/", async function(req, res) {
+router.post("/delete", async function(req, res) {
     try {
-        await items.create({
-            name: req.body.name,
-            shortDescription: req.body.shortDescription,
-            fullDescription: req.body.fullDescription
-        });
+        await items.findByIdAndDelete(req.body.id);
 
         res.status(200).end();
     }
@@ -57,5 +68,4 @@ router.post("/", async function(req, res) {
     }
 });
 
-
 module.exports = router;

package/controllers/the-front.js

@@ -1,104 +1,86 @@
-const { user, inventory, connectionSuccess, item } = require("../models");
-const path = require('path');
-
-let router = require("express").Router();
-let dir = "";
-
-
-let front = function front(detail) {
-    detail.options = {
-        styles: [],
-        externalStyles: [],
-        localScripts: [],
-        requiredItems: [],
-        needsKey: "",
-        dropOff: "",
-        ...detail.options
-    };
-
-    detail.options.styles = detail.options.styles.map(style => {
-        style = `${dir}/styles/${style}`;
-        return style;
-    });
-
-    detail.options.externalStyles = detail.options.externalStyles.map(style => {
-        style = `${dir}/${style}`;
-        return style;
-    });
-
-    detail.options.localScripts = detail.options.localScripts.map(script => {
-        script = `${dir}/local-scripts/${script}`;
-        return script;
-    });
-
-    router.get(`/${detail.name}`, async function(req, res) {
-        detail.options.main = "index";
-        if (detail.name !== "") detail.options.main = detail.name;
-        detail.options.main = `${dir}/views/${detail.options.main}`;
+const front = async function front(dir) {
+    const db = require("../models");
+    const path = require('path');
+    
+    let router = require("express").Router();
+    
+    router.post(`/serve/:script`, async function(req, res) {
+        try {
+            let currentRoute = `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
 
-        let foundItemIDs = [];
-        for (let m = 0; m < detail.options.requiredItems.length; m++) {
-            let foundItem = await item.findOne({name: detail.options.requiredItems[m]});
+            let foundPoi = await db.poi.findOne({ route: currentRoute, type: "global" });
 
-            foundItemIDs.push(foundItem._id);
+            if (foundPoi === null) {
+                db.poi.create({
+                    route: currentRoute,
+                    name: req.params.detail,
+                    type: "global",
+                    global: {}
+                });
+            }
+    
+            let scriptResult = await require(`${worldPath}/${currentRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, req.session.currentUser, req.body);
+            res.send(scriptResult);
         }
-
-        let context = {
-            siteTitle: "NotherBase | The Front",
-            user: null,
-            styles: detail.options.styles,
-            externalStyles: detail.options.externalStyles,
-            main: detail.options.main,
-            localScripts: detail.options.localScripts,
-            itemIDs: foundItemIDs,
-            inventory: null,
-            query: req.query,
-            dir: dir,
-            path: path
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
         }
-
-        if (connectionSuccess) {
-            try {
-                context.user = await user.findById(req.session.currentUser);
-                context.inventory = await inventory.findOne({ user: req.session.currentUser }).populate("items.item");
-            
-                if (detail.options.needsKey !== "" && context.inventory) {
-                    let hasKey = false;
+    });
+    
+    router.get(`/:detail`, async function(req, res) {
+        try {
+            const foundUser = await db.user.findById(req.session.currentUser);
+            const foundInventory = await db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
     
-                    for (let i = 0; i < foundInventory.items.length; i++) {
-                        if (foundInventory.items[i].item.name === detail.options.needsKey) hasKey = true;
-                    }
+            let main = `${dir}/views/${req.params.detail}`;
     
-                    if (!hasKey) res.redirect(detail.options.dropOff);
-                    else res.render(`explorer`, context);
-                }
-                else res.render(`explorer`, context);
+            let context = {
+                siteTitle: `NotherBase - ${req.params.detail}`,
+                user: foundUser,
+                main: main,
+                pov: req.query.pov,
+                inventory: foundInventory,
+                query: req.query,
+                dir: dir,
+                path: path
             }
-            catch(err) {
-                console.log(err);
+    
+            await res.render(`explorer`, context);
+        }
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
+        }
+    });
+    
+    router.get(`/`, async function(req, res) {
+        try {
+            const foundUser = await db.user.findById(req.session.currentUser);
+            const foundInventory = await db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+    
+            let main = `${dir}/views/index`;
+    
+            let context = {
+                siteTitle: `NotherBase - The Front`,
+                user: foundUser,
+                main: main,
+                pov: req.query.pov,
+                inventory: foundInventory,
+                query: req.query,
+                dir: dir,
+                path: path
             }
+    
+            await res.render(`explorer`, context);
         }
-        else {
-            console.log("no db connection");
-
-            res.render(`explorer`, context);
+        catch(err) {
+            console.log(err);
+            res.status(500).end();
         }
     });
+    
+    return router;
 }
 
-let complete = function complete(frontBuild) {
-    dir = frontBuild.dirname;
-
-    for (let i = 0; i < frontBuild.details.length; i++) {
-        front(frontBuild.details[i]);
-    }
-}
-
-module.exports = {
-    setDir: function setDir(newDir) {
-        dir = newDir;
-    },
-    router: router,
-    front: front,
-    complete: complete
-}
+module.exports = front;

package/models/index.js

@@ -6,5 +6,6 @@ module.exports = {
     contact: require("./contact"),
     inventory: require("./inventory"),
     game: require("./game"),
-    sendMail: require("./send-mail")
+    sendMail: require("./send-mail"),
+    poi: require("./poi")
 }

package/models/poi.js

@@ -0,0 +1,18 @@
+// This allows us to use Mongoose to connect to MongoDB
+const mongoose = require("mongoose");
+
+const poi = new mongoose.Schema({
+    route: String,
+	name: String,
+	type: String,
+    user: { 
+        type: mongoose.Schema.Types.ObjectId, 
+        ref: "users",
+        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('pois', poi);

package/notherbase-fs.js

@@ -0,0 +1,87 @@
+require("dotenv").config();
+
+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;
+    }
+
+    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'));
+
+            // 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");
+        
+            this.io.on('connection', (socket) => {
+                socket.join(socket.handshake.query.room);
+        
+                socket.on('disconnect', () => {});
+            });
+        
+            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);
+        
+            this.app.use("/the-front", await controllers.front(frontPath));
+
+            this.app.use("/", controllers.pages(pagesPath));
+
+            this.app.use("/", controllers.authCheck, await controllers.explorer(worldPath, voidPath));
+        
+            this.server.listen(process.env.PORT, function () {
+                console.log(`Server started at ${process.env.PORT}`);
+                this.started = true;
+            });
+
+        }
+        else console.log("Server already started!");
+    }
+}
+
+module.exports = new NotherBaseFS();

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "notherbase-fs",
-  "version": "1.2.14",
+  "version": "1.3.0",
   "description": "Functions to help make developing for NotherBase easier.",
-  "main": "index.js",
+  "main": "notherbase-fs.js",
   "scripts": {
     "test": "nodemon test/test-index.js",
     "gmail-auth": "node gmail-auth.js",