Skip to content

Commit c1c075e

Browse files
committed
Fix matchPlayerId
1 parent c8aaab2 commit c1c075e

File tree

2 files changed

+25
-20
lines changed

2 files changed

+25
-20
lines changed

src/app/components/Renderer.tsx

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,33 @@ export default class Renderer extends React.Component<RendererInterfaces.Props,
2323
updateLog,
2424
} = this.props;
2525
// tslint:disable-next-line: no-console
26-
console.log('logfile:', logFile, 'player1DL', player1DebugLog, 'player2DL', player2DebugLog);
26+
console.log(
27+
'logfile:',
28+
logFile,
29+
'player1DL',
30+
player1DebugLog,
31+
'player2DL',
32+
player2DebugLog,
33+
'MatchPlayerId',
34+
matchPlayerId,
35+
);
2736

2837
return (
2938
<div style={{ height, display: 'flex', width: '100%', alignItems: 'center' }}>
3039
{logFile !== '' ? (
3140
<CodecharacterRenderer
3241
// @ts-ignore
33-
logFile={pako.inflate(Buffer.from(JSON.parse(logFile)))}
42+
logFile={pako.inflate(Buffer.from(logFile))}
3443
options={{
3544
logClearFunction: clearLog,
3645
logFunction: updateLog,
3746
// @ts-ignore
3847
player1Log: new TextDecoder('utf-8').decode(
39-
pako.inflate(Buffer.from(JSON.parse(player1DebugLog))),
48+
pako.inflate(Buffer.from(player1DebugLog)),
4049
),
4150
// @ts-ignore
4251
player2Log: new TextDecoder('utf-8').decode(
43-
pako.inflate(Buffer.from(JSON.parse(player2DebugLog))),
52+
pako.inflate(Buffer.from(player2DebugLog)),
4453
),
4554
playerID: matchPlayerId,
4655
}}

src/app/components/SocketHandler.tsx

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,27 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
4747
gameLog: '',
4848
debugLog1: '',
4949
debugLog2: '',
50-
}
50+
};
5151
Object.keys(matchDetails).forEach((key, index) => {
5252
// @ts-ignore
53-
matchDetails[key] = message.body.slice(10, (message.body.length - 1)).split(', ')[index];
53+
matchDetails[key] = message.body.slice(10, message.body.length - 1).split(', ')[
54+
index
55+
];
5456
if (index !== 0) {
5557
// @ts-ignore
5658
matchDetails[key] = Buffer.from(matchDetails[key], 'base64');
5759
}
58-
})
59-
console.log(matchDetails);
60+
});
6061

61-
const { updateGameLog, updateMatchPlayerId } = this.props;
62-
63-
// /**
64-
// Received match object [GameLogs(isPlayer1=true, gameLog=H4sIAAAAAAAAA+zdd7CdV3pfabXVJA9BEpFA9w3I8YIEkUgAzPcw55xzzjlntkiCEcwRzDnnnDNIgO6Ry5aV7LFsyXLLmvHIlmXJnmBpCOwb3nN677VdrQ4Ma+aPuVXL81W5xj77/T1EjRvLfzD8Bz/+JxP+6IczVp/zkxf+7IeLfvLpH87uHbfTf2oM6Wj89sTfWvV//bste/r/mPNPdlj+g6/TD8tptXJavZzWKKdGOa1ZTkPKaa1yWruc1imnoeU0rJyGl9OIchpZTqPKad1yGl1OY0qpq/Gj4T9I8Seb9/b0/9Eff0yxg2InxS6K3RT
65-
// str.slice(1, (str.length -1)).split(', ')[1].split('=')[1]str.slice(1, (str.length -1)).split(', ')[1].split('=')[1]
66-
// */
67-
// (new Buffer(data, 'base64')).toString('binary')
68-
69-
// const { debugLog1, debugLog2, gameLog, matchPlayerId } = JSON.parse(message.body);
70-
62+
// tslint:disable-next-line: no-shadowed-variable
63+
const { updateGameLog, updateMatchPlayerId, userId } = this.props;
64+
const matchPlayerId = parseInt(matchDetails.matchPlayerId, 10);
65+
// tslint:disable-next-line: no-console
66+
console.log(matchDetails, matchPlayerId, userId);
7167

7268
updateGameLog('', '', '');
7369
updateGameLog(matchDetails.debugLog1, matchDetails.debugLog2, matchDetails.gameLog);
74-
updateMatchPlayerId(parseInt(matchDetails.matchPlayerId, 10));
70+
updateMatchPlayerId(matchPlayerId === userId ? 1 : 2);
7571
},
7672
);
7773
},
@@ -92,7 +88,7 @@ export class SocketHandler extends React.Component<SocketHandlerInterfaces.Props
9288
): void {
9389
// @ts-ignore
9490
this.stompClient.send(
95-
'/request/match',
91+
'/socket/request/match',
9692
{},
9793
JSON.stringify({
9894
commitHash,

0 commit comments

Comments
 (0)