@media-quest/engine 0.0.38 → 0.0.40

package/src/engine/SchemaEngine.ts

@@ -1,160 +1,155 @@
-import { SchemaDto } from "./SchemaDto";
-import { DPlayer } from "./dplayer";
-import { ScaleService } from "./scale";
-import { Page } from "../page/Page";
-import { TaskManager } from "../page/task-manager";
-import { PageResult } from "../page/page-result";
-import { SchemaResult } from "./SchemaResult";
-export interface EngineLogger {
-  info(message: string): void;
-  error(message: string): void;
-  warn(message: string): void;
-}
-
-const voidLogger: EngineLogger = {
-  info: (message: string) => {},
-  error: (message: string) => {},
-  warn: (message: string) => {},
-};
-
-export interface ISchemaEngine {
-  onProgress(handler: (result: SchemaResult) => void): void;
-  onFatalError(handler: (error: { message: string }) => void): void;
-  setLogger(logger: EngineLogger): void;
-}
-
-export class SchemaEngine implements ISchemaEngine {
-  private readonly TAG = "[ SCHEMA_ENGINE ] :";
-  private readonly scale: ScaleService;
-  private readonly hostElement: HTMLDivElement;
-  private readonly taskManager: TaskManager;
-  private logger: EngineLogger = voidLogger;
-  private readonly uiLayer: HTMLDivElement = document.createElement("div");
-  private readonly mediaLayer: HTMLDivElement = document.createElement("div");
-  private player: DPlayer;
-  private currentPage: Page | false = false;
-  private readonly tickerRef: number | false = false;
-  constructor(
-    hostEl: HTMLDivElement,
-    private readonly height: number,
-    private readonly width: number,
-    private readonly schema: SchemaDto,
-  ) {
-    this.tickerRef = window.setInterval(() => {
-      if (this.currentPage) {
-        this.currentPage.tick();
-      }
-    }, 100);
-    this.hostElement = hostEl;
-    this.hostElement.appendChild(this.mediaLayer);
-    this.hostElement.appendChild(this.uiLayer);
-    this.scale = new ScaleService({
-      baseHeight: schema.baseHeight,
-      baseWidth: schema.baseWidth,
-      containerWidth: this.width,
-      containerHeight: this.height,
-    });
-    this.logger.info(this.TAG + "Scale: " + JSON.stringify(this.scale));
-    this.player = new DPlayer(this.schema);
-    this.taskManager = new TaskManager(this.mediaLayer, this.scale, (error) => {
-      console.log(error);
-    });
-
-    this.styleSelf();
-    this.handlePageCompleted = this.handlePageCompleted.bind(this);
-    this.nextPage();
-  }
-
-  private handlePageCompleted(result: PageResult) {
-    // 1 Save data from last page
-    this.player.saveHistory(result);
-
-    // 2 Emit progress
-    const currentResults = this.player.getResults();
-    const a: SchemaResult = {
-      schemaId: this.schema.id,
-      pageResults: currentResults.pageResults,
-      pagesLeft: currentResults.pagesLeft,
-      predefinedFacts: currentResults.predefinedFacts,
-      eventLog: currentResults.eventLog,
-      answers: currentResults.answerFacts,
-    };
-    if (this._onProgress) {
-      this._onProgress(a);
-    }
-
-    // 3. Next page
-    this.nextPage();
-  }
-
-  private styleSelf() {
-    this.hostElement.style.height = this.scale.pageHeight + "px";
-    this.hostElement.style.width = this.scale.pageWidth + "px";
-    this.hostElement.style.backgroundColor = this.schema.backgroundColor ?? "white";
-    this.hostElement.style.position = "relative";
-    // this.hostElement.style.overflow = "hidden";
-    const makeStatic = (div: HTMLDivElement) => {
-      div.style.height = "0px";
-      div.style.width = "0px";
-      div.style.position = "static";
-    };
-
-    makeStatic(this.uiLayer);
-    this.uiLayer.style.zIndex = "10";
-    this.mediaLayer.style.zIndex = "8";
-    makeStatic(this.mediaLayer);
-  }
-
-  private nextPage() {
-    const nextPage = this.player.getNextPage();
-    if (this.currentPage) {
-      this.currentPage.destroy();
-      this.uiLayer.innerHTML = "";
-    }
-
-    // console.log(nextPage);
-    if (nextPage && nextPage.videoPlayer && nextPage.videoPlayer.style) {
-      this.taskManager.setVideoStyles(nextPage.videoPlayer.style);
-    }
-
-    if (!nextPage) {
-      // TODO FIGURE OUT WHAQT TO DO AT END OF TEST!! Start over??
-      this.player = new DPlayer(this.schema);
-      if (this.player.pagesLeft > 0) {
-        this.nextPage();
-      }
-      return false;
-    }
-
-    const newPage = new Page(nextPage, this.taskManager, this.scale, (result) => {
-      this.handlePageCompleted(result);
-    });
-
-    this.currentPage = newPage;
-    newPage.appendYourself(this.uiLayer);
-    return true;
-  }
-
-  destroy() {
-    if (this.currentPage) {
-      this.currentPage.destroy();
-      this.uiLayer.innerHTML = "";
-    }
-    if (this.tickerRef) {
-      window.clearInterval(this.tickerRef);
-    }
-  }
-
-  private _onProgress: ((result: SchemaResult) => void) | false = false;
-  onProgress(handler: (result: SchemaResult) => void) {
-    this._onProgress = handler;
-  }
-
-  private _onFatalError: ((error: { message: string }) => void) | false = false;
-  onFatalError(handler: (error: { message: string }) => void): void {
-    this._onFatalError = handler;
-  }
-  setLogger(logger: EngineLogger) {
-    this.logger = logger;
-  }
-}
+import { SchemaDto } from "./SchemaDto";
+import { DPlayer } from "./dplayer";
+import { ScaleService } from "./scale";
+import { Page } from "../page/Page";
+import { TaskManager } from "../page/task-manager";
+import { PageResult } from "../page/page-result";
+import { SchemaResult } from "./SchemaResult";
+export interface EngineLogger {
+  info(message: string): void;
+  error(message: string): void;
+  warn(message: string): void;
+}
+
+const voidLogger: EngineLogger = {
+  info: (message: string) => {},
+  error: (message: string) => {},
+  warn: (message: string) => {},
+};
+
+export interface ISchemaEngine {
+  onProgress(handler: (result: SchemaResult) => void): void;
+  onFatalError(handler: (error: { message: string }) => void): void;
+  setLogger(logger: EngineLogger): void;
+}
+
+export class SchemaEngine implements ISchemaEngine {
+  private readonly TAG = "[ SCHEMA_ENGINE ] :";
+  private readonly scale: ScaleService;
+  private readonly hostElement: HTMLDivElement;
+  private readonly taskManager: TaskManager;
+  private logger: EngineLogger = voidLogger;
+  private readonly uiLayer: HTMLDivElement = document.createElement("div");
+  private readonly mediaLayer: HTMLDivElement = document.createElement("div");
+  private player: DPlayer;
+  private currentPage: Page | false = false;
+  private readonly tickerRef: number | false = false;
+  constructor(
+    hostEl: HTMLDivElement,
+    private readonly height: number,
+    private readonly width: number,
+    private readonly schema: SchemaDto,
+  ) {
+    this.tickerRef = window.setInterval(() => {
+      if (this.currentPage) {
+        this.currentPage.tick();
+      }
+    }, 100);
+    this.hostElement = hostEl;
+    this.hostElement.appendChild(this.mediaLayer);
+    this.hostElement.appendChild(this.uiLayer);
+    this.scale = new ScaleService({
+      baseHeight: schema.baseHeight,
+      baseWidth: schema.baseWidth,
+      containerWidth: this.width,
+      containerHeight: this.height,
+    });
+    this.logger.info(this.TAG + "Scale: " + JSON.stringify(this.scale));
+    this.player = new DPlayer(this.schema);
+    this.taskManager = new TaskManager(this.mediaLayer, this.scale, (error) => {
+      console.log(error);
+    });
+
+    this.styleSelf();
+    this.handlePageCompleted = this.handlePageCompleted.bind(this);
+    this.nextPage();
+  }
+
+  private handlePageCompleted(result: PageResult) {
+    // 1 Save data from last page
+    this.player.saveHistory(result);
+
+    // 2 Emit progress
+    const currentResults = this.player.getResults();
+    const a: SchemaResult = {
+      schemaId: this.schema.id,
+      pagesLeft: currentResults.pagesLeft,
+      predefinedFacts: currentResults.predefinedFacts,
+      eventLog: currentResults.eventLog,
+      answers: currentResults.answerFacts,
+    };
+    if (this._onProgress) {
+      this._onProgress(a);
+    }
+
+    // 3. Next page
+    this.nextPage();
+  }
+
+  private styleSelf() {
+    this.hostElement.style.height = this.scale.pageHeight + "px";
+    this.hostElement.style.width = this.scale.pageWidth + "px";
+    this.hostElement.style.backgroundColor = this.schema.backgroundColor ?? "white";
+    this.hostElement.style.position = "relative";
+    // this.hostElement.style.overflow = "hidden";
+    const makeStatic = (div: HTMLDivElement) => {
+      div.style.height = "0px";
+      div.style.width = "0px";
+      div.style.position = "static";
+    };
+
+    makeStatic(this.uiLayer);
+    this.uiLayer.style.zIndex = "10";
+    this.mediaLayer.style.zIndex = "8";
+    makeStatic(this.mediaLayer);
+  }
+
+  private nextPage() {
+    const nextPage = this.player.getNextPage();
+    if (this.currentPage) {
+      this.currentPage.destroy();
+      this.uiLayer.innerHTML = "";
+    }
+
+    // console.log(nextPage);
+    if (nextPage && nextPage.videoPlayer && nextPage.videoPlayer.style) {
+      this.taskManager.setVideoStyles(nextPage.videoPlayer.style);
+    }
+
+    if (!nextPage) {
+      // TODO FIGURE OUT WHAQT TO DO AT END OF TEST!! Start over??
+      this.player = new DPlayer(this.schema);
+      if (this.player.pagesLeft > 0) {
+        this.nextPage();
+      }
+      return false;
+    }
+
+    const newPage = new Page(nextPage, this.taskManager, this.scale, (result) => {
+      this.handlePageCompleted(result);
+    });
+    this.currentPage = newPage;
+    newPage.appendYourself(this.uiLayer);
+    return true;
+  }
+
+  destroy() {
+    if (this.currentPage) {
+      this.currentPage.destroy();
+      this.uiLayer.innerHTML = "";
+    }
+  }
+
+  private _onProgress: ((result: SchemaResult) => void) | false = false;
+  onProgress(handler: (result: SchemaResult) => void) {
+    this._onProgress = handler;
+  }
+
+  private _onFatalError: ((error: { message: string }) => void) | false = false;
+  onFatalError(handler: (error: { message: string }) => void): void {
+    this._onFatalError = handler;
+  }
+  setLogger(logger: EngineLogger) {
+    this.logger = logger;
+  }
+}

