@openhps/protobuf 1.0.1 → 1.1.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.
Files changed (104) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +58 -38
  3. package/dist/cjs/InternalProtobufDeserializer.js +30 -15
  4. package/dist/cjs/InternalProtobufDeserializer.js.map +1 -1
  5. package/dist/cjs/InternalProtobufSerializer.js +7 -7
  6. package/dist/cjs/InternalProtobufSerializer.js.map +1 -1
  7. package/dist/cjs/PrimitiveWrapper.js +13 -0
  8. package/dist/cjs/PrimitiveWrapper.js.map +1 -0
  9. package/dist/cjs/ProtobufSerializer.js +27 -2
  10. package/dist/cjs/ProtobufSerializer.js.map +1 -1
  11. package/dist/cjs/bin/generator.js +3 -3
  12. package/dist/cjs/bin/generator.js.map +1 -1
  13. package/dist/cjs/generator/ObjectGenerator.js +30 -12
  14. package/dist/cjs/generator/ObjectGenerator.js.map +1 -1
  15. package/dist/cjs/generator/ProjectGenerator.js +89 -38
  16. package/dist/cjs/generator/ProjectGenerator.js.map +1 -1
  17. package/dist/cjs/generator/constants.js +11 -4
  18. package/dist/cjs/generator/constants.js.map +1 -1
  19. package/dist/cjs/package.json +3 -0
  20. package/dist/cjs/tsconfig.bundle.cjs.tsbuildinfo +1 -0
  21. package/dist/esm/InternalProtobufDeserializer.js +30 -14
  22. package/dist/esm/InternalProtobufDeserializer.js.map +1 -1
  23. package/dist/esm/InternalProtobufSerializer.js +7 -6
  24. package/dist/esm/InternalProtobufSerializer.js.map +1 -1
  25. package/dist/esm/PrimitiveWrapper.js +9 -0
  26. package/dist/esm/PrimitiveWrapper.js.map +1 -0
  27. package/dist/esm/ProtobufSerializer.js +30 -5
  28. package/dist/esm/ProtobufSerializer.js.map +1 -1
  29. package/dist/esm/bin/generator.js +5 -5
  30. package/dist/esm/bin/generator.js.map +1 -1
  31. package/dist/esm/decorators/index.js +1 -1
  32. package/dist/esm/generator/ObjectGenerator.js +32 -14
  33. package/dist/esm/generator/ObjectGenerator.js.map +1 -1
  34. package/dist/esm/generator/ProjectGenerator.js +92 -40
  35. package/dist/esm/generator/ProjectGenerator.js.map +1 -1
  36. package/dist/esm/generator/ServiceGenerator.js +1 -1
  37. package/dist/esm/generator/constants.js +11 -4
  38. package/dist/esm/generator/constants.js.map +1 -1
  39. package/dist/esm/generator/index.js +3 -3
  40. package/dist/esm/index.js +2 -2
  41. package/dist/esm/package.json +3 -0
  42. package/dist/esm/tsconfig.bundle.esm.tsbuildinfo +1 -0
  43. package/dist/esm/tsconfig.bundle.types.tsbuildinfo +1 -0
  44. package/dist/types/InternalProtobufDeserializer.d.ts +0 -2
  45. package/dist/types/InternalProtobufDeserializer.d.ts.map +1 -1
  46. package/dist/types/InternalProtobufSerializer.d.ts +0 -2
  47. package/dist/types/InternalProtobufSerializer.d.ts.map +1 -1
  48. package/dist/types/PrimitiveWrapper.d.ts +8 -0
  49. package/dist/types/PrimitiveWrapper.d.ts.map +1 -0
  50. package/dist/types/ProtobufSerializer.d.ts +6 -0
  51. package/dist/types/ProtobufSerializer.d.ts.map +1 -1
  52. package/dist/types/generator/ObjectGenerator.d.ts +2 -8
  53. package/dist/types/generator/ObjectGenerator.d.ts.map +1 -1
  54. package/dist/types/generator/ProjectGenerator.d.ts +1 -1
  55. package/dist/types/generator/ProjectGenerator.d.ts.map +1 -1
  56. package/dist/types/generator/constants.d.ts +1 -1
  57. package/dist/types/generator/constants.d.ts.map +1 -1
  58. package/dist/web/openhps-protobuf.es.js +17112 -12881
  59. package/dist/web/openhps-protobuf.es.js.map +1 -1
  60. package/dist/web/openhps-protobuf.es.min.js +2 -1
  61. package/dist/web/openhps-protobuf.es.min.js.LICENSE.txt +19 -0
  62. package/dist/web/openhps-protobuf.es.min.js.map +1 -1
  63. package/dist/web/openhps-protobuf.js +17434 -14605
  64. package/dist/web/openhps-protobuf.js.map +1 -1
  65. package/dist/web/openhps-protobuf.min.js +2 -1
  66. package/dist/web/openhps-protobuf.min.js.LICENSE.txt +19 -0
  67. package/dist/web/openhps-protobuf.min.js.map +1 -1
  68. package/package.json +125 -94
  69. package/src/InternalProtobufDeserializer.ts +52 -34
  70. package/src/InternalProtobufSerializer.ts +9 -10
  71. package/src/PrimitiveWrapper.ts +9 -0
  72. package/src/ProtobufSerializer.ts +33 -2
  73. package/src/bin/generator.ts +4 -4
  74. package/src/generator/ObjectGenerator.ts +34 -21
  75. package/src/generator/ProjectGenerator.ts +100 -42
  76. package/src/generator/constants.ts +11 -4
  77. package/dist/esm5/InternalProtobufDeserializer.js +0 -147
  78. package/dist/esm5/InternalProtobufDeserializer.js.map +0 -1
  79. package/dist/esm5/InternalProtobufSerializer.js +0 -132
  80. package/dist/esm5/InternalProtobufSerializer.js.map +0 -1
  81. package/dist/esm5/ProtobufSerializer.js +0 -131
  82. package/dist/esm5/ProtobufSerializer.js.map +0 -1
  83. package/dist/esm5/bin/generator.js +0 -104
  84. package/dist/esm5/bin/generator.js.map +0 -1
  85. package/dist/esm5/decorators/index.js +0 -2
  86. package/dist/esm5/decorators/index.js.map +0 -1
  87. package/dist/esm5/decorators/options.js +0 -2
  88. package/dist/esm5/decorators/options.js.map +0 -1
  89. package/dist/esm5/generator/ObjectGenerator.js +0 -311
  90. package/dist/esm5/generator/ObjectGenerator.js.map +0 -1
  91. package/dist/esm5/generator/ProjectGenerator.js +0 -115
  92. package/dist/esm5/generator/ProjectGenerator.js.map +0 -1
  93. package/dist/esm5/generator/ProtobufGenerator.js +0 -27
  94. package/dist/esm5/generator/ProtobufGenerator.js.map +0 -1
  95. package/dist/esm5/generator/ServiceGenerator.js +0 -10
  96. package/dist/esm5/generator/ServiceGenerator.js.map +0 -1
  97. package/dist/esm5/generator/constants.js +0 -18
  98. package/dist/esm5/generator/constants.js.map +0 -1
  99. package/dist/esm5/generator/index.js +0 -4
  100. package/dist/esm5/generator/index.js.map +0 -1
  101. package/dist/esm5/generator/types.js +0 -2
  102. package/dist/esm5/generator/types.js.map +0 -1
  103. package/dist/esm5/index.js +0 -3
  104. package/dist/esm5/index.js.map +0 -1
