chore: last fix

Signed-off-by: Sacha Froment <[email protected]>

examples/grid/src/index.ts

@@ -1,6 +1,6 @@
-import { DRPNode, type DRPNodeConfig } from "@ts-drp/node";
+import { DRPNode } from "@ts-drp/node";
 import { enableTracing, OpentelemetryMetrics } from "@ts-drp/tracer";
-import { type IMetrics } from "@ts-drp/types";
+import { type DRPNodeConfig, type IMetrics } from "@ts-drp/types";
 
 import { env } from "./env";
 import { Grid } from "./objects/grid";

packages/blueprints/tsconfig.json

@@ -3,11 +3,10 @@
 	"compilerOptions": {
 		"outDir": "dist"
 	},
-	"references": [
-		{
-			"path": "../object"
-		}
+	"include": [
+		"src/**/*.ts"
 	],
-	"include": ["src/**/*.ts"],
-	"exclude": ["src/**/*.asc.ts"]
+	"exclude": [
+		"src/**/*.asc.ts"
+	]
 }

packages/network/package.json

@@ -30,7 +30,6 @@
 	},
 	"devDependencies": {
 		"@ts-drp/keychain": "0.8.5",
-		"@ts-drp/node": "0.8.5",
 		"race-event": "^1.3.0"
 	},
 	"dependencies": {

packages/network/tests/network.test.ts

@@ -6,11 +6,11 @@ import {
 	type Libp2p,
 	type SubscriptionChangeData,
 } from "@libp2p/interface";
-import { loadConfig } from "@ts-drp/node";
-import { Message } from "@ts-drp/types";
+import { type DRPNodeConfig, Message } from "@ts-drp/types";
 import { raceEvent } from "race-event";
 import { beforeAll, describe, expect, test, afterAll } from "vitest";
 
+import rawConfig from "../../../configs/local-bootstrap.json" with { type: "json" };
 import { DRPNetworkNode, type DRPNetworkNodeConfig, streamToUint8Array } from "../src/node.js";
 
 describe("DRPNetworkNode can connect & send messages", () => {
@@ -42,9 +42,9 @@ describe("DRPNetworkNode can connect & send messages", () => {
 	};
 
 	beforeAll(async () => {
-		const configPath = `${__dirname}/../../../configs/local-bootstrap.json`;
+		const config: DRPNodeConfig = rawConfig;
 		const bootstrapConfig: DRPNetworkNodeConfig = {
-			...loadConfig(configPath)?.network_config,
+			...config.network_config,
 			log_config: { level: "silent" },
 		};
 		bootstrapNode = new DRPNetworkNode(bootstrapConfig);

packages/node/src/config.ts

@@ -1,8 +1,7 @@
+import type { DRPNodeConfig } from "@ts-drp/types";
 import * as dotenv from "dotenv";
 import fs from "node:fs";
 
-import type { DRPNodeConfig } from "./index.js";
-
 export function loadConfig(configPath?: string | undefined): DRPNodeConfig | undefined {
 	let config: DRPNodeConfig | undefined;
 

packages/node/src/index.ts

@@ -1,16 +1,16 @@
 import type { GossipsubMessage } from "@chainsafe/libp2p-gossipsub";
 import type { EventCallback, IncomingStreamData, StreamHandler } from "@libp2p/interface";
-import { type KeychainConfig, Keychain } from "@ts-drp/keychain";
+import { Keychain } from "@ts-drp/keychain";
 import { Logger } from "@ts-drp/logger";
-import { DRPNetworkNode, type DRPNetworkNodeConfig } from "@ts-drp/network";
+import { DRPNetworkNode } from "@ts-drp/network";
 import { DRPObject } from "@ts-drp/object";
 import {
 	type IMetrics,
+	type DRPNodeConfig,
 	Message,
 	MessageType,
 	type IACL,
 	type IDRP,
-	type LoggerOptions,
 	type IDRPObject,
 } from "@ts-drp/types";
 
@@ -25,13 +25,6 @@ export { loadConfig };
 
 export { serializeStateMessage, deserializeStateMessage };
 
-// snake_casing to match the JSON config
-export interface DRPNodeConfig {
-	log_config?: LoggerOptions;
-	network_config?: DRPNetworkNodeConfig;
-	keychain_config?: KeychainConfig;
-}
-
 export class DRPNode {
 	config?: DRPNodeConfig;
 	objectStore: DRPObjectStore;

packages/node/src/run.ts

@@ -1,6 +1,8 @@
+import { type DRPNodeConfig } from "@ts-drp/types";
+
 import { program } from "./cli/index.js";
 import { loadConfig } from "./config.js";
-import { type DRPNodeConfig, DRPNode } from "./index.js";
+import { DRPNode } from "./index.js";
 import { init as rpc_init } from "./rpc/index.js";
 
 export const run = async (port: number = 6969): Promise<void> => {

packages/object/package.json

@@ -33,8 +33,8 @@
 	"devDependencies": {
 		"@bufbuild/protobuf": "^2.0.0",
 		"@ts-drp/blueprints": "^0.8.5",
-		"@ts-drp/keychain": "workspace:0.8.5",
-		"@ts-drp/node": "workspace:0.8.5",
+		"@ts-drp/keychain": "^0.8.5",
+		"@ts-drp/node": "^0.8.5",
 		"@types/benchmark": "^2.1.5",
 		"benchmark": "^2.1.4",
 		"pprof": "^4.0.0",