@sidebandchat/client 0.2.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/activity/activity-sharing-controller.d.ts +2 -0
- package/dist/activity/activity-sharing-controller.d.ts.map +1 -1
- package/dist/activity/activity-sharing-controller.js +40 -9
- package/dist/activity/activity-sharing-controller.js.map +1 -1
- package/dist/calls/call-runtime.d.ts +37 -0
- package/dist/calls/call-runtime.d.ts.map +1 -0
- package/dist/calls/call-runtime.js +2 -0
- package/dist/calls/call-runtime.js.map +1 -0
- package/dist/calls/index.d.ts +1 -0
- package/dist/calls/index.d.ts.map +1 -1
- package/dist/calls/media-controls.d.ts +5 -0
- package/dist/calls/media-controls.d.ts.map +1 -1
- package/dist/calls/media-controls.js +79 -4
- package/dist/calls/media-controls.js.map +1 -1
- package/dist/calls/media.d.ts +1 -1
- package/dist/calls/media.d.ts.map +1 -1
- package/dist/calls/media.js +5 -12
- package/dist/calls/media.js.map +1 -1
- package/dist/client/ephemeral-state.d.ts.map +1 -1
- package/dist/client/ephemeral-state.js +31 -23
- package/dist/client/ephemeral-state.js.map +1 -1
- package/dist/client/index.d.ts +1 -1
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js.map +1 -1
- package/dist/client/platform-adapters.d.ts +21 -1
- package/dist/client/platform-adapters.d.ts.map +1 -1
- package/dist/client/session-runtime.d.ts +35 -1
- package/dist/client/session-runtime.d.ts.map +1 -1
- package/dist/client/session-runtime.js +428 -36
- package/dist/client/session-runtime.js.map +1 -1
- package/dist/client/sideband-client.d.ts.map +1 -1
- package/dist/client/sideband-client.js +18 -1
- package/dist/client/sideband-client.js.map +1 -1
- package/dist/communities/community-client.d.ts.map +1 -1
- package/dist/communities/community-client.js +11 -2
- package/dist/communities/community-client.js.map +1 -1
- package/dist/domain.d.ts +3 -2
- package/dist/domain.d.ts.map +1 -1
- package/dist/domain.js.map +1 -1
- package/dist/realtime/realtime-client.d.ts +8 -0
- package/dist/realtime/realtime-client.d.ts.map +1 -1
- package/dist/realtime/realtime-client.js +9 -0
- package/dist/realtime/realtime-client.js.map +1 -1
- package/dist/sbp/records.d.ts.map +1 -1
- package/dist/sbp/records.js +20 -5
- package/dist/sbp/records.js.map +1 -1
- package/dist/sbp/value.d.ts.map +1 -1
- package/dist/sbp/value.js +1 -1
- package/dist/sbp/value.js.map +1 -1
- package/dist/social/social-client.d.ts +1 -0
- package/dist/social/social-client.d.ts.map +1 -1
- package/dist/social/social-client.js +3 -0
- package/dist/social/social-client.js.map +1 -1
- package/dist/workspace/workspace-controller.d.ts +1 -1
- package/dist/workspace/workspace-controller.d.ts.map +1 -1
- package/dist/workspace/workspace-controller.js +3 -6
- package/dist/workspace/workspace-controller.js.map +1 -1
- package/package.json +1 -1
|
@@ -80,6 +80,7 @@ export type ActivitySharingControllerOptions = {
|
|
|
80
80
|
platform: ActivitySharingPlatform;
|
|
81
81
|
setSharingEnabled?: (enabled: boolean) => Promise<void>;
|
|
82
82
|
publishTune: (tune?: UserTune) => Promise<unknown>;
|
|
83
|
+
renewTune?: (tune: UserTune) => Promise<unknown>;
|
|
83
84
|
formatError: (reason: unknown) => string;
|
|
84
85
|
now?: () => number;
|
|
85
86
|
setTimer?: typeof setTimeout;
|
|
@@ -118,6 +119,7 @@ export declare class ActivitySharingController {
|
|
|
118
119
|
private publishCurrentActivity;
|
|
119
120
|
private publish;
|
|
120
121
|
private refreshPublicationTimer;
|
|
122
|
+
private renewCurrentActivity;
|
|
121
123
|
private clearPublicationState;
|
|
122
124
|
private cancelPauseTimer;
|
|
123
125
|
private cancelRefreshTimer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-sharing-controller.d.ts","sourceRoot":"","sources":["../../src/activity/activity-sharing-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,eAAO,MAAM,wBAAwB,QAAS,CAAC;AAC/C,eAAO,MAAM,mBAAmB,QAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"activity-sharing-controller.d.ts","sourceRoot":"","sources":["../../src/activity/activity-sharing-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export const PAUSED_ACTIVITY_GRACE_MS = 15_000;
|
|
2
2
|
export const ACTIVITY_REFRESH_MS = 30_000;
|
|
3
|
+
const SEEK_REFRESH_THRESHOLD_MS = 3_000;
|
|
3
4
|
export class ActivitySharingController {
|
|
4
5
|
options;
|
|
5
6
|
current = {
|
|
@@ -200,24 +201,31 @@ export class ActivitySharingController {
|
|
|
200
201
|
this.recomputeTune();
|
|
201
202
|
}
|
|
202
203
|
recomputeTune() {
|
|
203
|
-
this.cancelPauseTimer();
|
|
204
204
|
const selected = this.current.enabled
|
|
205
205
|
? selectActivitySession(this.current.sessions, this.current.applicationId)
|
|
206
206
|
: undefined;
|
|
207
207
|
if (selected?.playbackState === "playing") {
|
|
208
|
+
this.cancelPauseTimer();
|
|
209
|
+
const observedAt = this.now();
|
|
208
210
|
const tune = sessionTune(selected);
|
|
211
|
+
const previous = currentTune(this.lastPlayingTune, this.lastPlayingObservedAt, observedAt);
|
|
212
|
+
const seeked = positionDiscontinuity(previous, tune);
|
|
209
213
|
this.lastPlayingTune = tune;
|
|
210
|
-
this.lastPlayingObservedAt =
|
|
214
|
+
this.lastPlayingObservedAt = observedAt;
|
|
211
215
|
this.setTune(tune);
|
|
216
|
+
if (seeked)
|
|
217
|
+
this.renewCurrentActivity(tune);
|
|
212
218
|
return;
|
|
213
219
|
}
|
|
214
220
|
if (selected?.playbackState === "paused" && this.lastPlayingTune) {
|
|
215
|
-
this.pauseTimer
|
|
216
|
-
this.pauseTimer =
|
|
217
|
-
|
|
218
|
-
|
|
221
|
+
if (this.pauseTimer === undefined)
|
|
222
|
+
this.pauseTimer = this.setTimer(() => {
|
|
223
|
+
this.pauseTimer = undefined;
|
|
224
|
+
this.setTune(undefined);
|
|
225
|
+
}, PAUSED_ACTIVITY_GRACE_MS);
|
|
219
226
|
return;
|
|
220
227
|
}
|
|
228
|
+
this.cancelPauseTimer();
|
|
221
229
|
this.setTune(undefined);
|
|
222
230
|
}
|
|
223
231
|
setTune(tune) {
|
|
@@ -253,15 +261,18 @@ export class ActivitySharingController {
|
|
|
253
261
|
});
|
|
254
262
|
}
|
|
255
263
|
refreshPublicationTimer() {
|
|
256
|
-
this.
|
|
257
|
-
|
|
264
|
+
if (!this.started || !this.context.connected || !this.current.enabled) {
|
|
265
|
+
this.cancelRefreshTimer();
|
|
266
|
+
return;
|
|
267
|
+
}
|
|
268
|
+
if (this.refreshTimer !== undefined)
|
|
258
269
|
return;
|
|
259
270
|
this.refreshTimer = this.setInterval(() => {
|
|
260
271
|
const tune = currentTune(this.lastPlayingTune, this.lastPlayingObservedAt, this.now());
|
|
261
272
|
if (!tune)
|
|
262
273
|
return;
|
|
263
274
|
this.lastPublished = JSON.stringify(tune);
|
|
264
|
-
void this.options.publishTune(tune).catch((reason) => {
|
|
275
|
+
void (this.options.renewTune ?? this.options.publishTune)(tune).catch((reason) => {
|
|
265
276
|
this.clearPublicationState();
|
|
266
277
|
this.setState({
|
|
267
278
|
...this.current,
|
|
@@ -270,6 +281,18 @@ export class ActivitySharingController {
|
|
|
270
281
|
});
|
|
271
282
|
}, ACTIVITY_REFRESH_MS);
|
|
272
283
|
}
|
|
284
|
+
renewCurrentActivity(tune) {
|
|
285
|
+
if (!this.context.connected || !this.current.enabled)
|
|
286
|
+
return;
|
|
287
|
+
this.lastPublished = JSON.stringify(tune);
|
|
288
|
+
void (this.options.renewTune ?? this.options.publishTune)(tune).catch((reason) => {
|
|
289
|
+
this.clearPublicationState();
|
|
290
|
+
this.setState({
|
|
291
|
+
...this.current,
|
|
292
|
+
error: this.options.formatError(reason),
|
|
293
|
+
});
|
|
294
|
+
});
|
|
295
|
+
}
|
|
273
296
|
clearPublicationState() {
|
|
274
297
|
this.lastPublished = "";
|
|
275
298
|
this.lastPublishedActivity = "";
|
|
@@ -353,4 +376,12 @@ function currentTune(tune, observedAt, now) {
|
|
|
353
376
|
positionMs: Math.min(tune.durationMs ?? Infinity, tune.positionMs + Math.max(0, now - observedAt)),
|
|
354
377
|
};
|
|
355
378
|
}
|
|
379
|
+
function positionDiscontinuity(previous, next) {
|
|
380
|
+
if (!previous ||
|
|
381
|
+
activitySignature(previous) !== activitySignature(next) ||
|
|
382
|
+
previous.positionMs === undefined ||
|
|
383
|
+
next.positionMs === undefined)
|
|
384
|
+
return false;
|
|
385
|
+
return (Math.abs(previous.positionMs - next.positionMs) >= SEEK_REFRESH_THRESHOLD_MS);
|
|
386
|
+
}
|
|
356
387
|
//# sourceMappingURL=activity-sharing-controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activity-sharing-controller.js","sourceRoot":"","sources":["../../src/activity/activity-sharing-controller.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"activity-sharing-controller.js","sourceRoot":"","sources":["../../src/activity/activity-sharing-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { CallSession } from "../domain.js";
|
|
2
|
+
import type { CallId, UserId } from "../entity-id.js";
|
|
3
|
+
import type { MediaDisconnectReason } from "./media-types.js";
|
|
4
|
+
export type CallConnectionState = "idle" | "ringing" | "connecting" | "active" | "reconnecting" | "replacing" | "disconnecting";
|
|
5
|
+
export type CallLifecycleEvent = {
|
|
6
|
+
type: "current-changed";
|
|
7
|
+
call?: CallSession;
|
|
8
|
+
previous?: CallSession;
|
|
9
|
+
} | {
|
|
10
|
+
type: "call-updated";
|
|
11
|
+
call: CallSession;
|
|
12
|
+
previous?: CallSession;
|
|
13
|
+
} | {
|
|
14
|
+
type: "participant-state-changed";
|
|
15
|
+
call: CallSession;
|
|
16
|
+
userId: UserId;
|
|
17
|
+
state: CallSession["participants"][number]["state"];
|
|
18
|
+
previousState?: CallSession["participants"][number]["state"];
|
|
19
|
+
} | {
|
|
20
|
+
type: "call-ended";
|
|
21
|
+
call: CallSession;
|
|
22
|
+
} | {
|
|
23
|
+
type: "connection-state-changed";
|
|
24
|
+
state: CallConnectionState;
|
|
25
|
+
previousState: CallConnectionState;
|
|
26
|
+
call?: CallSession;
|
|
27
|
+
reason?: MediaDisconnectReason | "room-ended" | "reconnect-failed";
|
|
28
|
+
};
|
|
29
|
+
export type CallRuntimeView = {
|
|
30
|
+
connection: CallConnectionState;
|
|
31
|
+
phase?: "proposal" | "session";
|
|
32
|
+
current?: CallSession;
|
|
33
|
+
incoming?: CallSession;
|
|
34
|
+
joinable: ReadonlyMap<CallId, CallSession>;
|
|
35
|
+
pendingParticipantIds: readonly UserId[];
|
|
36
|
+
};
|
|
37
|
+
//# sourceMappingURL=call-runtime.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"call-runtime.d.ts","sourceRoot":"","sources":["../../src/calls/call-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAE9D,MAAM,MAAM,mBAAmB,GAC3B,MAAM,GACN,SAAS,GACT,YAAY,GACZ,QAAQ,GACR,cAAc,GACd,WAAW,GACX,eAAe,CAAC;AAEpB,MAAM,MAAM,kBAAkB,GAC1B;IACE,IAAI,EAAE,iBAAiB,CAAC;IACxB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,GACD;IACE,IAAI,EAAE,cAAc,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,WAAW,CAAC;CACxB,GACD;IACE,IAAI,EAAE,2BAA2B,CAAC;IAClC,IAAI,EAAE,WAAW,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;IACpD,aAAa,CAAC,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC;CAC9D,GACD;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GACzC;IACE,IAAI,EAAE,0BAA0B,CAAC;IACjC,KAAK,EAAE,mBAAmB,CAAC;IAC3B,aAAa,EAAE,mBAAmB,CAAC;IACnC,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,MAAM,CAAC,EAAE,qBAAqB,GAAG,YAAY,GAAG,kBAAkB,CAAC;CACpE,CAAC;AAEN,MAAM,MAAM,eAAe,GAAG;IAC5B,UAAU,EAAE,mBAAmB,CAAC;IAChC,KAAK,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC3C,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;CAC1C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"call-runtime.js","sourceRoot":"","sources":["../../src/calls/call-runtime.ts"],"names":[],"mappings":""}
|
package/dist/calls/index.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
export { type ManagedMediaCapture, type MediaCaptureAdapter, type MediaCallbacks, type MediaDisconnectReason, type TrackMetadata, type RemoteEndpointState, } from "./media-types.js";
|
|
2
2
|
export { MediaPresentationController, type RemoteMedia, type MediaPresentationState, type MediaPresentationControllerOptions, } from "./media-presentation-controller.js";
|
|
3
|
+
export type { CallConnectionState, CallLifecycleEvent, CallRuntimeView, } from "./call-runtime.js";
|
|
3
4
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/calls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,mBAAmB,GACzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,2BAA2B,EAC3B,KAAK,WAAW,EAChB,KAAK,sBAAsB,EAC3B,KAAK,kCAAkC,GACxC,MAAM,oCAAoC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/calls/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,cAAc,EACnB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,mBAAmB,GACzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,2BAA2B,EAC3B,KAAK,WAAW,EAChB,KAAK,sBAAsB,EAC3B,KAAK,kCAAkC,GACxC,MAAM,oCAAoC,CAAC;AAC5C,YAAY,EACV,mBAAmB,EACnB,kBAAkB,EAClB,eAAe,GAChB,MAAM,mBAAmB,CAAC"}
|
|
@@ -3,6 +3,7 @@ export type MediaControlsState = {
|
|
|
3
3
|
devices: CallMediaDevice[];
|
|
4
4
|
inputDeviceId: string;
|
|
5
5
|
outputDeviceId: string;
|
|
6
|
+
cameraDeviceId: string;
|
|
6
7
|
muted: boolean;
|
|
7
8
|
deafened: boolean;
|
|
8
9
|
cameraEnabled: boolean;
|
|
@@ -22,17 +23,21 @@ export declare class MediaControls {
|
|
|
22
23
|
subscribe: (listener: () => void) => () => boolean;
|
|
23
24
|
start(): Promise<void>;
|
|
24
25
|
stop(): void;
|
|
26
|
+
resetSession(): void;
|
|
25
27
|
refreshDevices(): Promise<void>;
|
|
26
28
|
selectInput(deviceId: string): Promise<void>;
|
|
27
29
|
selectOutput(deviceId: string): Promise<void>;
|
|
30
|
+
selectCamera(deviceId: string): Promise<void>;
|
|
28
31
|
toggleMuted(): Promise<void>;
|
|
29
32
|
toggleDeafened(): Promise<void>;
|
|
30
33
|
toggleCamera(): Promise<void>;
|
|
31
34
|
startScreenShare(sourceId: string, applicationAudio?: boolean): Promise<void>;
|
|
35
|
+
startCameraShare(deviceId: string): Promise<void>;
|
|
32
36
|
stopScreenShare(): Promise<void>;
|
|
33
37
|
setRemoteVolume(endpointId: string, value: number): void;
|
|
34
38
|
toggleRemoteMuted(endpointId: string): void;
|
|
35
39
|
private restore;
|
|
36
40
|
private set;
|
|
37
41
|
}
|
|
42
|
+
export declare function usableMediaDevices(devices: CallMediaDevice[]): CallMediaDevice[];
|
|
38
43
|
//# sourceMappingURL=media-controls.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-controls.d.ts","sourceRoot":"","sources":["../../src/calls/media-controls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AAExC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACjD,CAAC;AAEF,qBAAa,aAAa;
|
|
1
|
+
{"version":3,"file":"media-controls.d.ts","sourceRoot":"","sources":["../../src/calls/media-controls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,oBAAoB,EACrB,MAAM,gCAAgC,CAAC;AAExC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,eAAe,EAAE,CAAC;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACjD,CAAC;AAEF,qBAAa,aAAa;IAiBtB,QAAQ,CAAC,OAAO,EAAE,gBAAgB;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAjB/B,OAAO,CAAC,OAAO,CAUb;IACF,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,eAAe,CAA6B;IACpD,OAAO,CAAC,kBAAkB,CAAC,CAAa;IACxC,OAAO,CAAC,iBAAiB,CAAS;gBAEvB,OAAO,EAAE,gBAAgB,EACjB,WAAW,CAAC,EAAE,oBAAoB,YAAA;IAErD,IAAI,KAAK,uBAER;IACD,SAAS,GAAI,UAAU,MAAM,IAAI,mBAG/B;IACI,KAAK;IAQX,IAAI;IAWJ,YAAY;IASN,cAAc;IAiCd,WAAW,CAAC,QAAQ,EAAE,MAAM;IAK5B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAK7B,YAAY,CAAC,QAAQ,EAAE,MAAM;IAK7B,WAAW;IAcX,cAAc;IASd,YAAY;IAKZ,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,gBAAgB,UAAQ;IAI3D,gBAAgB,CAAC,QAAQ,EAAE,MAAM;IASjC,eAAe;IAIrB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IASjD,iBAAiB,CAAC,UAAU,EAAE,MAAM;YAOtB,OAAO;IA0BrB,OAAO,CAAC,GAAG;CAIZ;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,eAAe,EAAE,qBAoB5D"}
|
|
@@ -5,6 +5,7 @@ export class MediaControls {
|
|
|
5
5
|
devices: [],
|
|
6
6
|
inputDeviceId: "",
|
|
7
7
|
outputDeviceId: "",
|
|
8
|
+
cameraDeviceId: "",
|
|
8
9
|
muted: false,
|
|
9
10
|
deafened: false,
|
|
10
11
|
cameraEnabled: false,
|
|
@@ -30,7 +31,8 @@ export class MediaControls {
|
|
|
30
31
|
if (this.unsubscribeDevices)
|
|
31
32
|
return;
|
|
32
33
|
this.unsubscribeDevices = this.adapter.subscribeDevices(() => void this.refreshDevices());
|
|
33
|
-
await
|
|
34
|
+
await this.restore();
|
|
35
|
+
await this.refreshDevices();
|
|
34
36
|
}
|
|
35
37
|
stop() {
|
|
36
38
|
this.unsubscribeDevices?.();
|
|
@@ -43,15 +45,33 @@ export class MediaControls {
|
|
|
43
45
|
screenSharing: false,
|
|
44
46
|
});
|
|
45
47
|
}
|
|
48
|
+
resetSession() {
|
|
49
|
+
this.previousVolumes.clear();
|
|
50
|
+
this.set({
|
|
51
|
+
...this.current,
|
|
52
|
+
remoteVolumes: {},
|
|
53
|
+
cameraEnabled: false,
|
|
54
|
+
screenSharing: false,
|
|
55
|
+
});
|
|
56
|
+
}
|
|
46
57
|
async refreshDevices() {
|
|
47
|
-
const devices = await this.adapter.enumerateDevices().catch(() => []);
|
|
58
|
+
const devices = usableMediaDevices(await this.adapter.enumerateDevices().catch(() => []));
|
|
48
59
|
const inputDeviceId = available(devices, "audio-input", this.current.inputDeviceId)
|
|
49
60
|
? this.current.inputDeviceId
|
|
50
61
|
: "";
|
|
51
62
|
const outputDeviceId = available(devices, "audio-output", this.current.outputDeviceId)
|
|
52
63
|
? this.current.outputDeviceId
|
|
53
64
|
: "";
|
|
54
|
-
|
|
65
|
+
const cameraDeviceId = available(devices, "video-input", this.current.cameraDeviceId)
|
|
66
|
+
? this.current.cameraDeviceId
|
|
67
|
+
: "";
|
|
68
|
+
this.set({
|
|
69
|
+
...this.current,
|
|
70
|
+
devices,
|
|
71
|
+
inputDeviceId,
|
|
72
|
+
outputDeviceId,
|
|
73
|
+
cameraDeviceId,
|
|
74
|
+
});
|
|
55
75
|
}
|
|
56
76
|
async selectInput(deviceId) {
|
|
57
77
|
await this.adapter.selectInput(deviceId);
|
|
@@ -63,9 +83,20 @@ export class MediaControls {
|
|
|
63
83
|
this.set({ ...this.current, outputDeviceId: deviceId });
|
|
64
84
|
await this.preferences?.saveDevice("output", deviceId);
|
|
65
85
|
}
|
|
86
|
+
async selectCamera(deviceId) {
|
|
87
|
+
await this.adapter.selectCamera(deviceId);
|
|
88
|
+
this.set({ ...this.current, cameraDeviceId: deviceId });
|
|
89
|
+
await this.preferences?.saveDevice("camera", deviceId);
|
|
90
|
+
}
|
|
66
91
|
async toggleMuted() {
|
|
67
|
-
if (this.current.deafened)
|
|
92
|
+
if (this.current.deafened) {
|
|
93
|
+
this.mutedBeforeDeafen = false;
|
|
94
|
+
await this.adapter.setDeafened(false);
|
|
95
|
+
await this.adapter.setMuted(false);
|
|
96
|
+
this.set({ ...this.current, deafened: false, muted: false });
|
|
97
|
+
await this.preferences?.saveAudio(false, false);
|
|
68
98
|
return;
|
|
99
|
+
}
|
|
69
100
|
const muted = !this.current.muted;
|
|
70
101
|
await this.adapter.setMuted(muted);
|
|
71
102
|
this.set({ ...this.current, muted });
|
|
@@ -90,6 +121,15 @@ export class MediaControls {
|
|
|
90
121
|
await this.adapter.startScreenShare(sourceId, applicationAudio);
|
|
91
122
|
this.set({ ...this.current, screenSharing: true });
|
|
92
123
|
}
|
|
124
|
+
async startCameraShare(deviceId) {
|
|
125
|
+
await this.adapter.startCameraShare(deviceId);
|
|
126
|
+
this.set({
|
|
127
|
+
...this.current,
|
|
128
|
+
cameraDeviceId: deviceId,
|
|
129
|
+
screenSharing: true,
|
|
130
|
+
});
|
|
131
|
+
await this.preferences?.saveDevice("camera", deviceId);
|
|
132
|
+
}
|
|
93
133
|
async stopScreenShare() {
|
|
94
134
|
await this.adapter.stopScreenShare();
|
|
95
135
|
this.set({ ...this.current, screenSharing: false });
|
|
@@ -115,12 +155,24 @@ export class MediaControls {
|
|
|
115
155
|
this.mutedBeforeDeafen = saved.muted;
|
|
116
156
|
await this.adapter.setMuted(saved.muted || saved.deafened);
|
|
117
157
|
await this.adapter.setDeafened(saved.deafened);
|
|
158
|
+
await Promise.all([
|
|
159
|
+
saved.inputDeviceId
|
|
160
|
+
? this.adapter.selectInput(saved.inputDeviceId)
|
|
161
|
+
: undefined,
|
|
162
|
+
saved.outputDeviceId
|
|
163
|
+
? this.adapter.selectOutput(saved.outputDeviceId)
|
|
164
|
+
: undefined,
|
|
165
|
+
saved.cameraDeviceId
|
|
166
|
+
? this.adapter.selectCamera(saved.cameraDeviceId)
|
|
167
|
+
: undefined,
|
|
168
|
+
]);
|
|
118
169
|
this.set({
|
|
119
170
|
...this.current,
|
|
120
171
|
muted: saved.muted || saved.deafened,
|
|
121
172
|
deafened: saved.deafened,
|
|
122
173
|
inputDeviceId: saved.inputDeviceId,
|
|
123
174
|
outputDeviceId: saved.outputDeviceId,
|
|
175
|
+
cameraDeviceId: saved.cameraDeviceId ?? "",
|
|
124
176
|
});
|
|
125
177
|
}
|
|
126
178
|
set(state) {
|
|
@@ -128,6 +180,29 @@ export class MediaControls {
|
|
|
128
180
|
this.listeners.forEach((listener) => listener());
|
|
129
181
|
}
|
|
130
182
|
}
|
|
183
|
+
export function usableMediaDevices(devices) {
|
|
184
|
+
const seen = new Set();
|
|
185
|
+
return devices.filter((device) => {
|
|
186
|
+
const id = device.id.trim();
|
|
187
|
+
const label = normalizeLabel(device.label);
|
|
188
|
+
if (!id || ["default", "communications"].includes(id.toLowerCase()))
|
|
189
|
+
return false;
|
|
190
|
+
if (/\b(remote audio|remote desktop|rdp)\b/i.test(label))
|
|
191
|
+
return false;
|
|
192
|
+
if (device.kind === "audio-input" &&
|
|
193
|
+
/\b(loopback|monitor of|stereo mix|what u hear)\b/i.test(label))
|
|
194
|
+
return false;
|
|
195
|
+
const identity = device.groupId?.trim() || label || id;
|
|
196
|
+
const key = `${device.kind}:${identity.toLowerCase()}`;
|
|
197
|
+
if (seen.has(key))
|
|
198
|
+
return false;
|
|
199
|
+
seen.add(key);
|
|
200
|
+
return true;
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
function normalizeLabel(label) {
|
|
204
|
+
return label.trim().replace(/\s+/g, " ");
|
|
205
|
+
}
|
|
131
206
|
function available(devices, kind, id) {
|
|
132
207
|
return (!id || devices.some((device) => device.kind === kind && device.id === id));
|
|
133
208
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-controls.js","sourceRoot":"","sources":["../../src/calls/media-controls.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"media-controls.js","sourceRoot":"","sources":["../../src/calls/media-controls.ts"],"names":[],"mappings":"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"}
|
package/dist/calls/media.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ export declare class SidebandMedia {
|
|
|
23
23
|
join(endpoint: InstanceEndpoint, roomId: string, ticket: string, displayName: string, inputDeviceId?: string, muted?: boolean, deafened?: boolean, sessionId?: string): Promise<void>;
|
|
24
24
|
leave(expectedSessionId?: string, graceful?: boolean): Promise<boolean>;
|
|
25
25
|
setAudioState(muted: boolean, deafened: boolean): void;
|
|
26
|
-
setCameraEnabled(enabled: boolean, displayName: string): Promise<void>;
|
|
26
|
+
setCameraEnabled(enabled: boolean, displayName: string, deviceId?: string): Promise<void>;
|
|
27
27
|
selectAudioInput(deviceId: string, muted: boolean): Promise<void>;
|
|
28
28
|
private enableAudioDtx;
|
|
29
29
|
startScreenShare(sourceId: string, displayName: string, shareApplicationAudio?: boolean): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/calls/media.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAEV,mBAAmB,EACnB,cAAc,EAIf,MAAM,kBAAkB,CAAC;AAa1B,qBAAa,aAAa;IAwBtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAvB1B,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,mBAAmB,CAAC,CAA6B;IACzD,OAAO,CAAC,oBAAoB,CAAC,CAA6B;IAC1D,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,0BAA0B,CAAC,CAA6B;IAChE,OAAO,CAAC,uBAAuB,CAAC,CAAsB;IACtD,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,oBAAoB,CAA0C;IACtE,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,kBAAkB,CAGxB;IACF,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,SAAS,CAAiB;gBAGhC,SAAS,EAAE,cAAc,EACR,OAAO,EAAE,mBAAmB;IAKzC,IAAI,CACR,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,aAAa,SAAK,EAClB,KAAK,UAAQ,EACb,QAAQ,UAAQ,EAChB,SAAS,GAAE,MAA4B;
|
|
1
|
+
{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/calls/media.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAEV,mBAAmB,EACnB,cAAc,EAIf,MAAM,kBAAkB,CAAC;AAa1B,qBAAa,aAAa;IAwBtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAvB1B,OAAO,CAAC,QAAQ,CAAC,CAA2B;IAC5C,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,OAAO,CAAC,CAAU;IAC1B,OAAO,CAAC,WAAW,CAAC,CAAc;IAClC,OAAO,CAAC,mBAAmB,CAAC,CAA6B;IACzD,OAAO,CAAC,oBAAoB,CAAC,CAA6B;IAC1D,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,0BAA0B,CAAC,CAA6B;IAChE,OAAO,CAAC,uBAAuB,CAAC,CAAsB;IACtD,OAAO,CAAC,SAAS,CAAC,CAAS;IAC3B,OAAO,CAAC,SAAS,CAAqB;IACtC,OAAO,CAAC,kBAAkB,CAA6B;IACvD,OAAO,CAAC,oBAAoB,CAA0C;IACtE,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,kBAAkB,CAGxB;IACF,OAAO,CAAC,gBAAgB,CAAqB;IAC7C,OAAO,CAAC,SAAS,CAAiB;gBAGhC,SAAS,EAAE,cAAc,EACR,OAAO,EAAE,mBAAmB;IAKzC,IAAI,CACR,QAAQ,EAAE,gBAAgB,EAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,aAAa,SAAK,EAClB,KAAK,UAAQ,EACb,QAAQ,UAAQ,EAChB,SAAS,GAAE,MAA4B;IAgInC,KAAK,CAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,QAAQ,UAAQ;IAsDxD,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO;IA2BzC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,SAAK;IA6CrE,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;YA+BzC,cAAc;IAsBtB,gBAAgB,CACpB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,qBAAqB,UAAQ;IAkCzB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM;YAY9C,mBAAmB;YA0DnB,0BAA0B;IAsBlC,eAAe;YAyBP,6BAA6B;IAkB3C,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,0BAA0B;CAYnC"}
|
package/dist/calls/media.js
CHANGED
|
@@ -2,7 +2,7 @@ import { WebRTCEndpoint, } from "@fishjam-cloud/webrtc-client";
|
|
|
2
2
|
import { Socket } from "phoenix";
|
|
3
3
|
import { parseMediaServerIdentity } from "../transports/media-server-identity.js";
|
|
4
4
|
const SCREEN_SHARE_MAX_FRAMERATE = 30;
|
|
5
|
-
const SCREEN_SHARE_MAX_BANDWIDTH_KBPS =
|
|
5
|
+
const SCREEN_SHARE_MAX_BANDWIDTH_KBPS = 8_000;
|
|
6
6
|
export class SidebandMedia {
|
|
7
7
|
capture;
|
|
8
8
|
endpoint;
|
|
@@ -89,9 +89,6 @@ export class SidebandMedia {
|
|
|
89
89
|
this.endpoint.on("trackReady", (context) => {
|
|
90
90
|
if (!context.track)
|
|
91
91
|
return;
|
|
92
|
-
if (context.track.kind === "audio") {
|
|
93
|
-
context.track.enabled = !this.localEndpointState.deafened;
|
|
94
|
-
}
|
|
95
92
|
const stream = new MediaStream([context.track]);
|
|
96
93
|
this.callbacks.onRemoteStream(context.trackId, context.endpoint.id, stream, (context.metadata ?? {}));
|
|
97
94
|
});
|
|
@@ -194,10 +191,6 @@ export class SidebandMedia {
|
|
|
194
191
|
deafened,
|
|
195
192
|
};
|
|
196
193
|
this.endpoint?.updateEndpointMetadata(this.localEndpointState);
|
|
197
|
-
Object.values(this.endpoint?.getRemoteTracks() ?? {}).forEach((context) => {
|
|
198
|
-
if (context.track?.kind === "audio")
|
|
199
|
-
context.track.enabled = !deafened;
|
|
200
|
-
});
|
|
201
194
|
this.audioStateChange = this.audioStateChange
|
|
202
195
|
.then(async () => {
|
|
203
196
|
const track = this.localStream?.getAudioTracks()[0];
|
|
@@ -215,14 +208,14 @@ export class SidebandMedia {
|
|
|
215
208
|
: "Unable to update microphone state");
|
|
216
209
|
});
|
|
217
210
|
}
|
|
218
|
-
async setCameraEnabled(enabled, displayName) {
|
|
211
|
+
async setCameraEnabled(enabled, displayName, deviceId = "") {
|
|
219
212
|
if (!this.localStream || !this.endpoint)
|
|
220
213
|
throw new Error("Join a call before turning on your camera");
|
|
221
214
|
const currentTrack = this.localStream.getVideoTracks()[0];
|
|
222
215
|
if (enabled) {
|
|
223
216
|
if (currentTrack)
|
|
224
217
|
return;
|
|
225
|
-
const cameraCapture = await this.capture.captureCamera();
|
|
218
|
+
const cameraCapture = await this.capture.captureCamera(deviceId);
|
|
226
219
|
const stream = cameraCapture.stream;
|
|
227
220
|
const track = stream.getVideoTracks()[0];
|
|
228
221
|
if (!track) {
|
|
@@ -351,7 +344,7 @@ export class SidebandMedia {
|
|
|
351
344
|
throw new Error(`The selected ${sourceName} could not be captured`);
|
|
352
345
|
}
|
|
353
346
|
if (sourceName === "screen")
|
|
354
|
-
track.contentHint = "
|
|
347
|
+
track.contentHint = "detail";
|
|
355
348
|
this.screenStream = stream;
|
|
356
349
|
this.presentationCaptureCleanup = cleanup;
|
|
357
350
|
track.onended = () => {
|
|
@@ -395,7 +388,7 @@ export class SidebandMedia {
|
|
|
395
388
|
if (!sender)
|
|
396
389
|
return;
|
|
397
390
|
const parameters = sender.getParameters();
|
|
398
|
-
parameters.degradationPreference = "maintain-
|
|
391
|
+
parameters.degradationPreference = "maintain-resolution";
|
|
399
392
|
if (parameters.encodings.length === 0)
|
|
400
393
|
parameters.encodings = [{}];
|
|
401
394
|
parameters.encodings[0].maxFramerate = SCREEN_SHARE_MAX_FRAMERATE;
|