notherbase-fs 1.5.1 → 1.5.3

package/controllers/explorer.js

@@ -1,7 +1,5 @@
 import express from "express";
-import path from 'node:path';
 import fs from 'fs';
-import { nextTick } from "node:process";
 
 let router = express.Router();
 
@@ -11,7 +9,8 @@ router.post(`/:region/:area/:poi/:detail/serve/:script`, async function(req, res
         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);
+        let script = await import(`${req.worldDir}/${currentAreaRoute}/server-scripts/${req.params.script}.js`);
+        let scriptResult = await script.default(req.db, currentRoute, foundUser, req.body);
         res.send({ scriptResult: scriptResult });
     }
     catch(err) {
@@ -148,9 +147,4 @@ router.get(`/:region/:area/:poi`, async function(req, res, next) {
     }
 });
 
-// start location
-router.get("/", function(req, res) {
-    res.redirect("/the-front");
-});
-
 export default router;

package/controllers/pages.js

@@ -6,7 +6,8 @@ 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);
+        let script = await import(`${req.pagesDir}/scripts/${req.params.script}.js`);
+        let scriptResult = await script.default(req.db, foundUser, req.body);
         res.send(scriptResult);
     }
     catch(err) {
@@ -16,20 +17,17 @@ router.post(`/serve/:script`, async function(req, res) {
 });
 
 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();
-        }
-    });
+    if (fs.existsSync(`${req.pagesDir}/${req.params.page}.ejs`)) {
+        const foundUser = await req.db.user.findById(req.session.currentUser);
+
+        res.render(`${req.pagesDir}/${req.params.page}.ejs`, {
+            user: foundUser,
+            query: req.query
+        });
+    } 
+    else {
+        next();
+    }
 });
 
 export default router;

package/controllers/the-front.js

@@ -1,9 +1,11 @@
 import express from "express";
 let router = express.Router();
+import fs from 'fs';
 
 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);
+        let script = await import(`${req.frontDir}/server-scripts/${req.params.script}.js`);
+        let scriptResult = await script.default(req.db, "/the-front", req.session.currentUser, req.body);
         res.send(scriptResult);
     }
     catch(err) {
@@ -12,24 +14,28 @@ router.post(`/serve/:script`, async function(req, res) {
     }
 });
 
