@streamr/dht 100.0.0-pretestnet.2 → 100.0.0-pretestnet.3

package/dist/src/dht/routing/RoutingSession.js

@@ -14,25 +14,32 @@ const RouterRpcRemote_1 = require("./RouterRpcRemote");
 const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
 const proto_rpc_1 = require("@streamr/proto-rpc");
 const Contact_1 = require("../contact/Contact");
+const FindRpcRemote_1 = require("./FindRpcRemote");
+const Remote_1 = require("../contact/Remote");
+const getPreviousPeer_1 = require("./getPreviousPeer");
 const logger = new utils_1.Logger(module);
 const MAX_FAILED_HOPS = 2;
 class RemoteContact extends Contact_1.Contact {
-    constructor(peer, ownPeerDescriptor, rpcCommunicator) {
+    constructor(peer, localPeerDescriptor, rpcCommunicator) {
         super(peer.getPeerDescriptor());
-        this.router = new RouterRpcRemote_1.RouterRpcRemote(ownPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RouterRpcClient(rpcCommunicator.getRpcClientTransport())));
+        this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RouterRpcClient(rpcCommunicator.getRpcClientTransport())), Remote_1.EXISTING_CONNECTION_TIMEOUT);
+        this.findRpcRemote = new FindRpcRemote_1.FindRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.FindRpcClient(rpcCommunicator.getRpcClientTransport())), Remote_1.EXISTING_CONNECTION_TIMEOUT);
     }
