4

CustomKeyboard/Network/KBNetworkManager.h

@@ -19,8 +19,15 @@ typedef NS_ERROR_ENUM(KBNetworkErrorDomain, KBNetworkError) {
     KBNetworkErrorDecodeFailed = 4,
 };
 
-/// 简单的 JSON 回调：json 为 NSDictionary/NSArray 或者在非 JSON 情况下返回 NSData
-typedef void(^KBNetworkCompletion)(id _Nullable jsonOrData, NSURLResponse * _Nullable response, NSError * _Nullable error);
+/// JSON 回调（扩展侧目前很少使用 JSON，可按需扩展）
+typedef void(^KBNetworkCompletion)(NSDictionary *_Nullable json,
+                                   NSURLResponse * _Nullable response,
+                                   NSError * _Nullable error);
+
+/// 二进制回调：用于下载 zip、图片等原始数据
+typedef void(^KBNetworkDataCompletion)(NSData *_Nullable data,
+                                       NSURLResponse *_Nullable response,
+                                       NSError *_Nullable error);
 
 @interface KBNetworkManager : NSObject
 
@@ -45,6 +52,12 @@ typedef void(^KBNetworkCompletion)(id _Nullable jsonOrData, NSURLResponse * _Nul
                                 headers:(nullable NSDictionary<NSString *, NSString *> *)headers
                               completion:(KBNetworkCompletion)completion;
 
+/// GET 原始二进制数据（不做 JSON 解析）
+- (nullable NSURLSessionDataTask *)GETData:(NSString *)path
+                                 parameters:(nullable NSDictionary *)parameters
+                                    headers:(nullable NSDictionary<NSString *, NSString *> *)headers
+                                  completion:(KBNetworkDataCompletion)completion;
+
 /// POST JSON 请求，jsonBody 会以 application/json 发送
 - (nullable NSURLSessionDataTask *)POST:(NSString *)path
                                jsonBody:(nullable id)jsonBody
@@ -54,4 +67,3 @@ typedef void(^KBNetworkCompletion)(id _Nullable jsonOrData, NSURLResponse * _Nul
 @end
 
 NS_ASSUME_NONNULL_END
-

CustomKeyboard/Network/KBNetworkManager.m

@@ -60,7 +60,7 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
         return nil;
     }
     [self applyHeaders:headers toMutableRequest:req contentType:nil];
-    return [self startAFTaskWithRequest:req completion:completion];
+    return [self startAFJSONTaskWithRequest:req completion:completion];
 }
 
 - (NSURLSessionDataTask *)POST:(NSString *)path
@@ -80,7 +80,41 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
                                                        error:&error];
     if (error) { if (completion) completion(nil, nil, error); return nil; }
     [self applyHeaders:headers toMutableRequest:req contentType:nil];
-    return [self startAFTaskWithRequest:req completion:completion];
+    return [self startAFJSONTaskWithRequest:req completion:completion];
+}
+
+- (NSURLSessionDataTask *)GETData:(NSString *)path
+                       parameters:(NSDictionary *)parameters
+                          headers:(NSDictionary<NSString *,NSString *> *)headers
+                        completion:(KBNetworkDataCompletion)completion {
+    if (!self.isEnabled) {
+        NSError *e = [NSError errorWithDomain:KBNetworkErrorDomain
+                                         code:KBNetworkErrorDisabled
+                                     userInfo:@{NSLocalizedDescriptionKey: KBLocalized(@"Network disabled (Full Access may be off)")}];
+        if (completion) completion(nil, nil, e);
+        return nil;
+    }
+    NSString *urlString = [self buildURLStringWithPath:path];
+    if (!urlString) {
+        NSError *e = [NSError errorWithDomain:KBNetworkErrorDomain
+                                         code:KBNetworkErrorInvalidURL
+                                     userInfo:@{NSLocalizedDescriptionKey: KBLocalized(@"Invalid URL")}];
+        if (completion) completion(nil, nil, e);
+        return nil;
+    }
+    AFHTTPRequestSerializer *serializer = [AFHTTPRequestSerializer serializer];
+    serializer.timeoutInterval = self.timeout;
+    NSError *serror = nil;
+    NSMutableURLRequest *req = [serializer requestWithMethod:@"GET"
+                                                   URLString:urlString
+                                                  parameters:parameters
+                                                       error:&serror];
+    if (serror || !req) {
+        if (completion) completion(nil, nil, serror ?: [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorInvalidURL userInfo:@{NSLocalizedDescriptionKey: KBLocalized(@"Invalid URL")}]);
+        return nil;
+    }
+    [self applyHeaders:headers toMutableRequest:req contentType:nil];
+    return [self startAFDataTaskWithRequest:req completion:completion];
 }
 
 #pragma mark - Core
