mees/Undecked
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Mees van der Wijk
2023-08-29 20:06:52 +02:00
parent 7c2eec4446
commit 25702c073a
225 changed files with 1071 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Backend/dist/Pages/KeyManager.js vendored
View File

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
};
return __assign.apply(this, arguments);
};
exports.__esModule = true;
Object.defineProperty(exports, "__esModule", { value: true });
exports.KeyManager = void 0;
var Logger_1 = require("../Logger");
var KeyManager = /** @class */ (function () {
@@ -20,7 +20,7 @@ var KeyManager = /** @class */ (function () {
if (!this.ids.includes(keyID))
this.ids.push(keyID);
else {
Logger_1.Log('warn', "Duplicate key IDs '" + keyID + "'");
(0, Logger_1.Log)('warn', "Duplicate key IDs '".concat(keyID, "'"));
keyID = this.generateNew();
}
return keyID;

2
Backend/dist/Pages/KeyManager.js.map vendored
View File

@@ -1 +1 @@
{"version":3,"file":"KeyManager.js","sourceRoot":"","sources":["../../src/Pages/KeyManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,oCAAgC;AAIhC;IAGC;QACC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IACf,CAAC;IAED,6BAAQ,GAAR,UAAS,KAAa;QACrB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC/C;YACJ,YAAG,CAAC,MAAM,EAAE,wBAAsB,KAAK,MAAG,CAAC,CAAC;YAC5C,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;SAC3B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gCAAW,GAAX;QAAA,iBAMC;QALA,OAAO,IAAI,CAAC,QAAQ,CACnB,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,UAAC,UAAU;YACtC,OAAO,CAAC,KAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACvC,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAED,gCAAW,GAAX,UAAY,KAAK;QAChB,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpC,KAAK,IAAI,MAAM,IAAI,KAAK,EAAE;YACzB,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,kBAAS,MAAM,QAAA,IAAK,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAG;aACvD;SACD;QACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;IAC3C,CAAC;IACF,iBAAC;AAAD,CAAC,AAlCD,IAkCC;AAlCY,gCAAU"}
{"version":3,"file":"KeyManager.js","sourceRoot":"","sources":["../../src/Pages/KeyManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;AACA,oCAAgC;AAIhC;IAGC;QACC,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;IACf,CAAC;IAED,6BAAQ,GAAR,UAAS,KAAa;QACrB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAC/C;YACJ,IAAA,YAAG,EAAC,MAAM,EAAE,6BAAsB,KAAK,MAAG,CAAC,CAAC;YAC5C,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;SAC3B;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,gCAAW,GAAX;QAAA,iBAMC;QALA,OAAO,IAAI,CAAC,QAAQ,CACnB,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,UAAC,UAAU;YACtC,OAAO,CAAC,KAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QACvC,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IAED,gCAAW,GAAX,UAAY,KAAK;QAChB,IAAI,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QACpC,KAAK,IAAI,MAAM,IAAI,KAAK,EAAE;YACzB,IAAI,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;gBAC7B,kBAAS,MAAM,QAAA,IAAK,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAG;aACvD;SACD;QACD,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC;IAC3C,CAAC;IACF,iBAAC;AAAD,CAAC,AAlCD,IAkCC;AAlCY,gCAAU"}

20
Backend/dist/Pages/Page.js vendored
View File

@@ -9,15 +9,15 @@ var __assign = (this && this.__assign) || function () {
};
return __assign.apply(this, arguments);
};
exports.__esModule = true;
Object.defineProperty(exports, "__esModule", { value: true });
var fs_extra_1 = require("fs-extra");
var path = require("path");
var Logger_1 = require("../Logger");
module.exports = /** @class */ (function () {
function Page(settings) {
this.pageFilePath = path.join(Undecked.dataPath, 'pages', settings.pageID + ".json");
this.pageFilePath = path.join(Undecked.dataPath, 'pages', "".concat(settings.pageID, ".json"));
this.pageID = settings.pageID;
this.name = settings.name || "Unnamed page (" + this.pageID + ")";
this.name = settings.name || "Unnamed page (".concat(this.pageID, ")");
this.keys = settings.keys || {};
this.ensureKeys();
}
@@ -25,17 +25,17 @@ module.exports = /** @class */ (function () {
var _this = this;
clearTimeout(this.saveTimeout);
this.saveTimeout = setTimeout(function () {
fs_extra_1.writeJson(_this.pageFilePath, _this["export"](), function (err) {
(0, fs_extra_1.writeJson)(_this.pageFilePath, _this.export(), function (err) {
if (err)
Logger_1.Log('error', "Error whilst saving page " + _this.pageID, err.message);
(0, Logger_1.Log)('error', "Error whilst saving page ".concat(_this.pageID), err.message);
else
Logger_1.Log('info', "Page " + _this.pageID + " has been saved");
(0, Logger_1.Log)('info', "Page ".concat(_this.pageID, " has been saved"));
if (callback)
callback();
});
}, 10 * 1000);
};
Page.prototype["export"] = function () {
Page.prototype.export = function () {
var keys = JSON.parse(JSON.stringify(this.keys));
for (var y in keys) {
for (var x in keys[y]) {
@@ -113,8 +113,8 @@ module.exports = /** @class */ (function () {
//----------------------------------Validating key
var masterResponseToken = originQuery == undefined
? responseToken
: this.pageID + "_" + x + "_" + y == originQuery ? responseToken : '-1';
originQuery = this.pageID + "_" + x + "_" + y;
: "".concat(this.pageID, "_").concat(x, "_").concat(y) == originQuery ? responseToken : '-1';
originQuery = "".concat(this.pageID, "_").concat(x, "_").concat(y);
var decks = Undecked.Decks.decks;
var currentKey = this.keys[y][x];
var grabBest = function (object, value, defaultValue, incommingFirst) {
@@ -264,7 +264,7 @@ module.exports = /** @class */ (function () {
if (ghostKeyClone.state != undefined && ghostKeyClone.state.masterID == id) {
var responseTokenGhost = originQuery == undefined
? responseToken
: ghostLocation.pageID + "_" + ghostLocation.x + "_" + ghostLocation.y == originQuery
: "".concat(ghostLocation.pageID, "_").concat(ghostLocation.x, "_").concat(ghostLocation.y) == originQuery
? responseToken
: '-1';
var newGhostKey = __assign(__assign({}, ghostKeyClone), { appearence: ghostAppearence });

2
Backend/dist/Pages/Page.js.map vendored
View File

File diff suppressed because one or more lines are too long

14
Backend/dist/Pages/PageManager.js vendored
View File

@@ -9,7 +9,7 @@ var __assign = (this && this.__assign) || function () {
};
return __assign.apply(this, arguments);
};
exports.__esModule = true;
Object.defineProperty(exports, "__esModule", { value: true });
exports.PageManager = void 0;
var path = require("path");
var Logger_1 = require("../Logger");
@@ -27,7 +27,7 @@ var PageManager = /** @class */ (function () {
this.KeyManager = new KeyManager_1.KeyManager();
this.pages = {};
this.order = [];
Logger_1.Log('info', 'Loading pages');
(0, Logger_1.Log)('info', 'Loading pages');
ensureDir(this.managerDataPath, function (err) {
if (err)
throw err;
@@ -62,7 +62,7 @@ var PageManager = /** @class */ (function () {
};
writeFile(this.managerConfigPath, JSON.stringify(toSave, null, 4), function (err) {
if (err)
Logger_1.Log('error', 'Error whilst saving manager config', err.message);
(0, Logger_1.Log)('error', 'Error whilst saving manager config', err.message);
if (callback)
callback();
});
@@ -77,14 +77,14 @@ var PageManager = /** @class */ (function () {
if (files[i]) {
readJSON(path.join(instance.managerDataPath, files[i]), function (err, data) {
if (err)
Logger_1.Log('error', "Error whilst loading page " + files[i].replace('.json', ''), err.message);
(0, Logger_1.Log)('error', "Error whilst loading page ".concat(files[i].replace('.json', '')), err.message);
else
instance.pages[data.pageID] = new PageClass(data);
readPage(i + 1);
});
}
else {
Logger_1.Log('info', "Loaded " + Object.keys(instance.pages).length + " page(s)");
(0, Logger_1.Log)('info', "Loaded ".concat(Object.keys(instance.pages).length, " page(s)"));
if (Object.keys(instance.pages).length > 0)
callback();
else {
@@ -101,7 +101,7 @@ var PageManager = /** @class */ (function () {
}, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ');
this.pages[pageID] = new PageClass({
pageID: pageID,
name: pageName + " (" + pageID + ")",
name: "".concat(pageName, " (").concat(pageID, ")"),
keys: {
'0': { '0': { state: { type: 'pageup' } } },
'1': { '0': { state: { type: 'currentpage' } } },
@@ -112,7 +112,7 @@ var PageManager = /** @class */ (function () {
this.order.push(pageID);
Undecked.SocketServer.broadcastTo('home', 'pagelist', this.getNames());
this.pages[pageID].save(function () {
Logger_1.Log('info', "Page " + pageID + " has been created");
(0, Logger_1.Log)('info', "Page ".concat(pageID, " has been created"));
if (callback)
callback();
});

2
Backend/dist/Pages/PageManager.js.map vendored
View File

File diff suppressed because one or more lines are too long