@vnejs/plugins.scenario.fastforward 0.1.4 → 0.1.5

package/dist/index.js

@@ -1,6 +1,6 @@
 import "@vnejs/plugins.scenario.fastforward.contract";
 import { regPlugin } from "@vnejs/shared";
-import { PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/plugins.scenario.fastforward.contract";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/plugins.scenario.fastforward.contract";
 import { Fastforward } from "./modules/fastforward.js";
 import { FastforwardVisits } from "./modules/visits.js";
-regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params: PARAMS }, [Fastforward, FastforwardVisits]);
+regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params: PARAMS, constants: CONSTANTS }, [Fastforward, FastforwardVisits]);

package/dist/modules/fastforward.d.ts

@@ -1,8 +1,5 @@
-import "@vnejs/plugins.audio.contract";
 import "@vnejs/plugins.core.components.contract";
 import "@vnejs/plugins.core.media.contract";
-import "@vnejs/plugins.scenario.fastforward.contract";
-import "@vnejs/plugins.text.contract";
 import { Module } from "@vnejs/module";
 import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPluginParams, FastforwardPluginSettings } from "../types.js";
 export declare class Fastforward extends Module<FastforwardPluginEvents, FastforwardPluginConstants, FastforwardPluginSettings, FastforwardPluginParams> {
@@ -11,13 +8,17 @@ export declare class Fastforward extends Module<FastforwardPluginEvents, Fastfor
     emitFastforwardEmit: () => Promise<unknown[]> | undefined;
     emitFastforwardEmitCheck: () => Promise<unknown[]> | undefined;
     subscribe: () => void;
-    init: () => Promise<[unknown[] | undefined, unknown[] | undefined]>;
+    init: () => Promise<[unknown[] | undefined, unknown[] | undefined, unknown[] | undefined]>;
     onToggle: () => void;
+    onCheck: () => {
+        isAllowed: boolean;
+        source: string;
+    };
     onStart: () => void;
     onStop: () => void;
     onFastforwardEmit: () => Promise<void>;
     onFastforwardEmitCheck: () => number | false;
     setValue: (value: boolean) => void;
-    checkVisited: () => Promise<void>;
+    check: () => Promise<void>;
     notFastForward: (s: string) => boolean;
 }

package/dist/modules/fastforward.js

@@ -1,8 +1,5 @@
-import "@vnejs/plugins.audio.contract";
 import "@vnejs/plugins.core.components.contract";
 import "@vnejs/plugins.core.media.contract";
-import "@vnejs/plugins.scenario.fastforward.contract";
-import "@vnejs/plugins.text.contract";
 import { Module } from "@vnejs/module";
 export class Fastforward extends Module {
     name = "fastforward";
@@ -10,8 +7,9 @@ export class Fastforward extends Module {
     emitFastforwardEmit = () => this.emit(this.EVENTS.FASTFORWARD.EMIT);
     emitFastforwardEmitCheck = () => this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
     subscribe = () => {
-        this.on(this.EVENTS.FASTFORWARD.START, this.onStart);
         this.on(this.EVENTS.FASTFORWARD.STOP, this.onStop);
+        this.on(this.EVENTS.FASTFORWARD.START, this.onStart);
+        this.on(this.EVENTS.FASTFORWARD.CHECK, this.onCheck);
         this.on(this.EVENTS.FASTFORWARD.TOGGLE, this.onToggle);
         this.on(this.EVENTS.FASTFORWARD.EMIT, this.onFastforwardEmit);
         this.on(this.EVENTS.FASTFORWARD.EMIT_CHECK, this.onFastforwardEmitCheck);
@@ -22,13 +20,17 @@ export class Fastforward extends Module {
     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 }),
+        this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.ENABLED, value: this.PARAMS.FASTFORWARD.DEFAULT_ENABLED }),
     ]);
     onToggle = () => this.setValue(!this.shared.isFastforwardOn);
+    onCheck = () => ({ isAllowed: this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED], source: this.name });
     onStart = () => this.setValue(true);
     onStop = () => this.setValue(false);
     onFastforwardEmit = async () => {
+        if (!this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED])
+            return;
         if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK])
-            await this.checkVisited();
+            await this.check();
         await this.emit(this.EVENTS.INTERACT.EMIT);
         await this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
     };
