fixes

psy0rz · Dec 28, 2024 · 2fdbd35 · 2fdbd35
1 parent 0994205
commit 2fdbd35
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/ledder/server/Render.ts b/ledder/server/Render.ts
@@ -10,14 +10,18 @@ export class Render {
 
     public readonly animationManager: AnimationManager
     public readonly controlGroup: ControlGroup
+    public readonly description: string
 
     protected display: Display
     protected readonly box: PixelBox
     protected readonly scheduler: Scheduler
 
-    constructor(display: Display) {
+
+    constructor(display: Display, description='') {
         this.display = display
 
+        this.description=description
+
         this.controlGroup = new ControlGroup('root')
         this.box = new PixelBox(display)
         this.scheduler = new Scheduler()
@@ -32,7 +36,7 @@ export class Render {
         this.box.forEachPixel(() => {
             count++
         })
-        return (`${count} pixels.\n${this.scheduler.__getStats()}`)
+        return (`${this.description}: ${count} pixels.\n${this.scheduler.__getStats()}`)
     }
 
 }
diff --git a/ledder/server/RenderRealtime.ts b/ledder/server/RenderRealtime.ts
@@ -67,7 +67,7 @@ export class RenderRealtime extends Render {
             let busy=Math.round( ( 1000-this.idleMS)/10)
             if (busy<0)
                 busy=0
-            console.log(`RenderRealtime: ${this.lateFrames} late. ${this.droppedFrames} dropped. ${ busy }% busy.`)
+            console.log(`RenderRealtime ${this.description}: ${this.lateFrames} late. ${this.droppedFrames} dropped. ${ busy }% busy.`)
             this.lastStatUpdate=nowUS
             this.droppedFrames=0;
             this.lateFrames=0;

diff --git a/ledder/server/RpcServer.ts b/ledder/server/RpcServer.ts
@@ -60,7 +60,8 @@ export class RpcServer extends Rpc {
         // @ts-ignore
         this.app.ws('/ws', (ws, req) => {
             this.idCount++
-            let context = new WsContext(ws, this.server, this.idCount)
+            let context = new WsContext(ws, this.server, this.idCount, req.socket.remoteAddress)
+
 
             ws.on('message', async (msg) => {
                 // console.log("RPC request: ", msg)

diff --git a/ledder/server/WsContext.ts b/ledder/server/WsContext.ts
@@ -12,16 +12,18 @@ export class WsContext {
     client: JSONRPCServerAndClient<WsContext, WsContext>
     renderLoop: RenderRealtime
     id: number
+    remoteAddress:string
 
     statsInterval: any
     started: boolean
 
-    constructor(ws: WebSocket, client, id) {
+    constructor(ws: WebSocket, client, id, remoteAddress) {
         this.ws = ws
         this.client = client
         this.id = id
         this.started = false
-        console.log(`WsContext: New session ${id}`)
+        this.remoteAddress=remoteAddress
+        console.log(`WsContext: New session ${id} ${remoteAddress}`)
 
 
     }
@@ -43,7 +45,7 @@ export class WsContext {
 
 
         let display = new DisplayWebsocket(width, height, this.ws)
-        this.renderLoop = new RenderRealtime(display)
+        this.renderLoop = new RenderRealtime(display, `${this.id} ${this.remoteAddress}`)
         //todo: add delay or queue
         this.renderLoop.controlGroup.__onReset(() => {
             this.request("control.reset").then(() => {
@@ -59,9 +61,9 @@ export class WsContext {
         this.renderLoop.start()
 
 
-        this.statsInterval = setInterval(() => {
-            console.log(`Preview stats ${this.id}: ${this.renderLoop.getStats()}`)
-        }, 3000)
+        // this.statsInterval = setInterval(() => {
+        //     console.log(`Preview stats ${this.id}: ${this.renderLoop.getStats()}`)
+        // }, 3000)
 
 
     }