notherbase-fs 1.3.14 → 1.4.1

package/controllers/explorer.js

@@ -38,24 +38,43 @@ const explorer = async function explorer(worldPath, voidPath) {
         }
     });
 
-    router.get(`/:region/:area/:poi/:detail/load`, async function(req, res) {
+    router.get(`/recall`, async function(req, res) {
         try {
-            let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
+            let exists = await db.detail.exists({ 
+                route: req.query.route,
+                service: req.query.service,
+                scope: "local",
+                user: req.session.currentUser
+            });
 
-            let exists = await db.poi.exists({ route: currentRoute, user: req.session.currentUser });
             if (!exists) {
-                await db.poi.create({
-                    route: currentRoute,
-                    name: req.params.detail,
-                    type: "user",
+                await db.detail.create({
+                    _lastUpdate: Date.now(),
+                    route: req.query.route,
+                    service: req.query.service,
+                    scope: "local",
                     user: req.session.currentUser,
                     data: {}
                 });
             }
 
-            let found = await db.poi.findOne({ route: currentRoute, user: req.session.currentUser });
-    
-            res.send(found.data);
+            let found = await 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
+                });
+            }
+            else res.send({
+                isUpToDate: true,
+                data: null
+            });
         }
         catch(err) {
             console.log(err);
@@ -63,21 +82,25 @@ const explorer = async function explorer(worldPath, voidPath) {
         }
     });
 
-    router.post(`/:region/:area/:poi/:detail/save`, async function(req, res) {
+    router.post(`/commit`, async function(req, res) {
         try {
-            let currentRoute = `${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`;
-
-            let exists = await db.poi.exists({ route: currentRoute, user: req.session.currentUser });
-            if (!exists) await db.poi.create({
-                route: currentRoute,
-                name: req.params.detail,
-                type: "user",
+            console.log(req.body);
+            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,
-                data: {}
+                _lastUpdate: req.body.time,
+                data: req.body.data
+            }, {
+                upsert: true
             });
 
-            await db.poi.updateOne({ route: currentRoute, user: req.session.currentUser }, { data: req.body });
-    
             res.send("Update successful!");
         }
         catch(err) {
@@ -102,7 +125,7 @@ const explorer = async function explorer(worldPath, voidPath) {
                     inventory: foundInventory,
                     query: req.query,
                     dir: worldPath,
-                    path: path
+                    route: `/${req.params.region}/${req.params.area}/${req.params.poi}/${req.params.detail}`
                 }
         
                 await res.render(`explorer`, context);
@@ -113,7 +136,8 @@ const explorer = async function explorer(worldPath, voidPath) {
                     siteTitle: "NotherBase | The Void",
                     user: null,
                     inventory: null,
-                    main: `${voidPath}/index`
+                    main: `${voidPath}/index`,
+                    route: `/void/index`
                 });
             }
         }
@@ -139,7 +163,7 @@ const explorer = async function explorer(worldPath, voidPath) {
                     inventory: foundInventory,
                     query: req.query,
                     dir: worldPath,
-                    path: path
+                    route: `/${req.params.region}/${req.params.area}/${req.params.poi}/index`
                 }
         
                 await res.render(`explorer`, context);
@@ -150,7 +174,8 @@ const explorer = async function explorer(worldPath, voidPath) {
                     siteTitle: "NotherBase | The Void",
                     user: null,
                     inventory: null,
-                    main: `${voidPath}/index`
+                    main: `${voidPath}/index`,
+                    route: `/void/index`
                 });
             }
         }
@@ -172,7 +197,8 @@ const explorer = async function explorer(worldPath, voidPath) {
             siteTitle: "NotherBase | The Void",
             user: null,
             inventory: null,
-            main: `${voidPath}/index`
+            main: `${voidPath}/index`,
+            route: `/void/index`
         });
     });
     

package/controllers/the-front.js

@@ -43,7 +43,7 @@ const front = async function front(dir) {
                 inventory: foundInventory,
                 query: req.query,
                 dir: dir,
-                path: path
+                route: `/the-front/${req.params.detail}`
             }
     
             await res.render(`explorer`, context);
@@ -69,7 +69,7 @@ const front = async function front(dir) {
                 inventory: foundInventory,
                 query: req.query,
                 dir: dir,
-                path: path
+                route: `/the-front/${req.params.detail}`
             }
     
             await res.render(`explorer`, context);

package/models/{poi.js → detail.js}

@@ -1,10 +1,11 @@
 // This allows us to use Mongoose to connect to MongoDB
 const mongoose = require("mongoose");
 