@@ -36,23 +38,20 @@ export class Fastforward extends Module {
     setValue = (value) => {
         this.shared.isFastforwardOn = value;
         if (value) {
-            this.shared.audioNoSmoothSources.push(this.name);
             this.shared.mediaNoTimeoutSources.push(this.name);
-            this.shared.textNoAnimationSources.push(this.name);
             this.shared.viewForceAnimationSources.push(this.name);
         }
         else {
-            this.shared.audioNoSmoothSources = this.shared.audioNoSmoothSources.filter(this.notFastForward);
             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 });
         if (value)
             this.emitFastforwardEmit();
     };
-    checkVisited = async () => {
-        if (!(await this.emitOne(this.EVENTS.FASTFORWARD.CHECK)))
+    check = async () => {
+        const results = ((await this.emit(this.EVENTS.FASTFORWARD.CHECK)) ?? []);
+        if (!results.every((r) => r.isAllowed))
             this.setValue(false);
     };
     notFastForward = (s) => s !== this.name;

package/dist/modules/visits.d.ts

@@ -9,7 +9,10 @@ export declare class FastforwardVisits extends Module<FastforwardPluginEvents, F
     subscribe: () => void;
     init: () => Promise<void>;
     onText: ({ text, speaker }?: FastforwardTextPayload) => Promise<void>;
-    onVisitCheck: () => Promise<boolean>;
+    onVisitCheck: () => Promise<{
+        isAllowed: boolean;
+        source: string;
+    }>;
     onClear: () => Promise<unknown[]> | undefined;
     onStateSet: (payload: ModuleGlobalStateRegistry) => Promise<void>;
     getHash: () => Promise<unknown> | undefined;

package/dist/modules/visits.js

@@ -22,7 +22,7 @@ export class FastforwardVisits extends Module {
         const meet = speaker ? (this.globalState["text.meet"]?.[speaker] ?? 0) : 0;
         this.setState({ text, label, speaker, meet });
     };
-    onVisitCheck = async () => Boolean(this.visits[(await this.getHash())]);
+    onVisitCheck = async () => ({ isAllowed: Boolean(this.visits[(await this.getHash())]), source: this.name });
     onClear = () => this.emit(this.EVENTS.STORAGE.RM_ALL, { module: this.name });
     onStateSet = async (payload) => this.setState((await this.emitOne(this.EVENTS.VENDORS.CLONE, this.getStateSlice(payload))));
     getHash = () => this.emitOne(this.EVENTS.VENDORS.HASH, this.state);

package/dist/types.d.ts

@@ -6,8 +6,8 @@ import type { PluginName as StoragePluginName, SubscribeEvents as StorageSubscri
 import type { PluginName as SystemPluginName, SubscribeEvents as SystemSubscribeEvents } from "@vnejs/plugins.core.system.contract";
 import type { PluginName as VendorsPluginName, SubscribeEvents as VendorsSubscribeEvents } from "@vnejs/plugins.core.vendors.contract";
 import type { PluginName as TextPluginName, SubscribeEvents as TextSubscribeEvents } from "@vnejs/plugins.text.contract";
-import type { Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { Constants, Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/plugins.scenario.fastforward.contract";
 export type FastforwardPluginEvents = VnePluginEventsMapRegistry & Record<PluginName, SubscribeEvents> & Record<InteractPluginName, InteractSubscribeEvents> & Record<SettingsPluginName, SettingsSubscribeEvents> & Record<StatePluginName, StateSubscribeEvents> & Record<StoragePluginName, StorageSubscribeEvents> & Record<SystemPluginName, SystemSubscribeEvents> & Record<TextPluginName, TextSubscribeEvents> & Record<VendorsPluginName, VendorsSubscribeEvents>;
-export type FastforwardPluginConstants = VnePluginConstantsMapRegistry;
+export type FastforwardPluginConstants = VnePluginConstantsMapRegistry & Record<PluginName, Constants>;
 export type FastforwardPluginSettings = VnePluginSettingsMapRegistry & Record<PluginName, SettingsKeys>;
 export type FastforwardPluginParams = VnePluginParamsMapRegistry & Record<PluginName, Params>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.scenario.fastforward",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,10 +33,10 @@
     "@vnejs/plugins.scenario.fastforward.contract": "~0.0.1"
   },
   "peerDependencies": {
-    "@vnejs/plugins.audio.contract": "~0.0.1",
+    "@vnejs/module": "~0.0.1",
+    "@vnejs/shared": "~0.0.9",
     "@vnejs/plugins.core.components.contract": "~0.0.1",
     "@vnejs/plugins.core.media.contract": "~0.0.1",
-    "@vnejs/module": "~0.0.1",
     "@vnejs/plugins.core.interact.contract": "~0.0.1",
     "@vnejs/plugins.core.scenario.contract": "~0.0.1",
     "@vnejs/plugins.core.settings.contract": "~0.0.1",
@@ -44,8 +44,7 @@
     "@vnejs/plugins.core.storage.contract": "~0.0.1",
     "@vnejs/plugins.core.system.contract": "~0.0.1",
     "@vnejs/plugins.core.vendors.contract": "~0.0.1",
-    "@vnejs/plugins.text.contract": "~0.0.1",
-    "@vnejs/shared": "~0.0.9"
+    "@vnejs/plugins.text.contract": "~0.0.1"
   },
   "devDependencies": {
     "@vnejs/configs.ts-common": "~0.0.1"

package/src/index.ts

@@ -1,9 +1,9 @@
 import "@vnejs/plugins.scenario.fastforward.contract";
 
 import { regPlugin } from "@vnejs/shared";
-import { PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/plugins.scenario.fastforward.contract";
+import { CONSTANTS, PARAMS, PLUGIN_NAME, SETTINGS_KEYS, SUBSCRIBE_EVENTS } from "@vnejs/plugins.scenario.fastforward.contract";
 
 import { Fastforward } from "./modules/fastforward.js";
 import { FastforwardVisits } from "./modules/visits.js";
 
-regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params: PARAMS }, [Fastforward, FastforwardVisits]);
+regPlugin(PLUGIN_NAME, { events: SUBSCRIBE_EVENTS, settings: SETTINGS_KEYS, params: PARAMS, constants: CONSTANTS }, [Fastforward, FastforwardVisits]);

package/src/modules/fastforward.ts

@@ -1,11 +1,8 @@
-import "@vnejs/plugins.audio.contract";
 import "@vnejs/plugins.core.components.contract";
 import "@vnejs/plugins.core.media.contract";
-import "@vnejs/plugins.scenario.fastforward.contract";
-import "@vnejs/plugins.text.contract";
 
 import { Module } from "@vnejs/module";
-import type { FastforwardChangedPayload } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { FastforwardChangedPayload, FastforwardCheckResult } from "@vnejs/plugins.scenario.fastforward.contract";
 
 import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPluginParams, FastforwardPluginSettings } from "../types.js";
 
@@ -17,8 +14,9 @@ export class Fastforward extends Module<FastforwardPluginEvents, FastforwardPlug
   emitFastforwardEmitCheck = () => this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
 
   subscribe = () => {
-    this.on(this.EVENTS.FASTFORWARD.START, this.onStart);
     this.on(this.EVENTS.FASTFORWARD.STOP, this.onStop);
+    this.on(this.EVENTS.FASTFORWARD.START, this.onStart);
+    this.on(this.EVENTS.FASTFORWARD.CHECK, this.onCheck);
     this.on(this.EVENTS.FASTFORWARD.TOGGLE, this.onToggle);
 
     this.on(this.EVENTS.FASTFORWARD.EMIT, this.onFastforwardEmit);
@@ -34,16 +32,20 @@ export class Fastforward extends Module<FastforwardPluginEvents, FastforwardPlug
     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 }),
+      this.emit(this.EVENTS.SETTINGS.INIT, { name: this.SETTINGS.FASTFORWARD.ENABLED, value: this.PARAMS.FASTFORWARD.DEFAULT_ENABLED }),
     ]);
 
   onToggle = () => this.setValue(!this.shared.isFastforwardOn);
