@vnejs/plugins.core.media 0.0.1 → 0.1.1

package/const/const.js

@@ -1,9 +1,5 @@
 export const TYPES = { IMAGE: "image", AUDIO: "audio", VIDEO: "video" };
 
-export const CONSTRUCTORS = {
-  [TYPES.IMAGE]: Image,
-  [TYPES.AUDIO]: Audio,
-  [TYPES.VIDEO]: HTMLVideoElement,
-};
+export const CONSTRUCTORS = { [TYPES.IMAGE]: Image, [TYPES.AUDIO]: Audio, [TYPES.VIDEO]: HTMLVideoElement };
 
 export const PRIORITIES = { HIGH: 0, MEDIUM: 1, LOW: 2, BACKGROUND: 3 };

package/index.d.ts

@@ -0,0 +1,18 @@
+import * as constants from "./const/const";
+import { SUBSCRIBE_EVENTS } from "./const/events";
+import { SETTINGS_KEYS } from "./const/settings";
+
+type SubscribeEventsType = typeof SUBSCRIBE_EVENTS;
+type SettingsKeysType = typeof SETTINGS_KEYS;
+type ConstantsType = typeof constants;
+
+const PLUGIN_NAME = "MEDIA";
+
+declare global {
+  interface CONST {
+    [PLUGIN_NAME]: ConstantsType;
+  }
+  interface EVENTS {
+    [PLUGIN_NAME]: SubscribeEventsType;
+  }
+}

package/modules/load.js

@@ -40,7 +40,7 @@ export class MediaLoad extends Module {
     return this.emitOne(this.EVENTS.MEDIA.MEMORY_GET, { mediaId });
   };
 
-  onMediaLoadCheck = async (mediaId) => {
+  onMediaLoadCheck = async ({ mediaId } = {}) => {
     if (this.inProcess[mediaId]) return this.inProcess[mediaId];
 
     const oldMedia = await this.emitOne(this.EVENTS.MEDIA.MEMORY_GET, { mediaId });
@@ -63,17 +63,14 @@ export class MediaLoad extends Module {
     };
 
   loadMedia = async (mediaId, type, src, priority, isConstant = false, isTmp = false) => {
-    this.log({ action: "load start", mediaId, type, priority, isConstant, isTmp });
+    this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { action: "load start", mediaId, type, priority, isConstant, isTmp } });
 
     const ts = Math.round(new Date().getTime() / 1000 / 60 / 60);
     const mediaSrc = `${src}?ts=${ts}&version=${this.options?.global?.version || 0}`;
     const splitSrc = src.split(".");
     const ext = splitSrc[splitSrc.length - 1];
     const mediaRequest = await fetch(mediaSrc);
-    const media =
-      type === this.CONST.MEDIA.TYPES.VIDEO
-        ? document.createElement("video")
-        : new this.CONST.MEDIA.CONSTRUCTORS[type]();
+    const media = type === this.CONST.MEDIA.TYPES.VIDEO ? document.createElement("video") : new this.CONST.MEDIA.CONSTRUCTORS[type]();
     media.setAttribute("ext", ext);
     media.setAttribute("type", type);
     // IOS - mediaSrc
@@ -86,10 +83,9 @@ export class MediaLoad extends Module {
 
     await this.emit(this.EVENTS.MEDIA.SET, { media, mediaId, isConstant, isTmp });
 
-    if (priority && !this.shared.mediaNoTimeoutSources.length)
-      await this.waitTimeout(Math.round(25 * priority * (Math.random() + 0.618)));
+    if (priority && !this.shared.mediaNoTimeoutSources.length) await this.waitTimeout(Math.round(25 * priority * (Math.random() + 0.618)));
 
-    this.log({ action: "load end", mediaId, type, priority, isConstant, isTmp });
+    this.emit(this.EVENTS.LOGS.EMIT, { module: this.name, value: { action: "load end", mediaId, type, priority, isConstant, isTmp } });
 
     return media;
   };

package/modules/media.js

@@ -17,15 +17,14 @@ export class Media extends Module {
 
     if (!realMediaId) return null;
 
-    const media =
-      (await this.emitOne(this.EVENTS.MEDIA.MEMORY_GET, { mediaId: realMediaId })) ||
-      (await this.loadMedia(type, name, mediaType, quality, postfix));
+    let media = await this.emitOne(this.EVENTS.MEDIA.MEMORY_GET, { mediaId: realMediaId });
+
+    if (!media) media = await this.loadMedia(type, name, mediaType, quality, postfix);
 
     return this.prepareMedia(media);
   };
 
-  onMediaSet = async ({ mediaId, media, isConstant, isTmp } = {}) =>
-    this.emit(this.EVENTS.MEDIA.MEMORY_SET, { mediaId, media, isConstant, isTmp });
+  onMediaSet = async ({ mediaId, media, isConstant, isTmp } = {}) => this.emit(this.EVENTS.MEDIA.MEMORY_SET, { mediaId, media, isConstant, isTmp });
 
   loadMedia = (type, name, mediaType, quality, postfix) => {
     const priority = this.CONST.MEDIA.PRIORITIES.HIGH;

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@vnejs/plugins.core.media",
-  "version": "0.0.1",
+  "version": "0.1.1",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "publish:major:plugin": "npm run publish:major",
+    "publish:minor:plugin": "npm run publish:minor",
+    "publish:patch:plugin": "npm run publish:patch",
     "publish:major": "npm version major && npm publish --access public",
     "publish:minor": "npm version minor && npm publish --access public",
     "publish:patch": "npm version patch && npm publish --access public"
@@ -13,10 +16,5 @@
   "description": "",
   "dependencies": {
     "decode-gif": "1.0.1"
-  },
-  "peerDependencies": {
-    "@vnejs/shared": "*",
-    "@vnejs/module": "*",
-    "@vnejs/semaphore": "*"
   }
 }