From aa8679646b2da16ad169b951095ac78f562fba6e Mon Sep 17 00:00:00 2001 From: Joseph Garcia Date: Tue, 10 Oct 2023 05:14:51 -0700 Subject: [PATCH] electron fixes --- package-lock.json | 764 +++++++++++++++++----------- package.json | 14 +- src/Homenames.js | 2 +- src/common/squish-map.js | 4 +- src/common/util/dictionary.js | 6 +- src/dashboard/HomegamesDashboard.js | 11 +- src/games/sponge/index.js | 1 - src/homegames_root/HomegamesRoot.js | 11 +- src/util/link-helper.js | 11 +- src/util/socket.js | 3 +- 10 files changed, 503 insertions(+), 324 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0096da06..bc066cc6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,31 +1,39 @@ { "name": "homegames-core", - "version": "1.0.19", + "version": "1.0.21", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "homegames-core", - "version": "1.0.19", + "version": "1.0.21", "license": "ISC", "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:squishjs@1.0.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:squishjs@1.0.4", "squish-1004": "npm:squishjs@1.0.4", "squish-1005": "npm:squishjs@1.0.5", "unzipper": "^0.10.11", "ws": "7.4.6" } }, - "node_modules/available-typed-arrays": { + "../homegames-common": { + "version": "1.0.4", + "license": "ISC", + "dependencies": { + "aws-sdk": "^2.1151.0", + "unzipper": "^0.10.11", + "ws": "^7.5.4" + } + }, + "../homegames-common/node_modules/available-typed-arrays": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -33,10 +41,9 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/aws-sdk": { - "version": "2.1442.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1442.0.tgz", - "integrity": "sha512-Rp6kP813tdlg3R3Zi6Olt5NSutlx1UjhhoogJpEeIUQFXul7t/mu5FpyUZmYRsBN6TPCj9QD0eJOtBaFN4LZtg==", + "../homegames-common/node_modules/aws-sdk": { + "version": "2.1413.0", + "license": "Apache-2.0", "dependencies": { "buffer": "4.9.2", "events": "1.1.1", @@ -53,15 +60,12 @@ "node": ">= 10.0.0" } }, - "node_modules/balanced-match": { + "../homegames-common/node_modules/balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "license": "MIT" }, - "node_modules/base64-js": { + "../homegames-common/node_modules/base64-js": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "funding": [ { "type": "github", @@ -75,72 +79,61 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, - "node_modules/big-integer": { + "../homegames-common/node_modules/big-integer": { "version": "1.6.51", - "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz", - "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==", + "license": "Unlicense", "engines": { "node": ">=0.6" } }, - "node_modules/binary": { + "../homegames-common/node_modules/binary": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz", - "integrity": "sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==", + "license": "MIT", "dependencies": { "buffers": "~0.1.1", "chainsaw": "~0.1.0" - }, - "engines": { - "node": "*" } }, - "node_modules/bluebird": { + "../homegames-common/node_modules/bluebird": { "version": "3.4.7", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz", - "integrity": "sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==" + "license": "MIT" }, - "node_modules/brace-expansion": { + "../homegames-common/node_modules/brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "node_modules/buffer": { + "../homegames-common/node_modules/buffer": { "version": "4.9.2", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz", - "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==", + "license": "MIT", "dependencies": { "base64-js": "^1.0.2", "ieee754": "^1.1.4", "isarray": "^1.0.0" } }, - "node_modules/buffer-indexof-polyfill": { + "../homegames-common/node_modules/buffer-indexof-polyfill": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz", - "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==", + "license": "MIT", "engines": { "node": ">=0.10" } }, - "node_modules/buffers": { + "../homegames-common/node_modules/buffers": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz", - "integrity": "sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==", "engines": { "node": ">=0.2.0" } }, - "node_modules/call-bind": { + "../homegames-common/node_modules/call-bind": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -149,60 +142,49 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/chainsaw": { + "../homegames-common/node_modules/chainsaw": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", - "integrity": "sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==", + "license": "MIT/X11", "dependencies": { "traverse": ">=0.3.0 <0.4" - }, - "engines": { - "node": "*" } }, - "node_modules/concat-map": { + "../homegames-common/node_modules/concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "license": "MIT" }, - "node_modules/core-util-is": { + "../homegames-common/node_modules/core-util-is": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" + "license": "MIT" }, - "node_modules/duplexer2": { + "../homegames-common/node_modules/duplexer2": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", - "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==", + "license": "BSD-3-Clause", "dependencies": { "readable-stream": "^2.0.2" } }, - "node_modules/events": { + "../homegames-common/node_modules/events": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==", + "license": "MIT", "engines": { "node": ">=0.4.x" } }, - "node_modules/for-each": { + "../homegames-common/node_modules/for-each": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", + "license": "MIT", "dependencies": { "is-callable": "^1.1.3" } }, - "node_modules/fs.realpath": { + "../homegames-common/node_modules/fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" + "license": "ISC" }, - "node_modules/fstream": { + "../homegames-common/node_modules/fstream": { "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "license": "ISC", "dependencies": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -213,28 +195,26 @@ "node": ">=0.6" } }, - "node_modules/function-bind": { + "../homegames-common/node_modules/function-bind": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + "license": "MIT" }, - "node_modules/get-intrinsic": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", - "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "../homegames-common/node_modules/get-intrinsic": { + "version": "1.2.1", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", + "has-proto": "^1.0.1", "has-symbols": "^1.0.3" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/glob": { + "../homegames-common/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -250,10 +230,9 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/gopd": { + "../homegames-common/node_modules/gopd": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -261,15 +240,13 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/graceful-fs": { - "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==" + "../homegames-common/node_modules/graceful-fs": { + "version": "4.2.11", + "license": "ISC" }, - "node_modules/has": { + "../homegames-common/node_modules/has": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.1" }, @@ -277,10 +254,9 @@ "node": ">= 0.4.0" } }, - "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "../homegames-common/node_modules/has-proto": { + "version": "1.0.1", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -288,13 +264,9 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/has-tostringtag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", - "dependencies": { - "has-symbols": "^1.0.2" - }, + "../homegames-common/node_modules/has-symbols": { + "version": "1.0.3", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -302,59 +274,38 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/homegames-common": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/homegames-common/-/homegames-common-1.0.4.tgz", - "integrity": "sha512-1LVMRH79dFU6nNgidpOPWKdyBEAybHR3kEGIFYPNP4dmTTk8T2tQZ10ZPB6bWGIPTFeU5O8aLELYrDyi24ZN6w==", + "../homegames-common/node_modules/has-tostringtag": { + "version": "1.0.0", + "license": "MIT", "dependencies": { - "aws-sdk": "^2.1151.0", - "unzipper": "^0.10.11", - "ws": "^7.5.4" - } - }, - "node_modules/homegames-common/node_modules/ws": { - "version": "7.5.9", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz", - "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==", - "engines": { - "node": ">=8.3.0" + "has-symbols": "^1.0.2" }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": "^5.0.2" + "engines": { + "node": ">= 0.4" }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/ieee754": { + "../homegames-common/node_modules/ieee754": { "version": "1.1.13", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", - "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" + "license": "BSD-3-Clause" }, - "node_modules/inflight": { + "../homegames-common/node_modules/inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" } }, - "node_modules/inherits": { + "../homegames-common/node_modules/inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "license": "ISC" }, - "node_modules/is-arguments": { + "../homegames-common/node_modules/is-arguments": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -366,10 +317,9 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-callable": { + "../homegames-common/node_modules/is-callable": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -377,10 +327,9 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-generator-function": { + "../homegames-common/node_modules/is-generator-function": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -391,12 +340,15 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-typed-array": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", + "../homegames-common/node_modules/is-typed-array": { + "version": "1.1.10", + "license": "MIT", "dependencies": { - "which-typed-array": "^1.1.11" + "available-typed-arrays": "^1.0.5", + "call-bind": "^1.0.2", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "has-tostringtag": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -405,28 +357,24 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/isarray": { + "../homegames-common/node_modules/isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" + "license": "MIT" }, - "node_modules/jmespath": { + "../homegames-common/node_modules/jmespath": { "version": "0.16.0", - "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.16.0.tgz", - "integrity": "sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==", + "license": "Apache-2.0", "engines": { "node": ">= 0.6.0" } }, - "node_modules/listenercount": { + "../homegames-common/node_modules/listenercount": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz", - "integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==" + "license": "ISC" }, - "node_modules/minimatch": { + "../homegames-common/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -434,15 +382,16 @@ "node": "*" } }, - "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + "../homegames-common/node_modules/minimist": { + "version": "1.2.8", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, - "node_modules/mkdirp": { + "../homegames-common/node_modules/mkdirp": { "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "license": "MIT", "dependencies": { "minimist": "^1.2.6" }, @@ -450,45 +399,38 @@ "mkdirp": "bin/cmd.js" } }, - "node_modules/once": { + "../homegames-common/node_modules/once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" } }, - "node_modules/path-is-absolute": { + "../homegames-common/node_modules/path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/process-nextick-args": { + "../homegames-common/node_modules/process-nextick-args": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" + "license": "MIT" }, - "node_modules/punycode": { + "../homegames-common/node_modules/punycode": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==" + "license": "MIT" }, - "node_modules/querystring": { + "../homegames-common/node_modules/querystring": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==", "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.", "engines": { "node": ">=0.4.x" } }, - "node_modules/readable-stream": { - "version": "2.3.7", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", - "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "../homegames-common/node_modules/readable-stream": { + "version": "2.3.8", + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -499,10 +441,9 @@ "util-deprecate": "~1.0.1" } }, - "node_modules/rimraf": { + "../homegames-common/node_modules/rimraf": { "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -510,89 +451,32 @@ "rimraf": "bin.js" } }, - "node_modules/safe-buffer": { + "../homegames-common/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "license": "MIT" }, - "node_modules/sax": { + "../homegames-common/node_modules/sax": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "integrity": "sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==" + "license": "ISC" }, - "node_modules/setimmediate": { + "../homegames-common/node_modules/setimmediate": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==" - }, - "node_modules/squish-0756": { - "name": "squishjs", - "version": "0.7.56", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-0.7.56.tgz", - "integrity": "sha512-Ic+/2IbRlWhCINW+UP8SVVCCUDYMX6sq3xBDSr8silaLDvSTG+PMOiAoOutO+K0K9hgZjulec+1q7a9fPY0+hQ==" + "license": "MIT" }, - "node_modules/squish-0762": { - "name": "squishjs", - "version": "0.7.62", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-0.7.62.tgz", - "integrity": "sha512-O//OdIkDdgihzlYbVNk+AgBvAjW0unZelRJH74gNcTQYA/4dBZn6VH3Rw+d5QzhddrqNf2KK/UM8QwjIexqjRg==" - }, - "node_modules/squish-0765": { - "name": "squishjs", - "version": "0.7.65", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-0.7.65.tgz", - "integrity": "sha512-pJofwr/+KytfWtj10FvnlR+FiPL+OKrmkSTkbsdfYYv+/z533pk7ml265vMcgUE1K3ig9hDfL/Ko+a0HYu9n8A==" - }, - "node_modules/squish-0766": { - "name": "squishjs", - "version": "0.7.66", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-0.7.66.tgz", - "integrity": "sha512-JGt43+wipxONZUO7aakgf6h4nuD8MExtYI9hwrPYWgeAoF9h/dOhv35e6upMEGZsSyED5nKcTogisViQfEGzXg==" - }, - "node_modules/squish-0767": { - "name": "squishjs", - "version": "0.7.67", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-0.7.67.tgz", - "integrity": "sha512-IMx+e6GSEMgfqqipoocEa6KZQKsBsXYl+ikKWmXrBezWXhd0Xh5NnrBUCsqNOUMj9w50fSVQeYTadp3qX4bzwg==" - }, - "node_modules/squish-1000": { - "name": "squishjs", - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-1.0.0.tgz", - "integrity": "sha512-kKSSjeiNgFfxVbUDIZlH9TGBKaU8ArimBrlyxRlb3ydfX4ZroeQ4O2JMUL2+2O9sLUfyEYprCJ0z/wEYVup3Ww==" - }, - "node_modules/squish-1004": { - "name": "squishjs", - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-1.0.4.tgz", - "integrity": "sha512-bDvjztRoVtRdJZ/Tfn37SXbJXaYEvo3NN/ouIK/dzsY0QJbbHEn+27ar/CrWCNs3xFiyHYi9AoXd+9s3biHzww==" - }, - "node_modules/squish-1005": { - "name": "squishjs", - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/squishjs/-/squishjs-1.0.5.tgz", - "integrity": "sha512-t9nrT07LmMtJaSHYyXMN9OkpJ76hEDIBqrtG1EqL0Abdyp/H69wuct5ZxAeq7YeRfGiJWNOR41CRaU2JsfDlbg==" - }, - "node_modules/string_decoder": { + "../homegames-common/node_modules/string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } }, - "node_modules/traverse": { + "../homegames-common/node_modules/traverse": { "version": "0.3.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz", - "integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==", - "engines": { - "node": "*" - } + "license": "MIT/X11" }, - "node_modules/unzipper": { - "version": "0.10.11", - "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz", - "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==", + "../homegames-common/node_modules/unzipper": { + "version": "0.10.14", + "license": "MIT", "dependencies": { "big-integer": "^1.6.17", "binary": "~0.3.0", @@ -606,19 +490,17 @@ "setimmediate": "~1.0.4" } }, - "node_modules/url": { + "../homegames-common/node_modules/url": { "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==", + "license": "MIT", "dependencies": { "punycode": "1.3.2", "querystring": "0.2.0" } }, - "node_modules/util": { + "../homegames-common/node_modules/util": { "version": "0.12.5", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", - "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "is-arguments": "^1.0.4", @@ -627,29 +509,27 @@ "which-typed-array": "^1.1.2" } }, - "node_modules/util-deprecate": { + "../homegames-common/node_modules/util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "license": "MIT" }, - "node_modules/uuid": { + "../homegames-common/node_modules/uuid": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz", - "integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==", + "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } }, - "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "../homegames-common/node_modules/which-typed-array": { + "version": "1.1.9", + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.0", + "is-typed-array": "^1.1.10" }, "engines": { "node": ">= 0.4" @@ -658,15 +538,13 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrappy": { + "../homegames-common/node_modules/wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "license": "ISC" }, - "node_modules/ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==", + "../homegames-common/node_modules/ws": { + "version": "7.5.9", + "license": "MIT", "engines": { "node": ">=8.3.0" }, @@ -683,10 +561,9 @@ } } }, - "node_modules/xml2js": { + "../homegames-common/node_modules/xml2js": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", - "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", + "license": "MIT", "dependencies": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" @@ -695,13 +572,308 @@ "node": ">=4.0.0" } }, - "node_modules/xmlbuilder": { + "../homegames-common/node_modules/xmlbuilder": { "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", + "license": "MIT", "engines": { "node": ">=4.0" } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "license": "MIT" + }, + "node_modules/big-integer": { + "version": "1.6.51", + "license": "Unlicense", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/binary": { + "version": "0.3.0", + "license": "MIT", + "dependencies": { + "buffers": "~0.1.1", + "chainsaw": "~0.1.0" + } + }, + "node_modules/bluebird": { + "version": "3.4.7", + "license": "MIT" + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/buffer-indexof-polyfill": { + "version": "1.0.2", + "license": "MIT", + "engines": { + "node": ">=0.10" + } + }, + "node_modules/buffers": { + "version": "0.1.1", + "engines": { + "node": ">=0.2.0" + } + }, + "node_modules/chainsaw": { + "version": "0.1.0", + "license": "MIT/X11", + "dependencies": { + "traverse": ">=0.3.0 <0.4" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "license": "MIT" + }, + "node_modules/core-util-is": { + "version": "1.0.3", + "license": "MIT" + }, + "node_modules/duplexer2": { + "version": "0.1.4", + "license": "BSD-3-Clause", + "dependencies": { + "readable-stream": "^2.0.2" + } + }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "license": "ISC" + }, + "node_modules/fstream": { + "version": "1.0.12", + "license": "ISC", + "dependencies": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + }, + "engines": { + "node": ">=0.6" + } + }, + "node_modules/glob": { + "version": "7.2.3", + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/graceful-fs": { + "version": "4.2.10", + "license": "ISC" + }, + "node_modules/homegames-common": { + "resolved": "../homegames-common", + "link": true + }, + "node_modules/inflight": { + "version": "1.0.6", + "license": "ISC", + "dependencies": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "license": "ISC" + }, + "node_modules/isarray": { + "version": "1.0.0", + "license": "MIT" + }, + "node_modules/listenercount": { + "version": "1.0.1", + "license": "ISC" + }, + "node_modules/minimatch": { + "version": "3.1.2", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/minimist": { + "version": "1.2.6", + "license": "MIT" + }, + "node_modules/mkdirp": { + "version": "0.5.6", + "license": "MIT", + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, + "node_modules/once": { + "version": "1.4.0", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/path-is-absolute": { + "version": "1.0.1", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "license": "MIT" + }, + "node_modules/readable-stream": { + "version": "2.3.7", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/rimraf": { + "version": "2.7.1", + "license": "ISC", + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "license": "MIT" + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "license": "MIT" + }, + "node_modules/squish-0756": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-0762": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-0765": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-0766": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-0767": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-1000": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-1004": { + "name": "squishjs", + "version": "1.0.4", + "license": "ISC" + }, + "node_modules/squish-1005": { + "name": "squishjs", + "version": "1.0.5", + "license": "ISC" + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/traverse": { + "version": "0.3.9", + "license": "MIT/X11" + }, + "node_modules/unzipper": { + "version": "0.10.11", + "license": "MIT", + "dependencies": { + "big-integer": "^1.6.17", + "binary": "~0.3.0", + "bluebird": "~3.4.1", + "buffer-indexof-polyfill": "~1.0.0", + "duplexer2": "~0.1.4", + "fstream": "^1.0.12", + "graceful-fs": "^4.2.2", + "listenercount": "~1.0.1", + "readable-stream": "~2.3.6", + "setimmediate": "~1.0.4" + } + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "license": "MIT" + }, + "node_modules/wrappy": { + "version": "1.0.2", + "license": "ISC" + }, + "node_modules/ws": { + "version": "7.4.6", + "license": "MIT", + "engines": { + "node": ">=8.3.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } } } } diff --git a/package.json b/package.json index e8d7bc32..00be34d0 100644 --- a/package.json +++ b/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:squishjs@1.0.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:squishjs@1.0.4", "squish-1004": "npm:squishjs@1.0.4", "squish-1005": "npm:squishjs@1.0.5", "unzipper": "^0.10.11", diff --git a/src/Homenames.js b/src/Homenames.js index 62ea1d46..01830197 100644 --- a/src/Homenames.js +++ b/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 = {}; diff --git a/src/common/squish-map.js b/src/common/squish-map.js index 8e4db4e7..afbcad75 100644 --- a/src/common/squish-map.js +++ b/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 diff --git a/src/common/util/dictionary.js b/src/common/util/dictionary.js index 89e8e101..52c12679 100644 --- a/src/common/util/dictionary.js +++ b/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; } diff --git a/src/dashboard/HomegamesDashboard.js b/src/dashboard/HomegamesDashboard.js index 09d6200d..e349f376 100644 --- a/src/dashboard/HomegamesDashboard.js +++ b/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); }); } }, diff --git a/src/games/sponge/index.js b/src/games/sponge/index.js index 57380861..167b2886 100644 --- a/src/games/sponge/index.js +++ b/src/games/sponge/index.js @@ -19,7 +19,6 @@ class Sponge extends Game { } constructor() { - console.log("SDKJFHKDSJFHDSF"); super(); this.playerSides = {}; diff --git a/src/homegames_root/HomegamesRoot.js b/src/homegames_root/HomegamesRoot.js index c04e9ce1..007c6fa4 100644 --- a/src/homegames_root/HomegamesRoot.js +++ b/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: () => { diff --git a/src/util/link-helper.js b/src/util/link-helper.js index 637f22aa..49403b41 100644 --- a/src/util/link-helper.js +++ b/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); }); diff --git a/src/util/socket.js b/src/util/socket.js index 618d6502..f39e4361 100644 --- a/src/util/socket.js +++ b/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);