Feature/ios rest

README.md

@@ -11,7 +11,7 @@ client library SDKs for [Ably](https://ably.io/), the realtime data delivery pla
 Ably provides the best infrastructure and APIs to power realtime experiences at scale, delivering billions of realtime messages everyday to millions of end users.
 We handle the complexity of realtime messaging so you can focus on your code.
 
-## :construction: Work In Progress! :construction:
+## :construction: Experimental! :construction:
 
 We're busy working on this repository at the moment and we're doing that work in the public domain so that you can watch or
 [contribute](#contributing).

example/ios/Runner.xcodeproj/project.pbxproj

@@ -80,7 +80,6 @@
 				10B8B89ABB4264117E7AB56C /* Pods-Runner.release.xcconfig */,
 				EA3336021AE374E30F8FCF54 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -185,6 +184,7 @@
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
 						CreatedOnToolsVersion = 7.3.1;
+						DevelopmentTeam = S38X8U35U5;
 					};
 				};
 			};
@@ -393,6 +393,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = S38X8U35U5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -523,6 +524,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = S38X8U35U5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -546,6 +548,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = S38X8U35U5;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1140"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Profile"

example/lib/main.dart

@@ -115,8 +115,10 @@ class _MyAppState extends State<MyApp> {
 
     String name = "Hello";
     dynamic data = "Flutter";
-    print('publishing message... name "$name", message "$data"');
+    print('publishing messages... name "$name", message "$data"');
     await rest.channels.get('test').publish(name, data);
+    await rest.channels.get('test').publish(name);
+    await rest.channels.get('test').publish();
     print('Message published');
   }
 

ios/Classes/AblyFlutter.h

@@ -1,12 +1,17 @@
 @import Foundation;
 
+@class ARTRest;
 @class ARTClientOptions;
 @class AblyFlutterSurfaceRealtime;
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface AblyFlutter : NSObject
 
+-(NSNumber *)createRestWithOptions:(ARTClientOptions *)options;
+
+-(nullable ARTRest *)getRest:(NSNumber *)handle;
+
 -(NSNumber *)createRealtimeWithOptions:(ARTClientOptions *)options;
 
 -(nullable AblyFlutterSurfaceRealtime *)realtimeWithHandle:(NSNumber *)handle;

ios/Classes/AblyFlutter.m

@@ -9,6 +9,7 @@
 @implementation AblyFlutter {
     BOOL _disposed;
     NSMutableDictionary<NSNumber *, AblyFlutterSurfaceRealtime *>* _realtimeInstances;
+    NSMutableDictionary<NSNumber *, ARTRest *>* _restInstances;
     long long _nextHandle;
 }
 
@@ -19,6 +20,7 @@ -(instancetype)init {
     }
 
     _realtimeInstances = [NSMutableDictionary new];
+    _restInstances = [NSMutableDictionary new];
     _nextHandle = 1;
 
     return self;
@@ -30,6 +32,23 @@ -(instancetype)init {
                     format:@"Instance disposed."]; \
     }
 
