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

Compare commits

base: LumeWeb:90aeec6802219b61eb055561bf3e8356e68b30c0
Branches Tags
LumeWeb:master
..
compare: LumeWeb:4d6f9a81d5f30a3ad9445c917cc9b9a443f261f1
Branches Tags
LumeWeb:master

No commits in common. "90aeec6802219b61eb055561bf3e8356e68b30c0" and "4d6f9a81d5f30a3ad9445c917cc9b9a443f261f1" have entirely different histories.
90aeec6802 ... 4d6f9a81d5

4 changed files with 7 additions and 24 deletions
Show Stats Expand all files Collapse all files

3
dist/index.d.ts vendored
View File

@ -8,9 +8,8 @@ export default class DHTCache extends EventEmitter {
private bootstrapped;
private graph;
private connectedTo;
private heartBeatInterval;
protected flood: DHTFlood;
constructor(swarm: any, { id, heartBeatInterval, ...opts }?: {
constructor(swarm: any, { id, ...opts }?: {
id?: Buffer;
[key: string]: any;
});

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;IAC9B,OAAO,CAAC,iBAAiB,CAAS;IAElC,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAGxB,KAAK,EAAE,GAAG,EACV,EACE,EAA4B,EAC5B,iBAAsB,EACtB,GAAG,IAAI,EACR,GAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO;IAqC7C,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;IA2BjD,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,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAInC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG;IA6BlC,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;IAkEpD,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;IAwBtB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,YAAY;IA0CpB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,eAAe;IA0BvB,OAAO,CAAC,cAAc;CA2BvB"}
{"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;IAoC7C,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;IA2BjD,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,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG;IAInC,SAAS,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG;IA6BlC,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;IAkEpD,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;IAwBtB,OAAO,CAAC,iBAAiB;IAoBzB,OAAO,CAAC,YAAY;IAsCpB,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,WAAW;IA0BnB,OAAO,CAAC,eAAe;IAwBvB,OAAO,CAAC,cAAc;CA2BvB"}

13
dist/index.js vendored
View File

@ -22,9 +22,8 @@ class DHTCache extends events_1.default {
bootstrapped;
graph;
connectedTo;
heartBeatInterval;
flood;
constructor(swarm, { id = swarm.keyPair.publicKey, heartBeatInterval = 15, ...opts } = {}) {
constructor(swarm, { id = swarm.keyPair.publicKey, ...opts } = {}) {
super();
if (!id)
throw new TypeError("Must provide id for self");
@ -32,7 +31,6 @@ class DHTCache extends events_1.default {
this.bootstrapped = false;
this.graph = new jsnetworkx_1.DiGraph();
this.connectedTo = new Set();
this.heartBeatInterval = heartBeatInterval;
this._cache = new Set();
this._online = new Set([this._maybeHexify(this.id)]);
this.swarm = swarm;
@ -51,7 +49,7 @@ class DHTCache extends events_1.default {
});
this._ensurePeer(this.id);
setInterval(() => this._heartbeatCheck(), 5 * 1000);
setInterval(() => this._emitHeartbeat(), this.heartBeatInterval * 1000);
setInterval(() => this._emitHeartbeat(), 60 * 1000);
}
_cache;
get cache() {
@ -332,9 +330,6 @@ class DHTCache extends events_1.default {
this.graph.removeNode(id);
}
for (const id of online) {
if (b4a_1.default.equals(b4a_1.default.from(id, "hex"), this.id)) {
continue;
}
const item = this.graph.node.get(id);
if (!item?.online) {
online.delete(id);
@ -381,9 +376,7 @@ class DHTCache extends events_1.default {
const node = this.graph.node.get(peer);
const heartbeat = node?.heartbeat;
const conn = this.swarm._allConnections.get(pubkey);
const online = conn &&
heartbeat > 0 &&
Date.now() - heartbeat <= this.heartBeatInterval * 1000;
const online = conn && heartbeat > 0 && Date.now() - heartbeat <= 60 * 1000;
if (node?.online !== online) {
changed = true;
}

13
src/index.ts
View File

@ -29,7 +29,6 @@ export default class DHTCache extends EventEmitter {
private bootstrapped: boolean;
private graph: any;
private connectedTo: Set<any>;
private heartBeatInterval: number;
protected flood: DHTFlood;
@ -37,7 +36,6 @@ export default class DHTCache extends EventEmitter {
swarm: any,
{
id = swarm.keyPair.publicKey,
heartBeatInterval = 15,
...opts
}: { id?: Buffer; [key: string]: any } = {}
) {
@ -48,7 +46,6 @@ export default class DHTCache extends EventEmitter {
this.bootstrapped = false;
this.graph = new DiGraph();
this.connectedTo = new Set();
this.heartBeatInterval = heartBeatInterval;
this._cache = new Set();
this._online = new Set([this._maybeHexify(this.id)]);
this.swarm = swarm;
@ -73,7 +70,7 @@ export default class DHTCache extends EventEmitter {
this._ensurePeer(this.id);
setInterval(() => this._heartbeatCheck(), 5 * 1000);
setInterval(() => this._emitHeartbeat(), this.heartBeatInterval * 1000);
setInterval(() => this._emitHeartbeat(), 60 * 1000);
}
private _cache: Set<string>;
@ -426,10 +423,6 @@ export default class DHTCache extends EventEmitter {
}
for (const id of online) {
if (b4a.equals(b4a.from(id, "hex"), this.id)) {
continue;
}
const item = this.graph.node.get(id);
if (!item?.online) {
online.delete(id);
@ -485,9 +478,7 @@ export default class DHTCache extends EventEmitter {
const conn = this.swarm._allConnections.get(pubkey);
const online =
conn &&
heartbeat > 0 &&
Date.now() - heartbeat <= this.heartBeatInterval * 1000;
conn && heartbeat > 0 && Date.now() - heartbeat <= 60 * 1000;
if (node?.online !== online) {
changed = true;