tribufu/node-gamedig
1
0
Fork 0
mirror of https://github.com/tribufu/node-gamedig synced 2026-06-01 09:42:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update got, which now requires node 14

Browse source
This commit is contained in:
Michael Morrison 2022-02-05 20:10:14 -06:00
parent f93354203d
commit c7a669ce6b
3 changed files with 81 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

104
package-lock.json generated
View file

@ -10,11 +10,11 @@
"integrity": "sha512-QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ==" "integrity": "sha512-QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ=="
}, },
"@szmarczak/http-timer": { "@szmarczak/http-timer": {
"version": "4.0.6", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-5.0.1.tgz",
"integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "integrity": "sha512-+PmQX0PiAYPMeVYe237LJAYvOMYW1j2rH5YROyS3b4CTVJum34HfRvKvAzozHAQG0TnHNdUfY9nCeUyRAs//cw==",
"requires": { "requires": {
"defer-to-connect": "^2.0.0" "defer-to-connect": "^2.0.1"
} }
}, },
"@types/cacheable-request": { "@types/cacheable-request": {
@ -51,9 +51,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "12.20.43", "version": "14.18.10",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.43.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.10.tgz",
"integrity": "sha512-HCfJdaYqJX3BCzeihgZrD7b85Cu05OC/GVJ4kEYIflwUs4jbnUlLLWoq7hw1LBcdvUyehO+gr6P5JQ895/2ZfA==" "integrity": "sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ=="
}, },
"@types/responselike": { "@types/responselike": {
"version": "1.0.0", "version": "1.0.0",
@ -87,9 +87,9 @@
"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
}, },
"cacheable-lookup": { "cacheable-lookup": {
"version": "5.0.4", "version": "6.0.4",
"resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-6.0.4.tgz",
"integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==" "integrity": "sha512-mbcDEZCkv2CZF4G01kr8eBd/5agkt9oCqz75tJMSIsquvRZ2sL6Hi5zGVKi/0OSC9oO1GHfJ2AV0ZIOY9vye0A=="
}, },
"cacheable-request": { "cacheable-request": {
"version": "7.0.2", "version": "7.0.2",
@ -103,6 +103,21 @@
"lowercase-keys": "^2.0.0", "lowercase-keys": "^2.0.0",
"normalize-url": "^6.0.1", "normalize-url": "^6.0.1",
"responselike": "^2.0.0" "responselike": "^2.0.0"
},
"dependencies": {
"get-stream": {
"version": "5.2.0",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
"requires": {
"pump": "^3.0.0"
}
},
"lowercase-keys": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
}
} }
}, },
"cheerio": { "cheerio": {
@ -249,6 +264,11 @@
"resolved": "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.7.0.tgz", "resolved": "https://registry.npmjs.org/event-to-promise/-/event-to-promise-0.7.0.tgz",
"integrity": "sha1-ywffzUGNoiIdkPd+q3E7wjXiCQ8=" "integrity": "sha1-ywffzUGNoiIdkPd+q3E7wjXiCQ8="
}, },
"form-data-encoder": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/form-data-encoder/-/form-data-encoder-1.7.1.tgz",
"integrity": "sha512-EFRDrsMm/kyqbTQocNvRXMLjc7Es2Vk+IQFx/YW7hkUH1eBl4J1fqiP34l74Yt0pFLCNpc06fkbVk00008mzjg=="
},
"gbxremote": { "gbxremote": {
"version": "0.2.1", "version": "0.2.1",
"resolved": "https://registry.npmjs.org/gbxremote/-/gbxremote-0.2.1.tgz", "resolved": "https://registry.npmjs.org/gbxremote/-/gbxremote-0.2.1.tgz",
@ -262,28 +282,27 @@
} }
}, },
"get-stream": { "get-stream": {
"version": "5.2.0", "version": "6.0.1",
"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="
"requires": {
"pump": "^3.0.0"
}
}, },
"got": { "got": {
"version": "11.8.3", "version": "12.0.1",
"resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", "resolved": "https://registry.npmjs.org/got/-/got-12.0.1.tgz",
"integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==", "integrity": "sha512-1Zhoh+lDej3t7Ks1BP/Jufn+rNqdiHQgUOcTxHzg2Dao1LQfp5S4Iq0T3iBxN4Zdo7QqCJL+WJUNzDX6rCP2Ew==",
"requires": { "requires": {
"@sindresorhus/is": "^4.0.0", "@sindresorhus/is": "^4.2.0",
"@szmarczak/http-timer": "^4.0.5", "@szmarczak/http-timer": "^5.0.1",
"@types/cacheable-request": "^6.0.1", "@types/cacheable-request": "^6.0.2",
"@types/responselike": "^1.0.0", "@types/responselike": "^1.0.0",
"cacheable-lookup": "^5.0.3", "cacheable-lookup": "^6.0.4",
"cacheable-request": "^7.0.2", "cacheable-request": "^7.0.2",
"decompress-response": "^6.0.0", "decompress-response": "^6.0.0",
"http2-wrapper": "^1.0.0-beta.5.2", "form-data-encoder": "1.7.1",
"lowercase-keys": "^2.0.0", "get-stream": "^6.0.1",
"p-cancelable": "^2.0.0", "http2-wrapper": "^2.1.9",
"lowercase-keys": "^3.0.0",
"p-cancelable": "^3.0.0",
"responselike": "^2.0.0" "responselike": "^2.0.0"
} }
}, },
@ -309,12 +328,12 @@
"integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==" "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
}, },
"http2-wrapper": { "http2-wrapper": {
"version": "1.0.3", "version": "2.1.10",
"resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-2.1.10.tgz",
"integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "integrity": "sha512-QHgsdYkieKp+6JbXP25P+tepqiHYd+FVnDwXpxi/BlUcoIB0nsmTOymTNvETuTO+pDuwcSklPE72VR3DqV+Haw==",
"requires": { "requires": {
"quick-lru": "^5.1.1", "quick-lru": "^5.1.1",
"resolve-alpn": "^1.0.0" "resolve-alpn": "^1.2.0"
} }
}, },
"iconv-lite": { "iconv-lite": {
@ -354,9 +373,9 @@
"integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w==" "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
}, },
"lowercase-keys": { "lowercase-keys": {
"version": "2.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-3.0.0.tgz",
"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==" "integrity": "sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ=="
}, },
"mimic-response": { "mimic-response": {
"version": "1.0.1", "version": "1.0.1",
@ -395,9 +414,9 @@
} }
}, },
"p-cancelable": { "p-cancelable": {
"version": "2.1.1", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-3.0.0.tgz",
"integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==" "integrity": "sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw=="
}, },
"parse5": { "parse5": {
"version": "6.0.1", "version": "6.0.1",
@ -458,6 +477,13 @@
"integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
"requires": { "requires": {
"lowercase-keys": "^2.0.0" "lowercase-keys": "^2.0.0"
},
"dependencies": {
"lowercase-keys": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
"integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
}
} }
}, },
"safe-buffer": { "safe-buffer": {
@ -529,9 +555,9 @@
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
}, },
"varint": { "varint": {
"version": "5.0.2", "version": "6.0.0",
"resolved": "https://registry.npmjs.org/varint/-/varint-5.0.2.tgz", "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
"integrity": "sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==" "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg=="
}, },
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",

