@blueid/access-proto 0.24.0 → 0.26.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/BlueSDK.proto CHANGED
@@ -62,14 +62,21 @@ message BlueDeviceInfo {
62
62
  message BlueAccessCredential {
63
63
  required BlueCredentialId credentialId = 1;
64
64
  required BlueCredentialType credentialType = 2;
65
- optional BlueLocalTimestamp validFrom = 3;
66
- optional BlueLocalTimestamp validTo = 4;
67
- required bytes privateKey = 5;
65
+ optional string name = 3;
66
+ optional string siteName = 4;
67
+ optional BlueLocalTimestamp validFrom = 5;
68
+ optional BlueLocalTimestamp validTo = 6;
69
+ optional BlueLocalTimestamp validity = 7;
70
+ optional bytes privateKey = 8;
71
+ }
72
+
73
+ message BlueAccessCredentialList {
74
+ repeated BlueAccessCredential credentials = 1;
68
75
  }
69
76
 
70
77
  message BlueAccessDevice {
71
78
  required string deviceId = 1;
72
- optional string name = 2;
79
+ optional string objectName = 2;
73
80
  }
74
81
 
75
82
  message BlueAccessDeviceList {
@@ -210,19 +210,34 @@ export declare class BlueAccessCredential extends Message<BlueAccessCredential>
210
210
  credentialType: BlueCredentialType;
211
211
 
212
212
  /**
213
- * @generated from field: optional BlueLocalTimestamp validFrom = 3;
213
+ * @generated from field: optional string name = 3;
214
+ */
215
+ name?: string;
216
+
217
+ /**
218
+ * @generated from field: optional string siteName = 4;
219
+ */
220
+ siteName?: string;
221
+
222
+ /**
223
+ * @generated from field: optional BlueLocalTimestamp validFrom = 5;
214
224
  */
215
225
  validFrom?: BlueLocalTimestamp;
216
226
 
217
227
  /**
218
- * @generated from field: optional BlueLocalTimestamp validTo = 4;
228
+ * @generated from field: optional BlueLocalTimestamp validTo = 6;
219
229
  */
220
230
  validTo?: BlueLocalTimestamp;
221
231
 
222
232
  /**
223
- * @generated from field: required bytes privateKey = 5;
233
+ * @generated from field: optional BlueLocalTimestamp validity = 7;
224
234
  */
225
- privateKey: Uint8Array;
235
+ validity?: BlueLocalTimestamp;
236
+
237
+ /**
238
+ * @generated from field: optional bytes privateKey = 8;
239
+ */
240
+ privateKey?: Uint8Array;
226
241
 
227
242
  constructor(data?: PartialMessage<BlueAccessCredential>);
228
243
 
@@ -239,6 +254,30 @@ export declare class BlueAccessCredential extends Message<BlueAccessCredential>
239
254
  static equals(a: BlueAccessCredential | PlainMessage<BlueAccessCredential> | undefined, b: BlueAccessCredential | PlainMessage<BlueAccessCredential> | undefined): boolean;
240
255
  }
241
256
 
257
+ /**
258
+ * @generated from message BlueAccessCredentialList
259
+ */
260
+ export declare class BlueAccessCredentialList extends Message<BlueAccessCredentialList> {
261
+ /**
262
+ * @generated from field: repeated BlueAccessCredential credentials = 1;
263
+ */
264
+ credentials: BlueAccessCredential[];
265
+
266
+ constructor(data?: PartialMessage<BlueAccessCredentialList>);
267
+
268
+ static readonly runtime: typeof proto2;
269
+ static readonly typeName = "BlueAccessCredentialList";
270
+ static readonly fields: FieldList;
271
+
272
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueAccessCredentialList;
273
+
274
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueAccessCredentialList;
275
+
276
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueAccessCredentialList;
277
+
278
+ static equals(a: BlueAccessCredentialList | PlainMessage<BlueAccessCredentialList> | undefined, b: BlueAccessCredentialList | PlainMessage<BlueAccessCredentialList> | undefined): boolean;
279
+ }
280
+
242
281
  /**
243
282
  * @generated from message BlueAccessDevice
244
283
  */
@@ -249,9 +288,9 @@ export declare class BlueAccessDevice extends Message<BlueAccessDevice> {
249
288
  deviceId: string;
250
289
 
251
290
  /**
252
- * @generated from field: optional string name = 2;
291
+ * @generated from field: optional string objectName = 2;
253
292
  */
254
- name?: string;
293
+ objectName?: string;
255
294
 
256
295
  constructor(data?: PartialMessage<BlueAccessDevice>);
257
296
 
package/cjs/BlueSDK_pb.js CHANGED
@@ -18,6 +18,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
18
18
  var BlueSDK_pb_exports = {};
19
19
  __export(BlueSDK_pb_exports, {
20
20
  BlueAccessCredential: () => BlueAccessCredential,
21
+ BlueAccessCredentialList: () => BlueAccessCredentialList,
21
22
  BlueAccessDevice: () => BlueAccessDevice,
22
23
  BlueAccessDeviceList: () => BlueAccessDeviceList,
23
24
  BlueDeviceDetailsBluetooth: () => BlueDeviceDetailsBluetooth,
@@ -115,15 +116,18 @@ const BlueAccessCredential = import_protobuf.proto2.makeMessageType(
115
116
  () => [
116
117
  { no: 1, name: "credentialId", kind: "message", T: import_BlueCore_pb.BlueCredentialId },
117
118
  { no: 2, name: "credentialType", kind: "enum", T: import_protobuf.proto2.getEnumType(import_BlueCore_pb.BlueCredentialType) },
118
- { no: 3, name: "validFrom", kind: "message", T: import_BlueCore_pb.BlueLocalTimestamp, opt: true },
119
- { no: 4, name: "validTo", kind: "message", T: import_BlueCore_pb.BlueLocalTimestamp, opt: true },
120
- {
121
- no: 5,
122
- name: "privateKey",
123
- kind: "scalar",
124
- T: 12
125
- /* ScalarType.BYTES */
126
- }
119
+ { no: 3, name: "name", kind: "scalar", T: 9, opt: true },
120
+ { no: 4, name: "siteName", kind: "scalar", T: 9, opt: true },
121
+ { no: 5, name: "validFrom", kind: "message", T: import_BlueCore_pb.BlueLocalTimestamp, opt: true },
122
+ { no: 6, name: "validTo", kind: "message", T: import_BlueCore_pb.BlueLocalTimestamp, opt: true },
123
+ { no: 7, name: "validity", kind: "message", T: import_BlueCore_pb.BlueLocalTimestamp, opt: true },
124
+ { no: 8, name: "privateKey", kind: "scalar", T: 12, opt: true }
125
+ ]
126
+ );
127
+ const BlueAccessCredentialList = import_protobuf.proto2.makeMessageType(
128
+ "BlueAccessCredentialList",
129
+ () => [
130
+ { no: 1, name: "credentials", kind: "message", T: BlueAccessCredential, repeated: true }
127
131
  ]
128
132
  );
129
133
  const BlueAccessDevice = import_protobuf.proto2.makeMessageType(
@@ -136,7 +140,7 @@ const BlueAccessDevice = import_protobuf.proto2.makeMessageType(
136
140
  T: 9
137
141
  /* ScalarType.STRING */
138
142
  },
139
- { no: 2, name: "name", kind: "scalar", T: 9, opt: true }
143
+ { no: 2, name: "objectName", kind: "scalar", T: 9, opt: true }
140
144
  ]
141
145
  );
142
146
  const BlueAccessDeviceList = import_protobuf.proto2.makeMessageType(
@@ -210,19 +210,34 @@ export declare class BlueAccessCredential extends Message<BlueAccessCredential>
210
210
  credentialType: BlueCredentialType;
211
211
 
212
212
  /**
213
- * @generated from field: optional BlueLocalTimestamp validFrom = 3;
213
+ * @generated from field: optional string name = 3;
214
+ */
215
+ name?: string;
216
+
217
+ /**
218
+ * @generated from field: optional string siteName = 4;
219
+ */
220
+ siteName?: string;
221
+
222
+ /**
223
+ * @generated from field: optional BlueLocalTimestamp validFrom = 5;
214
224
  */
215
225
  validFrom?: BlueLocalTimestamp;
216
226
 
217
227
  /**
218
- * @generated from field: optional BlueLocalTimestamp validTo = 4;
228
+ * @generated from field: optional BlueLocalTimestamp validTo = 6;
219
229
  */
220
230
  validTo?: BlueLocalTimestamp;
221
231
 
222
232
  /**
223
- * @generated from field: required bytes privateKey = 5;
233
+ * @generated from field: optional BlueLocalTimestamp validity = 7;
224
234
  */
225
- privateKey: Uint8Array;
235
+ validity?: BlueLocalTimestamp;
236
+
237
+ /**
238
+ * @generated from field: optional bytes privateKey = 8;
239
+ */
240
+ privateKey?: Uint8Array;
226
241
 
227
242
  constructor(data?: PartialMessage<BlueAccessCredential>);
228
243
 
@@ -239,6 +254,30 @@ export declare class BlueAccessCredential extends Message<BlueAccessCredential>
239
254
  static equals(a: BlueAccessCredential | PlainMessage<BlueAccessCredential> | undefined, b: BlueAccessCredential | PlainMessage<BlueAccessCredential> | undefined): boolean;
240
255
  }
241
256
 
257
+ /**
258
+ * @generated from message BlueAccessCredentialList
259
+ */
260
+ export declare class BlueAccessCredentialList extends Message<BlueAccessCredentialList> {
261
+ /**
262
+ * @generated from field: repeated BlueAccessCredential credentials = 1;
263
+ */
264
+ credentials: BlueAccessCredential[];
265
+
266
+ constructor(data?: PartialMessage<BlueAccessCredentialList>);
267
+
268
+ static readonly runtime: typeof proto2;
269
+ static readonly typeName = "BlueAccessCredentialList";
270
+ static readonly fields: FieldList;
271
+
272
+ static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): BlueAccessCredentialList;
273
+
274
+ static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): BlueAccessCredentialList;
275
+
276
+ static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): BlueAccessCredentialList;
277
+
278
+ static equals(a: BlueAccessCredentialList | PlainMessage<BlueAccessCredentialList> | undefined, b: BlueAccessCredentialList | PlainMessage<BlueAccessCredentialList> | undefined): boolean;
279
+ }
280
+
242
281
  /**
243
282
  * @generated from message BlueAccessDevice
244
283
  */
