Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: UI protocol name #37

Merged
merged 3 commits into from
Oct 7, 2024
Merged

fix: UI protocol name #37

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2346c69
fix context loop
LexLuthr Oct 7, 2024
a3e0be2
update protocolMap
LexLuthr Oct 7, 2024
9b4fc5a
don't convert the keys
LexLuthr Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions pages/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1432,20 +1432,18 @@ function onSearch(
let deals = [];

// Extract protocols and deal information
while (mdBytes.length > 0) {
if (mdBytes.length > 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we still display cases where multiple protocols are included / concatenated in the metadata?

let next = popProtocol(mdBytes);
let name = next[0];
mdBytes = next[1];

if (name !== -1) {
if (name !== -1 && name !== null) {
let ctx = toContext(name, mdBytes);
if (ctx[0] != "") {
deals.push(ctx[0]);
}
mdBytes = ctx[1];
protocols.push(name);
} else {
break;
}
}

Expand Down Expand Up @@ -1475,27 +1473,28 @@ function popProtocol(buf) {
let [code, Vlen] = readVarint(buf, 0);
buf = buf.slice(Vlen);

// Map of protocol codes to protocol names
// Map of protocol codes to protocol names (using decimal keys)
const protocolMap = {
0x0900: "Bitswap", // 2304
0x0910: "Graphsync", // 2320
0x0920: "HTTP", // 2336
2304: "Bitswap", // 0x0900
2320: "Graphsync", // 0x0910
2336: "HTTP", // 0x0920
};

// Convert code to hexadecimal for mapping
const hexCode = code.toString(16).toLowerCase();
const protocolName = protocolMap[`0x${hexCode}`];
const protocolName = protocolMap[code];

if (protocolName) {
return [protocolName, buf];
} else {
// Optionally, handle unknown codes
console.warn(`Unknown protocol code: ${code}`);
return [code, buf];
}
} catch (e) {
return [-1, buf];
}
}


function toContext(code, buf) {
if (code == "Graphsync") {
try {
Expand All @@ -1510,9 +1509,9 @@ function toContext(code, buf) {
if (cborData.FastRetrieval) {
str += " (Unsealed copy available)";
}
return [str, Uint8Array.from([])];
return [str, Uint8Array.from([])]; // Empty buffer after processing
} catch (e) {
return ["Non-CBOR Context:" + e, buf];
return ["Non-CBOR Context: " + e.message, buf];
}
}
return ["", buf];
Expand Down
Loading