diff --git a/package.json b/package.json index 0c65cb5..aeddf0f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "POGOServer", - "version": "0.4.2", + "version": "0.4.3", "description": "", "repository": { "type": "git", @@ -26,7 +26,7 @@ "mysql": "^2.11.1", "jwt-decode": "^2.1.0", "long": "^3.2.0", - "pogo-asset-downloader": "^0.2.4", + "pogo-asset-downloader": "^0.2.5", "node-pogo-protos": "^1.3.0", "pogo-decode": "^0.5.2", "path": "^0.12.7", diff --git a/src/setup.js b/src/setup.js index bdef4e6..d4fde86 100644 --- a/src/setup.js +++ b/src/setup.js @@ -59,13 +59,6 @@ export function validateAssets() { return new Promise((resolve, reject) => { - // validate asset digests - /*if (!this.fileExists(CFG.DUMP_ASSET_PATH + "asset_digest_ios")) { - return reject("File asset_digest_ios"); - } - if (!this.fileExists(CFG.DUMP_ASSET_PATH + "asset_digest_android")) { - return reject("File asset_digest_android"); - }*/ if (!this.fileExists(CFG.DUMP_ASSET_PATH + "asset_digest")) { return reject("File asset_digest"); } @@ -117,13 +110,12 @@ export function onFirstRun(resolve) { username: CFG.DOWNLOAD_USERNAME, password: CFG.DOWNLOAD_PASSWORD }).then((res) => { - let client = res.client; // create data dir, if login successed fse.ensureDirSync(CFG.DUMP_ASSET_PATH); // write game master fs.writeFileSync(CFG.DUMP_ASSET_PATH + "game_master", res.master.toBuffer()); // get and write asset digests - this.dumpAssetDigests(client).then(() => { + this.dumpAssetDigests(res.client).then(() => { // dump pkmn models this.dumpPkmnModels(() => { resolve(); @@ -139,14 +131,6 @@ export function dumpAssetDigests(client) { this.print(`Dumping asset digests..`, 35); let platforms = [ - { - name: "ios", - platform: 1, - manufacturer: "Apple", - model: "iPhone8,1", - locale: "", - version: 3300 - }, { name: "android", platform: 2, @@ -170,7 +154,7 @@ export function dumpAssetDigests(client) { key.version ).then((asset) => { this.print(`Dumping ${key.name} asset digest..`, 35); - fs.writeFileSync(CFG.DUMP_ASSET_PATH + "asset_digest_" + key.name, asset.toBuffer()); + fs.writeFileSync(CFG.DUMP_ASSET_PATH + "asset_digest", asset.toBuffer()); if (++index >= platforms.length) { resolve(); }