diff --git a/src/GameCult.Networking/CultNetTransport.cs b/src/GameCult.Networking/CultNetTransport.cs
index 31ccc428..fc41b2f4 100644
--- a/src/GameCult.Networking/CultNetTransport.cs
+++ b/src/GameCult.Networking/CultNetTransport.cs
@@ -3581,14 +3581,14 @@ namespace GameCult.Networking
}
///
- /// A put or delete that arrived on an unreliable channel of a receipt session (write-receipt.md, Reliable channel only):
+ /// A put or delete that arrived on an unreliable or sequenced channel of a receipt session (write-receipt.md, Reliable channel only):
/// answered message_invalid, details channel, fixed text, carrying the write's id, and not applied. True when
/// the frame was such a write and has been answered here.
///
internal bool RefuseUnreliableWrite(ICultNetSchemaMessage message, DeliveryMethod method)
{
if (WriteReceipts == null) return false;
- if (method is DeliveryMethod.ReliableOrdered or DeliveryMethod.ReliableUnordered or DeliveryMethod.ReliableSequenced) return false;
+ if (method is DeliveryMethod.ReliableOrdered or DeliveryMethod.ReliableUnordered) return false;
var messageId = message switch
{
CultNetDocumentPutRawMessage put => put.MessageId,
diff --git a/src/GameCult.Networking/CultNetWriteReceipts.cs b/src/GameCult.Networking/CultNetWriteReceipts.cs
index a713c771..2a90f35d 100644
--- a/src/GameCult.Networking/CultNetWriteReceipts.cs
+++ b/src/GameCult.Networking/CultNetWriteReceipts.cs
@@ -90,6 +90,8 @@ namespace GameCult.Networking
public static CultNetRememberedRefusal Of(CultNetErrorMessage error) =>
new(error.Code, error.Details != null, error.Details?.Field, error.RoutingHint);
+ private static string? NullIfEmpty(string value) => value.Length == 0 ? null : value;
+
/// The refusal, in fixed text, naming the write's own record key or schema id where its details do.
public CultNetErrorMessage ToError(string schemaId, string recordKey) => new()
{
@@ -105,7 +107,7 @@ namespace GameCult.Networking
? new CultNetErrorDetails
{
Field = Field,
- Value = Field switch { "recordKey" => recordKey, "schemaId" => schemaId, _ => null }
+ Value = Field switch { "recordKey" => NullIfEmpty(recordKey), "schemaId" => NullIfEmpty(schemaId), _ => null }
}
: null
};
diff --git a/tests/GameCult.Networking.Tests/CultNetWriteReceiptLoopbackTests.cs b/tests/GameCult.Networking.Tests/CultNetWriteReceiptLoopbackTests.cs
index fb07ee58..d5e32fa0 100644
--- a/tests/GameCult.Networking.Tests/CultNetWriteReceiptLoopbackTests.cs
+++ b/tests/GameCult.Networking.Tests/CultNetWriteReceiptLoopbackTests.cs
@@ -50,6 +50,9 @@ namespace GameCult.Networking.Tests
public void SendUnreliable(T message) where T : ICultNetSchemaMessage =>
_peer.Send(CultNetSchemaMessageSerialization.Serialize(message), DeliveryMethod.Unreliable);
+ public void Send(T message, DeliveryMethod method) where T : ICultNetSchemaMessage =>
+ _peer.Send(CultNetSchemaMessageSerialization.Serialize(message), method);
+
public void SendRaw(byte[] bytes) => _peer.Send(bytes, DeliveryMethod.ReliableOrdered);
public T Next() where T : ICultNetSchemaMessage
@@ -202,6 +205,36 @@ namespace GameCult.Networking.Tests
await WaitFor(() => running.Cache.Get(KeyA)?.Text == "kept");
}
+ // write-receipt.md, Reliable channel only: reliable and not sequenced. Reliable ordered and unordered qualify; reliable
+ // sequenced does not, and nor does any unreliable method.
+ [TestCase(DeliveryMethod.ReliableSequenced, true)]
+ [TestCase(DeliveryMethod.Sequenced, true)]
+ [TestCase(DeliveryMethod.Unreliable, true)]
+ [TestCase(DeliveryMethod.ReliableUnordered, false)]
+ [TestCase(DeliveryMethod.ReliableOrdered, false)]
+ public async Task OnlyAReliableNonSequencedChannelCarriesAWriteOfAReceiptPeer(DeliveryMethod method, bool refused)
+ {
+ using var running = Running.Start();
+ using var client = running.Connect();
+ client.Send(HelloOf(BothFrames));
+ client.Next();
+
+ client.Send(running.PutOf("c1", KeyA, "text"), method);
+
+ if (refused)
+ {
+ var error = client.Next();
+ Assert.That(error.Details!.Field, Is.EqualTo("channel"));
+ Assert.That(error.MessageId, Is.EqualTo("c1"));
+ Assert.That(running.Cache.Get(KeyA), Is.Null);
+ }
+ else
+ {
+ Assert.That(client.Next().MessageId, Is.EqualTo("c1"));
+ await WaitFor(() => running.Cache.Get(KeyA)?.Text == "text");
+ }
+ }
+
[Test]
public void ADeleteOnAnUnreliableChannelOfAReceiptPeerIsRefusedWithItsId()
{
diff --git a/tests/GameCult.Networking.Tests/CultNetWriteReceiptServerTests.cs b/tests/GameCult.Networking.Tests/CultNetWriteReceiptServerTests.cs
index b50ac5de..6a79db6e 100644
--- a/tests/GameCult.Networking.Tests/CultNetWriteReceiptServerTests.cs
+++ b/tests/GameCult.Networking.Tests/CultNetWriteReceiptServerTests.cs
@@ -1205,5 +1205,25 @@ namespace GameCult.Networking.Tests
Assert.That(routedAgain.RoutingHint!.Reason, Is.EqualTo("not_primary"));
Assert.That(routedAgain.Error, Is.EqualTo(CultNetDatabaseServer.RoutingRefusalText));
}
+
+ // A write that carries no record key or schema id has none to echo: the detail value is null, not an empty string.
+ [Test]
+ public void AReplayedRefusalOfAWriteWithoutTheNamedFieldCarriesANullValue()
+ {
+ var session = new CultNetWriteReceiptSession();
+ var sent = new List();
+ CultNetReceiptedWrite Write() => new(session, sent.Add, "delete", "m1", null, null, null);
+ var first = Write();
+ Assert.That(first.Begin(), Is.True);
+ first.Refused(DeniedWith("ignored", "reason"));
+ Assert.That(Write().Begin(), Is.False);
+
+ foreach (var message in sent)
+ {
+ var error = (CultNetErrorV1Message)message;
+ Assert.That(error.Details!.Field, Is.EqualTo("recordKey"));
+ Assert.That(error.Details.Value, Is.Null);
+ }
+ }
}
}