diff --git a/packages/node/package.json b/packages/node/package.json index 5f5aef44..cfd953ee 100644 --- a/packages/node/package.json +++ b/packages/node/package.json @@ -42,6 +42,7 @@ "@topology-foundation/blueprints": "0.2.0", "@topology-foundation/network": "0.2.0", "@topology-foundation/object": "0.2.0", + "@topology-foundation/logger": "0.2.0", "commander": "^12.1.0", "google-protobuf": "^3.21.2" } diff --git a/packages/node/src/rpc/index.ts b/packages/node/src/rpc/index.ts index 228d353a..1d1acaa6 100644 --- a/packages/node/src/rpc/index.ts +++ b/packages/node/src/rpc/index.ts @@ -11,8 +11,11 @@ import type { UnsubscribeCroRequest, UnsubscribeCroResponse, } from "../proto/rpc_pb.js"; +import { Logger } from "@topology-foundation/logger"; export function init(node: TopologyNode) { + const log = new Logger("topology::rpc", "info"); + function subscribeCro( call: ServerUnaryCall, callback: sendUnaryData, @@ -80,7 +83,7 @@ export function init(node: TopologyNode) { "0.0.0.0:6969", grpc.ServerCredentials.createInsecure(), (_error, _port) => { - console.log("running grpc in port:", _port); + log.info("running grpc in port:", _port); }, ); } diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json index 44104cf7..5d24764d 100644 --- a/packages/node/tsconfig.json +++ b/packages/node/tsconfig.json @@ -13,6 +13,9 @@ }, { "path": "../object" + }, + { + "path": "../logger" } ], "include": ["src/**/*.ts", "src/**/*.js"] diff --git a/packages/object/package.json b/packages/object/package.json index 0daf3eb5..35baaf2a 100644 --- a/packages/object/package.json +++ b/packages/object/package.json @@ -33,6 +33,7 @@ }, "dependencies": { "@bufbuild/protobuf": "^2.0.0", + "@topology-foundation/logger": "^0.2.0", "ts-proto": "^2.2.4" } } diff --git a/packages/object/src/wasm/compiler.ts b/packages/object/src/wasm/compiler.ts index d8482a2b..cb53bb15 100644 --- a/packages/object/src/wasm/compiler.ts +++ b/packages/object/src/wasm/compiler.ts @@ -4,9 +4,12 @@ */ import * as fs from "node:fs"; import asc from "assemblyscript/asc"; +import { Logger } from "@topology-foundation/logger"; export async function compileWasm(path: string) { - console.log("Compiling", path); + const log = new Logger("topology::wasm", "info"); + + log.info("Compiling", path); const { error, stderr } = await asc.main( [path, "--bindings=esm", "--outFile=/tmp/dist.wasm"], { @@ -29,8 +32,8 @@ export async function compileWasm(path: string) { ); if (error) { - console.log(`Compilation failed: ${error}`); - console.log(stderr.toString()); + log.info(`Compilation failed: ${error}`); + log.info(stderr.toString()); return new Uint8Array(); } @@ -39,6 +42,6 @@ export async function compileWasm(path: string) { fs.readFileSync("/tmp/dist.wasm"), ); // fs.unlinkSync('dist/tmp.wasm'); - console.log("Compilation successful", bytecode); + log.info("Compilation successful", bytecode); return bytecode; } diff --git a/packages/object/tsconfig.json b/packages/object/tsconfig.json index 9cc8b37c..48e3023f 100644 --- a/packages/object/tsconfig.json +++ b/packages/object/tsconfig.json @@ -3,5 +3,10 @@ "compilerOptions": { "outDir": "dist" }, + "references": [ + { + "path": "../logger" + } + ], "include": ["src/**/*.ts"] }