6
package.json
View file

@ -40,13 +40,13 @@
"cheerio": "^1.0.0-rc.10", "cheerio": "^1.0.0-rc.10",
"compressjs": "^1.0.2", "compressjs": "^1.0.2",
"gbxremote": "^0.2.1", "gbxremote": "^0.2.1",
"got": "^11.8.3", "got": "^12.0.1",
"iconv-lite": "^0.6.3", "iconv-lite": "^0.6.3",
"long": "^5.2.0", "long": "^5.2.0",
"minimist": "^1.2.5", "minimist": "^1.2.5",
"moment": "^2.29.1", "moment": "^2.29.1",
"punycode": "^2.1.1", "punycode": "^2.1.1",
"varint": "^5.0.2" "varint": "^6.0.0"
}, },
"bin": { "bin": {
"gamedig": "bin/gamedig.js" "gamedig": "bin/gamedig.js"
@ -61,6 +61,6 @@
], ],
"devDependencies": { "devDependencies": {
"@types/cheerio": "^0.22.31", "@types/cheerio": "^0.22.31",
"@types/node": "^12.20.43" "@types/node": "^14.18.10"
} }
} }

23
protocols/core.js
View file

@ -1,12 +1,11 @@
const EventEmitter = require('events').EventEmitter, const EventEmitter = require('events').EventEmitter;
net = require('net'), const net = require('net');
Reader = require('../lib/reader'), const Reader = require('../lib/reader');
HexUtil = require('../lib/HexUtil'), const HexUtil = require('../lib/HexUtil');
got = require('got'), const Promises = require('../lib/Promises');
Promises = require('../lib/Promises'), const Logger = require('../lib/Logger');
Logger = require('../lib/Logger'), const DnsResolver = require('../lib/DnsResolver');
DnsResolver = require('../lib/DnsResolver'), const Results = require('../lib/Results');
Results = require('../lib/Results');
let uid = 0; let uid = 0;
@ -322,11 +321,15 @@ class Core extends EventEmitter {
async request(params) { async request(params) {
await this.tcpPing(); await this.tcpPing();
const got = (await import('got')).got;
let requestPromise; let requestPromise;
try { try {
requestPromise = got({ requestPromise = got({
...params, ...params,
timeout: this.options.socketTimeout timeout: {
request: this.options.socketTimeout
}
}); });
this.debugLog(log => { this.debugLog(log => {
log(() => params.url + " HTTP-->"); log(() => params.url + " HTTP-->");