update d.ts

packages/artplayer/src/player/eventInit.js

@@ -60,13 +60,13 @@ export default function eventInit(art) {
         }
     });
 
-    art.on('video:error', async () => {
+    art.on('video:error', async (error) => {
         if (reconnectTime < constructor.RECONNECT_TIME_MAX) {
             await sleep(constructor.RECONNECT_SLEEP_TIME);
             reconnectTime += 1;
             art.url = option.url;
             notice.show = `${i18n.get('Reconnect')}: ${reconnectTime}`;
-            art.emit('error', reconnectTime);
+            art.emit('error', error, reconnectTime);
         } else {
             art.mask.show = true;
             art.loading.show = false;

packages/artplayer/src/player/loopMix.js

@@ -13,11 +13,11 @@ export default function loopMix(art) {
                     art.emit('loop', interval);
                 } else {
                     interval = [];
-                    art.emit('loop');
+                    art.emit('loop', []);
                 }
             } else {
                 interval = [];
-                art.emit('loop');
+                art.emit('loop', []);
             }
         },
     });

packages/artplayer/src/player/playbackRateMix.js

@@ -21,7 +21,7 @@ export default function playbackRateMix(art) {
                 art.emit('playbackRate', rate);
             } else {
                 art.playbackRate = 1;
-                art.emit('playbackRate');
+                art.emit('playbackRate', 1);
             }
         },
     });

packages/artplayer/types/artplayer.d.ts

@@ -68,10 +68,10 @@ declare class Artplayer extends Player {
     readonly isRotate: boolean;
     readonly isDestroy: boolean;
 
-    on(name: Events, fn: Function, ctx?: object): void;
-    once(name: Events, fn: Function, ctx?: object): void;
-    emit(name: Events): void;
-    off(name: Events, callback?: Function): void;
+    on<T extends keyof Events>(name: T, fn: (...args: Events[T]) => unknown, ctx?: object): unknown;
+    once<T extends keyof Events>(name: T, fn: (...args: Events[T]) => unknown, ctx?: object): unknown;
+    emit<T extends keyof Events>(name: T, ...args: unknown[]): unknown;
+    off<T extends keyof Events>(name: T, callback?: Function): unknown;
 
     query: Artplayer['template']['query'];
     proxy: Artplayer['events']['proxy'];

packages/artplayer/types/component.d.ts

@@ -1,6 +1,6 @@
 import Artplayer = require('./artplayer');
 
-type Selector = {
+export type Selector = {
     /**
      * Whether the default is selected
      */

packages/artplayer/types/events.d.ts

@@ -1,61 +1,63 @@
-export type Events =
-    | 'video:canplay'
-    | 'video:canplaythrough'
-    | 'video:complete'
-    | 'video:durationchange'
-    | 'video:emptied'
-    | 'video:ended'
-    | 'video:loadeddata'
-    | 'video:loadeddata'
-    | 'video:loadedmetadata'
-    | 'video:pause'
-    | 'video:play'
-    | 'video:playing'
-    | 'video:progress'
-    | 'video:ratechange'
-    | 'video:seeked'
-    | 'video:seeking'
-    | 'video:stalled'
-    | 'video:suspend'
-    | 'video:timeupdate'
-    | 'video:volumechange'
-    | 'video:waiting'
-    | 'hotkey'
-    | 'destroy'
-    | 'customType'
-    | 'url'
-    | 'subtitleUpdate'
-    | 'subtitleLoad'
-    | 'subtitleSwitch'
-    | 'focus'
-    | 'blur'
-    | 'dblclick'
-    | 'click'
-    | 'setBar'
-    | 'hover'
-    | 'mousemove'
-    | 'resize'
-    | 'view'
-    | 'aspectRatio'
-    | 'autoHeight'
-    | 'autoSize'
-    | 'ready'
-    | 'error'
-    | 'flip'
-    | 'fullscreen'
-    | 'fullscreenWeb'
-    | 'loop'
-    | 'mini'
-    | 'pause'
-    | 'pip'
-    | 'playbackRate'
-    | 'play'
-    | 'screenshot'
-    | 'seek'
-    | 'subtitleOffset'
-    | 'switch'
-    | 'restart'
-    | 'volume'
-    | 'lock'
-    | 'selector'
-    | (string & Record<never, never>);
+import { AspectRatio, Flip, PlaybackRate } from './player';
+import { Selector } from './component';
+
+export type Events = {
+    'video:canplay': [event: Event];
+    'video:canplaythrough': [event: Event];
+    'video:complete': [event: Event];
+    'video:durationchange': [event: Event];
+    'video:emptied': [event: Event];
+    'video:ended': [event: Event];
+    'video:loadeddata': [event: Event];
+    'video:loadedmetadata': [event: Event];
+    'video:pause': [event: Event];
+    'video:play': [event: Event];
+    'video:playing': [event: Event];
+    'video:progress': [event: Event];
+    'video:ratechange': [event: Event];
+    'video:seeked': [event: Event];
+    'video:seeking': [event: Event];
+    'video:stalled': [event: Event];
+    'video:suspend': [event: Event];
+    'video:timeupdate': [event: Event];
+    'video:volumechange': [event: Event];
+    'video:waiting': [event: Event];
+    hotkey: [event: Event];
+    destroy: [];
+    customType: [typeName: string];
+    url: [url: string];
+    subtitleUpdate: [text: string];
+    subtitleLoad: [url: string];
+    subtitleSwitch: [url: string];
+    focus: [];
+    blur: [];
+    dblclick: [];
+    click: [];
+    setBar: [type: 'loaded' | 'played', percentage: number];
+    hover: [state: boolean];
+    mousemove: [event: Event];
+    resize: [];
+    view: [state: boolean];
+    aspectRatio: [aspectRatio: AspectRatio];
+    autoHeight: [height: number];
+    autoSize: [];
+    ready: [];
+    error: [error: Error, reconnectTime: number];
+    flip: [flip: Flip];
+    fullscreen: [state: boolean];
+    fullscreenWeb: [state: boolean];
+    loop: [interval: [start: number, end: number]];
+    mini: [state: boolean];
+    pause: [];
+    pip: [state: boolean];
+    playbackRate: [playbackRate: PlaybackRate];
+    play: [];
+    screenshot: [dataUri: string];
+    seek: [currentTime: number];
+    subtitleOffset: [offset: number];
+    switch: [url: string];
+    restart: [];
+    volume: [volume: number];
+    lock: [state: boolean];
+    selector: [selector: Selector, $item: HTMLDivElement];
+};

packages/artplayer/types/player.d.ts

@@ -1,6 +1,6 @@
-type AspectRatio = 'default' | '4:3' | '16:9' | void;
-type PlaybackRate = 0.5 | 0.75 | 1.0 | 1.25 | 1.5 | 1.75 | 2.0 | void;
-type Flip = 'normal' | 'horizontal' | 'vertical' | void;
+export type AspectRatio = 'default' | '4:3' | '16:9' | (string & Record<never, never>);
+export type PlaybackRate = 0.5 | 0.75 | 1.0 | 1.25 | 1.5 | 1.75 | 2.0 | (number & Record<never, never>);
+export type Flip = 'normal' | 'horizontal' | 'vertical' | (string & Record<never, never>);
 
 export declare class Player {
     get aspectRatio(): AspectRatio;