From 79898c647f4240c67376614bb83e90762d9082b5 Mon Sep 17 00:00:00 2001
From: 10672208+mind-ar <10672208+mind-ar@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:13:43 +0000
Subject: [PATCH 01/12] refactor: eliminado loop draw

se reemplaza el loop de p5 que llama a draw()
por una llamada manual a draw() cada vez que se recibe un evento
---
 public/game/index.html | 2 +-
 public/game/sketch.js  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/game/index.html b/public/game/index.html
index 82a1a38..b873e08 100644
--- a/public/game/index.html
+++ b/public/game/index.html
@@ -9,7 +9,7 @@
     <script
       language="javascript"
       type="text/javascript"
-      src="./sketch.js"
+      src="./sketch.js?v3"
     ></script>
     <style>
         main {
diff --git a/public/game/sketch.js b/public/game/sketch.js
index 21fee17..b3a4546 100644
--- a/public/game/sketch.js
+++ b/public/game/sketch.js
@@ -28,6 +28,7 @@ function setup() {
   socket.on("updateSound", (data) => {
     updateSound(data.soundInstances)
   })
+  noLoop()
   loadBackground()
   loadVisuals()
   socket.emit("ready")
@@ -65,6 +66,7 @@ function loadBackground() {
       fondo != "default" && imagen != null
         ? imagen.url
         : defaultBackground
+    draw()
   })
 }
 
@@ -73,12 +75,14 @@ function loadAllImages() {
     for (i = 0 ; i < img.length ; i++) {
       images.push({ name: img[i].name, url: loadImage(`${img[i].url}`) })
     }
+    draw()
   })
 }
 
 function loadVisuals() {
   socket.on("visuals", (visualsList) => {
     visuals = visualsList
+    draw()
   })
 }
 

From 8900dbdefae42cb3403ba48aaf8aedd5663aea86 Mon Sep 17 00:00:00 2001
From: 10672208+mind-ar <10672208+mind-ar@users.noreply.github.com>
Date: Mon, 10 Jun 2024 01:27:43 +0000
Subject: [PATCH 02/12] [REFACTOR] flushEvents

---
 src/commands/run.ts | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index 8173002..c30be7e 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -209,11 +209,30 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
       socket.emit('background', background)
     })
 
