.editorconfig

@@ -1,19 +0,0 @@
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-# 4 space indentation
-[*.js, *.css, *.html, *.json]
-indent_style = space
-indent_size = 4
-
-# Don't enforce anything in vendored code
-[*.min.*]
-end_of_line = unset
-insert_final_newline = unset
-indent_style = unset
-indent_style = unset

assets/js/easter-eggs.js

@@ -1,8 +1,10 @@
 // You're kind of ruining the surprise by reading this, but whatever
 var today = new Date();
 
-var christmasBegin = new Date(today.getFullYear(), 11, 21);
+// Check Christmas season: Date constructor in Javascript uses an index
-var christmasEnd = new Date(today.getFullYear(), 11, 31);
+// so 11 is Dec. of this year, and 12 is Jan. of the next
+var christmasBegin = new Date(today.getFullYear(), 11, 23);
+var christmasEnd = new Date(today.getFullYear(), 12, 8);
 var sf;
 
 if (today >= christmasBegin && today <= christmasEnd) {

assets/js/server-selector.js

@@ -1,13 +1,9 @@
+// TODO: path.join in this file, pass in json paths from index.js
 var remote = require("remote");
 var remotefs = remote.require("fs-extra");
 var dns = remote.require("dns");
-var path = remote.require("path");
-
-var userData = remote.require("app").getPath("userData");
-var configPath = path.join(userData, "config.json");
-var serversPath = path.join(userData, "servers.json");
-var versionsPath = path.join(userData, "versions.json");
 
+var userDir = remote.require("app").getPath("userData");
 var versionArray;
 var serverArray;
 var config;
@@ -33,7 +29,7 @@ function disableServerListButtons() {
 function getAppVersion() {
     appVersion = remote.require("app").getVersion();
 
-    // Simplify version, ex. 1.4.0 -> 1.4,
+    // simplify version, ex. 1.4.0 -> 1.4,
     // but only if a revision number isn't present
     if (appVersion.endsWith(".0")) {
         return appVersion.substr(0, appVersion.length - 2);
@@ -48,7 +44,9 @@ function setAppVersionText() {
 }
 
 function addServer() {
-    var jsonToModify = remotefs.readJsonSync(serversPath);
+    var jsonToModify = JSON.parse(
+        remotefs.readFileSync(userDir + "\\servers.json")
+    );
 
     var server = {};
     server["uuid"] = uuidv4();
@@ -65,12 +63,17 @@ function addServer() {
 
     jsonToModify["servers"].push(server);
 
-    remotefs.writeFileSync(serversPath, JSON.stringify(jsonToModify, null, 4));
+    remotefs.writeFileSync(
+        userDir + "\\servers.json",
+        JSON.stringify(jsonToModify, null, 4)
+    );
     loadServerList();
 }
 
 function editServer() {
-    var jsonToModify = remotefs.readJsonSync(serversPath);
+    var jsonToModify = JSON.parse(
+        remotefs.readFileSync(userDir + "\\servers.json")
+    );
     $.each(jsonToModify["servers"], function (key, value) {
         if (value["uuid"] == getSelectedServer()) {
             value["description"] =
@@ -87,12 +90,17 @@ function editServer() {
         }
     });
 
-    remotefs.writeFileSync(serversPath, JSON.stringify(jsonToModify, null, 4));
+    remotefs.writeFileSync(
+        userDir + "\\servers.json",
+        JSON.stringify(jsonToModify, null, 4)
+    );
     loadServerList();
 }
 
 function deleteServer() {
-    var jsonToModify = remotefs.readJsonSync(serversPath);
+    var jsonToModify = JSON.parse(
+        remotefs.readFileSync(userDir + "\\servers.json")
+    );
     var result = jsonToModify["servers"].filter(function (obj) {
         return obj.uuid === getSelectedServer();
     })[0];
@@ -101,20 +109,25 @@ function deleteServer() {
 
     jsonToModify["servers"].splice(resultindex, 1);
 
-    remotefs.writeFileSync(serversPath, JSON.stringify(jsonToModify, null, 4));
+    remotefs.writeFileSync(
+        userDir + "\\servers.json",
+        JSON.stringify(jsonToModify, null, 4)
+    );
     loadServerList();
 }
 
 function restoreDefaultServers() {
     remotefs.copySync(
-        path.join(__dirname, "/defaults/servers.json"),
+        __dirname + "\\defaults\\servers.json",
-        serversPath
+        userDir + "\\servers.json"
     );
     loadServerList();
 }
 
 function loadGameVersions() {
-    var versionJson = remotefs.readJsonSync(versionsPath);
+    var versionJson = JSON.parse(
+        remotefs.readFileSync(userDir + "\\versions.json")
+    );
     versionArray = versionJson["versions"];
     $.each(versionArray, function (key, value) {
         $(new Option(value.name, "val")).appendTo("#addserver-versionselect");
@@ -123,12 +136,14 @@ function loadGameVersions() {
 }
 
 function loadConfig() {
-    // Load config object globally
+    // load config object globally
-    config = remotefs.readJsonSync(configPath);
+    config = JSON.parse(remotefs.readFileSync(userDir + "\\config.json"));
 }
 
 function loadServerList() {
-    var serverJson = remotefs.readJsonSync(serversPath);
+    var serverJson = JSON.parse(
+        remotefs.readFileSync(userDir + "\\servers.json")
+    );
     serverArray = serverJson["servers"];
 
     $(".server-listing-entry").remove(); // Clear out old stuff, if any
@@ -159,50 +174,47 @@ function loadServerList() {
 }
 
 function performCacheSwap(newVersion) {
-    var cacheRoot = path.join(
+    var cacheRoot = userDir + "\\..\\..\\LocalLow\\Unity\\Web Player\\Cache";
-        userData,
+    var currentCache = cacheRoot + "\\Fusionfall";
-        "/../../LocalLow/Unity/Web Player/Cache"
+    var newCache = cacheRoot + "\\" + newVersion;
-    );
+    var record = userDir + "\\.lastver";
-    var currentCache = path.join(cacheRoot, "FusionFall");
-    var newCache = path.join(cacheRoot, newVersion);
-    var record = path.join(userData, ".lastver");
-    var lastVersion = remotefs.readFileSync(record, (encoding = "utf8"));
 
-    // Make note of what version we are launching for next launch
+    // if cache renaming would result in a no-op (ex. launching the same version
-    remotefs.writeFileSync(record, newVersion);
+    // two times), then skip it. this avoids permissions errors with multiple clients
-
-    // If cache renaming would result in a no-op (ex. launching the same version
-    // two times), then skip it. This avoids permissions errors with multiple clients
     // (file/folder is already open in another process)
     var skip = false;
 
     if (remotefs.existsSync(currentCache)) {
-        // Cache already exists, find out what version it belongs to
+        // cache already exists, find out what version it belongs to
         if (remotefs.existsSync(record)) {
+            lastVersion = remotefs.readFileSync(record);
             if (lastVersion != newVersion) {
-                // Remove the directory we're trying to store the
-                // existing cache to if it already exists for whatever
-                // reason, as it would cause an EPERM error otherwise.
-                // This is a no-op if the directory doesn't exist
-                remotefs.removeSync(path.join(cacheRoot, lastVersion));
-                // Store old cache to named directory
                 remotefs.renameSync(
                     currentCache,
-                    path.join(cacheRoot, lastVersion)
+                    cacheRoot + "\\" + lastVersion
                 );
             } else {
-                console.log("Cached version unchanged, skipping rename");
+                console.log(
+                    "Cached version unchanged, renaming will be skipped"
+                );
                 skip = true;
             }
             console.log("Current cache is " + lastVersion);
+        } else {
+            console.log(
+                "Couldn't find last version record; cache may get overwritten"
+            );
         }
     }
 
-    if (remotefs.existsSync(newCache) && !skip) {
+    if (remotefs.existsSync(newCache) || !skip) {
-        // Rename saved cache to FusionFall
+        // rename saved cache to FusionFall
         remotefs.renameSync(newCache, currentCache);
         console.log("Current cache swapped to " + newVersion);
     }
+
+    // make note of what version we are launching for next launch
+    remotefs.writeFileSync(record, newVersion);
 }
 
 // For writing loginInfo.php, assetInfo.php, etc.
@@ -214,7 +226,7 @@ function setGameInfo(serverUUID) {
         return obj.name === result.version;
     })[0];
 
-    // If cache swapping property exists AND is `true`, run cache swapping logic
+    // if cache swapping property exists AND is `true`, run cache swapping logic
     if (config["cache-swapping"]) {
         try {
             performCacheSwap(gameVersion.name);
@@ -227,34 +239,31 @@ function setGameInfo(serverUUID) {
 
     window.assetUrl = gameVersion.url; // game-client.js needs to access this
 
-    remotefs.writeFileSync(path.join(__dirname, "assetInfo.php"), assetUrl);
+    remotefs.writeFileSync(__dirname + "\\assetInfo.php", assetUrl);
     if (result.hasOwnProperty("endpoint")) {
         var httpEndpoint = result.endpoint.replace("https://", "http://");
         remotefs.writeFileSync(
-            path.join(__dirname, "rankurl.txt"),
+            __dirname + "\\rankurl.txt",
             httpEndpoint + "getranks"
         );
         // Write these out too
         remotefs.writeFileSync(
-            path.join(__dirname, "sponsor.php"),
+            __dirname + "\\sponsor.php",
             httpEndpoint + "upsell/sponsor.png"
         );
         remotefs.writeFileSync(
-            path.join(__dirname, "images.php"),
+            __dirname + "\\images.php",
             httpEndpoint + "upsell/"
         );
     } else {
         // Remove/default the endpoint related stuff, this server won't be using it
-        if (remotefs.existsSync(path.join(__dirname, "rankurl.txt"))) {
+        if (remotefs.existsSync(__dirname + "\\rankurl.txt")) {
-            remotefs.unlinkSync(path.join(__dirname, "rankurl.txt"));
+            remotefs.unlinkSync(__dirname + "\\rankurl.txt");
             remotefs.writeFileSync(
-                path.join(__dirname, "sponsor.php"),
+                __dirname + "\\sponsor.php",
                 "assets/img/welcome.png"
             );
-            remotefs.writeFileSync(
+            remotefs.writeFileSync(__dirname + "\\images.php", "assets/img/");
-                path.join(__dirname, "images.php"),
-                "assets/img/"
-            );
         }
     }
 
@@ -272,7 +281,7 @@ function setGameInfo(serverUUID) {
 
     // DNS resolution. there is no synchronous version for some stupid reason
     if (!address.match(/^[0-9.]+$/))
-        dns.lookup(address, (family = 4), function (err, resolvedAddress) {
+        dns.lookup(address, family=4, function (err, resolvedAddress) {
             if (!err) {
                 console.log("Resolved " + address + " to " + resolvedAddress);
                 address = resolvedAddress;
@@ -290,7 +299,7 @@ function setGameInfo(serverUUID) {
 function prepConnection(address, port) {
     var full = address + ":" + port;
     console.log("Will connect to " + full);
-    remotefs.writeFileSync(path.join(__dirname, "loginInfo.php"), full);
+    remotefs.writeFileSync(__dirname + "\\loginInfo.php", full);
     launchGame();
 }
 
@@ -333,8 +342,8 @@ $("#server-table").on("dblclick", ".server-listing-entry", function (event) {
 });
 
 $("#of-editservermodal").on("show.bs.modal", function (e) {
-    var jsonToModify = remotefs.readJsonSync(
+    var jsonToModify = JSON.parse(
-        path.join(userData, "servers.json")
+        remotefs.readFileSync(userDir + "\\servers.json")
     );
     $.each(jsonToModify["servers"], function (key, value) {
         if (value["uuid"] == getSelectedServer()) {

index.js

@@ -8,8 +8,10 @@ var path = require("path");
 var BrowserWindow = require("browser-window");
 var mainWindow = null;
 
+var userData = app.getPath("userData");
 var unityHomeDir = path.join(__dirname, "../../WebPlayer");
-// If running in non-packaged / development mode, this dir will be slightly different
+
+// if running in non-packaged / development mode, this dir will be slightly different
 if (process.env.npm_node_execpath) {
     unityHomeDir = path.join(app.getAppPath(), "/build/WebPlayer");
 }
@@ -18,26 +20,31 @@ process.env["UNITY_HOME_DIR"] = unityHomeDir;
 process.env["UNITY_DISABLE_PLUGIN_UPDATES"] = "yes";
 
 app.commandLine.appendSwitch("enable-npapi");
-app.commandLine.appendSwitch(
+app.commandLine.appendSwitch("load-plugin", path.join(unityHomeDir, "/loader/npUnity3D32.dll"));
-    "load-plugin",
-    path.join(unityHomeDir, "/loader/npUnity3D32.dll")
-);
 app.commandLine.appendSwitch("no-proxy-server");
 
-var userData = app.getPath("userData");
+var configPath = path.join(userData, "/config.json");
-var configPath = path.join(userData, "config.json");
+var serversPath = path.join(userData, "/servers.json");
-var serversPath = path.join(userData, "servers.json");
+var versionsPath = path.join(userData, "/versions.json");
-var versionsPath = path.join(userData, "versions.json");
 
 function initialSetup(firstTime) {
+    // Display a small window to inform the user that the app is working
+    setupWindow = new BrowserWindow({
+        width: 275,
+        height: 450,
+        resizable: false,
+        center: true,
+        frame: false,
+    });
     if (!firstTime) {
-        // Migration from pre-1.4
+        // migration from pre-1.4
         // Back everything up, just in case
+        setupWindow.loadUrl("file://" + __dirname + "/initial-setup.html");
         fs.copySync(configPath, configPath + ".bak");
         fs.copySync(serversPath, serversPath + ".bak");
         fs.copySync(versionsPath, versionsPath + ".bak");
     } else {
-        // First-time setup
+        // first-time setup
         // Copy default servers
         fs.copySync(
             path.join(__dirname, "/defaults/servers.json"),
@@ -50,6 +57,7 @@ function initialSetup(firstTime) {
     fs.copySync(path.join(__dirname, "/defaults/config.json"), configPath);
 
     console.log("JSON files copied.");
+    setupWindow.destroy();
     showMainWindow();
 }
 
@@ -78,7 +86,7 @@ app.on("ready", function () {
         height: 720,
         show: false,
         "web-preferences": {
-            plugins: true,
+            plugins: true
         },
     });
     mainWindow.setMinimumSize(640, 480);
@@ -141,6 +149,7 @@ function showMainWindow() {
 
     mainWindow.webContents.on("will-navigate", function (event, url) {
         event.preventDefault();
+        // TODO: showMessageBox rather than showErrorBox?
         switch (url) {
             case "https://audience.fusionfall.com/ff/regWizard.do?_flowId=fusionfall-registration-flow":
                 var errorMessage =

initial-setup.html

@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>OpenFusion: Initial Setup</title>
+    </head>
+    <body
+        style="
+            overflow: hidden;
+            background-color: #000;
+            user-select: none;
+            -webkit-user-select: none;
+        "
+    >
+        <center>
+            <div>
+                <img src="assets/img/of-3.png" width="256" />
+                <div>
+                    <img src="assets/img/spinner.gif" width="50px" />
+                </div>
+                <div style="margin-top: 15px">
+                    <p
+                        style="
+                            text-shadow: 1px 1px 8px #4349c4;
+                            color: #4a76b7;
+                            font-size: 18px;
+                            font-family: -apple-system, BlinkMacSystemFont,
+                                'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+                                'Noto Sans', sans-serif, 'Apple Color Emoji',
+                                'Segoe UI Emoji', 'Segoe UI Symbol',
+                                'Noto Color Emoji';
+                        "
+                    >
+                        OpenFusion is setting up...<br />Please wait - this
+                        should take <br />less than a minute.
+                    </p>
+                </div>
+            </div>
+        </center>
+    </body>
+</html>