Merge branch 'dev'

Classes/Kurento.h

@@ -20,4 +20,3 @@
 #import "NBMMessage.h"
 #import "NBMRequest.h"
 #import "NBMResponse.h"
-#import "NBMResponseError.h"

Classes/NBMJSONRPCClient.h

@@ -12,6 +12,7 @@
 @protocol NBMJSONRPCClientDelegate <NSObject>
 
 - (void)client:(NBMJSONRPCClient *)client didReceiveRequest:(NBMRequest *)request;
+- (void)client:(NBMJSONRPCClient *)client didFailWithError:(NSError *)error;
 
 @end
 
@@ -44,6 +45,6 @@
 - (void)cancelAllRequest;
 
 //Response (not implemented yet)
-- (void)sendResponse:(NBMResponse *)response;
+//- (void)sendResponse:(NBMResponse *)response;
 
 @end

Classes/NBMJSONRPCClient.m

@@ -386,8 +386,8 @@ - (void)sendRequestPack:(NBMRequestPack *)requestPack retried:(BOOL)retried
 
 - (void)sendRequest:(NBMRequest *)request
 {
-    NSDictionary *requestDictonary = [request toDictionary];
-    [_transport sendMessage:requestDictonary];
+    NSString *requestString = [request toJSONString];
+    [_transport send:requestString];
 }
 
 - (void)cancelRequestPack:(NBMRequestPack *)requestPack
@@ -484,6 +484,10 @@ - (void)channel:(NBMTransportChannel *)channel didReceiveMessage:(NSDictionary *
     [self decodeMessage:messageDictionary];
 }
 
+- (void)channel:(NBMTransportChannel *)channel didEncounterError:(NSError *)error {
+    [self.delegate client:self didFailWithError:error];
+}
+
 #pragma mark TimeoutableDelegate
 
 - (void)timeoutFired:(id)timeoutable

Classes/NBMLog.h

@@ -5,15 +5,14 @@
 //  Created by Marco Rossi on 20/10/15.
 //  Copyright © 2015 Telecom Italia S.p.A. All rights reserved.
 //
-
-#import <CocoaLumberjack/DDLogMacros.h>
+#import "DDLogMacros.h"
 
 #ifdef DEBUG
     static const int ddLogLevel = DDLogLevelVerbose;
     //Simple log macro
     #define DLog(s,...) NSLog((@"[%s] " s),__func__,## __VA_ARGS__);
 #else
-    static const int ddLogLevel = DDLogLevelOff;
+    static const int ddLogLevel = 0;
     //Log only in debug mode
     #define DLog(...)
 #endif

Classes/NBMMessage.h

@@ -8,17 +8,11 @@
 
 #import <Foundation/Foundation.h>
 
-FOUNDATION_EXTERN NSString * const kNBMJSONRPCVersion;
+@protocol NBMMessage <NSObject>
 
-@interface NBMMessage : NSObject
-
-@property (nonatomic, copy) NSString *sessionId;
-
-+ (NSString *)version;
-- (NSDictionary *)toDictionary;
-- (NSString *)JSONString;
-
-// Disallow init and don't add to documentation
-//- (id)init __attribute__((unavailable("init is not a supported initializer for this class.")));
+- (NSDictionary *)toJSONDictionary;
+@optional
+- (NSString *)toJSONString;
 
 @end
+

Classes/NBMRequest.h

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "NBMMessage.h"
 
-@interface NBMRequest : NBMMessage
+@interface NBMRequest : NSObject  <NBMMessage>
 
 @property (nonatomic, readonly) NSNumber *requestId;
 @property (nonatomic, copy, readonly) NSString *method;

Classes/NBMRequest.m

@@ -9,6 +9,7 @@
 #import "NBMRequest+Private.h"
 
 #import "NBMJSONRPCConstants.h"
+#import "NBMUtilities.h"
 
 @implementation NBMRequest
 
