feat(core-editor): cleaner event manager

Tchips46 · Tchips46 · commit 565446fa4b92 · 2026-03-31T00:55:20.000+09:00
diff --git a/packages/core-editor/.cliff-jumperrc.json b/packages/core-editor/.cliff-jumperrc.json
@@ -2,6 +2,6 @@
   "$schema": "https://raw.githubusercontent.com/favware/cliff-jumper/main/assets/cliff-jumper.schema.json",
   "name": "core",
   "org": "nanoforge-dev",
-  "packagePath": "packages/core",
+  "packagePath": "packages/core-editor",
   "identifierBase": false
 }
diff --git a/packages/core-editor/.idea/.name b/packages/core-editor/.idea/.name
diff --git a/packages/core-editor/.idea/[NanoForge] Engine Core Editor.iml b/packages/core-editor/.idea/[NanoForge] Engine Core Editor.iml
diff --git a/packages/core-editor/.idea/modules.xml b/packages/core-editor/.idea/modules.xml
diff --git a/packages/core-editor/CHANGELOG.md b/packages/core-editor/CHANGELOG.md
@@ -2,58 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
-# [@nanoforge-dev/core@1.0.1](https://github.com/NanoForge-dev/Engine/compare/@nanoforge-dev/core@1.0.0...@nanoforge-dev/core@1.0.1) - (2026-02-16)
-
 ## Documentation
 
