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

package/lib/ObservedPeerConnection.js

@@ -1,65 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservedPeerConnection = void 0;
 const events_1 = require("events");
-const Models = __importStar(require("./models/Models"));
 const ObservedInboundTrack_1 = require("./ObservedInboundTrack");
 const ObservedOutboundTrack_1 = require("./ObservedOutboundTrack");
-const SingleExecutor_1 = require("./common/SingleExecutor");
 const ObservedICE_1 = require("./ObservedICE");
+const ObservedDataChannel_1 = require("./ObservedDataChannel");
 class ObservedPeerConnection extends events_1.EventEmitter {
-    static create(config, client, storageProvider) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const model = new Models.PeerConnection({
-                roomId: client.roomId,
-                serviceId: client.serviceId,
-                callId: client.callId,
-                clientId: client.clientId,
-                peerConnectionId: config.peerConnectionId,
-            });
-            const alreadyInserted = yield storageProvider.peerConnectionStorage.insert(config.peerConnectionId, model);
-            if (alreadyInserted)
-                throw new Error(`PeerConnection with id ${config.peerConnectionId} already exists`);
-            return new ObservedPeerConnection(model, client, storageProvider);
-        });
-    }
-    constructor(_model, client, _storageProvider) {
+    constructor(_model, client) {
         super();
         this._model = _model;
         this.client = client;
-        this._storageProvider = _storageProvider;
         this.created = Date.now();
         this.totalInboundPacketsLost = 0;
         this.totalInboundPacketsReceived = 0;
@@ -98,11 +49,29 @@ class ObservedPeerConnection extends events_1.EventEmitter {
         this._inboundVideoTracks = new Map();
         this._outboundAudioTracks = new Map();
         this._outboundVideoTracks = new Map();
-        this._execute = (0, SingleExecutor_1.createSingleExecutor)();
+        this._dataChannels = new Map();
+    }
+    get serviceId() {
+        return this.client.serviceId;
+    }
+    get roomId() {
+        return this.client.roomId;
+    }
+    get callId() {
+        return this.client.callId;
+    }
+    get clientId() {
+        return this.client.clientId;
+    }
+    get mediaUnitId() {
+        return this.client.mediaUnitId;
     }
     get label() {
         return this._model.label;
     }
+    set label(value) {
+        this._model.label = value;
+    }
     get usingTURN() {
         var _a, _b;
         return ((_b = (_a = this.ICE.selectedRemoteCandidate) === null || _a === void 0 ? void 0 : _a.candidateType) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'relay';
@@ -140,6 +109,9 @@ class ObservedPeerConnection extends events_1.EventEmitter {
     get outboundVideoTracks() {
         return this._outboundVideoTracks;
     }
+    get dataChannels() {
+        return this._dataChannels;
+    }
     get uptimeInMs() {
         return this._updated - this.created;
     }
@@ -154,9 +126,7 @@ class ObservedPeerConnection extends events_1.EventEmitter {
         Array.from(this._inboundVideoTracks.values()).forEach((track) => track.close());
         Array.from(this._outboundAudioTracks.values()).forEach((track) => track.close());
         Array.from(this._outboundVideoTracks.values()).forEach((track) => track.close());
-        this._execute(() => this._storageProvider.peerConnectionStorage.remove(this.peerConnectionId))
-            .catch(() => void 0)
-            .finally(() => this.emit('close'));
+        this.emit('close');
     }
     getTrack(trackId) {
         var _a, _b, _c;
@@ -245,6 +215,12 @@ class ObservedPeerConnection extends events_1.EventEmitter {
             this.totalSentVideoPackets += track.totalSentPackets;
             sumRttInMs = ((_a = track.rttInMs) !== null && _a !== void 0 ? _a : 0);
         });
+        this._dataChannels.forEach((channel) => {
+            this.deltaDataChannelBytesSent += channel.deltaBytesSent;
+            this.deltaDataChannelBytesReceived += channel.deltaBytesReceived;
+            this.totalDataChannelBytesSent += channel.totalBytesSent;
+            this.totalDataChannelBytesReceived += channel.totalBytesReceived;
+        });
         const iceRttInMs = (_a = this.ICE.stats) === null || _a === void 0 ? void 0 : _a.currentRoundTripTime;
         let nrOfBelongings = this._inboundAudioTracks.size + this._inboundVideoTracks.size + this._outboundAudioTracks.size + this._outboundVideoTracks.size;
         if (iceRttInMs) {
@@ -254,136 +230,74 @@ class ObservedPeerConnection extends events_1.EventEmitter {
         this.avgRttInMs = 0 < nrOfBelongings ? sumRttInMs / nrOfBelongings : undefined;
     }
     update(sample, timestamp) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                return;
-            if (sample.peerConnectionId !== this._model.peerConnectionId)
-                throw new Error(`TransportId mismatch. PeerConnectionId: ${this._model.peerConnectionId} TransportId: ${sample.transportId}`);
-            this._sample = sample;
-            if (this._model.label !== sample.label) {
-                this._model.label = sample.label;
-                yield this._save().catch(() => void 0);
-            }
-            const report = Object.assign(Object.assign({ serviceId: this.client.call.serviceId, roomId: this.client.call.roomId, callId: this.client.call.callId, clientId: this.client.clientId, userId: this.client.userId, mediaUnitId: this.client.mediaUnitId }, sample), { timestamp, sampleSeq: -1 });
-            this.reports.addPeerConnectionTransportReports(report);
-            this._updated = timestamp;
-            this.emit('update');
-        });
+        if (this._closed)
+            return;
+        if (sample.peerConnectionId !== this._model.peerConnectionId)
+            throw new Error(`TransportId mismatch. PeerConnectionId: ${this._model.peerConnectionId} TransportId: ${sample.transportId}`);
+        this._sample = sample;
+        if (this._model.label !== sample.label) {
+            this._model.label = sample.label;
+        }
+        const report = Object.assign(Object.assign({ serviceId: this.client.call.serviceId, roomId: this.client.call.roomId, callId: this.client.call.callId, clientId: this.client.clientId, userId: this.client.userId, mediaUnitId: this.client.mediaUnitId }, sample), { timestamp, sampleSeq: -1 });
+        this.reports.addPeerConnectionTransportReports(report);
+        this._updated = Date.now();
+        this.emit('update');
     }
     createInboundAudioTrack(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
-            const result = yield ObservedInboundTrack_1.ObservedInboundTrack.create({
-                kind: 'audio',
-                trackId: config.trackId,
-            }, this, this._storageProvider);
-            const pendingTracksTimestamp = this.client.ωpendingCreatedTracksTimestamp.get(result.trackId);
-            if (pendingTracksTimestamp) {
-                this.client.ωpendingCreatedTracksTimestamp.delete(result.trackId);
-                result.created = pendingTracksTimestamp;
-            }
-            result.on('close', () => {
-                this._inboundAudioTracks.delete(result.trackId);
-                this._model.inboundTrackIds = this._model.inboundTrackIds.filter((id) => id !== result.trackId);
-                !this._closed && this._save().catch(() => void 0);
-            });
-            this._inboundAudioTracks.set(result.trackId, result);
-            this._model.inboundTrackIds = [...(new Set([...this._model.inboundTrackIds, result.trackId]))];
-            yield this._save();
-            this.emit('newinboudaudiotrack', result);
-            return result;
+        if (this._closed)
+            throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+        const result = new ObservedInboundTrack_1.ObservedInboundTrack(Object.assign({ kind: 'audio' }, config), this);
+        result.on('close', () => {
+            this._inboundAudioTracks.delete(result.trackId);
         });
+        this._inboundAudioTracks.set(result.trackId, result);
+        this.emit('newinboudaudiotrack', result);
+        return result;
     }
     createInboundVideoTrack(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
-            const result = yield ObservedInboundTrack_1.ObservedInboundTrack.create({
-                kind: 'video',
-                trackId: config.trackId,
-            }, this, this._storageProvider);
-            const pendingTracksTimestamp = this.client.ωpendingCreatedTracksTimestamp.get(result.trackId);
-            if (pendingTracksTimestamp) {
-                this.client.ωpendingCreatedTracksTimestamp.delete(result.trackId);
-                result.created = pendingTracksTimestamp;
-            }
-            result.on('close', () => {
-                this._inboundVideoTracks.delete(result.trackId);
-                this._model.inboundTrackIds = this._model.inboundTrackIds.filter((id) => id !== result.trackId);
-                !this._closed && this._save().catch(() => void 0);
-            });
-            this._inboundVideoTracks.set(result.trackId, result);
-            this._model.inboundTrackIds = [...(new Set([...this._model.inboundTrackIds, result.trackId]))];
-            yield this._save();
-            this.emit('newinboudvideotrack', result);
-            return result;
+        if (this._closed)
+            throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+        const result = new ObservedInboundTrack_1.ObservedInboundTrack(Object.assign({ kind: 'video' }, config), this);
+        result.on('close', () => {
+            this._inboundVideoTracks.delete(result.trackId);
         });
+        this._inboundVideoTracks.set(result.trackId, result);
+        this.emit('newinboudvideotrack', result);
+        return result;
     }
     createOutboundAudioTrack(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
-            const result = yield ObservedOutboundTrack_1.ObservedOutboundTrack.create({
-                kind: 'audio',
-                trackId: config.trackId,
-            }, this, this._storageProvider);
-            const pendingTracksTimestamp = this.client.ωpendingCreatedTracksTimestamp.get(result.trackId);
-            if (pendingTracksTimestamp) {
-                this.client.ωpendingCreatedTracksTimestamp.delete(result.trackId);
-                result.created = pendingTracksTimestamp;
-            }
-            result.on('close', () => {
-                this._outboundAudioTracks.delete(result.trackId);
-                this._model.outboundTrackIds = this._model.outboundTrackIds.filter((id) => id !== result.trackId);
-                result.sfuStreamId && this.client.call.sfuStreamIdToOutboundAudioTrack.delete(result.sfuStreamId);
-                !this._closed && this._save().catch(() => void 0);
-            });
-            this._outboundAudioTracks.set(result.trackId, result);
-            this._model.outboundTrackIds = [...(new Set([...this._model.outboundTrackIds, result.trackId]))];
-            result.sfuStreamId && this.client.call.sfuStreamIdToOutboundAudioTrack.set(result.sfuStreamId, result);
-            yield this._save();
-            this.emit('newoutboundaudiotrack', result);
-            return result;
+        if (this._closed)
+            throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+        const result = new ObservedOutboundTrack_1.ObservedOutboundTrack(Object.assign({ kind: 'audio' }, config), this);
+        result.on('close', () => {
+            this._outboundAudioTracks.delete(result.trackId);
         });
+        this._outboundAudioTracks.set(result.trackId, result);
+        this.emit('newoutboundaudiotrack', result);
+        return result;
     }
     createOutboundVideoTrack(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
-            const result = yield ObservedOutboundTrack_1.ObservedOutboundTrack.create({
-                kind: 'video',
-                trackId: config.trackId,
-            }, this, this._storageProvider);
-            const pendingTracksTimestamp = this.client.ωpendingCreatedTracksTimestamp.get(result.trackId);
-            if (pendingTracksTimestamp) {
-                this.client.ωpendingCreatedTracksTimestamp.delete(result.trackId);
-                result.created = pendingTracksTimestamp;
-            }
-            result.on('close', () => {
-                this._outboundVideoTracks.delete(result.trackId);
-                result.sfuStreamId && this.client.call.sfuStreamIdToOutboundVideoTrack.set(result.sfuStreamId, result);
-                this._model.outboundTrackIds = this._model.outboundTrackIds.filter((id) => id !== result.trackId);
-                !this._closed && this._save().catch(() => void 0);
-            });
-            this._outboundVideoTracks.set(result.trackId, result);
-            result.sfuStreamId && this.client.call.sfuStreamIdToOutboundVideoTrack.set(result.sfuStreamId, result);
-            this._model.outboundTrackIds = [...(new Set([...this._model.outboundTrackIds, result.trackId]))];
-            yield this._save();
-            this.emit('newoutboundvideotrack', result);
-            return result;
+        if (this._closed)
+            throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+        const result = new ObservedOutboundTrack_1.ObservedOutboundTrack(Object.assign({ kind: 'video' }, config), this);
+        result.on('close', () => {
+            this._outboundVideoTracks.delete(result.trackId);
         });
+        this._outboundVideoTracks.set(result.trackId, result);
+        this.emit('newoutboundvideotrack', result);
+        return result;
     }
-    _save() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
-            return this._execute(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._closed)
-                    throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
-                yield this._storageProvider.peerConnectionStorage.set(this.peerConnectionId, this._model);
-            }));
+    createDataChannel(channelId) {
+        if (this._closed)
+            throw new Error(`PeerConnection ${this.peerConnectionId} is closed`);
+        const result = new ObservedDataChannel_1.ObservedDataChannel({
+            channelId,
+        }, this);
+        result.on('close', () => {
+            this._dataChannels.delete(result.channelId);
         });
+        this._dataChannels.set(result.channelId, result);
+        return result;
     }
 }
 exports.ObservedPeerConnection = ObservedPeerConnection;

