update dcs-grpc protos to latest release

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
         id: cache-generated
         with:
           path: generated
-          key: ${{ runner.os }}-proto-${{ hashFiles('src/proto/**') }}
+          key: ${{ runner.os }}-proto-${{ hashFiles('src/protos/**') }}
           restore-keys: |
             ${{ runner.os }}-proto-
       - run: npm install
@@ -59,7 +59,7 @@ jobs:
         id: cache-generated
         with:
           path: generated
-          key: ${{ runner.os }}-proto-${{ hashFiles('src/proto/**') }}
+          key: ${{ runner.os }}-proto-${{ hashFiles('src/protos/**') }}
           restore-keys: |
             ${{ runner.os }}-proto-
       - run: npm install
@@ -89,7 +89,7 @@ jobs:
         id: cache-generated
         with:
           path: generated
-          key: ${{ runner.os }}-proto-${{ hashFiles('src/proto/**') }}
+          key: ${{ runner.os }}-proto-${{ hashFiles('src/protos/**') }}
           restore-keys: |
             ${{ runner.os }}-proto-
       - run: npm install
@@ -119,7 +119,7 @@ jobs:
         id: cache-generated
         with:
           path: generated
-          key: ${{ runner.os }}-proto-${{ hashFiles('src/proto/**') }}
+          key: ${{ runner.os }}-proto-${{ hashFiles('src/protos/**') }}
           restore-keys: |
             ${{ runner.os }}-proto-
       - run: npm install
@@ -149,7 +149,7 @@ jobs:
         id: cache-generated
         with:
           path: generated
-          key: ${{ runner.os }}-proto-${{ hashFiles('src/proto/**') }}
+          key: ${{ runner.os }}-proto-${{ hashFiles('src/protos/**') }}
           restore-keys: |
             ${{ runner.os }}-proto-
       - run: npm install

generate-types.js