-- Setup typedoc (#192) ([fa908e7](https://github.com/NanoForge-dev/Engine/commit/fa908e7e268fa1770be58fc62a0257f3760480b2)) by @MartinFillon
-- Fix readme badges (#186) ([fd8d93d](https://github.com/NanoForge-dev/Engine/commit/fd8d93d13a0fbad95ef9952acd10faad9e112c78)) by @Exeloo
-
-# [@nanoforge-dev/core@1.0.0](https://github.com/NanoForge-dev/Engine/tree/@nanoforge-dev/core@1.0.0) - (2026-01-09)
-
 ## Bug Fixes
 
-- **graphics:** Game loop ([53329d2](https://github.com/NanoForge-dev/Engine/commit/53329d28c47bfac9fe86259e9fc6f42b206062a8)) by @Exeloo
-- **graphics:** Fix display ([d8522e5](https://github.com/NanoForge-dev/Engine/commit/d8522e56678f3bd136733f7941c1d917c18b1400)) by @Exeloo
-- **ecs:** Fix tests ([d33ada5](https://github.com/NanoForge-dev/Engine/commit/d33ada5d9c37e331b8178aa1fc0daee88b07131c)) by @Exeloo
-- **ecs:** Change type handling on lib ecs ([580192d](https://github.com/NanoForge-dev/Engine/commit/580192d5038f386c965434f78aacdf3d1e399ff8)) by @Exeloo
-
 ## Documentation
 
-- Update README files with new structure and detailed usage examples for all packages (#157) ([63fab73](https://github.com/NanoForge-dev/Engine/commit/63fab7326bd9c7e6b00f950694ab16c9d9190c53)) by @Exeloo
-- Add funding (#147) ([7301fad](https://github.com/NanoForge-dev/Engine/commit/7301fad10f59b7e1f7fa788f8a2f6fc81d0db72e)) by @Exeloo
-- Add a basic introduction readme ([b240964](https://github.com/NanoForge-dev/Engine/commit/b240964a265b31769a8c5422e23e20156ba56192)) by @MartinFillon
-- Add building and dependency docs to every readme ([2d4785b](https://github.com/NanoForge-dev/Engine/commit/2d4785bdcb455e83337b37540f9ab6b3394c0850)) by @MartinFillon
-
 ## Features
 
-- **packages/network:** Client and server for tcp/udp and networked pong as example (#156) ([839fb95](https://github.com/NanoForge-dev/Engine/commit/839fb95449f6ae0ee66d7f7e279374268b743f65)) by @Tchips46
-- **core:** Add client/server distinction and update rendering logic (#119) ([5271432](https://github.com/NanoForge-dev/Engine/commit/5271432710031396d7e433bfdfb015e3871f69d0)) by @Exeloo
-- Add schematics used types (#102) ([b992306](https://github.com/NanoForge-dev/Engine/commit/b9923064ba1da3164b1739fcdec5a819734c4ba2)) by @Exeloo
-- **core:** Introduce `EditableApplicationContext` for managing sound libraries ([6c7bac2](https://github.com/NanoForge-dev/Engine/commit/6c7bac261eeb7ad79203d5695d5ad76dc9e9e9f5)) by @Exeloo
-- **core:** Add Context that admit a ClientLibraryManager ([3835bc8](https://github.com/NanoForge-dev/Engine/commit/3835bc8a6e6d039f11a513b7fe54c353f90e9fe1)) by @Exeloo
-- **music:** Finish music library and add an interface for mutable libraries ([8e00c5d](https://github.com/NanoForge-dev/Engine/commit/8e00c5d00f2901ada86f59667eff7e5d3446076b)) by @MartinFillon
-- **core:** Add `class-transformer` and `class-validator` dependencies for validation utilities ([fd94fe7](https://github.com/NanoForge-dev/Engine/commit/fd94fe7755999c5529335666720899792a691a36)) by @Exeloo
-- **common, core, config:** Introduce configuration registry and validation system ([4fafb82](https://github.com/NanoForge-dev/Engine/commit/4fafb82576fec6866fc281ad5b10321d2ac430df)) by @Exeloo
-- **core:** Enhance type safety and execution context handling ([d986030](https://github.com/NanoForge-dev/Engine/commit/d986030a333bc08d2e37291d1a023cf8d7a6e1d6)) by @Exeloo
-- **app:** Add the ability to mute and unmute sounds ([947bdc0](https://github.com/NanoForge-dev/Engine/commit/947bdc00784a4c3313fe08feb4f91fc91b3ac7b7)) by @MartinFillon
-- **sound:** Add basic sound playing to example ([7335814](https://github.com/NanoForge-dev/Engine/commit/7335814fc532ee92a5f9d776f409c5faa4d56423)) by @MartinFillon
-- **core:** Add default libraries to constructor ([7d9da69](https://github.com/NanoForge-dev/Engine/commit/7d9da69be4301875020176656276236b88b737f1)) by @Exeloo
-- Add dependencies handling ([e51dd3b](https://github.com/NanoForge-dev/Engine/commit/e51dd3bdb5e2e3de21339bf6218e85f935efb9d5)) by @Exeloo
-- **common:** Add dependencies handler ([edb098a](https://github.com/NanoForge-dev/Engine/commit/edb098a65fb932ba9a9532a9b1eee7d64a7a8f0d)) by @Exeloo
-- **core:** Add tickrate and fix runner ([1dba5bd](https://github.com/NanoForge-dev/Engine/commit/1dba5bd89ffa20dfd29b079f93c3eb923ffbdbbc)) by @Exeloo
-- **input:** Add input library ([387e97d](https://github.com/NanoForge-dev/Engine/commit/387e97d7c3015a869947af4acecf48e8e1b0e2b8)) by @Exeloo
-- **game:** Create pong example game ([4b66674](https://github.com/NanoForge-dev/Engine/commit/4b66674c750f345e860d225384054423433beb07)) by @bill-h4rper
-- **game:** Add width and height ([c93c985](https://github.com/NanoForge-dev/Engine/commit/c93c985665bd99c09bc410f1499d11aeaffe3c4c)) by @Exeloo
-- **game:** Add graphics factory ([0f4453c](https://github.com/NanoForge-dev/Engine/commit/0f4453ced908b39e953a672324e97eba82bfeaa3)) by @Exeloo
-- **asset-manager:** Add asset manager ([1774a26](https://github.com/NanoForge-dev/Engine/commit/1774a26593099b4faa0a2527d1684de35211d5d2)) by @Exeloo
-- Add asset manager default in core ([26cc5a9](https://github.com/NanoForge-dev/Engine/commit/26cc5a99e014fbc8669a43cc4aa4d78ecc1dee14)) by @Exeloo
-- Add core and common ([1755c79](https://github.com/NanoForge-dev/Engine/commit/1755c799c143513d72b28edaac875267d484a44f)) by @Exeloo
-- Initial commit ([c9bb59e](https://github.com/NanoForge-dev/Engine/commit/c9bb59ee963e7b444e8668db55597915e9ef0e4b)) by @Exeloo
-
 ## Refactor
 
-- **core:** Remove default libs in factory (#118) ([fa893c7](https://github.com/NanoForge-dev/Engine/commit/fa893c71616f151343c2f52a4723a64cca65814a)) by @Exeloo
-- Migrate namespaces to `@nanoforge-dev` and update related imports ([c84c927](https://github.com/NanoForge-dev/Engine/commit/c84c927ead941d914e5a9fd752fd3a5ac969f981)) by @Exeloo
-- **libraries:** Implement initialization validation and standardize nullable fields ([8b04575](https://github.com/NanoForge-dev/Engine/commit/8b04575cf7f649a440b8f40ad6114414406b0c1a)) by @Exeloo
-
diff --git a/packages/core-editor/README.md b/packages/core-editor/README.md
@@ -16,28 +16,27 @@
 
 ## About
 
-`@nanoforge-dev/core` is a core package that contains game main loop. It is used to initialize the game and run it.
+`@nanoforge-dev/core-editor` is a core package that contains game main loop. It is used to initialize the game and run it.
 
 ## Installation
 
 **Node.js 24.11.0 or newer is required.**
 
 ```sh
-npm install @nanoforge-dev/core
-yarn add @nanoforge-dev/core
-pnpm add @nanoforge-dev/core
-bun add @nanoforge-dev/core
+npm install @nanoforge-dev/core-editor
+yarn add @nanoforge-dev/core-editor
+pnpm add @nanoforge-dev/core-editor
+bun add @nanoforge-dev/core-editor
 ```
 
 ## Example usage
 
 Initialize the game in your main file.
 
 ```ts
-import { type IRunOptions } from "@nanoforge-dev/common";
-import { NanoforgeFactory } from "@nanoforge-dev/core";
+import { IEditorRunOptions, NanoforgeFactory } from "@nanoforge-dev/core-editor";
 
-export async function main(options: IRunClientOptions) {
+export async function main(options: IEditorRunOptions) {
   const app = NanoforgeFactory.createClient();
 
   await app.init(options);
@@ -63,6 +62,6 @@ If you don't understand something in the documentation, you are experiencing pro
 
 [documentation]: https://github.com/NanoForge-dev/Engine
 [discussions]: https://github.com/NanoForge-dev/Engine/discussions
-[source]: https://github.com/NanoForge-dev/Engine/tree/main/packages/core
-[npm]: https://www.npmjs.com/package/@nanoforge-dev/core
+[source]: https://github.com/NanoForge-dev/Engine/tree/main/packages/core-editor
+[npm]: https://www.npmjs.com/package/@nanoforge-dev/core-editor
 [contributing]: https://github.com/NanoForge-dev/Engine/blob/main/.github/CONTRIBUTING.md
diff --git a/packages/core-editor/cliff.toml b/packages/core-editor/cliff.toml
@@ -69,7 +69,7 @@ commit_parsers = [
 ]
 filter_commits = true
 protect_breaking_commits = true
-tag_pattern = "@nanoforge-dev/core@[0-9]*"
+tag_pattern = "@nanoforge-dev/core-editor@[0-9]*"
 ignore_tags = ""
 topo_order = false
 sort_commits = "newest"
diff --git a/packages/core-editor/package.json b/packages/core-editor/package.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@nanoforge-dev/core-editor",
-  "version": "1.0",
+  "version": "0.0",
   "description": "NanoForge Engine - Core Editor",
   "keywords": [
     "nanoforge",
diff --git a/packages/core-editor/src/common/context/event-emitter.type.ts b/packages/core-editor/src/common/context/event-emitter.type.ts
@@ -3,6 +3,22 @@ export enum EventTypeEnum {
   HARD_RELOAD = "hard-reload",
 }
 
-export interface EventEmitter {
-  eventQueue: (EventTypeEnum | string)[];
+export type ListenerType = (...args: any[]) => void;
+
+export interface IEventEmitter {
+  listeners: Record<EventTypeEnum | string, ListenerType[]>;
+  eventQueue: { event: EventTypeEnum | string; args: any[] }[];
+
+  runEvents: () => void;
+
+  emitEvent: (event: EventTypeEnum, ...args: any) => void;
+
+  addListener: (event: EventTypeEnum | string, listener: ListenerType) => void;
+  on: (event: EventTypeEnum | string, listener: ListenerType) => void;
+
+  removeListener: (event: EventTypeEnum | string, listener: ListenerType) => void;
+  off: (event: EventTypeEnum | string, listener: ListenerType) => void;
+
+  removeListenersForEvent: (event: EventTypeEnum | string) => void;
+  removeAllListeners: () => void;
 }
diff --git a/packages/core-editor/src/common/context/options.type.ts b/packages/core-editor/src/common/context/options.type.ts
@@ -1,4 +1,4 @@
-import { type EventEmitter } from "./event-emitter.type";
+import { type EventEmitter } from "../../editor/event-emitter.manager";
 import { type Save } from "./save.type";
 
 export type IEditorRunOptions = IEditorRunClientOptions | IEditorRunServerOptions;
@@ -9,15 +9,16 @@ export interface IEditorRunClientOptions {
   env: Record<string, string | undefined>;
   editor: {
     save: Save;
-    events: EventEmitter;
+    coreEvents: EventEmitter;
+    editorEvents: EventEmitter;
   };
 }
 export interface IEditorRunServerOptions {
-  canvas: HTMLCanvasElement;
   files: Map<string, string>;
   env: Record<string, string | undefined>;
   editor: {
     save: Save;
-    events: EventEmitter;
+    coreEvents: EventEmitter;
+    editorEvents: EventEmitter;
   };
 }
diff --git a/packages/core-editor/src/editor/core-editor.ts b/packages/core-editor/src/editor/core-editor.ts
@@ -10,20 +10,11 @@ export class CoreEditor {
   constructor(editor: IEditorRunOptions["editor"], ecsLibrary: ECSClientLibrary) {
     this.editor = editor;
     this.ecsLibrary = ecsLibrary;
+    this.editor.coreEvents?.addListener(EventTypeEnum.HOT_RELOAD, this.askEntitiesHotReload);
   }
 
   public runEvents() {
-    const events: (EventTypeEnum | string)[] = this.editor.events.eventQueue;
-    while (events.length > 0) {
-      const event = events.shift();
-      switch (event) {
-        case EventTypeEnum.HOT_RELOAD:
-          this.askEntitiesHotReload();
-          break;
-        default:
-          console.warn(`Unknown event type ${event}`);
-      }
-    }
+    this.editor.coreEvents?.runEvents();
   }
 
   public askEntitiesHotReload(): void {
diff --git a/packages/core-editor/src/editor/event-emitter.manager.ts b/packages/core-editor/src/editor/event-emitter.manager.ts
@@ -0,0 +1,50 @@
+import {
+  type EventTypeEnum,
+  type IEventEmitter,
+  type ListenerType,
+} from "../common/context/event-emitter.type";
+
+export class EventEmitter implements IEventEmitter {
+  public listeners: Record<EventTypeEnum | string, ListenerType[]> = {};
+  public eventQueue: { event: EventTypeEnum | string; args: any[] }[] = [];
+
+  public runEvents = () => {
+    this.eventQueue.forEach(({ event, args }) => {
+      this.listeners[event]?.forEach((listener) => {
+        listener(...args);
+      });
+    });
+    this.eventQueue = [];
+  };
+
+  public emitEvent(event: EventTypeEnum | string, ...args: any[]) {
+    this.eventQueue.push({ event, args });
+  }
+
+  public addListener(event: EventTypeEnum | string, listener: ListenerType): void {
+    if (!this.listeners[event]) this.listeners[event] = [];
+    this.listeners[event].push(listener);
+  }
+  public on(event: EventTypeEnum | string, listener: ListenerType): void {
+    this.addListener(event, listener);
+  }
+
+  public removeListener(event: EventTypeEnum | string, listener: ListenerType): void {
+    if (!this.listeners[event]) return;
+    const index = this.listeners[event].indexOf(listener);
+    if (index >= 0) {
+      this.listeners[event].splice(index, 1);
+    }
+  }
+  public off(event: EventTypeEnum | string, listener: ListenerType): void {
+    this.removeListener(event, listener);
+  }
+
+  public removeListenersForEvent(event: EventTypeEnum | string): void {
+    if (!this.listeners[event]) return;
+    this.listeners[event] = [];
+  }
+  public removeAllListeners(): void {
+    this.listeners = {};
+  }
+}
diff --git a/packages/core-editor/test/editor-feature.spec.ts b/packages/core-editor/test/editor-feature.spec.ts
@@ -1,24 +1,29 @@
 import { type ECSClientLibrary } from "@nanoforge-dev/ecs-client";
 import { afterEach, describe, expect, it, vi } from "vitest";
 
-import { type EventEmitter, EventTypeEnum } from "../src/common/context/event-emitter.type";
+import { EventTypeEnum } from "../src/common/context/event-emitter.type";
 import type { IEditorRunOptions } from "../src/common/context/options.type";
 import { type Save, type SaveComponent, type SaveEntity } from "../src/common/context/save.type";
 import { CoreEditor } from "../src/editor/core-editor";
+import { EventEmitter } from "../src/editor/event-emitter.manager";
 
 describe("EditorFeatures", () => {
   afterEach(() => {
     vi.restoreAllMocks();
   });
+
   describe("eventEmitter", () => {
     it("should execute eventQueue once", async () => {
-      const events: EventEmitter = {
-        eventQueue: [EventTypeEnum.HOT_RELOAD, EventTypeEnum.HOT_RELOAD],
-      };
+      const events = new EventEmitter();
+      events.emitEvent(EventTypeEnum.HOT_RELOAD);
+      events.emitEvent(EventTypeEnum.HOT_RELOAD);
       const spyHotReload = vi
         .spyOn(CoreEditor.prototype, "askEntitiesHotReload")
         .mockImplementation(() => {});
-      new CoreEditor({ events } as IEditorRunOptions["editor"], {} as ECSClientLibrary).runEvents();
+      new CoreEditor(
+        { coreEvents: events } as IEditorRunOptions["editor"],
+        {} as ECSClientLibrary,
+      ).runEvents();
       expect(spyHotReload).toHaveBeenCalledTimes(2);
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/favware/cliff-jumper/main/assets/cliff-jumper.schema.json",`
`3`	`3`	`"name": "core",`
`4`	`4`	`"org": "nanoforge-dev",`
`5`		`- "packagePath": "packages/core",`
	`5`	`+ "packagePath": "packages/core-editor",`
`6`	`6`	`"identifierBase": false`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ commit_parsers = [`
`69`	`69`	`]`
`70`	`70`	`filter_commits = true`
`71`	`71`	`protect_breaking_commits = true`
`72`		`-tag_pattern = "@nanoforge-dev/core@[0-9]*"`
	`72`	`+tag_pattern = "@nanoforge-dev/core-editor@[0-9]*"`
`73`	`73`	`ignore_tags = ""`
`74`	`74`	`topo_order = false`
`75`	`75`	`sort_commits = "newest"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://json.schemastore.org/package.json",`
`3`	`3`	`"name": "@nanoforge-dev/core-editor",`
`4`		`- "version": "1.0",`
	`4`	`+ "version": "0.0",`
`5`	`5`	`"description": "NanoForge Engine - Core Editor",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"nanoforge",`