@vnejs/plugins.feature.fastforward 0.1.0 → 0.1.1

package/const/events.js

@@ -1,7 +1,12 @@
 export const SUBSCRIBE_EVENTS = {
   STOP: "vne:fastforward:stop",
   START: "vne:fastforward:start",
-  CHECK: "vne:fastforward:check",
   TOGGLE: "vne:fastforward:toggle",
+
+  EMIT: "vne:fastforward:emit",
+  EMIT_CHECK: "vne:fastforward:emit_check",
+
+  CHECK: "vne:fastforward:check",
+
   CHANGED: "vne:fastforward:changed",
 };

package/const/params.js

@@ -0,0 +1,2 @@
+export const DEFAULT_CHECK = true;
+export const DEFAULT_DELAY = 50;

package/index.js

@@ -2,8 +2,9 @@ import { regPlugin } from "@vnejs/shared";
 
 import { SUBSCRIBE_EVENTS } from "./const/events";
 import { SETTINGS_KEYS } from "./const/settings";
+import * as params from "./const/params";
 
 import { Fastforward } from "./modules/fastforward";
 import { FastforwardVisits } from "./modules/visits";
 
-regPlugin("FASTFORWARD", { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS }, [Fastforward, FastforwardVisits]);
+regPlugin("FASTFORWARD", { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params }, [Fastforward, FastforwardVisits]);

package/modules/fastforward.js

@@ -1,62 +1,61 @@
 import { Module } from "@vnejs/module";
 
-const skipNFrames = (n, cb) => (n > 0 ? requestAnimationFrame(() => skipNFrames(n - 1, cb)) : setImmediate(cb));
-
 export class Fastforward extends Module {
   name = "fastforward";
 
+  emitStop = () => this.emit(this.EVENTS.FASTFORWARD.STOP);
+  emitFastforwardEmit = () => this.emit(this.EVENTS.FASTFORWARD.EMIT);
+  emitFastforwardEmitCheck = () => this.emit(this.EVENTS.FASTFORWARD.CHECK);
+
   subscribe = () => {
     this.on(this.EVENTS.FASTFORWARD.START, this.onStart);
     this.on(this.EVENTS.FASTFORWARD.STOP, this.onStop);
     this.on(this.EVENTS.FASTFORWARD.TOGGLE, this.onToggle);
 
-    this.on(this.EVENTS.INTERACT.ENDED, this.onInteractEnd);
+    this.on(this.EVENTS.FASTFORWARD.EMIT, this.onFastforwardEmit);
+    this.on(this.EVENTS.FASTFORWARD.EMIT_CHECK, this.onFastforwardEmitCheck);
 
-    this.EVENTS.CHOOSE && this.on(this.EVENTS.CHOOSE.OPTION, this.onInteractEnd);
+    this.on(this.EVENTS.INTERACT.ENDED, this.emitFastforwardEmitCheck);
 
-    this.on(this.EVENTS.STATE.CLEAR, this.onStop);
-    this.on(this.EVENTS.SYSTEM.STARTED, this.onStop);
-  };
+    this.EVENTS.CHOOSE && this.on(this.EVENTS.CHOOSE.OPTION, this.emitFastforwardEmitCheck);
 
-  init = async ({ platform = this.CONST.PLATFORMS.WEB } = {}) => {
-    await this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.CHECK, value: true });
-    await this.emit(this.EVENTS.SETTINGS.INIT, {
-      name: this.SETTINGS.FASTFORWARD.DELAY,
-      value: platform === this.CONST.PLATFORMS.WEB ? 10 : 1,
-    });
+    this.on(this.EVENTS.SYSTEM.STARTED, this.emitStop);
+    this.on(this.EVENTS.STATE.CLEAR, this.emitStop);
   };
 
+  init = () =>
+    Promise.all([
+      this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.CHECK, value: this.PARAMS.FASTFORWARD.DEFAULT_CHECK }),
+      this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.DELAY, value: this.PARAMS.FASTFORWARD.DEFAULT_DELAY }),
+    ]);
+
   onToggle = () => this.setValue(!this.shared.isFastforwardOn);
   onStart = () => this.setValue(true);
   onStop = () => this.setValue(false);
-  onInteractEnd = () =>
-    this.shared.isFastforwardOn && skipNFrames(this.shared.settings[this.SETTINGS.FASTFORWARD.DELAY], this.interact);
+
+  onFastforwardEmit = async () => {
+    if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK]) await this.checkVisited();
+    await this.emit(this.EVENTS.INTERACT.EMIT);
+  };
+  onFastforwardEmitCheck = () => this.shared.isFastforwardOn && setTimeout(this.emitFastforwardEmit, this.shared.settings[this.SETTINGS.FASTFORWARD.DELAY]);
 
   setValue = (value) => {
     this.shared.isFastforwardOn = value;
 
-    if (value) this.shared.mediaNoTimeoutSources.push(this.name);
-    else this.shared.mediaNoTimeoutSources = this.shared.mediaNoTimeoutSources.filter(this.notFastForward);
-
-    if (value) this.shared.textNoAnimationSources.push(this.name);
-    else this.shared.textNoAnimationSources = this.shared.textNoAnimationSources.filter(this.notFastForward);
-
-    if (value) this.shared.viewForceAnimationSources.push(this.name);
-    else this.shared.viewForceAnimationSources = this.shared.viewForceAnimationSources.filter(this.notFastForward);
+    if (value) {
+      this.shared.mediaNoTimeoutSources.push(this.name);
+      this.shared.textNoAnimationSources.push(this.name);
+      this.shared.viewForceAnimationSources.push(this.name);
+    } else {
+      this.shared.mediaNoTimeoutSources = this.shared.mediaNoTimeoutSources.filter(this.notFastForward);
+      this.shared.textNoAnimationSources = this.shared.textNoAnimationSources.filter(this.notFastForward);
+      this.shared.viewForceAnimationSources = this.shared.viewForceAnimationSources.filter(this.notFastForward);
+    }
 
     this.emit(this.EVENTS.FASTFORWARD.CHANGED, { value });
-    value && this.interact();
-  };
-
-  checkVisited = async () => {
-    const [isVisited] = await this.emit(this.EVENTS.FASTFORWARD.CHECK);
-    !isVisited && this.setValue(false);
-  };
 
-  interact = async () => {
-    if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK]) await this.checkVisited();
-    await this.emit(this.EVENTS.INTERACT.EMIT);
+    value && this.emitFastforwardEmit();
   };
-
+  checkVisited = async () => !(await this.emitOne(this.EVENTS.FASTFORWARD.CHECK)) && this.setValue(false);
   notFastForward = (s) => s !== this.name;
 }

package/modules/visits.js

@@ -2,6 +2,7 @@ import { Module } from "@vnejs/module";
 
 export class FastforwardVisits extends Module {
   name = "fastforward.visits";
+
   visits = {};
 
   subscribe = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.feature.fastforward",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",