3

Shared/KBSkinInstallBridge.m

@@ -6,11 +6,15 @@
 
 #import "KBConfig.h"
 #import "KBSkinManager.h"
+#if __has_include("KBNetworkManager.h")
+#import "KBNetworkManager.h"
+#endif
 #if __has_include(<SSZipArchive/SSZipArchive.h>)
 #import <SSZipArchive/SSZipArchive.h>
 #endif
 
 NSString * const KBDarwinSkinInstallRequestNotification = @"com.loveKey.nyx.skin.install.request";
+NSErrorDomain const KBSkinBridgeErrorDomain             = @"com.loveKey.nyx.skin.bridge";
 
 static NSString * const kKBSkinPendingRequestKey       = @"com.loveKey.nyx.skin.pending";
 static NSString * const kKBSkinPendingSkinIdKey        = @"skinId";
@@ -20,16 +24,6 @@ static NSString * const kKBSkinPendingKindKey          = @"kind";
 static NSString * const kKBSkinPendingTimestampKey     = @"timestamp";
 static NSString * const kKBSkinPendingIconShortKey     = @"iconShortNames";
 
-static NSString * const kKBSkinBridgeErrorDomain       = @"com.loveKey.nyx.skin.bridge";
-
-typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
-    KBSkinBridgeErrorInvalidPayload = 1,
-    KBSkinBridgeErrorContainerUnavailable,
-    KBSkinBridgeErrorZipMissing,
-    KBSkinBridgeErrorUnzipFailed,
-    KBSkinBridgeErrorApplyFailed,
-};
-
 @implementation KBSkinInstallBridge
 
 + (NSDictionary<NSString *,NSString *> *)defaultIconShortNames {
@@ -54,6 +48,245 @@ typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
     return [[NSUserDefaults alloc] initWithSuiteName:AppGroup];
 }
 
