electron fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "homegames-core",
-  "version": "1.0.20", 
+  "version": "1.0.21",
   "description": "Play games at home",
   "directories": {
     "lib": "lib"
@@ -28,12 +28,12 @@
   "homepage": "https://github.com/homegamesio/homegames#readme",
   "dependencies": {
     "homegames-common": "1.0.4",
-    "squish-0756": "npm:squishjs@0.7.56",
-    "squish-0762": "npm:squishjs@0.7.62",
-    "squish-0765": "npm:squishjs@0.7.65",
-    "squish-0766": "npm:squishjs@0.7.66",
-    "squish-0767": "npm:squishjs@0.7.67",
-    "squish-1000": "npm:[email protected].0",
+    "squish-0756": "npm:squishjs@1.0.4",
+    "squish-0762": "npm:squishjs@1.0.4",
+    "squish-0765": "npm:squishjs@1.0.4",
+    "squish-0766": "npm:squishjs@1.0.4",
+    "squish-0767": "npm:squishjs@1.0.4",
+    "squish-1000": "npm:[email protected].4",
     "squish-1004": "npm:[email protected]",
     "squish-1005": "npm:[email protected]",
     "unzipper": "^0.10.11",

src/Homenames.js

@@ -34,7 +34,7 @@ const getLocalIP = () => {
 
 class Homenames {
     constructor(port, certPath) {
-        log.info('running homenames on port ', port);
+        log.info('running homenames on port ' + port);
 
         this.certPath = certPath;
         this.playerInfo = {};

src/common/squish-map.js

@@ -1,10 +1,12 @@
+const { log } = require('homegames-common');
+
 let isMain = true;
 
 try {
     require.resolve('homegames-core');
     isMain = false;
 } catch (err) {
-    console.log('Running web as main module');
+    log.info('Running web as main module');
 }
 
 // versions before 1004 will fail when using electron because they use the wrong base data directory. when running in electron (not as main process), use 1004 instead of those older versions

src/common/util/dictionary.js

@@ -1,3 +1,5 @@
+const { log } = require('homegames-common');
+
 const https = require('https');
 const path = require('path');
 const fs = require('fs');
@@ -160,11 +162,11 @@ for (let i = 0; i < options.length; i++) {
 }
 
 if (dictPath) {
-    console.log('Using dictionary file at ' + dictPath);
+    log.info('Using dictionary file at ' + dictPath);
     const dictionaryBytes = fs.readFileSync(dictPath);
     words = dictionaryBytes.toString().split('\n').filter(w => !!w);
 } else {
-    console.log('Missing dictionary.txt file. Using default dictionary');
+    log.info('Missing dictionary.txt file. Using default dictionary');
     words = defaultWords;
 }
 

src/dashboard/HomegamesDashboard.js

@@ -117,8 +117,8 @@ if (!fs.existsSync(DOWNLOADED_GAME_DIRECTORY)) {
     try {
         fs.mkdirSync(DOWNLOADED_GAME_DIRECTORY);
     } catch (err) {
-        console.error('Unable to create downloaded game directory');
-        console.error(err);
+        log.error('Unable to create downloaded game directory');
+        log.error(err);
     }
 }
 
@@ -451,7 +451,8 @@ class HomegamesDashboard extends ViewableGame {
             });
 
             childSession.on('close', (err) => {
-                console.log(err);
+                log.error('Child session closed');
+                log.error(err);
                 this.sessions[sessionId] = {};
             });
 
@@ -536,8 +537,8 @@ class HomegamesDashboard extends ViewableGame {
                                     this.renderGamePlane();
                                     this.startSession(playerId, gameId, gameVersion.versionId);
                                 }).catch(err => {
-                                    console.log('eroeororor');
-                                    console.log(err);
+                                    log.error('Error downloading game');
+                                    log.error(err);
                                 });
                             }
                         },

src/games/sponge/index.js

@@ -19,7 +19,6 @@ class Sponge extends Game {
     }
 
     constructor() {
-        console.log("SDKJFHKDSJFHDSF");
         super();
 
         this.playerSides = {};

src/homegames_root/HomegamesRoot.js

@@ -1,9 +1,11 @@
+const { getConfigValue, getAppDataPath, log } = require('homegames-common');
+
 const fs = require('fs');
 const process = require('process');
 
 if (!process.env.SQUISH_PATH) {
     const defaultVersion = 'squish-0767';
-    console.log('No SQUISH_PATH found. Using default: ' + defaultVersion);
+    log.info('No SQUISH_PATH found. Using default: ' + defaultVersion);
     process.env.SQUISH_PATH = defaultVersion;
 }
 
@@ -21,18 +23,17 @@ if (baseDir.endsWith('src')) {
     baseDir = baseDir.substring(0, baseDir.length - 3);
 }
 
-const { getConfigValue, getAppDataPath, log } = require('homegames-common');
 const HomenamesHelper = require('../util/homenames-helper');
 
 const settingsModal = require('./settings');
 const COLORS = Colors.COLORS;
 
 const GAME_DIRECTORY = path.join(getAppDataPath(), 'hg-games');
-// const GAME_DIRECTORY = path.join(getAppDataPath(), 'hg-games');
 
 
 const SOURCE_GAME_DIRECTORY = path.resolve(getConfigValue('SOURCE_GAME_DIRECTORIES', `${baseDir}/src/games`));
-const DOWNLOADED_GAME_DIRECTORY = GAME_DIRECTORY;//path.resolve(getConfigValue('DOWNLOADED_GAME_DIRECTORY', `hg-games`));
+const DOWNLOADED_GAME_DIRECTORY = GAME_DIRECTORY;
+
 const HOME_PORT = getConfigValue('HOME_PORT', 7001);
 
 if (!fs.existsSync(GAME_DIRECTORY)) {
@@ -401,7 +402,7 @@ class HomegamesRoot {
                     this.homenamesHelper.updatePlayerSetting(playerId, PLAYER_SETTINGS.SOUND, {
                         enabled: newVal
                     }).then(() => {
-                        console.log('just updated setting??');
+                        log.info('just updated setting??');
                     });
                 },
                 onExportSessionData: () => {

src/util/link-helper.js

@@ -1,3 +1,5 @@
+const { log } = require('homegames-common');
+
 const WebSocket = require('ws');
 const https = require('https');
 const os = require('os');
@@ -63,8 +65,6 @@ const linkConnect = (msgHandler) => new Promise((resolve, reject) => {
 
     client.on('open', () => {
         getClientInfo().then(clientInfo => {
-//        clientInfo.username = username ? username.toString() : null;
-
             client.send(JSON.stringify({
                 type: 'register',
                 data: clientInfo
@@ -73,10 +73,10 @@ const linkConnect = (msgHandler) => new Promise((resolve, reject) => {
             interval = setInterval(() => {
                 client.readyState == 1 && client.send(JSON.stringify({type: 'heartbeat'}));
                 if (Date.now() > socketRefreshTime) {
-                    console.log('refreshing link socket');
+                    log.info('refreshing link socket');
                     client.close();
                     clearInterval(interval);
-                    linkConnect(msgHandler);///, username);
+                    linkConnect(msgHandler);
                 }
 
             }, 1000 * 10);
@@ -88,7 +88,8 @@ const linkConnect = (msgHandler) => new Promise((resolve, reject) => {
     client.on('message', msgHandler ? msgHandler : () => {});
 
     client.on('error', (err) => {
-        console.log(err);
+        log.error('Link client error');
+        log.error(err);
         reject(err);
     });
 

src/util/socket.js

@@ -218,6 +218,8 @@ const socketServer = (gameSession, port, cb = null, certPath = null, username =
     let server;
 
     if (certPath) {
+        log.info('Starting secure server on port ' + port);
+
         server = https.createServer({
             key: fs.readFileSync(`${certPath}/homegames.key`).toString(),
             cert: fs.readFileSync(`${certPath}/homegames.cert`).toString()
@@ -232,7 +234,6 @@ const socketServer = (gameSession, port, cb = null, certPath = null, username =
     });
 
     getPublicIP().then(publicIp => {
-
         const broadcastEnabled = !!getConfigValue('PUBLIC_GAMES', false);
         log.info('broadcastEnabled: ' + broadcastEnabled);