@leonxin/meetgames 0.1.11 → 0.1.13

package/src/core/workspace.ts

@@ -22,6 +22,8 @@ export function buildWorkspaceContext(
     projectRoot: root,
     packageRoot: pkg,
     sdkHomeApiBaseUrl: options.sdkHomeApiBaseUrl,
+    remoteConfigPath: options.remoteConfigPath,
+    iosSdkRoot: options.iosSdkRoot,
     android: detectAndroid(root, { appTarget: options.appTarget }),
     ios: detectIOS(root, { appTarget: options.appTarget }),
     iosReserved: iosToolingReserved,

package/src/index.ts

@@ -80,6 +80,13 @@ export {
   isTopSdkFeatureModuleEnabled,
 } from "./config/topsdkFeatureModules.js";
 export { clearPreviewPatchFilesIfTargetInside, resolveDefaultPreviewPatchDir } from "./core/previewPatches.js";
+export {
+  MEET_SDK_TOOL_CACHE_ROOT,
+  ensureCacheRoot,
+  resolveIosSdkCacheLayout,
+  resolveRemoteConfigCachePath,
+  writeRemoteConfigCache,
+} from "./cache.js";
 export { buildWorkspaceContext, resolvePackageRoot } from "./core/workspace.js";
 export { runPipeline } from "./core/pipeline.js";
 export { generatePatchForFile } from "./core/patch.js";

package/src/ios/channelConfig.ts

@@ -101,7 +101,7 @@ export const IOS_PLUGIN_FOLDER_BY_SUBKEY: Record<string, string> = {
 };
 
 export function enabledIosPluginFolders(config: MeetSdkRemoteConfig): string[] {
-  const folders: string[] = [];
+  const folders: string[] = ["UI"];
   for (const [scope, bucket] of Object.entries(config.sdkModules)) {
     if (!bucket || typeof bucket !== "object") continue;
     const scopeRecord = bucket as Record<string, unknown>;

package/src/ios/codeUtils.ts

@@ -19,6 +19,10 @@ export class CodeUtils {
     return norm(this.content).includes(norm(code));
   }
 
+  hasCode(code: string): boolean {
+    return this.checkExisted(code);
+  }
+
   addHeader(code: string): boolean {
     if (this.checkExisted(code)) return true;
     this.content = `${code}\n${this.content}`;

package/src/ios/integrate.ts

@@ -50,12 +50,12 @@ export interface IosIntegrateOptions {
 
 const IOS_FIREBASE_CONFIG_FILE = "GoogleService-Info.plist";
 
-function ok(changed: string[], warnings: string[] = []): StepResult {
-  return { ok: true, changedFiles: changed, warnings, errors: [] };
+function ok(changed: string[], warnings: string[] = [], logs: string[] = []): StepResult {
+  return { ok: true, changedFiles: changed, logs, warnings, errors: [] };
 }
 
-function fail(errors: string[], warnings: string[] = []): StepResult {
-  return { ok: false, changedFiles: [], warnings, errors };
+function fail(errors: string[], warnings: string[] = [], logs: string[] = []): StepResult {
+  return { ok: false, changedFiles: [], logs, warnings, errors };
 }
 
 function applyPlugin(
@@ -66,15 +66,19 @@ function applyPlugin(
   perform: readonly PerformSetting[],
   binaryCopies: BinaryCopy[],
   dryRun: boolean,
+  logs: string[],
   remoteSources: Map<string, string> = new Map()
 ): void {
   const { config, sourceDir } = loaded;
   const srcRoot = pbx.srcRoot;
 
+  logs.push(`- 插件：${config.name}, 类型：${config.type},版本：${config.pluginVersion}`);
+
   if (perform.includes("frameworks") && config.frameworks?.length) {
     for (const fw of config.frameworks) {
       if (fw.system) {
         addSystemFramework(pbx, fw.name);
+        logs.push(`SUCCESS: 导入系统依赖framework ${fw.name} 完成`);
         continue;
       }
       const src = path.join(sourceDir, fw.name);
@@ -86,6 +90,7 @@ function applyPlugin(
         fm.copyFramework(src);
       }
       addThirdPartyFramework(pbx, relTo, Boolean(fw.embed));
+      logs.push(`SUCCESS: 导入三方依赖framework ${fw.name} 完成`);
       if (fw.copyFile) addCopyFile(pbx, relTo);
     }
   }
@@ -94,6 +99,7 @@ function applyPlugin(
     for (const lib of config.libs) {
       if (lib.system) {
         addSystemLib(pbx, lib.name);
+        logs.push(`SUCCESS: 导入系统依赖lib ${lib.name} 完成`);
         continue;
       }
       const src = path.join(sourceDir, lib.name);
@@ -102,6 +108,7 @@ function applyPlugin(
       if (dryRun) binaryCopies.push({ fromAbs: src, relTo });
       else fm.copyFile(src);
       addSourceOrResourceFile(pbx, relTo);
+      logs.push(`SUCCESS: 导入三方依赖lib ${lib.name} 完成`);
     }
   }
 
@@ -110,6 +117,7 @@ function applyPlugin(
       const remoteRel = remoteSources.get(`${config.name}:${source}`);
       if (remoteRel) {
         addSourceOrResourceFile(pbx, remoteRel);
+        logs.push(`SUCCESS: 引入资源 ${source} 完成`);
         continue;
       }
       const src = path.join(sourceDir, source);
@@ -126,15 +134,17 @@ function applyPlugin(
             for (const name of fs.readdirSync(dir)) {
               const full = path.join(dir, name);
               if (fs.statSync(full).isDirectory()) {
-                if (name.endsWith(".bundle")) {
-                  addSourceOrResourceFile(pbx, fm.relFromSrc(full));
-                } else {
-                  walk(full);
-                }
+              if (name.endsWith(".bundle")) {
+                addSourceOrResourceFile(pbx, fm.relFromSrc(full));
+                logs.push(`SUCCESS: 引入资源 ${name} 完成`);
+              } else {
+                walk(full);
+              }
                 continue;
               }
               if (/\.(h|m|mm|plist|a)$/.test(name)) {
                 addSourceOrResourceFile(pbx, fm.relFromSrc(full));
+                logs.push(`SUCCESS: 引入资源 ${name} 完成`);
               }
             }
           };
@@ -146,6 +156,7 @@ function applyPlugin(
         else if (fs.statSync(src).isDirectory()) fm.copyDir(src);
         else fm.copyFile(src);
         addSourceOrResourceFile(pbx, relTo);
+        logs.push(`SUCCESS: 引入资源 ${source} 完成`);
       }
     }
   }
@@ -153,15 +164,18 @@ function applyPlugin(
   if (perform.includes("buildSettings") && config.buildSettings) {
     for (const [k, v] of Object.entries(config.buildSettings)) {
       setBuildSetting(pbx, k, v);
+      logs.push(`SUCCESS: BuildSetting设置${k}为${v} 完成`);
     }
   }
 
   if (perform.includes("OtherLinkerFlags") && config.OtherLinkerFlags?.length) {
     for (const flag of config.OtherLinkerFlags) {
       addOtherLinkerFlag(pbx, flag);
+      logs.push(`SUCCESS: 添加other link flag:${flag} 完成`);
     }
   }
 
+  logs.push(`SUCCESS: 插件${config.name}接入完成`);
 }
 
 function validateLoadedPluginResourcesForIos(loaded: LoadedPluginConfig): string[] {
@@ -224,6 +238,42 @@ function iosFirebaseConfigRelPath(plistDocs: PlistDocument[]): string {
   return dir === "." ? IOS_FIREBASE_CONFIG_FILE : path.posix.join(dir, IOS_FIREBASE_CONFIG_FILE);
 }
 
+function hasSwiftSource(srcRoot: string): boolean {
+  const walk = (dir: string): boolean => {
+    let entries: fs.Dirent[];
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch {
+      return false;
+    }
+    for (const entry of entries) {
+      if (entry.name.startsWith(".")) continue;
+      const full = path.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        if (!["Pods", "build", "DerivedData", "topSDK"].includes(entry.name) && walk(full)) return true;
+        continue;
+      }
+      if (entry.name.endsWith(".swift")) return true;
+    }
+    return false;
+  };
+  return walk(srcRoot);
+}
+
+function ensureTopSdkInstallSwift(
+  store: TextFileStore,
+  ctx: WorkspaceContext,
+  pbx: PbxContext
+): string | null {
+  if (hasSwiftSource(pbx.srcRoot)) return null;
+  const relFromSrc = path.join(pbx.targetName, "TopSDKInstall.swift").split(path.sep).join("/");
+  const abs = path.join(pbx.srcRoot, relFromSrc);
+  const relFromProject = path.relative(ctx.projectRoot, abs).split(path.sep).join("/");
+  store.write(relFromProject, "import Foundation\n\n");
+  addSourceOrResourceFile(pbx, relFromSrc);
+  return relFromProject;
+}
+
 function appDelegateCodeShouldMoveToSceneDelegate(code: CodeConfig): boolean {
   if (code.type === "header") return false;
   const method = code.method ?? "";
@@ -274,7 +324,8 @@ function mergePlistParams(
   docs: PlistDocument[],
   loaded: LoadedPluginConfig,
   channelConfig: Record<string, unknown>,
-  perform: readonly PerformSetting[]
+  perform: readonly PerformSetting[],
+  logs: string[]
 ): void {
   if (!perform.includes("infoParams") && !perform.includes("urlScheme") && !perform.includes("queriesSchemes")) {
     return;
@@ -282,18 +333,22 @@ function mergePlistParams(
   for (const doc of docs) {
     if (perform.includes("infoParams") && loaded.config.infoParams) {
       for (const [key, raw] of Object.entries(loaded.config.infoParams)) {
-        addPlistParam(doc.data, key, applyChannelTemplateValue(raw, channelConfig));
+        const value = applyChannelTemplateValue(raw, channelConfig);
+        addPlistParam(doc.data, key, value);
+        logs.push(`SUCCESS: info.plist添加配置key：${key} value:${String(value)} 完成`);
       }
     }
     if (perform.includes("queriesSchemes") && loaded.config.queriesSchemes?.length) {
       for (const scheme of loaded.config.queriesSchemes) {
         addQueriesScheme(doc.data, scheme);
+        logs.push(`SUCCESS: 添加queriesSchemes:${scheme} 完成`);
       }
     }
     if (perform.includes("urlScheme") && loaded.config.urlScheme) {
       let scheme = applyChannelTemplate(loaded.config.urlScheme, channelConfig);
       if (scheme.endsWith("://")) scheme = scheme.replace("://", "");
       addUrlScheme(doc.data, scheme);
+      logs.push(`SUCCESS: 设置urlScheme：${scheme}完成`);
     }
   }
 }
@@ -331,20 +386,21 @@ export async function runIosIntegrateTopSdk(
 ): Promise<StepResult> {
   if (!ctx.ios?.ok) return fail(["iOS project not detected"]);
   const warnings: string[] = [];
+  const logs: string[] = [];
   const changed = new Set<string>();
 
-  const configPath = path.join(ctx.projectRoot, MEETSDK_REMOTE_CONFIG_FILENAME);
+  const configPath = ctx.remoteConfigPath ?? path.join(ctx.projectRoot, MEETSDK_REMOTE_CONFIG_FILENAME);
   if (!fs.existsSync(configPath)) {
-    return fail([`${MEETSDK_REMOTE_CONFIG_FILENAME} not found; run fetch-config or setup first`]);
+    return fail([`${MEETSDK_REMOTE_CONFIG_FILENAME} not found at ${configPath}; run fetch-config or setup first`], warnings, logs);
   }
   let remote: ReturnType<typeof tryParseAsMeetSdkRemoteConfig>;
   try {
     remote = tryParseAsMeetSdkRemoteConfig(JSON.parse(fs.readFileSync(configPath, "utf8")) as unknown);
   } catch (e) {
-    return fail([e instanceof Error ? e.message : String(e)]);
+    return fail([e instanceof Error ? e.message : String(e)], warnings, logs);
   }
   if (!remote) {
-    return fail([`invalid ${MEETSDK_REMOTE_CONFIG_FILENAME}`]);
+    return fail([`invalid ${MEETSDK_REMOTE_CONFIG_FILENAME}`], warnings, logs);
   }
   const validation = validateMeetSdkRemoteConfig(remote);
   if (!validation.ok) {
@@ -353,15 +409,17 @@ export async function runIosIntegrateTopSdk(
 
   let sdkRoot: string;
   try {
-    sdkRoot = resolveIosSdkRoot(ctx.packageRoot);
+    sdkRoot = ctx.iosSdkRoot ?? resolveIosSdkRoot(ctx.packageRoot);
   } catch (e) {
-    return fail([e instanceof Error ? e.message : String(e)]);
+    return fail([e instanceof Error ? e.message : String(e)], warnings, logs);
   }
 
   const targetName = options.targetName ?? ctx.ios.targetName ?? path.basename(ctx.ios.xcodeprojPath!, ".xcodeproj");
   const perform = options.performSettings ?? DEFAULT_PERFORM_SETTINGS;
   const executeAppDelegate = options.executeAppDelegate !== false;
   const dryRun = Boolean(options.dryRun);
+  logs.push("6、执行 SDK 接入");
+  logs.push(`*** 项目根目录:${ctx.projectRoot} ***`);
 
   const channelConfig = buildChannelConfigMap(remote);
   const coreConfigs = listSdkCoreConfigs(sdkRoot);
@@ -375,6 +433,7 @@ export async function runIosIntegrateTopSdk(
     if (p) pluginConfigs.push(p);
     else warnings.push(`iOS plugin folder not in SDK package: plugins/${folder}`);
   }
+
   const xcodeprojPath = ctx.ios.xcodeprojPath!;
   const pbx = await loadPbxFromStore(store, ctx.projectRoot, xcodeprojPath, targetName);
   const fm = new TopSdkFileManager(pbx.srcRoot);
@@ -383,30 +442,37 @@ export async function runIosIntegrateTopSdk(
   try {
     plistDocs = await ensureInfoPlists(store, ctx, pbx, targetName);
   } catch (e) {
-    return fail([e instanceof Error ? e.message : String(e)], warnings);
+    return fail([e instanceof Error ? e.message : String(e)], warnings, logs);
   }
 
   const firebaseDownload = await downloadIosFirebaseConfig(remote, pbx, dryRun, iosFirebaseConfigRelPath(plistDocs));
   warnings.push(...firebaseDownload.warnings);
-  if (firebaseDownload.errors.length) return fail(firebaseDownload.errors, warnings);
+  if (firebaseDownload.errors.length) return fail(firebaseDownload.errors, warnings, logs);
 
   const resourceErrors = [...coreConfigs, ...pluginConfigs].flatMap(validateLoadedPluginResourcesForIos);
-  if (resourceErrors.length) return fail(resourceErrors, warnings);
+  if (resourceErrors.length) return fail(resourceErrors, warnings, logs);
 
   const missingRequiredConfigs = validateRequiredChannelConfigs(pluginConfigs, channelConfig);
   if (missingRequiredConfigs.length) {
-    return fail([`iOS remote config missing required channel params: ${missingRequiredConfigs.join(", ")}`], warnings);
+    return fail([`iOS remote config missing required channel params: ${missingRequiredConfigs.join(", ")}`], warnings, logs);
   }
 
-  for (const loaded of coreConfigs) {
-    applyPlugin(loaded, pbx, fm, channelConfig, perform, binaryCopies, dryRun, firebaseDownload.remoteSources);
-  }
   for (const loaded of pluginConfigs) {
-    applyPlugin(loaded, pbx, fm, channelConfig, perform, binaryCopies, dryRun, firebaseDownload.remoteSources);
+    applyPlugin(loaded, pbx, fm, channelConfig, perform, binaryCopies, dryRun, logs, firebaseDownload.remoteSources);
+    if (loaded.config.name === "FacebookSignin" && perform.includes("sources")) {
+      const swiftRel = ensureTopSdkInstallSwift(store, ctx, pbx);
+      if (swiftRel) {
+        changed.add(swiftRel);
+        logs.push("SUCCESS: 未检测到Swift代码文件，自动添加TopSDKInstall.swift完成");
+      }
+    }
+  }
+  for (const loaded of coreConfigs) {
+    applyPlugin(loaded, pbx, fm, channelConfig, perform, binaryCopies, dryRun, logs, firebaseDownload.remoteSources);
   }
 
   for (const loaded of [...coreConfigs, ...pluginConfigs]) {
-    mergePlistParams(plistDocs, loaded, channelConfig, perform);
+    mergePlistParams(plistDocs, loaded, channelConfig, perform, logs);
     if (perform.includes("infoParams")) {
       setAppTransportSecurity(plistDocs[0]?.data ?? {}, true);
     }
@@ -429,6 +495,7 @@ export async function runIosIntegrateTopSdk(
     for (const rel of ensureAppleSignInEntitlement(store, ctx.projectRoot, pbx)) {
       changed.add(rel);
     }
+    logs.push("SUCCESS: 启用SigninWithApple完成");
   }
 
   savePbxToStore(store, pbx);
@@ -453,14 +520,21 @@ export async function runIosIntegrateTopSdk(
     }
     for (const rel of delegateRelPaths.length === 1 ? delegateRelPaths : []) {
       const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
+      logs.push("检测到工程UIApplicationDelegate实现类，将自动接入对应接口");
       let okInject = true;
       for (const loaded of [...coreConfigs, ...pluginConfigs]) {
         for (const code of appDelegateCodesForLifecycle(loaded, hasUniqueSceneDelegate)) {
+          const existed = cu.hasCode(code.content);
           if (code.type === "header") {
             if (!cu.addHeader(code.content)) okInject = false;
           } else if ((code.type === "method" || code.type === "code") && code.method) {
             if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
           }
+          if (okInject) {
+            logs.push(
+              `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
+            );
+          }
         }
       }
       if (!okInject) warnings.push(`AppDelegate injection incomplete for ${rel}`);
@@ -474,14 +548,21 @@ export async function runIosIntegrateTopSdk(
     }
     for (const rel of sceneDelegateRelPaths.length === 1 ? sceneDelegateRelPaths : []) {
       const cu = CodeUtils.fromFile(path.join(ctx.projectRoot, rel));
+      logs.push("检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口");
       let okInject = true;
       for (const loaded of [...coreConfigs, ...pluginConfigs]) {
         for (const code of loaded.config.sceneDelegateCodes ?? []) {
+          const existed = cu.hasCode(code.content);
           if (code.type === "header") {
             if (!cu.addHeader(code.content)) okInject = false;
           } else if ((code.type === "method" || code.type === "code") && code.method) {
             if (!cu.addCodeToMethod(code.method, code.content, Boolean(code.addToReturn))) okInject = false;
           }
+          if (okInject) {
+            logs.push(
+              `SUCCESS: 代码文件${path.join(ctx.projectRoot, rel)},${existed ? "已存在代码" : "添加代码"}${code.content}${existed ? "" : "完成"}`
+            );
+          }
         }
       }
       if (!okInject) warnings.push(`SceneDelegate injection incomplete for ${rel}`);
@@ -491,7 +572,9 @@ export async function runIosIntegrateTopSdk(
     }
   }
 
-  return ok([...changed], warnings);
+  logs.push("SUCCESS: info.plist配置写入完成");
+  logs.push("！！ 接入流程已全部结束 ！！");
+  return ok([...changed], warnings, logs);
 }
 
 async function ensureInfoPlists(

package/src/ios/pbxprojEditor.ts

@@ -69,9 +69,70 @@ export async function loadPbxFromStore(
 }
 
 export function savePbxToStore(store: TextFileStore, ctx: PbxContext): void {
+  stripUndefinedValues(ctx.proj.hash?.project?.objects);
+  sanitizePbxBuildSettings(ctx.proj);
   store.write(ctx.rel, ctx.proj.writeSync());
 }
 
+function stripUndefinedValues(value: unknown): void {
+  if (Array.isArray(value)) {
+    for (const item of value) stripUndefinedValues(item);
+    return;
+  }
+  if (!value || typeof value !== "object") return;
+
+  const record = value as Record<string, unknown>;
+  for (const [key, nested] of Object.entries(record)) {
+    if (nested === undefined || nested === "undefined") {
+      delete record[key];
+      continue;
+    }
+    stripUndefinedValues(nested);
+  }
+}
+
+function sanitizePbxBuildSettings(proj: XcodeProject): void {
+  const buildConfigs = proj.pbxXCBuildConfigurationSection?.() ?? {};
+  for (const [uuid, cfg] of Object.entries(buildConfigs)) {
+    if (uuid.endsWith("_comment") || !cfg || typeof cfg !== "object") continue;
+    const settings = (cfg as { buildSettings?: Record<string, unknown> }).buildSettings;
+    if (!settings) continue;
+    for (const [key, raw] of Object.entries(settings)) {
+      if (typeof raw === "string") {
+        settings[key] = quotePbxStringIfNeeded(raw);
+        continue;
+      }
+      if (Array.isArray(raw)) {
+        settings[key] = raw.map((value) => (typeof value === "string" ? quotePbxStringIfNeeded(value) : value));
+      }
+    }
+  }
+}
+
+function isPbxQuotedString(value: string): boolean {
+  return value.length >= 2 && value.startsWith('"') && value.endsWith('"');
+}
+
+function unquotePbxString(value: string): string {
+  if (!isPbxQuotedString(value)) return value;
+  return value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, "\\");
+}
+
+function quotePbxStringIfNeeded(value: string): string {
+  if (isPbxQuotedString(value)) return value;
+  if (!pbxStringNeedsQuotes(value)) return value;
+  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+}
+
+function pbxStringNeedsQuotes(value: string): boolean {
+  if (value.length === 0 || value.startsWith("-")) return true;
+  return /[^A-Za-z0-9_.$/{}()+-]/.test(value);
+}
+
+function samePbxStringValue(a: unknown, b: string): boolean {
+  return typeof a === "string" && unquotePbxString(a) === unquotePbxString(b);
+}
+
 function targetUuid(proj: XcodeProject, targetName: string): string | undefined {
   const targets = proj.pbxNativeTargetSection?.() ?? {};
   for (const [uuid, t] of Object.entries(targets)) {
@@ -229,7 +290,12 @@ export function addSourceOrResourceFile(ctx: PbxContext, relPathFromSrcRoot: str
   if (file.endsWith(".h")) {
     ctx.proj.addHeaderFile(file, { target });
   } else if (file.endsWith(".m") || file.endsWith(".mm") || file.endsWith(".swift")) {
-    ctx.proj.addSourceFile(file, { target });
+    try {
+      ctx.proj.addSourceFile(file, { target });
+    } catch (e) {
+      if (!String(e instanceof Error ? e.message : e).includes("path")) throw e;
+      addSourceFileManually(ctx, file);
+    }
   } else {
     ensureResourcesBuildPhase(ctx.proj, ctx.targetName);
     const opt: Record<string, unknown> = { target };
@@ -245,6 +311,51 @@ export function addSourceOrResourceFile(ctx: PbxContext, relPathFromSrcRoot: str
   }
 }
 
+function ensureSourcesBuildPhase(proj: XcodeProject, targetName: string): void {
+  const target = targetKey(proj, targetName);
+  try {
+    proj.pbxSourcesBuildPhaseObj(target);
+    return;
+  } catch {
+    proj.addBuildPhase([], "PBXSourcesBuildPhase", "Sources", target);
+  }
+}
+
+function sourceFileType(file: string): string {
+  if (file.endsWith(".swift")) return "sourcecode.swift";
+  if (file.endsWith(".mm")) return "sourcecode.cpp.objcpp";
+  return "sourcecode.c.objc";
+}
+
+function addSourceFileManually(ctx: PbxContext, file: string): void {
+  const basename = path.basename(file);
+  ensureSourcesBuildPhase(ctx.proj, ctx.targetName);
+  const sources = ctx.proj.pbxSourcesBuildPhaseObj(targetKey(ctx.proj, ctx.targetName));
+  const files = (sources.files ??= []) as Array<{ value?: string; comment?: string }>;
+  if (JSON.stringify(files).includes(basename)) return;
+
+  const fileRefUuid = ctx.proj.generateUuid();
+  const buildUuid = ctx.proj.generateUuid();
+  const fileRefSection = objectSection(ctx.proj, "PBXFileReference");
+  const buildFileSection = objectSection(ctx.proj, "PBXBuildFile");
+
+  fileRefSection[fileRefUuid] = {
+    isa: "PBXFileReference",
+    name: `"${basename}"`,
+    path: `"${file}"`,
+    sourceTree: '"<group>"',
+    lastKnownFileType: sourceFileType(file),
+  };
+  fileRefSection[`${fileRefUuid}_comment`] = basename;
+  buildFileSection[buildUuid] = {
+    isa: "PBXBuildFile",
+    fileRef: fileRefUuid,
+    fileRef_comment: basename,
+  };
+  buildFileSection[`${buildUuid}_comment`] = `${basename} in Sources`;
+  files.push({ value: buildUuid, comment: `${basename} in Sources` });
+}
+
 function resourceFileType(file: string, lastKnownFileType?: string): string {
   if (lastKnownFileType) return lastKnownFileType;
   if (file.endsWith(".bundle")) return "wrapper.plug-in";
@@ -317,12 +428,18 @@ export function addOtherLinkerFlag(ctx: PbxContext, flag: string): void {
     if (!cfg || typeof cfg !== "object") continue;
     const settings = (cfg as { buildSettings?: Record<string, unknown> }).buildSettings ?? {};
     const cur = settings.OTHER_LDFLAGS;
+    const normalizedFlag = unquotePbxString(flag);
+    const nextFlag = quotePbxStringIfNeeded(normalizedFlag);
     if (typeof cur === "string") {
-      if (!cur.includes(flag)) settings.OTHER_LDFLAGS = `${cur} ${flag}`.trim();
+      if (!unquotePbxString(cur).split(/\s+/).includes(normalizedFlag)) {
+        settings.OTHER_LDFLAGS = [quotePbxStringIfNeeded(cur), nextFlag];
+      }
     } else if (Array.isArray(cur)) {
-      if (!cur.includes(flag)) settings.OTHER_LDFLAGS = [...cur, flag];
+      const values = cur.map((value) => (typeof value === "string" ? quotePbxStringIfNeeded(value) : value));
+      if (!values.some((value) => samePbxStringValue(value, normalizedFlag))) values.push(nextFlag);
+      settings.OTHER_LDFLAGS = values;
     } else {
-      settings.OTHER_LDFLAGS = [flag];
+      settings.OTHER_LDFLAGS = [nextFlag];
     }
     (cfg as { buildSettings: Record<string, unknown> }).buildSettings = settings;
   }

package/src/ios/sdkBundle.ts

@@ -1,25 +1,17 @@
 import fs from "node:fs";
 import path from "node:path";
-
-const BUNDLED_IOS_REL = path.join("bundled", "ios-sdk");
-
-export function defaultBundledIosSdkRoot(packageRoot: string): string {
-  return path.join(packageRoot, BUNDLED_IOS_REL);
-}
+import { MEET_SDK_TOOL_CACHE_ROOT } from "../cache.js";
 
 /**
- * TopSDK iOS package root: `bundled/ios-sdk` or a child version dir (e.g. `ios--V1.6.0.4/`).
- * Native iOS only; SDK is vendored in the tool package.
+ * TopSDK iOS package root from cache.
+ * Native iOS only.
  */
-export function resolveIosSdkRoot(packageRoot: string): string {
-  const bundled = defaultBundledIosSdkRoot(packageRoot);
-  if (!fs.existsSync(bundled)) {
-    throw new Error(`iOS SDK not found at ${BUNDLED_IOS_REL} (expected sdk/ and plugins/ inside).`);
-  }
+function findIosSdkRoot(container: string): string | null {
+  if (!fs.existsSync(container)) return null;
   const children = fs
-    .readdirSync(bundled, { withFileTypes: true })
+    .readdirSync(container, { withFileTypes: true })
     .filter((d) => d.isDirectory() && !d.name.startsWith("."))
-    .map((d) => path.join(bundled, d.name))
+    .map((d) => path.join(container, d.name))
     .sort()
     .reverse();
   for (const dir of children) {
@@ -27,10 +19,41 @@ export function resolveIosSdkRoot(packageRoot: string): string {
       return dir;
     }
   }
-  if (fs.existsSync(path.join(bundled, "sdk")) && fs.existsSync(path.join(bundled, "plugins"))) {
-    return bundled;
+  if (fs.existsSync(path.join(container, "sdk")) && fs.existsSync(path.join(container, "plugins"))) {
+    return container;
   }
+  return null;
+}
+
+function findLatestCachedIosSdkRoot(): string | null {
+  const iosCache = path.join(MEET_SDK_TOOL_CACHE_ROOT, "sdk", "ios");
+  if (!fs.existsSync(iosCache)) return null;
+  const candidates: string[] = [];
+  const walk = (dir: string): void => {
+    for (const ent of fs.readdirSync(dir, { withFileTypes: true })) {
+      if (!ent.isDirectory() || ent.name.startsWith(".")) continue;
+      const abs = path.join(dir, ent.name);
+      if (ent.name === "extracted") {
+        candidates.push(abs);
+      } else {
+        walk(abs);
+      }
+    }
+  };
+  walk(iosCache);
+  candidates.sort((a, b) => fs.statSync(b).mtimeMs - fs.statSync(a).mtimeMs);
+  for (const candidate of candidates) {
+    const found = findIosSdkRoot(candidate);
+    if (found) return found;
+  }
+  return null;
+}
+
+export function resolveIosSdkRoot(_packageRoot: string): string {
+  const cached = findLatestCachedIosSdkRoot();
+  if (cached) return cached;
+
   throw new Error(
-    `iOS SDK layout invalid under ${BUNDLED_IOS_REL}: need sdk/ + plugins/ at top level or under one version directory.`
+    `iOS SDK not found in ${path.join(MEET_SDK_TOOL_CACHE_ROOT, "sdk", "ios")}; run download-ios-sdk or setup first.`
   );
 }