@microsoft/live-share-media 0.5.1 → 1.0.0-preview.1

package/src/internals/GroupTransportState.ts

@@ -1,127 +1,127 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the Microsoft Live Share SDK License.
- */
-
-import { IEvent, EphemeralEvent } from '@microsoft/live-share';
-import EventEmitter from 'events';
-import { IMediaPlayerState } from '../EphemeralMediaSessionCoordinator';
-import { ExtendedMediaSessionPlaybackState, ExtendedMediaSessionAction } from '../MediaSessionExtensions';
-import { GroupPlaybackTrack, GroupPlaybackTrackEvents } from './GroupPlaybackTrack';
-
-
-/**
- * @hidden
- */
- export interface ITransportState {
-    playbackState: ExtendedMediaSessionPlaybackState;
-    startPosition: number;
-    timestamp: number;
-    clientId: string;
-}
-
-/**
- * @hidden
- */
-export enum GroupTransportStateEvents {
-    transportStateChange = 'transportStateChange'
-}
-
-/**
- * @hidden
- */
-export interface ITransportStateChangeEvent extends IEvent {
-    action: ExtendedMediaSessionAction;
-    seekTime?: number;
-}
-
-/**
- * @hidden
- */
- export class GroupTransportState extends EventEmitter {
-    private readonly _getMediaPlayerState: () => IMediaPlayerState;
-    private _track: GroupPlaybackTrack;
-    private _current: ITransportState;
-
-    constructor(track: GroupPlaybackTrack, getMediaPlayerState: () => IMediaPlayerState) {
-        super();
-        this._getMediaPlayerState = getMediaPlayerState;
-        this._track = track;
-        this._current = {
-            playbackState: 'none',
-            startPosition: 0.0,
-            timestamp: 0,
-            clientId: ''
-        };
-
-        // Listen for track changes
-        this._track.on(GroupPlaybackTrackEvents.trackChange, () => {
-            // Track changed so reset state to stopped ad position 0.0
-            this._current = {
-                playbackState: 'none',
-                startPosition: 0.0,
-                timestamp: this._track.current.timestamp,
-                clientId: this._track.current.clientId
-            }
-        });
-    }
-
-    public get current(): Readonly<ITransportState> {
-        return this._current;
-    }
-
-    public get playbackState(): ExtendedMediaSessionPlaybackState {
-        return this.current.playbackState;
-    }
-
-    public get startPosition(): number {
-        return this.current.startPosition;
-    }
-
-    public get timestamp(): number {
-        return this.current.timestamp;
-    }
-
-    public get track(): GroupPlaybackTrack {
-        return this._track;
-    }
-
-    public compare(state: ITransportState): boolean {
-        return this.current.playbackState == state.playbackState && this.current.startPosition == state.startPosition;
-    }
-
-    public updateState(state: ITransportState): boolean {
-        // Ignore if same playback state and start position
-        if (this.compare(state)) {
-            return false;
-        }
-
-        // Ignore state changes that are older
-        const originalState = this.current;
-        if (state.timestamp < originalState.timestamp) {
-            return false;
-        }
-
-        // Ignore state changes that have the same timestamp and the clientId sorts higher.
-        if (state.timestamp == originalState.timestamp && state.clientId.localeCompare(originalState.clientId) > 0) {
-            return false;
-        }
-
-        // Update playback state
-        this._current = state;
-
-        // Trigger transport change
-        const playerState = this._getMediaPlayerState().playbackState;
-        if (originalState.playbackState == state.playbackState && playerState != 'ended') {
-            this.emit(GroupTransportStateEvents.transportStateChange, { type: GroupTransportStateEvents.transportStateChange, action: 'seekto', seekTime: state.startPosition });
-        } else if (state.playbackState == 'playing') {
-            const now = EphemeralEvent.getTimestamp();
-            const projectedPosition = state.startPosition + ((now - state.timestamp) / 1000);
-            this.emit(GroupTransportStateEvents.transportStateChange, { type: GroupTransportStateEvents.transportStateChange, action: 'play', seekTime: projectedPosition});
-        } else {
-            this.emit(GroupTransportStateEvents.transportStateChange, { type: GroupTransportStateEvents.transportStateChange, action: 'pause', seekTime: state.startPosition});
-        }
-
-        return true;
-    }
-}
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the Microsoft Live Share SDK License.
+ */
+
+import { IEvent, LiveEvent } from '@microsoft/live-share';
+import EventEmitter from 'events';
+import { IMediaPlayerState } from '../LiveMediaSessionCoordinator';
+import { ExtendedMediaSessionPlaybackState, ExtendedMediaSessionAction } from '../MediaSessionExtensions';
+import { GroupPlaybackTrack, GroupPlaybackTrackEvents } from './GroupPlaybackTrack';
+
+
+/**
+ * @hidden
+ */
+ export interface ITransportState {
+    playbackState: ExtendedMediaSessionPlaybackState;
+    startPosition: number;
+    timestamp: number;
+    clientId: string;
+}
+
+/**
+ * @hidden
+ */
+export enum GroupTransportStateEvents {
+    transportStateChange = 'transportStateChange'
+}
+
+/**
+ * @hidden
+ */
+export interface ITransportStateChangeEvent extends IEvent {
+    action: ExtendedMediaSessionAction;
+    seekTime?: number;
+}
+
+/**
+ * @hidden
+ */
+ export class GroupTransportState extends EventEmitter {
+    private readonly _getMediaPlayerState: () => IMediaPlayerState;
+    private _track: GroupPlaybackTrack;
+    private _current: ITransportState;
+
+    constructor(track: GroupPlaybackTrack, getMediaPlayerState: () => IMediaPlayerState) {
+        super();
+        this._getMediaPlayerState = getMediaPlayerState;
+        this._track = track;
+        this._current = {
+            playbackState: 'none',
+            startPosition: 0.0,
+            timestamp: 0,
+            clientId: ''
+        };
+
+        // Listen for track changes
+        this._track.on(GroupPlaybackTrackEvents.trackChange, () => {
+            // Track changed so reset state to stopped ad position 0.0
+            this._current = {
+                playbackState: 'none',
+                startPosition: 0.0,
+                timestamp: this._track.current.timestamp,
+                clientId: this._track.current.clientId
+            }
+        });
+    }
+
+    public get current(): Readonly<ITransportState> {
+        return this._current;
+    }
+
+    public get playbackState(): ExtendedMediaSessionPlaybackState {
+        return this.current.playbackState;
+    }
+
+    public get startPosition(): number {
+        return this.current.startPosition;
+    }
+
+    public get timestamp(): number {
+        return this.current.timestamp;
+    }
+
+    public get track(): GroupPlaybackTrack {
+        return this._track;
+    }
+
+    public compare(state: ITransportState): boolean {
+        return this.current.playbackState == state.playbackState && this.current.startPosition == state.startPosition;
+    }
+
+    public updateState(state: ITransportState): boolean {
+        // Ignore if same playback state and start position
+        if (this.compare(state)) {
+            return false;
+        }
+
+        // Ignore state changes that are older
+        const originalState = this.current;
+        if (state.timestamp < originalState.timestamp) {
+            return false;
+        }
+
+        // Ignore state changes that have the same timestamp and the clientId sorts higher.
+        if (state.timestamp == originalState.timestamp && state.clientId.localeCompare(originalState.clientId) > 0) {
+            return false;
+        }
+
+        // Update playback state
+        this._current = state;
+
+        // Trigger transport change
+        const playerState = this._getMediaPlayerState().playbackState;
+        if (originalState.playbackState == state.playbackState && playerState != 'ended') {
+            this.emit(GroupTransportStateEvents.transportStateChange, { type: GroupTransportStateEvents.transportStateChange, action: 'seekto', seekTime: state.startPosition });
+        } else if (state.playbackState == 'playing') {
+            const now = LiveEvent.getTimestamp();
+            const projectedPosition = state.startPosition + ((now - state.timestamp) / 1000);
+            this.emit(GroupTransportStateEvents.transportStateChange, { type: GroupTransportStateEvents.transportStateChange, action: 'play', seekTime: projectedPosition});
+        } else {
+            this.emit(GroupTransportStateEvents.transportStateChange, { type: GroupTransportStateEvents.transportStateChange, action: 'pause', seekTime: state.startPosition});
+        }
+
+        return true;
+    }
+}

