gamelet-cli 0.8.15 → 0.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/assets/server/static/css/style.css +112 -0
- package/assets/server/static/js/monitor.js +193 -2
- package/assets/server/views/monitor.twig +18 -5
- package/build/package.json +1 -1
- package/build/src/server/entities/GameroomBase.js +23 -3
- package/build/src/server/entities/Monitor.js +15 -2
- package/build/src/server/entities/Player.js +77 -10
- package/build/src/server/managers/PlayerManager.js +26 -1
- package/build/src/server/managers/UserManager.js +39 -1
- package/build/src/server/server.js +6 -4
- package/build/src/server/startServer.js +2 -1
- package/package.json +1 -1
|
@@ -54,4 +54,116 @@ form button {
|
|
|
54
54
|
|
|
55
55
|
#messages {
|
|
56
56
|
margin-bottom: 40px
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/* monitor page */
|
|
60
|
+
|
|
61
|
+
body.monitor {
|
|
62
|
+
height: 100%;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
.layout {
|
|
66
|
+
display: flex;
|
|
67
|
+
align-items: stretch;
|
|
68
|
+
height: 100vh;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
.panel {
|
|
72
|
+
overflow: auto;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
.players-panel {
|
|
76
|
+
flex: 0 0 320px;
|
|
77
|
+
width: 320px;
|
|
78
|
+
border-right: 1px solid #ddd;
|
|
79
|
+
background: #fafafa;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
.main-panel {
|
|
83
|
+
flex: 1 1 auto;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
.panel-header {
|
|
87
|
+
display: flex;
|
|
88
|
+
align-items: center;
|
|
89
|
+
justify-content: space-between;
|
|
90
|
+
padding: 8px 10px;
|
|
91
|
+
border-bottom: 1px solid #ddd;
|
|
92
|
+
background: #f0f0f0;
|
|
93
|
+
font-weight: bold;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
#players {
|
|
97
|
+
list-style-type: none;
|
|
98
|
+
margin: 0;
|
|
99
|
+
padding: 0;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
#players li.player {
|
|
103
|
+
padding: 8px 10px;
|
|
104
|
+
border-bottom: 1px solid #eee;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
.player-head {
|
|
108
|
+
display: flex;
|
|
109
|
+
align-items: center;
|
|
110
|
+
overflow: hidden;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
.player-icon {
|
|
114
|
+
flex: 0 0 auto;
|
|
115
|
+
width: 20px;
|
|
116
|
+
height: 20px;
|
|
117
|
+
margin-right: 6px;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
.player-nickname {
|
|
121
|
+
flex: 0 1 auto;
|
|
122
|
+
margin-right: 6px;
|
|
123
|
+
font-weight: bold;
|
|
124
|
+
overflow: hidden;
|
|
125
|
+
text-overflow: ellipsis;
|
|
126
|
+
white-space: nowrap;
|
|
127
|
+
}
|
|
128
|
+
|
|
129
|
+
.player-username {
|
|
130
|
+
flex: 0 1 auto;
|
|
131
|
+
color: #888;
|
|
132
|
+
font-size: 11px;
|
|
133
|
+
overflow: hidden;
|
|
134
|
+
text-overflow: ellipsis;
|
|
135
|
+
white-space: nowrap;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
.player-edit {
|
|
139
|
+
display: flex;
|
|
140
|
+
margin-top: 4px;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
.player-edit input.nickname-input {
|
|
144
|
+
flex: 1 1 auto;
|
|
145
|
+
min-width: 0;
|
|
146
|
+
padding: 3px 5px;
|
|
147
|
+
border: 1px solid #ccc;
|
|
148
|
+
font: inherit;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
.player-edit input.delay-input {
|
|
152
|
+
flex: 0 0 70px;
|
|
153
|
+
min-width: 0;
|
|
154
|
+
padding: 3px 5px;
|
|
155
|
+
border: 1px solid #ccc;
|
|
156
|
+
font: inherit;
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
.player-edit button {
|
|
160
|
+
margin-left: 4px;
|
|
161
|
+
padding: 3px 8px;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
.player-meta {
|
|
165
|
+
margin-top: 4px;
|
|
166
|
+
color: #999;
|
|
167
|
+
font-size: 11px;
|
|
168
|
+
word-break: break-all;
|
|
57
169
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
(function (global) {
|
|
2
2
|
let socket = null;
|
|
3
|
+
let projectCode = global.PROJECT_CODE || '';
|
|
3
4
|
|
|
4
5
|
function connect() {
|
|
5
6
|
|
|
@@ -15,6 +16,7 @@
|
|
|
15
16
|
logError('Failed to login', res.error);
|
|
16
17
|
} else {
|
|
17
18
|
log('Login successfully', res.data, 'black');
|
|
19
|
+
refreshPlayers();
|
|
18
20
|
}
|
|
19
21
|
});
|
|
20
22
|
})
|
|
@@ -35,11 +37,17 @@
|
|
|
35
37
|
let msgProccessor = {
|
|
36
38
|
on_monitorLog: (clientCode, channel, prefix, data, color) => {
|
|
37
39
|
log(prefix, JSON.stringify(data), color);
|
|
40
|
+
},
|
|
41
|
+
on_monitorEvent: (clientCode, event, data) => {
|
|
42
|
+
onMonitorEvent(event, data);
|
|
38
43
|
},
|
|
39
44
|
}
|
|
40
45
|
|
|
41
46
|
socket.on('gltmsg', function (type, params) {
|
|
42
|
-
|
|
47
|
+
let processor = msgProccessor['on_' + type];
|
|
48
|
+
if (processor) {
|
|
49
|
+
processor.apply(msgProccessor, params);
|
|
50
|
+
}
|
|
43
51
|
});
|
|
44
52
|
}
|
|
45
53
|
}
|
|
@@ -67,13 +75,196 @@
|
|
|
67
75
|
log(prefix, error, 'red');
|
|
68
76
|
}
|
|
69
77
|
|
|
78
|
+
// players --------------------------------------------
|
|
79
|
+
|
|
80
|
+
function onMonitorEvent(event, data) {
|
|
81
|
+
let player = data && data.player;
|
|
82
|
+
if (!player) {
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
if (event == 'playerConnected') {
|
|
86
|
+
log('playerConnected', player.user ? player.user.username : player.code, 'green');
|
|
87
|
+
upsertPlayer(player);
|
|
88
|
+
} else if (event == 'playerDisconnected') {
|
|
89
|
+
log('playerDisconnected', player.user ? player.user.username : player.code, 'red');
|
|
90
|
+
removePlayer(player.code);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
function findPlayerRow(code) {
|
|
95
|
+
return $('#players li.player').filter(function () {
|
|
96
|
+
return $(this).attr('data-code') === code;
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function updatePlayersCount() {
|
|
101
|
+
$('#player-count').text($('#players li.player').length);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
function playerMetaText(player) {
|
|
105
|
+
let parts = [player.code];
|
|
106
|
+
if (typeof player.networkDelay === 'number') {
|
|
107
|
+
parts.push('delay: ' + player.networkDelay);
|
|
108
|
+
}
|
|
109
|
+
if (player.artificialDelay > 0) {
|
|
110
|
+
parts.push('artificial: ' + player.artificialDelay + 'ms');
|
|
111
|
+
}
|
|
112
|
+
if (player.locale) {
|
|
113
|
+
parts.push('locale: ' + player.locale);
|
|
114
|
+
}
|
|
115
|
+
if (player.loginTime) {
|
|
116
|
+
parts.push('login: ' + new Date(player.loginTime * 1000).toLocaleTimeString());
|
|
117
|
+
}
|
|
118
|
+
return parts.join(' | ');
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
function createPlayerRow(player) {
|
|
122
|
+
let nickname = player.user.nickname || '';
|
|
123
|
+
|
|
124
|
+
let $head = $('<div class="player-head">');
|
|
125
|
+
if (player.user.iconUrl) {
|
|
126
|
+
$head.append($('<img class="player-icon" />').attr('src', player.user.iconUrl));
|
|
127
|
+
}
|
|
128
|
+
$head.append($('<span class="player-nickname">').text(nickname));
|
|
129
|
+
$head.append($('<span class="player-username">').text(player.user.username));
|
|
130
|
+
|
|
131
|
+
let $input = $('<input type="text" class="nickname-input" placeholder="nickname" />')
|
|
132
|
+
.val(nickname)
|
|
133
|
+
.attr('data-original', nickname);
|
|
134
|
+
$input.on('keydown', event => {
|
|
135
|
+
if (event.which == 13) {
|
|
136
|
+
saveNickname(player.code);
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
let $save = $('<button class="nickname-save">').text('Save');
|
|
140
|
+
$save.on('click', () => saveNickname(player.code));
|
|
141
|
+
let $nicknameEdit = $('<div class="player-edit">').append($input).append($save);
|
|
142
|
+
|
|
143
|
+
let artificialDelay = player.artificialDelay || 0;
|
|
144
|
+
let $delayInput = $('<input type="number" class="delay-input" min="0" step="50" title="artificial delay in milliseconds" />')
|
|
145
|
+
.val(artificialDelay)
|
|
146
|
+
.attr('data-original', artificialDelay);
|
|
147
|
+
$delayInput.on('keydown', event => {
|
|
148
|
+
if (event.which == 13) {
|
|
149
|
+
saveArtificialDelay(player.code);
|
|
150
|
+
}
|
|
151
|
+
});
|
|
152
|
+
let $delaySave = $('<button class="delay-save">').text('Delay');
|
|
153
|
+
$delaySave.on('click', () => saveArtificialDelay(player.code));
|
|
154
|
+
let $delayEdit = $('<div class="player-edit">').append($delayInput).append($delaySave);
|
|
155
|
+
|
|
156
|
+
return $('<li class="player">')
|
|
157
|
+
.attr('data-code', player.code)
|
|
158
|
+
.append($head)
|
|
159
|
+
.append($nicknameEdit)
|
|
160
|
+
.append($delayEdit)
|
|
161
|
+
.append($('<div class="player-meta">').text(playerMetaText(player)));
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
function updatePlayerRow($li, player, force) {
|
|
165
|
+
let nickname = player.user.nickname || '';
|
|
166
|
+
|
|
167
|
+
$li.find('.player-nickname').text(nickname);
|
|
168
|
+
$li.find('.player-username').text(player.user.username);
|
|
169
|
+
$li.find('.player-meta').text(playerMetaText(player));
|
|
170
|
+
|
|
171
|
+
updateInput($li.find('.nickname-input'), nickname, force);
|
|
172
|
+
|
|
173
|
+
let artificialDelay = player.artificialDelay || 0;
|
|
174
|
+
updateInput($li.find('.delay-input'), artificialDelay, force);
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/**
|
|
178
|
+
* refresh the value of an input, but keep what the user is editing
|
|
179
|
+
*/
|
|
180
|
+
function updateInput($input, value, force) {
|
|
181
|
+
let isDirty = $input.val() != $input.attr('data-original');
|
|
182
|
+
if (force || !($input.is(':focus') && isDirty)) {
|
|
183
|
+
$input.val(value).attr('data-original', value);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
function upsertPlayer(player, force) {
|
|
188
|
+
let $li = findPlayerRow(player.code);
|
|
189
|
+
if ($li.length) {
|
|
190
|
+
updatePlayerRow($li, player, force);
|
|
191
|
+
} else {
|
|
192
|
+
$('#players').append(createPlayerRow(player));
|
|
193
|
+
}
|
|
194
|
+
updatePlayersCount();
|
|
195
|
+
}
|
|
196
|
+
|
|
197
|
+
function removePlayer(code) {
|
|
198
|
+
findPlayerRow(code).remove();
|
|
199
|
+
updatePlayersCount();
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
function saveNickname(code) {
|
|
203
|
+
let $li = findPlayerRow(code);
|
|
204
|
+
if (!$li.length) {
|
|
205
|
+
return;
|
|
206
|
+
}
|
|
207
|
+
let $input = $li.find('.nickname-input');
|
|
208
|
+
let nickname = ($input.val() || '').trim();
|
|
209
|
+
if (!nickname) {
|
|
210
|
+
logError('nickname', 'Nickname cannot be empty');
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
$input.prop('disabled', true);
|
|
214
|
+
clientApi(projectCode, 'update_player_nickname', [code, nickname])
|
|
215
|
+
.then(player => {
|
|
216
|
+
$input.prop('disabled', false);
|
|
217
|
+
log('updateNickname', code + ' -> ' + nickname, 'black');
|
|
218
|
+
player && upsertPlayer(player, true);
|
|
219
|
+
})
|
|
220
|
+
.catch(() => {
|
|
221
|
+
$input.prop('disabled', false);
|
|
222
|
+
});
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
function saveArtificialDelay(code) {
|
|
226
|
+
let $li = findPlayerRow(code);
|
|
227
|
+
if (!$li.length) {
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
let $input = $li.find('.delay-input');
|
|
231
|
+
let value = Number($input.val());
|
|
232
|
+
if (!isFinite(value) || value < 0) {
|
|
233
|
+
logError('artificialDelay', 'Artificial delay must be a number greater than or equal to 0');
|
|
234
|
+
return;
|
|
235
|
+
}
|
|
236
|
+
value = Math.floor(value);
|
|
237
|
+
$input.prop('disabled', true);
|
|
238
|
+
clientApi(projectCode, 'update_player_artificial_delay', [code, value])
|
|
239
|
+
.then(player => {
|
|
240
|
+
$input.prop('disabled', false);
|
|
241
|
+
log('artificialDelay', code + ' -> ' + value + 'ms', 'black');
|
|
242
|
+
player && upsertPlayer(player, true);
|
|
243
|
+
})
|
|
244
|
+
.catch(() => {
|
|
245
|
+
$input.prop('disabled', false);
|
|
246
|
+
});
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
function refreshPlayers() {
|
|
250
|
+
return clientApi(projectCode, 'list_players', [])
|
|
251
|
+
.then(list => {
|
|
252
|
+
$('#players').empty();
|
|
253
|
+
(list || []).forEach(player => $('#players').append(createPlayerRow(player)));
|
|
254
|
+
updatePlayersCount();
|
|
255
|
+
})
|
|
256
|
+
.catch(() => { });
|
|
257
|
+
}
|
|
258
|
+
|
|
70
259
|
//
|
|
260
|
+
global.refreshPlayers = refreshPlayers;
|
|
261
|
+
|
|
71
262
|
global.clearMessages = function() {
|
|
72
263
|
$('#messages').empty();
|
|
73
264
|
}
|
|
74
265
|
|
|
75
266
|
global.test = function() {
|
|
76
|
-
clientApi(
|
|
267
|
+
clientApi(projectCode, 'test', {}).then(res => {
|
|
77
268
|
console.log(res);
|
|
78
269
|
});
|
|
79
270
|
}
|
|
@@ -2,16 +2,29 @@
|
|
|
2
2
|
<html>
|
|
3
3
|
|
|
4
4
|
<head>
|
|
5
|
+
<meta charset="utf-8" />
|
|
5
6
|
<title>CG MSG Test Client</title>
|
|
6
7
|
<link rel="stylesheet" type="text/css" href="/css/style.css" />
|
|
7
8
|
</head>
|
|
8
9
|
|
|
9
|
-
<body>
|
|
10
|
-
<div class="
|
|
11
|
-
<
|
|
12
|
-
|
|
10
|
+
<body class="monitor">
|
|
11
|
+
<div class="layout">
|
|
12
|
+
<aside class="panel players-panel">
|
|
13
|
+
<div class="panel-header">
|
|
14
|
+
<span>Players (<span id="player-count">0</span>)</span>
|
|
15
|
+
<button onclick="refreshPlayers()">Refresh</button>
|
|
16
|
+
</div>
|
|
17
|
+
<ul id="players"></ul>
|
|
18
|
+
</aside>
|
|
19
|
+
<main class="panel main-panel">
|
|
20
|
+
<div class="menu">
|
|
21
|
+
<button onclick="clearMessages()">Clear</button>
|
|
22
|
+
<!--button onclick="test()">Test</button-->
|
|
23
|
+
</div>
|
|
24
|
+
<ul id="messages"></ul>
|
|
25
|
+
</main>
|
|
13
26
|
</div>
|
|
14
|
-
<
|
|
27
|
+
<script>window.PROJECT_CODE = "{{ projectCode }}";</script>
|
|
15
28
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/2.2.0/socket.io.js" integrity="sha256-yr4fRk/GU1ehYJPAs8P4JlTgu0Hdsp4ZKrx8bDEDC3I=" crossorigin="anonymous"></script>
|
|
16
29
|
<script src="https://code.jquery.com/jquery-1.11.1.js"></script>
|
|
17
30
|
<script src="js/monitor.js"></script>
|
package/build/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gamelet-cli",
|
|
3
3
|
"description": "Download project from code.gamelet.com, edit/test in vscode and sync back to server.",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.9.0",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"url": "git+https://github.com/haskasu/gamelet-cli.git"
|
|
@@ -255,11 +255,31 @@ class GameroomBase extends events_1.EventEmitter {
|
|
|
255
255
|
}
|
|
256
256
|
broadcast(msg) {
|
|
257
257
|
MonitorManager_1.monitorManager.logOutgoing(this.client.project.code, this.monitorChannel, this.roomType + '.broadcast', [this.code, msg.type, msg.params]);
|
|
258
|
-
|
|
258
|
+
this.sendToPlayers(msg);
|
|
259
259
|
}
|
|
260
260
|
broadcastByPlayer(msg, sender) {
|
|
261
261
|
MonitorManager_1.monitorManager.logIncoming(this.client.project.code, this.monitorChannel, this.roomType + '.broadcast', [this.code, msg.type, msg.params], sender);
|
|
262
|
-
|
|
262
|
+
this.sendToPlayers(msg);
|
|
263
|
+
}
|
|
264
|
+
/**
|
|
265
|
+
* Deliver a message to every player of this gameroom / gamezone.
|
|
266
|
+
*
|
|
267
|
+
* A single emit on the socket channel is enough in the normal case. When some player has an
|
|
268
|
+
* artificial delay, the message has to be sent to each player separately so that every player
|
|
269
|
+
* gets its own delay applied.
|
|
270
|
+
*/
|
|
271
|
+
sendToPlayers(msg) {
|
|
272
|
+
if (this.players.some(player => player.artificialDelay > 0)) {
|
|
273
|
+
this.players.forEach(player => {
|
|
274
|
+
// the broadcast itself is already logged by broadcast() / broadcastByPlayer()
|
|
275
|
+
player.send(msg, false).catch(() => {
|
|
276
|
+
// the player is disconnected, nothing to do
|
|
277
|
+
});
|
|
278
|
+
});
|
|
279
|
+
}
|
|
280
|
+
else {
|
|
281
|
+
msg.send(this.server.to(this.socketChannel));
|
|
282
|
+
}
|
|
263
283
|
}
|
|
264
284
|
}
|
|
265
285
|
exports.GameroomBase = GameroomBase;
|
|
@@ -273,4 +293,4 @@ GameroomBase.EVENT = {
|
|
|
273
293
|
PLAYER_STATES_CHANGED: 'playerStatesChanged',
|
|
274
294
|
PLAYER_SYNCED_CHANGED: 'playerSyncedChanged',
|
|
275
295
|
};
|
|
276
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"GameroomBase.js","sourceRoot":"","sources":["../../../../src/server/entities/GameroomBase.ts"],"names":[],"mappings":"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"}
|
|
296
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"GameroomBase.js","sourceRoot":"","sources":["../../../../src/server/entities/GameroomBase.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,8 +21,9 @@ class Monitor extends events_1.EventEmitter {
|
|
|
21
21
|
* this is for monitor client accessing msgserver
|
|
22
22
|
*/
|
|
23
23
|
this.socket.on(Message_1.MessageType.CLIENT_MONITOR_API, (projectCode, api, params, cb) => {
|
|
24
|
-
ClientManager_1.clientManager.getClientProject(projectCode, false)
|
|
24
|
+
ClientManager_1.clientManager.getClientProject(projectCode || this.project.code, false)
|
|
25
25
|
.then(project => {
|
|
26
|
+
project = project || this.project;
|
|
26
27
|
let func = this['_clientapi_' + api];
|
|
27
28
|
try {
|
|
28
29
|
let result = func.apply(this, [project].concat(params));
|
|
@@ -62,6 +63,18 @@ class Monitor extends events_1.EventEmitter {
|
|
|
62
63
|
let player = PlayerManager_1.playerManager.getPlayerByCode(playerCode);
|
|
63
64
|
player && player.disconnect();
|
|
64
65
|
}
|
|
66
|
+
_clientapi_update_player_nickname(_project, playerCode, nickname) {
|
|
67
|
+
let player = PlayerManager_1.playerManager.getPlayerByCode(playerCode);
|
|
68
|
+
PlayerManager_1.playerManager.designContract(player, 'The player has left the game.');
|
|
69
|
+
return PlayerManager_1.playerManager.updateNickname(player, nickname)
|
|
70
|
+
.then(() => player.toMonitorPlayer());
|
|
71
|
+
}
|
|
72
|
+
_clientapi_update_player_artificial_delay(_project, playerCode, artificialDelay) {
|
|
73
|
+
let player = PlayerManager_1.playerManager.getPlayerByCode(playerCode);
|
|
74
|
+
PlayerManager_1.playerManager.designContract(player, 'The player has left the game.');
|
|
75
|
+
return PlayerManager_1.playerManager.updateArtificialDelay(player, artificialDelay)
|
|
76
|
+
.then(() => player.toMonitorPlayer());
|
|
77
|
+
}
|
|
65
78
|
_clientapi_data_to_player(_project, playerCode, data) {
|
|
66
79
|
let target = PlayerManager_1.playerManager.getPlayerByCode(playerCode);
|
|
67
80
|
PlayerManager_1.playerManager.designContract(target, 'The player has left the game.');
|
|
@@ -92,4 +105,4 @@ exports.Monitor = Monitor;
|
|
|
92
105
|
Monitor.EVENT = {
|
|
93
106
|
DISCONNECTED: 'disconnected',
|
|
94
107
|
};
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9uaXRvci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2ZXIvZW50aXRpZXMvTW9uaXRvci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwrREFBNEQ7QUFDNUQsbURBQTZEO0FBRTdELG1DQUFzQztBQUN0QyxvREFBaUQ7QUFFakQsNkRBQTBEO0FBQzFELGlFQUE4RDtBQUM5RCxtREFBZ0Q7QUFFaEQsTUFBYSxPQUFRLFNBQVEscUJBQVk7SUFNckMsWUFBbUIsSUFBWSxFQUFTLE1BQXVCLEVBQVMsT0FBc0IsRUFBUyxJQUFhO1FBQ2hILEtBQUssRUFBRSxDQUFDO1FBRE8sU0FBSSxHQUFKLElBQUksQ0FBUTtRQUFTLFdBQU0sR0FBTixNQUFNLENBQWlCO1FBQVMsWUFBTyxHQUFQLE9BQU8sQ0FBZTtRQUFTLFNBQUksR0FBSixJQUFJLENBQVM7SUFFcEgsQ0FBQztJQUVNLFVBQVU7UUFDYjs7V0FFRztRQUNILElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLHFCQUFXLENBQUMsa0JBQWtCLEVBQUUsQ0FBQyxXQUFtQixFQUFFLEdBQVcsRUFBRSxNQUFhLEVBQUUsRUFBOEIsRUFBRSxFQUFFO1lBQy9ILDZCQUFhLENBQUMsZ0JBQWdCLENBQUMsV0FBVyxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQztpQkFDbEUsSUFBSSxDQUFDLE9BQU8sQ0FBQyxFQUFFO2dCQUNaLE9BQU8sR0FBRyxPQUFPLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQztnQkFDbEMsSUFBSSxJQUFJLEdBQWEsSUFBSSxDQUFDLGFBQWEsR0FBRyxHQUFHLENBQUMsQ0FBQztnQkFDL0MsSUFBSSxDQUFDO29CQUNELElBQUksTUFBTSxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7b0JBQ3hE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
|
|
@@ -23,6 +23,10 @@ class Player extends events_1.EventEmitter {
|
|
|
23
23
|
this._lastMsgTime = 0;
|
|
24
24
|
this._cheats = 0;
|
|
25
25
|
this._locale = 'en';
|
|
26
|
+
// artificial message delay in milliseconds, used to simulate a laggy client
|
|
27
|
+
this._artificialDelay = 0;
|
|
28
|
+
// scheduled tasks which are waiting for the artificial delay
|
|
29
|
+
this._pendingTasks = new Set();
|
|
26
30
|
this._lastMsgTime = Date.now();
|
|
27
31
|
this.loginTime = Math.floor(this._lastMsgTime / 1000);
|
|
28
32
|
this.setupServiceCall(gameroomService_1.gameroomService);
|
|
@@ -34,6 +38,7 @@ class Player extends events_1.EventEmitter {
|
|
|
34
38
|
gameroomManager.enterGamezone(this, gameroomManager.getClientZone(this.client).code);
|
|
35
39
|
}
|
|
36
40
|
onDisconnected() {
|
|
41
|
+
this.cancelPendingTasks();
|
|
37
42
|
if (this.gameroom) {
|
|
38
43
|
this.gameroom.removePlayer(this);
|
|
39
44
|
}
|
|
@@ -41,6 +46,37 @@ class Player extends events_1.EventEmitter {
|
|
|
41
46
|
this.emit(Player.EVENT.DISCONNECTED, this);
|
|
42
47
|
MonitorManager_1.monitorManager.eventPlayerDisconnected(this);
|
|
43
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* Drop the incoming messages and the outgoing messages which are still waiting for
|
|
51
|
+
* the artificial delay, the player is gone so they are no longer meaningful.
|
|
52
|
+
*/
|
|
53
|
+
cancelPendingTasks() {
|
|
54
|
+
let tasks = Array.from(this._pendingTasks);
|
|
55
|
+
this._pendingTasks.clear();
|
|
56
|
+
tasks.forEach(cancel => cancel());
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* Run the task right away, or after the artificial delay if it is greater than 0.
|
|
60
|
+
*
|
|
61
|
+
* @param onCancel called when the task is dropped before it runs
|
|
62
|
+
*/
|
|
63
|
+
schedule(delay, task, onCancel) {
|
|
64
|
+
if (delay > 0) {
|
|
65
|
+
let cancel = () => {
|
|
66
|
+
this._pendingTasks.delete(cancel);
|
|
67
|
+
clearTimeout(timer);
|
|
68
|
+
onCancel && onCancel();
|
|
69
|
+
};
|
|
70
|
+
let timer = setTimeout(() => {
|
|
71
|
+
this._pendingTasks.delete(cancel);
|
|
72
|
+
task();
|
|
73
|
+
}, delay);
|
|
74
|
+
this._pendingTasks.add(cancel);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
task();
|
|
78
|
+
}
|
|
79
|
+
}
|
|
44
80
|
addCheat() {
|
|
45
81
|
this._cheats++;
|
|
46
82
|
}
|
|
@@ -53,6 +89,15 @@ class Player extends events_1.EventEmitter {
|
|
|
53
89
|
setLocale(value) {
|
|
54
90
|
this._locale = value;
|
|
55
91
|
}
|
|
92
|
+
setNickname(value) {
|
|
93
|
+
this.user.nickname = value;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* @param value artificial delay in milliseconds, 0 to disable it
|
|
97
|
+
*/
|
|
98
|
+
setArtificialDelay(value) {
|
|
99
|
+
this._artificialDelay = Math.max(0, Math.floor(value) || 0);
|
|
100
|
+
}
|
|
56
101
|
get networkDelay() {
|
|
57
102
|
return this._networkDelay;
|
|
58
103
|
}
|
|
@@ -62,15 +107,24 @@ class Player extends events_1.EventEmitter {
|
|
|
62
107
|
get locale() {
|
|
63
108
|
return this._locale;
|
|
64
109
|
}
|
|
110
|
+
/**
|
|
111
|
+
* artificial delay in milliseconds, applied to both incoming and outgoing messages
|
|
112
|
+
*/
|
|
113
|
+
get artificialDelay() {
|
|
114
|
+
return this._artificialDelay;
|
|
115
|
+
}
|
|
65
116
|
setupServiceCall(service) {
|
|
66
117
|
this.socket.on(service.name, (method, params, cb) => {
|
|
118
|
+
// the message arrived at this moment, the artificial delay only postpones the processing
|
|
67
119
|
this._lastMsgTime = Date.now();
|
|
68
|
-
|
|
69
|
-
.
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
120
|
+
this.schedule(this._artificialDelay, () => {
|
|
121
|
+
service._execute(this, method, params)
|
|
122
|
+
.then(result => {
|
|
123
|
+
cb({ data: result });
|
|
124
|
+
})
|
|
125
|
+
.catch(err => {
|
|
126
|
+
cb({ error: StringUtil_1.StringUtil.errorToString(err) });
|
|
127
|
+
});
|
|
74
128
|
});
|
|
75
129
|
});
|
|
76
130
|
}
|
|
@@ -101,13 +155,26 @@ class Player extends events_1.EventEmitter {
|
|
|
101
155
|
toMonitorPlayer() {
|
|
102
156
|
return Object.assign(this.toVo(), {
|
|
103
157
|
msgVer: this.client.msgVersion,
|
|
104
|
-
lastMsgTime: this.lastMsgTime
|
|
158
|
+
lastMsgTime: this.lastMsgTime,
|
|
159
|
+
artificialDelay: this._artificialDelay,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
/**
|
|
163
|
+
* @param log set to false when the caller has already written its own monitor log
|
|
164
|
+
*/
|
|
165
|
+
send(msg, log = true) {
|
|
166
|
+
return new Promise((resolve, reject) => {
|
|
167
|
+
this.schedule(this._artificialDelay, () => {
|
|
168
|
+
this.emitMessage(msg, log).then(resolve).catch(reject);
|
|
169
|
+
}, () => {
|
|
170
|
+
reject('not connected');
|
|
171
|
+
});
|
|
105
172
|
});
|
|
106
173
|
}
|
|
107
|
-
|
|
174
|
+
emitMessage(msg, log) {
|
|
108
175
|
if (this.socket.connected) {
|
|
109
176
|
return new Promise(resolve => {
|
|
110
|
-
MonitorManager_1.monitorManager.logOutgoing(this.client.project.code, 'player', 'player.send', [this.code, msg.type, msg.params]);
|
|
177
|
+
log && MonitorManager_1.monitorManager.logOutgoing(this.client.project.code, 'player', 'player.send', [this.code, msg.type, msg.params]);
|
|
111
178
|
msg.send(this.socket, response => {
|
|
112
179
|
resolve(response);
|
|
113
180
|
});
|
|
@@ -137,4 +204,4 @@ exports.Player = Player;
|
|
|
137
204
|
Player.EVENT = {
|
|
138
205
|
DISCONNECTED: 'disconnected',
|
|
139
206
|
};
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
207
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGxheWVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3NlcnZlci9lbnRpdGllcy9QbGF5ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsb0RBQWlEO0FBQ2pELGlFQUE4RDtBQUc5RCxvREFBaUQ7QUFDakQsbUNBQXNDO0FBQ3RDLDZEQUEwRDtBQUMxRCwrREFBNEQ7QUFDNUQsNkRBQTBEO0FBRzFELE1BQWEsTUFBTyxTQUFRLHFCQUFZO0lBMEJwQyxZQUFtQixJQUFZLEVBQVMsTUFBdUIsRUFBUyxNQUFjLEVBQVMsSUFBYSxFQUFVLGFBQXFCO1FBQ3ZJLEtBQUssRUFBRSxDQUFDO1FBRE8sU0FBSSxHQUFKLElBQUksQ0FBUTtRQUFTLFdBQU0sR0FBTixNQUFNLENBQWlCO1FBQVMsV0FBTSxHQUFOLE1BQU0sQ0FBUTtRQUFTLFNBQUksR0FBSixJQUFJLENBQVM7UUFBVSxrQkFBYSxHQUFiLGFBQWEsQ0FBUTtRQWxCbkksY0FBUyxHQUFlLEVBQUUsQ0FBQztRQUVuQyx1QkFBdUI7UUFDZixjQUFTLEdBQVcsQ0FBQyxDQUFDO1FBRTlCLDRCQUE0QjtRQUNwQixpQkFBWSxHQUFXLENBQUMsQ0FBQztRQUV6QixZQUFPLEdBQVcsQ0FBQyxDQUFDO1FBRXBCLFlBQU8sR0FBVyxJQUFJLENBQUM7UUFFL0IsNEVBQTRFO1FBQ3BFLHFCQUFnQixHQUFXLENBQUMsQ0FBQztRQUVyQyw2REFBNkQ7UUFDckQsa0JBQWEsR0FBb0IsSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUsvQyxJQUFJLENBQUMsWUFBWSxHQUFHLElBQUksQ0FBQyxHQUFHLEVBQUUsQ0FBQztRQUMvQixJQUFJLENBQUMsU0FBUyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFlBQVksR0FBRyxJQUFJLENBQUMsQ0FBQztRQUV0RCxJQUFJLENBQUMsZ0JBQWdCLENBQUMsaUNBQWUsQ0FBQyxDQUFDO1FBQ3ZDLElBQUksQ0FBQyxnQkFB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
|
|
@@ -5,6 +5,7 @@ const ManagerBase_1 = require("./ManagerBase");
|
|
|
5
5
|
const Player_1 = require("../entities/Player");
|
|
6
6
|
const Message_1 = require("../messages/Message");
|
|
7
7
|
const ArrayUtil_1 = require("../utils/ArrayUtil");
|
|
8
|
+
const MonitorManager_1 = require("./MonitorManager");
|
|
8
9
|
class PlayerManager extends ManagerBase_1.ManagerBase {
|
|
9
10
|
constructor() {
|
|
10
11
|
super('PlayerManager');
|
|
@@ -63,11 +64,35 @@ class PlayerManager extends ManagerBase_1.ManagerBase {
|
|
|
63
64
|
player.setLocale(locale);
|
|
64
65
|
return Promise.resolve(locale);
|
|
65
66
|
}
|
|
67
|
+
updateNickname(player, nickname) {
|
|
68
|
+
nickname = String(nickname == null ? '' : nickname).trim();
|
|
69
|
+
this.designContract(nickname.length > 0, 'Nickname cannot be empty.');
|
|
70
|
+
player.setNickname(nickname);
|
|
71
|
+
MonitorManager_1.monitorManager.log(player.client.project.code, 'player', 'update nickname', {
|
|
72
|
+
code: player.code,
|
|
73
|
+
nickname: nickname,
|
|
74
|
+
});
|
|
75
|
+
return Promise.resolve(nickname);
|
|
76
|
+
}
|
|
66
77
|
updateNetworkDelay(player, networkDelay) {
|
|
67
78
|
networkDelay = Math.max(10, networkDelay);
|
|
68
79
|
player.setNetworkDelay(networkDelay);
|
|
69
80
|
return Promise.resolve(networkDelay);
|
|
70
81
|
}
|
|
82
|
+
/**
|
|
83
|
+
* @param artificialDelay artificial delay in milliseconds, 0 to disable it
|
|
84
|
+
*/
|
|
85
|
+
updateArtificialDelay(player, artificialDelay) {
|
|
86
|
+
let value = Number(artificialDelay);
|
|
87
|
+
this.designContract(Number.isFinite(value) && value >= 0, 'Artificial delay must be a number greater than or equal to 0.');
|
|
88
|
+
value = Math.floor(value);
|
|
89
|
+
player.setArtificialDelay(value);
|
|
90
|
+
MonitorManager_1.monitorManager.log(player.client.project.code, 'player', 'update artificial delay', {
|
|
91
|
+
code: player.code,
|
|
92
|
+
artificialDelay: value,
|
|
93
|
+
});
|
|
94
|
+
return Promise.resolve(value);
|
|
95
|
+
}
|
|
71
96
|
searchPlayers(player, term, length) {
|
|
72
97
|
if (length <= 0 || !term || term.length < 2) {
|
|
73
98
|
return Promise.resolve([]);
|
|
@@ -105,4 +130,4 @@ class PlayerManager extends ManagerBase_1.ManagerBase {
|
|
|
105
130
|
}
|
|
106
131
|
}
|
|
107
132
|
exports.playerManager = new PlayerManager();
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
133
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGxheWVyTWFuYWdlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2ZXIvbWFuYWdlcnMvUGxheWVyTWFuYWdlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFDQSwrQ0FBNEM7QUFDNUMsK0NBQTRDO0FBQzVDLGlEQUE4QztBQUM5QyxrREFBK0M7QUFDL0MscURBQWtEO0FBRWxELE1BQU0sYUFBYyxTQUFRLHlCQUFXO0lBS25DO1FBQ0ksS0FBSyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1FBSm5CLFlBQU8sR0FBOEIsRUFBRSxDQUFDO1FBQ3hDLGtCQUFhLEdBQThCLEVBQUUsQ0FBQztJQUl0RCxDQUFDO0lBRUQsVUFBVTtJQUNWLENBQUM7SUFFRCxXQUFXO1FBQ1AsT0FBTyxxQkFBUyxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUN0RCxDQUFDO0lBRUQsWUFBWSxDQUFDLE1BQXVCLEVBQUUsTUFBYyxFQUFFLElBQWEsRUFBRSxZQUFvQjtRQUNyRixJQUFJLFVBQVUsR0FBRyxJQUFJLENBQUMsa0JBQWtCLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQ3ZELElBQUksQ0FBQyxjQUFjLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxFQUFFLDhDQUE4QyxDQUFDLENBQUM7UUFDL0YsSUFBSSxNQUFNLEdBQUcsSUFBSSxlQUFNLENBQUMsVUFBVSxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFlBQVksQ0FBQyxDQUFDO1FBQ3hFLElBQUksQ0FBQyx5QkFBeUIsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUV2QyxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxNQUFNLENBQUM7UUFDbkMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUV6QixNQUFNLENBQUMsRUFBRSxDQUFD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
|
|
@@ -179,6 +179,9 @@ const loginPortal = {
|
|
|
179
179
|
},
|
|
180
180
|
newgrounds: async (clientCode, portal, token, options) => {
|
|
181
181
|
var _a;
|
|
182
|
+
if (!options.gateway.match(/^https:\/\/\w+\.newgrounds\.(io|com)\//)) {
|
|
183
|
+
throw new Error('Invalid gateway url');
|
|
184
|
+
}
|
|
182
185
|
const data = await (0, net_1.postUrlData)(options.gateway, {
|
|
183
186
|
app_id: options.appID,
|
|
184
187
|
session_id: token,
|
|
@@ -198,6 +201,41 @@ const loginPortal = {
|
|
|
198
201
|
ip: [192, 168, IntUtil_1.IntUtil.randInt(100, 200), IntUtil_1.IntUtil.randInt(100, 200)].join('.'),
|
|
199
202
|
};
|
|
200
203
|
},
|
|
204
|
+
gamejolt: async (clientCode, portal, token, options) => {
|
|
205
|
+
if (!options.gateway.match(/^https:\/\/\w+\.gamejolt\.(com|net)\//)) {
|
|
206
|
+
throw new Error('Invalid gateway url');
|
|
207
|
+
}
|
|
208
|
+
const requestData = async (uri, params) => {
|
|
209
|
+
let url = `${options.gateway}/${uri}/?game_id=${options.appID}&format=json`;
|
|
210
|
+
for (let key in params) {
|
|
211
|
+
url += `&${key}=${params[key]}`;
|
|
212
|
+
}
|
|
213
|
+
const signature = crypto_1.default.hash('sha1', url + options.appKey);
|
|
214
|
+
url += `&signature=${signature}`;
|
|
215
|
+
const data = await (0, net_1.getUrlData)(url);
|
|
216
|
+
const response = data && data.response;
|
|
217
|
+
if (response && response.success == 'true') {
|
|
218
|
+
return response;
|
|
219
|
+
}
|
|
220
|
+
if (response && response.message) {
|
|
221
|
+
throw new Error(response.message);
|
|
222
|
+
}
|
|
223
|
+
else {
|
|
224
|
+
throw new Error('Failed to validate Game Jolt User');
|
|
225
|
+
}
|
|
226
|
+
};
|
|
227
|
+
await requestData('users/auth', { username: options.username, user_token: token });
|
|
228
|
+
const data = await requestData('users', { username: options.username, user_id: options.uid });
|
|
229
|
+
const user = data && data.users[0];
|
|
230
|
+
const username = user.id + '.local@' + portal;
|
|
231
|
+
return {
|
|
232
|
+
username: username,
|
|
233
|
+
nickname: user.developer_name || user.username,
|
|
234
|
+
iconUrl: user.avatar_url,
|
|
235
|
+
token: `${username}|${clientCode}|Dev` + StringUtil_1.StringUtil.generateRandomString(3),
|
|
236
|
+
ip: [192, 168, IntUtil_1.IntUtil.randInt(100, 200), IntUtil_1.IntUtil.randInt(100, 200)].join('.'),
|
|
237
|
+
};
|
|
238
|
+
},
|
|
201
239
|
};
|
|
202
240
|
const isPortalUsername = (username) => {
|
|
203
241
|
const search = username && username.match(/.+@(\w+)$/);
|
|
@@ -205,4 +243,4 @@ const isPortalUsername = (username) => {
|
|
|
205
243
|
};
|
|
206
244
|
exports.userManager = new UserManager();
|
|
207
245
|
// userManager.loginPortal('test', 'yandex', '');
|
|
208
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UserManager.js","sourceRoot":"","sources":["../../../../src/server/managers/UserManager.ts"],"names":[],"mappings":"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"}
|
|
246
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"UserManager.js","sourceRoot":"","sources":["../../../../src/server/managers/UserManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,14 +26,16 @@ app.set('twig options', {
|
|
|
26
26
|
app.get('/', (_req, res) => {
|
|
27
27
|
res.render('index.twig');
|
|
28
28
|
});
|
|
29
|
-
app.get('/monitor', (_req, res) => {
|
|
30
|
-
res.render('monitor.twig');
|
|
31
|
-
});
|
|
32
29
|
function getServerTimeCode(add = 0) {
|
|
33
30
|
return Math.floor((Date.now() + add) / 1000).toString(36);
|
|
34
31
|
}
|
|
35
32
|
function createServer(clientCode, port) {
|
|
36
33
|
console.log('[' + clientCode + '] Server created');
|
|
34
|
+
app.get('/monitor', (_req, res) => {
|
|
35
|
+
res.render('monitor.twig', {
|
|
36
|
+
projectCode: clientCode,
|
|
37
|
+
});
|
|
38
|
+
});
|
|
37
39
|
app.get('/client', (0, cors_1.default)(), (_req, res) => {
|
|
38
40
|
res.json({
|
|
39
41
|
client: {
|
|
@@ -112,4 +114,4 @@ function initServer(clientCode, port) {
|
|
|
112
114
|
};
|
|
113
115
|
});
|
|
114
116
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
117
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZlci9zZXJ2ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFrSEEsZ0NBYUM7QUEvSEQsc0RBQThCO0FBQzlCLGdEQUF3QjtBQUN4QiwwREFBaUM7QUFDakMsZ0RBQXdCO0FBQ3hCLHdEQUFxRDtBQUNyRCxrREFBK0M7QUFDL0MsOERBQTJEO0FBUzNELEVBQUU7QUFDRixJQUFJLEdBQUcsR0FBRyxJQUFBLGlCQUFPLEdBQUUsQ0FBQztBQUNwQixJQUFJLFdBQVcsR0FBRyxTQUFTLEdBQUcsV0FBVyxDQUFDO0FBQzFDLElBQUksR0FBRyxHQUFHLFdBQVcsR0FBRyxnQkFBZ0IsQ0FBQztBQUV6QyxHQUFHLENBQUMsR0FBRyxDQUFDLGlCQUFPLENBQUMsTUFBTSxDQUFDLEdBQUcsR0FBRyxTQUFTLENBQUMsQ0FBQyxDQUFDO0FBQ3pDLEdBQUcsQ0FBQyxHQUFHLENBQUMsaUJBQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0FBQ3hCLEdBQUcsQ0FBQyxHQUFHLENBQUMsaUJBQU8sQ0FBQyxVQUFVLENBQUMsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQyxDQUFDO0FBQ2hELEdBQUcsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcsR0FBRyxRQUFRLENBQUMsQ0FBQztBQUNqQyxHQUFHLENBQUMsR0FBRyxDQUFDLGFBQWEsRUFBRSxNQUFNLENBQUMsQ0FBQztBQUMvQixHQUFHLENBQUMsR0FBRyxDQUFDLGNBQWMsRUFBRTtJQUNwQixnQkFBZ0IsRUFBRSxLQUFLO0NBQzFCLENBQUMsQ0FBQztBQUVILEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO0lBQ3ZCLEdBQUcsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDN0IsQ0FBQyxDQUFDLENBQUM7QUFFSCxTQUFTLGlCQUFpQixDQUFDLE1BQWMsQ0FBQztJQUN0QyxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQzlELENBQUM7QUFHRCxTQUFTLFlBQVksQ0FBQyxVQUFrQixFQUFFLElBQVk7SUFDbEQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEdBQUcsVUFBVSxHQUFHLGtCQUFrQixDQUFDLENBQUM7SUFFbkQsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7UUFDOUIsR0FBRyxDQUFDLE1BQU0sQ0FBQyxjQUFjLEVBQUU7WUFDdkIsV0FBVyxFQUFFLFVBQVU7U0FDMUIsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7SUFFSCxHQUFHLENBQUMsR0FBRyxDQUFDLFNBQVMsRUFBRSxJQUFBLGNBQUksR0FBRSxFQUFFLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ3JDLEdBQUcsQ0FBQyxJQUFJLENBQUM7WUFDTCxNQUFNLEVBQUU7Z0JBQ0osSUFBSSxFQUFFLFVBQVU7YUFDbkI7WUFDRCxJQUFJLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDO1NBQ3RDLENBQUMsQ0FBQztJQUNQLENBQUMsQ0FBQyxDQUFDO0lBQ0gsR0FBRyxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsSUFBQSxjQUFJLEdBQUUsRUFBRSxDQUFDLElBQUksRUFBRSxHQUFHLEVBQUUsRUFBRTtRQUNwQyxJQUFJLElBQUksR0FBRyx5QkFBVyxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDaEQsR0FBRyxDQUFDLElBQUksQ0FBQztZQUNMLElBQUksRUFBRSxJQUFJO1NBQ2IsQ0FBQyxDQUFDO0lBQ1AsQ0FBQyxDQUFDLENBQUM7SUFDSCxHQUFHLENBQUMsR0FBRyxDQUFDLFdBQVcsRUFBRSxJQUFBLGNBQUksR0FBRSxFQUFFLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQ3ZDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDekQsQ0FBQyxDQUFDLENBQUM7SUFDSCxHQUFHLENBQUMsSUFBSSxDQUFDLHNCQUFzQixFQUFFLElBQUEsY0FBSSxHQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7UUFDbkQsSUFBSSxJQUFJLEdBQUcseUJBQVcsQ0FBQyxLQUFLLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxDQUFDO1FBQy9DLEdBQUcsQ0FBQyxJQUFJLENBQUM7WUFDTCxJQUFJLEVBQUUsSUFBSTtZQUNWLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLEtBQUssRUFBRSxJQUFJLENBQUMsS0FBSztTQUNwQixDQUFDLENBQUM7SUFDUCxDQUFDLENBQUMsQ0FBQztJQUNILEdBQUcsQ0FBQyxJQUFJLENBQUMsNEJBQTRCLEVBQUUsSUFBQSxjQUFJLEdBQUUsRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRSxFQUFFO1FBQy9ELE1BQU0sSUFBSSxHQUFHLE1BQU0seUJBQVcsQ0FBQyxXQUFXLENBQUMsVUFBVSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDOUcsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuQixDQUFDLENBQUMsQ0FBQztJQUNILEdBQUcsQ0FBQyxJQUFJLENBQUMsY0FBYyxFQUFFLElBQUEsY0FBSSxHQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7UUFDM0MsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7UUFDaEMsbUJBQVEsQ0FBQyxjQUFjLENBQUMsT0FBTyxDQUFDO2FBQzNCLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRTtZQUNYLEdBQUcsQ0FBQyxJQUFJLENBQUM7Z0JBQ0wsTUFBTSxFQUFFLE1BQU07Z0JBQ2QsSUFBSSxFQUFFLGlCQUFpQixFQUFFO2FBQzVCLENBQUMsQ0FBQztRQUNQLENBQUMsQ0FBQzthQUNELEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNULEdBQUcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDaEIsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNkLCtCQUFjLENBQUMsS0FBSyxDQUFDLFVBQVUsRUFBRSxhQUFhLEVBQUUsR0FBRyxDQUFDLENBQUM7UUFDekQsQ0FBQyxDQUFDLENBQUE7SUFFVixDQUFDLENBQUMsQ0FBQztJQUNILEdBQUcsQ0FBQyxJQUFJLENBQUMsZUFBZSxFQUFFLElBQUEsY0FBSSxHQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLEVBQUU7UUFDNUMsSUFBSSxRQUFRLEdBQVUsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUM7UUFDekMsT0FBTyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxtQkFBUSxDQUFDLGNBQWMsQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO2FBQ3hFLElBQUksQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUNaLEdBQUcsQ0FBQyxJQUFJLENBQUM7Z0JBQ0wsT0FBTyxFQUFFLE9BQU87Z0JBQ2hCLElBQUksRUFBRSxpQkFBaUIsRUFBRTthQUM1QixDQUFDLENBQUM7UUFDUCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUU7WUFDVCxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBQ2hCLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDZCwrQkFBYyxDQUFDLEtBQUssQ0FBQyxVQUFVLEVBQUUsYUFBYSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBQ3pELENBQUMsQ0FBQyxDQUFBO0lBQ1YsQ0FBQyxDQUFDLENBQUM7SUFFSCxPQUFPLElBQUksT0FBTyxDQUFjLE9BQU8sQ0FBQyxFQUFFO1FBQ3RDLElBQUksTUFBTSxHQUFHLGNBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDcEMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7SUFDL0MsQ0FBQyxDQUFDLENBQUM7QUFDUCxDQUFDO0FBRUQsU0FBZ0IsVUFBVSxDQUFDLFVBQWtCLEVBQUUsSUFBWTtJQUN2RCxPQUFPLFlBQVksQ0FBQyxVQUFVLEVBQUUsSUFBSSxDQUFDO1NBQ2hDLElBQUksQ0FBQyxNQUFNLENBQUMsRUFBRTtRQUNYLE1BQU0sRUFBRSxHQUFHLElBQUEsbUJBQVEsRUFBQyxNQUFNLENBQUMsQ0FBQztRQUM1QixNQUFNLE1BQU0sR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzlCLE9BQU87WUFDSCxHQUFHLEVBQUUsR0FBRztZQUNSLE1BQU0sRUFBRSxNQUFNO1lBQ2QsRUFBRSxFQUFFLEVBQUU7WUFDTixNQUFNLEVBQUUsTUFBTTtZQUNkLElBQUksRUFBRSxJQUFJO1NBQ2IsQ0FBQztJQUNOLENBQUMsQ0FBQyxDQUFBO0FBQ1YsQ0FBQyJ9
|
|
@@ -17,6 +17,7 @@ function startServer(clientCode, folder, port) {
|
|
|
17
17
|
return (0, server_1.initServer)(clientCode, port)
|
|
18
18
|
.then(serverPack => {
|
|
19
19
|
console.log(`listening on localhost: ${serverPack.port}`);
|
|
20
|
+
console.log(`open monitor at http://localhost:${serverPack.port}/monitor`);
|
|
20
21
|
ClientManager_1.clientManager.initialize();
|
|
21
22
|
MonitorManager_1.monitorManager.initialize(clientCode, serverPack.io);
|
|
22
23
|
SocketManager_1.socketManager.initialize(serverPack.gameIO);
|
|
@@ -29,4 +30,4 @@ function startServer(clientCode, folder, port) {
|
|
|
29
30
|
return (0, file_1.wait)(Constant_1.Constant.ONE_DAY);
|
|
30
31
|
});
|
|
31
32
|
}
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3RhcnRTZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL3N0YXJ0U2VydmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBY0Esa0NBbUJDO0FBakNELDhEQUEyRDtBQUMzRCw0REFBeUQ7QUFDekQsZ0VBQTZEO0FBQzdELDREQUF5RDtBQUV6RCw0REFBeUQ7QUFDekQsNERBQXlEO0FBQ3pELDREQUF5RDtBQUN6RCxxQ0FBc0M7QUFDdEMsd0NBQXFDO0FBQ3JDLHlDQUFzQztBQUN0QyxrREFBK0M7QUFDL0Msc0RBQW1EO0FBRW5ELFNBQWdCLFdBQVcsQ0FBQyxVQUFrQixFQUFFLE1BQWMsRUFBRSxJQUFZO0lBQ3hFLE9BQU8sSUFBQSxtQkFBVSxFQUFDLFVBQVUsRUFBRSxJQUFJLENBQUM7U0FDOUIsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFO1FBQ2YsT0FBTyxDQUFDLEdBQUcsQ0FBQywyQkFBMkIsVUFBVSxDQUFDLElBQUksRUFBRSxDQUFDLENBQUM7UUFDMUQsT0FBTyxDQUFDLEdBQUcsQ0FBQyxvQ0FBb0MsVUFBVSxDQUFDLElBQUksVUFBVSxDQUFDLENBQUM7UUFFM0UsNkJBQWEsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUMzQiwrQkFBYyxDQUFDLFVBQVUsQ0FBQyxVQUFVLEVBQUUsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ3JELDZCQUFhLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1Qyw2QkFBYSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQzNCLHVCQUFVLENBQUMsVUFBVSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUVyQyw2QkFBYSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQzVCLGlDQUFlLENBQUMsV0FBVyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUMvQyw2QkFBYSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQzVCLG1CQUFRLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBRTdCLE9BQU8sSUFBQSxXQUFJLEVBQUMsbUJBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNsQyxDQUFDLENBQUMsQ0FBQztBQUNYLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gamelet-cli",
|
|
3
3
|
"description": "Download project from code.gamelet.com, edit/test in vscode and sync back to server.",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.9.0",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"url": "git+https://github.com/haskasu/gamelet-cli.git"
|