-    const flushInterval = 100
+    const flushInterval = 17
+    let muestras = 0
+    let tEvents = 0
+
     const id = setInterval(() => {
       try {
+      	const tsStart = performance.now()
         interpreter.send('flushEvents', gameSingleton, interpreter.reify(timer))
-        timer += flushInterval
+        const elapsed = performance.now() - tsStart
+        tEvents += elapsed
+
+        // Si flushEvents demoró más del tiempo flushInterval
+        // incrementamos el timer tomando el mayor de los tiempos
+        timer += elapsed > flushInterval ? elapsed : flushInterval
+        muestras += 1
+
+        // cada 30 muestras se imprime por consola el tiempo promedio
+        // que tardó en procesar todos los eventos
+        if(muestras >= 30) {
+        	logger.debug(`flushEvents: ${tEvents / muestras} ms`)
+        	muestras = 0
+        	tEvents = 0
+        }
+
         // We could pass the interpreter but a program does not change it
         dynamicDiagramClient.onReload()
         if (!gameSingleton.get('running')?.innerBoolean) {
@@ -286,4 +305,4 @@ export const gamePort = (port: string): string => port ?? DEFAULT_PORT
 
 export const dynamicDiagramPort = (port: string): string => `${+gamePort(port) + 1}`
 
-const drawDefinition = () => parse.File('draw').tryParse('object drawer{ method apply() native }')
\ No newline at end of file
+const drawDefinition = () => parse.File('draw.wlk').tryParse('object drawer{ method apply() native }')

From 1aceb9d5b347f274f2b485c83c67554ed5e19a21 Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Tue, 11 Jun 2024 19:34:26 -0300
Subject: [PATCH 03/12] refactor: eliminado metodo draw de bucle de eventos

---
 public/game/index.html |  2 +-
 src/commands/run.ts    | 67 +++++++++++++++++++-----------------------
 2 files changed, 31 insertions(+), 38 deletions(-)

diff --git a/public/game/index.html b/public/game/index.html
index b873e08..82a1a38 100644
--- a/public/game/index.html
+++ b/public/game/index.html
@@ -9,7 +9,7 @@
     <script
       language="javascript"
       type="text/javascript"
-      src="./sketch.js?v3"
+      src="./sketch.js"
     ></script>
     <style>
         main {
diff --git a/src/commands/run.ts b/src/commands/run.ts
index 648ba19..143b1ad 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -82,42 +82,7 @@ export default async function (programFQN: Name, options: Options): Promise<void
 }
 
 export const getGameInterpreter = (environment: Environment, io: Server): Interpreter => {
-  const nativesAndDraw = {
-    ...natives,
-    draw: {
-      drawer: {
-        *apply() {
-          try {
-            const game = interpreter?.object('wollok.game.game')
-            const visuals = getVisuals(game, interpreter)
-            io.emit('visuals', visuals)
-
-            const gameSounds = game.get('sounds')?.innerCollection ?? []
-            const mappedSounds = gameSounds.map(sound =>
-              [
-                sound.id,
-                sound.get('file')!.innerString!,
-                sound.get('status')!.innerString!,
-                sound.get('volume')!.innerNumber!,
-                sound.get('loop')!.innerBoolean!,
-              ])
-            io.emit('updateSound', { soundInstances: mappedSounds })
-          } catch (error: any) {
-            logger.error(failureDescription(error instanceof WollokException ? error.message : 'Exception while executing the program'))
-            const debug = logger.getLevel() <= logger.levels.DEBUG
-            if (debug) logger.error(error)
-            interpreter.send('stop', gameSingleton)
-          }
-        },
-      },
-    },
-  }
-
-  const interpreter = interpret(environment, nativesAndDraw)
-
-  const gameSingleton = interpreter?.object(GAME_MODULE)
-  const drawer = interpreter.object('draw.drawer')
-  interpreter.send('onTick', gameSingleton, interpreter.reify(17), interpreter.reify('renderizar'), drawer)
+   const interpreter = interpret(environment, natives)
 
   return interpreter
 }
@@ -221,6 +186,8 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
       try {
       	const tsStart = performance.now()
         interpreter.send('flushEvents', gameSingleton, interpreter.reify(timer))
+
+        draw(interpreter, io)
         const elapsed = performance.now() - tsStart
         tEvents += elapsed
 
@@ -229,10 +196,11 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
         timer += elapsed > flushInterval ? elapsed : flushInterval
         muestras += 1
 
+
         // cada 30 muestras se imprime por consola el tiempo promedio
         // que tardó en procesar todos los eventos
         if(muestras >= 30) {
-        	logger.debug(`flushEvents: ${tEvents / muestras} ms`)
+        	logger.debug(`flushEvents: ${(tEvents / muestras).toFixed(2)} ms`)
         	muestras = 0
         	tEvents = 0
         }
@@ -311,3 +279,28 @@ export const gameHost = (host: string): string => host ?? DEFAULT_HOST
 export const dynamicDiagramPort = (port: string): string => `${+gamePort(port) + 1}`
 
 const drawDefinition = () => parse.File('draw.wlk').tryParse('object drawer{ method apply() native }')
+
+
+const draw = (interpreter: Interpreter, io: Server) => {
+  const game = interpreter?.object('wollok.game.game')
+  try {
+    const visuals = getVisuals(game, interpreter)
+    io.emit('visuals', visuals)
+
+    const gameSounds = game.get('sounds')?.innerCollection ?? []
+    const mappedSounds = gameSounds.map(sound =>
+      [
+        sound.id,
+        sound.get('file')!.innerString!,
+        sound.get('status')!.innerString!,
+        sound.get('volume')!.innerNumber!,
+        sound.get('loop')!.innerBoolean!,
+      ])
+    io.emit('updateSound', { soundInstances: mappedSounds })
+  } catch (error: any) {
+    logger.error(failureDescription(error instanceof WollokException ? error.message : 'Exception while executing the program'))
+    const debug = logger.getLevel() <= logger.levels.DEBUG
+    if (debug) logger.error(error)
+    interpreter.send('stop', game)
+  }
+}

From 036293e7150f624d7db868ff6dfff0fa65bf09bf Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Tue, 11 Jun 2024 19:41:53 -0300
Subject: [PATCH 04/12] reemplazada string por constante para wollok.game.game

---
 src/commands/run.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index 143b1ad..709580a 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -82,7 +82,7 @@ export default async function (programFQN: Name, options: Options): Promise<void
 }
 
 export const getGameInterpreter = (environment: Environment, io: Server): Interpreter => {
-   const interpreter = interpret(environment, natives)
+  const interpreter = interpret(environment, natives)
 
   return interpreter
 }
@@ -162,7 +162,7 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
       queueEvent(interpreter, buildKeyPressEvent(interpreter, wKeyCode(key.key, key.keyCode)), buildKeyPressEvent(interpreter, 'ANY'))
     })
 
-    const gameSingleton = interpreter?.object('wollok.game.game')
+    const gameSingleton = interpreter?.object(GAME_MODULE)
     const background = gameSingleton.get('boardGround') ? gameSingleton.get('boardGround')?.innerString : 'default'
 
     const baseFolder = join(project, assets)
@@ -282,7 +282,7 @@ const drawDefinition = () => parse.File('draw.wlk').tryParse('object drawer{ met
 
 
 const draw = (interpreter: Interpreter, io: Server) => {
-  const game = interpreter?.object('wollok.game.game')
+  const game = interpreter?.object(GAME_MODULE)
   try {
     const visuals = getVisuals(game, interpreter)
     io.emit('visuals', visuals)

From 78c4137f4d4fb1536430aaf94bbf74a04d92dc7d Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Tue, 11 Jun 2024 19:51:48 -0300
Subject: [PATCH 05/12] fix lint

---
 src/commands/run.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index 709580a..324916b 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -58,7 +58,7 @@ export default async function (programFQN: Name, options: Options): Promise<void
 
 
     const ioGame: Server | undefined = initializeGameClient(options)
-    const interpreter = game ? getGameInterpreter(environment, ioGame!) : interpret(environment, { ...natives })
+    const interpreter = game ? getGameInterpreter(environment) : interpret(environment, { ...natives })
     const programPackage = environment.getNodeByFQN<Package>(programFQN).parent as Package
     const dynamicDiagramClient = await initializeDynamicDiagram(programPackage, options, interpreter)
 
@@ -81,7 +81,8 @@ export default async function (programFQN: Name, options: Options): Promise<void
   }
 }
 
-export const getGameInterpreter = (environment: Environment, io: Server): Interpreter => {
+// TODO: ver si se elimina este método
+export const getGameInterpreter = (environment: Environment): Interpreter => {
   const interpreter = interpret(environment, natives)
 
   return interpreter

From 6efb5c2ebd0ffdb704f6c8173422d3142da3fb36 Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Tue, 18 Jun 2024 19:18:40 -0300
Subject: [PATCH 06/12] fix lints & limpieza

---
 .gitignore          |  3 ++-
 src/commands/run.ts | 25 ++++++-------------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf21122..4c4a1dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,5 @@ src/wre/wre.json
 coverage
 .DS_Store
 /public/diagram/lib/*
-wollok.log
\ No newline at end of file
+wollok.log
+log/*
diff --git a/src/commands/run.ts b/src/commands/run.ts
index 324916b..8d4d99e 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -58,7 +58,7 @@ export default async function (programFQN: Name, options: Options): Promise<void
 
 
     const ioGame: Server | undefined = initializeGameClient(options)
-    const interpreter = game ? getGameInterpreter(environment) : interpret(environment, { ...natives })
+    const interpreter =  interpret(environment, { ...natives })
     const programPackage = environment.getNodeByFQN<Package>(programFQN).parent as Package
     const dynamicDiagramClient = await initializeDynamicDiagram(programPackage, options, interpreter)
 
@@ -81,13 +81,6 @@ export default async function (programFQN: Name, options: Options): Promise<void
   }
 }
 
-// TODO: ver si se elimina este método
-export const getGameInterpreter = (environment: Environment): Interpreter => {
-  const interpreter = interpret(environment, natives)
-
-  return interpreter
-}
-
 export const initializeGameClient = ({ project, assets, host, port, game }: Options): Server | undefined => {
   if (!game) return undefined
 
@@ -185,7 +178,7 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
 
     const id = setInterval(() => {
       try {
-      	const tsStart = performance.now()
+        const tsStart = performance.now()
         interpreter.send('flushEvents', gameSingleton, interpreter.reify(timer))
 
         draw(interpreter, io)
@@ -201,9 +194,9 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
         // cada 30 muestras se imprime por consola el tiempo promedio
         // que tardó en procesar todos los eventos
         if(muestras >= 30) {
-        	logger.debug(`flushEvents: ${(tEvents / muestras).toFixed(2)} ms`)
-        	muestras = 0
-        	tEvents = 0
+          logger.debug(`flushEvents: ${(tEvents / muestras).toFixed(2)} ms`)
+          muestras = 0
+          tEvents = 0
         }
 
         // We could pass the interpreter but a program does not change it
@@ -265,9 +258,6 @@ export const getAssetsFolder = ({ game, project, assets }: Options): string => {
 
 export const buildEnvironmentForProgram = async ({ project, skipValidations, game }: Options): Promise<Environment> => {
   let environment = await buildEnvironmentForProject(project)
-  if (game) {
-    environment = link([drawDefinition()], environment)
-  }
   validateEnvironment(environment, skipValidations)
   return environment
 }
@@ -279,9 +269,6 @@ export const gameHost = (host: string): string => host ?? DEFAULT_HOST
 
 export const dynamicDiagramPort = (port: string): string => `${+gamePort(port) + 1}`
 
-const drawDefinition = () => parse.File('draw.wlk').tryParse('object drawer{ method apply() native }')
-
-
 const draw = (interpreter: Interpreter, io: Server) => {
   const game = interpreter?.object(GAME_MODULE)
   try {
@@ -304,4 +291,4 @@ const draw = (interpreter: Interpreter, io: Server) => {
     if (debug) logger.error(error)
     interpreter.send('stop', game)
   }
-}
+}
\ No newline at end of file

From 56fd81c0a8040a60f3b8a39f85f183006e19ae2d Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Tue, 18 Jun 2024 19:25:36 -0300
Subject: [PATCH 07/12] se agrupa informacion de performance de flushEvent

---
 src/commands/run.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index 8d4d99e..457adc7 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -173,6 +173,9 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
     })
 
     const flushInterval = 17
+
+    // muestras y tEvents se utilizan para poder
+    // sacar un promedio de demora del flushEvents
     let muestras = 0
     let tEvents = 0
 
@@ -183,16 +186,19 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
 
         draw(interpreter, io)
         const elapsed = performance.now() - tsStart
-        tEvents += elapsed
 
-        // Si flushEvents demoró más del tiempo flushInterval
+        // Timer contiene el timestamp enviado a flushEvent
+        // para que pueda procesar los timeEvents.
+        //
+        // En el mejor de los casos va a incrementar de a 17ms
+        // Si flushEvents demoró más del tiempo flushInterval (17ms)
         // incrementamos el timer tomando el mayor de los tiempos
         timer += elapsed > flushInterval ? elapsed : flushInterval
-        muestras += 1
-
 
         // cada 30 muestras se imprime por consola el tiempo promedio
         // que tardó en procesar todos los eventos
+        tEvents += elapsed
+        muestras += 1
         if(muestras >= 30) {
           logger.debug(`flushEvents: ${(tEvents / muestras).toFixed(2)} ms`)
           muestras = 0

From f1281b74390ff37a660e43a3c87284e9c4051c7f Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Tue, 18 Jun 2024 19:35:33 -0300
Subject: [PATCH 08/12] fix lint errors

---
 src/commands/run.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index 457adc7..e8a7a57 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -7,7 +7,7 @@ import http from 'http'
 import logger from 'loglevel'
 import { join, relative } from 'path'
 import { Server, Socket } from 'socket.io'
-import { Environment, GAME_MODULE, link, Name, Package, parse, RuntimeObject, WollokException, interpret, Interpreter, WRENatives as natives } from 'wollok-ts'
+import { Environment, GAME_MODULE, Name, Package, RuntimeObject, WollokException, interpret, Interpreter, WRENatives as natives } from 'wollok-ts'
 import { ENTER, buildEnvironmentForProject, buildEnvironmentIcon, failureDescription, folderIcon, gameIcon, handleError, isImageFile, programIcon, publicPath, readPackageProperties, serverError, stackTrace, successDescription, validateEnvironment, valueDescription } from '../utils'
 import { buildKeyPressEvent, canvasResolution, Image, queueEvent, visualState, VisualState, wKeyCode } from './extrasGame'
 import { getDataDiagram } from '../services/diagram-generator'
@@ -262,8 +262,8 @@ export const getAssetsFolder = ({ game, project, assets }: Options): string => {
   return packageProperties?.resourceFolder ?? assets
 }
 
-export const buildEnvironmentForProgram = async ({ project, skipValidations, game }: Options): Promise<Environment> => {
-  let environment = await buildEnvironmentForProject(project)
+export const buildEnvironmentForProgram = async ({ project, skipValidations }: Options): Promise<Environment> => {
+  const environment = await buildEnvironmentForProject(project)
   validateEnvironment(environment, skipValidations)
   return environment
 }

From b61d070e8762503c047f62750a60186201d4b207 Mon Sep 17 00:00:00 2001
From: user <user@localhost.my.domain>
Date: Sat, 22 Jun 2024 13:01:38 -0300
Subject: [PATCH 09/12] revertida eliminacion de metodo getGameInterpreter

---
 src/commands/run.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index e8a7a57..c895921 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -58,7 +58,7 @@ export default async function (programFQN: Name, options: Options): Promise<void
 
 
     const ioGame: Server | undefined = initializeGameClient(options)
-    const interpreter =  interpret(environment, { ...natives })
+    const interpreter = game ? getGameInterpreter(environment) : interpret(environment, { ...natives })
     const programPackage = environment.getNodeByFQN<Package>(programFQN).parent as Package
     const dynamicDiagramClient = await initializeDynamicDiagram(programPackage, options, interpreter)
 
@@ -81,6 +81,12 @@ export default async function (programFQN: Name, options: Options): Promise<void
   }
 }
 
+export const getGameInterpreter = (environment: Environment): Interpreter => {
+  const interpreter = interpret(environment, natives)
+
+  return interpreter
+}
+
 export const initializeGameClient = ({ project, assets, host, port, game }: Options): Server | undefined => {
   if (!game) return undefined
 

From b05827fcf26f7b5efaa56e8ff68476438d6c66fd Mon Sep 17 00:00:00 2001
From: palumbon <nahuel.palumbo@gmail.com>
Date: Wed, 11 Sep 2024 10:35:07 +0200
Subject: [PATCH 10/12] Refactoring profile code

---
 .../existing-folder/package.json              |  2 +-
 src/commands/run.ts                           | 40 ++++---------------
 src/time-measurer.ts                          | 33 ++++++++++++++-
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/examples/init-examples/existing-folder/package.json b/examples/init-examples/existing-folder/package.json
index 94b9f99..ef8cb6a 100644
--- a/examples/init-examples/existing-folder/package.json
+++ b/examples/init-examples/existing-folder/package.json
@@ -2,6 +2,6 @@
   "name": "existing-folder",
   "version": "1.0.0",
   "wollokVersion": "4.0.0",
-  "author": "ivanjawerbaum",
+  "author": "palumbon",
   "license": "ISC"
 }
diff --git a/src/commands/run.ts b/src/commands/run.ts
index 48891c1..840f26f 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -11,7 +11,7 @@ import { Environment, GAME_MODULE, interpret, Interpreter, Name, Package, Runtim
 import { logger as fileLogger } from '../logger'
 import { getDataDiagram } from '../services/diagram-generator'
 import { buildEnvironmentForProject, buildEnvironmentIcon, ENTER, failureDescription, folderIcon, gameIcon, handleError, isValidAsset, isValidImage, isValidSound, programIcon, publicPath, readPackageProperties, serverError, stackTrace, successDescription, validateEnvironment, valueDescription } from '../utils'
-import { TimeMeasurer } from './../time-measurer'
+import { EventProfiler, TimeMeasurer } from './../time-measurer'
 
 const { time, timeEnd } = console
 
@@ -25,8 +25,6 @@ export type Options = {
   startDiagram: boolean
 }
 
-let timer = 0
-
 const DEFAULT_PORT = '4200'
 const DEFAULT_HOST = 'localhost'
 
@@ -163,7 +161,7 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
       queueEvent(interpreter, ...events.map(code => buildKeyPressEvent(interpreter, code)))
     })
 
-    const gameSingleton = interpreter.object('wollok.game.game')
+    const gameSingleton = interpreter.object(GAME_MODULE)
     // wait for client to be ready
     socket.on('ready', () => {
       logger.info(successDescription('Ready!'))
@@ -178,37 +176,15 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
     })
 
     const flushInterval = 17
+    const profiler = new EventProfiler(logger, "GAME")
 
-    // muestras y tEvents se utilizan para poder
-    // sacar un promedio de demora del flushEvents
-    let muestras = 0
-    let tEvents = 0
-
+    let timer = 0
     const id = setInterval(() => {
       try {
-        const tsStart = performance.now()
-        interpreter.send('flushEvents', gameSingleton, interpreter.reify(timer))
-
-        draw(interpreter, io)
-        const elapsed = performance.now() - tsStart
-
-        // Timer contiene el timestamp enviado a flushEvent
-        // para que pueda procesar los timeEvents.
-        //
-        // En el mejor de los casos va a incrementar de a 17ms
-        // Si flushEvents demoró más del tiempo flushInterval (17ms)
-        // incrementamos el timer tomando el mayor de los tiempos
-        timer += elapsed > flushInterval ? elapsed : flushInterval
-
-        // cada 30 muestras se imprime por consola el tiempo promedio
-        // que tardó en procesar todos los eventos
-        tEvents += elapsed
-        muestras += 1
-        if(muestras >= 30) {
-          logger.debug(`flushEvents: ${(tEvents / muestras).toFixed(2)} ms`)
-          muestras = 0
-          tEvents = 0
-        }
+        profiler.runEvent(() => {
+          interpreter.send('flushEvents', gameSingleton, interpreter.reify(timer))
+          draw(interpreter, io)
+        })
 
         // We could pass the interpreter but a program does not change it
         dynamicDiagramClient.onReload()
diff --git a/src/time-measurer.ts b/src/time-measurer.ts
index c58efbe..d677436 100644
--- a/src/time-measurer.ts
+++ b/src/time-measurer.ts
@@ -1,3 +1,5 @@
+import { Logger } from 'loglevel'
+
 export class TimeMeasurer {
   private initialTime: number = this.now()
 
@@ -12,4 +14,33 @@ export class TimeMeasurer {
   public elapsedTime(): number {
     return this.now() - this.initialTime
   }
-}
\ No newline at end of file
+}
+
+const MAX_SAMPLES = 30
+export class EventProfiler {
+  private samples = 0
+  private elapsedTime = 0
+
+  constructor(private logger: Logger, private label: string = 'PROFILE') { }
+
+  public runEvent = (f: () => any) => {
+    const timeMeasurer = new TimeMeasurer()
+    f()
+    this.elapsedTime += timeMeasurer.elapsedTime()
+    this.samples++
+
+    if (this.samples >= MAX_SAMPLES) {
+      this.notify()
+      this.restart()
+    }
+  }
+
+  private restart() {
+    this.samples = 0
+    this.elapsedTime = 0
+  }
+
+  private notify() {
+    this.logger.debug(`${this.label}: ${(this.elapsedTime / this.samples).toFixed(2)} ms`)
+  }
+}

From 622d483164f8f60f06319904bfc73331eb263bf4 Mon Sep 17 00:00:00 2001
From: palumbon <nahuel.palumbo@gmail.com>
Date: Mon, 16 Sep 2024 22:09:46 +0200
Subject: [PATCH 11/12] Refactoring profiler + elapsedTime

---
 src/commands/run.ts  | 16 +++++++++-------
 src/time-measurer.ts | 16 +++++++++++-----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/commands/run.ts b/src/commands/run.ts
index 840f26f..64b73d9 100644
--- a/src/commands/run.ts
+++ b/src/commands/run.ts
@@ -11,7 +11,7 @@ import { Environment, GAME_MODULE, interpret, Interpreter, Name, Package, Runtim
 import { logger as fileLogger } from '../logger'
 import { getDataDiagram } from '../services/diagram-generator'
 import { buildEnvironmentForProject, buildEnvironmentIcon, ENTER, failureDescription, folderIcon, gameIcon, handleError, isValidAsset, isValidImage, isValidSound, programIcon, publicPath, readPackageProperties, serverError, stackTrace, successDescription, validateEnvironment, valueDescription } from '../utils'
-import { EventProfiler, TimeMeasurer } from './../time-measurer'
+import { DummyProfiler, EventProfiler, TimeMeasurer } from './../time-measurer'
 
 const { time, timeEnd } = console
 
@@ -176,15 +176,17 @@ export const eventsFor = (io: Server, interpreter: Interpreter, dynamicDiagramCl
     })
 
     const flushInterval = 17
-    const profiler = new EventProfiler(logger, "GAME")
+    const profiler = logger.getLevel() >= logger.levels.DEBUG
+      ? new EventProfiler(logger, 'GAME-LOOP')
+      : new DummyProfiler()
 
-    let timer = 0
+    const start = new TimeMeasurer()
     const id = setInterval(() => {
       try {
-        profiler.runEvent(() => {
-          interpreter.send('flushEvents', gameSingleton, interpreter.reify(timer))
-          draw(interpreter, io)
-        })
+        profiler.start()
+        interpreter.send('flushEvents', gameSingleton, interpreter.reify(start.elapsedTime()))
+        draw(interpreter, io)
+        profiler.stop()
 
         // We could pass the interpreter but a program does not change it
         dynamicDiagramClient.onReload()
diff --git a/src/time-measurer.ts b/src/time-measurer.ts
index d677436..1a9e507 100644
--- a/src/time-measurer.ts
+++ b/src/time-measurer.ts
@@ -20,15 +20,16 @@ const MAX_SAMPLES = 30
 export class EventProfiler {
   private samples = 0
   private elapsedTime = 0
+  private timeMeasurer = new TimeMeasurer()
 
   constructor(private logger: Logger, private label: string = 'PROFILE') { }
 
-  public runEvent = (f: () => any) => {
-    const timeMeasurer = new TimeMeasurer()
-    f()
-    this.elapsedTime += timeMeasurer.elapsedTime()
+  public start(): void {
+    this.timeMeasurer = new TimeMeasurer()
+  }
+  public stop(): void {
+    this.elapsedTime += this.timeMeasurer.elapsedTime()
     this.samples++
-
     if (this.samples >= MAX_SAMPLES) {
       this.notify()
       this.restart()
@@ -44,3 +45,8 @@ export class EventProfiler {
     this.logger.debug(`${this.label}: ${(this.elapsedTime / this.samples).toFixed(2)} ms`)
   }
 }
+
+export class DummyProfiler {
+  public start(): void { }
+  public stop(): void { }
+}
\ No newline at end of file

From c1a9070e0709afd9ee60ad7dc50331558677dcfd Mon Sep 17 00:00:00 2001
From: palumbon <nahuel.palumbo@gmail.com>
Date: Mon, 16 Sep 2024 22:19:18 +0200
Subject: [PATCH 12/12] Fixing test

---
 test/run.test.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/run.test.ts b/test/run.test.ts
index bd35519..3055d0a 100644
--- a/test/run.test.ts
+++ b/test/run.test.ts
@@ -2,10 +2,10 @@ import chai from 'chai'
 import { mkdirSync, rmdirSync } from 'fs'
 import { join } from 'path'
 import sinon from 'sinon'
-import run, { Options, buildEnvironmentForProgram, getAssetsFolder, getGameInterpreter, getAllAssets, getSoundsFolder, getVisuals, initializeGameClient } from '../src/commands/run'
-import { spyCalledWithSubstring } from './assertions'
-import { logger as fileLogger } from '../src/logger'
 import { io as ioc } from 'socket.io-client'
+import run, { buildEnvironmentForProgram, getAllAssets, getAssetsFolder, getGameInterpreter, getSoundsFolder, getVisuals, Options } from '../src/commands/run'
+import { logger as fileLogger } from '../src/logger'
+import { spyCalledWithSubstring } from './assertions'
 
 
 chai.should()
@@ -80,12 +80,11 @@ describe('testing run', () => {
         project: imageProject,
       }
 
-      const io = initializeGameClient(options)!
       const environment = await buildEnvironmentForProgram(options)
-      const interpreter = getGameInterpreter(environment, io)!
+      const interpreter = getGameInterpreter(environment)!
       const game = interpreter.object('wollok.game.game')
       interpreter.send('addVisual', game, interpreter.object('mainGame.elementoVisual'))
-      io.close()
+
       // we can't use join in the image path since it's in Wollok project
       expect(getVisuals(game, interpreter)).to.deep.equal([{
         image: 'smalls/1.png',