v1.9.0

skyway · Jun 6, 2024 · db27992 · db27992
1 parent c081cfb
commit db27992
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 84 deletions.
diff --git a/THIRD_PARTY_LICENSE b/THIRD_PARTY_LICENSE
@@ -60,7 +60,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/core@1.8.1
+@skyway-sdk/core@1.9.0
 
 MIT
 
@@ -122,7 +122,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/room@1.8.1
+@skyway-sdk/room@1.9.0
 
 MIT
 
@@ -153,7 +153,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/rtc-api-client@1.6.0
+@skyway-sdk/rtc-api-client@1.7.0
 
 MIT
 
@@ -184,7 +184,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/rtc-rpc-api-client@1.6.0
+@skyway-sdk/rtc-rpc-api-client@1.7.0
 
 MIT
 
@@ -246,7 +246,7 @@ SOFTWARE.
 
 ---
 
-@skyway-sdk/sfu-bot@1.8.1
+@skyway-sdk/sfu-bot@1.9.0
 
 MIT
 
@@ -457,7 +457,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---
 
-[email protected].1
+[email protected].2
 
 MIT
 
@@ -552,7 +552,7 @@ THE SOFTWARE.
 
 ---
 
-[email protected].4
+[email protected].5
 
 MIT
 
@@ -1226,7 +1226,7 @@ SOFTWARE.
 
 ---
 
-[email protected].37
+[email protected].38
 
 MIT
 
@@ -1257,7 +1257,7 @@ SOFTWARE.
 
 ---
 
