@blueid/access-proto 0.32.0 → 0.34.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 CHANGED
@@ -402,15 +402,15 @@ message BlueEvent {
402
402
 
403
403
  required BlueLocalTimestamp eventTime = 2;
404
404
 
405
- required BlueEventId eventId = 4;
405
+ required BlueEventId eventId = 3;
406
406
 
407
- required int32 eventInfo = 5;
407
+ required int32 eventInfo = 4;
408
408
 
409
409
  // Set if credential related
410
- optional BlueCredentialId credentialId = 6;
410
+ optional BlueCredentialId credentialId = 5;
411
411
 
412
412
  // Set if eventId =
413
- optional string command = 7 [ (nanopb).max_length = 8 ];
413
+ optional string command = 6 [ (nanopb).max_length = 8 ];
414
414
  }
415
415
 
416
416
  ///////////////////////////////////////////////////////////////////////
package/BlueSDK.proto CHANGED
@@ -56,7 +56,7 @@ message BlueDeviceInfo {
56
56
  }
57
57
 
58
58
  ///////////////////////////////////////////////////////////////////////
59
- // Credential
59
+ // AccessCredential
60
60
  ///////////////////////////////////////////////////////////////////////
61
61
 
62
62
  message BlueAccessCredential {
@@ -75,11 +75,31 @@ message BlueAccessCredentialList {
75
75
  repeated BlueAccessCredential credentials = 1;
76
76
  }
77
77
 
78
+ ///////////////////////////////////////////////////////////////////////
79
+ // AccessDevice
80
+ ///////////////////////////////////////////////////////////////////////
81
+
78
82
  message BlueAccessDevice {
79
83
  required string deviceId = 1;
80
84
  optional string objectName = 2;
85
+ optional int32 objectId = 3;
81
86
  }
82
87
 
83
88
  message BlueAccessDeviceList {
84
89
  repeated BlueAccessDevice devices = 1;
90
+ }
91
+
92
+ ///////////////////////////////////////////////////////////////////////
93
+ // AccessObject
94
+ ///////////////////////////////////////////////////////////////////////
95
+
96
+ message BlueAccessObject {
97
+ required string _id = 1;
98
+ required int32 objectId = 2;
99
+ required string name = 3;
100
+ optional string description = 4;
101
+ }
102
+
103
+ message BlueAccessObjectList {
104
+ repeated BlueAccessObject objects = 1;
85
105
  }
@@ -1294,26 +1294,26 @@ export declare class BlueEvent extends Message<BlueEvent> {
1294
1294
  eventTime?: BlueLocalTimestamp;
1295
1295
 
1296
1296
  /**
1297
- * @generated from field: required BlueEventId eventId = 4;
1297
+ * @generated from field: required BlueEventId eventId = 3;
1298
1298
  */
1299
1299
  eventId: BlueEventId;
1300
1300
 
1301
1301
  /**
1302
- * @generated from field: required int32 eventInfo = 5;
1302
+ * @generated from field: required int32 eventInfo = 4;
1303
1303
  */
1304
1304
  eventInfo: number;
1305
1305
 
1306
1306
  /**
1307
1307
  * Set if credential related
1308
1308
  *
1309
- * @generated from field: optional BlueCredentialId credentialId = 6;
1309
+ * @generated from field: optional BlueCredentialId credentialId = 5;
1310
1310
  */
1311
1311
  credentialId?: BlueCredentialId;
1312
1312
 
1313
1313
  /**
1314
1314
  * Set if eventId =
1315
1315
  *
1316
- * @generated from field: optional string command = 7;
1316
+ * @generated from field: optional string command = 6;
1317
1317
  */
1318
1318
  command?: string;
1319
1319
 
@@ -528,16 +528,16 @@ const BlueEvent = import_protobuf.proto2.makeMessageType(
528
528
  /* ScalarType.UINT32 */
529
529
  },
530
530
  { no: 2, name: "eventTime", kind: "message", T: BlueLocalTimestamp },
531
- { no: 4, name: "eventId", kind: "enum", T: import_protobuf.proto2.getEnumType(BlueEventId) },
531
+ { no: 3, name: "eventId", kind: "enum", T: import_protobuf.proto2.getEnumType(BlueEventId) },
532
532
  {
533
- no: 5,
533
+ no: 4,
534
534
  name: "eventInfo",
535
535
  kind: "scalar",
536
536
  T: 5
537
537
  /* ScalarType.INT32 */
538
538
  },
539
- { no: 6, name: "credentialId", kind: "message", T: BlueCredentialId, opt: true },
540
- { no: 7, name: "command", kind: "scalar", T: 9, opt: true }
539
+ { no: 5, name: "credentialId", kind: "message", T: BlueCredentialId, opt: true },
540
+ { no: 6, name: "command", kind: "scalar", T: 9, opt: true }
541
541
  ]
542
542
  );
