Merge pull request #78 from mauriciosoares/simplify

Simplify

Author: GrosSacASac

README.md

@@ -210,6 +210,10 @@ You need [NodeJS](https://nodejs.org/) installed on your machine
 
 ## Changelog
 
+### 2.1.0
+
+ * eventPlayer, eventRecorder optionals are importable directly from the core
+
 ### 2.0.0
 
  * core.start, core.stop return Promises

examples/replay/index.html

@@ -18,6 +18,8 @@
     </li>
   </ul>
 
+  <button id="undo">Undo</button>
+
   <script type="module" src="./main.js"></script>
 </body>
 </html>

examples/replay/main.js

@@ -1,9 +1,10 @@
-import { Core, ALL } from "../../src/core.js";
-import {
+import { 
+    Core,
+    ALL,
     startEventRecorder,
     stopEventRecorder,
-} from "../../src/eventRecorder.js";
-import { replayEvents } from "../../src/eventPlayer.js";
+    replayEvents,
+} from "../../src/core.js";
 // import {  } from "./eventNames.js";
 // import { x, y } from "./dependencies.js";
 // import { configuration } from "./configuration.js";
@@ -44,10 +45,21 @@ const restart = async () => {
     ];
 };
 
-restart();
-
-setTimeout(async () => {
+const replay = async () => {
     const previousEvents = eventRecording.events;
     await restart();
     replayEvents(core, previousEvents, { sameSpeed: true });
-}, 10000);
+};
+const controlZ =  async () => {
+    const previousEvents = eventRecording.events;
+    previousEvents.pop(); // forget last
+    await restart();
+    replayEvents(core, previousEvents, { sameSpeed: false });
+};
+
+document.getElementById(`undo`).addEventListener(`click`, controlZ);
+
+restart();
+
+setTimeout(replay, 10000);
+setTimeout(controlZ, 20000);

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@eroc/core",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "main": "dist/core.umd.js",
   "module": "dist/core.es.js",
   "description": "Lightweight framework for scalable applications",

package.json

@@ -1,4 +1,6 @@
 export { Core, ALL, ERROR };
+export { startEventRecorder, stopEventRecorder } from "./eventRecorder.js";
+export { replayEvents } from "./eventPlayer.js";
 import EventEmitter from "../node_modules/event-e3/event-e3.js";
 
 

src/core.js

@@ -11,14 +11,21 @@ const replayEvents = (core, events, options = {}) => {
         core.paused = true;
     }
 
-    if (!sameSpeed) {
-        events.forEach(event => {
-            core.moduleEmitDirect(event.name, event.data);
-        });
-        core.paused = false;
-        return;
+    if (sameSpeed) {
+        replayEventsSameSpeed(core, events);
+    } else {
+        replayEventsInstantly(core, events);
     }
+};
+
+const replayEventsInstantly = (core, events) => {    
+    events.forEach(event => {
+        core.moduleEmitDirect(event.name, event.data);
+    });
+    core.paused = false;
+};
 
+const replayEventsSameSpeed = (core, events) => {
     const { length } = events;
     let i = 0;
     const playNext = () => {