react-native-acoustic-connect-beta 18.0.36 → 18.0.38

package/plugin/src/index.ts

@@ -9,16 +9,25 @@
 import { type ConfigPlugin } from '@expo/config-plugins'
 import { withConnectNSE, type ConnectPluginProps } from './withConnectNSE'
 import { withConnectNCE } from './withConnectNCE'
+import { withConnectAndroidConfig } from './withConnectAndroidConfig'
 
 /**
  * Expo Config Plugin for react-native-acoustic-connect-beta.
  *
- * Provisions the ConnectNSE Notification Service Extension and the ConnectNCE
- * Notification Content Extension targets during `expo prebuild`. Designed as a
- * chainable composition: additional mods are appended by adding to the mods
- * array. Order matters — withConnectNSE runs first so it seeds the host
- * entitlements and the PBXTargetDependency/PBXContainerItemProxy sections that
- * withConnectNCE reuses.
+ * iOS: provisions the ConnectNSE Notification Service Extension and the
+ * ConnectNCE Notification Content Extension targets during `expo prebuild`.
+ *
+ * Android: wires the SDK's config.gradle into the generated app build so
+ * ConnectConfig.json values (collector URL, app key) reach the native assets
+ * at build time (withConnectAndroidConfig). FCM push needs no mod here — Expo
+ * wires the google-services Gradle plugin natively when the consumer sets
+ * `android.googleServicesFile` in app.json.
+ *
+ * Designed as a chainable composition: additional mods are appended by adding
+ * to the mods array. Order matters for the iOS pair — withConnectNSE runs
+ * first so it seeds the host entitlements and the
+ * PBXTargetDependency/PBXContainerItemProxy sections that withConnectNCE
+ * reuses. The Android mod is independent of that ordering.
  *
  * Consumer app.json usage:
  *   // With explicit App Group override:
@@ -40,11 +49,12 @@ const withAcousticConnect: ConfigPlugin<ConnectPluginProps | void> = (
   const mods: Array<ConfigPlugin<ConnectPluginProps>> = [
     withConnectNSE,
     withConnectNCE,
+    withConnectAndroidConfig,
   ]
 
   return mods.reduce((accConfig, mod) => mod(accConfig, resolvedProps), config)
 }
 
 export default withAcousticConnect
-export { withConnectNSE, withConnectNCE }
+export { withConnectNSE, withConnectNCE, withConnectAndroidConfig }
 export type { ConnectPluginProps }

package/plugin/src/withConnectAndroidConfig.ts

@@ -0,0 +1,70 @@
+// Copyright (C) 2026 Acoustic, L.P. All rights reserved.
+//
+// NOTICE: This file contains material that is confidential and proprietary to
+// Acoustic, L.P. and/or other developers. No license is granted under any
+// intellectual or industrial property rights of Acoustic, L.P. except as may
+// be provided in an agreement with Acoustic, L.P. Any unauthorized copying or
+// distribution of content from this file is prohibited.
+
+import { withAppBuildGradle, type ConfigPlugin } from '@expo/config-plugins'
+import type { ConnectPluginProps } from './withConnectNSE'
+
+// The Gradle snippet that runs the SDK's config.gradle. config.gradle reads
+// the consumer app's ConnectConfig.json (`$project.rootDir/../ConnectConfig.json`)
+// and writes AppKey / PostMessageUrl / KillSwitchUrl (and the Tealeaf + EOCore
+// configs) into the SDK module's `src/main/assets/*` at Gradle configuration
+// time — so the collector the app reports to is driven by ConnectConfig.json.
+//
+// This mirrors the line `scripts/gradleParser.js` appends for the bare-workflow
+// sample (Examples/bare-workflow/android/app/build.gradle). The Expo Android
+// project is gitignored and regenerated by `expo prebuild`, so the line cannot
+// be committed there — this mod re-injects it on every prebuild instead.
+//
+// The ':react-native-acoustic-connect-beta' Gradle project is provided by
+// React Native autolinking and resolves in the Expo app the same way it does
+// in bare-workflow.
+export const CONFIG_GRADLE_APPLY =
+  `apply from: project(':react-native-acoustic-connect-beta')` +
+  `.projectDir.getPath() + "/config.gradle"`
+
+/**
+ * Append the config.gradle `apply from:` line to an app `build.gradle` body.
+ *
+ * Idempotent: a no-op when the line is already present, so repeated prebuilds
+ * (and a prebuild over an already-patched, non-`--clean` project) don't stack
+ * duplicate applies.
+ */
+export function appendConfigGradleApply(contents: string): string {
+  if (contents.includes('/config.gradle')) {
+    return contents
+  }
+  return `${contents}\n\n${CONFIG_GRADLE_APPLY}\n`
+}
+
+/**
+ * Expo config mod: wire the SDK's config.gradle into the generated Android
+ * app build so ConnectConfig.json values reach the native assets at build
+ * time. Without it, the Android SDK ships its committed default collector
+ * config and the app reports to the wrong endpoint (iOS is unaffected — it
+ * uses AcousticConnectRNConfig.json via a separate flow).
+ */
+export const withConnectAndroidConfig: ConfigPlugin<ConnectPluginProps> = (
+  config
+) =>
+  withAppBuildGradle(config, (cfg) => {
+    // The RN/Expo template app build.gradle is Groovy. If a future template
+    // switches to the Kotlin DSL the append heuristic no longer applies —
+    // warn and skip rather than corrupt the file.
+    if (cfg.modResults.language !== 'groovy') {
+      console.warn(
+        `[react-native-acoustic-connect-beta] Skipping Android config ` +
+          `propagation: app/build.gradle is '${cfg.modResults.language}', ` +
+          `expected 'groovy'. Add the following line manually:\n` +
+          `  ${CONFIG_GRADLE_APPLY}`
+      )
+      return cfg
+    }
+
+    cfg.modResults.contents = appendConfigGradleApply(cfg.modResults.contents)
+    return cfg
+  })

