Merge pull request #19 from kwan3854/v2.0.5

kwan3854 · web-flow · commit cf710b2af126 · 2025-07-01T12:21:24.000+09:00
Switches to UUID request IDs and simplifies chunk management
diff --git a/Packages/WebviewRpc/Runtime/ChunkAssembler.cs b/Packages/WebviewRpc/Runtime/ChunkAssembler.cs
@@ -16,10 +16,9 @@ private class ChunkSet
             public int TotalChunks { get; set; }
             public int OriginalSize { get; set; }
             public DateTime LastActivity { get; set; }
-            public string RequestId { get; set; }
         }
 
-        private readonly Dictionary<string, ChunkSet> _chunkSets = new();
+        private readonly Dictionary<string, ChunkSet> _chunkSetsByRequest = new();
         private readonly object _lock = new object();
 
         /// <summary>
@@ -46,31 +45,31 @@ public byte[] TryAssemble(RpcEnvelope envelope, out List<string> timedOutRequest
             lock (_lock)
             {
                 var chunkInfo = envelope.ChunkInfo;
+                var requestId = envelope.RequestId;
 
-                // Check if we've reached the maximum number of chunk sets
-                if (!_chunkSets.ContainsKey(chunkInfo.ChunkSetId) &&
-                    _chunkSets.Count >= WebViewRpcConfiguration.MaxConcurrentChunkSets)
+                // Check if we've reached the maximum number of concurrent requests
+                if (!_chunkSetsByRequest.ContainsKey(requestId) &&
+                    _chunkSetsByRequest.Count >= WebViewRpcConfiguration.MaxConcurrentChunkSets)
                 {
-                    // Remove the oldest chunk set
-                    var oldestKey = _chunkSets
+                    // Remove the oldest request
+                    var oldestKey = _chunkSetsByRequest
                         .OrderBy(kvp => kvp.Value.LastActivity)
                         .First()
                         .Key;
-                    _chunkSets.Remove(oldestKey);
+                    _chunkSetsByRequest.Remove(oldestKey);
                     Debug.LogWarning(
-                        $"Maximum chunk sets reached ({WebViewRpcConfiguration.MaxConcurrentChunkSets}). Removed oldest chunk set {oldestKey}");
+                        $"Maximum concurrent requests reached ({WebViewRpcConfiguration.MaxConcurrentChunkSets}). Removed oldest request {oldestKey}");
                 }
 
-                if (!_chunkSets.TryGetValue(chunkInfo.ChunkSetId, out var chunkSet))
+                if (!_chunkSetsByRequest.TryGetValue(requestId, out var chunkSet))
                 {
                     chunkSet = new ChunkSet
                     {
                         TotalChunks = chunkInfo.TotalChunks,
                         OriginalSize = chunkInfo.OriginalSize,
-                        LastActivity = DateTime.UtcNow,
-                        RequestId = envelope.RequestId
+                        LastActivity = DateTime.UtcNow
                     };
-                    _chunkSets[chunkInfo.ChunkSetId] = chunkSet;
+                    _chunkSetsByRequest[requestId] = chunkSet;
                 }
 
                 // Add chunk
@@ -88,7 +87,7 @@ public byte[] TryAssemble(RpcEnvelope envelope, out List<string> timedOutRequest
                     {
                         if (!chunkSet.Chunks.TryGetValue(i, out var chunk))
                         {
-                            Debug.LogError($"Missing chunk {i} in set {chunkInfo.ChunkSetId}");
+                            Debug.LogError($"Missing chunk {i} for request {requestId}");
                             return null;
                         }
 
@@ -97,7 +96,7 @@ public byte[] TryAssemble(RpcEnvelope envelope, out List<string> timedOutRequest
                     }
 
                     // Clean up
-                    _chunkSets.Remove(chunkInfo.ChunkSetId);
+                    _chunkSetsByRequest.Remove(requestId);
 
                     // Verify size
                     if (offset != chunkSet.OriginalSize)
@@ -109,18 +108,18 @@ public byte[] TryAssemble(RpcEnvelope envelope, out List<string> timedOutRequest
                     return result;
                 }
 
-                // Cleanup old chunk sets (older than configured timeout)
+                // Cleanup old requests (older than configured timeout)
                 var cutoff = DateTime.UtcNow.AddSeconds(-WebViewRpcConfiguration.ChunkTimeoutSeconds);
-                var toRemove = _chunkSets
+                var toRemove = _chunkSetsByRequest
                     .Where(kvp => kvp.Value.LastActivity < cutoff)
                     .ToList();
 
                 foreach (var kvp in toRemove)
                 {
-                    timedOutRequestIds.Add(kvp.Value.RequestId);
-                    _chunkSets.Remove(kvp.Key);
+                    timedOutRequestIds.Add(kvp.Key);
+                    _chunkSetsByRequest.Remove(kvp.Key);
                     Debug.LogWarning(
-                        $"Removed incomplete chunk set {kvp.Key} for request {kvp.Value.RequestId} due to timeout");
+                        $"Removed incomplete chunks for request {kvp.Key} due to timeout");
                 }
 
                 return null; // Not all chunks received yet
diff --git a/Packages/WebviewRpc/Runtime/IWebViewBridge.cs b/Packages/WebviewRpc/Runtime/IWebViewBridge.cs
@@ -12,11 +12,11 @@ public interface IWebViewBridge : IDisposable
         /// <summary>
         /// C# to WebView send string
         /// </summary>
-        void SendMessageToWeb(string message);
+        public void SendMessageToWeb(string message);
 
         /// <summary>
         /// JS to C# receive string
         /// </summary>
-        event Action<string> OnMessageReceived;
+        public event Action<string> OnMessageReceived;
     }
 }
