notherbase-fs 4.4.7 → 4.5.1

package/{controllers → server}/user.js

@@ -20,7 +20,6 @@ export default class User {
         this.router.post("/downloadData", this.downloadData);
         this.router.post("/deleteAlldata", this.deleteAlldata);
         this.router.post("/importData", this.importData);
-
     }
 
     /**
@@ -30,7 +29,7 @@ export default class User {
      */
     logout = async (req, res) => {
         if (loginCheck(req, res)) {
-            delete req.user.memory?.data?.sessions[req.session.id];
+            delete req.user?.data?.sessions[req.session.id];
             await req.user.commit();
             await req.session?.destroy();
 
@@ -45,20 +44,20 @@ export default class User {
      */
     changePassword = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });  
+            let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username });  
 
             if (check(res, spirit, "User not found!") &&
                 check(res, req.body.newPassword === req.body.confirmation, "New password and confirmation must match!") &&
                 check(res, req.body.oldPassword != req.body.newPassword, "New password must be different from the old one."))
             {
-                let passResult = await bcrypt.compare(req.body.oldPassword, spirit.memory.data.password);
+                let passResult = await bcrypt.compare(req.body.oldPassword, spirit.data.password);
 
                 if (check(res, passResult, "Old password incorrect.")) {
                     const salt = await bcrypt.genSalt(10);
                     const hash = await bcrypt.hash(req.body.newPassword, salt);
     
                     spirit.addBackup({
-                        ...spirit.memory.data,
+                        ...spirit.data,
                         password: hash
                     });
                     
@@ -71,17 +70,17 @@ export default class User {
     }
 
     validatePassword = async (req, password, user) => {
-        if (password && user?.memory?.data?.otp) {
-            if (password == user.memory.data.otp.code) {
-                if (Date.now() < user.memory.data.otp.expires) {
-                    user.memory.data.otp.expires = 0;
+        if (password && user?.data?.otp) {
+            if (password == user.data.otp.code) {
+                if (Date.now() < user.data.otp.expires) {
+                    user.data.otp.expires = 0;
                     await user.commit();
                     return "Authenticated.";
                 }
                 else return "One-time password expired.";
             }
             else {
-                let passResult = await bcrypt.compare(req.body.password, user.memory.data.password);
+                let passResult = await bcrypt.compare(req.body.password, user.data.password);
                 if (passResult) return "Authenticated.";
                 else return "Password doesn't match the username.";
             }
@@ -96,18 +95,18 @@ export default class User {
      */
     changeEmail = async (req, res) => {       
         if (loginCheck(req, res)) {
-            let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });  
+            let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username }); 
 
             if (check(res, spirit, "User not found!") &&
                 check(res, req.body.email, "New email must be provided."))
             {
                 let result = await this.validatePassword(req, req.body.password, spirit);
                 if (result == "Authenticated.") {
-                    let other = await req.db.Spirit.recallOne("user",  null, { email: req.body.email });
+                    let other = await req.Spirit.recallOne("user",  null, { email: req.body.email });
          
                     if (check(res, !other, "Email already in use!")) {
                         spirit.addBackup({
-                            ...spirit.memory.data,
+                            ...spirit.data,
                             email: req.body.email
                         });
                         
@@ -128,18 +127,18 @@ export default class User {
      */
     sendOneTimePassword = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });  
+            let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username }); 
 
             if (check(res, spirit, "User not found!")) {
                 let otp = Math.floor(100000 + Math.random() * 900000);
-                spirit.memory.data.otp = {
+                spirit.data.otp = {
                     code: otp,
                     expires: Date.now() + 1000 * 60 * 15
                 }
                 
                 await spirit.commit();
 
-                await req.db.SendMail.send(spirit.memory.data.email, 'One Time Password for NotherBase', 
+                await req.SendMail.send(spirit.data.email, 'One Time Password for NotherBase', 
                     `<h1>Your One-Time Password:<h1>
                     <h2>${otp}<h2>
                     <p>Visit <a href="https://www.notherbase.com/the-front/keeper">notherbase.com/the-front/keeper</a> to use your one-time password.</p>
@@ -159,13 +158,13 @@ export default class User {
         if (check(res, req.body.password.length > 10, "Password must be >10 characters long.") &&
             check(res, req.body.username.length > 2, "Username too short.")) 
         {
-            let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.body.username });
+            let spirit = await req.Spirit.findOne({ service: "user", username: req.body.username });
     
             if (check(res, !spirit, "Username already in use!")) {
                 const salt = await bcrypt.genSalt(10);
                 const hash = await bcrypt.hash(req.body.password, salt);
 
-                spirit = await req.db.Spirit.create("user", { 
+                spirit = await req.Spirit.create("user", { 
                     username: req.body.username, 
                     password: hash,
                     authLevels: [ "Basic" ],
@@ -189,9 +188,9 @@ export default class User {
      * @param {Object} res An Express.js response.
      */
     login = async (req, res) => {
-        let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.body.username });
+        let spirit = await req.Spirit.findOne({ service: "user", username: req.body.username });
         if (check(res, spirit, "User not found.")) {
-            spirit.memory.data = {
+            spirit.data = {
                 username: "", 
                 password: "",
                 authLevels: [ "Basic" ],
@@ -202,15 +201,15 @@ export default class User {
                     expires: 0
                 },
                 sessions: {},
-                ...spirit.memory.data
+                ...spirit.data
             }
             await spirit.commit();
             
             let result = await this.validatePassword(req, req.body.password, spirit);
             if (result === "Authenticated.") {
                 req.session.currentUser = req.body.username;
-                if (typeof spirit.memory.data.sessions !== "object" || Array.isArray(spirit.memory.data.sessions)) spirit.memory.data.sessions = {};
-                spirit.memory.data.sessions[req.session.id] = Date.now() + 1000 * 60 * 60 * 24 * 28; // 28 days 
+                if (typeof spirit.data.sessions !== "object" || Array.isArray(spirit.data.sessions)) spirit.data.sessions = {};
+                spirit.data.sessions[req.session.id] = Date.now() + 1000 * 60 * 60 * 24 * 28; // 28 days 
                 await spirit.commit();
                 success(res, "Login successful!", req.body.username);
             }
@@ -225,13 +224,13 @@ export default class User {
      */
     deletePermanently = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });
+            let spirit = await req.Spirit.findOne({ service: "user", username: req.session.username });
 
             if (check(res, spirit, "User not found.")) {
-                let passResult = await bcrypt.compare(req.body.password, spirit.memory.data.password);
+                let passResult = await bcrypt.compare(req.body.password, spirit.data.password);
 
                 if (check(res, passResult, "Password doesn't match the username.")) {
-                    let deleted = await req.db.Spirit.delete("user",  null, { username: req.session.currentUser });
+                    let deleted = await req.Spirit.deleteMany({ service: "user", username: req.session.username });
             
                     if (check(res, deleted > 0, "No account deleted")) {
                         await req.session.destroy();
@@ -250,11 +249,11 @@ export default class User {
      */
     getInfo = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });
+            let user = await req.Spirit.findOne({ service: "user", username: req.session.username }); 
     
             if (check(res, user, "Account not found!")) {
                 success(res, "Info found", {
-                    username: user.memory.data.username
+                    username: user.data.username
                 });
             }
         }
@@ -263,11 +262,11 @@ export default class User {
     //download all spirit data belonging to the user
     downloadData = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });
+            let user = await req.Spirit.findOne({ service: "user", username: req.session.username }); 
 
             if (check(res, user, "Account not found!")) {
-                let data = await req.db.Spirit.recallAll(null, user.memory._id);
-                let dataToDownload = data.map(d => d.memory);
+                let data = await req.Spirit.recallAll(null, user._id);
+                let dataToDownload = data.map(d => d);
 
                 successJSON(res, "Data Downloaded", dataToDownload);
             }
@@ -277,14 +276,14 @@ export default class User {
     //delete all spirit data belonging to the user
     deleteAlldata = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });
+            let user = await req.Spirit.findOne({ service: "user", username: req.session.username }); 
 
             if (check(res, user, "Account not found!")) {
                 if (check(res, req.body.password, "Password error.")) {
-                    let passResult = await bcrypt.compare(req.body.password, user.memory.data.password);
+                    let passResult = await bcrypt.compare(req.body.password, user.data.password);
 
                     if (check(res, passResult, "Password doesn't match the username.")) {
-                        let deleted = await req.db.Spirit.delete(null, user.memory._id);
+                        let deleted = await req.Spirit.deleteMany({ parent: user._id });
                         if (check(res, deleted > 0, "No data deleted")) {
                             success(res, "Data Deleted", deleted);
                         }
@@ -297,18 +296,18 @@ export default class User {
     // import spirit data from a JSON file
     importData = async (req, res) => {
         if (loginCheck(req, res)) {
-            let user = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser }); 
+            let user = await req.Spirit.findOne({ service: "user", username: req.session.username }); 
 
             if (check(res, user, "Account not found!")) {
                 if (check(res, req.body.password, "Password error.")) {
-                    let passResult = await bcrypt.compare(req.body.password, user.memory.data.password);
+                    let passResult = await bcrypt.compare(req.body.password, user.data.password);
 
                     if (check(res, passResult, "Password doesn't match the username.")) {
                         let data = JSON.parse(req.body.data);
                         let imported = 0;
                         for (let i = 0; i < data.length; i++) {
                             if (data[i].parent != null) {
-                                let spirit = await req.db.Spirit.create(data[i].service, data[i].data, user.memory._id);
+                                let spirit = await req.Spirit.create(data[i].service, data[i].data, user._id);
                                 if (spirit) imported++;
                             }
                         }

package/test/coast/tall-beach/nono-cove/index.ejs

@@ -22,9 +22,9 @@
 
 <script src="/js/chat-box.js"></script>
 <script>
-    let chatTest = new ChatBox("<%= user.memory.data.username %>", "test-chat");
-    let chatTest2 = new ChatBox("<%= user.memory.data.username %>", "test-chat-2");
-    let chatTest3 = new ChatBox("<%= user.memory.data.username %>", "test-chat-3");
+    let chatTest = new ChatBox("<%= user.data.username %>", "test-chat");
+    let chatTest2 = new ChatBox("<%= user.data.username %>", "test-chat-2");
+    let chatTest3 = new ChatBox("<%= user.data.username %>", "test-chat-3");
 
     chatTest.sendMessage("Hello, world!");
 </script>

package/test/the-front/add-gold.js

@@ -1,14 +1,6 @@
 export default async (req, user, io) => {
-    // let deleted = await req.db.Spirit.delete("gold");
-    let spirit = await req.db.Spirit.recallOrCreateOne("gold");
-    spirit.addBackup({
-        amount: spirit.memory?.data?.amount != null ? spirit.memory.data.amount + 1 : 1
-    });
-    await spirit.commit();
-
-    spirit = await req.db.Spirit.recallOrCreateOne("gold", user.memory._id);
-    spirit.addBackup({
-        amount: spirit.memory?.data?.amount != null ? spirit.memory.data.amount + 1 : 1
-    });
-    await spirit.commit();
+    if (!user) return "No user logged in";
+    let spirit = await req.Spirit.findOne({ service: "gold", parent: user._id });
+    await spirit.commit({ amount: spirit.data?.amount != null ? spirit.data.amount + 1 : 1 });
+    return spirit.data.amount;
 }

package/test/the-front/index.ejs

@@ -15,7 +15,7 @@
 
 <input type="number" id="token">
 <button onclick="test.continueTest()">Continue Test</button>
-<button onclick="myGold = myGold + 1; base.save('front-gold', 'local', { amount: myGold })">add gold</button>
+<button onclick="addGold()">add gold</button>
 <!-- download you data -->
 <button onclick="downloadData()">Download Data</button>
 <!-- delete all your data -->
@@ -42,6 +42,11 @@
 <script>
     let myGold = 0;
 
+    base.load("gold").then(loaded => {
+        myGold = loaded[0]?.data?.amount || 0;
+        $("#gold").text(`${myGold} Gold Added`);
+    });
+
     class Test {
         constructor() {
             this.$info = $("main #info");
@@ -66,11 +71,6 @@
 
             this.$info.append(this.newUsername + "<br>");
             this.$info.append(this.newPassword + "<br>");
-
-            let loaded = await base.load("front-gold");
-            console.log("gold ", loaded);
-            myGold = loaded?.memory?.data?.amount || 0;
-            this.$gold.text(`${myGold} Gold Added`);
         }
 
         runTest = async () => {
@@ -130,4 +130,10 @@
         let res = await base.changeEmail(pass, email);
         console.log(res.message);
     }
+
+    let addGold = async () => {
+        myGold = myGold + 1;
+        let res = await base.do('add-gold', { amount: myGold, route: '/the-front' });
+        $("#gold").text(`${res.data} Gold Added`);
+    }
 </script>

package/test2/the-front/index.ejs

@@ -1,100 +1 @@
 <h1>NotherBase 2</h1>
-
-<p>
-    Welcome to The Front Test.
-</p>
-
-<p id="gold">0 Gold Added</p>
-
-<hr>
-
-<h3>Test Accounts</h3>
-<button onclick="test.runTest()">Run Test</button>
-
-<p id="info"></p>
-
-<input type="number" id="token">
-<button onclick="test.continueTest()">Continue Test</button>
-<button onclick="base.do('add-gold', { route: '/the-front' })">add gold</button>
-<!-- download you data -->
-<button onclick="base.downloadData()">Download Data</button>
-<!-- delete all your data -->
-<button onclick="base.deleteData($('#password').val())">Delete Data</button>
-<!-- import your data -->
-<button onclick="base.importData($('#password').val(), $('#fileInput')[0].files[0])">Import Data</button>
-<input type="file" id="fileInput">
-<!-- password input -->
-<input type="test" id="password" placeholder="pass">
-
-<hr>
-
-<a href="/coast/tall-beach/nono-cove" class="to nother-base">
-    Go inside
-</a>
-
-<a href="/check">
-    Go to The Check
-</a>
-
-<script>
-    class Test {
-        constructor() {
-            this.$info = $("main #info");
-            this.$gold = $("#gold");
-
-            this.oldID = Math.floor(Math.random() * 1000);
-            this.oldUsername = `testuser00${this.oldID}`;
-            this.oldPassword = `password00${this.oldID}`;
-
-            this.newID = Math.floor(Math.random() * 1000);
-            this.newUsername = `testuser00${this.newID}`;
-            this.newPassword = `password00${this.newID}`;
-
-            this.prepTest();
-        }
-
-        prepTest = async () => {
-            this.$info.empty();
-
-            this.$info.append(this.oldUsername + "<br>");
-            this.$info.append(this.oldPassword + "<br>");
-
-            this.$info.append(this.newUsername + "<br>");
-            this.$info.append(this.newPassword + "<br>");
-
-            let loaded = await base.load("gold", "global");
-            console.log("global gold ", loaded);
-            this.$gold.text(`?/${loaded?.memory?.data?.amount !== null ? loaded.memory.data.amount : 0} Gold Added`);
-            loaded = await base.loadAll("gold");
-            console.log("local gold ", loaded);
-        }
-
-        runTest = async () => {
-            let response = await base.attemptRegister(this.oldUsername, this.oldPassword);
-            this.$info.append(response.message + "<br>");
-
-            response = await base.attemptLogin(this.oldUsername, this.oldPassword);
-            this.$info.append(response.message + "<br>");
-        }
-
-        continueTest = async () => {
-            let response = await base.changePassword(
-                this.oldPassword,
-                this.newPassword, 
-                this.newPassword
-            );
-            this.$info.append(response.message + "<br>");
-
-            response = await base.logout(true);
-            this.$info.append(response.message + "<br>");
-
-            response = await base.attemptLogin(this.oldUsername, this.newPassword);
-            this.$info.append(response.message + "<br>");
-
-            response = await base.logout(true);
-            this.$info.append(response.message + "<br>");
-        }
-    }
-
-    let test = new Test();
-</script>

package/views/explorer.ejs

@@ -8,7 +8,7 @@
         const base = new Base();
     </script>
 
-    <% if (requireUser && !user?.memory) { %>
+    <% if (requireUser && !user?.data) { %>
         <div class="login-cover">
             <a class="header-link" href="/">
                 <img src="/img/logo.png">

package/views/footer.ejs

@@ -1,7 +1,7 @@
 
 <footer>
     <% if (user) { %> 
-        <p class="login-status">Logged In: <%= user.memory.data.username %></p><button class="logout" onclick="base.logout()">Logout</button>
+        <p class="login-status">Logged In: <%= user.data.username %></p><button class="logout" onclick="base.logout()">Logout</button>
     <% } else { %>
         <p class="login-status">Not Logged In</p><button class="invisible logout" onclick="base.logout()">Logout</button>
     <% } %>

package/controllers/creation.js

@@ -1,181 +0,0 @@
-import express from "express";
-import fs from 'fs';
-
-/**
- * Creation is all the renedered pages in a base.
- */
-export default class Creation {
-    constructor(bases = {}) {
-        this.bases = bases;
-        this.router = express.Router();
-
-        //home
-        this.router.get("/", this.front, this.explore);
-
-        //the-front
-        this.router.get(`/the-front`, this.front, this.explore);
-        this.router.get(`/the-front/:frontDetail`, this.frontDetail, this.explore);
-
-        //pages
-        // this.router.get(`/:page`, this.page, this.explore);
-
-        //the-front optional shortcuts
-        this.router.get(`/:frontDetail`, this.frontDetail, this.explore);
-
-        //explorer
-        this.router.get(`/:region/:area/:poi`, this.lock, this.poi, this.explore);
-        this.router.get(`/:region/:area/:poi/:detail`, this.lock, this.detail, this.explore);
-
-        //void
-        this.router.use(function(req, res) {
-            res.redirect("/void");
-        });
-    }
-
-    /**
-     * This middleware requires a user to login to access affected routes.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    lock = (req, res, next) => {
-        req.lock = true;
-        next();
-    }
-
-    /**
-     * This route renders a page and sends it to the client.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    explore = async (req, res, next) => {
-        try {
-            if (fs.existsSync(req.main + ".ejs")) {
-                let stats = await req.db.Spirit.recallOrCreateOne("stats", null, { route: req.path });
-                if (stats.memory.data.visits) stats.memory.data.visits++;
-                else stats.memory.data.visits = 1;
-                await stats.commit();
-
-                let context = {
-                    user: null,
-                    siteTitle: req.siteTitle,
-                    main: req.main,
-                    query: req.query,
-                    route: req.path,
-                    requireUser: req.lock,
-                    preprocessed: {}
-                }
-
-                if (req.session.currentUser) {
-                    let user = await req.db.Spirit.recallOne("user",  null, { username: req.session.currentUser });
-                    context.user = {
-                        memory: {
-                            data: user.memory.data,
-                            backups: user.memory.backups,
-                            _id: user.memory._id,
-                            parent: user.memory.parent,
-                            service: user.memory.service,
-                            _lastUpdate: user.memory._lastUpdate
-                        }
-                    }
-                }      
-
-                //preprocess
-                let preprocessScripts = fs.existsSync(req.preprocess) ? fs.readdirSync(req.preprocess) : [];
-                for (let preprocessScript of preprocessScripts) {
-                    try {
-                        let scriptPath = `${req.preprocess}/${preprocessScript}`;
-
-                        if (fs.existsSync(scriptPath)) {
-                            let script = await import(process.env.WINDOWS == "true" ? `file://${scriptPath}` : scriptPath);
-                            let result = await script.default(req, context.user, this.io);
-                            context.preprocessed[preprocessScript.split(".")[0]] = result;
-                        }
-                        else context.preprocessed[preprocessScript.split(".")[0]] = `Error: Script Not Found`;
-                    } catch (error) {
-                        console.log(error);
-                        context.preprocessed[preprocessScript.split(".")[0]] = `Error: Server Error`;
-                    }
-                }
-
-                res.render(req.toRender, context);
-            }
-            else next();
-        }
-        catch(err) {
-            console.log(err);
-            res.status(500).send("Server Error");
-        }
-    }
-
-    /**
-     * This middleware directs exploration to the front.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    front = async (req, res, next) => {
-        req.main = req.contentPath + "/the-front/index";
-        req.preprocess = req.contentPath + "/the-front/_preprocess";
-        req.siteTitle = this.bases[req.hosting].title;
-        req.toRender = "explorer";
-        next();
-    }
-
-    /**
-     * This middleware directs exploration to a detail in the front.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    frontDetail = async (req, res, next) => {
-        req.main = `${req.contentPath}/the-front/${req.params.frontDetail}/index`;
-        req.preprocess = `${req.contentPath}/the-front/${req.params.frontDetail}/_preprocess`;
-        req.siteTitle = `${this.bases[req.hosting].title} - ${req.params.frontDetail}`;
-        req.toRender = "explorer";
-        next();
-    }
-
-    /**
-     * This middleware directs exploration to a point of interest.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    poi = async (req, res, next) => {
-        req.main = `${req.contentPath}/${req.params.region}/${req.params.area}/${req.params.poi}/index`;
-        req.preprocess = `${req.contentPath}/${req.params.region}/${req.params.area}/${req.params.poi}/_preprocess`;
-        req.siteTitle = `${this.bases[req.hosting].title} - ${req.params.poi}`;
-        req.toRender = "explorer";
-        next();
-    }
-
-    /**
-     * This middleware directs exploration to a detail.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    detail = async (req, res, next) => {
-        req.main = `${req.contentPath}/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}/index`;
-        req.preprocess = `${req.contentPath}/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}/_preprocess`;
-        req.siteTitle = `${this.bases[req.hosting].title} - ${req.params.detail}`;
-        req.toRender = "explorer";
-        next();
-    }
-
-    /**
-     * This middleware directs exploration to a one-off page.
-     * @param {Object} req An Express.js request.
-     * @param {Object} res An Express.js response.
-     * @param {Function} next next()
-     */
-    // page = async (req, res, next) => {
-    //     req.main = `${req.contentPath}/pages/${req.params.page}/index`;
-    //     req.preprocess = `${req.contentPath}/pages/${req.params.page}/_preprocess`;
-    //     req.siteTitle = `${req.params.page}`;
-    //     req.toRender = req.main;
-    //     next();
-    // }
-}