@vnejs/plugins.views.video 0.1.9 → 0.1.11

package/const/events.js

@@ -2,6 +2,8 @@ export const SUBSCRIBE_EVENTS = {
   SET: "vne:video:set",
   GET: "vne:video:get",
   LOAD: "vne:video:load",
+
+  SET_SRC: "vne:video:set_src",
   SHOW: "vne:video:show",
   HIDE: "vne:video:hide",
   UPDATE: "vne:video:update",

package/index.js

@@ -1,10 +1,10 @@
 import { regPlugin } from "@vnejs/shared";
 
-import * as constants from "./const/const";
 import { SUBSCRIBE_EVENTS } from "./const/events";
 import * as params from "./const/params";
 
+import { VideoController } from "./modules/controller";
 import { Video } from "./modules/video";
 import { VideoView } from "./modules/view";
 
-regPlugin("VIDEO", { constants, events: SUBSCRIBE_EVENTS, params }, [Video, VideoView]);
+regPlugin("VIDEO", { events: SUBSCRIBE_EVENTS, params }, [VideoController, Video, VideoView]);

package/modules/controller.js

@@ -0,0 +1,26 @@
+import { ModuleController } from "@vnejs/module.components";
+
+export class VideoController extends ModuleController {
+  name = "video.controller";
+
+  updateEvent = this.EVENTS.VIDEO.UPDATE;
+  controls = { [this.CONST.CONTROLS.BUTTONS.ANY]: () => this.emit(this.EVENTS.INTERACT.EMIT) };
+  controlsIndex = this.PARAMS.VIDEO.ZINDEX;
+
+  subscribe = () => {
+    this.on(this.EVENTS.VIDEO.SHOW, this.onShow);
+    this.on(this.EVENTS.VIDEO.HIDE, this.onHide);
+    this.on(this.EVENTS.VIDEO.SET_SRC, this.onVideoSetSrc);
+
+    this.on(this.EVENTS.STATE.CLEAR, this.onHideForce);
+  };
+
+  beforeShow = () => this.emit(this.EVENTS.INTERFACE.TEXT_HIDE);
+  afterShow = () => this.emit(this.EVENTS.INTERACT.PUSH, { key: this.name, handler: this.emitHide });
+  afterHide = () => this.emit(this.EVENTS.INTERACT.POP, { key: this.name }).then(this.clearSrcAndGoNext);
+
+  onVideoSetSrc = async ({ src = "" } = {}) => this.updateStateAndViewFast({ src });
+
+  emitHide = () => this.emit(this.EVENTS.VIDEO.HIDE);
+  clearSrcAndGoNext = () => void Promise.all([this.emit(this.EVENTS.VIDEO.SET_SRC, { src: "" }), this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name })]);
+}

package/modules/video.js

@@ -1,47 +1,34 @@
-import { ModuleController } from "@vnejs/module.components";
+import { Module } from "@vnejs/module";
 
-export class Video extends ModuleController {
-  name = "video";
-
-  emitHide = () => this.emit(this.EVENTS.VIDEO.HIDE);
+import { tokenizeExecLine } from "@vnejs/helpers";
 
-  updateEvent = this.EVENTS.VIDEO.UPDATE;
-  controls = { [this.CONST.CONTROLS.BUTTONS.ANY]: () => this.emit(this.EVENTS.INTERACT.EMIT) };
-  controlsIndex = this.PARAMS.VIDEO.ZINDEX;
+export class Video extends Module {
+  name = "video";
 
   subscribe = () => {
-    this.on(this.EVENTS.VIDEO.SHOW, this.onShow);
-    this.on(this.EVENTS.VIDEO.HIDE, this.onHide);
+    this.on(this.EVENTS.VIDEO.HIDE, this.setDefaultState);
+
     this.on(this.EVENTS.VIDEO.LOAD, this.onVideoLoad);
     this.on(this.EVENTS.VIDEO.GET, this.onVideoGet);
     this.on(this.EVENTS.VIDEO.SET, this.onVideoSet);
 
     this.on(this.EVENTS.STATE.SET, this.onStateSet);
-    this.on(this.EVENTS.STATE.CLEAR, this.onHide);
   };
 
   init = () =>
     Promise.all([
-      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.name, handler: this.onExecLineHandler }),
-      this.emit(this.EVENTS.SCENARIO.LINE_LOAD_REG, { module: this.name, handler: this.onPreloadLineHandler }),
+      this.emit(this.EVENTS.SCENARIO.LINE_EXEC_REG, { module: this.name, handler: this.onLineExec }),
+      this.emit(this.EVENTS.SCENARIO.LINE_LOAD_REG, { module: this.name, handler: this.onLineLoad }),
     ]);
 
-  beforeShow = () => this.emit(this.EVENTS.INTERFACE.TEXT_HIDE);
-  afterHide = async () => {
-    await this.emit(this.EVENTS.INTERACT.POP, { key: this.name });
-    this.updateStateAndViewFast({ src: "" });
-    this.emit(this.EVENTS.SCENARIO.NEXT, { module: this.name });
-  };
-
-  onExecLineHandler = async (line = "") => {
-    const { name } = line.match(this.CONST.VIDEO.LINE_REG).groups;
+  onLineExec = async ({ line = "" } = {}) => {
+    const [name = ""] = tokenizeExecLine(line);
 
     await this.emit(this.EVENTS.VIDEO.SET, { name });
     await this.emit(this.EVENTS.VIDEO.SHOW);
-    await this.emit(this.EVENTS.INTERACT.PUSH, { key: this.name, handler: this.emitHide });
   };
-  onPreloadLineHandler = ({ line, priority = this.CONST.MEDIA.PRIORITIES.BACKGROUND } = {}) => {
-    const { name = "" } = line.match(this.CONST.VIDEO.LINE_REG).groups;
+  onLineLoad = ({ line, priority = this.CONST.MEDIA.PRIORITIES.BACKGROUND } = {}) => {
+    const [name = ""] = tokenizeExecLine(line);
 
     return name && this.emit(this.EVENTS.VIDEO.LOAD, { name, priority });
   };
@@ -49,14 +36,16 @@ export class Video extends ModuleController {
   onVideoLoad = ({ name = "", priority = this.CONST.MEDIA.PRIORITIES.BACKGROUND } = {}) => this.emit(this.EVENTS.MEDIA.LOAD, this.getMediaArgs(name, priority));
   onVideoGet = ({ name = "" } = {}) => this.emitOne(this.EVENTS.MEDIA.GET, this.getMediaArgs(name));
   onVideoSet = async ({ name = "" } = {}) => {
+    this.updateState({ name });
+
     const video = await this.emitOne(this.EVENTS.VIDEO.GET, { name });
 
     if (!video) throw Error("no video");
 
-    this.updateState({ src: video.src });
+    this.emit(this.EVENTS.VIDEO.SET_SRC, { src: video.src });
   };
 
-  onStateSet = async ({ [this.name]: state } = {}) => this.setState(await this.emitOne(this.EVENTS.VENDORS.CLONE, state));
+  onStateSet = async ({ [this.name]: { name = "" } = {} } = {}) => name && this.emit(this.EVENTS.VIDEO.SET, { name });
 
   getMediaArgs = (name, priority) => {
     const [type, quality] = [this.CONST.MEDIA.TYPES.VIDEO, this.shared.settings[this.SETTINGS.LAYER.QUALITY]];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vnejs/plugins.views.video",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/const/const.js

@@ -1 +0,0 @@
-export const LINE_REG = /^{(?<name>.*)}( (?<animation>.*) (?<duration>\d+))?$/;