Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/platform message encoding #5

Merged
merged 6 commits into from
May 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions android/src/main/java/io/ably/flutter/plugin/AblyMessageCodec.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
package io.ably.flutter.plugin;

import java.io.ByteArrayOutputStream;
import java.nio.ByteBuffer;
import java.util.function.Consumer;

import io.ably.lib.rest.Auth;
import io.ably.lib.rest.Auth.TokenDetails;
import io.ably.lib.types.ClientOptions;
import io.ably.lib.types.Param;
import io.ably.lib.types.ErrorInfo;
import io.flutter.plugin.common.StandardMessageCodec;

public class AblyMessageCodec extends StandardMessageCodec {
private static final byte _valueClientOptions = (byte)128;
private static final byte _valueTokenDetails = (byte)129;
private static final byte _errorInfo = (byte)144;
private static final byte _valueAblyMessage = (byte)255;

@Override
Expand Down Expand Up @@ -110,4 +113,26 @@ private Object readTokenDetails(final ByteBuffer buffer) {

return o;
}


//HANDLING WRITE

@Override
protected void writeValue(ByteArrayOutputStream stream, Object value) {
if(value instanceof ErrorInfo){
stream.write(_errorInfo);
writeErrorInfo(stream, (ErrorInfo) value);
return;
}
super.writeValue(stream, value);
}

private void writeErrorInfo(ByteArrayOutputStream stream, ErrorInfo e){
writeValue(stream, e.code);
writeValue(stream, e.message);
writeValue(stream, e.statusCode);
writeValue(stream, e.href);
writeValue(stream, null); //requestId - not available in ably-java
writeValue(stream, null); //cause - not available in ably-java
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public void onSuccess() {

@Override
public void onError(ErrorInfo reason) {
result.error(Integer.toString(reason.code), "Unable to publish message to Ably server; err = " + reason.message, null);
result.error(Integer.toString(reason.code), "Unable to publish message to Ably server; err = " + reason.message, reason);
}
});
});
Expand Down
10 changes: 7 additions & 3 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,13 @@ class _MyAppState extends State<MyApp> {
String name = "Hello";
dynamic data = "Flutter";
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();
try {
await rest.channels.get('test').publish(name, data);
await rest.channels.get('test').publish(name);
await rest.channels.get('test').publish();
} on ably.AblyException catch(e) {
print(e.errorInfo);
}
print('Message published');
}

Expand Down
4 changes: 2 additions & 2 deletions ios/Classes/AblyFlutterPlugin.m
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// @import Ably;
#import "Ably.h"

#import "AblyFlutterReaderWriter.h"
#import "codec/AblyFlutterReaderWriter.h"
#import "AblyFlutterMessage.h"
#import "AblyFlutter.h"
#import "AblyFlutterSurfaceRealtime.h"
Expand Down Expand Up @@ -65,7 +65,7 @@ -(nullable AblyFlutter *)ablyWithHandle:(NSNumber *)handle;
FlutterError
errorWithCode:[NSString stringWithFormat: @"%ld", (long)error.code]
message:[NSString stringWithFormat:@"Unable to publish message to Ably server; err = %@", [error message]]
details:nil
details:error
]);
}else{
result(nil);
Expand Down
17 changes: 17 additions & 0 deletions ios/Classes/codec/AblyFlutterReader.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@import Foundation;
@import Flutter;

NS_ASSUME_NONNULL_BEGIN

@interface AblyFlutterReader : FlutterStandardReader
@end

NS_ASSUME_NONNULL_END


typedef NS_ENUM(UInt8, _Value) {
_valueClientOptions = 128,
_valueTokenDetails = 129,
_ValueErrorInfo = 144,
_valueAblyMessage = 255,
};
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ static ARTLogLevel _logLevel(NSNumber *const number) {

@implementation AblyFlutterReader

typedef NS_ENUM(UInt8, _Value) {
_valueClientOptions = 128,
_valueTokenDetails = 129,
_valueAblyMessage = 255,
};

-(id)readValueOfType:(const UInt8)type {
switch ((_Value)type) {
case _valueClientOptions:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
#import "AblyFlutterReaderWriter.h"
#import "AblyFlutterReader.h"
#import "AblyFlutterWriter.h"

@implementation AblyFlutterReaderWriter

-(FlutterStandardReader *)readerWithData:(NSData *const)data {
return [[AblyFlutterReader alloc] initWithData:data];
}

- (FlutterStandardWriter*)writerWithData:(NSMutableData*)data {
return [[AblyFlutterWriter alloc] initWithData:data];
}

@end
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

NS_ASSUME_NONNULL_BEGIN

@interface AblyFlutterReader : FlutterStandardReader
@interface AblyFlutterWriter : FlutterStandardWriter
@end

NS_ASSUME_NONNULL_END
28 changes: 28 additions & 0 deletions ios/Classes/codec/AblyFlutterWriter.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#import "AblyFlutterWriter.h"
#import "Ably.h"
#import "AblyFlutterMessage.h"
#import "AblyFlutterReader.h"


@implementation AblyFlutterWriter

- (void)writeValue:(id)value {
if([value isKindOfClass:[ARTErrorInfo class]]){
[self writeByte:_ValueErrorInfo];
[self writeErrorInfo: value];
return;
}

[super writeValue:value];
}

- (void) writeErrorInfo:(ARTErrorInfo *) e{
[self writeValue: nil]; //code - not available in ably-cocoa
[self writeValue: [e message]];
[self writeValue: @([e statusCode])];
[self writeValue: nil]; //href - not available in ably-cocoa
[self writeValue: nil]; //requestId - not available in ably-java
[self writeValue: nil]; //cause - not available in ably-java
}

@end
Loading