Merge pull request #3440 from Thorium-Sim/develop

Release

Author: alexanderson1993

server/app.ts

@@ -200,6 +200,11 @@ class Events extends EventEmitter {
     const snap = this.trimSnapshot({...this});
     store.set(snap, null);
   }
+  saveRestore() {
+    this.snapshotVersion = this.version;
+    const snap = this.trimSnapshot({...this});
+    store.writeRestore(snap);
+  }
   trimSnapshot({
     eventsToEmit = null,
     newEvents = null,

server/events/computerCore.js

@@ -68,13 +68,13 @@ const hackerNames = [
 
 App.on(
   "computerCoreAddHacker",
-  ({id, simulatorId, level = Math.round(Math.random() * 9 + 1), cb}) => {
+  ({id, simulatorId, name, level = Math.round(Math.random() * 9 + 1), cb}) => {
     const computerCore = App.systems.find(
       s => s.class === "ComputerCore" && s.simulatorId === simulatorId,
     );
     if (!computerCore) return;
     computerCore.addUser({
-      name: randomFromList(hackerNames),
+      name: name || randomFromList(hackerNames),
       level,
       hacker: true,
     });

server/helpers/data-store.js

@@ -1,10 +1,17 @@
 // From jonschlinkert/data-store
 // Extracted to replace debounce with throttle
 
-import { writeFile as _writeFile, readFileSync, existsSync, mkdirSync, unlinkSync } from "fs";
-import { homedir } from "os";
-import { join, dirname as _dirname, relative, sep } from "path";
-import { strictEqual } from "assert";
+import {
+  writeFile as _writeFile,
+  readFileSync,
+  readdirSync,
+  existsSync,
+  mkdirSync,
+  unlinkSync,
+} from "fs";
+import {homedir} from "os";
+import path, {join, dirname as _dirname, relative, sep} from "path";
+import {strictEqual} from "assert";
 const XDG_CONFIG_HOME = process.env.XDG_CONFIG_HOME;
 import throttle from "./throttle";
 const flatten = (...args) => [].concat.apply([], args);
@@ -252,7 +259,7 @@ class Store {
    * @api public
    */
 
-  json(replacer = null, space = this.indent) {
+  json(data, replacer = null, space = this.indent) {
     function stringify(obj, replacer, spaces, cycleReplacer) {
       return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces);
     }
@@ -281,7 +288,7 @@ class Store {
         return replacer == null ? value : replacer.call(this, key, value);
       };
     }
-    return stringify(this.data, replacer, space);
+    return stringify(data, replacer, space);
   }
 
   /**
@@ -317,21 +324,46 @@ class Store {
 
   writeFile() {
     mkdir(_dirname(this.path), this.options.mkdir);
-    const jsonData = this.json();
+    const jsonData = this.json(this.data);
+
+    _writeFile(this.path, jsonData, {mode: 0o0600}, err => {
+      if (err) {
+        console.error(err);
+      }
+    });
+  }
+
+  writeRestore(data) {
+    mkdir(_dirname(this.path), this.options.mkdir);
+    const jsonData = this.json(data);
+
+    // Get all of the restore files and keep the oldest 10
+    const filePath = _dirname(this.path);
+    readdirSync(filePath)
+      .filter(f => f.includes("-restore-"))
+      .sort((a, b) => {
+        const timestampA = Number(
+          a.slice(a.indexOf("-restore-") + 9),
+          a.indexOf(".json"),
+        );
+        const timestampB = Number(
+          b.slice(b.indexOf("-restore-") + 9),
+          b.indexOf(".json"),
+        );
+
+        return timestampB - timestampA;
+      })
+      .slice(10)
+      .forEach(filename => unlinkSync(join(filePath, filename)));
+
     _writeFile(
-      this.path.replace(".json", "-restore.json"),
+      this.path.replace(".json", `-restore-${Date.now()}.json`),
       jsonData,
       {mode: 0o0600},
       err => {
         if (err) {
           console.error(err);
         }
-
-        _writeFile(this.path, jsonData, {mode: 0o0600}, err => {
-          if (err) {
-            console.error(err);
-          }
-        });
       },
     );
   }

server/typeDefs/flight.ts

@@ -417,6 +417,8 @@ const resolver = {
     startFlight(rootQuery, {id = uuid.v4(), name, simulators, flightType}) {
       const simIds = simulators.map(
         (s: {simulatorId: string; missionId?: string; stationSet: string}) => {
+          // Create a snapshot restore before the flight is created
+          App.saveRestore();
           const template = cloneDeep(
             App.simulators.find(sim => sim.id === s.simulatorId),
           );
@@ -452,7 +454,7 @@ const resolver = {
       pubsub.publish("interfaceUpdate", App.interfaces);
 
       pubsub.publish("flightsUpdate", App.flights);
-      
+
       return id;
     },
     deleteFlight(rootQuery, {flightId}) {

src/components/macros/computerCore.tsx

@@ -11,7 +11,7 @@ const ComputerCoreAddHacker: React.FC<MacroConfigProps> = ({
       <Label>
         Name
         <Input
-          defaultValue={args.name}
+          value={args.name || ""}
           onChange={e => updateArgs("name", e.target.value)}
         />
         <small>Leave blank for random hacker name</small>