notherbase-fs 3.0.10 → 3.1.1

package/README.md

@@ -1,2 +1,4 @@
 # notherbase-fs
-Functions to help make developing for NotherBase easier.
+Functions to help one develope a base.
+
+Visit notherbase.com/doc to for documentation on notherbase-fs and notherbase.

package/controllers/creation.js

@@ -29,29 +29,42 @@ export default class Creation {
 
     explore = async (req, res, next) => {
         let main = `${req.contentPath}`;
+        let route = "";
         let siteTitle = `NotherBase - `;
 
         if (req.params.frontDetail) {
-            main += `/the-front/${req.params.frontDetail}/index`;
+            route = `/the-front/${req.params.frontDetail}/index`;
             siteTitle += req.params.frontDetail;
         }
         else if (req.params.detail) {
-            main += `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}/index`;
+            route = `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}/index`;
             siteTitle += req.params.detail;
         }
         else if (req.params.poi) {
-            main += `/${req.params.region}/${req.params.area}/${req.params.poi}/index`;
+            route = `/${req.params.region}/${req.params.area}/${req.params.poi}/index`;
             siteTitle += req.params.poi;
         }
         else {
-            main += `/the-front/index`;
+            route = `/the-front/index`;
             siteTitle += "the-front";
         }
+        main += route;
 
         try {
             if (fs.existsSync(main + ".ejs")) {
                 let user = await req.db.User.recallOne(req.session.currentUser);
 
+                let stats = await req.db.Spirit.recallOne("stats");
+                if (stats.memory.data[route]) {
+                    stats.memory.data[route].visits++;
+                }
+                else {
+                    stats.memory.data[route] = {
+                        visits: 1
+                    }
+                }
+                await stats.commit();
+
                 let userStuff = {
                     userID: null,
                     user: null,
@@ -67,7 +80,7 @@ export default class Creation {
                     siteTitle: siteTitle,
                     main: main,
                     query: req.query,
-                    dir: req.frontDir,
+                    // dir: req.frontDir,
                     route: req.path,
                     requireUser: req.lock
                 }
@@ -91,6 +104,17 @@ export default class Creation {
             if (fs.existsSync(main)) {
                 let user = await req.db.User.recallOne(req.session.currentUser);
 
+                let stats = await req.db.Spirit.recallOne("stats");
+                if (stats.memory.data[main]) {
+                    stats.memory.data[main].visits++;
+                }
+                else {
+                    stats.memory.data[main] = {
+                        visits: 1
+                    }
+                }
+                await stats.commit();
+
                 let userStuff = {
                     userID: null,
                     user: null

package/controllers/spirit-world.js

@@ -1,8 +1,7 @@
 import express from "express";
 import { stripHtml } from "string-strip-html";
-import User from "./spirits/user.js";
-import Contact from "./spirits/contact.js";
 import { success, fail } from "./spirits/util.js";
+import User from "./spirits/user.js";
 import fs from 'fs';
 
 export default class SpiritWorld {
@@ -36,12 +35,10 @@ export default class SpiritWorld {
         this.io = io;
         this.router = express.Router();
         this.user = new User();
-        this.contact = new Contact();
 
+        this.router.post("/load", this.load);
         this.router.post("/serve", this.serve);
-        this.router.get("/load", this.load);
         this.router.use("/user", this.user.router);
-        this.router.use("/contact-nother", this.contact.router);
 
         this.io.on('connection', this.#setupChat);
     }
@@ -49,12 +46,12 @@ export default class SpiritWorld {
     load = async (req, res) => {
         let parent = null;
 
-        if (req.query.scope === "local") {
+        if (req.body.scope === "local") {
             let user = await req.db.User.recallOne(req.session.currentUser);
             parent = user.id;
         } 
 
-        let spirit = await req.db.Spirit.recallOne(req.query.service, parent);
+        let spirit = await req.db.Spirit.recallOne(req.body.service, parent);
 
         if (!spirit.memory.data) spirit.memory.data = {};
 
@@ -63,7 +60,7 @@ export default class SpiritWorld {
 
     serve = async (req, res) => {
         try {
-            let scriptPath = `${req.contentPath}${req.body.data.route}/${req.body.data.script}.js`;
+            let scriptPath = `${req.contentPath}${req.body.route}/${req.body.script}.js`;
             
             let script, result = null;
 
@@ -74,7 +71,7 @@ export default class SpiritWorld {
                 result = await script.default(req, user);
                 success(res, "Served.", result);
             }
-            else fail(res, `Script not found: ${req.body.data.script} at ${scriptPath}`);
+            else fail(res, `Script not found: ${req.body.script} at ${scriptPath}`);
         } catch (error) {
             console.log(error);
             fail(res, "Server error");

package/controllers/spirits/user.js

@@ -16,6 +16,7 @@ export default class User {
         this.router.post("/deletePermanently", this.deletePermanently);
         this.router.post("/getInventory", this.getInventory);
         this.router.post("/getAttributes", this.getAttributes);
+        this.router.post("/getInfo", this.getInfo);
     }
 
     logout = async (req, res) => {
@@ -25,18 +26,18 @@ export default class User {
     }
 
     sendPasswordReset = async (req, res) => {
-        let spirit = await req.db.User.recallOne(req.body.data.email);
+        let spirit = await req.db.User.recallOne(req.body.email);
 
         if (spirit) {
             let token = Math.floor(Math.random() * 9999);
 
-            if (req.body.data.test) console.log("token: " + token);
+            if (req.body.test) console.log("token: " + token);
 
             spirit.memory.data.resetToken = token;
             spirit.memory.data.resetExp = Date.now() + (1000 * 60 * 10);
             await spirit.commit();
     
-            req.db.SendMail.passwordReset(req.body.data.email, token);
+            req.db.SendMail.passwordReset(req.body.email, token);
     
             success(res, "Password reset token sent.");
         }
@@ -44,18 +45,18 @@ export default class User {
     }
 
     changePassword = async (req, res) => {
-        if (check(res, req.body.data.token, "No token provided!")){
-            let spirit = await req.db.User.recallOne(req.body.data.email);
+        if (check(res, req.body.token, "No token provided!")){
+            let spirit = await req.db.User.recallOne(req.body.email);
     
             if (check(res, spirit, "User not found!") &&
-                check(res, spirit.memory.data.resetToken == req.body.data.token, "Reset token not valid!") &&
+                check(res, spirit.memory.data.resetToken == req.body.token, "Reset token not valid!") &&
                 check(res, spirit.memory.data.resetExp > Date.now(), "Reset token expired!") &&
-                check(res, req.body.data.password === req.body.data.confirmation, "Passwords must match!")) 
+                check(res, req.body.password === req.body.confirmation, "Passwords must match!")) 
             {
                 spirit.memory.data.resetExp = -1;
         
                 const salt = await bcrypt.genSalt(10);
-                const hash = await bcrypt.hash(req.body.data.password, salt);
+                const hash = await bcrypt.hash(req.body.password, salt);
         
                 spirit.memory.data.password = hash;
                 await spirit.commit();
@@ -66,14 +67,14 @@ export default class User {
     }
 
     register = async (req, res) => {
-        if (check(res, req.body.data.password.length > 7, "Password too short.") &&
-            check(res, req.body.data.email.length > 7, "Email too short.") &&
-            check(res, req.body.data.username.length > 2, "Username too short.")) 
+        if (check(res, req.body.password.length > 7, "Password too short.") &&
+            check(res, req.body.email.length > 7, "Email too short.") &&
+            check(res, req.body.username.length > 2, "Username too short.")) 
         {
-            let spirit = await req.db.User.recallOne(req.body.data.email);
+            let spirit = await req.db.User.recallOne(req.body.email);
     
             if (check(res, !spirit, "Email already in use!")) {
-                spirit = await req.db.User.create(req.body.data.username, req.body.data.password, req.body.data.email);
+                spirit = await req.db.User.create(req.body.username, req.body.password, req.body.email);
         
                 success(res, "Registration successful!");
             }
@@ -81,12 +82,13 @@ export default class User {
     }
 
     login = async (req, res) => {
-        let spirit = await req.db.User.recallOne(req.body.data.email);
+        let spirit = await req.db.User.recallOne(req.body.email);
+
         if (check(res, spirit, "User not found.")) {
-            let passResult = await bcrypt.compare(req.body.data.password, spirit.memory.data.password);
+            let passResult = await bcrypt.compare(req.body.password, spirit.memory.data.password);
             
             if (check(res, passResult, "Password doesn't match the email.")) {
-                req.session.currentUser = req.body.data.email;
+                req.session.currentUser = req.body.email;
         
                 success(res, "Logged in.", spirit.memory.data.username);
             }
@@ -95,15 +97,15 @@ export default class User {
 
     changeEmail = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.User.recallOne(req.body.data.email);
+            let spirit = await req.db.User.recallOne(req.body.email);
     
             if (check(res, !spirit, "Email already in use!")) {
                 spirit = await req.db.User.recallOne(req.session.currentUser);
         
-                spirit.memory.data.email = req.body.data.email;
+                spirit.memory.data.email = req.body.email;
                 await spirit.commit();
         
-                req.session.currentUser = req.body.data.email;
+                req.session.currentUser = req.body.email;
         
                 success(res, "Email changed.");
             }
@@ -112,12 +114,12 @@ export default class User {
 
     changeUsername = async (req, res) => {
         if (loginCheck(req, res)) {
-            let spirit = await req.db.User.recallOne(null, req.body.data.username);
+            let spirit = await req.db.User.recallOne(null, req.body.username);
     
             if (check(res, !spirit, "Username already in use!")) {
                 spirit = await req.db.User.recallOne(req.session.currentUser);
         
-                spirit.memory.data.username = req.body.data.username;
+                spirit.memory.data.username = req.body.username;
                 await spirit.commit();
         
                 success(res, "Username changed");
@@ -159,4 +161,18 @@ export default class User {
             else fail(res, "Attributes up to date.");
         }
     }
+
+    getInfo = async (req, res) => {
+        if (loginCheck(req, res)) {
+            let user = await req.db.User.recallOne(req.session.currentUser);
+    
+            if (user.memory._lastUpdate > req.body._lastUpdate) {
+                success(res, "Info found", {
+                    email: user.memory.data.email,
+                    username: user.memory.data.username
+                });
+            }
+            else fail(res, "Info up to date.");
+        }
+    }
 }

package/models/spirit.js

@@ -77,8 +77,8 @@ export default class Spirit {
         }
     }
 
-    static delete = async (options = {}, data = {}, id = null) => {
-        let found = await Spirit.db.deleteMany(Spirit.buildQuery(options, data, id));
+    static delete = async (service, data = {}, id = null) => {
+        let found = await Spirit.db.deleteMany(Spirit.buildQuery(service, data, id));
 
         return found.deletedCount;
     }

package/models/user.js

@@ -66,13 +66,11 @@ export default class User extends Spirit {
         return spirit;
     }
 
-    static delete = async (target) => {
+    static delete = async (email) => {
         let found = await Spirit.db.findAndDelete(Spirit.buildQuery({
-            route: "/",
             service: "user",
-            scope: "global",
             parent: null
-        }, { email: target }));
+        }, { email: email }));
 
         return found.deletedCount;
     }

package/package.json

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

package/public/styles/menu.css

@@ -47,6 +47,7 @@
     width: 64px;
     height: 64px;
     border-radius: 5px;
+    z-index: 100;
 }
 
 .menu button#close {

package/test/coast/tall-beach/nono-cove/nono-og/add-gold.js

@@ -0,0 +1,16 @@
+export default async (req, user) => {
+    await user.offsetItem("Gold Coin", 3);
+
+    let spirit = await req.db.Spirit.recallOne("test");
+    if (!spirit.memory.data.amount) spirit.memory.data.amount = 0;
+    spirit.memory.data.amount += 3;
+    await spirit.commit();
+
+    let stats = await req.db.Spirit.recallOne("stats");
+    let render = [];
+    let keys = Object.keys(stats.memory.data);
+    for (let i = 0; i < keys.length; i++) {
+        render.push(`${keys[i]} - ${stats.memory.data[keys[i]].visits}`)
+    }
+    console.log(render);
+}

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

@@ -40,4 +40,8 @@
     setInterval(moveNono, 2000);
 
     <%- include("./nono.js"); %>
+
+    base.load("test", "global").then((res) => {
+        console.log(res);
+    });
 </script>

package/test/coast/tall-beach/nono-cove/nono-og/nono.js

@@ -185,7 +185,7 @@ class NonoGame {
 
     tryFinishGame() {
         if (this.checkForSolve()) {
-            playerInventory.change(this.goldItem, this.level + this.difficulty);
+            base.do("add-gold");
 
             let $tiles = $(".nono-tile");
             $tiles.off("click");

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

@@ -7,27 +7,15 @@ export default async (req, user) => {
 
     await user.offsetItem("Gold Coin", 15);
 
-    let local = await req.db.Spirit.recallOrCreate({
-        route: req.body.route,
-        scope: "local",
-        parent: user.id,
-        service: "gold"
-    }, {}, {
-        gold: 0
-    });
+    // await req.db.Spirit.delete("gold");
+
+    let local = await req.db.Spirit.recallOne("gold", user.id);
 
     if (!local.memory.data.gold) local.memory.data.gold = 0;
     local.memory.data.gold += 15;
     await local.commit();
 
-    let global = await req.db.Spirit.recallOrCreate({
-        route: req.body.route,
-        scope: "global",
-        parent: null,
-        service: "gold"
-    }, {}, {
-        gold: 0
-    });
+    let global = await req.db.Spirit.recallOne("gold");
 
     if (!global.memory.data.gold) global.memory.data.gold = 0;
     global.memory.data.gold += 15;

package/views/explorer.ejs

@@ -10,6 +10,8 @@
     const currentRoute = "<%- route %>";
 
     <%- include("./scripts/base.js", {user: user}); %>
+
+    const base = new Base();
 </script>
 
 

package/views/menu/more.ejs

@@ -1,5 +1,2 @@
 <div class="content invisible" id="more">
-    <h4>Message Nother</h4>
-    <textarea id="content"></textarea>
-    <button id="send" onclick="sendMessageToNother()">Send Message</button>
 </div>

package/views/scripts/base.js

@@ -1,13 +1,8 @@
 class Base {
-    static commune = async (route, data = null, options = null) => {
-        let body = { data, ...options };
-    
-        let response = null;
+    static commune = async (route, data = {}) => {
+        let response = await $.post("/s/user/" + route, JSON.stringify(data));
 
-        await $.post(route, JSON.stringify(body), (res) => {
-            response = res;
-            if (res.status != "success") console.log(`${route} - ${res.message}`);
-        });
+        if (response.status != "success") console.log(`${"/s/user/" + route} - ${response.message}`);
     
         return response;
     }
@@ -17,15 +12,13 @@ class Base {
             this.items = [];
             this.lastUpdate = 0;
     
-            <% if (user) { %>
-                this.refresh();
-            <% } %>
+            this.refresh();
         }
         
         async refresh() {
             let $list = $(".inventory .item-list");
 
-            let response = await Base.commune("/s/user/getInventory", {}, { _lastUpdate: this.lastUpdate });
+            let response = await Base.commune("getInventory", { _lastUpdate: this.lastUpdate });
 
             if (response.status === "success") {
                 this.items = response.data;
@@ -68,13 +61,11 @@ class Base {
             this.attributes = [];
             this.lastUpdate = 0;
 
-            <% if (user) { %>
-                this.refresh();
-            <% } %>
+            this.refresh();
         }
 
         async refresh() {
-            let response = await Base.commune("/s/user/getAttributes", {}, { _lastUpdate: this.lastUpdate });
+            let response = await Base.commune("getAttributes", { _lastUpdate: this.lastUpdate });
             if (response.status === "success") {
                 this.lastUpdate = response.lastUpdate;
                 this.attributes = response.data;
@@ -100,16 +91,19 @@ class Base {
         constructor() {
             this.username = "";
             this.email = "";
+            this.lastUpdate = 0;
             
-            <% if (user) { %>
-                this.username = "<%= user.username %>";
-                this.email = "<%= user.email %>";
-    
-                this.refresh();
-            <% } %>
+            this.refresh();
         }
     
-        refresh() {
+        async refresh() {
+            let response = await Base.commune("getInfo", { _lastUpdate: this.lastUpdate });
+            if (response.status === "success") {
+                this.lastUpdate = response.lastUpdate;
+                this.email = response.data.email;
+                this.username = response.data.username;
+            }
+
             let $email = $(".content#account .setting#email p");
             let $emailInput = $(".content#account .edit#email input");
             let $username = $(".content#account .setting#username p");
@@ -148,9 +142,10 @@ class Base {
             let $email = $(".content#account .setting#email p");
             let $emailInput = $(".content#account .edit#email input");
 
-            let response = await Base.commune("/s/user/changeEmail", { email: $emailInput.val() });
+            let response = await Base.commune("changeEmail", { email: $emailInput.val() });
     
             if (response.status === "success") {
+                this.email = $emailInput.val();
                 $email.text($emailInput.val());
                 $info.text("Email Updated.");
             }
@@ -184,9 +179,10 @@ class Base {
             let $username = $(".content#account .setting#username p");
             let $usernameInput = $(".content#account .edit#username input");
 
-            let response = await Base.commune("/s/user/changeUsername", { username: $usernameInput.val() });
+            let response = await Base.commune("changeUsername", { username: $usernameInput.val() });
     
             if (response.status === "success") {
+                this.username = $usernameInput.val();
                 $username.text($usernameInput.val());
                 $info.text("Username Updated.");
             }
@@ -202,6 +198,8 @@ class Base {
         this.playerAttributes = new this.#PlayerAttributes();
         this.playerAccount = new this.#AccountServices();
         this.menuClosing = false;
+
+        this.switchTab("inventory");
     }
 
     closeMenu = () => {
@@ -237,22 +235,13 @@ class Base {
     }
     
     logout = async () => {
-        let response = await Base.commune("/s/user/logout");
+        let response = await Base.commune("logout");
 
         return response;
     }
-    
-    sendMessageToNother = async () => {
-        await Base.commune("contactNother", {
-            content: $(".menu .content#more #content").val(),
-            route: currentRoute
-        });
-    
-        $(".menu .content#more #content").val("");
-    }
 
     attemptRegister = async (email, username, password) => {
-        let response = await Base.commune("/s/user/register", { 
+        let response = await Base.commune("register", { 
             email, username, password 
         });
         
@@ -260,7 +249,7 @@ class Base {
     }
 
     attemptLogin = async (email, password) => {
-        let response = await Base.commune("/s/user/login", {
+        let response = await Base.commune("login", {
             email: email,
             password: password
         });
@@ -277,24 +266,25 @@ class Base {
     };
 
     resetPassword = async (email, test = false) => {
-        let response = await Base.commune("/s/user/sendPasswordReset", { email, test });
+        let response = await Base.commune("sendPasswordReset", { email, test });
         
         return response;
     }
 
     changePassword = async (token, email, password, confirmation) => {
-        let response = await Base.commune("/s/user/changePassword", { token, email, password, confirmation });
+        let response = await Base.commune("changePassword", { token, email, password, confirmation });
         
         return response;
     }
 
     do = async (what, data = null) => {
-        console.log(window.location.pathname);
-        let response = await Base.commune("/s/serve", {
+        let response = await $.post("/s/serve", JSON.stringify({ 
             script: what,
             route: window.location.pathname,
             ...data
-        });
+        }));
+
+        if (response.status != "success") console.log(`${window.location.pathname} - ${response.message}`);
 
         this.playerInventory.refresh();
         this.playerAttributes.refresh();
@@ -303,12 +293,8 @@ class Base {
     }
 
     load = async (service, scope = "local") => {
-        let response = await $.get("/s/load", { service, scope });
+        let response = await $.post("/s/load", JSON.stringify({ service, scope }));
 
         return response;
     }
-}
-
-const base = new Base();
-
-base.switchTab("inventory");
+}

package/controllers/spirits/contact.js

@@ -1,23 +0,0 @@
-import express from "express";
-import { success } from "./util.js";
-
-export default class Contact {
-    constructor() {
-        this.router = express.Router();
-
-        this.router.post(`/`, this.contactNother);
-    }
-
-    contactNother = async function(req, res) {
-        let user = await User.recallOne(req.session.currentUser);
-
-        let spirit = await req.db.Spirit.create({
-            route: "/",
-            service: "nother-contacts",
-            scope: "local",
-            parent: user.id
-        }, req.body);
-
-        success(res, "Message sent.");
-    }
-}