package/plugin/src/withConnectNCE.ts

@@ -264,13 +264,38 @@ export function withNCEXcodeProject(
       nceTarget.uuid
     )
 
-    // Add Frameworks build phase (empty — CocoaPods populates it)
+    // Add the Frameworks build phase, then explicitly link the two
+    // user-notifications system frameworks into the NCE target.
+    //
+    // The NCE principal class conforms to `UNNotificationContentExtension`,
+    // whose extension-point context class
+    // (`_UNNotificationContentExtensionVendorContext`) is vended by
+    // UserNotificationsUI.framework, and whose `didReceive(_:)` consumes
+    // `UNNotification` / `UNNotificationContent` from UserNotifications.framework.
+    // Without these explicit links the extension binary never loads them, so on
+    // a PHYSICAL DEVICE iOS logs "Unable to find NSExtensionContextClass … did
+    // you link the framework that declares the extension point?" and never calls
+    // `didReceive(_:)`. The custom expanded view (rich-media `expandedImage`)
+    // then silently never renders, while the NSE-produced thumbnail still shows.
+    // The iOS Simulator resolves these classes implicitly, masking the omission —
+    // so this only surfaces on device. Both are Apple SYSTEM frameworks, so
+    // CocoaPods does NOT add them; they must be linked here, mirroring the
+    // canonical Examples/bare-workflow ConnectNCE target (which also lists the
+    // auto-linked Foundation/UIKit — omitted here as Swift links them implicitly).
     xcodeProject.addBuildPhase(
       [],
       'PBXFrameworksBuildPhase',
       'Frameworks',
       nceTarget.uuid
     )
+    xcodeProject.addFramework(
+      'System/Library/Frameworks/UserNotifications.framework',
+      { target: nceTarget.uuid }
+    )
+    xcodeProject.addFramework(
+      'System/Library/Frameworks/UserNotificationsUI.framework',
+      { target: nceTarget.uuid }
+    )
 
     // Make the host app target depend on ConnectNCE. CocoaPods resolves an
     // extension's host target through PBXTargetDependency

package/plugin/src/withConnectNSE.ts

