diff --git a/README.md b/README.md index 5d7aa97..adac34a 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To discuss licensing, contact `ponytownhelp@gmail.com`. ## Prerequisites -* [Node.js](https://nodejs.org/download/release/v10.24.1) (version 10) +* [Node.js](https://nodejs.org/download/release/v12.22.12) (version 12) * gulp `npm install -g gulp` * MongoDB: [download link](https://www.mongodb.com/download-center/community) and [installation instructions](https://docs.mongodb.com/manual/administration/install-community/) * [ImageMagick](https://imagemagick.org/script/download.php#windows) (optional, required for generating preview gifs in animation tool) diff --git a/package-lock.json b/package-lock.json index 1c5ec86..3d63c9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -534,10 +534,10 @@ } } }, - "@clusterws/cws": { - "version": "0.15.0", - "resolved": "https://registry.npmjs.org/@clusterws/cws/-/cws-0.15.0.tgz", - "integrity": "sha512-41QpCngw86n41hIdU5Nx2QJmmxZuA9FPtDkjONrYpk27L7HjL1kj6J5oWEjbr14yXLfigZit3VY+oACDCGbiHw==" + "@encharm/cws": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@encharm/cws/-/cws-4.0.2.tgz", + "integrity": "sha512-8pHjBzAjjQbjpH/1mP0qrLaCEafH5R+rwDoJZ5Q3u+VSKWfaY/bHCDJbGmaqnU0kYwy11gQEPlrQYIGNrnmxrA==" }, "@fortawesome/angular-fontawesome": { "version": "0.5.0", @@ -4765,7 +4765,7 @@ "bundled": true, "optional": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -4868,7 +4868,7 @@ "bundled": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { @@ -4876,7 +4876,7 @@ "bundled": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -4903,7 +4903,7 @@ "bundled": true, "optional": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -4916,7 +4916,7 @@ "bundled": true, "optional": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -4959,9 +4959,9 @@ "bundled": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.24", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -4986,8 +4986,8 @@ "bundled": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -5000,8 +5000,8 @@ "bundled": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.5" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -5048,8 +5048,8 @@ "bundled": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -5067,10 +5067,10 @@ "bundled": true, "optional": true, "requires": { - "deep-extend": "0.6.0", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -5137,9 +5137,9 @@ "bundled": true, "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -5147,7 +5147,7 @@ "bundled": true, "optional": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -5155,7 +5155,7 @@ "bundled": true, "optional": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -5637,11 +5637,6 @@ } } }, - "clusterws-uws": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/clusterws-uws/-/clusterws-uws-0.4.6.tgz", - "integrity": "sha512-r4s9ugW3pgaXF1OygRS8vRDZB7CoBfnuKE5b7hCnIIbSsge3ofinfdRBwD7J9/sR22V2ICLV4YD7hANARPiGDQ==" - }, "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", @@ -9347,7 +9342,7 @@ "bundled": true, "optional": true, "requires": { - "ms": "2.1.1" + "ms": "^2.1.1" } }, "deep-extend": { @@ -9416,7 +9411,7 @@ "bundled": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": ">= 2.1.2 < 3" } }, "ignore-walk": { @@ -9451,7 +9446,7 @@ "bundled": true, "optional": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -9513,9 +9508,9 @@ "bundled": true, "optional": true, "requires": { - "debug": "4.1.1", - "iconv-lite": "0.4.24", - "sax": "1.2.4" + "debug": "^4.1.0", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -9540,8 +9535,8 @@ "bundled": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -9554,8 +9549,8 @@ "bundled": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.6" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -9602,8 +9597,8 @@ "bundled": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -9691,9 +9686,9 @@ "bundled": true, "optional": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -9701,7 +9696,7 @@ "bundled": true, "optional": true, "requires": { - "safe-buffer": "5.1.2" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -9709,7 +9704,7 @@ "bundled": true, "optional": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { diff --git a/package.json b/package.json index 1e9af47..2099ac9 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "@angular/platform-browser-dynamic": "^8.2.4", "@angular/platform-server": "^8.2.4", "@angular/router": "^8.2.4", - "@clusterws/cws": "^0.15.0", + "@encharm/cws": "^4.0.2", "@fortawesome/angular-fontawesome": "^0.5.0", "@fortawesome/fontawesome-svg-core": "^1.2.22", "@fortawesome/free-brands-svg-icons": "^5.10.2", @@ -115,7 +115,6 @@ "chai": "^4.2.0", "chai-as-promised": "^7.1.1", "chalk": "^2.4.2", - "clusterws-uws": "^0.4.6", "color-convert": "^2.0.1", "connect-mongo": "^3.0.0", "cookie-parser": "^1.4.4", diff --git a/src/ts/server/server.ts b/src/ts/server/server.ts index cae453f..3719d44 100644 --- a/src/ts/server/server.ts +++ b/src/ts/server/server.ts @@ -11,8 +11,7 @@ import * as Rollbar from 'rollbar'; import * as passport from 'passport'; import * as connectMongo from 'connect-mongo'; import * as express from 'express'; -// import { WebSocketServer } from '@clusterws/cws'; -import { WebSocketServer } from 'clusterws-uws'; +import { WebSocketServer } from '@encharm/cws'; import { compact, once } from 'lodash'; import { copySync, removeSync, ensureDirSync } from 'fs-extra'; import { createServerHost, createClientOptions, ServerOptions, ClientExtensions, Packet } from 'ag-sockets'; diff --git a/tsconfig.json b/tsconfig.json index 8493a2c..7f46d22 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,6 +18,7 @@ "strict": true, "strictFunctionTypes": true, "sourceMap": true, + "skipLibCheck": true, "preserveConstEnums": true }, "exclude": [