@blueid/access-proto 0.98.0 → 0.100.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/BlueCore.proto +18 -6
- package/cjs/BlueCore_pb.d.ts +30 -6
- package/cjs/BlueCore_pb.js +18 -3
- package/es/BlueCore_pb.d.ts +30 -6
- package/es/BlueCore_pb.js +14 -2
- package/nanopb/BlueCore.pb.c +1 -0
- package/nanopb/BlueCore.pb.h +29 -15
- package/package.json +1 -1
- package/swift/BlueCore.pb.swift +104 -10
package/BlueCore.proto
CHANGED
|
@@ -265,11 +265,13 @@ enum BlueCredentialType {
|
|
|
265
265
|
Regular = 1;
|
|
266
266
|
/* Maintenance can open and update all locks within the site */
|
|
267
267
|
Maintenance = 2;
|
|
268
|
-
/* Master can open all locks within the given site
|
|
268
|
+
/* Master can open all locks within the given site */
|
|
269
269
|
Master = 3;
|
|
270
270
|
/* Nfc writer allows to write any credential within this site on cards & fobs
|
|
271
271
|
*/
|
|
272
272
|
NfcWriter = 4;
|
|
273
|
+
/* Emergency can open all locks within given site, requires no refresh and has no validity */
|
|
274
|
+
Emergency = 5;
|
|
273
275
|
}
|
|
274
276
|
|
|
275
277
|
message BlueBlacklistEntry {
|
|
@@ -511,13 +513,17 @@ enum BlueOssCredentialTypeSource {
|
|
|
511
513
|
message BlueOssAccessResult {
|
|
512
514
|
// If access is granted or not
|
|
513
515
|
required bool accessGranted = 1;
|
|
514
|
-
|
|
516
|
+
|
|
517
|
+
// The final access type that was used if access was granted
|
|
515
518
|
required BlueAccessType accessType = 2;
|
|
516
|
-
//
|
|
517
|
-
//
|
|
518
|
-
required
|
|
519
|
+
// Additional access info if was granted, depends on device
|
|
520
|
+
// For locks for example this would contain the BlueLockState
|
|
521
|
+
required uint32 accessInfo = 3 [ (nanopb).int_size = IS_8 ];
|
|
522
|
+
// Defines when the used schedule actually ends if any if access was granted
|
|
523
|
+
required BlueLocalTimestamp scheduleEndTime = 4;
|
|
524
|
+
|
|
519
525
|
// If access denied this marks if it was denied due a schedule missmatch
|
|
520
|
-
required bool scheduleMissmatch =
|
|
526
|
+
required bool scheduleMissmatch = 5;
|
|
521
527
|
}
|
|
522
528
|
|
|
523
529
|
message BlueOssAccessEventsResult {
|
|
@@ -681,6 +687,12 @@ message BlueOssSoDTSchedule {
|
|
|
681
687
|
repeated BlueOssSoDTScheduleDay days = 1 [ (nanopb).max_count = 4 ];
|
|
682
688
|
}
|
|
683
689
|
|
|
690
|
+
enum BlueOssSoDoorGroupId {
|
|
691
|
+
option (nanopb_enumopt).packed_enum = true;
|
|
692
|
+
|
|
693
|
+
MasterGroupId = 0;
|
|
694
|
+
}
|
|
695
|
+
|
|
684
696
|
enum BlueOssSoDoorInfoAccessBy {
|
|
685
697
|
option (nanopb_enumopt).packed_enum = true;
|
|
686
698
|
|
package/cjs/BlueCore_pb.d.ts
CHANGED
|
@@ -608,7 +608,7 @@ export declare enum BlueCredentialType {
|
|
|
608
608
|
Maintenance = 2,
|
|
609
609
|
|
|
610
610
|
/**
|
|
611
|
-
* Master can open all locks within the given site
|
|
611
|
+
* Master can open all locks within the given site
|
|
612
612
|
*
|
|
613
613
|
* @generated from enum value: Master = 3;
|
|
614
614
|
*/
|
|
@@ -620,6 +620,13 @@ export declare enum BlueCredentialType {
|
|
|
620
620
|
* @generated from enum value: NfcWriter = 4;
|
|
621
621
|
*/
|
|
622
622
|
NfcWriter = 4,
|
|
623
|
+
|
|
624
|
+
/**
|
|
625
|
+
* Emergency can open all locks within given site, requires no refresh and has no validity
|
|
626
|
+
*
|
|
627
|
+
* @generated from enum value: Emergency = 5;
|
|
628
|
+
*/
|
|
629
|
+
Emergency = 5,
|
|
623
630
|
}
|
|
624
631
|
|
|
625
632
|
/**
|
|
@@ -993,6 +1000,16 @@ export declare enum BlueOssSoCredentialTypeOssCredential {
|
|
|
993
1000
|
InterventionMedia = 1,
|
|
994
1001
|
}
|
|
995
1002
|
|
|
1003
|
+
/**
|
|
1004
|
+
* @generated from enum BlueOssSoDoorGroupId
|
|
1005
|
+
*/
|
|
1006
|
+
export declare enum BlueOssSoDoorGroupId {
|
|
1007
|
+
/**
|
|
1008
|
+
* @generated from enum value: MasterGroupId = 0;
|
|
1009
|
+
*/
|
|
1010
|
+
MasterGroupId = 0,
|
|
1011
|
+
}
|
|
1012
|
+
|
|
996
1013
|
/**
|
|
997
1014
|
* @generated from enum BlueOssSoDoorInfoAccessBy
|
|
998
1015
|
*/
|
|
@@ -1625,24 +1642,31 @@ export declare class BlueOssAccessResult extends Message<BlueOssAccessResult> {
|
|
|
1625
1642
|
accessGranted: boolean;
|
|
1626
1643
|
|
|
1627
1644
|
/**
|
|
1628
|
-
* The final access type
|
|
1645
|
+
* The final access type that was used if access was granted
|
|
1629
1646
|
*
|
|
1630
1647
|
* @generated from field: required BlueAccessType accessType = 2;
|
|
1631
1648
|
*/
|
|
1632
1649
|
accessType: BlueAccessType;
|
|
1633
1650
|
|
|
1634
1651
|
/**
|
|
1635
|
-
*
|
|
1636
|
-
*
|
|
1652
|
+
* Additional access info if was granted, depends on device
|
|
1653
|
+
* For locks for example this would contain the BlueLockState
|
|
1654
|
+
*
|
|
1655
|
+
* @generated from field: required uint32 accessInfo = 3;
|
|
1656
|
+
*/
|
|
1657
|
+
accessInfo: number;
|
|
1658
|
+
|
|
1659
|
+
/**
|
|
1660
|
+
* Defines when the used schedule actually ends if any if access was granted
|
|
1637
1661
|
*
|
|
1638
|
-
* @generated from field: required BlueLocalTimestamp scheduleEndTime =
|
|
1662
|
+
* @generated from field: required BlueLocalTimestamp scheduleEndTime = 4;
|
|
1639
1663
|
*/
|
|
1640
1664
|
scheduleEndTime?: BlueLocalTimestamp;
|
|
1641
1665
|
|
|
1642
1666
|
/**
|
|
1643
1667
|
* If access denied this marks if it was denied due a schedule missmatch
|
|
1644
1668
|
*
|
|
1645
|
-
* @generated from field: required bool scheduleMissmatch =
|
|
1669
|
+
* @generated from field: required bool scheduleMissmatch = 5;
|
|
1646
1670
|
*/
|
|
1647
1671
|
scheduleMissmatch: boolean;
|
|
1648
1672
|
|
package/cjs/BlueCore_pb.js
CHANGED
|
@@ -56,6 +56,7 @@ __export(BlueCore_pb_exports, {
|
|
|
56
56
|
BlueOssSoCredentialTypeProprietary: () => BlueOssSoCredentialTypeProprietary,
|
|
57
57
|
BlueOssSoDTSchedule: () => BlueOssSoDTSchedule,
|
|
58
58
|
BlueOssSoDTScheduleDay: () => BlueOssSoDTScheduleDay,
|
|
59
|
+
BlueOssSoDoorGroupId: () => BlueOssSoDoorGroupId,
|
|
59
60
|
BlueOssSoDoorInfo: () => BlueOssSoDoorInfo,
|
|
60
61
|
BlueOssSoDoorInfoAccessBy: () => BlueOssSoDoorInfoAccessBy,
|
|
61
62
|
BlueOssSoEvent: () => BlueOssSoEvent,
|
|
@@ -222,7 +223,8 @@ const BlueCredentialType = import_protobuf.proto2.makeEnum(
|
|
|
222
223
|
{ no: 1, name: "Regular" },
|
|
223
224
|
{ no: 2, name: "Maintenance" },
|
|
224
225
|
{ no: 3, name: "Master" },
|
|
225
|
-
{ no: 4, name: "NfcWriter" }
|
|
226
|
+
{ no: 4, name: "NfcWriter" },
|
|
227
|
+
{ no: 5, name: "Emergency" }
|
|
226
228
|
]
|
|
227
229
|
);
|
|
228
230
|
const BlueAccessType = import_protobuf.proto2.makeEnum(
|
|
@@ -326,6 +328,12 @@ const BlueOssSoCredentialTypeOssCredential = import_protobuf.proto2.makeEnum(
|
|
|
326
328
|
{ no: 1, name: "InterventionMedia" }
|
|
327
329
|
]
|
|
328
330
|
);
|
|
331
|
+
const BlueOssSoDoorGroupId = import_protobuf.proto2.makeEnum(
|
|
332
|
+
"BlueOssSoDoorGroupId",
|
|
333
|
+
[
|
|
334
|
+
{ no: 0, name: "MasterGroupId" }
|
|
335
|
+
]
|
|
336
|
+
);
|
|
329
337
|
const BlueOssSoDoorInfoAccessBy = import_protobuf.proto2.makeEnum(
|
|
330
338
|
"BlueOssSoDoorInfoAccessBy",
|
|
331
339
|
[
|
|
@@ -655,9 +663,16 @@ const BlueOssAccessResult = import_protobuf.proto2.makeMessageType(
|
|
|
655
663
|
/* ScalarType.BOOL */
|
|
656
664
|
},
|
|
657
665
|
{ no: 2, name: "accessType", kind: "enum", T: import_protobuf.proto2.getEnumType(BlueAccessType) },
|
|
658
|
-
{ no: 3, name: "scheduleEndTime", kind: "message", T: BlueLocalTimestamp },
|
|
659
666
|
{
|
|
660
|
-
no:
|
|
667
|
+
no: 3,
|
|
668
|
+
name: "accessInfo",
|
|
669
|
+
kind: "scalar",
|
|
670
|
+
T: 13
|
|
671
|
+
/* ScalarType.UINT32 */
|
|
672
|
+
},
|
|
673
|
+
{ no: 4, name: "scheduleEndTime", kind: "message", T: BlueLocalTimestamp },
|
|
674
|
+
{
|
|
675
|
+
no: 5,
|
|
661
676
|
name: "scheduleMissmatch",
|
|
662
677
|
kind: "scalar",
|
|
663
678
|
T: 8
|
package/es/BlueCore_pb.d.ts
CHANGED
|
@@ -608,7 +608,7 @@ export declare enum BlueCredentialType {
|
|
|
608
608
|
Maintenance = 2,
|
|
609
609
|
|
|
610
610
|
/**
|
|
611
|
-
* Master can open all locks within the given site
|
|
611
|
+
* Master can open all locks within the given site
|
|
612
612
|
*
|
|
613
613
|
* @generated from enum value: Master = 3;
|
|
614
614
|
*/
|
|
@@ -620,6 +620,13 @@ export declare enum BlueCredentialType {
|
|
|
620
620
|
* @generated from enum value: NfcWriter = 4;
|
|
621
621
|
*/
|
|
622
622
|
NfcWriter = 4,
|
|
623
|
+
|
|
624
|
+
/**
|
|
625
|
+
* Emergency can open all locks within given site, requires no refresh and has no validity
|
|
626
|
+
*
|
|
627
|
+
* @generated from enum value: Emergency = 5;
|
|
628
|
+
*/
|
|
629
|
+
Emergency = 5,
|
|
623
630
|
}
|
|
624
631
|
|
|
625
632
|
/**
|
|
@@ -993,6 +1000,16 @@ export declare enum BlueOssSoCredentialTypeOssCredential {
|
|
|
993
1000
|
InterventionMedia = 1,
|
|
994
1001
|
}
|
|
995
1002
|
|
|
1003
|
+
/**
|
|
1004
|
+
* @generated from enum BlueOssSoDoorGroupId
|
|
1005
|
+
*/
|
|
1006
|
+
export declare enum BlueOssSoDoorGroupId {
|
|
1007
|
+
/**
|
|
1008
|
+
* @generated from enum value: MasterGroupId = 0;
|
|
1009
|
+
*/
|
|
1010
|
+
MasterGroupId = 0,
|
|
1011
|
+
}
|
|
1012
|
+
|
|
996
1013
|
/**
|
|
997
1014
|
* @generated from enum BlueOssSoDoorInfoAccessBy
|
|
998
1015
|
*/
|
|
@@ -1625,24 +1642,31 @@ export declare class BlueOssAccessResult extends Message<BlueOssAccessResult> {
|
|
|
1625
1642
|
accessGranted: boolean;
|
|
1626
1643
|
|
|
1627
1644
|
/**
|
|
1628
|
-
* The final access type
|
|
1645
|
+
* The final access type that was used if access was granted
|
|
1629
1646
|
*
|
|
1630
1647
|
* @generated from field: required BlueAccessType accessType = 2;
|
|
1631
1648
|
*/
|
|
1632
1649
|
accessType: BlueAccessType;
|
|
1633
1650
|
|
|
1634
1651
|
/**
|
|
1635
|
-
*
|
|
1636
|
-
*
|
|
1652
|
+
* Additional access info if was granted, depends on device
|
|
1653
|
+
* For locks for example this would contain the BlueLockState
|
|
1654
|
+
*
|
|
1655
|
+
* @generated from field: required uint32 accessInfo = 3;
|
|
1656
|
+
*/
|
|
1657
|
+
accessInfo: number;
|
|
1658
|
+
|
|
1659
|
+
/**
|
|
1660
|
+
* Defines when the used schedule actually ends if any if access was granted
|
|
1637
1661
|
*
|
|
1638
|
-
* @generated from field: required BlueLocalTimestamp scheduleEndTime =
|
|
1662
|
+
* @generated from field: required BlueLocalTimestamp scheduleEndTime = 4;
|
|
1639
1663
|
*/
|
|
1640
1664
|
scheduleEndTime?: BlueLocalTimestamp;
|
|
1641
1665
|
|
|
1642
1666
|
/**
|
|
1643
1667
|
* If access denied this marks if it was denied due a schedule missmatch
|
|
1644
1668
|
*
|
|
1645
|
-
* @generated from field: required bool scheduleMissmatch =
|
|
1669
|
+
* @generated from field: required bool scheduleMissmatch = 5;
|
|
1646
1670
|
*/
|
|
1647
1671
|
scheduleMissmatch: boolean;
|
|
1648
1672
|
|
package/es/BlueCore_pb.js
CHANGED
|
@@ -154,6 +154,7 @@ export const BlueCredentialType = proto2.makeEnum(
|
|
|
154
154
|
{no: 2, name: "Maintenance"},
|
|
155
155
|
{no: 3, name: "Master"},
|
|
156
156
|
{no: 4, name: "NfcWriter"},
|
|
157
|
+
{no: 5, name: "Emergency"},
|
|
157
158
|
],
|
|
158
159
|
);
|
|
159
160
|
|
|
@@ -294,6 +295,16 @@ export const BlueOssSoCredentialTypeOssCredential = proto2.makeEnum(
|
|
|
294
295
|
],
|
|
295
296
|
);
|
|
296
297
|
|
|
298
|
+
/**
|
|
299
|
+
* @generated from enum BlueOssSoDoorGroupId
|
|
300
|
+
*/
|
|
301
|
+
export const BlueOssSoDoorGroupId = proto2.makeEnum(
|
|
302
|
+
"BlueOssSoDoorGroupId",
|
|
303
|
+
[
|
|
304
|
+
{no: 0, name: "MasterGroupId"},
|
|
305
|
+
],
|
|
306
|
+
);
|
|
307
|
+
|
|
297
308
|
/**
|
|
298
309
|
* @generated from enum BlueOssSoDoorInfoAccessBy
|
|
299
310
|
*/
|
|
@@ -514,8 +525,9 @@ export const BlueOssAccessResult = proto2.makeMessageType(
|
|
|
514
525
|
() => [
|
|
515
526
|
{ no: 1, name: "accessGranted", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
|
|
516
527
|
{ no: 2, name: "accessType", kind: "enum", T: proto2.getEnumType(BlueAccessType) },
|
|
517
|
-
{ no: 3, name: "
|
|
518
|
-
{ no: 4, name: "
|
|
528
|
+
{ no: 3, name: "accessInfo", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
|
|
529
|
+
{ no: 4, name: "scheduleEndTime", kind: "message", T: BlueLocalTimestamp },
|
|
530
|
+
{ no: 5, name: "scheduleMissmatch", kind: "scalar", T: 8 /* ScalarType.BOOL */ },
|
|
519
531
|
],
|
|
520
532
|
);
|
|
521
533
|
|
package/nanopb/BlueCore.pb.c
CHANGED
package/nanopb/BlueCore.pb.h
CHANGED
|
@@ -139,10 +139,12 @@ typedef enum BlueCredentialType {
|
|
|
139
139
|
BlueCredentialType_Regular = 1,
|
|
140
140
|
/* Maintenance can open and update all locks within the site */
|
|
141
141
|
BlueCredentialType_Maintenance = 2,
|
|
142
|
-
/* Master can open all locks within the given site
|
|
142
|
+
/* Master can open all locks within the given site */
|
|
143
143
|
BlueCredentialType_Master = 3,
|
|
144
144
|
/* Nfc writer allows to write any credential within this site on cards & fobs */
|
|
145
|
-
BlueCredentialType_NfcWriter = 4
|
|
145
|
+
BlueCredentialType_NfcWriter = 4,
|
|
146
|
+
/* Emergency can open all locks within given site, requires no refresh and has no validity */
|
|
147
|
+
BlueCredentialType_Emergency = 5
|
|
146
148
|
} pb_packed BlueCredentialType_t;
|
|
147
149
|
|
|
148
150
|
typedef enum BlueAccessType {
|
|
@@ -251,6 +253,10 @@ typedef enum BlueOssSoCredentialTypeOssCredential {
|
|
|
251
253
|
BlueOssSoCredentialTypeOssCredential_InterventionMedia = 1
|
|
252
254
|
} pb_packed BlueOssSoCredentialTypeOssCredential_t;
|
|
253
255
|
|
|
256
|
+
typedef enum BlueOssSoDoorGroupId {
|
|
257
|
+
BlueOssSoDoorGroupId_MasterGroupId = 0
|
|
258
|
+
} pb_packed BlueOssSoDoorGroupId_t;
|
|
259
|
+
|
|
254
260
|
typedef enum BlueOssSoDoorInfoAccessBy {
|
|
255
261
|
BlueOssSoDoorInfoAccessBy_DoorGroupId = 0,
|
|
256
262
|
BlueOssSoDoorInfoAccessBy_DoorId = 1
|
|
@@ -377,10 +383,12 @@ typedef struct BlueSPResult {
|
|
|
377
383
|
typedef struct BlueOssAccessResult {
|
|
378
384
|
/* If access is granted or not */
|
|
379
385
|
bool accessGranted;
|
|
380
|
-
/* The final access type */
|
|
386
|
+
/* The final access type that was used if access was granted */
|
|
381
387
|
BlueAccessType_t accessType;
|
|
382
|
-
/*
|
|
383
|
-
|
|
388
|
+
/* Additional access info if was granted, depends on device
|
|
389
|
+
For locks for example this would contain the BlueLockState */
|
|
390
|
+
uint8_t accessInfo;
|
|
391
|
+
/* Defines when the used schedule actually ends if any if access was granted */
|
|
384
392
|
BlueLocalTimestamp_t scheduleEndTime;
|
|
385
393
|
/* If access denied this marks if it was denied due a schedule missmatch */
|
|
386
394
|
bool scheduleMissmatch;
|
|
@@ -734,8 +742,8 @@ extern "C" {
|
|
|
734
742
|
#define _BLUEWEEKDAY_ARRAYSIZE ((BlueWeekday_t)(BlueWeekday_Sunday+1))
|
|
735
743
|
|
|
736
744
|
#define _BLUECREDENTIALTYPE_MIN BlueCredentialType_Regular
|
|
737
|
-
#define _BLUECREDENTIALTYPE_MAX
|
|
738
|
-
#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(
|
|
745
|
+
#define _BLUECREDENTIALTYPE_MAX BlueCredentialType_Emergency
|
|
746
|
+
#define _BLUECREDENTIALTYPE_ARRAYSIZE ((BlueCredentialType_t)(BlueCredentialType_Emergency+1))
|
|
739
747
|
|
|
740
748
|
#define _BLUEACCESSTYPE_MIN BlueAccessType_DefaultTime
|
|
741
749
|
#define _BLUEACCESSTYPE_MAX BlueAccessType_NoAccessBlacklisted
|
|
@@ -773,6 +781,10 @@ extern "C" {
|
|
|
773
781
|
#define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_MAX BlueOssSoCredentialTypeOssCredential_InterventionMedia
|
|
774
782
|
#define _BLUEOSSSOCREDENTIALTYPEOSSCREDENTIAL_ARRAYSIZE ((BlueOssSoCredentialTypeOssCredential_t)(BlueOssSoCredentialTypeOssCredential_InterventionMedia+1))
|
|
775
783
|
|
|
784
|
+
#define _BLUEOSSSODOORGROUPID_MIN BlueOssSoDoorGroupId_MasterGroupId
|
|
785
|
+
#define _BLUEOSSSODOORGROUPID_MAX BlueOssSoDoorGroupId_MasterGroupId
|
|
786
|
+
#define _BLUEOSSSODOORGROUPID_ARRAYSIZE ((BlueOssSoDoorGroupId_t)(BlueOssSoDoorGroupId_MasterGroupId+1))
|
|
787
|
+
|
|
776
788
|
#define _BLUEOSSSODOORINFOACCESSBY_MIN BlueOssSoDoorInfoAccessBy_DoorGroupId
|
|
777
789
|
#define _BLUEOSSSODOORINFOACCESSBY_MAX BlueOssSoDoorInfoAccessBy_DoorId
|
|
778
790
|
#define _BLUEOSSSODOORINFOACCESSBY_ARRAYSIZE ((BlueOssSoDoorInfoAccessBy_t)(BlueOssSoDoorInfoAccessBy_DoorId+1))
|
|
@@ -864,7 +876,7 @@ extern "C" {
|
|
|
864
876
|
#define BLUESPTOKENCOMMAND_INIT_DEFAULT {BLUECREDENTIALID_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, BLUELOCALTIMESTAMP_INIT_DEFAULT, "", {0, {0}}}
|
|
865
877
|
#define BLUESPTOKEN_INIT_DEFAULT {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_DEFAULT}}
|
|
866
878
|
#define BLUESPRESULT_INIT_DEFAULT {{0, {0}}}
|
|
867
|
-
#define BLUEOSSACCESSRESULT_INIT_DEFAULT {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
|
|
879
|
+
#define BLUEOSSACCESSRESULT_INIT_DEFAULT {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_DEFAULT, 0}
|
|
868
880
|
#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}}
|
|
869
881
|
#define BLUEOSSSIDVERSION_INIT_DEFAULT {false, 1u, false, 0u}
|
|
870
882
|
#define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_DEFAULT {false, 0}
|
|
@@ -920,7 +932,7 @@ extern "C" {
|
|
|
920
932
|
#define BLUESPTOKENCOMMAND_INIT_ZERO {BLUECREDENTIALID_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, BLUELOCALTIMESTAMP_INIT_ZERO, "", {0, {0}}}
|
|
921
933
|
#define BLUESPTOKEN_INIT_ZERO {{0, {0}}, 0, {BLUESPTOKENCOMMAND_INIT_ZERO}}
|
|
922
934
|
#define BLUESPRESULT_INIT_ZERO {{0, {0}}}
|
|
923
|
-
#define BLUEOSSACCESSRESULT_INIT_ZERO {0, _BLUEACCESSTYPE_MIN, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
|
|
935
|
+
#define BLUEOSSACCESSRESULT_INIT_ZERO {0, _BLUEACCESSTYPE_MIN, 0, BLUELOCALTIMESTAMP_INIT_ZERO, 0}
|
|
924
936
|
#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}}
|
|
925
937
|
#define BLUEOSSSIDVERSION_INIT_ZERO {false, 0, false, 0}
|
|
926
938
|
#define BLUEOSSSIDCREDENTIALTYPEOSS_INIT_ZERO {false, 0}
|
|
@@ -1013,8 +1025,9 @@ extern "C" {
|
|
|
1013
1025
|
#define BLUESPRESULT_DATA_TAG 1
|
|
1014
1026
|
#define BLUEOSSACCESSRESULT_ACCESSGRANTED_TAG 1
|
|
1015
1027
|
#define BLUEOSSACCESSRESULT_ACCESSTYPE_TAG 2
|
|
1016
|
-
#define
|
|
1017
|
-
#define
|
|
1028
|
+
#define BLUEOSSACCESSRESULT_ACCESSINFO_TAG 3
|
|
1029
|
+
#define BLUEOSSACCESSRESULT_SCHEDULEENDTIME_TAG 4
|
|
1030
|
+
#define BLUEOSSACCESSRESULT_SCHEDULEMISSMATCH_TAG 5
|
|
1018
1031
|
#define BLUEOSSACCESSEVENTSRESULT_ACCESSRESULT_TAG 1
|
|
1019
1032
|
#define BLUEOSSACCESSEVENTSRESULT_EVENTS_TAG 2
|
|
1020
1033
|
#define BLUEOSSSIDVERSION_VERSIONMAJOR_TAG 1
|
|
@@ -1278,8 +1291,9 @@ X(a, STATIC, REQUIRED, BYTES, data, 1)
|
|
|
1278
1291
|
#define BLUEOSSACCESSRESULT_FIELDLIST(X, a) \
|
|
1279
1292
|
X(a, STATIC, REQUIRED, BOOL, accessGranted, 1) \
|
|
1280
1293
|
X(a, STATIC, REQUIRED, UENUM, accessType, 2) \
|
|
1281
|
-
X(a, STATIC, REQUIRED,
|
|
1282
|
-
X(a, STATIC, REQUIRED,
|
|
1294
|
+
X(a, STATIC, REQUIRED, UINT32, accessInfo, 3) \
|
|
1295
|
+
X(a, STATIC, REQUIRED, MESSAGE, scheduleEndTime, 4) \
|
|
1296
|
+
X(a, STATIC, REQUIRED, BOOL, scheduleMissmatch, 5)
|
|
1283
1297
|
#define BLUEOSSACCESSRESULT_CALLBACK NULL
|
|
1284
1298
|
#define BLUEOSSACCESSRESULT_DEFAULT (const pb_byte_t*)"\x10\x01\x00"
|
|
1285
1299
|
#define BlueOssAccessResult_t_scheduleEndTime_MSGTYPE BlueLocalTimestamp_t
|
|
@@ -1733,8 +1747,8 @@ extern const pb_msgdesc_t _BlueTestEncodeDecode_t_msg;
|
|
|
1733
1747
|
#define BLUELOCALTIMEPERIOD_SIZE 12
|
|
1734
1748
|
#define BLUELOCALTIMESCHEDULE_SIZE 36
|
|
1735
1749
|
#define BLUELOCALTIMESTAMP_SIZE 19
|
|
1736
|
-
#define BLUEOSSACCESSEVENTSRESULT_SIZE
|
|
1737
|
-
#define BLUEOSSACCESSRESULT_SIZE
|
|
1750
|
+
#define BLUEOSSACCESSEVENTSRESULT_SIZE 1088
|
|
1751
|
+
#define BLUEOSSACCESSRESULT_SIZE 30
|
|
1738
1752
|
#define BLUEOSSSIDCONFIGURATION_SIZE 47
|
|
1739
1753
|
#define BLUEOSSSIDCREDENTIALTYPEOSS_SIZE 2
|
|
1740
1754
|
#define BLUEOSSSIDCREDENTIALTYPEPROPRIETARY_SIZE 9
|
package/package.json
CHANGED
package/swift/BlueCore.pb.swift
CHANGED
|
@@ -456,12 +456,15 @@ public enum BlueCredentialType: SwiftProtobuf.Enum {
|
|
|
456
456
|
/// Maintenance can open and update all locks within the site
|
|
457
457
|
case maintenance // = 2
|
|
458
458
|
|
|
459
|
-
/// Master can open all locks within the given site
|
|
459
|
+
/// Master can open all locks within the given site
|
|
460
460
|
case master // = 3
|
|
461
461
|
|
|
462
462
|
/// Nfc writer allows to write any credential within this site on cards & fobs
|
|
463
463
|
case nfcWriter // = 4
|
|
464
464
|
|
|
465
|
+
/// Emergency can open all locks within given site, requires no refresh and has no validity
|
|
466
|
+
case emergency // = 5
|
|
467
|
+
|
|
465
468
|
public init() {
|
|
466
469
|
self = .regular
|
|
467
470
|
}
|
|
@@ -472,6 +475,7 @@ public enum BlueCredentialType: SwiftProtobuf.Enum {
|
|
|
472
475
|
case 2: self = .maintenance
|
|
473
476
|
case 3: self = .master
|
|
474
477
|
case 4: self = .nfcWriter
|
|
478
|
+
case 5: self = .emergency
|
|
475
479
|
default: return nil
|
|
476
480
|
}
|
|
477
481
|
}
|
|
@@ -482,6 +486,7 @@ public enum BlueCredentialType: SwiftProtobuf.Enum {
|
|
|
482
486
|
case .maintenance: return 2
|
|
483
487
|
case .master: return 3
|
|
484
488
|
case .nfcWriter: return 4
|
|
489
|
+
case .emergency: return 5
|
|
485
490
|
}
|
|
486
491
|
}
|
|
487
492
|
|
|
@@ -961,6 +966,37 @@ extension BlueOssSoCredentialTypeOssCredential: CaseIterable {
|
|
|
961
966
|
|
|
962
967
|
#endif // swift(>=4.2)
|
|
963
968
|
|
|
969
|
+
public enum BlueOssSoDoorGroupId: SwiftProtobuf.Enum {
|
|
970
|
+
public typealias RawValue = Int
|
|
971
|
+
case masterGroupID // = 0
|
|
972
|
+
|
|
973
|
+
public init() {
|
|
974
|
+
self = .masterGroupID
|
|
975
|
+
}
|
|
976
|
+
|
|
977
|
+
public init?(rawValue: Int) {
|
|
978
|
+
switch rawValue {
|
|
979
|
+
case 0: self = .masterGroupID
|
|
980
|
+
default: return nil
|
|
981
|
+
}
|
|
982
|
+
}
|
|
983
|
+
|
|
984
|
+
public var rawValue: Int {
|
|
985
|
+
switch self {
|
|
986
|
+
case .masterGroupID: return 0
|
|
987
|
+
}
|
|
988
|
+
}
|
|
989
|
+
|
|
990
|
+
}
|
|
991
|
+
|
|
992
|
+
#if swift(>=4.2)
|
|
993
|
+
|
|
994
|
+
extension BlueOssSoDoorGroupId: CaseIterable {
|
|
995
|
+
// Support synthesized by the compiler.
|
|
996
|
+
}
|
|
997
|
+
|
|
998
|
+
#endif // swift(>=4.2)
|
|
999
|
+
|
|
964
1000
|
public enum BlueOssSoDoorInfoAccessBy: SwiftProtobuf.Enum {
|
|
965
1001
|
public typealias RawValue = Int
|
|
966
1002
|
case doorGroupID // = 0
|
|
@@ -1786,7 +1822,7 @@ public struct BlueOssAccessResult {
|
|
|
1786
1822
|
/// Clears the value of `accessGranted`. Subsequent reads from it will return its default value.
|
|
1787
1823
|
public mutating func clearAccessGranted() {self._accessGranted = nil}
|
|
1788
1824
|
|
|
1789
|
-
/// The final access type
|
|
1825
|
+
/// The final access type that was used if access was granted
|
|
1790
1826
|
public var accessType: BlueAccessType {
|
|
1791
1827
|
get {return _accessType ?? .defaultTime}
|
|
1792
1828
|
set {_accessType = newValue}
|
|
@@ -1796,8 +1832,18 @@ public struct BlueOssAccessResult {
|
|
|
1796
1832
|
/// Clears the value of `accessType`. Subsequent reads from it will return its default value.
|
|
1797
1833
|
public mutating func clearAccessType() {self._accessType = nil}
|
|
1798
1834
|
|
|
1799
|
-
///
|
|
1800
|
-
///
|
|
1835
|
+
/// Additional access info if was granted, depends on device
|
|
1836
|
+
/// For locks for example this would contain the BlueLockState
|
|
1837
|
+
public var accessInfo: UInt32 {
|
|
1838
|
+
get {return _accessInfo ?? 0}
|
|
1839
|
+
set {_accessInfo = newValue}
|
|
1840
|
+
}
|
|
1841
|
+
/// Returns true if `accessInfo` has been explicitly set.
|
|
1842
|
+
public var hasAccessInfo: Bool {return self._accessInfo != nil}
|
|
1843
|
+
/// Clears the value of `accessInfo`. Subsequent reads from it will return its default value.
|
|
1844
|
+
public mutating func clearAccessInfo() {self._accessInfo = nil}
|
|
1845
|
+
|
|
1846
|
+
/// Defines when the used schedule actually ends if any if access was granted
|
|
1801
1847
|
public var scheduleEndTime: BlueLocalTimestamp {
|
|
1802
1848
|
get {return _scheduleEndTime ?? BlueLocalTimestamp()}
|
|
1803
1849
|
set {_scheduleEndTime = newValue}
|
|
@@ -1823,6 +1869,7 @@ public struct BlueOssAccessResult {
|
|
|
1823
1869
|
|
|
1824
1870
|
fileprivate var _accessGranted: Bool? = nil
|
|
1825
1871
|
fileprivate var _accessType: BlueAccessType? = nil
|
|
1872
|
+
fileprivate var _accessInfo: UInt32? = nil
|
|
1826
1873
|
fileprivate var _scheduleEndTime: BlueLocalTimestamp? = nil
|
|
1827
1874
|
fileprivate var _scheduleMissmatch: Bool? = nil
|
|
1828
1875
|
}
|
|
@@ -2164,11 +2211,31 @@ public struct BlueOssSidMobile {
|
|
|
2164
2211
|
/// Clears the value of `infoFile`. Subsequent reads from it will return its default value.
|
|
2165
2212
|
public mutating func clearInfoFile() {self._infoFile = nil}
|
|
2166
2213
|
|
|
2214
|
+
public var requestedEventCount: UInt32 {
|
|
2215
|
+
get {return _requestedEventCount ?? 0}
|
|
2216
|
+
set {_requestedEventCount = newValue}
|
|
2217
|
+
}
|
|
2218
|
+
/// Returns true if `requestedEventCount` has been explicitly set.
|
|
2219
|
+
public var hasRequestedEventCount: Bool {return self._requestedEventCount != nil}
|
|
2220
|
+
/// Clears the value of `requestedEventCount`. Subsequent reads from it will return its default value.
|
|
2221
|
+
public mutating func clearRequestedEventCount() {self._requestedEventCount = nil}
|
|
2222
|
+
|
|
2223
|
+
public var supportedEventIds: Data {
|
|
2224
|
+
get {return _supportedEventIds ?? Data()}
|
|
2225
|
+
set {_supportedEventIds = newValue}
|
|
2226
|
+
}
|
|
2227
|
+
/// Returns true if `supportedEventIds` has been explicitly set.
|
|
2228
|
+
public var hasSupportedEventIds: Bool {return self._supportedEventIds != nil}
|
|
2229
|
+
/// Clears the value of `supportedEventIds`. Subsequent reads from it will return its default value.
|
|
2230
|
+
public mutating func clearSupportedEventIds() {self._supportedEventIds = nil}
|
|
2231
|
+
|
|
2167
2232
|
public var unknownFields = SwiftProtobuf.UnknownStorage()
|
|
2168
2233
|
|
|
2169
2234
|
public init() {}
|
|
2170
2235
|
|
|
2171
2236
|
fileprivate var _infoFile: Data? = nil
|
|
2237
|
+
fileprivate var _requestedEventCount: UInt32? = nil
|
|
2238
|
+
fileprivate var _supportedEventIds: Data? = nil
|
|
2172
2239
|
}
|
|
2173
2240
|
|
|
2174
2241
|
public struct BlueOssSidMobileProvisioningConfiguration {
|
|
@@ -3528,6 +3595,7 @@ extension BlueEventInfoSystem: @unchecked Sendable {}
|
|
|
3528
3595
|
extension BlueEventInfoAccess: @unchecked Sendable {}
|
|
3529
3596
|
extension BlueOssCredentialTypeSource: @unchecked Sendable {}
|
|
3530
3597
|
extension BlueOssSoCredentialTypeOssCredential: @unchecked Sendable {}
|
|
3598
|
+
extension BlueOssSoDoorGroupId: @unchecked Sendable {}
|
|
3531
3599
|
extension BlueOssSoDoorInfoAccessBy: @unchecked Sendable {}
|
|
3532
3600
|
extension BlueOssSoFileId: @unchecked Sendable {}
|
|
3533
3601
|
extension BlueSharedDemoData: @unchecked Sendable {}
|
|
@@ -3722,6 +3790,7 @@ extension BlueCredentialType: SwiftProtobuf._ProtoNameProviding {
|
|
|
3722
3790
|
2: .same(proto: "Maintenance"),
|
|
3723
3791
|
3: .same(proto: "Master"),
|
|
3724
3792
|
4: .same(proto: "NfcWriter"),
|
|
3793
|
+
5: .same(proto: "Emergency"),
|
|
3725
3794
|
]
|
|
3726
3795
|
}
|
|
3727
3796
|
|
|
@@ -3826,6 +3895,12 @@ extension BlueOssSoCredentialTypeOssCredential: SwiftProtobuf._ProtoNameProvidin
|
|
|
3826
3895
|
]
|
|
3827
3896
|
}
|
|
3828
3897
|
|
|
3898
|
+
extension BlueOssSoDoorGroupId: SwiftProtobuf._ProtoNameProviding {
|
|
3899
|
+
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
|
|
3900
|
+
0: .same(proto: "MasterGroupId"),
|
|
3901
|
+
]
|
|
3902
|
+
}
|
|
3903
|
+
|
|
3829
3904
|
extension BlueOssSoDoorInfoAccessBy: SwiftProtobuf._ProtoNameProviding {
|
|
3830
3905
|
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
|
|
3831
3906
|
0: .same(proto: "DoorGroupId"),
|
|
@@ -4766,13 +4841,15 @@ extension BlueOssAccessResult: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
|
|
|
4766
4841
|
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
|
|
4767
4842
|
1: .same(proto: "accessGranted"),
|
|
4768
4843
|
2: .same(proto: "accessType"),
|
|
4769
|
-
3: .same(proto: "
|
|
4770
|
-
4: .same(proto: "
|
|
4844
|
+
3: .same(proto: "accessInfo"),
|
|
4845
|
+
4: .same(proto: "scheduleEndTime"),
|
|
4846
|
+
5: .same(proto: "scheduleMissmatch"),
|
|
4771
4847
|
]
|
|
4772
4848
|
|
|
4773
4849
|
public var isInitialized: Bool {
|
|
4774
4850
|
if self._accessGranted == nil {return false}
|
|
4775
4851
|
if self._accessType == nil {return false}
|
|
4852
|
+
if self._accessInfo == nil {return false}
|
|
4776
4853
|
if self._scheduleEndTime == nil {return false}
|
|
4777
4854
|
if self._scheduleMissmatch == nil {return false}
|
|
4778
4855
|
if let v = self._scheduleEndTime, !v.isInitialized {return false}
|
|
@@ -4787,8 +4864,9 @@ extension BlueOssAccessResult: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
|
|
|
4787
4864
|
switch fieldNumber {
|
|
4788
4865
|
case 1: try { try decoder.decodeSingularBoolField(value: &self._accessGranted) }()
|
|
4789
4866
|
case 2: try { try decoder.decodeSingularEnumField(value: &self._accessType) }()
|
|
4790
|
-
case 3: try { try decoder.
|
|
4791
|
-
case 4: try { try decoder.
|
|
4867
|
+
case 3: try { try decoder.decodeSingularUInt32Field(value: &self._accessInfo) }()
|
|
4868
|
+
case 4: try { try decoder.decodeSingularMessageField(value: &self._scheduleEndTime) }()
|
|
4869
|
+
case 5: try { try decoder.decodeSingularBoolField(value: &self._scheduleMissmatch) }()
|
|
4792
4870
|
default: break
|
|
4793
4871
|
}
|
|
4794
4872
|
}
|
|
@@ -4805,11 +4883,14 @@ extension BlueOssAccessResult: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
|
|
|
4805
4883
|
try { if let v = self._accessType {
|
|
4806
4884
|
try visitor.visitSingularEnumField(value: v, fieldNumber: 2)
|
|
4807
4885
|
} }()
|
|
4886
|
+
try { if let v = self._accessInfo {
|
|
4887
|
+
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3)
|
|
4888
|
+
} }()
|
|
4808
4889
|
try { if let v = self._scheduleEndTime {
|
|
4809
|
-
try visitor.visitSingularMessageField(value: v, fieldNumber:
|
|
4890
|
+
try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
|
|
4810
4891
|
} }()
|
|
4811
4892
|
try { if let v = self._scheduleMissmatch {
|
|
4812
|
-
try visitor.visitSingularBoolField(value: v, fieldNumber:
|
|
4893
|
+
try visitor.visitSingularBoolField(value: v, fieldNumber: 5)
|
|
4813
4894
|
} }()
|
|
4814
4895
|
try unknownFields.traverse(visitor: &visitor)
|
|
4815
4896
|
}
|
|
@@ -4817,6 +4898,7 @@ extension BlueOssAccessResult: SwiftProtobuf.Message, SwiftProtobuf._MessageImpl
|
|
|
4817
4898
|
public static func ==(lhs: BlueOssAccessResult, rhs: BlueOssAccessResult) -> Bool {
|
|
4818
4899
|
if lhs._accessGranted != rhs._accessGranted {return false}
|
|
4819
4900
|
if lhs._accessType != rhs._accessType {return false}
|
|
4901
|
+
if lhs._accessInfo != rhs._accessInfo {return false}
|
|
4820
4902
|
if lhs._scheduleEndTime != rhs._scheduleEndTime {return false}
|
|
4821
4903
|
if lhs._scheduleMissmatch != rhs._scheduleMissmatch {return false}
|
|
4822
4904
|
if lhs.unknownFields != rhs.unknownFields {return false}
|
|
@@ -5310,6 +5392,8 @@ extension BlueOssSidMobile: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
5310
5392
|
public static let protoMessageName: String = "BlueOssSidMobile"
|
|
5311
5393
|
public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
|
|
5312
5394
|
1: .same(proto: "infoFile"),
|
|
5395
|
+
2: .same(proto: "requestedEventCount"),
|
|
5396
|
+
3: .same(proto: "supportedEventIds"),
|
|
5313
5397
|
]
|
|
5314
5398
|
|
|
5315
5399
|
public var isInitialized: Bool {
|
|
@@ -5324,6 +5408,8 @@ extension BlueOssSidMobile: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
5324
5408
|
// enabled. https://github.com/apple/swift-protobuf/issues/1034
|
|
5325
5409
|
switch fieldNumber {
|
|
5326
5410
|
case 1: try { try decoder.decodeSingularBytesField(value: &self._infoFile) }()
|
|
5411
|
+
case 2: try { try decoder.decodeSingularUInt32Field(value: &self._requestedEventCount) }()
|
|
5412
|
+
case 3: try { try decoder.decodeSingularBytesField(value: &self._supportedEventIds) }()
|
|
5327
5413
|
default: break
|
|
5328
5414
|
}
|
|
5329
5415
|
}
|
|
@@ -5337,11 +5423,19 @@ extension BlueOssSidMobile: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
|
|
|
5337
5423
|
try { if let v = self._infoFile {
|
|
5338
5424
|
try visitor.visitSingularBytesField(value: v, fieldNumber: 1)
|
|
5339
5425
|
} }()
|
|
5426
|
+
try { if let v = self._requestedEventCount {
|
|
5427
|
+
try visitor.visitSingularUInt32Field(value: v, fieldNumber: 2)
|
|
5428
|
+
} }()
|
|
5429
|
+
try { if let v = self._supportedEventIds {
|
|
5430
|
+
try visitor.visitSingularBytesField(value: v, fieldNumber: 3)
|
|
5431
|
+
} }()
|
|
5340
5432
|
try unknownFields.traverse(visitor: &visitor)
|
|
5341
5433
|
}
|
|
5342
5434
|
|
|
5343
5435
|
public static func ==(lhs: BlueOssSidMobile, rhs: BlueOssSidMobile) -> Bool {
|
|
5344
5436
|
if lhs._infoFile != rhs._infoFile {return false}
|
|
5437
|
+
if lhs._requestedEventCount != rhs._requestedEventCount {return false}
|
|
5438
|
+
if lhs._supportedEventIds != rhs._supportedEventIds {return false}
|
|
5345
5439
|
if lhs.unknownFields != rhs.unknownFields {return false}
|
|
5346
5440
|
return true
|
|
5347
5441
|
}
|