package/lib/ObservedSfu.d.ts

@@ -2,11 +2,10 @@
 import { EventEmitter } from 'events';
 import { Observer } from './Observer';
 import { SfuSample } from '@observertc/sample-schemas-js';
-export type ObservedSfuConfig<AppData extends Record<string, unknown> = Record<string, unknown>> = {
+export type ObservedSfuModel = {
     serviceId: string;
     sfuId: string;
     joined?: number;
-    appData: AppData;
 };
 export type ObservedSfuEvents = {
     update: [];
@@ -22,17 +21,16 @@ export declare class ObservedSfu<AppData extends Record<string, unknown> = Recor
     private readonly _model;
     readonly observer: Observer;
     readonly appData: AppData;
-    static create<T extends Record<string, unknown> = Record<string, unknown>>(config: ObservedSfuConfig<T>, observer: Observer): Promise<ObservedSfu<T>>;
+    readonly created: number;
     private _updated;
-    private readonly _execute;
     private _closed;
-    private constructor();
+    constructor(_model: ObservedSfuModel, observer: Observer, appData: AppData);
     get serviceId(): string;
     get sfuId(): string;
     get joined(): number;
+    get updated(): number;
     get closed(): boolean;
     close(): void;
-    update(sample: SfuSample): Promise<void>;
-    private _save;
+    update(sample: SfuSample): void;
 }
 //# sourceMappingURL=ObservedSfu.d.ts.map

package/lib/ObservedSfu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservedSfu.d.ts","sourceRoot":"","sources":["../src/ObservedSfu.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,MAAM,iBAAiB,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI;IAClG,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,EAAE,CAAC;IACX,KAAK,EAAE,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,WAAW;IACnC,EAAE,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACzG,GAAG,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAC1F;AAED,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,YAAY;IA8B9G,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,QAAQ,EAAE,QAAQ;aAClB,OAAO,EAAE,OAAO;WA/Bb,MAAM,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrF,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,QAAQ;IAsBnB,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0B;IACnD,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO;IAQP,IAAW,SAAS,WAGnB;IAED,IAAW,KAAK,WAGf;IAED,IAAW,MAAM,WAGhB;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IAMC,MAAM,CAAC,MAAM,EAAE,SAAS;YAWvB,KAAK;CASnB"}
+{"version":3,"file":"ObservedSfu.d.ts","sourceRoot":"","sources":["../src/ObservedSfu.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,MAAM,gBAAgB,GAAE;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC/B,MAAM,EAAE,EAAE,CAAC;IACX,KAAK,EAAE,EAAE,CAAC;CACV,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,WAAW;IACnC,EAAE,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACzG,GAAG,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC1G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC3G,IAAI,CAAC,CAAC,SAAS,MAAM,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAC1F;AAED,qBAAa,WAAW,CAAC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAE,SAAQ,YAAY;IAO9G,OAAO,CAAC,QAAQ,CAAC,MAAM;aACP,QAAQ,EAAE,QAAQ;aAClB,OAAO,EAAE,OAAO;IARjC,SAAgB,OAAO,SAAc;IAErC,OAAO,CAAC,QAAQ,CAAc;IAC9B,OAAO,CAAC,OAAO,CAAS;gBAGN,MAAM,EAAE,gBAAgB,EACzB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO;IAKjC,IAAW,SAAS,WAGnB;IAED,IAAW,KAAK,WAGf;IAED,IAAW,MAAM,WAGhB;IAED,IAAW,OAAO,WAEjB;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IAML,MAAM,CAAC,MAAM,EAAE,SAAS;CAO/B"}

package/lib/ObservedSfu.js

@@ -1,65 +1,15 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservedSfu = void 0;
 const events_1 = require("events");
-const Models = __importStar(require("./models/Models"));
-const SingleExecutor_1 = require("./common/SingleExecutor");
 class ObservedSfu extends events_1.EventEmitter {
-    static create(config, observer) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const model = new Models.Sfu({
-                serviceId: config.serviceId,
-                sfuId: config.sfuId,
-                sfuTransportIds: [],
-                joined: BigInt((_a = config.joined) !== null && _a !== void 0 ? _a : Date.now()),
-            });
-            const result = new ObservedSfu(model, observer, config.appData);
-            const alreadyInserted = yield observer.storage.sfuStorage.insert(config.sfuId, model);
-            if (alreadyInserted)
-                throw new Error(`Sfu with id ${config.sfuId} already exists`);
-            return result;
-        });
-    }
     constructor(_model, observer, appData) {
         super();
         this._model = _model;
         this.observer = observer;
         this.appData = appData;
+        this.created = Date.now();
         this._updated = Date.now();
-        this._execute = (0, SingleExecutor_1.createSingleExecutor)();
         this._closed = false;
     }
     get serviceId() {
@@ -74,6 +24,9 @@ class ObservedSfu extends events_1.EventEmitter {
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return Number(this._model.joined);
     }
+    get updated() {
+        return this._updated;
+    }
     get closed() {
         return this._closed;
     }
@@ -84,29 +37,12 @@ class ObservedSfu extends events_1.EventEmitter {
         this.emit('close');
     }
     update(sample) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`Sfu ${this.sfuId} is closed`);
