From c87d76e948b9c93457974ec4e9e376c0e3757424 Mon Sep 17 00:00:00 2001
From: Sami Spets <savasp@utu.fi>
Date: Thu, 5 Dec 2019 08:48:32 +0200
Subject: [PATCH] Debugging the converter
---
web-service/server/src/index.js | 4 +--
web-service/server/src/peer.js | 34 +++++++++++++---------
web-service/server/src/public/js/bundle.js | 34 +++++++++++++---------
3 files changed, 42 insertions(+), 30 deletions(-)
diff --git a/web-service/server/src/index.js b/web-service/server/src/index.js
index 3e3ac2e24..8f8b1c9d8 100644
--- a/web-service/server/src/index.js
+++ b/web-service/server/src/index.js
@@ -403,8 +403,8 @@ app.ws('/', (ws, req) => {
});
p.bind("node_details", () => {
- console.log(peer.convertUUID())
- return [`{"title": "FTL Web-Service", "id": "${peer.convertUUID}", "kind": "master"}`];
+ console.log(p.convertUUID())
+ return [`{"title": "FTL Web-Service", "id": "${p.convertUUID()}", "kind": "master"}`];
});
p.bind("list_streams", () => {
diff --git a/web-service/server/src/peer.js b/web-service/server/src/peer.js
index a0ecc5fa0..957bdd352 100644
--- a/web-service/server/src/peer.js
+++ b/web-service/server/src/peer.js
@@ -9,8 +9,10 @@ const kConnected = 2;
const kDisconnected = 3;
// Generate a unique id for this webservice
+let cpp_my_uuid = uuidv4();
+console.log(cpp_my_uuid)
let my_uuid = uuidParser.parse(uuidv4())
-my_uuid = new Uint8Array(my_uuid);
+my_uuid = new Uint8Array(cpp_my_uuid);
// my_uuid[0] = 44;
my_uuid = Buffer.from(my_uuid);
@@ -273,40 +275,44 @@ Peer.prototype.on = function(evt, f) {
* Returns a string of the UUID
*/
Peer.prototype.convertUUID = function() {
- const digits = "0123456789abcdef";
- const uuid = my_uuid
+ const uuid = cpp_my_uuid
console.log("MY_UUID", uuid)
+
+ const digits = "0123456789abcdef";
+ let rc = "";
let j=0;
for (let i=0; i<4; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ console.log(digits[digits.indexOf(uuid[i])]);
+ rc[j] = digits[digits.indexOf(uuid[i+1])];
+ console.log(digits[digits.indexOf(uuid[i+1])]);
j+=2;
}
rc[j++] = '-';
for (let i=4 ; i<6; ++i) {
- rc[j+1] = digits[uuid[i]];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
rc[j++] = '-';
for (let i=6 ; i<8; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
rc[j++] = '-';
for (let i=8 ; i<10; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
rc[j++] = '-';
for (let i=10 ; i<16; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
- console.log(rc)
+ console.log("RC", rc)
return rc;
}
diff --git a/web-service/server/src/public/js/bundle.js b/web-service/server/src/public/js/bundle.js
index 6df36aecf..1bc7a6dde 100644
--- a/web-service/server/src/public/js/bundle.js
+++ b/web-service/server/src/public/js/bundle.js
@@ -4349,8 +4349,10 @@ const kConnected = 2;
const kDisconnected = 3;
// Generate a unique id for this webservice
+let cpp_my_uuid = uuidv4();
+console.log(cpp_my_uuid)
let my_uuid = uuidParser.parse(uuidv4())
-my_uuid = new Uint8Array(my_uuid);
+my_uuid = new Uint8Array(cpp_my_uuid);
// my_uuid[0] = 44;
my_uuid = Buffer.from(my_uuid);
@@ -4613,40 +4615,44 @@ Peer.prototype.on = function(evt, f) {
* Returns a string of the UUID
*/
Peer.prototype.convertUUID = function() {
- const digits = "0123456789abcdef";
- const uuid = my_uuid
+ const uuid = cpp_my_uuid
console.log("MY_UUID", uuid)
+
+ const digits = "0123456789abcdef";
+ let rc = "";
let j=0;
for (let i=0; i<4; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ console.log(digits[digits.indexOf(uuid[i])]);
+ rc[j] = digits[digits.indexOf(uuid[i+1])];
+ console.log(digits[digits.indexOf(uuid[i+1])]);
j+=2;
}
rc[j++] = '-';
for (let i=4 ; i<6; ++i) {
- rc[j+1] = digits[uuid[i]];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
rc[j++] = '-';
for (let i=6 ; i<8; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
rc[j++] = '-';
for (let i=8 ; i<10; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
rc[j++] = '-';
for (let i=10 ; i<16; ++i) {
- rc[j+1] = digits[uuid[i] & 0x0f];
- rc[j] = digits[(uuid[i] >> 4) & 0x0f];
+ rc[j+1] = digits[digits.indexOf(uuid[i])];
+ rc[j] = digits[digits.indexOf(uuid[i])];
j+=2;
}
- console.log(rc)
+ console.log("RC", rc)
return rc;
}
--
GitLab