++ (void)installRemoteSkinWithJSON:(NSDictionary *)skinJSON
+                        completion:(KBSkinInstallConsumeCompletion)completion {
+    if (![skinJSON isKindOfClass:NSDictionary.class] || skinJSON.count == 0) {
+        if (completion) {
+            NSError *err = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                               code:KBSkinBridgeErrorInvalidPayload
+                                           userInfo:nil];
+            dispatch_async(dispatch_get_main_queue(), ^{ completion(NO, err); });
+        }
+        return;
+    }
+
+    NSString *skinId = skinJSON[@"id"] ?: @"remote";
+    NSString *name = skinJSON[@"name"] ?: skinId;
+    NSString *zipURL = skinJSON[@"zip_url"] ?: @"";
+
+    // key_icons 可选：
+    // - 若后端提供 key_icons，则优先使用服务端映射；
+    // - 若未提供，则回退到本地默认映射，这样后端只需返回 id/name/zip_url。
+    NSDictionary *iconShortNames = nil;
+    if ([skinJSON[@"key_icons"] isKindOfClass:NSDictionary.class]) {
+        iconShortNames = skinJSON[@"key_icons"];
+    } else {
+        iconShortNames = [self defaultIconShortNames];
+    }
+
+    NSFileManager *fm = [NSFileManager defaultManager];
+    NSURL *containerURL = [fm containerURLForSecurityApplicationGroupIdentifier:AppGroup];
+    if (!containerURL) {
+        if (completion) {
+            NSError *err = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                               code:KBSkinBridgeErrorContainerUnavailable
+                                           userInfo:@{NSLocalizedDescriptionKey: @"Shared container unavailable"}];
+            dispatch_async(dispatch_get_main_queue(), ^{ completion(NO, err); });
+        }
+        return;
+    }
+
+    NSString *skinsRoot = [containerURL.path stringByAppendingPathComponent:@"Skins"];
+    NSString *skinRoot  = [skinsRoot stringByAppendingPathComponent:skinId];
+    NSString *iconsDir  = [skinRoot stringByAppendingPathComponent:@"icons"];
+    [fm createDirectoryAtPath:iconsDir
+   withIntermediateDirectories:YES
+                    attributes:nil
+                         error:NULL];
+
+    BOOL isDir = NO;
+    BOOL hasIconsDir = [fm fileExistsAtPath:iconsDir isDirectory:&isDir] && isDir;
+    NSArray *contents = hasIconsDir ? [fm contentsOfDirectoryAtPath:iconsDir error:NULL] : nil;
+    BOOL hasCachedAssets = (contents.count > 0);
+
+    NSString *bgPath = [skinRoot stringByAppendingPathComponent:@"background.png"];
+
+    dispatch_group_t group = dispatch_group_create();
+    __block BOOL zipOK = YES;
+    __block NSError *innerError = nil;
+
+#if __has_include(<SSZipArchive/SSZipArchive.h>)
+    // 若本地尚未缓存该皮肤资源且提供了 zip_url，则通过网络下载并解压 Zip 包。
+    if (!hasCachedAssets && zipURL.length > 0) {
+        dispatch_group_enter(group);
+
+        void (^handleZipData)(NSData *) = ^(NSData *data) {
+            if (data.length == 0) {
+                zipOK = NO;
+                if (!innerError) {
+                    innerError = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                                     code:KBSkinBridgeErrorZipMissing
+                                                 userInfo:@{NSLocalizedDescriptionKey: @"Zip data is empty"}];
+                }
+                dispatch_group_leave(group);
+                return;
+            }
+            // 将 Zip 写入临时路径再解压
+            [fm createDirectoryAtPath:skinRoot
+          withIntermediateDirectories:YES
+                           attributes:nil
+                                error:NULL];
+            NSString *zipPath = [skinRoot stringByAppendingPathComponent:@"skin.zip"];
+            if (![data writeToFile:zipPath atomically:YES]) {
+                zipOK = NO;
+                if (!innerError) {
+                    innerError = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                                     code:KBSkinBridgeErrorUnzipFailed
+                                                 userInfo:@{NSLocalizedDescriptionKey: @"Failed to write zip file"}];
+                }
+                dispatch_group_leave(group);
+                return;
+            }
+
+            NSError *unzipError = nil;
+            BOOL ok = [SSZipArchive unzipFileAtPath:zipPath
+                                       toDestination:skinRoot
+                                           overwrite:YES
+                                            password:nil
+                                               error:&unzipError];
+            [fm removeItemAtPath:zipPath error:nil];
+            if (!ok || unzipError) {
+                zipOK = NO;
+                if (!innerError) {
+                    innerError = unzipError ?: [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                                                   code:KBSkinBridgeErrorUnzipFailed
+                                                               userInfo:nil];
+                }
+                dispatch_group_leave(group);
+                return;
+            }
+
+            // 兼容“额外包一层目录”的压缩结构：
+            // 若 Skins/<skinId>/icons 为空，但存在 Skins/<skinId>/<子目录>/icons，
+            // 则将实际 icons 与 background.png 上移到预期位置。
+            BOOL isDir2 = NO;
+            NSArray *iconsContent = [fm contentsOfDirectoryAtPath:iconsDir error:NULL];
+            BOOL iconsValid = ([fm fileExistsAtPath:iconsDir isDirectory:&isDir2] && isDir2 && iconsContent.count > 0);
+            if (!iconsValid) {
+                NSArray<NSString *> *subItems = [fm contentsOfDirectoryAtPath:skinRoot error:NULL];
+                for (NSString *subName in subItems) {
+                    if ([subName isEqualToString:@"icons"] || [subName isEqualToString:@"__MACOSX"]) continue;
+                    NSString *nestedRoot = [skinRoot stringByAppendingPathComponent:subName];
+                    BOOL isDirNested = NO;
+                    if (![fm fileExistsAtPath:nestedRoot isDirectory:&isDirNested] || !isDirNested) continue;
+
+                    NSString *nestedIcons = [nestedRoot stringByAppendingPathComponent:@"icons"];
+                    BOOL isDirNestedIcons = NO;
+                    if ([fm fileExistsAtPath:nestedIcons isDirectory:&isDirNestedIcons] && isDirNestedIcons) {
+                        NSArray *nestedFiles = [fm contentsOfDirectoryAtPath:nestedIcons error:NULL];
+                        if (nestedFiles.count > 0) {
+                            // 确保目标 icons 目录存在
+                            [fm createDirectoryAtPath:iconsDir
+                           withIntermediateDirectories:YES
+                                            attributes:nil
+                                                 error:NULL];
+                            // 将 icons 下所有文件上移一层
+                            for (NSString *fn in nestedFiles) {
+                                NSString *from = [nestedIcons stringByAppendingPathComponent:fn];
+                                NSString *to   = [iconsDir stringByAppendingPathComponent:fn];
+                                [fm removeItemAtPath:to error:nil];
+                                [fm moveItemAtPath:from toPath:to error:nil];
+                            }
+                        }
+                    }
+
+                    // 处理 background.png：若在子目录下存在，则上移到 skinRoot
+                    NSString *nestedBg = [nestedRoot stringByAppendingPathComponent:@"background.png"];
+                    if ([fm fileExistsAtPath:nestedBg]) {
+                        [fm removeItemAtPath:bgPath error:nil];
+                        [fm moveItemAtPath:nestedBg toPath:bgPath error:nil];
+                    }
+                }
+            }
+            dispatch_group_leave(group);
+        };
+
+#if __has_include("KBNetworkManager.h")
+        // 远程下载（http/https）
+        [[KBNetworkManager shared] GET:zipURL parameters:nil headers:nil completion:^(id jsonOrData, NSURLResponse *response, NSError *error) {
+            NSData *data = ([jsonOrData isKindOfClass:NSData.class] ? (NSData *)jsonOrData : nil);
+            if (error || data.length == 0) {
+                zipOK = NO;
+                if (!innerError) {
+                    innerError = error ?: [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                                              code:KBSkinBridgeErrorZipMissing
+                                                          userInfo:@{NSLocalizedDescriptionKey: @"Failed to download zip"}];
+                }
+                dispatch_group_leave(group);
+                return;
+            }
+            handleZipData(data);
+        }];
+#else
+        // 无 KBNetworkManager 时，退回到简单的 dataWithContentsOfURL 下载（阻塞当前线程）
+        dispatch_async(dispatch_get_global_queue(QOS_CLASS_UTILITY, 0), ^{
+            NSURL *url = [NSURL URLWithString:zipURL];
+            NSData *data = url ? [NSData dataWithContentsOfURL:url] : nil;
+            if (!data) {
+                zipOK = NO;
+                if (!innerError) {
+                    innerError = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                                     code:KBSkinBridgeErrorZipMissing
+                                                 userInfo:@{NSLocalizedDescriptionKey: @"Failed to download zip"}];
+                }
+                dispatch_group_leave(group);
+            } else {
+                handleZipData(data);
+            }
+        });
+#endif
+    }
+#else
+    zipOK = NO;
+    innerError = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                     code:KBSkinBridgeErrorUnzipFailed
+                                 userInfo:@{NSLocalizedDescriptionKey: @"SSZipArchive not available"}];
+#endif
+
+    // 解压与下载完成后，构造主题并应用
+    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+        // 构造 key_icons -> App Group 相对路径 映射
+        NSMutableDictionary<NSString *, NSString *> *iconPathMap = [NSMutableDictionary dictionary];
+        [iconShortNames enumerateKeysAndObjectsUsingBlock:^(NSString *identifier, NSString *shortName, BOOL *stop) {
+            if (![shortName isKindOfClass:NSString.class] || shortName.length == 0) return;
+            NSString *fileName = shortName;
+            // 若未带扩展名，默认按 .png 处理
+            if (fileName.pathExtension.length == 0) {
+                fileName = [fileName stringByAppendingPathExtension:@"png"];
+            }
+            NSString *relative = [NSString stringWithFormat:@"Skins/%@/icons/%@", skinId, fileName];
+            iconPathMap[identifier] = relative;
+        }];
+
+        NSMutableDictionary *themeJSON = [skinJSON mutableCopy];
+        themeJSON[@"id"] = skinId;
+        if (iconPathMap.count > 0) {
+            themeJSON[@"key_icons"] = iconPathMap.copy;
+        }
+
+        BOOL themeOK = [[KBSkinManager shared] applyThemeFromJSON:themeJSON];
+
+        // 背景图优先从 Zip 解压出的 background.png 读取
+        NSData *bgData = [NSData dataWithContentsOfFile:bgPath];
+        BOOL ok = themeOK;
+        if (bgData.length > 0) {
+            ok = [[KBSkinManager shared] applyImageSkinWithData:bgData skinId:skinId name:name];
+        }
+
+        if (!zipOK && !hasCachedAssets) {
+            ok = NO;
+        }
+
+        NSError *finalError = nil;
+        if (!ok) {
+            finalError = innerError ?: [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                                           code:KBSkinBridgeErrorApplyFailed
+                                                       userInfo:nil];
+        }
+        if (completion) completion(ok, finalError);
+    });
+}
+
 + (void)publishBundleSkinRequestWithId:(NSString *)skinId
                                   name:(NSString *)name
                                zipName:(NSString *)zipName