package/src/engine/SchemaResult.ts

@@ -1,12 +1,10 @@
-import { Fact } from "../rules/fact";
-import { MqEvent } from "../events/mq-events";
-import { PageResult } from "../page/page-result";
-
-export interface SchemaResult {
-  readonly schemaId: string;
-  readonly pagesLeft: number;
-  readonly predefinedFacts: ReadonlyArray<Fact>;
-  readonly eventLog: ReadonlyArray<MqEvent>;
-  readonly answers: ReadonlyArray<Fact>;
-  readonly pageResults?: ReadonlyArray<PageResult>;
-}
+import { Fact } from "../rules/fact";
+import { MqEvent } from "../events/mq-events";
+
+export interface SchemaResult {
+  readonly schemaId: string;
+  readonly pagesLeft: number;
+  readonly predefinedFacts: ReadonlyArray<Fact>;
+  readonly eventLog: ReadonlyArray<MqEvent>;
+  readonly answers: ReadonlyArray<Fact>;
+}

package/src/engine/dplayer.spec.ts

@@ -1,92 +1,91 @@
-import { DPlayer, DPlayerData } from "./dplayer";
-import { PageSequenceDto } from "./SchemaDto";
-import { Rule } from "../rules/rule";
-import { DTimestamp } from "../common/DTimestamp";
-import { RuleActionPageQue } from "./page-que-ruleengine-action";
-import { PageDto } from "../page/Page";
-import { PageResult } from "../page/page-result";
-
-const page = (id: number): PageDto => {
-  return PageDto.createDummy(id);
-  // return { id: PageID.create(), elements: [] };
-};
-const p1 = page(1);
-const p2 = page(2);
-const p3 = page(3);
-const p4 = page(4);
-const p5 = page(5);
-const p6 = page(6);
-const all = [p1, p2, p3, p4, p5, p6];
-const Seq1 = {
-  p10: page(10),
-  p11: page(11),
-  p12: page(12),
-};
-
-const seq1: PageSequenceDto = {
-  id: "s1",
-  pages: [Seq1.p10, Seq1.p11, Seq1.p12],
-  rules: [],
-};
-const data = (
-  pages: PageDto[],
-  pageSequences: PageSequenceDto[] = [],
-  rules: Rule<RuleActionPageQue, never>[] = [],
-): DPlayerData => ({ pages: pages, pageSequences, rules });
-// const seq = (pages: PageDto[], rules: Rule[]) => {};
-beforeEach(() => {
-  // data = { pages: [], rules: [], pageSequences: [] };
-});
-
-describe("DPlayer", () => {
-  it("should create an instance", () => {
-    const player = new DPlayer(data([p1, p1]));
-    expect(player).toBeTruthy();
-  });
-
-  it("can app pages, and get next", () => {
-    const player = new DPlayer(data([p1, p2]));
-
-    expect(player.getNextPage()).toBe(p1);
-    expect(player.getNextPage()).toBe(p2);
-    expect(player.getNextPage()).toBe(false);
-  });
-
-  it("Can insert a sequence", () => {
-    const player = new DPlayer(data(all, [seq1]));
-
-    expect(player.getNextPage()).toBe(p1);
-    expect(player.getNextPage()).toBe(p2);
-    player.insertSequence(seq1.id);
-    expect(player.getNextPage()).toBe(Seq1.p10);
-    expect(player.getNextPage()).toBe(Seq1.p11);
-    expect(player.getNextPage()).toBe(Seq1.p12);
-    expect(player.getNextPage()).toBe(p3);
-  });
-
-  it("Save history", () => {
-    const player = new DPlayer(data(all));
-
-    const curr = player.getNextPage() as PageDto;
-
-    const result: PageResult = {
-      pageId: curr.id,
-      pagePrefix: curr.id,
-      pageNumber: 1,
-      eventLog: [],
-      pageTime: DTimestamp.diff(DTimestamp.now(), DTimestamp.now()),
-      collectedFacts: [
-        {
-          referenceId: "as",
-          referenceLabel: "as-label",
-          kind: "numeric-fact",
-          label: "litt",
-          value: 2,
-        },
-      ],
-    };
-    player.saveHistory(result);
-    expect(player.getNextPage()).toBe(p2);
-    expect(player.getResults().answerFacts.length).toBe(1);
-  });
-});
+import { DPlayer, DPlayerData } from "./dplayer";
+import { PageSequenceDto } from "./SchemaDto";
+import { Rule } from "../rules/rule";
+import { DTimestamp } from "../common/DTimestamp";
+import { RuleActionPageQue } from "./page-que-ruleengine-action";
+import { PageDto } from "../page/Page";
+import { PageResult } from "../page/page-result";
+
+const page = (id: number): PageDto => {
+  return PageDto.createDummy(id);
+  // return { id: PageID.create(), elements: [] };
+};
+const p1 = page(1);
+const p2 = page(2);
+const p3 = page(3);
+const p4 = page(4);
+const p5 = page(5);
+const p6 = page(6);
+const all = [p1, p2, p3, p4, p5, p6];
+const Seq1 = {
+  p10: page(10),
+  p11: page(11),
+  p12: page(12),
+};
+
+const seq1: PageSequenceDto = {
+  id: "s1",
+  pages: [Seq1.p10, Seq1.p11, Seq1.p12],
+  rules: [],
+};
+const data = (
+  pages: PageDto[],
+  pageSequences: PageSequenceDto[] = [],
+  rules: Rule<RuleActionPageQue, never>[] = [],
+): DPlayerData => ({ pages: pages, pageSequences, rules });
+// const seq = (pages: PageDto[], rules: Rule[]) => {};
+beforeEach(() => {
+  // data = { pages: [], rules: [], pageSequences: [] };
+});
+
+describe("DPlayer", () => {
+  it("should create an instance", () => {
+    const player = new DPlayer(data([p1, p1]));
+    expect(player).toBeTruthy();
+  });
+
+  it("can app pages, and get next", () => {
+    const player = new DPlayer(data([p1, p2]));
+
+    expect(player.getNextPage()).toBe(p1);
+    expect(player.getNextPage()).toBe(p2);
+    expect(player.getNextPage()).toBe(false);
+  });
+
+  it("Can insert a sequence", () => {
+    const player = new DPlayer(data(all, [seq1]));
+
+    expect(player.getNextPage()).toBe(p1);
+    expect(player.getNextPage()).toBe(p2);
+    player.insertSequence(seq1.id);
+    expect(player.getNextPage()).toBe(Seq1.p10);
+    expect(player.getNextPage()).toBe(Seq1.p11);
+    expect(player.getNextPage()).toBe(Seq1.p12);
+    expect(player.getNextPage()).toBe(p3);
+  });
+
+  it("Save history", () => {
+    const player = new DPlayer(data(all));
+
+    const curr = player.getNextPage() as PageDto;
+
+    const result: PageResult = {
+      pageId: curr.id,
+      pagePrefix: curr.id,
+      eventLog: [],
+      pageTime: DTimestamp.diff(DTimestamp.now(), DTimestamp.now()),
+      collectedFacts: [
+        {
+          referenceId: "as",
+          referenceLabel: "as-label",
+          kind: "numeric-fact",
+          label: "litt",
+          value: 2,
+        },
+      ],
+    };
+    player.saveHistory(result);
+    expect(player.getNextPage()).toBe(p2);
+    expect(player.getResults().answerFacts.length).toBe(1);
+  });
+});