整理

shiguredo · Jan 10, 2025 · 715277e · 715277e
1 parent 81401f7
commit 715277e
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 33 deletions.
diff --git a/check_stereo/main.ts b/check_stereo/main.ts
@@ -123,8 +123,12 @@ class SendonlyClient {
   }
 
   async connect(stream: MediaStream): Promise<void> {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = { access_token: jwt };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     const audioTrack = stream.getAudioTracks()[0];
     if (!audioTrack) {

diff --git a/check_stereo_multi/main.ts b/check_stereo_multi/main.ts
@@ -160,10 +160,12 @@ class SendonlyClient {
   }
 
   async connect(stream: MediaStream): Promise<void> {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = {
-      access_token: jwt,
-    };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     const audioTrack = stream.getAudioTracks()[0];
     if (!audioTrack) {

diff --git a/messaging/main.ts b/messaging/main.ts
@@ -114,8 +114,12 @@ class SoraClient {
   }
 
   async connect(compress: boolean, header: boolean) {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = { access_token: jwt };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     // connect ボタンを無効にする
     const connectButton = document.querySelector<HTMLButtonElement>("#connect");

diff --git a/recvonly/main.ts b/recvonly/main.ts
@@ -86,8 +86,12 @@ class SoraClient {
   }
 
   async connect(): Promise<void> {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = { access_token: jwt };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     await this.connection.connect();
   }

diff --git a/replace_track/main.ts b/replace_track/main.ts
@@ -121,10 +121,12 @@ class SoraClient {
   }
 
   async connect() {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = {
-      access_token: jwt,
-    };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     await this.connection.connect(this.stream);
     const localVideo = document.querySelector<HTMLVideoElement>("#local-video");

diff --git a/sendonly/main.ts b/sendonly/main.ts
@@ -92,10 +92,12 @@ class SoraClient {
   }
 
   async connect(stream: MediaStream): Promise<void> {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = {
-      access_token: jwt,
-    };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     await this.connection.connect(stream);
 

diff --git a/sendrecv/main.ts b/sendrecv/main.ts
@@ -109,10 +109,12 @@ class SoraClient {
   }
 
   async connect(stream: MediaStream) {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = {
-      access_token: jwt,
-    };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     await this.connection.connect(stream);
     const localVideo = document.querySelector<HTMLVideoElement>("#local-video");

diff --git a/simulcast/main.ts b/simulcast/main.ts
@@ -146,10 +146,12 @@ class SimulcastSendonlySoraClient {
   }
 
   async connect(stream: MediaStream) {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = {
-      access_token: jwt,
-    };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     await this.connection.connect(stream);
 

diff --git a/spotlight_sendrecv/main.ts b/spotlight_sendrecv/main.ts
@@ -72,10 +72,12 @@ class SoraClient {
   }
 
   async connect(stream: MediaStream) {
-    const jwt = await generateJwt(this.channelId, this.secretKey);
-    this.connection.metadata = {
-      access_token: jwt,
-    };
+    if (this.secretKey !== "") {
+      const jwt = await generateJwt(this.channelId, this.secretKey);
+      this.connection.metadata = {
+        access_token: jwt,
+      };
+    }
 
     await this.connection.connect(stream);
 

diff --git a/src/misc.ts b/src/misc.ts
@@ -4,9 +4,6 @@ export const generateJwt = async (
   channelId: string,
   secretKey: string,
 ): Promise<string> => {
-  if (secretKey === "") {
-    return "";
-  }
   const header = { alg: "HS256", typ: "JWT" };
   return (
     new jose.SignJWT({