Update Deucalion

Author: troy-f

BardMusicPlayer.Seer/BardMusicPlayer.Seer.csproj

@@ -35,10 +35,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Lib\Machina\FFXIV\Deucalion\Distrib\deucalion-0.8.0.dll" />
-    <EmbeddedResource Include="Lib\Machina\FFXIV\Headers\Opcodes\Chinese.txt" />
-    <EmbeddedResource Include="Lib\Machina\FFXIV\Headers\Opcodes\Global.txt" />
-    <EmbeddedResource Include="Lib\Machina\FFXIV\Headers\Opcodes\Korean.txt" />
+    <EmbeddedResource Include="Lib\Machina.FFXIV\Deucalion\Distrib\deucalion-0.9.0.dll" />
+    <EmbeddedResource Include="Lib\Machina.FFXIV\Headers\Opcodes\Chinese.txt" />
+    <EmbeddedResource Include="Lib\Machina.FFXIV\Headers\Opcodes\Global.txt" />
+    <EmbeddedResource Include="Lib\Machina.FFXIV\Headers\Opcodes\Korean.txt" />
   </ItemGroup>
 
 </Project>

BardMusicPlayer.Seer/Lib/Machina/FFXIV/Deucalion/DeucalionClient.cs renamed to BardMusicPlayer.Seer/Lib/Machina.FFXIV/Deucalion/DeucalionClient.cs

@@ -109,10 +109,19 @@ public struct DeucalionSegment
 
         public delegate void MessageReceivedHandler(byte[] message);
         public MessageReceivedHandler MessageReceived;
+        
+        public delegate void MessageSentHandler(byte[] message);
+        public MessageSentHandler MessageSent;
+
         public void OnMessageReceived(byte[] message)
         {
             MessageReceived?.Invoke(message);
         }
+        
+        public void OnMessageSent(byte[] message)
+        {
+            MessageSent?.Invoke(message);
+        }
 
         public unsafe void Connect(int processId)
         {
@@ -137,18 +146,18 @@ public unsafe void Connect(int processId)
                     return;
                 }
 
-                // Set opcode filter to just recv for zone packets.  Assume it was processed successfully.
+                // Set opcode filter to get recv/send for zone packets.  Assume it was processed successfully.
                 WritePipe(new DeucalionMessage()
                 {
                     header = new DeucalionHeader()
                     {
-                        channel = (FFXIVChannel)(1 << 1),
+                        channel = (FFXIVChannel)(1 << 1 |  1 << 4),
                         Opcode = FFXIVOpcodes.Option
                     },
                     data = Array.Empty<byte>()
                 });
 
-                if (result.debug.Contains("RECV REQUIRES SIG"))
+                if (result.debug.Contains("REQUIRES SIG"))
                 {
                     Trace.WriteLine("DeucalionClient: Named Pipe connected, but requires updated signature.  Cannot find network data.");
                     return;
@@ -195,8 +204,17 @@ private void ProcessReadLoop(CancellationToken token)
                         }
 
                         foreach (DeucalionMessage message in messages)
