update stats colector version (#111 )

correct pare callRecording headers from sip info (#110 )
Feat/siprec custom headers (#109 )
2026-10-04 02:04:22 +00:00 · 2023-08-07 21:22:47 -04:00 · 2023-07-20 09:02:04 -04:00 · 2023-07-20 08:21:09 -04:00 · 2023-07-04 16:41:46 +01:00
3 changed files with 52 additions and 39 deletions
@@ -64,6 +64,7 @@ class CallSession extends Emitter {
    this.application_sid = req.locals.application_sid;
    this.account_sid = req.locals.account_sid;
    this.service_provider_sid = req.locals.service_provider_sid;
+    this.srsClients = [];
  }

  get isFromMSTeams() {
@@ -317,10 +318,7 @@ class CallSession extends Emitter {
      this.activeCallIds.delete(callId);
      if (dlg.other && dlg.other.connected) dlg.other.destroy().catch((e) => {});

-      if (this.srsClient) {
-        this.srsClient.stop();
-        this.srsClient = null;
-      }
+      this._stopRecording();

      this.srf.endSession(this.req);
    });
@@ -329,6 +327,13 @@ class CallSession extends Emitter {
    dlg.on('modify', this._onReinvite.bind(this, dlg));
  }

+  _stopRecording() {
+    if (this.srsClients.length) {
+      this.srsClients.forEach((c) => c.stop());
+      this.srsClients = [];
+    }
+  }
+
  _setHandlers({uas, uac}) {
    this.emit('connected');
    const callStart = Date.now();
@@ -412,10 +417,7 @@ class CallSession extends Emitter {
        dlg.other = null;
        other.other = null;

-        if (this.srsClient) {
-          this.srsClient.stop();
-          this.srsClient = null;
-        }
+        this._stopRecording();

        this.logger.info(`call ended with normal termination, there are ${this.activeCallIds.size} active`);
        this.srf.endSession(this.req);
@@ -689,6 +691,7 @@ Duration=${payload.duration} `
            const to = this.req.getParsedHeader('To');
            const aorFrom = from.uri;
            const aorTo = to.uri;
+            const headers = contentType === 'application/json' && req.body ? JSON.parse(req.body) : {};
            this.logger.info({to, from}, 'startCallRecording request for a call');

            const srsUrl = req.get('X-Srs-Url');
@@ -696,7 +699,7 @@ Duration=${payload.duration} `
            const callSid = req.get('X-Call-Sid');
            const accountSid = req.get('X-Account-Sid');
            const applicationSid = req.get('X-Application-Sid');
-            if (this.srsClient) {
+            if (this.srsClients.length) {
              res.send(400);
              this.logger.info('discarding duplicate startCallRecording request for a call');
              return;
@@ -706,13 +709,14 @@ Duration=${payload.duration} `
              res.send(400);
              return;
            }
-            this.srsClient = new SrsClient(this.logger, {
+            const arr = srsUrl.split(',');
+            this.srsClients = arr.map((url) => new SrsClient(this.logger, {
              srf: dlg.srf,
              direction: 'inbound',
              originalInvite: this.req,
              callingNumber: this.req.callingNumber,
              calledNumber: this.req.calledNumber,
-              srsUrl,
+              srsUrl: url,
              srsRecordingId,
              callSid,
              accountSid,
@@ -727,42 +731,51 @@ Duration=${payload.duration} `
              del: this.del,
              blockMedia: this.blockMedia,
              unblockMedia: this.unblockMedia,
-              unsubscribe: this.unsubscribe
-            });
+              unsubscribe: this.unsubscribe,
+              headers
+            }));
            try {
-              succeeded = await this.srsClient.start();
+              succeeded = (await Promise.all(
+                this.srsClients.map((c) => c.start())
+              )).every((r) => r);
            } catch (err) {
              this.logger.error({err}, 'Error starting SipRec call recording');
            }
          }
          else if (reason === 'stopCallRecording') {
-            if (!this.srsClient) {
+            if (!this.srsClients.length) {
              res.send(400);
              this.logger.info('discarding stopCallRecording request because we are not recording');
              return;
            }
            try {
-              succeeded = await this.srsClient.stop();
+              succeeded = (await Promise.all(
+                this.srsClients.map((c) => c.stop())
+              )).every((r) => r);
            } catch (err) {
              this.logger.error({err}, 'Error stopping SipRec call recording');
            }
-            this.srsClient = null;
+            this.srsClients = [];
          }
          else if (reason === 'pauseCallRecording') {
-            if (!this.srsClient || this.srsClient.paused) {
+            if (!this.srsClients.length || this.srsClients.every((c) => c.paused)) {
              this.logger.info('discarding invalid pauseCallRecording request');
              res.send(400);
              return;
            }
-            succeeded = await this.srsClient.pause();
+            succeeded = (await Promise.all(
+              this.srsClients.map((c) => c.pause())
+            )).every((r) => r);
          }
          else if (reason === 'resumeCallRecording') {
-            if (!this.srsClient || !this.srsClient.paused) {
+            if (!this.srsClients.length || !this.srsClients.every((c) => c.paused)) {
              res.send(400);
              this.logger.info('discarding invalid resumeCallRecording request');
              return;
            }
-            succeeded = await this.srsClient.resume();
+            succeeded = (await Promise.all(
+              this.srsClients.map((c) => c.resume())
+            )).every((r) => r);
          }
          res.send(succeeded ? 200 : 503);
        }
@@ -815,8 +828,8 @@ Duration=${payload.duration} `
        res.send(response.status, {headers: responseHeaders, body: response.body});
      }
    } catch (err) {
-      if (this.srsClient) {
-        this.srsClient = null;
+      if (this.srsClients.length) {
+        this.srsClients = [];
      }
      res.send(500);
      this.logger.info({err}, `Error handing INFO request on ${dlg.type} leg`);
@@ -16,8 +16,8 @@
        "@jambonz/http-health-check": "^0.0.1",
        "@jambonz/realtimedb-helpers": "^0.8.6",
        "@jambonz/rtpengine-utils": "^0.4.3",
-        "@jambonz/siprec-client-utils": "^0.2.5",
-        "@jambonz/stats-collector": "^0.1.8",
+        "@jambonz/siprec-client-utils": "^0.2.6",
+        "@jambonz/stats-collector": "^0.1.9",
        "@jambonz/time-series": "^0.2.5",
        "bent": "^7.3.12",
        "cidr-matcher": "^2.1.1",
@@ -1716,18 +1716,18 @@
      }
    },
    "node_modules/@jambonz/siprec-client-utils": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.5.tgz",
-      "integrity": "sha512-Ib3M2ecFNxi80gZRG3hcCvxXLLImti1/0bVjAtglGjo1+qn3MyirIVYDchqdabzOC2nWl5aKBEcpG30c2saIDg==",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.6.tgz",
+      "integrity": "sha512-z2x6nghLaCfOBPcr36f+1vxsV557X3z5JW1L1RxZg8YPWkTboNIHyHxtEcAua7V9g6EB4G1qv2KDwA+iE5n5Ww==",
      "dependencies": {
        "sdp-transform": "^2.14.1",
        "uuid": "^8.3.2"
      }
    },
    "node_modules/@jambonz/stats-collector": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.8.tgz",
-      "integrity": "sha512-PadBKTmcphU7bZI7pVr4awhoIi+DMLw7An6AGE0GGsLCn2x0IGnxr9k47gI4Bk3OaSF6N7RyVLEAMkJfr24l8Q==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.9.tgz",
+      "integrity": "sha512-JNRBaHQ47pWsXydj4gUp7zc64/0pM89a6E9pA8uQ15l1KxPGYYTrNRdone5aJqLTFOoPl3tYeF1kXj+3nU1nEA==",
      "dependencies": {
        "debug": "^4.3.2",
        "hot-shots": "^8.5.0"
@@ -7684,18 +7684,18 @@
      }
    },
    "@jambonz/siprec-client-utils": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.5.tgz",
-      "integrity": "sha512-Ib3M2ecFNxi80gZRG3hcCvxXLLImti1/0bVjAtglGjo1+qn3MyirIVYDchqdabzOC2nWl5aKBEcpG30c2saIDg==",
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/@jambonz/siprec-client-utils/-/siprec-client-utils-0.2.6.tgz",
+      "integrity": "sha512-z2x6nghLaCfOBPcr36f+1vxsV557X3z5JW1L1RxZg8YPWkTboNIHyHxtEcAua7V9g6EB4G1qv2KDwA+iE5n5Ww==",
      "requires": {
        "sdp-transform": "^2.14.1",
        "uuid": "^8.3.2"
      }
    },
    "@jambonz/stats-collector": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.8.tgz",
-      "integrity": "sha512-PadBKTmcphU7bZI7pVr4awhoIi+DMLw7An6AGE0GGsLCn2x0IGnxr9k47gI4Bk3OaSF6N7RyVLEAMkJfr24l8Q==",
+      "version": "0.1.9",
+      "resolved": "https://registry.npmjs.org/@jambonz/stats-collector/-/stats-collector-0.1.9.tgz",
+      "integrity": "sha512-JNRBaHQ47pWsXydj4gUp7zc64/0pM89a6E9pA8uQ15l1KxPGYYTrNRdone5aJqLTFOoPl3tYeF1kXj+3nU1nEA==",
      "requires": {
        "debug": "^4.3.2",
        "hot-shots": "^8.5.0"
@@ -29,8 +29,8 @@
    "@jambonz/http-health-check": "^0.0.1",
    "@jambonz/realtimedb-helpers": "^0.8.6",
    "@jambonz/rtpengine-utils": "^0.4.3",
-    "@jambonz/siprec-client-utils": "^0.2.5",
-    "@jambonz/stats-collector": "^0.1.8",
+    "@jambonz/siprec-client-utils": "^0.2.6",
+    "@jambonz/stats-collector": "^0.1.9",
    "@jambonz/time-series": "^0.2.5",
    "@jambonz/digest-utils": "^0.0.3",
    "@aws-sdk/client-sns": "^3.360.0",
Author	SHA1	Message	Date
Hoan Luu Huu	a25aa08e17	update stats colector version (#111 )	2023-08-07 21:22:47 -04:00
Hoan Luu Huu	b1296c8e89	correct pare callRecording headers from sip info (#110 )	2023-07-20 09:02:04 -04:00
Hoan Luu Huu	17df3a4ca8	Feat/siprec custom headers (#109 ) * siprec custom headers * siprec custom headers * update siprec client util	2023-07-20 08:21:09 -04:00
Hoan Luu Huu	f2e820915d	Multi srs (#106 ) * multi srs * multi srs * multi srs * fix review comment	2023-07-04 16:41:46 +01:00