+  onCheck = () => ({ isAllowed: this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED], source: this.name } satisfies FastforwardCheckResult);
   onStart = () => this.setValue(true);
   onStop = () => this.setValue(false);
 
   onFastforwardEmit = async () => {
-    if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK]) await this.checkVisited();
+    if (!this.shared.settings[this.SETTINGS.FASTFORWARD.ENABLED]) return;
+    if (this.shared.settings[this.SETTINGS.FASTFORWARD.CHECK]) await this.check();
 
     await this.emit(this.EVENTS.INTERACT.EMIT);
+
     await this.emit(this.EVENTS.FASTFORWARD.EMIT_CHECK);
   };
 
@@ -53,14 +55,10 @@ export class Fastforward extends Module<FastforwardPluginEvents, FastforwardPlug
     this.shared.isFastforwardOn = value;
 
     if (value) {
-      this.shared.audioNoSmoothSources.push(this.name);
       this.shared.mediaNoTimeoutSources.push(this.name);
-      this.shared.textNoAnimationSources.push(this.name);
       this.shared.viewForceAnimationSources.push(this.name);
     } else {
-      this.shared.audioNoSmoothSources = this.shared.audioNoSmoothSources.filter(this.notFastForward);
       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);
     }
 
@@ -69,8 +67,10 @@ export class Fastforward extends Module<FastforwardPluginEvents, FastforwardPlug
     if (value) this.emitFastforwardEmit();
   };
 
