breaking: AsmDef Updates

- KcpTransport moved up
- SimpleWeb moved into folder
- AsmDef chains updated and simplified

Assets/Mirror/Core/Mirror.asmdef

@@ -2,9 +2,7 @@
     "name": "Mirror",
     "rootNamespace": "",
     "references": [
-        "GUID:325984b52e4128546bc7558552f8b1d2",
+        "GUID:325984b52e4128546bc7558552f8b1d2"
-        "GUID:725ee7191c021de4dbf9269590ded755",
-        "GUID:6806a62c384838046a3c66c44f06d75f"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Mirror/Examples/Mirror.Examples.asmdef

@@ -4,6 +4,7 @@
     "references": [
         "GUID:30817c1a0e6d646d99c048fc403f5979",
         "GUID:72872094b21c16e48b631b2224833d49",
+        "GUID:627104647b9c04b4ebb8978a92ecac63",
         "GUID:6055be8ebefd69e48b49212b09b47b2f"
     ],
     "includePlatforms": [],

Assets/Mirror/Tests/Editor/Mirror.Tests.asmdef

@@ -6,13 +6,11 @@
         "GUID:1c7c33eb5480dd24c9e29a8250c1a775",
         "GUID:72872094b21c16e48b631b2224833d49",
         "GUID:4e9aca8a359ab48de906aedbfa1ffe21",
-        "GUID:725ee7191c021de4dbf9269590ded755",
         "GUID:27619889b8ba8c24980f49ee34dbb44a",
         "GUID:0acc523941302664db1f4e527237feb3",
         "GUID:1d0b9d21c3ff546a4aa32399dfd33474",
         "GUID:4887344a35d890449b35f8b1b0a3355a",
-        "GUID:e1cda8afe30f847fe8b40485b4768089",
+        "GUID:627104647b9c04b4ebb8978a92ecac63"
-        "GUID:513aba84521ba40b697b5aac9ecd91fc"
     ],
     "includePlatforms": [
         "Editor"
@@ -23,7 +21,6 @@
     "precompiledReferences": [
         "NSubstitute.dll",
         "Castle.Core.dll",
-        "System.Threading.Tasks.Extensions.dll",
         "Mono.CecilX.dll",
         "nunit.framework.dll"
     ],

Assets/Mirror/Transports/KCP/kcp2k/KCP.asmdef

@@ -1,7 +1,9 @@
 {
     "name": "kcp2k",
     "rootNamespace": "",
-    "references": [],
+    "references": [
+        "GUID:30817c1a0e6d646d99c048fc403f5979"
+    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": true,

Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef

@@ -1,16 +0,0 @@
-{
-    "name": "MiddlewareTransport",
-    "rootNamespace": "",
-    "references": [
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Assets/Mirror/Transports/Middleware/MiddlewareTransport.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 513aba84521ba40b697b5aac9ecd91fc
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef

@@ -1,16 +0,0 @@
-{
-    "name": "MultiplexTransport",
-    "rootNamespace": "",
-    "references": [
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

Assets/Mirror/Transports/Multiplex/MultiplexTransport.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e1cda8afe30f847fe8b40485b4768089
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Mirror/Transports/SimpleWeb/SimpleWeb.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7bdb797750d0a490684410110bf48192
+guid: 8ae237a052b29fc4b8d000f48e545bb7
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Mirror/Transports/SimpleWeb/SimpleWeb/Client/StandAlone/ClientHandshake.cs

@@ -57,9 +57,18 @@ public bool TryHandshake(Connection conn, Uri uri)
                 }
 
                 string responseString = Encoding.ASCII.GetString(responseBuffer, 0, lengthOrNull.Value);
+                Log.Verbose($"[SimpleWebTransport] Handshake Response {responseString}");
 
                 string acceptHeader = "Sec-WebSocket-Accept: ";
                 int startIndex = responseString.IndexOf(acceptHeader, StringComparison.InvariantCultureIgnoreCase) + acceptHeader.Length;
+
+                if (startIndex < 0)
+                {
+                    Log.Error($"[SimpleWebTransport] Unexpected Handshake Response {responseString}");
+                    return false;
+                }
+
+                startIndex += acceptHeader.Length;
                 int endIndex = responseString.IndexOf("\r\n", startIndex);
                 string responseKey = responseString.Substring(startIndex, endIndex - startIndex);
 

Assets/Mirror/Transports/SimpleWeb/SimpleWeb/SimpleWebTransport.asmdef

@@ -1,9 +1,7 @@
 {
     "name": "SimpleWebTransport",
     "rootNamespace": "",
-    "references": [
+    "references": [],
-        "GUID:30817c1a0e6d646d99c048fc403f5979"
-    ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,