+-(NSNumber *)createRestWithOptions:(ARTClientOptions *const)options {
+    if (!options) {
+        [NSException raise:NSInvalidArgumentException format:@"options cannot be nil."];
+    }
+
+    ASSERT_NOT_DISPOSED
+
+    ARTRest *const instance = [[ARTRest alloc] initWithOptions:options];
+    NSNumber *const handle = @(_nextHandle++);
+    [_restInstances setObject:instance forKey:handle];
+    return handle;
+}
+
+-(ARTRest *)getRest:(NSNumber *const)handle {
+    return [_restInstances objectForKey:handle];
+}
+
 -(NSNumber *)createRealtimeWithOptions:(ARTClientOptions *const)options {
     if (!options) {
         [NSException raise:NSInvalidArgumentException format:@"options cannot be nil."];

ios/Classes/AblyFlutterPlugin.m

@@ -39,6 +39,40 @@ -(nullable AblyFlutter *)ablyWithHandle:(NSNumber *)handle;
     [plugin registerWithCompletionHandler:result];
 };
 
+static FlutterHandler _createRestWithOptions = ^void(AblyFlutterPlugin *const plugin, FlutterMethodCall *const call, const FlutterResult result) {
+    AblyFlutterMessage *const message = call.arguments;
+    LOG(@"message for handle %@", message.handle);
+    AblyFlutter *const ably = [plugin ablyWithHandle:message.handle];
+    // TODO if ably is nil here then an error response, perhaps? or allow Dart side to understand null response?
+    result([ably createRestWithOptions:message.message]);
+};
+
+static FlutterHandler _publishRestMessage = ^void(AblyFlutterPlugin *const plugin, FlutterMethodCall *const call, const FlutterResult result) {
+    AblyFlutterMessage *const message = call.arguments;
+    LOG(@"message for handle %@", message.handle);
+    AblyFlutter *const ably = [plugin ablyWithHandle:message.handle];
+    AblyFlutterMessage *const messageData = message.message;
+    NSMutableDictionary<NSString *, NSObject *>* _dataMap = messageData.message;
+    NSString *channelName = (NSString*)[_dataMap objectForKey:@"channel"];
+    NSString *const eventName = (NSString*)[_dataMap objectForKey:@"name"];
+    NSObject *const eventData = (NSString*)[_dataMap objectForKey:@"message"];
+    ARTRest *client = [ably getRest:messageData.handle];
+    ARTRestChannel *channel = [client.channels get:channelName];
+
+    [channel publish:eventName data:eventData callback:^(ARTErrorInfo *_Nullable error){
+        if(error){
+            result([
+                    FlutterError
+                    errorWithCode:[NSString stringWithFormat: @"%ld", (long)error.code]
+                    message:[NSString stringWithFormat:@"Unable to publish message to Ably server; err = %@", [error message]]
+                    details:nil
+                    ]);
+        }else{
+            result(nil);
+        }
+    }];
+};
+
 static FlutterHandler _createRealtimeWithOptions = ^void(AblyFlutterPlugin *const plugin, FlutterMethodCall *const call, const FlutterResult result) {
     AblyFlutterMessage *const message = call.arguments;
     LOG(@"message for handle %@", message.handle);
@@ -92,6 +126,8 @@ -(instancetype)initWithChannel:(FlutterMethodChannel *const)channel {
         @"getPlatformVersion": _getPlatformVersion,
         @"getVersion": _getVersion,
         @"register": _register,
+        @"createRestWithOptions": _createRestWithOptions,
+        @"publish": _publishRestMessage,
         @"createRealtimeWithOptions": _createRealtimeWithOptions,
         @"connectRealtime": _connectRealtime,
         @"dispose": _dispose,

ios/Classes/AblyFlutterReader.m

@@ -18,14 +18,18 @@ @implementation AblyFlutterReader
 
 typedef NS_ENUM(UInt8, _Value) {
     _valueClientOptions = 128,
-    _valueAblyMessage = 129,
+    _valueTokenDetails = 129,
+    _valueAblyMessage = 255,
 };
 
 -(id)readValueOfType:(const UInt8)type {
     switch ((_Value)type) {
         case _valueClientOptions:
             return [self readClientOptions];
 
+        case _valueTokenDetails:
+            return [self readTokenDeatils];
+
         case _valueAblyMessage:
             return [self readAblyFlutterMessage];
     }
@@ -81,7 +85,8 @@ -(ARTClientOptions *)readClientOptions {
     READ_VALUE(o, authUrl);
     READ_VALUE(o, authMethod);
     READ_VALUE(o, key);
-    READ_VALUE(o, tokenDetails);
+//    READ_VALUE(o, tokenDetails);
+    ON_VALUE(^(const id value) { o.tokenDetails = value; });
     READ_VALUE(o, authHeaders);
     READ_VALUE(o, authParams);
     READ_VALUE(o, queryTime);
@@ -90,6 +95,7 @@ -(ARTClientOptions *)readClientOptions {
     // ClientOptions
     READ_VALUE(o, clientId);
     ON_VALUE(^(const id value) { o.logLevel = _logLevel(value); });
+    //TODO log handler
     READ_VALUE(o, tls);
     READ_VALUE(o, restHost);
     READ_VALUE(o, realtimeHost);
@@ -100,7 +106,6 @@ -(ARTClientOptions *)readClientOptions {
     READ_VALUE(o, queueMessages);
     READ_VALUE(o, echoMessages);
     READ_VALUE(o, recover);
-    [self readValue]; // TODO READ_VALUE(o, proxy); // property not found
     READ_VALUE(o, environment);
     READ_VALUE(o, idempotentRestPublishing);
     [self readValue]; // TODO READ_VALUE(o, httpOpenTimeout); // NSTimeInterval
@@ -113,9 +118,28 @@ -(ARTClientOptions *)readClientOptions {
     READ_VALUE(o, defaultTokenParams);
     [self readValue]; // TODO READ_VALUE(o, channelRetryTimeout); // NSTimeInterval
     [self readValue]; // TODO READ_VALUE(o, transportParams); // property not found
-    [self readValue]; // TODO READ_VALUE(o, asyncHttpThreadpoolSize); // property not found
-    READ_VALUE(o, pushFullWait);
+    //    [self readValue]; // TODO READ_VALUE(o, asyncHttpThreadpoolSize); // property not found
+    //    READ_VALUE(o, pushFullWait);
+
+    return o;
+}
+
+
+-(ARTTokenDetails *)readTokenDeatils {
+    __block NSString *token = nil;
+    __block NSDate *expires = nil;
+    __block NSDate *issued = nil;
+    __block NSString *capability = nil;
+    __block NSString *clientId = nil;
+
+    ON_VALUE(^(const id value) { token = value; })
+    ON_VALUE(^(const id value) { expires = value; })
+    ON_VALUE(^(const id value) { issued = value; })
+    ON_VALUE(^(const id value) { capability = value; })
+    ON_VALUE(^(const id value) { clientId = value; })
 
+    ARTTokenDetails *const o = [ARTTokenDetails new];
+    [o initWithToken:token expires:expires issued:issued capability:capability clientId:clientId];
     return o;
 }
 

lib/src/codec.dart

@@ -39,7 +39,7 @@ class Codec extends StandardMessageCodec {
 
       // ClientOptions
       writeValue(buffer, v.clientId);
-      writeValue(buffer, v.logLevel.index);
+      writeValue(buffer, v.logLevel);
       //TODO handle logHandler
       writeValue(buffer, v.tls);
       writeValue(buffer, v.restHost);
@@ -98,7 +98,7 @@ class Codec extends StandardMessageCodec {
 
         // ClientOptions
         v.clientId = readValue(buffer) as String;
-        v.logLevel = LogLevel.values[readValue(buffer) as int];
+        v.logLevel = readValue(buffer) as int;
         //TODO handle logHandler
         v.tls = readValue(buffer) as bool;
         v.restHost = readValue(buffer) as String;

lib/src/impl/rest/channels.dart

@@ -31,11 +31,10 @@ class RestPlatformChannel extends PlatformObject implements spec.Channel{
   @override
   Future<void> publish([String name, dynamic data]) async {
     try {
-      await this.invoke(PlatformMethod.publish, {
-        "channel": this.name,
-        "name": name,
-        "message": data
-      });
+      Map _map = { "channel": this.name, };
+      if(name!=null) _map["name"] = name;
+      if(data!=null) _map["message"] = data;
+      await this.invoke(PlatformMethod.publish, _map);
     } on PlatformException catch (pe) {
       throw spec.AblyException(pe.code, pe.message);
     }

lib/src/spec/constants.dart

@@ -0,0 +1,8 @@
+class LogLevel{
+  static final int none = 99;
+  static final int verbose = 2;
+  static final int debug = 3;
+  static final int info = 4;
+  static final int warn = 5;
+  static final int error = 6;
+}

lib/src/spec/enums.dart

@@ -69,14 +69,6 @@ enum HttpAuthType {
   X_ABLY_TOKEN,
 }
 
-enum LogLevel{
-  none,   //no logs
-  errors, //errors only
-  info,   //errors and channel state changes
-  debug,  //high-level debug output
-  verbose //full debug output
-}
-
 enum DevicePushState{
   active,
   failing,

lib/src/spec/rest/options.dart

@@ -51,11 +51,11 @@ typedef void LogHandler({String msg, AblyException exception});
 class ClientOptions extends AuthOptions {
 
   ClientOptions(){
-    logLevel = LogLevel.info;
+    logLevel = 4;
   }
 
   ClientOptions.fromKey(String key): super.fromKey(key){
-    logLevel = LogLevel.info;
+    logLevel = 4;
   }
 
   ///Optional clientId that can be used to specify the identity for this client.
@@ -65,7 +65,7 @@ class ClientOptions extends AuthOptions {
 
   ///Logger configuration
   LogHandler logHandler;  //optional
-  LogLevel logLevel;  //optional
+  int logLevel;  //optional
 
   String restHost;	//optional
   String realtimeHost;	//optional

lib/src/spec/spec.dart

@@ -13,3 +13,4 @@ export 'realtime/realtime.dart';
 export 'push/push.dart';
 export 'message.dart';
 export 'common.dart';
+export 'constants.dart';

pubspec.yaml

@@ -16,10 +16,10 @@ dev_dependencies:
 
   # Specifying a slightly older version minimum for the 'pure' Dart test package
   # because the flutter_test package needs an older version of test_api.
-  test: ^1.9.4
+  test: ^1.14.2
 
   # Stricter Linting
-  pedantic: ^1.0.0
+  pedantic: ^1.9.0
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec