Merge pull request #49 from longbai/detail_info

detail info

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.11.1 (2015-06-23)
+
+### 增加
+* response info 增加 user id, timestamp
+
 ## 7.0.11 (2015-06-07)
 
 ### 增加

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.0.11'
+  s.version      = '7.0.11.1'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

QiniuSDK/Http/QNHttpManager.m

@@ -138,7 +138,7 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 	}
 	[request setTimeoutInterval:_timeout];
 
-	[request setValue:QNUserAgent() forHTTPHeaderField:@"User-Agent"];
+	[request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];
 	[request setValue:nil forHTTPHeaderField:@"Accept-Language"];
 	[_httpManager.operationQueue addOperation:operation];
 }

QiniuSDK/Http/QNResponseInfo.h

@@ -78,6 +78,16 @@ extern const int kQNFileError;
  */
 @property (nonatomic, readonly) NSString *serverIp;
 
+/**
+ *    客户端id
+ */
+@property (nonatomic, readonly) NSString *id;
+
+/**
+ *    时间戳
+ */
+@property (readonly) UInt64 timeStamp;
+
 /**
  *    网络类型
  */

QiniuSDK/Http/QNResponseInfo.m

@@ -8,6 +8,7 @@
 
 
 #import "QNResponseInfo.h"
+#import "QNUserAgent.h"
 
 const int kQNInvalidToken = -5;
 const int kQNFileError = -4;
@@ -112,6 +113,8 @@ - (instancetype)initWithStatus:(int)status
 		_error = error;
 		_host = host;
 		_duration = duration;
+        _id = [QNUserAgent sharedInstance].id;
+        _timeStamp = [[NSDate date] timeIntervalSince1970];
 	}
 	return self;
 }
@@ -138,6 +141,8 @@ - (instancetype)init:(int)status
 		_host = [host copy];
 		_duration = duration;
 		_serverIp = ip;
+		_id = [QNUserAgent sharedInstance].id;
+		_timeStamp = [[NSDate date] timeIntervalSince1970];
 		if (status != 200) {
 			if (body == nil) {
 				_error = [[NSError alloc] initWithDomain:domain code:_statusCode userInfo:nil];
@@ -165,7 +170,7 @@ - (instancetype)init:(int)status
 }
 
 - (NSString *)description {
-	return [NSString stringWithFormat:@"<%@: %p, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ ip: %@ duration:%f s error: %@>", NSStringFromClass([self class]), self, _statusCode, _reqId, _xlog, _xvia, _host, _serverIp, _duration, _error];
+	return [NSString stringWithFormat:@"<%@= id: %@, status: %d, requestId: %@, xlog: %@, xvia: %@, host: %@ ip: %@ duration: %f s time: %llu error: %@>", NSStringFromClass([self class]), _id, _statusCode, _reqId, _xlog, _xvia, _host, _serverIp, _duration, _timeStamp, _error];
 }
 
 - (BOOL)isCancelled {

QiniuSDK/Http/QNSessionManager.m

@@ -201,7 +201,7 @@ - (void)  sendRequest:(NSMutableURLRequest *)request
 
 	[request setTimeoutInterval:_timeout];
 
-	[request setValue:QNUserAgent() forHTTPHeaderField:@"User-Agent"];
+	[request setValue:[[QNUserAgent sharedInstance] description] forHTTPHeaderField:@"User-Agent"];
 	[request setValue:nil forHTTPHeaderField:@"Accept-Language"];
 	[uploadTask resume];
 }

QiniuSDK/Http/QNUserAgent.h

@@ -9,8 +9,24 @@
 #import <Foundation/Foundation.h>
 
 /**
- *    UserAgent 生成函数
+ *    UserAgent
  *
- *    @return UserAgent 字串
  */
-NSString *QNUserAgent(void);
+
+@interface QNUserAgent : NSObject
+
+/**
+ *    用户id
+ */
+@property (copy, nonatomic, readonly) NSString *id;
+
+/**
+ *    UserAgent 字串
+ */
+- (NSString *)description;
+
+/**
+ *  单例
+ */
++ (instancetype)sharedInstance;
+@end

QiniuSDK/Http/QNUserAgent.m

@@ -23,15 +23,44 @@
 	return [NSString stringWithFormat:@"%lld%u", now_timestamp, r];
 }
 
-NSString *QNUserAgent(void) {
-	static NSString *ua = nil;
-	static dispatch_once_t onceToken;
-	dispatch_once(&onceToken, ^{
+static NSString *userAgent(NSString *id) {
 #if __IPHONE_OS_VERSION_MIN_REQUIRED
-		ua =  [NSString stringWithFormat:@"QiniuObject-C/%@ (%@; iOS %@; %@)", kQiniuVersion, [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], clientId()];
+	return [NSString stringWithFormat:@"QiniuObject-C/%@ (%@; iOS %@; %@)", kQiniuVersion, [[UIDevice currentDevice] model], [[UIDevice currentDevice] systemVersion], id];
 #else
-		ua = [NSString stringWithFormat:@"QiniuObject-C/%@ (Mac OS X %@; %@)", kQiniuVersion, [[NSProcessInfo processInfo] operatingSystemVersionString], clientId()];
+	return [NSString stringWithFormat:@"QiniuObject-C/%@ (Mac OS X %@; %@)", kQiniuVersion, [[NSProcessInfo processInfo] operatingSystemVersionString], id];
 #endif
+}
+
+@interface QNUserAgent ()
+@property (nonatomic) NSString *ua;
+@end
+
+@implementation QNUserAgent
+
+- (NSString *)description {
+	return _ua;
+}
+
+- (instancetype)init {
+	if (self = [super init]) {
+		_id = clientId();
+		_ua = userAgent(_id);
+	}
+	return self;
+}
+
+/**
+ *  单例
+ */
++ (instancetype)sharedInstance {
+	static QNUserAgent *sharedInstance = nil;
+
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		sharedInstance = [[self alloc] init];
 	});
-	return ua;
+
+	return sharedInstance;
 }
+
+@end