-    getRouter() {
-        return this.router;
+    getRouterRpcRemote() {
+        return this.routerRpcRemote;
+    }
+    getFindRpcRemote() {
+        return this.findRpcRemote;
     }
 }
 var RoutingMode;
 (function (RoutingMode) {
     RoutingMode[RoutingMode["ROUTE"] = 0] = "ROUTE";
     RoutingMode[RoutingMode["FORWARD"] = 1] = "FORWARD";
-    RoutingMode[RoutingMode["RECURSIVE_FIND"] = 2] = "RECURSIVE_FIND";
+    RoutingMode[RoutingMode["FIND"] = 2] = "FIND";
 })(RoutingMode || (exports.RoutingMode = RoutingMode = {}));
 class RoutingSession extends eventemitter3_1.default {
-    constructor(rpcCommunicator, ownPeerDescriptor, messageToRoute, connections, parallelism, mode = RoutingMode.ROUTE, destinationId, excludedPeerIDs) {
+    constructor(rpcCommunicator, localPeerDescriptor, messageToRoute, connections, parallelism, mode = RoutingMode.ROUTE, excludedPeerIDs) {
         super();
         this.sessionId = (0, uuid_1.v4)();
         this.ongoingRequests = new Set();
@@ -40,140 +47,126 @@ class RoutingSession extends eventemitter3_1.default {
         this.successfulHopCounter = 0;
         this.mode = RoutingMode.ROUTE;
         this.stopped = false;
-        this.onRequestFailed = (peerId) => {
-            logger.trace('onRequestFailed() sessionId: ' + this.sessionId);
-            if (this.stopped) {
-                return;
-            }
-            if (this.ongoingRequests.has(peerId.toKey())) {
-                this.ongoingRequests.delete(peerId.toKey());
-            }
-            const contacts = this.findMoreContacts();
-            if (contacts.length < 1 && this.ongoingRequests.size < 1) {
-                logger.trace('routing failed, emitting routingFailed sessionId: ' + this.sessionId);
-                this.stopped = true;
-                this.emitFailure();
-            }
-            else {
-                this.failedHopCounter += 1;
-                logger.trace('routing failed, retrying to route sessionId: ' + this.sessionId + ' failedHopCounter: ' + this.failedHopCounter);
-                this.sendMoreRequests(contacts);
-            }
-        };
-        this.emitFailure = () => {
-            if (this.successfulHopCounter >= 1) {
-                this.emit('partialSuccess', this.sessionId);
-            }
-            else {
-                this.emit('routingFailed', this.sessionId);
-            }
-        };
-        this.onRequestSucceeded = () => {
-            logger.trace('onRequestSucceeded() sessionId: ' + this.sessionId);
-            if (this.stopped) {
-                return;
-            }
-            this.successfulHopCounter += 1;
-            const contacts = this.findMoreContacts();
-            if (this.successfulHopCounter >= this.parallelism || contacts.length < 1) {
-                this.stopped = true;
-                this.emit('routingSucceeded', this.sessionId);
-            }
-            else if (contacts.length > 0 && this.ongoingRequests.size < 1) {
-                this.sendMoreRequests(contacts);
-            }
-        };
-        this.sendRouteMessageRequest = async (contact) => {
-            if (this.stopped) {
-                return false;
-            }
-            const router = contact.getRouter();
-            if (this.mode === RoutingMode.FORWARD) {
-                return router.forwardMessage({
-                    ...this.messageToRoute,
-                    previousPeer: this.ownPeerDescriptor
-                });
-            }
-            else if (this.mode === RoutingMode.RECURSIVE_FIND) {
-                return router.findRecursively({
-                    ...this.messageToRoute,
-                    previousPeer: this.ownPeerDescriptor
-                });
-            }
-            else {
-                return router.routeMessage({
-                    ...this.messageToRoute,
-                    previousPeer: this.ownPeerDescriptor
-                });
-            }
-        };
-        this.findMoreContacts = () => {
-            logger.trace('findMoreContacts() sessionId: ' + this.sessionId);
-            // the contents of the connections might have changed between the rounds
-            // addContacts() will only add new contacts that were not there yet
-            const contacts = Array.from(this.connections.values())
-                .map((peer) => new RemoteContact(peer, this.ownPeerDescriptor, this.rpcCommunicator));
-            this.contactList.addContacts(contacts);
-            return this.contactList.getUncontactedContacts(this.parallelism);
-        };
-        this.sendMoreRequests = (uncontacted) => {
-            logger.trace('sendMoreRequests() sessionId: ' + this.sessionId);
-            if (this.stopped) {
-                return;
-            }
-            if (uncontacted.length < 1) {
-                this.emitFailure();
-                return;
-            }
-            if (this.failedHopCounter >= MAX_FAILED_HOPS) {
-                logger.trace(`Stopping routing after ${MAX_FAILED_HOPS} failed attempts for sessionId: ${this.sessionId}`);
-                this.emitFailure();
-                return;
-            }
-            while ((this.ongoingRequests.size) < this.parallelism && (uncontacted.length > 0) && !this.stopped) {
-                const nextPeer = uncontacted.shift();
-                // eslint-disable-next-line max-len
-                logger.trace(`Sending routeMessage request to contact: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
-                this.contactList.setContacted(nextPeer.getPeerId());
-                this.ongoingRequests.add(nextPeer.getPeerId().toKey());
-                setImmediate(async () => {
-                    try {
-                        const succeeded = await this.sendRouteMessageRequest(nextPeer);
-                        if (succeeded) {
-                            this.onRequestSucceeded();
-                        }
-                        else {
-                            this.onRequestFailed(nextPeer.getPeerId());
-                        }
-                    }
-                    catch (e) {
-                        logger.debug('Unable to route message ', { error: e });
-                    }
-                    finally {
-                        logger.trace('sendRouteMessageRequest returned');
-                    }
-                });
-            }
-        };
         this.rpcCommunicator = rpcCommunicator;
-        this.ownPeerDescriptor = ownPeerDescriptor;
+        this.localPeerDescriptor = localPeerDescriptor;
         this.messageToRoute = messageToRoute;
         this.connections = connections;
         this.parallelism = parallelism;
         this.mode = mode;
-        const previousId = messageToRoute.previousPeer ? PeerID_1.PeerID.fromValue(messageToRoute.previousPeer.kademliaId) : undefined;
-        this.contactList = new SortedContactList_1.SortedContactList(destinationId ? PeerID_1.PeerID.fromValue(destinationId) : PeerID_1.PeerID.fromValue(this.messageToRoute.destinationPeer.kademliaId), 10000, undefined, true, previousId, excludedPeerIDs);
+        const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(messageToRoute);
+        const previousId = previousPeer ? PeerID_1.PeerID.fromValue(previousPeer.kademliaId) : undefined;
+        this.contactList = new SortedContactList_1.SortedContactList(PeerID_1.PeerID.fromValue(this.messageToRoute.destinationPeer.kademliaId), 10000, undefined, true, previousId, excludedPeerIDs);
+    }
+    onRequestFailed(peerId) {
+        logger.trace('onRequestFailed() sessionId: ' + this.sessionId);
+        if (this.stopped) {
+            return;
+        }
+        if (this.ongoingRequests.has(peerId.toKey())) {
+            this.ongoingRequests.delete(peerId.toKey());
+        }
+        const contacts = this.findMoreContacts();
+        if (contacts.length === 0 && this.ongoingRequests.size === 0) {
+            logger.trace('routing failed, emitting routingFailed sessionId: ' + this.sessionId);
+            // TODO should call this.stop() so that we do cleanup? (after the emitFailure call)
+            this.stopped = true;
+            this.emitFailure();
+        }
+        else {
+            this.failedHopCounter += 1;
+            logger.trace('routing failed, retrying to route sessionId: ' + this.sessionId + ' failedHopCounter: ' + this.failedHopCounter);
+            this.sendMoreRequests(contacts);
+        }
+    }
+    emitFailure() {
+        if (this.successfulHopCounter >= 1) {
+            this.emit('partialSuccess', this.sessionId);
+        }
+        else {
+            this.emit('routingFailed', this.sessionId);
+        }
     }
-    start() {
-        logger.trace('start() sessionId: ' + this.sessionId);
+    onRequestSucceeded() {
+        logger.trace('onRequestSucceeded() sessionId: ' + this.sessionId);
+        if (this.stopped) {
+            return;
+        }
+        this.successfulHopCounter += 1;
         const contacts = this.findMoreContacts();
-        if (contacts.length < 1) {
-            logger.trace('start() throwing noCandidatesFound sessionId: ' + this.sessionId);
+        if (this.successfulHopCounter >= this.parallelism || contacts.length === 0) {
+            // TODO should call this.stop() so that we do cleanup? (after the routingSucceeded call)
             this.stopped = true;
-            this.emit('noCandidatesFound', this.sessionId);
-            throw new Error('noCandidatesFound ' + this.sessionId);
+            this.emit('routingSucceeded', this.sessionId);
+        }
+        else if (contacts.length > 0 && this.ongoingRequests.size === 0) {
+            this.sendMoreRequests(contacts);
+        }
+    }
+    async sendRouteMessageRequest(contact) {
+        if (this.stopped) {
+            return false;
+        }
+        const msg = {
+            ...this.messageToRoute,
+            routingPath: this.messageToRoute.routingPath.concat([this.localPeerDescriptor])
+        };
+        if (this.mode === RoutingMode.FORWARD) {
+            return contact.getRouterRpcRemote().forwardMessage(msg);
+        }
+        else if (this.mode === RoutingMode.FIND) {
+            return contact.getFindRpcRemote().routeFindRequest(msg);
+        }
+        else {
+            return contact.getRouterRpcRemote().routeMessage(msg);
+        }
+    }
+    findMoreContacts() {
+        logger.trace('findMoreContacts() sessionId: ' + this.sessionId);
+        // the contents of the connections might have changed between the rounds
+        // addContacts() will only add new contacts that were not there yet
+        const contacts = Array.from(this.connections.values())
+            .map((peer) => new RemoteContact(peer, this.localPeerDescriptor, this.rpcCommunicator));
+        this.contactList.addContacts(contacts);
+        return this.contactList.getUncontactedContacts(this.parallelism);
+    }
+    sendMoreRequests(uncontacted) {
+        logger.trace('sendMoreRequests() sessionId: ' + this.sessionId);
+        if (this.stopped) {
+            return;
+        }
+        if (uncontacted.length === 0) {
+            this.emitFailure();
+            return;
+        }
+        if (this.failedHopCounter >= MAX_FAILED_HOPS) {
+            logger.trace(`Stopping routing after ${MAX_FAILED_HOPS} failed attempts for sessionId: ${this.sessionId}`);
+            this.emitFailure();
+            return;
+        }
+        while ((this.ongoingRequests.size < this.parallelism) && (uncontacted.length > 0) && !this.stopped) {
+            const nextPeer = uncontacted.shift();
+            // eslint-disable-next-line max-len
+            logger.trace(`Sending routeMessage request to contact: ${(0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
+            this.contactList.setContacted(nextPeer.getPeerId());
+            this.ongoingRequests.add(nextPeer.getPeerId().toKey());
+            setImmediate(async () => {
+                try {
+                    const succeeded = await this.sendRouteMessageRequest(nextPeer);
+                    if (succeeded) {
+                        this.onRequestSucceeded();
+                    }
+                    else {
+                        this.onRequestFailed(nextPeer.getPeerId());
+                    }
+                }
+                catch (e) {
+                    logger.debug('Unable to route message ', { error: e });
+                }
+                finally {
+                    logger.trace('sendRouteMessageRequest returned');
+                }
+            });
         }
-        this.sendMoreRequests(contacts);
     }
     stop() {
         this.stopped = true;

package/dist/src/dht/routing/RoutingSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":";;;;;;AACA,oEAAgE;AAChE,iDAAwD;AACxD,qFAA8E;AAC9E,0CAAuC;AACvC,kEAAwC;AACxC,+BAAyB;AAEzB,uDAAmD;AAEnD,iFAA+E;AAC/E,kDAAqD;AACrD,gDAA4C;AAE5C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,eAAe,GAAG,CAAC,CAAA;AAEzB,MAAM,aAAc,SAAQ,iBAAO;IAI/B,YAAY,IAAmB,EAAE,iBAAiC,EAAE,eAAuC;QACvG,KAAK,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC/B,IAAI,CAAC,MAAM,GAAG,IAAI,iCAAe,CAC7B,iBAAiB,EACjB,IAAI,CAAC,iBAAiB,EAAE,EACxB,IAAI,CAAC,YAAY,EAAE,EACnB,IAAA,4BAAgB,EAAC,IAAI,+BAAe,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CACjF,CAAA;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,MAAM,CAAA;IACtB,CAAC;CACJ;AAeD,IAAY,WAA8C;AAA1D,WAAY,WAAW;IAAG,+CAAK,CAAA;IAAE,mDAAO,CAAA;IAAE,iEAAc,CAAA;AAAC,CAAC,EAA9C,WAAW,2BAAX,WAAW,QAAmC;AAE1D,MAAa,cAAe,SAAQ,uBAAkC;IAelE,YACI,eAAuC,EACvC,iBAAiC,EACjC,cAAmC,EACnC,WAA0C,EAC1C,WAAmB,EACnB,OAAoB,WAAW,CAAC,KAAK,EACrC,aAA0B,EAC1B,eAA0B;QAE1B,KAAK,EAAE,CAAA;QAvBK,cAAS,GAAG,IAAA,SAAE,GAAE,CAAA;QAExB,oBAAe,GAAmB,IAAI,GAAG,EAAE,CAAA;QAM3C,qBAAgB,GAAG,CAAC,CAAA;QACpB,yBAAoB,GAAG,CAAC,CAAA;QACf,SAAI,GAAgB,WAAW,CAAC,KAAK,CAAA;QAC9C,YAAO,GAAG,KAAK,CAAA;QA8Bf,oBAAe,GAAG,CAAC,MAAc,EAAE,EAAE;YACzC,MAAM,CAAC,KAAK,CAAC,+BAA+B,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9D,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAM;aACT;YACD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,EAAE;gBAC1C,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;aAC9C;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACxC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;gBACtD,MAAM,CAAC,KAAK,CAAC,oDAAoD,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;gBACnF,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;gBACnB,IAAI,CAAC,WAAW,EAAE,CAAA;aACrB;iBAAM;gBACH,IAAI,CAAC,gBAAgB,IAAI,CAAC,CAAA;gBAC1B,MAAM,CAAC,KAAK,CAAC,+CAA+C,GAAG,IAAI,CAAC,SAAS,GAAG,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAC9H,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;aAClC;QACL,CAAC,CAAA;QAEO,gBAAW,GAAG,GAAG,EAAE;YACvB,IAAI,IAAI,CAAC,oBAAoB,IAAI,CAAC,EAAE;gBAChC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;aAE9C;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;aAC7C;QACL,CAAC,CAAA;QAEO,uBAAkB,GAAG,GAAG,EAAE;YAC9B,MAAM,CAAC,KAAK,CAAC,kCAAkC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YACjE,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAM;aACT;YACD,IAAI,CAAC,oBAAoB,IAAI,CAAC,CAAA;YAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;YACxC,IAAI,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC,WAAW,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;gBACnB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;aAChD;iBAAM,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,GAAG,CAAC,EAAE;gBAC7D,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;aAClC;QACL,CAAC,CAAA;QAEO,4BAAuB,GAAG,KAAK,EAAE,OAAsB,EAAoB,EAAE;YACjF,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAO,KAAK,CAAA;aACf;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAA;YAClC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,OAAO,EAAE;gBACnC,OAAO,MAAM,CAAC,cAAc,CAAC;oBACzB,GAAG,IAAI,CAAC,cAAc;oBACtB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACvC,CAAC,CAAA;aACL;iBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,cAAc,EAAE;gBACjD,OAAO,MAAM,CAAC,eAAe,CAAC;oBAC1B,GAAG,IAAI,CAAC,cAAc;oBACtB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACvC,CAAC,CAAA;aACL;iBAAM;gBACH,OAAO,MAAM,CAAC,YAAY,CAAC;oBACvB,GAAG,IAAI,CAAC,cAAc;oBACtB,YAAY,EAAE,IAAI,CAAC,iBAAiB;iBACvC,CAAC,CAAA;aACL;QACL,CAAC,CAAA;QAEO,qBAAgB,GAAG,GAAoB,EAAE;YAC7C,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/D,wEAAwE;YACxE,mEAAmE;YACnE,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;iBACjD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAA;YACzF,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;YACtC,OAAO,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QACpE,CAAC,CAAA;QAEO,qBAAgB,GAAG,CAAC,WAA4B,EAAE,EAAE;YACxD,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAC/D,IAAI,IAAI,CAAC,OAAO,EAAE;gBACd,OAAM;aACT;YACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,IAAI,CAAC,WAAW,EAAE,CAAA;gBAClB,OAAM;aACT;YACD,IAAI,IAAI,CAAC,gBAAgB,IAAI,eAAe,EAAE;gBAC1C,MAAM,CAAC,KAAK,CAAC,0BAA0B,eAAe,mCAAmC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;gBAC1G,IAAI,CAAC,WAAW,EAAE,CAAA;gBAClB,OAAM;aACT;YACD,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAChG,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,CAAA;gBACpC,mCAAmC;gBACnC,MAAM,CAAC,KAAK,CAAC,4CAA4C,IAAA,gDAAqB,EAAC,QAAS,CAAC,iBAAiB,EAAE,CAAC,eAAe,IAAI,CAAC,SAAS,GAAG,CAAC,CAAA;gBAC9I,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,CAAA;gBACpD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC,CAAA;gBACvD,YAAY,CAAC,KAAK,IAAI,EAAE;oBACpB,IAAI;wBACA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,QAAS,CAAC,CAAA;wBAC/D,IAAI,SAAS,EAAE;4BACX,IAAI,CAAC,kBAAkB,EAAE,CAAA;yBAC5B;6BAAM;4BACH,IAAI,CAAC,eAAe,CAAC,QAAS,CAAC,SAAS,EAAE,CAAC,CAAA;yBAC9C;qBACJ;oBAAC,OAAO,CAAC,EAAE;wBACR,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;qBACzD;4BAAS;wBACN,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;qBACnD;gBACL,CAAC,CAAC,CAAA;aACL;QACL,CAAC,CAAA;QAjIG,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,MAAM,UAAU,GAAG,cAAc,CAAC,YAAY,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QACrH,IAAI,CAAC,WAAW,GAAG,IAAI,qCAAiB,CACpC,aAAa,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,eAAM,CAAC,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,eAAgB,CAAC,UAAU,CAAC,EACnH,KAAK,EACL,SAAS,EACT,IAAI,EACJ,UAAU,EACV,eAAe,CAClB,CAAA;IACL,CAAC;IAoHM,KAAK;QACR,MAAM,CAAC,KAAK,CAAC,qBAAqB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACxC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,CAAC,KAAK,CAAC,gDAAgD,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;YAE/E,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;YACnB,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;YAC9C,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,IAAI,CAAC,SAAS,CAAC,CAAA;SACzD;QACD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACnC,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAA;QAEvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAA;QACpC,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7B,CAAC;CAEJ;AAlLD,wCAkLC"}
+{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":"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"}

package/dist/src/dht/routing/getPreviousPeer.d.ts

@@ -0,0 +1,2 @@
+import { PeerDescriptor, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+export declare const getPreviousPeer: (routeMessage: RouteMessageWrapper) => PeerDescriptor | undefined;

package/dist/src/dht/routing/getPreviousPeer.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPreviousPeer = void 0;
+const lodash_1 = require("lodash");
+const getPreviousPeer = (routeMessage) => {
+    return (0, lodash_1.last)(routeMessage.routingPath);
+};
+exports.getPreviousPeer = getPreviousPeer;
+//# sourceMappingURL=getPreviousPeer.js.map

package/dist/src/dht/routing/getPreviousPeer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getPreviousPeer.js","sourceRoot":"","sources":["../../../../src/dht/routing/getPreviousPeer.ts"],"names":[],"mappings":";;;AAAA,mCAA6B;AAGtB,MAAM,eAAe,GAAG,CAAC,YAAiC,EAA8B,EAAE;IAC7F,OAAO,IAAA,aAAI,EAAC,YAAY,CAAC,WAAY,CAAC,CAAA;AAC1C,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B"}

package/dist/src/dht/store/StoreRpcLocal.d.ts

@@ -2,28 +2,30 @@ import { DeleteDataRequest, DeleteDataResponse, MigrateDataRequest, MigrateDataR
 import { Any } from '../../proto/google/protobuf/any';
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
-import { IRecursiveFinder } from '../find/RecursiveFinder';
+import { IFinder } from '../find/Finder';
 import { LocalDataStore } from './LocalDataStore';
 import { IStoreRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import EventEmitter from 'eventemitter3';
 import { Events } from '../DhtNode';
-import { RemoteDhtNode } from '../RemoteDhtNode';
+import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
+import { ServiceID } from '../../types/ServiceID';
 interface DataStoreConfig {
     rpcCommunicator: RoutingRpcCommunicator;
-    recursiveFinder: IRecursiveFinder;
-    ownPeerDescriptor: PeerDescriptor;
+    finder: IFinder;
+    localPeerDescriptor: PeerDescriptor;
     localDataStore: LocalDataStore;
-    serviceId: string;
+    serviceId: ServiceID;
     maxTtl: number;
     highestTtl: number;
     redundancyFactor: number;
     dhtNodeEmitter: EventEmitter<Events>;
-    getNodesClosestToIdFromBucket: (id: Uint8Array, n?: number) => RemoteDhtNode[];
+    getNodesClosestToIdFromBucket: (id: Uint8Array, n?: number) => DhtNodeRpcRemote[];
+    rpcRequestTimeout?: number;
 }
 export declare class StoreRpcLocal implements IStoreRpc {
     private readonly rpcCommunicator;
-    private readonly recursiveFinder;
-    private readonly ownPeerDescriptor;
+    private readonly finder;
+    private readonly localPeerDescriptor;
     private readonly localDataStore;
     private readonly serviceId;
     private readonly maxTtl;
@@ -31,6 +33,7 @@ export declare class StoreRpcLocal implements IStoreRpc {
     private readonly redundancyFactor;
     private readonly dhtNodeEmitter;
     private readonly getNodesClosestToIdFromBucket;
+    private readonly rpcRequestTimeout?;
     constructor(config: DataStoreConfig);
     private shouldMigrateDataToNewNode;
     private migrateDataToContact;

package/dist/src/dht/store/StoreRpcLocal.js

@@ -15,14 +15,15 @@ const logger = new utils_1.Logger(module);
 class StoreRpcLocal {
     constructor(config) {
         this.rpcCommunicator = config.rpcCommunicator;
-        this.recursiveFinder = config.recursiveFinder;
-        this.ownPeerDescriptor = config.ownPeerDescriptor;
+        this.finder = config.finder;
+        this.localPeerDescriptor = config.localPeerDescriptor;
         this.localDataStore = config.localDataStore;
         this.serviceId = config.serviceId;
         this.maxTtl = config.maxTtl;
         this.highestTtl = config.highestTtl;
         this.redundancyFactor = config.redundancyFactor;
         this.dhtNodeEmitter = config.dhtNodeEmitter;
+        this.rpcRequestTimeout = config.rpcRequestTimeout;
         this.getNodesClosestToIdFromBucket = config.getNodesClosestToIdFromBucket;
         this.rpcCommunicator.registerRpcMethod(DhtRpc_1.StoreDataRequest, DhtRpc_1.StoreDataResponse, 'storeData', (request, context) => this.storeData(request, context));
         this.rpcCommunicator.registerRpcMethod(DhtRpc_1.MigrateDataRequest, DhtRpc_1.MigrateDataResponse, 'migrateData', (request, context) => this.migrateData(request, context));
@@ -40,16 +41,16 @@ class StoreRpcLocal {
     shouldMigrateDataToNewNode(dataEntry, newNode) {
         const dataId = PeerID_1.PeerID.fromValue(dataEntry.kademliaId);
         const newNodeId = PeerID_1.PeerID.fromValue(newNode.kademliaId);
-        const ownPeerId = PeerID_1.PeerID.fromValue(this.ownPeerDescriptor.kademliaId);
+        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
         const closestToData = this.getNodesClosestToIdFromBucket(dataEntry.kademliaId, 10);
         const sortedList = new SortedContactList_1.SortedContactList(dataId, 20, undefined, true);
-        sortedList.addContact(new Contact_1.Contact(this.ownPeerDescriptor));
+        sortedList.addContact(new Contact_1.Contact(this.localPeerDescriptor));
         closestToData.forEach((con) => {
             if (!newNodeId.equals(PeerID_1.PeerID.fromValue(con.getPeerDescriptor().kademliaId))) {
                 sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor()));
             }
         });
-        if (!sortedList.getAllContacts()[0].getPeerId().equals(ownPeerId)) {
+        if (!sortedList.getAllContacts()[0].getPeerId().equals(localPeerId)) {
             // If we are not the closes node to the data, do not migrate
             return false;
         }
@@ -74,7 +75,7 @@ class StoreRpcLocal {
         }
     }
     async migrateDataToContact(dataEntry, contact, doNotConnect = false) {
-        const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.ownPeerDescriptor, contact, this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+        const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.localPeerDescriptor, contact, this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.rpcRequestTimeout);
         try {
             const response = await rpcRemote.migrateData({ dataEntry }, doNotConnect);
             if (response.error) {
@@ -87,16 +88,16 @@ class StoreRpcLocal {
     }
     async storeDataToDht(key, data) {
         logger.debug(`Storing data to DHT ${this.serviceId}`);
-        const result = await this.recursiveFinder.startRecursiveFind(key);
+        const result = await this.finder.startFind(key);
         const closestNodes = result.closestNodes;
         const successfulNodes = [];
         const ttl = this.highestTtl; // ToDo: make TTL decrease according to some nice curve
         const storerTime = timestamp_1.Timestamp.now();
         for (let i = 0; i < closestNodes.length && successfulNodes.length < this.redundancyFactor; i++) {
-            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, closestNodes[i])) {
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, closestNodes[i])) {
                 this.localDataStore.storeEntry({
                     kademliaId: key,
-                    storer: this.ownPeerDescriptor,
+                    storer: this.localPeerDescriptor,
                     ttl,
                     storedAt: timestamp_1.Timestamp.now(),
                     data,
@@ -107,7 +108,7 @@ class StoreRpcLocal {
                 successfulNodes.push(closestNodes[i]);
                 continue;
             }
-            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.ownPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.localPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.rpcRequestTimeout);
             try {
                 const response = await rpcRemote.storeData({ kademliaId: key, data, ttl, storerTime });
                 if (!response.error) {
@@ -125,25 +126,25 @@ class StoreRpcLocal {
         return successfulNodes;
     }
     selfIsOneOfClosestPeers(dataId) {
-        const ownPeerId = PeerID_1.PeerID.fromValue(this.ownPeerDescriptor.kademliaId);
+        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
         const closestPeers = this.getNodesClosestToIdFromBucket(dataId, this.redundancyFactor);
-        const sortedList = new SortedContactList_1.SortedContactList(ownPeerId, this.redundancyFactor, undefined, true);
-        sortedList.addContact(new Contact_1.Contact(this.ownPeerDescriptor));
+        const sortedList = new SortedContactList_1.SortedContactList(localPeerId, this.redundancyFactor, undefined, true);
+        sortedList.addContact(new Contact_1.Contact(this.localPeerDescriptor));
         closestPeers.forEach((con) => sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor())));
-        return sortedList.getClosestContacts().some((node) => node.getPeerId().equals(ownPeerId));
+        return sortedList.getClosestContacts().some((node) => node.getPeerId().equals(localPeerId));
     }
     async deleteDataFromDht(key) {
         logger.debug(`Deleting data from DHT ${this.serviceId}`);
-        const result = await this.recursiveFinder.startRecursiveFind(key);
+        const result = await this.finder.startFind(key);
         const closestNodes = result.closestNodes;
         const successfulNodes = [];
         for (let i = 0; i < closestNodes.length && successfulNodes.length < this.redundancyFactor; i++) {
-            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.ownPeerDescriptor, closestNodes[i])) {
-                this.localDataStore.markAsDeleted(key, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.ownPeerDescriptor));
+            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, closestNodes[i])) {
+                this.localDataStore.markAsDeleted(key, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor));
                 successfulNodes.push(closestNodes[i]);
                 continue;
             }
-            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.ownPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())));
+            const rpcRemote = new StoreRpcRemote_1.StoreRpcRemote(this.localPeerDescriptor, closestNodes[i], this.serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.StoreRpcClient(this.rpcCommunicator.getRpcClientTransport())), this.rpcRequestTimeout);
             try {
                 const response = await rpcRemote.deleteData({ kademliaId: key });
                 if (response.deleted) {
@@ -203,21 +204,21 @@ class StoreRpcLocal {
     }
     migrateDataToNeighborsIfNeeded(incomingPeer, dataEntry) {
         // sort own contact list according to data id
-        const ownPeerId = PeerID_1.PeerID.fromValue(this.ownPeerDescriptor.kademliaId);
+        const localPeerId = PeerID_1.PeerID.fromValue(this.localPeerDescriptor.kademliaId);
         const dataId = PeerID_1.PeerID.fromValue(dataEntry.kademliaId);
         const incomingPeerId = PeerID_1.PeerID.fromValue(incomingPeer.kademliaId);
         const closestToData = this.getNodesClosestToIdFromBucket(dataEntry.kademliaId, 10);
         const sortedList = new SortedContactList_1.SortedContactList(dataId, this.redundancyFactor, undefined, true);
-        sortedList.addContact(new Contact_1.Contact(this.ownPeerDescriptor));
+        sortedList.addContact(new Contact_1.Contact(this.localPeerDescriptor));
         closestToData.forEach((con) => {
             sortedList.addContact(new Contact_1.Contact(con.getPeerDescriptor()));
         });
-        if (!sortedList.getAllContacts()[0].getPeerId().equals(ownPeerId)) {
+        if (!sortedList.getAllContacts()[0].getPeerId().equals(localPeerId)) {
             // If we are not the closest node to the data, migrate only to the 
             // closest one to the data
             const contact = sortedList.getAllContacts()[0];
             const contactPeerId = PeerID_1.PeerID.fromValue(contact.getPeerDescriptor().kademliaId);
-            if (!incomingPeerId.equals(contactPeerId) && !ownPeerId.equals(contactPeerId)) {
+            if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
                 setImmediate(async () => {
                     try {
                         await this.migrateDataToContact(dataEntry, contact.getPeerDescriptor());
@@ -233,8 +234,8 @@ class StoreRpcLocal {
             // if we are the closest to the data, migrate to all storageRedundancyFactor nearest
             sortedList.getAllContacts().forEach((contact) => {
                 const contactPeerId = PeerID_1.PeerID.fromValue(contact.getPeerDescriptor().kademliaId);
-                if (!incomingPeerId.equals(contactPeerId) && !ownPeerId.equals(contactPeerId)) {
-                    if (!incomingPeerId.equals(contactPeerId) && !ownPeerId.equals(contactPeerId)) {
+                if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
+                    if (!incomingPeerId.equals(contactPeerId) && !localPeerId.equals(contactPeerId)) {
                         setImmediate(async () => {
                             try {
                                 await this.migrateDataToContact(dataEntry, contact.getPeerDescriptor());

package/dist/src/dht/store/StoreRpcLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"StoreRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcLocal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StoreRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcLocal.ts"],"names":[],"mappings":"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"}

package/dist/src/dht/store/StoreRpcRemote.js

@@ -5,9 +5,7 @@ const Remote_1 = require("../contact/Remote");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
 class StoreRpcRemote extends Remote_1.Remote {
     async storeData(request) {
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             return await this.getClient().storeData(request, options);
         }
@@ -18,9 +16,7 @@ class StoreRpcRemote extends Remote_1.Remote {
         }
     }
     async deleteData(request) {
-        const options = this.formDhtRpcOptions({
-            timeout: 10000
-        });
+        const options = this.formDhtRpcOptions();
         try {
             return await this.getClient().deleteData(request, options);
         }
@@ -30,7 +26,7 @@ class StoreRpcRemote extends Remote_1.Remote {
     }
     async migrateData(request, doNotConnect = false) {
         const options = this.formDhtRpcOptions({
-            timeout: 10000,
+            timeout: Remote_1.EXISTING_CONNECTION_TIMEOUT,
             doNotConnect
         });
         return this.getClient().migrateData(request, options);

package/dist/src/dht/store/StoreRpcRemote.js.map

@@ -1 +1 @@
-{"version":3,"file":"StoreRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcRemote.ts"],"names":[],"mappings":";;;AAAA,8CAA0C;AAU1C,qFAA8E;AAE9E,MAAa,cAAe,SAAQ,eAAuB;IAEvD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAC1D,MAAM,IAAI,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAA;YACjE,MAAM,KAAK,CACP,2BAA2B,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CACtD,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC7D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,CACP,iCAAiC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,EAAE,CAC5F,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAA2B,EAAE,eAAwB,KAAK;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,YAAY;SACf,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC;CAEJ;AAtCD,wCAsCC"}
+{"version":3,"file":"StoreRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/store/StoreRpcRemote.ts"],"names":[],"mappings":";;;AAAA,8CAAuE;AAUvE,qFAA8E;AAE9E,MAAa,cAAe,SAAQ,eAAuB;IAEvD,KAAK,CAAC,SAAS,CAAC,OAAyB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC5D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,EAAE,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAC1D,MAAM,IAAI,GAAG,IAAA,gDAAqB,EAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC,CAAA;YACjE,MAAM,KAAK,CACP,2BAA2B,EAAE,SAAS,IAAI,IAAI,GAAG,EAAE,CACtD,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,OAA0B;QACvC,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAA;QACxC,IAAI;YACA,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;SAC7D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,KAAK,CACP,iCAAiC,IAAA,gDAAqB,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,GAAG,EAAE,CAC5F,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAA2B,EAAE,eAAwB,KAAK;QACxE,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,oCAA2B;YACpC,YAAY;SACf,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC;CAEJ;AAlCD,wCAkCC"}