capacitor-record360sdk 7.24.0 → 7.30.1

package/CapacitorRecord360sdk.podspec

@@ -11,8 +11,8 @@ Pod::Spec.new do |s|
   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  = '14.0'
+  s.ios.deployment_target  = '15.0'
   s.dependency 'Capacitor'
-  s.dependency 'Record360SDK', '4.22'
+  s.dependency 'Record360SDK', '4.24.7'
   s.swift_version = '5.1'
 end

package/README.md

@@ -40,12 +40,12 @@ launchRecord360(identity?: Record360Identity | undefined) => Promise<void>
 ### launchReferenceCapture(...)
 
 ```typescript
-launchReferenceCapture(options: { referenceNumber: string; workOrderId?: number; workOrderLabel?: string; identity?: Record360Identity; }) => Promise<void>
+launchReferenceCapture(options: { referenceNumber: string; department?: string; sequence?: string; fieldData?: Record360FieldData; identity?: Record360Identity; }) => Promise<void>
 ```
 
-| Param         | Type                                                                                                                                                    |
-| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`options`** | <code>{ referenceNumber: string; workOrderId?: number; workOrderLabel?: string; identity?: <a href="#record360identity">Record360Identity</a>; }</code> |
+| Param         | Type                                                                                                                                                                                                               |
+| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **`options`** | <code>{ referenceNumber: string; department?: string; sequence?: string; fieldData?: <a href="#record360fielddata">Record360FieldData</a>; identity?: <a href="#record360identity">Record360Identity</a>; }</code> |
 
 --------------------
 
