notherbase-fs 1.4.4 → 1.5.1

package/controllers/authCheck.js

@@ -1,4 +1,4 @@
-const { connectionSuccess } = require("../models");
+import { connectionSuccess } from "../models/index.js";
 
 const authCheck = async function authCheck(req, res, next){
     if (connectionSuccess) {
@@ -15,4 +15,4 @@ const authCheck = async function authCheck(req, res, next){
     }
 }
 
-module.exports = authCheck;
+export default authCheck;

package/controllers/contact.js

@@ -1,7 +1,7 @@
-const express = require("express");
+import express from "express";
 const router = express.Router();
 
-const contact = require("../models/contact");
+import contact from "../models/contact.js";
 
 router.post("/", async function(req, res) {
     try {
@@ -19,4 +19,4 @@ router.post("/", async function(req, res) {
     }
 });
 
-module.exports = router;
+export default router;

package/controllers/explorer.js

@@ -1,189 +1,156 @@
-const db = require("../models");
-const path = require('path');
-const fs = require("fs");
-
-let router = require("express").Router();
-
-const explorer = async function explorer(worldPath, voidPath) {
-    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}`;
-            const foundUser = await db.user.findById(req.session.currentUser);
-    
-            let scriptResult = await require(`${worldPath}/${currentAreaRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, foundUser, req.body);
-            res.send({ scriptResult: scriptResult });
-        }
-        catch(err) {
-            console.log(err);
-            res.status(500).end();
-        }
-    });
+import express from "express";
+import path from 'node:path';
+import fs from 'fs';
+import { nextTick } from "node:process";
 
