@leonxin/meetgames 0.1.16 → 0.1.18

package/src/remote/sdkHomeDownload.ts

@@ -2,12 +2,33 @@ import { spawn } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 import { syncMeetSdkIosVersionToConfig } from "../config/meetSdkIosConfig.js";
+import { hasSdkModuleKey, type MeetSdkRemoteConfig } from "../config/meetSdkRemoteConfig.js";
 import { resolveIosSdkCacheLayout, withCacheLock, writeIosSdkCacheMetadata } from "../cache.js";
 
 export const defaultSdkHomeApiBaseUrl = "https://business-api.meetgames.com";
 export const DEFAULT_IOS_SDK_PLUGINS = ["guest", "facebook", "google", "apple", "apple_pay", "dataAppsFlyer"] as const;
 export const DEFAULT_IOS_SDK_PACKAGE_TYPE = "native";
 
+const IOS_SDK_DOWNLOAD_PLUGIN_BY_SUBKEY: Record<string, string> = {
+  guest: "guest",
+  email: "email",
+  facebook: "facebook",
+  google: "google",
+  snapchat: "snapchat",
+  discord: "discord",
+  line: "line",
+  naver: "naver",
+  kakao: "kakao",
+  tiktok: "tiktok",
+  apple: "apple",
+  googleIap: "google_pay",
+  appleIap: "apple_pay",
+  appsflyer: "dataAppsFlyer",
+  firebase: "dataFirebase",
+  adjust: "dataAdjust",
+  facebookdata: "dataFacebook",
+};
+
 const SDK_HOME_VERSION_PATH = "sdk/home/version";
 const SDK_HOME_DOWNLOAD_URL_PATH = "sdk/home/sdk-download/getDownLoadUrl";
 
