adwhale-sdk-react-native 2.7.201 → 2.7.202

package/README.md

@@ -43,7 +43,7 @@ npm install adwhale-sdk-react-native
 운영 안정성을 중시하는 경우
 ```json
 {
-  "adwhale-sdk-react-native": "~2.7.201"
+  "adwhale-sdk-react-native": "~2.7.202"
 }
 ```
 - Android SDK 2.7.2 기반 유지
@@ -52,7 +52,7 @@ npm install adwhale-sdk-react-native
 ### 동일한 Android SDK 기반의 최신 RN 수정만 사용
 ```json
 {
-  "adwhale-sdk-react-native": "^2.7.201"
+  "adwhale-sdk-react-native": "^2.7.202"
 }
 ```
 - Android SDK 2.7.x 범위 내 최신 RN 수정 자동 반영
@@ -62,7 +62,7 @@ npm install adwhale-sdk-react-native
 ### 특정 버전을 완전히 고정하여 사용하는 경우
 ```json
 {
-  "adwhale-sdk-react-native": "2.7.201"
+  "adwhale-sdk-react-native": "2.7.202"
 }
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adwhale-sdk-react-native",
-  "version": "2.7.201",
+  "version": "2.7.202",
   "description": "Adwhale SDK React Native library for integrating Adwhale advertising mediation SDK into React Native applications.",
   "main": "./lib/module/index.js",
   "react-native": "./lib/module/index.js",

package/plugin/index.js

@@ -1,38 +1,36 @@
 /**
- * AdWhale Expo Config Plugin
+ * AdWhale Expo Config Plugin (Most Compatible)
  *
  * 목적:
  * - Expo Bare / Managed / prebuild / EAS Dev Client 환경에서
  *   AdWhale Android SDK 의존성을 정상적으로 resolve 하기 위해
  *   Maven Repository들을 자동으로 Gradle 설정에 추가한다.
  *
- * 전략:
+ * 왜 withDangerousMod?
+ * - 일부 Expo/@expo config-plugins 버전에서는 Android 전용 helper(mod)
+ *   (예: withAndroidBuildGradle, withAndroidProjectBuildGradle)가 존재하지 않는다.
+ * - helper에 의존하면 TypeError가 발생할 수 있다.
+ * - withDangerousMod는 폭넓게 제공되며, 파일을 직접 수정하는 방식이라 호환성이 가장 높다.
+ *
+ * 적용 정책:
  * 1) android/settings.gradle
- *    - dependencyResolutionManagement { repositories { ... } } 에 repo 추가
- *    - rootProject.name 바로 다음 줄에 삽입 (가독성 + 충돌 최소화)
+ *   - rootProject.name 바로 다음 줄에
+ *     dependencyResolutionManagement { repositories { ... } } 추가/보강
  *
  * 2) android/build.gradle (project-level)
- *    - allprojects { repositories { ... } } 에 repo 추가
+ *   - allprojects { repositories { ... } } 안에만 Maven repo 추가
+ *   - buildscript.repositories에는 절대 추가하지 않음
  *
  * 3) 단, settings.gradle에
  *    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
- *    가 존재하는 경우:
- *    - project-level repo 사용이 금지되므로
- *    - build.gradle 수정은 생략
- *
- * 결과:
- * - AGP 7/8
- * - Expo SDK 49+
- * - Version Catalog / 강한 repo 정책
- *   모두에서 안전하게 동작
+ *    가 존재하면:
+ *   - project-level repo 사용이 금지될 수 있으므로
+ *   - build.gradle 수정은 생략
  */
 
-const {
-  createRunOncePlugin,
-  withAndroidProjectBuildGradle,
-  withSettingsGradle,
-} = require('expo/config-plugins');
-
+const fs = require('fs');
+const path = require('path');
+const { createRunOncePlugin, withDangerousMod } = require('expo/config-plugins');
 const pkg = require('../package.json');
 
 /**
@@ -63,37 +61,48 @@ const MAVEN_REPOSITORIES = [
 const MARKER_BEGIN = '// [AdWhale] BEGIN Maven Repositories';
 const MARKER_END = '// [AdWhale] END Maven Repositories';
 
+function readTextIfExists(filePath) {
+  if (!fs.existsSync(filePath)) return null;
+  return fs.readFileSync(filePath, 'utf8');
+}
+
+function writeText(filePath, contents) {
+  fs.writeFileSync(filePath, contents, 'utf8');
+}
+
 /**
- * repo 블록 문자열 생성
+ * settings.gradle에 FAIL_ON_PROJECT_REPOS가 있으면
+ * project-level repo를 금지할 수 있으므로 build.gradle 수정은 생략한다.
  */
-function generateReposBlock(indent = '    ') {
+function hasFailOnProjectRepos(contents) {
+  return /repositoriesMode\.set\s*\(\s*RepositoriesMode\.FAIL_ON_PROJECT_REPOS\s*\)/.test(
+    contents
+  );
+}
+
+/**
+ * Maven repo 블록 생성 (마커 포함)
+ */
+function generateReposBlock(indent = '        ') {
   const body = MAVEN_REPOSITORIES.map(
-    (repo) =>
-      `${indent}// ${repo.comment}\n` +
-      `${indent}maven { url "${repo.url}" }`
+    (repo) => `${indent}// ${repo.comment}\n${indent}maven { url "${repo.url}" }`
   ).join('\n\n');
 
   return `${indent}${MARKER_BEGIN}\n\n${body}\n\n${indent}${MARKER_END}`;
 }
 
 /**
- * repositories { } 안에
- * google(), mavenCentral() 이 없으면 보장해준다
+ * repositories { ... } 내부에 google(), mavenCentral()이 없으면 추가해준다.
+ * (resolve 기본 repo 안전장치)
  */
