notherbase-fs 3.1.7 → 3.2.1

package/controllers/spirit-world.js

@@ -8,6 +8,24 @@ import fs from 'fs';
 * The spirit world is the API of a base.
 */
 export default class SpiritWorld {
+    /**
+     * Sets up the spirit world.
+     * @param {Server} io 
+     */
+    constructor(io) {
+        this.io = io;
+        this.rooms = {};
+
+        this.router = express.Router();
+        this.user = new User();
+
+        this.router.post("/load", this.load);
+        this.router.post("/serve", this.serve);
+        this.router.use("/user", this.user.router);
+
+        this.io.on('connection', this.#setupChat);
+    }
+
     /**
      * Sets up socket.io for instant messaging and etc.
      * @param {*} socket 
@@ -66,24 +84,6 @@ export default class SpiritWorld {
         });
     }
 
-    /**
-     * Sets up the spirit world.
-     * @param {Server} io 
-     */
-    constructor(io) {
-        this.io = io;
-        this.rooms = {};
-
-        this.router = express.Router();
-        this.user = new User();
-
-        this.router.post("/load", this.load);
-        this.router.post("/serve", this.serve);
-        this.router.use("/user", this.user.router);
-
-        this.io.on('connection', this.#setupChat);
-    }
-
     /**
      * This API route requests a spirit from the database.
      * @param {Object} req 
@@ -123,7 +123,7 @@ export default class SpiritWorld {
                 let user = await req.db.User.recallOne(req.session.currentUser);
 
                 script = await import(scriptPath);
-                result = await script.default(req, user);
+                result = await script.default(req, user, this.io);
                 success(res, "Served.", result);
             }
             else fail(res, `Script not found: ${req.body.script} at ${scriptPath}`);

package/models/send-mail.js

@@ -6,24 +6,7 @@ import nodemailer from "nodemailer";
  * @param {Number} resetToken Token to reset by.
  */
 const passwordReset = async (toEmail, resetToken) => {
-    var transporter = nodemailer.createTransport({
-        service: 'gmail',
-        auth: {
-          user: process.env.NOREPLY,
-          pass: process.env.NOREPLYPW
-        }
-    });
-      
-    var mailOptions = {
-        from: process.env.NOREPLY,
-        to: toEmail,
-        subject: 'Password Reset for NotherBase',
-        html: `<h1>Your One-Time Password Reset Code: ${resetToken}<h1>`
-    };
-    
-    transporter.sendMail(mailOptions, function(error, info){
-        if (error) console.log(error);
-    });
+    return await send(toEmail, 'Password Reset for NotherBase', `<h1>Your One-Time Password Reset Code: ${resetToken}<h1>`);
 };
 
 /**
@@ -34,14 +17,14 @@ const passwordReset = async (toEmail, resetToken) => {
  * @returns 
  */
 const send = async (toEmail, subject, html) => {
-    var transporter = nodemailer.createTransport({
+    const transporter = nodemailer.createTransport({
         service: 'gmail',
         auth: {
           user: process.env.NOREPLY,
-          pass: process.env.NOREPLYPW
+          pass: process.env.EMAILPW
         }
-    });
-      
+      });
+
     var mailOptions = {
         from: process.env.NOREPLY,
         to: toEmail,
@@ -49,9 +32,11 @@ const send = async (toEmail, subject, html) => {
         html: html
     };
     
-    return await transporter.sendMail(mailOptions, function(error, info){
+    let sent = await transporter.sendMail(mailOptions, function(error, info){
         if (error) console.log(error);
     });
+
+    return sent;
 }
 
 export default { passwordReset, send };

package/package.json

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

package/test/the-front/check/check.css

@@ -0,0 +1,3 @@
+.flipped {
+    background: black;
+}

package/test/the-front/check/flip.js

@@ -0,0 +1,10 @@
+export default async (req, user, io) => {
+    let bigSwitch = await req.db.Spirit.recallOne("big-switch");
+
+    if (!bigSwitch.memory.data.flipped) await bigSwitch.commit({ flipped: true });
+    else await bigSwitch.commit({ flipped: false });
+    console.log(bigSwitch.memory.data);
+
+    io.to("big-switch").emit("big-switch", { flipped: bigSwitch.memory.data.flipped });
+    return "success";
+}

package/test/the-front/check/index.ejs

@@ -1,3 +1,7 @@
+<style>
+    <%- include("./check.css"); %> 
+</style>
+
 <h1>The Big Check</h1>
 
 <hr>
@@ -5,6 +9,7 @@
 <button onclick="base.do('add-more-gold')">+3</button>
 <button onclick="base.do('subtract-gold')">-30</button>
 <button onclick="base.do('emailTime')">email</button>
+<button class="switch" onclick="base.do('flip')">Flip Me</button>
 <input type="text" id="test" placeholder="Loading...">
 <button onclick="saveInput()">Save</button>
 
@@ -27,4 +32,20 @@
 
         base.do("save-input", { text: inp });
     }
+
+    let switchSocket = io({
+        query: {
+            room: "big-switch",
+            name: "player"
+        }
+    });
+
+    switchSocket.on('big-switch', (update) => {
+        flipSwitch(update.flipped);
+    });
+
+    let flipSwitch = function flipSwitch(flipped) {
+        if (flipped) $(".switch").addClass("flipped");
+        else $(".switch").removeClass("flipped");
+    }
 </script>

package/test/the-front/check/save-input.js

@@ -1,7 +1,8 @@
-export default async (req, user) => {
+export default async (req, user, io) => {
     let spirit = await req.db.Spirit.recallOne("test-save3", user.id);
+    console.log(req.body);
 
     await spirit.commit({
-        text: req.body.data.text
+        text: req.body.text
     });
 }