@hive-p2p/server 1.0.33 → 1.0.35

package/core/arbiter.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, NODE, GOSSIP, UNICAST, LOG_CSS } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { GOSSIP, UNICAST, LOG_CSS } from './config.mjs';
 
 // TRUST_BALANCE = seconds of ban if negative - never exceed MAX_TRUST if positive
 // Growing each second by 1000ms until 0

package/core/config.mjs

@@ -1,14 +1,10 @@
 const isNode = (typeof window === 'undefined');
 if (!isNode) (await import('../libs/simplepeer-9.11.1.min.js')).default;
-import { Clock } from '../services/clock.mjs';
 
 // HOLD: GLOBAL CONFIG FOR THE LIBRARY
 // AVOID: CIRCULAR DEPENDENCIES AND TOO MANY FUNCTION/CONSTRUCTOR CONFIG
 // SIMPLIFY: IMPORTS, SIMULATOR AND BROWSER SUPPORT
 
-/** Synchronized clock that can be used outside the library */
-export const CLOCK = Clock.instance;
-
 export const SIMULATION = {
 	/** Specify setInterval() avoidance for faster simulation (true = avoid intervals) | Default: true */
 	AVOID_INTERVALS: false,
@@ -223,6 +219,4 @@ export const LOG_CSS = {
 	PUNISHER: { BAN: 'color: red; font-weight: bold;', KICK: 'color: darkorange; font-weight: bold;' },
 }
 
-export default {
-	CLOCK, SIMULATION, NODE, TRANSPORTS, DISCOVERY, IDENTITY, UNICAST, GOSSIP, LOG_CSS
-};
+export default { SIMULATION, NODE, TRANSPORTS, DISCOVERY, IDENTITY, UNICAST, GOSSIP, LOG_CSS };

package/core/crypto-codex.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, SIMULATION, NODE, IDENTITY, GOSSIP, UNICAST, LOG_CSS } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { SIMULATION, NODE, IDENTITY, GOSSIP, UNICAST, LOG_CSS } from './config.mjs';
 import { GossipMessage } from './gossip.mjs';
 import { DirectMessage, ReroutedDirectMessage } from './unicast.mjs';
 import { Converter } from '../services/converter.mjs';

package/core/gossip.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, GOSSIP, DISCOVERY } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { GOSSIP } from './config.mjs';
 import { xxHash32 } from '../libs/xxhash32.mjs';
 
 export class GossipMessage { // TYPE DEFINITION

package/core/ice-offer-manager.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, NODE, TRANSPORTS, LOG_CSS } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { NODE, TRANSPORTS, LOG_CSS } from './config.mjs';
 import { xxHash32 } from '../libs/xxhash32.mjs';
 async function getWrtc() {
     if (typeof globalThis.RTCPeerConnection !== 'undefined') return undefined;

package/core/node.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, SIMULATION, NODE, SERVICE, DISCOVERY } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { SIMULATION, NODE, SERVICE, DISCOVERY } from './config.mjs';
 import { Arbiter } from './arbiter.mjs';
 import { OfferManager } from './ice-offer-manager.mjs';
 import { PeerStore } from './peer-store.mjs';

package/core/peer-store.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, SIMULATION, NODE, DISCOVERY, LOG_CSS } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { SIMULATION, NODE, DISCOVERY, LOG_CSS } from './config.mjs';
 const { SANDBOX, ICE_CANDIDATE_EMITTER, TEST_WS_EVENT_MANAGER } = SIMULATION.ENABLED ? await import('../simulation/test-transports.mjs') : {};
 
 export class KnownPeer { // known peer, not necessarily connected

package/core/topologist.mjs

@@ -1,4 +1,5 @@
-import { CLOCK, SIMULATION, TRANSPORTS, NODE, DISCOVERY, GOSSIP } from './config.mjs';
+import { CLOCK } from '../services/clock.mjs';
+import { SIMULATION, TRANSPORTS, NODE, DISCOVERY, GOSSIP } from './config.mjs';
 import { PeerConnection } from './peer-store.mjs';
 const { SANDBOX, ICE_CANDIDATE_EMITTER, TEST_WS_EVENT_MANAGER } = SIMULATION.ENABLED ? await import('../simulation/test-transports.mjs') : {};
 

package/index.mjs

@@ -1,17 +1,28 @@
 import { Node, createNode, createPublicNode } from "./core/node.mjs";
 import { CryptoCodex } from "./core/crypto-codex.mjs";
+import { CLOCK } from "./services/clock.mjs';
 import CONFIG from "./core/config.mjs";
 
+function mergeHiveConfig(target, source) {
+  for (const key in source)
+    if (source[key] && typeof source[key] === 'object' && !Array.isArray(source[key])) {
+      target[key] = target[key] || {};
+      mergeHiveConfig(target[key], source[key]);
+    } else target[key] = source[key];
+}
+
 /**
  * @typedef {Object} HiveP2PNamespace
+ * @property {typeof CLOCK} CLOCK
+ * @property {typeof CONFIG} CONFIG
+ * @property {typeof mergeHiveConfig} mergeHiveConfig
  * @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 };
+const HiveP2P = { CLOCK, CONFIG, mergeHiveConfig, Node, createNode, createPublicNode, CryptoCodex };
+export { CLOCK, CONFIG, mergeHiveConfig, Node, createNode, createPublicNode, CryptoCodex };
 export default HiveP2P;

package/package.json

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

package/services/clock.mjs

@@ -126,7 +126,7 @@ export class Clock {
 		} catch (error) { if (this.verbose) console.warn('[Clock] Background refine failed:', error); }
 	}
 }
-
+export const CLOCK = Clock.instance; // Singleton instance
 
 export async function CLOCK_TEST() { // DEBUG TEST WHILE RUNNING AS STANDALONE
 	const startTime = Date.now();