@@ -53,13 +53,13 @@ launchReferenceCapture(options: { referenceNumber: string; workOrderId?: number;
 ### addListener('Record360Event', ...)
 
 ```typescript
-addListener(eventName: 'Record360Event', listenerFunc: (data: { type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionStarted' | 'onUserAuthenticated'; referenceNumber?: string; bytesComplete?: number; bytesTotal?: number; error?: string; userId?: string; username?: string; inspectionJSON?: string; }) => void) => Promise<PluginListenerHandle>
+addListener(eventName: 'Record360Event', listenerFunc: (data: { type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionUploadDeleted' | 'onInspectionStarted' | 'onUserAuthenticated' | 'onSDKShouldRelaunch' | 'onSDKShouldExit'; referenceNumber?: string; inspectionNonce?: string; percentComplete?: number; error?: string; userId?: string; inspectionJSON?: string; }) => void) => Promise<PluginListenerHandle>
 ```
 
-| Param              | Type                                                                                                                                                                                                                                                                                                                                                                                                                   |
-| ------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`eventName`**    | <code>'Record360Event'</code>                                                                                                                                                                                                                                                                                                                                                                                          |
-| **`listenerFunc`** | <code>(data: { type: 'onFailedToAuthenticate' \| 'onInspectionCancelled' \| 'onInspectionComplete' \| 'onInspectionUploadFailed' \| 'onInspectionUploadProgress' \| 'onInspectionUploaded' \| 'onInspectionStarted' \| 'onUserAuthenticated'; referenceNumber?: string; bytesComplete?: number; bytesTotal?: number; error?: string; userId?: string; username?: string; inspectionJSON?: string; }) =&gt; void</code> |
+| Param              | Type                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    |
+| ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`eventName`**    | <code>'Record360Event'</code>                                                                                                                                                                                                                                                                                                                                                                                                                                                           |
+| **`listenerFunc`** | <code>(data: { type: 'onFailedToAuthenticate' \| 'onInspectionCancelled' \| 'onInspectionComplete' \| 'onInspectionUploadFailed' \| 'onInspectionUploadProgress' \| 'onInspectionUploaded' \| 'onInspectionUploadDeleted' \| 'onInspectionStarted' \| 'onUserAuthenticated' \| 'onSDKShouldRelaunch' \| 'onSDKShouldExit'; referenceNumber?: string; inspectionNonce?: string; percentComplete?: number; error?: string; userId?: string; inspectionJSON?: string; }) =&gt; void</code> |
 
 **Returns:** <code>Promise&lt;<a href="#pluginlistenerhandle">PluginListenerHandle</a>&gt;</code>
 
@@ -99,4 +99,37 @@ addListener(eventName: 'Record360Event', listenerFunc: (data: { type: 'onFailedT
 
 <code><a href="#r360passwordidentity">R360PasswordIdentity</a> | <a href="#r360usertokenidentity">R360UserTokenIdentity</a></code>
 
+
+#### Record360FieldData
+
+<code>{ [key: string]: unknown }</code>
+
 </docgen-api>
+
+## Changelog
+
+### 7.30.1
+
+Capacitor 7 release carrying the unified Record360 SDK callbacks. Pairs with Android SDK 4.30.1 and iOS SDK 4.24.7.
+
+Requirements (updates needed in the consuming app):
+- Android: `minSdkVersion` 26, Kotlin Gradle plugin 2.1 or newer (the SDK is compiled with Kotlin 2.2), compileSdk 36
+- iOS: deployment target 15.0
+
+Event payload changes on `Record360Event`:
+- Every inspection event now carries `inspectionNonce`, an id unique per inspection and identical across all of that inspection's events. Reference numbers repeat across inspections of the same unit; correlate on the nonce.
+- `onInspectionUploadProgress` sends `percentComplete` as a fraction from 0 to 1. `bytesComplete` and `bytesTotal` are removed.
+- `onInspectionUploadFailed` carries an `error` message on both platforms.
+- `onUserAuthenticated` no longer includes `username`.
+- `onInspectionStarted` fires once the inspection has been created, on both platforms. It previously fired from the reference-number prefill request on Android only.
+
+New event types:
+- `onInspectionUploadDeleted`: the user removed a queued upload from the Uploads screen.
+- `onSDKShouldExit`: the SDK handed control back to the app. Fires exactly once per launch, after any inspection event. On iOS the plugin dismisses the SDK view controller on this event.
+- `onSDKShouldRelaunch`: iOS only; the SDK dismissed after a workflow update and the plugin relaunches it with the last launch call.
+
+Behavior changes:
+- `onInspectionCancelled` fires whenever an in-progress inspection is discarded: the delete dialog, logout, session expiry, or a new launch for a different reference number or user. On iOS it no longer fires for plain dismissal, a cancelled sign-in, or declined terms; those report `onSDKShouldExit` only.
+- On iOS, `onInspectionComplete` and `onInspectionCancelled` no longer dismiss the SDK view controller themselves; dismissal happens on `onSDKShouldExit`.
+- Android `onInspectionUploaded` now passes the reference number; it previously passed an internal upload id.
+

package/android/build.gradle

@@ -5,10 +5,10 @@ buildscript {
         androidxJunitVersion = '1.2.1'
         androidxEspressoCoreVersion = '3.6.1'
         androidXCore = '1.15.0'
-        compileSdk = 35
-        minSdkVersion = 24
-        targetSdkVersion = 35
-        kotlinVersion = '2.0.21'
+        compileSdk = 36
+        minSdkVersion = 26
+        targetSdkVersion = 36
+        kotlinVersion = '2.2.0'
         androidxCoreVersion = '1.15.0'
         androidxActivityVersion = '1.9.2'
         androidxFragmentVersion = '1.8.4'
@@ -101,6 +101,6 @@ dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
     androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
-    implementation 'com.record360.sdk:android-sdk:4.24.0'
+    implementation 'com.record360.sdk:android-sdk:4.30.1'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 }

package/android/src/main/java/com/record360/plugins/CapacitorRecord360SDKPlugin.kt

@@ -8,12 +8,14 @@ import com.getcapacitor.Plugin
 import com.getcapacitor.PluginCall
 import com.getcapacitor.PluginMethod
 import com.getcapacitor.annotation.CapacitorPlugin
+import com.record360.plugins.SampleRecord360Activity.Companion.DEPARTMENT_INTENT
+import com.record360.plugins.SampleRecord360Activity.Companion.FIELD_DATA_INTENT
+import com.record360.plugins.SampleRecord360Activity.Companion.REFERENCE_NUMBER_INTENT
+import com.record360.plugins.SampleRecord360Activity.Companion.SEQUENCE_INTENT
 import com.record360.plugins.SampleRecord360Activity.Companion.USER_ID_INTENT
 import com.record360.plugins.SampleRecord360Activity.Companion.USER_NAME_INTENT
 import com.record360.plugins.SampleRecord360Activity.Companion.USER_PASSWORD_INTENT
 import com.record360.plugins.SampleRecord360Activity.Companion.USER_TOKEN_INTENT
-import com.record360.plugins.SampleRecord360Activity.Companion.WORK_ORDER_ID_INTENT
-import com.record360.plugins.SampleRecord360Activity.Companion.WORK_ORDER_LABEL_INTENT
 import com.record360.sdk.IRecord360Interface
 import com.record360.sdk.R360Identity
 import com.record360.sdk.Record360SDK
@@ -42,10 +44,9 @@ open class CapacitorRecord360SDKPlugin : Plugin(), IRecord360Interface {
 
     private fun startRefCap(referenceNumber: String, data: JSObject?) {
         val intent = Intent(bridge.context, SampleRecord360Activity::class.java)
-        intent.putExtra(SampleRecord360Activity.REFERENCE_NUMBER_INTENT, referenceNumber)
         val identity = checkForIdentity(data?.getJSObject("identity"))
         identity?.let { intent.addIdentity(it) }
-        intent.addWorkOrderInfo(data)
+        intent.refCapIntent(referenceNumber, data)
         context.startActivity(intent)
     }
 
@@ -62,14 +63,15 @@ open class CapacitorRecord360SDKPlugin : Plugin(), IRecord360Interface {
         }
     }
 
-    private fun Intent.addWorkOrderInfo(data: JSObject?) {
+    private fun Intent.refCapIntent(referenceNumber: String, data: JSObject?) {
+        putExtra(REFERENCE_NUMBER_INTENT, referenceNumber)
         data?.let { dataObj ->
-            val workOrderId = dataObj.getInteger("workOrderId")
-            val workOrderLabel = dataObj.getString("workOrderLabel")
-            if (workOrderId != null && workOrderId > 0) {
-                putExtra(WORK_ORDER_ID_INTENT, workOrderId)
-                workOrderLabel?.let { putExtra(WORK_ORDER_LABEL_INTENT, it) }
-            }
+            val department = dataObj.getString("department")
+            val sequence = dataObj.getString("sequence")
+            val fieldData = dataObj.getJSObject("fieldData")
+            department?.let { putExtra(DEPARTMENT_INTENT, it) }
+            sequence?.let { putExtra(SEQUENCE_INTENT, it) }
+            fieldData?.let { putExtra(FIELD_DATA_INTENT, it.toString()) }
         }
     }
 
@@ -112,82 +114,111 @@ open class CapacitorRecord360SDKPlugin : Plugin(), IRecord360Interface {
         return contractFieldData
     }
 
-    override fun onFailedToAuthenticate(credentialsAreValid: Boolean, error: String?) {
-        Log.i(TAG, "onFailedToAuthenticate")
+    override fun onFailedAuthentication(error: Throwable) {
+        Log.i(TAG, "onFailedAuthentication")
         val data = JSObject().apply {
             put("type", "onFailedToAuthenticate")
+            put("error", error.localizedMessage)
         }
         notifyListeners(EVENT_NAME, data)
     }
 
-    override fun onInspectionCancelled(referenceNumber: String?) {
-        Log.i(TAG, "onInspectionCancelled")
+    override fun onInspectionCancelled(refNum: String, inspectionNonce: String) {
+        Log.i(TAG, "onInspectionCancelled refNum=$refNum nonce=$inspectionNonce")
         val data = JSObject().apply {
             put("type", "onInspectionCancelled")
-            put("referenceNumber", referenceNumber)
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
         }
         notifyListeners(EVENT_NAME, data)
     }
 
-    override fun onInspectionComplete(referenceNumber: String?) {
-        Log.i(TAG, "onInspectionComplete")
+    override fun onInspectionComplete(refNum: String, inspectionNonce: String) {
+        Log.i(TAG, "onInspectionComplete refNum=$refNum nonce=$inspectionNonce")
         val data = JSObject().apply {
             put("type", "onInspectionComplete")
-            put("referenceNumber", referenceNumber)
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
         }
         notifyListeners(EVENT_NAME, data)
     }
 
-    override fun onInspectionUploadFailed(referenceNumber: String?, error: String?) {
-        Log.i(TAG, "onInspectionUploadFailed")
+    override fun onInspectionUploadFailed(refNum: String, inspectionNonce: String, error: String) {
+        Log.i(TAG, "onInspectionUploadFailed refNum=$refNum nonce=$inspectionNonce error=$error")
         val data = JSObject().apply {
             put("type", "onInspectionUploadFailed")
-            put("referenceNumber", referenceNumber)
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
             put("error", error)
         }
         notifyListeners(EVENT_NAME, data)
     }
 
-    override fun onInspectionUploadProgress(referenceNumber: String?, complete: Long, total: Long) {
-        Log.i(TAG, "onInspectionUploadProgress")
+    override fun onInspectionUploadProgress(refNum: String, inspectionNonce: String, percentComplete: Double) {
+        Log.i(TAG, "onInspectionUploadProgress refNum=$refNum nonce=$inspectionNonce percent=$percentComplete")
         val data = JSObject().apply {
             put("type", "onInspectionUploadProgress")
-            put("referenceNumber", referenceNumber)
-            put("bytesComplete", complete)
-            put("bytesTotal", total)
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
+            put("percentComplete", percentComplete)
         }
         notifyListeners(EVENT_NAME, data)
     }
 
-    override fun onInspectionUploaded(referenceNumber: String?, inspectionJson: String?) {
-        Log.i(TAG, "onInspectionUploaded")
+    override fun onInspectionUploaded(refNum: String, inspectionNonce: String, inspectionJSON: String) {
+        Log.i(TAG, "onInspectionUploaded refNum=$refNum nonce=$inspectionNonce")
         val data = JSObject().apply {
             put("type", "onInspectionUploaded")
-            put("referenceNumber", referenceNumber)
-            put("inspectionJSON", inspectionJson)
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
+            put("inspectionJSON", inspectionJSON)
         }
         notifyListeners(EVENT_NAME, data)
     }
 
+    override fun onInspectionUploadDeleted(refNum: String, inspectionNonce: String) {
+        Log.i(TAG, "onInspectionUploadDeleted refNum=$refNum nonce=$inspectionNonce")
+        val data = JSObject().apply {
+            put("type", "onInspectionUploadDeleted")
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
+        }
+        notifyListeners(EVENT_NAME, data)
+    }
+
+    override fun onSDKShouldRelaunch() {
+        Log.i(TAG, "onSDKShouldRelaunch")
+        notifyListeners(EVENT_NAME, JSObject().apply { put("type", "onSDKShouldRelaunch") })
+    }
+
+    override fun onSDKShouldExit() {
+        Log.i(TAG, "onSDKShouldExit")
+        notifyListeners(EVENT_NAME, JSObject().apply { put("type", "onSDKShouldExit") })
+    }
+
     override fun onReferenceNumberEnteredWithFieldData(
         referenceNumber: String?,
         fieldData: Map<String?, String?>?
     ): Map<String?, String?>? {
         Log.i(TAG, "onRefNumEntered")
+        return fieldData
+    }
+
+    override fun onInspectionStarted(refNum: String, inspectionNonce: String) {
+        Log.i(TAG, "onInspectionStarted refNum=$refNum nonce=$inspectionNonce")
         val data = JSObject().apply {
             put("type", "onInspectionStarted")
-            put("referenceNumber", referenceNumber)
+            put("referenceNumber", refNum)
+            put("inspectionNonce", inspectionNonce)
         }
         notifyListeners(EVENT_NAME, data)
-        return fieldData
     }
 
-    override fun onUserAuthenticated(username: String?, userId: String?, token: String?) {
-        Log.i(TAG, "onUserAuthenticated")
+    override fun onSuccessfulAuthentication(userToken: String, userId: String) {
+        Log.i(TAG, "onSuccessfulAuthentication")
         val data = JSObject().apply {
             put("type", "onUserAuthenticated")
             put("userId", userId)
-            put("username", username)
         }
         notifyListeners(EVENT_NAME, data)
     }

package/android/src/main/java/com/record360/plugins/SampleRecord360Activity.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import com.record360.sdk.R360Identity
 import com.record360.sdk.Record360Activity
 import com.record360.sdk.ui.insets.EdgeToEdgeInitializer
+import org.json.JSONObject
 
 class SampleRecord360Activity: Record360Activity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -13,10 +14,11 @@ class SampleRecord360Activity: Record360Activity() {
         val userToken = if (intent.hasExtra(USER_TOKEN_INTENT)) intent.getStringExtra(USER_TOKEN_INTENT) else null
         val userName = if (intent.hasExtra(USER_NAME_INTENT)) intent.getStringExtra(USER_NAME_INTENT) else null
         val password = if (intent.hasExtra(USER_PASSWORD_INTENT)) intent.getStringExtra(USER_PASSWORD_INTENT) else null
-        val workOrderId = if (intent.hasExtra(WORK_ORDER_ID_INTENT)) intent.getIntExtra(
-            WORK_ORDER_ID_INTENT, -1) else null
-        val workOrderLabel = if (intent.hasExtra(WORK_ORDER_LABEL_INTENT)) intent.getStringExtra(
-            WORK_ORDER_LABEL_INTENT) else null
+        val department = if (intent.hasExtra(DEPARTMENT_INTENT)) intent.getStringExtra(DEPARTMENT_INTENT) else null
+        val sequence = if (intent.hasExtra(SEQUENCE_INTENT)) intent.getStringExtra(SEQUENCE_INTENT) else null
+        val fieldData = if (intent.hasExtra(FIELD_DATA_INTENT)) {
+            parseFieldData(intent.getStringExtra(FIELD_DATA_INTENT))
+        } else null
         val referenceNumber = if (intent.hasExtra(REFERENCE_NUMBER_INTENT)) {
             intent.getStringExtra(REFERENCE_NUMBER_INTENT)
         } else null
@@ -24,20 +26,31 @@ class SampleRecord360Activity: Record360Activity() {
         when  {
             userId != null && userToken != null -> {
                 val identity = R360Identity.UserTokenIdentity(userId, userToken)
-                startRecord360WithIdentity(this, identity, referenceNumber, workOrderId, workOrderLabel)
+                startRecord360WithIdentity(this, identity, referenceNumber, department, sequence, fieldData)
             }
             userName != null && password != null -> {
                 val identity = R360Identity.PasswordIdentity(userName, password)
-                startRecord360WithIdentity(this, identity, referenceNumber, workOrderId, workOrderLabel)
+                startRecord360WithIdentity(this, identity, referenceNumber, department, sequence, fieldData)
             }
-            else -> startRecord360(this, referenceNumber, workOrderId, workOrderLabel, null)
+            else -> startRecord360(this, referenceNumber, department, sequence, null, fieldData)
+        }
+    }
+
+    private fun parseFieldData(json: String?): Map<String, String>? {
+        if (json.isNullOrEmpty()) return null
+        return try {
+            val obj = JSONObject(json)
+            obj.keys().asSequence().associateWith { key -> obj.get(key).toString() }
+        } catch (e: Exception) {
+            null
         }
     }
 
     companion object {
         var REFERENCE_NUMBER_INTENT = "SampleRecord360Activity.REF_NUM_INTENT"
-        var WORK_ORDER_ID_INTENT = "SampleRecord360Activity.WORK_ORDER_ID_INTENT"
-        var WORK_ORDER_LABEL_INTENT = "SampleRecord360Activity.WORK_ORDER_LABEL_INTENT"
+        var DEPARTMENT_INTENT = "SampleRecord360Activity.DEPARTMENT_INTENT"
+        var SEQUENCE_INTENT = "SampleRecord360Activity.SEQUENCE_INTENT"
+        var FIELD_DATA_INTENT = "SampleRecord360Activity.FIELD_DATA_INTENT"
         var USER_ID_INTENT = "SampleRecord360Activity.USER_ID"
         var USER_TOKEN_INTENT = "SampleRecord360Activity.USER_TOKEN"
         var USER_NAME_INTENT = "SampleRecord360Activity.USER_NAME"

package/dist/docs.json

@@ -25,25 +25,26 @@
       },
       {
         "name": "launchReferenceCapture",
-        "signature": "(options: { referenceNumber: string; workOrderId?: number; workOrderLabel?: string; identity?: Record360Identity; }) => Promise<void>",
+        "signature": "(options: { referenceNumber: string; department?: string; sequence?: string; fieldData?: Record360FieldData; identity?: Record360Identity; }) => Promise<void>",
         "parameters": [
           {
             "name": "options",
             "docs": "",
-            "type": "{ referenceNumber: string; workOrderId?: number | undefined; workOrderLabel?: string | undefined; identity?: Record360Identity | undefined; }"
+            "type": "{ referenceNumber: string; department?: string | undefined; sequence?: string | undefined; fieldData?: Record360FieldData | undefined; identity?: Record360Identity | undefined; }"
           }
         ],
         "returns": "Promise<void>",
         "tags": [],
         "docs": "",
         "complexTypes": [
+          "Record360FieldData",
           "Record360Identity"
         ],
         "slug": "launchreferencecapture"
       },
       {
         "name": "addListener",
-        "signature": "(eventName: 'Record360Event', listenerFunc: (data: { type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionStarted' | 'onUserAuthenticated'; referenceNumber?: string; bytesComplete?: number; bytesTotal?: number; error?: string; userId?: string; username?: string; inspectionJSON?: string; }) => void) => Promise<PluginListenerHandle>",
+        "signature": "(eventName: 'Record360Event', listenerFunc: (data: { type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionUploadDeleted' | 'onInspectionStarted' | 'onUserAuthenticated' | 'onSDKShouldRelaunch' | 'onSDKShouldExit'; referenceNumber?: string; inspectionNonce?: string; percentComplete?: number; error?: string; userId?: string; inspectionJSON?: string; }) => void) => Promise<PluginListenerHandle>",
         "parameters": [
           {
             "name": "eventName",
@@ -53,7 +54,7 @@
           {
             "name": "listenerFunc",
             "docs": "",
-            "type": "(data: { type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionStarted' | 'onUserAuthenticated'; referenceNumber?: string | undefined; bytesComplete?: number | undefined; bytesTotal?: number | undefined; error?: string | undefined; userId?: string | undefined; username?: string | undefined; inspectionJSON?: string | undefined; }) => void"
+            "type": "(data: { type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionUploadDeleted' | 'onInspectionStarted' | 'onUserAuthenticated' | 'onSDKShouldRelaunch' | 'onSDKShouldExit'; referenceNumber?: string | undefined; inspectionNonce?: string | undefined; percentComplete?: number | undefined; error?: string | undefined; userId?: string | undefined; inspectionJSON?: string | undefined; }) => void"
           }
         ],
         "returns": "Promise<PluginListenerHandle>",
@@ -151,6 +152,17 @@
           ]
         }
       ]
+    },
+    {
+      "name": "Record360FieldData",
+      "slug": "record360fielddata",
+      "docs": "",
+      "types": [
+        {
+          "text": "{ [key: string]: unknown }",
+          "complexTypes": []
+        }
+      ]
     }
   ],
   "pluginConfigs": []

package/dist/esm/definitions.d.ts

@@ -8,22 +8,27 @@ export interface R360UserTokenIdentity {
     userId: string;
     userToken: string;
 }
+export declare type Record360FieldData = {
+    [key: string]: unknown;
+};
 export interface CapacitorRecord360SDKPlugin {
     launchRecord360(identity?: Record360Identity): Promise<void>;
     launchReferenceCapture(options: {
         referenceNumber: string;
-        workOrderId?: number;
-        workOrderLabel?: string;
+        department?: string;
+        sequence?: string;
+        fieldData?: Record360FieldData;
         identity?: Record360Identity;
     }): Promise<void>;
     addListener(eventName: 'Record360Event', listenerFunc: (data: {
-        type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionStarted' | 'onUserAuthenticated';
+        type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionUploadDeleted' | 'onInspectionStarted' | 'onUserAuthenticated' | 'onSDKShouldRelaunch' | 'onSDKShouldExit';
         referenceNumber?: string;
-        bytesComplete?: number;
-        bytesTotal?: number;
+        /** Unique per inspection; correlates every event for the same inspection. */
+        inspectionNonce?: string;
+        /** Fraction uploaded, 0 to 1. */
+        percentComplete?: number;
         error?: string;
         userId?: string;
-        username?: string;
         inspectionJSON?: string;
     }) => void): Promise<PluginListenerHandle>;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PluginListenerHandle } from \"@capacitor/core\"\nexport type Record360Identity = R360PasswordIdentity | R360UserTokenIdentity\n\nexport interface R360PasswordIdentity {\n  username: string,\n  password: string\n}\n\nexport interface R360UserTokenIdentity {\n  userId: string,\n  userToken: string\n}\n\nexport interface CapacitorRecord360SDKPlugin {\n  launchRecord360(identity?: Record360Identity): Promise<void>\n\n  launchReferenceCapture(options: {\n    referenceNumber: string,\n    workOrderId?: number,\n    workOrderLabel?: string,\n    identity?: Record360Identity\n  }): Promise<void>\n\n  addListener(\n    eventName: 'Record360Event',\n    listenerFunc: (\n      data: { \n        type: 'onFailedToAuthenticate' |  'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionStarted' | 'onUserAuthenticated',\n        referenceNumber?: string,\n        bytesComplete?: number,\n        bytesTotal?: number,\n        error?: string,\n        userId?: string,\n        username?: string,\n        inspectionJSON?: string\n      }\n    ) => void,\n  ): Promise<PluginListenerHandle>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import type { PluginListenerHandle } from \"@capacitor/core\"\nexport type Record360Identity = R360PasswordIdentity | R360UserTokenIdentity\n\nexport interface R360PasswordIdentity {\n  username: string,\n  password: string\n}\n\nexport interface R360UserTokenIdentity {\n  userId: string,\n  userToken: string\n}\n\nexport type Record360FieldData = { [key: string]: unknown }\n\nexport interface CapacitorRecord360SDKPlugin {\n  launchRecord360(identity?: Record360Identity): Promise<void>\n\n  launchReferenceCapture(options: {\n    referenceNumber: string,\n    department?: string,\n    sequence?: string,\n    fieldData?: Record360FieldData,\n    identity?: Record360Identity\n  }): Promise<void>\n\n  addListener(\n    eventName: 'Record360Event',\n    listenerFunc: (\n      data: {\n        type: 'onFailedToAuthenticate' | 'onInspectionCancelled' | 'onInspectionComplete' | 'onInspectionUploadFailed' | 'onInspectionUploadProgress' | 'onInspectionUploaded' | 'onInspectionUploadDeleted' | 'onInspectionStarted' | 'onUserAuthenticated' | 'onSDKShouldRelaunch' | 'onSDKShouldExit',\n        referenceNumber?: string,\n        /** Unique per inspection; correlates every event for the same inspection. */\n        inspectionNonce?: string,\n        /** Fraction uploaded, 0 to 1. */\n        percentComplete?: number,\n        error?: string,\n        userId?: string,\n        inspectionJSON?: string\n      }\n    ) => void,\n  ): Promise<PluginListenerHandle>;\n}\n"]}

package/dist/esm/web.d.ts

@@ -1,11 +1,12 @@
 import { ListenerCallback, PluginListenerHandle, WebPlugin } from '@capacitor/core';
-import type { CapacitorRecord360SDKPlugin, Record360Identity } from './definitions';
+import type { CapacitorRecord360SDKPlugin, Record360FieldData, Record360Identity } from './definitions';
 export declare class CapacitorRecord360SDKWeb extends WebPlugin implements CapacitorRecord360SDKPlugin {
     launchRecord360(_?: Record360Identity): Promise<void>;
     launchReferenceCapture(_: {
         referenceNumber: string;
-        workOrderId?: number;
-        workOrderLabel?: string;
+        department?: string;
+        sequence?: string;
+        fieldData?: Record360FieldData;
         identity?: Record360Identity;
     }): Promise<void>;
     addListener(_eventName: string, _listenerFunc: ListenerCallback): Promise<PluginListenerHandle>;

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIpF,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IACrD,eAAe,CAAC,CAAqB;QACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IAED,sBAAsB,CAAC,CAA4G;QAC/H,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,UAAkB,EAAE,aAA+B;QAC3D,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;CACF","sourcesContent":["import { ListenerCallback, PluginListenerHandle, WebPlugin } from '@capacitor/core';\n\nimport type { CapacitorRecord360SDKPlugin, Record360Identity } from './definitions';\n\nexport class CapacitorRecord360SDKWeb extends WebPlugin implements CapacitorRecord360SDKPlugin {\n  launchRecord360(_?: Record360Identity): Promise<void> {\n    throw new Error(\"Not available on web.\");\n  }\n\n  launchReferenceCapture(_: { referenceNumber: string; workOrderId?: number; workOrderLabel?: string; identity?: Record360Identity; }): Promise<void> {\n      throw new Error(\"Not available on web\");\n  }\n  \n  addListener(_eventName: string, _listenerFunc: ListenerCallback): Promise<PluginListenerHandle> {\n      throw new Error(\"Not available on web\");\n  }\n}"]}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0C,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAIpF,MAAM,OAAO,wBAAyB,SAAQ,SAAS;IACrD,eAAe,CAAC,CAAqB;QACnC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAC3C,CAAC;IAED,sBAAsB,CAAC,CAAqI;QACxJ,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,UAAkB,EAAE,aAA+B;QAC3D,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;IAC5C,CAAC;CACF","sourcesContent":["import { ListenerCallback, PluginListenerHandle, WebPlugin } from '@capacitor/core';\n\nimport type { CapacitorRecord360SDKPlugin, Record360FieldData, Record360Identity } from './definitions';\n\nexport class CapacitorRecord360SDKWeb extends WebPlugin implements CapacitorRecord360SDKPlugin {\n  launchRecord360(_?: Record360Identity): Promise<void> {\n    throw new Error(\"Not available on web.\");\n  }\n\n  launchReferenceCapture(_: { referenceNumber: string; department?: string; sequence?: string; fieldData?: Record360FieldData; identity?: Record360Identity; }): Promise<void> {\n      throw new Error(\"Not available on web\");\n  }\n  \n  addListener(_eventName: string, _listenerFunc: ListenerCallback): Promise<PluginListenerHandle> {\n      throw new Error(\"Not available on web\");\n  }\n}"]}

package/ios/Sources/CapacitorRecord360SDKPlugin/CapacitorRecord360SDKPlugin.swift

@@ -14,10 +14,11 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
     public var record360: Record360?
     public var record360ViewController: Record360ViewController?
     public var hostingSDKViewController = false
+    private var lastLaunch: (() -> Void)?
     
     public override init() {
         super.init()
-        self.record360 = Record360(delegate: self, allowUserToExitRecord360: true);
+        self.record360 = Record360(delegate: self, allowUserToExitRecord360: true, error: nil);
     }
     
     private func applySettings() {
@@ -53,7 +54,7 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
             let identity = Record360Identity(userID: userId!, userToken: userToken!)
             loadR360SDK(identity: identity, presentingVC: presentingVC)
         } else {
-            loadR360SDKLogin(referenceNumber: nil, workOrderId: nil, workOrderLabel: nil, presentingVC: presentingVC)
+            loadR360SDKLogin(referenceNumber: nil, department: nil, sequence: nil, fieldData: nil, presentingVC: presentingVC)
         }
     }
     
@@ -69,8 +70,9 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
             call.reject("Reference number is required")
         }
         
-        let workOrderId = call.getInt("workOrderId") as NSNumber?
-        let workOrderLabel = call.getString("workOrderLabel")
+        let department = call.getString("department")
+        let sequence = call.getString("sequence")
+        let fieldData = call.getObject("fieldData")
         let identityObj = call.getObject("identity")
         let username = identityObj?["username"] as? String
         let password = identityObj?["password"] as? String
@@ -79,21 +81,22 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
 
         if (username != nil && password != nil) {
             let identity = Record360Identity(userName: username!, password: password!)
-            loadR360SDKForInspection(identity: identity, referenceNumber: referenceNumber!, workOrderId: workOrderId, workOrderLabel: workOrderLabel, presentingVC: presentingVC)
+            loadR360SDKForInspection(identity: identity, referenceNumber: referenceNumber!, department: department, sequence: sequence, fieldData: fieldData, presentingVC: presentingVC)
         } else if (userId != nil && userToken != nil) {
             let identity = Record360Identity(userID: userId!, userToken: userToken!)
-            loadR360SDKForInspection(identity: identity, referenceNumber: referenceNumber!, workOrderId: workOrderId, workOrderLabel: workOrderLabel, presentingVC: presentingVC)
+            loadR360SDKForInspection(identity: identity, referenceNumber: referenceNumber!, department: department, sequence: sequence, fieldData: fieldData, presentingVC: presentingVC)
         } else {
-            loadR360SDKLogin(referenceNumber: referenceNumber, workOrderId: workOrderId, workOrderLabel: workOrderLabel, presentingVC: presentingVC)
+            loadR360SDKLogin(referenceNumber: referenceNumber, department: department, sequence: sequence, fieldData: fieldData, presentingVC: presentingVC)
         }
     }
     
-    private func loadR360SDKLogin(referenceNumber: String?, workOrderId: NSNumber?, workOrderLabel: String?, presentingVC: UIViewController) {
+    private func loadR360SDKLogin(referenceNumber: String?, department: String?, sequence: String?, fieldData: JSObject?, presentingVC: UIViewController) {
+        lastLaunch = { self.loadR360SDKLogin(referenceNumber: referenceNumber, department: department, sequence: sequence, fieldData: fieldData, presentingVC: presentingVC) }
         DispatchQueue.main.async {
             self.hostSDKViewController {
                 let identity = Record360Identity(userName: "", password: nil)
                 if (referenceNumber != nil) {
-                    self.record360?.launchReferenceCapture(referenceNumber, workOrderID: workOrderId, workOrderLabel: workOrderLabel, identity: identity)
+                    self.record360?.launchReferenceCapture(referenceNumber, departmentReference: department, sequenceReference: sequence, fieldData: fieldData, identity: identity)
                 } else {
                     self.record360?.launch(identity)
                 }
@@ -103,6 +106,7 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
     }
     
     private func loadR360SDK(identity: Record360Identity, presentingVC: UIViewController) {
+        lastLaunch = { self.loadR360SDK(identity: identity, presentingVC: presentingVC) }
         DispatchQueue.main.async {
             self.hostSDKViewController {
                 self.record360?.launch(identity)
@@ -111,10 +115,11 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
         }
     }
     
-    private func loadR360SDKForInspection(identity: Record360Identity, referenceNumber: String, workOrderId: NSNumber?, workOrderLabel: String?, presentingVC: UIViewController) {
+    private func loadR360SDKForInspection(identity: Record360Identity, referenceNumber: String, department: String?, sequence: String?, fieldData: JSObject?, presentingVC: UIViewController) {
+        lastLaunch = { self.loadR360SDKForInspection(identity: identity, referenceNumber: referenceNumber, department: department, sequence: sequence, fieldData: fieldData, presentingVC: presentingVC) }
         DispatchQueue.main.async {
             self.hostSDKViewController {
-                self.record360?.launchReferenceCapture(referenceNumber, workOrderID: workOrderId, workOrderLabel: workOrderLabel, identity: identity)
+                self.record360?.launchReferenceCapture(referenceNumber, departmentReference: department, sequenceReference: sequence, fieldData: fieldData, identity: identity)
                 self.applySettings()
             }
         }
@@ -125,54 +130,83 @@ public class CapacitorRecord360SDKPlugin: CAPPlugin, CAPBridgedPlugin, Record360
         data["type"] = "onUserAuthenticated"
         data["userId"] = userId
 
-        notifyListeners("Record360Event", data: data)
+        emit(data)
     }
     
     public func onFailedAuthentication(_ error: any Error) {
         var data = JSObject()
         data["type"] = "onFailedToAuthenticate"
-        notifyListeners("Record360Event", data: data)
+        emit(data)
     }
     
-    public func onInspectionComplete() {
-        var data = JSObject()
-        data["type"] = "onInspectionComplete"
+    private func emit(_ data: JSObject) {
+        let fields = data.keys.sorted().filter { $0 != "type" && $0 != "inspectionJSON" }
+            .map { "\($0)=\(data[$0] ?? "")" }.joined(separator: " ")
+        print("Record360Event \(data["type"] ?? "") \(fields)")
         notifyListeners("Record360Event", data: data)
-        self.dismissSDKViewController(animated: true, completion: {})
     }
-    
-    public func onInspectionCanceled() {
+
+    private func inspectionEvent(_ type: String, _ refNum: String, _ nonce: String) -> JSObject {
         var data = JSObject()
-        data["type"] = "onInspectionCancelled"
-        notifyListeners("Record360Event", data: data)
-        self.dismissSDKViewController(animated: true, completion: {})
+        data["type"] = type
+        data["referenceNumber"] = refNum
+        data["inspectionNonce"] = nonce
+        return data
     }
-    
-    public func onInspectionUploadDeleted(forReferenceNumber referenceNumber: String) {
-        
+
+    public func onInspectionStarted(forReferenceNumber refNum: String, inspectionNonce nonce: String) {
+        emit(inspectionEvent("onInspectionStarted", refNum, nonce))
+    }
+
+    public func onInspectionComplete(forReferenceNumber refNum: String, inspectionNonce nonce: String) {
+        emit(inspectionEvent("onInspectionComplete", refNum, nonce))
     }
     
-    public func userHasRequestedToExitRecord360() {
+    public func onInspectionCancelled(forReferenceNumber refNum: String, inspectionNonce nonce: String) {
+        emit(inspectionEvent("onInspectionCancelled", refNum, nonce))
+    }
+
+    public func onSDKShouldExit() {
+        var data = JSObject()
+        data["type"] = "onSDKShouldExit"
+        emit(data)
         self.dismissSDKViewController(animated: true, completion: {})
     }
-    
-    public func onInspectionUploaded(forReferenceNumber referenceNumber: String, inspectionJSON: [AnyHashable : Any]) {
+
+    public func onSDKShouldRelaunch() {
         var data = JSObject()
-        if let inspection = inspectionJSON["transaction"] as? [AnyHashable : Any] {
-            data["inspectionJSON"] = self.dictionaryToJSONString(inspection)!
+        data["type"] = "onSDKShouldRelaunch"
+        emit(data)
+        let relaunch = self.lastLaunch
+        self.dismissSDKViewController(animated: true) {
+            relaunch?()
         }
-        data["type"] = "onInspectionUploaded"
-        data["referenceNumber"] = referenceNumber
-        notifyListeners("Record360Event", data: data)
     }
     
-    public func onInspectionUploadFailed(forReferenceNumber referenceNumber: String) {
-        var data = JSObject()
-        data["type"] = "onInspectionUploadFailed"
-        data["referenceNumber"] = referenceNumber
-        notifyListeners("Record360Event", data: data)
+    public func onInspectionUploadDeleted(forReferenceNumber refNum: String, inspectionNonce nonce: String) {
+        emit(inspectionEvent("onInspectionUploadDeleted", refNum, nonce))
     }
     
+    public func onInspectionUploaded(forReferenceNumber refNum: String, inspectionNonce nonce: String, inspectionJSON: [AnyHashable : Any]) {
+        var data = inspectionEvent("onInspectionUploaded", refNum, nonce)
+        if let json = self.dictionaryToJSONString(inspectionJSON) {
+            data["inspectionJSON"] = json
+        }
+        emit(data)
+    }
+    
+    public func onInspectionUploadFailed(forReferenceNumber refNum: String, inspectionNonce nonce: String, error: any Error) {
+        var data = inspectionEvent("onInspectionUploadFailed", refNum, nonce)
+        data["error"] = error.localizedDescription
+        emit(data)
+    }
+
+    public func onInspectionUploadProgress(forReferenceNumber refNum: String, inspectionNonce nonce: String, percentComplete: CGFloat) {
+        var data = inspectionEvent("onInspectionUploadProgress", refNum, nonce)
+        data["percentComplete"] = Double(percentComplete)
+        emit(data)
+    }
+
     func dictionaryToJSONString(_ dict: [AnyHashable: Any]) -> String? {
         do {
             // Check if the dictionary is valid for JSON serialization

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-record360sdk",
-  "version": "7.24.0",
+  "version": "7.30.1",
   "description": "Capacitor wrapper for Record360SDK",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -19,10 +19,10 @@
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Record360/record360-capacitor-plugin.git.git"
+    "url": "git+https://github.com/Record360/record360-capacitor-plugin.git"
   },
   "bugs": {
-    "url": "https://github.com/Record360/record360-capacitor-plugin.git/issues"
+    "url": "https://github.com/Record360/record360-capacitor-plugin/issues"
   },
   "keywords": [
     "capacitor",