@goliapkg/sentori-expo 6.0.0 → 7.0.1

package/app.plugin.js

@@ -95,9 +95,13 @@ const withSentoriPushIos = (config) => {
  */
 const withSentoriPushAndroidManifest = (config) => {
   return withAndroidManifest(config, (cfg) => {
-    const manifest = cfg.modResults.manifest
+    // addPermission expects the AndroidManifest object (cfg.modResults);
+    // it dereferences `.manifest['uses-permission']` internally. Passing
+    // `cfg.modResults.manifest` makes that read fail with `Cannot read
+    // properties of undefined (reading 'uses-permission')` and crashes
+    // `expo prebuild`.
     AndroidConfig.Permissions.addPermission(
-      manifest,
+      cfg.modResults,
       'android.permission.POST_NOTIFICATIONS'
     )
     return cfg
@@ -168,15 +172,80 @@ const withSentoriGoogleServicesJson = (config, props = {}) => {
   ])
 }
 
+// ── v2.28 iOS Notification Service Extension scaffolding ──────────
+//
+// Rich-media notifications (images / future video) require an NSE
+// target on the iOS app. The Sentori NSE template downloads the URL
+// at `userInfo.sentori_attachment_url` and attaches it before iOS
+// displays the notification. APNs server side sets this key when
+// `richMedia.imageUrl` is on the send (v2.28+).
+//
+// v2.28 ships the source files via withDangerousMod. Adding the NSE
+// **target** to the Xcode project is a one-time manual step (5 clicks
+// in Xcode → File → New → Target → Notification Service Extension,
+// then drag in our Swift file). The recipe walks the developer through
+// it. v2.28.1 will auto-inject the target via withXcodeProject.
+//
+// Opt out with `{ ios: false }` (which also drops the rest of the iOS
+// push wiring) or with `{ nse: false }` for just this template.
+
+/**
+ * @param {import('@expo/config-plugins').ExpoConfig} config
+ */
+const withSentoriNSE = (config) => {
+  return withDangerousMod(config, [
+    'ios',
+    async (cfg) => {
+      const platformRoot = cfg.modRequest.platformProjectRoot
+      const destDir = path.join(platformRoot, 'SentoriNSE')
+      const templateDir = path.join(__dirname, 'templates', 'ios-nse')
+      const swiftSrc = path.join(templateDir, 'SentoriNotificationServiceExtension.swift')
+      const plistSrc = path.join(templateDir, 'SentoriNSE-Info.plist')
+      if (!fs.existsSync(swiftSrc) || !fs.existsSync(plistSrc)) {
+        // eslint-disable-next-line no-console
+        console.warn(
+          '[sentori-expo] NSE templates missing; skipping. Reinstall the package to restore.'
+        )
+        return cfg
+      }
+      fs.mkdirSync(destDir, { recursive: true })
+      fs.copyFileSync(
+        swiftSrc,
+        path.join(destDir, 'SentoriNotificationServiceExtension.swift')
+      )
+      fs.copyFileSync(plistSrc, path.join(destDir, 'SentoriNSE-Info.plist'))
+      // One-time guidance for first-time setup. Idempotent — appears
+      // on every prebuild until the target exists.
+      const pbxproj = path.join(platformRoot, cfg.modRequest.projectName + '.xcodeproj', 'project.pbxproj')
+      if (fs.existsSync(pbxproj)) {
+        const proj = fs.readFileSync(pbxproj, 'utf8')
+        if (!proj.includes('SentoriNSE')) {
+          // eslint-disable-next-line no-console
+          console.log(
+            '\n[sentori-expo] iOS NSE template files copied to ios/SentoriNSE/.\n' +
+              '             For rich-media (image) notifications to render, add a\n' +
+              '             Notification Service Extension target via Xcode and link\n' +
+              '             these files. Detailed steps in the recipe.\n'
+          )
+        }
+      }
+      return cfg
+    },
+  ])
+}
+
 // ── Composer ───────────────────────────────────────────────────────
 
 /**
  * @param {import('@expo/config-plugins').ExpoConfig} config
- * @param {{ sdkVersion?: string, ios?: boolean, android?: boolean, googleServicesFile?: string }} [props]
+ * @param {{ sdkVersion?: string, ios?: boolean, android?: boolean, nse?: boolean, googleServicesFile?: string }} [props]
  */
 const withSentori = (config, props = {}) => {
   const plugins = [[withSentoriVersion, props]]
-  if (props.ios !== false) plugins.push([withSentoriPushIos, props])
+  if (props.ios !== false) {
+    plugins.push([withSentoriPushIos, props])
+    if (props.nse !== false) plugins.push([withSentoriNSE, props])
+  }
   if (props.android !== false) {
     plugins.push(
       [withSentoriPushAndroidManifest, props],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goliapkg/sentori-expo",
-  "version": "6.0.0",
+  "version": "7.0.1",
   "description": "Expo adapter for Sentori — Config Plugin marker, expo-application auto-config, EAS post-build helper. Built on @goliapkg/sentori-react-native.",
   "license": "Apache-2.0 OR MIT",
   "author": "GOLIA K.K. <takagi@golia.jp> (https://golia.jp)",
@@ -36,6 +36,7 @@
     "src/",
     "app.plugin.js",
     "scripts/",
+    "templates/",
     "README.md"
   ],
   "scripts": {
@@ -45,7 +46,7 @@
     "prepack": "bun run build"
   },
   "peerDependencies": {
-    "@goliapkg/sentori-react-native": ">=3.0.0",
+    "@goliapkg/sentori-react-native": ">=3.1.0",
     "expo": ">=55.0.0 <57.0.0",
     "expo-application": ">=55.0.0 <57.0.0",
     "react-native": ">=0.81.0"

package/templates/ios-nse/SentoriNSE-Info.plist

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>$(DEVELOPMENT_LANGUAGE)</string>
+    <key>CFBundleDisplayName</key>
+    <string>SentoriNSE</string>
+    <key>CFBundleExecutable</key>
+    <string>$(EXECUTABLE_NAME)</string>
+    <key>CFBundleIdentifier</key>
+    <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>$(PRODUCT_NAME)</string>
+    <key>CFBundlePackageType</key>
+    <string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+    <key>CFBundleShortVersionString</key>
+    <string>1.0</string>
+    <key>CFBundleVersion</key>
+    <string>1</string>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.usernotifications.service</string>
+        <key>NSExtensionPrincipalClass</key>
+        <string>$(PRODUCT_MODULE_NAME).SentoriNotificationServiceExtension</string>
+    </dict>
+</dict>
+</plist>

package/templates/ios-nse/SentoriNotificationServiceExtension.swift

@@ -0,0 +1,77 @@
+// Sentori Notification Service Extension — v2.28.
+//
+// When an APNs payload arrives with `mutable-content: 1` AND a custom
+// `sentori_attachment_url` field, this extension downloads the image
+// and attaches it to the notification before iOS displays it.
+//
+// Lifecycle:
+//   - serviceExtensionTimeWillExpire is called ~30 s after delivery.
+//     We fall back to the unaltered notification at that point.
+//   - All work runs off the main thread; the OS gives this extension
+//     up to ~30 s with a hard CPU budget. The download is on a
+//     background URLSession with 5 s timeout so a slow CDN does not
+//     burn the budget.
+//
+// This file is written by `@goliapkg/sentori-expo` v2.28+'s
+// `withSentoriNSE` config plugin into `ios/SentoriNSE/` on every
+// `expo prebuild`. The one-time Xcode target wiring is documented in
+// the recipe (auto-injection lands in v2.28.1).
+
+import UserNotifications
+
+final class SentoriNotificationServiceExtension: UNNotificationServiceExtension {
+    private var contentHandler: ((UNNotificationContent) -> Void)?
+    private var bestAttempt: UNMutableNotificationContent?
+
+    override func didReceive(
+        _ request: UNNotificationRequest,
+        withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void
+    ) {
+        self.contentHandler = contentHandler
+        self.bestAttempt = (request.content.mutableCopy() as? UNMutableNotificationContent)
+        guard let bestAttempt = self.bestAttempt else {
+            contentHandler(request.content)
+            return
+        }
+
+        // Extract the Sentori-reserved attachment URL. v2.28 server
+        // emits this as a top-level custom-data key when the send's
+        // `richMedia.imageUrl` is set.
+        guard
+            let raw = bestAttempt.userInfo["sentori_attachment_url"] as? String,
+            let url = URL(string: raw)
+        else {
+            contentHandler(bestAttempt)
+            return
+        }
+
+        // Bounded-time download to a temp file. URLSession.shared
+        // honours the request's timeout; we set it to 5 s so a stalled
+        // CDN does not eat the ~30 s extension budget.
+        var request = URLRequest(url: url)
+        request.timeoutInterval = 5
+        let task = URLSession.shared.downloadTask(with: request) { tempURL, _, _ in
+            defer { contentHandler(bestAttempt) }
+            guard let tempURL = tempURL else { return }
+            // Move to a guessed-extension destination so iOS picks a
+            // sensible content type.
+            let ext = url.pathExtension.isEmpty ? "img" : url.pathExtension
+            let dest = tempURL.deletingPathExtension().appendingPathExtension(ext)
+            try? FileManager.default.moveItem(at: tempURL, to: dest)
+            if let attachment = try? UNNotificationAttachment(
+                identifier: "sentori-image",
+                url: dest,
+                options: nil
+            ) {
+                bestAttempt.attachments = [attachment]
+            }
+        }
+        task.resume()
+    }
+
+    override func serviceExtensionTimeWillExpire() {
+        if let contentHandler = contentHandler, let bestAttempt = bestAttempt {
+            contentHandler(bestAttempt)
+        }
+    }
+}