-router.get(`/:detail`, async function(req, res) {
+router.get(`/:detail`, async function(req, res, next) {
     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}`
+        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,
+                inventory: foundInventory,
+                query: req.query,
+                dir: req.frontDir,
+                route: `/the-front/${req.params.detail}`
+            }
+    
+            res.render(`explorer`, context);
         }
-
-        res.render(`explorer`, context);
+        else next();
     }
     catch(err) {
         console.log(err);
@@ -39,11 +45,10 @@ router.get(`/:detail`, async function(req, res) {
 
 router.get(`/`, async function(req, res) {
     try {
+        let main = `${req.frontDir}/views/index`;
         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,

package/notherbase-fs.js

@@ -100,9 +100,14 @@ class NotherBaseFS {
     
         this.app.use("/the-front", controllers.front);
     
-        this.app.use("/", controllers.authCheck, controllers.explorer);
-        
         this.app.use("/", controllers.pages);
+        
+        this.app.use("/", controllers.authCheck, controllers.explorer);
+
+        // start location
+        this.app.get("/", function(req, res) {
+            res.redirect("/the-front");
+        });
 
         this.app.use(controllers.void);
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Functions to help make developing for NotherBase easier.",
   "exports": "./notherbase-fs.js",
   "scripts": {

package/test/explorer/coast/tall-beach/nono-cove/server-scripts/emailTime.js

@@ -0,0 +1,11 @@
+export default async function emailTime(db, route, user, params) {
+    try {
+        await db.sendMail.send(params.toEmail, params.subject, params.html);
+
+        return "Sent"
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

package/test/{coast → explorer/coast}/tall-beach/nono-cove/server-scripts/getTimer.js

@@ -1,4 +1,4 @@
-module.exports = async function getTimer(db, route, user, params) {
+export default async function getTimer(db, route, user, params) {
     try {
         let poi = await db.poi.findOne({ route: route, user: user });
 

package/test/test-index.js

@@ -2,4 +2,4 @@ import NotherBaseFS from "../notherbase-fs.js";
 import { fileURLToPath } from 'node:url';
 const __dirname = fileURLToPath(new URL('./', import.meta.url));
 
-const notherBaseFS = new NotherBaseFS(__dirname, `${__dirname}void`, __dirname, `${__dirname}pages`);
+const notherBaseFS = new NotherBaseFS(`${__dirname}explorer`, `${__dirname}void`, `${__dirname}the-front`, `${__dirname}pages`);

package/test/the-front/server-scripts/emailTime.js

@@ -0,0 +1,11 @@
+export default async function emailTime(db, route, user, params) {
+    try {
+        await db.sendMail.send(params.toEmail, params.subject, params.html);
+
+        return "Sent"
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

package/test/the-front/server-scripts/getTimer.js

@@ -0,0 +1,31 @@
+export default async function getTimer(db, route, user, params) {
+    try {
+        let poi = await db.poi.findOne({ route: route, user: user });
+
+        let now = Date.now();
+
+        if (!poi.data) poi.data = {
+            timer: 0,
+            lastTime: now
+        }
+        else {
+            if (!poi.data.lastTime) poi.data.lastTime = now;
+            if (!poi.data.timer) poi.data.timer = 0;
+        }
+
+        let difference = (now - poi.data.lastTime) / 1000;
+
+        poi.data.timer -= difference;
+        if (poi.data.timer < 0) poi.data.timer = 0;
+        poi.data.lastTime = now;
+
+        poi.markModified("data");
+        await poi.save();
+
+        return poi.data.timer;
+    } 
+    catch(err) {
+        console.log(err);
+        return false;
+    }
+}

package/test/{views → the-front/views}/index.ejs

@@ -4,6 +4,8 @@
 
 <button onclick="addGold()">Gold</button>
 
+<button onclick="emailTime()">email</button>
+
 <hr>
 
 <h3>Register Account</h3>
@@ -154,4 +156,16 @@
     let addGold = function addGold(params) {
         playerInventory.change(itemIDs[0], 2);
     }
+
+    let time = 0;
+
+    let emailTime = async () => {
+        $.post("/coast/tall-beach/nono-cove/index/serve/emailTime", {
+            toEmail: "wyattsushi@gmail.com",
+            subject: "New Time Update!",
+            html: `New Time: ${time}`
+        }, (res) => {
+            console.log(res);
+        })
+    }
 </script>

package/test/void/index.ejs

@@ -1 +1 @@
-void
+<a href="/">Leave the Void</a>

package/test/coast/tall-beach/nono-cove/server-scripts/emailTime.js

@@ -1,9 +0,0 @@
-module.exports = async function addToTimer(db, route, user, params) {
-    try {
-        return await db.sendMail.send(params.toEmail, params.subject, params.html);
-    } 
-    catch(err) {
-        console.log(err);
-        return false;
-    }
-}

package/test/coast/tall-beach/nono-cove/server-scripts/game.js

@@ -1,31 +0,0 @@
-const req = require("express/lib/request");
-
-module.exports = async function gameServerScript(db) {
-    try {
-        let foundGame = await db.game.findOne({ name: "test" });
-
-        if (!foundGame) {
-            await db.game.create({
-                name: "test",
-                data: {
-                    count: 0
-                }
-            });
-
-            return 0;
-        }
-        else {
-            let newCount = foundGame.data.count + 1;
-            foundGame.data = {
-                count: newCount
-            }
-            foundGame.markModified("data");
-            await foundGame.save();
-
-            return newCount;
-        }
-    }
-    catch(err) {
-        console.log(err);
-    }
-}