diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java index 81effbd5..dbff5c3a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/GenerateJsUtils.java @@ -103,10 +103,10 @@ public abstract class GenerateJsUtils { importBuilder.append(StringUtils.format("import {} from './{}/{}.js';", protocolName, path, protocolName)).append(LS); } - initProtocolBuilder.append(TAB).append(StringUtils.format("protocols.set({}, {});", protocolId, protocolName)); + initProtocolBuilder.append(StringUtils.format("protocols.set({}, {});", protocolId, protocolName)).append(LS); } - protocolManagerTemplate = StringUtils.format(protocolManagerTemplate, importBuilder.toString().trim(), initProtocolBuilder.toString().trim()); + protocolManagerTemplate = StringUtils.format(protocolManagerTemplate, importBuilder.toString().trim(), StringUtils.EMPTY_JSON, initProtocolBuilder.toString().trim()); FileUtils.writeStringToFile(new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.js")), protocolManagerTemplate); } @@ -185,9 +185,9 @@ public abstract class GenerateJsUtils { var field = fields[i]; var fieldRegistration = fieldRegistrations[i]; if (field.isAnnotationPresent(Compatible.class)) { - jsBuilder.append( TAB).append("if (!buffer.isReadable()) {").append(LS); - jsBuilder.append( TAB + TAB).append("return packet;").append(LS); - jsBuilder.append( TAB).append("}").append(LS); + jsBuilder.append(TAB).append("if (!buffer.isReadable()) {").append(LS); + jsBuilder.append(TAB + TAB).append("return packet;").append(LS); + jsBuilder.append(TAB).append("}").append(LS); } var readObject = jsSerializer(fieldRegistration.serializer()).readObject(jsBuilder, 1, field, fieldRegistration); jsBuilder.append(TAB).append(StringUtils.format("packet.{} = {};", field.getName(), readObject)).append(LS); diff --git a/protocol/src/main/resources/javascript/ProtocolManagerTemplate.js b/protocol/src/main/resources/javascript/ProtocolManagerTemplate.js index cb1b633b..89149a01 100644 --- a/protocol/src/main/resources/javascript/ProtocolManagerTemplate.js +++ b/protocol/src/main/resources/javascript/ProtocolManagerTemplate.js @@ -4,6 +4,9 @@ const protocols = new Map(); const ProtocolManager = {}; +// initProtocol +{} + ProtocolManager.getProtocol = function getProtocol(protocolId) { const protocol = protocols.get(protocolId); if (protocol === null) { @@ -26,8 +29,4 @@ ProtocolManager.read = function read(buffer) { return packet; }; -ProtocolManager.initProtocol = function initProtocol() { - {} -}; - export default ProtocolManager; diff --git a/protocol/src/test/javascript/main.spec.js b/protocol/src/test/javascript/main.spec.js index e4e672a1..428331a8 100644 --- a/protocol/src/test/javascript/main.spec.js +++ b/protocol/src/test/javascript/main.spec.js @@ -7,8 +7,6 @@ describe('jsProtocolTest', () => { it('complexObjectTest', () => { const data = fs.readFileSync('../resources/ComplexObject.bytes'); - ProtocolManager.initProtocol(); - const arrayBytes = new Uint8Array(data.length); data.copy(arrayBytes, 0, 0, data.length); diff --git a/protocol/src/test/javascript/zfoojs/ProtocolManager.js b/protocol/src/test/javascript/zfoojs/ProtocolManager.js index 22ba541e..a31eafcf 100644 --- a/protocol/src/test/javascript/zfoojs/ProtocolManager.js +++ b/protocol/src/test/javascript/zfoojs/ProtocolManager.js @@ -6,7 +6,14 @@ import SimpleObject from './packet/SimpleObject.js'; const protocols = new Map(); -const ProtocolManager = protocols.set(100, ComplexObject); protocols.set(101, NormalObject); protocols.set(102, ObjectA); protocols.set(103, ObjectB); protocols.set(104, SimpleObject); +const ProtocolManager = {}; + +// initProtocol +protocols.set(100, ComplexObject); +protocols.set(101, NormalObject); +protocols.set(102, ObjectA); +protocols.set(103, ObjectB); +protocols.set(104, SimpleObject); ProtocolManager.getProtocol = function getProtocol(protocolId) { const protocol = protocols.get(protocolId); @@ -30,8 +37,4 @@ ProtocolManager.read = function read(buffer) { return packet; }; -ProtocolManager.initProtocol = function initProtocol() { - {} -}; - export default ProtocolManager;