@leonxin/meetgames 0.1.13 → 0.1.14

package/tests/pipeline.ios.test.ts

@@ -7,32 +7,19 @@ import { loadManifestFile } from "../src/config/loadManifest.js";
 import { buildWorkspaceContext } from "../src/core/workspace.js";
 import { runPipeline } from "../src/core/pipeline.js";
 import { detectIOS } from "../src/ios/detect.js";
+import { parsePlistXml } from "../src/ios/infoPlist.js";
 import { resolveIosSdkRootFromDirectory } from "../src/remote/sdkHomeDownload.js";
 
 const here = path.dirname(fileURLToPath(import.meta.url));
 const pkgRoot = path.resolve(here, "..");
-const iosRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "tooltest");
-const nativeSampleRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "native-sample");
-const iosRemoteConfigFixture = path.join(pkgRoot, "fixtures", "meetsdk-remote-config.ios-tooltest.json");
+const iosRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "native-sample");
 const hasIosProjectFixture = fs.existsSync(iosRoot);
-const hasNativeSampleFixture = fs.existsSync(nativeSampleRoot);
 const manifest = () => loadManifestFile(path.join(pkgRoot, "recipes", "ios-default.yaml"));
 const fixtureIosSdkRoot = resolveIosSdkRootFromDirectory(path.join(pkgRoot, "fixtures", "ios-sdk", "topSDK-ios--V1.6.0.5"));
 
-function writeOfflineRemoteConfig(projectRoot: string): void {
-  fs.copyFileSync(iosRemoteConfigFixture, path.join(projectRoot, "meetsdk-remote-config.json"));
-}
-
 function copyProjectToTemp(): string {
-  const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "meet-ios-integrate-"));
-  fs.cpSync(iosRoot, tmp, { recursive: true });
-  writeOfflineRemoteConfig(tmp);
-  return tmp;
-}
-
-function copyNativeSampleToTemp(): string {
   const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "meet-ios-native-sample-"));
-  fs.cpSync(nativeSampleRoot, tmp, { recursive: true });
+  fs.cpSync(iosRoot, tmp, { recursive: true });
   writeNativeSampleRemoteConfig(tmp);
   return tmp;
 }
@@ -97,6 +84,14 @@ function plannedIosAsset(patch: string, binaryCopies: Array<{ relTo: string }>,
   return patch.includes(name) || binaryCopies.some((c) => c.relTo.includes(name));
 }
 
+function occurrenceCount(content: string, needle: string): number {
+  return content.split(needle).length - 1;
+}
+
+function regexCount(content: string, pattern: RegExp): number {
+  return [...content.matchAll(pattern)].length;
+}
+
 function testIosContext(projectRoot: string) {
   return buildWorkspaceContext(projectRoot, pkgRoot, { iosSdkRoot: fixtureIosSdkRoot });
 }
@@ -109,29 +104,29 @@ describe("pipeline ios fixture SDK", () => {
 });
 
 describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
