Merge pull request #22 from BlackishGreen33/bg/upstream-fix-plugin-gate-ios-debug-and-align-version

fix(plugin): gate iOS debug logs and align plugin metadata

Author: konodioda727

README.md

@@ -170,6 +170,8 @@ export default ({ config }: ConfigContext): ExpoConfig => {
 - `appKey`、`channel`、`packageName` 仍然是插件必填项
 - iOS 初始化参数会写入 `Info.plist`，不再直接拼进 `AppDelegate.swift`
 - Android `manifestPlaceholders` 优先读取环境变量或 `gradle.properties`，缺失时会回退到插件配置里的 `appKey` / `channel` / `packageName`
+- 如果宿主已经定义了 `manifestPlaceholders`，插件会通过 `manifestPlaceholders += [...]` 追加 JPush 字段
+  非 JPush 的宿主键会被保留；如果宿主和插件都声明了同名的 `JPUSH_*` 键，后追加的 JPush 默认值会生效
 - `vendorChannels` 决定要注入哪些厂商 SDK 与占位符；若声明某个厂商通道，就必须提供该厂商要求的必填字段
 - 厂商密钥仍然建议交给环境变量，避免把敏感信息直接提交到仓库
 
@@ -261,14 +263,15 @@ JPUSH_XIAOMI_APP_KEY=your-xiaomi-app-key
   - `fetch`
   - `remote-notification`
 - `AppDelegate.swift` 中存在 `JPUSHService.setup`
+- `AppDelegate.swift` 中的调试日志与 `JPUSHService.setDebugMode()` 会被 `#if DEBUG` 包裹，release 构建不再无条件打印
 - 如果项目使用 Swift，插件会优先复用已有 `SWIFT_OBJC_BRIDGING_HEADER`；未配置时会自动创建 `<target>-Bridging-Header.h`
 
 ### Android
 
-`android/app/build.gradle` 中的 `manifestPlaceholders` 应保持"运行时读取"，而不是写死明文：
+`android/app/build.gradle` 中的 JPush 占位符应保持"运行时读取"，而不是写死明文：
 
 ```gradle
-manifestPlaceholders = [
+manifestPlaceholders += [
     JPUSH_PKGNAME: System.getenv("JPUSH_PKGNAME") ?: (project.findProperty("JPUSH_PKGNAME") ?: "com.your.app"),
     JPUSH_APPKEY: System.getenv("JPUSH_APP_KEY") ?: (project.findProperty("JPUSH_APP_KEY") ?: "your-jpush-app-key"),
     JPUSH_CHANNEL: System.getenv("JPUSH_CHANNEL") ?: (project.findProperty("JPUSH_CHANNEL") ?: "developer-default")
@@ -277,6 +280,8 @@ manifestPlaceholders = [
 
 也就是说：
 
+- 宿主原本的 `manifestPlaceholders = [...]` 配置会被保留
+- 对于宿主和插件都声明的 `JPUSH_*` 键，后追加的 JPush 值会在合并结果中生效
 - 对最终消费方，插件配置本身已经足够让 `prebuild` 产出可用的 Android 默认值
 - 对 CI / EAS / 多环境发布，依然推荐通过环境变量或 `gradle.properties` 在构建时覆盖这些值
 - 厂商通道密钥如果需要按环境切换，也应沿用同样的覆盖策略

app.plugin.js

@@ -5,7 +5,7 @@
  * 支持 Expo SDK 53+ 和 React Native 0.79.5+
  * 
  * @author MuxiStudio
- * @version 1.2.3-beta.0
+ * @version 1.2.4
  * 
  * 参考文档：
  * - JPush 集成 Expo: https://juejin.cn/post/7423235127716659239

plugin/__tests__/androidTransforms.test.ts

@@ -6,27 +6,37 @@ import { applyAndroidGradleProperties } from '../src/android/gradleProperties';
 import { applyAndroidProjectBuildGradle } from '../src/android/projectBuildGradle';
 import { applyAndroidSettingsGradle } from '../src/android/settingsGradle';
 import { mergeContents } from '../src/utils/generateCode';
-import { setConfig } from '../src/utils/config';
 
 const readFixture = (fixturePath: string): string =>
   fs.readFileSync(path.join(__dirname, 'fixtures', fixturePath), 'utf8');
 
-describe('Android transforms', () => {
-  beforeEach(() => {
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', false, undefined);
-  });
+const TEST_APP_KEY = 'demo-app-key';
+const TEST_CHANNEL = 'demo-channel';
+const TEST_PACKAGE_NAME = 'com.demo.app';
 
+describe('Android transforms', () => {
   it('should inject app/build.gradle for enabled vendors and remain idempotent', () => {
     const vendorChannels = {
       fcm: { enabled: true },
       huawei: { enabled: true },
       xiaomi: { appId: 'xiaomi-id', appKey: 'xiaomi-key' },
     };
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', false, vendorChannels);
 
     const fixture = readFixture('android/app-build.gradle.fixture');
-    const transformed = applyAndroidAppBuildGradle(fixture, vendorChannels);
-    const repeated = applyAndroidAppBuildGradle(transformed, vendorChannels);
+    const transformed = applyAndroidAppBuildGradle(
+      fixture,
+      vendorChannels,
+      TEST_PACKAGE_NAME,
+      TEST_APP_KEY,
+      TEST_CHANNEL
+    );
+    const repeated = applyAndroidAppBuildGradle(
+      transformed,
+      vendorChannels,
+      TEST_PACKAGE_NAME,
+      TEST_APP_KEY,
+      TEST_CHANNEL
+    );
 
     expect(transformed).toContain('defaultConfig {');
     expect(transformed).toContain('manifestPlaceholders += [');
@@ -45,9 +55,21 @@ describe('Android transforms', () => {
       huawei: { enabled: true },
       oppo: { appId: 'oppo-id', appKey: 'oppo-key', appSecret: 'oppo-secret' },
     };
-    const enabled = applyAndroidAppBuildGradle(fixture, vendorConfig);
+    const enabled = applyAndroidAppBuildGradle(
+      fixture,
+      vendorConfig,
+      TEST_PACKAGE_NAME,
+      TEST_APP_KEY,
+      TEST_CHANNEL
+    );
 
-    const disabled = applyAndroidAppBuildGradle(enabled, undefined);
+    const disabled = applyAndroidAppBuildGradle(
+      enabled,
+      undefined,
+      TEST_PACKAGE_NAME,
+      TEST_APP_KEY,
+      TEST_CHANNEL
+    );
 
     expect(disabled).toContain(`implementation project(':jpush-react-native')`);
     expect(disabled).not.toContain(`com.google.firebase:firebase-messaging`);
@@ -97,7 +119,13 @@ describe('Android transforms', () => {
       comment: '//',
     }).contents;
 
-    const upgraded = applyAndroidAppBuildGradle(withLegacyFileTree, undefined);
+    const upgraded = applyAndroidAppBuildGradle(
+      withLegacyFileTree,
+      undefined,
+      TEST_PACKAGE_NAME,
+      TEST_APP_KEY,
+      TEST_CHANNEL
+    );
 
     expect(upgraded).not.toContain('@generated begin jpush-ndk-config');
     expect(upgraded).not.toContain('@generated begin jpush-libs-filetree');
@@ -130,7 +158,6 @@ describe('Android transforms', () => {
     expect(enabled).toContain(`https://developer.hihonor.com/repo`);
     expect(repeated).toBe(enabled);
 
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', false, undefined);
     const disabled = applyAndroidProjectBuildGradle(enabled);
 
     expect(disabled).not.toContain(`com.google.gms:google-services`);
@@ -140,12 +167,11 @@ describe('Android transforms', () => {
   });
 
   it('should remove legacy project/build.gradle generated sections during upgrade', () => {
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', false, {
+    const vendorChannels = {
       fcm: { enabled: true },
       huawei: { enabled: true },
       honor: { appId: 'honor-id' },
-    });
-
+    };
     const fixture = readFixture('android/project-build.gradle.fixture');
     const withLegacyBuildscriptHuawei = mergeContents({
       src: fixture,
@@ -189,7 +215,10 @@ describe('Android transforms', () => {
       comment: '//',
     }).contents;
 
-    const upgraded = applyAndroidProjectBuildGradle(withLegacyHonorAllprojects);
+    const upgraded = applyAndroidProjectBuildGradle(
+      withLegacyHonorAllprojects,
+      vendorChannels
+    );
 
     expect(upgraded).not.toContain('@generated begin jpush-huawei-maven-buildscript');
     expect(upgraded).not.toContain('@generated begin jpush-honor-maven-buildscript');
@@ -227,11 +256,9 @@ describe('Android transforms', () => {
   });
 
   it('should add gradle.properties compatibility only for Huawei', () => {
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', false, {
+    const withHuawei = applyAndroidGradleProperties([], {
       huawei: { enabled: true },
     });
-
-    const withHuawei = applyAndroidGradleProperties([]);
     expect(withHuawei).toEqual([
       {
         type: 'property',
@@ -240,8 +267,7 @@ describe('Android transforms', () => {
       },
     ]);
 
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', false, undefined);
-    const withoutHuawei = applyAndroidGradleProperties(withHuawei);
+    const withoutHuawei = applyAndroidGradleProperties(withHuawei, undefined);
     expect(withoutHuawei).toBe(withHuawei);
   });
 });

plugin/__tests__/iosTransforms.test.ts

@@ -9,7 +9,6 @@ import {
   upsertBridgingHeaderImports,
 } from '../src/ios/bridgingHeader';
 import { applyIosInfoPlist, mergeBackgroundModes } from '../src/ios/infoPlist';
-import { setConfig } from '../src/utils/config';
 
 const readFixture = (fixturePath: string): string =>
   fs.readFileSync(path.join(__dirname, 'fixtures', fixturePath), 'utf8');
@@ -54,10 +53,6 @@ function createMockXcodeProject() {
 }
 
 describe('iOS transforms', () => {
-  beforeEach(() => {
-    setConfig('demo-app-key', 'demo-channel', 'com.demo.app', true, undefined);
-  });
-
   it('should merge Info.plist background modes without overwriting existing values', () => {
     expect(mergeBackgroundModes(['processing', 'fetch'])).toEqual([
       'processing',
@@ -94,6 +89,8 @@ describe('iOS transforms', () => {
 
     expect(transformed).toContain('import UserNotifications');
     expect(transformed).toContain('JPUSHService.setup(withOption: launchOptions');
+    expect(transformed).toContain('#if DEBUG');
+    expect(transformed).toContain('JPUSHService.setDebugMode()');
     expect(transformed).toContain('didRegisterForRemoteNotificationsWithDeviceToken');
     expect(transformed).toContain('extension AppDelegate: JPUSHRegisterDelegate');
     expect(repeated).toBe(transformed);

plugin/__tests__/nativeIosAppDelegate.test.ts

@@ -27,6 +27,8 @@ describe('native iOS AppDelegate mod', () => {
     expect(appDelegate).toContain(
       'JPUSHService.register(forRemoteNotificationConfig: entity, delegate: self)'
     );
+    expect(appDelegate).toContain('#if DEBUG');
+    expect(appDelegate).toContain('JPUSHService.setDebugMode()');
     expect(appDelegate).toContain('JPUSHService.setup(withOption: launchOptions,');
     expect(appDelegate).toContain(
       'didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data'
@@ -66,6 +68,7 @@ describe('native iOS AppDelegate mod', () => {
         'JPUSHService.register(forRemoteNotificationConfig: entity, delegate: self)'
       )
     ).toBe(1);
+    expect(countOccurrences(twiceCompiled, '#if DEBUG')).toBeGreaterThan(0);
     expect(
       countOccurrences(
         twiceCompiled,

plugin/src/android/appBuildGradle.ts

@@ -11,7 +11,6 @@ import {
   replaceGeneratedContentsAtLine,
   syncGeneratedContentsAtEnd,
 } from '../utils/generateCode';
-import { getConfig } from '../utils/config';
 import {
   ensureNestedBlock,
   ensureTopLevelBlock,
@@ -52,18 +51,16 @@ function removeLegacyGeneratedSections(contents: string, tags: string[]): string
 }
 
 function getResolvedConfig({
-  packageName,
-  appKey,
-  channel,
+  packageName = '',
+  appKey = '',
+  channel = '',
   vendorChannels,
 }: AndroidBuildGradleConfigInput): ResolvedAndroidBuildGradleConfig {
-  const fallbackConfig = getConfig();
-
   return {
-    appKey: appKey ?? fallbackConfig?.appKey ?? '',
-    channel: channel ?? fallbackConfig?.channel ?? '',
-    packageName: packageName ?? fallbackConfig?.packageName ?? '',
-    vendorChannels: vendorChannels ?? fallbackConfig?.vendorChannels,
+    appKey,
+    channel,
+    packageName,
+    vendorChannels,
   };
 }
 

plugin/src/android/gradleProperties.ts

@@ -5,8 +5,7 @@
 
 import { ExpoConfig } from 'expo/config';
 import { withGradleProperties } from 'expo/config-plugins';
-import { ResolvedJPushPluginProps } from '../types';
-import { getVendorChannels } from '../utils/vendorChannels';
+import { ResolvedJPushPluginProps, VendorChannelConfig } from '../types';
 
 type GradleProperty =
   | {
@@ -22,9 +21,10 @@ type GradleProperty =
       value: string;
     };
 
-export function applyAndroidGradleProperties(properties: GradleProperty[]): GradleProperty[] {
-  const vendorChannels = getVendorChannels();
-
+export function applyAndroidGradleProperties(
+  properties: GradleProperty[],
+  vendorChannels?: VendorChannelConfig
+): GradleProperty[] {
   if (!vendorChannels?.huawei?.enabled) {
     return properties;
   }
@@ -63,25 +63,10 @@ export function withAndroidGradleProperties(
   props: Pick<ResolvedJPushPluginProps, 'vendorChannels'>
 ): ExpoConfig {
   return withGradleProperties(config, (nextConfig) => {
-    if (props.vendorChannels?.huawei?.enabled === true) {
-      console.log(
-        '\n[MX_JPush_Expo] 配置 gradle.properties 华为 AGC 兼容性（Gradle 8.0）...'
-      );
-
-      const existingProp = nextConfig.modResults.find(
-        (prop) =>
-          prop.type === 'property' && prop.key === 'apmsInstrumentationEnabled'
-      );
-
-      if (!existingProp) {
-        nextConfig.modResults.push({
-          type: 'property',
-          key: 'apmsInstrumentationEnabled',
-          value: 'false',
-        });
-      }
-    }
-
+    nextConfig.modResults = applyAndroidGradleProperties(
+      nextConfig.modResults,
+      props.vendorChannels
+    );
     return nextConfig;
   });
 }

plugin/src/android/projectBuildGradle.ts

@@ -9,7 +9,47 @@ import { withProjectBuildGradle } from 'expo/config-plugins';
 import { VendorChannelConfig } from '../types';
 import { removeGeneratedContents, syncGeneratedContentsAtLine } from '../utils/generateCode';
 import { ensureTopLevelBlock, ensureNestedBlock, findNestedBlockRange } from '../utils/sourceCode';
-import { getProjectVendorFlags, LEGACY_PROJECT_BUILD_TAGS, getBuildscriptRepositories } from '../utils/vendorChannels';
+
+const LEGACY_PROJECT_BUILD_TAGS = [
+  'jpush-buildscript-repositories',
+  'jpush-buildscript-classpaths',
+  'jpush-allprojects-repositories',
+  'jpush-huawei-maven-buildscript',
+  'jpush-honor-maven-buildscript',
+  'jpush-vendor-classpaths',
+  'jpush-huawei-maven-allprojects',
+  'jpush-honor-maven-allprojects',
+];
+
+function getProjectVendorFlags(
+  vendorChannels?: VendorChannelConfig
+): Record<string, boolean> {
+  if (!vendorChannels) {
+    return {};
+  }
+
+  return Object.fromEntries(
+    Object.entries(vendorChannels).map(([key, value]) => [
+      key,
+      Boolean(value?.enabled || value?.appId || value?.appKey),
+    ])
+  );
+}
+
+function getBuildscriptRepositories(vendorChannels?: VendorChannelConfig): string {
+  const flags = getProjectVendorFlags(vendorChannels);
+  const repositories: string[] = [];
+
+  if (flags.huawei) {
+    repositories.push(`maven { url 'https://developer.huawei.com/repo/' }`);
+  }
+
+  if (flags.honor) {
+    repositories.push(`maven { url 'https://developer.hihonor.com/repo' }`);
+  }
+
+  return repositories.join('\n        ');
+}
 
 /**
  * 获取厂商通道开启标记
@@ -150,7 +190,7 @@ export function applyAndroidProjectBuildGradle(
 
 export function withAndroidProjectBuildGradle(
   config: ExpoConfig,
-  props: { vendorChannels?: any }
+  props: { vendorChannels?: VendorChannelConfig }
 ): ExpoConfig {
   return withProjectBuildGradle(config, (config) => {
     const { vendorChannels } = props;
@@ -160,4 +200,4 @@ export function withAndroidProjectBuildGradle(
     );
     return config;
   });
-}
+}