-                            if (message.header.Opcode == FFXIVOpcodes.Recv)
-                                OnMessageReceived(message.data);
+                        {
+                            switch (message.header.Opcode)
+                            {
+                                case FFXIVOpcodes.Recv:
+                                    OnMessageReceived(message.data);
+                                    break;
+                                case FFXIVOpcodes.Send:
+                                    OnMessageSent(message.data);
+                                    break;
+                            }
+                        }
                     }
                     catch (OperationCanceledException)
                     {
@@ -292,6 +310,10 @@ private unsafe DeucalionMessage[] ReadPipe(byte[] buffer)
                             if (messagePtr->channel == FFXIVChannel.Zone)
                                 response.Add(newMessage);
                             break;
+                        case FFXIVOpcodes.Send:
+                            if (messagePtr->channel == FFXIVChannel.Zone)
+                                response.Add(newMessage);
+                            break;
                         case FFXIVOpcodes.Exit:
                             Trace.WriteLine("DeucalionClient: Received exit opcode from injected code.", "DEBUG-MACHINA");
                             Disconnect();

BardMusicPlayer.Seer/Lib/Machina/FFXIV/Deucalion/DeucalionInjector.cs renamed to BardMusicPlayer.Seer/Lib/Machina.FFXIV/Deucalion/DeucalionInjector.cs

@@ -116,7 +116,7 @@ private struct SECURITY_DESCRIPTOR
 
         public static string ExtractLibrary()
         {
-            string fileName = Path.Combine(Path.GetTempPath(), "Machina.FFXIV", "deucalion-0.8.0.dll");
+            string fileName = Path.Combine(Path.GetTempPath(), "Machina.FFXIV", "deucalion-0.9.0.dll");
             if (File.Exists(fileName))
             {
                 try
@@ -135,7 +135,8 @@ public static string ExtractLibrary()
                 if (!Directory.Exists(fileName.Substring(0, fileName.LastIndexOf("\\") + 1)))
                     Directory.CreateDirectory(fileName.Substring(0, fileName.LastIndexOf("\\") + 1));
 
-                string resourceName = $"BardMusicPlayer.Seer.Lib.Machina.FFXIV.Deucalion.Distrib.deucalion-0.8.0.dll";
+                string resourceName = $"BardMusicPlayer.Seer.Lib.Machina.FFXIV.Deucalion.Distrib.deucalion-0.9.0.dll";
+
                 using (Stream s = typeof(DeucalionInjector).Module.Assembly.GetManifestResourceStream(resourceName))
                 {
                     using (BinaryReader sr = new BinaryReader(s))
@@ -146,7 +147,7 @@ public static string ExtractLibrary()
                 }
             }
 
-            string release_checksum = "15-76-26-8C-BD-7A-B3-9B-7A-81-C6-8B-DC-16-AC-E1";//pre-0.7.0: "1B-9B-7A-E7-5F-C1-A7-05-40-AD-60-C7-62-77-01-36";
+            string release_checksum = "6C-9C-32-45-10-B6-B9-A8-64-20-53-7A-E3-7D-66-9D"; //0.8.0: "15-76-26-8C-BD-7A-B3-9B-7A-81-C6-8B-DC-16-AC-E1"; //pre-0.7.0: "1B-9B-7A-E7-5F-C1-A7-05-40-AD-60-C7-62-77-01-36";
 
             // validate checksum
             byte[] checksum = CalculateChecksum(fileName);

BardMusicPlayer.Seer/Lib/Machina.FFXIV/Deucalion/Distrib/deucalion-0.9.0.dll

@@ -130,11 +130,15 @@ public void Start()
 
             if (UseDeucalion)
             {
+                if (ProcessID == 0)
+                    throw new ArgumentException("ProcessID must be specified for Deucalion.");
+                
                 string library = DeucalionInjector.ExtractLibrary();
                 DeucalionInjector.InjectLibrary((int)ProcessID, library);
 
                 _deucalionClient = new DeucalionClient();
-                _deucalionClient.MessageReceived = (byte[] message) => ProcessDeucalionMessage(message);
+                _deucalionClient.MessageSent = (message) => ProcessDeucalionMessage(message, true);
+                _deucalionClient.MessageReceived = (message) => ProcessDeucalionMessage(message, false);
                 _deucalionClient.Connect((int)ProcessID);
             }
             else
@@ -209,15 +213,22 @@ public void ProcessReceivedMessage(TCPConnection connection, byte[] data)
 
         }
 
-        public void ProcessDeucalionMessage(byte[] data)
+        public void ProcessDeucalionMessage(byte[] data, bool isSend)
         {
             // TCP Connection is irrelevent for this, but needed by interface, so make new one.
             TCPConnection connection = new TCPConnection();
             connection.ProcessId = ProcessID;
 
             (long epoch, byte[] packet) = DeucalionClient.ConvertDeucalionFormatToPacketFormat(data);
-
-            OnMessageReceived(connection, epoch, packet);
+          
+            if (isSend)
+            {
+                OnMessageSent(connection, epoch, packet);
+            }
+            else
+            {
+                OnMessageReceived(connection, epoch, packet);
+            }
         }