543
543
  const BlueSPHandshake = import_protobuf.proto2.makeMessageType(
@@ -297,6 +297,11 @@ export declare class BlueAccessDevice extends Message<BlueAccessDevice> {
297
297
  */
298
298
  objectName?: string;
299
299
 
300
+ /**
301
+ * @generated from field: optional int32 objectId = 3;
302
+ */
303
+ objectId?: number;
304
+
300
305
  constructor(data?: PartialMessage<BlueAccessDevice>);
301
306
 
302
307
  static readonly runtime: typeof proto2;
@@ -336,3 +341,66 @@ export declare class BlueAccessDeviceList extends Message<BlueAccessDeviceList>
336
341
  static equals(a: BlueAccessDeviceList | PlainMessage<BlueAccessDeviceList> | undefined, b: BlueAccessDeviceList | PlainMessage<BlueAccessDeviceList> | undefined): boolean;
337
342
  }
338
343
 
344
+ /**
345
+ * @generated from message BlueAccessObject
346
+ */
347
+ export declare class BlueAccessObject extends Message<BlueAccessObject> {
348
+ /**
349
+ * @generated from field: required string _id = 1;
350
+ */
351
+ Id: string;
352
+
353
+ /**
354
+ * @generated from field: required int32 objectId = 2;
355
+ */
356
+ objectId: number;
357
+
358
+ /**
359
+ * @generated from field: required string name = 3;
360
+ */
361
+ name: string;
362
+
363
+ /**
364
+ * @generated from field: optional string description = 4;
365
+ */
366
+ description?: string;
367
+
368
+ constructor(data?: PartialMessage<BlueAccessObject>);
369
+
370
+ static readonly runtime: typeof proto2;
371
+ static readonly typeName = "BlueAccessObject";
372
+ static readonly fields: FieldList;
373
+
374
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueAccessObject;
375
+
376
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueAccessObject;
377
+
378
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueAccessObject;
379
+
380
+ static equals(a: BlueAccessObject | PlainMessage<BlueAccessObject> | undefined, b: BlueAccessObject | PlainMessage<BlueAccessObject> | undefined): boolean;
381
+ }
382
+
383
+ /**
384
+ * @generated from message BlueAccessObjectList
385
+ */
386
+ export declare class BlueAccessObjectList extends Message<BlueAccessObjectList> {
387
+ /**
388
+ * @generated from field: repeated BlueAccessObject objects = 1;
389
+ */
390
+ objects: BlueAccessObject[];
391
+
392
+ constructor(data?: PartialMessage<BlueAccessObjectList>);
393
+
394
+ static readonly runtime: typeof proto2;
395
+ static readonly typeName = "BlueAccessObjectList";
396
+ static readonly fields: FieldList;
397
+
398
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueAccessObjectList;
399
+
400
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueAccessObjectList;
401
+
402
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueAccessObjectList;
403
+
404
+ static equals(a: BlueAccessObjectList | PlainMessage<BlueAccessObjectList> | undefined, b: BlueAccessObjectList | PlainMessage<BlueAccessObjectList> | undefined): boolean;
405
+ }
406
+
package/cjs/BlueSDK_pb.js CHANGED
@@ -21,6 +21,8 @@ __export(BlueSDK_pb_exports, {
21
21
  BlueAccessCredentialList: () => BlueAccessCredentialList,
22
22
  BlueAccessDevice: () => BlueAccessDevice,
23
23
  BlueAccessDeviceList: () => BlueAccessDeviceList,
24
+ BlueAccessObject: () => BlueAccessObject,
25
+ BlueAccessObjectList: () => BlueAccessObjectList,
24
26
  BlueDeviceDetailsBluetooth: () => BlueDeviceDetailsBluetooth,
25
27
  BlueDeviceDetailsUWB: () => BlueDeviceDetailsUWB,
26
28
  BlueDeviceInfo: () => BlueDeviceInfo,
@@ -141,7 +143,8 @@ const BlueAccessDevice = import_protobuf.proto2.makeMessageType(
141
143
  T: 9
142
144
  /* ScalarType.STRING */
143
145
  },
144
- { no: 2, name: "objectName", kind: "scalar", T: 9, opt: true }
146
+ { no: 2, name: "objectName", kind: "scalar", T: 9, opt: true },
147
+ { no: 3, name: "objectId", kind: "scalar", T: 5, opt: true }
145
148
  ]
146
149
  );
147
150
  const BlueAccessDeviceList = import_protobuf.proto2.makeMessageType(
@@ -150,3 +153,36 @@ const BlueAccessDeviceList = import_protobuf.proto2.makeMessageType(
150
153
  { no: 1, name: "devices", kind: "message", T: BlueAccessDevice, repeated: true }
151
154
  ]
152
155
  );
156
+ const BlueAccessObject = import_protobuf.proto2.makeMessageType(
157
+ "BlueAccessObject",
158
+ () => [
159
+ {
160
+ no: 1,
161
+ name: "_id",
162
+ kind: "scalar",
163
+ T: 9
164
+ /* ScalarType.STRING */
165
+ },
166
+ {
167
+ no: 2,
168
+ name: "objectId",
169
+ kind: "scalar",
170
+ T: 5
171
+ /* ScalarType.INT32 */
172
+ },
173
+ {
174
+ no: 3,
175
+ name: "name",
176
+ kind: "scalar",
177
+ T: 9
178
+ /* ScalarType.STRING */
179
+ },
180
+ { no: 4, name: "description", kind: "scalar", T: 9, opt: true }
181
+ ]
182
+ );
183
+ const BlueAccessObjectList = import_protobuf.proto2.makeMessageType(
184
+ "BlueAccessObjectList",
185
+ () => [
186
+ { no: 1, name: "objects", kind: "message", T: BlueAccessObject, repeated: true }
187
+ ]
188
+ );
@@ -1294,26 +1294,26 @@ export declare class BlueEvent extends Message<BlueEvent> {
1294
1294
  eventTime?: BlueLocalTimestamp;
1295
1295
 
1296
1296
  /**
1297
- * @generated from field: required BlueEventId eventId = 4;
1297
+ * @generated from field: required BlueEventId eventId = 3;
1298
1298
  */
1299
1299
  eventId: BlueEventId;
1300
1300
 
1301
1301
  /**
1302
- * @generated from field: required int32 eventInfo = 5;
1302
+ * @generated from field: required int32 eventInfo = 4;
1303
1303
  */
1304
1304
  eventInfo: number;
1305
1305
 
1306
1306
  /**
1307
1307
  * Set if credential related
1308
1308
  *
1309
- * @generated from field: optional BlueCredentialId credentialId = 6;
1309
+ * @generated from field: optional BlueCredentialId credentialId = 5;
1310
1310
  */
1311
1311
  credentialId?: BlueCredentialId;
1312
1312
 
1313
1313
  /**
1314
1314
  * Set if eventId =
1315
1315
  *
1316
- * @generated from field: optional string command = 7;
1316
+ * @generated from field: optional string command = 6;
1317
1317
  */
1318
1318
  command?: string;
1319
1319
 
package/es/BlueCore_pb.js CHANGED
@@ -424,10 +424,10 @@ export const BlueEvent = proto2.makeMessageType(
424
424
  () => [
425
425
  { no: 1, name: "sequenceId", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
426
426
  { no: 2, name: "eventTime", kind: "message", T: BlueLocalTimestamp },
427
- { no: 4, name: "eventId", kind: "enum", T: proto2.getEnumType(BlueEventId) },
428
- { no: 5, name: "eventInfo", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
429
- { no: 6, name: "credentialId", kind: "message", T: BlueCredentialId, opt: true },
430
- { no: 7, name: "command", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
427
+ { no: 3, name: "eventId", kind: "enum", T: proto2.getEnumType(BlueEventId) },
428
+ { no: 4, name: "eventInfo", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
429
+ { no: 5, name: "credentialId", kind: "message", T: BlueCredentialId, opt: true },
430
+ { no: 6, name: "command", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
431
431
  ],
432
432
  );
433
433
 
@@ -297,6 +297,11 @@ export declare class BlueAccessDevice extends Message<BlueAccessDevice> {
297
297
  */
298
298
  objectName?: string;
299
299
 
300
+ /**
301
+ * @generated from field: optional int32 objectId = 3;
302
+ */
303
+ objectId?: number;
304
+
300
305
  constructor(data?: PartialMessage<BlueAccessDevice>);
301
306
 
302
307
  static readonly runtime: typeof proto2;
@@ -336,3 +341,66 @@ export declare class BlueAccessDeviceList extends Message<BlueAccessDeviceList>
336
341
  static equals(a: BlueAccessDeviceList | PlainMessage<BlueAccessDeviceList> | undefined, b: BlueAccessDeviceList | PlainMessage<BlueAccessDeviceList> | undefined): boolean;
337
342
  }
338
343
 
344
+ /**
345
+ * @generated from message BlueAccessObject
346
+ */
347
+ export declare class BlueAccessObject extends Message<BlueAccessObject> {
348
+ /**
349
+ * @generated from field: required string _id = 1;
350
+ */
351
+ Id: string;
352
+
353
+ /**
354
+ * @generated from field: required int32 objectId = 2;
355
+ */
356
+ objectId: number;
357
+
358
+ /**
359
+ * @generated from field: required string name = 3;
360
+ */
361
+ name: string;
362
+
363
+ /**
364
+ * @generated from field: optional string description = 4;
365
+ */
366
+ description?: string;
367
+
368
+ constructor(data?: PartialMessage<BlueAccessObject>);
369
+
370
+ static readonly runtime: typeof proto2;
371
+ static readonly typeName = "BlueAccessObject";
372
+ static readonly fields: FieldList;
373
+
374
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueAccessObject;
375
+
376
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueAccessObject;
377
+
378
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueAccessObject;
379
+
380
+ static equals(a: BlueAccessObject | PlainMessage<BlueAccessObject> | undefined, b: BlueAccessObject | PlainMessage<BlueAccessObject> | undefined): boolean;
381
+ }
382
+
383
+ /**
384
+ * @generated from message BlueAccessObjectList
385
+ */
386
+ export declare class BlueAccessObjectList extends Message<BlueAccessObjectList> {
387
+ /**
388
+ * @generated from field: repeated BlueAccessObject objects = 1;
389
+ */
390
+ objects: BlueAccessObject[];
391
+
392
+ constructor(data?: PartialMessage<BlueAccessObjectList>);
393
+
394
+ static readonly runtime: typeof proto2;
395
+ static readonly typeName = "BlueAccessObjectList";
396
+ static readonly fields: FieldList;
397
+
398
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueAccessObjectList;
399
+
400
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueAccessObjectList;
401
+
402
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueAccessObjectList;
403
+
404
+ static equals(a: BlueAccessObjectList | PlainMessage<BlueAccessObjectList> | undefined, b: BlueAccessObjectList | PlainMessage<BlueAccessObjectList> | undefined): boolean;
405
+ }
406
+
package/es/BlueSDK_pb.js CHANGED
@@ -107,6 +107,7 @@ export const BlueAccessDevice = proto2.makeMessageType(
107
107
  () => [
108
108
  { no: 1, name: "deviceId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
109
109
  { no: 2, name: "objectName", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
110
+ { no: 3, name: "objectId", kind: "scalar", T: 5 /* ScalarType.INT32 */, opt: true },
110
111
  ],
111
112
  );
112
113
 
@@ -120,3 +121,26 @@ export const BlueAccessDeviceList = proto2.makeMessageType(
120
121
  ],
121
122
  );
122
123
 
124
+ /**
125
+ * @generated from message BlueAccessObject
126
+ */
127
+ export const BlueAccessObject = proto2.makeMessageType(
128
+ "BlueAccessObject",
129
+ () => [
130
+ { no: 1, name: "_id", kind: "scalar", T: 9 /* ScalarType.STRING */ },
131
+ { no: 2, name: "objectId", kind: "scalar", T: 5 /* ScalarType.INT32 */ },
132
+ { no: 3, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
133
+ { no: 4, name: "description", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
134
+ ],
135
+ );
136
+
137
+ /**
138
+ * @generated from message BlueAccessObjectList
139
+ */
140
+ export const BlueAccessObjectList = proto2.makeMessageType(
141
+ "BlueAccessObjectList",
142
+ () => [
143
+ { no: 1, name: "objects", kind: "message", T: BlueAccessObject, repeated: true },
144
+ ],
145
+ );
146
+
@@ -962,10 +962,10 @@ extern "C" {
962
962
  #define BLUEBLEADVERTISEMENTINFO_MFINFO_TAG 4
963
963
  #define BLUEEVENT_SEQUENCEID_TAG 1
964
964
  #define BLUEEVENT_EVENTTIME_TAG 2
965
- #define BLUEEVENT_EVENTID_TAG 4
966
- #define BLUEEVENT_EVENTINFO_TAG 5
967
- #define BLUEEVENT_CREDENTIALID_TAG 6
968
- #define BLUEEVENT_COMMAND_TAG 7
965
+ #define BLUEEVENT_EVENTID_TAG 3
966
+ #define BLUEEVENT_EVENTINFO_TAG 4
967
+ #define BLUEEVENT_CREDENTIALID_TAG 5
968
+ #define BLUEEVENT_COMMAND_TAG 6
969
969
  #define BLUESPHANDSHAKE_TRANSPONDERSALT_TAG 1
970
970
  #define BLUESPHANDSHAKEREPLY_TERMINALSALT_TAG 1
971
971
  #define BLUESPHANDSHAKEREPLY_TERMINALSIGNATURE_TAG 2
@@ -1187,12 +1187,12 @@ X(a, STATIC, REQUIRED, MESSAGE, mfInfo, 4)
1187
1187
  #define BLUEEVENT_FIELDLIST(X, a) \
1188
1188
  X(a, STATIC, REQUIRED, UINT32, sequenceId, 1) \
1189
1189
  X(a, STATIC, REQUIRED, MESSAGE, eventTime, 2) \
1190
- X(a, STATIC, REQUIRED, UENUM, eventId, 4) \
1191
- X(a, STATIC, REQUIRED, INT32, eventInfo, 5) \
1192
- X(a, STATIC, OPTIONAL, MESSAGE, credentialId, 6) \
1193
- X(a, STATIC, OPTIONAL, STRING, command, 7)
1190
+ X(a, STATIC, REQUIRED, UENUM, eventId, 3) \
1191
+ X(a, STATIC, REQUIRED, INT32, eventInfo, 4) \
1192
+ X(a, STATIC, OPTIONAL, MESSAGE, credentialId, 5) \
1193
+ X(a, STATIC, OPTIONAL, STRING, command, 6)
1194
1194
  #define BLUEEVENT_CALLBACK NULL
1195
- #define BLUEEVENT_DEFAULT (const pb_byte_t*)"\x20\x01\x00"
1195
+ #define BLUEEVENT_DEFAULT (const pb_byte_t*)"\x18\x01\x00"
1196
1196
  #define BlueEvent_t_eventTime_MSGTYPE BlueLocalTimestamp_t
1197
1197
  #define BlueEvent_t_credentialId_MSGTYPE BlueCredentialId_t
1198
1198
 
@@ -30,5 +30,11 @@ PB_BIND(BLUEACCESSDEVICE, BlueAccessDevice_t, AUTO)
30
30
  PB_BIND(BLUEACCESSDEVICELIST, BlueAccessDeviceList_t, AUTO)
31
31
 
32
32
 
33
+ PB_BIND(BLUEACCESSOBJECT, BlueAccessObject_t, AUTO)
34
+
35
+
36
+ PB_BIND(BLUEACCESSOBJECTLIST, BlueAccessObjectList_t, AUTO)
37
+
38
+
33
39
 
34
40
 
@@ -74,12 +74,25 @@ typedef struct BlueAccessCredentialList {
74
74
  typedef struct BlueAccessDevice {
75
75
  pb_callback_t deviceId;
76
76
  pb_callback_t objectName;
77
+ bool has_objectId;
78
+ int32_t objectId;
77
79
  } BlueAccessDevice_t;
78
80
 
79
81
  typedef struct BlueAccessDeviceList {
80
82
  pb_callback_t devices;
81
83
  } BlueAccessDeviceList_t;
82
84
 
85
+ typedef struct BlueAccessObject {
86
+ pb_callback_t _id;
87
+ int32_t objectId;
88
+ pb_callback_t name;
89
+ pb_callback_t description;
90
+ } BlueAccessObject_t;
91
+
92
+ typedef struct BlueAccessObjectList {
93
+ pb_callback_t objects;
94
+ } BlueAccessObjectList_t;
95
+
83
96
 
84
97
  #ifdef __cplusplus
85
98
  extern "C" {
@@ -101,6 +114,8 @@ extern "C" {
101
114
 
102
115
 
103
116
 
117
+
118
+
104
119
  /* Initializer values for message structs */
105
120
  #define BLUEI18N_INIT_DEFAULT {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
106
121
  #define BLUEDEVICEDETAILSBLUETOOTH_INIT_DEFAULT {0, 0, 0}
@@ -108,16 +123,20 @@ extern "C" {
108
123
  #define BLUEDEVICEINFO_INIT_DEFAULT {_BLUEDEVICETYPE_MIN, {{NULL}, NULL}, 0, false, BLUEBLEMANUFACTURERINFO_INIT_DEFAULT, 0, {BLUEDEVICEDETAILSBLUETOOTH_INIT_DEFAULT}}
109
124
  #define BLUEACCESSCREDENTIAL_INIT_DEFAULT {BLUECREDENTIALID_INIT_DEFAULT, _BLUECREDENTIALTYPE_MIN, {{NULL}, NULL}, false, 0, {{NULL}, NULL}, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, {{NULL}, NULL}}
110
125
  #define BLUEACCESSCREDENTIALLIST_INIT_DEFAULT {{{NULL}, NULL}}
111
- #define BLUEACCESSDEVICE_INIT_DEFAULT {{{NULL}, NULL}, {{NULL}, NULL}}
126
+ #define BLUEACCESSDEVICE_INIT_DEFAULT {{{NULL}, NULL}, {{NULL}, NULL}, false, 0}
112
127
  #define BLUEACCESSDEVICELIST_INIT_DEFAULT {{{NULL}, NULL}}
128
+ #define BLUEACCESSOBJECT_INIT_DEFAULT {{{NULL}, NULL}, 0, {{NULL}, NULL}, {{NULL}, NULL}}
129
+ #define BLUEACCESSOBJECTLIST_INIT_DEFAULT {{{NULL}, NULL}}
113
130
  #define BLUEI18N_INIT_ZERO {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
114
131
  #define BLUEDEVICEDETAILSBLUETOOTH_INIT_ZERO {0, 0, 0}
115
132
  #define BLUEDEVICEDETAILSUWB_INIT_ZERO {0}
116
133
  #define BLUEDEVICEINFO_INIT_ZERO {_BLUEDEVICETYPE_MIN, {{NULL}, NULL}, 0, false, BLUEBLEMANUFACTURERINFO_INIT_ZERO, 0, {BLUEDEVICEDETAILSBLUETOOTH_INIT_ZERO}}
117
134
  #define BLUEACCESSCREDENTIAL_INIT_ZERO {BLUECREDENTIALID_INIT_ZERO, _BLUECREDENTIALTYPE_MIN, {{NULL}, NULL}, false, 0, {{NULL}, NULL}, false, BLUELOCALTIMESTAMP_INIT_ZERO, false, BLUELOCALTIMESTAMP_INIT_ZERO, false, BLUELOCALTIMESTAMP_INIT_ZERO, {{NULL}, NULL}}
118
135
  #define BLUEACCESSCREDENTIALLIST_INIT_ZERO {{{NULL}, NULL}}
119
- #define BLUEACCESSDEVICE_INIT_ZERO {{{NULL}, NULL}, {{NULL}, NULL}}
136
+ #define BLUEACCESSDEVICE_INIT_ZERO {{{NULL}, NULL}, {{NULL}, NULL}, false, 0}
120
137
  #define BLUEACCESSDEVICELIST_INIT_ZERO {{{NULL}, NULL}}
138
+ #define BLUEACCESSOBJECT_INIT_ZERO {{{NULL}, NULL}, 0, {{NULL}, NULL}, {{NULL}, NULL}}
139
+ #define BLUEACCESSOBJECTLIST_INIT_ZERO {{{NULL}, NULL}}
121
140
 
122
141
  /* Field tags (for use in manual encoding/decoding) */
123
142
  #define BLUEI18N_NFCWAITMESSAGE_TAG 1
@@ -150,7 +169,13 @@ extern "C" {
150
169
  #define BLUEACCESSCREDENTIALLIST_CREDENTIALS_TAG 1
151
170
  #define BLUEACCESSDEVICE_DEVICEID_TAG 1
152
171
  #define BLUEACCESSDEVICE_OBJECTNAME_TAG 2
172
+ #define BLUEACCESSDEVICE_OBJECTID_TAG 3
153
173
  #define BLUEACCESSDEVICELIST_DEVICES_TAG 1
174
+ #define BLUEACCESSOBJECT__ID_TAG 1
175
+ #define BLUEACCESSOBJECT_OBJECTID_TAG 2
176
+ #define BLUEACCESSOBJECT_NAME_TAG 3
177
+ #define BLUEACCESSOBJECT_DESCRIPTION_TAG 4
178
+ #define BLUEACCESSOBJECTLIST_OBJECTS_TAG 1
154
179
 
155
180
  /* Struct field encoding specification for nanopb */
156
181
  #define BLUEI18N_FIELDLIST(X, a) \
@@ -215,7 +240,8 @@ X(a, CALLBACK, REPEATED, MESSAGE, credentials, 1)
215
240
 
216
241
  #define BLUEACCESSDEVICE_FIELDLIST(X, a) \
217
242
  X(a, CALLBACK, REQUIRED, STRING, deviceId, 1) \
218
- X(a, CALLBACK, OPTIONAL, STRING, objectName, 2)
243
+ X(a, CALLBACK, OPTIONAL, STRING, objectName, 2) \
244
+ X(a, STATIC, OPTIONAL, INT32, objectId, 3)
219
245
  #define BLUEACCESSDEVICE_CALLBACK pb_default_field_callback
220
246
  #define BLUEACCESSDEVICE_DEFAULT NULL
221
247
 
@@ -225,6 +251,20 @@ X(a, CALLBACK, REPEATED, MESSAGE, devices, 1)
225
251
  #define BLUEACCESSDEVICELIST_DEFAULT NULL
226
252
  #define BlueAccessDeviceList_t_devices_MSGTYPE BlueAccessDevice_t
227
253
 
254
+ #define BLUEACCESSOBJECT_FIELDLIST(X, a) \
255
+ X(a, CALLBACK, REQUIRED, STRING, _id, 1) \
256
+ X(a, STATIC, REQUIRED, INT32, objectId, 2) \
257
+ X(a, CALLBACK, REQUIRED, STRING, name, 3) \
258
+ X(a, CALLBACK, OPTIONAL, STRING, description, 4)
259
+ #define BLUEACCESSOBJECT_CALLBACK pb_default_field_callback
260
+ #define BLUEACCESSOBJECT_DEFAULT NULL
261
+
262
+ #define BLUEACCESSOBJECTLIST_FIELDLIST(X, a) \
263
+ X(a, CALLBACK, REPEATED, MESSAGE, objects, 1)
264
+ #define BLUEACCESSOBJECTLIST_CALLBACK pb_default_field_callback
265
+ #define BLUEACCESSOBJECTLIST_DEFAULT NULL
266
+ #define BlueAccessObjectList_t_objects_MSGTYPE BlueAccessObject_t
267
+
228
268
  extern const pb_msgdesc_t BlueI18n_t_msg;
229
269
  extern const pb_msgdesc_t BlueDeviceDetailsBluetooth_t_msg;
230
270
  extern const pb_msgdesc_t BlueDeviceDetailsUWB_t_msg;
@@ -233,6 +273,8 @@ extern const pb_msgdesc_t BlueAccessCredential_t_msg;
233
273
  extern const pb_msgdesc_t BlueAccessCredentialList_t_msg;
234
274
  extern const pb_msgdesc_t BlueAccessDevice_t_msg;
235
275
  extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
276
+ extern const pb_msgdesc_t BlueAccessObject_t_msg;
277
+ extern const pb_msgdesc_t BlueAccessObjectList_t_msg;
236
278
 
237
279
  /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
238
280
  #define BLUEI18N_FIELDS &BlueI18n_t_msg
@@ -243,6 +285,8 @@ extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
243
285
  #define BLUEACCESSCREDENTIALLIST_FIELDS &BlueAccessCredentialList_t_msg
244
286
  #define BLUEACCESSDEVICE_FIELDS &BlueAccessDevice_t_msg
245
287
  #define BLUEACCESSDEVICELIST_FIELDS &BlueAccessDeviceList_t_msg
288
+ #define BLUEACCESSOBJECT_FIELDS &BlueAccessObject_t_msg
289
+ #define BLUEACCESSOBJECTLIST_FIELDS &BlueAccessObjectList_t_msg
246
290
 
247
291
  /* Maximum encoded size of messages (where known) */
248
292
  /* BlueI18n_size depends on runtime parameters */
@@ -251,6 +295,8 @@ extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
251
295
  /* BlueAccessCredentialList_size depends on runtime parameters */
252
296
  /* BlueAccessDevice_size depends on runtime parameters */
253
297
  /* BlueAccessDeviceList_size depends on runtime parameters */
298
+ /* BlueAccessObject_size depends on runtime parameters */
299
+ /* BlueAccessObjectList_size depends on runtime parameters */
254
300
  #define BLUEDEVICEDETAILSBLUETOOTH_SIZE 24
255
301
  #define BLUEDEVICEDETAILSUWB_SIZE 2
256
302
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blueid/access-proto",
3
- "version": "0.32.0",
3
+ "version": "0.34.0",
4
4
  "description": "BlueID Access Proto files",
5
5
  "author": "BlueID GmbH",
6
6
  "main": "cjs/index.js",
@@ -4255,10 +4255,10 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
4255
4255
  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
4256
4256
  1: .same(proto: "sequenceId"),
4257
4257
  2: .same(proto: "eventTime"),
4258
- 4: .same(proto: "eventId"),
4259
- 5: .same(proto: "eventInfo"),
4260
- 6: .same(proto: "credentialId"),
4261
- 7: .same(proto: "command"),
4258
+ 3: .same(proto: "eventId"),
4259
+ 4: .same(proto: "eventInfo"),
4260
+ 5: .same(proto: "credentialId"),
4261
+ 6: .same(proto: "command"),
4262
4262
  ]
4263
4263
 
4264
4264
  public var isInitialized: Bool {
@@ -4279,10 +4279,10 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
4279
4279
  switch fieldNumber {
4280
4280
  case 1: try { try decoder.decodeSingularUInt32Field(value: &self._sequenceID) }()
4281
4281
  case 2: try { try decoder.decodeSingularMessageField(value: &self._eventTime) }()
4282
- case 4: try { try decoder.decodeSingularEnumField(value: &self._eventID) }()
4283
- case 5: try { try decoder.decodeSingularInt32Field(value: &self._eventInfo) }()
4284
- case 6: try { try decoder.decodeSingularMessageField(value: &self._credentialID) }()
4285
- case 7: try { try decoder.decodeSingularStringField(value: &self._command) }()
4282
+ case 3: try { try decoder.decodeSingularEnumField(value: &self._eventID) }()
4283
+ case 4: try { try decoder.decodeSingularInt32Field(value: &self._eventInfo) }()
4284
+ case 5: try { try decoder.decodeSingularMessageField(value: &self._credentialID) }()
4285
+ case 6: try { try decoder.decodeSingularStringField(value: &self._command) }()
4286
4286
  default: break
4287
4287
  }
4288
4288
  }
@@ -4300,16 +4300,16 @@ extension BlueEvent: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementation
4300
4300
  try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
4301
4301
  } }()
4302
4302
  try { if let v = self._eventID {
4303
- try visitor.visitSingularEnumField(value: v, fieldNumber: 4)
4303
+ try visitor.visitSingularEnumField(value: v, fieldNumber: 3)
4304
4304
  } }()
4305
4305
  try { if let v = self._eventInfo {
4306
- try visitor.visitSingularInt32Field(value: v, fieldNumber: 5)
4306
+ try visitor.visitSingularInt32Field(value: v, fieldNumber: 4)
4307
4307
  } }()
4308
4308
  try { if let v = self._credentialID {
4309
- try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
4309
+ try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
4310
4310
  } }()
4311
4311
  try { if let v = self._command {
4312
- try visitor.visitSingularStringField(value: v, fieldNumber: 7)
4312
+ try visitor.visitSingularStringField(value: v, fieldNumber: 6)
4313
4313
  } }()
4314
4314
  try unknownFields.traverse(visitor: &visitor)
4315
4315
  }
@@ -444,12 +444,22 @@ public struct BlueAccessDevice {
444
444
  /// Clears the value of `objectName`. Subsequent reads from it will return its default value.
445
445
  public mutating func clearObjectName() {self._objectName = nil}
446
446
 
447
+ public var objectID: Int32 {
448
+ get {return _objectID ?? 0}
449
+ set {_objectID = newValue}
450
+ }
451
+ /// Returns true if `objectID` has been explicitly set.
452
+ public var hasObjectID: Bool {return self._objectID != nil}
453
+ /// Clears the value of `objectID`. Subsequent reads from it will return its default value.
454
+ public mutating func clearObjectID() {self._objectID = nil}
455
+
447
456
  public var unknownFields = SwiftProtobuf.UnknownStorage()
448
457
 
449
458
  public init() {}
450
459
 
451
460
  fileprivate var _deviceID: String? = nil
452
461
  fileprivate var _objectName: String? = nil
462
+ fileprivate var _objectID: Int32? = nil
453
463
  }
454
464
 
455
465
  public struct BlueAccessDeviceList {
@@ -464,6 +474,69 @@ public struct BlueAccessDeviceList {
464
474
  public init() {}
465
475
  }
466
476
 
477
+ public struct BlueAccessObject {
478
+ // SwiftProtobuf.Message conformance is added in an extension below. See the
479
+ // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
480
+ // methods supported on all messages.
481
+
482
+ public var id: String {
483
+ get {return _id ?? String()}
484
+ set {_id = newValue}
485
+ }
486
+ /// Returns true if `id` has been explicitly set.
487
+ public var hasID: Bool {return self._id != nil}
488
+ /// Clears the value of `id`. Subsequent reads from it will return its default value.
489
+ public mutating func clearID() {self._id = nil}
490
+
491
+ public var objectID: Int32 {
492
+ get {return _objectID ?? 0}
493
+ set {_objectID = newValue}
494
+ }
495
+ /// Returns true if `objectID` has been explicitly set.
496
+ public var hasObjectID: Bool {return self._objectID != nil}
497
+ /// Clears the value of `objectID`. Subsequent reads from it will return its default value.
498
+ public mutating func clearObjectID() {self._objectID = nil}
499
+
500
+ public var name: String {
501
+ get {return _name ?? String()}
502
+ set {_name = newValue}
503
+ }
504
+ /// Returns true if `name` has been explicitly set.
505
+ public var hasName: Bool {return self._name != nil}
506
+ /// Clears the value of `name`. Subsequent reads from it will return its default value.
507
+ public mutating func clearName() {self._name = nil}
508
+
509
+ public var description_p: String {
510
+ get {return _description_p ?? String()}
511
+ set {_description_p = newValue}
512
+ }
513
+ /// Returns true if `description_p` has been explicitly set.
514
+ public var hasDescription_p: Bool {return self._description_p != nil}
515
+ /// Clears the value of `description_p`. Subsequent reads from it will return its default value.
516
+ public mutating func clearDescription_p() {self._description_p = nil}
517
+
518
+ public var unknownFields = SwiftProtobuf.UnknownStorage()
519
+
520
+ public init() {}
521
+
522
+ fileprivate var _id: String? = nil
523
+ fileprivate var _objectID: Int32? = nil
524
+ fileprivate var _name: String? = nil
525
+ fileprivate var _description_p: String? = nil
526
+ }
527
+
528
+ public struct BlueAccessObjectList {
529
+ // SwiftProtobuf.Message conformance is added in an extension below. See the
530
+ // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
531
+ // methods supported on all messages.
532
+
533
+ public var objects: [BlueAccessObject] = []
534
+
535
+ public var unknownFields = SwiftProtobuf.UnknownStorage()
536
+
537
+ public init() {}
538
+ }
539
+
467
540
  #if swift(>=5.5) && canImport(_Concurrency)
468
541
  extension BlueDeviceType: @unchecked Sendable {}
469
542
  extension BlueI18n: @unchecked Sendable {}
@@ -475,6 +548,8 @@ extension BlueAccessCredential: @unchecked Sendable {}
475
548
  extension BlueAccessCredentialList: @unchecked Sendable {}
476
549
  extension BlueAccessDevice: @unchecked Sendable {}
477
550
  extension BlueAccessDeviceList: @unchecked Sendable {}
551
+ extension BlueAccessObject: @unchecked Sendable {}
552
+ extension BlueAccessObjectList: @unchecked Sendable {}
478
553
  #endif // swift(>=5.5) && canImport(_Concurrency)
479
554
 
480
555
  // MARK: - Code below here is support for the SwiftProtobuf runtime.
@@ -961,6 +1036,7 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
961
1036
  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
962
1037
  1: .same(proto: "deviceId"),
963
1038
  2: .same(proto: "objectName"),
1039
+ 3: .same(proto: "objectId"),
964
1040
  ]
965
1041
 
966
1042
  public var isInitialized: Bool {
@@ -976,6 +1052,7 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
976
1052
  switch fieldNumber {
977
1053
  case 1: try { try decoder.decodeSingularStringField(value: &self._deviceID) }()
978
1054
  case 2: try { try decoder.decodeSingularStringField(value: &self._objectName) }()
1055
+ case 3: try { try decoder.decodeSingularInt32Field(value: &self._objectID) }()
979
1056
  default: break
980
1057
  }
981
1058
  }
@@ -992,12 +1069,16 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
992
1069
  try { if let v = self._objectName {
993
1070
  try visitor.visitSingularStringField(value: v, fieldNumber: 2)
994
1071
  } }()
1072
+ try { if let v = self._objectID {
1073
+ try visitor.visitSingularInt32Field(value: v, fieldNumber: 3)
1074
+ } }()
995
1075
  try unknownFields.traverse(visitor: &visitor)
996
1076
  }
997
1077
 
998
1078
  public static func ==(lhs: BlueAccessDevice, rhs: BlueAccessDevice) -> Bool {
999
1079
  if lhs._deviceID != rhs._deviceID {return false}
1000
1080
  if lhs._objectName != rhs._objectName {return false}
1081
+ if lhs._objectID != rhs._objectID {return false}
1001
1082
  if lhs.unknownFields != rhs.unknownFields {return false}
1002
1083
  return true
1003
1084
  }
@@ -1039,3 +1120,101 @@ extension BlueAccessDeviceList: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
1039
1120
  return true
1040
1121
  }
1041
1122
  }
1123
+
1124
+ extension BlueAccessObject: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
1125
+ public static let protoMessageName: String = "BlueAccessObject"
1126
+ public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1127
+ 1: .standard(proto: "_id"),
1128
+ 2: .same(proto: "objectId"),
1129
+ 3: .same(proto: "name"),
1130
+ 4: .same(proto: "description"),
1131
+ ]
1132
+
1133
+ public var isInitialized: Bool {
1134
+ if self._id == nil {return false}
1135
+ if self._objectID == nil {return false}
1136
+ if self._name == nil {return false}
1137
+ return true
1138
+ }
1139
+
1140
+ public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
1141
+ while let fieldNumber = try decoder.nextFieldNumber() {
1142
+ // The use of inline closures is to circumvent an issue where the compiler
1143
+ // allocates stack space for every case branch when no optimizations are
1144
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
1145
+ switch fieldNumber {
1146
+ case 1: try { try decoder.decodeSingularStringField(value: &self._id) }()
1147
+ case 2: try { try decoder.decodeSingularInt32Field(value: &self._objectID) }()
1148
+ case 3: try { try decoder.decodeSingularStringField(value: &self._name) }()
1149
+ case 4: try { try decoder.decodeSingularStringField(value: &self._description_p) }()
1150
+ default: break
1151
+ }
1152
+ }
1153
+ }
1154
+
1155
+ public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
1156
+ // The use of inline closures is to circumvent an issue where the compiler
1157
+ // allocates stack space for every if/case branch local when no optimizations
1158
+ // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
1159
+ // https://github.com/apple/swift-protobuf/issues/1182
1160
+ try { if let v = self._id {
1161
+ try visitor.visitSingularStringField(value: v, fieldNumber: 1)
1162
+ } }()
1163
+ try { if let v = self._objectID {
1164
+ try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
1165
+ } }()
1166
+ try { if let v = self._name {
1167
+ try visitor.visitSingularStringField(value: v, fieldNumber: 3)
1168
+ } }()
1169
+ try { if let v = self._description_p {
1170
+ try visitor.visitSingularStringField(value: v, fieldNumber: 4)
1171
+ } }()
1172
+ try unknownFields.traverse(visitor: &visitor)
1173
+ }
1174
+
1175
+ public static func ==(lhs: BlueAccessObject, rhs: BlueAccessObject) -> Bool {
1176
+ if lhs._id != rhs._id {return false}
1177
+ if lhs._objectID != rhs._objectID {return false}
1178
+ if lhs._name != rhs._name {return false}
1179
+ if lhs._description_p != rhs._description_p {return false}
1180
+ if lhs.unknownFields != rhs.unknownFields {return false}
1181
+ return true
1182
+ }
1183
+ }
1184
+
1185
+ extension BlueAccessObjectList: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
1186
+ public static let protoMessageName: String = "BlueAccessObjectList"
1187
+ public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
1188
+ 1: .same(proto: "objects"),
1189
+ ]
1190
+
1191
+ public var isInitialized: Bool {
1192
+ if !SwiftProtobuf.Internal.areAllInitialized(self.objects) {return false}
1193
+ return true
1194
+ }
1195
+
1196
+ public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
1197
+ while let fieldNumber = try decoder.nextFieldNumber() {
1198
+ // The use of inline closures is to circumvent an issue where the compiler
1199
+ // allocates stack space for every case branch when no optimizations are
1200
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
1201
+ switch fieldNumber {
1202
+ case 1: try { try decoder.decodeRepeatedMessageField(value: &self.objects) }()
1203
+ default: break
1204
+ }
1205
+ }
1206
+ }
1207
+
1208
+ public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
1209
+ if !self.objects.isEmpty {
1210
+ try visitor.visitRepeatedMessageField(value: self.objects, fieldNumber: 1)
1211
+ }
1212
+ try unknownFields.traverse(visitor: &visitor)
1213
+ }
1214
+
1215
+ public static func ==(lhs: BlueAccessObjectList, rhs: BlueAccessObjectList) -> Bool {
1216
+ if lhs.objects != rhs.objects {return false}
1217
+ if lhs.unknownFields != rhs.unknownFields {return false}
1218
+ return true
1219
+ }
1220
+ }