@blueid/access-capacitor 0.98.0 → 0.100.0

package/ios/CBlueIDAccess.xcframework/Info.plist

@@ -10,18 +10,15 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>BinaryPath</key>
@@ -46,15 +43,18 @@
 			<key>HeadersPath</key>
 			<string>Headers</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>libCBlueIDAccess.a</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

package/ios/CBlueIDAccess.xcframework/ios-arm64/Headers/core/BlueCore.pb.h

@@ -139,10 +139,12 @@ typedef enum BlueCredentialType {
     BlueCredentialType_Regular = 1,
     /* Maintenance can open and update all locks within the site */
     BlueCredentialType_Maintenance = 2,
-    /* Master can open all locks within the given site and requires no refresh */
+    /* Master can open all locks within the given site */
     BlueCredentialType_Master = 3,
     /* Nfc writer allows to write any credential within this site on cards & fobs */
-    BlueCredentialType_NfcWriter = 4
+    BlueCredentialType_NfcWriter = 4,
+    /* Emergency can open all locks within given site, requires no refresh and has no validity */
+    BlueCredentialType_Emergency = 5
 } pb_packed BlueCredentialType_t;
 
 typedef enum BlueAccessType {
@@ -251,6 +253,10 @@ typedef enum BlueOssSoCredentialTypeOssCredential {
     BlueOssSoCredentialTypeOssCredential_InterventionMedia = 1
 } pb_packed BlueOssSoCredentialTypeOssCredential_t;
 
+typedef enum BlueOssSoDoorGroupId {
+    BlueOssSoDoorGroupId_MasterGroupId = 0
+} pb_packed BlueOssSoDoorGroupId_t;
+
 typedef enum BlueOssSoDoorInfoAccessBy {
     BlueOssSoDoorInfoAccessBy_DoorGroupId = 0,
     BlueOssSoDoorInfoAccessBy_DoorId = 1
@@ -377,10 +383,12 @@ typedef struct BlueSPResult {
 typedef struct BlueOssAccessResult {
     /* If access is granted or not */
     bool accessGranted;
-    /* The final access type */
+    /* The final access type that was used if access was granted */
     BlueAccessType_t accessType;
-    /* If access type is a toggle then this specifies the time it should lock
- again */
+    /* Additional access info if was granted, depends on device
+ For locks for example this would contain the BlueLockState */
+    uint8_t accessInfo;
+    /* Defines when the used schedule actually ends if any if access was granted */
     BlueLocalTimestamp_t scheduleEndTime;
     /* If access denied this marks if it was denied due a schedule missmatch */
     bool scheduleMissmatch;
@@ -734,8 +742,8 @@ extern "C" {
 #define _BLUEWEEKDAY_ARRAYSIZE ((BlueWeekday_t)(BlueWeekday_Sunday+1))
 
 #define _BLUECREDENTIALTYPE_MIN BlueCredentialType_Regular
-#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_NfcWriter
-#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_NfcWriter+1))
+#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_Emergency
+#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_Emergency+1))
 
 #define _BLUEACCESSTYPE_MIN BlueAccessType_DefaultTime
 #define _BLUEACCESSTYPE_MAX BlueAccessType_NoAccessBlacklisted
@@ -773,6 +781,10 @@ extern "C" {
 #define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_MAX BlueOssSoCredentialTypeOssCredential_InterventionMedia
 #define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_ARRAYSIZE ((BlueOssSoCredentialTypeOssCredential_t)(BlueOssSoCredentialTypeOssCredential_InterventionMedia+1))
 
+#define _BLUEOSSSODOORGROUPID_MIN BlueOssSoDoorGroupId_MasterGroupId
+#define _BLUEOSSSODOORGROUPID_MAX BlueOssSoDoorGroupId_MasterGroupId
+#define _BLUEOSSSODOORGROUPID_ARRAYSIZE ((BlueOssSoDoorGroupId_t)(BlueOssSoDoorGroupId_MasterGroupId+1))
+
 #define _BLUEOSSSODOORINFOACCESSBY_MIN BlueOssSoDoorInfoAccessBy_DoorGroupId
 #define _BLUEOSSSODOORINFOACCESSBY_MAX BlueOssSoDoorInfoAccessBy_DoorId
 #define _BLUEOSSSODOORINFOACCESSBY_ARRAYSIZE ((BlueOssSoDoorInfoAccessBy_t)(BlueOssSoDoorInfoAccessBy_DoorId+1))
@@ -864,7 +876,7 @@ extern "C" {
 #define BLUESPTOKENCOMMAND_INIT_DEFAULT          {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, "", {0, {0}}}
 #define BLUESPTOKEN_INIT_DEFAULT                 {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_DEFAULT}}
 #define BLUESPRESULT_INIT_DEFAULT                {{0, {0}}}
-#define BLUEOSSACCESSRESULT_INIT_DEFAULT         {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
+#define BLUEOSSACCESSRESULT_INIT_DEFAULT         {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
 #define BLUEOSSACCESSEVENTSRESULT_INIT_DEFAULT   {BLUEOSSACCESSRESULT_INIT_DEFAULT, 0, {BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT}}
 #define BLUEOSSSIDVERSION_INIT_DEFAULT           {false, 1u, false, 0u}
 #define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_DEFAULT {false, 0}
@@ -920,7 +932,7 @@ extern "C" {
 #define BLUESPTOKENCOMMAND_INIT_ZERO             {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, "", {0, {0}}}
 #define BLUESPTOKEN_INIT_ZERO                    {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_ZERO}}
 #define BLUESPRESULT_INIT_ZERO                   {{0, {0}}}
-#define BLUEOSSACCESSRESULT_INIT_ZERO            {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
+#define BLUEOSSACCESSRESULT_INIT_ZERO            {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
 #define BLUEOSSACCESSEVENTSRESULT_INIT_ZERO      {BLUEOSSACCESSRESULT_INIT_ZERO, 0, {BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO}}
 #define BLUEOSSSIDVERSION_INIT_ZERO              {false, 0, false, 0}
 #define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_ZERO    {false, 0}
@@ -1013,8 +1025,9 @@ extern "C" {
 #define BLUESPRESULT_DATA_TAG                    1
 #define BLUEOSSACCESSRESULT_ACCESSGRANTED_TAG    1
 #define BLUEOSSACCESSRESULT_ACCESSTYPE_TAG       2
-#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG  3
-#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 4
+#define BLUEOSSACCESSRESULT_ACCESSINFO_TAG       3
+#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG  4
+#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 5
 #define BLUEOSSACCESSEVENTSRESULT_ACCESSRESULT_TAG 1
 #define BLUEOSSACCESSEVENTSRESULT_EVENTS_TAG     2
 #define BLUEOSSSIDVERSION_VERSIONMAJOR_TAG       1
@@ -1278,8 +1291,9 @@ X(a, STATIC,   REQUIRED, BYTES,    data,              1)
 #define BLUEOSSACCESSRESULT_FIELDLIST(X, a) \
 X(a, STATIC,   REQUIRED, BOOL,     accessGranted,     1) \
 X(a, STATIC,   REQUIRED, UENUM,    accessType,        2) \
-X(a, STATIC,   REQUIRED, MESSAGE,  scheduleEndTime,   3) \
-X(a, STATIC,   REQUIRED, BOOL,     scheduleMissmatch,   4)
+X(a, STATIC,   REQUIRED, UINT32,   accessInfo,        3) \
+X(a, STATIC,   REQUIRED, MESSAGE,  scheduleEndTime,   4) \
+X(a, STATIC,   REQUIRED, BOOL,     scheduleMissmatch,   5)
 #define BLUEOSSACCESSRESULT_CALLBACK NULL
 #define BLUEOSSACCESSRESULT_DEFAULT (const pb_byte_t*)"\x10\x01\x00"
 #define BlueOssAccessResult_t_scheduleEndTime_MSGTYPE BlueLocalTimestamp_t
@@ -1733,8 +1747,8 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
 #define BLUELOCALTIMEPERIOD_SIZE                 12
 #define BLUELOCALTIMESCHEDULE_SIZE               36
 #define BLUELOCALTIMESTAMP_SIZE                  19
-#define BLUEOSSACCESSEVENTSRESULT_SIZE           1085
-#define BLUEOSSACCESSRESULT_SIZE                 27
+#define BLUEOSSACCESSEVENTSRESULT_SIZE           1088
+#define BLUEOSSACCESSRESULT_SIZE                 30
 #define BLUEOSSSIDCONFIGURATION_SIZE             47
 #define BLUEOSSSIDCREDENTIALTYPEOSS_SIZE         2
 #define BLUEOSSSIDCREDENTIALTYPEPROPRIETARY_SIZE 9

package/ios/CBlueIDAccess.xcframework/ios-arm64/Headers/core/oss/BlueOss.h

@@ -27,7 +27,7 @@ typedef enum BlueOssPrepareMode
         },                                        \
     }
 
-typedef BlueReturnCode_t (*BlueOssGrantAccessFunc_t)(void *pContext, BlueAccessType_t accessType, const BlueLocalTimestamp_t *const pScheduleEndTime);
+typedef BlueReturnCode_t (*BlueOssGrantAccessFunc_t)(void *pContext, BlueAccessType_t accessType, const BlueLocalTimestamp_t *const pScheduleEndTime, uint8_t *const pAccessInfo);
 typedef BlueReturnCode_t (*BlueOssDenyAccessFunc_t)(void *pContext, BlueAccessType_t accessType);
 
 #ifdef __cplusplus

package/ios/CBlueIDAccess.xcframework/ios-arm64_x86_64-simulator/Headers/core/BlueCore.pb.h

@@ -139,10 +139,12 @@ typedef enum BlueCredentialType {
     BlueCredentialType_Regular = 1,
     /* Maintenance can open and update all locks within the site */
     BlueCredentialType_Maintenance = 2,
-    /* Master can open all locks within the given site and requires no refresh */
+    /* Master can open all locks within the given site */
     BlueCredentialType_Master = 3,
     /* Nfc writer allows to write any credential within this site on cards & fobs */
-    BlueCredentialType_NfcWriter = 4
+    BlueCredentialType_NfcWriter = 4,
+    /* Emergency can open all locks within given site, requires no refresh and has no validity */
+    BlueCredentialType_Emergency = 5
 } pb_packed BlueCredentialType_t;
 
 typedef enum BlueAccessType {
@@ -251,6 +253,10 @@ typedef enum BlueOssSoCredentialTypeOssCredential {
     BlueOssSoCredentialTypeOssCredential_InterventionMedia = 1
 } pb_packed BlueOssSoCredentialTypeOssCredential_t;
 
+typedef enum BlueOssSoDoorGroupId {
+    BlueOssSoDoorGroupId_MasterGroupId = 0
+} pb_packed BlueOssSoDoorGroupId_t;
+
 typedef enum BlueOssSoDoorInfoAccessBy {
     BlueOssSoDoorInfoAccessBy_DoorGroupId = 0,
     BlueOssSoDoorInfoAccessBy_DoorId = 1
@@ -377,10 +383,12 @@ typedef struct BlueSPResult {
 typedef struct BlueOssAccessResult {
     /* If access is granted or not */
     bool accessGranted;
-    /* The final access type */
+    /* The final access type that was used if access was granted */
     BlueAccessType_t accessType;
-    /* If access type is a toggle then this specifies the time it should lock
- again */
+    /* Additional access info if was granted, depends on device
+ For locks for example this would contain the BlueLockState */
+    uint8_t accessInfo;
+    /* Defines when the used schedule actually ends if any if access was granted */
     BlueLocalTimestamp_t scheduleEndTime;
     /* If access denied this marks if it was denied due a schedule missmatch */
     bool scheduleMissmatch;
@@ -734,8 +742,8 @@ extern "C" {
 #define _BLUEWEEKDAY_ARRAYSIZE ((BlueWeekday_t)(BlueWeekday_Sunday+1))
 
 #define _BLUECREDENTIALTYPE_MIN BlueCredentialType_Regular
-#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_NfcWriter
-#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_NfcWriter+1))
+#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_Emergency
+#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_Emergency+1))
 
 #define _BLUEACCESSTYPE_MIN BlueAccessType_DefaultTime
 #define _BLUEACCESSTYPE_MAX BlueAccessType_NoAccessBlacklisted
@@ -773,6 +781,10 @@ extern "C" {
 #define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_MAX BlueOssSoCredentialTypeOssCredential_InterventionMedia
 #define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_ARRAYSIZE ((BlueOssSoCredentialTypeOssCredential_t)(BlueOssSoCredentialTypeOssCredential_InterventionMedia+1))
 
+#define _BLUEOSSSODOORGROUPID_MIN BlueOssSoDoorGroupId_MasterGroupId
+#define _BLUEOSSSODOORGROUPID_MAX BlueOssSoDoorGroupId_MasterGroupId
+#define _BLUEOSSSODOORGROUPID_ARRAYSIZE ((BlueOssSoDoorGroupId_t)(BlueOssSoDoorGroupId_MasterGroupId+1))
+
 #define _BLUEOSSSODOORINFOACCESSBY_MIN BlueOssSoDoorInfoAccessBy_DoorGroupId
 #define _BLUEOSSSODOORINFOACCESSBY_MAX BlueOssSoDoorInfoAccessBy_DoorId
 #define _BLUEOSSSODOORINFOACCESSBY_ARRAYSIZE ((BlueOssSoDoorInfoAccessBy_t)(BlueOssSoDoorInfoAccessBy_DoorId+1))
@@ -864,7 +876,7 @@ extern "C" {
 #define BLUESPTOKENCOMMAND_INIT_DEFAULT          {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, "", {0, {0}}}
 #define BLUESPTOKEN_INIT_DEFAULT                 {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_DEFAULT}}
 #define BLUESPRESULT_INIT_DEFAULT                {{0, {0}}}
-#define BLUEOSSACCESSRESULT_INIT_DEFAULT         {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
+#define BLUEOSSACCESSRESULT_INIT_DEFAULT         {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
 #define BLUEOSSACCESSEVENTSRESULT_INIT_DEFAULT   {BLUEOSSACCESSRESULT_INIT_DEFAULT, 0, {BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT}}
 #define BLUEOSSSIDVERSION_INIT_DEFAULT           {false, 1u, false, 0u}
 #define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_DEFAULT {false, 0}
@@ -920,7 +932,7 @@ extern "C" {
 #define BLUESPTOKENCOMMAND_INIT_ZERO             {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, "", {0, {0}}}
 #define BLUESPTOKEN_INIT_ZERO                    {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_ZERO}}
 #define BLUESPRESULT_INIT_ZERO                   {{0, {0}}}
-#define BLUEOSSACCESSRESULT_INIT_ZERO            {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
+#define BLUEOSSACCESSRESULT_INIT_ZERO            {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
 #define BLUEOSSACCESSEVENTSRESULT_INIT_ZERO      {BLUEOSSACCESSRESULT_INIT_ZERO, 0, {BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO}}
 #define BLUEOSSSIDVERSION_INIT_ZERO              {false, 0, false, 0}
 #define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_ZERO    {false, 0}
@@ -1013,8 +1025,9 @@ extern "C" {
 #define BLUESPRESULT_DATA_TAG                    1
 #define BLUEOSSACCESSRESULT_ACCESSGRANTED_TAG    1
 #define BLUEOSSACCESSRESULT_ACCESSTYPE_TAG       2
-#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG  3
-#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 4
+#define BLUEOSSACCESSRESULT_ACCESSINFO_TAG       3
+#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG  4
+#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 5
 #define BLUEOSSACCESSEVENTSRESULT_ACCESSRESULT_TAG 1
 #define BLUEOSSACCESSEVENTSRESULT_EVENTS_TAG     2
 #define BLUEOSSSIDVERSION_VERSIONMAJOR_TAG       1
@@ -1278,8 +1291,9 @@ X(a, STATIC,   REQUIRED, BYTES,    data,              1)
 #define BLUEOSSACCESSRESULT_FIELDLIST(X, a) \
 X(a, STATIC,   REQUIRED, BOOL,     accessGranted,     1) \
 X(a, STATIC,   REQUIRED, UENUM,    accessType,        2) \
-X(a, STATIC,   REQUIRED, MESSAGE,  scheduleEndTime,   3) \
-X(a, STATIC,   REQUIRED, BOOL,     scheduleMissmatch,   4)
+X(a, STATIC,   REQUIRED, UINT32,   accessInfo,        3) \
+X(a, STATIC,   REQUIRED, MESSAGE,  scheduleEndTime,   4) \
+X(a, STATIC,   REQUIRED, BOOL,     scheduleMissmatch,   5)
 #define BLUEOSSACCESSRESULT_CALLBACK NULL
 #define BLUEOSSACCESSRESULT_DEFAULT (const pb_byte_t*)"\x10\x01\x00"
 #define BlueOssAccessResult_t_scheduleEndTime_MSGTYPE BlueLocalTimestamp_t
@@ -1733,8 +1747,8 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
 #define BLUELOCALTIMEPERIOD_SIZE                 12
 #define BLUELOCALTIMESCHEDULE_SIZE               36
 #define BLUELOCALTIMESTAMP_SIZE                  19
-#define BLUEOSSACCESSEVENTSRESULT_SIZE           1085
-#define BLUEOSSACCESSRESULT_SIZE                 27
+#define BLUEOSSACCESSEVENTSRESULT_SIZE           1088
+#define BLUEOSSACCESSRESULT_SIZE                 30
 #define BLUEOSSSIDCONFIGURATION_SIZE             47
 #define BLUEOSSSIDCREDENTIALTYPEOSS_SIZE         2
 #define BLUEOSSSIDCREDENTIALTYPEPROPRIETARY_SIZE 9

package/ios/CBlueIDAccess.xcframework/ios-arm64_x86_64-simulator/Headers/core/oss/BlueOss.h

@@ -27,7 +27,7 @@ typedef enum BlueOssPrepareMode
         },                                        \
     }
 
-typedef BlueReturnCode_t (*BlueOssGrantAccessFunc_t)(void *pContext, BlueAccessType_t accessType, const BlueLocalTimestamp_t *const pScheduleEndTime);
+typedef BlueReturnCode_t (*BlueOssGrantAccessFunc_t)(void *pContext, BlueAccessType_t accessType, const BlueLocalTimestamp_t *const pScheduleEndTime, uint8_t *const pAccessInfo);
 typedef BlueReturnCode_t (*BlueOssDenyAccessFunc_t)(void *pContext, BlueAccessType_t accessType);
 
 #ifdef __cplusplus

package/ios/CBlueIDAccess.xcframework/macos-arm64_x86_64/Headers/core/BlueCore.pb.h

@@ -139,10 +139,12 @@ typedef enum BlueCredentialType {
     BlueCredentialType_Regular = 1,
     /* Maintenance can open and update all locks within the site */
     BlueCredentialType_Maintenance = 2,
-    /* Master can open all locks within the given site and requires no refresh */
+    /* Master can open all locks within the given site */
     BlueCredentialType_Master = 3,
     /* Nfc writer allows to write any credential within this site on cards & fobs */
-    BlueCredentialType_NfcWriter = 4
+    BlueCredentialType_NfcWriter = 4,
+    /* Emergency can open all locks within given site, requires no refresh and has no validity */
+    BlueCredentialType_Emergency = 5
 } pb_packed BlueCredentialType_t;
 
 typedef enum BlueAccessType {
@@ -251,6 +253,10 @@ typedef enum BlueOssSoCredentialTypeOssCredential {
     BlueOssSoCredentialTypeOssCredential_InterventionMedia = 1
 } pb_packed BlueOssSoCredentialTypeOssCredential_t;
 
+typedef enum BlueOssSoDoorGroupId {
+    BlueOssSoDoorGroupId_MasterGroupId = 0
+} pb_packed BlueOssSoDoorGroupId_t;
+
 typedef enum BlueOssSoDoorInfoAccessBy {
     BlueOssSoDoorInfoAccessBy_DoorGroupId = 0,
     BlueOssSoDoorInfoAccessBy_DoorId = 1
@@ -377,10 +383,12 @@ typedef struct BlueSPResult {
 typedef struct BlueOssAccessResult {
     /* If access is granted or not */
     bool accessGranted;
-    /* The final access type */
+    /* The final access type that was used if access was granted */
     BlueAccessType_t accessType;
-    /* If access type is a toggle then this specifies the time it should lock
- again */
+    /* Additional access info if was granted, depends on device
+ For locks for example this would contain the BlueLockState */
+    uint8_t accessInfo;
+    /* Defines when the used schedule actually ends if any if access was granted */
     BlueLocalTimestamp_t scheduleEndTime;
     /* If access denied this marks if it was denied due a schedule missmatch */
     bool scheduleMissmatch;
@@ -734,8 +742,8 @@ extern "C" {
 #define _BLUEWEEKDAY_ARRAYSIZE ((BlueWeekday_t)(BlueWeekday_Sunday+1))
 
 #define _BLUECREDENTIALTYPE_MIN BlueCredentialType_Regular
-#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_NfcWriter
-#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_NfcWriter+1))
+#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_Emergency
+#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_Emergency+1))
 
 #define _BLUEACCESSTYPE_MIN BlueAccessType_DefaultTime
 #define _BLUEACCESSTYPE_MAX BlueAccessType_NoAccessBlacklisted
@@ -773,6 +781,10 @@ extern "C" {
 #define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_MAX BlueOssSoCredentialTypeOssCredential_InterventionMedia
 #define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_ARRAYSIZE ((BlueOssSoCredentialTypeOssCredential_t)(BlueOssSoCredentialTypeOssCredential_InterventionMedia+1))
 
+#define _BLUEOSSSODOORGROUPID_MIN BlueOssSoDoorGroupId_MasterGroupId
+#define _BLUEOSSSODOORGROUPID_MAX BlueOssSoDoorGroupId_MasterGroupId
+#define _BLUEOSSSODOORGROUPID_ARRAYSIZE ((BlueOssSoDoorGroupId_t)(BlueOssSoDoorGroupId_MasterGroupId+1))
+
 #define _BLUEOSSSODOORINFOACCESSBY_MIN BlueOssSoDoorInfoAccessBy_DoorGroupId
 #define _BLUEOSSSODOORINFOACCESSBY_MAX BlueOssSoDoorInfoAccessBy_DoorId
 #define _BLUEOSSSODOORINFOACCESSBY_ARRAYSIZE ((BlueOssSoDoorInfoAccessBy_t)(BlueOssSoDoorInfoAccessBy_DoorId+1))
@@ -864,7 +876,7 @@ extern "C" {
 #define BLUESPTOKENCOMMAND_INIT_DEFAULT          {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, "", {0, {0}}}
 #define BLUESPTOKEN_INIT_DEFAULT                 {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_DEFAULT}}
 #define BLUESPRESULT_INIT_DEFAULT                {{0, {0}}}
-#define BLUEOSSACCESSRESULT_INIT_DEFAULT         {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
+#define BLUEOSSACCESSRESULT_INIT_DEFAULT         {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
 #define BLUEOSSACCESSEVENTSRESULT_INIT_DEFAULT   {BLUEOSSACCESSRESULT_INIT_DEFAULT, 0, {BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT, BLUEEVENT_INIT_DEFAULT}}
 #define BLUEOSSSIDVERSION_INIT_DEFAULT           {false, 1u, false, 0u}
 #define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_DEFAULT {false, 0}
@@ -920,7 +932,7 @@ extern "C" {
 #define BLUESPTOKENCOMMAND_INIT_ZERO             {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, "", {0, {0}}}
 #define BLUESPTOKEN_INIT_ZERO                    {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_ZERO}}
 #define BLUESPRESULT_INIT_ZERO                   {{0, {0}}}
-#define BLUEOSSACCESSRESULT_INIT_ZERO            {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
+#define BLUEOSSACCESSRESULT_INIT_ZERO            {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
 #define BLUEOSSACCESSEVENTSRESULT_INIT_ZERO      {BLUEOSSACCESSRESULT_INIT_ZERO, 0, {BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO, BLUEEVENT_INIT_ZERO}}
 #define BLUEOSSSIDVERSION_INIT_ZERO              {false, 0, false, 0}
 #define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_ZERO    {false, 0}
@@ -1013,8 +1025,9 @@ extern "C" {
 #define BLUESPRESULT_DATA_TAG                    1
 #define BLUEOSSACCESSRESULT_ACCESSGRANTED_TAG    1
 #define BLUEOSSACCESSRESULT_ACCESSTYPE_TAG       2
-#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG  3
-#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 4
+#define BLUEOSSACCESSRESULT_ACCESSINFO_TAG       3
+#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG  4
+#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 5
 #define BLUEOSSACCESSEVENTSRESULT_ACCESSRESULT_TAG 1
 #define BLUEOSSACCESSEVENTSRESULT_EVENTS_TAG     2
 #define BLUEOSSSIDVERSION_VERSIONMAJOR_TAG       1
@@ -1278,8 +1291,9 @@ X(a, STATIC,   REQUIRED, BYTES,    data,              1)
 #define BLUEOSSACCESSRESULT_FIELDLIST(X, a) \
 X(a, STATIC,   REQUIRED, BOOL,     accessGranted,     1) \
 X(a, STATIC,   REQUIRED, UENUM,    accessType,        2) \
-X(a, STATIC,   REQUIRED, MESSAGE,  scheduleEndTime,   3) \
-X(a, STATIC,   REQUIRED, BOOL,     scheduleMissmatch,   4)
+X(a, STATIC,   REQUIRED, UINT32,   accessInfo,        3) \
+X(a, STATIC,   REQUIRED, MESSAGE,  scheduleEndTime,   4) \
+X(a, STATIC,   REQUIRED, BOOL,     scheduleMissmatch,   5)
 #define BLUEOSSACCESSRESULT_CALLBACK NULL
 #define BLUEOSSACCESSRESULT_DEFAULT (const pb_byte_t*)"\x10\x01\x00"
 #define BlueOssAccessResult_t_scheduleEndTime_MSGTYPE BlueLocalTimestamp_t
@@ -1733,8 +1747,8 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
 #define BLUELOCALTIMEPERIOD_SIZE                 12
 #define BLUELOCALTIMESCHEDULE_SIZE               36
 #define BLUELOCALTIMESTAMP_SIZE                  19
-#define BLUEOSSACCESSEVENTSRESULT_SIZE           1085
-#define BLUEOSSACCESSRESULT_SIZE                 27
+#define BLUEOSSACCESSEVENTSRESULT_SIZE           1088
+#define BLUEOSSACCESSRESULT_SIZE                 30
 #define BLUEOSSSIDCONFIGURATION_SIZE             47
 #define BLUEOSSSIDCREDENTIALTYPEOSS_SIZE         2
 #define BLUEOSSSIDCREDENTIALTYPEPROPRIETARY_SIZE 9

package/ios/CBlueIDAccess.xcframework/macos-arm64_x86_64/Headers/core/oss/BlueOss.h

@@ -27,7 +27,7 @@ typedef enum BlueOssPrepareMode
         },                                        \
     }
 
-typedef BlueReturnCode_t (*BlueOssGrantAccessFunc_t)(void *pContext, BlueAccessType_t accessType, const BlueLocalTimestamp_t *const pScheduleEndTime);
+typedef BlueReturnCode_t (*BlueOssGrantAccessFunc_t)(void *pContext, BlueAccessType_t accessType, const BlueLocalTimestamp_t *const pScheduleEndTime, uint8_t *const pAccessInfo);
 typedef BlueReturnCode_t (*BlueOssDenyAccessFunc_t)(void *pContext, BlueAccessType_t accessType);
 
 #ifdef __cplusplus

package/ios/Plugin/BlueIDAccessSDK/BlueAccess.swift

@@ -40,22 +40,22 @@ public class BlueClaimAccessCredentialCommand: BlueSdkAsyncCommand {
     }
 }
 
-public struct BlueGetAccessCredentialsCommand: BlueAsyncCommand {
-    internal func runAsync(arg0: Any?, arg1: Any?, arg2: Any?) async throws -> Any? {
+public struct BlueGetAccessCredentialsCommand: BlueCommand {
+    func run(arg0: Any?, arg1: Any?, arg2: Any?) throws -> Any? {
         var credentialType: BlueCredentialType?
         
         if let rawValue = try blueCastArg(Int.self, arg0) {
             credentialType = BlueCredentialType(rawValue: rawValue)
         }
         
-        return try await runAsync(
+        return try run(
             credentialType: credentialType,
             for: blueCastArg(String.self, arg1),
             includePrivateKey: false
         )
     }
     
-    public func runAsync(credentialType: BlueCredentialType? = nil, for deviceID: String? = nil, includePrivateKey: Bool? = false) async throws -> BlueAccessCredentialList {
+    public func run(credentialType: BlueCredentialType? = nil, for deviceID: String? = nil, includePrivateKey: Bool? = false) throws -> BlueAccessCredentialList {
         let filterByCredentialType = { (_ credential: BlueAccessCredential) -> Bool in
             guard let credentialType = credentialType else {
                 return true
@@ -321,11 +321,19 @@ public class BlueSynchronizeAccessDeviceCommand: BlueSdkAsyncCommand {
     
     private func waitUntilDeviceHasBeenRestarted(_ deviceID: String) async throws {
         do {
-            try? await Task.sleep(nanoseconds: UInt64(blueSecondsToNanoseconds(30)))
+            var attempts = 0
             
-            if blueGetDevice(deviceID) == nil {
-                throw BlueError(.sdkDeviceNotFound)
+            while attempts <= 2 {
+                try? await Task.sleep(nanoseconds: UInt64(blueSecondsToNanoseconds(10)))
+                
+                if blueGetDevice(deviceID) != nil {
+                    return
+                }
+                
+                attempts += 1
             }
+            
+            throw BlueError(.sdkDeviceNotFound)
         } catch {
             throw BlueError(.sdkWaitDeviceToRestartFailed, cause: error)
         }
@@ -534,13 +542,23 @@ public struct BlueListAccessDevicesCommand: BlueAsyncCommand {
             credentialType = BlueCredentialType(rawValue: credentialTypeRawValue)
         }
         
-        return try await runAsync(credentialType: credentialType)
+        return try await runAsync(
+            credentialType: credentialType,
+            suppressCredentialValidityStart: blueCastArg(Bool.self, arg1)
+        )
     }
     
-    public func runAsync(credentialType: BlueCredentialType? = nil) async throws -> BlueAccessDeviceList {
-        let credentialList = try await BlueGetAccessCredentialsCommand().runAsync(credentialType: credentialType)
+    public func runAsync(credentialType: BlueCredentialType? = nil, suppressCredentialValidityStart: Bool? = false) async throws -> BlueAccessDeviceList {
+        let credentialList = try BlueGetAccessCredentialsCommand().run(credentialType: credentialType)
         
         let devices = credentialList.credentials.compactMap { credential in
+            
+            if (suppressCredentialValidityStart != true) {
+                if (!credential.checkValidityStart()) {
+                    return [BlueAccessDevice]()
+                }
+            }
+            
             let deviceList = try? BlueGetAccessDevicesCommand().run(credentialID: credential.credentialID.id)
             
             return deviceList?.devices

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSync.swift

@@ -199,7 +199,7 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueSdkAsyncCommand {
             throw BlueError(.sdkUnsupportedPlatform)
         }
         
-        let credentials = try await BlueGetAccessCredentialsCommand().runAsync().credentials
+        let credentials = try BlueGetAccessCredentialsCommand().run().credentials
         
         if (credentials.isEmpty) {
             return BlueSynchronizeAccessCredentials()
@@ -251,7 +251,7 @@ public class BlueSynchronizeAccessCredentialsCommand: BlueSdkAsyncCommand {
     /// Purges orphaned tokens.
     private func purgeTokens() async {
         do {
-            let credentialIds = try await BlueGetAccessCredentialsCommand().runAsync().credentials.compactMap { $0.credentialID.id }
+            let credentialIds = try BlueGetAccessCredentialsCommand().run().credentials.compactMap { $0.credentialID.id }
             
             try blueGetSpTokenEntryIds().forEach{ entryID in
                 do {

package/ios/Plugin/BlueIDAccessSDK/BlueAccessSyncScheduler.swift

@@ -14,11 +14,6 @@ private class ForegroundScheduler {
     }
     
     func schedule(_ now: Bool? = false) {
-        guard #available(macOS 10.15, *) else {
-            blueLogWarn("Unsupported platform")
-            return
-        }
-        
         suspend()
         
         if now == true {
@@ -26,7 +21,7 @@ private class ForegroundScheduler {
         } else {
             blueRunInMainThread {
                 self.timer = Timer.scheduledTimer(
-                    timeInterval: self.scheduler!.timeInterval,
+                    timeInterval: self.scheduler!.calculateNextInterval(),
                     target: self,
                     selector: #selector(self.handleTask),
                     userInfo: nil,
@@ -36,7 +31,6 @@ private class ForegroundScheduler {
         }
     }
     
-    @available(macOS 10.15, *)
     @objc private func handleTask() {
         DispatchQueue.global(qos: .background).async {
             Task {
@@ -142,4 +136,28 @@ internal class BlueAccessSyncScheduler: BlueEventListener {
         
         _ = try await command.runAsync()
     }
+    
+    func calculateNextInterval(_ now: Date? = nil) -> TimeInterval {
+        var interval: TimeInterval = self.timeInterval
+        
+        if let credentials = try? blueCommands.getAccessCredentials.run().credentials {
+            if (!credentials.isEmpty) {
+                credentials.forEach { credential in
+                    if (!credential.checkValidityStart()) {
+                        if let validFrom = credential.validFrom.toDate() {
+                            let now = now ?? Date()
+                            
+                            if validFrom > now {
+                                let differenceInSeconds = validFrom.timeIntervalSince(now)
+                                
+                                interval = min(differenceInSeconds, interval)
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        return interval
+    }
 }