some more type hinting etc

src/server/Game.ts

@@ -1,4 +1,4 @@
-import GameCommon from './../common/GameCommon'
+import GameCommon, { ScoreMode } from './../common/GameCommon'
 import Util from './../common/Util'
 import { Rng } from './../common/Rng'
 import GameLog from './GameLog'
@@ -6,7 +6,13 @@ import { createPuzzle } from './Puzzle'
 import Protocol from './../common/Protocol'
 import GameStorage from './GameStorage'
 
-async function createGameObject(gameId: string, targetTiles: number, image: { file: string, url: string }, ts: number, scoreMode: number) {
+async function createGameObject(
+  gameId: string,
+  targetTiles: number,
+  image: { file: string, url: string },
+  ts: number,
+  scoreMode: ScoreMode
+) {
   const seed = Util.hash(gameId + ' ' + ts)
   const rng = new Rng(seed)
   return {
@@ -19,7 +25,13 @@ async function createGameObject(gameId: string, targetTiles: number, image: { fi
   }
 }
 
-async function createGame(gameId: string, targetTiles: number, image: { file: string, url: string }, ts: number, scoreMode: number) {
+async function createGame(
+  gameId: string,
+  targetTiles: number,
+  image: { file: string, url: string },
+  ts: number,
+  scoreMode: ScoreMode
+) {
   const gameObject = await createGameObject(gameId, targetTiles, image, ts, scoreMode)
 
   GameLog.create(gameId)

src/server/GameStorage.ts

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import GameCommon from './../common/GameCommon'
+import GameCommon, { ScoreMode } from './../common/GameCommon'
 import Util, { logger } from './../common/Util'
 import { Rng } from './../common/Rng'
 import { DATA_DIR } from './Dirs'
@@ -55,7 +55,7 @@ function loadGame(gameId: string): void {
     puzzle: game.puzzle,
     players: game.players,
     evtInfos: {},
-    scoreMode: game.scoreMode || GameCommon.SCORE_MODE_FINAL,
+    scoreMode: game.scoreMode || ScoreMode.FINAL,
   }
   GameCommon.setGame(gameObject.id, gameObject)
 }

src/server/Puzzle.ts

@@ -1,6 +1,7 @@
 import Util from './../common/Util'
 import { Rng } from './../common/Rng'
 import Images from './Images'
+import { EncodedPiece, EncodedPieceShape, PieceShape } from '../common/GameCommon'
 
 interface PuzzleInfo {
   width: number
@@ -31,7 +32,7 @@ async function createPuzzle(
   if (!dim || !dim.width || !dim.height) {
     throw `[ 2021-05-16 invalid dimension for path ${imagePath} ]`
   }
-  const info = determinePuzzleInfo(dim.width, dim.height, targetTiles)
+  const info: PuzzleInfo = determinePuzzleInfo(dim.width, dim.height, targetTiles)
 
   let tiles = new Array(info.tiles)
   for (let i = 0; i < tiles.length; i++) {
@@ -91,7 +92,7 @@ async function createPuzzle(
   // then shuffle the positions
   positions = rng.shuffle(positions)
 
-  tiles = tiles.map(tile => {
+  const pieces: Array<EncodedPiece> = tiles.map(tile => {
     return Util.encodeTile({
       idx: tile.idx, // index of tile in the array
       group: 0, // if grouped with other tiles
@@ -113,7 +114,7 @@ async function createPuzzle(
   // Complete puzzle object
   return {
     // tiles array
-    tiles,
+    tiles: pieces,
     // game data for puzzle, data changes during the game
     data: {
       // TODO: maybe calculate this each time?
@@ -159,10 +160,10 @@ async function createPuzzle(
 function determinePuzzleTileShapes(
   rng: Rng,
   info: PuzzleInfo
-) {
+): Array<EncodedPieceShape> {
   const tabs = [-1, 1]
 
-  const shapes = new Array(info.tiles)
+  const shapes: Array<PieceShape> = new Array(info.tiles)
   for (let i = 0; i < info.tiles; i++) {
     let coord = Util.coordByTileIdx(info, i)
     shapes[i] = {
@@ -191,7 +192,11 @@ const determineTilesXY = (w: number, h: number, targetTiles: number) => {
   }
 }
 
-const determinePuzzleInfo = (w: number, h: number, targetTiles: number) => {
+const determinePuzzleInfo = (
+  w: number,
+  h: number,
+  targetTiles: number
+): PuzzleInfo => {
   const {tilesX, tilesY} = determineTilesXY(w, h, targetTiles)
   const tiles = tilesX * tilesY
   const tileSize = TILE_SIZE

src/server/main.ts

@@ -13,7 +13,7 @@ import GameSockets from './GameSockets'
 import Time from './../common/Time'
 import Images from './Images'
 import { UPLOAD_DIR, UPLOAD_URL, PUBLIC_DIR } from './Dirs'
-import GameCommon from '../common/GameCommon'
+import GameCommon, { ScoreMode } from '../common/GameCommon'
 import GameStorage from './GameStorage'
 
 let configFile = ''
@@ -158,7 +158,7 @@ wss.on('message', async ({socket, data} : { socket: WebSocket, data: any }) => {
           log[0][2],
           log[0][3],
           log[0][4],
-          log[0][5] || GameCommon.SCORE_MODE_FINAL
+          log[0][5] || ScoreMode.FINAL
         )
         notify(
           [Protocol.EV_SERVER_INIT_REPLAY, Util.encodeGame(game), log],