-[email protected].0
+[email protected].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.1",
+  "version": "1.9.0",
   "description": "The official Next Generation JavaScript SDK for SkyWay",
   "homepage": "https://skyway.ntt.com/",
   "repository": {
@@ -48,7 +48,7 @@
   },
   "dependencies": {
     "@skyway-sdk/analytics-client": "^0.1.0-beta3",
-    "@skyway-sdk/rtc-api-client": "^1.6.0",
+    "@skyway-sdk/rtc-api-client": "^1.7.0",
     "@skyway-sdk/signaling-client": "^1.0.4",
     "bowser": "^2.11.0",
     "deepmerge": "^4.2.2",

diff --git a/packages/core/src/channel/index.ts b/packages/core/src/channel/index.ts
@@ -369,8 +369,9 @@ export class SkyWayChannelImpl implements Channel {
       async ({ publication }) =>
         await this._handleOnPublicationEnabled(publication)
     );
-    this._channelImpl.onPublicationDisabled.add(({ publication }) =>
-      this._handleOnPublicationDisabled(publication)
+    this._channelImpl.onPublicationDisabled.add(
+      async ({ publication }) =>
+        await this._handleOnPublicationDisabled(publication)
     );
     this._channelImpl.onPublicationSubscribed.add(({ subscription }) => {
       this._handleOnStreamSubscribe(subscription);
@@ -458,9 +459,11 @@ export class SkyWayChannelImpl implements Channel {
     this.onPublicationEnabled.emit({ publication });
   }
 
-  private _handleOnPublicationDisabled(publicationDto: model.Publication) {
+  private async _handleOnPublicationDisabled(
+    publicationDto: model.Publication
+  ) {
     const publication = this._getPublication(publicationDto.id);
-    publication._disable();
+    await publication._disable();
 
     this.onPublicationDisabled.emit({ publication });
   }

diff --git a/packages/core/src/member/localPerson/index.ts b/packages/core/src/member/localPerson/index.ts
@@ -477,6 +477,7 @@ export class LocalPersonImpl extends MemberImpl implements LocalPerson {
       channel: this.channel.id,
       contentType: stream.contentType,
       codecCapabilities: options.codecCapabilities ?? [],
+      isEnabled: options.isEnabled,
     };
     if (
       stream.contentType === 'video' &&
@@ -503,6 +504,14 @@ export class LocalPersonImpl extends MemberImpl implements LocalPerson {
       })
     );
 
+    // publication作成時にpublication.state=isEnabledとなり、その後isEnabledに合わせてpublicationのenableStream/disableStreamを呼び出してもsetIsEnabled/setEnabledが実行されない。
+    // そのままではpublication.stateとstreamで状態の乖離が発生する場合があるため、ここで直接実行し一致させておく。
+    if (stream.contentType === 'data') {
+      stream.setIsEnabled(published.isEnabled);
+    } else {
+      await stream.setEnabled(published.isEnabled);
+    }
+
     const publication = this.channel._addPublication(published);
     publication._setStream(stream);
 
@@ -956,6 +965,13 @@ export type PublicationOptions = {
    * P2Pを利用している場合、最もビットレートの低い設定のみが適用される。
    */
   encodings?: EncodingParameters[];
+  /**
+   * @description [japanese]
+   * publicationを有効にしてpublishするか指定する。
+   * デフォルトではtrueが設定される。
+   * falseに設定された場合、publicationは一時停止された状態でpublishされる。
+   */
+  isEnabled?: boolean;
 };
 
 export type SubscriptionOptions = {

diff --git a/packages/core/src/plugin/internal/person/connection/index.ts b/packages/core/src/plugin/internal/person/connection/index.ts
@@ -192,6 +192,7 @@ export class P2PConnection implements SkyWayConnection {
         stream = this.receiver.streams[publicationId];
       }
 
+      stream.setIsEnabled(subscription.publication.state === 'enabled');
       subscription.codec = stream.codec;
       subscription._setStream(stream);
 

diff --git a/packages/core/src/publication/index.ts b/packages/core/src/publication/index.ts
@@ -233,10 +233,10 @@ export class PublicationImpl<T extends LocalStream = LocalStream>
     this.origin = args.origin;
     this.setCodecCapabilities(args.codecCapabilities ?? []);
     this.setEncodings(normalizeEncodings(args.encodings ?? []));
+    this._state = args.isEnabled ? 'enabled' : 'disabled';
     if (args.stream) {
       this._setStream(args.stream);
     }
-    this._state = args.isEnabled ? 'enabled' : 'disabled';
     this._analytics = this._channel.localPerson?._analytics;
 
     log.debug('publication spawned', this.toJSON());
@@ -255,8 +255,8 @@ export class PublicationImpl<T extends LocalStream = LocalStream>
   }
 
   /**@private */
-  _disable() {
-    this._disableStream();
+  async _disable() {
+    await this._disableStream();
 
     this.onDisabled.emit();
     this.onStateChanged.emit();
@@ -393,7 +393,7 @@ export class PublicationImpl<T extends LocalStream = LocalStream>
         this
       );
 
-      this._disableStream();
+      await this._disableStream();
 
       let failed = false;
       this._channel._disablePublication(this.id).catch((e) => {
@@ -421,7 +421,7 @@ export class PublicationImpl<T extends LocalStream = LocalStream>
         });
     });
 
-  private _disableStream() {
+  private async _disableStream() {
     if (this.state === 'disabled') {
       return;
     }
@@ -433,7 +433,7 @@ export class PublicationImpl<T extends LocalStream = LocalStream>
     if (this.stream.contentType === 'data') {
       this.stream.setIsEnabled(false);
     } else {
-      this.stream.setEnabled(false).catch((e) => {
+      await this.stream.setEnabled(false).catch((e) => {
         log.warn(
           createWarnPayload({
             channel: this._channel,

diff --git a/packages/core/src/version.ts b/packages/core/src/version.ts
@@ -1 +1 @@
-export const PACKAGE_VERSION = '1.8.1';
+export const PACKAGE_VERSION = '1.9.0';
diff --git a/packages/room/package.json b/packages/room/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skyway-sdk/room",
-  "version": "1.8.1",
+  "version": "1.9.0",
   "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.1",
-    "@skyway-sdk/sfu-bot": "^1.8.1",
+    "@skyway-sdk/core": "^1.9.0",
+    "@skyway-sdk/sfu-bot": "^1.9.0",
     "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.1';
+export const PACKAGE_VERSION = '1.9.0';
diff --git a/packages/rtc-api-client/package.json b/packages/rtc-api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skyway-sdk/rtc-api-client",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "The official Next Generation JavaScript SDK for SkyWay",
   "homepage": "https://skyway.ntt.com/",
   "repository": {
@@ -35,7 +35,7 @@
     "watch:tsc": "tsc -p tsconfig.build.json -w"
   },
   "dependencies": {
-    "@skyway-sdk/rtc-rpc-api-client": "^1.6.0",
+    "@skyway-sdk/rtc-rpc-api-client": "^1.7.0",
     "@skyway-sdk/token": "^1.6.0",
     "deepmerge": "^4.2.2",
     "uuid": "^9.0.0"

diff --git a/packages/rtc-api-client/src/domain/api.ts b/packages/rtc-api-client/src/domain/api.ts
@@ -48,7 +48,10 @@ export interface RtcApi {
     metadata: string
   ): Promise<void>;
   /**@throws {@link SkyWayError} */
-  publish(appId: string, init: PublicationInit): Promise<model.Publication>;
+  publish(
+    appId: string,
+    init: PublicationInit
+  ): Promise<model.Publication['id']>;
   unpublish(
     appId: string,
     channelId: Channel['id'],
@@ -71,7 +74,10 @@ export interface RtcApi {
     publicationId: Publication['id']
   ): Promise<void>;
   /**@throws {@link SkyWayError} */
-  subscribe(appId: string, init: SubscriptionInit): Promise<model.Subscription>;
+  subscribe(
+    appId: string,
+    init: SubscriptionInit
+  ): Promise<model.Subscription['id']>;
   unsubscribe(
     appId: string,
     channelId: string,
@@ -108,6 +114,7 @@ export type PublicationInit = {
   contentType: model.ContentType;
   codecCapabilities?: model.Codec[];
   encodings?: model.Encoding[];
+  isEnabled?: boolean;
 };
 
 export type SubscriptionInit = {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const PACKAGE_VERSION = '1.8.1';
		export const PACKAGE_VERSION = '1.9.0';