-    router.get(`/recall`, async function(req, res) {
-        try {
-            let exists = await db.detail.exists({ 
-                route: req.query.route,
-                service: req.query.service,
-                scope: "local",
-                user: req.session.currentUser
-            });
+let router = express.Router();
 
-            if (!exists) {
-                await db.detail.create({
-                    _lastUpdate: Date.now(),
-                    route: req.query.route,
-                    service: req.query.service,
-                    scope: "local",
-                    user: req.session.currentUser,
-                    data: {}
-                });
-            }
+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}`;
+        const foundUser = await req.db.user.findById(req.session.currentUser);
+
+        let scriptResult = await require(`${req.worldDir}/${currentAreaRoute}/server-scripts/${req.params.script}.js`)(db, currentRoute, foundUser, req.body);
+        res.send({ scriptResult: scriptResult });
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+router.get(`/recall`, async function(req, res) {
+    try {
+        let exists = await req.db.detail.exists({ 
+            route: req.query.route,
+            service: req.query.service,
+            scope: "local",
+            user: req.session.currentUser
+        });
 
-            let found = await db.detail.findOne({ 
+        if (!exists) {
+            await req.db.detail.create({
+                _lastUpdate: Date.now(),
                 route: req.query.route,
                 service: req.query.service,
                 scope: "local",
-                user: req.session.currentUser
+                user: req.session.currentUser,
+                data: {}
             });
+        }
 
-            if (new Date(found._lastUpdate) > new Date(req.query._lastUpdate)) {
-                res.send({
-                    isUpToDate: false,
-                    data: found.data
-                });
-            }
-            else res.send({
-                isUpToDate: true,
-                data: null
+        let found = await req.db.detail.findOne({ 
+            route: req.query.route,
+            service: req.query.service,
+            scope: "local",
+            user: req.session.currentUser
+        });
+
+        if (new Date(found._lastUpdate) > new Date(req.query._lastUpdate)) {
+            res.send({
+                isUpToDate: false,
+                data: found.data
             });
         }
-        catch(err) {
-            console.log(err);
-            res.status(500).end();
-        }
-    });
+        else res.send({
+            isUpToDate: true,
+            data: null
+        });
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
 
-    router.post(`/commit`, async function(req, res) {
-        try {
-            await db.detail.updateOne({ 
-                route: req.body.route,
-                service: req.body.service,
-                scope: "local",
-                user: req.session.currentUser
-            }, { 
-                route: req.body.route,
-                service: req.body.service,
-                scope: "local",
-                user: req.session.currentUser,
-                _lastUpdate: req.body.time,
-                data: req.body.data
-            }, {
-                upsert: true
-            });
+router.post(`/commit`, async function(req, res) {
+    try {
+        await req.db.detail.updateOne({ 
+            route: req.body.route,
+            service: req.body.service,
+            scope: "local",
+            user: req.session.currentUser
+        }, { 
+            route: req.body.route,
+            service: req.body.service,
+            scope: "local",
+            user: req.session.currentUser,
+            _lastUpdate: req.body.time,
+            data: req.body.data
+        }, {
+            upsert: true
+        });
 
-            res.send("Update successful!");
-        }
-        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}`;
-
-            if (fs.existsSync(main + ".ejs")) {
-                let context = {
-                    siteTitle: `NotherBase - ${req.params.detail}`,
-                    user: foundUser,
-                    main: main,
-                    pov: req.query.pov,
-                    inventory: foundInventory,
-                    query: req.query,
-                    dir: worldPath,
-                    route: `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`
-                }
-        
-                await res.render(`explorer`, context);
-            } 
-            else {
-                res.render(`explorer`, 
-                {
-                    siteTitle: "NotherBase | The Void",
-                    user: null,
-                    inventory: null,
-                    main: `${voidPath}/index`,
-                    route: `/void`
-                });
+        res.send("Update successful!");
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+router.get(`/:region/:area/:poi/:detail`, async function(req, res, next) {
+    try {
+        let main = `${req.worldDir}/${req.params.region}/${req.params.area}/${req.params.poi}/views/${req.params.detail}`;
+
+        if (fs.existsSync(main + ".ejs")) {
+            const foundUser = await req.db.user.findById(req.session.currentUser);
+            const foundInventory = await req.db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+
+            let context = {
+                siteTitle: `NotherBase - ${req.params.detail}`,
+                user: foundUser,
+                main: main,
+                pov: req.query.pov,
+                inventory: foundInventory,
+                query: req.query,
+                dir: req.worldDir,
+                route: `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`
             }
-        }
-        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`;
-    
-            if (fs.existsSync(main + ".ejs")) {
-                let context = {
-                    siteTitle: `NotherBase - ${req.params.poi}`,
-                    user: foundUser,
-                    main: main,
-                    pov: req.query.pov,
-                    inventory: foundInventory,
-                    query: req.query,
-                    dir: worldPath,
-                    route: `/${req.params.region}/${req.params.area}/${req.params.poi}`
-                }
-        
-                await res.render(`explorer`, context);
-            } 
-            else {
-                res.render(`explorer`, 
-                {
-                    siteTitle: "NotherBase | The Void",
-                    user: null,
-                    inventory: null,
-                    main: `${voidPath}/index`,
-                    route: `/void`
-                });
+            await res.render(`explorer`, context);
+        } 
+        else next();
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+router.get(`/:region/:area/:poi`, async function(req, res, next) {
+    try {
+        let main = `${req.worldDir}/${req.params.region}/${req.params.area}/${req.params.poi}/views/index`;
+
+        if (fs.existsSync(main + ".ejs")) {
+            const foundUser = await req.db.user.findById(req.session.currentUser);
+            const foundInventory = await req.db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+
+            let context = {
+                siteTitle: `NotherBase - ${req.params.poi}`,
+                user: foundUser,
+                main: main,
+                pov: req.query.pov,
+                inventory: foundInventory,
+                query: req.query,
+                dir: req.worldDir,
+                route: `/${req.params.region}/${req.params.area}/${req.params.poi}`
             }
-        }
-        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,
-            inventory: null,
-            main: `${voidPath}/index`,
-            route: `/void`
-        });
-    });
-    
-    return router;
-}
+            await res.render(`explorer`, context);
+        } 
+        else next();
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+// start location
+router.get("/", function(req, res) {
+    res.redirect("/the-front");
+});
 
-module.exports = explorer;
+export default router;

package/controllers/game.js

@@ -1,8 +1,7 @@
-const express = require("express");
+import express from "express";
 const router = express.Router();
 
-// Import my Data
-const { game } = require("../models");
+import { game } from "../models/index.js";
 
 router.get("/all", async function(req, res) {
     try {
@@ -57,4 +56,4 @@ router.post("/", async function(req, res) {
     }
 });
 
-module.exports = router;
+export default router;

package/controllers/index.js

@@ -1,12 +1,10 @@
-module.exports = {
-    chat: require("./chat"),
-    item: require("./item"),
-    pages: require("./pages.js"),
-    user: require("./user"),
-    authCheck: require("./authCheck"),
-    contact: require("./contact"),
-    explorer: require("./explorer"),
-    front: require("./the-front"),
-    inventory: require("./inventory"),
-    game: require("./game")
-}
+export {default as item} from "./item.js";
+export {default as pages} from "./pages.js";
+export {default as user} from "./user.js";
+export {default as authCheck} from "./authCheck.js";
+export {default as contact} from "./contact.js";
+export {default as explorer} from "./explorer.js";
+export {default as front} from "./the-front.js";
+export {default as inventory} from "./inventory.js";
+export {default as game} from "./game.js";
+export {default as void} from "./void.js";

package/controllers/inventory.js

@@ -1,8 +1,8 @@
-const express = require("express");
+import express from "express";
 const router = express.Router();
 
 // Import my Data
-const { inventory, item, connectionSuccess } = require("../models");
+import { inventory, item, connectionSuccess } from "../models/index.js";
 
 router.get("/", async function(req, res) {
     if (connectionSuccess) {
@@ -34,8 +34,7 @@ router.post("/", async function(req, res) {
 
                 if (foundItem) {
                     let foundInventory = await inventory.findOne({user: req.session.currentUser}).populate("items.item");
-        
-                    console.log(foundInventory.items);
+
                     let holding = false;
         
                     for (let j = 0; j < foundInventory.items.length; j++) {
@@ -114,4 +113,4 @@ router.post("/", async function(req, res) {
 });
 
 
-module.exports = router;
+export default router;

package/controllers/item.js

@@ -1,8 +1,7 @@
-const express = require("express");
+import express from "express";
 const router = express.Router();
 
-// Import my Data
-const items = require("../models/item");
+import items from "../models/item.js";
 
 router.get("/all", async function(req, res) {
     try {
@@ -68,4 +67,4 @@ router.post("/delete", async function(req, res) {
     }
 });
 
-module.exports = router;
+export default router;

package/controllers/pages.js

@@ -1,38 +1,35 @@
-const express = require("express");
+import express from "express";
 const router = express.Router();
-const fs = require('fs');
-
-const db = require("../models");
-
-module.exports = function name(path)
-{
-    let files = fs.readdirSync(path);
-
-    router.post(`/serve/:script`, async function(req, res) {
-        try {
-            const foundUser = await db.user.findById(req.session.currentUser);
-
-            let scriptResult = await require(`${path}/scripts/${req.params.script}.js`)(db, foundUser, req.body);
-            res.send(scriptResult);
-        }
-        catch(err) {
-            console.log(err);
-            res.status(500).end();
-        }
-    });
-
-    files.forEach(file => {
-        file = file.slice(0, -4);
-
-        router.get(`/${file}`, async function(req, res) {
-            const foundUser = await db.user.findById(req.session.currentUser);
-
-            res.render(`${path}/${file}.ejs`, {
+import fs from "fs";
+
+router.post(`/serve/:script`, async function(req, res) {
+    try {
+        const foundUser = await req.db.user.findById(req.session.currentUser);
+
+        let scriptResult = await require(`${req.pagesDir}/scripts/${req.params.script}.js`)(db, foundUser, req.body);
+        res.send(scriptResult);
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+router.get(`/:page`, async function(req, res, next) {
+    fs.access(`${req.pagesDir}/${req.params.page}.ejs`, async (err) => {
+        if (!err) {
+            const foundUser = await req.db.user.findById(req.session.currentUser);
+    
+            res.render(`${req.pagesDir}/${req.params.page}.ejs`, {
                 user: foundUser,
                 query: req.query
             });
-        });
+        }
+        else {
+            console.log(err);
+            next();
+        }
     });
+});
 
-    return router;
-}
+export default router;

package/controllers/the-front.js

@@ -1,71 +1,65 @@
-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 scriptResult = await require(`${worldPath}/${currentRoute}/server-scripts/${req.params.script}.js`)(db, "/the-front", req.session.currentUser, req.body);
-            res.send(scriptResult);
-        }
-        catch(err) {
-            console.log(err);
-            res.status(500).end();
-        }
-    });
-    
-    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");
-    
-            let main = `${dir}/views/${req.params.detail}`;
-    
-            let context = {
-                siteTitle: `NotherBase - ${req.params.detail}`,
-                user: foundUser,
-                main: main,
-                inventory: foundInventory,
-                query: req.query,
-                dir: dir,
-                route: `/the-front/${req.params.detail}`
-            }
-    
-            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,
-                inventory: foundInventory,
-                query: req.query,
-                dir: dir,
-                route: `/the-front`
-            }
-    
-            await res.render(`explorer`, context);
+import express from "express";
+let router = express.Router();
+
+router.post(`/serve/:script`, async function(req, res) {
+    try {  
+        let scriptResult = await require(`${worldPath}/${currentRoute}/server-scripts/${req.params.script}.js`)(req.db, "/the-front", req.session.currentUser, req.body);
+        res.send(scriptResult);
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+router.get(`/:detail`, async function(req, res) {
+    try {
+        const foundUser = await req.db.user.findById(req.session.currentUser);
+        const foundInventory = await req.db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+
+        let main = `${req.frontDir}/views/${req.params.detail}`;
+
+        let context = {
+            siteTitle: `NotherBase - ${req.params.detail}`,
+            user: foundUser,
+            main: main,
+            inventory: foundInventory,
+            query: req.query,
+            dir: req.frontDir,
+            route: `/the-front/${req.params.detail}`
         }
-        catch(err) {
-            console.log(err);
-            res.status(500).end();
+
+        res.render(`explorer`, context);
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+router.get(`/`, async function(req, res) {
+    try {
+        const foundUser = await req.db.user.findById(req.session.currentUser);
+        const foundInventory = await req.db.inventory.findOne({ user: req.session.currentUser }).populate("items.item");
+
+        let main = `${req.frontDir}/views/index`;
+
+        let context = {
+            siteTitle: `NotherBase - The Front`,
+            user: foundUser,
+            main: main,
+            inventory: foundInventory,
+            query: req.query,
+            dir: req.frontDir,
+            route: `/the-front`
         }
-    });
-    
-    return router;
-}
 
-module.exports = front;
+        res.render(`explorer`, context);
+    }
+    catch(err) {
+        console.log(err);
+        res.status(500).end();
+    }
+});
+
+export default router;