Sent ArrayBuffer to peer instead of Buffer. Use custom function to ch…

…ange string from utf-8 to hex.
Novage · Oct 11, 2023 · 548320d · 548320d
1 parent 9a14429
commit 548320d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/packages/p2p-media-loader-core/src/declarations.d.ts b/packages/p2p-media-loader-core/src/declarations.d.ts
@@ -1,8 +1,8 @@
 declare module "bittorrent-tracker" {
   export default class Client {
     constructor(options: {
-      infoHash: string | Buffer;
-      peerId: string | Buffer;
+      infoHash: string;
+      peerId: string;
       announce: string[];
       port: number;
       rtcConfig?: RTCConfiguration;
@@ -52,8 +52,8 @@ declare module "bittorrent-tracker" {
       event: E,
       handler: PeerConnectionEventHandler<E>
     ): void;
-    send(data: string | Blob | Buffer): void;
-    write(data: string | Blob | Buffer): void;
+    send(data: string | ArrayBuffer): void;
+    write(data: string | ArrayBuffer): void;
     destroy(): void;
   };
 }
diff --git a/packages/p2p-media-loader-core/src/p2p-loader.ts b/packages/p2p-media-loader-core/src/p2p-loader.ts
@@ -32,8 +32,8 @@ export class P2PLoader {
     );
 
     this.trackerClient = createTrackerClient({
-      streamHash: Buffer.from(this.streamExternalId, "utf-8"),
-      peerHash: Buffer.from(this.peerId, "utf-8"),
+      streamHash: utf8ToHex(this.streamExternalId),
+      peerHash: utf8ToHex(this.peerId),
     });
     this.logger(
       `create tracker client: ${LoggerUtils.getStreamString(stream)}; ${
@@ -202,8 +202,8 @@ function createTrackerClient({
   streamHash,
   peerHash,
 }: {
-  streamHash: Buffer;
-  peerHash: Buffer;
+  streamHash: string;
+  peerHash: string;
 }) {
   return new TrackerClient({
     infoHash: streamHash,
@@ -225,3 +225,12 @@ function createTrackerClient({
     },
   });
 }
+
+function utf8ToHex(utf8String: string) {
+  let result = "";
+  for (let i = 0; i < utf8String.length; i++) {
+    result += utf8String.charCodeAt(i).toString(16);
+  }
+
+  return result;
+}
diff --git a/packages/p2p-media-loader-core/src/peer.ts b/packages/p2p-media-loader-core/src/peer.ts
@@ -265,14 +265,14 @@ export class Peer {
 function* getBufferChunks(
   data: ArrayBuffer,
   maxChunkSize: number
-): Generator<Buffer> {
+): Generator<ArrayBuffer> {
   let bytesLeft = data.byteLength;
   while (bytesLeft > 0) {
     const bytesToSend = bytesLeft >= maxChunkSize ? maxChunkSize : bytesLeft;
     const from = data.byteLength - bytesLeft;
     const buffer = data.slice(from, from + bytesToSend);
     bytesLeft -= bytesToSend;
-    yield Buffer.from(buffer);
+    yield buffer;
   }
 }