gamelet-cli 0.3.21 → 0.3.22
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/package.json.twig +4 -4
- package/build/package.json +1 -1
- package/package.json +1 -1
- package/build/src/gamelet/download.js +0 -730
- package/build/src/gamelet/merges.js +0 -106
- package/build/src/gamelet/prepare.js +0 -275
- package/build/src/gamelet/upload.js +0 -279
- package/build/src/index.js +0 -86
- package/build/src/server/Constant.js +0 -10
- package/build/src/server/entities/Client.js +0 -57
- package/build/src/server/entities/ClientOwner.js +0 -67
- package/build/src/server/entities/ClientProject.js +0 -68
- package/build/src/server/entities/Gameroom.js +0 -88
- package/build/src/server/entities/GameroomBase.js +0 -244
- package/build/src/server/entities/Gamezone.js +0 -73
- package/build/src/server/entities/ListFilter.js +0 -193
- package/build/src/server/entities/Monitor.js +0 -81
- package/build/src/server/entities/Player.js +0 -132
- package/build/src/server/managers/ClientManager.js +0 -61
- package/build/src/server/managers/Database.js +0 -591
- package/build/src/server/managers/GameroomManager.js +0 -392
- package/build/src/server/managers/ManagerBase.js +0 -17
- package/build/src/server/managers/MonitorManager.js +0 -73
- package/build/src/server/managers/PlayerManager.js +0 -104
- package/build/src/server/managers/SocketManager.js +0 -50
- package/build/src/server/managers/UserManager.js +0 -58
- package/build/src/server/messages/Message.js +0 -141
- package/build/src/server/server.js +0 -110
- package/build/src/server/services/ServiceBase.js +0 -25
- package/build/src/server/services/clientService.js +0 -16
- package/build/src/server/services/gameroomService.js +0 -122
- package/build/src/server/services/gltserver.service.js +0 -24
- package/build/src/server/services/playerService.js +0 -30
- package/build/src/server/startServer.js +0 -31
- package/build/src/server/types/BadgeStatus.js +0 -25
- package/build/src/server/types/OrderType.js +0 -38
- package/build/src/server/types/SubmitType.js +0 -24
- package/build/src/server/types/TimeRange.js +0 -26
- package/build/src/server/utils/ArrayUtil.js +0 -126
- package/build/src/server/utils/IntUtil.js +0 -10
- package/build/src/server/utils/ObjectUtil.js +0 -191
- package/build/src/server/utils/StringUtil.js +0 -37
- package/build/src/server/vo/Database.js +0 -1
- package/build/src/server/vo/Gameroom.js +0 -1
- package/build/src/server/vo/Gamezone.js +0 -1
- package/build/src/server/vo/Player.js +0 -1
- package/build/src/server/vo/Response.js +0 -1
- package/build/src/server/vo/System.js +0 -1
- package/build/src/utils/cli.js +0 -49
- package/build/src/utils/file.js +0 -327
- package/build/src/utils/init.js +0 -42
- package/build/src/utils/log.js +0 -17
- package/build/src/utils/net.js +0 -39
|
@@ -1,279 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.upload = void 0;
|
|
7
|
-
const file_1 = require("../utils/file");
|
|
8
|
-
const net_1 = require("../utils/net");
|
|
9
|
-
const merges_1 = require("./merges");
|
|
10
|
-
const cli_progress_1 = __importDefault(require("cli-progress"));
|
|
11
|
-
const inquirer_1 = __importDefault(require("inquirer"));
|
|
12
|
-
const isbinaryfile_1 = require("isbinaryfile");
|
|
13
|
-
const tempFolder = '/.temp';
|
|
14
|
-
exports.upload = ({ projectCode, folder, token, debug }) => {
|
|
15
|
-
if (debug) {
|
|
16
|
-
console.log('debug = true');
|
|
17
|
-
}
|
|
18
|
-
let srcFolder = `${folder}/src`;
|
|
19
|
-
net_1.apiSetToken(token);
|
|
20
|
-
file_1.setFileCacheFolder(folder);
|
|
21
|
-
if (!file_1.fileExists(srcFolder)) {
|
|
22
|
-
return Promise.reject(`${srcFolder} does not exist`);
|
|
23
|
-
}
|
|
24
|
-
let zipFilename = folder + tempFolder + '/sources.zip';
|
|
25
|
-
return Promise.resolve()
|
|
26
|
-
.then(() => validateToken(projectCode, token))
|
|
27
|
-
.then(() => validateGitCommit(folder))
|
|
28
|
-
.then(() => checkSourcesMerged(zipFilename, projectCode, folder, token))
|
|
29
|
-
.then(basezip => createUploadQueue(projectCode, basezip, folder))
|
|
30
|
-
.then(queue => processUploadQueue(projectCode, queue, folder))
|
|
31
|
-
.then(queue => queue.length && downloadBase(zipFilename, projectCode, folder, token))
|
|
32
|
-
.then(() => file_1.rmdir(`${folder}${tempFolder}`).catch(_e => { }))
|
|
33
|
-
.then(() => {
|
|
34
|
-
console.log();
|
|
35
|
-
console.log('done');
|
|
36
|
-
})
|
|
37
|
-
.catch(err => {
|
|
38
|
-
console.log();
|
|
39
|
-
console.error(err);
|
|
40
|
-
})
|
|
41
|
-
.then(() => console.log());
|
|
42
|
-
};
|
|
43
|
-
function validateGitCommit(folder) {
|
|
44
|
-
return file_1.isGitCommitted(folder)
|
|
45
|
-
.then(committed => {
|
|
46
|
-
if (!committed) {
|
|
47
|
-
return Promise.reject('Please commit your current sources first.');
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
return Promise.resolve();
|
|
51
|
-
}
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
function validateToken(projectCode, _token) {
|
|
55
|
-
return net_1.apiGet(`/validate/local_dev_token/${projectCode}/edit`)
|
|
56
|
-
.catch(_e => {
|
|
57
|
-
console.error('Only the current Project Editor can do the upload');
|
|
58
|
-
throw _e;
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
|
-
function downloadBase(zipFilename, projectCode, folder, token) {
|
|
62
|
-
let basezip = `${folder}/.cg/sources.base`;
|
|
63
|
-
console.log(`update sources base ...`);
|
|
64
|
-
return Promise.resolve()
|
|
65
|
-
.then(() => {
|
|
66
|
-
if (!file_1.fileExists(zipFilename)) {
|
|
67
|
-
let progressBar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
68
|
-
return file_1.downloadFile(net_1.cgUrl(`/download/${projectCode}?token=${token}`), zipFilename, progressBar, { noCache: true })
|
|
69
|
-
.then(() => progressBar && progressBar.stop());
|
|
70
|
-
}
|
|
71
|
-
else {
|
|
72
|
-
return Promise.resolve();
|
|
73
|
-
}
|
|
74
|
-
})
|
|
75
|
-
.then(() => file_1.moveFile(zipFilename, basezip));
|
|
76
|
-
}
|
|
77
|
-
let sourcesProcessing;
|
|
78
|
-
function checkSourcesMerged(zipFilename, projectCode, folder, token) {
|
|
79
|
-
let progressBar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
80
|
-
sourcesProcessing = [];
|
|
81
|
-
let basezip = `${folder}/.cg/sources.base`;
|
|
82
|
-
if (!file_1.fileExists(basezip)) {
|
|
83
|
-
return Promise.reject('Cannot merge: source base missing.');
|
|
84
|
-
}
|
|
85
|
-
console.log(`prepare updates: download remote sources ...`);
|
|
86
|
-
return file_1.downloadFile(net_1.cgUrl(`/download/${projectCode}?token=${token}`), zipFilename, progressBar, { noCache: true })
|
|
87
|
-
.then(() => {
|
|
88
|
-
progressBar.stop();
|
|
89
|
-
return file_1.getFileZip(zipFilename);
|
|
90
|
-
})
|
|
91
|
-
.then(jszip => {
|
|
92
|
-
return Promise.resolve()
|
|
93
|
-
.then(() => file_1.rmdir(`${folder}${tempFolder}`).catch(_e => { }))
|
|
94
|
-
.then(() => file_1.getFileZip(basezip))
|
|
95
|
-
.then(basezip => {
|
|
96
|
-
let saveSrcFiles = [];
|
|
97
|
-
sourcesProcessing = [];
|
|
98
|
-
console.log(`prepare updates: diff remote sources ...`);
|
|
99
|
-
for (let filename in jszip.files) {
|
|
100
|
-
if (filename.startsWith('src/')) {
|
|
101
|
-
saveSrcFiles.push(checkSourceMerged(jszip.file(filename), basezip.file(filename), folder));
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
return Promise.all(saveSrcFiles)
|
|
105
|
-
.then(results => {
|
|
106
|
-
if (results.find(result => !result)) {
|
|
107
|
-
return Promise.reject(`Please do a merge before upload.\nRun the command "gamelet merge"`);
|
|
108
|
-
}
|
|
109
|
-
return basezip;
|
|
110
|
-
});
|
|
111
|
-
});
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
function checkSourceMerged(file, base, folder) {
|
|
115
|
-
if (sourcesProcessing.length > 19) {
|
|
116
|
-
return file_1.wait(30).then(() => checkSourceMerged(file, base, folder));
|
|
117
|
-
}
|
|
118
|
-
sourcesProcessing.push(file);
|
|
119
|
-
return merges_1.isSourceMerged(file.name, file, base, folder)
|
|
120
|
-
.then(result => {
|
|
121
|
-
let index = sourcesProcessing.indexOf(file);
|
|
122
|
-
sourcesProcessing.splice(index, 1);
|
|
123
|
-
return result;
|
|
124
|
-
});
|
|
125
|
-
}
|
|
126
|
-
function processUploadQueue(projectCode, queue, _folder) {
|
|
127
|
-
if (!queue.length) {
|
|
128
|
-
console.log('nothing to upload');
|
|
129
|
-
return Promise.resolve(queue);
|
|
130
|
-
}
|
|
131
|
-
return inquirer_1.default.prompt([
|
|
132
|
-
{
|
|
133
|
-
type: 'confirm',
|
|
134
|
-
name: 'confirm',
|
|
135
|
-
message: `${queue.length} item(s) to upload to "${projectCode}", Continue?`,
|
|
136
|
-
}
|
|
137
|
-
])
|
|
138
|
-
.then(result => {
|
|
139
|
-
if (result.confirm) {
|
|
140
|
-
sourcesProcessing = [];
|
|
141
|
-
let progressBar = new cli_progress_1.default.SingleBar({}, cli_progress_1.default.Presets.shades_classic);
|
|
142
|
-
progressBar.start(queue.length, 0);
|
|
143
|
-
return Promise.all(queue.map(item => processUploadQueueItem(projectCode, item, progressBar)))
|
|
144
|
-
.then(() => progressBar.stop());
|
|
145
|
-
}
|
|
146
|
-
else {
|
|
147
|
-
queue.length = 0;
|
|
148
|
-
}
|
|
149
|
-
return Promise.resolve();
|
|
150
|
-
})
|
|
151
|
-
.then(() => queue);
|
|
152
|
-
}
|
|
153
|
-
function processUploadQueueItem(projectCode, queueItem, progressBar) {
|
|
154
|
-
if (sourcesProcessing.length > 5) {
|
|
155
|
-
return file_1.wait(30).then(() => processUploadQueueItem(projectCode, queueItem, progressBar));
|
|
156
|
-
}
|
|
157
|
-
sourcesProcessing.push(queueItem);
|
|
158
|
-
return Promise.resolve()
|
|
159
|
-
.then(() => {
|
|
160
|
-
return net_1.apiPost(`/update/source/local_dev/${projectCode}/${queueItem.action}`, {
|
|
161
|
-
path: queueItem.path,
|
|
162
|
-
filename: queueItem.filename,
|
|
163
|
-
content: queueItem.content || '',
|
|
164
|
-
});
|
|
165
|
-
})
|
|
166
|
-
.then(() => {
|
|
167
|
-
progressBar.increment(1);
|
|
168
|
-
let index = sourcesProcessing.indexOf(queueItem);
|
|
169
|
-
sourcesProcessing.splice(index, 1);
|
|
170
|
-
});
|
|
171
|
-
}
|
|
172
|
-
function createUploadQueue(projectCode, basezip, folder) {
|
|
173
|
-
sourcesProcessing = [];
|
|
174
|
-
let srcFolder = `${folder}/src`;
|
|
175
|
-
let queue = [];
|
|
176
|
-
let filesToDelete = {};
|
|
177
|
-
for (let filename in basezip.files) {
|
|
178
|
-
let search = filename.match(/^src\/(.*\/)?([^\/]+)$/);
|
|
179
|
-
if (search) {
|
|
180
|
-
let path = search[1] ? search[1].substr(0, search[1].length - 1) : '';
|
|
181
|
-
let fname = search[2];
|
|
182
|
-
let fullpath = path ? `${path}/${fname}` : fname;
|
|
183
|
-
filesToDelete[fullpath] = {
|
|
184
|
-
path: path,
|
|
185
|
-
filename: fname,
|
|
186
|
-
};
|
|
187
|
-
}
|
|
188
|
-
}
|
|
189
|
-
console.log('listing files to upload...');
|
|
190
|
-
console.log('===============================');
|
|
191
|
-
return file_1.listFiles(srcFolder)
|
|
192
|
-
.then(files => {
|
|
193
|
-
return Promise.all(files.map(file => updateSource(projectCode, srcFolder, '', file, basezip, queue, filesToDelete)));
|
|
194
|
-
})
|
|
195
|
-
.then(() => {
|
|
196
|
-
sourcesProcessing = [];
|
|
197
|
-
for (let key in filesToDelete) {
|
|
198
|
-
let queueItem = Object.assign({
|
|
199
|
-
action: 'delete',
|
|
200
|
-
}, filesToDelete[key]);
|
|
201
|
-
queue.push(queueItem);
|
|
202
|
-
console.log(' - (delete) ' + key);
|
|
203
|
-
}
|
|
204
|
-
})
|
|
205
|
-
.then(() => {
|
|
206
|
-
if (queue.length) {
|
|
207
|
-
console.log('-------------------------------');
|
|
208
|
-
}
|
|
209
|
-
return queue;
|
|
210
|
-
});
|
|
211
|
-
}
|
|
212
|
-
function updateSource(projectCode, srcFolder, path, filename, basezip, queue, filesToDelete) {
|
|
213
|
-
if (sourcesProcessing.length > 19) {
|
|
214
|
-
return file_1.wait(30).then(() => updateSource(projectCode, srcFolder, path, filename, basezip, queue, filesToDelete));
|
|
215
|
-
}
|
|
216
|
-
let fullpathname = path ? `${path}/${filename}` : filename;
|
|
217
|
-
sourcesProcessing.push(fullpathname);
|
|
218
|
-
let localFilepath = `${srcFolder}/${fullpathname}`;
|
|
219
|
-
delete filesToDelete[fullpathname];
|
|
220
|
-
return file_1.fileStat(localFilepath)
|
|
221
|
-
.then((stats) => {
|
|
222
|
-
if (stats.isDirectory()) {
|
|
223
|
-
return file_1.listFiles(localFilepath)
|
|
224
|
-
.then(files => {
|
|
225
|
-
let index = sourcesProcessing.indexOf(fullpathname);
|
|
226
|
-
sourcesProcessing.splice(index, 1);
|
|
227
|
-
return Promise.all(files.map(file => {
|
|
228
|
-
return updateSource(projectCode, srcFolder, fullpathname, file, basezip, queue, filesToDelete);
|
|
229
|
-
}));
|
|
230
|
-
});
|
|
231
|
-
}
|
|
232
|
-
else if (stats.isFile()) {
|
|
233
|
-
return isbinaryfile_1.isBinaryFile(localFilepath)
|
|
234
|
-
.then(isBinary => {
|
|
235
|
-
if (isBinary) {
|
|
236
|
-
return Promise.reject(`${filename} is not a text file.`);
|
|
237
|
-
}
|
|
238
|
-
else {
|
|
239
|
-
return file_1.getFileString(localFilepath)
|
|
240
|
-
.then(content => {
|
|
241
|
-
return getSourceAction(fullpathname, content, basezip)
|
|
242
|
-
.then(action => {
|
|
243
|
-
if (action) {
|
|
244
|
-
queue.push({
|
|
245
|
-
path: path,
|
|
246
|
-
filename: filename,
|
|
247
|
-
content: content,
|
|
248
|
-
action: action,
|
|
249
|
-
});
|
|
250
|
-
let sign = action == 'create' ? '+' : '>';
|
|
251
|
-
console.log(` ${sign} (${action}) ` + fullpathname);
|
|
252
|
-
}
|
|
253
|
-
});
|
|
254
|
-
});
|
|
255
|
-
}
|
|
256
|
-
});
|
|
257
|
-
}
|
|
258
|
-
else {
|
|
259
|
-
return Promise.resolve();
|
|
260
|
-
}
|
|
261
|
-
})
|
|
262
|
-
.then(() => {
|
|
263
|
-
let index = sourcesProcessing.indexOf(fullpathname);
|
|
264
|
-
sourcesProcessing.splice(index, 1);
|
|
265
|
-
});
|
|
266
|
-
}
|
|
267
|
-
function getSourceAction(sourcePathname, sourceContent, basezip) {
|
|
268
|
-
let baseFile = basezip.file(`src/${sourcePathname}`);
|
|
269
|
-
if (baseFile) {
|
|
270
|
-
return baseFile.async('string')
|
|
271
|
-
.then(baseContent => {
|
|
272
|
-
return sourceContent != baseContent ? 'update' : '';
|
|
273
|
-
});
|
|
274
|
-
}
|
|
275
|
-
else {
|
|
276
|
-
return Promise.resolve('create');
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/gamelet/upload.ts"],"names":[],"mappings":"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"}
|
package/build/src/index.js
DELETED
|
@@ -1,86 +0,0 @@
|
|
|
1
|
-
#!/usr/bin/env node
|
|
2
|
-
"use strict";
|
|
3
|
-
/**
|
|
4
|
-
* gamelet
|
|
5
|
-
* Download project from code.gamelet.com, edit/test in vscode and sync back to server.
|
|
6
|
-
*
|
|
7
|
-
* @author Haska Su <https://haskasu.com>
|
|
8
|
-
*/
|
|
9
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
-
const cli_1 = require("./utils/cli");
|
|
11
|
-
const init_1 = require("./utils/init");
|
|
12
|
-
const log_1 = require("./utils/log");
|
|
13
|
-
const download_1 = require("./gamelet/download");
|
|
14
|
-
const prepare_1 = require("./gamelet/prepare");
|
|
15
|
-
const upload_1 = require("./gamelet/upload");
|
|
16
|
-
const startServer_1 = require("./server/startServer");
|
|
17
|
-
const Constant_1 = require("./server/Constant");
|
|
18
|
-
const input = cli_1.cli.input;
|
|
19
|
-
const flags = cli_1.cli.flags;
|
|
20
|
-
const debug = !!flags.debug;
|
|
21
|
-
(async () => {
|
|
22
|
-
init_1.init({ clear: Boolean(flags.clear) });
|
|
23
|
-
async function runDownload(prepareResult) {
|
|
24
|
-
try {
|
|
25
|
-
await download_1.download({
|
|
26
|
-
token: prepareResult.token,
|
|
27
|
-
projectCode: prepareResult.projectCode,
|
|
28
|
-
folder: prepareResult.folder,
|
|
29
|
-
sourceHandler: prepareResult.sourceHandler,
|
|
30
|
-
targetItems: prepareResult.items,
|
|
31
|
-
force: prepareResult.force,
|
|
32
|
-
debug: debug
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
catch (err) {
|
|
36
|
-
console.error(err);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
if (input.indexOf('download') == 0) {
|
|
40
|
-
let result = await prepare_1.prepare({ command: input[0], tokenFile: input[1], folder: flags.dir, sourceHandler: flags.source, debug: debug });
|
|
41
|
-
if (result && result.token && result.projectCode && result.folder) {
|
|
42
|
-
if (flags.item) {
|
|
43
|
-
result.items = flags.item.split(',');
|
|
44
|
-
}
|
|
45
|
-
if (flags.force) {
|
|
46
|
-
result.force = true;
|
|
47
|
-
}
|
|
48
|
-
await runDownload(result);
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
else if (input.indexOf('merge') == 0) {
|
|
52
|
-
let result = await prepare_1.prepare({ command: input[0], tokenFile: null, folder: flags.dir, sourceHandler: 'merge', debug: debug });
|
|
53
|
-
if (result && result.token && result.projectCode && result.folder) {
|
|
54
|
-
if (flags.item) {
|
|
55
|
-
result.items = flags.item.split(',');
|
|
56
|
-
}
|
|
57
|
-
if (flags.force) {
|
|
58
|
-
result.force = true;
|
|
59
|
-
}
|
|
60
|
-
await runDownload(result);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
else if (input.indexOf('upload') == 0) {
|
|
64
|
-
let result = await prepare_1.prepare({ command: input[0], tokenFile: null, folder: flags.dir, sourceHandler: 'merge', debug: debug });
|
|
65
|
-
if (result && result.token && result.projectCode && result.folder) {
|
|
66
|
-
await upload_1.upload({
|
|
67
|
-
token: result.token,
|
|
68
|
-
projectCode: result.projectCode,
|
|
69
|
-
folder: result.folder,
|
|
70
|
-
debug: debug
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
else if (input.indexOf('help') == 0) {
|
|
75
|
-
cli_1.cli.showHelp(0);
|
|
76
|
-
}
|
|
77
|
-
else if (input.indexOf('server') == 0) {
|
|
78
|
-
let result = await prepare_1.prepare({ command: input[0], tokenFile: null, folder: flags.dir, sourceHandler: 'skip', debug: debug });
|
|
79
|
-
if (result && result.token && result.projectCode) {
|
|
80
|
-
await startServer_1.startServer(result.projectCode, result.folder, Constant_1.Constant.ServerPort);
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
debug && log_1.log(flags);
|
|
84
|
-
process.exit();
|
|
85
|
-
})();
|
|
86
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFFQTs7Ozs7R0FLRzs7QUFFSCxxQ0FBa0M7QUFDbEMsdUNBQW9DO0FBQ3BDLHFDQUFrQztBQUNsQyxpREFBOEM7QUFDOUMsK0NBQTRDO0FBQzVDLDZDQUEwQztBQUMxQyxzREFBbUQ7QUFDbkQsZ0RBQTZDO0FBRTdDLE1BQU0sS0FBSyxHQUFHLFNBQUcsQ0FBQyxLQUFLLENBQUM7QUFDeEIsTUFBTSxLQUFLLEdBQUcsU0FBRyxDQUFDLEtBQUssQ0FBQztBQUN4QixNQUFNLEtBQUssR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQztBQUU1QixDQUFDLEtBQUssSUFBSSxFQUFFO0lBQ1IsV0FBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBRXRDLEtBQUssVUFBVSxXQUFXLENBQUMsYUFBYTtRQUNwQyxJQUFJO1lBQ0EsTUFBTSxtQkFBUSxDQUFDO2dCQUNYLEtBQUssRUFBRSxhQUFhLENBQUMsS0FBSztnQkFDMUIsV0FBVyxFQUFFLGFBQWEsQ0FBQyxXQUFXO2dCQUN0QyxNQUFNLEVBQUUsYUFBYSxDQUFDLE1BQU07Z0JBQzVCLGFBQWEsRUFBRSxhQUFhLENBQUMsYUFBYTtnQkFDMUMsV0FBVyxFQUFFLGFBQWEsQ0FBQyxLQUFLO2dCQUNoQyxLQUFLLEVBQUUsYUFBYSxDQUFDLEtBQUs7Z0JBQzFCLEtBQUssRUFBRSxLQUFLO2FBQ2YsQ0FBQyxDQUFDO1NBQ047UUFBQyxPQUFPLEdBQUcsRUFBRTtZQUNWLE9BQU8sQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7U0FDdEI7SUFDTCxDQUFDO0lBRUQsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTtRQUNoQyxJQUFJLE1BQU0s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
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Constant = void 0;
|
|
4
|
-
exports.Constant = {
|
|
5
|
-
ServerPort: 61701,
|
|
6
|
-
ONE_MINUTE: 60000,
|
|
7
|
-
ONE_HOUR: 60000 * 60,
|
|
8
|
-
ONE_DAY: 60000 * 60 * 24,
|
|
9
|
-
};
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc3RhbnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmVyL0NvbnN0YW50LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFhLFFBQUEsUUFBUSxHQUFHO0lBRXBCLFVBQVUsRUFBRSxLQUFLO0lBSWpCLFVBQVUsRUFBRSxLQUFLO0lBQ2pCLFFBQVEsRUFBRSxLQUFLLEdBQUcsRUFBRTtJQUNwQixPQUFPLEVBQUUsS0FBSyxHQUFHLEVBQUUsR0FBRyxFQUFFO0NBQzNCLENBQUEifQ==
|
|
@@ -1,57 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Client = void 0;
|
|
4
|
-
const Constant_1 = require("./../Constant");
|
|
5
|
-
const PlayerManager_1 = require("./../managers/PlayerManager");
|
|
6
|
-
const ArrayUtil_1 = require("./../utils/ArrayUtil");
|
|
7
|
-
class Client {
|
|
8
|
-
constructor(project, msgVersion) {
|
|
9
|
-
this.project = project;
|
|
10
|
-
this.msgVersion = msgVersion;
|
|
11
|
-
this.players = [];
|
|
12
|
-
if (typeof msgVersion === 'number') {
|
|
13
|
-
msgVersion = '' + msgVersion;
|
|
14
|
-
}
|
|
15
|
-
else if (!msgVersion) {
|
|
16
|
-
msgVersion = '';
|
|
17
|
-
}
|
|
18
|
-
this._key = project.code.replace(/\|/g, '/') + '|' + msgVersion.replace(/\|/g, '/');
|
|
19
|
-
}
|
|
20
|
-
get key() {
|
|
21
|
-
return this._key;
|
|
22
|
-
}
|
|
23
|
-
addPlayer(player) {
|
|
24
|
-
ArrayUtil_1.ArrayUtil.addUniqueElement(this.players, player);
|
|
25
|
-
}
|
|
26
|
-
removePlayer(player) {
|
|
27
|
-
ArrayUtil_1.ArrayUtil.removeElement(this.players, player);
|
|
28
|
-
}
|
|
29
|
-
removePlayerByCode(playerCode) {
|
|
30
|
-
let index = this.players.findIndex(p => p.code == playerCode);
|
|
31
|
-
if (index == -1) {
|
|
32
|
-
return null;
|
|
33
|
-
}
|
|
34
|
-
let player = this.players[index];
|
|
35
|
-
this.players.splice(index, 1);
|
|
36
|
-
return player;
|
|
37
|
-
}
|
|
38
|
-
get playersCount() {
|
|
39
|
-
return this.players.length;
|
|
40
|
-
}
|
|
41
|
-
get playerList() {
|
|
42
|
-
return this.players;
|
|
43
|
-
}
|
|
44
|
-
cleanDisconnectedPlayers() {
|
|
45
|
-
this.players = this.players.filter(p => PlayerManager_1.playerManager.getPlayerByCode(p.code));
|
|
46
|
-
}
|
|
47
|
-
disconnectInactivePlayers() {
|
|
48
|
-
let inactiveTime = Date.now() - Constant_1.Constant.ONE_HOUR * 3;
|
|
49
|
-
this.players.slice().forEach(p => {
|
|
50
|
-
if (p.lastMsgTime < inactiveTime) {
|
|
51
|
-
p.disconnect();
|
|
52
|
-
}
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
exports.Client = Client;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xpZW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vc3JjL3NlcnZlci9lbnRpdGllcy9DbGllbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsNENBQXlDO0FBQ3pDLCtEQUE0RDtBQUM1RCxvREFBaUQ7QUFHakQsTUFBYSxNQUFNO0lBTWYsWUFBbUIsT0FBc0IsRUFBUyxVQUFrQjtRQUFqRCxZQUFPLEdBQVAsT0FBTyxDQUFlO1FBQVMsZUFBVSxHQUFWLFVBQVUsQ0FBUTtRQUY1RCxZQUFPLEdBQWEsRUFBRSxDQUFDO1FBRzNCLElBQUksT0FBTyxVQUFVLEtBQUssUUFBUSxFQUFFO1lBQ2hDLFVBQVUsR0FBRyxFQUFFLEdBQUcsVUFBVSxDQUFDO1NBQ2hDO2FBQU0sSUFBSSxDQUFDLFVBQVUsRUFBRTtZQUNwQixVQUFVLEdBQUcsRUFBRSxDQUFBO1NBQ2xCO1FBQ0QsSUFBSSxDQUFDLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLEdBQUcsR0FBRyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDO0lBQ3hGLENBQUM7SUFFRCxJQUFJLEdBQUc7UUFDSCxPQUFPLElBQUksQ0FBQyxJQUFJLENBQUM7SUFDckIsQ0FBQztJQUVELFNBQVMsQ0FBQyxNQUFjO1FBQ3BCLHFCQUFTLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNyRCxDQUFDO0lBRUQsWUFBWSxDQUFDLE1BQWM7UUFDdkIscUJBQVMsQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNsRCxDQUFDO0lBRUQsa0JBQWtCLENBQUMsVUFBa0I7UUFDakMsSUFBSSxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxJQUFJLFVBQVUsQ0FBQyxDQUFDO1FBQzlELElBQUksS0FBSyxJQUFJLENBQUMsQ0FBQyxFQUFFO1lBQ2IsT0FBTyxJQUFJLENBQUM7U0FDZjtRQUNELElBQUksTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDakMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQzlCLE9BQU8sTUFBTSxDQUFDO0lBQ2xCLENBQUM7SUFFRCxJQUFJLFlBQVk7UUFDWixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDO0lBQy9CLENBQUM7SUFFRCxJQUFJLFVBQVU7UUFDVixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDeEIsQ0FBQztJQUVELHdCQUF3QjtRQUNwQixJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsNkJBQWEsQ0FBQyxlQUFlLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDbEYsQ0FBQztJQUVELHlCQUF5QjtRQUNyQixJQUFJLFlBQVksR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsbUJBQVEsQ0FBQyxRQUFRLEdBQUcsQ0FBQyxDQUFDO1FBQ3RELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQzdCLElBQUksQ0FBQyxDQUFDLFdBQVcsR0FBRyxZQUFZLEVBQUU7Z0JBQzlCLENBQUMsQ0FBQyxVQUFVLEVBQUUsQ0FBQzthQUNsQjtRQUNMLENBQUMsQ0FBQyxDQUFBO0lBQ04sQ0FBQztDQUNKO0FBekRELHdCQXlEQyJ9
|
|
@@ -1,67 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ClientOwner = void 0;
|
|
4
|
-
const ClientProject_1 = require("./ClientProject");
|
|
5
|
-
const Constant_1 = require("./../Constant");
|
|
6
|
-
const gltserver_service_1 = require("../services/gltserver.service");
|
|
7
|
-
class ClientOwner {
|
|
8
|
-
constructor(ownername) {
|
|
9
|
-
this.ownername = ownername;
|
|
10
|
-
this.projects = {};
|
|
11
|
-
this.maxPlayers = 5;
|
|
12
|
-
this.timeToUpdateMaxPlayers = 0;
|
|
13
|
-
}
|
|
14
|
-
addProject(project) {
|
|
15
|
-
this.projects[project.code] = project;
|
|
16
|
-
}
|
|
17
|
-
getProject(projectCode) {
|
|
18
|
-
let project = this.projects[projectCode];
|
|
19
|
-
if (!project) {
|
|
20
|
-
project = new ClientProject_1.ClientProject(projectCode, this);
|
|
21
|
-
this.projects[projectCode] = project;
|
|
22
|
-
}
|
|
23
|
-
return project;
|
|
24
|
-
}
|
|
25
|
-
getMaxPlayers() {
|
|
26
|
-
if (Date.now() < this.timeToUpdateMaxPlayers) {
|
|
27
|
-
return Promise.resolve(this.maxPlayers);
|
|
28
|
-
}
|
|
29
|
-
return gltserver_service_1.serverService.getMaxPlayers(this.ownername)
|
|
30
|
-
.then(max => {
|
|
31
|
-
this.maxPlayers = max;
|
|
32
|
-
this.timeToUpdateMaxPlayers = Date.now() + Constant_1.Constant.ONE_MINUTE;
|
|
33
|
-
return this.maxPlayers;
|
|
34
|
-
});
|
|
35
|
-
}
|
|
36
|
-
get playerList() {
|
|
37
|
-
let list = [];
|
|
38
|
-
for (let key in this.projects) {
|
|
39
|
-
list = list.concat(this.projects[key].playerList);
|
|
40
|
-
}
|
|
41
|
-
return list;
|
|
42
|
-
}
|
|
43
|
-
get playersCount() {
|
|
44
|
-
let count = 0;
|
|
45
|
-
for (let key in this.projects) {
|
|
46
|
-
count += this.projects[key].playersCount;
|
|
47
|
-
}
|
|
48
|
-
return count;
|
|
49
|
-
}
|
|
50
|
-
getPlayersCountByProject(project) {
|
|
51
|
-
let ownerCount = 0;
|
|
52
|
-
let projectCount = 0;
|
|
53
|
-
for (let key in this.projects) {
|
|
54
|
-
let count = this.projects[key].playersCount;
|
|
55
|
-
ownerCount += count;
|
|
56
|
-
if (key == project.code) {
|
|
57
|
-
projectCount = count;
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
return {
|
|
61
|
-
ownerCount: ownerCount,
|
|
62
|
-
projectCount: projectCount
|
|
63
|
-
};
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
exports.ClientOwner = ClientOwner;
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xpZW50T3duZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmVyL2VudGl0aWVzL0NsaWVudE93bmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1EQUFnRDtBQUNoRCw0Q0FBeUM7QUFDekMscUVBQThEO0FBRzlELE1BQWEsV0FBVztJQVFwQixZQUFtQixTQUFpQjtRQUFqQixjQUFTLEdBQVQsU0FBUyxDQUFRO1FBTjVCLGFBQVEsR0FBcUMsRUFBRSxDQUFDO1FBRWhELGVBQVUsR0FBVyxDQUFDLENBQUM7UUFFdkIsMkJBQXNCLEdBQVcsQ0FBQyxDQUFDO0lBSTNDLENBQUM7SUFFRCxVQUFVLENBQUMsT0FBc0I7UUFDN0IsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEdBQUcsT0FBTyxDQUFDO0lBQzFDLENBQUM7SUFFRCxVQUFVLENBQUMsV0FBbUI7UUFDMUIsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ1YsT0FBTyxHQUFHLElBQUksNkJBQWEsQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLENBQUM7WUFDL0MsSUFBSSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsR0FBRyxPQUFPLENBQUM7U0FDeEM7UUFDRCxPQUFPLE9BQU8sQ0FBQztJQUNuQixDQUFDO0lBRUQsYUFBYTtRQUNULElBQUksSUFBSSxDQUFDLEdBQUcsRUFBRSxHQUFHLElBQUksQ0FBQyxzQkFBc0IsRUFBRTtZQUMxQyxPQUFPLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDO1NBQzNDO1FBRUQsT0FBTyxpQ0FBYSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO2FBQzdDLElBQUksQ0FBQyxHQUFHLENBQUMsRUFBRTtZQUNSLElBQUksQ0FBQyxVQUFVLEdBQUcsR0FBRyxDQUFDO1lBQ3RCLElBQUksQ0FBQyxzQkFBc0IsR0FBRyxJQUFJLENBQUMsR0FBRyxFQUFFLEdBQUcsbUJBQVEsQ0FBQyxVQUFVLENBQUM7WUFDL0QsT0FBTyxJQUFJLENBQUMsVUFBVSxDQUFDO1FBQzNCLENBQUMsQ0FBQyxDQUFBO0lBQ1YsQ0FBQztJQUVELElBQUksVUFBVTtRQUNWLElBQUksSUFBSSxHQUFhLEVBQUUsQ0FBQztRQUN4QixLQUFLLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDM0IsSUFBSSxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQztTQUNyRDtRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2hCLENBQUM7SUFFRCxJQUFJLFlBQVk7UUFDWixJQUFJLEtBQUssR0FBRyxDQUFDLENBQUM7UUFDZCxLQUFLLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxRQUFRLEVBQUU7WUFDM0IsS0FBSyxJQUFJLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxDQUFDO1NBQzVDO1FBQ0QsT0FBTyxLQUFLLENBQUM7SUFDakIsQ0FBQztJQUVELHdCQUF3QixDQUFDLE9BQXNCO1FBQzNDLElBQUksVUFBVSxHQUFXLENBQUMsQ0FBQztRQUMzQixJQUFJLFlBQVksR0FBVyxDQUFDLENBQUM7UUFDN0IsS0FBSyxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQzNCLElBQUksS0FBSyxHQUFHLElBQUksQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLENBQUMsWUFBWSxDQUFDO1lBQzVDLFVBQVUsSUFBSSxLQUFLLENBQUE7WUFDbkIsSUFBSSxHQUFHLElBQUksT0FBTyxDQUFDLElBQUksRUFBRTtnQkFDckIsWUFBWSxHQUFHLEtBQUssQ0FBQTthQUN2QjtTQUNKO1FBQ0QsT0FBTztZQUNILFVBQVUsRUFBRSxVQUFVO1lBQ3RCLFlBQVksRUFBRSxZQUFZO1NBQzdCLENBQUM7SUFDTixDQUFDO0NBRUo7QUF0RUQsa0NBc0VDIn0=
|
|
@@ -1,68 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ClientProject = void 0;
|
|
4
|
-
const Constant_1 = require("./../Constant");
|
|
5
|
-
const Client_1 = require("./Client");
|
|
6
|
-
class ClientProject {
|
|
7
|
-
constructor(code, owner) {
|
|
8
|
-
this.code = code;
|
|
9
|
-
this.owner = owner;
|
|
10
|
-
this.clients = {};
|
|
11
|
-
autoDisconnectInactivePlayerLoop(this);
|
|
12
|
-
}
|
|
13
|
-
getClient(msgVersion) {
|
|
14
|
-
let client = this.clients[msgVersion];
|
|
15
|
-
if (!client) {
|
|
16
|
-
client = new Client_1.Client(this, msgVersion);
|
|
17
|
-
this.clients[msgVersion] = client;
|
|
18
|
-
}
|
|
19
|
-
return client;
|
|
20
|
-
}
|
|
21
|
-
listClients() {
|
|
22
|
-
let list = [];
|
|
23
|
-
for (let key in this.clients) {
|
|
24
|
-
let client = this.clients[key];
|
|
25
|
-
if (client.playersCount) {
|
|
26
|
-
list.push(client);
|
|
27
|
-
}
|
|
28
|
-
else {
|
|
29
|
-
delete this.clients[key];
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
return list;
|
|
33
|
-
}
|
|
34
|
-
removePlayerByCode(playerCode) {
|
|
35
|
-
for (let key in this.clients) {
|
|
36
|
-
let player = this.clients[key].removePlayerByCode(playerCode);
|
|
37
|
-
if (player) {
|
|
38
|
-
return player;
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
return null;
|
|
42
|
-
}
|
|
43
|
-
get playerList() {
|
|
44
|
-
let list = [];
|
|
45
|
-
for (let key in this.clients) {
|
|
46
|
-
list = list.concat(this.clients[key].playerList);
|
|
47
|
-
}
|
|
48
|
-
return list;
|
|
49
|
-
}
|
|
50
|
-
get playersCount() {
|
|
51
|
-
let count = 0;
|
|
52
|
-
for (let key in this.clients) {
|
|
53
|
-
count += this.clients[key].playersCount;
|
|
54
|
-
}
|
|
55
|
-
return count;
|
|
56
|
-
}
|
|
57
|
-
cleanDisconnectedPlayers() {
|
|
58
|
-
for (let key in this.clients) {
|
|
59
|
-
this.clients[key].cleanDisconnectedPlayers();
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
exports.ClientProject = ClientProject;
|
|
64
|
-
function autoDisconnectInactivePlayerLoop(project) {
|
|
65
|
-
setTimeout(autoDisconnectInactivePlayerLoop, Constant_1.Constant.ONE_HOUR * 2, project);
|
|
66
|
-
project.listClients().slice().forEach(client => client.disconnectInactivePlayers());
|
|
67
|
-
}
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ2xpZW50UHJvamVjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9zZXJ2ZXIvZW50aXRpZXMvQ2xpZW50UHJvamVjdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw0Q0FBeUM7QUFDekMscUNBQWtDO0FBS2xDLE1BQWEsYUFBYTtJQUl0QixZQUFtQixJQUFZLEVBQVMsS0FBa0I7UUFBdkMsU0FBSSxHQUFKLElBQUksQ0FBUTtRQUFTLFVBQUssR0FBTCxLQUFLLENBQWE7UUFGbEQsWUFBTyxHQUE4QixFQUFFLENBQUM7UUFHNUMsZ0NBQWdDLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDM0MsQ0FBQztJQUVELFNBQVMsQ0FBQyxVQUFrQjtRQUN4QixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBQ3RDLElBQUksQ0FBQyxNQUFNLEVBQUU7WUFDVCxNQUFNLEdBQUcsSUFBSSxlQUFNLENBQUMsSUFBSSxFQUFFLFVBQVUsQ0FBQyxDQUFDO1lBQ3RDLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsTUFBTSxDQUFDO1NBQ3JDO1FBQ0QsT0FBTyxNQUFNLENBQUM7SUFDbEIsQ0FBQztJQUVELFdBQVc7UUFDUCxJQUFJLElBQUksR0FBYSxFQUFFLENBQUM7UUFDeEIsS0FBSSxJQUFJLEdBQUcsSUFBSSxJQUFJLENBQUMsT0FBTyxFQUFFO1lBQ3pCLElBQUksTUFBTSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDL0IsSUFBRyxNQUFNLENBQUMsWUFBWSxFQUFFO2dCQUNwQixJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2FBQ3JCO2lCQUFNO2dCQUNILE9BQU8sSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQzthQUM1QjtTQUNKO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVELGtCQUFrQixDQUFDLFVBQWtCO1FBQ2pDLEtBQUssSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUMxQixJQUFJLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLGtCQUFrQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1lBQzlELElBQUcsTUFBTSxFQUFFO2dCQUNQLE9BQU8sTUFBTSxDQUFDO2FBQ2pCO1NBQ0o7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNoQixDQUFDO0lBRUQsSUFBSSxVQUFVO1FBQ1YsSUFBSSxJQUFJLEdBQWEsRUFBRSxDQUFDO1FBQ3hCLEtBQUssSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUMxQixJQUFJLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxDQUFDO1NBQ3BEO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQUVELElBQUksWUFBWTtRQUNaLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQztRQUNkLEtBQUssSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUMxQixLQUFLLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxZQUFZLENBQUM7U0FDM0M7UUFDRCxPQUFPLEtBQUssQ0FBQztJQUNqQixDQUFDO0lBRUQsd0JBQXdCO1FBQ3BCLEtBQUssSUFBSSxHQUFHLElBQUksSUFBSSxDQUFDLE9BQU8sRUFBRTtZQUMxQixJQUFJLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLHdCQUF3QixFQUFFLENBQUM7U0FDaEQ7SUFDTCxDQUFDO0NBQ0o7QUE3REQsc0NBNkRDO0FBRUQsU0FBUyxnQ0FBZ0MsQ0FBQyxPQUFzQjtJQUM1RCxVQUFVLENBQUMsZ0NBQWdDLEVBQUUsbUJBQVEsQ0FBQyxRQUFRLEdBQUcsQ0FBQyxFQUFFLE9BQU8sQ0FBQyxDQUFDO0lBQzdFLE9BQU8sQ0FBQyxXQUFXLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMseUJBQXlCLEVBQUUsQ0FBQyxDQUFDO0FBQ3hGLENBQUMifQ==
|