@observertc/observer-js 0.9.19-beta → 0.9.21-beta
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/lib/Observer.d.ts +4 -0
- package/lib/Observer.d.ts.map +1 -1
- package/lib/Observer.js +6 -5
- package/lib/processes/detachClientProcess.js +2 -2
- package/lib/processes/joinClientProcess.d.ts.map +1 -1
- package/lib/processes/joinClientProcess.js +2 -2
- package/lib/sinks/callEventReports.d.ts +2 -2
- package/lib/sinks/callEventReports.d.ts.map +1 -1
- package/lib/sinks/callEventReports.js +4 -2
- package/package.json +2 -1
- package/src/Observer.ts +9 -1
- package/src/processes/detachClientProcess.ts +2 -2
- package/src/processes/findRemoteMatches.ts +2 -2
- package/src/processes/joinClientProcess.ts +2 -0
- package/src/sinks/callEventReports.ts +4 -0
package/lib/Observer.d.ts
CHANGED
|
@@ -10,6 +10,10 @@ import { PartialBy } from './common/utils';
|
|
|
10
10
|
import { LogLevel } from './common/logger';
|
|
11
11
|
import { ObservedSfuSource, ObservedSfuSourceConfig } from './sources/ObservedSfuSource';
|
|
12
12
|
export type ObserverEvents = {
|
|
13
|
+
'processing-started': undefined;
|
|
14
|
+
'client-added': string;
|
|
15
|
+
'client-removed': string;
|
|
16
|
+
'processing-ended': undefined;
|
|
13
17
|
'close': undefined;
|
|
14
18
|
};
|
|
15
19
|
export type ObserverConfig = {
|
package/lib/Observer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAC;AACzG,OAAO,EAAW,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAA+B,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAa,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAiC,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAgB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAKzF,MAAM,MAAM,cAAc,GAAG;IAC5B,OAAO,EAAE,SAAS,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC5B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,eAAe,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAE/B,QAAQ,EAAE,QAAQ,CAAC;CACnB,CAAC;AAEF,qBAAa,QAAQ;aAgCH,MAAM,EAAE,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;WAjCf,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,QAAQ;IAyBvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAS;gBAEP,MAAM,EAAE,cAAc,EACrB,SAAS,EAAE,eAAe,EAC1B,WAAW,EAAE,iBAAiB;
|
|
1
|
+
{"version":3,"file":"Observer.d.ts","sourceRoot":"","sources":["../src/Observer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,UAAU,EAAY,MAAM,sBAAsB,CAAC;AACzG,OAAO,EAAW,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAA+B,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC1F,OAAO,KAAK,MAAM,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAa,eAAe,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC3E,OAAO,EAAiC,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAClG,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAgB,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAKzF,MAAM,MAAM,cAAc,GAAG;IAC5B,oBAAoB,EAAE,SAAS,CAAC;IAChC,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,SAAS,CAAC;IAC9B,OAAO,EAAE,SAAS,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC5B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;OAIG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,OAAO,EAAE,aAAa,CAAC;IACvB,SAAS,EAAE,eAAe,CAAC;IAC3B,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAE/B,QAAQ,EAAE,QAAQ,CAAC;CACnB,CAAC;AAEF,qBAAa,QAAQ;aAgCH,MAAM,EAAE,cAAc;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW;WAjCf,MAAM,CAAC,cAAc,EAAE,OAAO,CAAC,cAAc,CAAC,GAAG,QAAQ;IAyBvE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAC/C,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,KAAK,CAAW;IACxB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,OAAO,CAAS;gBAEP,MAAM,EAAE,cAAc,EACrB,SAAS,EAAE,eAAe,EAC1B,WAAW,EAAE,iBAAiB;IAyBzC,EAAE,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI;IAK9F,IAAI,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI;IAKhG,GAAG,CAAC,CAAC,SAAS,MAAM,cAAc,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI;IAK/F,gBAAgB,CACtB,MAAM,EAAE,SAAS,CAAC,wBAAwB,EAAE,WAAW,GAAG,aAAa,CAAC,GACtE,kBAAkB;IA0Cd,kBAAkB,CACxB,MAAM,EAAE,SAAS,CAAC,0BAA0B,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC,GACnF,oBAAoB;IAehB,eAAe,CACrB,MAAM,EAAE,SAAS,CAAC,uBAAuB,EAAE,WAAW,GAAG,aAAa,GAAG,QAAQ,CAAC,GAChF,iBAAiB;IAeP,QAAQ;IAUrB,IAAW,OAAO,IAAI,sBAAsB,CAE3C;IAEM,aAAa,CAAC,GAAG,SAAS,EAAE,gBAAgB,EAAE;IAS9C,gBAAgB,CAAC,GAAG,SAAS,EAAE,gBAAgB,EAAE;IASjD,QAAQ,CAAC,GAAG,SAAS,EAAE,mBAAmB,EAAE;IAS5C,WAAW,CAAC,GAAG,SAAS,EAAE,mBAAmB,EAAE;IAS/C,KAAK,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAKrD,IAAI,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAKnD,aAAa,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAKrE,iBAAiB,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAK7E,kBAAkB,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAK/E,OAAO,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAKzD,eAAe,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;IAKnE,QAAQ,CAAC,OAAO,EAAE,MAAM;IAUxB,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;IAS7C,aAAa,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAKrE,cAAc,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAKvE,eAAe,IAAI,qBAAqB,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;IAKnE,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,SAAS,CAAC;IAKzD,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;IAKjF,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,SAAS,CAAC;IAKtD,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAK9E,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC;IAKjF,mBAAmB,CAC/B,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAKvC,mBAAmB,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,GAAG,SAAS,CAAC;IAK7F,uBAAuB,CACnC,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,GACnC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAK3C,oBAAoB,CAAC,mBAAmB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAKhG,wBAAwB,CACpC,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,GACpC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAK5C,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC;IAK/D,YAAY,CAAC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAKtF,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC;IAKvF,qBAAqB,CACjC,iBAAiB,EAAE,QAAQ,CAAC,MAAM,CAAC,GACjC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;IAKzC,eAAe,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC;IAKjF,mBAAmB,CAC/B,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAKvC,gBAAgB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,aAAa,GAAG,SAAS,CAAC;IAKpF,oBAAoB,CAChC,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,GAChC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IAKxC,iBAAiB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC;IAKpF,oBAAoB,CAChC,cAAc,EAAE,QAAQ,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC;IAKtD,IAAW,MAAM,YAEhB;IAEM,KAAK;CAUZ"}
|
package/lib/Observer.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.Observer = void 0;
|
|
7
4
|
const ObserverSink_1 = require("./sinks/ObserverSink");
|
|
@@ -10,7 +7,7 @@ const StorageProvider_1 = require("./storages/StorageProvider");
|
|
|
10
7
|
const Evaluator_1 = require("./Evaluator");
|
|
11
8
|
const Semaphore_1 = require("./common/Semaphore");
|
|
12
9
|
const logger_1 = require("./common/logger");
|
|
13
|
-
const events_1 =
|
|
10
|
+
const events_1 = require("events");
|
|
14
11
|
const logger = (0, logger_1.createLogger)('Observer');
|
|
15
12
|
class Observer {
|
|
16
13
|
static create(providedConfig) {
|
|
@@ -37,22 +34,26 @@ class Observer {
|
|
|
37
34
|
this.config = config;
|
|
38
35
|
this._storages = _storages;
|
|
39
36
|
this._semaphores = _semaphores;
|
|
40
|
-
this._emitter = new events_1.
|
|
37
|
+
this._emitter = new events_1.EventEmitter();
|
|
41
38
|
this._closed = false;
|
|
42
39
|
this._sources = new Sources_1.Sources(config.sources);
|
|
43
40
|
this._sink = new ObserverSink_1.SinkImpl(config.sink);
|
|
44
41
|
this._evaluator = new Evaluator_1.Evaluator(this.config.evaluator, this._semaphores.callSemaphore, this._storages, this._sink);
|
|
45
42
|
this._sources.on('observed-samples', (event) => {
|
|
43
|
+
this._emitter.emit('processing-started');
|
|
46
44
|
this._evaluator.addObservedSamples(event);
|
|
47
45
|
});
|
|
48
46
|
this._sources.on('added-client-source', (event) => {
|
|
49
47
|
this._evaluator.addCreatedClientSource(event);
|
|
48
|
+
this._emitter.emit('client-added', event.clientId);
|
|
50
49
|
});
|
|
51
50
|
this._sources.on('removed-client-source', (event) => {
|
|
52
51
|
this._evaluator.addClosedClientSource(event);
|
|
52
|
+
this._emitter.emit('client-added', event.clientId);
|
|
53
53
|
});
|
|
54
54
|
this._evaluator.on('ready', () => {
|
|
55
55
|
this._sink.emit();
|
|
56
|
+
this._emitter.emit('processing-ended');
|
|
56
57
|
});
|
|
57
58
|
logger.debug(`Observer is created with config`, this.config);
|
|
58
59
|
}
|
|
@@ -38,7 +38,7 @@ function createDetachClientProcess(storageProvider, reports) {
|
|
|
38
38
|
if (!deletedClient) {
|
|
39
39
|
continue;
|
|
40
40
|
}
|
|
41
|
-
const { roomId, serviceId, mediaUnitId, marker, callId } = deletedClient;
|
|
41
|
+
const { roomId, serviceId, mediaUnitId, marker, callId, userId } = deletedClient;
|
|
42
42
|
if (!roomId || !serviceId || !mediaUnitId || !callId) {
|
|
43
43
|
continue;
|
|
44
44
|
}
|
|
@@ -48,7 +48,7 @@ function createDetachClientProcess(storageProvider, reports) {
|
|
|
48
48
|
closed: detached,
|
|
49
49
|
});
|
|
50
50
|
}
|
|
51
|
-
reports.addCallEventReport((0, callEventReports_1.createClientLeftEventReport)(serviceId, mediaUnitId, roomId, callId, clientId, detached, marker));
|
|
51
|
+
reports.addCallEventReport((0, callEventReports_1.createClientLeftEventReport)(serviceId, mediaUnitId, roomId, callId, clientId, detached, userId, marker));
|
|
52
52
|
evaluatorContext === null || evaluatorContext === void 0 ? void 0 : evaluatorContext.detachedClients.push({
|
|
53
53
|
...deletedClient,
|
|
54
54
|
detached: Number(detached),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"joinClientProcess.d.ts","sourceRoot":"","sources":["../../src/processes/joinClientProcess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,MAAM,MAAM,sBAAsB,GAAG;IACpC,OAAO,EAAE,0BAA0B,EAAE,CAAC;IAEtC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,uBAAuB,CACtC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,gBAAgB,GACvB,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"joinClientProcess.d.ts","sourceRoot":"","sources":["../../src/processes/joinClientProcess.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAG9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAE9D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,MAAM,MAAM,sBAAsB,GAAG;IACpC,OAAO,EAAE,0BAA0B,EAAE,CAAC;IAEtC,gBAAgB,CAAC,EAAE,QAAQ,CAAC,gBAAgB,CAAC,CAAC;CAC9C,CAAC;AAEF,wBAAgB,uBAAuB,CACtC,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,gBAAgB,GACvB,CAAC,KAAK,EAAE,sBAAsB,KAAK,OAAO,CAAC,IAAI,CAAC,CA2GlD"}
|
|
@@ -91,13 +91,13 @@ function createJoinClientProcess(storageProvider, reports) {
|
|
|
91
91
|
await clientStorage.setAll(newClients);
|
|
92
92
|
}
|
|
93
93
|
for (const [clientId, client] of newClients) {
|
|
94
|
-
const { serviceId, mediaUnitId, roomId, callId, clientId: savedClientId,
|
|
94
|
+
const { serviceId, mediaUnitId, roomId, callId, clientId: savedClientId, userId,
|
|
95
95
|
// timeZoneId,
|
|
96
96
|
marker, joined, } = client;
|
|
97
97
|
if (!serviceId || !mediaUnitId || !roomId || !callId || !savedClientId) {
|
|
98
98
|
continue;
|
|
99
99
|
}
|
|
100
|
-
const callEvent = (0, callEventReports_1.createClientJoinedEventReport)(serviceId, mediaUnitId, roomId, callId, clientId, Number(joined), marker);
|
|
100
|
+
const callEvent = (0, callEventReports_1.createClientJoinedEventReport)(serviceId, mediaUnitId, roomId, callId, clientId, Number(joined), userId, marker);
|
|
101
101
|
reports.addCallEventReport(callEvent);
|
|
102
102
|
evaluatorContext === null || evaluatorContext === void 0 ? void 0 : evaluatorContext.joinedClientIds.push(clientId);
|
|
103
103
|
}
|
|
@@ -11,8 +11,8 @@ export declare enum CallEventType {
|
|
|
11
11
|
}
|
|
12
12
|
export declare function createCallStartedEventReport(serviceId: string, roomId: string, callId: string, timestamp: number, marker?: string): CallEventReport;
|
|
13
13
|
export declare function createCallEndedEventReport(serviceId: string, roomId: string, callId: string, timestamp: number, marker?: string): CallEventReport;
|
|
14
|
-
export declare function createClientJoinedEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, timestamp: number, marker?: string): CallEventReport;
|
|
15
|
-
export declare function createClientLeftEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, timestamp: number, marker?: string): CallEventReport;
|
|
14
|
+
export declare function createClientJoinedEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, timestamp: number, userId?: string, marker?: string): CallEventReport;
|
|
15
|
+
export declare function createClientLeftEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, timestamp: number, userId?: string, marker?: string): CallEventReport;
|
|
16
16
|
export declare function createPeerConnectionOpenedEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, peerConnectionId: string, timestamp: number, marker?: string): CallEventReport;
|
|
17
17
|
export declare function createPeerConnectionClosedEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, peerConnectionId: string, timestamp: number, marker?: string): CallEventReport;
|
|
18
18
|
export declare function createMediaTrackAddedEventReport(serviceId: string, mediaUnitId: string, roomId: string, callId: string, clientId: string, peerConnectionId: string, mediaTrackId: string, timestamp: number, marker?: string): CallEventReport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callEventReports.d.ts","sourceRoot":"","sources":["../../src/sinks/callEventReports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,oBAAY,aAAa;IACxB,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,WAAW,gBAAgB;IAC3B,sBAAsB,2BAA2B;IACjD,sBAAsB,2BAA2B;IACjD,iBAAiB,sBAAsB;IACvC,mBAAmB,wBAAwB;CAC3C;AACD,wBAAgB,4BAA4B,CAC3C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CASjB;AAED,wBAAgB,0BAA0B,CACzC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CASjB;AAED,wBAAgB,6BAA6B,CAC5C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,
|
|
1
|
+
{"version":3,"file":"callEventReports.d.ts","sourceRoot":"","sources":["../../src/sinks/callEventReports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGhE,oBAAY,aAAa;IACxB,YAAY,iBAAiB;IAC7B,UAAU,eAAe;IACzB,aAAa,kBAAkB;IAC/B,WAAW,gBAAgB;IAC3B,sBAAsB,2BAA2B;IACjD,sBAAsB,2BAA2B;IACjD,iBAAiB,sBAAsB;IACvC,mBAAmB,wBAAwB;CAC3C;AACD,wBAAgB,4BAA4B,CAC3C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CASjB;AAED,wBAAgB,0BAA0B,CACzC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CASjB;AAED,wBAAgB,6BAA6B,CAC5C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CAYjB;AAED,wBAAgB,2BAA2B,CAC1C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CAYjB;AAED,wBAAgB,qCAAqC,CACpD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CAYjB;AAED,wBAAgB,qCAAqC,CACpD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CAYjB;AAED,wBAAgB,gCAAgC,CAC/C,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CAajB;AAED,wBAAgB,kCAAkC,CACjD,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,MAAM,EACjB,MAAM,CAAC,EAAE,MAAM,GACb,eAAe,CAajB"}
|
|
@@ -34,7 +34,7 @@ function createCallEndedEventReport(serviceId, roomId, callId, timestamp, marker
|
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
exports.createCallEndedEventReport = createCallEndedEventReport;
|
|
37
|
-
function createClientJoinedEventReport(serviceId, mediaUnitId, roomId, callId, clientId, timestamp, marker) {
|
|
37
|
+
function createClientJoinedEventReport(serviceId, mediaUnitId, roomId, callId, clientId, timestamp, userId, marker) {
|
|
38
38
|
return {
|
|
39
39
|
name: CallEventType.CLIENT_JOINED,
|
|
40
40
|
serviceId,
|
|
@@ -43,11 +43,12 @@ function createClientJoinedEventReport(serviceId, mediaUnitId, roomId, callId, c
|
|
|
43
43
|
callId,
|
|
44
44
|
clientId,
|
|
45
45
|
timestamp,
|
|
46
|
+
userId,
|
|
46
47
|
marker,
|
|
47
48
|
};
|
|
48
49
|
}
|
|
49
50
|
exports.createClientJoinedEventReport = createClientJoinedEventReport;
|
|
50
|
-
function createClientLeftEventReport(serviceId, mediaUnitId, roomId, callId, clientId, timestamp, marker) {
|
|
51
|
+
function createClientLeftEventReport(serviceId, mediaUnitId, roomId, callId, clientId, timestamp, userId, marker) {
|
|
51
52
|
return {
|
|
52
53
|
name: CallEventType.CLIENT_LEFT,
|
|
53
54
|
serviceId,
|
|
@@ -56,6 +57,7 @@ function createClientLeftEventReport(serviceId, mediaUnitId, roomId, callId, cli
|
|
|
56
57
|
callId,
|
|
57
58
|
clientId,
|
|
58
59
|
timestamp,
|
|
60
|
+
userId,
|
|
59
61
|
marker,
|
|
60
62
|
};
|
|
61
63
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@observertc/observer-js",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.21-beta",
|
|
4
4
|
"description": "Server Side NodeJS Library for processing ObserveRTC Samples",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"types": "lib/index.d.ts",
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"@types/jest": "^27.5.2",
|
|
39
|
+
"@types/node": "^20.9.0",
|
|
39
40
|
"@typescript-eslint/eslint-plugin": "^5.38.0",
|
|
40
41
|
"@typescript-eslint/parser": "^5.38.0",
|
|
41
42
|
"bufferutil": "^4.0.6",
|
package/src/Observer.ts
CHANGED
|
@@ -9,11 +9,15 @@ import { ObservedClientSource, ObservedClientSourceConfig } from './sources/Obse
|
|
|
9
9
|
import { PartialBy } from './common/utils';
|
|
10
10
|
import { createLogger, LogLevel } from './common/logger';
|
|
11
11
|
import { ObservedSfuSource, ObservedSfuSourceConfig } from './sources/ObservedSfuSource';
|
|
12
|
-
import EventEmitter from 'events';
|
|
12
|
+
import { EventEmitter } from 'events';
|
|
13
13
|
|
|
14
14
|
const logger = createLogger('Observer');
|
|
15
15
|
|
|
16
16
|
export type ObserverEvents = {
|
|
17
|
+
'processing-started': undefined,
|
|
18
|
+
'client-added': string,
|
|
19
|
+
'client-removed': string,
|
|
20
|
+
'processing-ended': undefined,
|
|
17
21
|
'close': undefined,
|
|
18
22
|
}
|
|
19
23
|
|
|
@@ -87,16 +91,20 @@ export class Observer {
|
|
|
87
91
|
this._evaluator = new Evaluator(this.config.evaluator, this._semaphores.callSemaphore, this._storages, this._sink);
|
|
88
92
|
|
|
89
93
|
this._sources.on('observed-samples', (event) => {
|
|
94
|
+
this._emitter.emit('processing-started');
|
|
90
95
|
this._evaluator.addObservedSamples(event);
|
|
91
96
|
});
|
|
92
97
|
this._sources.on('added-client-source', (event) => {
|
|
93
98
|
this._evaluator.addCreatedClientSource(event);
|
|
99
|
+
this._emitter.emit('client-added', event.clientId);
|
|
94
100
|
});
|
|
95
101
|
this._sources.on('removed-client-source', (event) => {
|
|
96
102
|
this._evaluator.addClosedClientSource(event);
|
|
103
|
+
this._emitter.emit('client-added', event.clientId);
|
|
97
104
|
});
|
|
98
105
|
this._evaluator.on('ready', () => {
|
|
99
106
|
this._sink.emit();
|
|
107
|
+
this._emitter.emit('processing-ended');
|
|
100
108
|
});
|
|
101
109
|
logger.debug(`Observer is created with config`, this.config);
|
|
102
110
|
}
|
|
@@ -58,7 +58,7 @@ export function createDetachClientProcess(
|
|
|
58
58
|
if (!deletedClient) {
|
|
59
59
|
continue;
|
|
60
60
|
}
|
|
61
|
-
const { roomId, serviceId, mediaUnitId, marker, callId } = deletedClient;
|
|
61
|
+
const { roomId, serviceId, mediaUnitId, marker, callId, userId } = deletedClient;
|
|
62
62
|
if (!roomId || !serviceId || !mediaUnitId || !callId) {
|
|
63
63
|
continue;
|
|
64
64
|
}
|
|
@@ -71,7 +71,7 @@ export function createDetachClientProcess(
|
|
|
71
71
|
}
|
|
72
72
|
|
|
73
73
|
reports.addCallEventReport(
|
|
74
|
-
createClientLeftEventReport(serviceId, mediaUnitId, roomId, callId, clientId, detached, marker)
|
|
74
|
+
createClientLeftEventReport(serviceId, mediaUnitId, roomId, callId, clientId, detached, userId, marker)
|
|
75
75
|
);
|
|
76
76
|
evaluatorContext?.detachedClients.push({
|
|
77
77
|
...deletedClient,
|
|
@@ -10,12 +10,12 @@ function groupToMap<T>(input: ReadonlyMap<string, T>, getGroupKey: (value: T) =>
|
|
|
10
10
|
const groupKey = getGroupKey(value);
|
|
11
11
|
if (!groupKey) continue;
|
|
12
12
|
|
|
13
|
-
|
|
13
|
+
let group = result.get(groupKey);
|
|
14
14
|
if (group === undefined) {
|
|
15
15
|
group = [];
|
|
16
16
|
result.set(groupKey, group);
|
|
17
17
|
}
|
|
18
|
-
|
|
18
|
+
group.push(value);
|
|
19
19
|
}
|
|
20
20
|
return result;
|
|
21
21
|
}
|
|
@@ -100,6 +100,7 @@ export function createJoinClientProcess(
|
|
|
100
100
|
roomId,
|
|
101
101
|
callId,
|
|
102
102
|
clientId: savedClientId,
|
|
103
|
+
userId,
|
|
103
104
|
// timeZoneId,
|
|
104
105
|
marker,
|
|
105
106
|
joined,
|
|
@@ -116,6 +117,7 @@ export function createJoinClientProcess(
|
|
|
116
117
|
callId,
|
|
117
118
|
clientId,
|
|
118
119
|
Number(joined),
|
|
120
|
+
userId,
|
|
119
121
|
marker
|
|
120
122
|
);
|
|
121
123
|
reports.addCallEventReport(callEvent);
|
|
@@ -52,6 +52,7 @@ export function createClientJoinedEventReport(
|
|
|
52
52
|
callId: string,
|
|
53
53
|
clientId: string,
|
|
54
54
|
timestamp: number,
|
|
55
|
+
userId?: string,
|
|
55
56
|
marker?: string
|
|
56
57
|
): CallEventReport {
|
|
57
58
|
return {
|
|
@@ -62,6 +63,7 @@ export function createClientJoinedEventReport(
|
|
|
62
63
|
callId,
|
|
63
64
|
clientId,
|
|
64
65
|
timestamp,
|
|
66
|
+
userId,
|
|
65
67
|
marker,
|
|
66
68
|
};
|
|
67
69
|
}
|
|
@@ -73,6 +75,7 @@ export function createClientLeftEventReport(
|
|
|
73
75
|
callId: string,
|
|
74
76
|
clientId: string,
|
|
75
77
|
timestamp: number,
|
|
78
|
+
userId?: string,
|
|
76
79
|
marker?: string
|
|
77
80
|
): CallEventReport {
|
|
78
81
|
return {
|
|
@@ -83,6 +86,7 @@ export function createClientLeftEventReport(
|
|
|
83
86
|
callId,
|
|
84
87
|
clientId,
|
|
85
88
|
timestamp,
|
|
89
|
+
userId,
|
|
86
90
|
marker,
|
|
87
91
|
};
|
|
88
92
|
}
|