Updated drachtio-srf version (#199 )

https://github.com/drachtio/drachtio-server/issues/424
update drachtio srf 5.0.4 (#198 )
2026-10-04 18:44:43 +00:00 · 2025-04-22 11:05:30 -04:00 · 2025-04-18 07:45:18 -04:00 · 2025-04-17 19:45:39 -04:00 · 2025-04-14 08:22:17 -04:00 · 2025-03-10 09:54:03 -04:00
5 changed files with 55 additions and 45 deletions
@@ -8,7 +8,7 @@ module.exports = (logger) => {
  // listen for SNS lifecycle changes
  let lifecycleEmitter = new Emitter();
  lifecycleEmitter.dryUpCalls = false;
-  if (process.env.AWS_SNS_TOPIC_ARM) {
+  if (process.env.AWS_SNS_TOPIC_ARN) {

    (async function() {
      try {
@@ -69,7 +69,17 @@ class SnsNotifier extends Emitter {
            subscriptionRequestId: this.subscriptionRequestId
          }, 'response from SNS SubscribeURL');
          const data = await this.describeInstance();
-          this.lifecycleState = data.AutoScalingGroups[0].Instances[0].LifecycleState;
+
+          const group = data.AutoScalingGroups.find((group) =>
+            group.Instances && group.Instances.some((instance) => instance.InstanceId === this.instanceId)
+          );
+          if (!group) {
+            this.logger.error('Current instance not found in any Auto Scaling group', data);
+          } else {
+            const instance = group.Instances.find((instance) => instance.InstanceId === this.instanceId);
+            this.lifecycleState = instance.LifecycleState;
+          }
+
          this.emit('SubscriptionConfirmation', {publicIp: this.publicIp});
          break;

@@ -137,13 +147,13 @@ class SnsNotifier extends Emitter {
    try {
      const params = {
        Protocol: 'http',
-        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARN,
        Endpoint: this.snsEndpoint
      };
      const response = await snsClient.send(new SubscribeCommand(params));
-      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
    } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
    }
  }

@@ -154,9 +164,9 @@ class SnsNotifier extends Emitter {
        SubscriptionArn: this.subscriptionArn
      };
      const response = await snsClient.send(new UnsubscribeCommand(params));
-      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARN}`);
    } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARN}`);
    }
  }

@@ -180,8 +180,8 @@ class CallSession extends Emitter {
      host = obj.host;
      proxy = `sip:${featureServer}`;
    }
-    if (obj.user) uri = `${scheme}:${obj.user}@${host}`;
-    else uri = `${scheme}:${host}`;
+    if (obj.user) uri = `sip:${obj.user}@${host}`;
+    else uri = `sip:${host}`;
    this.logger.info(`uri will be: ${uri}, proxy ${proxy}`);

    const sendOfferToRtpEngine = async(remoteSdp) => {
@@ -1057,7 +1057,7 @@ Duration=${payload.duration} `
          // eslint-disable-next-line no-unused-vars
          'content-length':contentlength, 'refer-to':_referto, 'referred-by': referredby,
          // eslint-disable-next-line no-unused-vars
-          'X-Refer-To-Leave-Untouched': _leave,
+          'X-Refer-To-Leave-Untouched': _leave, contact: _contact,
          ...customHeaders
        } = req.headers;

@@ -1066,6 +1066,7 @@ Duration=${payload.duration} `
          headers: {
            'Refer-To': `<${stringifyUri(uri)}>`,
            'Referred-By': referredby,
+            'Contact': this.contactHeader,
            ...customHeaders
          }
        });
@@ -11,10 +11,10 @@
      "dependencies": {
        "@aws-sdk/client-auto-scaling": "^3.549.0",
        "@aws-sdk/client-sns": "^3.549.0",
-        "@jambonz/db-helpers": "^0.9.9",
-        "@jambonz/digest-utils": "^0.0.5",
+        "@jambonz/db-helpers": "^0.9.11",
+        "@jambonz/digest-utils": "^0.0.6",
        "@jambonz/http-health-check": "^0.0.1",
-        "@jambonz/realtimedb-helpers": "^0.8.8",
+        "@jambonz/realtimedb-helpers": "^0.8.13",
        "@jambonz/rtpengine-utils": "^0.4.4",
        "@jambonz/siprec-client-utils": "^0.2.10",
        "@jambonz/stats-collector": "^0.1.10",
@@ -23,7 +23,7 @@
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
        "drachtio-fn-b2b-sugar": "0.2.1",
-        "drachtio-srf": "^5.0.2",
+        "drachtio-srf": "^5.0.5",
        "express": "^4.19.2",
        "pino": "^8.20.0",
        "verify-aws-sns-signature": "^0.1.0",
@@ -1410,9 +1410,9 @@
      }
    },
    "node_modules/@jambonz/db-helpers": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.9.tgz",
