@waku/core 0.0.34-c41b319.0 → 0.0.34-c43cec2.0

package/bundle/{base_protocol-CCK9RCtH.js → base_protocol-DxFKDXX2.js}

@@ -1,4 +1,4 @@
-import { L as Logger } from './index-Db7LxDrL.js';
+import { L as Logger } from './index-yLOEQnIE.js';
 
 function selectOpenConnection(connections) {
     return connections
@@ -22,36 +22,36 @@ class StreamManager {
         this.log = new Logger(`stream-manager:${multicodec}`);
         this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
     }
-    async getStream(peerId) {
-        const peerIdStr = peerId.toString();
-        const scheduledStream = this.streamPool.get(peerIdStr);
+    async getStream(peer) {
+        const peerId = peer.id.toString();
+        const scheduledStream = this.streamPool.get(peerId);
         if (scheduledStream) {
-            this.streamPool.delete(peerIdStr);
+            this.streamPool.delete(peerId);
             await scheduledStream;
         }
-        let stream = this.getOpenStreamForCodec(peerId);
+        let stream = this.getOpenStreamForCodec(peer.id);
         if (stream) {
-            this.log.info(`Found existing stream peerId=${peerIdStr} multicodec=${this.multicodec}`);
-            this.lockStream(peerIdStr, stream);
+            this.log.info(`Found existing stream peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
+            this.lockStream(peer.id.toString(), stream);
             return stream;
         }
-        stream = await this.createStream(peerId);
-        this.lockStream(peerIdStr, stream);
+        stream = await this.createStream(peer);
+        this.lockStream(peer.id.toString(), stream);
         return stream;
     }
-    async createStream(peerId, retries = 0) {
-        const connections = this.getConnections(peerId);
+    async createStream(peer, retries = 0) {
+        const connections = this.getConnections(peer.id);
         const connection = selectOpenConnection(connections);
         if (!connection) {
-            throw new Error(`Failed to get a connection to the peer peerId=${peerId.toString()} multicodec=${this.multicodec}`);
+            throw new Error(`Failed to get a connection to the peer peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
         }
         let lastError;
         let stream;
         for (let i = 0; i < retries + 1; i++) {
             try {
-                this.log.info(`Attempting to create a stream for peerId=${peerId.toString()} multicodec=${this.multicodec}`);
+                this.log.info(`Attempting to create a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
                 stream = await connection.newStream(this.multicodec);
-                this.log.info(`Created stream for peerId=${peerId.toString()} multicodec=${this.multicodec}`);
+                this.log.info(`Created stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`);
                 break;
             }
             catch (error) {
@@ -59,7 +59,8 @@ class StreamManager {
             }
         }
         if (!stream) {
-            throw new Error(`Failed to create a new stream for ${peerId.toString()} -- ` + lastError);
+            throw new Error(`Failed to create a new stream for ${peer.id.toString()} -- ` +
+                lastError);
         }
         return stream;
     }
@@ -71,7 +72,7 @@ class StreamManager {
         }
         try {
             this.ongoingCreation.add(peerId);
-            await this.createStream(peer.id);
+            await this.createStream(peer);
         }
         catch (error) {
             this.log.error(`Failed to createStreamWithLock:`, error);
@@ -144,8 +145,8 @@ class BaseProtocol {
         this.removeLibp2pEventListener = components.events.removeEventListener.bind(components.events);
         this.streamManager = new StreamManager(multicodec, components.connectionManager.getConnections.bind(components.connectionManager), this.addLibp2pEventListener);
     }
-    async getStream(peerId) {
-        return this.streamManager.getStream(peerId);
+    async getStream(peer) {
+        return this.streamManager.getStream(peer);
     }
 }
 

package/bundle/{index-Db7LxDrL.js → index-yLOEQnIE.js}

@@ -1,16 +1,3 @@
-function equals(aa, bb) {
-    if (aa === bb)
-        return true;
-    if (aa.byteLength !== bb.byteLength) {
-        return false;
-    }
-    for (let ii = 0; ii < aa.byteLength; ii++) {
-        if (aa[ii] !== bb[ii]) {
-            return false;
-        }
-    }
-    return true;
-}
 function coerce(o) {
     if (o instanceof Uint8Array && o.constructor.name === 'Uint8Array')
         return o;
@@ -759,10 +746,6 @@ var EConnectionStateEvents;
     EConnectionStateEvents["CONNECTION_STATUS"] = "waku:connection";
 })(EConnectionStateEvents || (EConnectionStateEvents = {}));
 
-var HealthStatusChangeEvents;
-(function (HealthStatusChangeEvents) {
-    HealthStatusChangeEvents["StatusChange"] = "health:change";
-})(HealthStatusChangeEvents || (HealthStatusChangeEvents = {}));
 var HealthStatus;
 (function (HealthStatus) {
     HealthStatus["Unhealthy"] = "Unhealthy";
@@ -1114,62 +1097,24 @@ function setup(env) {
 		createDebug.names = [];
 		createDebug.skips = [];
 
-		const split = (typeof namespaces === 'string' ? namespaces : '')
-			.trim()
-			.replace(' ', ',')
-			.split(',')
-			.filter(Boolean);
+		let i;
+		const split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
+		const len = split.length;
 
-		for (const ns of split) {
-			if (ns[0] === '-') {
-				createDebug.skips.push(ns.slice(1));
-			} else {
-				createDebug.names.push(ns);
+		for (i = 0; i < len; i++) {
+			if (!split[i]) {
+				// ignore empty strings
+				continue;
 			}
-		}
-	}
 
-	/**
-	 * Checks if the given string matches a namespace template, honoring
-	 * asterisks as wildcards.
-	 *
-	 * @param {String} search
-	 * @param {String} template
-	 * @return {Boolean}
-	 */
-	function matchesTemplate(search, template) {
-		let searchIndex = 0;
-		let templateIndex = 0;
-		let starIndex = -1;
-		let matchIndex = 0;
-
-		while (searchIndex < search.length) {
-			if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === '*')) {
-				// Match character or proceed with wildcard
-				if (template[templateIndex] === '*') {
-					starIndex = templateIndex;
-					matchIndex = searchIndex;
-					templateIndex++; // Skip the '*'
-				} else {
-					searchIndex++;
-					templateIndex++;
-				}
-			} else if (starIndex !== -1) { // eslint-disable-line no-negated-condition
-				// Backtrack to the last '*' and try to match more characters
-				templateIndex = starIndex + 1;
-				matchIndex++;
-				searchIndex = matchIndex;
+			namespaces = split[i].replace(/\*/g, '.*?');
+
+			if (namespaces[0] === '-') {
+				createDebug.skips.push(new RegExp('^' + namespaces.slice(1) + '$'));
 			} else {
-				return false; // No match
+				createDebug.names.push(new RegExp('^' + namespaces + '$'));
 			}
 		}
-
-		// Handle trailing '*' in template
-		while (templateIndex < template.length && template[templateIndex] === '*') {
-			templateIndex++;
-		}
-
-		return templateIndex === template.length;
 	}
 
 	/**
@@ -1180,8 +1125,8 @@ function setup(env) {
 	*/
 	function disable() {
 		const namespaces = [
-			...createDebug.names,
-			...createDebug.skips.map(namespace => '-' + namespace)
+			...createDebug.names.map(toNamespace),
+			...createDebug.skips.map(toNamespace).map(namespace => '-' + namespace)
 		].join(',');
 		createDebug.enable('');
 		return namespaces;
@@ -1195,14 +1140,21 @@ function setup(env) {
 	* @api public
 	*/
 	function enabled(name) {
-		for (const skip of createDebug.skips) {
-			if (matchesTemplate(name, skip)) {
+		if (name[name.length - 1] === '*') {
+			return true;
+		}
+
+		let i;
+		let len;
+
+		for (i = 0, len = createDebug.skips.length; i < len; i++) {
+			if (createDebug.skips[i].test(name)) {
 				return false;
 			}
 		}
 
-		for (const ns of createDebug.names) {
-			if (matchesTemplate(name, ns)) {
+		for (i = 0, len = createDebug.names.length; i < len; i++) {
+			if (createDebug.names[i].test(name)) {
 				return true;
 			}
 		}
@@ -1210,6 +1162,19 @@ function setup(env) {
 		return false;
 	}
 
+	/**
+	* Convert regexp to namespace
+	*
+	* @param {RegExp} regxep
+	* @return {String} namespace
+	* @api private
+	*/
+	function toNamespace(regexp) {
+		return regexp.toString()
+			.substring(2, regexp.toString().length - 2)
+			.replace(/\.\*\?$/, '*');
+	}
+
 	/**
 	* Coerce `val`.
 	*
@@ -1371,7 +1336,6 @@ var common = setup;
 
 		// Is webkit? http://stackoverflow.com/a/16459606/376773
 		// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
-		// eslint-disable-next-line no-return-assign
 		return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
 			// Is firebug? http://stackoverflow.com/a/398120/376773
 			(typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||
@@ -1545,4 +1509,4 @@ class Logger {
     }
 }
 
-export { EPeersByDiscoveryEvents as E, Logger as L, ProtocolError as P, Tags as T, base32 as a, base36 as b, coerce as c, base58btc as d, equals as e, EConnectionStateEvents as f, base2$1 as g, base8$1 as h, identityBase as i, base10$1 as j, base16$1 as k, base32$1 as l, base36$1 as m, base58 as n, base64$1 as o, base256emoji$1 as p };
+export { EPeersByDiscoveryEvents as E, HealthStatus as H, Logger as L, ProtocolError as P, Tags as T, EConnectionStateEvents as a, Protocols as b, base2$1 as c, base8$1 as d, base10$1 as e, base16$1 as f, base32$1 as g, base36$1 as h, identityBase as i, base58 as j, base64$1 as k, base256emoji$1 as l };