@blueid/access-proto 0.22.0 → 0.24.0

package/es/BlueSDK_pb.js

@@ -4,7 +4,7 @@
 // @ts-nocheck
 
 import { proto2 } from "@bufbuild/protobuf";
-import { BlueBleManufacturerInfo } from "./BlueCore_pb.js";
+import { BlueBleManufacturerInfo, BlueCredentialId, BlueCredentialType, BlueLocalTimestamp } from "./BlueCore_pb.js";
 
 /**
  * @generated from enum BlueDeviceType
@@ -71,3 +71,38 @@ export const BlueDeviceInfo = proto2.makeMessageType(
   ],
 );
 
+/**
+ * @generated from message BlueAccessCredential
+ */
+export const BlueAccessCredential = proto2.makeMessageType(
+  "BlueAccessCredential",
+  () => [
+    { no: 1, name: "credentialId", kind: "message", T: BlueCredentialId },
+    { no: 2, name: "credentialType", kind: "enum", T: proto2.getEnumType(BlueCredentialType) },
+    { no: 3, name: "validFrom", kind: "message", T: BlueLocalTimestamp, opt: true },
+    { no: 4, name: "validTo", kind: "message", T: BlueLocalTimestamp, opt: true },
+    { no: 5, name: "privateKey", kind: "scalar", T: 12 /* ScalarType.BYTES */ },
+  ],
+);
+
+/**
+ * @generated from message BlueAccessDevice
+ */
+export const BlueAccessDevice = proto2.makeMessageType(
+  "BlueAccessDevice",
+  () => [
+    { no: 1, name: "deviceId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 2, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
+  ],
+);
+
+/**
+ * @generated from message BlueAccessDeviceList
+ */
+export const BlueAccessDeviceList = proto2.makeMessageType(
+  "BlueAccessDeviceList",
+  () => [
+    { no: 1, name: "devices", kind: "message", T: BlueAccessDevice, repeated: true },
+  ],
+);
+

package/es/BlueSystem_pb.d.ts

@@ -622,35 +622,10 @@ export declare class BlueSystemStatus extends Message<BlueSystemStatus> {
    */
   settings?: BlueSystemSettings;
 
-  /**
-   * @generated from field: required uint32 blacklistEntriesCount = 9;
-   */
-  blacklistEntriesCount: number;
-
-  /**
-   * @generated from field: required uint32 eventLogEntriesCount = 10;
-   */
-  eventLogEntriesCount: number;
-
-  /**
-   * @generated from field: required uint32 eventLogSequenceId = 11;
-   */
-  eventLogSequenceId: number;
-
-  /**
-   * @generated from field: required uint32 systemLogEntriesCount = 12;
-   */
-  systemLogEntriesCount: number;
-
-  /**
-   * @generated from field: required uint32 systemLogSequenceId = 13;
-   */
-  systemLogSequenceId: number;
-
   /**
    * -- Custom
    *
-   * @generated from field: optional BlueLockStatus lock = 14;
+   * @generated from field: optional BlueLockStatus lock = 9;
    */
   lock?: BlueLockStatus;
 

package/es/BlueSystem_pb.js

@@ -180,12 +180,7 @@ export const BlueSystemStatus = proto2.makeMessageType(
     { no: 6, name: "applicationVersion", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
     { no: 7, name: "localTime", kind: "message", T: BlueLocalTimestamp },
     { no: 8, name: "settings", kind: "message", T: BlueSystemSettings },
-    { no: 9, name: "blacklistEntriesCount", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
-    { no: 10, name: "eventLogEntriesCount", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
-    { no: 11, name: "eventLogSequenceId", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
-    { no: 12, name: "systemLogEntriesCount", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
-    { no: 13, name: "systemLogSequenceId", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
-    { no: 14, name: "lock", kind: "message", T: BlueLockStatus, opt: true },
+    { no: 9, name: "lock", kind: "message", T: BlueLockStatus, opt: true },
   ],
 );
 

package/nanopb/BlueCore.pb.c

@@ -186,3 +186,4 @@ PB_BIND(_BLUETESTENCODEDECODE, _BlueTestEncodeDecode_t, AUTO)
 
 
 
+

package/nanopb/BlueCore.pb.h

@@ -112,6 +112,17 @@ typedef enum BlueWeekday {
     BlueWeekday_Sunday = 6
 } BlueWeekday_t;
 
+typedef enum BlueCredentialType {
+    /* Regular credential can only open / enter */
+    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 */
+    BlueCredentialType_Master = 3,
+    /* Nfc writer allows to write any credential within this site on cards & fobs */
+    BlueCredentialType_NfcWriter = 4
+} BlueCredentialType_t;
+
 typedef enum BlueAccessType {
     /* Access with default unlock time */
     BlueAccessType_DefaultTime = 1,
@@ -308,9 +319,9 @@ typedef struct BlueEvent {
     BlueLocalTimestamp_t eventTime;
     BlueEventId_t eventId;
     int32_t eventInfo;
-    /* Set if identity related */
-    bool has_identity;
-    char identity[11];
+    /* Set if credential related */
+    bool has_credentialId;
+    BlueCredentialId_t credentialId;
     /* Set if eventId = */
     bool has_command;
     char command[9];
@@ -689,6 +700,10 @@ extern "C" {
 #define _BLUEWEEKDAY_MAX BlueWeekday_Sunday
 #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 _BLUEACCESSTYPE_MIN BlueAccessType_DefaultTime
 #define _BLUEACCESSTYPE_MAX BlueAccessType_NoAccessBlacklisted
 #define _BLUEACCESSTYPE_ARRAYSIZE ((BlueAccessType_t)(BlueAccessType_NoAccessBlacklisted+1))
@@ -809,7 +824,7 @@ extern "C" {
 #define BLUEBLACKLISTENTRY_INIT_DEFAULT          {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT}
 #define BLUEBLEMANUFACTURERINFO_INIT_DEFAULT     {_BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, 0, 0}
 #define BLUEBLEADVERTISEMENTINFO_INIT_DEFAULT    {"", 0, 0, BLUEBLEMANUFACTURERINFO_INIT_DEFAULT}
-#define BLUEEVENT_INIT_DEFAULT                   {0, BLUELOCALTIMESTAMP_INIT_DEFAULT, _BLUEEVENTID_MIN, 0, false, "", false, ""}
+#define BLUEEVENT_INIT_DEFAULT                   {0, BLUELOCALTIMESTAMP_INIT_DEFAULT, _BLUEEVENTID_MIN, 0, false, BLUECREDENTIALID_INIT_DEFAULT, false, ""}
 #define BLUESPHANDSHAKE_INIT_DEFAULT             {{0}}
 #define BLUESPHANDSHAKEREPLY_INIT_DEFAULT        {{0}, {0, {0}}}
 #define BLUESPTOKENCOMMAND_INIT_DEFAULT          {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, "", {0, {0}}}
@@ -864,7 +879,7 @@ extern "C" {
 #define BLUEBLACKLISTENTRY_INIT_ZERO             {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO}
 #define BLUEBLEMANUFACTURERINFO_INIT_ZERO        {_BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, 0, 0}
 #define BLUEBLEADVERTISEMENTINFO_INIT_ZERO       {"", 0, 0, BLUEBLEMANUFACTURERINFO_INIT_ZERO}
-#define BLUEEVENT_INIT_ZERO                      {0, BLUELOCALTIMESTAMP_INIT_ZERO, _BLUEEVENTID_MIN, 0, false, "", false, ""}
+#define BLUEEVENT_INIT_ZERO                      {0, BLUELOCALTIMESTAMP_INIT_ZERO, _BLUEEVENTID_MIN, 0, false, BLUECREDENTIALID_INIT_ZERO, false, ""}
 #define BLUESPHANDSHAKE_INIT_ZERO                {{0}}
 #define BLUESPHANDSHAKEREPLY_INIT_ZERO           {{0}, {0, {0}}}
 #define BLUESPTOKENCOMMAND_INIT_ZERO             {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, "", {0, {0}}}
@@ -949,7 +964,7 @@ extern "C" {
 #define BLUEEVENT_EVENTTIME_TAG                  2
 #define BLUEEVENT_EVENTID_TAG                    4
 #define BLUEEVENT_EVENTINFO_TAG                  5
-#define BLUEEVENT_IDENTITY_TAG                   6
+#define BLUEEVENT_CREDENTIALID_TAG               6
 #define BLUEEVENT_COMMAND_TAG                    7
 #define BLUESPHANDSHAKE_TRANSPONDERSALT_TAG      1
 #define BLUESPHANDSHAKEREPLY_TERMINALSALT_TAG    1
@@ -1174,11 +1189,12 @@ X(a, STATIC,   REQUIRED, UINT32,   sequenceId,        1) \
 X(a, STATIC,   REQUIRED, MESSAGE,  eventTime,         2) \
 X(a, STATIC,   REQUIRED, UENUM,    eventId,           4) \
 X(a, STATIC,   REQUIRED, INT32,    eventInfo,         5) \
-X(a, STATIC,   OPTIONAL, STRING,   identity,          6) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  credentialId,      6) \
 X(a, STATIC,   OPTIONAL, STRING,   command,           7)
 #define BLUEEVENT_CALLBACK NULL
 #define BLUEEVENT_DEFAULT (const pb_byte_t*)"\x20\x01\x00"
 #define BlueEvent_t_eventTime_MSGTYPE BlueLocalTimestamp_t
+#define BlueEvent_t_credentialId_MSGTYPE BlueCredentialId_t
 
 #define BLUESPHANDSHAKE_FIELDLIST(X, a) \
 X(a, STATIC,   REQUIRED, FIXED_LENGTH_BYTES, transponderSalt,   1)
@@ -1661,7 +1677,7 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
 #define BLUEBLEADVERTISEMENTINFO_SIZE            42
 #define BLUEBLEMANUFACTURERINFO_SIZE             17
 #define BLUECREDENTIALID_SIZE                    12
-#define BLUEEVENT_SIZE                           62
+#define BLUEEVENT_SIZE                           64
 #define BLUELOCALTIMEPERIOD_SIZE                 12
 #define BLUELOCALTIMESCHEDULE_SIZE               36
 #define BLUELOCALTIMESTAMP_SIZE                  19

package/nanopb/BlueLock.pb.c

@@ -6,7 +6,7 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
-PB_BIND(BLUELOCKCONFIG, BlueLockConfig_t, 2)
+PB_BIND(BLUELOCKCONFIG, BlueLockConfig_t, AUTO)
 
 
 PB_BIND(BLUELOCKSTATUS, BlueLockStatus_t, AUTO)

package/nanopb/BlueLock.pb.h

@@ -26,9 +26,8 @@ typedef struct BlueLockConfig {
     /* If set to true then the lock opens by schedule only after it was first
  opened by an authenticated user and is within any of the open schedules */
     bool openScheduleByUser;
-    /* Days of year (1-366) the open schedule is ignored (ie vacation days) */
-    pb_size_t closedDays_count;
-    uint32_t closedDays[18];
+    /* If set keeps the lock closed on federal vacation days */
+    bool keepClosedOnHolidays;
     /* Default time in seconds to keep the lock open */
     uint32_t defaultOpenTimeSec;
     /* Extended time in seconds to keep the lock open */
@@ -55,15 +54,15 @@ extern "C" {
 
 
 /* Initializer values for message structs */
-#define BLUELOCKCONFIG_INIT_DEFAULT              {0, {BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT}, false, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 5u, 3600u}
+#define BLUELOCKCONFIG_INIT_DEFAULT              {0, {BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT, BLUELOCALTIMESCHEDULE_INIT_DEFAULT}, false, 0, 5u, 3600u}
 #define BLUELOCKSTATUS_INIT_DEFAULT              {_BLUELOCKSTATE_MIN, 0}
-#define BLUELOCKCONFIG_INIT_ZERO                 {0, {BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO}, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, 0}
+#define BLUELOCKCONFIG_INIT_ZERO                 {0, {BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO, BLUELOCALTIMESCHEDULE_INIT_ZERO}, 0, 0, 0, 0}
 #define BLUELOCKSTATUS_INIT_ZERO                 {_BLUELOCKSTATE_MIN, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define BLUELOCKCONFIG_OPENSCHEDULES_TAG         1
 #define BLUELOCKCONFIG_OPENSCHEDULEBYUSER_TAG    2
-#define BLUELOCKCONFIG_CLOSEDDAYS_TAG            20
+#define BLUELOCKCONFIG_KEEPCLOSEDONHOLIDAYS_TAG  20
 #define BLUELOCKCONFIG_DEFAULTOPENTIMESEC_TAG    21
 #define BLUELOCKCONFIG_EXTENDEDOPENTIMESEC_TAG   22
 #define BLUELOCKSTATUS_STATE_TAG                 1
@@ -73,7 +72,7 @@ extern "C" {
 #define BLUELOCKCONFIG_FIELDLIST(X, a) \
 X(a, STATIC,   REPEATED, MESSAGE,  openSchedules,     1) \
 X(a, STATIC,   REQUIRED, BOOL,     openScheduleByUser,   2) \
-X(a, STATIC,   REPEATED, UINT32,   closedDays,       20) \
+X(a, STATIC,   REQUIRED, BOOL,     keepClosedOnHolidays,  20) \
 X(a, STATIC,   REQUIRED, UINT32,   defaultOpenTimeSec,  21) \
 X(a, STATIC,   REQUIRED, UINT32,   extendedOpenTimeSec,  22)
 #define BLUELOCKCONFIG_CALLBACK NULL
@@ -94,7 +93,7 @@ extern const pb_msgdesc_t BlueLockStatus_t_msg;
 #define BLUELOCKSTATUS_FIELDS &BlueLockStatus_t_msg
 
 /* Maximum encoded size of messages (where known) */
-#define BLUELOCKCONFIG_SIZE                      294
+#define BLUELOCKCONFIG_SIZE                      171
 #define BLUELOCKSTATUS_SIZE                      8
 
 #ifdef __cplusplus

package/nanopb/BlueSDK.pb.c

@@ -18,5 +18,14 @@ PB_BIND(BLUEDEVICEDETAILSUWB, BlueDeviceDetailsUWB_t, AUTO)
 PB_BIND(BLUEDEVICEINFO, BlueDeviceInfo_t, AUTO)
 
 
+PB_BIND(BLUEACCESSCREDENTIAL, BlueAccessCredential_t, AUTO)
+
+
+PB_BIND(BLUEACCESSDEVICE, BlueAccessDevice_t, AUTO)
+
+
+PB_BIND(BLUEACCESSDEVICELIST, BlueAccessDeviceList_t, AUTO)
+
+
 
 

package/nanopb/BlueSDK.pb.h

@@ -51,6 +51,25 @@ typedef struct BlueDeviceInfo {
     } details;
 } BlueDeviceInfo_t;
 
+typedef struct BlueAccessCredential {
+    BlueCredentialId_t credentialId;
+    BlueCredentialType_t credentialType;
+    bool has_validFrom;
+    BlueLocalTimestamp_t validFrom;
+    bool has_validTo;
+    BlueLocalTimestamp_t validTo;
+    pb_callback_t privateKey;
+} BlueAccessCredential_t;
+
+typedef struct BlueAccessDevice {
+    pb_callback_t deviceId;
+    pb_callback_t name;
+} BlueAccessDevice_t;
+
+typedef struct BlueAccessDeviceList {
+    pb_callback_t devices;
+} BlueAccessDeviceList_t;
+
 
 #ifdef __cplusplus
 extern "C" {
@@ -66,16 +85,26 @@ extern "C" {
 
 #define BlueDeviceInfo_t_deviceType_ENUMTYPE BlueDeviceType_t
 
+#define BlueAccessCredential_t_credentialType_ENUMTYPE BlueCredentialType_t
+
+
+
 
 /* Initializer values for message structs */
 #define BLUEI18N_INIT_DEFAULT                    {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
 #define BLUEDEVICEDETAILSBLUETOOTH_INIT_DEFAULT  {0, 0, 0}
 #define BLUEDEVICEDETAILSUWB_INIT_DEFAULT        {0}
 #define BLUEDEVICEINFO_INIT_DEFAULT              {_BLUEDEVICETYPE_MIN, {{NULL}, NULL}, 0, false, BLUEBLEMANUFACTURERINFO_INIT_DEFAULT, 0, {BLUEDEVICEDETAILSBLUETOOTH_INIT_DEFAULT}}
+#define BLUEACCESSCREDENTIAL_INIT_DEFAULT        {BLUECREDENTIALID_INIT_DEFAULT, _BLUECREDENTIALTYPE_MIN, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, {{NULL}, NULL}}
+#define BLUEACCESSDEVICE_INIT_DEFAULT            {{{NULL}, NULL}, {{NULL}, NULL}}
+#define BLUEACCESSDEVICELIST_INIT_DEFAULT        {{{NULL}, NULL}}
 #define BLUEI18N_INIT_ZERO                       {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
 #define BLUEDEVICEDETAILSBLUETOOTH_INIT_ZERO     {0, 0, 0}
 #define BLUEDEVICEDETAILSUWB_INIT_ZERO           {0}
 #define BLUEDEVICEINFO_INIT_ZERO                 {_BLUEDEVICETYPE_MIN, {{NULL}, NULL}, 0, false, BLUEBLEMANUFACTURERINFO_INIT_ZERO, 0, {BLUEDEVICEDETAILSBLUETOOTH_INIT_ZERO}}
+#define BLUEACCESSCREDENTIAL_INIT_ZERO           {BLUECREDENTIALID_INIT_ZERO, _BLUECREDENTIALTYPE_MIN, false, BLUELOCALTIMESTAMP_INIT_ZERO, false, BLUELOCALTIMESTAMP_INIT_ZERO, {{NULL}, NULL}}
+#define BLUEACCESSDEVICE_INIT_ZERO               {{{NULL}, NULL}, {{NULL}, NULL}}
+#define BLUEACCESSDEVICELIST_INIT_ZERO           {{{NULL}, NULL}}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define BLUEI18N_NFCWAITMESSAGE_TAG              1
@@ -96,6 +125,14 @@ extern "C" {
 #define BLUEDEVICEINFO_MANUFACTURERINFO_TAG      4
 #define BLUEDEVICEINFO_BLUETOOTH_TAG             5
 #define BLUEDEVICEINFO_UWB_TAG                   6
+#define BLUEACCESSCREDENTIAL_CREDENTIALID_TAG    1
+#define BLUEACCESSCREDENTIAL_CREDENTIALTYPE_TAG  2
+#define BLUEACCESSCREDENTIAL_VALIDFROM_TAG       3
+#define BLUEACCESSCREDENTIAL_VALIDTO_TAG         4
+#define BLUEACCESSCREDENTIAL_PRIVATEKEY_TAG      5
+#define BLUEACCESSDEVICE_DEVICEID_TAG            1
+#define BLUEACCESSDEVICE_NAME_TAG                2
+#define BLUEACCESSDEVICELIST_DEVICES_TAG         1
 
 /* Struct field encoding specification for nanopb */
 #define BLUEI18N_FIELDLIST(X, a) \
@@ -135,20 +172,53 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (details,uwb,details.uwb),   6)
 #define BlueDeviceInfo_t_details_bluetooth_MSGTYPE BlueDeviceDetailsBluetooth_t
 #define BlueDeviceInfo_t_details_uwb_MSGTYPE BlueDeviceDetailsUWB_t
 
+#define BLUEACCESSCREDENTIAL_FIELDLIST(X, a) \
+X(a, STATIC,   REQUIRED, MESSAGE,  credentialId,      1) \
+X(a, STATIC,   REQUIRED, UENUM,    credentialType,    2) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  validFrom,         3) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  validTo,           4) \
+X(a, CALLBACK, REQUIRED, BYTES,    privateKey,        5)
+#define BLUEACCESSCREDENTIAL_CALLBACK pb_default_field_callback
+#define BLUEACCESSCREDENTIAL_DEFAULT (const pb_byte_t*)"\x10\x01\x00"
+#define BlueAccessCredential_t_credentialId_MSGTYPE BlueCredentialId_t
+#define BlueAccessCredential_t_validFrom_MSGTYPE BlueLocalTimestamp_t
+#define BlueAccessCredential_t_validTo_MSGTYPE BlueLocalTimestamp_t
+
+#define BLUEACCESSDEVICE_FIELDLIST(X, a) \
+X(a, CALLBACK, REQUIRED, STRING,   deviceId,          1) \
+X(a, CALLBACK, OPTIONAL, STRING,   name,              2)
+#define BLUEACCESSDEVICE_CALLBACK pb_default_field_callback
+#define BLUEACCESSDEVICE_DEFAULT NULL
+
+#define BLUEACCESSDEVICELIST_FIELDLIST(X, a) \
+X(a, CALLBACK, REPEATED, MESSAGE,  devices,           1)
+#define BLUEACCESSDEVICELIST_CALLBACK pb_default_field_callback
+#define BLUEACCESSDEVICELIST_DEFAULT NULL
+#define BlueAccessDeviceList_t_devices_MSGTYPE BlueAccessDevice_t
+
 extern const pb_msgdesc_t BlueI18n_t_msg;
 extern const pb_msgdesc_t BlueDeviceDetailsBluetooth_t_msg;
 extern const pb_msgdesc_t BlueDeviceDetailsUWB_t_msg;
 extern const pb_msgdesc_t BlueDeviceInfo_t_msg;
+extern const pb_msgdesc_t BlueAccessCredential_t_msg;
+extern const pb_msgdesc_t BlueAccessDevice_t_msg;
+extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define BLUEI18N_FIELDS &BlueI18n_t_msg
 #define BLUEDEVICEDETAILSBLUETOOTH_FIELDS &BlueDeviceDetailsBluetooth_t_msg
 #define BLUEDEVICEDETAILSUWB_FIELDS &BlueDeviceDetailsUWB_t_msg
 #define BLUEDEVICEINFO_FIELDS &BlueDeviceInfo_t_msg
+#define BLUEACCESSCREDENTIAL_FIELDS &BlueAccessCredential_t_msg
+#define BLUEACCESSDEVICE_FIELDS &BlueAccessDevice_t_msg
+#define BLUEACCESSDEVICELIST_FIELDS &BlueAccessDeviceList_t_msg
 
 /* Maximum encoded size of messages (where known) */
 /* BlueI18n_size depends on runtime parameters */
 /* BlueDeviceInfo_size depends on runtime parameters */
+/* BlueAccessCredential_size depends on runtime parameters */
+/* BlueAccessDevice_size depends on runtime parameters */
+/* BlueAccessDeviceList_size depends on runtime parameters */
 #define BLUEDEVICEDETAILSBLUETOOTH_SIZE          24
 #define BLUEDEVICEDETAILSUWB_SIZE                2
 

package/nanopb/BlueSystem.pb.h

@@ -167,11 +167,6 @@ typedef struct BlueSystemStatus {
     uint32_t applicationVersion;
     BlueLocalTimestamp_t localTime;
     BlueSystemSettings_t settings;
-    uint16_t blacklistEntriesCount;
-    uint16_t eventLogEntriesCount;
-    uint32_t eventLogSequenceId;
-    uint16_t systemLogEntriesCount;
-    uint32_t systemLogSequenceId;
     /* -- Custom */
     bool has_lock;
     BlueLockStatus_t lock;
@@ -236,7 +231,7 @@ extern "C" {
 #define BLUESYSTEMUPDATE_INIT_DEFAULT            {false, BLUESYSTEMCONFIG_INIT_DEFAULT, false, BLUESYSTEMTIMEUNIX_INIT_DEFAULT}
 #define BLUESYSTEMSETTINGS_INIT_DEFAULT          {0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u, 0, 0}
 #define BLUESYSTEMPROVISIONING_INIT_DEFAULT      {BlueHardwareType_TestHardware, "", "00000000000000000000", {0, {0}}, {0, {0}}}
-#define BLUESYSTEMSTATUS_INIT_DEFAULT            {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUESYSTEMSETTINGS_INIT_DEFAULT, 0, 0, 0, 0, 0, false, BLUELOCKSTATUS_INIT_DEFAULT}
+#define BLUESYSTEMSTATUS_INIT_DEFAULT            {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUESYSTEMSETTINGS_INIT_DEFAULT, false, BLUELOCKSTATUS_INIT_DEFAULT}
 #define BLUESYSTEMLOGQUERY_INIT_DEFAULT          {0, 0, {0}}
 #define BLUESYSTEMLOGENTRY_INIT_DEFAULT          {0, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0, 0, "", ""}
 #define BLUESYSTEMLOGRESULT_INIT_DEFAULT         {0, {BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT, BLUESYSTEMLOGENTRY_INIT_DEFAULT}}
@@ -254,7 +249,7 @@ extern "C" {
 #define BLUESYSTEMUPDATE_INIT_ZERO               {false, BLUESYSTEMCONFIG_INIT_ZERO, false, BLUESYSTEMTIMEUNIX_INIT_ZERO}
 #define BLUESYSTEMSETTINGS_INIT_ZERO             {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define BLUESYSTEMPROVISIONING_INIT_ZERO         {_BLUEHARDWARETYPE_MIN, "", "", {0, {0}}, {0, {0}}}
-#define BLUESYSTEMSTATUS_INIT_ZERO               {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, BLUESYSTEMSETTINGS_INIT_ZERO, 0, 0, 0, 0, 0, false, BLUELOCKSTATUS_INIT_ZERO}
+#define BLUESYSTEMSTATUS_INIT_ZERO               {"", "", "", _BLUEHARDWARETYPE_MIN, _BLUEBATTERYLEVEL_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, BLUESYSTEMSETTINGS_INIT_ZERO, false, BLUELOCKSTATUS_INIT_ZERO}
 #define BLUESYSTEMLOGQUERY_INIT_ZERO             {0, 0, {0}}
 #define BLUESYSTEMLOGENTRY_INIT_ZERO             {0, BLUELOCALTIMESTAMP_INIT_ZERO, 0, 0, "", ""}
 #define BLUESYSTEMLOGRESULT_INIT_ZERO            {0, {BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO, BLUESYSTEMLOGENTRY_INIT_ZERO}}
@@ -327,12 +322,7 @@ extern "C" {
 #define BLUESYSTEMSTATUS_APPLICATIONVERSION_TAG  6
 #define BLUESYSTEMSTATUS_LOCALTIME_TAG           7
 #define BLUESYSTEMSTATUS_SETTINGS_TAG            8
-#define BLUESYSTEMSTATUS_BLACKLISTENTRIESCOUNT_TAG 9
-#define BLUESYSTEMSTATUS_EVENTLOGENTRIESCOUNT_TAG 10
-#define BLUESYSTEMSTATUS_EVENTLOGSEQUENCEID_TAG  11
-#define BLUESYSTEMSTATUS_SYSTEMLOGENTRIESCOUNT_TAG 12
-#define BLUESYSTEMSTATUS_SYSTEMLOGSEQUENCEID_TAG 13
-#define BLUESYSTEMSTATUS_LOCK_TAG                14
+#define BLUESYSTEMSTATUS_LOCK_TAG                9
 #define BLUESYSTEMLOGQUERY_MAXCOUNT_TAG          1
 #define BLUESYSTEMLOGQUERY_SEQUENCEID_TAG        2
 #define BLUESYSTEMLOGQUERY_FROMHEAD_TAG          3
@@ -471,12 +461,7 @@ X(a, STATIC,   REQUIRED, UENUM,    batteryLevel,      5) \
 X(a, STATIC,   REQUIRED, UINT32,   applicationVersion,   6) \
 X(a, STATIC,   REQUIRED, MESSAGE,  localTime,         7) \
 X(a, STATIC,   REQUIRED, MESSAGE,  settings,          8) \
-X(a, STATIC,   REQUIRED, UINT32,   blacklistEntriesCount,   9) \
-X(a, STATIC,   REQUIRED, UINT32,   eventLogEntriesCount,  10) \
-X(a, STATIC,   REQUIRED, UINT32,   eventLogSequenceId,  11) \
-X(a, STATIC,   REQUIRED, UINT32,   systemLogEntriesCount,  12) \
-X(a, STATIC,   REQUIRED, UINT32,   systemLogSequenceId,  13) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  lock,             14)
+X(a, STATIC,   OPTIONAL, MESSAGE,  lock,              9)
 #define BLUESYSTEMSTATUS_CALLBACK NULL
 #define BLUESYSTEMSTATUS_DEFAULT NULL
 #define BlueSystemStatus_t_localTime_MSGTYPE BlueLocalTimestamp_t
@@ -572,18 +557,18 @@ extern const pb_msgdesc_t BlueBlacklistEntries_t_msg;
 #define BLUEBLACKLISTENTRIES_SIZE                2775
 #define BLUEBLECONFIG_SIZE                       342
 #define BLUEEVENTLOGQUERY_SIZE                   12
-#define BLUEEVENTLOGRESULT_SIZE                  3200
+#define BLUEEVENTLOGRESULT_SIZE                  3300
 #define BLUEONLINECONFIG_SIZE                    224
 #define BLUEOSSCONFIG_SIZE                       56
-#define BLUESYSTEMCONFIG_SIZE                    1780
+#define BLUESYSTEMCONFIG_SIZE                    1657
 #define BLUESYSTEMLOGENTRY_SIZE                  152
 #define BLUESYSTEMLOGQUERY_SIZE                  9
 #define BLUESYSTEMLOGRESULT_SIZE                 1550
 #define BLUESYSTEMPROVISIONING_SIZE              299
 #define BLUESYSTEMSETTINGS_SIZE                  48
-#define BLUESYSTEMSTATUS_SIZE                    158
+#define BLUESYSTEMSTATUS_SIZE                    134
 #define BLUESYSTEMTIMEUNIX_SIZE                  6
-#define BLUESYSTEMUPDATE_SIZE                    1791
+#define BLUESYSTEMUPDATE_SIZE                    1668
 
 #ifdef __cplusplus
 } /* extern "C" */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueid/access-proto",
-  "version": "0.22.0",
+  "version": "0.24.0",
   "description": "BlueID Access Proto files",
   "author": "BlueID GmbH",
   "main": "cjs/index.js",

package/swift/BlueCore.pb.swift

@@ -381,6 +381,54 @@ extension BlueWeekday: CaseIterable {
 
 #endif  // swift(>=4.2)
 
+public enum BlueCredentialType: SwiftProtobuf.Enum {
+  public typealias RawValue = Int
+
+  /// Regular credential can only open / enter 
+  case regular // = 1
+
+  /// Maintenance can open and update all locks within the site 
+  case maintenance // = 2
+
+  /// Master can open all locks within the given site and requires no refresh 
+  case master // = 3
+
+  /// Nfc writer allows to write any credential within this site on cards & fobs 
+  case nfcWriter // = 4
+
+  public init() {
+    self = .regular
+  }
+
+  public init?(rawValue: Int) {
+    switch rawValue {
+    case 1: self = .regular
+    case 2: self = .maintenance
+    case 3: self = .master
+    case 4: self = .nfcWriter
+    default: return nil
+    }
+  }
+
+  public var rawValue: Int {
+    switch self {
+    case .regular: return 1
+    case .maintenance: return 2
+    case .master: return 3
+    case .nfcWriter: return 4
+    }
+  }
+
+}
+
+#if swift(>=4.2)
+
+extension BlueCredentialType: CaseIterable {
+  // Support synthesized by the compiler.
+}
+
+#endif  // swift(>=4.2)
+
 public enum BlueAccessType: SwiftProtobuf.Enum {
   public typealias RawValue = Int
 
@@ -1393,15 +1441,15 @@ public struct BlueEvent {
   /// Clears the value of `eventInfo`. Subsequent reads from it will return its default value.
   public mutating func clearEventInfo() {self._eventInfo = nil}
 
-  /// Set if identity related
-  public var identity: String {
-    get {return _identity ?? String()}
-    set {_identity = newValue}
+  /// Set if credential related
+  public var credentialID: BlueCredentialId {
+    get {return _credentialID ?? BlueCredentialId()}
+    set {_credentialID = newValue}
   }
-  /// Returns true if `identity` has been explicitly set.
-  public var hasIdentity: Bool {return self._identity != nil}
-  /// Clears the value of `identity`. Subsequent reads from it will return its default value.
-  public mutating func clearIdentity() {self._identity = nil}
+  /// Returns true if `credentialID` has been explicitly set.
+  public var hasCredentialID: Bool {return self._credentialID != nil}
+  /// Clears the value of `credentialID`. Subsequent reads from it will return its default value.
+  public mutating func clearCredentialID() {self._credentialID = nil}
 
   /// Set if eventId =
   public var command: String {
@@ -1421,7 +1469,7 @@ public struct BlueEvent {
   fileprivate var _eventTime: BlueLocalTimestamp? = nil
   fileprivate var _eventID: BlueEventId? = nil
   fileprivate var _eventInfo: Int32? = nil
-  fileprivate var _identity: String? = nil
+  fileprivate var _credentialID: BlueCredentialId? = nil
   fileprivate var _command: String? = nil
 }
 
@@ -3361,6 +3409,7 @@ public struct _BlueTestEncodeDecode {
 extension BlueReturnCode: @unchecked Sendable {}
 extension BlueTimeUnit: @unchecked Sendable {}
 extension BlueWeekday: @unchecked Sendable {}
+extension BlueCredentialType: @unchecked Sendable {}
 extension BlueAccessType: @unchecked Sendable {}
 extension BlueTransponderType: @unchecked Sendable {}
 extension BlueHardwareType: @unchecked Sendable {}
@@ -3535,6 +3584,15 @@ extension BlueWeekday: SwiftProtobuf._ProtoNameProviding {
   ]
 }
 
+extension BlueCredentialType: SwiftProtobuf._ProtoNameProviding {
+  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "Regular"),
+    2: .same(proto: "Maintenance"),
+    3: .same(proto: "Master"),
+    4: .same(proto: "NfcWriter"),
+  ]
+}
+
 extension BlueAccessType: SwiftProtobuf._ProtoNameProviding {
   public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "DefaultTime"),
@@ -4199,7 +4257,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     2: .same(proto: "eventTime"),
     4: .same(proto: "eventId"),
     5: .same(proto: "eventInfo"),
-    6: .same(proto: "identity"),
+    6: .same(proto: "credentialId"),
     7: .same(proto: "command"),
   ]
 
@@ -4209,6 +4267,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     if self._eventID == nil {return false}
     if self._eventInfo == nil {return false}
     if let v = self._eventTime, !v.isInitialized {return false}
+    if let v = self._credentialID, !v.isInitialized {return false}
     return true
   }
 
@@ -4222,7 +4281,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
       case 2: try { try decoder.decodeSingularMessageField(value: &self._eventTime) }()
       case 4: try { try decoder.decodeSingularEnumField(value: &self._eventID) }()
       case 5: try { try decoder.decodeSingularInt32Field(value: &self._eventInfo) }()
-      case 6: try { try decoder.decodeSingularStringField(value: &self._identity) }()
+      case 6: try { try decoder.decodeSingularMessageField(value: &self._credentialID) }()
       case 7: try { try decoder.decodeSingularStringField(value: &self._command) }()
       default: break
       }
@@ -4246,8 +4305,8 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     try { if let v = self._eventInfo {
       try visitor.visitSingularInt32Field(value: v, fieldNumber: 5)
     } }()
-    try { if let v = self._identity {
-      try visitor.visitSingularStringField(value: v, fieldNumber: 6)
+    try { if let v = self._credentialID {
+      try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
     } }()
     try { if let v = self._command {
       try visitor.visitSingularStringField(value: v, fieldNumber: 7)
@@ -4260,7 +4319,7 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
     if lhs._eventTime != rhs._eventTime {return false}
     if lhs._eventID != rhs._eventID {return false}
     if lhs._eventInfo != rhs._eventInfo {return false}
-    if lhs._identity != rhs._identity {return false}
+    if lhs._credentialID != rhs._credentialID {return false}
     if lhs._command != rhs._command {return false}
     if lhs.unknownFields != rhs.unknownFields {return false}
     return true