diff --git a/package-lock.json b/package-lock.json index 1f24841a9a..ea62b3642c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27530,9 +27530,8 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "node_modules/socket.io": { - "version": "0.9.19-overleaf-5", - "resolved": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-5.tar.gz", - "integrity": "sha512-MDRh05EWE7OSgLzsFR0ikLzIVxPD7ItC5FcScxY58QYTRmC4p0kbod4zVSYjIT9aTdMM6CnWXMvFYSe50vV/iA==", + "version": "0.9.19-overleaf-6", + "resolved": "git+ssh://git@github.com/overleaf/socket.io.git#af96d1b68d9918ee0f9cb82c62990395b0a601fb", "dependencies": { "base64id": "0.1.0", "policyfile": "0.0.4", @@ -33889,8 +33888,8 @@ "express-session": "^1.17.1", "proxy-addr": "^2.0.7", "request": "^2.88.2", - "socket.io": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-5.tar.gz", - "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-3.tar.gz", + "socket.io": "overleaf/socket.io#0.9.19-overleaf-6", + "socket.io-client": "overleaf/socket.io-client#0.9.17-overleaf-3", "underscore": "1.13.1" }, "devDependencies": { @@ -33904,6 +33903,19 @@ "uid-safe": "^2.1.5" } }, + "services/real-time/node_modules/commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha512-J2wnb6TKniXNOtoHS8TSrG9IOQluPrsmyAJ8oCUJOBmv+uLBCyPYAZkD2jFvw2DCzIXNnISIM01NIvr35TkBMQ==", + "engines": { + "node": ">= 0.6.x" + } + }, + "services/real-time/node_modules/nan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", + "integrity": "sha512-Wm2/nFOm2y9HtJfgOLnctGbfvF23FcQZeyUZqDD8JQG3zO5kXh3MkQKiUaA68mJiVWrOzLFkAV1u6bC8P52DJA==" + }, "services/real-time/node_modules/sandboxed-module": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-0.3.0.tgz", @@ -33914,6 +33926,19 @@ "stack-trace": "0.0.6" } }, + "services/real-time/node_modules/socket.io-client": { + "version": "0.9.17-overleaf-3", + "resolved": "git+ssh://git@github.com/overleaf/socket.io-client.git#60e7aa96978e890dcfc244071de0284e9174e125", + "dependencies": { + "active-x-obfuscator": "0.0.1", + "uglify-js": "1.2.5", + "ws": "0.4.x", + "xmlhttprequest": "1.4.2" + }, + "engines": { + "node": ">= 0.4.0" + } + }, "services/real-time/node_modules/stack-trace": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz", @@ -33929,11 +33954,40 @@ "integrity": "sha1-kNt58X2Ni1NiFUOJSSuXJ2LP0nY=", "dev": true }, + "services/real-time/node_modules/uglify-js": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz", + "integrity": "sha512-Ps1oQryKOcRDYuAN1tGpPWd/DIRMcdLz4p7JMxLjJiFvp+aaG01IEu0ZSoVvYUSxIkvW7k2X50BCW2InguEGlg==", + "bin": { + "uglifyjs": "bin/uglifyjs" + }, + "engines": { + "node": "*" + } + }, "services/real-time/node_modules/underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" }, + "services/real-time/node_modules/ws": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "integrity": "sha512-htqsS0U9Z9lb3ITjidQkRvkLdVhQePrMeu475yEfOWkAYvJ6dSjQp1tOH6ugaddzX5b7sQjMPNtY71eTzrV/kA==", + "hasInstallScript": true, + "dependencies": { + "commander": "~2.1.0", + "nan": "~1.0.0", + "options": ">=0.0.5", + "tinycolor": "0.x" + }, + "bin": { + "wscat": "bin/wscat" + }, + "engines": { + "node": ">=0.4.0" + } + }, "services/references": { "name": "@overleaf/references", "dependencies": { @@ -41580,13 +41634,23 @@ "request": "^2.88.2", "sandboxed-module": "~0.3.0", "sinon": "^9.2.4", - "socket.io": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-5.tar.gz", - "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-3.tar.gz", + "socket.io": "overleaf/socket.io#0.9.19-overleaf-6", + "socket.io-client": "overleaf/socket.io-client#0.9.17-overleaf-3", "timekeeper": "0.0.4", "uid-safe": "^2.1.5", "underscore": "1.13.1" }, "dependencies": { + "commander": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz", + "integrity": "sha512-J2wnb6TKniXNOtoHS8TSrG9IOQluPrsmyAJ8oCUJOBmv+uLBCyPYAZkD2jFvw2DCzIXNnISIM01NIvr35TkBMQ==" + }, + "nan": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz", + "integrity": "sha512-Wm2/nFOm2y9HtJfgOLnctGbfvF23FcQZeyUZqDD8JQG3zO5kXh3MkQKiUaA68mJiVWrOzLFkAV1u6bC8P52DJA==" + }, "sandboxed-module": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-0.3.0.tgz", @@ -41597,6 +41661,16 @@ "stack-trace": "0.0.6" } }, + "socket.io-client": { + "version": "git+ssh://git@github.com/overleaf/socket.io-client.git#60e7aa96978e890dcfc244071de0284e9174e125", + "from": "socket.io-client@overleaf/socket.io-client#0.9.17-overleaf-3", + "requires": { + "active-x-obfuscator": "0.0.1", + "uglify-js": "1.2.5", + "ws": "0.4.x", + "xmlhttprequest": "1.4.2" + } + }, "stack-trace": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.6.tgz", @@ -41609,10 +41683,26 @@ "integrity": "sha1-kNt58X2Ni1NiFUOJSSuXJ2LP0nY=", "dev": true }, + "uglify-js": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz", + "integrity": "sha512-Ps1oQryKOcRDYuAN1tGpPWd/DIRMcdLz4p7JMxLjJiFvp+aaG01IEu0ZSoVvYUSxIkvW7k2X50BCW2InguEGlg==" + }, "underscore": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz", "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" + }, + "ws": { + "version": "0.4.32", + "resolved": "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz", + "integrity": "sha512-htqsS0U9Z9lb3ITjidQkRvkLdVhQePrMeu475yEfOWkAYvJ6dSjQp1tOH6ugaddzX5b7sQjMPNtY71eTzrV/kA==", + "requires": { + "commander": "~2.1.0", + "nan": "~1.0.0", + "options": ">=0.0.5", + "tinycolor": "0.x" + } } } }, @@ -62828,8 +62918,8 @@ } }, "socket.io": { - "version": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-5.tar.gz", - "integrity": "sha512-MDRh05EWE7OSgLzsFR0ikLzIVxPD7ItC5FcScxY58QYTRmC4p0kbod4zVSYjIT9aTdMM6CnWXMvFYSe50vV/iA==", + "version": "git+ssh://git@github.com/overleaf/socket.io.git#af96d1b68d9918ee0f9cb82c62990395b0a601fb", + "from": "socket.io@overleaf/socket.io#0.9.19-overleaf-6", "requires": { "base64id": "0.1.0", "policyfile": "0.0.4", diff --git a/services/real-time/package.json b/services/real-time/package.json index d46e5856f8..e5d456e026 100644 --- a/services/real-time/package.json +++ b/services/real-time/package.json @@ -32,8 +32,8 @@ "express-session": "^1.17.1", "proxy-addr": "^2.0.7", "request": "^2.88.2", - "socket.io": "https://github.com/overleaf/socket.io/archive/0.9.19-overleaf-5.tar.gz", - "socket.io-client": "https://github.com/overleaf/socket.io-client/archive/0.9.17-overleaf-3.tar.gz", + "socket.io": "overleaf/socket.io#0.9.19-overleaf-6", + "socket.io-client": "overleaf/socket.io-client#0.9.17-overleaf-3", "underscore": "1.13.1" }, "devDependencies": {