v1.8.1

skyway · May 21, 2024 · c081cfb · c081cfb
1 parent 7ec62c7
commit c081cfb
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 94 deletions.
diff --git a/THIRD_PARTY_LICENSE b/THIRD_PARTY_LICENSE
@@ -60,7 +60,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/[email protected].0
+@skyway-sdk/[email protected].1
 
 MIT
 
@@ -122,7 +122,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/[email protected].0
+@skyway-sdk/[email protected].1
 
 MIT
 
@@ -246,7 +246,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/[email protected].0
+@skyway-sdk/[email protected].1
 
 MIT
 
@@ -457,7 +457,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---
 
-axios@1.6.8
+axios@1.7.1
 
 MIT
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skyway-sdk/core",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "The official Next Generation JavaScript SDK for SkyWay",
   "homepage": "https://skyway.ntt.com/",
   "repository": {

diff --git a/packages/core/src/plugin/internal/person/connection/index.ts b/packages/core/src/plugin/internal/person/connection/index.ts
@@ -32,9 +32,10 @@ export class P2PConnection implements SkyWayConnection {
     localPersonId: this.localPerson.id,
   });
   private _pubsubQueue = new PromiseQueue();
-  private sendSubscriptionStatsReportTimer: ReturnType<
-    typeof setInterval
-  > | null = null;
+  private sendSubscriptionStatsReportTimers: Map<
+    string,
+    ReturnType<typeof setInterval>
+  > = new Map();
   private _waitingSendSubscriptionStatsReportsFromPublish: Map<string, string> =
     new Map();
   private _waitingSendSubscriptionStatsReportsFromSubscribe: string[] = [];
@@ -155,8 +156,12 @@ export class P2PConnection implements SkyWayConnection {
       this._log.debug('<stopPublishing> end', { publication });
     });
 
-    if (this.sendSubscriptionStatsReportTimer) {
-      clearInterval(this.sendSubscriptionStatsReportTimer);
+    // publication(=stream）のidをkeyとして一致するタイマーを取得する
+    const sendSubscriptionStatsReportTimer =
+      this.sendSubscriptionStatsReportTimers.get(publication.id);
+    if (sendSubscriptionStatsReportTimer) {
+      clearInterval(sendSubscriptionStatsReportTimer);
+      this.sendSubscriptionStatsReportTimers.delete(publication.id);
     }
   }
 
@@ -221,8 +226,12 @@ export class P2PConnection implements SkyWayConnection {
       this._closeIfNeeded();
     });
 
-    if (this.sendSubscriptionStatsReportTimer) {
-      clearInterval(this.sendSubscriptionStatsReportTimer);
+    // subscription(=stream）のidをkeyとして一致するタイマーを取得する
+    const sendSubscriptionStatsReportTimer =
+      this.sendSubscriptionStatsReportTimers.get(subscription.id);
+    if (sendSubscriptionStatsReportTimer) {
+      clearInterval(sendSubscriptionStatsReportTimer);
+      this.sendSubscriptionStatsReportTimers.delete(subscription.id);
     }
   }
 
@@ -286,38 +295,44 @@ export class P2PConnection implements SkyWayConnection {
     if (this._analytics) {
       const role = stream instanceof PublicationImpl ? 'sender' : 'receiver';
       const intervalSec = this._analytics.client.getIntervalSec();
-      this.sendSubscriptionStatsReportTimer = setInterval(async () => {
-        if (!this._analytics) {
-          throw createError({
-            operationName: 'P2PConnection.sendSubscriptionStatsReportTimer',
-            info: {
-              ...errors.missingProperty,
-              detail: 'AnalyticsSession not exist',
-            },
-            path: log.prefix,
-            context: this._context,
-            channel: this.localPerson.channel,
-          });
-        }
+      this.sendSubscriptionStatsReportTimers.set(
+        stream.id,
+        setInterval(async () => {
+          if (!this._analytics) {
+            throw createError({
+              operationName: 'P2PConnection.sendSubscriptionStatsReportTimer',
+              info: {
+                ...errors.missingProperty,
+                detail: 'AnalyticsSession not exist',
+              },
+              path: log.prefix,
+              context: this._context,
+              channel: this.localPerson.channel,
+            });
+          }
 
-        // AnalyticsSessionがcloseされていたらタイマーを止める
-        if (this._analytics.isClosed()) {
-          if (this.sendSubscriptionStatsReportTimer) {
-            clearInterval(this.sendSubscriptionStatsReportTimer);
+          // AnalyticsSessionがcloseされていたらタイマーを止める
+          if (this._analytics.isClosed()) {
+            const subscriptionStatsReportTimer =
+              this.sendSubscriptionStatsReportTimers.get(stream.id);
+            if (subscriptionStatsReportTimer) {
+              clearInterval(subscriptionStatsReportTimer);
+              this.sendSubscriptionStatsReportTimers.delete(stream.id);
+            }
+            return;
           }
-          return;
-        }
 
-        const stats = await this.getStats(stream);
-        if (stats) {
-          // 再送時に他の処理をブロックしないためにawaitしない
-          void this._analytics.client.sendSubscriptionStatsReport(stats, {
-            subscriptionId: subscriptionId,
-            role: role,
-            createdAt: Date.now(),
-          });
-        }
-      }, intervalSec * 1000);
+          const stats = await this.getStats(stream);
+          if (stats) {
+            // 再送時に他の処理をブロックしないためにawaitしない
+            void this._analytics.client.sendSubscriptionStatsReport(stats, {
+              subscriptionId: subscriptionId,
+              role: role,
+              createdAt: Date.now(),
+            });
+          }
+        }, intervalSec * 1000)
+      );
     }
   }
 }

diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = '1.8.0';
+export const PACKAGE_VERSION = '1.8.1';
diff --git a/packages/room/package.json b/packages/room/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skyway-sdk/room",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "The official Next Generation JavaScript SDK for SkyWay",
   "homepage": "https://skyway.ntt.com/",
   "repository": {
@@ -46,8 +46,8 @@
     "watch:tsc": "tsc -p tsconfig.build.json -w"
   },
   "dependencies": {
-    "@skyway-sdk/core": "^1.8.0",
-    "@skyway-sdk/sfu-bot": "^1.8.0",
+    "@skyway-sdk/core": "^1.8.1",
+    "@skyway-sdk/sfu-bot": "^1.8.1",
     "uuid": "^9.0.0"
   },
   "devDependencies": {

diff --git a/packages/room/src/version.ts b/packages/room/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = '1.8.0';
+export const PACKAGE_VERSION = '1.8.1';
diff --git a/packages/sfu-bot/package.json b/packages/sfu-bot/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skyway-sdk/sfu-bot",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "The official Next Generation JavaScript SDK for SkyWay",
   "homepage": "https://skyway.ntt.com/",
   "repository": {
@@ -41,7 +41,7 @@
     "watch:tsc": "tsc -p tsconfig.build.json -w"
   },
   "dependencies": {
-    "@skyway-sdk/core": "^1.8.0",
+    "@skyway-sdk/core": "^1.8.1",
     "@skyway-sdk/sfu-api-client": "^1.4.6",
     "lodash": "4.17.21",
     "mediasoup-client": "3.6.82"

diff --git a/packages/sfu-bot/src/version.ts b/packages/sfu-bot/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = '1.8.0';
+export const PACKAGE_VERSION = '1.8.1';
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const PACKAGE_VERSION = '1.8.0';
		export const PACKAGE_VERSION = '1.8.1';