Merge remote-tracking branch 'origin' into fix/acl-syn

* origin:
  fix(interval-discovery)!: now use a != topic in order not to have many invalid operation logs (#589)
  feat!: restrict set key access (#582)
  fix: log_config pass down to disco interval (#590)
  feat(object): drpobject become generic (#565)

Author: sfroment

examples/canvas/src/index.ts

@@ -5,8 +5,7 @@ import { DRP_DISCOVERY_TOPIC } from "@ts-drp/types";
 import { Canvas } from "./objects/canvas";
 
 const node = new DRPNode();
-let drpObject: DRPObject;
-let canvasDRP: Canvas;
+let drpObject: DRPObject<Canvas>;
 let peers: string[] = [];
 let discoveryPeers: string[] = [];
 let objectPeers: string[] = [];
@@ -22,8 +21,8 @@ const render = (): void => {
 	object_element.innerHTML = `[${objectPeers.join(", ")}]`;
 	(<HTMLSpanElement>document.getElementById("canvasId")).innerText = drpObject?.id;
 
-	if (!canvasDRP) return;
-	const canvas = canvasDRP.canvas;
+	if (!drpObject.drp) return;
+	const canvas = drpObject.drp.canvas;
 	for (let x = 0; x < canvas.length; x++) {
 		for (let y = 0; y < canvas[x].length; y++) {
 			const pixel = document.getElementById(`${x}-${y}`);
@@ -38,8 +37,8 @@ const random_int = (max: number): number => Math.floor(Math.random() * max);
 function paint_pixel(pixel: HTMLDivElement): void {
 	const [x, y] = pixel.id.split("-").map((v) => Number.parseInt(v, 10));
 	const painting: [number, number, number] = [random_int(256), random_int(256), random_int(256)];
-	canvasDRP.paint([x, y], painting);
-	const [r, g, b] = canvasDRP.query_pixel(x, y).color();
+	drpObject.drp?.paint([x, y], painting);
+	const [r, g, b] = drpObject.drp?.query_pixel(x, y).color() ?? [0, 0, 0];
 	pixel.style.backgroundColor = `rgb(${r}, ${g}, ${b})`;
 }
 
@@ -85,7 +84,6 @@ async function init(): Promise<void> {
 	const create_button = <HTMLButtonElement>document.getElementById("create");
 	const create = async (): Promise<void> => {
 		drpObject = await node.createObject({ drp: new Canvas(5, 10) });
-		canvasDRP = drpObject.drp as Canvas;
 
 		createConnectHandlers();
 		render();
@@ -101,7 +99,6 @@ async function init(): Promise<void> {
 				id: drpId,
 				drp: new Canvas(5, 10),
 			});
-			canvasDRP = drpObject.drp as Canvas;
 
 			createConnectHandlers();
 			render();

examples/canvas/tsconfig.json

@@ -10,5 +10,9 @@
 		"esModuleInterop": true,
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true
-	}
+	},
+	"exclude": [
+		"node_modules",
+		"dist"
+	]
 }

examples/chat/src/index.ts

@@ -5,8 +5,7 @@ import { DRP_DISCOVERY_TOPIC } from "@ts-drp/types";
 import { Chat } from "./objects/chat";
 
 const node = new DRPNode();
-let drpObject: DRPObject;
-let chatDRP: Chat;
+let drpObject: DRPObject<Chat>;
 let peers: string[] = [];
 let discoveryPeers: string[] = [];
 let objectPeers: string[] = [];
@@ -25,8 +24,8 @@ const render = (): void => {
 	const element_objectPeers = <HTMLDivElement>document.getElementById("objectPeers");
 	element_objectPeers.innerHTML = `[${objectPeers.join(", ")}]`;
 
-	if (!chatDRP) return;
-	const chat = chatDRP.query_messages();
+	if (!drpObject.drp) return;
+	const chat = drpObject.drp.query_messages();
 	const element_chat = <HTMLDivElement>document.getElementById("chat");
 	element_chat.innerHTML = "";
 
@@ -47,13 +46,13 @@ const render = (): void => {
 
 function sendMessage(message: string): void {
 	const timestamp: string = Date.now().toString();
-	if (!chatDRP) {
+	if (!drpObject.drp) {
 		console.error("Chat DRP not initialized");
 		alert("Please create or join a chat room first");
 		return;
 	}
 
-	chatDRP.addMessage(timestamp, message, node.networkNode.peerId);
+	drpObject.drp.addMessage(timestamp, message, node.networkNode.peerId);
 	render();
 }
 
@@ -86,7 +85,6 @@ async function main(): Promise<void> {
 
 	const create = async (): Promise<void> => {
 		drpObject = await node.createObject({ drp: new Chat() });
-		chatDRP = drpObject.drp as Chat;
 		createConnectHandlers();
 		render();
 	};
@@ -101,7 +99,6 @@ async function main(): Promise<void> {
 		}
 
 		drpObject = await node.createObject({ id: objectId, drp: new Chat() });
-		chatDRP = drpObject.drp as Chat;
 		createConnectHandlers();
 		render();
 	};

examples/chat/tsconfig.json

@@ -10,5 +10,9 @@
 		"esModuleInterop": true,
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true
-	}
+	},
+	"exclude": [
+		"node_modules",
+		"dist"
+	]
 }

examples/grid/src/index.ts

@@ -45,27 +45,27 @@ export function getNetworkConfigFromEnv(): DRPNodeConfig {
 }
 
 function addUser(): void {
-	if (!gridState.gridDRP) {
+	if (!gridState.drpObject?.drp) {
 		console.error("Grid DRP not initialized");
 		alert("Please create or join a grid first");
 		return;
 	}
 
-	gridState.gridDRP.addUser(
+	gridState.drpObject.drp.addUser(
 		gridState.node.networkNode.peerId,
 		getColorForPeerId(gridState.node.networkNode.peerId)
 	);
 	render();
 }
 
 function moveUser(direction: string): void {
-	if (!gridState.gridDRP) {
+	if (!gridState.drpObject?.drp) {
 		console.error("Grid DRP not initialized");
 		alert("Please create or join a grid first");
 		return;
 	}
 
-	gridState.gridDRP?.moveUser(gridState.node.networkNode.peerId, direction);
+	gridState.drpObject.drp.moveUser(gridState.node.networkNode.peerId, direction);
 	render();
 }
 
@@ -96,7 +96,6 @@ function run(metrics?: IMetrics): void {
 			drp: new Grid(),
 			metrics,
 		});
-		gridState.gridDRP = gridState.drpObject.drp as Grid;
 		createConnectHandlers();
 		addUser();
 		render();
@@ -120,7 +119,6 @@ function run(metrics?: IMetrics): void {
 				drp: new Grid(),
 				metrics,
 			});
-			gridState.gridDRP = gridState.drpObject.drp as Grid;
 			createConnectHandlers();
 			addUser();
 			render();

examples/grid/src/render.ts

@@ -131,7 +131,7 @@ export const render = (): void => {
 	}
 
 	if (!gridState.drpObject) return;
-	const users = gridState.gridDRP?.query_users();
+	const users = gridState.drpObject.drp?.query_users();
 	const element_grid = <HTMLDivElement>document.getElementById("grid");
 	element_grid.innerHTML = "";
 
@@ -169,7 +169,7 @@ export const render = (): void => {
 	if (!users) return;
 	for (const userColorString of users) {
 		const [id, color] = userColorString.split(":");
-		const position = gridState.gridDRP?.query_userPosition(userColorString);
+		const position = gridState.drpObject.drp?.query_userPosition(userColorString);
 
 		if (position) {
 			const div = document.createElement("div");

examples/grid/src/state.ts

@@ -5,8 +5,7 @@ import { type Grid } from "./objects/grid";
 
 interface GridState {
 	node: DRPNode;
-	drpObject: IDRPObject | undefined;
-	gridDRP: Grid | undefined;
+	drpObject: IDRPObject<Grid> | undefined;
 	peers: string[];
 	discoveryPeers: string[];
 	objectPeers: string[];
@@ -15,7 +14,6 @@ interface GridState {
 export const gridState: GridState = {
 	node: new DRPNode(),
 	drpObject: undefined,
-	gridDRP: undefined,
 	peers: [],
 	discoveryPeers: [],
 	objectPeers: [],

examples/grid/tsconfig.json

@@ -10,5 +10,9 @@
 		"esModuleInterop": true,
 		"skipLibCheck": true,
 		"forceConsistentCasingInFileNames": true
-	}
+	},
+	"exclude": [
+		"node_modules",
+		"dist"
+	]
 }

packages/interval-discovery/README.md

@@ -39,7 +39,7 @@ sequenceDiagram
         
         alt No peers found for objectId
             Note over Node_A_DRPIntervalDiscovery: Start search timer
-            Node_A_DRPIntervalDiscovery->>Node_A_NetworkNode: broadcastMessage(DRP_DISCOVERY_TOPIC)
+            Node_A_DRPIntervalDiscovery->>Node_A_NetworkNode: broadcastMessage(DRP_INTERVAL_DISCOVERY_TOPIC)
             Node_A_NetworkNode-->>Node_B_NetworkNode: DRPDiscoveryRequest message
             
             alt Node B has matching objectId
@@ -88,7 +88,7 @@ interface DRPIntervalDiscoveryOptions {
 
 2. **Peer Discovery**
    - Broadcasts discovery messages when no peers are found
-   - Uses `DRP_DISCOVERY_TOPIC` for discovery messages
+   - Uses `DRP_INTERVAL_DISCOVERY_TOPIC` for discovery messages
    - Includes object ID for targeted peer matching
 
 3. **Connection Management**

packages/interval-discovery/src/index.ts

@@ -1,7 +1,7 @@
 import { IntervalRunner } from "@ts-drp/interval-runner";
 import { Logger } from "@ts-drp/logger";
 import {
-	DRP_INTERVAL_TOPIC,
+	DRP_INTERVAL_DISCOVERY_TOPIC,
 	DRPDiscovery as DRPDiscoveryRequest,
 	DRPDiscoveryResponse,
 	type DRPIntervalDiscoveryOptions,
@@ -106,7 +106,7 @@ export class DRPIntervalDiscovery implements IDRPIntervalDiscovery {
 			});
 
 			this._logger.info("Broadcasting discovery request");
-			await this.networkNode.broadcastMessage(DRP_INTERVAL_TOPIC, message);
+			await this.networkNode.broadcastMessage(DRP_INTERVAL_DISCOVERY_TOPIC, message);
 		} catch (error) {
 			this._logger.error("Error broadcasting discovery request:", error);
 		}

packages/network/src/node.ts

@@ -35,7 +35,7 @@ import { WebRTC } from "@multiformats/multiaddr-matcher";
 import { Logger } from "@ts-drp/logger";
 import {
 	DRP_DISCOVERY_TOPIC,
-	DRP_INTERVAL_TOPIC,
+	DRP_INTERVAL_DISCOVERY_TOPIC,
 	type DRPNetworkNode as DRPNetworkNodeInterface,
 	type LoggerOptions,
 	Message,
@@ -240,7 +240,7 @@ export class DRPNetworkNode implements DRPNetworkNodeInterface {
 
 		// needded as I've disabled the pubsubPeerDiscovery
 		this._pubsub?.subscribe(DRP_DISCOVERY_TOPIC);
-		this._pubsub?.subscribe(DRP_INTERVAL_TOPIC);
+		this._pubsub?.subscribe(DRP_INTERVAL_DISCOVERY_TOPIC);
 	}
 
 	async stop(): Promise<void> {