-  it("detects tooltest xcodeproj with AppDelegate target", () => {
+  it("detects native-sample xcodeproj with AppDelegate target", () => {
     const d = detectIOS(iosRoot);
     expect(d.ok).toBe(true);
     if (d.ok) {
-      expect(d.targetName).toBe("tooltest");
-      expect(fs.existsSync(path.join(iosRoot, "tooltest", "AppDelegate.m"))).toBe(true);
+      expect(d.targetName).toBe("native-sample");
+      expect(fs.existsSync(path.join(iosRoot, "native-sample", "AppDelegate.m"))).toBe(true);
     }
   });
 
   it("detects when project root is the xcodeproj directory itself", () => {
-    const xcodeprojRoot = path.join(iosRoot, "tooltest.xcodeproj");
+    const xcodeprojRoot = path.join(iosRoot, "native-sample.xcodeproj");
     const d = detectIOS(xcodeprojRoot);
     expect(d.ok).toBe(true);
     if (d.ok) {
       expect(d.xcodeprojPath).toBe(xcodeprojRoot);
-      expect(d.targetName).toBe("tooltest");
+      expect(d.targetName).toBe("native-sample");
     }
   });
 
   it("builds workspace context when project root is the xcodeproj directory", () => {
-    const ctx = testIosContext(path.join(iosRoot, "tooltest.xcodeproj"));
+    const ctx = testIosContext(path.join(iosRoot, "native-sample.xcodeproj"));
     expect(ctx.ios?.ok).toBe(true);
-    expect(ctx.ios?.ok && ctx.ios.xcodeprojPath).toBe(path.join(iosRoot, "tooltest.xcodeproj"));
+    expect(ctx.ios?.ok && ctx.ios.xcodeprojPath).toBe(path.join(iosRoot, "native-sample.xcodeproj"));
   });
 
   it("dry-run: plans TOPCore + GuestSignin frameworks and pbxproj edits", async () => {
@@ -163,31 +158,85 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPGuestSigninPlugin.framework"))).toBe(true);
       expect(fs.existsSync(path.join(tmp, "topSDK", "TopSDKSource.bundle"))).toBe(true);
 
-      const pbx = fs.readFileSync(path.join(tmp, "tooltest.xcodeproj", "project.pbxproj"), "utf8");
+      const pbx = fs.readFileSync(path.join(tmp, "native-sample.xcodeproj", "project.pbxproj"), "utf8");
       expect(pbx).toContain("TOPCore.framework");
       expect(pbx).toContain("TOPGuestSigninPlugin.framework");
       expect(pbx).toContain('"-ObjC"');
-      expect(pbx).toContain('"-lc++"');
+      expect(pbx).toContain("libc++.tbd");
       expect(pbx).not.toMatch(/\n\s+-ObjC,/);
-      expect(pbx).not.toMatch(/\n\s+-lc\+\+,/);
       expect(pbxBuildFileRefErrors(pbx).filter((e) => /TOP|FBSDK|Google|AppsFlyer|TopSDKInstall/.test(e))).toEqual([]);
       expect(pbx).not.toMatch(/\bundefined;/);
 
-      const delegate = fs.readFileSync(path.join(tmp, "tooltest", "AppDelegate.m"), "utf8");
+      const delegate = fs.readFileSync(path.join(tmp, "native-sample", "AppDelegate.m"), "utf8");
       expect(delegate).toContain("#import <TOPSDK/TopSDK.h>");
       expect(delegate).toContain("TopSDK.sharedInstance");
       expect(delegate).toContain("TOPDataSDK");
 
-      const plist = fs.readFileSync(path.join(tmp, "tooltest", "Info.plist"), "utf8");
+      const plist = fs.readFileSync(path.join(tmp, "native-sample", "Info.plist"), "utf8");
       expect(plist).toContain("<key>TOPSDK</key>");
       expect(plist).toContain("<key>APP_ID</key>");
-      expect(plist).toContain("mock-ios-tooltest-app-id");
+      expect(plist).toContain("mock-ios-native-sample-app-id");
       expect(plist).toContain("GuestSignin");
     } finally {
       fs.rmSync(tmp, { recursive: true, force: true });
     }
   });
 
+  it("apply: is idempotent and logs iOS value updates", async () => {
+    const tmp = copyProjectToTemp();
+    try {
+      const plistPath = path.join(tmp, "native-sample", "Info.plist");
+      const beforePlist = fs.readFileSync(plistPath, "utf8");
+      fs.writeFileSync(
+        plistPath,
+        beforePlist
+          .replace("<key>FacebookAppID</key>\n\t<string>883695101201170</string>", "<key>FacebookAppID</key>\n\t<string>old-facebook-app-id</string>")
+          .replace(
+            "</dict>\n</plist>",
+            "\t<key>LSApplicationQueriesSchemes</key>\n\t<array>\n\t\t<string>fbapi</string>\n\t</array>\n\t<key>CFBundleURLTypes</key>\n\t<array>\n\t\t<dict>\n\t\t\t<key>CFBundleTypeRole</key>\n\t\t\t<string>Editor</string>\n\t\t\t<key>CFBundleURLSchemes</key>\n\t\t\t<array>\n\t\t\t\t<string>fb883695101201170</string>\n\t\t\t</array>\n\t\t</dict>\n\t</array>\n</dict>\n</plist>"
+          ),
+        "utf8"
+      );
+
+      const first = await runPipeline(testIosContext(tmp), manifest(), { dryRun: false });
+      expect(first.report.errors).toEqual([]);
+      const firstLogs = (first.report.logs ?? []).join("\n");
+      expect(firstLogs).toContain("SUCCESS: info.plist配置key：FacebookAppID old-facebook-app-id -> 883695101201170");
+
+      const second = await runPipeline(testIosContext(tmp), manifest(), { dryRun: false });
+      expect(second.report.errors).toEqual([]);
+      const secondLogs = (second.report.logs ?? []).join("\n");
+      expect(secondLogs).toContain("SUCCESS: info.plist配置key：FacebookAppID 未变化 value:883695101201170");
+      expect(secondLogs).toContain("SUCCESS: BuildSetting设置VALIDATE_WORKSPACE 未变化 value:YES");
+
+      const plist = fs.readFileSync(plistPath, "utf8");
+      const plistData = parsePlistXml(plist);
+      const queries = Array.isArray(plistData.LSApplicationQueriesSchemes)
+        ? (plistData.LSApplicationQueriesSchemes as string[])
+        : [];
+      const urlTypes = Array.isArray(plistData.CFBundleURLTypes)
+        ? (plistData.CFBundleURLTypes as Array<Record<string, unknown>>)
+        : [];
+      const urlSchemes = urlTypes.flatMap((entry) =>
+        Array.isArray(entry.CFBundleURLSchemes) ? (entry.CFBundleURLSchemes as string[]) : []
+      );
+      expect(occurrenceCount(plist, "<key>FacebookAppID</key>")).toBe(1);
+      expect(occurrenceCount(plist, "<key>FacebookClientToken</key>")).toBe(1);
+      expect(queries.filter((scheme) => scheme === "fbapi")).toHaveLength(1);
+      expect(urlSchemes.filter((scheme) => scheme === "fb883695101201170")).toHaveLength(1);
+      expect(urlSchemes.filter((scheme) => scheme === "com.googleusercontent.apps.396842465987-8sg3ngohnl5f2r8no5etu401ruv6snql")).toHaveLength(1);
+      expect(occurrenceCount(plist, "<key>TOPSDK</key>")).toBe(1);
+
+      const pbx = fs.readFileSync(path.join(tmp, "native-sample.xcodeproj", "project.pbxproj"), "utf8");
+      expect(regexCount(pbx, /\/\* TopSDKInstall\.swift in Sources \*\/ = \{isa = PBXBuildFile;/g)).toBe(1);
+      expect(regexCount(pbx, /\/\* TOPFacebookSigninPlugin\.framework in Frameworks \*\/ = \{isa = PBXBuildFile;/g)).toBe(1);
+      expect(regexCount(pbx, /\/\* TOPGoogleSigninPlugin\.framework in Frameworks \*\/ = \{isa = PBXBuildFile;/g)).toBe(1);
+      expect(occurrenceCount(pbx, "VALIDATE_WORKSPACE = YES")).toBe(2);
+    } finally {
+      fs.rmSync(tmp, { recursive: true, force: true });
+    }
+  });
+
   it("apply: enables Apple Sign In entitlement when AppleSignin plugin is enabled", async () => {
     const tmp = copyProjectToTemp();
     try {
@@ -204,15 +253,15 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       const { report } = await runPipeline(ctx, manifest(), { dryRun: false });
       expect(report.errors).toEqual([]);
 
-      const entitlementsPath = path.join(tmp, "tooltest", "tooltest.entitlements");
+      const entitlementsPath = path.join(tmp, "native-sample", "native-sample.entitlements");
       expect(fs.existsSync(entitlementsPath)).toBe(true);
       const entitlements = fs.readFileSync(entitlementsPath, "utf8");
       expect(entitlements).toContain("com.apple.developer.applesignin");
       expect(entitlements).toContain("Default");
 
-      const pbx = fs.readFileSync(path.join(tmp, "tooltest.xcodeproj", "project.pbxproj"), "utf8");
+      const pbx = fs.readFileSync(path.join(tmp, "native-sample.xcodeproj", "project.pbxproj"), "utf8");
       expect(pbx).toContain("CODE_SIGN_ENTITLEMENTS");
-      expect(pbx).toContain("tooltest/tooltest.entitlements");
+      expect(pbx).toContain("native-sample/native-sample.entitlements");
       expect(pbx).toContain("TOPAppleSigninPlugin.framework");
     } finally {
       fs.rmSync(tmp, { recursive: true, force: true });
@@ -345,7 +394,7 @@ 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 tooltest/GoogleService-Info.plist");
+      expect(report.warnings.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 });
@@ -356,7 +405,7 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
     const tmp = copyProjectToTemp();
     try {
       fs.writeFileSync(
-        path.join(tmp, "tooltest", "AppDelegate.m"),
+        path.join(tmp, "native-sample", "AppDelegate.m"),
         `#import "AppDelegate.h"
 
 @implementation AppDelegate
@@ -370,7 +419,7 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
         "utf8"
       );
       fs.writeFileSync(
-        path.join(tmp, "tooltest", "SceneDelegate.m"),
+        path.join(tmp, "native-sample", "SceneDelegate.m"),
         `#import "SceneDelegate.h"
 
 @implementation SceneDelegate
@@ -384,7 +433,7 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       const { report } = await runPipeline(ctx, manifest(), { dryRun: false });
       expect(report.errors).toEqual([]);
 
-      const appDelegate = fs.readFileSync(path.join(tmp, "tooltest", "AppDelegate.m"), "utf8");
+      const appDelegate = fs.readFileSync(path.join(tmp, "native-sample", "AppDelegate.m"), "utf8");
       expect(appDelegate).toContain("[TopSDK.sharedInstance application:application didFinishLaunchingWithOptions:launchOptions]");
       expect(appDelegate).toContain("[TOPDataSDK application:application didFinishLaunchingWithOptions:launchOptions]");
       expect(appDelegate).not.toContain("openURL:url options");
@@ -392,7 +441,7 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
       expect(appDelegate).not.toContain("applicationDidEnterBackground");
       expect(appDelegate).not.toContain("applicationWillEnterForeground");
 
-      const sceneDelegate = fs.readFileSync(path.join(tmp, "tooltest", "SceneDelegate.m"), "utf8");
+      const sceneDelegate = fs.readFileSync(path.join(tmp, "native-sample", "SceneDelegate.m"), "utf8");
       expect(sceneDelegate).toContain("[TopSDK.sharedInstance scene:scene openURLContexts:URLContexts]");
       expect(sceneDelegate).toContain("[TopSDK.sharedInstance scene:scene continueUserActivity:userActivity]");
       expect(sceneDelegate).toContain("[TopSDK.sharedInstance sceneWillEnterForeground:scene]");
@@ -405,12 +454,12 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
   it("fails when the configured Info.plist file is missing", async () => {
     const tmp = copyProjectToTemp();
     try {
-      fs.rmSync(path.join(tmp, "tooltest", "Info.plist"));
+      fs.rmSync(path.join(tmp, "native-sample", "Info.plist"));
 
       const ctx = testIosContext(tmp);
       const { report } = await runPipeline(ctx, manifest(), { dryRun: true });
 
-      expect(report.errors.join("\n")).toContain("Info.plist not found for iOS target tooltest");
+      expect(report.errors.join("\n")).toContain("Info.plist not found for iOS target native-sample");
     } finally {
       fs.rmSync(tmp, { recursive: true, force: true });
     }
@@ -440,9 +489,9 @@ describe.skipIf(!hasIosProjectFixture)("pipeline ios fixture", () => {
   });
 });
 
-describe.skipIf(!hasNativeSampleFixture)("pipeline ios native-sample parity", () => {
+describe.skipIf(!hasIosProjectFixture)("pipeline ios native-sample parity", () => {
   it("apply: mirrors topsdk-tool-ios logs and integration points for native-sample", async () => {
-    const tmp = copyNativeSampleToTemp();
+    const tmp = copyProjectToTemp();
     try {
       const ctx = testIosContext(tmp);
       const { report } = await runPipeline(ctx, manifest(), { dryRun: false });
@@ -461,6 +510,38 @@ describe.skipIf(!hasNativeSampleFixture)("pipeline ios native-sample parity", ()
       expect(logs).toContain("检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口");
       expect(logs).toContain("SUCCESS: info.plist配置写入完成");
       expect(logs).toContain("！！ 接入流程已全部结束 ！！");
+      const orderedLogMarkers = [
+        "- 插件：GuestSignin, 类型：1,版本：1.6.0.3",
+        "SUCCESS: 插件GuestSignin接入完成",
+        "- 插件：UI, 类型：3,版本：1.6.0.3",
+        "SUCCESS: 插件UI接入完成",
+        "- 插件：IAPPay, 类型：2,版本：1.6.0.3",
+        "SUCCESS: 插件IAPPay接入完成",
+        "- 插件：AppsFlyerManager, 类型：4,版本：1.6.0.3",
+        "SUCCESS: info.plist添加配置key：NSAdvertisingAttributionReportEndpoint value:https://appsflyer-skadnetwork.com/ 完成",
+        "SUCCESS: 插件AppsFlyerManager接入完成",
+        "- 插件：FacebookSignin, 类型：1,版本：1.6.0.3",
+        "SUCCESS: 未检测到Swift代码文件，自动添加TopSDKInstall.swift完成",
+        "SUCCESS: 添加queriesSchemes:fbapi 完成",
+        "SUCCESS: 设置urlScheme：fb883695101201170完成",
+        "SUCCESS: 插件FacebookSignin接入完成",
+        "- 插件：GoogleSignin, 类型：1,版本：1.6.0.3",
+        "SUCCESS: 插件GoogleSignin接入完成",
+        "- 插件：AppleSignin, 类型：1,版本：1.6.0.3",
+        "SUCCESS: 启用SigninWithApple完成",
+        "SUCCESS: 插件AppleSignin接入完成",
+        "- 插件：TOPSDK, 类型：0,版本：1.6.0.3",
+        "检测到工程UIApplicationDelegate实现类，将自动接入对应接口",
+        "检测到工程存在UIWindowSceneDelegate实现类，将自动接入对应接口",
+        "SUCCESS: 插件TOPSDK接入完成",
+        "SUCCESS: info.plist配置写入完成",
+      ];
+      let lastLogIndex = -1;
+      for (const marker of orderedLogMarkers) {
+        const index = logs.indexOf(marker);
+        expect(index, marker).toBeGreaterThan(lastLogIndex);
+        lastLogIndex = index;
+      }
 
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPUIPlugin.framework"))).toBe(true);
       expect(fs.existsSync(path.join(tmp, "topSDK", "TOPFacebookSigninPlugin.framework"))).toBe(true);

package/tests/platformSelection.test.ts

@@ -11,7 +11,7 @@ import type { Manifest } from "../src/contracts/types.js";
 
 const pkgRoot = path.resolve(__dirname, "..");
 const androidLatestRoot = path.join(pkgRoot, "fixtures", "android-test-project", "android-latest-project");
-const iosProjectRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "tooltest");
+const iosProjectRoot = path.join(pkgRoot, "fixtures", "ios-test-project", "native-sample");
 const hasIosProjectFixture = fs.existsSync(iosProjectRoot);
 
 describe("platform selection", () => {
@@ -58,11 +58,11 @@ describe("platform selection", () => {
 
   it.skipIf(!hasIosProjectFixture)("overrides detected iOS target name when explicitly provided", () => {
     const ctx = buildWorkspaceContext(iosProjectRoot, pkgRoot, {
-      appTarget: "tooltest",
+      appTarget: "native-sample",
     });
 
-    expect(ctx.ios?.ok && ctx.ios.targetName).toBe("tooltest");
-    expect(ctx.ios?.ok && ctx.ios.targetNames).toContain("tooltest");
+    expect(ctx.ios?.ok && ctx.ios.targetName).toBe("native-sample");
+    expect(ctx.ios?.ok && ctx.ios.targetNames).toContain("native-sample");
   });
 
   it.skipIf(!hasIosProjectFixture)("rejects missing iOS app target names during detection", () => {