@entrig/capacitor 0.0.3 → 0.0.5

package/ios/Sources/EntrigPlugin/EntrigPlugin.swift

@@ -1,7 +1,18 @@
 import Foundation
 import Capacitor
 import UserNotifications
+
+#if canImport(Entrig)
+// SPM - specific imports to avoid module/class name collision
+import class Entrig.Entrig
+import struct Entrig.EntrigConfig
+import struct Entrig.NotificationEvent
+import protocol Entrig.OnNotificationReceivedListener
+import protocol Entrig.OnNotificationClickListener
+#else
+// CocoaPods - module is EntrigSDK, no name collision
 import EntrigSDK
+#endif
 
 @objc(EntrigPlugin)
 public class EntrigPlugin: CAPPlugin, CAPBridgedPlugin, OnNotificationReceivedListener, OnNotificationClickListener {
@@ -56,27 +67,29 @@ public class EntrigPlugin: CAPPlugin, CAPBridgedPlugin, OnNotificationReceivedLi
     // MARK: - Plugin Methods
 
     @objc func `init`(_ call: CAPPluginCall) {
-        guard let apiKey = call.getString("apiKey"), !apiKey.isEmpty else {
-            call.reject("API key is required and cannot be empty")
+        let apiKey = call.getString("apiKey", "")
+        guard !apiKey.isEmpty else {
+            call.unavailable("API key is required and cannot be empty")
             return
         }
 
-        let handlePermission = call.getBool("handlePermission") ?? true
-        let showForegroundNotification = call.getBool("showForegroundNotification") ?? true
+        let handlePermission = call.getBool("handlePermission", true)
+        let showForegroundNotification = call.getBool("showForegroundNotification", true)
         let config = EntrigConfig(apiKey: apiKey, handlePermission: handlePermission, showForegroundNotification: showForegroundNotification)
 
         Entrig.configure(config: config) { success, error in
             if success {
                 call.resolve()
             } else {
-                call.reject(error ?? "Failed to initialize SDK")
+                call.unavailable(error ?? "Failed to initialize SDK")
             }
         }
     }
 
     @objc func register(_ call: CAPPluginCall) {
-        guard let userId = call.getString("userId"), !userId.isEmpty else {
-            call.reject("userId is required")
+        let userId = call.getString("userId", "")
+        guard !userId.isEmpty else {
+            call.unavailable("userId is required")
             return
         }
 
@@ -91,7 +104,7 @@ public class EntrigPlugin: CAPPlugin, CAPBridgedPlugin, OnNotificationReceivedLi
             if success {
                 call.resolve()
             } else {
-                call.reject(error ?? "Registration failed")
+                call.unavailable(error ?? "Registration failed")
             }
         }
     }
@@ -99,7 +112,7 @@ public class EntrigPlugin: CAPPlugin, CAPBridgedPlugin, OnNotificationReceivedLi
     @objc func requestPermission(_ call: CAPPluginCall) {
         Entrig.requestPermission { granted, error in
             if let error = error {
-                call.reject(error.localizedDescription)
+                call.unavailable(error.localizedDescription)
             } else {
                 call.resolve(["granted": granted])
             }
@@ -111,7 +124,7 @@ public class EntrigPlugin: CAPPlugin, CAPBridgedPlugin, OnNotificationReceivedLi
             if success {
                 call.resolve()
             } else {
-                call.reject(error ?? "Unregistration failed")
+                call.unavailable(error ?? "Unregistration failed")
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@entrig/capacitor",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Push Notifications for Supabase",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -16,8 +16,7 @@
     "dist/",
     "ios/Sources",
     "ios/Tests",
-    "Package.swift",
-    "EntrigCapacitor.podspec"
+    "Package.swift"
   ],
   "author": "entrig",
   "license": "MIT",

package/EntrigCapacitor.podspec

@@ -1,18 +0,0 @@
-require 'json'
-
-package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
-
-Pod::Spec.new do |s|
-  s.name = 'EntrigCapacitor'
-  s.version = package['version']
-  s.summary = package['description']
-  s.license = package['license']
-  s.homepage = package['repository']['url']
-  s.author = package['author']
-  s.source = { :git => package['repository']['url'], :tag => s.version.to_s }
-  s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
-  s.ios.deployment_target = '15.0'
-  s.dependency 'Capacitor'
-  s.dependency 'EntrigSDK', '0.0.1'
-  s.swift_version = '5.9'
-end