@leonxin/meetgames 0.1.13 → 0.1.14

package/docs/INTEGRATION.md

@@ -62,7 +62,7 @@ node dist/entry.js setup \
   --app-id 791251136341225472 \
   --app-secret 'YOUR_APP_SECRET' \
   --channel-type APPLE \
-  --project-root ./fixtures/ios-test-project/tooltest \
+  --project-root ./fixtures/ios-test-project/native-sample \
   --env test \
   --verbose
 ```
@@ -84,6 +84,32 @@ Android 接入时会根据 `meetsdk-remote-config.json` 和内置默认配置检
 
 `doctor` 会校验仓库、依赖、`resValue`、Firebase 文件等是否已正确接入。
 
+## 重复运行 setup 的幂等行为
+
+`setup` 可以在同一个 Android / iOS 工程上重复执行。判断粒度是每一个配置项，而不是整个文件：缺少的配置会插入；key 已存在但 value 不同时更新 value；key 和 value 都相同时保持该配置项不变，不追加重复项。
+
+Android：
+
+- App Module `build.gradle` 中的 `applicationId` 按远程配置 `packageName` 更新。
+- App Module `defaultConfig` 中的 `resValue` 按第二个参数 key 去重更新，例如已有 `top_app_id` 时更新 value，不再追加第二条 `top_app_id`。
+- TOPSDK 管理的仓库、插件、依赖块只在缺失或内容不一致时写入；已有相同声明时保持原状，避免重复插入和无意义格式变更。
+- 控制台会通过 `PipelineReport.logs` 打印变更前后值，例如：
+  - `[meetgames] Android applicationId com.example.old -> com.meet.integrate.androidsample`
+  - `[meetgames] Android resValue top_app_id string:old-app-id -> string:mock-topsdk-app-id`
+  - `[meetgames] Android resValue facebook_app_id <missing> -> string:0000000000000000`
+
+iOS：
+
+- `Info.plist` 顶层 key 使用覆盖写入；已有同名 key 更新 value，缺少时新增。
+- `LSApplicationQueriesSchemes` 和 `CFBundleURLTypes` 按 scheme 去重；同一个 URL Scheme / Queries Scheme 重复运行不会追加第二份。
+- Xcode `build settings` 按 key 更新；framework、resource、source、system framework、system lib 和 `TopSDKInstall.swift` 引用重复运行后保持单份有效 build entry。
+- Delegate / SceneDelegate 代码注入会识别已存在代码，不会重复插入。
+- 控制台会通过 `PipelineReport.logs` 打印变更前后值；未变化时也会打印当前值，例如：
+  - `SUCCESS: info.plist配置key：FacebookAppID old-facebook-app-id -> 883695101201170`
+  - `SUCCESS: info.plist配置key：FacebookAppID 未变化 value:883695101201170`
+  - `SUCCESS: BuildSetting设置VALIDATE_WORKSPACE <missing> -> YES`
+  - `SUCCESS: BuildSetting设置VALIDATE_WORKSPACE 未变化 value:YES`
+
 ## iOS 接入内容
 
 iOS 接入时会根据缓存 iOS SDK 中的 `config.t.json` 执行：
@@ -101,7 +127,9 @@ iOS 接入时会根据缓存 iOS SDK 中的 `config.t.json` 执行：
 
 ### iOS 旧工具日志对齐记录
 
-2026-06-25 已用老工具 `topsdk-tool-ios` 在测试工程 `/Users/work/Workspace/Test/native-sample-old` 上的运行日志作为对齐基准；同源测试工程已放入 `fixtures/ios-test-project/native-sample`。`meet-sdk-tool` 的 iOS 接入在 apply 模式下需要保留同类运行日志，并完成同一批功能点。
+2026-06-25 / 2026-06-26 已用老工具 `topsdk-tool-ios` 在测试工程 `/Users/work/Workspace/Test/native-sample-old` 上的运行日志作为对齐基准；同源测试工程已放入 `fixtures/ios-test-project/native-sample`。`meet-sdk-tool` 的 iOS 接入在 apply 模式下需要保留同类运行日志，并完成同一批功能点。
+
+完整旧日志要求按插件段连续打印：插件开始行、该插件资源导入、build setting、plist / queries / url scheme / capability、插件完成行都必须在同一个插件段内；`TOPSDK` 的 Delegate 注入日志必须出现在 `SUCCESS: 插件TOPSDK接入完成` 之前。当前回归测试会约束这些关键日志的先后顺序。
 
 旧日志覆盖的插件顺序和功能点：
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leonxin/meetgames",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "license": "MIT",
   "type": "module",
   "bin": {

package/src/android/manifest.ts

@@ -31,6 +31,17 @@ function stripPermissionManagedBlock(content: string): string {
 
 export function insertPermissions(content: string, permissions: string[]): { content: string; changed: boolean } {
   const names = new Set(permissions);
+  const existingNames = content
+    .split("\n")
+    .map(extractPermissionName)
+    .filter((name): name is string => Boolean(name));
+  const existingNameSet = new Set(existingNames);
+  const hasDuplicateTargetPermission = permissions.some(
+    (permission) => existingNames.filter((name) => name === permission).length > 1
+  );
+  if (!hasDuplicateTargetPermission && permissions.every((permission) => existingNameSet.has(permission))) {
+    return { content, changed: false };
+  }
   let cleaned = removePermissionLinesByNames(content, names);
   cleaned = stripPermissionManagedBlock(cleaned);
 

package/src/android/meetSdkRemoteGradle.ts

@@ -64,7 +64,8 @@ export function escapeGroovyDoubleQuotedInner(value: string): string {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
 
-const RES_VALUE_KEY_RE = /resValue\s*\(\s*'[^']+'\s*,\s*'([^']+)'/;
+const RES_VALUE_KEY_RE = /resValue\s*\(\s*['"][^'"]+['"]\s*,\s*['"]([^'"]+)['"]/;
+const RES_VALUE_RE = /resValue\s*\(\s*(['"])([^'"]+)\1\s*,\s*(['"])([^'"]+)\3\s*,\s*(['"])(.*?)\5\s*\)/;
 const IMPLEMENTATION_COORD_RE = /implementation\s+["']([^"']+)["']/;
 const APPLY_PLUGIN_ID_RE = /apply\s+plugin:\s*['"]([^'"]+)['"]/;
 const PLUGINS_DSL_ID_RE = /^\s*id\s+(?:\(\s*)?['"]([^'"]+)['"](?:\s*\))?/;
@@ -99,6 +100,12 @@ export function extractResValueKey(line: string): string | null {
   return m?.[1] ?? null;
 }
 
+function parseResValueLine(line: string): { type: string; key: string; value: string } | null {
+  const m = line.trim().match(RES_VALUE_RE);
+  if (!m) return null;
+  return { type: m[2], key: m[4], value: m[6] };
+}
+
 /** Maven coordinate key for upsert: `group:artifact` (version ignored). */
 export function mavenGroupArtifactKey(coordinate: string): string {
   const parts = coordinate.split(":");
@@ -251,6 +258,9 @@ function repositoryToGradleLine(repo: string): string {
 }
 
 export function mergeRepositoriesInBlock(blockText: string, repositories: readonly string[]): string {
+  if (repositories.length && repositories.every((repo) => blockText.split("\n").some((line) => lineDeclaresRepository(line, repo)))) {
+    return blockText;
+  }
   let cleaned = removeRepositoryLinesByKeys(blockText, repositories);
   cleaned = stripManagedBlocks(cleaned, TOPSDK_REPO_AUTO_START, TOPSDK_REPO_AUTO_END);
   if (!repositories.length) return cleaned;
@@ -266,6 +276,16 @@ export function mergeRepositoriesInBlock(blockText: string, repositories: readon
  * Upsert buildscript classpaths: drop existing lines with same coordinate, then write TOPSDK AUTO block.
  */
 export function mergeClasspathsInBlock(blockText: string, classpaths: readonly string[]): string {
+  if (
+    classpaths.length &&
+    classpaths.every((classpath) =>
+      blockText
+        .split("\n")
+        .some((line) => extractClasspathCoordinate(line) === classpath)
+    )
+  ) {
+    return blockText;
+  }
   const coords = new Set(classpaths);
   let cleaned = removeClasspathLinesByCoordinates(blockText, coords);
   cleaned = stripManagedBlocks(cleaned, TOPSDK_AUTO_START, TOPSDK_AUTO_END);
@@ -312,6 +332,9 @@ function insertAfterLeadingApplyPlugins(content: string, snippet: string): strin
  */
 export function mergeApplyPluginsInContent(content: string, applyPlugins: readonly string[]): string {
   if (!applyPlugins.length) return content;
+  if (applyPlugins.every((plugin) => content.split("\n").some((line) => extractApplyPluginId(line) === plugin))) {
+    return content;
+  }
   const ids = new Set(applyPlugins);
   let cleaned = removeApplyPluginLinesByIds(content, ids);
   cleaned = stripManagedBlocks(cleaned, TOPSDK_PLUGIN_AUTO_START, TOPSDK_PLUGIN_AUTO_END);
@@ -342,25 +365,77 @@ export function mergeResValuesInDefaultConfigBlock(blockText: string, managedSni
     .split("\n")
     .map((l) => l.trimEnd())
     .filter((l) => l.includes("resValue("));
-  const keys = new Set(
-    [...desiredLines.map((l) => extractResValueKey(l)).filter((k): k is string => Boolean(k)), ...TOPSDK_MANAGED_RESVALUE_KEYS]
+  const desiredByKey = new Map(
+    desiredLines
+      .map((line) => {
+        const spec = parseResValueLine(line);
+        return spec ? ([spec.key, { ...spec, line }] as const) : null;
+      })
+      .filter((entry): entry is readonly [string, { type: string; key: string; value: string; line: string }] =>
+        Boolean(entry)
+      )
   );
-  let cleaned = removeResValueLinesByKeys(blockText, keys);
+  if (resValuesAlreadyMatch(blockText, desiredByKey)) return blockText;
+  const keys = new Set([...desiredByKey.keys(), ...TOPSDK_MANAGED_RESVALUE_KEYS]);
+  const seen = new Set<string>();
+  let cleaned = blockText
+    .split("\n")
+    .filter((line) => {
+      if (line.includes(TOPSDK_AUTO_START) || line.includes(TOPSDK_AUTO_END)) return false;
+      const current = parseResValueLine(line);
+      if (!current || !keys.has(current.key)) return true;
+      const desired = desiredByKey.get(current.key);
+      if (!desired) return false;
+      if (current.type === desired.type && current.value === desired.value && !seen.has(current.key)) {
+        seen.add(current.key);
+        return true;
+      }
+      return false;
+    })
+    .join("\n");
   cleaned = stripManagedBlocks(cleaned, TOPSDK_AUTO_START, TOPSDK_AUTO_END);
+  const missingLines = desiredLines.filter((line) => {
+    const spec = parseResValueLine(line);
+    return spec ? !seen.has(spec.key) : false;
+  });
+  if (missingLines.length === 0) return cleaned;
+  const missingSnippet = [TOPSDK_AUTO_START, ...missingLines, TOPSDK_AUTO_END].join("\n");
   return replaceOrInsertManaged(
     cleaned,
     { start: 0, openBrace: 0, end: cleaned.length },
     TOPSDK_AUTO_START,
     TOPSDK_AUTO_END,
-    managedSnippet
+    missingSnippet
   );
 }
 
+function resValuesAlreadyMatch(
+  blockText: string,
+  desiredByKey: ReadonlyMap<string, { type: string; key: string; value: string; line: string }>
+): boolean {
+  const lines = blockText.split("\n");
+  const seen = new Set<string>();
+  for (const line of lines) {
+    const current = parseResValueLine(line);
+    if (!current) continue;
+    const desired = desiredByKey.get(current.key);
+    if (!desired) {
+      if ((TOPSDK_MANAGED_RESVALUE_KEYS as readonly string[]).includes(current.key)) return false;
+      continue;
+    }
+    if (seen.has(current.key)) return false;
+    if (current.type !== desired.type || current.value !== desired.value) return false;
+    seen.add(current.key);
+  }
+  return [...desiredByKey.keys()].every((key) => seen.has(key));
+}
+
 function mergeDependenciesInBlock(
   blockText: string,
   managedSnippet: string,
   fallbackGroupId: string
 ): string {
+  if (dependenciesAlreadyMatch(blockText, managedSnippet, fallbackGroupId)) return blockText;
   const lookupText = `${blockText}\n${managedSnippet}`;
   const desiredLines = managedSnippet
     .split("\n")
@@ -388,6 +463,32 @@ function mergeDependenciesInBlock(
   );
 }
 
+function dependenciesAlreadyMatch(blockText: string, managedSnippet: string, fallbackGroupId: string): boolean {
+  const lookupText = `${blockText}\n${managedSnippet}`;
+  const desiredLines = managedSnippet
+    .split("\n")
+    .map((l) => l.trimEnd())
+    .filter((l) => l.includes("implementation "));
+  const desiredKeys = desiredLines
+    .map((l) => extractImplementationKey(l, lookupText, fallbackGroupId))
+    .filter((k): k is string => Boolean(k));
+  const existingKeys = blockText
+    .split("\n")
+    .map((line) => extractImplementationKey(line, blockText, fallbackGroupId))
+    .filter((k): k is string => Boolean(k));
+  const existingKeySet = new Set(existingKeys);
+  if (!desiredKeys.every((key) => existingKeySet.has(key))) return false;
+  const versionMatch = managedSnippet.match(/def\s+topsdk_version\s*=\s*["']([^"']+)["']/);
+  const groupMatch = managedSnippet.match(/def\s+groupId\s*=\s*["']([^"']+)["']/);
+  if (versionMatch && !new RegExp(`def\\s+topsdk_version\\s*=\\s*["']${escapeRegExp(versionMatch[1])}["']`).test(blockText)) return false;
+  if (groupMatch && !new RegExp(`def\\s+groupId\\s*=\\s*["']${escapeRegExp(groupMatch[1])}["']`).test(blockText)) return false;
+  return true;
+}
+
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 function stripManagedBlocks(text: string, startMarker: string, endMarker: string): string {
   const start = text.indexOf(startMarker);
   const end = text.indexOf(endMarker);
@@ -576,6 +677,7 @@ function mergePluginsDslInBlock(blockText: string, specs: readonly MeetSdkGradle
  */
 export function mergePluginsDslInContent(content: string, specs: readonly MeetSdkGradlePluginDslSpec[]): string {
   if (!specs.length) return content;
+  if (pluginsDslAlreadyMatch(content, specs)) return content;
   const ids = new Set(specs.map((s) => s.id));
   let cleaned = removePluginsDslLinesByIds(content, ids);
   cleaned = removeApplyPluginLinesByIds(cleaned, ids);
@@ -589,6 +691,20 @@ export function mergePluginsDslInContent(content: string, specs: readonly MeetSd
   return cleaned.slice(0, pluginsBlock.openBrace + 1) + merged + cleaned.slice(pluginsBlock.end);
 }
 
+function pluginsDslAlreadyMatch(content: string, specs: readonly MeetSdkGradlePluginDslSpec[]): boolean {
+  const lines = content.split("\n");
+  return specs.every((spec) =>
+    lines.some((line) => {
+      if (extractPluginsDslId(line) !== spec.id) return false;
+      if (spec.version && !line.includes(`version '${spec.version}'`) && !line.includes(`version "${spec.version}"`)) {
+        return false;
+      }
+      if (spec.applyFalse && !/\bapply\s+false\b/.test(line)) return false;
+      return true;
+    })
+  );
+}
+
 function stripBuildscriptClasspaths(content: string, classpaths: readonly string[]): string {
   if (!classpaths.length) return content;
   const buildscript = findBlockRange(content, "buildscript");
@@ -746,8 +862,10 @@ function buildRemoteDependenciesSnippet(config: MeetSdkRemoteConfig): string {
 function updateDefaultConfigApplicationId(content: string, defaultConfigBlock: { openBrace: number; end: number }, applicationId: string): string {
   const escaped = escapeGroovyDoubleQuotedInner(applicationId);
   const blockText = content.slice(defaultConfigBlock.openBrace + 1, defaultConfigBlock.end);
-  const existing = /(^[ \t]*)applicationId\s+(?:=+\s*)?["'][^"']*["']/m;
-  if (existing.test(blockText)) {
+  const existing = /(^[ \t]*)applicationId\s+(?:=+\s*)?(["'])([^"']*)\2/m;
+  const match = blockText.match(existing);
+  if (match) {
+    if (match[3] === applicationId) return content;
     const updatedBlockText = blockText.replace(existing, `$1applicationId "${escaped}"`);
     return content.slice(0, defaultConfigBlock.openBrace + 1) + updatedBlockText + content.slice(defaultConfigBlock.end);
   }

package/src/ios/channelConfig.ts

@@ -100,6 +100,16 @@ export const IOS_PLUGIN_FOLDER_BY_SUBKEY: Record<string, string> = {
   facebookdata: "FacebookManager",
 };
 
+const IOS_PLUGIN_ORDER = [
+  "GuestSignin",
+  "UI",
+  "IAPPay",
+  "AppsFlyerManager",
+  "FacebookSignin",
+  "GoogleSignin",
+  "AppleSignin",
+] as const;
+
 export function enabledIosPluginFolders(config: MeetSdkRemoteConfig): string[] {
   const folders: string[] = ["UI"];
   for (const [scope, bucket] of Object.entries(config.sdkModules)) {
@@ -111,7 +121,13 @@ export function enabledIosPluginFolders(config: MeetSdkRemoteConfig): string[] {
       if (folder) folders.push(folder);
     }
   }
-  return [...new Set(folders)];
+  const unique = [...new Set(folders)];
+  return unique.sort((a, b) => {
+    const ai = IOS_PLUGIN_ORDER.indexOf(a as (typeof IOS_PLUGIN_ORDER)[number]);
+    const bi = IOS_PLUGIN_ORDER.indexOf(b as (typeof IOS_PLUGIN_ORDER)[number]);
+    if (ai !== -1 || bi !== -1) return (ai === -1 ? Number.MAX_SAFE_INTEGER : ai) - (bi === -1 ? Number.MAX_SAFE_INTEGER : bi);
+    return unique.indexOf(a) - unique.indexOf(b);
+  });
 }
 
 export function unsupportedIosModuleKeys(config: MeetSdkRemoteConfig): string[] {