Skip to content

Cleanup Live Share folder structure #782

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jul 1, 2024
Merged

Cleanup Live Share folder structure #782

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43df5a8
replaced deprecated interface with moved version, delete internal ind…
Jul 1, 2024
25f8df4
deleted LiveEventTimer, not useful
Jul 1, 2024
9bac2c1
move some more files and fix tests
Jul 1, 2024
3c9e1c7
moved MockRoleVerifier
Jul 1, 2024
7b54acb
additional cleanup in media package
Jul 1, 2024
6fc6ec1
used pattern from fluid for exposing internal implementation details
Jul 1, 2024
4950ed3
only include typescript files
Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/live-share-canvas/src/core/InkingManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import {
computeQuadPath,
renderQuadPathToSVG,
} from "./internals";
import { IEvent } from "@fluidframework/common-definitions";
import { IEvent } from "@fluidframework/core-interfaces";

/**
* Defines available inking tools.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share-media/src/LiveMediaSessionCoordinator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import {
IRateChangeCommandEvent,
} from "./internals";
import { LiveMediaSessionCoordinatorSuspension } from "./LiveMediaSessionCoordinatorSuspension";
import { isErrorLike } from "@microsoft/live-share/bin/internals";
import { isErrorLike } from "@microsoft/live-share/bin/internals/type-guards";
import { TypedEventEmitter } from "@fluid-internal/client-utils";
import { IEvent } from "@fluidframework/common-definitions";
import { IEvent } from "@fluidframework/core-interfaces";

/**
* Most recent state of the media session.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share-media/src/MediaPlayerSynchronizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import { VolumeManager } from "./VolumeManager";
import { LiveMediaSession } from "./LiveMediaSession";
import { IMediaPlayer } from "./IMediaPlayer";
import { ITriggerActionEvent, TelemetryEvents } from "./internals";
import { waitUntilConnected } from "@microsoft/live-share/bin/internals";
import { waitUntilConnected } from "@microsoft/live-share/bin/internals/utils";
import { TypedEventEmitter } from "@fluid-internal/client-utils";
import { IEvent } from "@fluidframework/common-definitions";
import { IEvent } from "@fluidframework/core-interfaces";

/**
* Event data returned by `MediaPlayerSynchronizer` object.
Expand Down
2 changes: 1 addition & 1 deletion packages/live-share-media/src/internals/GroupCoordinatorState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import {
IPlaybackTrackDataChangeEvent,
} from "./GroupPlaybackTrackData";
import { TelemetryEvents } from "./consts";
import { waitUntilConnected } from "@microsoft/live-share/bin/internals";
import { waitUntilConnected } from "@microsoft/live-share/bin/internals/utils";
Copy link
Contributor Author

@huntj88 huntj88 Jul 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we export waitUntilConnected? it has the hidden annotation already.

Same question for any resource referencing bin or src?

src one might be okay, because only used in unit tests after my changes

import {
GroupPlaybackRate,
IPlaybackRate,
Expand Down
2 changes: 1 addition & 1 deletion packages/live-share-media/src/internals/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { IEvent } from "@microsoft/live-share";
import { IEvent as IFluidEvent } from "@fluidframework/common-definitions";
import { IEvent as IFluidEvent } from "@fluidframework/core-interfaces";
import { ExtendedMediaSessionActionSource } from "../MediaSessionExtensions";

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/live-share-media/src/test/GroupPlaybackPosition.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
TestLiveShareHost,
TimeInterval,
} from "@microsoft/live-share";
import { MockLiveShareRuntime } from "@microsoft/live-share/src/test/MockLiveShareRuntime";
import { MockLiveShareRuntime } from "@microsoft/live-share/src/internals/test/MockLiveShareRuntime";
import { IMediaPlayerState } from "../LiveMediaSessionCoordinator";

function createTransportUpdate(
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share-media/src/test/LiveMediaSession_ManualActionHandler.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
} from "@microsoft/live-share";
import { TestLiveShareHost } from "@microsoft/live-share";
import { getLiveDataObjectKind } from "@microsoft/live-share";
import { waitForDelay } from "@microsoft/live-share/src/internals";
import { MockLiveShareRuntime } from "@microsoft/live-share/src/test/MockLiveShareRuntime";
import { waitForDelay } from "@microsoft/live-share/src/internals/utils";
import { MockLiveShareRuntime } from "@microsoft/live-share/src/internals/test/MockLiveShareRuntime";
import {
ExtendedMediaMetadata,
ExtendedMediaSessionActionDetails,
Expand Down
6 changes: 3 additions & 3 deletions packages/live-share-media/src/test/LiveMediaSession_Synchronizer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import {
} from "@microsoft/live-share";
import { TestLiveShareHost } from "@microsoft/live-share";
import { getLiveDataObjectKind } from "@microsoft/live-share";
import { waitForDelay } from "@microsoft/live-share/src/internals";
import { MockLiveShareRuntime } from "@microsoft/live-share/src/test/MockLiveShareRuntime";
import { isErrorLike } from "@microsoft/live-share/bin/internals";
import { waitForDelay } from "@microsoft/live-share/src/internals/utils";
import { MockLiveShareRuntime } from "@microsoft/live-share/src/internals/test/MockLiveShareRuntime";
import { isErrorLike } from "@microsoft/live-share/src/internals/type-guards";
import {
ExtendedMediaMetadata,
ExtendedMediaSessionAction,
Expand Down
3 changes: 2 additions & 1 deletion packages/live-share-media/src/test/VolumeManager.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { strict as assert } from "assert";
import { IMediaPlayer } from "../IMediaPlayer";
import { LimitLevelType, VolumeManager } from "../VolumeManager";
import { Deferred, waitForDelay } from "@microsoft/live-share/src/internals";
import { Deferred } from "@microsoft/live-share/src/internals/Deferred";
import { waitForDelay } from "@microsoft/live-share/src/internals/utils";

// few millis more than max timeout callback in scheduleAnimationFrame
const milliTolerance = 25;
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share/src/AzureLiveShareClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import { AzureContainerServices } from "@fluidframework/azure-client/internal";
import { BaseLiveShareClient } from "./internals/BaseLiveShareClient";
import { ILiveShareHost } from "./interfaces";
import { AzureLiveShareHost } from "./AzureLiveShareHost";
import { LiveShareRuntime } from "./LiveShareRuntime";
import { LiveShareRuntime } from "./internals/LiveShareRuntime";
import { getLiveContainerSchema } from "./internals/schema-injection-utils";
import { LiveShareClient } from "./LiveShareClient";
import { LiveDataObject } from "./LiveDataObject";
import { LiveDataObject } from "./internals/LiveDataObject";
import { FluidCompatibilityMode } from "./internals/consts";

/**
Expand Down
2 changes: 1 addition & 1 deletion packages/live-share/src/AzureLiveShareHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
INtpTimeInfo,
UserMeetingRole,
} from "./interfaces";
import { Deferred } from "./internals";
import { Deferred } from "./internals/Deferred";

/**
* @alpha
Expand Down
8 changes: 4 additions & 4 deletions packages/live-share/src/LiveEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ import {
ILiveEvent,
LiveDataObjectInitializeState,
} from "./interfaces";
import { LiveEventScope } from "./LiveEventScope";
import { LiveEventTarget } from "./LiveEventTarget";
import { LiveEventScope } from "./internals/LiveEventScope";
import { LiveEventTarget } from "./internals/LiveEventTarget";
import { DynamicObjectRegistry } from "./internals/DynamicObjectRegistry";
import { LiveDataObject } from "./LiveDataObject";
import { cloneValue } from "./internals";
import { LiveDataObject } from "./internals/LiveDataObject";
import {
LiveDataObjectInitializeNotNeededError,
LiveDataObjectNotInitializedError,
UnexpectedError,
} from "./errors";
import { SharedObjectKind } from "fluid-framework";
import { cloneValue } from "./internals/utils";

/**
* Events supported by `LiveEvent` object.
Expand Down
117 changes: 0 additions & 117 deletions packages/live-share/src/LiveEventTimer.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/live-share/src/LiveFollowMode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LiveDataObject } from "./LiveDataObject";
import { LiveDataObject } from "./internals/LiveDataObject";
import { LiveState } from "./LiveState";
import { ILivePresenceEvents, LivePresence } from "./LivePresence";
import {
Expand Down
9 changes: 5 additions & 4 deletions packages/live-share/src/LivePresence.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ import {
DataObjectFactory,
createDataObjectKind,
} from "@fluidframework/aqueduct/internal";
import { IEvent } from "@fluidframework/common-definitions";
import { IEvent } from "@fluidframework/core-interfaces";
import {
LivePresenceUser,
PresenceState,
ILivePresenceEvent,
LivePresenceReceivedEventData,
} from "./LivePresenceUser";
import { LiveObjectSynchronizer } from "./LiveObjectSynchronizer";
import { LiveObjectSynchronizer } from "./internals/LiveObjectSynchronizer";
import { LiveTelemetryLogger } from "./LiveTelemetryLogger";
import { cloneValue, TelemetryEvents } from "./internals";
import {
LiveDataObjectInitializeNotNeededError,
LiveDataObjectNotInitializedError,
Expand All @@ -29,8 +28,10 @@ import {
LiveDataObjectInitializeState,
UserMeetingRole,
} from "./interfaces";
import { LiveDataObject } from "./LiveDataObject";
import { LiveDataObject } from "./internals/LiveDataObject";
import { SharedObjectKind } from "fluid-framework";
import { cloneValue } from "./internals/utils";
import { TelemetryEvents } from "./internals/consts";

/**
* Events supported by `LivePresence` object.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share/src/LivePresenceConnection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { cloneValue } from "./internals";
import { LiveEvent } from "./LiveEvent";
import {
LivePresenceReceivedEventData,
PresenceState,
} from "./LivePresenceUser";
import { LiveShareRuntime } from "./LiveShareRuntime";
import { LiveShareRuntime } from "./internals/LiveShareRuntime";
import { TimeInterval } from "./TimeInterval";
import { cloneValue } from "./internals/utils";

/**
* A connection that presence is being tracked for.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share/src/LivePresenceUser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import { LiveEvent } from "./LiveEvent";
import { IClientInfo, ILiveEvent, UserMeetingRole } from "./interfaces";
import { TimeInterval } from "./TimeInterval";
import { cloneValue } from "./internals";
import { LiveShareRuntime } from "./LiveShareRuntime";
import { LiveShareRuntime } from "./internals/LiveShareRuntime";
import { LivePresenceConnection } from "./LivePresenceConnection";
import { cloneValue } from "./internals/utils";

/**
* List of possible presence states.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share/src/LiveShareClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import {
import { BaseLiveShareClient } from "./internals/BaseLiveShareClient";
import { LocalTimestampProvider } from "./LocalTimestampProvider";
import { TestLiveShareHost } from "./TestLiveShareHost";
import { LiveShareRuntime } from "./LiveShareRuntime";
import { LiveShareRuntime } from "./internals/LiveShareRuntime";
import { getLiveContainerSchema } from "./internals/schema-injection-utils";
import { ExpectedError, UnexpectedError } from "./errors";
import { FluidCompatibilityMode } from "./internals";
import { FluidCompatibilityMode } from "./internals/consts";

/**
* @hidden
Expand Down
7 changes: 4 additions & 3 deletions packages/live-share/src/LiveState.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,19 @@ import {
LiveDataObjectInitializeState,
UserMeetingRole,
} from "./interfaces";
import { cloneValue, TelemetryEvents } from "./internals";
import {
LiveDataObjectInitializeNotNeededError,
LiveDataObjectNotInitializedError,
UnexpectedError,
} from "./errors";
import { LiveTelemetryLogger } from "./LiveTelemetryLogger";
import { LiveEvent } from "./LiveEvent";
import { LiveObjectSynchronizer } from "./LiveObjectSynchronizer";
import { LiveObjectSynchronizer } from "./internals/LiveObjectSynchronizer";
import { DynamicObjectRegistry } from "./internals/DynamicObjectRegistry";
import { LiveDataObject } from "./LiveDataObject";
import { LiveDataObject } from "./internals/LiveDataObject";
import { SharedObjectKind } from "fluid-framework";
import { TelemetryEvents } from "./internals/consts";
import { cloneValue } from "./internals/utils";

/**
* Events supported by [LiveState` object.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share/src/LiveTelemetryLogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import {
ITelemetryBaseProperties,
LogLevel,
} from "@fluidframework/core-interfaces";
import { IRuntimeSignaler } from "./LiveEventScope";
import { LiveShareRuntime } from "./LiveShareRuntime";
import { IRuntimeSignaler } from "./internals/LiveEventScope";
import { LiveShareRuntime } from "./internals/LiveShareRuntime";

/**
* Properties included on all events sent by `LiveTelemetryLogger`.
Expand Down
4 changes: 2 additions & 2 deletions packages/live-share/src/LiveTimer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
DataObjectFactory,
createDataObjectKind,
} from "@fluidframework/aqueduct/internal";
import { LiveObjectSynchronizer } from "./LiveObjectSynchronizer";
import { LiveObjectSynchronizer } from "./internals/LiveObjectSynchronizer";
import {
IClientTimestamp,
ILiveEvent,
Expand All @@ -17,7 +17,7 @@ import {
import { IEvent } from "@fluidframework/core-interfaces";
import { LiveEvent } from "./LiveEvent";
import { DynamicObjectRegistry } from "./internals/DynamicObjectRegistry";
import { LiveDataObject } from "./LiveDataObject";
import { LiveDataObject } from "./internals/LiveDataObject";
import {
LiveDataObjectInitializeNotNeededError,
LiveDataObjectNotInitializedError,
Expand Down
2 changes: 1 addition & 1 deletion packages/live-share/src/TimestampProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the Microsoft Live Share SDK License.
*/

import { ILiveShareHost, INtpTimeInfo, ITimestampProvider } from "./interfaces";
import { INtpTimeInfo, ITimestampProvider } from "./interfaces";

const IMPROVE_ACCURACY_INTERVAL = 5 * 1000;
const IMPROVE_ACCURACY_ATTEMPTS = 5;
Expand Down
2 changes: 1 addition & 1 deletion packages/live-share/src/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { LiveShareReportIssueLink } from "./internals";
import { LiveDataObjectInitializeState } from "./interfaces";
import { LiveShareReportIssueLink } from "./internals/consts";

/**
* @hidden
Expand Down
Loading