Skip to content

Commit 0557d6d

Browse files
committed
fix(grabber): program error out when player data is not much sound
1 parent f162302 commit 0557d6d

File tree

6 files changed

+27
-23
lines changed

6 files changed

+27
-23
lines changed

package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,14 @@
4545
"@types/fs-extra": "^2.1.0",
4646
"@types/inquirer": "^6.0.0",
4747
"@types/js-yaml": "^3.12.5",
48-
"@types/node": "^14.0.19",
48+
"@types/node": "^12.19.0",
4949
"@typescript-eslint/eslint-plugin": "^3.6.0",
5050
"@typescript-eslint/parser": "^3.6.0",
5151
"eslint": "^7.4.0",
5252
"jest": "^26.1.0",
53-
"typescript": "^4.0.0-beta"
53+
"typescript": "^4.0.5"
54+
},
55+
"volta": {
56+
"node": "12.18.0"
5457
}
5558
}

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void async function main () {
6060
try {
6161
data = await utils.createPlayerData(uuid, banned)
6262
} catch (error) {
63-
logger.Default.error(`Failed to create player data for ${uuid}`)
63+
logger.Default.error(`Failed to create player data for ${uuid}`, JSON.stringify(error))
6464
continue
6565
}
6666
players.push({

src/utils.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,16 @@ export default class Utils {
6969
let data: string | McPlayerStatsJson
7070
try {
7171
data = fs.readFileSync(statsfile, 'utf-8') as string
72+
logger.PlayerData.info('READ', statsfile)
73+
data = JSON.parse(data) as McPlayerStatsJson
74+
return resolve({
75+
merged: mergeStats(data),
76+
source: data,
77+
})
7278
} catch (error) {
73-
logger.PlayerData.warn('READ', statsfile, error)
74-
return reject()
79+
logger.PlayerData.warn('READ', statsfile, JSON.stringify(error))
80+
return resolve({merged: {}, source: {}})
7581
}
76-
logger.PlayerData.info('READ', statsfile)
77-
data = JSON.parse(data) as McPlayerStatsJson
78-
return resolve({
79-
merged: mergeStats(data),
80-
source: data,
81-
})
8282
})
8383
}
8484

@@ -91,12 +91,12 @@ export default class Utils {
9191
let data: string
9292
try {
9393
data = fs.readFileSync(advancementsfile, 'utf-8') as string
94+
logger.PlayerData.info('READ', advancementsfile)
95+
return resolve(JSON.parse(data))
9496
} catch (error) {
95-
logger.PlayerData.warn('READ', advancementsfile, error)
96-
return reject()
97+
logger.PlayerData.warn('READ', advancementsfile, JSON.stringify(error))
98+
return resolve({})
9799
}
98-
logger.PlayerData.info('READ', advancementsfile)
99-
return resolve(JSON.parse(data))
100100
})
101101
}
102102

types/common.d.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
type Json = null | number | string | boolean | {[k: string]: Json} | Json[]

types/minecraft.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ interface McBannedPlayerRecord {
2323

2424
type McBannedPlayersJson = McBannedPlayerRecord[]
2525

26-
type McPlayerStatsJson = any // FIXME: implement it
26+
type McPlayerStatsJson = Json // FIXME: implement it
2727

28-
type McPlayerAdvancementsJson = any // FIXME: implement it
28+
type McPlayerAdvancementsJson = Json // FIXME: implement it
2929

3030
interface McNameHistoryRecord {
3131
name: string

0 commit comments

Comments
 (0)