package/src/internals/consts.ts

@@ -1,80 +1,80 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the Microsoft Live Share SDK License.
- */
-
-/**
- * @hidden
- * List of telemetry events. Wrap with a call to transmit() if the event should be transmitted to
- * the telemetry service.
- */
-export const TelemetryEvents = {
-    MediaPlayerSynchronizer: {
-        SynchronizationStarted: 'MediaPlayerSynchronizer:SynchronizationStarted',
-        PlayerEvent: 'MediaPlayerSynchronizer:PlayerEvent',
-        PlayAction: 'MediaPlayerSynchronizer:PlayAction',
-        PauseAction: 'MediaPlayerSynchronizer:PauseAction',
-        SeekToAction: 'MediaPlayerSynchronizer:SeekToAction',
-        CatchupAction: 'MediaPlayerSynchronizer:CatchupAction',
-        SetTrackAction: 'MediaPlayerSynchronizer:SetTrackAction',
-        DataChangeAction: 'MediaPlayerSynchronizer:DataChangeAction',
-        UserTappedVideoToPlay: transmit('MediaPlayerSynchronizer:UserTappedVideoToPlay'),
-        PlaybackRateChangeBlocked: 'MediaPlayerSynchronizer:PlaybackRateChangeBlocked',
-        PlayerBlockedOperation: transmit('MediaPlayerSynchronizer:PlayerBlockedOperation'),
-        SeekingPlayerToStartPosition: 'MediaPlayerSynchronizer:SeekingPlayerToStartPosition',
-        BeginSeekCalled: 'MediaPlayerSynchronizer:BeginSeekCalled',
-        EndSeekCalled: 'MediaPlayerSynchronizer:EndSeekCalled',
-        PlayCalled: 'MediaPlayerSynchronizer:PlayCalled',
-        PauseCalled: 'MediaPlayerSynchronizer:PauseCalled',
-        SeekToCalled: 'MediaPlayerSynchronizer:SeekToCalled',
-        SetTrackCalled: 'MediaPlayerSynchronizer:SetTrackCalled',
-        SetTrackDataCalled: 'MediaPlayerSynchronizer:SetTrackDataCalled',
-    },
-    MediaSession: {
-        PlayAction: transmit('MediaSession:PlayAction'),
-        PauseAction: transmit('MediaSession:PauseAction'),
-        SeekToAction: transmit('MediaSession:SeekToAction'),
-        CatchUpAction: transmit('MediaSession:CatchUpAction'),
-        SetTrackAction: transmit('MediaSession:SetTrackAction'),
-        DataChangeAction: 'MediaSession:DataChangeAction',
-        BeginPositionUpdateTimer: 'MediaSession:BeginPositionUpdateTimer',
-    },
-    SessionCoordinator: {
-        PlayCalled: transmit('SessionCoordinator:PlayCalled'),
-        PauseCalled: transmit('SessionCoordinator:PauseCalled'),
-        SeekToCalled: transmit('SessionCoordinator:SeekToCalled'),
-        SetTrackCalled: transmit('SessionCoordinator:SetTrackCalled'),
-        SetTrackDataCalled: 'SessionCoordinator:SetTrackDataCalled',
-        BeginSuspension: 'SessionCoordinator:BeginSuspension',
-        BeginSuspensionAndWait: transmit('SessionCoordinator:BeginSuspensionAndWait'),
-        EndSuspension: 'SessionCoordinator:EndSuspension',
-        EndSuspensionAndWait: transmit('SessionCoordinator:EndSuspensionAndWait'),
-        RemoteJoinReceived: 'SessionCoordinator:RemoteJoinReceived',
-        RemoteSetTrackReceived: transmit('SessionCoordinator:RemoteSetTrackReceived'),
-        RemoteSetTrackDataReceived: transmit('SessionCoordinator:RemoteSetTrackDataReceived'),
-        RemotePlayReceived: transmit('SessionCoordinator:RemotePlayReceived'),
-        RemotePauseReceived: transmit('SessionCoordinator:RemotePauseReceived'),
-        RemoteSeekToReceived: transmit('SessionCoordinator:RemoteSeekToReceived'),
-    },
-    GroupCoordinator: {
-        TrackChanged: 'GroupCoordinator:TrackChanged',
-        TrackChangeDelayed: 'GroupCoordinator:TrackChangeDelayed',
-        TrackDataChanged: 'GroupCoordinator:TrackDataChanged',
-        TrackDataChangeDelayed: 'GroupCoordinator:TrackDataChangeDelayed',
-        TransportStateChanged: 'GroupCoordinator:TransportStateChanged',
-        TransportStateChangeDelayed: 'GroupCoordinator:TransportStateChangeDelayed',
-        BeginSoftSuspension: 'GroupCoordinator:BeginSoftSuspension',
-        CheckingForSyncIssues: 'GroupCoordinator:CheckingForSyncIssues',
-        TrackOutOfSync: transmit('GroupCoordinator:TrackOutOfSync'),
-        TrackDataOutOfSync: transmit('GroupCoordinator:TrackDataOutOfSync'),
-        TransportOutOfSync: transmit('GroupCoordinator:TransportOutOfSync'),
-        PositionOutOfSync: transmit('GroupCoordinator:PositionOutOfSync'),
-    }
-}
-
-/**
- * @hidden
- */
-function transmit(eventName: string): string {
-    return `${eventName}#transmit`;
-}
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the Microsoft Live Share SDK License.
+ */
+
+/**
+ * @hidden
+ * List of telemetry events. Wrap with a call to transmit() if the event should be transmitted to
+ * the telemetry service.
+ */
+export const TelemetryEvents = {
+    MediaPlayerSynchronizer: {
+        SynchronizationStarted: 'MediaPlayerSynchronizer:SynchronizationStarted',
+        PlayerEvent: 'MediaPlayerSynchronizer:PlayerEvent',
+        PlayAction: 'MediaPlayerSynchronizer:PlayAction',
+        PauseAction: 'MediaPlayerSynchronizer:PauseAction',
+        SeekToAction: 'MediaPlayerSynchronizer:SeekToAction',
+        CatchupAction: 'MediaPlayerSynchronizer:CatchupAction',
+        SetTrackAction: 'MediaPlayerSynchronizer:SetTrackAction',
+        DataChangeAction: 'MediaPlayerSynchronizer:DataChangeAction',
+        UserTappedVideoToPlay: transmit('MediaPlayerSynchronizer:UserTappedVideoToPlay'),
+        PlaybackRateChangeBlocked: 'MediaPlayerSynchronizer:PlaybackRateChangeBlocked',
+        PlayerBlockedOperation: transmit('MediaPlayerSynchronizer:PlayerBlockedOperation'),
+        SeekingPlayerToStartPosition: 'MediaPlayerSynchronizer:SeekingPlayerToStartPosition',
+        BeginSeekCalled: 'MediaPlayerSynchronizer:BeginSeekCalled',
+        EndSeekCalled: 'MediaPlayerSynchronizer:EndSeekCalled',
+        PlayCalled: 'MediaPlayerSynchronizer:PlayCalled',
+        PauseCalled: 'MediaPlayerSynchronizer:PauseCalled',
+        SeekToCalled: 'MediaPlayerSynchronizer:SeekToCalled',
+        SetTrackCalled: 'MediaPlayerSynchronizer:SetTrackCalled',
+        SetTrackDataCalled: 'MediaPlayerSynchronizer:SetTrackDataCalled',
+    },
+    MediaSession: {
+        PlayAction: transmit('MediaSession:PlayAction'),
+        PauseAction: transmit('MediaSession:PauseAction'),
+        SeekToAction: transmit('MediaSession:SeekToAction'),
+        CatchUpAction: transmit('MediaSession:CatchUpAction'),
+        SetTrackAction: transmit('MediaSession:SetTrackAction'),
+        DataChangeAction: 'MediaSession:DataChangeAction',
+        BeginPositionUpdateTimer: 'MediaSession:BeginPositionUpdateTimer',
+    },
+    SessionCoordinator: {
+        PlayCalled: transmit('SessionCoordinator:PlayCalled'),
+        PauseCalled: transmit('SessionCoordinator:PauseCalled'),
+        SeekToCalled: transmit('SessionCoordinator:SeekToCalled'),
+        SetTrackCalled: transmit('SessionCoordinator:SetTrackCalled'),
+        SetTrackDataCalled: 'SessionCoordinator:SetTrackDataCalled',
+        BeginSuspension: 'SessionCoordinator:BeginSuspension',
+        BeginSuspensionAndWait: transmit('SessionCoordinator:BeginSuspensionAndWait'),
+        EndSuspension: 'SessionCoordinator:EndSuspension',
+        EndSuspensionAndWait: transmit('SessionCoordinator:EndSuspensionAndWait'),
+        RemoteJoinReceived: 'SessionCoordinator:RemoteJoinReceived',
+        RemoteSetTrackReceived: transmit('SessionCoordinator:RemoteSetTrackReceived'),
+        RemoteSetTrackDataReceived: transmit('SessionCoordinator:RemoteSetTrackDataReceived'),
+        RemotePlayReceived: transmit('SessionCoordinator:RemotePlayReceived'),
+        RemotePauseReceived: transmit('SessionCoordinator:RemotePauseReceived'),
+        RemoteSeekToReceived: transmit('SessionCoordinator:RemoteSeekToReceived'),
+    },
+    GroupCoordinator: {
+        TrackChanged: 'GroupCoordinator:TrackChanged',
+        TrackChangeDelayed: 'GroupCoordinator:TrackChangeDelayed',
+        TrackDataChanged: 'GroupCoordinator:TrackDataChanged',
+        TrackDataChangeDelayed: 'GroupCoordinator:TrackDataChangeDelayed',
+        TransportStateChanged: 'GroupCoordinator:TransportStateChanged',
+        TransportStateChangeDelayed: 'GroupCoordinator:TransportStateChangeDelayed',
+        BeginSoftSuspension: 'GroupCoordinator:BeginSoftSuspension',
+        CheckingForSyncIssues: 'GroupCoordinator:CheckingForSyncIssues',
+        TrackOutOfSync: transmit('GroupCoordinator:TrackOutOfSync'),
+        TrackDataOutOfSync: transmit('GroupCoordinator:TrackDataOutOfSync'),
+        TransportOutOfSync: transmit('GroupCoordinator:TransportOutOfSync'),
+        PositionOutOfSync: transmit('GroupCoordinator:PositionOutOfSync'),
+    }
+}
+
+/**
+ * @hidden
+ */
+function transmit(eventName: string): string {
+    return `${eventName}#transmit`;
+}

package/src/internals/index.ts

@@ -1,11 +1,11 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the Microsoft Live Share SDK License.
- */
-
-export * from './consts';
-export * from './GroupCoordinatorState';
-export * from './GroupPlaybackPosition';
-export * from './GroupPlaybackTrack';
-export * from './GroupPlaybackTrackData';
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the Microsoft Live Share SDK License.
+ */
+
+export * from './consts';
+export * from './GroupCoordinatorState';
+export * from './GroupPlaybackPosition';
+export * from './GroupPlaybackTrack';
+export * from './GroupPlaybackTrackData';
 export * from './GroupTransportState';