diff --git a/Packages/WebviewRpc/Runtime/WebViewRpcClient.cs b/Packages/WebviewRpc/Runtime/WebViewRpcClient.cs
@@ -12,13 +12,14 @@ namespace WebViewRPC
     /// </summary>
     public class WebViewRpcClient : IDisposable
     {
+        private bool _disposed;
+        
         private readonly IWebViewBridge _bridge;
         private readonly Dictionary<string, UniTaskCompletionSource<RpcEnvelope>> _pendingRequests = new();
         private readonly ChunkAssembler _chunkAssembler = new();
-        private int _requestIdCounter = 1;
+        private readonly CancellationTokenSource _cancellationTokenSource = new();
         private readonly object _pendingRequestsLock = new object();
-        private bool _disposed;
-        private CancellationTokenSource _cancellationTokenSource = new();
+
 
         public WebViewRpcClient(IWebViewBridge bridge)
         {
@@ -39,7 +40,7 @@ public async UniTask<TResponse> CallMethod<TResponse>(string method, IMessage re
                 throw new ObjectDisposedException(nameof(WebViewRpcClient), "Cannot call method on disposed client");
             }
             
-            var requestId = Interlocked.Increment(ref _requestIdCounter).ToString();
+            var requestId = Guid.NewGuid().ToString("N");
             var requestBytes = request.ToByteArray();
             
             var tcs = new UniTaskCompletionSource<RpcEnvelope>();
@@ -99,7 +100,6 @@ private async UniTask SendChunkedMessage(string requestId, string method, byte[]
             // Check disposed state
             if (_disposed || _cancellationTokenSource.Token.IsCancellationRequested) return;
             
-            var chunkSetId = $"{requestId}_{Guid.NewGuid():N}";
             int effectivePayloadSize = WebViewRpcConfiguration.GetEffectivePayloadSize();
             var totalChunks = (int)Math.Ceiling((double)data.Length / effectivePayloadSize);
             
@@ -121,7 +121,7 @@ private async UniTask SendChunkedMessage(string requestId, string method, byte[]
                     Payload = ByteString.CopyFrom(chunkData),
                     ChunkInfo = new ChunkInfo
                     {
-                        ChunkSetId = chunkSetId,
+                        ChunkSetId = "", // Not used anymore, but required by protobuf
                         ChunkIndex = i,
                         TotalChunks = totalChunks,
                         OriginalSize = data.Length
diff --git a/Packages/WebviewRpc/Runtime/WebViewRpcServer.cs b/Packages/WebviewRpc/Runtime/WebViewRpcServer.cs
@@ -9,10 +9,11 @@ namespace WebViewRPC
 {
     public class WebViewRpcServer : IDisposable
     {
+        private bool _disposed;
+        
         private readonly IWebViewBridge _bridge;
         private readonly ChunkAssembler _chunkAssembler = new();
-        private bool _disposed;
-        private CancellationTokenSource _cancellationTokenSource = new();
+        private readonly CancellationTokenSource _cancellationTokenSource = new();
 
         /// <summary>
         /// You can add multiple services to the server.
@@ -202,7 +203,6 @@ private async UniTask SendChunkedMessage(string requestId, string method, byte[]
             // Check disposed state before starting
             if (_disposed || cancellationToken.IsCancellationRequested) return;
             
-            var chunkSetId = $"{requestId}_{Guid.NewGuid():N}";
             int effectivePayloadSize = WebViewRpcConfiguration.GetEffectivePayloadSize();
             var totalChunks = (int)Math.Ceiling((double)data.Length / effectivePayloadSize);
             
@@ -224,7 +224,7 @@ private async UniTask SendChunkedMessage(string requestId, string method, byte[]
                     Payload = ByteString.CopyFrom(chunkData),
                     ChunkInfo = new ChunkInfo
                     {
-                        ChunkSetId = chunkSetId,
+                        ChunkSetId = "",
                         ChunkIndex = i,
                         TotalChunks = totalChunks,
                         OriginalSize = data.Length
diff --git a/Packages/WebviewRpc/package.json b/Packages/WebviewRpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.kwanjoong.webviewrpc",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "displayName": "Webview RPC",
   "description": "The webview Remote Procedure Call bridge.",
   "unity": "2022.3",
@@ -20,7 +20,7 @@
     "url": "https://github.com/kwan3854/Unity-WebviewRpc.git"
   },
   "dependencies": {
-
+    "com.cysharp.unitask": "2.5.10"
   },
   "license": "MIT"
 }
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -18,7 +18,9 @@
       "version": "file:WebviewRpc",
       "depth": 0,
       "source": "embedded",
-      "dependencies": {}
+      "dependencies": {
+        "com.cysharp.unitask": "2.5.10"
+      }
     },
     "com.unity.ai.navigation": {
       "version": "2.0.5",
diff --git a/webview_rpc_runtime_library/CHANGELOG.md b/webview_rpc_runtime_library/CHANGELOG.md
@@ -5,7 +5,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.0.9] - 2025-01-22
+## [2.0.11] - 2025-07-01
+### Fixed
+- Corrected release dates in CHANGELOG.md
+
+## [2.0.10] - 2025-07-01
+### Changed
+- **BREAKING**: RequestId generation changed from incremental integer to UUID/GUID for true uniqueness across multiple WebView instances
+- Simplified chunk management by removing ChunkSetId dependency and using RequestId directly
+- Improved performance by eliminating unnecessary string concatenation operations
+- ChunkAssembler now manages chunks by RequestId instead of ChunkSetId
+
+### Fixed
+- Fixed potential RequestId collisions when multiple WebView instances are used simultaneously
+
+## [2.0.9] - 2025-06-30
 
 ### Added
 - `maxConcurrentChunkSets` configuration option (default: 100, min: 10, max: 1000)
@@ -22,7 +36,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - ChunkAssembler now returns timed out request IDs for proper cleanup
 - Both Unity and JavaScript implementations now handle chunk timeouts consistently
 
-## [2.0.8] - 2025-01-22
+## [2.0.8] - 2025-06-30
 
 ### Added
 - Proper dispose pattern for JavaScript components
@@ -41,7 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Memory leaks from unremoved event listeners
 - Potential resource leaks when page navigates away
 
-## [2.0.7] - 2025-01-22
+## [2.0.7] - 2025-06-30
 
 ### Fixed
 - Improved error handling: errors now take precedence over payload
@@ -52,7 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Error responses can now include payload data if available
 - Clearer error messages when methods return null without setting an error
 
-## [2.0.6] - 2025-01-22
+## [2.0.6] - 2025-06-30
 
 ### Added
 - Smart chunk size calculation that accounts for RPC envelope and Base64 encoding overhead
diff --git a/webview_rpc_runtime_library/package.json b/webview_rpc_runtime_library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app-webview-rpc",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "type": "module",
   "description": "WebView RPC provides an abstraction layer that allows communication between the App (e.g. Unity C#) and WebView (HTML, JS) using protobuf, similar to gRPC.",
   "main": "./dist/cjs/index.js",
diff --git a/webview_rpc_runtime_library/src/core/chunk_assembler.js b/webview_rpc_runtime_library/src/core/chunk_assembler.js
@@ -5,7 +5,7 @@ import { WebViewRpcConfiguration } from './webview_rpc_configuration.js';
  */
 export class ChunkAssembler {
     constructor() {
-        this._chunkSets = new Map();
+        this._chunkSetsByRequest = new Map();
     }
 
     /**
@@ -22,39 +22,38 @@ export class ChunkAssembler {
         }
 
         const chunkInfo = envelope.chunkInfo;
-        const chunkSetId = chunkInfo.chunkSetId;
+        const requestId = envelope.requestId;
 
-        // Check if we've reached the maximum number of chunk sets
-        if (!this._chunkSets.has(chunkSetId) && 
-            this._chunkSets.size >= WebViewRpcConfiguration.maxConcurrentChunkSets) {
-            // Remove the oldest chunk set
+        // Check if we've reached the maximum number of concurrent requests
+        if (!this._chunkSetsByRequest.has(requestId) && 
+            this._chunkSetsByRequest.size >= WebViewRpcConfiguration.maxConcurrentChunkSets) {
+            // Remove the oldest request
             let oldestKey = null;
             let oldestTime = Date.now();
             
-            for (const [key, value] of this._chunkSets) {
+            for (const [key, value] of this._chunkSetsByRequest) {
                 if (value.lastActivity < oldestTime) {
                     oldestTime = value.lastActivity;
                     oldestKey = key;
                 }
             }
             
             if (oldestKey) {
-                this._chunkSets.delete(oldestKey);
-                console.warn(`Maximum chunk sets reached (${WebViewRpcConfiguration.maxConcurrentChunkSets}). Removed oldest chunk set ${oldestKey}`);
+                this._chunkSetsByRequest.delete(oldestKey);
+                console.warn(`Maximum concurrent requests reached (${WebViewRpcConfiguration.maxConcurrentChunkSets}). Removed oldest request ${oldestKey}`);
             }
         }
 
-        if (!this._chunkSets.has(chunkSetId)) {
-            this._chunkSets.set(chunkSetId, {
+        if (!this._chunkSetsByRequest.has(requestId)) {
+            this._chunkSetsByRequest.set(requestId, {
                 chunks: new Map(),
                 totalChunks: chunkInfo.totalChunks,
                 originalSize: chunkInfo.originalSize,
-                lastActivity: Date.now(),
-                requestId: envelope.requestId
+                lastActivity: Date.now()
             });
         }
 
-        const chunkSet = this._chunkSets.get(chunkSetId);
+        const chunkSet = this._chunkSetsByRequest.get(requestId);
         
         // Add chunk
         const chunkIndex = Number(chunkInfo.chunkIndex);
@@ -70,7 +69,7 @@ export class ChunkAssembler {
             for (let i = 1; i <= chunkSet.totalChunks; i++) {
                 const chunk = chunkSet.chunks.get(i);
                 if (!chunk) {
-                    console.error(`Missing chunk ${i} in set ${chunkSetId}`);
+                    console.error(`Missing chunk ${i} for request ${requestId}`);
                     console.error(`Available chunks:`, Array.from(chunkSet.chunks.keys()));
                     return { data: null, timedOutRequestIds };
                 }
@@ -80,7 +79,7 @@ export class ChunkAssembler {
             }
 
             // Clean up
-            this._chunkSets.delete(chunkSetId);
+            this._chunkSetsByRequest.delete(requestId);
 
             // Verify size
             if (offset !== chunkSet.originalSize) {
@@ -91,20 +90,20 @@ export class ChunkAssembler {
             return { data: result, timedOutRequestIds };
         }
 
-        // Cleanup old chunk sets (older than configured timeout)
+        // Cleanup old requests (older than configured timeout)
         const cutoff = Date.now() - (WebViewRpcConfiguration.chunkTimeoutSeconds * 1000);
         const toRemove = [];
         
-        for (const [key, value] of this._chunkSets) {
+        for (const [key, value] of this._chunkSetsByRequest) {
             if (value.lastActivity < cutoff) {
-                toRemove.push({ key, requestId: value.requestId });
+                toRemove.push(key);
             }
         }
 
-        for (const { key, requestId } of toRemove) {
+        for (const requestId of toRemove) {
             timedOutRequestIds.push(requestId);
-            this._chunkSets.delete(key);
-            console.warn(`Removed incomplete chunk set ${key} for request ${requestId} due to timeout`);
+            this._chunkSetsByRequest.delete(requestId);
+            console.warn(`Removed incomplete chunks for request ${requestId} due to timeout`);
         }
 
         return { data: null, timedOutRequestIds }; // Not all chunks received yet
diff --git a/webview_rpc_runtime_library/src/core/webview_rpc_client.js b/webview_rpc_runtime_library/src/core/webview_rpc_client.js
diff --git a/webview_rpc_runtime_library/src/core/webview_rpc_server.js b/webview_rpc_runtime_library/src/core/webview_rpc_server.js
diff --git a/webview_rpc_sample/package-lock.json b/webview_rpc_sample/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ public interface IWebViewBridge : IDisposable`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// C# to WebView send string`
`14`	`14`	`/// </summary>`
`15`		`- void SendMessageToWeb(string message);`
	`15`	`+ public void SendMessageToWeb(string message);`
`16`	`16`
`17`	`17`	`/// <summary>`
`18`	`18`	`/// JS to C# receive string`
`19`	`19`	`/// </summary>`
`20`		`- event Action<string> OnMessageReceived;`
	`20`	`+ public event Action<string> OnMessageReceived;`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "app-webview-rpc",`
`3`		`- "version": "2.0.9",`
	`3`	`+ "version": "2.0.11",`
`4`	`4`	`"type": "module",`
`5`	`5`	`"description": "WebView RPC provides an abstraction layer that allows communication between the App (e.g. Unity C#) and WebView (HTML, JS) using protobuf, similar to gRPC.",`
`6`	`6`	`"main": "./dist/cjs/index.js",`