-      "integrity": "sha512-aUr7kq78NUiOg7/aqFW+KseHqwujtThaJHu7O1Bp5OznHLMDNFB8jJJDs3LGIqaRHEM/c4oaKtpKA4wahgP99w==",
+      "version": "0.9.11",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.11.tgz",
+      "integrity": "sha512-L6xw60J0sYEMlR0EkeqolKbk+g08yvN51V8D0+bBfpTxsJUGgHiYhDgeGeTLU5J1FQCGwmj2RI1AVW5aAu6Q1A==",
      "dependencies": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
@@ -1422,11 +1422,11 @@
      }
    },
    "node_modules/@jambonz/digest-utils": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.5.tgz",
-      "integrity": "sha512-x9/ptEnmZTpasiVRHVAabBN7borzj9QScAokr3InpFMulvCLdCvSUYRmsqUna2Kw2lWTIs9D1BQXnQLDDgNHxA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.6.tgz",
+      "integrity": "sha512-7ogpe14+Ibh3yLZbi+yoanTL/6HJw3fLEghPB2YXLNh0cyGWcqrpnE8tM9YLhYSLOE14VFanlpiyaKCNX244kQ==",
+      "license": "MIT",
      "dependencies": {
-        "bent": "^7.3.12",
        "debug": "^4.3.4",
        "nonce": "^1.0.4",
        "qs": "^6.9.4"
@@ -1444,9 +1444,9 @@
      }
    },
    "node_modules/@jambonz/realtimedb-helpers": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.8.tgz",
-      "integrity": "sha512-bzVz2EqJ7Gma5ysOh8J8Z1amw7szCBS1RSCLWEhtwPgYt6yWRdjgXbH7wHJ1qbZYYEfetfn7jeEaee8BYnoQlg==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.13.tgz",
+      "integrity": "sha512-/7c8kCu/dMSk8CWTYdEv4xU/7+vmVL30VCjtHPRAXVBRIVejAPDf1xK5n0rXwG8Fda1Oa+0TFsymkiRpew8P6w==",
      "dependencies": {
        "debug": "^4.3.4",
        "ioredis": "^5.3.2"
@@ -2948,9 +2948,9 @@
      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
    },
    "node_modules/drachtio-srf": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.2.tgz",
-      "integrity": "sha512-tM4TVNoC3IpdmpNn2gnuIp5AzNF6Ik6rvRTFjmQ25/W4gb4eVzK8cCYntc00rtbENI4HHmrX4Ep+/T+ZVnoTDw==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.5.tgz",
+      "integrity": "sha512-dKdOf+zonTvk1eVu0IVc4a/Hdah2KspXngAeLQ3NZHdAkjQCJjYQZubVP6ho2QT1pzu8wA3U4M/atL1O99Ujzw==",
      "dependencies": {
        "debug": "^3.2.7",
        "delegates": "^0.1.0",
@@ -2964,7 +2964,7 @@
        "uuid-random": "^1.3.2"
      },
      "engines": {
-        "node": ">= 10.x"
+        "node": ">= 18.x"
      }
    },
    "node_modules/drachtio-srf/node_modules/debug": {
@@ -7907,9 +7907,9 @@
      "dev": true
    },
    "@jambonz/db-helpers": {
-      "version": "0.9.9",
-      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.9.tgz",
-      "integrity": "sha512-aUr7kq78NUiOg7/aqFW+KseHqwujtThaJHu7O1Bp5OznHLMDNFB8jJJDs3LGIqaRHEM/c4oaKtpKA4wahgP99w==",
+      "version": "0.9.11",
+      "resolved": "https://registry.npmjs.org/@jambonz/db-helpers/-/db-helpers-0.9.11.tgz",
+      "integrity": "sha512-L6xw60J0sYEMlR0EkeqolKbk+g08yvN51V8D0+bBfpTxsJUGgHiYhDgeGeTLU5J1FQCGwmj2RI1AVW5aAu6Q1A==",
      "requires": {
        "cidr-matcher": "^2.1.1",
        "debug": "^4.3.4",
@@ -7919,11 +7919,10 @@
      }
    },
    "@jambonz/digest-utils": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.5.tgz",