-const poi = new mongoose.Schema({
+const detail = new mongoose.Schema({
+    _lastUpdate: Number,
     route: String,
-	name: String,
-	type: String,
+	service: String,
+	scope: String,
     user: { 
         type: mongoose.Schema.Types.ObjectId, 
         ref: "users",
@@ -15,4 +16,4 @@ const poi = new mongoose.Schema({
 
 // 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);
+module.exports = mongoose.model('details', detail);

package/models/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notherbase-fs",
-  "version": "1.3.14",
+  "version": "1.4.1",
   "description": "Functions to help make developing for NotherBase easier.",
   "main": "notherbase-fs.js",
   "scripts": {

package/public/js/memories.js

@@ -0,0 +1,45 @@
+class Memories {
+    constructor() {
+        this._lastUpdate = 0;
+        this.data = {};
+    }
+    
+    load = async (service, route = currentRoute) => {
+        try {
+            await $.get(`/recall`, {
+                route: route,
+                service: service,
+                _lastUpdate: this._lastUpdate
+            }, (res) => {
+                if (!res.isUpToDate && res.data) {
+                    this.data[service] = JSON.parse(res.data);
+                    this._lastUpdate = this.data[service]._lastUpdate;
+                }
+            });
+
+            return this.data[service];
+        } catch (error) {
+            return error;
+        }
+    }
+    
+    save = async (service, dataToSave, route = currentRoute) => {
+        try {
+            this._lastUpdate = Date.now();
+
+            await $.post('/commit', {
+                route: route,
+                service: service,
+                time: this._lastUpdate,
+                data: JSON.stringify(dataToSave)
+            }, (data) => {
+                this.data[service] = dataToSave;
+                return "saved";
+            });
+        } catch (error) {
+            return error;
+        }
+    }
+}
+
+const memories = new Memories();

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

@@ -17,9 +17,9 @@
 
 <hr>
 
-<h3>Game Test</h3>
+<h3>memories Test</h3>
 
-<button onclick="addToTime()">Add</button>
+<button onclick="setTime()">Add</button>
 <p id="timer">0:00</p>
 
 <hr>
@@ -105,44 +105,34 @@
 
     let time = 0;
 
-    let addToTime = async function addToTime() {
-        try {
-            time += 10;
+    (async () => {
+        let load = await memories.load("time", "/void/test");
+        console.log(load);
+        time = load.time;
+    })();
 
-            await $.post(`/coast/tall-beach/nono-cove/index/save`, { timer: time, lastTime: Date.now() }, function () {
-                $("#timer").text(Math.floor(time));
-            });
-        } catch (error) {
-            console.log(error);
-        }
-    }
-
-    let getTime = async function getTime() {
-        try {
-            await $.get(`/coast/tall-beach/nono-cove/index/load`, function (data) {
-                console.log(data);
-                data.timer = parseFloat(data.timer);
-                data.lastTime = parseFloat(data.lastTime);
-                console.log(data);
-                console.log(Date.now());
-                time = data.timer - ((Date.now() - data.lastTime) / 1000);
-                if (time < 0) time = 0;
-                $("#timer").text(Math.floor(time));
-            });
-        } catch (error) {
-            console.log(error);
-        }
+    let setTime = async function setTime() {
+        time = Date.now();
+        
+        await memories.save("time", {
+            time: time,
+            a: "dabfb",
+            bln: false,
+            numba: 4236,
+            arrray: [32, "sg", 45],
+            check: {
+                time: time,
+                a: "dabfb",
+                bln: false,
+                numba: 4236,
+                arrray: [32, "sg", 45]
+            }
+        }, "/void/test");
     }
     
     let updateTime = function updateTime() {
-        if (time > 0) {
-            time--;
-            if (time < 0) time = 0;
-            $("#timer").text(Math.floor(time));
-        }
-        
+        $("#timer").text(Math.floor((Date.now() - time) / 1000));
     }
 
     setInterval(updateTime, 1000);
-    getTime();
 </script>

package/views/explorer.ejs

@@ -1,5 +1,10 @@
 <%- include("./head.ejs"); %>
 
+<script>
+    const currentRoute = "<%- route %>";
+</script>
+<script src="/js/memories.js"></script>
+
 <main class="override">
     <%- include(`${main}.ejs`); %>
 </main>

package/views/inventory.ejs

@@ -19,7 +19,7 @@
         constructor() {
             this.$div = $(".inventory");
             this.$list = $(".inventory .item-list");
-            this.$search = $(".search");
+            this.$search = $(".inventory .search");
             this.$searchResults = $(".search-results");
             this.searchResults = [];
             this.$error = $("#inventory #error");