LumeWeb
/
dht-cache
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: LumeWeb:74773f12cd874775feaa9547036e65f409e85535
Branches Tags
LumeWeb:master
..
compare: LumeWeb:323530c4bc136301b94699039452b483360e4c11
Branches Tags
LumeWeb:master

7 Commits
74773f12cd ... 323530c4bc

Author SHA1 Message Date
Derrick Hammer 323530c4bc
*Update dist 2022-11-24 01:50:30 -05:00
Derrick Hammer 1910398d44
*Refactor test to use events/promises and not a timer 
*Add tests for peerHasItem
 2022-11-24 01:50:11 -05:00
Derrick Hammer 734a3640e3
*switch to b4a 2022-11-24 01:49:15 -05:00
Derrick Hammer 587739334a
*filter for peers in neighbors in _getBootstrapInfo 2022-11-24 01:48:00 -05:00
Derrick Hammer 48ceded78f
*Add item-added and item-removed events 2022-11-24 01:46:55 -05:00
Derrick Hammer 24b97d5288
*Add peerHasItem method 2022-11-24 01:46:34 -05:00
Derrick Hammer eab1d70df4
*Add connection to graph on addItem 2022-11-24 01:46:14 -05:00
5 changed files with 61 additions and 14 deletions
Show Stats Expand all files Collapse all files

1
dist/index.d.ts vendored
View File