@@ -12,12 +12,12 @@ async function main() {
 
   const npmBin = resolve('node_modules', '.bin')
   const bin = resolve(npmBin, 'proto-loader-gen-types')
-  const protoDir = resolve('src', 'proto')
-  const dcsProtoFile = resolve(protoDir, 'dcs', 'dcs.proto')
+  const protosDir = resolve('src', 'protos')
+  const dcsProtoFile = resolve(protosDir, 'dcs', 'dcs.proto')
 
   const args = [
     '-I',
-    protoDir,
+    protosDir,
     '-O',
     generatedDir,
     '--oneofs',

package.json

@@ -29,7 +29,7 @@
     "typecheck": "tsc --noEmit",
     "prettier": "npx prettier --check src/",
     "full-build": "npm run codegen && npm run build",
-    "build": "rm -rf build/ && tsc && cp -r src/proto/ build/ && cp -r package*.json build/",
+    "build": "rm -rf build/ && tsc && cp -r src/protos/ build/ && cp -r package*.json build/",
     "codegen": "node generate-types.js && mikro-orm cache:generate"
   },
   "dependencies": {

src/autoRespawn/main.ts

@@ -1,30 +1,32 @@
+import { wrap } from '@mikro-orm/core'
 import { equal } from 'assert'
 
+import { coalitionFrom } from '../coalition'
+import { CommandType, ToDestroy } from '../commands'
+import { randomBetween } from '../common'
+import { distanceFrom } from '../convert'
+import { MarkPanel, getMarkById, getMarkPanels } from '../custom'
+import { Position, Spawner, SpawnerQueuedUnit, SpawnerType, Unit } from '../db'
+import { emFork } from '../db/connection'
 import {
-  Events,
   EventType,
+  Events,
   MarkChangeEvent,
   MissionCommandEvent,
 } from '../events'
-import { markToAll, outText, removeMapMark } from '../trigger'
-import { getMarkById, getMarkPanels, MarkPanel } from '../custom'
-import { CommandType, ToDestroy } from '../commands'
-import { emFork } from '../db/connection'
-import { Position, Spawner, SpawnerQueuedUnit, SpawnerType, Unit } from '../db'
-import { distanceFrom, PositionLL, randomBetween } from '../common'
-import { createGroundUnitsInCircle, spawnGroundUnit } from '../unit'
-import { UnitEvents, UnitEventType, UnitGoneEvent } from '../unitEvents'
-import { closestPointOnRoads, findPathOnRoads, RoadType } from '../land'
+import { LatLon } from '../geo'
 import { driveGroundGroup } from '../group'
+import { RoadType, closestPointOnRoads, findPathOnRoads } from '../land'
 import {
   allSpawners,
   createSpawner,
   findNearbySpawners,
   spawnerDestroyed,
 } from '../spawner'
-import { coalitionFrom } from '../coalition'
-import { wrap } from '@mikro-orm/core'
-import { LatLon } from '../geo'
+import { markToAll, outText, removeMapMark } from '../trigger'
+import { GamePositionLL } from '../types'
+import { createGroundUnitsInCircle, spawnGroundUnit } from '../unit'
+import { UnitEventType, UnitEvents, UnitGoneEvent } from '../unitEvents'
 
 const UNIT_MAXIMUM_DISPLACEMENT_TO_SPAWNER_METERS = 100000
 const SPAWNER_MINIMUM_DISPLACEMENT_METERS = 250
@@ -130,8 +132,8 @@ function respawnQueue(): () => void {
       const { country, position: randomUnitDeathPosition } = randomQueuedUnit
 
       const [firstOnRoadPosition, lastOnRoadPosition]: [
-        PositionLL,
-        PositionLL,
+        GamePositionLL,
+        GamePositionLL,
       ] = await Promise.all([
         closestPointOnRoads(RoadType.Roads, spawner.position),
         closestPointOnRoads(RoadType.Roads, randomUnitDeathPosition),

src/base-templates/types.ts

@@ -1,4 +1,4 @@
-import { PositionLL } from '../common'
+import { GamePositionLL } from '../types'
 import { StaticObjectTypeName, UnitTypeName } from '../db'
 
 interface TemplateObject<TTypeName> {
@@ -9,7 +9,7 @@ interface TemplateObject<TTypeName> {
 }
 
 export interface Template {
-  origin: Pick<PositionLL, 'lat' | 'lon'>
+  origin: Pick<GamePositionLL, 'lat' | 'lon'>
   /* slots that players can spawn into */
   slots: TemplateObject<UnitTypeName>[]
   /* Static objects (tents, barriers, decorative vehicles, etc) */

src/base.ts

@@ -1,31 +1,32 @@
-import { LatLon } from './geo'
-import { baseNames } from './baseNames'
-import { distanceFrom, metersToDegree, randomBetween } from './common'
-import { countryFrom } from './country'
-import { despawnStaticObject, spawnStaticObject } from './staticObject'
+import { wrap } from '@mikro-orm/core'
+import assert from 'assert'
+
+import { Coalition } from './__generated__/dcs/common/v0/Coalition'
 import {
+  Template,
   baseLevel0,
   baseLevel1,
   baseLevel2,
   baseLevel3,
-  Template,
 } from './base-templates'
-import assert from 'assert'
-import { createUnit, despawnGroundUnit, spawnGroundUnit } from './unit'
-import { despawnFarp, spawnFarp } from './farp'
-import { emFork } from './db/connection'
+import { baseNames } from './baseNames'
+import { metersToDegree, randomBetween } from './common'
+import { countryFrom, distanceFrom } from './convert'
 import {
   Base,
   BaseType,
+  Color,
   NewBase,
   Position,
   StaticObject,
   TextMarkup,
-  Color,
 } from './db'
-import { Coalition } from './__generated__/dcs/common/v0/Coalition'
-import { wrap } from '@mikro-orm/core'
+import { emFork } from './db/connection'
+import { despawnFarp, spawnFarp } from './farp'
+import { LatLon } from './geo'
 import { spawnMarkup } from './markup'
+import { despawnStaticObject, spawnStaticObject } from './staticObject'
+import { createUnit, despawnGroundUnit, spawnGroundUnit } from './unit'
 
 /** Min range between COP bases in meters */
 const BASE_COP_MIN_RANGE_METERS = 3500
@@ -534,8 +535,8 @@
 }
 
 export async function upgradeBaseTypeTo(
   base: Base,
   nextBaseType: BaseType
 ): Promise<void> {
   //
 }

src/bin/dump-template.ts

@@ -2,18 +2,16 @@
 import { orm } from '../db/connection'
 
 // just hold a reference here (i promise, this fixes a bug)
 const db = orm
 
-import { Position, StaticObjectTypeName, Unit, UnitTypeName } from '../db'
-
 import assert from 'assert'
-import { PositionLL } from '../common'
-
+import { Template } from '../base-templates/types'
+import { positionLatLonFrom } from '../coord'
+import { Position, StaticObjectTypeName, Unit, UnitTypeName } from '../db'
 import { LatLon } from '../geo'
 import { Mission } from '../restartMission/types'
 import { services } from '../services'
-import { Template } from '../base-templates/types'
-import { positionLatLonFrom } from '../coord'
+import { GamePositionLL } from '../types'
 
 const { custom, hook } = services
 
@@ -42,7 +40,7 @@
 interface StaticObject {
   id: string
   typeName: string
-  position: Pick<PositionLL, 'lat' | 'lon'>
+  position: Pick<GamePositionLL, 'lat' | 'lon'>
   heading: number // in radians
 }