Merge pull request #1045 from WatWowMap/cjs-exports-cleanup

refactor: cleanup module.exports on server side

packages/types/lib/client.d.ts

@@ -30,7 +30,7 @@ declare global {
   }
 }
 
-export interface CustomI extends React.HTMLProps<HTMLLIElement> {
+export interface CustomI extends React.HTMLAttributes<HTMLLIElement> {
   size?: ButtonProps['size']
 }
 

packages/types/lib/general.d.ts

@@ -1,5 +1,5 @@
 import type { SliderProps } from '@mui/material'
-import type { Feature, Polygon, MultiPolygon } from '@turf/helpers'
+import type { Feature, Polygon, MultiPolygon } from 'geojson'
 import { Config } from './config'
 
 export type HttpMethod = 'GET' | 'PUT' | 'POST' | 'PATCH' | 'DELETE'

packages/types/lib/poracle.d.ts

@@ -291,14 +291,16 @@ export interface PoracleAPIRef {
 }
 
 export type PoracleUI = ReturnType<
-  import('server/src/services/Poracle')['generateUi']
+  import('server/src/services/Poracle').PoracleAPI['generateUi']
 >
 
 export type PoracleDefault<T extends keyof Omit<PoracleUI, 'human'>> =
   PoracleUI[T]['defaults']
 
 export type PoracleClientContext = Omit<
-  ReturnType<import('server/src/services/Poracle')['getClientContext']>,
+  ReturnType<
+    import('server/src/services/Poracle').PoracleAPI['getClientContext']
+  >,
   'ui'
 > & {
   ui: PoracleUI

packages/types/lib/server.d.ts

@@ -10,7 +10,7 @@ import { Model } from 'objection'
 import { NextFunction, Request, Response } from 'express'
 import { VerifyCallback } from 'passport-oauth2'
 
-import DbCheck = require('server/src/services/DbCheck')
+import DbManager = require('server/src/services/DbManager')
 import EventManager = require('server/src/services/EventManager')
 import Pokemon = require('server/src/models/Pokemon')
 import Gym = require('server/src/models/Gym')
@@ -86,7 +86,7 @@ export interface DbConnection {
 
 export type Schema = ApiEndpoint | DbConnection
 
-export interface DbCheckClass {
+export interface DbManagerClass {
   models: {
     [key in ScannerModelKeys]?: (DbContext & {
       connection: number
@@ -133,8 +133,8 @@ export interface GqlContext {
   userId: number
   req: Request
   res: Response
-  Db: DbCheck
-  Event: EventManager
+  Db: DbManager.DbManager
+  Event: EventManager.EventManager
   perms: Permissions
   username: string
   operation: OperationTypeNode
@@ -238,19 +238,22 @@ export type DiscordVerifyFunction = (
   done: VerifyCallback,
 ) => void
 
-export type BaseFilter = import('server/src/filters/Base')
+export type BaseFilter = import('server/src/filters/Base').BaseFilter
 
-export type PokemonFilter = import('server/src/filters/pokemon/Frontend')
+export type PokemonFilter =
+  import('server/src/filters/pokemon/Frontend').PokemonFilter
 
 export type AllFilters = ReturnType<
-  typeof import('server/src/filters/builder/base')
+  (typeof import('server/src/filters/builder/base'))['buildDefaultFilters']
 >
 
 export type Categories = keyof AllFilters
 
 export type AdvCategories = 'pokemon' | 'gyms' | 'pokestops' | 'nests'
 
-export type UIObject = ReturnType<typeof import('server/src/ui/primary')>
+export type UIObject = ReturnType<
+  (typeof import('server/src/ui/drawer'))['drawer']
+>
 
 export interface PokemonGlow
   extends Partial<Omit<Config['clientSideOptions']['pokemon'], 'glow'>> {

packages/types/package.json

@@ -12,19 +12,19 @@
     "prettier:fix": "prettier --write \"**/*.{css,html,js,jsx,yml}\""
   },
   "devDependencies": {
-    "@apollo/client": "^3.7.15",
-    "@mui/material": "^5.14.0",
-    "@mui/system": "^5.15.2",
-    "@sentry/node": "^7.48.0",
-    "@types/config": "^3.3.0",
-    "@types/node": "^20.5.1",
-    "@types/react": "^18.2.20",
-    "@types/react-dom": "^18.0.9",
-    "@turf/helpers": "^6.5.0",
+    "@apollo/client": "3.11.4",
+    "@mui/material": "5.16.7",
+    "@mui/system": "5.16.7",
+    "@sentry/node": "^7.65.0",
+    "@types/config": "^3.3.4",
+    "@types/node": "^18",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "express": "^4.19.2",
-    "knex": "^2.4.2",
+    "geojson": "0.5.0",
+    "knex": "3.1.0",
     "loglevel": "^1.8.1",
-    "objection": "^3.0.1",
+    "objection": "3.1.4",
     "passport-discord": "https://github.com/tonestrike/passport-discord.git",
     "passport-oauth2": "^1.7.0"
   }

server/src/filters/Base.js

@@ -14,4 +14,4 @@ class BaseFilter {
   }
 }
 
-module.exports = BaseFilter
+module.exports = { BaseFilter }

server/src/filters/builder/base.js

@@ -1,12 +1,12 @@
 // @ts-check
 const config = require('@rm/config')
 
-const state = require('../../services/state')
-const buildPokemon = require('./pokemon')
-const buildPokestops = require('./pokestop')
-const buildGyms = require('./gym')
-const BaseFilter = require('../Base')
-const PokemonFilter = require('../pokemon/Frontend')
+const { state } = require('../../services/state')
+const { buildPokemon } = require('./pokemon')
+const { buildPokestops } = require('./pokestop')
+const { buildGyms } = require('./gym')
+const { BaseFilter } = require('../Base')
+const { PokemonFilter } = require('../pokemon/Frontend')
 
 /**
  * @param {import("@rm/types").Permissions} perms
@@ -230,4 +230,4 @@ function buildDefaultFilters(perms) {
   }
 }
 
-module.exports = buildDefaultFilters
+module.exports = { buildDefaultFilters }

server/src/filters/builder/gym.js

@@ -1,6 +1,6 @@
 // @ts-check
-const state = require('../../services/state')
-const BaseFilter = require('../Base')
+const { state } = require('../../services/state')
+const { BaseFilter } = require('../Base')
 
 /**
  *
@@ -44,4 +44,4 @@ function buildGyms(perms, defaults) {
   return gymFilters
 }
 
-module.exports = buildGyms
+module.exports = { buildGyms }

server/src/filters/builder/pokemon.js

@@ -1,6 +1,6 @@
 // @ts-check
-const state = require('../../services/state')
-const BaseFilter = require('../Base')
+const { state } = require('../../services/state')
+const { BaseFilter } = require('../Base')
 
 /**
  *
@@ -66,4 +66,4 @@ function buildPokemon(defaults, base, custom) {
   return pokemon
 }
 
-module.exports = buildPokemon
+module.exports = { buildPokemon }

server/src/filters/builder/pokestop.js

@@ -1,8 +1,8 @@
 // @ts-check
 const { log, TAGS } = require('@rm/logger')
 
-const BaseFilter = require('../Base')
-const state = require('../../services/state')
+const { state } = require('../../services/state')
+const { BaseFilter } = require('../Base')
 
 /**
  *
@@ -110,4 +110,4 @@ function buildPokestops(perms, defaults) {
   return quests
 }
 
-module.exports = buildPokestops
+module.exports = { buildPokestops }

server/src/filters/pokemon/Backend.js

@@ -13,14 +13,14 @@ const {
   dnfifyIvFilter,
 } = require('./functions')
 const { filterRTree } = require('../../utils/filterRTree')
-const state = require('../../services/state')
-const PokemonFilter = require('./Frontend')
+const { PokemonFilter } = require('./Frontend')
+const { state } = require('../../services/state')
 
-module.exports = class PkmnBackend {
+class PkmnBackend {
   /**
    * @param {`${number}-${number}` | 'global'} id
-   * @param {import("./Frontend")} filter
-   * @param {import("./Frontend")} global
+   * @param {import("./Frontend").PokemonFilter} filter
+   * @param {import("./Frontend").PokemonFilter} global
    * @param {object} perms
    * @param {boolean} perms.pokemon
    * @param {boolean} perms.iv
@@ -162,7 +162,7 @@ module.exports = class PkmnBackend {
   }
 
   /**
-   * @param {import("./Frontend")} filter
+   * @param {import("./Frontend").PokemonFilter} filter
    * @returns {Set<string>}
    */
   getRelevantKeys(filter = this.filter) {
@@ -476,3 +476,5 @@ module.exports = class PkmnBackend {
     return result
   }
 }
+
+module.exports = { PkmnBackend }

server/src/filters/pokemon/Frontend.js

@@ -1,6 +1,6 @@
 // @ts-check
 const config = require('@rm/config')
-const BaseFilter = require('../Base')
+const { BaseFilter } = require('../Base')
 
 class PokemonFilter extends BaseFilter {
   /**
@@ -53,4 +53,4 @@ class PokemonFilter extends BaseFilter {
   }
 }
 
-module.exports = PokemonFilter
+module.exports = { PokemonFilter }

server/src/graphql/resolvers.js

@@ -8,15 +8,15 @@ const { S2LatLng, S2RegionCoverer, S2LatLngRect } = require('nodes2ts')
 const config = require('@rm/config')
 const { missing, readAndParseJson } = require('@rm/locales')
 
-const buildDefaultFilters = require('../filters/builder/base')
-const filterComponents = require('../utils/filterComponents')
-const validateSelectedWebhook = require('../utils/validateSelectedWebhook')
-const PoracleAPI = require('../services/Poracle')
+const { buildDefaultFilters } = require('../filters/builder/base')
+const { filterComponents } = require('../utils/filterComponents')
+const { validateSelectedWebhook } = require('../utils/validateSelectedWebhook')
+const { PoracleAPI } = require('../services/Poracle')
 const { geocoder } = require('../services/geocoder')
-const scannerApi = require('../services/scannerApi')
-const getPolyVector = require('../utils/getPolyVector')
-const getPlacementCells = require('../utils/getPlacementCells')
-const getTypeCells = require('../utils/getTypeCells')
+const { scannerApi } = require('../services/scannerApi')
+const { getPolyVector } = require('../utils/getPolyVector')
+const { getPlacementCells } = require('../utils/getPlacementCells')
+const { getTypeCells } = require('../utils/getTypeCells')
 const { getValidCoords } = require('../utils/getValidCoords')
 
 /** @type {import("@apollo/server").ApolloServerOptions<import("@rm/types").GqlContext>['resolvers']} */
@@ -788,4 +788,4 @@ const resolvers = {
   },
 }
 
-module.exports = resolvers
+module.exports = { resolvers }

server/src/graphql/server.js

@@ -15,8 +15,8 @@ const {
 const config = require('@rm/config')
 const { Logger, TAGS, log } = require('@rm/logger')
 
-const resolvers = require('./resolvers')
-const state = require('../services/state')
+const { resolvers } = require('./resolvers')
+const { state } = require('../services/state')
 
 /** @param {import('http').Server} httpServer */
 async function startApollo(httpServer) {
@@ -167,4 +167,4 @@ async function startApollo(httpServer) {
   return apolloServer
 }
 
-module.exports = startApollo
+module.exports = { startApollo }

server/src/index.js

@@ -12,12 +12,11 @@ const { rainbow } = require('chalkercli')
 const cors = require('cors')
 const { json } = require('body-parser')
 const http = require('http')
-const { default: helmet } = require('helmet')
 
 const { log, TAGS, Logger } = require('@rm/logger')
 const config = require('@rm/config')
 
-const state = require('./services/state')
+const { state } = require('./services/state')
 const { starti18n } = require('./services/i18n')
 const { checkForUpdates } = require('./services/checkForUpdates')
 const { loadLatestAreas, loadCachedAreas } = require('./services/areas')
@@ -31,11 +30,12 @@ const { initPassport } = require('./middleware/passport')
 const { errorMiddleware } = require('./middleware/error')
 const { sessionMiddleware } = require('./middleware/session')
 const { apolloMiddleware } = require('./middleware/apollo')
+const { helmetMiddleware } = require('./middleware/helmet')
 
-const startApollo = require('./graphql/server')
+const { startApollo } = require('./graphql/server')
 const { bindConnections } = require('./models')
 const { migrate } = require('./db/migrate')
-const rootRouter = require('./routes/rootRouter')
+const { rootRouter } = require('./routes/rootRouter')
 
 const startServer = async () => {
   if (!config.getSafe('devOptions.skipUpdateCheck')) {
@@ -77,23 +77,7 @@ const startServer = async () => {
   )
 
   if (config.getSafe('api.enableHelmet')) {
-    app.use(
-      helmet({
-        hidePoweredBy: true,
-        contentSecurityPolicy: {
-          directives: {
-            scriptSrc: [
-              "'self'",
-              'https://cdn.jsdelivr.net',
-              'https://telegram.org',
-              'https://static.cloudflareinsights.com',
-            ],
-            frameSrc: ["'self'", 'https://*.telegram.org'],
-            workerSrc: ["'self'", 'blob:'],
-          },
-        },
-      }),
-    )
+    app.use(helmetMiddleware())
   }
 
   initPassport(app)

server/src/middleware/apollo.js

@@ -4,13 +4,13 @@ const { ApolloServerErrorCode } = require('@apollo/server/errors')
 const { GraphQLError } = require('graphql')
 const { parse } = require('graphql')
 
-const state = require('../services/state')
-const pkg = require('../../../package.json')
+const { state } = require('../services/state')
+const { version } = require('../../../package.json')
 const { DataLimitCheck } = require('../services/DataLimitCheck')
 
 /**
  *
- * @param {Awaited<ReturnType<import('../graphql/server')>>} server
+ * @param {Awaited<ReturnType<import('../graphql/server')['startApollo']>>} server
  * @returns
  */
 function apolloMiddleware(server) {
@@ -23,9 +23,9 @@ function apolloMiddleware(server) {
       const clientVHeader = req.headers['apollographql-client-version']
       const clientV =
         (typeof clientVHeader === 'string' && clientVHeader.trim()) ||
-        pkg.version ||
+        version ||
         1
-      const serverV = pkg.version || 1
+      const serverV = version || 1
 
       const definition =
         /** @type {import('graphql').OperationDefinitionNode} */ (