Improve RPC API

nakama/lib/nakama.dart

@@ -26,7 +26,6 @@ export 'src/models/matchmaker.dart'
         PartyMatchmakerTicket;
 export 'src/models/notification.dart' show Notification, NotificationList;
 export 'src/models/party.dart' show PartyData, PartyLeader, PartyPresenceEvent;
-export 'src/models/rpc.dart' show Rpc;
 export 'src/models/session.dart' show Session;
 export 'src/models/status.dart'
     show

nakama/lib/src/client.dart

@@ -929,9 +929,12 @@ abstract interface class Client {
   ///
   /// - [id] The ID of the function to execute.
   /// - [payload] The payload to send with the function call.
-  Future<String?> rpc({
+  /// - [httpKey] The HTTP key to use for the function call. Not supported by
+  ///   gRPC protocol.
+  Future<Map<String, Object?>?> rpc({
     required String id,
-    String? payload,
+    Map<String, Object?>? payload,
+    String? httpKey,
   });
 }
 
@@ -949,6 +952,7 @@ abstract base class ClientBase implements Client {
   });
 
   static bool get _withoutSession => Zone.current[#_withoutSession]! as bool;
+  static String get _httpKey => Zone.current[#_httpKey]! as String;
 
   @override
   final String host;
@@ -971,13 +975,14 @@ abstract base class ClientBase implements Client {
   String get authorizationHeader {
     return switch (session) {
       final session? when !_withoutSession => 'Bearer ${session.token}',
-      _ => 'Basic ${base64Encode('$serverKey:'.codeUnits)}'
+      _ => 'Basic ${base64Encode('$_httpKey:'.codeUnits)}'
     };
   }
 
   Future<T> _performRequest<T>(
     Future<T> Function() request, {
     bool withoutSession = false,
+    String? httpKey,
   }) async {
     if (session
         case Session(isExpired: true, isRefreshExpired: false, :final vars)
@@ -997,7 +1002,10 @@ abstract base class ClientBase implements Client {
       try {
         return await runZoned(
           request,
-          zoneValues: {#_withoutSession: withoutSession},
+          zoneValues: {
+            #_withoutSession: withoutSession,
+            #_httpKey: httpKey ?? serverKey,
+          },
         );
       } on Exception catch (exception) {
         if (translateException(exception) case final translatedException?) {
@@ -1517,9 +1525,9 @@ abstract base class ClientBase implements Client {
   });
 
   @visibleForOverriding
-  Future<String?> performRpc({
+  Future<Map<String, Object?>?> performRpc({
     required String id,
-    String? payload,
+    Map<String, Object?>? payload,
   });
 
   @override
@@ -1539,7 +1547,7 @@ abstract base class ClientBase implements Client {
       );
     }
 
-    session = await _performRequest(withoutSession: true,() {
+    session = await _performRequest(withoutSession: true, () {
       return performSessionRefresh(vars: vars);
     });
 
@@ -2580,11 +2588,12 @@ abstract base class ClientBase implements Client {
   }
 
   @override
-  Future<String?> rpc({
+  Future<Map<String, Object?>?> rpc({
     required String id,
-    String? payload,
+    Map<String, Object?>? payload,
+    String? httpKey,
   }) {
-    return _performRequest(() {
+    return _performRequest(httpKey: httpKey, () {
       return performRpc(
         id: id,
         payload: payload,

nakama/lib/src/grpc_client.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:grpc/grpc.dart' hide Client;
@@ -1207,18 +1208,33 @@ final class GrpcClient extends ClientBase {
   }
 
   @override
-  Future<String?> performRpc({
+  Future<Map<String, Object?>?> performRpc({
     required String id,
-    String? payload,
+    Map<String, Object?>? payload,
   }) async {
     final res = await _client.rpcFunc(
       api.Rpc(
         id: id,
-        payload: payload,
+        payload: payload != null ? jsonEncode(payload) : null,
       ),
     );
 
-    return res.payload;
+    return res.payload.isEmpty ? null : jsonDecode(res.payload);
+  }
+
+  @override
+  Future<Map<String, Object?>?> rpc({
+    required String id,
+    Map<String, Object?>? payload,
+    String? httpKey,
+  }) async {
+    if (httpKey != null) {
+      throw NakamaError(
+        code: ErrorCode.invalidArgument,
+        message: 'RPC with HTTP key is not supported by gRPC protocol.',
+      );
+    }
+    return super.rpc(id: id, payload: payload, httpKey: httpKey);
   }
 
   @override

nakama/lib/src/rest_client.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:dio/dio.dart';
@@ -1137,15 +1138,20 @@ final class RestClient extends ClientBase {
   }
 
   @override
-  Future<String?> performRpc({
+  Future<Map<String, Object?>?> performRpc({
     required String id,
-    String? payload,
+    Map<String, Object?>? payload,
   }) async {
     final result = await switch (payload) {
-      final payload? => _api.rpcFunc(id: id, body: payload),
-      _ => _api.rpcFunc2(id: id)
+      final payload? => _api.rpcFunc(
+          id: id,
+          // The payload is double-encoded because the Nakama server expects
+          // it this way.
+          body: jsonEncode(jsonEncode(payload)),
+        ),
+      _ => _api.rpcFunc2(id: id),
     };
 
-    return result.payload;
+    return result.payload?.isEmpty ?? true ? null : jsonDecode(result.payload!);
   }
 }

nakama/lib/src/socket.dart

@@ -13,7 +13,6 @@ import 'models/match.dart';
 import 'models/matchmaker.dart';
 import 'models/notification.dart';
 import 'models/party.dart';
-import 'models/rpc.dart';
 import 'models/status.dart';
 
 /// A socket for real-time communication with the Nakama server.
@@ -83,7 +82,10 @@ abstract class Socket {
 
   Future<void> removeMatchmaker(String ticket);
 
-  Future<Rpc> rpc({required String id, String? payload});
+  Future<Map<String, Object?>?> rpc({
+    required String id,
+    Map<String, Object?>? payload,
+  });
 
   Future<List<UserPresence>> followUsers({
     List<String>? userIds,
@@ -287,7 +289,7 @@ class SocketImpl implements Socket {
           PartyMatchmakerTicket.fromDto(envelope.partyMatchmakerTicket),
         );
       case rtapi.Envelope_Message.rpc:
-        _completePendingRequest(envelope.cid, Rpc.fromDto(envelope.rpc));
+        _completePendingRequest(envelope.cid, envelope.rpc);
       case rtapi.Envelope_Message.party:
         _completePendingRequest(envelope.cid, Party.fromDto(envelope.party));
       case rtapi.Envelope_Message.channelPresenceEvent:
@@ -595,12 +597,21 @@ class SocketImpl implements Socket {
   }
 
   @override
-  Future<Rpc> rpc({required String id, String? payload}) {
-    return _send(
+  Future<Map<String, Object?>?> rpc({
+    required String id,
+    Map<String, Object?>? payload,
+  }) async {
+    final result = await _send<api.Rpc>(
       rtapi.Envelope(
-        rpc: api.Rpc(id: id, payload: payload),
+        rpc: api.Rpc(
+          id: id,
+          payload: payload != null ? jsonEncode(payload) : null,
+        ),
       ),
     );
+    return result.payload.isEmpty
+        ? null
+        : jsonDecode(result.payload) as Map<String, Object?>;
   }
 
   @override