-            if (sample.sfuId !== this.sfuId)
-                throw new Error(`Sfu ${this.sfuId} is not the same as sample.sfuId`);
-            return this._execute(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._closed)
-                    throw new Error(`Sfu ${this.sfuId} is closed`);
-                yield this._save();
-                this.emit('update');
-            }));
-        });
-    }
-    _save() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed)
-                throw new Error(`Sfu ${this.sfuId} is closed`);
-            return this._execute(() => __awaiter(this, void 0, void 0, function* () {
-                if (this._closed)
-                    throw new Error(`Sfu ${this.sfuId} is closed`);
-                yield this.observer.storage.sfuStorage.set(this.sfuId, this._model);
-            }));
-        });
+        if (this._closed)
+            throw new Error(`Sfu ${this.sfuId} is closed`);
+        if (sample.sfuId !== this.sfuId)
+            throw new Error(`Sfu ${this.sfuId} is not the same as sample.sfuId`);
+        this._updated = Date.now();
+        this.emit('update');
     }
 }
 exports.ObservedSfu = ObservedSfu;

package/lib/Observer.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="node" />
-import { StorageProvider } from './storages/StorageProvider';
-import { ObservedCall, ObservedCallConfig } from './ObservedCall';
+import { ObservedCall, ObservedCallModel } from './ObservedCall';
 import { ReportsCollector } from './ReportsCollector';
 import { EventEmitter } from 'events';
 import { PartialBy } from './common/utils';