@@ -249,9 +288,9 @@ export declare class BlueAccessDevice extends Message<BlueAccessDevice> {
249
288
  deviceId: string;
250
289
 
251
290
  /**
252
- * @generated from field: optional string name = 2;
291
+ * @generated from field: optional string objectName = 2;
253
292
  */
254
- name?: string;
293
+ objectName?: string;
255
294
 
256
295
  constructor(data?: PartialMessage<BlueAccessDevice>);
257
296
 
package/es/BlueSDK_pb.js CHANGED
@@ -79,9 +79,22 @@ export const BlueAccessCredential = proto2.makeMessageType(
79
79
  () => [
80
80
  { no: 1, name: "credentialId", kind: "message", T: BlueCredentialId },
81
81
  { no: 2, name: "credentialType", kind: "enum", T: proto2.getEnumType(BlueCredentialType) },
82
- { no: 3, name: "validFrom", kind: "message", T: BlueLocalTimestamp, opt: true },
83
- { no: 4, name: "validTo", kind: "message", T: BlueLocalTimestamp, opt: true },
84
- { no: 5, name: "privateKey", kind: "scalar", T: 12 /* ScalarType.BYTES */ },
82
+ { no: 3, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
83
+ { no: 4, name: "siteName", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
84
+ { no: 5, name: "validFrom", kind: "message", T: BlueLocalTimestamp, opt: true },
85
+ { no: 6, name: "validTo", kind: "message", T: BlueLocalTimestamp, opt: true },
86
+ { no: 7, name: "validity", kind: "message", T: BlueLocalTimestamp, opt: true },
87
+ { no: 8, name: "privateKey", kind: "scalar", T: 12 /* ScalarType.BYTES */, opt: true },
88
+ ],
89
+ );
90
+
91
+ /**
92
+ * @generated from message BlueAccessCredentialList
93
+ */
94
+ export const BlueAccessCredentialList = proto2.makeMessageType(
95
+ "BlueAccessCredentialList",
96
+ () => [
97
+ { no: 1, name: "credentials", kind: "message", T: BlueAccessCredential, repeated: true },
85
98
  ],
86
99
  );
87
100
 
@@ -92,7 +105,7 @@ export const BlueAccessDevice = proto2.makeMessageType(
92
105
  "BlueAccessDevice",
93
106
  () => [
94
107
  { no: 1, name: "deviceId", kind: "scalar", T: 9 /* ScalarType.STRING */ },
95
- { no: 2, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
108
+ { no: 2, name: "objectName", kind: "scalar", T: 9 /* ScalarType.STRING */, opt: true },
96
109
  ],
97
110
  );
98
111
 
@@ -21,6 +21,9 @@ PB_BIND(BLUEDEVICEINFO, BlueDeviceInfo_t, AUTO)
21
21
  PB_BIND(BLUEACCESSCREDENTIAL, BlueAccessCredential_t, AUTO)
22
22
 
23
23
 
24
+ PB_BIND(BLUEACCESSCREDENTIALLIST, BlueAccessCredentialList_t, AUTO)
25
+
26
+
24
27
  PB_BIND(BLUEACCESSDEVICE, BlueAccessDevice_t, AUTO)
25
28
 
26
29
 
@@ -54,16 +54,24 @@ typedef struct BlueDeviceInfo {
54
54
  typedef struct BlueAccessCredential {
55
55
  BlueCredentialId_t credentialId;
56
56
  BlueCredentialType_t credentialType;
57
+ pb_callback_t name;
58
+ pb_callback_t siteName;
57
59
  bool has_validFrom;
58
60
  BlueLocalTimestamp_t validFrom;
59
61
  bool has_validTo;
60
62
  BlueLocalTimestamp_t validTo;
63
+ bool has_validity;
64
+ BlueLocalTimestamp_t validity;
61
65
  pb_callback_t privateKey;
62
66
  } BlueAccessCredential_t;
63
67
 
68
+ typedef struct BlueAccessCredentialList {
69
+ pb_callback_t credentials;
70
+ } BlueAccessCredentialList_t;
71
+
64
72
  typedef struct BlueAccessDevice {
65
73
  pb_callback_t deviceId;
66
- pb_callback_t name;
74
+ pb_callback_t objectName;
67
75
  } BlueAccessDevice_t;
68
76
 
69
77
  typedef struct BlueAccessDeviceList {
@@ -90,19 +98,22 @@ extern "C" {
90
98
 
91
99
 
92
100
 
101
+
93
102
  /* Initializer values for message structs */
94
103
  #define BLUEI18N_INIT_DEFAULT {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
95
104
  #define BLUEDEVICEDETAILSBLUETOOTH_INIT_DEFAULT {0, 0, 0}
96
105
  #define BLUEDEVICEDETAILSUWB_INIT_DEFAULT {0}
97
106
  #define BLUEDEVICEINFO_INIT_DEFAULT {_BLUEDEVICETYPE_MIN, {{NULL}, NULL}, 0, false, BLUEBLEMANUFACTURERINFO_INIT_DEFAULT, 0, {BLUEDEVICEDETAILSBLUETOOTH_INIT_DEFAULT}}
98
- #define BLUEACCESSCREDENTIAL_INIT_DEFAULT {BLUECREDENTIALID_INIT_DEFAULT, _BLUECREDENTIALTYPE_MIN, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, {{NULL}, NULL}}
107
+ #define BLUEACCESSCREDENTIAL_INIT_DEFAULT {BLUECREDENTIALID_INIT_DEFAULT, _BLUECREDENTIALTYPE_MIN, {{NULL}, NULL}, {{NULL}, NULL}, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, false, BLUELOCALTIMESTAMP_INIT_DEFAULT, {{NULL}, NULL}}
108
+ #define BLUEACCESSCREDENTIALLIST_INIT_DEFAULT {{{NULL}, NULL}}
99
109
  #define BLUEACCESSDEVICE_INIT_DEFAULT {{{NULL}, NULL}, {{NULL}, NULL}}
100
110
  #define BLUEACCESSDEVICELIST_INIT_DEFAULT {{{NULL}, NULL}}
101
111
  #define BLUEI18N_INIT_ZERO {{{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}}
102
112
  #define BLUEDEVICEDETAILSBLUETOOTH_INIT_ZERO {0, 0, 0}
103
113
  #define BLUEDEVICEDETAILSUWB_INIT_ZERO {0}
104
114
  #define BLUEDEVICEINFO_INIT_ZERO {_BLUEDEVICETYPE_MIN, {{NULL}, NULL}, 0, false, BLUEBLEMANUFACTURERINFO_INIT_ZERO, 0, {BLUEDEVICEDETAILSBLUETOOTH_INIT_ZERO}}
105
- #define BLUEACCESSCREDENTIAL_INIT_ZERO {BLUECREDENTIALID_INIT_ZERO, _BLUECREDENTIALTYPE_MIN, false, BLUELOCALTIMESTAMP_INIT_ZERO, false, BLUELOCALTIMESTAMP_INIT_ZERO, {{NULL}, NULL}}
115
+ #define BLUEACCESSCREDENTIAL_INIT_ZERO {BLUECREDENTIALID_INIT_ZERO, _BLUECREDENTIALTYPE_MIN, {{NULL}, NULL}, {{NULL}, NULL}, false, BLUELOCALTIMESTAMP_INIT_ZERO, false, BLUELOCALTIMESTAMP_INIT_ZERO, false, BLUELOCALTIMESTAMP_INIT_ZERO, {{NULL}, NULL}}
116
+ #define BLUEACCESSCREDENTIALLIST_INIT_ZERO {{{NULL}, NULL}}
106
117
  #define BLUEACCESSDEVICE_INIT_ZERO {{{NULL}, NULL}, {{NULL}, NULL}}
107
118
  #define BLUEACCESSDEVICELIST_INIT_ZERO {{{NULL}, NULL}}
108
119
 
@@ -127,11 +138,15 @@ extern "C" {
127
138
  #define BLUEDEVICEINFO_UWB_TAG 6
128
139
  #define BLUEACCESSCREDENTIAL_CREDENTIALID_TAG 1
129
140
  #define BLUEACCESSCREDENTIAL_CREDENTIALTYPE_TAG 2
130
- #define BLUEACCESSCREDENTIAL_VALIDFROM_TAG 3
131
- #define BLUEACCESSCREDENTIAL_VALIDTO_TAG 4
132
- #define BLUEACCESSCREDENTIAL_PRIVATEKEY_TAG 5
141
+ #define BLUEACCESSCREDENTIAL_NAME_TAG 3
142
+ #define BLUEACCESSCREDENTIAL_SITENAME_TAG 4
143
+ #define BLUEACCESSCREDENTIAL_VALIDFROM_TAG 5
144
+ #define BLUEACCESSCREDENTIAL_VALIDTO_TAG 6
145
+ #define BLUEACCESSCREDENTIAL_VALIDITY_TAG 7
146
+ #define BLUEACCESSCREDENTIAL_PRIVATEKEY_TAG 8
147
+ #define BLUEACCESSCREDENTIALLIST_CREDENTIALS_TAG 1
133
148
  #define BLUEACCESSDEVICE_DEVICEID_TAG 1
134
- #define BLUEACCESSDEVICE_NAME_TAG 2
149
+ #define BLUEACCESSDEVICE_OBJECTNAME_TAG 2
135
150
  #define BLUEACCESSDEVICELIST_DEVICES_TAG 1
136
151
 
137
152
  /* Struct field encoding specification for nanopb */
@@ -175,18 +190,28 @@ X(a, STATIC, ONEOF, MESSAGE, (details,uwb,details.uwb), 6)
175
190
  #define BLUEACCESSCREDENTIAL_FIELDLIST(X, a) \
176
191
  X(a, STATIC, REQUIRED, MESSAGE, credentialId, 1) \
177
192
  X(a, STATIC, REQUIRED, UENUM, credentialType, 2) \
178
- X(a, STATIC, OPTIONAL, MESSAGE, validFrom, 3) \
179
- X(a, STATIC, OPTIONAL, MESSAGE, validTo, 4) \
180
- X(a, CALLBACK, REQUIRED, BYTES, privateKey, 5)
193
+ X(a, CALLBACK, OPTIONAL, STRING, name, 3) \
194
+ X(a, CALLBACK, OPTIONAL, STRING, siteName, 4) \
195
+ X(a, STATIC, OPTIONAL, MESSAGE, validFrom, 5) \
196
+ X(a, STATIC, OPTIONAL, MESSAGE, validTo, 6) \
197
+ X(a, STATIC, OPTIONAL, MESSAGE, validity, 7) \
198
+ X(a, CALLBACK, OPTIONAL, BYTES, privateKey, 8)
181
199
  #define BLUEACCESSCREDENTIAL_CALLBACK pb_default_field_callback
182
200
  #define BLUEACCESSCREDENTIAL_DEFAULT (const pb_byte_t*)"\x10\x01\x00"
183
201
  #define BlueAccessCredential_t_credentialId_MSGTYPE BlueCredentialId_t
184
202
  #define BlueAccessCredential_t_validFrom_MSGTYPE BlueLocalTimestamp_t
185
203
  #define BlueAccessCredential_t_validTo_MSGTYPE BlueLocalTimestamp_t
204
+ #define BlueAccessCredential_t_validity_MSGTYPE BlueLocalTimestamp_t
205
+
206
+ #define BLUEACCESSCREDENTIALLIST_FIELDLIST(X, a) \
207
+ X(a, CALLBACK, REPEATED, MESSAGE, credentials, 1)
208
+ #define BLUEACCESSCREDENTIALLIST_CALLBACK pb_default_field_callback
209
+ #define BLUEACCESSCREDENTIALLIST_DEFAULT NULL
210
+ #define BlueAccessCredentialList_t_credentials_MSGTYPE BlueAccessCredential_t
186
211
 
187
212
  #define BLUEACCESSDEVICE_FIELDLIST(X, a) \
188
213
  X(a, CALLBACK, REQUIRED, STRING, deviceId, 1) \
189
- X(a, CALLBACK, OPTIONAL, STRING, name, 2)
214
+ X(a, CALLBACK, OPTIONAL, STRING, objectName, 2)
190
215
  #define BLUEACCESSDEVICE_CALLBACK pb_default_field_callback
191
216
  #define BLUEACCESSDEVICE_DEFAULT NULL
192
217
 
@@ -201,6 +226,7 @@ extern const pb_msgdesc_t BlueDeviceDetailsBluetooth_t_msg;
201
226
  extern const pb_msgdesc_t BlueDeviceDetailsUWB_t_msg;
202
227
  extern const pb_msgdesc_t BlueDeviceInfo_t_msg;
203
228
  extern const pb_msgdesc_t BlueAccessCredential_t_msg;
229
+ extern const pb_msgdesc_t BlueAccessCredentialList_t_msg;
204
230
  extern const pb_msgdesc_t BlueAccessDevice_t_msg;
205
231
  extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
206
232
 
@@ -210,6 +236,7 @@ extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
210
236
  #define BLUEDEVICEDETAILSUWB_FIELDS &BlueDeviceDetailsUWB_t_msg
211
237
  #define BLUEDEVICEINFO_FIELDS &BlueDeviceInfo_t_msg
212
238
  #define BLUEACCESSCREDENTIAL_FIELDS &BlueAccessCredential_t_msg
239
+ #define BLUEACCESSCREDENTIALLIST_FIELDS &BlueAccessCredentialList_t_msg
213
240
  #define BLUEACCESSDEVICE_FIELDS &BlueAccessDevice_t_msg
214
241
  #define BLUEACCESSDEVICELIST_FIELDS &BlueAccessDeviceList_t_msg
215
242
 
@@ -217,6 +244,7 @@ extern const pb_msgdesc_t BlueAccessDeviceList_t_msg;
217
244
  /* BlueI18n_size depends on runtime parameters */
218
245
  /* BlueDeviceInfo_size depends on runtime parameters */
219
246
  /* BlueAccessCredential_size depends on runtime parameters */
247
+ /* BlueAccessCredentialList_size depends on runtime parameters */
220
248
  /* BlueAccessDevice_size depends on runtime parameters */
221
249
  /* BlueAccessDeviceList_size depends on runtime parameters */
222
250
  #define BLUEDEVICEDETAILSBLUETOOTH_SIZE 24
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blueid/access-proto",
3
- "version": "0.24.0",
3
+ "version": "0.26.0",
4
4
  "description": "BlueID Access Proto files",
5
5
  "author": "BlueID GmbH",
6
6
  "main": "cjs/index.js",
@@ -322,59 +322,94 @@ public struct BlueAccessCredential {
322
322
  // methods supported on all messages.
323
323
 
324
324
  public var credentialID: BlueCredentialId {
325
- get {return _credentialID ?? BlueCredentialId()}
326
- set {_credentialID = newValue}
325
+ get {return _storage._credentialID ?? BlueCredentialId()}
326
+ set {_uniqueStorage()._credentialID = newValue}
327
327
  }
328
328
  /// Returns true if `credentialID` has been explicitly set.
329
- public var hasCredentialID: Bool {return self._credentialID != nil}
329
+ public var hasCredentialID: Bool {return _storage._credentialID != nil}
330
330
  /// Clears the value of `credentialID`. Subsequent reads from it will return its default value.
331
- public mutating func clearCredentialID() {self._credentialID = nil}
331
+ public mutating func clearCredentialID() {_uniqueStorage()._credentialID = nil}
332
332
 
333
333
  public var credentialType: BlueCredentialType {
334
- get {return _credentialType ?? .regular}
335
- set {_credentialType = newValue}
334
+ get {return _storage._credentialType ?? .regular}
335
+ set {_uniqueStorage()._credentialType = newValue}
336
336
  }
337
337
  /// Returns true if `credentialType` has been explicitly set.
338
- public var hasCredentialType: Bool {return self._credentialType != nil}
338
+ public var hasCredentialType: Bool {return _storage._credentialType != nil}
339
339
  /// Clears the value of `credentialType`. Subsequent reads from it will return its default value.
340
- public mutating func clearCredentialType() {self._credentialType = nil}
340
+ public mutating func clearCredentialType() {_uniqueStorage()._credentialType = nil}
341
+
342
+ public var name: String {
343
+ get {return _storage._name ?? String()}
344
+ set {_uniqueStorage()._name = newValue}
345
+ }
346
+ /// Returns true if `name` has been explicitly set.
347
+ public var hasName: Bool {return _storage._name != nil}
348
+ /// Clears the value of `name`. Subsequent reads from it will return its default value.
349
+ public mutating func clearName() {_uniqueStorage()._name = nil}
350
+
351
+ public var siteName: String {
352
+ get {return _storage._siteName ?? String()}
353
+ set {_uniqueStorage()._siteName = newValue}
354
+ }
355
+ /// Returns true if `siteName` has been explicitly set.
356
+ public var hasSiteName: Bool {return _storage._siteName != nil}
357
+ /// Clears the value of `siteName`. Subsequent reads from it will return its default value.
358
+ public mutating func clearSiteName() {_uniqueStorage()._siteName = nil}
341
359
 
342
360
  public var validFrom: BlueLocalTimestamp {
343
- get {return _validFrom ?? BlueLocalTimestamp()}
344
- set {_validFrom = newValue}
361
+ get {return _storage._validFrom ?? BlueLocalTimestamp()}
362
+ set {_uniqueStorage()._validFrom = newValue}
345
363
  }
346
364
  /// Returns true if `validFrom` has been explicitly set.
347
- public var hasValidFrom: Bool {return self._validFrom != nil}
365
+ public var hasValidFrom: Bool {return _storage._validFrom != nil}
348
366
  /// Clears the value of `validFrom`. Subsequent reads from it will return its default value.
349
- public mutating func clearValidFrom() {self._validFrom = nil}
367
+ public mutating func clearValidFrom() {_uniqueStorage()._validFrom = nil}
350
368
 
351
369
  public var validTo: BlueLocalTimestamp {
352
- get {return _validTo ?? BlueLocalTimestamp()}
353
- set {_validTo = newValue}
370
+ get {return _storage._validTo ?? BlueLocalTimestamp()}
371
+ set {_uniqueStorage()._validTo = newValue}
354
372
  }
355
373
  /// Returns true if `validTo` has been explicitly set.
356
- public var hasValidTo: Bool {return self._validTo != nil}
374
+ public var hasValidTo: Bool {return _storage._validTo != nil}
357
375
  /// Clears the value of `validTo`. Subsequent reads from it will return its default value.
358
- public mutating func clearValidTo() {self._validTo = nil}
376
+ public mutating func clearValidTo() {_uniqueStorage()._validTo = nil}
377
+
378
+ public var validity: BlueLocalTimestamp {
379
+ get {return _storage._validity ?? BlueLocalTimestamp()}
380
+ set {_uniqueStorage()._validity = newValue}
381
+ }
382
+ /// Returns true if `validity` has been explicitly set.
383
+ public var hasValidity: Bool {return _storage._validity != nil}
384
+ /// Clears the value of `validity`. Subsequent reads from it will return its default value.
385
+ public mutating func clearValidity() {_uniqueStorage()._validity = nil}
359
386
 
360
387
  public var privateKey: Data {
361
- get {return _privateKey ?? Data()}
362
- set {_privateKey = newValue}
388
+ get {return _storage._privateKey ?? Data()}
389
+ set {_uniqueStorage()._privateKey = newValue}
363
390
  }
364
391
  /// Returns true if `privateKey` has been explicitly set.
365
- public var hasPrivateKey: Bool {return self._privateKey != nil}
392
+ public var hasPrivateKey: Bool {return _storage._privateKey != nil}
366
393
  /// Clears the value of `privateKey`. Subsequent reads from it will return its default value.
367
- public mutating func clearPrivateKey() {self._privateKey = nil}
394
+ public mutating func clearPrivateKey() {_uniqueStorage()._privateKey = nil}
368
395
 
369
396
  public var unknownFields = SwiftProtobuf.UnknownStorage()
370
397
 
371
398
  public init() {}
372
399
 
373
- fileprivate var _credentialID: BlueCredentialId? = nil
374
- fileprivate var _credentialType: BlueCredentialType? = nil
375
- fileprivate var _validFrom: BlueLocalTimestamp? = nil
376
- fileprivate var _validTo: BlueLocalTimestamp? = nil
377
- fileprivate var _privateKey: Data? = nil
400
+ fileprivate var _storage = _StorageClass.defaultInstance
401
+ }
402
+
403
+ public struct BlueAccessCredentialList {
404
+ // SwiftProtobuf.Message conformance is added in an extension below. See the
405
+ // `Message` and `Message+*Additions` files in the SwiftProtobuf library for
406
+ // methods supported on all messages.
407
+
408
+ public var credentials: [BlueAccessCredential] = []
409
+
410
+ public var unknownFields = SwiftProtobuf.UnknownStorage()
411
+
412
+ public init() {}
378
413
  }
379
414
 
380
415
  public struct BlueAccessDevice {
@@ -391,21 +426,21 @@ public struct BlueAccessDevice {
391
426
  /// Clears the value of `deviceID`. Subsequent reads from it will return its default value.
392
427
  public mutating func clearDeviceID() {self._deviceID = nil}
393
428
 
394
- public var name: String {
395
- get {return _name ?? String()}
396
- set {_name = newValue}
429
+ public var objectName: String {
430
+ get {return _objectName ?? String()}
431
+ set {_objectName = newValue}
397
432
  }
398
- /// Returns true if `name` has been explicitly set.
399
- public var hasName: Bool {return self._name != nil}
400
- /// Clears the value of `name`. Subsequent reads from it will return its default value.
401
- public mutating func clearName() {self._name = nil}
433
+ /// Returns true if `objectName` has been explicitly set.
434
+ public var hasObjectName: Bool {return self._objectName != nil}
435
+ /// Clears the value of `objectName`. Subsequent reads from it will return its default value.
436
+ public mutating func clearObjectName() {self._objectName = nil}
402
437
 
403
438
  public var unknownFields = SwiftProtobuf.UnknownStorage()
404
439
 
405
440
  public init() {}
406
441
 
407
442
  fileprivate var _deviceID: String? = nil
408
- fileprivate var _name: String? = nil
443
+ fileprivate var _objectName: String? = nil
409
444
  }
410
445
 
411
446
  public struct BlueAccessDeviceList {
@@ -428,6 +463,7 @@ extension BlueDeviceDetailsUWB: @unchecked Sendable {}
428
463
  extension BlueDeviceInfo: @unchecked Sendable {}
429
464
  extension BlueDeviceInfo.OneOf_Details: @unchecked Sendable {}
430
465
  extension BlueAccessCredential: @unchecked Sendable {}
466
+ extension BlueAccessCredentialList: @unchecked Sendable {}
431
467
  extension BlueAccessDevice: @unchecked Sendable {}
432
468
  extension BlueAccessDeviceList: @unchecked Sendable {}
433
469
  #endif // swift(>=5.5) && canImport(_Concurrency)
@@ -735,18 +771,145 @@ extension BlueAccessCredential: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
735
771
  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
736
772
  1: .same(proto: "credentialId"),
737
773
  2: .same(proto: "credentialType"),
738
- 3: .same(proto: "validFrom"),
739
- 4: .same(proto: "validTo"),
740
- 5: .same(proto: "privateKey"),
774
+ 3: .same(proto: "name"),
775
+ 4: .same(proto: "siteName"),
776
+ 5: .same(proto: "validFrom"),
777
+ 6: .same(proto: "validTo"),
778
+ 7: .same(proto: "validity"),
779
+ 8: .same(proto: "privateKey"),
741
780
  ]
742
781
 
782
+ fileprivate class _StorageClass {
783
+ var _credentialID: BlueCredentialId? = nil
784
+ var _credentialType: BlueCredentialType? = nil
785
+ var _name: String? = nil
786
+ var _siteName: String? = nil
787
+ var _validFrom: BlueLocalTimestamp? = nil
788
+ var _validTo: BlueLocalTimestamp? = nil
789
+ var _validity: BlueLocalTimestamp? = nil
790
+ var _privateKey: Data? = nil
791
+
792
+ static let defaultInstance = _StorageClass()
793
+
794
+ private init() {}
795
+
796
+ init(copying source: _StorageClass) {
797
+ _credentialID = source._credentialID
798
+ _credentialType = source._credentialType
799
+ _name = source._name
800
+ _siteName = source._siteName
801
+ _validFrom = source._validFrom
802
+ _validTo = source._validTo
803
+ _validity = source._validity
804
+ _privateKey = source._privateKey
805
+ }
806
+ }
807
+
808
+ fileprivate mutating func _uniqueStorage() -> _StorageClass {
809
+ if !isKnownUniquelyReferenced(&_storage) {
810
+ _storage = _StorageClass(copying: _storage)
811
+ }
812
+ return _storage
813
+ }
814
+
743
815
  public var isInitialized: Bool {
744
- if self._credentialID == nil {return false}
745
- if self._credentialType == nil {return false}
746
- if self._privateKey == nil {return false}
747
- if let v = self._credentialID, !v.isInitialized {return false}
748
- if let v = self._validFrom, !v.isInitialized {return false}
749
- if let v = self._validTo, !v.isInitialized {return false}
816
+ return withExtendedLifetime(_storage) { (_storage: _StorageClass) in
817
+ if _storage._credentialID == nil {return false}
818
+ if _storage._credentialType == nil {return false}
819
+ if let v = _storage._credentialID, !v.isInitialized {return false}
820
+ if let v = _storage._validFrom, !v.isInitialized {return false}
821
+ if let v = _storage._validTo, !v.isInitialized {return false}
822
+ if let v = _storage._validity, !v.isInitialized {return false}
823
+ return true
824
+ }
825
+ }
826
+
827
+ public mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
828
+ _ = _uniqueStorage()
829
+ try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
830
+ while let fieldNumber = try decoder.nextFieldNumber() {
831
+ // The use of inline closures is to circumvent an issue where the compiler
832
+ // allocates stack space for every case branch when no optimizations are
833
+ // enabled. https://github.com/apple/swift-protobuf/issues/1034
834
+ switch fieldNumber {
835
+ case 1: try { try decoder.decodeSingularMessageField(value: &_storage._credentialID) }()
836
+ case 2: try { try decoder.decodeSingularEnumField(value: &_storage._credentialType) }()
837
+ case 3: try { try decoder.decodeSingularStringField(value: &_storage._name) }()
838
+ case 4: try { try decoder.decodeSingularStringField(value: &_storage._siteName) }()
839
+ case 5: try { try decoder.decodeSingularMessageField(value: &_storage._validFrom) }()
840
+ case 6: try { try decoder.decodeSingularMessageField(value: &_storage._validTo) }()
841
+ case 7: try { try decoder.decodeSingularMessageField(value: &_storage._validity) }()
842
+ case 8: try { try decoder.decodeSingularBytesField(value: &_storage._privateKey) }()
843
+ default: break
844
+ }
845
+ }
846
+ }
847
+ }
848
+
849
+ public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
850
+ try withExtendedLifetime(_storage) { (_storage: _StorageClass) in
851
+ // The use of inline closures is to circumvent an issue where the compiler
852
+ // allocates stack space for every if/case branch local when no optimizations
853
+ // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
854
+ // https://github.com/apple/swift-protobuf/issues/1182
855
+ try { if let v = _storage._credentialID {
856
+ try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
857
+ } }()
858
+ try { if let v = _storage._credentialType {
859
+ try visitor.visitSingularEnumField(value: v, fieldNumber: 2)
860
+ } }()
861
+ try { if let v = _storage._name {
862
+ try visitor.visitSingularStringField(value: v, fieldNumber: 3)
863
+ } }()
864
+ try { if let v = _storage._siteName {
865
+ try visitor.visitSingularStringField(value: v, fieldNumber: 4)
866
+ } }()
867
+ try { if let v = _storage._validFrom {
868
+ try visitor.visitSingularMessageField(value: v, fieldNumber: 5)
869
+ } }()
870
+ try { if let v = _storage._validTo {
871
+ try visitor.visitSingularMessageField(value: v, fieldNumber: 6)
872
+ } }()
873
+ try { if let v = _storage._validity {
874
+ try visitor.visitSingularMessageField(value: v, fieldNumber: 7)
875
+ } }()
876
+ try { if let v = _storage._privateKey {
877
+ try visitor.visitSingularBytesField(value: v, fieldNumber: 8)
878
+ } }()
879
+ }
880
+ try unknownFields.traverse(visitor: &visitor)
881
+ }
882
+
883
+ public static func ==(lhs: BlueAccessCredential, rhs: BlueAccessCredential) -> Bool {
884
+ if lhs._storage !== rhs._storage {
885
+ let storagesAreEqual: Bool = withExtendedLifetime((lhs._storage, rhs._storage)) { (_args: (_StorageClass, _StorageClass)) in
886
+ let _storage = _args.0
887
+ let rhs_storage = _args.1
888
+ if _storage._credentialID != rhs_storage._credentialID {return false}
889
+ if _storage._credentialType != rhs_storage._credentialType {return false}
890
+ if _storage._name != rhs_storage._name {return false}
891
+ if _storage._siteName != rhs_storage._siteName {return false}
892
+ if _storage._validFrom != rhs_storage._validFrom {return false}
893
+ if _storage._validTo != rhs_storage._validTo {return false}
894
+ if _storage._validity != rhs_storage._validity {return false}
895
+ if _storage._privateKey != rhs_storage._privateKey {return false}
896
+ return true
897
+ }
898
+ if !storagesAreEqual {return false}
899
+ }
900
+ if lhs.unknownFields != rhs.unknownFields {return false}
901
+ return true
902
+ }
903
+ }
904
+
905
+ extension BlueAccessCredentialList: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
906
+ public static let protoMessageName: String = "BlueAccessCredentialList"
907
+ public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
908
+ 1: .same(proto: "credentials"),
909
+ ]
910
+
911
+ public var isInitialized: Bool {
912
+ if !SwiftProtobuf.Internal.areAllInitialized(self.credentials) {return false}
750
913
  return true
751
914
  }
752
915
 
@@ -756,45 +919,21 @@ extension BlueAccessCredential: SwiftProtobuf.Message, SwiftProtobuf._MessageImp
756
919
  // allocates stack space for every case branch when no optimizations are
757
920
  // enabled. https://github.com/apple/swift-protobuf/issues/1034
758
921
  switch fieldNumber {
759
- case 1: try { try decoder.decodeSingularMessageField(value: &self._credentialID) }()
760
- case 2: try { try decoder.decodeSingularEnumField(value: &self._credentialType) }()
761
- case 3: try { try decoder.decodeSingularMessageField(value: &self._validFrom) }()
762
- case 4: try { try decoder.decodeSingularMessageField(value: &self._validTo) }()
763
- case 5: try { try decoder.decodeSingularBytesField(value: &self._privateKey) }()
922
+ case 1: try { try decoder.decodeRepeatedMessageField(value: &self.credentials) }()
764
923
  default: break
765
924
  }
766
925
  }
767
926
  }
768
927
 
769
928
  public func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
770
- // The use of inline closures is to circumvent an issue where the compiler
771
- // allocates stack space for every if/case branch local when no optimizations
772
- // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
773
- // https://github.com/apple/swift-protobuf/issues/1182
774
- try { if let v = self._credentialID {
775
- try visitor.visitSingularMessageField(value: v, fieldNumber: 1)
776
- } }()
777
- try { if let v = self._credentialType {
778
- try visitor.visitSingularEnumField(value: v, fieldNumber: 2)
779
- } }()
780
- try { if let v = self._validFrom {
781
- try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
782
- } }()
783
- try { if let v = self._validTo {
784
- try visitor.visitSingularMessageField(value: v, fieldNumber: 4)
785
- } }()
786
- try { if let v = self._privateKey {
787
- try visitor.visitSingularBytesField(value: v, fieldNumber: 5)
788
- } }()
929
+ if !self.credentials.isEmpty {
930
+ try visitor.visitRepeatedMessageField(value: self.credentials, fieldNumber: 1)
931
+ }
789
932
  try unknownFields.traverse(visitor: &visitor)
790
933
  }
791
934
 
792
- public static func ==(lhs: BlueAccessCredential, rhs: BlueAccessCredential) -> Bool {
793
- if lhs._credentialID != rhs._credentialID {return false}
794
- if lhs._credentialType != rhs._credentialType {return false}
795
- if lhs._validFrom != rhs._validFrom {return false}
796
- if lhs._validTo != rhs._validTo {return false}
797
- if lhs._privateKey != rhs._privateKey {return false}
935
+ public static func ==(lhs: BlueAccessCredentialList, rhs: BlueAccessCredentialList) -> Bool {
936
+ if lhs.credentials != rhs.credentials {return false}
798
937
  if lhs.unknownFields != rhs.unknownFields {return false}
799
938
  return true
800
939
  }
@@ -804,7 +943,7 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
804
943
  public static let protoMessageName: String = "BlueAccessDevice"
805
944
  public static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
806
945
  1: .same(proto: "deviceId"),
807
- 2: .same(proto: "name"),
946
+ 2: .same(proto: "objectName"),
808
947
  ]
809
948
 
810
949
  public var isInitialized: Bool {
@@ -819,7 +958,7 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
819
958
  // enabled. https://github.com/apple/swift-protobuf/issues/1034
820
959
  switch fieldNumber {
821
960
  case 1: try { try decoder.decodeSingularStringField(value: &self._deviceID) }()
822
- case 2: try { try decoder.decodeSingularStringField(value: &self._name) }()
961
+ case 2: try { try decoder.decodeSingularStringField(value: &self._objectName) }()
823
962
  default: break
824
963
  }
825
964
  }
@@ -833,7 +972,7 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
833
972
  try { if let v = self._deviceID {
834
973
  try visitor.visitSingularStringField(value: v, fieldNumber: 1)
835
974
  } }()
836
- try { if let v = self._name {
975
+ try { if let v = self._objectName {
837
976
  try visitor.visitSingularStringField(value: v, fieldNumber: 2)
838
977
  } }()
839
978
  try unknownFields.traverse(visitor: &visitor)
@@ -841,7 +980,7 @@ extension BlueAccessDevice: SwiftProtobuf.Message, SwiftProtobuf._MessageImpleme
841
980
 
842
981
  public static func ==(lhs: BlueAccessDevice, rhs: BlueAccessDevice) -> Bool {
843
982
  if lhs._deviceID != rhs._deviceID {return false}
844
- if lhs._name != rhs._name {return false}
983
+ if lhs._objectName != rhs._objectName {return false}
845
984
  if lhs.unknownFields != rhs.unknownFields {return false}
846
985
  return true
847
986
  }