@ -16,6 +16,7 @@ export default class DHTCache extends EventEmitter {
private _cache;
get cache(): string[];
get allCache(): string[];
peerHasItem(peer: string | Buffer, item: string | Buffer): boolean;
addItem(item: string | Buffer): void;
private _compileMessage;
private _broadcastMessage;

2
dist/index.d.ts.map vendored
View File

@ -1 +1 @@
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAYlC,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAa1C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,YAAY;IAChD,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC;IACrB,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,WAAW,CAAW;IAE9B,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAGxB,KAAK,EAAE,GAAG,EACV,EACE,EAA4B,EAC5B,GAAG,IAAI,EACR,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO;IAkC7C,OAAO,CAAC,MAAM,CAAc;IAE5B,IAAW,KAAK,IAAI,MAAM,EAAE,CAE3B;IAED,IAAW,QAAQ,IAAI,MAAM,EAAE,CAU9B;IAEM,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAqBpC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIlB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAmBjD,OAAO,CAAC,OAAO,CAAc;IAE7B,IAAW,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAE/B;IAEM,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAIpC,IAAI,CAAC,OAAO,EAAE,GAAG;IAIxB,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG;IA2BlC,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAW3B,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;IAmBhC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAsDpD,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,iBAAiB;IAiBzB,OAAO,CAAC,YAAY;IA+BpB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,WAAW;CAyBpB"}
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,OAAO,YAAY,MAAM,QAAQ,CAAC;AAYlC,OAAO,QAAQ,MAAM,oBAAoB,CAAC;AAa1C,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,YAAY;IAChD,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC;IACrB,OAAO,CAAC,EAAE,CAAS;IACnB,OAAO,CAAC,YAAY,CAAU;IAC9B,OAAO,CAAC,KAAK,CAAM;IACnB,OAAO,CAAC,WAAW,CAAW;IAE9B,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAGxB,KAAK,EAAE,GAAG,EACV,EACE,EAA4B,EAC5B,GAAG,IAAI,EACR,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO;IAkC7C,OAAO,CAAC,MAAM,CAAc;IAE5B,IAAW,KAAK,IAAI,MAAM,EAAE,CAE3B;IAED,IAAW,QAAQ,IAAI,MAAM,EAAE,CAU9B;IAEM,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAOlE,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAsBpC,OAAO,CAAC,eAAe;IAIvB,OAAO,CAAC,iBAAiB;IAIlB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO;IAmBjD,OAAO,CAAC,OAAO,CAAc;IAE7B,IAAW,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC,CAE/B;IAEM,SAAS,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;IAIpC,IAAI,CAAC,OAAO,EAAE,GAAG;IAIxB,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG;IA2BlC,iBAAiB,CAAC,IAAI,EAAE,GAAG;IAW3B,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG;IAmBhC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;IAwDpD,OAAO,CAAC,SAAS;IAMjB,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,aAAa;IAOrB,OAAO,CAAC,cAAc;IAItB,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,uBAAuB;IAa/B,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,cAAc;IAuBtB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,YAAY;IA+BpB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,WAAW;CAyBpB"}

17
dist/index.js vendored
View File

@ -38,7 +38,7 @@ class DHTCache extends events_1.default {
this.flood.on("peer-open", (peer) => this.addPeerHandler(peer));
this.flood.on("peer-remove", (peer) => this.removePeerHandler(peer));
this.flood.on("message", (message, id) => this.onGetBroadcast(message, id));
this.swarm.on("connection", (peer) => this.flood.send(peer, Buffer.from("hello"), 0));
this.swarm.on("connection", (peer) => this.flood.send(peer, b4a_1.default.from("hello"), 0));
[...this.swarm.peers.values()]
.map((item) => {
remotePublicKey: item.publicKey;
@ -64,10 +64,16 @@ class DHTCache extends events_1.default {
}
return items.sort();
}
peerHasItem(peer, item) {
peer = this._maybeHexify(peer);
item = this._maybeHexify(item);
return this.graph.hasSuccessor(peer, item);
}
addItem(item) {
item = this._maybeHexify(item);
this._cache.add(item);
this._ensureItem(item);
this._addEntityConnection(this.id, item);
const broadcast = () => {
this._broadcastMessage({
type: messages_js_1.Type.ADD_ITEM,
@ -173,22 +179,24 @@ class DHTCache extends events_1.default {
if (messages_js_1.Type.ADD_ITEM === type) {
this._ensureItem(bufData);
this._addEntityConnection(id, bufData);
this.emit("item-added", id, bufData);
}
if (messages_js_1.Type.REMOVE_ITEM === type) {
this.removeItem(bufData);
this._pruneItems();
this.emit("item-removed", id, bufData);
}
}
}
else if (type === messages_js_1.Type.CONNECTED) {
const { id: toId } = decoded;
this._addEntityConnection(id, Buffer.from(toId));
this._addEntityConnection(id, b4a_1.default.from(toId));
this.emit("peer-add-seen", id, toId);
this._recalculate();
}
else if (type === messages_js_1.Type.DISCONNECTED) {
const { id: toId } = decoded;
this._removeEntityConnection(id, Buffer.from(toId));
this._removeEntityConnection(id, b4a_1.default.from(toId));
this.emit("peer-remove-seen", id, toId);
this._recalculate();
}
@ -272,7 +280,8 @@ class DHTCache extends events_1.default {
}
const connectedTo = this.graph
.neighbors(id)
.map((id) => Buffer.from(id, "hex"));
.filter((item) => this.graph.node.get(item)?.type === EntityType.PUBKEY)
.map((id) => b4a_1.default.from(id, "hex"));
state[id] = { connectedTo };
}
return state;

21
src/index.ts
View File

@ -56,7 +56,7 @@ export default class DHTCache extends EventEmitter {
this.flood.on("message", (message, id) => this.onGetBroadcast(message, id));
this.swarm.on("connection", (peer: any) =>
this.flood.send(peer, Buffer.from("hello"), 0)
this.flood.send(peer, b4a.from("hello"), 0)
);
[...this.swarm.peers.values()]
@ -89,11 +89,19 @@ export default class DHTCache extends EventEmitter {
return items.sort();
}
public peerHasItem(peer: string | Buffer, item: string | Buffer): boolean {
peer = this._maybeHexify(peer);
item = this._maybeHexify(item);
return this.graph.hasSuccessor(peer, item);
}
public addItem(item: string | Buffer) {
item = this._maybeHexify(item);
this._cache.add(item);
this._ensureItem(item);
this._addEntityConnection(this.id, item);
const broadcast = () => {
this._broadcastMessage({
@ -228,21 +236,23 @@ export default class DHTCache extends EventEmitter {
if (Type.ADD_ITEM === type) {
this._ensureItem(bufData);
this._addEntityConnection(id, bufData);
this.emit("item-added", id, bufData);
}
if (Type.REMOVE_ITEM === type) {
this.removeItem(bufData);
this._pruneItems();
this.emit("item-removed", id, bufData);
}
}
} else if (type === Type.CONNECTED) {
const { id: toId } = decoded;
this._addEntityConnection(id, Buffer.from(toId as Uint8Array));
this._addEntityConnection(id, b4a.from(toId as Uint8Array) as Buffer);
this.emit("peer-add-seen", id, toId);
this._recalculate();
} else if (type === Type.DISCONNECTED) {
const { id: toId } = decoded;
this._removeEntityConnection(id, Buffer.from(toId as Uint8Array));
this._removeEntityConnection(id, b4a.from(toId as Uint8Array) as Buffer);
this.emit("peer-remove-seen", id, toId);
this._recalculate();
} else if (type === Type.BOOTSTRAP_REQUEST) {
@ -352,7 +362,10 @@ export default class DHTCache extends EventEmitter {
}
const connectedTo = this.graph
.neighbors(id)
.map((id: string) => Buffer.from(id, "hex"));
.filter(
(item: any) => this.graph.node.get(item)?.type === EntityType.PUBKEY
)
.map((id: string) => b4a.from(id, "hex"));
state[id] = { connectedTo };
}

32
test.js
View File

@ -13,7 +13,7 @@ sodium.crypto_generichash(item1, b4a.from("item1"));
sodium.crypto_generichash(item2, b4a.from("item2"));
test("Basic presence test / data propagation", (t) => {
t.plan(6);
t.plan(10);
const peer1 = createPeer();
const peer2 = createPeer();
@ -51,15 +51,39 @@ test("Basic presence test / data propagation", (t) => {
p1.removeListener("online", handleOnline);
p2.removeListener("online", handleOnline);
setTimeout(() => {
t.pass("Seeing everyone online");
t.equals(true, p2.allCache.includes(peerData1[0]));
let p1Resolve;
let p2Resolve;
let p1Promise = new Promise((resolve) => {
p1Resolve = resolve;
});
let p2Promise = new Promise((resolve) => {
p2Resolve = resolve;
});
p1.on("item-added", () => {
t.equals(true, p1.allCache.includes(peerData2[0]));
p1Resolve();
});
p2.on("item-added", () => {
t.equals(true, p2.allCache.includes(peerData1[0]));
p2Resolve();
});
Promise.all([p1Promise, p2Promise]).then(() => {
t.equals(true, p1.peerHasItem(peer1.keyPair.publicKey, item1));
t.equals(true, p2.peerHasItem(peer1.keyPair.publicKey, item1));
t.equals(true, p1.peerHasItem(peer2.keyPair.publicKey, item2));
t.equals(true, p2.peerHasItem(peer2.keyPair.publicKey, item2));
hasFinished = true;
peer2._allConnections.get(peer1.keyPair.publicKey).end();
}, 1000);
});
}
}