From ae2ad3f63027b60e547b9591f87d35399068fcd0 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Sat, 18 May 2024 16:13:27 +0200 Subject: [PATCH] add emd to send data --- package.json | 1 - src/models/RequestDataPojo.js | 4 +++- src/workers/CommandorPage.js | 26 ++++++++++++++++++++++---- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 6c6afd8..416c4c3 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,6 @@ "make": "electron-forge make" }, "dependencies": { - "@nodegui/nodegui": "^0.57.1", "alert": "^5.1.1", "amqplib": "^0.10.3", "axios": "^0.27.2", diff --git a/src/models/RequestDataPojo.js b/src/models/RequestDataPojo.js index 4d62dcc..ba05ba6 100644 --- a/src/models/RequestDataPojo.js +++ b/src/models/RequestDataPojo.js @@ -21,6 +21,7 @@ class RequestDataPojo { pr ts_mtp tz + emd cookiesStr constructor(glvd, @@ -38,7 +39,7 @@ class RequestDataPojo { plg, eva, vnd, - plu, ua, dvm, acw, pr, ts_mtp, tz) { + plu, ua, dvm, acw, pr, ts_mtp, tz, emd) { this.glvd = glvd this.glrd = glrd this.hc = hc @@ -61,6 +62,7 @@ class RequestDataPojo { this.pr = pr this.ts_mtp = ts_mtp this.tz = tz + this.emd = emd } } diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js index 977ae55..4c5c077 100644 --- a/src/workers/CommandorPage.js +++ b/src/workers/CommandorPage.js @@ -1179,8 +1179,24 @@ class CommandorPage { plg, eva, vnd, - plu, ua, dvm, acw, pr, ts_mtp, tz - } = await this.page.evaluate(() => { + plu, ua, dvm, acw, pr, ts_mtp, tz, emd + } = await this.page.evaluate(async () => { + let emd = "NA"; + if (navigator.mediaDevices && "function" == typeof navigator.mediaDevices.enumerateDevices) { + let o = [], i = [], a = [], r = []; + try { + let mediaDeviceInfo = await navigator.mediaDevices.enumerateDevices() + for (var d = 0; d < mediaDeviceInfo['length']; d++) { + var c = mediaDeviceInfo[d]; + c.kind && ("audioinput" == c['kind'] ? o.push("ai") : c['kind'] == 'audiooutput' ? o.push("ao") : "videoinput" == c.kind ? o.push("vi") : o['push'](c.kind)), c['deviceId'] && i['push'](c['deviceId'].slice(0, 5)), c.groupId && a.push(c.groupId.slice(0, 5)), c['label'] && r.push(c.label.slice(0, 5)); + } + emd = (o.length ? "k:" + o['toString']() : "") + (i.length ? ' d:' + i['toString']() : "") + (a['length'] ? ' g:' + a.toString() : "") + (r.length ? " l:" + r['toString']() : ""); + console.log(emd) + } catch (e) { + emd = "Err: " + e.toString(); + } + } else emd = "NA"; + let webglContext = document.createElement('canvas').getContext("webgl") let webglDebugRenderInfo = webglContext.getExtension("WEBGL_debug_renderer_info") let glvd = webglContext.getParameter(webglDebugRenderInfo.UNMASKED_VENDOR_WEBGL) @@ -1239,7 +1255,7 @@ class CommandorPage { vnd, plu, ua, - dvm, acw, pr, ts_mtp, tz + dvm, acw, pr, ts_mtp, tz, emd } }) @@ -1265,7 +1281,9 @@ class CommandorPage { logWithDevice("pr:" + pr, this.device) logWithDevice("ts_mtp:" + ts_mtp, this.device) logWithDevice("tz:" + tz, this.device) - return new RequestDataPojo(glvd, glrd, hc, br_oh, br_ow, br_h, br_w, rs_h, rs_w, rs_cd, ars_h, ars_w, plg, eva, vnd, plu, ua, dvm, acw, pr, ts_mtp, tz) + logWithDevice("emd:" + emd, this.device) + + return new RequestDataPojo(glvd, glrd, hc, br_oh, br_ow, br_h, br_w, rs_h, rs_w, rs_cd, ars_h, ars_w, plg, eva, vnd, plu, ua, dvm, acw, pr, ts_mtp, tz, emd) }