@@ -120,7 +154,7 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
     [all enumerateKeysAndObjectsUsingBlock:^(NSString *key, NSString *obj, BOOL *stop) { [req setValue:obj forHTTPHeaderField:key]; }];
 }
 
-- (NSURLSessionDataTask *)startAFTaskWithRequest:(NSURLRequest *)req completion:(KBNetworkCompletion)completion {
+- (NSURLSessionDataTask *)startAFJSONTaskWithRequest:(NSURLRequest *)req completion:(KBNetworkCompletion)completion {
     // 响应先用原始数据返回，再按 Content-Type 解析 JSON（与原实现一致）
     self.manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     NSURLSessionDataTask *task = [self.manager dataTaskWithRequest:req uploadProgress:nil downloadProgress:nil completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
@@ -154,16 +188,41 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
         if (looksJSON) {
             NSError *jsonErr = nil;
             id json = [NSJSONSerialization JSONObjectWithData:data options:0 error:&jsonErr];
-            if (jsonErr) { if (completion) completion(nil, response, [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorDecodeFailed userInfo:@{NSLocalizedDescriptionKey:KBLocalized(@"Failed to parse JSON")}]); return; }
-            if (completion) completion(json, response, nil);
+            if (jsonErr) {
+                if (completion) completion(nil, response, [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorDecodeFailed userInfo:@{NSLocalizedDescriptionKey:KBLocalized(@"Failed to parse JSON")}]);
+                return;
+            }
+            if (![json isKindOfClass:[NSDictionary class]]) {
+                if (completion) completion(nil, response, [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorInvalidResponse userInfo:@{NSLocalizedDescriptionKey:KBLocalized(@"Invalid response")}]);
+                return;
+            }
+            if (completion) completion((NSDictionary *)json, response, nil);
         } else {
-            if (completion) completion(data, response, nil);
+            if (completion) completion(nil, response, [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorInvalidResponse userInfo:@{NSLocalizedDescriptionKey:KBLocalized(@"Invalid response")}]);
         }
     }];
     [task resume];
     return task;
 }
 
+- (NSURLSessionDataTask *)startAFDataTaskWithRequest:(NSURLRequest *)req completion:(KBNetworkDataCompletion)completion {
+    self.manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    NSURLSessionDataTask *task = [self.manager dataTaskWithRequest:req uploadProgress:nil downloadProgress:nil completionHandler:^(NSURLResponse *response, id responseObject, NSError *error) {
+        if (error) {
+            if (completion) completion(nil, response, error);
+            return;
+        }
+        NSData *data = (NSData *)responseObject;
+        if (![data isKindOfClass:[NSData class]]) {
+            if (completion) completion(nil, response, [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorInvalidResponse userInfo:@{NSLocalizedDescriptionKey:KBLocalized(@"No data")}]);
+            return;
+        }
+        if (completion) completion(data, response, nil);
+    }];
+    [task resume];
+    return task;
+}
+
 #pragma mark - AFHTTPSessionManager
 
 - (AFHTTPSessionManager *)manager {