@hive-p2p/server 1.0.31 → 1.0.33

package/core/node-services.mjs

@@ -121,11 +121,13 @@ export class NodeServices {
 	static deriveSTUNServers(bootstraps) {
 		/** @type {Array<{urls: string}>} */
 		const stunUrls = [];
-		for (const b of bootstraps) { // {urls: 'stun:42312:NaN'}
+		for (const b of bootstraps) {
 			if (!b.includes(':')) continue;
-			const url = b.replace('/ws', '/signal'); // in case someone put domain/ws
-			url.replace('/wss', '/signal'); // in case someone put domain/wss
-			url.replace('ws://', 'stun:');
+			if (b.endsWith('/ws') || b.endsWith('/wss')) continue; // ugly hardcode
+			// useless ? => proxy can't serve as stun server
+			//const url = b.replace('/ws', '/signal'); // in case someone put domain/ws
+			//url.replace('/wss', '/signal'); // in case someone put domain/wss
+			const url = b.replace('ws://', 'stun:');
 			url.replace('wss://', 'stun:');
 			if (!url.includes('stun:')) continue;
 			stunUrls.push({ urls: url });

package/core/node.mjs

@@ -17,12 +17,13 @@ import { NodeServices } from './node-services.mjs';
  * @param {number} [options.port] If provided, the node will listen on this port (default: SERVICE.PORT)
  * @param {number} [options.verbose] Verbosity level for logging (default: NODE.DEFAULT_VERBOSE) */
 export async function createPublicNode(options) {
-	await CLOCK.sync(this.verbose);
 	const verbose = options.verbose !== undefined ? options.verbose : NODE.DEFAULT_VERBOSE;
 	const domain = options.domain || undefined;
 	const codex = options.cryptoCodex || new CryptoCodex(undefined, verbose);
+	const clockSync = CLOCK.sync(verbose);
 	if (!codex.publicKey) await codex.generate(domain ? true : false);
 	
+	await clockSync;
 	const node = new Node(codex, options.bootstraps || [], verbose);
 	if (domain) {
 		node.services = new NodeServices(codex, node.peerStore, undefined, verbose);
@@ -42,8 +43,10 @@ export async function createPublicNode(options) {
 export async function createNode(options = {}) {
 	const verbose = options.verbose !== undefined ? options.verbose : NODE.DEFAULT_VERBOSE;
 	const codex = options.cryptoCodex || new CryptoCodex(undefined, verbose);
+	const clockSync = CLOCK.sync(verbose);
 	if (!codex.publicKey) await codex.generate(false);
 
+	await clockSync;
 	const node = new Node(codex, options.bootstraps || [], verbose);
 	if (options.autoStart !== false) await node.start();
 	return node;
@@ -136,6 +139,7 @@ export class Node {
 	}
 
 	// PUBLIC API
+	/** @returns {string | undefined} */
 	get publicUrl() { return this.services?.publicUrl; }
 
 	onMessageData(callback) { this.messager.on('message', callback); }
@@ -145,10 +149,13 @@ export class Node {
 		await CLOCK.sync(this.verbose);
 		this.started = true;
 		if (SIMULATION.AVOID_INTERVALS) return true; // SIMULATOR CASE
-		this.topologist.tryConnectNextBootstrap(); // first shot ASAP
+
 		this.arbiterInterval = setInterval(() => this.arbiter.tick(), 1000);
-		this.enhancerInterval = setInterval(() => this.topologist.tick(), DISCOVERY.LOOP_DELAY);
 		this.peerStoreInterval = setInterval(() => { this.peerStore.cleanupExpired(); this.peerStore.offerManager.tick(); }, 2500);
+		if (this.publicUrl) return true;
+		
+		this.enhancerInterval = setInterval(() => this.topologist.tick(), DISCOVERY.LOOP_DELAY);
+		this.topologist.tryConnectNextBootstrap(); // first shot ASAP
 		return true;
 	}
 	/** Broadcast a message to all connected peers or to a specified peer

package/index.mjs

@@ -2,6 +2,16 @@ import { Node, createNode, createPublicNode } from "./core/node.mjs";
 import { CryptoCodex } from "./core/crypto-codex.mjs";
 import CONFIG from "./core/config.mjs";
 
+/**
+ * @typedef {Object} HiveP2PNamespace
+ * @property {typeof Node} Node
+ * @property {typeof createNode} createNode
+ * @property {typeof CryptoCodex} CryptoCodex
+ * @property {typeof createPublicNode} createPublicNode
+ * @property {typeof CONFIG} CONFIG
+ */
+
+/** @type {HiveP2PNamespace} */
 const HiveP2P = { Node, createNode, createPublicNode, CryptoCodex, CONFIG };
 export { Node, createNode, createPublicNode, CryptoCodex, CONFIG };
 export default HiveP2P;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hive-p2p/server",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "publishConfig": {
     "access": "public"
   },