@@ -26,7 +25,6 @@ export type ObserverConfig = {
     maxReports?: number | undefined;
     maxCollectingTimeInMs?: number | undefined;
     maxEntryIdleTimeInMs?: number | undefined;
-    storages?: StorageProvider;
 };
 export declare interface Observer {
     on<U extends keyof ObserverEvents>(event: U, listener: (...args: ObserverEvents[U]) => void): this;
@@ -36,14 +34,15 @@ export declare interface Observer {
 }
 export declare class Observer extends EventEmitter {
     readonly config: ObserverConfig;
-    readonly storage: StorageProvider;
     static create(providedConfig: Partial<ObserverConfig>): Observer;
     readonly reports: ReportsCollector;
     private readonly _observedCalls;
     private _reportTimer?;
     private _closed;
-    constructor(config: ObserverConfig, storage: StorageProvider);
-    createObservedCall<T extends Record<string, unknown> = Record<string, unknown>>(config: PartialBy<ObservedCallConfig<T>, 'serviceId' | 'started'>): Promise<ObservedCall<T>>;
+    constructor(config: ObserverConfig);
+    createObservedCall<T extends Record<string, unknown> = Record<string, unknown>>(config: PartialBy<ObservedCallModel, 'serviceId' | 'started'> & {
+        appData: T;
+    }): ObservedCall<T>;
     get observedCalls(): ReadonlyMap<string, ObservedCall>;
     get closed(): boolean;
     close(): void;

package/lib/Observer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,eAAe,EAA+B,MAAM,4BAA4B,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,MAAM,MAAM,cAAc,GAAG;IAC5B,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;IAE1B,OAAO,EAAE,EAAE,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAE5B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3C,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE1C,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC3B,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,QAAQ;IAChC,EAAE,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACnG,GAAG,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACpG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACrG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACpF;AAED,qBAAa,QAAS,SAAQ,YAAY;aA0BxB,MAAM,EAAE,cAAc;aACtB,OAAO,EAAE,eAAe;WA1B3B,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,QAAQ;IAoBvE,SAAgB,OAAO,mBAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,YAAY,CAAC,CAAgC;IACrD,OAAO,CAAC,OAAO,CAAS;gBAEP,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,eAAe;IAiB5B,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1F,MAAM,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC,GAC/D,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAqC3B,IAAW,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAE5D;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IASZ,OAAO,CAAC,YAAY;CAepB"}
+{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,MAAM,MAAM,cAAc,GAAG;IAC5B,SAAS,EAAE,CAAC,YAAY,CAAC,CAAC;IAE1B,OAAO,EAAE,EAAE,CAAC;CACZ,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAE5B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAE3C,oBAAoB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C,CAAC;AAEF,MAAM,CAAC,OAAO,WAAW,QAAQ;IAChC,EAAE,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACnG,GAAG,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACpG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IACrG,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CACpF;AAED,qBAAa,QAAS,SAAQ,YAAY;aAwBxB,MAAM,EAAE,cAAc;WAvBzB,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,QAAQ;IAkBvE,SAAgB,OAAO,mBAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAmC;IAClE,OAAO,CAAC,YAAY,CAAC,CAAgC;IACrD,OAAO,CAAC,OAAO,CAAS;gBAEP,MAAM,EAAE,cAAc;IAiBhC,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACpF,MAAM,EAAE,SAAS,CAAC,iBAAiB,EAAE,WAAW,GAAG,SAAS,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC,CAAA;KAAE,GAC5E,YAAY,CAAC,CAAC,CAAC;IAsClB,IAAW,aAAa,IAAI,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,CAE5D;IAED,IAAW,MAAM,YAEhB;IAEM,KAAK;IASZ,OAAO,CAAC,YAAY;CAepB"}

package/lib/Observer.js

@@ -1,17 +1,18 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Observer = void 0;
 const logger_1 = require("./common/logger");
-const StorageProvider_1 = require("./storages/StorageProvider");
 const ObservedCall_1 = require("./ObservedCall");
 const ReportsCollector_1 = require("./ReportsCollector");
 const events_1 = require("events");
@@ -19,7 +20,6 @@ const callEventReports_1 = require("./common/callEventReports");
 const logger = (0, logger_1.createLogger)('Observer');
 class Observer extends events_1.EventEmitter {
     static create(providedConfig) {
-        var _a;
         const config = Object.assign({
             defaultServiceId: 'default-service-id',
             defaultMediaUnitId: 'default-media-unit-id',
@@ -30,13 +30,11 @@ class Observer extends events_1.EventEmitter {
             sink: {},
             logLevel: 'info',
         }, providedConfig);
-        const storages = (_a = providedConfig.storages) !== null && _a !== void 0 ? _a : (0, StorageProvider_1.createSimpleStorageProvider)();
-        return new Observer(config, storages);
+        return new Observer(config);
     }
-    constructor(config, storage) {
+    constructor(config) {
         super();
         this.config = config;
-        this.storage = storage;
         this.reports = new ReportsCollector_1.ReportsCollector();
         this._observedCalls = new Map();
         this._closed = false;
@@ -53,24 +51,23 @@ class Observer extends events_1.EventEmitter {
         this.reports.on('newreport', onNewReport);
     }
     createObservedCall(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this._closed) {
-                throw new Error('Attempted to create a call source on a closed observer');
-            }
-            const call = yield ObservedCall_1.ObservedCall.create(Object.assign({ serviceId: this.config.defaultServiceId, started: Date.now() }, config), this);
-            if (this._closed)
-                throw new Error('Cannot create an observed call on a closed observer');
-            if (this._observedCalls.has(call.callId))
-                throw new Error(`Observed Call with id ${call.callId} already exists`);
-            call.once('close', () => {
-                this._observedCalls.delete(call.callId);
-                this.reports.addCallEventReport((0, callEventReports_1.createCallStartedEventReport)(call.serviceId, call.roomId, call.callId, Date.now()));
-            });
-            this._observedCalls.set(call.callId, call);
-            this.reports.addCallEventReport((0, callEventReports_1.createCallStartedEventReport)(call.serviceId, call.roomId, call.callId, call.started));
-            this.emit('newcall', call);
-            return call;
+        if (this._closed) {
+            throw new Error('Attempted to create a call source on a closed observer');
+        }
+        const { appData } = config, model = __rest(config, ["appData"]);
+        const call = new ObservedCall_1.ObservedCall(Object.assign(Object.assign({}, model), { serviceId: this.config.defaultServiceId, started: Date.now() }), this, appData);
+        if (this._closed)
+            throw new Error('Cannot create an observed call on a closed observer');
+        if (this._observedCalls.has(call.callId))
+            throw new Error(`Observed Call with id ${call.callId} already exists`);
+        call.once('close', () => {
+            this._observedCalls.delete(call.callId);
+            this.reports.addCallEventReport((0, callEventReports_1.createCallEndedEventReport)(call.serviceId, call.roomId, call.callId, Date.now()));
         });
+        this._observedCalls.set(call.callId, call);
+        this.reports.addCallEventReport((0, callEventReports_1.createCallStartedEventReport)(call.serviceId, call.roomId, call.callId, call.started));
+        this.emit('newcall', call);
+        return call;
     }
     get observedCalls() {
         return this._observedCalls;