From 8b3126e43071fa10d64dca5adeeaa5d353846d5a Mon Sep 17 00:00:00 2001 From: mmorrison Date: Sun, 6 Jan 2019 14:10:46 -0600 Subject: [PATCH] Use win1252 character encoding for samp (1.0.48) Fixes #99 --- lib/reader.js | 8 +++++++- package.json | 2 +- protocols/core.js | 2 ++ protocols/samp.js | 10 ++++++++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/lib/reader.js b/lib/reader.js index e49413e..92c6206 100644 --- a/lib/reader.js +++ b/lib/reader.js @@ -1,5 +1,7 @@ const Iconv = require('iconv-lite'), - Long = require('long'); + Long = require('long'), + Core = require('../protocols/core'), + Buffer = require('buffer'); function readUInt64BE(buffer,offset) { const high = buffer.readUInt32BE(offset); @@ -13,6 +15,10 @@ function readUInt64LE(buffer,offset) { } class Reader { + /** + * @param {Core} query + * @param {Buffer} buffer + **/ constructor(query,buffer) { this.query = query; this.buffer = buffer; diff --git a/package.json b/package.json index a8d2012..05d44b8 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ ], "main": "lib/index.js", "author": "Michael Morrison", - "version": "1.0.47", + "version": "1.0.48", "repository": { "type": "git", "url": "https://github.com/sonicsnes/node-gamedig.git" diff --git a/protocols/core.js b/protocols/core.js index ca81b35..1fadb09 100644 --- a/protocols/core.js +++ b/protocols/core.js @@ -130,6 +130,8 @@ class Core extends EventEmitter { ]); } + run() {} + parseDns(host,c) { const resolveStandard = (host,c) => { if(this.debug) console.log("Standard DNS Lookup: " + host); diff --git a/protocols/samp.js b/protocols/samp.js index d5cadcf..43934a4 100644 --- a/protocols/samp.js +++ b/protocols/samp.js @@ -1,6 +1,12 @@ -const async = require('async'); +const async = require('async'), + Core = require('./core'); + +class Samp extends Core { + constructor() { + super(); + this.encoding = 'win1252'; + } -class Samp extends require('./core') { run(state) { async.series([ (c) => {