Release v2.3.0

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,12 @@
+##  Here is what I would like to see new or change within PokeNurse
+
+
+
+
+## This is my environment
+
+ - OS and Version:
+ - Version of PokeNurse
+
+
+

.travis.yml

@@ -25,6 +25,19 @@ addons:
 install:
   - export CXX="g++-4.8"
   - npm install -g yarn
+  # BEGIN PATCH TO FIX MISSING DEP
+  - export BACK_TO_WORKSPACE=$(pwd)
+  - cd $(npm config get prefix)/lib/node_modules/yarn/node_modules/end-of-stream
+  - npm install once
+  - cd ../../
+  - npm install har-validator
+  - mkdir $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/node4
+  - ln -s $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/promise.js $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/node4/promise.js
+  - ln -s $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/error.js $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/node4/error.js
+  - ln -s $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/async.js $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/node4/async.js
+  - ln -s $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/promise.js $(npm config get prefix)/lib/node_modules/yarn/node_modules/har-validator/lib/index.js
+  - cd $BACK_TO_WORKSPACE
+  # END PATCH
   - yarn
   - "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16"
 

CONTRIBUTING.md

@@ -0,0 +1,22 @@
+## Login related issues
+
+Note that issues regarding login are better handled in [pogobuf](https://github.com/cyraxx/pogobuf) as this project is reliant on it for access.
+
+If you have related questions, you are welcome to join the [discord chat](https://discord.gg/sSXCruy)
+
+
+## Contributing
+
+The instructions below should let build and run a copy of your own for testing.
+
+These assume you are comfortable [installing yarn](https://yarnpkg.com/lang/en/docs/install/).
+
+```
+git clone https://github.com/vinnymac/PokeNurse
+cd PokeNurse
+git checkout develop
+yarn
+yarn run dev
+```
+
+All pull requests should be made to the develop branch.

README.md

@@ -8,14 +8,14 @@
 
 **PokéNurse** is a desktop application for Windows and Mac that allows you to manage your pokémon from Pokémon Go without the need for a mobile device. You can now favorite, transfer, and evolve from the comfort of your own home!
 
-## Downloads for v2.2.0
+## Downloads for v2.3.0
 You may view all the releases [here](https://github.com/vinnymac/PokeNurse/releases)
-* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v2.2.0/PokeNurse.dmg)
-* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v2.2.0/PokeNurse.exe)
-* [Debian 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.2.0/PokeNurse-ia32.deb)
-* [Debian 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.2.0/PokeNurse-x64.deb)
-* [AppImage 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.2.0/PokeNurse-ia32.AppImage)
-* [AppImage 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.2.0/PokeNurse-x64.AppImage)
+* [macOS](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse.dmg)
+* [Windows](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse.exe)
+* [Debian 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-ia32.deb)
+* [Debian 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-x64.deb)
+* [AppImage 32 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-ia32.AppImage)
+* [AppImage 64 bit](https://github.com/vinnymac/PokeNurse/releases/download/v2.3.0/PokeNurse-x64.AppImage)
 
 ## Examples
 ![Login Window](app/loginExample.png)
@@ -69,10 +69,12 @@ Note: Only 12 characters can be used to rename a pokemon.
     yarn run package-all
 
 ## FAQ
-1. Will I be banned from pokemon go for using PokeNurse?
-
+1. **Will I be banned from pokemon go for using PokeNurse?**  
 This app is meant to make pogo easier to manage. This is not a bot. We do not send location data. No one has ever been banned for using PokeNurse as far as we are aware. This doesn't mean you cannot be banned, if they somehow begin to detect API calls from pogobuf, then this may very well start happening, but that is the risk of using any of these third party tools right now that are not the original app.
 
+2. **What is this `hashingKey` PokeNurse asks for?**  
+The API Hashing service is a paid service that allows third party Pokémon GO developers to build awesome tools for the game. Most of this tools were free to use in the past but, because of some changes Niantic introduced, there's no way to use them anymore without a Hashing Key license. You can learn more about what they are and how much they cost [from this website](https://talk.pogodev.org/d/51-api-hashing-service-by-pokefarmer).
+
 ## Known Issues
 * Google 2 Factor Authentication cannot be used. However you can use an [AppPassword](https://security.google.com/settings/security/apppasswords) instead.
 

app/actions/trainer.js

@@ -234,9 +234,7 @@ function parseInventory(inventory) {
   }
 }
 
-function sleep(time) {
-  return new Promise(r => setTimeout(r, time))
-}
+const sleep = time => new Promise(r => setTimeout(r, time))
 
 const getTrainerInfoSuccess = createAction('GET_TRAINER_INFO_SUCCESS')
 const getTrainerInfoFailed = createAction('GET_TRAINER_INFO_FAILED')
@@ -455,50 +453,78 @@ function handlePogobufError(error) {
   }
 }
 
-function transferPokemon(pokemon, delay) {
+// Wait for a random number of seconds between min and max
+const randomDelay = ([min, max]) => Math.round((min + Math.random() * (max - min)) * 1000)
+
+function transferPokemon(selectedPokemon) {
   return async (dispatch) => {
+    const ids = selectedPokemon.map(p => p.id)
+    dispatch(updateStatus({ method: 'transfer' }))
     try {
-      await sleep(delay)
-      await getClient().releasePokemon(pokemon.id)
-      dispatch(transferPokemonSuccess(pokemon))
+      await getClient().releasePokemon(ids)
+      dispatch(transferPokemonSuccess(selectedPokemon))
+      await dispatch(resetStatusAndGetPokemon(null, () => {
+        ipcRenderer.send('information-dialog', 'Complete!', 'Finished Transfer')
+      }))
     } catch (error) {
       dispatch(transferPokemonFailed(error))
       handlePogobufError(error)
+      dispatch(resetStatusAndGetPokemon('Failed to transfer all pokemon.'))
     }
   }
 }
 
-function evolvePokemon(pokemon, delay) {
+const promiseChainFromArray = (array, iterator) => {
+  let promise = Promise.resolve()
+
+  array.forEach((value, index) => {
+    promise = promise.then(() => iterator(value, index))
+  })
+
+  return promise
+}
+
+function evolvePokemon(selectedPokemon) {
   return async (dispatch) => {
+    const delayMin = 4 // 4 seconds
+    const delayMax = 12 // 12 seconds
+
     try {
-      await sleep(delay)
-      await getClient().evolvePokemon(pokemon.id)
-      dispatch(evolvePokemonSuccess(pokemon))
+      // Wait for all selectedPokemon to be evolved
+      dispatch(updateStatus({ method: 'evolve' }))
+      await promiseChainFromArray(selectedPokemon, async (currentPokemon) => {
+        try {
+          await getClient().evolvePokemon(currentPokemon.id)
+          const delay = randomDelay([delayMin, delayMax])
+          console.log(`Simulating Human Behavior, ${delayMin} to ${delayMax} seconds`)
+          console.log(`Delaying evolve for ${delay / 1000} seconds`)
+          await sleep(delay)
+
+          dispatch(evolvePokemonSuccess(currentPokemon))
+        } catch (error) {
+          dispatch(evolvePokemonFailed(error))
+          handlePogobufError(error)
+        }
+      })
+
+      await dispatch(resetStatusAndGetPokemon(null, () => {
+        ipcRenderer.send('information-dialog', 'Complete!', 'Finished Evolve')
+      }))
     } catch (error) {
-      dispatch(evolvePokemonFailed(error))
-      handlePogobufError(error)
+      dispatch(resetStatusAndGetPokemon('Failed to evolve all pokemon.'))
     }
   }
 }
 
 const updateMonster = createAction('UPDATE_MONSTER')
 
-function batchStart(selectedPokemon, method) {
-  let batch = getClient().batchStart()
-
-  selectedPokemon.forEach((p) => {
-    batch = batch[method](p.id)
-  })
-
-  return () => batch.batchCall()
-}
-
-function resetStatusAndGetPokemon(errorMessage) {
+function resetStatusAndGetPokemon(errorMessage, success) {
   return async (dispatch) => {
     try {
       dispatch(resetStatus())
       await sleep(100) // Pogobuf may need a tick after a large batch
       await dispatch(refreshPokemon())
+      if (success) success()
       if (errorMessage) ipcRenderer.send('error-message', errorMessage)
     } catch (e) {
       errorMessage = errorMessage ? `${errorMessage}\n\n${e}` : `Failed to fetch pokemon:\n\n${e}`
@@ -507,30 +533,6 @@ function resetStatusAndGetPokemon(errorMessage) {
   }
 }
 
-function batchProcessSelectedPokemon(method, batchMethod, selectedPokemon) {
-  return async (dispatch) => {
-    dispatch(updateStatus({
-      method,
-      selectedPokemon: null,
-      time: null,
-    }))
-
-    const batchCall = batchStart(selectedPokemon, batchMethod)
-
-    try {
-      await batchCall()
-      await dispatch(resetStatusAndGetPokemon())
-      ipcRenderer.send('information-dialog', 'Complete!', `Finished ${method}`)
-    } catch (e) {
-      dispatch(resetStatusAndGetPokemon(`Error while running ${method.toLowerCase()}:\n\n${e}`))
-    }
-  }
-}
-
-const transferSelectedPokemon = batchProcessSelectedPokemon.bind(null, 'Transfer', 'releasePokemon')
-
-const evolveSelectedPokemon = batchProcessSelectedPokemon.bind(null, 'Evolve', 'evolvePokemon')
-
 export default {
   updateMonster,
   updateSpecies: createAction('UPDATE_SPECIES'),
@@ -549,7 +551,7 @@ export default {
   renamePokemon,
   transferPokemon,
   evolvePokemon,
-  evolveSelectedPokemon,
-  transferSelectedPokemon,
+  evolveSelectedPokemon: evolvePokemon,
+  transferSelectedPokemon: transferPokemon,
   refreshPokemon,
 }

app/app.global.css

@@ -407,8 +407,9 @@ margin: auto;
 left: 0;
 right: 0;
 cursor: pointer;
-//max-width: 400px;
+max-width: 400px;
 height: 90%;
+object-fit: contain;
 image-rendering: pixelated;
 }