Compare commits
7 Commits
01f6d0dd2c
...
e7bc452332
Author | SHA1 | Date |
---|---|---|
Pedro Ivo Hudson | e7bc452332 | |
CosminPerRam | ee5baaff13 | |
Pedro Ivo Hudson | a4790bbfaa | |
Pedro Ivo Hudson | 242a1f4035 | |
Pedro Ivo Hudson | c9d8e00139 | |
Pedro Ivo Hudson | c317cfc760 | |
Pedro Ivo Hudson | cebefe3899 |
|
@ -15,6 +15,7 @@
|
||||||
* Myth of Empires - Added support.
|
* Myth of Empires - Added support.
|
||||||
* Fix: BeamMP maxplayers that was displaying player count (By @dgibbs64 #551)
|
* Fix: BeamMP maxplayers that was displaying player count (By @dgibbs64 #551)
|
||||||
* Fix: BeamMP filter servers by address, not host (By @Rephot #558)
|
* Fix: BeamMP filter servers by address, not host (By @Rephot #558)
|
||||||
|
* Palworld - Replace old and broken protocol with the new one (#560)
|
||||||
|
|
||||||
## 5.0.0-beta.2
|
## 5.0.0-beta.2
|
||||||
* Fixed support for projects using `require`.
|
* Fixed support for projects using `require`.
|
||||||
|
|
|
@ -210,7 +210,7 @@
|
||||||
| openarena | OpenArena | |
|
| openarena | OpenArena | |
|
||||||
| openttd | OpenTTD | |
|
| openttd | OpenTTD | |
|
||||||
| painkiller | Painkiller | |
|
| painkiller | Painkiller | |
|
||||||
| palworld | Palworld | [EOS Protocol](#epic) |
|
| palworld | Palworld | [Notes](#palworld) |
|
||||||
| pce | Primal Carnage: Extinction | [Valve Protocol](#valve) |
|
| pce | Primal Carnage: Extinction | [Valve Protocol](#valve) |
|
||||||
| pixark | PixARK | [Valve Protocol](#valve) |
|
| pixark | PixARK | [Valve Protocol](#valve) |
|
||||||
| postal2 | Postal 2 | |
|
| postal2 | Postal 2 | |
|
||||||
|
@ -459,3 +459,8 @@ option: `requestRules: true`. Beware that this may increase query time.
|
||||||
|
|
||||||
### <a name="epic"></a>Epic Online Services (EOS) Protocol
|
### <a name="epic"></a>Epic Online Services (EOS) Protocol
|
||||||
EOS does not provide players data.
|
EOS does not provide players data.
|
||||||
|
|
||||||
|
### <a name="palworld"></a>Palworld
|
||||||
|
Palworld support can be unstable, the devs mention the api is currently experimental.
|
||||||
|
To query palworld servers, the `RESTAPIEnabled` must be `True` in the configuration file, and you need to pass
|
||||||
|
the `username` (currently always `admin`) and `password` (settings parameter) for it.
|
||||||
|
|
|
@ -59,6 +59,7 @@ Confused on how this works, or you want to see more? Checkout the [examples](/ex
|
||||||
| **portCache** | boolean | true | After you queried a server, the second time you query that exact server (identified by specified ip and port), first add an attempt to query with the last successful port. |
|
| **portCache** | boolean | true | After you queried a server, the second time you query that exact server (identified by specified ip and port), first add an attempt to query with the last successful port. |
|
||||||
| **noBreadthOrder** | boolean | false | Enable the behaviour of retrying an attempt X times followed by the next attempt X times, otherwise try attempt A, then B, then A, then B until reaching the X retry count of each. |
|
| **noBreadthOrder** | boolean | false | Enable the behaviour of retrying an attempt X times followed by the next attempt X times, otherwise try attempt A, then B, then A, then B until reaching the X retry count of each. |
|
||||||
| **checkOldIDs** | boolean | false | Also checks the old ids amongst the current ones. |
|
| **checkOldIDs** | boolean | false | Also checks the old ids amongst the current ones. |
|
||||||
|
| **checkAlias** | boolean | false | Also checks for alternative game ids. |
|
||||||
|
|
||||||
## Query Response
|
## Query Response
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ import Minimist from 'minimist'
|
||||||
import { GameDig } from './../lib/index.js'
|
import { GameDig } from './../lib/index.js'
|
||||||
|
|
||||||
const argv = Minimist(process.argv.slice(2), {
|
const argv = Minimist(process.argv.slice(2), {
|
||||||
boolean: ['pretty', 'debug', 'givenPortOnly', 'requestRules', 'requestRulesRequired', 'requestPlayersRequired', 'stripColors', 'portCache', 'noBreadthOrder', 'checkOldIDs'],
|
boolean: ['pretty', 'debug', 'givenPortOnly', 'requestRules', 'requestRulesRequired', 'requestPlayersRequired', 'stripColors', 'portCache', 'noBreadthOrder', 'checkOldIDs', 'checkAlias'],
|
||||||
string: ['guildId', 'listenUdpPort', 'ipFamily', 'token'],
|
string: ['guildId', 'listenUdpPort', 'ipFamily', 'token'],
|
||||||
default: {
|
default: {
|
||||||
stripColors: true,
|
stripColors: true,
|
||||||
|
|
|
@ -13,6 +13,12 @@ export const lookup = (options) => {
|
||||||
|
|
||||||
let game = games[type]
|
let game = games[type]
|
||||||
|
|
||||||
|
if (options.checkAlias) {
|
||||||
|
Object.keys(games).forEach((id) => {
|
||||||
|
if (games[id]?.extra?.alias) game = games[id]
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
if (options.checkOldIDs) {
|
if (options.checkOldIDs) {
|
||||||
Object.keys(games).forEach((id) => {
|
Object.keys(games).forEach((id) => {
|
||||||
if (games[id]?.extra?.old_id === type) {
|
if (games[id]?.extra?.old_id === type) {
|
||||||
|
|
|
@ -2092,8 +2092,9 @@ export const games = {
|
||||||
name: 'Palworld',
|
name: 'Palworld',
|
||||||
release_year: 2024,
|
release_year: 2024,
|
||||||
options: {
|
options: {
|
||||||
port: 8211,
|
port: 8212,
|
||||||
protocol: 'palworld'
|
protocol: 'palworld',
|
||||||
|
doc_notes: 'palworld'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
pvak2: {
|
pvak2: {
|
||||||
|
|
|
@ -1,20 +1,32 @@
|
||||||
import Epic from './epic.js'
|
import Core from './core.js'
|
||||||
|
|
||||||
export default class palworld extends Epic {
|
export default class palworld extends Core {
|
||||||
constructor () {
|
async makeCall (endpoint) {
|
||||||
super()
|
const url = `http://${this.options.host}:${this.options.port}/v1/api/${endpoint}`
|
||||||
|
const headers = {
|
||||||
|
Authorization: `Basic ${Buffer.from(`${this.options.username}:${this.options.password}`).toString('base64')}`,
|
||||||
|
Accept: 'application/json'
|
||||||
|
}
|
||||||
|
|
||||||
// OAuth2 credentials extracted from Palworld files.
|
return await this.request({ url, headers, method: 'GET', responseType: 'json' })
|
||||||
this.clientId = 'xyza78916PZ5DF0fAahu4tnrKKyFpqRE'
|
|
||||||
this.clientSecret = 'j0NapLEPm3R3EOrlQiM8cRLKq3Rt02ZVVwT0SkZstSg'
|
|
||||||
this.deploymentId = '0a18471f93d448e2a1f60e47e03d3413'
|
|
||||||
this.authByExternalToken = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async run (state) {
|
async run (state) {
|
||||||
await super.run(state)
|
const serverInfo = await this.makeCall('info')
|
||||||
state.name = state.raw.attributes.NAME_s
|
state.version = serverInfo.version
|
||||||
state.numplayers = state.raw.attributes.PLAYERS_l
|
state.name = serverInfo.servername
|
||||||
state.version = state.raw.attributes.VERSION_S
|
state.raw.serverInfo = serverInfo
|
||||||
|
|
||||||
|
const { players } = await this.makeCall('players')
|
||||||
|
state.numplayers = players.length
|
||||||
|
state.players = players.map(p => p.name)
|
||||||
|
state.raw.players = players
|
||||||
|
|
||||||
|
state.raw.settings = await this.makeCall('settings')
|
||||||
|
|
||||||
|
const metrics = await this.makeCall('metrics')
|
||||||
|
state.numplayers = metrics.currentplayernum
|
||||||
|
state.maxplayers = metrics.maxplayernum
|
||||||
|
state.raw.metrics = metrics
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,12 +21,16 @@ sortedGamesIds.forEach(key => {
|
||||||
})
|
})
|
||||||
|
|
||||||
let generated = ''
|
let generated = ''
|
||||||
generated += '| GameDig Type ID | Name | See Also\n'
|
generated += '| GameDig Type ID | Alias | Name | See Also\n'
|
||||||
generated += '|---|---|---\n'
|
generated += '|---|---|---|---\n'
|
||||||
|
|
||||||
for (const id in sortedGames) {
|
for (const id in sortedGames) {
|
||||||
const game = sortedGames[id]
|
const game = sortedGames[id]
|
||||||
generated += '| ' + id.padEnd(10, ' ') + ' | ' + game.name
|
if (!game?.extra?.alias) {
|
||||||
|
game.alias = ' '
|
||||||
|
}
|
||||||
|
generated += '| ' + id.padEnd(10, ' ') + ' | ' + game.alias + ' | ' + game.name
|
||||||
|
|
||||||
const notes = []
|
const notes = []
|
||||||
if (game?.extra?.doc_notes) {
|
if (game?.extra?.doc_notes) {
|
||||||
notes.push('[Notes](#' + game.extra.doc_notes + ')')
|
notes.push('[Notes](#' + game.extra.doc_notes + ')')
|
||||||
|
@ -34,7 +38,7 @@ for (const id in sortedGames) {
|
||||||
if (game.options.protocol === 'valve' || game.options.protocol === 'dayz') {
|
if (game.options.protocol === 'valve' || game.options.protocol === 'dayz') {
|
||||||
notes.push('[Valve Protocol](#valve)')
|
notes.push('[Valve Protocol](#valve)')
|
||||||
}
|
}
|
||||||
if (game.options.protocol === 'epic' || game.options.protocol === 'asa' || game.options.protocol === 'palworld' || game.options.protocol === 'theisleevrima') {
|
if (game.options.protocol === 'epic' || game.options.protocol === 'asa' || game.options.protocol === 'theisleevrima') {
|
||||||
notes.push('[EOS Protocol](#epic)')
|
notes.push('[EOS Protocol](#epic)')
|
||||||
}
|
}
|
||||||
if (notes.length) {
|
if (notes.length) {
|
||||||
|
|
Loading…
Reference in New Issue