@@ -33,9 +54,9 @@ export interface SdkHomeDownloadUrlRequest {
 
 export interface DownloadIosSdkOptions {
   baseUrl?: string;
-  version?: string;
   plugins?: readonly string[] | string;
   packageType?: string;
+  cacheRoot?: string;
   signal?: AbortSignal;
 }
 
@@ -43,13 +64,14 @@ export interface DownloadIosSdkResult {
   version: string;
   versionDate: string;
   versionUrl: string;
-  downloadApiUrl: string;
-  sdkZipUrl: string;
+  downloadApiUrl?: string;
+  sdkZipUrl?: string;
   zipPath: string;
   extractDir: string;
   resolvedSdkRoot: string;
   iosConfigPath: string;
   cacheMetadataPath: string;
+  downloaded: boolean;
 }
 
 function isRecord(value: unknown): value is JsonRecord {
@@ -73,6 +95,20 @@ function pluginsToList(plugins: readonly string[] | string | undefined): string[
     .filter(Boolean);
 }
 
+export function resolveIosSdkDownloadPluginsFromRemoteConfig(config: MeetSdkRemoteConfig): string[] {
+  const plugins: string[] = [];
+  for (const bucket of Object.values(config.sdkModules)) {
+    if (!bucket || typeof bucket !== "object") continue;
+    const scopeRecord = bucket as Record<string, unknown>;
+    for (const subKey of Object.keys(scopeRecord)) {
+      if (!hasSdkModuleKey(scopeRecord, subKey)) continue;
+      const plugin = IOS_SDK_DOWNLOAD_PLUGIN_BY_SUBKEY[subKey];
+      if (plugin) plugins.push(plugin);
+    }
+  }
+  return [...new Set(plugins)];
+}
+
 export function buildSdkHomeVersionUrl(baseUrl: string): string {
   return joinBaseAndPath(baseUrl, SDK_HOME_VERSION_PATH).toString();
 }
@@ -188,6 +224,68 @@ export function resolveIosSdkRootFromDirectory(bundledDir: string): string {
   throw new Error(`iOS SDK layout invalid under ${bundledDir}: need sdk/ + plugins/ at top level or under one version directory.`);
 }
 
+function tryResolveIosSdkRootFromDirectory(bundledDir: string): string | null {
+  try {
+    return resolveIosSdkRootFromDirectory(bundledDir);
+  } catch {
+    return null;
+  }
+}
+
+function compareSdkVersions(a: string, b: string): number {
+  const left = a.split(/[.-]/);
+  const right = b.split(/[.-]/);
+  const len = Math.max(left.length, right.length);
+  for (let i = 0; i < len; i += 1) {
+    const l = left[i] ?? "0";
+    const r = right[i] ?? "0";
+    const ln = /^\d+$/.test(l) ? Number(l) : null;
+    const rn = /^\d+$/.test(r) ? Number(r) : null;
+    if (ln !== null && rn !== null) {
+      if (ln !== rn) return ln - rn;
+      continue;
+    }
+    const cmp = l.localeCompare(r);
+    if (cmp !== 0) return cmp;
+  }
+  return 0;
+}
+
+function findReusableCachedIosSdk(params: {
+  cacheRoot?: string;
+  packageType: string;
+  plugins: readonly string[];
+  serverVersion: string;
+}): { version: string; layout: ReturnType<typeof resolveIosSdkCacheLayout>; resolvedSdkRoot: string } | null {
+  const probe = resolveIosSdkCacheLayout({
+    version: "__probe__",
+    packageType: params.packageType,
+    plugins: params.plugins,
+    cacheRoot: params.cacheRoot,
+  });
+  const packageDir = path.dirname(path.dirname(probe.baseDir));
+  if (!fs.existsSync(packageDir)) return null;
+
+  let best: { version: string; layout: ReturnType<typeof resolveIosSdkCacheLayout>; resolvedSdkRoot: string } | null = null;
+  for (const ent of fs.readdirSync(packageDir, { withFileTypes: true })) {
+    if (!ent.isDirectory() || ent.name.startsWith(".")) continue;
+    const comparedToServer = compareSdkVersions(ent.name, params.serverVersion);
+    if (comparedToServer < 0) continue;
+    const layout = resolveIosSdkCacheLayout({
+      version: ent.name,
+      packageType: params.packageType,
+      plugins: params.plugins,
+      cacheRoot: params.cacheRoot,
+    });
+    const resolvedSdkRoot = tryResolveIosSdkRootFromDirectory(layout.extractDir);
+    if (!resolvedSdkRoot) continue;
+    if (!best || compareSdkVersions(ent.name, best.version) > 0) {
+      best = { version: ent.name, layout, resolvedSdkRoot };
+    }
+  }
+  return best;
+}
+
 export async function downloadBinaryFile(url: string, absPath: string, signal?: AbortSignal): Promise<void> {
   let res: Response;
   try {
@@ -236,25 +334,39 @@ export async function downloadIosSdkToBundled(
   const baseUrl = options.baseUrl || defaultSdkHomeApiBaseUrl;
   const packageType = options.packageType || DEFAULT_IOS_SDK_PACKAGE_TYPE;
   const plugins = pluginsToList(options.plugins);
-  const versionResult = options.version
-    ? { url: buildSdkHomeVersionUrl(baseUrl), ios: { ver: options.version, date: "" } }
-    : await fetchSdkHomeIosVersion({ baseUrl, signal: options.signal });
-  const version = versionResult.ios.ver;
-  const downloadResult = await fetchSdkHomeIosDownloadUrl({
-    baseUrl,
-    version,
-    plugins,
+  const versionResult = await fetchSdkHomeIosVersion({ baseUrl, signal: options.signal });
+  const serverVersion = versionResult.ios.ver;
+  const reusableCache = findReusableCachedIosSdk({
+    cacheRoot: options.cacheRoot,
     packageType,
-    signal: options.signal,
+    plugins,
+    serverVersion,
   });
-  const cacheLayout = resolveIosSdkCacheLayout({ version, packageType, plugins });
+  const version = reusableCache?.version ?? serverVersion;
+  const cacheLayout =
+    reusableCache?.layout ?? resolveIosSdkCacheLayout({ version, packageType, plugins, cacheRoot: options.cacheRoot });
   const extractDir = cacheLayout.extractDir;
   const zipPath = cacheLayout.zipPath;
+  let downloadApiUrl: string | undefined;
+  let sdkZipUrl: string | undefined;
+  let downloaded = false;
 
   const downloadAndExtract = async (): Promise<void> => {
-    await downloadBinaryFile(downloadResult.sdkZipUrl, zipPath, options.signal);
+    const cachedRoot = tryResolveIosSdkRootFromDirectory(extractDir);
+    if (cachedRoot) return;
+    const fetchedDownload = await fetchSdkHomeIosDownloadUrl({
+      baseUrl,
+      version,
+      plugins,
+      packageType,
+      signal: options.signal,
+    });
+    downloadApiUrl = fetchedDownload.url;
+    sdkZipUrl = fetchedDownload.sdkZipUrl;
+    await downloadBinaryFile(fetchedDownload.sdkZipUrl, zipPath, options.signal);
     fs.rmSync(extractDir, { recursive: true, force: true });
     await extractZip(zipPath, extractDir);
+    downloaded = true;
   };
   await withCacheLock(cacheLayout.lockDir, downloadAndExtract);
   const iosConfigPath = syncMeetSdkIosVersionToConfig({
@@ -266,30 +378,33 @@ export async function downloadIosSdkToBundled(
   });
   const resolvedSdkRoot = resolveIosSdkRootFromDirectory(extractDir);
   const cacheMetadataPath = cacheLayout.metadataPath;
-  writeIosSdkCacheMetadata({
-    metadataPath: cacheMetadataPath,
-    version,
-    date: versionResult.ios.date,
-    packageType,
-    plugins,
-    versionUrl: versionResult.url,
-    downloadApiUrl: downloadResult.url,
-    sdkZipUrl: downloadResult.sdkZipUrl,
-    zipPath,
-    extractDir,
-    resolvedSdkRoot,
-  });
+  if (downloaded && downloadApiUrl && sdkZipUrl) {
+    writeIosSdkCacheMetadata({
+      metadataPath: cacheMetadataPath,
+      version,
+      date: versionResult.ios.date,
+      packageType,
+      plugins,
+      versionUrl: versionResult.url,
+      downloadApiUrl,
+      sdkZipUrl,
+      zipPath,
+      extractDir,
+      resolvedSdkRoot,
+    });
+  }
 
   return {
     version,
     versionDate: versionResult.ios.date,
     versionUrl: versionResult.url,
-    downloadApiUrl: downloadResult.url,
-    sdkZipUrl: downloadResult.sdkZipUrl,
+    downloadApiUrl,
+    sdkZipUrl,
     zipPath,
     extractDir,
     resolvedSdkRoot,
     iosConfigPath,
     cacheMetadataPath,
+    downloaded,
   };
 }

package/tests/pipeline.ios.test.ts

@@ -423,7 +423,8 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       const { report, patch, binaryCopies } = await runPipeline(ctx, manifest(), { dryRun: true });
 
       expect(report.errors).toEqual([]);
-      expect(report.warnings.join("\n")).toContain("would download GoogleService-Info.plist to native-sample/GoogleService-Info.plist");
+      expect(report.warnings.join("\n")).not.toContain("GoogleService-Info.plist");
+      expect((report.logs ?? []).join("\n")).toContain("would download GoogleService-Info.plist to native-sample/GoogleService-Info.plist");
       expect(plannedIosAsset(patch, binaryCopies, "TOPDataFirebasePlugin.framework")).toBe(true);
     } finally {
       fs.rmSync(tmp, { recursive: true, force: true });

package/tests/sdkHomeDownload.test.ts

@@ -2,16 +2,20 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { fileURLToPath } from "node:url";
 import {
   DEFAULT_IOS_SDK_PLUGINS,
   buildSdkHomeDownloadUrl,
   buildSdkHomeVersionUrl,
+  downloadIosSdkToBundled,
   fetchSdkHomeIosDownloadUrl,
   fetchSdkHomeIosVersion,
   fetchSdkHomeVersions,
+  resolveIosSdkDownloadPluginsFromRemoteConfig,
   resolveIosSdkRootFromDirectory,
   resolveIosSdkZipFileName,
 } from "../src/remote/sdkHomeDownload.js";
+import { resolveIosSdkCacheLayout } from "../src/cache.js";
 
 describe("sdk-home iOS SDK download client", () => {
   afterEach(() => {
@@ -104,6 +108,56 @@ describe("sdk-home iOS SDK download client", () => {
     expect(resolveIosSdkZipFileName("1.6.0.5")).toBe("topSDK-ios--V1.6.0.5.zip");
   });
 
+  it("resolves SDK download plugins from the iOS remote config", () => {
+    expect(
+      resolveIosSdkDownloadPluginsFromRemoteConfig({
+        packageName: "com.example.app",
+        channel: "APPLE",
+        devicePlatform: "ios",
+        topsdk: { appId: "app", appSecret: "secret" },
+        sdkModules: {
+          login: {
+            guest: {},
+            email: {},
+            facebook: { clientId: "fb", scheme: "fb", secret: "token" },
+            google: { clientId: "google", scheme: "google" },
+            snapchat: { clientId: "snap", redirect: "snap://callback" },
+            line: { clientId: "line", scheme: "line" },
+            naver: { clientId: "naver", secret: "secret", scheme: "naver" },
+            kakao: { clientId: "kakao", scheme: "kakao" },
+            tiktok: { clientId: "tiktok", secret: "secret", redirect: "tiktok://callback" },
+            discord: { clientId: "discord", secret: "secret", redirect: "https://example.invalid/discord" },
+            apple: {},
+          },
+          payment: { appleIap: {} },
+          analytics: {
+            appsflyer: { devKey: "af", appleAppId: "123" },
+            firebase: { firebase_file_url: "https://cdn.example.invalid/GoogleService-Info.plist" },
+            adjust: { appCode: "adjust" },
+            facebookdata: { clientId: "fb", scheme: "fb", secret: "token" },
+          },
+        },
+      })
+    ).toEqual([
+      "guest",
+      "email",
+      "facebook",
+      "google",
+      "snapchat",
+      "line",
+      "naver",
+      "kakao",
+      "tiktok",
+      "discord",
+      "apple",
+      "apple_pay",
+      "dataAppsFlyer",
+      "dataFirebase",
+      "dataAdjust",
+      "dataFacebook",
+    ]);
+  });
+
   it("resolves top-level and nested extracted SDK layouts", () => {
     const root = fs.mkdtempSync(path.join(os.tmpdir(), "meet-sdk-tool-ios-"));
     try {
@@ -121,4 +175,101 @@ describe("sdk-home iOS SDK download client", () => {
       fs.rmSync(root, { recursive: true, force: true });
     }
   });
+
+  it("reuses an existing iOS SDK cache for the latest server version", async () => {
+    const version = "99.88.77-cache-test";
+    const cacheRoot = fs.mkdtempSync(path.join(os.tmpdir(), "meet-sdk-tool-cache-"));
+    const cacheLayout = resolveIosSdkCacheLayout({
+      version,
+      packageType: "native",
+      plugins: [...DEFAULT_IOS_SDK_PLUGINS],
+      cacheRoot,
+    });
+    fs.mkdirSync(path.join(cacheLayout.extractDir, "sdk"), { recursive: true });
+    fs.mkdirSync(path.join(cacheLayout.extractDir, "plugins"), { recursive: true });
+    const fetchMock = vi.fn(async (input: string | URL) => {
+      const url = String(input);
+      if (url.includes("/sdk/home/sdk-download/getDownLoadUrl")) {
+        throw new Error("download URL should not be requested when cache is current");
+      }
+      return {
+        ok: true,
+        status: 200,
+        text: async () =>
+          JSON.stringify({
+            code: 200,
+            data: {
+              result: {
+                android: { ver: "1.0.0", date: "2026-01-01" },
+                ios: { ver: version, date: "2026-06-26" },
+              },
+            },
+          }),
+      };
+    });
+    vi.stubGlobal("fetch", fetchMock as unknown as typeof fetch);
+
+    try {
+      const result = await downloadIosSdkToBundled(path.resolve(path.dirname(fileURLToPath(import.meta.url)), ".."), {
+        baseUrl: "https://example.com",
+        cacheRoot,
+      });
+
+      expect(result.version).toBe(version);
+      expect(result.downloaded).toBe(false);
+      expect(result.resolvedSdkRoot).toBe(cacheLayout.extractDir);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+    } finally {
+      fs.rmSync(cacheRoot, { recursive: true, force: true });
+    }
+  });
+
+  it("reuses a higher local iOS SDK cache instead of downloading an older server version", async () => {
+    const serverVersion = "99.88.77-cache-test";
+    const cachedVersion = "99.88.78-cache-test";
+    const cacheRoot = fs.mkdtempSync(path.join(os.tmpdir(), "meet-sdk-tool-cache-"));
+    const cacheLayout = resolveIosSdkCacheLayout({
+      version: cachedVersion,
+      packageType: "native",
+      plugins: [...DEFAULT_IOS_SDK_PLUGINS],
+      cacheRoot,
+    });
+    fs.mkdirSync(path.join(cacheLayout.extractDir, "sdk"), { recursive: true });
+    fs.mkdirSync(path.join(cacheLayout.extractDir, "plugins"), { recursive: true });
+    const fetchMock = vi.fn(async (input: string | URL) => {
+      const url = String(input);
+      if (url.includes("/sdk/home/sdk-download/getDownLoadUrl")) {
+        throw new Error("download URL should not be requested when a higher cache is available");
+      }
+      return {
+        ok: true,
+        status: 200,
+        text: async () =>
+          JSON.stringify({
+            code: 200,
+            data: {
+              result: {
+                android: { ver: "1.0.0", date: "2026-01-01" },
+                ios: { ver: serverVersion, date: "2026-06-26" },
+              },
+            },
+          }),
+      };
+    });
+    vi.stubGlobal("fetch", fetchMock as unknown as typeof fetch);
+
+    try {
+      const result = await downloadIosSdkToBundled(path.resolve(path.dirname(fileURLToPath(import.meta.url)), ".."), {
+        baseUrl: "https://example.com",
+        cacheRoot,
+      });
+
+      expect(result.version).toBe(cachedVersion);
+      expect(result.downloaded).toBe(false);
+      expect(result.resolvedSdkRoot).toBe(cacheLayout.extractDir);
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+    } finally {
+      fs.rmSync(cacheRoot, { recursive: true, force: true });
+    }
+  });
 });