-function ensureGoogleAndMavenCentral(reposBlock, indent = '    ') {
+function ensureGoogleAndMavenCentral(reposBlock, indent = '        ') {
   if (!/google\(\)/.test(reposBlock)) {
-    reposBlock = reposBlock.replace(
-      /repositories\s*\{\s*/m,
-      (m) => `${m}\n${indent}google()`
-    );
+    reposBlock = reposBlock.replace(/repositories\s*\{\s*/m, (m) => `${m}\n${indent}google()`);
   }
 
   if (!/mavenCentral\(\)/.test(reposBlock)) {
     if (/google\(\)/.test(reposBlock)) {
-      reposBlock = reposBlock.replace(
-        /(google\(\))/m,
-        `$1\n${indent}mavenCentral()`
-      );
+      reposBlock = reposBlock.replace(/(google\(\))/m, `$1\n${indent}mavenCentral()`);
     } else {
       reposBlock = reposBlock.replace(
         /repositories\s*\{\s*/m,
@@ -106,32 +115,45 @@ function ensureGoogleAndMavenCentral(reposBlock, indent = '    ') {
 }
 
 /**
- * settings.gradle 에서
- * repositoriesMode = FAIL_ON_PROJECT_REPOS 가 있는지 검사
- *
- * 이 설정이 있으면 project-level(build.gradle) repo 사용이 금지됨
+ * '{'의 매칭 '}' 범위를 찾아서 {start,end} 반환 (end inclusive)
+ * - 중첩 brace를 고려하여 깊이(depth)로 스캔
  */
-function hasFailOnProjectRepos(contents) {
-  return /repositoriesMode\.set\s*\(\s*RepositoriesMode\.FAIL_ON_PROJECT_REPOS\s*\)/
-    .test(contents);
+function extractBraceRange(text, openBraceIndex) {
+  if (openBraceIndex < 0 || openBraceIndex >= text.length) return null;
+  if (text[openBraceIndex] !== '{') return null;
+
+  let depth = 1;
+  let i = openBraceIndex;
+
+  while (i + 1 < text.length && depth > 0) {
+    i++;
+    const ch = text[i];
+    if (ch === '{') depth++;
+    else if (ch === '}') depth--;
+  }
+
+  if (depth !== 0) return null;
+  return { start: openBraceIndex, end: i };
 }
 
 /**
  * android/settings.gradle 패치
  *
- * - dependencyResolutionManagement 가 없으면 새로 생성
- * - 있으면 내부 repositories { } 에 repo 추가
- * - rootProject.name 바로 다음 줄에 삽입
+ * 목표:
+ * - rootProject.name 바로 다음 줄에 dependencyResolutionManagement 블록을 추가한다.
+ * - 이미 DRM이 존재하면:
+ *   - repositories 블록이 없으면 추가
+ *   - 있으면 missing repo만 추가
  */
 function patchSettingsGradle(contents) {
   const failOnProjectRepos = hasFailOnProjectRepos(contents);
 
-  // 이미 우리가 삽입한 흔적이 있으면 그대로 유지
+  // 이미 적용되어 있으면 스킵
   if (contents.includes(MARKER_BEGIN)) {
-    return { contents, failOnProjectRepos };
+    return { contents, failOnProjectRepos, changed: false };
   }
 
-  // dependencyResolutionManagement 가 아예 없는 경우
+  // DRM 자체가 없으면 rootProject.name 다음에 삽입
   if (!/dependencyResolutionManagement\s*\{/.test(contents)) {
     const drmBlock =
       `\n\ndependencyResolutionManagement {\n` +
@@ -142,159 +164,206 @@ function patchSettingsGradle(contents) {
       `    }\n` +
       `}\n`;
 
-    // rootProject.name 바로 뒤에 삽입
-    const rootNameRegex =
-      /(^\s*rootProject\.name\s*=\s*['"][^'"]+['"]\s*$)/m;
-
+    const rootNameRegex = /(^\s*rootProject\.name\s*=\s*['"][^'"]+['"]\s*$)/m;
     const match = contents.match(rootNameRegex);
+
     if (match) {
       const insertAt = match.index + match[0].length;
-      contents =
-        contents.slice(0, insertAt) +
-        drmBlock +
-        contents.slice(insertAt);
-    } else {
-      contents += drmBlock;
+      const newContents = contents.slice(0, insertAt) + drmBlock + contents.slice(insertAt);
+      return { contents: newContents, failOnProjectRepos, changed: true };
     }
 
-    return { contents, failOnProjectRepos };
+    // rootProject.name이 없으면 파일 끝에 append
+    return { contents: contents + drmBlock, failOnProjectRepos, changed: true };
   }
 
-  // dependencyResolutionManagement 는 있으나 repositories 가 없는 경우
-  if (
-    !/dependencyResolutionManagement\s*\{[\s\S]*?repositories\s*\{/
-      .test(contents)
-  ) {
-    contents = contents.replace(
-      /(dependencyResolutionManagement\s*\{)/,
+  // DRM은 있으나 repositories 블록이 없으면 추가
+  const drmHasRepos = /dependencyResolutionManagement\s*\{[\s\S]*?repositories\s*\{/.test(
+    contents
+  );
+  if (!drmHasRepos) {
+    const newContents = contents.replace(
+      /(dependencyResolutionManagement\s*\{)/m,
       `$1\n    repositories {\n        google()\n        mavenCentral()\n\n${generateReposBlock(
         '        '
       )}\n    }\n`
     );
-
-    return { contents, failOnProjectRepos };
+    return { contents: newContents, failOnProjectRepos, changed: true };
   }
 
-  // repositories 블록 내부에 repo 추가
-  const startMatch =
-    contents.match(/dependencyResolutionManagement\s*\{[\s\S]*?repositories\s*\{/);
-
-  if (!startMatch) {
-    return { contents, failOnProjectRepos };
-  }
-
-  const startIdx = contents.indexOf(startMatch[0]) + startMatch[0].length;
-
-  // brace 스캔으로 repositories { } 범위 찾기
-  let i = startIdx - 1;
-  let brace = 1;
-  while (i < contents.length && brace > 0) {
-    i++;
-    if (contents[i] === '{') brace++;
-    else if (contents[i] === '}') brace--;
+  // DRM.repositories 존재: missing repo만 추가
+  const missing = MAVEN_REPOSITORIES.filter((r) => !contents.includes(r.url));
+  if (missing.length === 0) {
+    return { contents, failOnProjectRepos, changed: false };
   }
 
-  const reposBlockStart = contents.lastIndexOf('repositories', startIdx);
-  let reposBlock = contents.slice(reposBlockStart, i + 1);
-
-  reposBlock = ensureGoogleAndMavenCentral(reposBlock, '        ');
+  const indent = '        ';
+  const body = missing
+    .map((r) => `${indent}// ${r.comment}\n${indent}maven { url "${r.url}" }`)
+    .join('\n\n');
+  const block = `${indent}${MARKER_BEGIN}\n\n${body}\n\n${indent}${MARKER_END}`;
 
-  const missing = MAVEN_REPOSITORIES.filter(
-    (r) => !reposBlock.includes(r.url)
-  );
+  let newContents = contents;
 
-  if (missing.length === 0) {
-    return { contents, failOnProjectRepos };
+  // 가장 무난한 위치: repositories 내 mavenCentral() 다음
+  if (/mavenCentral\(\)/.test(newContents)) {
+    newContents = newContents.replace(/(mavenCentral\(\)\s*)/m, `$1\n\n${block}\n`);
+  } else {
+    // mavenCentral이 아예 없으면 repositories { 다음에 삽입
+    newContents = newContents.replace(/(repositories\s*\{\s*)/m, `$1\n${block}\n`);
   }
 
-  const block =
-    `        ${MARKER_BEGIN}\n\n` +
-    missing
-      .map(
-        (r) =>
-          `        // ${r.comment}\n        maven { url "${r.url}" }`
-      )
-      .join('\n\n') +
-    `\n\n        ${MARKER_END}`;
-
-  reposBlock = reposBlock.replace(
-    /(mavenCentral\(\)\s*)/,
-    `$1\n\n${block}\n`
-  );
-
-  contents =
-    contents.slice(0, reposBlockStart) +
-    reposBlock +
-    contents.slice(i + 1);
-
-  return { contents, failOnProjectRepos };
+  return { contents: newContents, failOnProjectRepos, changed: true };
 }
 
 /**
- * android/build.gradle (project-level) 패치
+ * android/build.gradle(project-level) 패치
  *
- * - allprojects { repositories { ... } } 에 repo 추가
- * - settings.gradle 에 FAIL_ON_PROJECT_REPOS 가 있으면 호출되지 않음
+ * 목표:
+ * - buildscript.repositories는 절대 건드리지 않는다.
+ * - allprojects { repositories { ... } } 블록 "안"에만 repo를 삽입한다.
+ *
+ * 삽입 위치 정책:
+ * - jitpack이 있으면: jitpack 다음 줄에 삽입 (원하는 형태)
+ * - jitpack이 없으면: repositories 블록 닫기 직전에 삽입
  */
 function patchProjectBuildGradle(contents) {
-  if (contents.includes(MARKER_BEGIN)) return contents;
+  // 이미 적용되어 있으면 스킵
+  if (contents.includes(MARKER_BEGIN)) return { contents, changed: false };
 
+  // allprojects 없으면 append
   if (!/allprojects\s*\{/.test(contents)) {
-    return (
-      contents +
+    const block =
       `\n\nallprojects {\n` +
-      `    repositories {\n` +
-      `        google()\n` +
-      `        mavenCentral()\n\n` +
-      `${generateReposBlock('        ')}\n` +
-      `    }\n` +
-      `}\n`
-    );
+      `  repositories {\n` +
+      `    google()\n` +
+      `    mavenCentral()\n` +
+      `    maven { url 'https://www.jitpack.io' }\n\n` +
+      `${generateReposBlock('    ')}\n` +
+      `  }\n` +
+      `}\n`;
+    return { contents: contents + block, changed: true };
   }
 
-  if (
-    !/allprojects\s*\{[\s\S]*?repositories\s*\{/.test(contents)
-  ) {
-    return contents.replace(
-      /(allprojects\s*\{)/,
-      `$1\n    repositories {\n        google()\n        mavenCentral()\n\n${generateReposBlock(
-        '        '
-      )}\n    }\n`
-    );
+  // allprojects 헤더와 '{' 찾기
+  const apHeader = contents.match(/allprojects\s*\{/m);
+  if (!apHeader) return { contents, changed: false };
+
+  const apOpen = apHeader.index + apHeader[0].length - 1; // '{'
+  const apRange = extractBraceRange(contents, apOpen);
+  if (!apRange) return { contents, changed: false };
+
+  const apText = contents.slice(apHeader.index, apRange.end + 1); // "allprojects { ... }"
+
+  // allprojects 안에 repositories가 없으면 삽입
+  if (!/repositories\s*\{/.test(apText)) {
+    const insertion =
+      `\n  repositories {\n` +
+      `    google()\n` +
+      `    mavenCentral()\n` +
+      `    maven { url 'https://www.jitpack.io' }\n\n` +
+      `${generateReposBlock('    ')}\n` +
+      `  }\n`;
+
+    const newApText = apText.replace(/allprojects\s*\{\s*/m, (m) => m + insertion);
+
+    const newContents =
+      contents.slice(0, apHeader.index) + newApText + contents.slice(apRange.end + 1);
+
+    return { contents: newContents, changed: true };
+  }
+
+  // allprojects.repositories 헤더와 '{' 찾기 (apText 내부 인덱스)
+  const repoHeader = apText.match(/repositories\s*\{/m);
+  if (!repoHeader) return { contents, changed: false };
+
+  const repoOpenInAp = repoHeader.index + repoHeader[0].length - 1;
+  const repoRangeInAp = extractBraceRange(apText, repoOpenInAp);
+  if (!repoRangeInAp) return { contents, changed: false };
+
+  let repoBlockText = apText.slice(repoHeader.index, repoRangeInAp.end + 1); // "repositories { ... }"
+
+  // 안전장치: 기본 repo 보장
+  repoBlockText = ensureGoogleAndMavenCentral(repoBlockText, '    ');
+
+  // missing만 추가
+  const missing = MAVEN_REPOSITORIES.filter((r) => !repoBlockText.includes(r.url));
+  if (missing.length === 0) return { contents, changed: false };
+
+  const indent = '    ';
+  const body = missing
+    .map((r) => `${indent}// ${r.comment}\n${indent}maven { url "${r.url}" }`)
+    .join('\n\n');
+  const markerBlock = `${indent}${MARKER_BEGIN}\n\n${body}\n\n${indent}${MARKER_END}`;
+
+  const jitpackRegex = /maven\s*\{\s*url\s*['"]https:\/\/www\.jitpack\.io['"]\s*\}/m;
+
+  if (jitpackRegex.test(repoBlockText)) {
+    // jitpack 다음에 삽입
+    repoBlockText = repoBlockText.replace(jitpackRegex, (m) => `${m}\n\n${markerBlock}`);
+  } else {
+    // repositories 닫기 직전에 삽입
+    repoBlockText = repoBlockText.replace(/\}\s*$/m, `\n\n${markerBlock}\n}`);
   }
 
-  return contents;
+  // apText 안에서 repositories 블록 교체
+  const newApText =
+    apText.slice(0, repoHeader.index) + repoBlockText + apText.slice(repoRangeInAp.end + 1);
+
+  // 전체 파일에서 allprojects 블록 교체
+  const newContents =
+    contents.slice(0, apHeader.index) + newApText + contents.slice(apRange.end + 1);
+
+  return { contents: newContents, changed: true };
 }
 
 /**
  * 실제 적용 플러그인
+ *
+ * - android 폴더가 생성된 이후(prebuild) 시점에 실행되며,
+ * - settings.gradle 먼저 수정하여 정책을 판단하고,
+ * - FAIL_ON_PROJECT_REPOS가 아니면 build.gradle도 수정한다.
  */
-const withAdwhaleMavenRepositories = (config) => {
-  let failOnProjectRepos = false;
-
-  // 1) settings.gradle 먼저 처리
-  config = withSettingsGradle(config, (c) => {
-    const result = patchSettingsGradle(c.modResults.contents);
-    c.modResults.contents = result.contents;
-    failOnProjectRepos = result.failOnProjectRepos;
-    return c;
-  });
-
-  // 2) FAIL_ON_PROJECT_REPOS 가 없을 때만 build.gradle 처리
-  if (!failOnProjectRepos) {
-    config = withAndroidProjectBuildGradle(config, (c) => {
-      c.modResults.contents = patchProjectBuildGradle(
-        c.modResults.contents
-      );
-      return c;
-    });
-  }
-
-  return config;
-};
+function withAdwhaleMavenRepositories(config) {
+  return withDangerousMod(config, [
+    'android',
+    async (config) => {
+      const projectRoot = config.modRequest.projectRoot;
+      const androidDir = path.join(projectRoot, 'android');
+
+      const settingsGradlePath = path.join(androidDir, 'settings.gradle');
+      const buildGradlePath = path.join(androidDir, 'build.gradle');
+
+      // 1) settings.gradle 패치
+      const settingsText = readTextIfExists(settingsGradlePath);
+      let failOnProjectRepos = false;
+
+      if (settingsText) {
+        const res = patchSettingsGradle(settingsText);
+        failOnProjectRepos = res.failOnProjectRepos;
+
+        if (res.changed) {
+          writeText(settingsGradlePath, res.contents);
+        }
+      }
+
+      // 2) FAIL_ON_PROJECT_REPOS이면 build.gradle 수정 생략
+      if (failOnProjectRepos) {
+        return config;
+      }
+
+      // 3) build.gradle(project) 패치
+      const buildText = readTextIfExists(buildGradlePath);
+      if (buildText) {
+        const res2 = patchProjectBuildGradle(buildText);
+        if (res2.changed) {
+          writeText(buildGradlePath, res2.contents);
+        }
+      }
+
+      return config;
+    },
+  ]);
+}
 
-module.exports = createRunOncePlugin(
-  withAdwhaleMavenRepositories,
-  pkg.name,
-  pkg.version
-);
+module.exports = createRunOncePlugin(withAdwhaleMavenRepositories, pkg.name, pkg.version);