@@ -115,7 +348,7 @@ typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
                  error:(NSError * __autoreleasing *)error {
 #if !__has_include(<SSZipArchive/SSZipArchive.h>)
     if (error) {
-        *error = [NSError errorWithDomain:kKBSkinBridgeErrorDomain
+        *error = [NSError errorWithDomain:KBSkinBridgeErrorDomain
                                      code:KBSkinBridgeErrorUnzipFailed
                                  userInfo:@{NSLocalizedDescriptionKey: @"SSZipArchive not available"}];
     }
@@ -126,7 +359,7 @@ typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
     NSString *zipName = payload[kKBSkinPendingZipKey];
     if (skinId.length == 0 || zipName.length == 0) {
         if (error) {
-            *error = [NSError errorWithDomain:kKBSkinBridgeErrorDomain
+            *error = [NSError errorWithDomain:KBSkinBridgeErrorDomain
                                          code:KBSkinBridgeErrorInvalidPayload
                                      userInfo:nil];
         }
@@ -192,9 +425,9 @@ typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
         }
         if (zipPath.length == 0) {
             if (error) {
-                *error = [NSError errorWithDomain:kKBSkinBridgeErrorDomain
-                                             code:KBSkinBridgeErrorZipMissing
-                                         userInfo:@{NSLocalizedDescriptionKey: @"Zip resource not found"}];
+        *error = [NSError errorWithDomain:KBSkinBridgeErrorDomain
+                                     code:KBSkinBridgeErrorZipMissing
+                                 userInfo:@{NSLocalizedDescriptionKey: @"Zip resource not found"}];
             }
             return NO;
         }
@@ -207,7 +440,7 @@ typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
                                            error:&unzipError];
         if (!ok || unzipError) {
             if (error) {
-                *error = unzipError ?: [NSError errorWithDomain:kKBSkinBridgeErrorDomain
+                *error = unzipError ?: [NSError errorWithDomain:KBSkinBridgeErrorDomain
                                                            code:KBSkinBridgeErrorUnzipFailed
                                                        userInfo:nil];
             }
@@ -283,7 +516,7 @@ typedef NS_ENUM(NSUInteger, KBSkinBridgeErrorCode) {
     }
 
     if (!ok && error) {
-        *error = [NSError errorWithDomain:kKBSkinBridgeErrorDomain
+        *error = [NSError errorWithDomain:KBSkinBridgeErrorDomain
                                      code:KBSkinBridgeErrorApplyFailed
                                  userInfo:nil];
     }