Merge pull request #510 from WatWowMap/develop

TurtIeSocks · web-flow · commit b97a688c5015 · 2022-06-07T04:54:39.000-08:00
Sync Dev &amp; Main
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -27,6 +27,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           commit_message: Synced docker env vars with latest config
   Docker:
+    if: ${{ always() }}
     needs: Sync
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -1,5 +1,5 @@
 name: Lint
-on: [push, pull_request]
+on: [push]
 
 jobs:
   Lint:
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ server/src/strategies/*
 server/src/routes/api/v1/*
 !server/src/routes/api/v1/users.js
 !server/src/routes/api/v1/sessions.js
+!server/src/routes/api/v1/available.js
 
 # custom model
 server/src/models/Custom.js
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
@@ -25,7 +25,17 @@ services:
       - ./server/src/configs/local.json:/home/node/server/src/configs/local.json
       - ./server/src/configs/geofence.json/:/home/node/server/src/configs/geofence.json
       - ./example.env:/home/node/.env
-    security_opt: 
-      - no-new-privileges:true  #https://nodramadevops.com/2019/06/running-docker-application-containers-more-securely/
+    security_opt:
+      - no-new-privileges:true #https://nodramadevops.com/2019/06/running-docker-application-containers-more-securely/
     ports:
       - "9090:8080"
+  # nginx:
+  #   image: nginx
+  #   container_name: nginx
+  #   depends_on:
+  #     - reactmap
+  #   ports:
+  #     - "80:80"
+  #     - "443:443"
+  #   volumes:
+  #     - ./server/src/configs/nginx.conf:/etc/nginx/conf.d/default.conf
diff --git a/esbuild.config.mjs b/esbuild.config.mjs
@@ -124,7 +124,9 @@ const esbuild = {
   publicPath: '/',
   entryNames: isDevelopment ? undefined : '[name].[hash]',
   metafile: true,
-  minify: isRelease || !isDevelopment,
+  minify: env.parsed.NO_MINIFIED
+    ? false
+    : isRelease || !isDevelopment,
   logLevel: isDevelopment ? 'info' : 'error',
   target: ['safari11.1', 'chrome64', 'firefox66', 'edge88'],
   watch: isDevelopment
diff --git a/example.env b/example.env
@@ -1,4 +1,4 @@
-GOOGLE_ANALYTICS_ID=
+GOOGLE_ANALYTICS_ID=""
 TITLE="Map"
 SENTRY_DSN=""
 SENTRY_AUTH_TOKEN=""
@@ -7,3 +7,4 @@ SENTRY_PROJECT=""
 SENTRY_TRACES_SAMPLE_RATE=0.1
 SENTRY_DEBUG=
 DEV_PORT=""
+NO_MINIFIED=""
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reactmap",
-  "version": "1.2.6",
+  "version": "1.2.7",
   "description": "React based frontend map.",
   "main": "ReactMap.mjs",
   "author": "TurtIeSocks <58572875+TurtIeSocks@users.noreply.github.com>",
@@ -26,8 +26,8 @@
     "release": "node server/scripts/newRelease.js"
   },
   "engines": {
-    "node": ">=16",
-    "yarn": "1.22.x"
+    "node": "^16",
+    "yarn": "^1.22.x"
   },
   "devDependencies": {
     "@craftamap/esbuild-plugin-html": "^0.4.0",
diff --git a/public/base-locales/en.json b/public/base-locales/en.json
@@ -164,6 +164,7 @@
   "event": "Event",
   "legendary": "Legendary",
   "mythical": "Mythical",
+  "ultra_beast": "Ultra Beast",
   "alt_forms": "Alt Forms",
   "alola": "Alola",
   "galarian": "Galarian",
diff --git a/server/scripts/generateMasterfile.js b/server/scripts/generateMasterfile.js
@@ -19,6 +19,7 @@ const getRarityLevel = (id, pkmn) => {
   }
   if (pkmn.legendary) pkmnRarity = 'legendary'
   if (pkmn.mythical) pkmnRarity = 'mythical'
+  if (pkmn.ultraBeast) pkmnRarity = 'ultraBeast'
   return pkmnRarity
 }
 
diff --git a/server/scripts/poracleToGeoJSON.js b/server/scripts/poracleToGeoJSON.js
@@ -48,6 +48,10 @@ if (fs.existsSync(geofencesFile)) {
         const coord = inGeofence.path[j]
         inGeofence.path[j] = [coord[1], coord[0]]
       }
+      const lastCoords = inGeofence.path.slice(-1)
+      if (inGeofence.path[0][0] !== lastCoords[0][0] || inGeofence.path[0][1] !== lastCoords[0][1]) {
+        inGeofence.path.push(inGeofence.path[0])
+      }
       outGeofence.geometry.coordinates[0] = inGeofence.path
       outGeoJSON.features.push(outGeofence)
     }
diff --git a/server/src/configs/areas.example.json b/server/src/configs/areas.example.json
@@ -7,8 +7,20 @@
         "coordinates": [
           [
             [
-              -100,
-              4
+              lon1,
+              lat1
+            ],
+            [
+              lon2,
+              lat2
+            ],
+            [
+              lon3,
+              lat3
+            ],
+            [
+              lon1,
+              lat1
             ]
           ]
         ]
diff --git a/server/src/configs/custom-environment-variables.json b/server/src/configs/custom-environment-variables.json
@@ -45,6 +45,48 @@
         "__format": "number"
       }
     },
+    "polling": {
+      "devices": {
+        "__name": "API_POLLING_DEVICES",
+        "__format": "number"
+      },
+      "gyms": {
+        "__name": "API_POLLING_GYMS",
+        "__format": "number"
+      },
+      "nests": {
+        "__name": "API_POLLING_NESTS",
+        "__format": "number"
+      },
+      "pokemon": {
+        "__name": "API_POLLING_POKEMON",
+        "__format": "number"
+      },
+      "pokestops": {
+        "__name": "API_POLLING_POKESTOPS",
+        "__format": "number"
+      },
+      "portals": {
+        "__name": "API_POLLING_PORTALS",
+        "__format": "number"
+      },
+      "scanAreas": {
+        "__name": "API_POLLING_SCAN_AREAS",
+        "__format": "number"
+      },
+      "scanCells": {
+        "__name": "API_POLLING_SCAN_CELLS",
+        "__format": "number"
+      },
+      "submissionCells": {
+        "__name": "API_POLLING_SUBMISSION_CELLS",
+        "__format": "number"
+      },
+      "weather": {
+        "__name": "API_POLLING_WEATHER",
+        "__format": "number"
+      }
+    },
     "queryUpdateHours": {
       "pokemon": {
         "__name": "API_QUERY_UPDATE_HOURS_POKEMON",
diff --git a/server/src/configs/default.json b/server/src/configs/default.json
@@ -18,6 +18,18 @@
       "time": 60,
       "requests": 1000
     },
+    "polling": {
+      "devices": 10,
+      "gyms": 10,
+      "nests": 300,
+      "pokemon": 20,
+      "pokestops": 300,
+      "portals": 300,
+      "scanAreas": 10000,
+      "scanCells": 10,
+      "submissionCells": 500,
+      "weather": 30
+    },
     "queryUpdateHours": {
       "pokemon": 0.5,
       "quests": 1,
diff --git a/server/src/models/Gym.js b/server/src/models/Gym.js
@@ -239,9 +239,11 @@ module.exports = class Gym extends Model {
           raidFields.forEach(field => newGym[field] = gym[field])
           newGym.hasRaid = true
         }
-        if (newGym.hasRaid || newGym.badge
-          || finalTeams.includes(gym.team_id)
-          || finalSlots[gym.team_id]?.includes(gym.available_slots)) {
+        if ((onlyAllGyms || onlyExEligible || onlyArEligible || onlyInBattle) && (finalTeams.includes(gym.team_id)
+          || finalSlots[gym.team_id]?.includes(gym.available_slots))) {
+          newGym.hasGym = true
+        }
+        if (newGym.hasRaid || newGym.badge || newGym.hasGym) {
           filteredResults.push(newGym)
         }
       })
diff --git a/server/src/models/Pokemon.js b/server/src/models/Pokemon.js
@@ -40,7 +40,7 @@ const getMadSql = q => (
       'pokemon_display.pokemon AS display_pokemon_id',
       'pokemon_display.form AS ditto_form',
       'weather_boosted_condition AS weather',
-      raw('IF(calc_endminsec, 1, NULL)')
+      raw('IF(calc_endminsec IS NOT NULL, 1, NULL)')
         .as('expire_timestamp_verified'),
       raw('Unix_timestamp(disappear_time)')
         .as('expire_timestamp'),
diff --git a/server/src/models/Pokestop.js b/server/src/models/Pokestop.js
@@ -357,6 +357,7 @@ module.exports = class Pokestop extends Model {
                 newQuest.key = `c${quest.candy_pokemon_id}`
                 fields.push('candy_pokemon_id', 'candy_amount'); break
               case 7:
+                quest.quest_form_id = quest.quest_form_id ?? 0
                 newQuest.key = `${quest.quest_pokemon_id}-${quest.quest_form_id}`
                 fields.push('quest_pokemon_id', 'quest_form_id', 'quest_costume_id', 'quest_gender_id', 'quest_shiny'); break
               case 9:
@@ -606,7 +607,7 @@ module.exports = class Pokestop extends Model {
         case 'stardust': rewards.forEach(reward => finalList.add(`d${reward.amount}`)); break
         case 'candy': rewards.forEach(reward => finalList.add(`c${reward.id}`)); break
         case 'xlCandy': rewards.forEach(reward => finalList.add(`x${reward.id}`)); break
-        default: rewards.forEach(reward => finalList.add(`${reward.quest_pokemon_id}-${reward.form}`)); break
+        default: rewards.forEach(reward => finalList.add(`${reward.quest_pokemon_id}-${reward.form ?? 0}`)); break
       }
     })
 
diff --git a/server/src/routes/api/v1/available.js b/server/src/routes/api/v1/available.js
@@ -0,0 +1,117 @@
+/* eslint-disable no-console */
+const path = require('path')
+const router = require('express').Router()
+const { api } = require('../../../services/config')
+const { Db, Event } = require('../../../services/initialization')
+
+const queryObj = {
+  pokemon: { model: 'Pokemon', category: 'pokemon' },
+  quests: { model: 'Pokestop', category: 'pokestops' },
+  raids: { model: 'Gym', category: 'gyms' },
+  nests: { model: 'Nest', category: 'nests' },
+}
+
+const resolveCategory = (category) => {
+  switch (category) {
+    case 'gym':
+    case 'gyms':
+    case 'raid':
+    case 'raids': return 'raids'
+    case 'pokestop':
+    case 'pokestops':
+    case 'quest':
+    case 'quests': return 'quests'
+    case 'pokemon':
+    case 'pokemons': return 'pokemon'
+    default: return 'all'
+  }
+}
+
+const getAll = async (compare) => {
+  const available = compare
+    ? await Promise.all([
+      Db.getAvailable('Pokemon'),
+      Db.getAvailable('Pokestop'),
+      Db.getAvailable('Gym'),
+      Db.getAvailable('Nest'),
+    ])
+    : [
+      Event.available.pokemon,
+      Event.available.pokestops,
+      Event.available.gyms,
+      Event.available.nests,
+    ]
+  return Object.fromEntries(Object.keys(queryObj).map((key, i) => [key, available[i]]))
+}
+
+router.get(['/', '/:category'], async (req, res) => {
+  const { model, category } = queryObj[resolveCategory(req.params.category)] || {}
+  const { current, equal } = req.query
+  try {
+    if (api.reactMapSecret && req.headers['react-map-secret'] === api.reactMapSecret) {
+      if (model && category) {
+        const available = current !== undefined
+          ? await Db.getAvailable(model)
+          : Event.available[category]
+        available.sort((a, b) => a.localeCompare(b))
+
+        if (equal !== undefined) {
+          const compare = current !== undefined
+            ? Event.available[category]
+            : await Db.getAvailable(model)
+          compare.sort((a, b) => a.localeCompare(b))
+          res.status(200).json(available.every((item, i) => item === compare[i]))
+        } else {
+          res.status(200).json(available)
+        }
+      } else {
+        const available = await getAll(current)
+        Object.values(available).forEach(c => c.sort((a, b) => a.localeCompare(b)))
+
+        if (equal !== undefined) {
+          const compare = await getAll(!current)
+          Object.values(compare).forEach(c => c.sort((a, b) => a.localeCompare(b)))
+
+          res.status(200).json(Object.keys(available).every(cat => (
+            available[cat].every((item, j) => item === compare[cat][j])
+          )))
+        } else {
+          res.status(200).json(available)
+        }
+      }
+    } else {
+      throw new Error('Incorrect or missing API secret')
+    }
+    console.log(`[API] api/v1/${path.parse(__filename).name}`)
+  } catch (e) {
+    console.error(`[API Error] api/v1/${path.parse(__filename).name}`, e)
+    res.status(500).json({ status: 'ServerError', reason: e.message })
+  }
+})
+
+router.put('/:category', async (req, res) => {
+  const { model, category } = queryObj[resolveCategory(req.params.category)] || {}
+  try {
+    if (api.reactMapSecret && req.headers['react-map-secret'] === api.reactMapSecret) {
+      if (model && category) {
+        await Event.setAvailable(category, model, Db)
+      } else {
+        await Promise.all([
+          Event.setAvailable('pokemon', 'Pokemon', Db),
+          Event.setAvailable('pokestops', 'Pokestop', Db),
+          Event.setAvailable('gyms', 'Gym', Db),
+          Event.setAvailable('nests', 'Nest', Db),
+        ])
+      }
+      res.status(200).json({ status: `updated availabled for ${category || 'all'}` })
+    } else {
+      throw new Error('Incorrect or missing API secret')
+    }
+    console.log(`[API] api/v1/${path.parse(__filename).name} - updated availabled for ${category || 'all'}`)
+  } catch (e) {
+    console.error(`[API] api/v1/${path.parse(__filename).name}`, e)
+    res.status(500).json({ status: 'ServerError', reason: e.message })
+  }
+})
+
+module.exports = router
diff --git a/server/src/routes/rootRouter.js b/server/src/routes/rootRouter.js
@@ -69,7 +69,7 @@ rootRouter.get('/settings', async (req, res) => {
       req.session.perms = {
         areaRestrictions: Utility.areaPerms(['none']),
         webhooks: [],
-        scanner: [],
+        scanner: Object.keys(config.scanner).filter((key) => key !== 'backendConfig' && config.scanner[key].enabled && !config.scanner[key].discordRoles.length && !config.scanner[key].telegramGroups.length),
       }
       config.authentication.alwaysEnabledPerms.forEach(perm => {
         if (config.authentication.perms[perm]) {
@@ -112,6 +112,7 @@ rootRouter.get('/settings', async (req, res) => {
           ...config.map,
           ...config.multiDomainsObj[req.headers.host],
           excludeList: config.authentication.excludeFromTutorial,
+          polling: config.api.polling,
         },
         localeSelection: Object.fromEntries(config.map.localeSelection.map(l => [l, { name: l }])),
         tileServers: Object.fromEntries(config.tileServers.map(s => [s.name, s])),
diff --git a/server/src/services/api/fetchJson.js b/server/src/services/api/fetchJson.js
@@ -21,7 +21,7 @@ module.exports = async function fetchJson(url, options = undefined, log = false)
       console.log('Request to', url, 'timed out and was aborted')
     } else if (log) {
       console.warn(e)
-    } else {
+    } else if (e instanceof Error) {
       console.warn(e.message, '\n', e.code, `\nUnable to fetch ${url}`)
     }
     return null
diff --git a/server/src/strategies/telegram.js b/server/src/strategies/telegram.js
diff --git a/src/components/QueryData.jsx b/src/components/QueryData.jsx
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ const getRarityLevel = (id, pkmn) => {`
`19`	`19`	`}`
`20`	`20`	`if (pkmn.legendary) pkmnRarity = 'legendary'`
`21`	`21`	`if (pkmn.mythical) pkmnRarity = 'mythical'`
	`22`	`+ if (pkmn.ultraBeast) pkmnRarity = 'ultraBeast'`
`22`	`23`	`return pkmnRarity`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ if (fs.existsSync(geofencesFile)) {`
`48`	`48`	`const coord = inGeofence.path[j]`
`49`	`49`	`inGeofence.path[j] = [coord[1], coord[0]]`
`50`	`50`	`}`
	`51`	`+ const lastCoords = inGeofence.path.slice(-1)`
	`52`	`+ if (inGeofence.path[0][0] !== lastCoords[0][0] \|\| inGeofence.path[0][1] !== lastCoords[0][1]) {`
	`53`	`+ inGeofence.path.push(inGeofence.path[0])`
	`54`	`+ }`
`51`	`55`	`outGeofence.geometry.coordinates[0] = inGeofence.path`
`52`	`56`	`outGeoJSON.features.push(outGeofence)`
`53`	`57`	`}`