-      "integrity": "sha512-x9/ptEnmZTpasiVRHVAabBN7borzj9QScAokr3InpFMulvCLdCvSUYRmsqUna2Kw2lWTIs9D1BQXnQLDDgNHxA==",
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@jambonz/digest-utils/-/digest-utils-0.0.6.tgz",
+      "integrity": "sha512-7ogpe14+Ibh3yLZbi+yoanTL/6HJw3fLEghPB2YXLNh0cyGWcqrpnE8tM9YLhYSLOE14VFanlpiyaKCNX244kQ==",
      "requires": {
-        "bent": "^7.3.12",
        "debug": "^4.3.4",
        "nonce": "^1.0.4",
        "qs": "^6.9.4"
@@ -7938,9 +7937,9 @@
      }
    },
    "@jambonz/realtimedb-helpers": {
-      "version": "0.8.8",
-      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.8.tgz",
-      "integrity": "sha512-bzVz2EqJ7Gma5ysOh8J8Z1amw7szCBS1RSCLWEhtwPgYt6yWRdjgXbH7wHJ1qbZYYEfetfn7jeEaee8BYnoQlg==",
+      "version": "0.8.13",
+      "resolved": "https://registry.npmjs.org/@jambonz/realtimedb-helpers/-/realtimedb-helpers-0.8.13.tgz",
+      "integrity": "sha512-/7c8kCu/dMSk8CWTYdEv4xU/7+vmVL30VCjtHPRAXVBRIVejAPDf1xK5n0rXwG8Fda1Oa+0TFsymkiRpew8P6w==",
      "requires": {
        "debug": "^4.3.4",
        "ioredis": "^5.3.2"
@@ -9066,9 +9065,9 @@
      "integrity": "sha512-bMtje8GWVTze+UG6WSGnlUfBaYCuFiApNXl/XxWc+X9uATZiZkV2jIqhf+Y4SY3nS8dZclJIVKd9qwoCa+i+Vw=="
    },
    "drachtio-srf": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.2.tgz",
-      "integrity": "sha512-tM4TVNoC3IpdmpNn2gnuIp5AzNF6Ik6rvRTFjmQ25/W4gb4eVzK8cCYntc00rtbENI4HHmrX4Ep+/T+ZVnoTDw==",
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/drachtio-srf/-/drachtio-srf-5.0.5.tgz",
+      "integrity": "sha512-dKdOf+zonTvk1eVu0IVc4a/Hdah2KspXngAeLQ3NZHdAkjQCJjYQZubVP6ho2QT1pzu8wA3U4M/atL1O99Ujzw==",
      "requires": {
        "debug": "^3.2.7",
        "delegates": "^0.1.0",
@@ -26,21 +26,21 @@
    "jslint:fix": "npm run jslint --fix"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.9.9",
+    "@jambonz/db-helpers": "^0.9.11",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.8.8",
+    "@jambonz/realtimedb-helpers": "^0.8.13",
    "@jambonz/rtpengine-utils": "^0.4.4",
    "@jambonz/siprec-client-utils": "^0.2.10",
    "@jambonz/stats-collector": "^0.1.10",
    "@jambonz/time-series": "^0.2.10",
-    "@jambonz/digest-utils": "^0.0.5",
+    "@jambonz/digest-utils": "^0.0.6",
    "@aws-sdk/client-sns": "^3.549.0",
    "@aws-sdk/client-auto-scaling": "^3.549.0",
    "bent": "^7.3.12",
    "cidr-matcher": "^2.1.1",
    "debug": "^4.3.4",
    "drachtio-fn-b2b-sugar": "0.2.1",
-    "drachtio-srf": "^5.0.2",
+    "drachtio-srf": "^5.0.5",
    "express": "^4.19.2",
    "pino": "^8.20.0",
    "verify-aws-sns-signature": "^0.1.0",
Author	SHA1	Message	Date
rammohan-y	35c38685a9	Updated drachtio-srf version (#199 ) https://github.com/drachtio/drachtio-server/issues/424	2025-04-22 11:05:30 -04:00
Hoan Luu Huu	8d15098b77	update drachtio srf 5.0.4 (#198 )	2025-04-18 07:45:18 -04:00
Hoan Luu Huu	656ad3b6cb	update digest-utils version (#197 )	2025-04-17 19:45:39 -04:00
rammohan-y	7eccb6816d	Updated db-helper to 0.9.11 (#196 ) https://github.com/jambonz/jambonz-feature-server/issues/1151	2025-04-14 08:22:17 -04:00
rammohan-y	f58cf8eecf	updated realtimedb-helper to 0.8.13 (#195 )	2025-03-10 09:54:03 -04:00
Dave Horton	638c003dfc	fix aws sns topic subscribe (#193 )	2025-02-24 12:57:23 -05:00
Dave Horton	23c748046d	REFER should have sips contact if far end is using sips (#192 )	2025-02-24 09:37:18 -05:00