package/LICENSE CHANGED
@@ -175,7 +175,7 @@
175
175
 
176
176
  END OF TERMS AND CONDITIONS
177
177
 
178
- Copyright 2019-2023 Maxim Van de Wynckel & Vrije Universiteit Brussel
178
+ Copyright 2019-2026 Maxim Van de Wynckel & Vrije Universiteit Brussel
179
179
 
180
180
  Licensed under the Apache License, Version 2.0 (the "License");
181
181
  you may not use this file except in compliance with the License.
package/README.md CHANGED
@@ -23,9 +23,9 @@
23
23
 
24
24
  <br />
25
25
 
26
- When serializing data generated by OpenHPS, the framework will use a modified serialization strategy of [TypedJSON](https://github.com/JohnWeisz/TypedJSON/) to convert the data to JSON format. This serialized JSON data can be used for socket, MQTT and REST communication when transmitting data from client to server. In real-time situations, JSON messages might be too large to transmit from embedded devices to a server.
26
+ When serializing data generated by OpenHPS, the framework will use a modified serialization strategy of [TypedJSON](https://github.com/JohnWeisz/TypedJSON/) to convert the data to JSON format. This serialized JSON data can be used for socket, MQTT and REST communication when transmitting data from client to server. In real-time situations, JSON messages might be too large to transmit from embedded devices to a server.
27
27
 
28
- [Protocol buffers](https://protobuf.dev/) are language-neutral and platform-neutral mechanisms for serializing structured data to lightweight buffers. Instead of encoding the structure of your data within the JSON data that is being serialized, a structured *message type* is defined beforehand that can be used by the serializer and deserializer. This structured *message type* will ensure that the data adheres to a specific structure while also prevent the need to encode this structure within the serialized data, lowering the size of the serialized data drastically.
28
+ [Protocol buffers](https://protobuf.dev/) are language-neutral and platform-neutral mechanisms for serializing structured data to lightweight buffers. Instead of encoding the structure of your data within the JSON data that is being serialized, a structured _message type_ is defined beforehand that can be used by the serializer and deserializer. This structured _message type_ will ensure that the data adheres to a specific structure while also prevent the need to encode this structure within the serialized data, lowering the size of the serialized data drastically.
29
29
 
30
30
  This OpenHPS module includes the serialization and deserialization engine for Protocol Buffer Messages to OpenHPS classes and object instances. In addition, this module provides a CLI tool for generating protocol message types of all OpenHPS modules installed in your project. Combined, these two features ensure that you do not have to manually create message types and do not manually have to create a custom deserialization strategy for each class you might need to serialize.
31
31
 
@@ -37,13 +37,14 @@ This OpenHPS module includes the serialization and deserialization engine for Pr
37
37
  ## Known Limitations/Workarounds
38
38
 
39
39
  - JavaScript only uses `Number` as a primitive. Protocol buffers use integers, floats, ... OpenHPS includes the `NumberType` enum option for `SerializableMember` decorators. When no number type is specified a number will be serialized to a string to ensure compatibility.
40
- - Polymorphism and inheritance is not possible in protocol buffer v3. In order to ensure maintainable messages, any serializable object with known types will be treated as a `google.protobuf.Any` type with an included `type_url` that can be used for deserialization.
41
- - Objects that use generic types will also make use of `google.protobuf.Any`. However, generic types that include primitives will be serialized using a primitive wrapper.
40
+ - Polymorphism and inheritance is not possible in protocol buffer v3. In order to ensure maintainable messages, any serializable object with known types will be treated as a `google.protobuf.Any` type with an included `type_url` that can be used for deserialization.
41
+ - Objects that use generic types will also make use of `google.protobuf.Any`. However, generic types that include primitives will be serialized using a primitive wrapper.
42
42
 
43
43
  ## Usage
44
44
 
45
45
  ### CLI Generator
46
- This module can generate the protocol files (*.proto) automatically.
46
+
47
+ This module can generate the protocol files (*.proto) automatically.
47
48
 
48
49
  1. Install the module using `npm install @openhps/protobuf@latest`
49
50
  2. Open the root directory of your project containing your `package.json` file
@@ -51,19 +52,22 @@ This module can generate the protocol files (*.proto) automatically.
51
52
 
52
53
  #### Parameters
53
54
 
54
- `-d <directory>` Output directory\
55
- `-v` Verbose logging
55
+ `-d <directory>` Output directory\
56
+ `-v` Verbose logging
56
57
 
57
58
  #### Output Data
59
+
58
60
  The output directory will include a subdirectory for each OpenHPS package.
59
61
 
60
62
  ### Serialization and Deserialization
63
+
61
64
  First the protocol buffer serializer has to be initialized with the messages.
65
+
62
66
  ```typescript
63
67
  import { ProtobufSerializer } from '@openhps/protobuf';
64
68
 
65
69
  // Initialize the protocol buffer serializer with the protocol files
66
- ProtobufSerializer.initialize("/home/openhps/protobuf/");
70
+ ProtobufSerializer.initialize('/home/openhps/protobuf/');
67
71
 
68
72
  // Or
69
73
 
@@ -86,6 +90,7 @@ message DataObject {
86
90
  repeated google.protobuf.Any relativePositions = 6;
87
91
  }
88
92
  ```
93
+
89
94
  ```proto
90
95
  package openhps.core;
91
96
  syntax = "proto3";
@@ -108,58 +113,73 @@ message Absolute3DPosition {
108
113
  ```
109
114
 
110
115
  ### @openhps/socket
116
+
111
117
  ```ts
112
118
  ModelBuilder.create()
113
- .addService(new SocketServer({
114
- srv: server,
115
- path: "/api/v1"
116
- }))
117
- .from(new SocketServerSource({
118
- uid: "source",
119
- // Override serializer and deserializer with protocol buffer
120
- serialize: (obj) => ProtobufSerializer.serialize(obj),
121
- deserialize: (obj) => ProtobufSerializer.deserialize(obj)
122
- }))
123
- .to()
124
- .build();
119
+ .addService(
120
+ new SocketServer({
121
+ srv: server,
122
+ path: '/api/v1',
123
+ }),
124
+ )
125
+ .from(
126
+ new SocketServerSource({
127
+ uid: 'source',
128
+ // Override serializer and deserializer with protocol buffer
129
+ serialize: (obj) => ProtobufSerializer.serialize(obj),
130
+ deserialize: (obj) => ProtobufSerializer.deserialize(obj),
131
+ }),
132
+ )
133
+ .to()
134
+ .build();
125
135
  ```
126
136
 
127
137
  ### @openhps/mqtt
138
+
128
139
  ```ts
129
140
  ModelBuilder.create()
130
- .addService(new MQTTServer({
131
- port: 1443,
132
- }))
133
- .from(new MQTTSourceNode({
134
- uid: "source",
135
- // Override frame serializer (not the options)
136
- serialize: (obj, options) => ({
137
- frame: ProtobufSerializer.serialize(obj),
138
- options
139
- }),
140
- deserialize: (obj) => ProtobufSerializer.deserialize(obj.frame)
141
- }))
142
- .to()
143
- .build();
141
+ .addService(
142
+ new MQTTServer({
143
+ port: 1443,
144
+ }),
145
+ )
146
+ .from(
147
+ new MQTTSourceNode({
148
+ uid: 'source',
149
+ // Override frame serializer (not the options)
150
+ serialize: (obj, options) => ({
151
+ frame: ProtobufSerializer.serialize(obj),
152
+ options,
153
+ }),
154
+ deserialize: (obj) => ProtobufSerializer.deserialize(obj.frame),
155
+ }),
156
+ )
157
+ .to()
158
+ .build();
144
159
  ```
145
160
 
146
161
  ## Getting Started
162
+
147
163
  If you have [npm installed](https://www.npmjs.com/get-npm), start using @openhps/protobuf with the following command.
164
+
148
165
  ```bash
149
166
  npm install @openhps/protobuf --save
150
167
  ```
151
168
 
152
169
  ## Contributors
153
- The framework is open source and is mainly developed by PhD Student Maxim Van de Wynckel as part of his research towards *Hybrid Positioning and Implicit Human-Computer Interaction* under the supervision of Prof. Dr. Beat Signer.
170
+
171
+ The framework is open source and was developed as part of the PhD of Maxim Van de Wynckel under the supervision of Prof. Dr. Beat Signer. It is currently maintained by [MVdW-Software](https://mvdw-software.com).
154
172
 
155
173
  ## Contributing
156
- Use of OpenHPS, contributions and feedback is highly appreciated. Please read our [contributing guidelines](CONTRIBUTING.md) for more information.
174
+
175
+ Use of OpenHPS, contributions and feedback is highly appreciated. Please read our [contributing guidelines](https://github.com/OpenHPS/.github/blob/HEAD/CONTRIBUTING.md) for more information.
157
176
 
158
177
  ## License
159
- Copyright (C) 2019-2024 Maxim Van de Wynckel & Vrije Universiteit Brussel
178
+
179
+ Copyright (C) 2019-2026 Maxim Van de Wynckel & Vrije Universiteit Brussel
160
180
 
161
181
  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
162
182
 
163
183
  https://www.apache.org/licenses/LICENSE-2.0
164
184
 
165
- Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
185
+ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
@@ -1,15 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.InternalProtobufDeserializer = void 0;
4
- const tslib_1 = require("tslib");
5
4
  const core_1 = require("@openhps/core");
6
- const protobuf = tslib_1.__importStar(require("protobufjs"));
7
5
  const typedjson_1 = require("typedjson");
6
+ const PrimitiveWrapper_1 = require("./PrimitiveWrapper");
8
7
  class InternalProtobufDeserializer extends core_1.Deserializer {
9
8
  constructor() {
10
9
  super();
11
- InternalProtobufDeserializer.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
12
- InternalProtobufDeserializer.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
13
10
  this.setDeserializationStrategy(Number, (object) => {
14
11
  if (typeof object === 'number') {
15
12
  return object;
@@ -53,7 +50,7 @@ class InternalProtobufDeserializer extends core_1.Deserializer {
53
50
  convertAsObject(sourceObject, typeDescriptor, knownTypes, memberName, deserializer, memberOptions, serializerOptions) {
54
51
  let expectedSelfType = typeDescriptor.ctor;
55
52
  let sourceObjectMetadata = typedjson_1.JsonObjectMetadata.getFromConstructor(expectedSelfType);
56
- if (sourceObject.hasOwnProperty('_type') && sourceObject._type !== 0) {
53
+ if (Object.prototype.hasOwnProperty.call(sourceObject, '_type') && sourceObject._type !== 0) {
57
54
  const enumTypeClassname = sourceObjectMetadata.protobuf.enumMapping.get(sourceObject._type);
58
55
  if (enumTypeClassname) {
59
56
  const enumType = knownTypes.get(enumTypeClassname);
@@ -65,9 +62,21 @@ class InternalProtobufDeserializer extends core_1.Deserializer {
65
62
  }
66
63
  else if (sourceObject.type_url && sourceObject.value) {
67
64
  const MessageType = serializerOptions.types.get(sourceObject.type_url);
68
- const message = MessageType.decode(sourceObject.value);
69
- const data = this.convertAsObject(message, new core_1.ConcreteTypeDescriptor(knownTypes.get(sourceObject.type_url)), knownTypes, memberName, deserializer, memberOptions, serializerOptions);
70
- return data;
65
+ if (MessageType) {
66
+ const message = MessageType.decode(sourceObject.value);
67
+ const data = this.convertAsObject(message, new core_1.ConcreteTypeDescriptor(knownTypes.get(sourceObject.type_url)), knownTypes, memberName, deserializer, memberOptions, serializerOptions);
68
+ return data;
69
+ }
70
+ // Unknown type: fall back to the primitive wrapper for primitive values
71
+ const message = PrimitiveWrapper_1.primitiveWrapper.decode(sourceObject.value);
72
+ switch (sourceObject.type_url) {
73
+ case 'Boolean':
74
+ return (message.value === 'true');
75
+ case 'Number':
76
+ return Number(message.value);
77
+ default:
78
+ return message.value;
79
+ }
71
80
  }
72
81
  const sourceMetadata = sourceObjectMetadata;
73
82
  // Strong-typed deserialization available, get to it.
@@ -84,30 +93,36 @@ class InternalProtobufDeserializer extends core_1.Deserializer {
84
93
  const objMemberValue = sourceObject[memberName];
85
94
  let revivedValue;
86
95
  if (objMemberMetadata.name === 'uid') {
87
- if (sourceObject.hasOwnProperty('uid_bytes') && sourceObject['uid_bytes'].byteLength > 0) {
96
+ if (Object.prototype.hasOwnProperty.call(sourceObject, 'uid_bytes') &&
97
+ sourceObject['uid_bytes'].byteLength > 0) {
88
98
  revivedValue = core_1.UUID.fromBuffer(sourceObject['uid_bytes']).toString();
89
99
  }
90
- else if (sourceObject.hasOwnProperty('uid_string')) {
100
+ else if (Object.prototype.hasOwnProperty.call(sourceObject, 'uid_string')) {
91
101
  revivedValue = sourceObject['uid_string'];
92
102
  }
93
103
  else {
94
104
  return;
95
105
  }
96
106
  }
97
- else if (!sourceObject.hasOwnProperty(memberName) || !objMemberValue) {
107
+ else if (!Object.prototype.hasOwnProperty.call(sourceObject, memberName) ||
108
+ objMemberValue === undefined ||
109
+ objMemberValue === null) {
98
110
  return;
99
111
  }
100
112
  else if (objMemberMetadata.type() === typedjson_1.AnyT && objMemberValue.type_url) {
101
113
  const MessageType = serializerOptions.types.get(sourceObject[memberName].type_url);
102
114
  if (MessageType) {
103
- const message = MessageType.decode(objMemberValue.value);
104
- revivedValue = deserializer.convertSingleValue(message, new core_1.ConcreteTypeDescriptor(knownTypes.get(objMemberValue.type_url)), knownTypes, objMemberDebugName, objMemberOptions, serializerOptions);
115
+ const messageType = knownTypes.get(objMemberValue.type_url);
116
+ if (messageType !== undefined) {
117
+ const message = MessageType.decode(objMemberValue.value);
118
+ revivedValue = deserializer.convertSingleValue(message, new core_1.ConcreteTypeDescriptor(messageType), knownTypes, objMemberDebugName, objMemberOptions, serializerOptions);
119
+ }
105
120
  }
106
121
  else if (objMemberValue.value) {
107
- const message = InternalProtobufDeserializer.primitiveWrapper.decode(objMemberValue.value);
122
+ const message = PrimitiveWrapper_1.primitiveWrapper.decode(objMemberValue.value);
108
123
  switch (objMemberValue.type_url) {
109
124
  case 'Boolean':
110
- revivedValue = Boolean(message.value);
125
+ revivedValue = message.value === 'true';
111
126
  break;
112
127
  case 'Number':
113
128
  revivedValue = Number(message.value);
@@ -1 +1 @@
1
- {"version":3,"file":"InternalProtobufDeserializer.js","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"InternalProtobufDeserializer.js","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.InternalProtobufSerializer = void 0;
4
- const tslib_1 = require("tslib");
5
4
  const core_1 = require("@openhps/core");
6
5
  const typedjson_1 = require("typedjson");
7
- const protobuf = tslib_1.__importStar(require("protobufjs"));
6
+ const PrimitiveWrapper_1 = require("./PrimitiveWrapper");
8
7
  class InternalProtobufSerializer extends core_1.Serializer {
9
8
  constructor() {
10
9
  super();
11
10
  this.setSerializationStrategy(Map, this.convertAsMap.bind(this));
12
- InternalProtobufSerializer.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
13
- InternalProtobufSerializer.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
14
11
  }
15
12
  convertSingleValue(sourceObject, typeDescriptor, memberName, memberOptions, serializerOptions) {
16
13
  if (!core_1.TypedJSON.utils.isValueDefined(sourceObject)) {
@@ -73,7 +70,10 @@ class InternalProtobufSerializer extends core_1.Serializer {
73
70
  }
74
71
  else {
75
72
  const MessageType = sourceTypeMetadata.protobuf.messageType;
76
- const field = MessageType.get(objMemberMetadata.name);
73
+ // Look the field up by its wire name: members renamed through
74
+ // `options.protobuf.name` are emitted under that name, so the
75
+ // metadata name would not resolve for them.
76
+ const field = MessageType.get(memberName);
77
77
  serialized = this.convertSingleValue(sourceObject[objMemberMetadata.key], objMemberMetadata.type(), `${core_1.TypedJSON.utils.nameof(sourceMeta.classType)}.${objMemberMetadata.key}`, objMemberOptions, Object.assign(Object.assign({}, serializerOptions), { field }));
78
78
  }
79
79
  if (core_1.TypedJSON.utils.isValueDefined(serialized)) {
@@ -87,12 +87,12 @@ class InternalProtobufSerializer extends core_1.Serializer {
87
87
  };
88
88
  }
89
89
  else {
90
- const message = InternalProtobufSerializer.primitiveWrapper.create({
90
+ const message = PrimitiveWrapper_1.primitiveWrapper.create({
91
91
  value: String(sourceObject[objMemberMetadata.key]),
92
92
  });
93
93
  serialized = {
94
94
  type_url: sourceObject[objMemberMetadata.key].constructor.name,
95
- value: InternalProtobufSerializer.primitiveWrapper.encode(message).finish(),
95
+ value: PrimitiveWrapper_1.primitiveWrapper.encode(message).finish(),
96
96
  };
97
97
  }
98
98
  }
@@ -1 +1 @@
1
- {"version":3,"file":"InternalProtobufSerializer.js","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"InternalProtobufSerializer.js","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.primitiveWrapper = void 0;
4
+ const tslib_1 = require("tslib");
5
+ const protobuf = tslib_1.__importStar(require("protobufjs"));
6
+ /**
7
+ * Protobuf type wrapping a primitive value as a string.
8
+ * Shared by the serializer and the deserializer as the `google.protobuf.Any`
9
+ * fallback for primitive values that protobuf cannot express directly.
10
+ */
11
+ exports.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
12
+ exports.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
13
+ //# sourceMappingURL=PrimitiveWrapper.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"PrimitiveWrapper.js","sourceRoot":"","sources":["../../src/PrimitiveWrapper.ts"],"names":[],"mappings":";;;;AAAA,6DAAuC;AAEvC;;;;GAIG;AACU,QAAA,gBAAgB,GAAkB,IAAI,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;AAC5F,wBAAgB,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC"}
@@ -34,6 +34,26 @@ class ProtobufSerializer extends core_1.DataSerializer {
34
34
  static initialize(directory) {
35
35
  return new Promise((resolve, reject) => {
36
36
  ProtobufSerializer.root = new protobuf.Root();
37
+ // Reinitialisation (e.g. per test) must not accumulate stale type entries:
38
+ // build the new map first and only swap it in once the schemas have
39
+ // loaded, so a failed load keeps the previous types instead of wiping them
40
+ const types = new Map();
41
+ // The generated schemas extend google.protobuf.EnumValueOptions, which is
42
+ // declared in descriptor.proto. protobufjs resolves imports relative to the
43
+ // origin file, so it looked for google/protobuf/descriptor.proto inside the
44
+ // generated output directory and failed with "unresolvable extensions".
45
+ // protobufjs ships the well-known types itself; point the resolver at them.
46
+ // Resolve the package root from a literal specifier: a template literal here
47
+ // makes webpack build a context module over the whole protobufjs package,
48
+ // which then tries to parse its .d.ts and tsconfig.json as bundle input.
49
+ const protobufRoot = path.dirname(require.resolve('protobufjs/package.json'));
50
+ const defaultResolve = ProtobufSerializer.root.resolvePath.bind(ProtobufSerializer.root);
51
+ ProtobufSerializer.root.resolvePath = (origin, target) => {
52
+ if (target.startsWith('google/protobuf/')) {
53
+ return path.join(protobufRoot, target);
54
+ }
55
+ return defaultResolve(origin, target);
56
+ };
37
57
  Promise.resolve(!directory ? generator_1.ProjectGenerator.buildProject(path.resolve('tmp')) : Promise.resolve())
38
58
  .then(() => {
39
59
  const files = this.getFiles(path.resolve(directory !== null && directory !== void 0 ? directory : 'tmp'));
@@ -73,22 +93,24 @@ class ProtobufSerializer extends core_1.DataSerializer {
73
93
  messageTypeEnum: enumNumber,
74
94
  enumMapping,
75
95
  };
76
- this.options.types.set(className, MessageType);
96
+ types.set(className, MessageType);
77
97
  }
78
98
  });
99
+ this.options.types = types;
79
100
  resolve();
80
101
  })
81
102
  .catch((error) => {
82
103
  return reject(error);
83
104
  });
84
105
  });
106
+ this.wrapperRoot = new protobuf.Root();
85
107
  this.wrapperMessage = new protobuf.Type('WrapperMessage');
86
108
  this.wrapperMessage.add(new protobuf.Field('data', 1, 'google.protobuf.Any'));
87
109
  this.wrapperMessage.addJSON(protobuf.common['google/protobuf/any.proto'].nested);
110
+ this.wrapperRoot.add(this.wrapperMessage);
88
111
  return loadPromise;
89
112
  })
90
113
  .then(() => {
91
- console.log(ProtobufSerializer.root.toJSON());
92
114
  resolve();
93
115
  })
94
116
  .catch(reject);
@@ -122,6 +144,9 @@ class ProtobufSerializer extends core_1.DataSerializer {
122
144
  const decodedData = this.wrapperMessage.decode(serializedData);
123
145
  const typeURL = decodedData.data.type_url;
124
146
  const MessageType = this.options.types.get(typeURL);
147
+ if (MessageType === undefined) {
148
+ throw new Error(`Unknown protobuf type '${typeURL}'`);
149
+ }
125
150
  const decodedMessage = MessageType.decode(decodedData.data.value);
126
151
  const finalType = dataType !== null && dataType !== void 0 ? dataType : this.knownTypes.get(typeURL);
127
152
  return this.options.deserializer.convertSingleValue(decodedMessage, core_1.DataSerializerUtils.ensureTypeDescriptor(finalType), core_1.DataSerializer.knownTypes, undefined, undefined, Object.assign(Object.assign({}, config), this.options));
@@ -1 +1 @@
1
- {"version":3,"file":"ProtobufSerializer.js","sourceRoot":"","sources":["../../src/ProtobufSerializer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ProtobufSerializer.js","sourceRoot":"","sources":["../../src/ProtobufSerializer.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@ const prompts_1 = require("@inquirer/prompts");
10
10
  const yargs = tslib_1.__importStar(require("yargs"));
11
11
  const core_1 = require("@openhps/core");
12
12
  const ProtobufSerializer_1 = require("../ProtobufSerializer");
13
- const chai_1 = require("chai");
13
+ const strict_1 = tslib_1.__importDefault(require("node:assert/strict"));
14
14
  const args = yargs.argv;
15
15
  const data = {
16
16
  directory: path.normalize('tmp'),
@@ -90,13 +90,13 @@ function test() {
90
90
  frame.addObject(new core_1.DataObject('test2', 'Test Object 2'));
91
91
  const buffer = ProtobufSerializer_1.ProtobufSerializer.serialize(frame);
92
92
  const deserialized = ProtobufSerializer_1.ProtobufSerializer.deserialize(buffer);
93
- (0, chai_1.expect)(deserialized).to.not.be.undefined;
93
+ strict_1.default.notStrictEqual(deserialized, undefined, 'deserialization returned undefined');
94
94
  const compare1 = JSON.stringify(core_1.DataSerializer.serialize(deserialized), null, 2);
95
95
  const compare2 = JSON.stringify(core_1.DataSerializer.serialize(frame), null, 2);
96
96
  // console.log(compare1);
97
97
  // console.log('\n');
98
98
  // console.log(compare2);
99
- (0, chai_1.expect)(compare1).to.eql(compare2);
99
+ strict_1.default.deepStrictEqual(compare1, compare2, 'round-tripped frame differs from the original');
100
100
  console.log(chalk_1.default.green(`Basic serialization and deserialization test completed!`));
101
101
  resolve();
102
102
  })
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/bin/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../src/bin/generator.ts"],"names":[],"mappings":"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"}