@blueid/access-proto 0.88.0 → 0.90.0

package/BlueCore.proto

@@ -183,6 +183,7 @@ enum BlueReturnCode {
   SdkDecodeBase64Failed = -413;
   SdkDecodeJsonFailed = -414;
   SdkFetchDataFailed = -415;
+  SdkTimeout = -416;
 
   //
   // Everything after here equals OssMaIoReturnCode codes; to gather the
@@ -215,6 +216,8 @@ message BlueLocalTimeperiod {
 }
 
 enum BlueTimeUnit {
+  option (nanopb_enumopt).packed_enum = true;
+
   Seconds = 1;
   Minutes = 2;
   Hours = 3;
@@ -225,6 +228,8 @@ enum BlueTimeUnit {
 
 // Those may never be changed
 enum BlueWeekday {
+  option (nanopb_enumopt).packed_enum = true;
+
   Monday = 0;
   Tuesday = 1;
   Wednesday = 2;
@@ -249,6 +254,8 @@ message BlueCredentialId {
 }
 
 enum BlueCredentialType {
+  option (nanopb_enumopt).packed_enum = true;
+
   /* Regular credential can only open / enter */
   Regular = 1;
   /* Maintenance can open and update all locks within the site */
@@ -266,6 +273,8 @@ message BlueBlacklistEntry {
 }
 
 enum BlueAccessType {
+  option (nanopb_enumopt).packed_enum = true;
+
   /* Access with default unlock time */
   DefaultTime = 1;
   /* Access with extended unlock time */
@@ -285,12 +294,16 @@ enum BlueAccessType {
 };
 
 enum BlueTransponderType {
+  option (nanopb_enumopt).packed_enum = true;
+
   UnknownTransponder = 0;
   MobileTransponder = 1;
   MifareDesfire = 2;
 }
 
 enum BlueHardwareType {
+  option (nanopb_enumopt).packed_enum = true;
+
   UnknownHardware = 0;
   TestHardware = 1;
   Gateway = 2;
@@ -301,6 +314,8 @@ enum BlueHardwareType {
 }
 
 enum BlueBatteryLevel {
+  option (nanopb_enumopt).packed_enum = true;
+
   UnknownBattery = 0;
   OnPower = 1;
   GoodPower = 10;
@@ -336,6 +351,8 @@ message BlueBleAdvertisementInfo {
 ///////////////////////////////////////////////////////////////////////
 
 enum BlueEventId {
+  option (nanopb_enumopt).packed_enum = true;
+
   // Oss So events --
 
   /** eventInfo = 0 */
@@ -376,6 +393,8 @@ enum BlueEventId {
 }
 
 enum BlueEventInfoSystem {
+  option (nanopb_enumopt).packed_enum = true;
+
   // Oss So events --
 
   SystemRestart = 0x01;
@@ -389,6 +408,8 @@ enum BlueEventInfoSystem {
 }
 
 enum BlueEventInfoAccess {
+  option (nanopb_enumopt).packed_enum = true;
+
   // Oss So events --
 
   Granted = 0x01;
@@ -476,6 +497,8 @@ message BlueSPResult {
 ///////////////////////////////////////////////////////////////////////
 
 enum BlueOssCredentialTypeSource {
+  option (nanopb_enumopt).packed_enum = true;
+
   Oss = 0;
   Proprietary = 1;
 }
@@ -615,6 +638,8 @@ message BlueOssSoVersion {
 //
 
 enum BlueOssSoCredentialTypeOssCredential {
+  option (nanopb_enumopt).packed_enum = true;
+
   Standard = 0;
   InterventionMedia = 1;
 }
@@ -647,26 +672,28 @@ message BlueOssSoDTSchedule {
 }
 
 enum BlueOssSoDoorInfoAccessBy {
+  option (nanopb_enumopt).packed_enum = true;
+
   DoorGroupId = 0;
   DoorId = 1;
 }
 
 message BlueOssSoDoorInfo {
-  required uint32 id = 1;
+  required uint32 id = 1 [ (nanopb).int_size = IS_16 ];
   required BlueOssSoDoorInfoAccessBy accessBy = 2;
-  required uint32 dtScheduleNumber = 3;
+  required uint32 dtScheduleNumber = 3 [ (nanopb).int_size = IS_8 ];
   required BlueAccessType accessType = 4;
 }
 
 message BlueOssSoEvent {
   required BlueLocalTimestamp eventTime = 1;
-  required uint32 doorId = 2;
-  required BlueEventId eventId = 3;
+  required uint32 doorId = 2 [ (nanopb).int_size = IS_16 ];
+  required BlueEventId eventId = 3 [ (nanopb).int_size = IS_8 ];
 
   // If eventId = AccessGranted or AccessDenied -> BlueEventInfoAccess
   // If eventId = SystemEvent -> BlueEventInfoSystem
   // Otherwise unused
-  required uint32 eventInfo = 4;
+  required uint32 eventInfo = 4 [ (nanopb).int_size = IS_8 ];
 }
 
 message BlueOssSoExtFeature {
@@ -684,6 +711,8 @@ message BlueOssSoExtFeature_ValidityStart {
 //
 
 enum BlueOssSoFileId {
+  option (nanopb_enumopt).packed_enum = true;
+
   Info = 0;
   Data = 1;
   Event = 2;

package/BlueLock.proto

@@ -5,6 +5,8 @@ import "BlueCore.proto";
 import "nanopb.proto";
 
 enum BlueLockState {
+  option (nanopb_enumopt).packed_enum = true;
+
   UnknownLockState = 1;
   Locked = 2;
   Unlocked = 3;

package/cjs/BlueCore_pb.d.ts

@@ -471,6 +471,11 @@ export declare enum BlueReturnCode {
    */
   SdkFetchDataFailed = -415,
 
+  /**
+   * @generated from enum value: SdkTimeout = -416;
+   */
+  SdkTimeout = -416,
+
   /**
    * @generated from enum value: OssMAReturnCodeStart = -1000;
    */
@@ -761,8 +766,6 @@ export declare enum BlueBatteryLevel {
 }
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventId
  */
 export declare enum BlueEventId {
@@ -871,8 +874,6 @@ export declare enum BlueEventId {
 }
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventInfoSystem
  */
 export declare enum BlueEventInfoSystem {
@@ -888,8 +889,6 @@ export declare enum BlueEventInfoSystem {
 }
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventInfoAccess
  */
 export declare enum BlueEventInfoAccess {

package/cjs/BlueCore_pb.js

@@ -182,6 +182,7 @@ const BlueReturnCode = import_protobuf.proto2.makeEnum(
     { no: -413, name: "SdkDecodeBase64Failed" },
     { no: -414, name: "SdkDecodeJsonFailed" },
     { no: -415, name: "SdkFetchDataFailed" },
+    { no: -416, name: "SdkTimeout" },
     { no: -1e3, name: "OssMAReturnCodeStart" },
     { no: -1100, name: "OssMAReturnCodeEnd" }
   ]

package/es/BlueCore_pb.d.ts

@@ -471,6 +471,11 @@ export declare enum BlueReturnCode {
    */
   SdkFetchDataFailed = -415,
 
+  /**
+   * @generated from enum value: SdkTimeout = -416;
+   */
+  SdkTimeout = -416,
+
   /**
    * @generated from enum value: OssMAReturnCodeStart = -1000;
    */
@@ -761,8 +766,6 @@ export declare enum BlueBatteryLevel {
 }
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventId
  */
 export declare enum BlueEventId {
@@ -871,8 +874,6 @@ export declare enum BlueEventId {
 }
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventInfoSystem
  */
 export declare enum BlueEventInfoSystem {
@@ -888,8 +889,6 @@ export declare enum BlueEventInfoSystem {
 }
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventInfoAccess
  */
 export declare enum BlueEventInfoAccess {

package/es/BlueCore_pb.js

@@ -100,6 +100,7 @@ export const BlueReturnCode = proto2.makeEnum(
     {no: -413, name: "SdkDecodeBase64Failed"},
     {no: -414, name: "SdkDecodeJsonFailed"},
     {no: -415, name: "SdkFetchDataFailed"},
+    {no: -416, name: "SdkTimeout"},
     {no: -1000, name: "OssMAReturnCodeStart"},
     {no: -1100, name: "OssMAReturnCodeEnd"},
   ],
@@ -214,8 +215,6 @@ export const BlueBatteryLevel = proto2.makeEnum(
 );
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventId
  */
 export const BlueEventId = proto2.makeEnum(
@@ -240,8 +239,6 @@ export const BlueEventId = proto2.makeEnum(
 );
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventInfoSystem
  */
 export const BlueEventInfoSystem = proto2.makeEnum(
@@ -253,8 +250,6 @@ export const BlueEventInfoSystem = proto2.makeEnum(
 );
 
 /**
- * Oss So events --
- *
  * @generated from enum BlueEventInfoAccess
  */
 export const BlueEventInfoAccess = proto2.makeEnum(

package/nanopb/BlueCore.pb.h

@@ -104,6 +104,7 @@ typedef enum BlueReturnCode {
     BlueReturnCode_SdkDecodeBase64Failed = -413,
     BlueReturnCode_SdkDecodeJsonFailed = -414,
     BlueReturnCode_SdkFetchDataFailed = -415,
+    BlueReturnCode_SdkTimeout = -416,
     BlueReturnCode_OssMAReturnCodeStart = -1000,
     BlueReturnCode_OssMAReturnCodeEnd = -1100
 } BlueReturnCode_t;
@@ -115,7 +116,7 @@ typedef enum BlueTimeUnit {
     BlueTimeUnit_Days = 4,
     BlueTimeUnit_Months = 5,
     BlueTimeUnit_Years = 6
-} BlueTimeUnit_t;
+} pb_packed BlueTimeUnit_t;
 
 /* Those may never be changed */
 typedef enum BlueWeekday {
@@ -126,7 +127,7 @@ typedef enum BlueWeekday {
     BlueWeekday_Friday = 4,
     BlueWeekday_Saturday = 5,
     BlueWeekday_Sunday = 6
-} BlueWeekday_t;
+} pb_packed BlueWeekday_t;
 
 typedef enum BlueCredentialType {
     /* Regular credential can only open / enter */
@@ -137,7 +138,7 @@ typedef enum BlueCredentialType {
     BlueCredentialType_Master = 3,
     /* Nfc writer allows to write any credential within this site on cards & fobs */
     BlueCredentialType_NfcWriter = 4
-} BlueCredentialType_t;
+} pb_packed BlueCredentialType_t;
 
 typedef enum BlueAccessType {
     /* Access with default unlock time */
@@ -156,13 +157,13 @@ typedef enum BlueAccessType {
     BlueAccessType_NoAccessValidity = 7,
     /* No access due blacklisted */
     BlueAccessType_NoAccessBlacklisted = 8
-} BlueAccessType_t;
+} pb_packed BlueAccessType_t;
 
 typedef enum BlueTransponderType {
     BlueTransponderType_UnknownTransponder = 0,
     BlueTransponderType_MobileTransponder = 1,
     BlueTransponderType_MifareDesfire = 2
-} BlueTransponderType_t;
+} pb_packed BlueTransponderType_t;
 
 typedef enum BlueHardwareType {
     BlueHardwareType_UnknownHardware = 0,
@@ -172,7 +173,7 @@ typedef enum BlueHardwareType {
     BlueHardwareType_DoorHandleLock = 4,
     BlueHardwareType_WallReader = 5,
     BlueHardwareType_Kiosk = 6
-} BlueHardwareType_t;
+} pb_packed BlueHardwareType_t;
 
 typedef enum BlueBatteryLevel {
     BlueBatteryLevel_UnknownBattery = 0,
@@ -184,9 +185,9 @@ typedef enum BlueBatteryLevel {
     /* 0% (100) - 100% (200) */
     BlueBatteryLevel_FullyDischarged = 100,
     BlueBatteryLevel_FullyCharged = 200
-} BlueBatteryLevel_t;
+} pb_packed BlueBatteryLevel_t;
 
-typedef enum BlueEventId { /* Oss So events -- */
+typedef enum BlueEventId {
     /* * eventInfo = 0 */
     BlueEventId_BatteryLow = 1,
     /* * eventInfo = 0 */
@@ -216,14 +217,14 @@ typedef enum BlueEventId { /* Oss So events -- */
     BlueEventId_TerminalCommand = 14,
     /* * eventInfo = BlueReturnCode */
     BlueEventId_TerminalOss = 15
-} BlueEventId_t;
+} pb_packed BlueEventId_t;
 
-typedef enum BlueEventInfoSystem { /* Oss So events -- */
+typedef enum BlueEventInfoSystem {
     BlueEventInfoSystem_SystemRestart = 1,
     BlueEventInfoSystem_SystemConfigured = 2
-} BlueEventInfoSystem_t;
+} pb_packed BlueEventInfoSystem_t;
 
-typedef enum BlueEventInfoAccess { /* Oss So events -- */
+typedef enum BlueEventInfoAccess {
     BlueEventInfoAccess_Granted = 1,
     BlueEventInfoAccess_GrantedDefaultTime = 2,
     BlueEventInfoAccess_GrantedExtendedTime = 3,
@@ -233,22 +234,22 @@ typedef enum BlueEventInfoAccess { /* Oss So events -- */
     BlueEventInfoAccess_DeniedBlacklisted = 130,
     BlueEventInfoAccess_DeniedValidity = 131,
     BlueEventInfoAccess_DeniedDTSchedule = 132
-} BlueEventInfoAccess_t;
+} pb_packed BlueEventInfoAccess_t;
 
 typedef enum BlueOssCredentialTypeSource {
     BlueOssCredentialTypeSource_Oss = 0,
     BlueOssCredentialTypeSource_Proprietary = 1
-} BlueOssCredentialTypeSource_t;
+} pb_packed BlueOssCredentialTypeSource_t;
 
 typedef enum BlueOssSoCredentialTypeOssCredential {
     BlueOssSoCredentialTypeOssCredential_Standard = 0,
     BlueOssSoCredentialTypeOssCredential_InterventionMedia = 1
-} BlueOssSoCredentialTypeOssCredential_t;
+} pb_packed BlueOssSoCredentialTypeOssCredential_t;
 
 typedef enum BlueOssSoDoorInfoAccessBy {
     BlueOssSoDoorInfoAccessBy_DoorGroupId = 0,
     BlueOssSoDoorInfoAccessBy_DoorId = 1
-} BlueOssSoDoorInfoAccessBy_t;
+} pb_packed BlueOssSoDoorInfoAccessBy_t;
 
 typedef enum BlueOssSoFileId {
     BlueOssSoFileId_Info = 0,
@@ -256,7 +257,7 @@ typedef enum BlueOssSoFileId {
     BlueOssSoFileId_Event = 2,
     BlueOssSoFileId_Blacklist = 3,
     BlueOssSoFileId_CustomerExtensions = 4
-} BlueOssSoFileId_t;
+} pb_packed BlueOssSoFileId_t;
 
 /* Struct definitions */
 typedef PB_BYTES_ARRAY_T(160) BlueSharedDemoData_terminalPrivateKey_t;
@@ -508,20 +509,20 @@ typedef struct BlueOssSoDTSchedule {
 } BlueOssSoDTSchedule_t;
 
 typedef struct BlueOssSoDoorInfo {
-    uint32_t id;
+    uint16_t id;
     BlueOssSoDoorInfoAccessBy_t accessBy;
-    uint32_t dtScheduleNumber;
+    uint8_t dtScheduleNumber;
     BlueAccessType_t accessType;
 } BlueOssSoDoorInfo_t;
 
 typedef struct BlueOssSoEvent {
     BlueLocalTimestamp_t eventTime;
-    uint32_t doorId;
+    uint16_t doorId;
     BlueEventId_t eventId;
     /* If eventId = AccessGranted or AccessDenied -> BlueEventInfoAccess
  If eventId = SystemEvent -> BlueEventInfoSystem
  Otherwise unused */
-    uint32_t eventInfo;
+    uint8_t eventInfo;
 } BlueOssSoEvent_t;
 
 typedef PB_BYTES_ARRAY_T(64) BlueOssSoExtFeature_value_t;
@@ -1713,20 +1714,20 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
 #define BLUEOSSSIDSETTINGS_SIZE                  62
 #define BLUEOSSSIDSTORAGEPROFILE_SIZE            24
 #define BLUEOSSSIDVERSION_SIZE                   12
-#define BLUEOSSSOCONFIGURATION_SIZE              28568
+#define BLUEOSSSOCONFIGURATION_SIZE              26018
 #define BLUEOSSSOCREDENTIALTYPEOSS_SIZE          2
 #define BLUEOSSSOCREDENTIALTYPEPROPRIETARY_SIZE  9
 #define BLUEOSSSOCREDENTIALTYPE_SIZE             17
-#define BLUEOSSSODOORINFO_SIZE                   16
+#define BLUEOSSSODOORINFO_SIZE                   11
 #define BLUEOSSSODTSCHEDULEDAY_SIZE              70
 #define BLUEOSSSODTSCHEDULE_SIZE                 288
-#define BLUEOSSSOEVENT_SIZE                      35
+#define BLUEOSSSOEVENT_SIZE                      30
 #define BLUEOSSSOEXTFEATURE_SIZE                 72
 #define BLUEOSSSOEXTFEATURE_VALIDITYSTART_SIZE   23
 #define BLUEOSSSOFILEBLACKLIST_SIZE              9435
 #define BLUEOSSSOFILECUSTOMEREXTENSIONS_SIZE     617
-#define BLUEOSSSOFILEDATA_SIZE                   8996
-#define BLUEOSSSOFILEEVENT_SIZE                  9449
+#define BLUEOSSSOFILEDATA_SIZE                   7721
+#define BLUEOSSSOFILEEVENT_SIZE                  8174
 #define BLUEOSSSOFILEINFO_SIZE                   57
 #define BLUEOSSSOMIFAREDESFIRECONFIGURATION_SIZE 60
 #define BLUEOSSSOMIFAREDESFIREPROVISIONINGCONFIGURATION_SIZE 56

package/nanopb/BlueLock.pb.h

@@ -16,7 +16,7 @@ typedef enum BlueLockState {
     BlueLockState_Locked = 2,
     BlueLockState_Unlocked = 3,
     BlueLockState_Jammed = 4
-} BlueLockState_t;
+} pb_packed BlueLockState_t;
 
 /* Struct definitions */
 typedef struct BlueLockConfig {

package/nanopb/BlueSDK.pb.h

@@ -437,7 +437,7 @@ extern const pb_msgdesc_t BlueSynchronizeAccessCredentials_t_msg;
 /* BlueSynchronizeAccessCredentials_size depends on runtime parameters */
 #define BLUEDEVICEDETAILSBLUETOOTH_SIZE          24
 #define BLUEDEVICEDETAILSUWB_SIZE                2
-#define BLUEREFRESHOSSSOCREDENTIAL_SIZE          28588
+#define BLUEREFRESHOSSSOCREDENTIAL_SIZE          26038
 
 #ifdef __cplusplus
 } /* extern "C" */

package/package.json

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

package/swift/BlueCore.pb.swift

@@ -123,6 +123,7 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
   case sdkDecodeBase64Failed // = -413
   case sdkDecodeJsonFailed // = -414
   case sdkFetchDataFailed // = -415
+  case sdkTimeout // = -416
   case ossMareturnCodeStart // = -1000
   case ossMareturnCodeEnd // = -1100
 
@@ -134,6 +135,7 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
     switch rawValue {
     case -1100: self = .ossMareturnCodeEnd
     case -1000: self = .ossMareturnCodeStart
+    case -416: self = .sdkTimeout
     case -415: self = .sdkFetchDataFailed
     case -414: self = .sdkDecodeJsonFailed
     case -413: self = .sdkDecodeBase64Failed
@@ -231,6 +233,7 @@ public enum BlueReturnCode: SwiftProtobuf.Enum {
     switch self {
     case .ossMareturnCodeEnd: return -1100
     case .ossMareturnCodeStart: return -1000
+    case .sdkTimeout: return -416
     case .sdkFetchDataFailed: return -415
     case .sdkDecodeJsonFailed: return -414
     case .sdkDecodeBase64Failed: return -413
@@ -685,7 +688,6 @@ extension BlueBatteryLevel: CaseIterable {
 
 #endif  // swift(>=4.2)
 
-/// Oss So events --
 public enum BlueEventId: SwiftProtobuf.Enum {
   public typealias RawValue = Int
 
@@ -787,7 +789,6 @@ extension BlueEventId: CaseIterable {
 
 #endif  // swift(>=4.2)
 
-/// Oss So events --
 public enum BlueEventInfoSystem: SwiftProtobuf.Enum {
   public typealias RawValue = Int
   case systemRestart // = 1
@@ -822,7 +823,6 @@ extension BlueEventInfoSystem: CaseIterable {
 
 #endif  // swift(>=4.2)
 
-/// Oss So events --
 public enum BlueEventInfoAccess: SwiftProtobuf.Enum {
   public typealias RawValue = Int
   case granted // = 1
@@ -3536,6 +3536,7 @@ extension BlueReturnCode: SwiftProtobuf._ProtoNameProviding {
   public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     -1100: .same(proto: "OssMAReturnCodeEnd"),
     -1000: .same(proto: "OssMAReturnCodeStart"),
+    -416: .same(proto: "SdkTimeout"),
     -415: .same(proto: "SdkFetchDataFailed"),
     -414: .same(proto: "SdkDecodeJsonFailed"),
     -413: .same(proto: "SdkDecodeBase64Failed"),