@leonxin/meetgames 0.1.12 → 0.1.14

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/contracts/types.ts

@@ -109,6 +109,8 @@ export interface StepResult {
   ok: boolean;
   /** Relative paths from project root that were touched or would be touched */
   changedFiles: string[];
+  /** Human-readable operation logs. iOS integration keeps topsdk-tool-ios style logs here. */
+  logs?: string[];
   warnings: string[];
   errors: string[];
 }
@@ -119,6 +121,7 @@ export interface PipelineReport {
   stepsRun: number;
   stepsSkipped: number;
   results: StepResult[];
+  logs?: string[];
   warnings: string[];
   errors: string[];
 }

package/src/core/pipeline.ts

@@ -51,6 +51,7 @@ export async function runPipeline(
   options: RunPipelineOptions
 ): Promise<RunPipelineResult> {
   const results: StepResult[] = [];
+  const logs: string[] = [];
   const warnings: string[] = [];
   const errors: string[] = [];
   let stepsRun = 0;
@@ -76,6 +77,7 @@ export async function runPipeline(
     const r = await Promise.resolve(handler(ctx, store, step.args ?? {}, options.dryRun, binaryCopies));
     results.push(r);
     stepsRun += 1;
+    logs.push(...(r.logs ?? []));
     warnings.push(...r.warnings);
     if (!r.ok) {
       errors.push(...r.errors);
@@ -99,6 +101,7 @@ export async function runPipeline(
     stepsRun,
     stepsSkipped,
     results,
+    logs,
     warnings,
     errors,
   };

package/src/core/reporter.ts

@@ -3,6 +3,9 @@ import type { PipelineReport } from "../contracts/types.js";
 export function printReport(report: PipelineReport, patch: string, verbose: boolean): void {
   console.log(`[meetgames] dryRun=${report.dryRun}`);
   console.log(`[meetgames] steps run: ${report.stepsRun}, skipped: ${report.stepsSkipped}`);
+  if (report.logs?.length) {
+    for (const line of report.logs) console.log(line);
+  }
   if (report.warnings.length) {
     for (const w of report.warnings) console.log(`[meetgames] warning: ${w}`);
   }

package/src/ios/channelConfig.ts

@@ -100,8 +100,18 @@ 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[] = [];
+  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>;
@@ -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[] {

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}`;