@@ -268,14 +268,25 @@ export function injectPodfileBlock(podfileContent: string): string {
 // ─── Entitlements mod ─────────────────────────────────────────────────────────
 
 /**
- * Adds the App Group to the HOST app's entitlements. Merges idempotently
- * — never clobbers an existing `com.apple.security.application-groups` array.
+ * Adds the HOST app's push entitlements. Merges idempotently:
+ * - `aps-environment` — the APNs (Push Notifications) capability. Required for
+ *   the SDK's automatic `registerForRemoteNotifications()` to receive a device
+ *   token; without it iOS fails registration with "no valid aps-environment
+ *   entitlement string found", so no token is ever sent to the collector.
+ *   Mirrors the bare-workflow host entitlements. `development` targets the
+ *   sandbox APNs used by dev/`expo run:ios`/EAS `development` builds;
+ *   production/TestFlight builds need `production`.
+ * - `com.apple.security.application-groups` — shared App Group for the host app
+ *   and the NSE/NCE extensions. Never clobbers an existing array.
  */
 export function withNSEEntitlements(
   config: ExpoConfig,
   appGroupIdentifier: string
 ): ExpoConfig {
   return withEntitlementsPlist(config, (c) => {
+    if (!c.modResults['aps-environment']) {
+      c.modResults['aps-environment'] = 'development'
+    }
     const existing: string[] =
       (c.modResults['com.apple.security.application-groups'] as
         | string[]

package/scripts/postinstall.mjs

@@ -0,0 +1,35 @@
+// Cross-platform postinstall (replaces the bash-only postInstallScripts.sh,
+// which silently no-opped on Windows and violated the repo's cross-platform
+// rule). Runs the same three helper scripts that integrate the SDK into a
+// consumer project, from the package root, best-effort: a non-zero exit from
+// any of them is logged but never fails `npm install`.
+
+import {spawnSync} from 'node:child_process'
+import path from 'node:path'
+import {fileURLToPath} from 'node:url'
+
+const scriptsDir = path.dirname(fileURLToPath(import.meta.url))
+const packageRoot = path.dirname(scriptsDir)
+
+// Order matches the original postInstallScripts.sh. Note: the file is
+// `xmlparser.js` (lowercase) — the old shell script referenced `xmlParser.js`
+// with a capital P, which failed on case-sensitive filesystems (Linux CI).
+const steps = ['reviewConnectConfig.js', 'xmlparser.js', 'gradleParser.js']
+
+console.log(
+  '**Acoustic Integration***********************************************************************',
+)
+for (const step of steps) {
+  console.log(`Running scripts/${step} ...`)
+  const result = spawnSync(process.execPath, [path.join('scripts', step)], {
+    cwd: packageRoot,
+    stdio: 'inherit',
+  })
+  if (result.status !== 0)
+    console.log(
+      `scripts/${step} exited with ${result.status ?? result.signal} — continuing (postinstall is best-effort).`,
+    )
+}
+console.log(
+  '*********************************************************************************************',
+)

package/scripts/xmlparser.js

@@ -14,7 +14,7 @@ const xmlPaserPlugin = require("@prettier/plugin-xml");
 const { exit } = require('process');
 const { isValid } = require('./util');
 
-console.log("Run xmlParser.js");
+console.log("Run xmlparser.js");
 
 const directoryPath = path.join(__dirname,"..","..","..")
 const filePath = `${directoryPath}/android/app/src/main/AndroidManifest.xml`;

package/scripts/postInstallScripts.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-echo "**Acoustic Integration***********************************************************************"
-echo "Current directory:"
-pwd
-echo "Running Node scripts..."
-node ./scripts/reviewConnectConfig.js
-node ./scripts/xmlParser.js
-node ./scripts/gradleParser.js
-echo "*********************************************************************************************"
-echo "Running here scripts..."

package/scripts/verifyConnectSetup.js

@@ -1,87 +0,0 @@
-/********************************************************************************************
-* Copyright (C) 2024 Acoustic, L.P. All rights reserved.
-*
-* NOTICE: This file contains material that is confidential and proprietary to
-* Acoustic, L.P. and/or other developers. No license is granted under any intellectual or
-* industrial property rights of Acoustic, L.P. except as may be provided in an agreement with
-* Acoustic, L.P. Any unauthorized copying or distribution of content from this file is
-* prohibited.
-********************************************************************************************/
-
-/**
- * Verify and Update React Native SDK integration to capture screen tracking.
- * 
- * cd node_modules/react-native-acoustic-connect-beta folder
- * 
- * yarn run verifyConnectSetup
- * 
- */
-const fs = require('fs');
-
-//const filePath = "../../src/components/RootComponent.tsx"
-const filePath = "Example/nativebase-v3-kitchensink/src/components/RootComponent.tsx"
-
-function log(message) {
-    console.log(message);
-}
-
-function isRootFileAvailable() {
-    return fs.existsSync(filePath);
-}
-
-function isConnectComponentAvailable() {
-    log("Looking for Connect tag...");
-    return isComponentAvailable(/<Connect/);
-}
-
-function isNavigationContainerAvailable() {
-    log("Looking for NavigationContainer tag...");
-    return isComponentAvailable(/<NavigationContainer/);
-}
-
-function isComponentAvailable(componentTag) {
-    try {
-        let data = fs.readFileSync(filePath, 'utf8');
-        const re = new RegExp(componentTag, "g");
-        const found = re.test(data);
-
-        return found;
-    } catch (err) {
-        console.error(err);
-    }
-}
-
-if (isRootFileAvailable()) {
-    if (isConnectComponentAvailable()) {
-        log("Connect component found. You are ready to go!");
-    } else if (isNavigationContainerAvailable()) {
-        log("NavigationContainer component is available but Connect component is missing.\n I'll add Connect around NavigationContainer component.");
-        AddConnectComponent();
-    } else {
-        log("Missing both Connect and NavigationContainer component.\n Please refer to SDK integration without React Navigation.");
-    };
-} else {
-    console.error("App.js file not found in root app folder.");
-}
-
-// Update and add Connect around NavigationContainer
-function AddConnectComponent() {
-    const connectImport = `import { Connect } from 'react-native-acoustic-connect-beta';`
-
-    const startNavigationContainer = /<NavigationContainer/
-    const startConnectComponent = `<Connect><NavigationContainer`
-
-    const endNavigationContainer = /<\/NavigationContainer>/
-    const endConnectComponent = `</NavigationContainer></Connect>`
-    
-    try {
-        let data = fs.readFileSync(filePath, 'utf8');
-        data = data
-            .replace(startNavigationContainer, startConnectComponent)
-            .replace(endNavigationContainer, endConnectComponent);
-        fs.writeFileSync(filePath, ConnectImport + '\n' + data);
-    } catch (err) {
-        log("Something went wrong.\n Please refer to SDK integration with React Navigation.");
-        console.error(err);
-    }
-}