@streamr/dht 100.0.0-pretestnet.6 → 100.0.0-testnet-one.1

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

@@ -1,5 +1,5 @@
 import { ConnectionManager } from '../../connection/ConnectionManager';
-import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
+import { PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
 import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
 import { DuplicateDetector } from './DuplicateDetector';
 import { RoutingMode } from './RoutingSession';
@@ -11,7 +11,7 @@ interface RouterRpcLocalConfig {
     localPeerDescriptor: PeerDescriptor;
     connectionManager?: ConnectionManager;
 }
-export declare const createRouteMessageAck: (routedMessage: RouteMessageWrapper, error?: string) => RouteMessageAck;
+export declare const createRouteMessageAck: (routedMessage: RouteMessageWrapper, error?: RouteMessageError) => RouteMessageAck;
 export declare class RouterRpcLocal implements IRouterRpc {
     private readonly config;
     constructor(config: RouterRpcLocalConfig);

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

@@ -3,12 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterRpcLocal = exports.createRouteMessageAck = void 0;
 const utils_1 = require("@streamr/utils");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const RoutingSession_1 = require("./RoutingSession");
 const logger = new utils_1.Logger(module);
 const createRouteMessageAck = (routedMessage, error) => {
     const ack = {
         requestId: routedMessage.requestId,
-        error: error ? error : ''
+        error
     };
     return ack;
 };
@@ -21,7 +22,7 @@ class RouterRpcLocal {
         if (this.config.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
             logger.trace(`Routing message ${routedMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer)} `
                 + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(routedMessage.destinationPeer)} is likely a duplicate`);
-            return (0, exports.createRouteMessageAck)(routedMessage, 'message given to routeMessage() service is likely a duplicate');
+            return (0, exports.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
         }
         logger.trace(`Processing received routeMessage ${routedMessage.requestId}`);
         this.config.addContact(routedMessage.sourcePeer, true);
@@ -40,7 +41,7 @@ class RouterRpcLocal {
         if (this.config.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
             logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(forwardMessage.sourcePeer)} `
                 + `to ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(forwardMessage.destinationPeer)} is likely a duplicate`);
-            return (0, exports.createRouteMessageAck)(forwardMessage, 'message given to forwardMessage() service is likely a duplicate');
+            return (0, exports.createRouteMessageAck)(forwardMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
         }
         logger.trace(`Processing received forward routeMessage ${forwardMessage.requestId}`);
         this.config.addContact(forwardMessage.sourcePeer, true);

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

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

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

@@ -1,7 +1,7 @@
 import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
 import { IRouterRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
-import { Remote } from '../contact/Remote';
-export declare class RouterRpcRemote extends Remote<IRouterRpcClient> {
+import { RpcRemote } from '../contact/RpcRemote';
+export declare class RouterRpcRemote extends RpcRemote<IRouterRpcClient> {
     routeMessage(params: RouteMessageWrapper): Promise<boolean>;
     forwardMessage(params: RouteMessageWrapper): Promise<boolean>;
 }

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

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterRpcRemote = void 0;
+const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
 const uuid_1 = require("uuid");
 const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
-const Remote_1 = require("../contact/Remote");
+const RpcRemote_1 = require("../contact/RpcRemote");
 const utils_1 = require("@streamr/utils");
 const getPreviousPeer_1 = require("./getPreviousPeer");
 const logger = new utils_1.Logger(module);
-class RouterRpcRemote extends Remote_1.Remote {
+class RouterRpcRemote extends RpcRemote_1.RpcRemote {
     async routeMessage(params) {
         const message = {
             destinationPeer: params.destinationPeer,
@@ -17,15 +18,17 @@ class RouterRpcRemote extends Remote_1.Remote {
             reachableThrough: params.reachableThrough ?? [],
             routingPath: params.routingPath
         };
-        const options = this.formDhtRpcOptions();
+        const options = this.formDhtRpcOptions({
+            doNotConnect: true
+        });
         try {
             const ack = await this.getClient().routeMessage(message, options);
             // Success signal if sent to destination and error includes duplicate
-            if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(params.destinationPeer, this.getPeerDescriptor())
-                && ack.error.includes('duplicate')) {
+            if (ack.error === DhtRpc_1.RouteMessageError.DUPLICATE
+                && (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(params.destinationPeer, this.getPeerDescriptor())) {
                 return true;
             }
-            else if (ack.error.length > 0) {
+            else if (ack.error !== undefined) {
                 return false;
             }
         }
@@ -48,10 +51,12 @@ class RouterRpcRemote extends Remote_1.Remote {
             reachableThrough: params.reachableThrough ?? [],
             routingPath: params.routingPath
         };
-        const options = this.formDhtRpcOptions();
+        const options = this.formDhtRpcOptions({
+            doNotConnect: true
+        });
         try {
             const ack = await this.getClient().forwardMessage(message, options);
-            if (ack.error.length > 0) {
+            if (ack.error !== undefined) {
                 return false;
             }
         }

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

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

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

@@ -42,7 +42,7 @@ export declare class RoutingSession extends EventEmitter<RoutingSessionEvents> {
     private emitFailure;
     private onRequestSucceeded;
     private sendRouteMessageRequest;
-    findMoreContacts(): RemoteContact[];
+    updateAndGetRoutablePeers(): RemoteContact[];
     sendMoreRequests(uncontacted: RemoteContact[]): void;
     stop(): void;
 }

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

@@ -15,15 +15,15 @@ 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 RpcRemote_1 = require("../contact/RpcRemote");
 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, localPeerDescriptor, rpcCommunicator) {
         super(peer.getPeerDescriptor());
-        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);
+        this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.RouterRpcClient(rpcCommunicator.getRpcClientTransport())), RpcRemote_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())), RpcRemote_1.EXISTING_CONNECTION_TIMEOUT);
     }
     getRouterRpcRemote() {
         return this.routerRpcRemote;
@@ -54,8 +54,15 @@ class RoutingSession extends eventemitter3_1.default {
         this.parallelism = parallelism;
         this.mode = mode;
         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);
+        const previousId = previousPeer ? PeerID_1.PeerID.fromValue(previousPeer.nodeId) : undefined;
+        this.contactList = new SortedContactList_1.SortedContactList({
+            referenceId: PeerID_1.PeerID.fromValue(this.messageToRoute.destinationPeer.nodeId),
+            maxSize: 10000,
+            allowToContainReferenceId: true,
+            peerIdDistanceLimit: previousId,
+            excludedPeerIDs: excludedPeerIDs,
+            emitEvents: false
+        });
     }
     onRequestFailed(peerId) {
         logger.trace('onRequestFailed() sessionId: ' + this.sessionId);
@@ -65,7 +72,7 @@ class RoutingSession extends eventemitter3_1.default {
         if (this.ongoingRequests.has(peerId.toKey())) {
             this.ongoingRequests.delete(peerId.toKey());
         }
-        const contacts = this.findMoreContacts();
+        const contacts = this.updateAndGetRoutablePeers();
         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)
@@ -92,7 +99,7 @@ class RoutingSession extends eventemitter3_1.default {
             return;
         }
         this.successfulHopCounter += 1;
-        const contacts = this.findMoreContacts();
+        const contacts = this.updateAndGetRoutablePeers();
         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;
@@ -120,10 +127,15 @@ class RoutingSession extends eventemitter3_1.default {
             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
+    updateAndGetRoutablePeers() {
+        logger.trace('getRoutablePeers() sessionId: ' + this.sessionId);
+        // Remove stale contacts that may have been removed from connections
+        this.contactList.getAllContacts().forEach((contact) => {
+            const peerId = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(contact.getPeerDescriptor());
+            if (this.connections.has(peerId.toKey()) === false) {
+                this.contactList.removeContact(peerId);
+            }
+        });
         const contacts = Array.from(this.connections.values())
             .map((peer) => new RemoteContact(peer, this.localPeerDescriptor, this.rpcCommunicator));
         this.contactList.addContacts(contacts);

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

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

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

@@ -1 +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"}
+{"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,WAAW,CAAC,CAAA;AACzC,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B"}

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

@@ -8,12 +8,12 @@ interface LocalDataEntry {
 export declare class LocalDataStore {
     private store;
     storeEntry(dataEntry: DataEntry): boolean;
-    markAsDeleted(id: Uint8Array, storer: PeerID): boolean;
+    markAsDeleted(id: Uint8Array, creator: PeerID): boolean;
     getStore(): Map<PeerIDKey, Map<PeerIDKey, LocalDataEntry>>;
     getEntry(key: PeerID): Map<PeerIDKey, DataEntry>;
-    setStale(key: PeerID, storer: PeerDescriptor, stale: boolean): void;
+    setStale(key: PeerID, creator: PeerDescriptor, stale: boolean): void;
     setAllEntriesAsStale(key: PeerID): void;
-    deleteEntry(key: PeerID, storer: PeerDescriptor): void;
+    deleteEntry(key: PeerID, creator: PeerDescriptor): void;
     clear(): void;
 }
 export {};

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

@@ -20,20 +20,20 @@ class LocalDataStore {
     constructor() {
         // A map into which each node can store one value per data key
         // The first key is the key of the data, the second key is the
-        // PeerID of the storer of the data
+        // PeerID of the creator of the data
         this.store = new Map();
     }
     storeEntry(dataEntry) {
-        const publisherKey = PeerID_1.PeerID.fromValue(dataEntry.storer.kademliaId).toKey();
-        const dataKey = PeerID_1.PeerID.fromValue(dataEntry.kademliaId).toKey();
+        const publisherKey = PeerID_1.PeerID.fromValue(dataEntry.creator.nodeId).toKey();
+        const dataKey = PeerID_1.PeerID.fromValue(dataEntry.key).toKey();
         if (!this.store.has(dataKey)) {
             this.store.set(dataKey, new Map());
         }
         if (this.store.get(dataKey).has(publisherKey)) {
-            const storedMillis = (dataEntry.storerTime.seconds * 1000) + (dataEntry.storerTime.nanos / 1000000);
+            const storedMillis = (dataEntry.createdAt.seconds * 1000) + (dataEntry.createdAt.nanos / 1000000);
             const oldLocalEntry = this.store.get(dataKey).get(publisherKey);
-            const oldStoredMillis = (oldLocalEntry.dataEntry.storerTime.seconds * 1000) + (oldLocalEntry.dataEntry.storerTime.nanos / 1000000);
-            // do nothing if old entry is newer than the one being migrated
+            const oldStoredMillis = (oldLocalEntry.dataEntry.createdAt.seconds * 1000) + (oldLocalEntry.dataEntry.createdAt.nanos / 1000000);
+            // do nothing if old entry is newer than the one being replicated
             if (oldStoredMillis >= storedMillis) {
                 return false;
             }
@@ -44,17 +44,18 @@ class LocalDataStore {
         this.store.get(dataKey).set(publisherKey, {
             dataEntry,
             ttlTimeout: setTimeout(() => {
-                this.deleteEntry(PeerID_1.PeerID.fromValue(dataEntry.kademliaId), dataEntry.storer);
+                this.deleteEntry(PeerID_1.PeerID.fromValue(dataEntry.key), dataEntry.creator);
             }, createTtlValue(dataEntry.ttl))
         });
         return true;
     }
-    markAsDeleted(id, storer) {
+    markAsDeleted(id, creator) {
         const dataKey = PeerID_1.PeerID.fromValue(id).toKey();
-        if (!this.store.get(dataKey)?.has(storer.toKey())) {
+        const item = this.store.get(dataKey);
+        if ((item === undefined) || !item.has(creator.toKey())) {
             return false;
         }
-        const storedEntry = this.store.get(dataKey).get(storer.toKey());
+        const storedEntry = item.get(creator.toKey());
         storedEntry.dataEntry.deleted = true;
         return true;
     }
@@ -68,9 +69,9 @@ class LocalDataStore {
         });
         return dataEntries;
     }
-    setStale(key, storer, stale) {
-        const storerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(storer);
-        const storedEntry = this.store.get(key.toKey())?.get(storerKey);
+    setStale(key, creator, stale) {
+        const creatorKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(creator);
+        const storedEntry = this.store.get(key.toKey())?.get(creatorKey);
         if (storedEntry) {
             storedEntry.dataEntry.stale = stale;
         }
@@ -80,12 +81,12 @@ class LocalDataStore {
             value.dataEntry.stale = true;
         });
     }
-    deleteEntry(key, storer) {
-        const storerKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(storer);
-        const storedEntry = this.store.get(key.toKey())?.get(storerKey);
+    deleteEntry(key, creator) {
+        const creatorKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(creator);
+        const storedEntry = this.store.get(key.toKey())?.get(creatorKey);
         if (storedEntry) {
             clearTimeout(storedEntry.ttlTimeout);
-            this.store.get(key.toKey())?.delete(storerKey);
+            this.store.get(key.toKey())?.delete(creatorKey);
             if (this.store.get(key.toKey())?.size === 0) {
                 this.store.delete(key.toKey());
             }

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

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

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

@@ -1,4 +1,4 @@
-import { DeleteDataRequest, DeleteDataResponse, MigrateDataRequest, MigrateDataResponse, PeerDescriptor, StoreDataRequest, StoreDataResponse } from '../../proto/packages/dht/protos/DhtRpc';
+import { ReplicateDataRequest, PeerDescriptor, StoreDataRequest, StoreDataResponse } from '../../proto/packages/dht/protos/DhtRpc';
 import { Any } from '../../proto/google/protobuf/any';
 import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
 import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
@@ -9,6 +9,7 @@ import EventEmitter from 'eventemitter3';
 import { Events } from '../DhtNode';
 import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
 import { ServiceID } from '../../types/ServiceID';
+import { Empty } from '../../proto/google/protobuf/empty';
 interface DataStoreConfig {
     rpcCommunicator: RoutingRpcCommunicator;
     finder: IFinder;
@@ -35,14 +36,14 @@ export declare class StoreRpcLocal implements IStoreRpc {
     private readonly getNodesClosestToIdFromBucket;
     private readonly rpcRequestTimeout?;
     constructor(config: DataStoreConfig);
-    private shouldMigrateDataToNewNode;
-    private migrateDataToContact;
-    storeDataToDht(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
+    private shouldReplicateDataToNewNode;
+    private replicateDataToContact;
+    storeDataToDht(key: Uint8Array, data: Any, creator: PeerDescriptor): Promise<PeerDescriptor[]>;
     private selfIsOneOfClosestPeers;
-    deleteDataFromDht(key: Uint8Array): Promise<void>;
-    storeData(request: StoreDataRequest, context: ServerCallContext): Promise<StoreDataResponse>;
-    deleteData(request: DeleteDataRequest, context: ServerCallContext): Promise<DeleteDataResponse>;
-    migrateData(request: MigrateDataRequest, context: ServerCallContext): Promise<MigrateDataResponse>;
-    private migrateDataToNeighborsIfNeeded;
+    storeData(request: StoreDataRequest): Promise<StoreDataResponse>;
+    destroy(): Promise<void>;
+    private replicateDataToClosestNodes;
+    replicateData(request: ReplicateDataRequest, context: ServerCallContext): Promise<Empty>;
+    private replicateDataToNeighborsIfNeeded;
 }
 export {};