@@ -96,7 +97,7 @@ - (NSString *)debugDescription {
 
 #pragma mark - Message
 
-- (NSDictionary *)toDictionary
+- (NSDictionary *)toJSONDictionary
 {
     NSMutableDictionary *json = [NSMutableDictionary dictionary];
     [json setObject:kJsonRpcVersion forKey:kJsonRpcKey];
@@ -109,4 +110,8 @@ - (NSDictionary *)toDictionary
     return [json copy];
 }
 
+- (NSString *)toJSONString {
+    return [NSString nbm_stringFromJSONDictionary:[self toJSONDictionary]];
+}
+
 @end

Classes/NBMResponse.h

@@ -9,7 +9,7 @@
 #import "NBMMessage.h"
 
 @class NBMResponseError;
-@interface NBMResponse : NBMMessage
+@interface NBMResponse : NSObject <NBMMessage>
 
 @property (nonatomic, readonly) id result;
 @property (nonatomic, readonly) NBMResponseError *error;
@@ -22,3 +22,24 @@
                        responseId:(NSNumber *)responseId;
 
 @end
+
+typedef NS_ENUM(NSInteger, NBMResponseErrorCode) {
+    NBMResponseErrorInvalidParamCode = -32602,
+    NBMResponseErrorMethodNotFoundCode = -32601,
+    NBMResponseErrorInvalidRequestCode = -32600,
+    NBMResponseErrorParseErrorCode = -32700,
+    NBMResponseErrorInternalErrorCode = -32603,
+    NBMResponseErrorServerErrorCode = -32000
+};
+
+@interface NBMResponseError : NSObject
+
+@property (nonatomic) NSInteger code;
+@property (nonatomic, copy) NSString *message;
+@property (nonatomic) id data;
+
++ (instancetype)responseErrorWithCode:(NBMResponseErrorCode)code
+                              message:(NSString *)message
+                                 data:(id)data;
+
+@end

Classes/NBMResponse.m

@@ -7,8 +7,56 @@
 //
 
 #import "NBMResponse+Private.h"
-#import "NBMResponseError.h"
+
 #import "NBMJSONRPCConstants.h"
+#import "NBMUtilities.h"
+
+static NSString* JSONRPCLocalizedErrorMessageForCode(NSInteger code) {
+    switch(code) {
+        case NBMResponseErrorParseErrorCode:
+            return @"Parse Error";
+        case NBMResponseErrorInvalidRequestCode:
+            return @"Invalid Request";
+        case NBMResponseErrorMethodNotFoundCode:
+            return @"Method Not Found";
+        case NBMResponseErrorInvalidParamCode:
+            return @"Invalid Params";
+        case NBMResponseErrorInternalErrorCode:
+            return @"Internal Error";
+        default:
+            return @"Server Error";
+    }
+}
+
+@implementation NBMResponseError
+
++ (instancetype)responseErrorWithCode:(NBMResponseErrorCode)code
+                              message:(NSString *)message
+                                 data:(id)data
+{
+    NBMResponseError *responseError = [[NBMResponseError alloc] init];
+    responseError.code = code;
+    if (!message || message.length == 0) {
+        message = JSONRPCLocalizedErrorMessageForCode(code);
+    }
+    responseError.message = message;
+    responseError.data = data;
+
+    return responseError;
+}
+
+- (NSDictionary *)errorDictionary
+{
+    NSMutableDictionary *errorDict = [NSMutableDictionary dictionaryWithCapacity:3];
+    [errorDict setObject:@(self.code) forKey:kCodeKey];
+    [errorDict setObject:self.message forKey:kMessageKey];
+    if (self.data) {
+        [errorDict setObject:self.data forKey:kDataKey];
+    }
+    return errorDict;
+}
+
+@end
 
 @implementation NBMResponse
 
@@ -77,7 +125,7 @@ - (NSString *)debugDescription {
 
 #pragma mark - Message
 
-- (NSDictionary *)toDictionary
+- (NSDictionary *)toJSONDictionary
 {
     NSMutableDictionary *json = [NSMutableDictionary dictionary];
     [json setObject:kJsonRpcVersion forKey:kJsonRpcKey];
@@ -91,4 +139,8 @@ - (NSDictionary *)toDictionary
     return [json copy];
 }
 
+- (NSString *)toJSONString {
+    return [NSString nbm_stringFromJSONDictionary:[self toJSONDictionary]];
+}
+
 @end

Classes/NBMTransportChannel.h

@@ -23,6 +23,9 @@ typedef NS_ENUM(NSInteger, NBMTransportChannelState) {
 - (void)channel:(NBMTransportChannel *)channel
  didChangeState:(NBMTransportChannelState)channelState;
 
+- (void)channel:(NBMTransportChannel *)channel
+didEncounterError:(NSError *)error;
+
 - (void)channel:(NBMTransportChannel *)channel
 didReceiveMessage:(NSDictionary *)messageDictionary;
 
@@ -38,7 +41,7 @@ didReceiveMessage:(NSDictionary *)messageDictionary;
 
 - (void)open;
 - (void)close;
-//- (void)send:(NSString *)message;
+- (void)send:(NSString *)message;
 - (void)sendMessage:(NSDictionary *)messageDictionary;
 
 @end