trucoshi 0.0.2 → 0.0.5

package/src/lib/utils.ts

@@ -1,69 +1,66 @@
-import { CARDS } from "./constants";
-import { ICard, IPoints, IRound, ITeam } from "./types";
+import { CARDS } from "./constants"
+import { ICard, IRound, ITeam, RoundPoints } from "./types"
+
+export function getMaxNumberIndex<T = number>(array: Array<T>) {
+  return array.reduce((accumulator, current, index) => {
+    return current > array[accumulator] ? index : accumulator
+  }, 0)
+}
 
 export function getCardValue(card: ICard) {
-    return CARDS[card] || -1
+  return CARDS[card] || -1
 }
 
-export function shuffleArray<T = never>(array: Array<T>) {
-    let currentIndex = array.length, randomIndex;
+export function shuffleArray<T = unknown>(array: Array<T>) {
+  let currentIndex = array.length,
+    randomIndex
 
-    while (currentIndex != 0) {
-        randomIndex = Math.floor(Math.random() * currentIndex);
-        currentIndex--;
-        [array[currentIndex], array[randomIndex]] = [
-            array[randomIndex], array[currentIndex]];
-    }
+  while (currentIndex != 0) {
+    randomIndex = Math.floor(Math.random() * currentIndex)
+    currentIndex--
+    ;[array[currentIndex], array[randomIndex]] = [array[randomIndex], array[currentIndex]]
+  }
 
-    return array as Array<T>;
+  return array as Array<T>
 }
 
-export function checkHandWinner(rounds: Array<IRound>, forehandTeamIdx: 0 | 1): null | 0 | 1 {
-    const roundsWon: IPoints = {
-        0: 0,
-        1: 0,
-        2: 0 // tied rounds
-    }
+export function checkHandWinner(
+  rounds: Array<IRound>,
+  forehandTeamIdx: 0 | 1
+): null | 0 | 1 {
+  const roundsWon: RoundPoints = {
+    0: 0,
+    1: 0,
+    ties: 0,
+  }
 
-    for (let i = 0; i < rounds.length; i++) {
-        const round = rounds[i];
-        if (round.tie) {
-            roundsWon[0] += 1;
-            roundsWon[1] += 1;
-            roundsWon[2] = (roundsWon[2] || 0) + 1;
-            continue;
-        }
-        if (round.winner?.teamIdx === 0) {
-            roundsWon[0] += 1;
-        }
-        if (round.winner?.teamIdx === 1) {
-            roundsWon[1] += 1;
-        }
+  for (let i = 0; i < rounds.length; i++) {
+    const round = rounds[i]
+    if (round.tie) {
+      roundsWon[0] += 1
+      roundsWon[1] += 1
+      roundsWon.ties = roundsWon.ties + 1
+      continue
     }
-
-    const ties = roundsWon[2] || 0
-    
-    if ((roundsWon[0] > 2 && roundsWon[1] > 2) || (rounds.length > 2 && ties > 0)) {
-        return forehandTeamIdx
+    if (round.winner?.teamIdx === 0) {
+      roundsWon[0] += 1
     }
-
-    if (roundsWon[0] >= 2 && roundsWon[1] < 2) {
-        return 0
+    if (round.winner?.teamIdx === 1) {
+      roundsWon[1] += 1
     }
+  }
 
-    if (roundsWon[1] >= 2 && roundsWon[0] < 2) {
-        return 1
-    }
+  if ((roundsWon[0] > 2 && roundsWon[1] > 2) || (rounds.length > 2 && roundsWon.ties > 0)) {
+    return forehandTeamIdx
+  }
 
-    return null
-}
+  if (roundsWon[0] >= 2 && roundsWon[1] < 2) {
+    return 0
+  }
 
-export function checkMatchWinner(teams: Array<ITeam>, matchPoint: number): ITeam | null {
-    if (teams[0].points >= matchPoint) {
-        return teams[0]
-    }
-    if (teams[1].points >= matchPoint) {
-        return teams[1]
-    }
-    return null
+  if (roundsWon[1] >= 2 && roundsWon[0] < 2) {
+    return 1
+  }
+
+  return null
 }

package/src/server/index.ts

@@ -1,22 +1,34 @@
-import { createServer } from "http";
-import { Server } from "socket.io";
-
-const PORT = 4001
-
-const httpServer = createServer();
-const io = new Server(httpServer, {
-    cors: {
-        origin: "http://localhost:3000",
-        methods: ["GET", "POST"]
-    }
-});
-
-io.on("connection", (socket) => {
-    socket.on('ping', (msg) => {
-        io.emit('pong', msg);
-    });
-});
-
-httpServer.listen(PORT);
-
-console.log('Listening on port', PORT)
+import { createServer } from "http"
+import { Server } from "socket.io"
+import { EClientEvent, EServerEvent } from "./types"
+
+const PORT = 4001
+
+const httpServer = createServer()
+const io = new Server(httpServer, {
+  cors: {
+    origin: "http://localhost:3000",
+    methods: ["GET", "POST"],
+  },
+})
+
+const sessions = new Map<string, string>()
+
+io.on("connection", (socket) => {
+  socket.on(EClientEvent.PING, (msg) => {
+    io.emit(EServerEvent.PONG, msg)
+  })
+
+  socket.on(EClientEvent.CREATE_MATCH, (msg) => {
+
+  })
+  
+  socket.on(EClientEvent.SET_PLAYER_ID, (msg) => {
+    if (typeof msg === 'string' && msg.length < 32) {
+    }
+  })
+})
+
+httpServer.listen(PORT)
+
+console.log("Listening on port", PORT)

package/src/server/types.ts

@@ -0,0 +1,12 @@
+export enum EClientEvent {
+  PING = "PING",
+  CREATE_MATCH = "CREATE_MATCH",
+  JOIN_MATCH = "JOIN_MATCH",
+  START_MATCH = "START_MATCH",
+  SET_PLAYER_ID = "SET_PLAYER_ID",
+}
+
+export enum EServerEvent {
+  SET_SESSION_ID = "SET_SESSION_ID",
+  PONG = "PONG",
+}

package/src/test/autoplay.ts

@@ -1,41 +1,57 @@
-import { COLORS } from '../lib/constants';
-import { Match, Player, Team } from "../lib/trucoshi";
-import { ICard, IRound } from '../lib/types';
-
-(async () => {
-    const player1 = Player('lukini', 0)
-    const player2 = Player('guada', 0)
-    const player3 = Player('denoph', 1)
-    const player4 = Player('juli', 1)
-    const player5 = Player('fran', 1)
-    const player6 = Player('day', 0)
-
-    const team1 = Team(COLORS[0], [player1, player2, player6])
-    const team2 = Team(COLORS[1], [player3, player4, player5])
-
-    const match = Match([team1, team2], 9);
-
-    while(!match.winner) {
-        const play = match.play()
-
-        if (!play || !play.player) {
-            break;
-        }
-
-        const name = play.player.id.toUpperCase()
-        console.log(`=== Mano ${play.handIdx} === Ronda ${play.roundIdx} === Turno de ${name} ===`)
-        match.teams.map((team, id) => console.log(`=== Team ${id} = ${team.points} Puntos ===`))
-        console.log(play.rounds && play.rounds.length ? (play.rounds.map((round: IRound) => round.cards.length ? round.cards.map(c => [c.player.id, c.card]) : '')) : '')
-
-        const randomIdx = Math.round(Math.random() * (play.player.hand.length - 1))
-        const card = play.use(randomIdx)
-
-        console.log(`\n${JSON.stringify(play.player.hand)}\nUsing ${card}`)
-        console.log(play.rounds && play.rounds.length ? (play.rounds.map((round: IRound) => round.cards.length ? round.cards.map(c => [c.player.id, c.card]) : '')) : '')
-    }
-
-    console.log('\n')
-    match.teams.map((t, i) => console.log(`Equipo ${i}: ${t.players.map(p => ` ${p.id}`)} === ${t.points} puntos`))
-    console.log(`\nEquipo Ganador:${match.winner?.players.map(p => ` ${p.id}`)}`)
-
-})();
+import { Trucoshi } from "../lib"
+import { IRound } from "../lib/types"
+;(async () => {
+  const trucoshi = Trucoshi()
+
+  trucoshi.addPlayer("lukini").setReady(true)
+  trucoshi.addPlayer("denoph").setReady(true)
+  trucoshi.addPlayer("guada").setReady(true)
+  trucoshi.addPlayer("juli").setReady(true)
+  trucoshi.addPlayer("day").setReady(true)
+  trucoshi.addPlayer("fran").setReady(true) 
+
+  trucoshi
+    .startMatch()
+    .onTurn(async (play) => {
+      if (!play.player) {
+        return
+      }
+      const name = play.player?.id.toUpperCase()
+      console.log(`=== Mano ${play.handIdx} === Ronda ${play.roundIdx} === Turno de ${name} ===`)
+      play.teams.map((team, id) =>
+        console.log(`=== Team ${id} = ${team.points.malas} malas ${team.points.buenas} buenas ===`)
+      )
+      console.log(
+        play.rounds && play.rounds.length
+          ? play.rounds.map((round: IRound) =>
+              round.cards.length ? round.cards.map((c) => [c.player.id, c.card]) : ""
+            )
+          : ""
+      )
+
+      const randomIdx = Math.round(Math.random() * (play.player.hand.length - 1))
+      const handString = JSON.stringify(play.player.hand)
+      const card = play.use(randomIdx)
+
+      console.log(`\n${handString}\nUsing ${card}`)
+      console.log(
+        play.rounds && play.rounds.length
+          ? play.rounds.map((round: IRound) =>
+              round.cards.length ? round.cards.map((c) => [c.player.id, c.card]) : ""
+            )
+          : ""
+      )
+    })
+    .onWinner(async (winner, teams) => {
+      console.log("\n")
+      teams.map((t, i) =>
+        console.log(
+          `Equipo ${i}: ${t.players.map((p) => ` ${p.id}`)} === ${t.points.malas} malas ${
+            t.points.buenas
+          } buenas`
+        )
+      )
+      console.log(`\nEquipo Ganador:${winner.players.map((p) => ` ${p.id}`)}`)
+    })
+    .begin()
+})()

package/src/test/play.ts

@@ -1,70 +1,122 @@
-import * as readline from 'readline'
-import { COLORS } from '../lib/constants';
-import { Match, Player, Team } from "../lib/trucoshi";
-import { IRound } from '../lib/types';
-
-(async () => {
-    const player1 = Player('lukini', 0)
-    const player2 = Player('guada', 0)
-    const player3 = Player('denoph', 1)
-    const player4 = Player('juli', 1)
-
-    const team1 = Team(COLORS[0], [player1, player2])
-    const team2 = Team(COLORS[1], [player3, player4])
-
-    const match = Match([team1, team2], 9);
-
-    while(!match.winner) {
-
-        const play = match.play()
-
-        if (!play || !play.player) {
-            break;
-        }
-
-        const name = play.player.id.toUpperCase()
-
-        process.stdout.write('\u001B[2J\u001B[0;0f');
-        process.stdout.write('\u001B[0;0f');
-
-        console.log(`=== Mano ${play.handIdx} === Ronda ${play.roundIdx} === Turno de ${name} ===`)
-
-        process.stdout.write('\u001B[2;0f');
-
-        match.teams.map((team, id) => console.log(`=== Team ${id} = ${team.points} Puntos ===`))
-
-        process.stdout.write('\u001B[5;0f');
-
-        console.log(play.rounds && play.rounds.length ? (play.rounds.map((round: IRound) => round.cards.length ? round.cards.map(c => [c.player.id, c.card]) : '')) : '')
-
-        const prom = () => new Promise<void>((resolve) => {
-            const rl = readline.createInterface(process.stdin, process.stdout);
-            rl.setPrompt(`\n${play.player?.id} elije una carta [1, 2, 3]: ${JSON.stringify(play.player?.hand)}\n`);
-            rl.prompt();
-            rl.on('line', (idx: string) => {
-                const playedCard = play.use(Number(idx) - 1)
-                if (!playedCard) {
-                    rl.close();
-                    return (async () => {
-                        await prom()
-                        resolve()
-                    })();
-                }
-                process.stdout.write('\u001B[7;0f');
-                console.log(`\n${JSON.stringify(play.player?.hand)}\nUsing ${playedCard}`)
-                process.stdout.write('\u001B[10;0f');
-                console.log(play.rounds && play.rounds.length ? (play.rounds.map((round: IRound) => round.cards.length ? round.cards.map(c => [c.player.id, c.card]) : '')) : '')
-                rl.close();
-                resolve()
-            });
-        });
-
-        await prom()
-
-    }
-
-    process.stdout.write('\u001B[2J\u001B[2;0f');
-    match.teams.map((t, i) => console.log(`Equipo ${i}: ${t.players.map(p => ` ${p.id}`)} === ${t.points} puntos`))
-    console.log(`\nEquipo Ganador:${match.winner?.players.map(p => ` ${p.id}`)}`)
-
-})();
+import * as readline from "readline"
+import { Trucoshi } from "../lib"
+import { IPlayInstance, IRound, ITeam } from "../lib/types"
+
+const command = (
+  title: string,
+  onLine: (line: string, close: () => void) => Promise<void>
+): (() => Promise<void>) => {
+  const promise = () =>
+    new Promise<void>((resolve) => {
+      const rl = readline.createInterface(process.stdin, process.stdout)
+      rl.setPrompt(title)
+      rl.prompt()
+      rl.on("line", async (line) => {
+        try {
+          await onLine(line, () => rl.close())
+          rl.close()
+          resolve()
+        } catch (e) {
+          rl.close()
+          return (async () => {
+            await promise()
+            resolve()
+          })()
+        }
+      })
+    })
+
+  return promise
+}
+
+const playCommand = (play: IPlayInstance) =>
+  command(
+    `${play.player?.id} elije una carta [${play.player?.hand.map(
+      (_c, i) => i + 1
+    )}]: ${JSON.stringify(play.player?.hand)}\n`,
+    async (idx) => {
+      const playedCard = play.use(Number(idx) - 1)
+      if (!playedCard) {
+        return Promise.reject()
+      }
+      const handString = JSON.stringify(play.player?.hand)
+      console.log(`\n${handString}\nUsing ${playedCard}`)
+      console.log(
+        play.rounds && play.rounds.length
+          ? play.rounds.map((round: IRound) =>
+              round.cards.length ? round.cards.map((c) => [c.player.id, c.card]) : ""
+            )
+          : ""
+      )
+      return Promise.resolve()
+    }
+  )
+
+const sayCommand = (play: IPlayInstance, canPlay: boolean) =>
+  command(
+    `${play.player?.id} elije una accion [${canPlay ? "0," : ""}${play.commands?.map(
+      (_c, i) => i + 1
+    )}]: ${
+      canPlay ? JSON.stringify(["CARTA", ...(play.commands || [])]) : JSON.stringify(play.commands)
+    }\n`,
+    async (idx, close) => {
+      const selectedCommand = play.commands?.[Number(idx) - 1]
+
+      if (selectedCommand) {
+        play.say(selectedCommand)
+        return Promise.resolve()
+      }
+
+      if (idx === "0" && canPlay) {
+        close()
+        await playCommand(play)()
+        return Promise.resolve()
+      }
+
+      return Promise.reject()
+    }
+  )
+
+;(async () => {
+  const trucoshi = Trucoshi()
+
+  trucoshi.addPlayer("lukini", 0).setReady(true)
+  trucoshi.addPlayer("guada", 0).setReady(true)
+  trucoshi.addPlayer("denoph", 1).setReady(true)
+  trucoshi.addPlayer("juli", 1).setReady(true)
+
+  trucoshi
+    .startMatch()
+    .onTruco(async (play) => {
+      await sayCommand(play, false)()
+    })
+    .onTurn(async (play) => {
+      const name = play.player?.id.toUpperCase()
+      console.log(`=== Mano ${play.handIdx} === Ronda ${play.roundIdx} === Turno de ${name} ===`)
+
+      play.teams.map((team, id) =>
+        console.log(`=== Team ${id} = ${team.points.malas} malas ${team.points.buenas} buenas`)
+      )
+
+      console.log(
+        play.rounds && play.rounds.length
+          ? play.rounds.map((round: IRound) =>
+              round.cards.length ? round.cards.map((c) => [c.player.id, c.card]) : ""
+            )
+          : ""
+      )
+
+      await sayCommand(play, true)()
+    })
+    .onWinner(async (winner: ITeam, teams: [ITeam, ITeam]) => {
+      teams.map((t, i) =>
+        console.log(
+          `Equipo ${i}: ${t.players.map((p) => ` ${p.id}`)} === ${t.points.malas} malas ${
+            t.points.buenas
+          } buenas`
+        )
+      )
+      console.log(`\nEquipo Ganador:${winner?.players.map((p) => ` ${p.id}`)}`)
+    })
+    .begin()
+})()

package/build/lib/trucoshi.d.ts

@@ -1,10 +0,0 @@
-import { IMatch, IPlayer, ITeam } from "./types";
-export declare function Match(teams?: Array<ITeam>, matchPoint?: number): IMatch;
-export declare function Player(id: string, teamIdx: number): IPlayer;
-export declare function Team(color: string, players: Array<IPlayer>): {
-    _players: Map<string, IPlayer>;
-    readonly players: IPlayer[];
-    color: string;
-    points: number;
-    addPoints(points: number): number;
-};