@observertc/observer-js 0.30.6-beta → 0.40.1-beta

package/lib/common/types.d.ts

@@ -1,60 +1,5 @@
 import { CallEventReport, CallMetaReport, ClientDataChannelReport, ClientExtensionReport, IceCandidatePairReport, InboundAudioTrackReport, InboundVideoTrackReport, ObserverEventReport, OutboundAudioTrackReport, OutboundVideoTrackReport, PeerConnectionTransportReport, SfuEventReport, SfuExtensionReport, SfuInboundRtpPadReport, SfuMetaReport, SfuOutboundRtpPadReport, SfuSctpStreamReport, SFUTransportReport } from '@observertc/report-schemas-js';
-import * as Models from '../models/Models';
-import { StorageProvider } from '../storages/StorageProvider';
-import { Message } from '@bufbuild/protobuf';
 export type MediaKind = 'audio' | 'video';
-export interface EvaluatorContext {
-    readonly startedCallIds: string[];
-    readonly endedCalls: (Omit<Models.Call, keyof Message> & {
-        ended: number;
-    })[];
-    readonly joinedClientIds: string[];
-    readonly detachedClients: (Omit<Models.Client, keyof Message> & {
-        detached: number;
-    })[];
-    readonly openedPeerConnectionIds: string[];
-    readonly closedPeerConnections: (Omit<Models.PeerConnection, keyof Message> & {
-        closed: number;
-    })[];
-    readonly addedInboundAudioTrackIds: string[];
-    readonly removedInboundAudioTracks: (Omit<Models.InboundTrack, keyof Message> & {
-        removed: number;
-    })[];
-    readonly addedInboundVideoTrackIds: string[];
-    readonly removedInboundVideoTracks: (Omit<Models.InboundTrack, keyof Message> & {
-        removed: number;
-    })[];
-    readonly addedOutboundAudioTrackIds: string[];
-    readonly removedOutboundAudioTracks: (Omit<Models.OutboundTrack, keyof Message> & {
-        removed: number;
-    })[];
-    readonly addedOutboundVideoTrackIds: string[];
-    readonly removedOutboundVideoTracks: (Omit<Models.OutboundTrack, keyof Message> & {
-        removed: number;
-    })[];
-    readonly joinedSfuIds: string[];
-    readonly detachedSfus: (Omit<Models.Sfu, keyof Message> & {
-        detached: number;
-    })[];
-    readonly openedSfuTransportIds: string[];
-    readonly closedSfuTransports: (Omit<Models.SfuTransport, keyof Message> & {
-        closed: number;
-    })[];
-    readonly addedSfuInbounRtpPadIds: string[];
-    readonly removedSfuInbounRtpPadIds: (Omit<Models.SfuInboundRtpPad, keyof Message> & {
-        removed: number;
-    })[];
-    readonly addedSfuOutbounRtpPadIds: string[];
-    readonly removedSfuOutbounRtpPadIds: (Omit<Models.SfuOutboundRtpPad, keyof Message> & {
-        removed: number;
-    })[];
-    readonly openedSfuSctpChannelIds: string[];
-    readonly closedSfuSctpChannels: (Omit<Models.SfuSctpChannel, keyof Message> & {
-        closed: number;
-    })[];
-    readonly storages: StorageProvider;
-    readonly reports: ObserverSinkContext;
-}
 export interface ObserverSinkContext {
     readonly callEventReports: CallEventReport[];
     readonly callMetaReports: CallMetaReport[];

package/lib/common/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,6BAA6B,EAC7B,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,EACb,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;AAE1C,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,GAAG;QACxD,KAAK,EAAE,MAAM,CAAC;KACd,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,eAAe,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,OAAO,CAAC,GAAG;QAC/D,QAAQ,EAAE,MAAM,CAAC;KACjB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,OAAO,CAAC,GAAG;QAC7E,MAAM,EAAE,MAAM,CAAC;KACf,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,yBAAyB,EAAE,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,GAAG;QAC/E,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,yBAAyB,EAAE,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,GAAG;QAC/E,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,0BAA0B,EAAE,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,GAAG;QACjF,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,0BAA0B,EAAE,MAAM,EAAE,CAAC;IAC9C,QAAQ,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,OAAO,CAAC,GAAG;QACjF,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,OAAO,CAAC,GAAG;QACzD,QAAQ,EAAE,MAAM,CAAC;KACjB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,qBAAqB,EAAE,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,OAAO,CAAC,GAAG;QACzE,MAAM,EAAE,MAAM,CAAC;KACf,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,yBAAyB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,OAAO,CAAC,GAAG;QACnF,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,wBAAwB,EAAE,MAAM,EAAE,CAAC;IAC5C,QAAQ,CAAC,0BAA0B,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,MAAM,OAAO,CAAC,GAAG;QACrF,OAAO,EAAE,MAAM,CAAC;KAChB,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,uBAAuB,EAAE,MAAM,EAAE,CAAC;IAC3C,QAAQ,CAAC,qBAAqB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,OAAO,CAAC,GAAG;QAC7E,MAAM,EAAE,MAAM,CAAC;KACf,CAAC,EAAE,CAAC;IAEL,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,CAAC;CAEtC;AAID,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,sBAAsB,EAAE,qBAAqB,EAAE,CAAC;IACzD,QAAQ,CAAC,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;IAC3D,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,8BAA8B,EAAE,6BAA6B,EAAE,CAAC;IACzE,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IACrD,QAAQ,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;IAC/D,QAAQ,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;IAC/D,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IACnD,QAAQ,CAAC,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;IAC3D,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IACrD,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IACnD,QAAQ,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;CACzC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,6BAA6B,EAC7B,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,EACb,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,EAClB,MAAM,+BAA+B,CAAC;AAEvC,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,OAAO,CAAC;AAI1C,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC;IAC7C,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,sBAAsB,EAAE,qBAAqB,EAAE,CAAC;IACzD,QAAQ,CAAC,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;IAC3D,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,8BAA8B,EAAE,6BAA6B,EAAE,CAAC;IACzE,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IACrD,QAAQ,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;IAC/D,QAAQ,CAAC,yBAAyB,EAAE,wBAAwB,EAAE,CAAC;IAC/D,QAAQ,CAAC,eAAe,EAAE,cAAc,EAAE,CAAC;IAC3C,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IACnD,QAAQ,CAAC,uBAAuB,EAAE,sBAAsB,EAAE,CAAC;IAC3D,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAC;IAC7D,QAAQ,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;IACrD,QAAQ,CAAC,mBAAmB,EAAE,kBAAkB,EAAE,CAAC;IACnD,QAAQ,CAAC,cAAc,EAAE,aAAa,EAAE,CAAC;CACzC"}

package/lib/index.d.ts

@@ -1,17 +1,15 @@
 export type { ObserverConfig, ObserverEvents } from './Observer';
 export { Observer } from './Observer';
-export type { ObserverStorage } from './storages/ObserverStorage';
-export type { StorageProvider } from './storages/StorageProvider';
 export * as SampleSchema from '@observertc/sample-schemas-js';
 export * as ReportSchema from '@observertc/report-schemas-js';
 export type { LogLevel, Logger } from './common/logger';
 export type { Samples, ClientSample, SfuSample, ExtensionStat, PeerConnectionTransport, IceCandidatePair, MediaSourceStat, MediaCodecStats, InboundAudioTrack, InboundVideoTrack, OutboundAudioTrack, OutboundVideoTrack, IceLocalCandidate, IceRemoteCandidate, CustomCallEvent, SfuTransport, SfuInboundRtpPad, SfuOutboundRtpPad, SfuSctpChannel, SfuExtensionStats, DataChannel, } from '@observertc/sample-schemas-js';
 export type { CallEventReport, CallMetaReport, ClientDataChannelReport, ClientExtensionReport, IceCandidatePairReport, InboundAudioTrackReport, InboundVideoTrackReport, ObserverEventReport, OutboundAudioTrackReport, OutboundVideoTrackReport, PeerConnectionTransportReport, SfuEventReport, SfuExtensionReport, SfuInboundRtpPadReport, SfuMetaReport, SfuOutboundRtpPadReport, SfuSctpStreamReport, SFUTransportReport, } from '@observertc/report-schemas-js';
-export type { ObservedClient, ObservedClientConfig } from './ObservedClient';
-export type { ObservedPeerConnection, ObservedPeerConnectionConfig, ObservedPeerConnectionEvents } from './ObservedPeerConnection';
-export type { ObservedInboundTrack, ObservedInboundTrackConfig, ObservedInboundTrackEvents } from './ObservedInboundTrack';
-export type { ObservedOutboundTrack, ObservedOutboundTrackConfig, ObservedOutboundTrackEvents } from './ObservedOutboundTrack';
-export type { EvaluatorContext, ObserverSinkContext } from './common/types';
+export type { ObservedClient, ObservedClientModel } from './ObservedClient';
+export type { ObservedPeerConnection, ObservedPeerConnectionModel, ObservedPeerConnectionEvents } from './ObservedPeerConnection';
+export type { ObservedInboundTrack, ObservedInboundTrackModel, ObservedInboundTrackEvents } from './ObservedInboundTrack';
+export type { ObservedOutboundTrack, ObservedOutboundTrackModel, ObservedOutboundTrackEvents } from './ObservedOutboundTrack';
+export type { ObserverSinkContext } from './common/types';
 import { Observer, ObserverConfig } from './Observer';
 export declare function createObserver(config?: Partial<ObserverConfig>): Observer;
 import { LogLevel, Logger } from './common/logger';

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAClE,YAAY,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAElE,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAE9D,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAExD,YAAY,EACX,OAAO,EACP,YAAY,EACZ,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,WAAW,GACX,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EACX,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,6BAA6B,EAC7B,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,EACb,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,GAClB,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7E,YAAY,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACnI,YAAY,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC3H,YAAY,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE/H,YAAY,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACtD,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,YAE9D;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AAC/E,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAG3D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAC9D,OAAO,KAAK,YAAY,MAAM,+BAA+B,CAAC;AAE9D,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAExD,YAAY,EACX,OAAO,EACP,YAAY,EACZ,SAAS,EACT,aAAa,EACb,uBAAuB,EACvB,gBAAgB,EAChB,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,EACf,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,WAAW,GACX,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EACX,eAAe,EACf,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,mBAAmB,EACnB,wBAAwB,EACxB,wBAAwB,EACxB,6BAA6B,EAC7B,cAAc,EACd,kBAAkB,EAClB,sBAAsB,EACtB,aAAa,EACb,uBAAuB,EACvB,mBAAmB,EACnB,kBAAkB,GAClB,MAAM,+BAA+B,CAAC;AAEvC,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC5E,YAAY,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AAClI,YAAY,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,0BAA0B,EAAE,MAAM,wBAAwB,CAAC;AAC1H,YAAY,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAE9H,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACtD,wBAAgB,cAAc,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,YAE9D;AAED,OAAO,EAAE,QAAQ,EAAE,MAAM,EAA8B,MAAM,iBAAiB,CAAC;AAC/E,wBAAgB,SAAS,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAG3D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@observertc/observer-js",
-  "version": "0.30.6-beta",
+  "version": "0.40.1-beta",
   "description": "Server Side NodeJS Library for processing ObserveRTC Samples",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/ObservedCall.ts

@@ -1,16 +1,14 @@
 import { EventEmitter } from 'events';
-import * as Models from './models/Models';
-import { ObservedClient, ObservedClientConfig } from './ObservedClient';
-import { createSingleExecutor } from './common/SingleExecutor';
+import { ObservedClient, ObservedClientModel } from './ObservedClient';
 import { ObservedOutboundTrack } from './ObservedOutboundTrack';
 import { Observer } from './Observer';
+import { createClientJoinedEventReport } from './common/callEventReports';
 
-export type ObservedCallConfig<AppData extends Record<string, unknown> = Record<string, unknown>> = {
+export type ObservedCallModel = {
 	serviceId: string;
 	roomId: string;
 	callId: string;
 	started: number,
-	appData: AppData,
 };
 
 export type ObservedCallEvents = {
@@ -27,36 +25,6 @@ export declare interface ObservedCall {
 }
 
 export class ObservedCall<AppData extends Record<string, unknown> = Record<string, unknown>> extends EventEmitter {
-	public static async create<T extends Record<string, unknown> = Record<string, unknown>>(
-		config: ObservedCallConfig<T>, 
-		observer: Observer,
-		// storageProvider: StorageProvider,
-		// reportsCollector: ReportsCollector,
-	) {
-		const model = new Models.Call({
-			roomId: config.roomId,
-			serviceId: config.serviceId,
-			callId: config.callId,
-			clientIds: [],
-			started: BigInt(config.started ?? Date.now()),
-		});
-		const result = new ObservedCall(
-			model,
-			observer,
-			// storageProvider, 
-			// reportsCollector, 
-			config.appData,
-		);
-
-		const alreadyInserted = await observer.storage.callStorage.insert(config.callId, model);
-
-		if (alreadyInserted) throw new Error(`Call with id ${config.callId} already exists`);
-
-		return result;
-	}
-
-	private readonly _execute = createSingleExecutor();
-	private readonly _creatingClients = new Map<string, Promise<ObservedClient>>();
 	private readonly _clients = new Map<string, ObservedClient>();
 	
 	public readonly sfuStreamIdToOutboundAudioTrack = new Map<string | number, ObservedOutboundTrack<'audio'>>();
@@ -64,8 +32,8 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 	private _closed = false;
 	private _ended?: number;
 
-	private constructor(
-		private readonly _model: Models.Call,
+	public constructor(
+		private readonly _model: ObservedCallModel,
 		public readonly observer: Observer,
 		public readonly appData: AppData,
 	) {
@@ -113,63 +81,35 @@ export class ObservedCall<AppData extends Record<string, unknown> = Record<strin
 		this._ended = timestamp ?? Date.now();
 
 		Array.from(this._clients.values()).forEach((client) => client.close());
-
-		this._execute(() => this.observer.storage.callStorage.remove(this.callId))
-			.catch(() => void 0)
-			.finally(() => this.emit('close'));
-	}
-
-	public async createClient<ClientAppData extends Record<string, unknown> = Record<string, unknown>>(
-		clientId: string, 
-		config: { mediaUnitId?: string, appData: ClientAppData, joined?: number }
-	): Promise<ObservedClient<ClientAppData>> {
-		if (this._closed) throw new Error(`Call ${this.callId} is closed`);
-		let creating = this._creatingClients.get(clientId);
-
-		if (creating) return creating as Promise<ObservedClient<ClientAppData>>;
-		
-		creating = this._createObservedClient<ClientAppData>(clientId, {
-			callId: this.callId,
-			appData: config.appData,
-			clientId,
-			overflowingProcessingThreshold: 2,
-			mediaUnitId: config.mediaUnitId ?? this.observer.config.defaultMediaUnitId,
-			joined: config.joined,
-		}).finally(() => this._creatingClients.delete(clientId));
-
-		this._creatingClients.set(clientId, creating);
 		
-		return creating as Promise<ObservedClient<ClientAppData>>;
+		this.emit('close');
 	}
 
-	public async save() {
+	public createClient<ClientAppData extends Record<string, unknown> = Record<string, unknown>>(config: ObservedClientModel & { appData: ClientAppData, generateClientJoinedReport?: boolean, joined?: number }) {
 		if (this._closed) throw new Error(`Call ${this.callId} is closed`);
-		
-		return this._execute(async () => {
-			if (this._closed) throw new Error(`Call ${this.callId} is closed`);
-			await this.observer.storage.callStorage.set(this.callId, this._model);
-		});		
-	}
-
-	private async _createObservedClient<ClientAppData extends Record<string, unknown> = Record<string, unknown>>(clientId: string, config: ObservedClientConfig<ClientAppData>): Promise<ObservedClient> {
-		const client = await ObservedClient.create<ClientAppData>(config, this, this.observer.storage);
-		const onUpdate = () => this.emit('update');
 
-		await this.save();
-
-		client.once('close', () => {
-			client.off('update', onUpdate);
-
-			this._clients.delete(clientId);
-			this._model.clientIds = this._model.clientIds.filter((id) => id !== clientId);
-			this.save().catch(() => void 0);
+		const { appData, generateClientJoinedReport, joined = Date.now(), ...model } = config;
+		
+		const result = new ObservedClient(model, this, appData);
 
+		result.once('close', () => {
+			this._clients.delete(result.clientId);
 		});
+		this._clients.set(result.clientId, result);
+
+		if (generateClientJoinedReport) {
+			this.reports.addCallEventReport(createClientJoinedEventReport(
+				this.serviceId,
+				result.mediaUnitId,
+				this.roomId,
+				this.callId,
+				result.clientId,
+				joined,
+				result.userId,
+				result.marker,
+			));
+		}
 		
-		client.on('update', onUpdate);
-		this._clients.set(clientId, client);
-		this._model.clientIds.push(clientId);
-		
-		return client;
+		return result;
 	}
 }