tiennm99/zfoo
1
0
Fork 0
mirror of https://github.com/tiennm99/zfoo.git synced 2026-08-20 00:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix[swift]: ensure capacity

Browse Source
This commit is contained in:
godotg
2024-07-28 20:40:35 +08:00
parent 9b835ed23e
commit a10bf0402d
3 changed files with 67 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
protocol/src/main/java/com/zfoo/protocol/serializer/swift/CodeGenerateSwift.java
+52 -85
View File
@@ -79,24 +79,7 @@ public class CodeGenerateSwift implements ICodeGenerate {
@Override
public void mergerProtocol(List<ProtocolRegistration> registrations) throws IOException {
createTemplateFile();
var protocolManagerTemplate = ClassUtils.getFileFromClassPathToString("kotlin/ProtocolManagerTemplate.kt");
var protocol_manager_registrations = new StringBuilder();
var protocol_imports = new StringBuilder();
for (var registration : registrations) {
var protocol_id = registration.protocolId();
var protocol_name = registration.protocolConstructor().getDeclaringClass().getSimpleName();
protocol_manager_registrations.append(StringUtils.format("protocols[{}] = {}Registration()", protocol_id, protocol_name)).append(LS);
protocol_manager_registrations.append(StringUtils.format("protocolIdMap.put({}::class.java, {})", protocol_name, protocol_id)).append(LS);
}
var placeholderMap = Map.of(CodeTemplatePlaceholder.protocol_imports, protocol_imports.toString()
, CodeTemplatePlaceholder.protocol_manager_registrations, protocol_manager_registrations.toString());
var formatProtocolManagerTemplate = CodeTemplatePlaceholder.formatTemplate(protocolManagerTemplate, placeholderMap);
var protocolManagerFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.kt"));
FileUtils.writeStringToFile(protocolManagerFile, formatProtocolManagerTemplate, true);
logger.info("Generated Swift protocol manager file:[{}] is in path:[{}]", protocolManagerFile.getName(), protocolManagerFile.getAbsolutePath());
createTemplateFile(registrations);
var protocol_class = new StringBuilder();
var protocol_registration = new StringBuilder();
@@ -107,13 +90,13 @@ public class CodeGenerateSwift implements ICodeGenerate {
// registration
protocol_registration.append(protocol_registration(registration)).append(LS);
}
var protocolTemplate = ClassUtils.getFileFromClassPathToString("kotlin/ProtocolsTemplate.kt");
var protocolTemplate = ClassUtils.getFileFromClassPathToString("swift/ProtocolsTemplate.swift");
var formatProtocolTemplate = CodeTemplatePlaceholder.formatTemplate(protocolTemplate, Map.of(
CodeTemplatePlaceholder.protocol_imports, StringUtils.EMPTY
, CodeTemplatePlaceholder.protocol_class, protocol_class.toString()
, CodeTemplatePlaceholder.protocol_registration, protocol_registration.toString()
));
var outputPath = StringUtils.format("{}/Protocols.kt", protocolOutputPath);
var outputPath = StringUtils.format("{}/Protocols.swift", protocolOutputPath);
var file = new File(outputPath);
FileUtils.writeStringToFile(file, formatProtocolTemplate, true);
logger.info("Generated Swift protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath());
@@ -121,34 +104,18 @@ public class CodeGenerateSwift implements ICodeGenerate {
@Override
public void foldProtocol(List<ProtocolRegistration> registrations) throws IOException {
createTemplateFile();
var protocolManagerTemplate = ClassUtils.getFileFromClassPathToString("kotlin/ProtocolManagerTemplate.kt");
var protocol_manager_registrations = new StringBuilder();
var protocol_imports = new StringBuilder();
for (var registration : registrations) {
var protocol_id = registration.protocolId();
var protocol_name = registration.protocolConstructor().getDeclaringClass().getSimpleName();
protocol_manager_registrations.append(StringUtils.format("protocols[{}] = {}Registration()", protocol_id, protocol_name)).append(LS);
protocol_manager_registrations.append(StringUtils.format("protocolIdMap[{}::class.java] = {}.toShort()", protocol_name, protocol_id)).append(LS);
}
var placeholderMap = Map.of(CodeTemplatePlaceholder.protocol_imports, protocol_imports.toString()
, CodeTemplatePlaceholder.protocol_manager_registrations, protocol_manager_registrations.toString());
var formatProtocolManagerTemplate = CodeTemplatePlaceholder.formatTemplate(protocolManagerTemplate, placeholderMap);
var protocolManagerFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.kt"));
FileUtils.writeStringToFile(protocolManagerFile, formatProtocolManagerTemplate, true);
logger.info("Generated Swift protocol manager file:[{}] is in path:[{}]", protocolManagerFile.getName(), protocolManagerFile.getAbsolutePath());
createTemplateFile(registrations);
for (var registration : registrations) {
var protocol_id = registration.protocolId();
var protocol_name = registration.protocolConstructor().getDeclaringClass().getSimpleName();
var protocolTemplate = ClassUtils.getFileFromClassPathToString("kotlin/ProtocolTemplate.kt");
var protocolTemplate = ClassUtils.getFileFromClassPathToString("swift/ProtocolTemplate.swift");
var formatProtocolTemplate = CodeTemplatePlaceholder.formatTemplate(protocolTemplate, Map.of(
CodeTemplatePlaceholder.protocol_class, protocol_class(registration)
CodeTemplatePlaceholder.protocol_imports, StringUtils.EMPTY
, CodeTemplatePlaceholder.protocol_class, protocol_class(registration)
, CodeTemplatePlaceholder.protocol_registration, protocol_registration(registration)
));
var outputPath = StringUtils.format("{}/{}/{}.kt", protocolOutputPath, GenerateProtocolPath.protocolPathSlash(protocol_id), protocol_name);
var outputPath = StringUtils.format("{}/{}/{}.swift", protocolOutputPath, GenerateProtocolPath.protocolPathSlash(protocol_id), protocol_name);
var file = new File(outputPath);
FileUtils.writeStringToFile(file, formatProtocolTemplate, true);
logger.info("Generated Swift protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath());
@@ -157,7 +124,31 @@ public class CodeGenerateSwift implements ICodeGenerate {
@Override
public void defaultProtocol(List<ProtocolRegistration> registrations) throws IOException {
createTemplateFile();
createTemplateFile(registrations);
for (var registration : registrations) {
var protocol_id = registration.protocolId();
var protocol_name = registration.protocolConstructor().getDeclaringClass().getSimpleName();
var protocolTemplate = ClassUtils.getFileFromClassPathToString("swift/ProtocolTemplate.swift");
var formatProtocolTemplate = CodeTemplatePlaceholder.formatTemplate(protocolTemplate, Map.of(
CodeTemplatePlaceholder.protocol_imports, StringUtils.EMPTY
, CodeTemplatePlaceholder.protocol_class, protocol_class(registration)
, CodeTemplatePlaceholder.protocol_registration, protocol_registration(registration)
));
var outputPath = StringUtils.format("{}/{}.swift", protocolOutputPath, protocol_name);
var file = new File(outputPath);
FileUtils.writeStringToFile(file, formatProtocolTemplate, true);
logger.info("Generated Swift protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath());
}
}
private void createTemplateFile(List<ProtocolRegistration> registrations) throws IOException {
var list = List.of("swift/ByteBuffer.swift", "swift/IProtocolRegistration.swift");
for (var fileName : list) {
var fileInputStream = ClassUtils.getFileFromClassPath(fileName);
var createFile = new File(StringUtils.format("{}/{}", protocolOutputPath, StringUtils.substringAfterFirst(fileName, "swift/")));
FileUtils.writeInputStreamToFile(createFile, fileInputStream);
}
var protocolManagerTemplate = ClassUtils.getFileFromClassPathToString("swift/ProtocolManagerTemplate.swift");
var protocol_manager_registrations = new StringBuilder();
@@ -172,30 +163,6 @@ public class CodeGenerateSwift implements ICodeGenerate {
var protocolManagerFile = new File(StringUtils.format("{}/{}", protocolOutputRootPath, "ProtocolManager.swift"));
FileUtils.writeStringToFile(protocolManagerFile, formatProtocolManagerTemplate, true);
logger.info("Generated Swift protocol manager file:[{}] is in path:[{}]", protocolManagerFile.getName(), protocolManagerFile.getAbsolutePath());
for (var registration : registrations) {
var protocol_id = registration.protocolId();
var protocol_name = registration.protocolConstructor().getDeclaringClass().getSimpleName();
var protocolTemplate = ClassUtils.getFileFromClassPathToString("swift/ProtocolTemplate.swift");
var formatProtocolTemplate = CodeTemplatePlaceholder.formatTemplate(protocolTemplate, Map.of(
CodeTemplatePlaceholder.protocol_imports, StringUtils.EMPTY
,CodeTemplatePlaceholder.protocol_class, protocol_class(registration)
, CodeTemplatePlaceholder.protocol_registration, protocol_registration(registration)
));
var outputPath = StringUtils.format("{}/{}.swift", protocolOutputPath, protocol_name);
var file = new File(outputPath);
FileUtils.writeStringToFile(file, formatProtocolTemplate, true);
logger.info("Generated Swift protocol file:[{}] is in path:[{}]", file.getName(), file.getAbsolutePath());
}
}
private void createTemplateFile() throws IOException {
var list = List.of("swift/ByteBuffer.swift", "swift/IProtocolRegistration.swift");
for (var fileName : list) {
var fileInputStream = ClassUtils.getFileFromClassPath(fileName);
var createFile = new File(StringUtils.format("{}/{}", protocolOutputPath, StringUtils.substringAfterFirst(fileName, "swift/")));
FileUtils.writeInputStreamToFile(createFile, fileInputStream);
}
}
private String protocol_class(ProtocolRegistration registration) {
@@ -229,7 +196,7 @@ public class CodeGenerateSwift implements ICodeGenerate {
var protocolId = registration.getId();
var fields = registration.getFields();
var fieldRegistrations = registration.getFieldRegistrations();
var ktBuilder = new StringBuilder();
var swiftBuilder = new StringBuilder();
var sequencedFields = ReflectionUtils.notStaticAndTransientFields(registration.getConstructor().getDeclaringClass());
for (int i = 0; i < sequencedFields.size(); i++) {
var field = sequencedFields.get(i);
@@ -238,14 +205,14 @@ public class CodeGenerateSwift implements ICodeGenerate {
// 生成注释
var fieldNotes = GenerateProtocolNote.fieldNotes(protocolId, fieldName, CodeLanguage.Swift);
for (var fieldNote : fieldNotes) {
ktBuilder.append(fieldNote).append(LS);
swiftBuilder.append(fieldNote).append(LS);
}
var fieldTypeDefaultValue = swiftSerializer(fieldRegistration.serializer()).fieldTypeDefaultValue(field, fieldRegistration);
var fieldType = fieldTypeDefaultValue.getKey();
var fieldDefaultValue = fieldTypeDefaultValue.getValue();
ktBuilder.append(StringUtils.format("var {}: {} = {}", fieldName, fieldType, fieldDefaultValue)).append(LS);
swiftBuilder.append(StringUtils.format("var {}: {} = {}", fieldName, fieldType, fieldDefaultValue)).append(LS);
}
return ktBuilder.toString();
return swiftBuilder.toString();
}
@@ -253,22 +220,22 @@ public class CodeGenerateSwift implements ICodeGenerate {
GenerateProtocolFile.localVariableId = 0;
var fields = registration.getFields();
var fieldRegistrations = registration.getFieldRegistrations();
var ktBuilder = new StringBuilder();
var swiftBuilder = new StringBuilder();
if (registration.isCompatible()) {
ktBuilder.append("let beforeWriteIndex = buffer.getWriteOffset()").append(LS);
ktBuilder.append(StringUtils.format("buffer.writeInt({})", registration.getPredictionLength())).append(LS);
swiftBuilder.append("let beforeWriteIndex = buffer.getWriteOffset()").append(LS);
swiftBuilder.append(StringUtils.format("buffer.writeInt({})", registration.getPredictionLength())).append(LS);
} else {
ktBuilder.append("buffer.writeInt(-1)").append(LS);
swiftBuilder.append("buffer.writeInt(-1)").append(LS);
}
for (var i = 0; i < fields.length; i++) {
var field = fields[i];
var fieldRegistration = fieldRegistrations[i];
swiftSerializer(fieldRegistration.serializer()).writeObject(ktBuilder, "message." + field.getName(), 0, field, fieldRegistration);
swiftSerializer(fieldRegistration.serializer()).writeObject(swiftBuilder, "message." + field.getName(), 0, field, fieldRegistration);
}
if (registration.isCompatible()) {
ktBuilder.append(StringUtils.format("buffer.adjustPadding({}, beforeWriteIndex)", registration.getPredictionLength())).append(LS);
swiftBuilder.append(StringUtils.format("buffer.adjustPadding({}, beforeWriteIndex)", registration.getPredictionLength())).append(LS);
}
return ktBuilder.toString();
return swiftBuilder.toString();
}
@@ -276,22 +243,22 @@ public class CodeGenerateSwift implements ICodeGenerate {
GenerateProtocolFile.localVariableId = 0;
var fields = registration.getFields();
var fieldRegistrations = registration.getFieldRegistrations();
var ktBuilder = new StringBuilder();
var swiftBuilder = new StringBuilder();
for (var i = 0; i < fields.length; i++) {
var field = fields[i];
var fieldRegistration = fieldRegistrations[i];
if (field.isAnnotationPresent(Compatible.class)) {
ktBuilder.append("if (buffer.compatibleRead(beforeReadIndex, length)) {").append(LS);
var compatibleReadObject = swiftSerializer(fieldRegistration.serializer()).readObject(ktBuilder, 1, field, fieldRegistration);
ktBuilder.append(TAB).append(StringUtils.format("packet.{} = {}", field.getName(), compatibleReadObject)).append(LS);
ktBuilder.append("}").append(LS);
swiftBuilder.append("if (buffer.compatibleRead(beforeReadIndex, length)) {").append(LS);
var compatibleReadObject = swiftSerializer(fieldRegistration.serializer()).readObject(swiftBuilder, 1, field, fieldRegistration);
swiftBuilder.append(TAB).append(StringUtils.format("packet.{} = {}", field.getName(), compatibleReadObject)).append(LS);
swiftBuilder.append("}").append(LS);
continue;
}
var readObject = swiftSerializer(fieldRegistration.serializer()).readObject(ktBuilder, 0, field, fieldRegistration);
ktBuilder.append(StringUtils.format("packet.{} = {}", field.getName(), readObject)).append(LS);
var readObject = swiftSerializer(fieldRegistration.serializer()).readObject(swiftBuilder, 0, field, fieldRegistration);
swiftBuilder.append(StringUtils.format("packet.{} = {}", field.getName(), readObject)).append(LS);
}
return ktBuilder.toString();
return swiftBuilder.toString();
}
public static String toSwiftClassName(String typeName) {
protocol/src/main/resources/swift/ByteBuffer.swift
+10 -11
View File
@@ -54,6 +54,7 @@ class ByteBuffer {
func writeBytes(_ bytes: [Int8]) {
let length = bytes.count
ensureCapacity(length)
buffer[writeOffset..<(writeOffset + length)] = bytes[0..<length]
writeOffset += length
}
@@ -67,9 +68,8 @@ class ByteBuffer {
func writeUBytes(_ bytes: [UInt8]) {
let length = bytes.count
ensureCapacity(length)
for ubyte in bytes {
writeUByte(ubyte)
}
let newBytes = bytes.map { Int8(bitPattern: $0) }
writeBytes(newBytes)
}
func toBytes() -> [Int8] {
@@ -82,10 +82,9 @@ class ByteBuffer {
func ensureCapacity(_ capacity: Int) {
while (capacity - getCapacity() > 0) {
let newSize = buffer.count * 2
var newBytes = Array<Int8>(repeating: 0, count: newSize)
newBytes.append(contentsOf: buffer)
buffer = newBytes
let newSize = buffer.count
let newBytes = Array<Int8>(repeating: 0, count: newSize)
buffer.append(contentsOf: newBytes)
}
}
@@ -320,22 +319,22 @@ class ByteBuffer {
}
func writeFloat(_ value: Float32) {
let v = value.bitPattern.bigEndian
let v = value.bitPattern
writeRawInt(Int32(bitPattern: v))
}
func readFloat() -> Float32 {
let value = UInt32(bitPattern: readRawInt()).bigEndian
let value = UInt32(bitPattern: readRawInt())
return Float32(bitPattern: value)
}
func writeDouble(_ value: Float64) {
let v = value.bitPattern.bigEndian
let v = value.bitPattern
writeRawLong(Int64(bitPattern: v))
}
func readDouble() -> Float64 {
let value = UInt64(bitPattern: readRawLong()).bigEndian
let value = UInt64(bitPattern: readRawLong())
return Float64(bitPattern: value)
}
protocol/src/main/resources/swift/ProtocolsTemplate.swift
+5
View File
@@ -0,0 +1,5 @@
import Foundation
${protocol_imports}
${protocol_class}
${protocol_registration}