-  checkVisited = async () => {
-    if (!(await this.emitOne(this.EVENTS.FASTFORWARD.CHECK))) this.setValue(false);
+  check = async () => {
+    const results = ((await this.emit(this.EVENTS.FASTFORWARD.CHECK)) ?? []) as FastforwardCheckResult[];
+
+    if (!results.every((r) => r.isAllowed)) this.setValue(false);
   };
 
   notFastForward = (s: string) => s !== this.name;

package/src/modules/visits.ts

@@ -2,7 +2,7 @@ import "@vnejs/plugins.core.scenario.contract";
 import "@vnejs/plugins.text.contract";
 
 import { Module, type ModuleGlobalStateRegistry } from "@vnejs/module";
-import type { FastforwardTextPayload, ModuleGlobalStateFastforwardVisits } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { FastforwardCheckResult, FastforwardTextPayload, ModuleGlobalStateFastforwardVisits } from "@vnejs/plugins.scenario.fastforward.contract";
 
 import type { FastforwardPluginConstants, FastforwardPluginEvents, FastforwardPluginParams, FastforwardPluginSettings } from "../types.js";
 
@@ -43,7 +43,8 @@ export class FastforwardVisits extends Module<
     this.setState({ text, label, speaker, meet });
   };
 
-  onVisitCheck = async () => Boolean(this.visits[(await this.getHash()) as string]);
+  onVisitCheck = async () =>
+    ({ isAllowed: Boolean(this.visits[(await this.getHash()) as string]), source: this.name } satisfies FastforwardCheckResult);
 
   onClear = () => this.emit(this.EVENTS.STORAGE.RM_ALL, { module: this.name });
 

package/src/types.ts

@@ -6,7 +6,7 @@ import type { PluginName as StoragePluginName, SubscribeEvents as StorageSubscri
 import type { PluginName as SystemPluginName, SubscribeEvents as SystemSubscribeEvents } from "@vnejs/plugins.core.system.contract";
 import type { PluginName as VendorsPluginName, SubscribeEvents as VendorsSubscribeEvents } from "@vnejs/plugins.core.vendors.contract";
 import type { PluginName as TextPluginName, SubscribeEvents as TextSubscribeEvents } from "@vnejs/plugins.text.contract";
-import type { Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/plugins.scenario.fastforward.contract";
+import type { Constants, Params, PluginName, SettingsKeys, SubscribeEvents } from "@vnejs/plugins.scenario.fastforward.contract";
 
 export type FastforwardPluginEvents = VnePluginEventsMapRegistry &
   Record<PluginName, SubscribeEvents> &
@@ -18,7 +18,7 @@ export type FastforwardPluginEvents = VnePluginEventsMapRegistry &
   Record<TextPluginName, TextSubscribeEvents> &
   Record<VendorsPluginName, VendorsSubscribeEvents>;
 
-export type FastforwardPluginConstants = VnePluginConstantsMapRegistry;
+export type FastforwardPluginConstants = VnePluginConstantsMapRegistry & Record<PluginName, Constants>;
 
 export type FastforwardPluginSettings = VnePluginSettingsMapRegistry & Record<PluginName, SettingsKeys>;