From 1883cc4f97138f71af33e7907b92e60941282a00 Mon Sep 17 00:00:00 2001 From: jaysunxiao Date: Sun, 5 Jun 2022 22:40:47 +0800 Subject: [PATCH] =?UTF-8?q?perf[protocol]:=20=E6=94=AF=E6=8C=81TypeScript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generate/GenerateProtocolFile.java | 10 + .../protocol/serializer/CodeLanguage.java | 2 + .../serializer/CutDownArraySerializer.java | 36 + .../serializer/CutDownListSerializer.java | 18 + .../serializer/CutDownMapSerializer.java | 24 + .../serializer/CutDownSetSerializer.java | 18 + .../serializer/cpp/GenerateCppUtils.java | 2 +- .../javascript/GenerateJsUtils.java | 22 +- .../serializer/javascript/IJsSerializer.java | 6 + .../javascript/JsArraySerializer.java | 6 + .../javascript/JsBooleanSerializer.java | 6 + .../javascript/JsByteSerializer.java | 6 + .../javascript/JsCharSerializer.java | 6 + .../javascript/JsDoubleSerializer.java | 6 + .../javascript/JsFloatSerializer.java | 6 + .../javascript/JsIntSerializer.java | 6 + .../javascript/JsListSerializer.java | 6 + .../javascript/JsLongSerializer.java | 6 + .../javascript/JsMapSerializer.java | 6 + .../JsObjectProtocolSerializer.java | 10 + .../javascript/JsSetSerializer.java | 6 + .../javascript/JsShortSerializer.java | 6 + .../javascript/JsStringSerializer.java | 6 + .../typescript/GenerateTsUtils.java | 218 +++ .../typescript/ProtocolManagerTemplate.ts | 32 + .../resources/typescript/ProtocolTemplate.ts | 29 + .../resources/typescript/buffer/ByteBuffer.ts | 352 +++++ .../main/resources/typescript/buffer/long.js | 1325 +++++++++++++++++ .../resources/typescript/buffer/longbits.js | 189 +++ .../java/com/zfoo/protocol/SpeedTest.java | 2 +- protocol/src/test/typescript/main.ts | 82 + protocol/src/test/typescript/package.json | 11 + 32 files changed, 2454 insertions(+), 12 deletions(-) create mode 100644 protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java create mode 100644 protocol/src/main/resources/typescript/ProtocolManagerTemplate.ts create mode 100644 protocol/src/main/resources/typescript/ProtocolTemplate.ts create mode 100644 protocol/src/main/resources/typescript/buffer/ByteBuffer.ts create mode 100644 protocol/src/main/resources/typescript/buffer/long.js create mode 100644 protocol/src/main/resources/typescript/buffer/longbits.js create mode 100644 protocol/src/test/typescript/main.ts create mode 100644 protocol/src/test/typescript/package.json diff --git a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java index 1a1e220a..4b454ace 100644 --- a/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java +++ b/protocol/src/main/java/com/zfoo/protocol/generate/GenerateProtocolFile.java @@ -23,6 +23,7 @@ import com.zfoo.protocol.serializer.gdscript.GenerateGdUtils; import com.zfoo.protocol.serializer.javascript.GenerateJsUtils; import com.zfoo.protocol.serializer.lua.GenerateLuaUtils; import com.zfoo.protocol.serializer.protobuf.GenerateProtobufUtils; +import com.zfoo.protocol.serializer.typescript.GenerateTsUtils; import java.io.IOException; import java.util.Arrays; @@ -124,6 +125,15 @@ public abstract class GenerateProtocolFile { GenerateJsUtils.createProtocolManager(allSortedGenerateProtocols); } + // 生成TypeScript协议 + if (generateLanguages.contains(CodeLanguage.TypeScript)) { + GenerateTsUtils.init(generateOperation); + for (var protocolRegistration : allSortedGenerateProtocols) { + GenerateTsUtils.createTsProtocolFile((ProtocolRegistration) protocolRegistration); + } + GenerateTsUtils.createProtocolManager(allSortedGenerateProtocols); + } + // 生成Lua协议 if (generateLanguages.contains(CodeLanguage.Lua)) { GenerateLuaUtils.init(generateOperation); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CodeLanguage.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CodeLanguage.java index bf8cbb44..f83f7ee6 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CodeLanguage.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CodeLanguage.java @@ -27,6 +27,8 @@ public enum CodeLanguage { JavaScript, + TypeScript, + Lua, CSharp, diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownArraySerializer.java index 72d3b909..8dec30be 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownArraySerializer.java @@ -62,6 +62,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeBooleanArray({});", objectStr)).append(LS); break; default: @@ -84,6 +85,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeBooleanArray({});", objectStr)).append(LS); break; default: @@ -106,6 +108,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeByteArray({});", objectStr)).append(LS); break; default: @@ -128,6 +131,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeByteArray({});", objectStr)).append(LS); break; default: @@ -150,6 +154,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeShortArray({});", objectStr)).append(LS); break; default: @@ -172,6 +177,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeShortArray({});", objectStr)).append(LS); break; default: @@ -194,6 +200,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntArray({});", objectStr)).append(LS); break; default: @@ -216,6 +223,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntArray({});", objectStr)).append(LS); break; default: @@ -238,6 +246,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongArray({});", objectStr)).append(LS); break; default: @@ -260,6 +269,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongArray({});", objectStr)).append(LS); break; default: @@ -282,6 +292,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeFloatArray({});", objectStr)).append(LS); break; default: @@ -304,6 +315,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeFloatArray({});", objectStr)).append(LS); break; default: @@ -326,6 +338,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeDoubleArray({});", objectStr)).append(LS); break; default: @@ -348,6 +361,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeDoubleArray({});", objectStr)).append(LS); break; default: @@ -370,6 +384,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringArray({});", objectStr)).append(LS); break; default: @@ -392,6 +407,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeCharArray({});", objectStr)).append(LS); break; default: @@ -414,6 +430,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeCharArray({});", objectStr)).append(LS); break; default: @@ -440,6 +457,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("buffer.writePacketArray<{}>({}, {});", EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), objectStr, protocolId)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writePacketArray({}, {});", objectStr, protocolId)).append(LS); break; default: @@ -480,6 +498,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readBooleanArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readBooleanArray();", array)).append(LS); break; default: @@ -504,6 +523,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readBooleanArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readBooleanArray();", array)).append(LS); break; default: @@ -528,6 +548,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readByteArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readByteArray();", array)).append(LS); break; default: @@ -552,6 +573,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readByteArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readByteArray();", array)).append(LS); break; default: @@ -576,6 +598,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readShortArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readShortArray();", array)).append(LS); break; default: @@ -600,6 +623,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readShortArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readShortArray();", array)).append(LS); break; default: @@ -624,6 +648,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntArray();", array)).append(LS); break; default: @@ -648,6 +673,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntArray();", array)).append(LS); break; default: @@ -672,6 +698,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongArray();", array)).append(LS); break; default: @@ -696,6 +723,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongArray();", array)).append(LS); break; default: @@ -720,6 +748,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readFloatArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readFloatArray();", array)).append(LS); break; default: @@ -744,6 +773,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readFloatArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readFloatArray();", array)).append(LS); break; default: @@ -768,6 +798,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readDoubleArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readDoubleArray();", array)).append(LS); break; default: @@ -792,6 +823,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readDoubleArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readDoubleArray();", array)).append(LS); break; default: @@ -816,6 +848,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringArray();", array)).append(LS); break; default: @@ -840,6 +873,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readCharArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readCharArray();", array)).append(LS); break; default: @@ -864,6 +898,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readCharArray();", array)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readCharArray();", array)).append(LS); break; default: @@ -888,6 +923,7 @@ public class CutDownArraySerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readPacketArray<{}>({});", array, EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), protocolId)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readPacketArray({});", array, protocolId)).append(LS); break; default: diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java index 42e11010..c459cd9c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownListSerializer.java @@ -61,6 +61,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeBooleanList({});", objectStr)).append(LS); break; default: @@ -83,6 +84,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeByteList({});", objectStr)).append(LS); break; default: @@ -105,6 +107,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeShortList({});", objectStr)).append(LS); break; default: @@ -127,6 +130,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntList({});", objectStr)).append(LS); break; default: @@ -149,6 +153,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongList({});", objectStr)).append(LS); break; default: @@ -172,6 +177,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeFloatList({});", objectStr)).append(LS); break; default: @@ -195,6 +201,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeDoubleList({});", objectStr)).append(LS); break; default: @@ -218,6 +225,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringList({});", objectStr)).append(LS); break; default: @@ -243,6 +251,7 @@ public class CutDownListSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writePacketList({}, {});", objectStr, protocolId)).append(LS); break; default: @@ -282,6 +291,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readBooleanList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readBooleanList();", list)).append(LS); break; default: @@ -306,6 +316,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readByteList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readByteList();", list)).append(LS); break; default: @@ -330,6 +341,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readShortList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readShortList();", list)).append(LS); break; default: @@ -354,6 +366,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntList();", list)).append(LS); break; default: @@ -378,6 +391,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongList();", list)).append(LS); break; default: @@ -402,6 +416,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readFloatList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readFloatList();", list)).append(LS); break; default: @@ -426,6 +441,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readDoubleList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readDoubleList();", list)).append(LS); break; default: @@ -450,6 +466,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringList();", list)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringList();", list)).append(LS); break; default: @@ -476,6 +493,7 @@ public class CutDownListSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readPacketList<{}>({});", list, EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), protocolId)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readPacketList({});", list, protocolId)).append(LS); break; default: diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownMapSerializer.java index 95fd2c44..263d084d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownMapSerializer.java @@ -68,6 +68,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntIntMap({});", objectStr)).append(LS); return true; } @@ -87,6 +88,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntLongMap({});", objectStr)).append(LS); return true; } @@ -99,6 +101,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("buffer.writeIntStringMap({});", objectStr)).append(LS); return true; case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntStringMap({});", objectStr)).append(LS); return true; case GdScript: @@ -127,6 +130,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntPacketMap({}, {});", objectStr, ((ObjectProtocolField) valueRegistration).getProtocolId())).append(LS); return true; } @@ -148,6 +152,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongIntMap({});", objectStr)).append(LS); return true; } @@ -167,6 +172,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongLongMap({}, {});", objectStr, ((ObjectProtocolField) valueRegistration).getProtocolId())).append(LS); return true; } @@ -186,6 +192,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongStringMap({});", objectStr)).append(LS); return true; } @@ -205,6 +212,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongPacketMap({}, {});", objectStr, ((ObjectProtocolField) valueRegistration).getProtocolId())).append(LS); return true; } @@ -226,6 +234,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringIntMap({});", objectStr)).append(LS); return true; } @@ -245,6 +254,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringLongMap({});", objectStr)).append(LS); return true; } @@ -264,6 +274,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringStringMap({});", objectStr)).append(LS); return true; } @@ -283,6 +294,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { return true; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringPacketMap({}, {});", objectStr, ((ObjectProtocolField) valueRegistration).getProtocolId())).append(LS); return true; } @@ -322,6 +334,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntIntMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntIntMap();", map)).append(LS); return map; } @@ -343,6 +356,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntLongMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntLongMap();", map)).append(LS); return map; } @@ -364,6 +378,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntStringMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntStringMap();", map)).append(LS); return map; } @@ -386,6 +401,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntPacketMap<{}>({});", map, EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), protocolId)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntPacketMap({});", map, protocolId)).append(LS); return map; } @@ -409,6 +425,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongIntMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongIntMap();", map)).append(LS); return map; } @@ -430,6 +447,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongLongMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongLongMap();", map)).append(LS); return map; } @@ -451,6 +469,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongStringMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongStringMap();", map)).append(LS); return map; } @@ -473,6 +492,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongPacketMap<{}>({});", map, EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), protocolId)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongPacketMap({});", map, protocolId)).append(LS); return map; } @@ -496,6 +516,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringIntMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringIntMap();", map)).append(LS); return map; } @@ -517,6 +538,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringLongMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringLongMap();", map)).append(LS); return map; } @@ -538,6 +560,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringStringMap();", map)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringStringMap();", map)).append(LS); return map; } @@ -560,6 +583,7 @@ public class CutDownMapSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringPacketMap<{}>({});", map, EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), protocolId)).append(LS); return map; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringPacketMap({});", map, protocolId)).append(LS); return map; } diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java index 6420c688..e9226634 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/CutDownSetSerializer.java @@ -62,6 +62,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeBooleanSet({});", objectStr)).append(LS); break; default: @@ -84,6 +85,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeByteSet({});", objectStr)).append(LS); break; default: @@ -106,6 +108,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeShortSet({});", objectStr)).append(LS); break; default: @@ -128,6 +131,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeIntSet({});", objectStr)).append(LS); break; default: @@ -150,6 +154,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeLongSet({});", objectStr)).append(LS); break; default: @@ -172,6 +177,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeFloatSet({});", objectStr)).append(LS); break; default: @@ -194,6 +200,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeDoubleSet({});", objectStr)).append(LS); break; default: @@ -216,6 +223,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writeStringSet({});", objectStr)).append(LS); break; default: @@ -241,6 +249,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { break; case Cpp: case JavaScript: + case TypeScript: builder.append(StringUtils.format("buffer.writePacketSet({}, {});", objectStr, protocolId)).append(LS); break; default: @@ -280,6 +289,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readBooleanSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readBooleanSet();", set)).append(LS); break; default: @@ -304,6 +314,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readByteSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readByteSet();", set)).append(LS); break; default: @@ -328,6 +339,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readShortSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readShortSet();", set)).append(LS); break; default: @@ -352,6 +364,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readIntSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readIntSet();", set)).append(LS); break; default: @@ -376,6 +389,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readLongSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readLongSet();", set)).append(LS); break; default: @@ -400,6 +414,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readFloatSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readFloatSet();", set)).append(LS); break; default: @@ -424,6 +439,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readDoubleSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readDoubleSet();", set)).append(LS); break; default: @@ -448,6 +464,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readStringSet();", set)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readStringSet();", set)).append(LS); break; default: @@ -474,6 +491,7 @@ public class CutDownSetSerializer implements ICutDownSerializer { builder.append(StringUtils.format("auto {} = buffer.readPacketSet<{}>({});", set, EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId), protocolId)).append(LS); break; case JavaScript: + case TypeScript: builder.append(StringUtils.format("const {} = buffer.readPacketSet({});", set, protocolId)).append(LS); break; default: diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java index ee2476b0..277250a6 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/cpp/GenerateCppUtils.java @@ -157,7 +157,7 @@ public abstract class GenerateCppUtils { private static String includeSubProtocol(ProtocolRegistration registration) { - short protocolId = registration.getId(); + var protocolId = registration.getId(); var subProtocols = ProtocolAnalysis.getAllSubProtocolIds(protocolId); if (CollectionUtils.isEmpty(subProtocols)) { 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 dbff5c3a..31da6be6 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 @@ -48,16 +48,7 @@ public abstract class GenerateJsUtils { private static Map jsSerializerMap; - public static IJsSerializer jsSerializer(ISerializer serializer) { - return jsSerializerMap.get(serializer); - } - - public static void init(GenerateOperation generateOperation) { - protocolOutputRootPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); - - FileUtils.deleteFile(new File(protocolOutputRootPath)); - FileUtils.createDirectory(protocolOutputRootPath); - + static { jsSerializerMap = new HashMap<>(); jsSerializerMap.put(BooleanSerializer.INSTANCE, new JsBooleanSerializer()); jsSerializerMap.put(ByteSerializer.INSTANCE, new JsByteSerializer()); @@ -75,6 +66,17 @@ public abstract class GenerateJsUtils { jsSerializerMap.put(ObjectProtocolSerializer.INSTANCE, new JsObjectProtocolSerializer()); } + public static IJsSerializer jsSerializer(ISerializer serializer) { + return jsSerializerMap.get(serializer); + } + + public static void init(GenerateOperation generateOperation) { + protocolOutputRootPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); + + FileUtils.deleteFile(new File(protocolOutputRootPath)); + FileUtils.createDirectory(protocolOutputRootPath); + } + public static void clear() { jsSerializerMap = null; protocolOutputRootPath = null; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java index 6c716f38..ce40d08d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/IJsSerializer.java @@ -13,6 +13,7 @@ package com.zfoo.protocol.serializer.javascript; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import java.lang.reflect.Field; @@ -23,6 +24,11 @@ import java.lang.reflect.Field; */ public interface IJsSerializer { + /** + * 获取属性的类型和名称 + */ + Pair field(Field field, IFieldRegistration fieldRegistration); + void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration); String readObject(StringBuilder builder, int deep, Field field, IFieldRegistration fieldRegistration); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java index a41223de..2e1fbad1 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsArraySerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.ArrayField; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.serializer.CodeLanguage; @@ -30,6 +31,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsArraySerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("Array", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBooleanSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBooleanSerializer.java index c4b23ec9..76143e08 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBooleanSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsBooleanSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsBooleanSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("boolean", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java index 34144a30..b0eb2a4b 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsByteSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsByteSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsCharSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsCharSerializer.java index 5826088c..9ffe0e8d 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsCharSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsCharSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsCharSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("string", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java index 682c957e..495de91c 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsDoubleSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsDoubleSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java index b18dc755..db975e9e 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsFloatSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsFloatSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java index 5c634d43..73a40868 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsIntSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsIntSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java index 7f8d54a4..7e92dd2a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsListSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ListField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -30,6 +31,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsListSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("Array", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java index 0e76b54f..13cb7583 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsLongSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsLongSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java index 92b5f1c8..aa4b36b7 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsMapSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.MapField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -30,6 +31,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsMapSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("Map", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java index c5e4b2ce..d21940db 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsObjectProtocolSerializer.java @@ -14,8 +14,10 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.ObjectProtocolField; +import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; import com.zfoo.protocol.util.StringUtils; import java.lang.reflect.Field; @@ -28,6 +30,14 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsObjectProtocolSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; + var protocolSimpleName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(objectProtocolField.getProtocolId()); + var type = StringUtils.format("{}", protocolSimpleName); + return new Pair<>(type, field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { ObjectProtocolField objectProtocolField = (ObjectProtocolField) fieldRegistration; diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java index 0e767855..fe135e6a 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsSetSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.registration.field.SetField; import com.zfoo.protocol.serializer.CodeLanguage; @@ -30,6 +31,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsSetSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("Set", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java index 74c39696..096c5793 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsShortSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsShortSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("number", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java index a1f92f92..46736b71 100644 --- a/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/javascript/JsStringSerializer.java @@ -14,6 +14,7 @@ package com.zfoo.protocol.serializer.javascript; import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.model.Pair; import com.zfoo.protocol.registration.field.IFieldRegistration; import com.zfoo.protocol.util.StringUtils; @@ -27,6 +28,11 @@ import static com.zfoo.protocol.util.FileUtils.LS; */ public class JsStringSerializer implements IJsSerializer { + @Override + public Pair field(Field field, IFieldRegistration fieldRegistration) { + return new Pair<>("string", field.getName()); + } + @Override public void writeObject(StringBuilder builder, String objectStr, int deep, Field field, IFieldRegistration fieldRegistration) { GenerateProtocolFile.addTab(builder, deep); diff --git a/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java new file mode 100644 index 00000000..ce3f92db --- /dev/null +++ b/protocol/src/main/java/com/zfoo/protocol/serializer/typescript/GenerateTsUtils.java @@ -0,0 +1,218 @@ +/* + * Copyright (C) 2020 The zfoo Authors + * + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + +package com.zfoo.protocol.serializer.typescript; + +import com.zfoo.protocol.collection.CollectionUtils; +import com.zfoo.protocol.generate.GenerateOperation; +import com.zfoo.protocol.generate.GenerateProtocolDocument; +import com.zfoo.protocol.generate.GenerateProtocolFile; +import com.zfoo.protocol.generate.GenerateProtocolPath; +import com.zfoo.protocol.model.Pair; +import com.zfoo.protocol.registration.IProtocolRegistration; +import com.zfoo.protocol.registration.ProtocolAnalysis; +import com.zfoo.protocol.registration.ProtocolRegistration; +import com.zfoo.protocol.registration.anno.Compatible; +import com.zfoo.protocol.serializer.enhance.EnhanceObjectProtocolSerializer; +import com.zfoo.protocol.serializer.javascript.*; +import com.zfoo.protocol.serializer.reflect.*; +import com.zfoo.protocol.util.ClassUtils; +import com.zfoo.protocol.util.FileUtils; +import com.zfoo.protocol.util.IOUtils; +import com.zfoo.protocol.util.StringUtils; + +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.stream.Collectors; + +import static com.zfoo.protocol.util.FileUtils.LS; +import static com.zfoo.protocol.util.StringUtils.TAB; + +/** + * @author jaysunxiao + * @version 3.0 + */ +public abstract class GenerateTsUtils { + + private static String protocolOutputRootPath = "tsProtocol/"; + + public static void init(GenerateOperation generateOperation) { + protocolOutputRootPath = FileUtils.joinPath(generateOperation.getProtocolPath(), protocolOutputRootPath); + + FileUtils.deleteFile(new File(protocolOutputRootPath)); + FileUtils.createDirectory(protocolOutputRootPath); + } + + public static void clear() { + protocolOutputRootPath = null; + } + + public static void createProtocolManager(List protocolList) throws IOException { + var list = List.of("typescript/buffer/ByteBuffer.ts", "typescript/buffer/long.js", "typescript/buffer/longbits.js"); + for (var fileName : list) { + var fileInputStream = ClassUtils.getFileFromClassPath(fileName); + var createFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, StringUtils.substringAfterFirst(fileName, "typescript/"))); + FileUtils.writeInputStreamToFile(createFile, fileInputStream); + } + + // 生成ProtocolManager.ts文件 + var protocolManagerTemplate = StringUtils.bytesToString(IOUtils.toByteArray(ClassUtils.getFileFromClassPath("typescript/ProtocolManagerTemplate.ts"))); + + var importBuilder = new StringBuilder(); + var initProtocolBuilder = new StringBuilder(); + for (var protocol : protocolList) { + var protocolId = protocol.protocolId(); + var protocolClassName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(protocolId); + + var path = GenerateProtocolPath.getProtocolPath(protocolId); + if (StringUtils.isBlank(path)) { + importBuilder.append(StringUtils.format("import {} from './{}';", protocolClassName, protocolClassName)).append(LS); + } else { + importBuilder.append(StringUtils.format("import {} from './{}/{}';", protocolClassName, path, protocolClassName)).append(LS); + } + initProtocolBuilder.append(StringUtils.format("protocols.set({}, {});", protocolId, protocolClassName)).append(LS); + } + + protocolManagerTemplate = StringUtils.format(protocolManagerTemplate, importBuilder.toString().trim(), initProtocolBuilder.toString().trim()); + FileUtils.writeStringToFile(new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.ts")), protocolManagerTemplate); + } + + public static void createTsProtocolFile(ProtocolRegistration registration) throws IOException { + // 初始化index + GenerateProtocolFile.index.set(0); + + var protocolId = registration.protocolId(); + var registrationConstructor = registration.getConstructor(); + var protocolClazzName = registrationConstructor.getDeclaringClass().getSimpleName(); + + var protocolTemplate = StringUtils.bytesToString(IOUtils.toByteArray(ClassUtils.getFileFromClassPath("typescript/ProtocolTemplate.ts"))); + + var importSubProtocol = importSubProtocol(registration); + var docTitle = docTitle(registration); + var fieldDefinition = fieldDefinition(registration); + var valueOfMethod = valueOfMethod(registration); + var writeObject = writeObject(registration); + var readObject = readObject(registration); + + protocolTemplate = StringUtils.format(protocolTemplate, importSubProtocol, docTitle, protocolClazzName, fieldDefinition.trim() + , valueOfMethod.getKey().trim(), valueOfMethod.getValue().trim(), protocolId, protocolClazzName + , writeObject.trim(), protocolClazzName, protocolClazzName, readObject.trim(), protocolClazzName); + var protocolOutputPath = StringUtils.format("{}/{}/{}.ts", protocolOutputRootPath + , GenerateProtocolPath.getProtocolPath(protocolId), protocolClazzName); + FileUtils.writeStringToFile(new File(protocolOutputPath), protocolTemplate); + } + + private static String importSubProtocol(ProtocolRegistration registration) { + var protocolId = registration.getId(); + var subProtocols = ProtocolAnalysis.getAllSubProtocolIds(protocolId); + + if (CollectionUtils.isEmpty(subProtocols)) { + return StringUtils.EMPTY; + } + var importBuilder = new StringBuilder(); + for (var subProtocolId : subProtocols) { + var protocolClassName = EnhanceObjectProtocolSerializer.getProtocolClassSimpleName(subProtocolId); + var path = GenerateProtocolPath.getProtocolPath(protocolId); + importBuilder.append(StringUtils.format("import {} from './{}';", protocolClassName, protocolClassName)).append(LS); + } + return importBuilder.toString(); + } + + private static String docTitle(ProtocolRegistration registration) { + var protocolId = registration.getId(); + var protocolDocument = GenerateProtocolDocument.getProtocolDocument(protocolId); + var docTitle = protocolDocument.getKey(); + return docTitle; + } + + private static String fieldDefinition(ProtocolRegistration registration) { + var protocolId = registration.getId(); + var fields = registration.getFields(); + var fieldRegistrations = registration.getFieldRegistrations(); + + var fieldDefinitionBuilder = new StringBuilder(); + + var protocolDocument = GenerateProtocolDocument.getProtocolDocument(protocolId); + var docFieldMap = protocolDocument.getValue(); + + for (var i = 0; i < fields.length; i++) { + var field = fields[i]; + var fieldRegistration = fieldRegistrations[i]; + + var propertyName = field.getName(); + // 生成注释 + var doc = docFieldMap.get(propertyName); + if (StringUtils.isNotBlank(doc)) { + Arrays.stream(doc.split(LS)).forEach(it -> fieldDefinitionBuilder.append(TAB).append(it).append(LS)); + } + + var propertyTypeAndName = GenerateJsUtils.jsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + fieldDefinitionBuilder.append(TAB).append(StringUtils.format("{}: {};", propertyTypeAndName.getValue(), propertyTypeAndName.getKey())).append(LS); + } + return fieldDefinitionBuilder.toString(); + } + + private static Pair valueOfMethod(ProtocolRegistration registration) { + var protocolId = registration.getId(); + var fields = registration.getFields(); + var fieldRegistrations = registration.getFieldRegistrations(); + + var filedList = new ArrayList>(); + for (int i = 0; i < fields.length; i++) { + var field = fields[i]; + var fieldRegistration = fieldRegistrations[i]; + var propertyTypeAndName = GenerateJsUtils.jsSerializer(fieldRegistration.serializer()).field(field, fieldRegistration); + filedList.add(propertyTypeAndName); + } + + var valueOfParams = filedList.stream() + .map(it -> StringUtils.format("{}: {}", it.getValue(), it.getKey())) + .collect(Collectors.toList()); + var valueOfParamsStr = StringUtils.joinWith(StringUtils.COMMA + " ", valueOfParams.toArray()); + + var cppBuilder = new StringBuilder(); + filedList.forEach(it -> cppBuilder.append(TAB + TAB).append(StringUtils.format("this.{} = {};", it.getValue(), it.getValue())).append(LS)); + return new Pair<>(valueOfParamsStr, cppBuilder.toString()); + } + + private static String writeObject(ProtocolRegistration registration) { + var fields = registration.getFields(); + var fieldRegistrations = registration.getFieldRegistrations(); + var jsBuilder = new StringBuilder(); + for (var i = 0; i < fields.length; i++) { + var field = fields[i]; + var fieldRegistration = fieldRegistrations[i]; + GenerateJsUtils.jsSerializer(fieldRegistration.serializer()).writeObject(jsBuilder, "packet." + field.getName(), 2, field, fieldRegistration); + } + return jsBuilder.toString(); + } + + private static String readObject(ProtocolRegistration registration) { + var fields = registration.getFields(); + var fieldRegistrations = registration.getFieldRegistrations(); + var jsBuilder = new StringBuilder(); + for (var i = 0; i < fields.length; i++) { + 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); + } + var readObject = GenerateJsUtils.jsSerializer(fieldRegistration.serializer()).readObject(jsBuilder, 2, field, fieldRegistration); + jsBuilder.append(TAB + TAB).append(StringUtils.format("packet.{} = {};", field.getName(), readObject)).append(LS); + } + return jsBuilder.toString(); + } +} diff --git a/protocol/src/main/resources/typescript/ProtocolManagerTemplate.ts b/protocol/src/main/resources/typescript/ProtocolManagerTemplate.ts new file mode 100644 index 00000000..655ef2cb --- /dev/null +++ b/protocol/src/main/resources/typescript/ProtocolManagerTemplate.ts @@ -0,0 +1,32 @@ +{} + +const protocols = new Map(); + +// initProtocol +{} + +class ProtocolManager { + static getProtocol(): Any { + const protocol = protocols.get(protocolId); + if (protocol === null) { + throw new Error('[protocolId:' + protocolId + ']协议不存在'); + } + return protocol; + } + + static write(buffer: Any, packet: Any): void { + const protocolId = packet.protocolId(); + buffer.writeShort(protocolId); + const protocol = getProtocol(protocolId); + protocol.write(buffer, packet); + } + + static read(buffer: Any): Any { + const protocolId = buffer.readShort(); + const protocol = ProtocolManager.getProtocol(protocolId); + const packet = protocol.read(buffer); + return packet; + } +} + +export default ProtocolManager; diff --git a/protocol/src/main/resources/typescript/ProtocolTemplate.ts b/protocol/src/main/resources/typescript/ProtocolTemplate.ts new file mode 100644 index 00000000..4dde5248 --- /dev/null +++ b/protocol/src/main/resources/typescript/ProtocolTemplate.ts @@ -0,0 +1,29 @@ +{} +{} +class {} { + + {} + + constructor({}) { + {} + } + + protocolId(): number { + return {}; + } + + static write(buffer: Any, packet: {}) { + {} + } + + static read(buffer: Any): {} { + if (!buffer.readBoolean()) { + return null; + } + const packet = new {}(); + {} + return packet; + } +} + +export default {}; diff --git a/protocol/src/main/resources/typescript/buffer/ByteBuffer.ts b/protocol/src/main/resources/typescript/buffer/ByteBuffer.ts new file mode 100644 index 00000000..2628a16e --- /dev/null +++ b/protocol/src/main/resources/typescript/buffer/ByteBuffer.ts @@ -0,0 +1,352 @@ +const Longbits = require('./longbits.js'); + +const empty_str = ''; +const initSize = 128; +const maxSize = 655537; + +const maxShort = 32767; +const minShort = -32768; + +const maxInt = 2147483647; +const minInt = -2147483648; + +// UTF-8编码与解码 +// const encoder = new TextEncoder('utf-8'); +// const decoder = new TextDecoder('utf-8'); + +// nodejs的测试环境需要用以下方式特殊处理 +const util = require('util'); +const encoder = new util.TextEncoder('utf-8'); +const decoder = new util.TextDecoder('utf-8'); + +// 在js中long可以支持的最大值 +// const maxLong = 9007199254740992; +// const minLong = -9007199254740992; + +const copy = function copy(original: ArrayBuffer, newLength: number) { + if (original.byteLength > newLength) { + throw new Error('newLength is too small'); + } + const dst = new ArrayBuffer(newLength); + new Uint8Array(dst).set(new Uint8Array(original)); + return dst; +}; + +function encodeZigzagInt(n: number) { + // 有效位左移一位+符号位右移31位 + return (n << 1) ^ (n >> 31); +} + +function decodeZigzagInt(n: number) { + return (n >>> 1) ^ -(n & 1); +} + + +class ByteBuffer { + writeOffset: number; + readOffset: number; + buffer: ArrayBuffer; + bufferView: DataView; + + constructor() { + this.writeOffset = 0; + this.readOffset = 0; + this.buffer = new ArrayBuffer(initSize); + this.bufferView = new DataView(this.buffer, 0, this.buffer.byteLength); + } + + setWriteOffset(writeOffset: number): void { + if (writeOffset > this.buffer.byteLength) { + throw new Error('index out of bounds exception:readerIndex:' + this.readOffset + + ', writerIndex:' + this.writeOffset + + '(expected:0 <= readerIndex <= writerIndex <= capacity:' + this.buffer.byteLength); + } + this.writeOffset = writeOffset; + } + + setReadOffset(readOffset: number): void { + if (readOffset > this.writeOffset) { + throw new Error('index out of bounds exception:readerIndex:' + this.readOffset + + ', writerIndex:' + this.writeOffset + + '(expected:0 <= readerIndex <= writerIndex <= capacity:' + this.buffer.byteLength); + } + this.readOffset = readOffset; + } + + getCapacity(): number { + return this.buffer.byteLength - this.writeOffset; + } + + ensureCapacity(minCapacity: number): void { + while (minCapacity - this.getCapacity() > 0) { + const newSize = this.buffer.byteLength * 2; + if (newSize > maxSize) { + throw new Error('out of memory error'); + } + this.buffer = copy(this.buffer, newSize); + this.bufferView = new DataView(this.buffer, 0, this.buffer.byteLength); + } + } + + isReadable(): boolean { + return this.writeOffset > this.readOffset; + } + + writeBytes(byteArray: ArrayBuffer): void { + const length = byteArray.byteLength; + this.ensureCapacity(length); + new Uint8Array(this.buffer).set(new Uint8Array(byteArray), this.writeOffset); + this.writeOffset += length; + } + + toBytes(): ArrayBuffer { + const result = new ArrayBuffer(this.writeOffset); + new Uint8Array(result).set(new Uint8Array(this.buffer.slice(0, this.writeOffset))); + return result; + } + + writeBoolean(value: boolean): void { + if (!(value === true || value === false)) { + throw new Error('value must be true of false'); + } + this.ensureCapacity(1); + if (value === true) { + this.bufferView.setInt8(this.writeOffset, 1); + } else { + this.bufferView.setInt8(this.writeOffset, 0); + } + this.writeOffset++; + } + + readBoolean(): boolean { + const value = this.bufferView.getInt8(this.readOffset); + this.readOffset++; + return (value === 1); + } + + writeByte(value: number): void { + this.ensureCapacity(1); + this.bufferView.setInt8(this.writeOffset, value); + this.writeOffset++; + } + + readByte(): number { + const value = this.bufferView.getInt8(this.readOffset); + this.readOffset++; + return value; + } + + writeShort(value: number): void { + if (!(minShort <= value && value <= maxShort)) { + throw new Error('value must range between minShort:-32768 and maxShort:32767'); + } + this.ensureCapacity(2); + this.bufferView.setInt16(this.writeOffset, value); + this.writeOffset += 2; + } + + readShort(): number { + const value = this.bufferView.getInt16(this.readOffset); + this.readOffset += 2; + return value; + } + + writeRawInt(value: number): void { + if (!(minInt <= value && value <= maxInt)) { + throw new Error('value must range between minInt:-2147483648 and maxInt:2147483647'); + } + this.ensureCapacity(4); + this.bufferView.setInt32(this.writeOffset, value); + this.writeOffset += 4; + } + + readRawInt(): number { + const value = this.bufferView.getInt32(this.readOffset); + this.readOffset += 4; + return value; + } + + writeInt(value: number): void { + if (!(minInt <= value && value <= maxInt)) { + throw new Error('value must range between minInt:-2147483648 and maxInt:2147483647'); + } + this.ensureCapacity(5); + + value = encodeZigzagInt(value); + + if (value >>> 7 === 0) { + this.writeByte(value); + return; + } + + if (value >>> 14 === 0) { + this.writeByte((value & 0x7F) | 0x80); + this.writeByte((value >>> 7)); + return; + } + + if (value >>> 21 === 0) { + this.writeByte((value & 0x7F) | 0x80); + this.writeByte((value >>> 7 | 0x80)); + this.writeByte(value >>> 14); + return; + } + + if (value >>> 28 === 0) { + this.writeByte((value & 0x7F) | 0x80); + this.writeByte((value >>> 7 | 0x80)); + this.writeByte((value >>> 14 | 0x80)); + this.writeByte(value >>> 21); + return; + } + + this.writeByte((value & 0x7F) | 0x80); + this.writeByte((value >>> 7 | 0x80)); + this.writeByte((value >>> 14 | 0x80)); + this.writeByte((value >>> 21 | 0x80)); + this.writeByte(value >>> 28); + } + + readInt(): number { + let b = this.readByte(); + let value = b & 0x7F; + if ((b & 0x80) !== 0) { + b = this.readByte(); + value |= (b & 0x7F) << 7; + if ((b & 0x80) !== 0) { + b = this.readByte(); + value |= (b & 0x7F) << 14; + if ((b & 0x80) !== 0) { + b = this.readByte(); + value |= (b & 0x7F) << 21; + if ((b & 0x80) !== 0) { + b = this.readByte(); + value |= (b & 0x7F) << 28; + } + } + } + } + + return decodeZigzagInt(value); + } + + writeLong(value: number): void { + if (value === null || value === undefined) { + throw new Error('value must not be null'); + } + this.ensureCapacity(9); + + Longbits.writeInt64(this, value); + } + + readLong(): number { + const buffer = new ArrayBuffer(9); + const bufferView = new DataView(buffer, 0, buffer.byteLength); + + let count = 0; + let b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + if ((b & 0x80) !== 0) { + b = this.readByte(); + bufferView.setUint8(count++, b); + } + } + } + } + } + } + } + } + return Longbits.readInt64(new Uint8Array(buffer.slice(0, count))).toString(); + } + + writeFloat(value: number): void { + if (value === null || value === undefined) { + throw new Error('value must not be null'); + } + this.ensureCapacity(4); + this.bufferView.setFloat32(this.writeOffset, value); + this.writeOffset += 4; + } + + readFloat(): number { + const value = this.bufferView.getFloat32(this.readOffset); + this.readOffset += 4; + return value; + } + + writeDouble(value: number): void { + if (value === null || value === undefined) { + throw new Error('value must not be null'); + } + this.ensureCapacity(8); + this.bufferView.setFloat64(this.writeOffset, value); + this.writeOffset += 8; + } + + readDouble(): number { + const value = this.bufferView.getFloat64(this.readOffset); + this.readOffset += 8; + return value; + } + + writeChar(value: string): void { + if (value === null || value === undefined || value.length === 0) { + this.writeString(empty_str); + return; + } + this.writeString(value.charAt(0)); + } + + readChar(): string { + return this.readString(); + } + + writeString(value: string): void { + if (value === null || value === undefined || value.trim().length === 0) { + this.writeInt(0); + return; + } + + const uint8Array = encoder.encode(value); + + this.ensureCapacity(5 + uint8Array.length); + + this.writeInt(uint8Array.length); + uint8Array.forEach((value: number) => this.writeByte(value)); + } + + readString(): string { + const length = this.readInt(); + if (length <= 0) { + return empty_str; + } + const uint8Array = new Uint8Array(this.buffer.slice(this.readOffset, this.readOffset + length)); + const value = decoder.decode(uint8Array); + this.readOffset += length; + return value; + } +} + +export default ByteBuffer; diff --git a/protocol/src/main/resources/typescript/buffer/long.js b/protocol/src/main/resources/typescript/buffer/long.js new file mode 100644 index 00000000..31a8e6d7 --- /dev/null +++ b/protocol/src/main/resources/typescript/buffer/long.js @@ -0,0 +1,1325 @@ +/* eslint-disable */ +// from https://github.com/dcodeIO/long.js/blob/master/src/long.js +module.exports = Long; + +/** + * wasm optimizations, to do native i64 multiplication and divide + */ +var wasm = null; + +try { + wasm = new WebAssembly.Instance(new WebAssembly.Module(new Uint8Array([ + 0, 97, 115, 109, 1, 0, 0, 0, 1, 13, 2, 96, 0, 1, 127, 96, 4, 127, 127, 127, 127, 1, 127, 3, 7, 6, 0, 1, 1, 1, 1, 1, 6, 6, 1, 127, 1, 65, 0, 11, 7, 50, 6, 3, 109, 117, 108, 0, 1, 5, 100, 105, 118, 95, 115, 0, 2, 5, 100, 105, 118, 95, 117, 0, 3, 5, 114, 101, 109, 95, 115, 0, 4, 5, 114, 101, 109, 95, 117, 0, 5, 8, 103, 101, 116, 95, 104, 105, 103, 104, 0, 0, 10, 191, 1, 6, 4, 0, 35, 0, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 126, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 127, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 128, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 129, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11, 36, 1, 1, 126, 32, 0, 173, 32, 1, 173, 66, 32, 134, 132, 32, 2, 173, 32, 3, 173, 66, 32, 134, 132, 130, 34, 4, 66, 32, 135, 167, 36, 0, 32, 4, 167, 11 + ])), {}).exports; +} catch (e) { + // no wasm support :( +} + +/** + * Constructs a 64 bit two's-complement integer, given its low and high 32 bit values as *signed* integers. + * See the from* functions below for more convenient ways of constructing Longs. + * @exports Long + * @class A Long class for representing a 64 bit two's-complement integer value. + * @param {number} low The low (signed) 32 bits of the long + * @param {number} high The high (signed) 32 bits of the long + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @constructor + */ +function Long(low, high, unsigned) { + + /** + * The low 32 bits as a signed value. + * @type {number} + */ + this.low = low | 0; + + /** + * The high 32 bits as a signed value. + * @type {number} + */ + this.high = high | 0; + + /** + * Whether unsigned or not. + * @type {boolean} + */ + this.unsigned = !!unsigned; +} + +// The internal representation of a long is the two given signed, 32-bit values. +// We use 32-bit pieces because these are the size of integers on which +// Javascript performs bit-operations. For operations like addition and +// multiplication, we split each number into 16 bit pieces, which can easily be +// multiplied within Javascript's floating-point representation without overflow +// or change in sign. +// +// In the algorithms below, we frequently reduce the negative case to the +// positive case by negating the input(s) and then post-processing the result. +// Note that we must ALWAYS check specially whether those values are MIN_VALUE +// (-2^63) because -MIN_VALUE == MIN_VALUE (since 2^63 cannot be represented as +// a positive number, it overflows back into a negative). Not handling this +// case would often result in infinite recursion. +// +// Common constant values ZERO, ONE, NEG_ONE, etc. are defined below the from* +// methods on which they depend. + +/** + * An indicator used to reliably determine if an object is a Long or not. + * @type {boolean} + * @const + * @private + */ +Long.prototype.__isLong__; + +Object.defineProperty(Long.prototype, "__isLong__", {value: true}); + +/** + * @function + * @param {*} obj Object + * @returns {boolean} + * @inner + */ +function isLong(obj) { + return (obj && obj["__isLong__"]) === true; +} + +/** + * Tests if the specified object is a Long. + * @function + * @param {*} obj Object + * @returns {boolean} + */ +Long.isLong = isLong; + +/** + * A cache of the Long representations of small integer values. + * @type {!Object} + * @inner + */ +var INT_CACHE = {}; + +/** + * A cache of the Long representations of small unsigned integer values. + * @type {!Object} + * @inner + */ +var UINT_CACHE = {}; + +/** + * @param {number} value + * @param {boolean=} unsigned + * @returns {!Long} + * @inner + */ +function fromInt(value, unsigned) { + var obj, cachedObj, cache; + if (unsigned) { + value >>>= 0; + if (cache = (0 <= value && value < 256)) { + cachedObj = UINT_CACHE[value]; + if (cachedObj) + return cachedObj; + } + obj = fromBits(value, (value | 0) < 0 ? -1 : 0, true); + if (cache) + UINT_CACHE[value] = obj; + return obj; + } else { + value |= 0; + if (cache = (-128 <= value && value < 128)) { + cachedObj = INT_CACHE[value]; + if (cachedObj) + return cachedObj; + } + obj = fromBits(value, value < 0 ? -1 : 0, false); + if (cache) + INT_CACHE[value] = obj; + return obj; + } +} + +/** + * Returns a Long representing the given 32 bit integer value. + * @function + * @param {number} value The 32 bit integer in question + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @returns {!Long} The corresponding Long value + */ +Long.fromInt = fromInt; + +/** + * @param {number} value + * @param {boolean=} unsigned + * @returns {!Long} + * @inner + */ +function fromNumber(value, unsigned) { + if (isNaN(value)) + return unsigned ? UZERO : ZERO; + if (unsigned) { + if (value < 0) + return UZERO; + if (value >= TWO_PWR_64_DBL) + return MAX_UNSIGNED_VALUE; + } else { + if (value <= -TWO_PWR_63_DBL) + return MIN_VALUE; + if (value + 1 >= TWO_PWR_63_DBL) + return MAX_VALUE; + } + if (value < 0) + return fromNumber(-value, unsigned).neg(); + return fromBits((value % TWO_PWR_32_DBL) | 0, (value / TWO_PWR_32_DBL) | 0, unsigned); +} + +/** + * Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned. + * @function + * @param {number} value The number in question + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @returns {!Long} The corresponding Long value + */ +Long.fromNumber = fromNumber; + +/** + * @param {number} lowBits + * @param {number} highBits + * @param {boolean=} unsigned + * @returns {!Long} + * @inner + */ +function fromBits(lowBits, highBits, unsigned) { + return new Long(lowBits, highBits, unsigned); +} + +/** + * Returns a Long representing the 64 bit integer that comes by concatenating the given low and high bits. Each is + * assumed to use 32 bits. + * @function + * @param {number} lowBits The low 32 bits + * @param {number} highBits The high 32 bits + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @returns {!Long} The corresponding Long value + */ +Long.fromBits = fromBits; + +/** + * @function + * @param {number} base + * @param {number} exponent + * @returns {number} + * @inner + */ +var pow_dbl = Math.pow; // Used 4 times (4*8 to 15+4) + +/** + * @param {string} str + * @param {(boolean|number)=} unsigned + * @param {number=} radix + * @returns {!Long} + * @inner + */ +function fromString(str, unsigned, radix) { + if (str.length === 0) + throw Error('empty string'); + if (str === "NaN" || str === "Infinity" || str === "+Infinity" || str === "-Infinity") + return ZERO; + if (typeof unsigned === 'number') { + // For goog.math.long compatibility + radix = unsigned, + unsigned = false; + } else { + unsigned = !!unsigned; + } + radix = radix || 10; + if (radix < 2 || 36 < radix) + throw RangeError('radix'); + + var p; + if ((p = str.indexOf('-')) > 0) + throw Error('interior hyphen'); + else if (p === 0) { + return fromString(str.substring(1), unsigned, radix).neg(); + } + + // Do several (8) digits each time through the loop, so as to + // minimize the calls to the very expensive emulated div. + var radixToPower = fromNumber(pow_dbl(radix, 8)); + + var result = ZERO; + for (var i = 0; i < str.length; i += 8) { + var size = Math.min(8, str.length - i), + value = parseInt(str.substring(i, i + size), radix); + if (size < 8) { + var power = fromNumber(pow_dbl(radix, size)); + result = result.mul(power).add(fromNumber(value)); + } else { + result = result.mul(radixToPower); + result = result.add(fromNumber(value)); + } + } + result.unsigned = unsigned; + return result; +} + +/** + * Returns a Long representation of the given string, written using the specified radix. + * @function + * @param {string} str The textual representation of the Long + * @param {(boolean|number)=} unsigned Whether unsigned or not, defaults to signed + * @param {number=} radix The radix in which the text is written (2-36), defaults to 10 + * @returns {!Long} The corresponding Long value + */ +Long.fromString = fromString; + +/** + * @function + * @param {!Long|number|string|!{low: number, high: number, unsigned: boolean}} val + * @param {boolean=} unsigned + * @returns {!Long} + * @inner + */ +function fromValue(val, unsigned) { + if (typeof val === 'number') + return fromNumber(val, unsigned); + if (typeof val === 'string') + return fromString(val, unsigned); + // Throws for non-objects, converts non-instanceof Long: + return fromBits(val.low, val.high, typeof unsigned === 'boolean' ? unsigned : val.unsigned); +} + +/** + * Converts the specified value to a Long using the appropriate from* function for its type. + * @function + * @param {!Long|number|string|!{low: number, high: number, unsigned: boolean}} val Value + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @returns {!Long} + */ +Long.fromValue = fromValue; + +// NOTE: the compiler should inline these constant values below and then remove these variables, so there should be +// no runtime penalty for these. + +/** + * @type {number} + * @const + * @inner + */ +var TWO_PWR_16_DBL = 1 << 16; + +/** + * @type {number} + * @const + * @inner + */ +var TWO_PWR_24_DBL = 1 << 24; + +/** + * @type {number} + * @const + * @inner + */ +var TWO_PWR_32_DBL = TWO_PWR_16_DBL * TWO_PWR_16_DBL; + +/** + * @type {number} + * @const + * @inner + */ +var TWO_PWR_64_DBL = TWO_PWR_32_DBL * TWO_PWR_32_DBL; + +/** + * @type {number} + * @const + * @inner + */ +var TWO_PWR_63_DBL = TWO_PWR_64_DBL / 2; + +/** + * @type {!Long} + * @const + * @inner + */ +var TWO_PWR_24 = fromInt(TWO_PWR_24_DBL); + +/** + * @type {!Long} + * @inner + */ +var ZERO = fromInt(0); + +/** + * Signed zero. + * @type {!Long} + */ +Long.ZERO = ZERO; + +/** + * @type {!Long} + * @inner + */ +var UZERO = fromInt(0, true); + +/** + * Unsigned zero. + * @type {!Long} + */ +Long.UZERO = UZERO; + +/** + * @type {!Long} + * @inner + */ +var ONE = fromInt(1); + +/** + * Signed one. + * @type {!Long} + */ +Long.ONE = ONE; + +/** + * @type {!Long} + * @inner + */ +var UONE = fromInt(1, true); + +/** + * Unsigned one. + * @type {!Long} + */ +Long.UONE = UONE; + +/** + * @type {!Long} + * @inner + */ +var NEG_ONE = fromInt(-1); + +/** + * Signed negative one. + * @type {!Long} + */ +Long.NEG_ONE = NEG_ONE; + +/** + * @type {!Long} + * @inner + */ +var MAX_VALUE = fromBits(0xFFFFFFFF | 0, 0x7FFFFFFF | 0, false); + +/** + * Maximum signed value. + * @type {!Long} + */ +Long.MAX_VALUE = MAX_VALUE; + +/** + * @type {!Long} + * @inner + */ +var MAX_UNSIGNED_VALUE = fromBits(0xFFFFFFFF | 0, 0xFFFFFFFF | 0, true); + +/** + * Maximum unsigned value. + * @type {!Long} + */ +Long.MAX_UNSIGNED_VALUE = MAX_UNSIGNED_VALUE; + +/** + * @type {!Long} + * @inner + */ +var MIN_VALUE = fromBits(0, 0x80000000 | 0, false); + +/** + * Minimum signed value. + * @type {!Long} + */ +Long.MIN_VALUE = MIN_VALUE; + +/** + * @alias Long.prototype + * @inner + */ +var LongPrototype = Long.prototype; + +/** + * Converts the Long to a 32 bit integer, assuming it is a 32 bit integer. + * @returns {number} + */ +LongPrototype.toInt = function toInt() { + return this.unsigned ? this.low >>> 0 : this.low; +}; + +/** + * Converts the Long to a the nearest floating-point representation of this value (double, 53 bit mantissa). + * @returns {number} + */ +LongPrototype.toNumber = function toNumber() { + if (this.unsigned) + return ((this.high >>> 0) * TWO_PWR_32_DBL) + (this.low >>> 0); + return this.high * TWO_PWR_32_DBL + (this.low >>> 0); +}; + +/** + * Converts the Long to a string written in the specified radix. + * @param {number=} radix Radix (2-36), defaults to 10 + * @returns {string} + * @override + * @throws {RangeError} If `radix` is out of range + */ +LongPrototype.toString = function toString(radix) { + radix = radix || 10; + if (radix < 2 || 36 < radix) + throw RangeError('radix'); + if (this.isZero()) + return '0'; + if (this.isNegative()) { // Unsigned Longs are never negative + if (this.eq(MIN_VALUE)) { + // We need to change the Long value before it can be negated, so we remove + // the bottom-most digit in this base and then recurse to do the rest. + var radixLong = fromNumber(radix), + div = this.div(radixLong), + rem1 = div.mul(radixLong).sub(this); + return div.toString(radix) + rem1.toInt().toString(radix); + } else + return '-' + this.neg().toString(radix); + } + + // Do several (6) digits each time through the loop, so as to + // minimize the calls to the very expensive emulated div. + var radixToPower = fromNumber(pow_dbl(radix, 6), this.unsigned), + rem = this; + var result = ''; + while (true) { + var remDiv = rem.div(radixToPower), + intval = rem.sub(remDiv.mul(radixToPower)).toInt() >>> 0, + digits = intval.toString(radix); + rem = remDiv; + if (rem.isZero()) + return digits + result; + else { + while (digits.length < 6) + digits = '0' + digits; + result = '' + digits + result; + } + } +}; + +/** + * Gets the high 32 bits as a signed integer. + * @returns {number} Signed high bits + */ +LongPrototype.getHighBits = function getHighBits() { + return this.high; +}; + +/** + * Gets the high 32 bits as an unsigned integer. + * @returns {number} Unsigned high bits + */ +LongPrototype.getHighBitsUnsigned = function getHighBitsUnsigned() { + return this.high >>> 0; +}; + +/** + * Gets the low 32 bits as a signed integer. + * @returns {number} Signed low bits + */ +LongPrototype.getLowBits = function getLowBits() { + return this.low; +}; + +/** + * Gets the low 32 bits as an unsigned integer. + * @returns {number} Unsigned low bits + */ +LongPrototype.getLowBitsUnsigned = function getLowBitsUnsigned() { + return this.low >>> 0; +}; + +/** + * Gets the number of bits needed to represent the absolute value of this Long. + * @returns {number} + */ +LongPrototype.getNumBitsAbs = function getNumBitsAbs() { + if (this.isNegative()) // Unsigned Longs are never negative + return this.eq(MIN_VALUE) ? 64 : this.neg().getNumBitsAbs(); + var val = this.high != 0 ? this.high : this.low; + for (var bit = 31; bit > 0; bit--) + if ((val & (1 << bit)) != 0) + break; + return this.high != 0 ? bit + 33 : bit + 1; +}; + +/** + * Tests if this Long's value equals zero. + * @returns {boolean} + */ +LongPrototype.isZero = function isZero() { + return this.high === 0 && this.low === 0; +}; + +/** + * Tests if this Long's value equals zero. This is an alias of {@link Long#isZero}. + * @returns {boolean} + */ +LongPrototype.eqz = LongPrototype.isZero; + +/** + * Tests if this Long's value is negative. + * @returns {boolean} + */ +LongPrototype.isNegative = function isNegative() { + return !this.unsigned && this.high < 0; +}; + +/** + * Tests if this Long's value is positive. + * @returns {boolean} + */ +LongPrototype.isPositive = function isPositive() { + return this.unsigned || this.high >= 0; +}; + +/** + * Tests if this Long's value is odd. + * @returns {boolean} + */ +LongPrototype.isOdd = function isOdd() { + return (this.low & 1) === 1; +}; + +/** + * Tests if this Long's value is even. + * @returns {boolean} + */ +LongPrototype.isEven = function isEven() { + return (this.low & 1) === 0; +}; + +/** + * Tests if this Long's value equals the specified's. + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.equals = function equals(other) { + if (!isLong(other)) + other = fromValue(other); + if (this.unsigned !== other.unsigned && (this.high >>> 31) === 1 && (other.high >>> 31) === 1) + return false; + return this.high === other.high && this.low === other.low; +}; + +/** + * Tests if this Long's value equals the specified's. This is an alias of {@link Long#equals}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.eq = LongPrototype.equals; + +/** + * Tests if this Long's value differs from the specified's. + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.notEquals = function notEquals(other) { + return !this.eq(/* validates */ other); +}; + +/** + * Tests if this Long's value differs from the specified's. This is an alias of {@link Long#notEquals}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.neq = LongPrototype.notEquals; + +/** + * Tests if this Long's value differs from the specified's. This is an alias of {@link Long#notEquals}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.ne = LongPrototype.notEquals; + +/** + * Tests if this Long's value is less than the specified's. + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.lessThan = function lessThan(other) { + return this.comp(/* validates */ other) < 0; +}; + +/** + * Tests if this Long's value is less than the specified's. This is an alias of {@link Long#lessThan}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.lt = LongPrototype.lessThan; + +/** + * Tests if this Long's value is less than or equal the specified's. + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.lessThanOrEqual = function lessThanOrEqual(other) { + return this.comp(/* validates */ other) <= 0; +}; + +/** + * Tests if this Long's value is less than or equal the specified's. This is an alias of {@link Long#lessThanOrEqual}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.lte = LongPrototype.lessThanOrEqual; + +/** + * Tests if this Long's value is less than or equal the specified's. This is an alias of {@link Long#lessThanOrEqual}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.le = LongPrototype.lessThanOrEqual; + +/** + * Tests if this Long's value is greater than the specified's. + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.greaterThan = function greaterThan(other) { + return this.comp(/* validates */ other) > 0; +}; + +/** + * Tests if this Long's value is greater than the specified's. This is an alias of {@link Long#greaterThan}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.gt = LongPrototype.greaterThan; + +/** + * Tests if this Long's value is greater than or equal the specified's. + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.greaterThanOrEqual = function greaterThanOrEqual(other) { + return this.comp(/* validates */ other) >= 0; +}; + +/** + * Tests if this Long's value is greater than or equal the specified's. This is an alias of {@link Long#greaterThanOrEqual}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.gte = LongPrototype.greaterThanOrEqual; + +/** + * Tests if this Long's value is greater than or equal the specified's. This is an alias of {@link Long#greaterThanOrEqual}. + * @function + * @param {!Long|number|string} other Other value + * @returns {boolean} + */ +LongPrototype.ge = LongPrototype.greaterThanOrEqual; + +/** + * Compares this Long's value with the specified's. + * @param {!Long|number|string} other Other value + * @returns {number} 0 if they are the same, 1 if the this is greater and -1 + * if the given one is greater + */ +LongPrototype.compare = function compare(other) { + if (!isLong(other)) + other = fromValue(other); + if (this.eq(other)) + return 0; + var thisNeg = this.isNegative(), + otherNeg = other.isNegative(); + if (thisNeg && !otherNeg) + return -1; + if (!thisNeg && otherNeg) + return 1; + // At this point the sign bits are the same + if (!this.unsigned) + return this.sub(other).isNegative() ? -1 : 1; + // Both are positive if at least one is unsigned + return (other.high >>> 0) > (this.high >>> 0) || (other.high === this.high && (other.low >>> 0) > (this.low >>> 0)) ? -1 : 1; +}; + +/** + * Compares this Long's value with the specified's. This is an alias of {@link Long#compare}. + * @function + * @param {!Long|number|string} other Other value + * @returns {number} 0 if they are the same, 1 if the this is greater and -1 + * if the given one is greater + */ +LongPrototype.comp = LongPrototype.compare; + +/** + * Negates this Long's value. + * @returns {!Long} Negated Long + */ +LongPrototype.negate = function negate() { + if (!this.unsigned && this.eq(MIN_VALUE)) + return MIN_VALUE; + return this.not().add(ONE); +}; + +/** + * Negates this Long's value. This is an alias of {@link Long#negate}. + * @function + * @returns {!Long} Negated Long + */ +LongPrototype.neg = LongPrototype.negate; + +/** + * Returns the sum of this and the specified Long. + * @param {!Long|number|string} addend Addend + * @returns {!Long} Sum + */ +LongPrototype.add = function add(addend) { + if (!isLong(addend)) + addend = fromValue(addend); + + // Divide each number into 4 chunks of 16 bits, and then sum the chunks. + + var a48 = this.high >>> 16; + var a32 = this.high & 0xFFFF; + var a16 = this.low >>> 16; + var a00 = this.low & 0xFFFF; + + var b48 = addend.high >>> 16; + var b32 = addend.high & 0xFFFF; + var b16 = addend.low >>> 16; + var b00 = addend.low & 0xFFFF; + + var c48 = 0, c32 = 0, c16 = 0, c00 = 0; + c00 += a00 + b00; + c16 += c00 >>> 16; + c00 &= 0xFFFF; + c16 += a16 + b16; + c32 += c16 >>> 16; + c16 &= 0xFFFF; + c32 += a32 + b32; + c48 += c32 >>> 16; + c32 &= 0xFFFF; + c48 += a48 + b48; + c48 &= 0xFFFF; + return fromBits((c16 << 16) | c00, (c48 << 16) | c32, this.unsigned); +}; + +/** + * Returns the difference of this and the specified Long. + * @param {!Long|number|string} subtrahend Subtrahend + * @returns {!Long} Difference + */ +LongPrototype.subtract = function subtract(subtrahend) { + if (!isLong(subtrahend)) + subtrahend = fromValue(subtrahend); + return this.add(subtrahend.neg()); +}; + +/** + * Returns the difference of this and the specified Long. This is an alias of {@link Long#subtract}. + * @function + * @param {!Long|number|string} subtrahend Subtrahend + * @returns {!Long} Difference + */ +LongPrototype.sub = LongPrototype.subtract; + +/** + * Returns the product of this and the specified Long. + * @param {!Long|number|string} multiplier Multiplier + * @returns {!Long} Product + */ +LongPrototype.multiply = function multiply(multiplier) { + if (this.isZero()) + return ZERO; + if (!isLong(multiplier)) + multiplier = fromValue(multiplier); + + // use wasm support if present + if (wasm) { + var low = wasm.mul(this.low, + this.high, + multiplier.low, + multiplier.high); + return fromBits(low, wasm.get_high(), this.unsigned); + } + + if (multiplier.isZero()) + return ZERO; + if (this.eq(MIN_VALUE)) + return multiplier.isOdd() ? MIN_VALUE : ZERO; + if (multiplier.eq(MIN_VALUE)) + return this.isOdd() ? MIN_VALUE : ZERO; + + if (this.isNegative()) { + if (multiplier.isNegative()) + return this.neg().mul(multiplier.neg()); + else + return this.neg().mul(multiplier).neg(); + } else if (multiplier.isNegative()) + return this.mul(multiplier.neg()).neg(); + + // If both longs are small, use float multiplication + if (this.lt(TWO_PWR_24) && multiplier.lt(TWO_PWR_24)) + return fromNumber(this.toNumber() * multiplier.toNumber(), this.unsigned); + + // Divide each long into 4 chunks of 16 bits, and then add up 4x4 products. + // We can skip products that would overflow. + + var a48 = this.high >>> 16; + var a32 = this.high & 0xFFFF; + var a16 = this.low >>> 16; + var a00 = this.low & 0xFFFF; + + var b48 = multiplier.high >>> 16; + var b32 = multiplier.high & 0xFFFF; + var b16 = multiplier.low >>> 16; + var b00 = multiplier.low & 0xFFFF; + + var c48 = 0, c32 = 0, c16 = 0, c00 = 0; + c00 += a00 * b00; + c16 += c00 >>> 16; + c00 &= 0xFFFF; + c16 += a16 * b00; + c32 += c16 >>> 16; + c16 &= 0xFFFF; + c16 += a00 * b16; + c32 += c16 >>> 16; + c16 &= 0xFFFF; + c32 += a32 * b00; + c48 += c32 >>> 16; + c32 &= 0xFFFF; + c32 += a16 * b16; + c48 += c32 >>> 16; + c32 &= 0xFFFF; + c32 += a00 * b32; + c48 += c32 >>> 16; + c32 &= 0xFFFF; + c48 += a48 * b00 + a32 * b16 + a16 * b32 + a00 * b48; + c48 &= 0xFFFF; + return fromBits((c16 << 16) | c00, (c48 << 16) | c32, this.unsigned); +}; + +/** + * Returns the product of this and the specified Long. This is an alias of {@link Long#multiply}. + * @function + * @param {!Long|number|string} multiplier Multiplier + * @returns {!Long} Product + */ +LongPrototype.mul = LongPrototype.multiply; + +/** + * Returns this Long divided by the specified. The result is signed if this Long is signed or + * unsigned if this Long is unsigned. + * @param {!Long|number|string} divisor Divisor + * @returns {!Long} Quotient + */ +LongPrototype.divide = function divide(divisor) { + if (!isLong(divisor)) + divisor = fromValue(divisor); + if (divisor.isZero()) + throw Error('division by zero'); + + // use wasm support if present + if (wasm) { + // guard against signed division overflow: the largest + // negative number / -1 would be 1 larger than the largest + // positive number, due to two's complement. + if (!this.unsigned && + this.high === -0x80000000 && + divisor.low === -1 && divisor.high === -1) { + // be consistent with non-wasm code path + return this; + } + var low = (this.unsigned ? wasm.div_u : wasm.div_s)( + this.low, + this.high, + divisor.low, + divisor.high + ); + return fromBits(low, wasm.get_high(), this.unsigned); + } + + if (this.isZero()) + return this.unsigned ? UZERO : ZERO; + var approx, rem, res; + if (!this.unsigned) { + // This section is only relevant for signed longs and is derived from the + // closure library as a whole. + if (this.eq(MIN_VALUE)) { + if (divisor.eq(ONE) || divisor.eq(NEG_ONE)) + return MIN_VALUE; // recall that -MIN_VALUE == MIN_VALUE + else if (divisor.eq(MIN_VALUE)) + return ONE; + else { + // At this point, we have |other| >= 2, so |this/other| < |MIN_VALUE|. + var halfThis = this.shr(1); + approx = halfThis.div(divisor).shl(1); + if (approx.eq(ZERO)) { + return divisor.isNegative() ? ONE : NEG_ONE; + } else { + rem = this.sub(divisor.mul(approx)); + res = approx.add(rem.div(divisor)); + return res; + } + } + } else if (divisor.eq(MIN_VALUE)) + return this.unsigned ? UZERO : ZERO; + if (this.isNegative()) { + if (divisor.isNegative()) + return this.neg().div(divisor.neg()); + return this.neg().div(divisor).neg(); + } else if (divisor.isNegative()) + return this.div(divisor.neg()).neg(); + res = ZERO; + } else { + // The algorithm below has not been made for unsigned longs. It's therefore + // required to take special care of the MSB prior to running it. + if (!divisor.unsigned) + divisor = divisor.toUnsigned(); + if (divisor.gt(this)) + return UZERO; + if (divisor.gt(this.shru(1))) // 15 >>> 1 = 7 ; with divisor = 8 ; true + return UONE; + res = UZERO; + } + + // Repeat the following until the remainder is less than other: find a + // floating-point that approximates remainder / other *from below*, add this + // into the result, and subtract it from the remainder. It is critical that + // the approximate value is less than or equal to the real value so that the + // remainder never becomes negative. + rem = this; + while (rem.gte(divisor)) { + // Approximate the result of division. This may be a little greater or + // smaller than the actual value. + approx = Math.max(1, Math.floor(rem.toNumber() / divisor.toNumber())); + + // We will tweak the approximate result by changing it in the 48-th digit or + // the smallest non-fractional digit, whichever is larger. + var log2 = Math.ceil(Math.log(approx) / Math.LN2), + delta = (log2 <= 48) ? 1 : pow_dbl(2, log2 - 48), + + // Decrease the approximation until it is smaller than the remainder. Note + // that if it is too large, the product overflows and is negative. + approxRes = fromNumber(approx), + approxRem = approxRes.mul(divisor); + while (approxRem.isNegative() || approxRem.gt(rem)) { + approx -= delta; + approxRes = fromNumber(approx, this.unsigned); + approxRem = approxRes.mul(divisor); + } + + // We know the answer can't be zero... and actually, zero would cause + // infinite recursion since we would make no progress. + if (approxRes.isZero()) + approxRes = ONE; + + res = res.add(approxRes); + rem = rem.sub(approxRem); + } + return res; +}; + +/** + * Returns this Long divided by the specified. This is an alias of {@link Long#divide}. + * @function + * @param {!Long|number|string} divisor Divisor + * @returns {!Long} Quotient + */ +LongPrototype.div = LongPrototype.divide; + +/** + * Returns this Long modulo the specified. + * @param {!Long|number|string} divisor Divisor + * @returns {!Long} Remainder + */ +LongPrototype.modulo = function modulo(divisor) { + if (!isLong(divisor)) + divisor = fromValue(divisor); + + // use wasm support if present + if (wasm) { + var low = (this.unsigned ? wasm.rem_u : wasm.rem_s)( + this.low, + this.high, + divisor.low, + divisor.high + ); + return fromBits(low, wasm.get_high(), this.unsigned); + } + + return this.sub(this.div(divisor).mul(divisor)); +}; + +/** + * Returns this Long modulo the specified. This is an alias of {@link Long#modulo}. + * @function + * @param {!Long|number|string} divisor Divisor + * @returns {!Long} Remainder + */ +LongPrototype.mod = LongPrototype.modulo; + +/** + * Returns this Long modulo the specified. This is an alias of {@link Long#modulo}. + * @function + * @param {!Long|number|string} divisor Divisor + * @returns {!Long} Remainder + */ +LongPrototype.rem = LongPrototype.modulo; + +/** + * Returns the bitwise NOT of this Long. + * @returns {!Long} + */ +LongPrototype.not = function not() { + return fromBits(~this.low, ~this.high, this.unsigned); +}; + +/** + * Returns the bitwise AND of this Long and the specified. + * @param {!Long|number|string} other Other Long + * @returns {!Long} + */ +LongPrototype.and = function and(other) { + if (!isLong(other)) + other = fromValue(other); + return fromBits(this.low & other.low, this.high & other.high, this.unsigned); +}; + +/** + * Returns the bitwise OR of this Long and the specified. + * @param {!Long|number|string} other Other Long + * @returns {!Long} + */ +LongPrototype.or = function or(other) { + if (!isLong(other)) + other = fromValue(other); + return fromBits(this.low | other.low, this.high | other.high, this.unsigned); +}; + +/** + * Returns the bitwise XOR of this Long and the given one. + * @param {!Long|number|string} other Other Long + * @returns {!Long} + */ +LongPrototype.xor = function xor(other) { + if (!isLong(other)) + other = fromValue(other); + return fromBits(this.low ^ other.low, this.high ^ other.high, this.unsigned); +}; + +/** + * Returns this Long with bits shifted to the left by the given amount. + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shiftLeft = function shiftLeft(numBits) { + if (isLong(numBits)) + numBits = numBits.toInt(); + if ((numBits &= 63) === 0) + return this; + else if (numBits < 32) + return fromBits(this.low << numBits, (this.high << numBits) | (this.low >>> (32 - numBits)), this.unsigned); + else + return fromBits(0, this.low << (numBits - 32), this.unsigned); +}; + +/** + * Returns this Long with bits shifted to the left by the given amount. This is an alias of {@link Long#shiftLeft}. + * @function + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shl = LongPrototype.shiftLeft; + +/** + * Returns this Long with bits arithmetically shifted to the right by the given amount. + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shiftRight = function shiftRight(numBits) { + if (isLong(numBits)) + numBits = numBits.toInt(); + if ((numBits &= 63) === 0) + return this; + else if (numBits < 32) + return fromBits((this.low >>> numBits) | (this.high << (32 - numBits)), this.high >> numBits, this.unsigned); + else + return fromBits(this.high >> (numBits - 32), this.high >= 0 ? 0 : -1, this.unsigned); +}; + +/** + * Returns this Long with bits arithmetically shifted to the right by the given amount. This is an alias of {@link Long#shiftRight}. + * @function + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shr = LongPrototype.shiftRight; + +/** + * Returns this Long with bits logically shifted to the right by the given amount. + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shiftRightUnsigned = function shiftRightUnsigned(numBits) { + if (isLong(numBits)) + numBits = numBits.toInt(); + numBits &= 63; + if (numBits === 0) + return this; + else { + var high = this.high; + if (numBits < 32) { + var low = this.low; + return fromBits((low >>> numBits) | (high << (32 - numBits)), high >>> numBits, this.unsigned); + } else if (numBits === 32) + return fromBits(high, 0, this.unsigned); + else + return fromBits(high >>> (numBits - 32), 0, this.unsigned); + } +}; + +/** + * Returns this Long with bits logically shifted to the right by the given amount. This is an alias of {@link Long#shiftRightUnsigned}. + * @function + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shru = LongPrototype.shiftRightUnsigned; + +/** + * Returns this Long with bits logically shifted to the right by the given amount. This is an alias of {@link Long#shiftRightUnsigned}. + * @function + * @param {number|!Long} numBits Number of bits + * @returns {!Long} Shifted Long + */ +LongPrototype.shr_u = LongPrototype.shiftRightUnsigned; + +/** + * Converts this Long to signed. + * @returns {!Long} Signed long + */ +LongPrototype.toSigned = function toSigned() { + if (!this.unsigned) + return this; + return fromBits(this.low, this.high, false); +}; + +/** + * Converts this Long to unsigned. + * @returns {!Long} Unsigned long + */ +LongPrototype.toUnsigned = function toUnsigned() { + if (this.unsigned) + return this; + return fromBits(this.low, this.high, true); +}; + +/** + * Converts this Long to its byte representation. + * @param {boolean=} le Whether little or big endian, defaults to big endian + * @returns {!Array.} Byte representation + */ +LongPrototype.toBytes = function toBytes(le) { + return le ? this.toBytesLE() : this.toBytesBE(); +}; + +/** + * Converts this Long to its little endian byte representation. + * @returns {!Array.} Little endian byte representation + */ +LongPrototype.toBytesLE = function toBytesLE() { + var hi = this.high, + lo = this.low; + return [ + lo & 0xff, + lo >>> 8 & 0xff, + lo >>> 16 & 0xff, + lo >>> 24, + hi & 0xff, + hi >>> 8 & 0xff, + hi >>> 16 & 0xff, + hi >>> 24 + ]; +}; + +/** + * Converts this Long to its big endian byte representation. + * @returns {!Array.} Big endian byte representation + */ +LongPrototype.toBytesBE = function toBytesBE() { + var hi = this.high, + lo = this.low; + return [ + hi >>> 24, + hi >>> 16 & 0xff, + hi >>> 8 & 0xff, + hi & 0xff, + lo >>> 24, + lo >>> 16 & 0xff, + lo >>> 8 & 0xff, + lo & 0xff + ]; +}; + +/** + * Creates a Long from its byte representation. + * @param {!Array.} bytes Byte representation + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @param {boolean=} le Whether little or big endian, defaults to big endian + * @returns {Long} The corresponding Long value + */ +Long.fromBytes = function fromBytes(bytes, unsigned, le) { + return le ? Long.fromBytesLE(bytes, unsigned) : Long.fromBytesBE(bytes, unsigned); +}; + +/** + * Creates a Long from its little endian byte representation. + * @param {!Array.} bytes Little endian byte representation + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @returns {Long} The corresponding Long value + */ +Long.fromBytesLE = function fromBytesLE(bytes, unsigned) { + return new Long( + bytes[0] | + bytes[1] << 8 | + bytes[2] << 16 | + bytes[3] << 24, + bytes[4] | + bytes[5] << 8 | + bytes[6] << 16 | + bytes[7] << 24, + unsigned + ); +}; + +/** + * Creates a Long from its big endian byte representation. + * @param {!Array.} bytes Big endian byte representation + * @param {boolean=} unsigned Whether unsigned or not, defaults to signed + * @returns {Long} The corresponding Long value + */ +Long.fromBytesBE = function fromBytesBE(bytes, unsigned) { + return new Long( + bytes[4] << 24 | + bytes[5] << 16 | + bytes[6] << 8 | + bytes[7], + bytes[0] << 24 | + bytes[1] << 16 | + bytes[2] << 8 | + bytes[3], + unsigned + ); +}; diff --git a/protocol/src/main/resources/typescript/buffer/longbits.js b/protocol/src/main/resources/typescript/buffer/longbits.js new file mode 100644 index 00000000..23f759ad --- /dev/null +++ b/protocol/src/main/resources/typescript/buffer/longbits.js @@ -0,0 +1,189 @@ +// from protobuf +const Long = require('./long.js') + +module.exports = LongBits; + +/** + * Constructs new long bits. + * @classdesc Helper class for working with the low and high bits of a 64 bit value. + * @memberof util + * @constructor + * @param {number} lo Low 32 bits, unsigned + * @param {number} hi High 32 bits, unsigned + */ +function LongBits(lo, hi) { + // note that the casts below are theoretically unnecessary as of today, but older statically + // generated converter code might still call the ctor with signed 32bits. kept for compat. + + /** + * Low bits. + * @type {number} + */ + this.lo = lo >>> 0; + + /** + * High bits. + * @type {number} + */ + this.hi = hi >>> 0; +} + +/** + * Zig-zag encodes this long bits. + * @returns {util.LongBits} `this` + */ +LongBits.prototype.zzEncode = function zzEncode() { + const mask = this.hi >> 31; + this.hi = ((this.hi << 1 | this.lo >>> 31) ^ mask) >>> 0; + this.lo = (this.lo << 1 ^ mask) >>> 0; + return this; +}; + +/** + * Zig-zag decodes this long bits. + * @returns {util.LongBits} `this` + */ +LongBits.prototype.zzDecode = function zzDecode() { + const mask = -(this.lo & 1); + this.lo = ((this.lo >>> 1 | this.hi << 31) ^ mask) >>> 0; + this.hi = (this.hi >>> 1 ^ mask) >>> 0; + return this; +}; + +/** + * Converts this long bits to a long. + * @param {boolean} [unsigned=false] Whether unsigned or not + * @returns {Long} Long + */ +LongBits.prototype.toLong = function toLong(unsigned) { + return new Long(this.lo | 0, this.hi | 0, Boolean(unsigned)); +}; + +/** + * Zero bits. + * @memberof util.LongBits + * @type {util.LongBits} + */ +const zero = LongBits.zero = new LongBits(0, 0); + +function from(value) { + if (typeof value === 'number') { + return fromNumber(value); + } + if (typeof value === 'string' || value instanceof String) { + value = Long.fromString(value); + } + return value.low || value.high ? new LongBits(value.low >>> 0, value.high >>> 0) : zero; +} + + +/** + * Constructs new long bits from the specified number. + * @param {number} value Value + * @returns {util.LongBits} Instance + */ +function fromNumber(value) { + if (value === 0) { + return zero; + } + const sign = value < 0; + if (sign) { + value = -value; + } + let lo = value >>> 0; + let hi = (value - lo) / 4294967296 >>> 0; + if (sign) { + hi = ~hi >>> 0; + lo = ~lo >>> 0; + if (++lo > 4294967295) { + lo = 0; + if (++hi > 4294967295) { + hi = 0; + } + } + } + return new LongBits(lo, hi); +} + +function writeVarint64(byteBuffer, value) { + let count = 0; + while (value.hi) { + byteBuffer.writeByte(value.lo & 127 | 128); + value.lo = (value.lo >>> 7 | value.hi << 25) >>> 0; + value.hi >>>= 7; + count = count + 7; + } + while (value.lo > 127) { + if (count >= 56) { + byteBuffer.writeByte(value.lo); + return; + } + byteBuffer.writeByte(value.lo & 127 | 128); + value.lo = value.lo >>> 7; + count = count + 7; + } + byteBuffer.writeByte(value.lo); +} + +function readLongVarint(buffer) { + // tends to deopt with local vars for octet etc. + const bits = new LongBits(0, 0); + let i = 0; + const len = buffer.length; + let pos = 0; + if (len - pos > 4) { // fast route (lo) + for (; i < 4; ++i) { + // 1st..4th + bits.lo = (bits.lo | (buffer[pos] & 127) << i * 7) >>> 0; + if (buffer[pos++] < 128) { + return bits; + } + } + // 5th + bits.lo = (bits.lo | (buffer[pos] & 127) << 28) >>> 0; + bits.hi = (bits.hi | (buffer[pos] & 127) >> 4) >>> 0; + if (buffer[pos++] < 128) { + return bits; + } + i = 0; + } else { + for (; i < 3; ++i) { + // 1st..3th + bits.lo = (bits.lo | (buffer[pos] & 127) << i * 7) >>> 0; + if (buffer[pos++] < 128) { + return bits; + } + } + // 4th + bits.lo = (bits.lo | (buffer[pos++] & 127) << i * 7) >>> 0; + return bits; + } + + // 6th..9th + for (; i < 4; ++i) { + // 最后一位直接写入 + if (pos === 8) { + bits.hi = (bits.hi | buffer[pos] << i * 7 + 3) >>> 0; + return bits; + } + bits.hi = (bits.hi | (buffer[pos] & 127) << i * 7 + 3) >>> 0; + if (buffer[pos++] < 128) { + return bits; + } + } + + return bits; +} + +function writeInt64(byteBuffer, value) { + const bits = from(value).zzEncode(); + writeVarint64(byteBuffer, bits); +} + +function readInt64(buffer) { + return readLongVarint(buffer).zzDecode().toLong(false); +} + +LongBits.writeInt64 = writeInt64; + +LongBits.readInt64 = readInt64; diff --git a/protocol/src/test/java/com/zfoo/protocol/SpeedTest.java b/protocol/src/test/java/com/zfoo/protocol/SpeedTest.java index 03f61c9d..155b714f 100644 --- a/protocol/src/test/java/com/zfoo/protocol/SpeedTest.java +++ b/protocol/src/test/java/com/zfoo/protocol/SpeedTest.java @@ -42,7 +42,7 @@ import java.util.concurrent.Executors; */ public class SpeedTest { - private static int benchmark = 10_0000; + private static int benchmark = 1; /** * 单线程性能测试 diff --git a/protocol/src/test/typescript/main.ts b/protocol/src/test/typescript/main.ts new file mode 100644 index 00000000..2599eaf3 --- /dev/null +++ b/protocol/src/test/typescript/main.ts @@ -0,0 +1,82 @@ +import ByteBuffer from './zfoojs/buffer/ByteBuffer'; + +function assert(flag: boolean): void { + if (!flag) { + throw "exception happen"; + } +} + +// 如果是在idea中运行，需要先安装插件：Run Configuration for TypeScript +console.log("Hello world"); + + + +// ByteBuffer test +let buffer = new ByteBuffer(); +assert(buffer.getCapacity() == 128) + +// boolean +const testBoolean = [false, true]; +testBoolean.forEach((value) => { + buffer.writeBoolean(value); + assert(buffer.readBoolean() == value); +}); + +assert(buffer.writeOffset == testBoolean.length); +assert(buffer.readOffset == testBoolean.length); + +// byte +buffer = new ByteBuffer(); +const testByte = [-128, -99, 0, 99, 127]; +testByte.forEach((value) => { + buffer.writeByte(value); + assert(buffer.readByte() == value); +}); +assert(buffer.writeOffset == testByte.length); +assert(buffer.readOffset == testByte.length); + +// short +buffer = new ByteBuffer(); +const testShort = [-32768, -99, 0, 99, 32767]; +testShort.forEach((value) => { + buffer.writeShort(value); + assert(buffer.readShort() == value); +}); +assert(buffer.writeOffset == testShort.length * 2); +assert(buffer.readOffset == testShort.length * 2); + +// int +buffer = new ByteBuffer(); +const testInt = [-2147483648, -99, 0, 99, 2147483647]; +testInt.forEach((value) => { + buffer.writeInt(value); + assert(buffer.readInt() == value); +}); + +// float +buffer = new ByteBuffer(); +const testFloat = [-999.5, -99.5, 0, 99.5, 999.5]; +testFloat.forEach((value) => { + buffer.writeFloat(value); + assert(buffer.readFloat() == value); +}); + +// double +buffer = new ByteBuffer(); +const testDouble = [-999.5, -99.5, 0, 99.5, 999.5]; +testDouble.forEach((value) => { + buffer.writeDouble(value); + assert(buffer.readDouble() == value); +}); + +// string +buffer = new ByteBuffer(); +const testString = 'hello world!'; +buffer.writeString(testString); +assert(buffer.readString() == testString); + +// char +buffer = new ByteBuffer(); +const testChar = 'h'; +buffer.writeChar(testString); +assert(buffer.readChar() == testChar); diff --git a/protocol/src/test/typescript/package.json b/protocol/src/test/typescript/package.json new file mode 100644 index 00000000..013c2d13 --- /dev/null +++ b/protocol/src/test/typescript/package.json @@ -0,0 +1,11 @@ +{ + "name": "zfoo-typescript", + "version": "1.0.0", + "description": "", + "main": "main.ts", + "devDependencies": { + "@types/node": "^17.0.39", + "ts-node": "^10.8.1", + "typescript": "^4.7.3" + } +}