@openhps/protobuf 1.0.2 → 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.
- package/LICENSE +1 -1
- package/README.md +58 -38
- package/dist/cjs/InternalProtobufDeserializer.js +30 -15
- package/dist/cjs/InternalProtobufDeserializer.js.map +1 -1
- package/dist/cjs/InternalProtobufSerializer.js +7 -7
- package/dist/cjs/InternalProtobufSerializer.js.map +1 -1
- package/dist/cjs/PrimitiveWrapper.js +13 -0
- package/dist/cjs/PrimitiveWrapper.js.map +1 -0
- package/dist/cjs/ProtobufSerializer.js +27 -1
- package/dist/cjs/ProtobufSerializer.js.map +1 -1
- package/dist/cjs/bin/generator.js +3 -3
- package/dist/cjs/bin/generator.js.map +1 -1
- package/dist/cjs/generator/ObjectGenerator.js +28 -11
- package/dist/cjs/generator/ObjectGenerator.js.map +1 -1
- package/dist/cjs/generator/ProjectGenerator.js +52 -32
- package/dist/cjs/generator/ProjectGenerator.js.map +1 -1
- package/dist/cjs/generator/constants.js +11 -4
- package/dist/cjs/generator/constants.js.map +1 -1
- package/dist/cjs/package.json +3 -0
- package/dist/cjs/tsconfig.bundle.cjs.tsbuildinfo +1 -0
- package/dist/esm/InternalProtobufDeserializer.js +30 -14
- package/dist/esm/InternalProtobufDeserializer.js.map +1 -1
- package/dist/esm/InternalProtobufSerializer.js +7 -6
- package/dist/esm/InternalProtobufSerializer.js.map +1 -1
- package/dist/esm/PrimitiveWrapper.js +9 -0
- package/dist/esm/PrimitiveWrapper.js.map +1 -0
- package/dist/esm/ProtobufSerializer.js +30 -4
- package/dist/esm/ProtobufSerializer.js.map +1 -1
- package/dist/esm/bin/generator.js +5 -5
- package/dist/esm/bin/generator.js.map +1 -1
- package/dist/esm/decorators/index.js +1 -1
- package/dist/esm/generator/ObjectGenerator.js +30 -13
- package/dist/esm/generator/ObjectGenerator.js.map +1 -1
- package/dist/esm/generator/ProjectGenerator.js +55 -34
- package/dist/esm/generator/ProjectGenerator.js.map +1 -1
- package/dist/esm/generator/ServiceGenerator.js +1 -1
- package/dist/esm/generator/constants.js +11 -4
- package/dist/esm/generator/constants.js.map +1 -1
- package/dist/esm/generator/index.js +3 -3
- package/dist/esm/index.js +2 -2
- package/dist/esm/package.json +3 -0
- package/dist/esm/tsconfig.bundle.esm.tsbuildinfo +1 -0
- package/dist/esm/tsconfig.bundle.types.tsbuildinfo +1 -0
- package/dist/types/InternalProtobufDeserializer.d.ts +0 -2
- package/dist/types/InternalProtobufDeserializer.d.ts.map +1 -1
- package/dist/types/InternalProtobufSerializer.d.ts +0 -2
- package/dist/types/InternalProtobufSerializer.d.ts.map +1 -1
- package/dist/types/PrimitiveWrapper.d.ts +8 -0
- package/dist/types/PrimitiveWrapper.d.ts.map +1 -0
- package/dist/types/ProtobufSerializer.d.ts +6 -0
- package/dist/types/ProtobufSerializer.d.ts.map +1 -1
- package/dist/types/generator/ObjectGenerator.d.ts +2 -8
- package/dist/types/generator/ObjectGenerator.d.ts.map +1 -1
- package/dist/types/generator/ProjectGenerator.d.ts +0 -1
- package/dist/types/generator/ProjectGenerator.d.ts.map +1 -1
- package/dist/types/generator/constants.d.ts +1 -1
- package/dist/types/generator/constants.d.ts.map +1 -1
- package/dist/web/openhps-protobuf.es.js +16272 -12072
- package/dist/web/openhps-protobuf.es.js.map +1 -1
- package/dist/web/openhps-protobuf.es.min.js +2 -1
- package/dist/web/openhps-protobuf.es.min.js.LICENSE.txt +19 -0
- package/dist/web/openhps-protobuf.es.min.js.map +1 -1
- package/dist/web/openhps-protobuf.js +17390 -14592
- package/dist/web/openhps-protobuf.js.map +1 -1
- package/dist/web/openhps-protobuf.min.js +2 -1
- package/dist/web/openhps-protobuf.min.js.LICENSE.txt +19 -0
- package/dist/web/openhps-protobuf.min.js.map +1 -1
- package/package.json +125 -94
- package/src/InternalProtobufDeserializer.ts +52 -34
- package/src/InternalProtobufSerializer.ts +9 -10
- package/src/PrimitiveWrapper.ts +9 -0
- package/src/ProtobufSerializer.ts +33 -1
- package/src/bin/generator.ts +4 -4
- package/src/generator/ObjectGenerator.ts +32 -20
- package/src/generator/ProjectGenerator.ts +61 -36
- package/src/generator/constants.ts +11 -4
- package/dist/esm5/InternalProtobufDeserializer.js +0 -147
- package/dist/esm5/InternalProtobufDeserializer.js.map +0 -1
- package/dist/esm5/InternalProtobufSerializer.js +0 -132
- package/dist/esm5/InternalProtobufSerializer.js.map +0 -1
- package/dist/esm5/ProtobufSerializer.js +0 -130
- package/dist/esm5/ProtobufSerializer.js.map +0 -1
- package/dist/esm5/bin/generator.js +0 -104
- package/dist/esm5/bin/generator.js.map +0 -1
- package/dist/esm5/decorators/index.js +0 -2
- package/dist/esm5/decorators/index.js.map +0 -1
- package/dist/esm5/decorators/options.js +0 -2
- package/dist/esm5/decorators/options.js.map +0 -1
- package/dist/esm5/generator/ObjectGenerator.js +0 -312
- package/dist/esm5/generator/ObjectGenerator.js.map +0 -1
- package/dist/esm5/generator/ProjectGenerator.js +0 -146
- package/dist/esm5/generator/ProjectGenerator.js.map +0 -1
- package/dist/esm5/generator/ProtobufGenerator.js +0 -27
- package/dist/esm5/generator/ProtobufGenerator.js.map +0 -1
- package/dist/esm5/generator/ServiceGenerator.js +0 -10
- package/dist/esm5/generator/ServiceGenerator.js.map +0 -1
- package/dist/esm5/generator/constants.js +0 -18
- package/dist/esm5/generator/constants.js.map +0 -1
- package/dist/esm5/generator/index.js +0 -4
- package/dist/esm5/generator/index.js.map +0 -1
- package/dist/esm5/generator/types.js +0 -2
- package/dist/esm5/generator/types.js.map +0 -1
- package/dist/esm5/index.js +0 -3
- package/dist/esm5/index.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ObjectGenerator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ObjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ObjectGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,9 @@ class ProjectGenerator extends core_1.DataSerializer {
|
|
|
15
15
|
static findAllModules(dir) {
|
|
16
16
|
var _a;
|
|
17
17
|
const packageFile = path.resolve(path.join(dir, 'package.json'));
|
|
18
|
-
|
|
18
|
+
// require.main is undefined when mocha runs the specs through its ESM loader.
|
|
19
|
+
const mainPath = (_a = require.main) === null || _a === void 0 ? void 0 : _a.path;
|
|
20
|
+
if (mainPath !== undefined && packageFile === path.resolve(mainPath)) {
|
|
19
21
|
return [];
|
|
20
22
|
}
|
|
21
23
|
if (fs.existsSync(packageFile)) {
|
|
@@ -41,21 +43,28 @@ class ProjectGenerator extends core_1.DataSerializer {
|
|
|
41
43
|
}
|
|
42
44
|
}
|
|
43
45
|
static findModule(dir) {
|
|
44
|
-
const
|
|
46
|
+
const resolvedDir = path.resolve(dir);
|
|
47
|
+
const packageFile = path.join(resolvedDir, 'package.json');
|
|
45
48
|
if (fs.existsSync(packageFile)) {
|
|
46
49
|
const packageJson = JSON.parse(fs.readFileSync(packageFile, { encoding: 'utf-8' }));
|
|
47
50
|
return packageJson.name;
|
|
48
51
|
}
|
|
49
52
|
else {
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
+
const parentDir = path.dirname(resolvedDir);
|
|
54
|
+
if (parentDir === resolvedDir) {
|
|
55
|
+
// Reached the filesystem root without finding a manifest
|
|
56
|
+
throw new Error(`Unable to find a package.json above '${dir}'`);
|
|
57
|
+
}
|
|
58
|
+
return this.findModule(parentDir);
|
|
53
59
|
}
|
|
54
60
|
}
|
|
55
61
|
static loadModules(objects, module = require.main) {
|
|
56
62
|
if (module === undefined) {
|
|
57
|
-
// Use cache instead
|
|
58
|
-
|
|
63
|
+
// Use cache instead. require.main is undefined under mocha's ESM loader, and
|
|
64
|
+
// the cache is typed as possibly holding undefined entries.
|
|
65
|
+
Object.values(require.cache)
|
|
66
|
+
.filter((cached) => cached !== undefined && Array.isArray(cached.children))
|
|
67
|
+
.forEach((cached) => this.loadModules(objects, cached));
|
|
59
68
|
return;
|
|
60
69
|
}
|
|
61
70
|
this._modules.add(module.id);
|
|
@@ -68,9 +77,12 @@ class ProjectGenerator extends core_1.DataSerializer {
|
|
|
68
77
|
}
|
|
69
78
|
});
|
|
70
79
|
}
|
|
71
|
-
module.children
|
|
72
|
-
|
|
73
|
-
|
|
80
|
+
if (!Array.isArray(module.children)) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
module.children.forEach((child) => {
|
|
84
|
+
if (child !== undefined && !this._modules.has(child.id)) {
|
|
85
|
+
this.loadModules(objects, child);
|
|
74
86
|
}
|
|
75
87
|
});
|
|
76
88
|
}
|
|
@@ -82,6 +94,9 @@ class ProjectGenerator extends core_1.DataSerializer {
|
|
|
82
94
|
}
|
|
83
95
|
static loadClasses() {
|
|
84
96
|
const declarations = [];
|
|
97
|
+
// Reset so a second build in the same process does not reuse stale module/package state
|
|
98
|
+
this._modules = new Set();
|
|
99
|
+
this._packages = new Set();
|
|
85
100
|
this.findAllModules('./');
|
|
86
101
|
this.knownTypes.forEach((value) => {
|
|
87
102
|
const metadata = core_1.DataSerializerUtils.getOwnMetadata(value);
|
|
@@ -113,35 +128,40 @@ class ProjectGenerator extends core_1.DataSerializer {
|
|
|
113
128
|
}
|
|
114
129
|
static buildProject(directory, options = {}) {
|
|
115
130
|
return new Promise((resolve, reject) => {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
131
|
+
(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
132
|
+
const resolvedDirectory = path.resolve(directory);
|
|
133
|
+
// The CLI passes -d <dir> verbatim: refuse to delete the current working
|
|
134
|
+
// directory, one of its parents, or the filesystem root
|
|
135
|
+
if (resolvedDirectory === path.parse(resolvedDirectory).root ||
|
|
136
|
+
resolvedDirectory === process.cwd() ||
|
|
137
|
+
process.cwd().startsWith(resolvedDirectory + path.sep)) {
|
|
138
|
+
throw new Error(`Refusing to use '${resolvedDirectory}': it is the current working directory, a parent of it, or the filesystem root.`);
|
|
139
|
+
}
|
|
140
|
+
// Prepare directories
|
|
141
|
+
if (yield fs.pathExists(resolvedDirectory)) {
|
|
142
|
+
yield fs.promises.rm(resolvedDirectory, { recursive: true });
|
|
143
|
+
}
|
|
144
|
+
yield fs.promises.mkdir(resolvedDirectory, { recursive: true });
|
|
145
|
+
// Get all class sources
|
|
146
|
+
if (options.logLevel > 0) {
|
|
147
|
+
console.log('Generating protocol buffer messages ...');
|
|
148
|
+
console.log('Use of any types = ', options.useAnyType);
|
|
149
|
+
}
|
|
150
|
+
const classes = yield ProjectGenerator.generateProtoMessages(options);
|
|
128
151
|
if (options.logLevel > 0)
|
|
129
152
|
console.log('Saving generating protocol buffer messages ...');
|
|
130
|
-
|
|
131
|
-
const packageDir = path.join(
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
}
|
|
135
|
-
fs.writeFileSync(path.join(packageDir, key + '.proto'), value[1], {
|
|
153
|
+
for (const [key, value] of classes) {
|
|
154
|
+
const packageDir = path.join(resolvedDirectory, ...value[0].split('.'));
|
|
155
|
+
yield fs.ensureDir(packageDir);
|
|
156
|
+
yield fs.promises.writeFile(path.join(packageDir, key + '.proto'), value[1], {
|
|
136
157
|
encoding: 'utf-8',
|
|
137
158
|
});
|
|
138
|
-
}
|
|
139
|
-
fs.
|
|
159
|
+
}
|
|
160
|
+
yield fs.promises.writeFile(path.join(resolvedDirectory, 'common.proto'), constants_1.COMMON, {
|
|
140
161
|
encoding: 'utf-8',
|
|
141
162
|
});
|
|
142
163
|
resolve(classes.size);
|
|
143
|
-
})
|
|
144
|
-
.catch(reject);
|
|
164
|
+
}))().catch(reject);
|
|
145
165
|
});
|
|
146
166
|
}
|
|
147
167
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":";;;;AAAA,wCAAkG;AAClG,uDAAoD;AACpD,qDAA+B;AAC/B,mDAA6B;AAC7B,0DAA0B;AAC1B,2CAAqC;AAGrC;;GAEG;AACH,MAAa,gBAAiB,SAAQ,qBAAc;IAIhD,MAAM,CAAC,cAAc,CAAC,GAAW;;QAC7B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,CAAC;QACjE,
|
|
1
|
+
{"version":3,"file":"ProjectGenerator.js","sourceRoot":"","sources":["../../../src/generator/ProjectGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,21 @@ exports.HEADER = `/**
|
|
|
5
5
|
* OpenHPS Protocol Buffer
|
|
6
6
|
* This file was automatically generated with @openhps/protobuf
|
|
7
7
|
*
|
|
8
|
-
* (c) 2019-
|
|
8
|
+
* (c) 2019-2026 Maxim Van de Wynckel & Vrije Universiteit Brussel
|
|
9
9
|
**/\n
|
|
10
10
|
`;
|
|
11
11
|
exports.COMMON = exports.HEADER +
|
|
12
12
|
`syntax = "proto3";` +
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
// EnumValueOptions is declared in descriptor.proto. Extending it without importing
|
|
14
|
+
// that file leaves protobufjs unable to resolve the extension, and loading the
|
|
15
|
+
// generated schema fails with "unresolvable extensions".
|
|
16
|
+
`\nimport "google/protobuf/descriptor.proto";\n` +
|
|
17
|
+
`\nextend google.protobuf.EnumValueOptions {\n` +
|
|
18
|
+
// Field numbers 1 and 2 belong to EnumValueOptions' own fields; reusing them made
|
|
19
|
+
// protobufjs reject the schema with "duplicate id 1". Custom options must sit in
|
|
20
|
+
// the 50000-99999 range protobuf reserves for third-party extensions.
|
|
21
|
+
`\toptional string className = 50001;\n` +
|
|
22
|
+
`\toptional string packageName = 50002;\n` +
|
|
16
23
|
`}\n`;
|
|
17
24
|
// `\nextend google.protobuf.MessageOptions {\n` +
|
|
18
25
|
// `\toptional string className = 1001;\n` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;;;;;;CAMrB,CAAC;AAEW,QAAA,MAAM,GACf,cAAM;IACN,oBAAoB;IACpB,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/generator/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,MAAM,GAAG;;;;;;CAMrB,CAAC;AAEW,QAAA,MAAM,GACf,cAAM;IACN,oBAAoB;IACpB,mFAAmF;IACnF,+EAA+E;IAC/E,yDAAyD;IACzD,gDAAgD;IAChD,+CAA+C;IAC/C,kFAAkF;IAClF,iFAAiF;IACjF,sEAAsE;IACtE,wCAAwC;IACxC,0CAA0C;IAC1C,KAAK,CAAC;AACV,kDAAkD;AAClD,4CAA4C;AAC5C,8CAA8C;AAC9C,SAAS"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"root":["../../src/InternalProtobufDeserializer.ts","../../src/InternalProtobufSerializer.ts","../../src/PrimitiveWrapper.ts","../../src/ProtobufSerializer.ts","../../src/index.ts","../../src/bin/generator.ts","../../src/decorators/index.ts","../../src/decorators/options.ts","../../src/generator/ObjectGenerator.ts","../../src/generator/ProjectGenerator.ts","../../src/generator/ProtobufGenerator.ts","../../src/generator/ServiceGenerator.ts","../../src/generator/constants.ts","../../src/generator/index.ts","../../src/generator/types.ts"],"version":"5.9.3"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { ConcreteTypeDescriptor, Deserializer, TypedJSON, UUID, } from '@openhps/core';
|
|
2
|
-
import * as protobuf from 'protobufjs';
|
|
3
2
|
import { AnyT, JsonObjectMetadata } from 'typedjson';
|
|
3
|
+
import { primitiveWrapper } from './PrimitiveWrapper.js';
|
|
4
4
|
export class InternalProtobufDeserializer extends Deserializer {
|
|
5
5
|
constructor() {
|
|
6
6
|
super();
|
|
7
|
-
InternalProtobufDeserializer.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
|
|
8
|
-
InternalProtobufDeserializer.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
|
|
9
7
|
this.setDeserializationStrategy(Number, (object) => {
|
|
10
8
|
if (typeof object === 'number') {
|
|
11
9
|
return object;
|
|
@@ -49,7 +47,7 @@ export class InternalProtobufDeserializer extends Deserializer {
|
|
|
49
47
|
convertAsObject(sourceObject, typeDescriptor, knownTypes, memberName, deserializer, memberOptions, serializerOptions) {
|
|
50
48
|
let expectedSelfType = typeDescriptor.ctor;
|
|
51
49
|
let sourceObjectMetadata = JsonObjectMetadata.getFromConstructor(expectedSelfType);
|
|
52
|
-
if (
|
|
50
|
+
if (Object.prototype.hasOwnProperty.call(sourceObject, '_type') && sourceObject._type !== 0) {
|
|
53
51
|
const enumTypeClassname = sourceObjectMetadata.protobuf.enumMapping.get(sourceObject._type);
|
|
54
52
|
if (enumTypeClassname) {
|
|
55
53
|
const enumType = knownTypes.get(enumTypeClassname);
|
|
@@ -61,9 +59,21 @@ export class InternalProtobufDeserializer extends Deserializer {
|
|
|
61
59
|
}
|
|
62
60
|
else if (sourceObject.type_url && sourceObject.value) {
|
|
63
61
|
const MessageType = serializerOptions.types.get(sourceObject.type_url);
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
62
|
+
if (MessageType) {
|
|
63
|
+
const message = MessageType.decode(sourceObject.value);
|
|
64
|
+
const data = this.convertAsObject(message, new ConcreteTypeDescriptor(knownTypes.get(sourceObject.type_url)), knownTypes, memberName, deserializer, memberOptions, serializerOptions);
|
|
65
|
+
return data;
|
|
66
|
+
}
|
|
67
|
+
// Unknown type: fall back to the primitive wrapper for primitive values
|
|
68
|
+
const message = primitiveWrapper.decode(sourceObject.value);
|
|
69
|
+
switch (sourceObject.type_url) {
|
|
70
|
+
case 'Boolean':
|
|
71
|
+
return (message.value === 'true');
|
|
72
|
+
case 'Number':
|
|
73
|
+
return Number(message.value);
|
|
74
|
+
default:
|
|
75
|
+
return message.value;
|
|
76
|
+
}
|
|
67
77
|
}
|
|
68
78
|
const sourceMetadata = sourceObjectMetadata;
|
|
69
79
|
// Strong-typed deserialization available, get to it.
|
|
@@ -80,30 +90,36 @@ export class InternalProtobufDeserializer extends Deserializer {
|
|
|
80
90
|
const objMemberValue = sourceObject[memberName];
|
|
81
91
|
let revivedValue;
|
|
82
92
|
if (objMemberMetadata.name === 'uid') {
|
|
83
|
-
if (
|
|
93
|
+
if (Object.prototype.hasOwnProperty.call(sourceObject, 'uid_bytes') &&
|
|
94
|
+
sourceObject['uid_bytes'].byteLength > 0) {
|
|
84
95
|
revivedValue = UUID.fromBuffer(sourceObject['uid_bytes']).toString();
|
|
85
96
|
}
|
|
86
|
-
else if (
|
|
97
|
+
else if (Object.prototype.hasOwnProperty.call(sourceObject, 'uid_string')) {
|
|
87
98
|
revivedValue = sourceObject['uid_string'];
|
|
88
99
|
}
|
|
89
100
|
else {
|
|
90
101
|
return;
|
|
91
102
|
}
|
|
92
103
|
}
|
|
93
|
-
else if (!
|
|
104
|
+
else if (!Object.prototype.hasOwnProperty.call(sourceObject, memberName) ||
|
|
105
|
+
objMemberValue === undefined ||
|
|
106
|
+
objMemberValue === null) {
|
|
94
107
|
return;
|
|
95
108
|
}
|
|
96
109
|
else if (objMemberMetadata.type() === AnyT && objMemberValue.type_url) {
|
|
97
110
|
const MessageType = serializerOptions.types.get(sourceObject[memberName].type_url);
|
|
98
111
|
if (MessageType) {
|
|
99
|
-
const
|
|
100
|
-
|
|
112
|
+
const messageType = knownTypes.get(objMemberValue.type_url);
|
|
113
|
+
if (messageType !== undefined) {
|
|
114
|
+
const message = MessageType.decode(objMemberValue.value);
|
|
115
|
+
revivedValue = deserializer.convertSingleValue(message, new ConcreteTypeDescriptor(messageType), knownTypes, objMemberDebugName, objMemberOptions, serializerOptions);
|
|
116
|
+
}
|
|
101
117
|
}
|
|
102
118
|
else if (objMemberValue.value) {
|
|
103
|
-
const message =
|
|
119
|
+
const message = primitiveWrapper.decode(objMemberValue.value);
|
|
104
120
|
switch (objMemberValue.type_url) {
|
|
105
121
|
case 'Boolean':
|
|
106
|
-
revivedValue =
|
|
122
|
+
revivedValue = message.value === 'true';
|
|
107
123
|
break;
|
|
108
124
|
case 'Number':
|
|
109
125
|
revivedValue = Number(message.value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalProtobufDeserializer.js","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,YAAY,EAOZ,SAAS,EACT,IAAI,GACP,MAAM,eAAe,CAAC;AACvB,OAAO,
|
|
1
|
+
{"version":3,"file":"InternalProtobufDeserializer.js","sourceRoot":"","sources":["../../src/InternalProtobufDeserializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { Serializer, TypedJSON, UUID, } from '@openhps/core';
|
|
2
2
|
import { AnyT, JsonObjectMetadata } from 'typedjson';
|
|
3
|
-
import
|
|
3
|
+
import { primitiveWrapper } from './PrimitiveWrapper.js';
|
|
4
4
|
export class InternalProtobufSerializer extends Serializer {
|
|
5
5
|
constructor() {
|
|
6
6
|
super();
|
|
7
7
|
this.setSerializationStrategy(Map, this.convertAsMap.bind(this));
|
|
8
|
-
InternalProtobufSerializer.primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
|
|
9
|
-
InternalProtobufSerializer.primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
|
|
10
8
|
}
|
|
11
9
|
convertSingleValue(sourceObject, typeDescriptor, memberName, memberOptions, serializerOptions) {
|
|
12
10
|
if (!TypedJSON.utils.isValueDefined(sourceObject)) {
|
|
@@ -69,7 +67,10 @@ export class InternalProtobufSerializer extends Serializer {
|
|
|
69
67
|
}
|
|
70
68
|
else {
|
|
71
69
|
const MessageType = sourceTypeMetadata.protobuf.messageType;
|
|
72
|
-
|
|
70
|
+
// Look the field up by its wire name: members renamed through
|
|
71
|
+
// `options.protobuf.name` are emitted under that name, so the
|
|
72
|
+
// metadata name would not resolve for them.
|
|
73
|
+
const field = MessageType.get(memberName);
|
|
73
74
|
serialized = this.convertSingleValue(sourceObject[objMemberMetadata.key], objMemberMetadata.type(), `${TypedJSON.utils.nameof(sourceMeta.classType)}.${objMemberMetadata.key}`, objMemberOptions, Object.assign(Object.assign({}, serializerOptions), { field }));
|
|
74
75
|
}
|
|
75
76
|
if (TypedJSON.utils.isValueDefined(serialized)) {
|
|
@@ -83,12 +84,12 @@ export class InternalProtobufSerializer extends Serializer {
|
|
|
83
84
|
};
|
|
84
85
|
}
|
|
85
86
|
else {
|
|
86
|
-
const message =
|
|
87
|
+
const message = primitiveWrapper.create({
|
|
87
88
|
value: String(sourceObject[objMemberMetadata.key]),
|
|
88
89
|
});
|
|
89
90
|
serialized = {
|
|
90
91
|
type_url: sourceObject[objMemberMetadata.key].constructor.name,
|
|
91
|
-
value:
|
|
92
|
+
value: primitiveWrapper.encode(message).finish(),
|
|
92
93
|
};
|
|
93
94
|
}
|
|
94
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InternalProtobufSerializer.js","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAMH,UAAU,EAEV,SAAS,EACT,IAAI,GACP,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"InternalProtobufSerializer.js","sourceRoot":"","sources":["../../src/InternalProtobufSerializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import * as protobuf from 'protobufjs';
|
|
2
|
+
/**
|
|
3
|
+
* Protobuf type wrapping a primitive value as a string.
|
|
4
|
+
* Shared by the serializer and the deserializer as the `google.protobuf.Any`
|
|
5
|
+
* fallback for primitive values that protobuf cannot express directly.
|
|
6
|
+
*/
|
|
7
|
+
export const primitiveWrapper = new protobuf.Type('PrimitiveWrapperMessage');
|
|
8
|
+
primitiveWrapper.add(new protobuf.Field('value', 1, 'string'));
|
|
9
|
+
//# sourceMappingURL=PrimitiveWrapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PrimitiveWrapper.js","sourceRoot":"","sources":["../../src/PrimitiveWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AAEvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAkB,IAAI,QAAQ,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;AAC5F,gBAAgB,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC"}
|
|
@@ -2,9 +2,9 @@ import { DataSerializer, DataSerializerUtils } from '@openhps/core';
|
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import * as protobuf from 'protobufjs';
|
|
4
4
|
import * as fs from 'fs';
|
|
5
|
-
import { ProjectGenerator } from './generator';
|
|
6
|
-
import { InternalProtobufDeserializer } from './InternalProtobufDeserializer';
|
|
7
|
-
import { InternalProtobufSerializer } from './InternalProtobufSerializer';
|
|
5
|
+
import { ProjectGenerator } from './generator/index.js';
|
|
6
|
+
import { InternalProtobufDeserializer } from './InternalProtobufDeserializer.js';
|
|
7
|
+
import { InternalProtobufSerializer } from './InternalProtobufSerializer.js';
|
|
8
8
|
export class ProtobufSerializer extends DataSerializer {
|
|
9
9
|
static getFiles(directory, files = []) {
|
|
10
10
|
if (!fs.statSync(directory).isDirectory()) {
|
|
@@ -30,6 +30,26 @@ export class ProtobufSerializer extends DataSerializer {
|
|
|
30
30
|
static initialize(directory) {
|
|
31
31
|
return new Promise((resolve, reject) => {
|
|
32
32
|
ProtobufSerializer.root = new protobuf.Root();
|
|
33
|
+
// Reinitialisation (e.g. per test) must not accumulate stale type entries:
|
|
34
|
+
// build the new map first and only swap it in once the schemas have
|
|
35
|
+
// loaded, so a failed load keeps the previous types instead of wiping them
|
|
36
|
+
const types = new Map();
|
|
37
|
+
// The generated schemas extend google.protobuf.EnumValueOptions, which is
|
|
38
|
+
// declared in descriptor.proto. protobufjs resolves imports relative to the
|
|
39
|
+
// origin file, so it looked for google/protobuf/descriptor.proto inside the
|
|
40
|
+
// generated output directory and failed with "unresolvable extensions".
|
|
41
|
+
// protobufjs ships the well-known types itself; point the resolver at them.
|
|
42
|
+
// Resolve the package root from a literal specifier: a template literal here
|
|
43
|
+
// makes webpack build a context module over the whole protobufjs package,
|
|
44
|
+
// which then tries to parse its .d.ts and tsconfig.json as bundle input.
|
|
45
|
+
const protobufRoot = path.dirname(require.resolve('protobufjs/package.json'));
|
|
46
|
+
const defaultResolve = ProtobufSerializer.root.resolvePath.bind(ProtobufSerializer.root);
|
|
47
|
+
ProtobufSerializer.root.resolvePath = (origin, target) => {
|
|
48
|
+
if (target.startsWith('google/protobuf/')) {
|
|
49
|
+
return path.join(protobufRoot, target);
|
|
50
|
+
}
|
|
51
|
+
return defaultResolve(origin, target);
|
|
52
|
+
};
|
|
33
53
|
Promise.resolve(!directory ? ProjectGenerator.buildProject(path.resolve('tmp')) : Promise.resolve())
|
|
34
54
|
.then(() => {
|
|
35
55
|
const files = this.getFiles(path.resolve(directory !== null && directory !== void 0 ? directory : 'tmp'));
|
|
@@ -69,18 +89,21 @@ export class ProtobufSerializer extends DataSerializer {
|
|
|
69
89
|
messageTypeEnum: enumNumber,
|
|
70
90
|
enumMapping,
|
|
71
91
|
};
|
|
72
|
-
|
|
92
|
+
types.set(className, MessageType);
|
|
73
93
|
}
|
|
74
94
|
});
|
|
95
|
+
this.options.types = types;
|
|
75
96
|
resolve();
|
|
76
97
|
})
|
|
77
98
|
.catch((error) => {
|
|
78
99
|
return reject(error);
|
|
79
100
|
});
|
|
80
101
|
});
|
|
102
|
+
this.wrapperRoot = new protobuf.Root();
|
|
81
103
|
this.wrapperMessage = new protobuf.Type('WrapperMessage');
|
|
82
104
|
this.wrapperMessage.add(new protobuf.Field('data', 1, 'google.protobuf.Any'));
|
|
83
105
|
this.wrapperMessage.addJSON(protobuf.common['google/protobuf/any.proto'].nested);
|
|
106
|
+
this.wrapperRoot.add(this.wrapperMessage);
|
|
84
107
|
return loadPromise;
|
|
85
108
|
})
|
|
86
109
|
.then(() => {
|
|
@@ -117,6 +140,9 @@ export class ProtobufSerializer extends DataSerializer {
|
|
|
117
140
|
const decodedData = this.wrapperMessage.decode(serializedData);
|
|
118
141
|
const typeURL = decodedData.data.type_url;
|
|
119
142
|
const MessageType = this.options.types.get(typeURL);
|
|
143
|
+
if (MessageType === undefined) {
|
|
144
|
+
throw new Error(`Unknown protobuf type '${typeURL}'`);
|
|
145
|
+
}
|
|
120
146
|
const decodedMessage = MessageType.decode(decodedData.data.value);
|
|
121
147
|
const finalType = dataType !== null && dataType !== void 0 ? dataType : this.knownTypes.get(typeURL);
|
|
122
148
|
return this.options.deserializer.convertSingleValue(decodedMessage, DataSerializerUtils.ensureTypeDescriptor(finalType), 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":"AAAA,OAAO,EAAe,cAAc,EAAwB,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACvG,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,OAAO,kBAAmB,SAAQ,cAAc;
|
|
1
|
+
{"version":3,"file":"ProtobufSerializer.js","sourceRoot":"","sources":["../../src/ProtobufSerializer.ts"],"names":[],"mappings":"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"}
|