commit 657331dd3171eb4fce8119ea4af92036d34773a0 Author: rnentjes Date: Sun Sep 1 10:25:04 2024 +0200 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0e374c9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,47 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Kotlin ### +.kotlin + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store + +/web diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/artifacts/typed_byte_arrays_js_1_0_SNAPSHOT.xml b/.idea/artifacts/typed_byte_arrays_js_1_0_SNAPSHOT.xml new file mode 100644 index 0000000..f38a5da --- /dev/null +++ b/.idea/artifacts/typed_byte_arrays_js_1_0_SNAPSHOT.xml @@ -0,0 +1,6 @@ + + + $PROJECT_DIR$/build/libs + + + \ No newline at end of file diff --git a/.idea/artifacts/typed_byte_arrays_jvm_1_0_SNAPSHOT.xml b/.idea/artifacts/typed_byte_arrays_jvm_1_0_SNAPSHOT.xml new file mode 100644 index 0000000..1b90c77 --- /dev/null +++ b/.idea/artifacts/typed_byte_arrays_jvm_1_0_SNAPSHOT.xml @@ -0,0 +1,6 @@ + + + $PROJECT_DIR$/build/libs + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..2a65317 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..5815a4a --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..c7fb6ee --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..f744b8b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,65 @@ +plugins { + kotlin("multiplatform") version "2.0.20" +} + +group = "nl.astraeus" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +kotlin { + jvm { + kotlin { + jvmToolchain(17) + } + + } + js { + browser { + distribution { + outputDirectory.set(file("$projectDir/web/")) + } + } + } + + + sourceSets { + val commonMain by getting { + dependencies { + implementation(kotlin("stdlib")) + } + } + + val commonTest by getting { + dependencies { + implementation(kotlin("test-common")) + } + } + + val jvmMain by getting { + dependencies { + implementation(kotlin("stdlib-jdk8")) + } + } + + val jvmTest by getting { + dependencies { + implementation(kotlin("test")) + } + } + + val jsMain by getting { + dependencies { + implementation(kotlin("stdlib-js")) + } + } + + val jsTest by getting { + dependencies { + implementation(kotlin("test-js")) + } + } + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..7fc6f1f --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..4e074eb --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sat Aug 31 15:35:11 CEST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..7f6ca2a --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} +rootProject.name = "typed-byte-arrays" + diff --git a/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayDefinition.kt b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayDefinition.kt new file mode 100644 index 0000000..1ac8d50 --- /dev/null +++ b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayDefinition.kt @@ -0,0 +1,45 @@ +package nl.astraeus.tba + +enum class DataType(val size: Int) { + BYTE(1), + SHORT(2), + INT(4), + LONG(8), + FLOAT(4), + DOUBLE(8), + STRING(-1), // max length 65535 + CLOB(-1), // max length 2^32-1 + BLOB(-1), + ARRAY(-1), + ; +} + +class Type( + val name: String, + val type: DataType, + val size: Int = if (type.size == -1) { + throw IllegalArgumentException("Size must be defined for type ${type.name}") + } else { + type.size + }, +) + +interface ByteArrayDefinition { + val types: List + val size: Int +} + +open class BaseByteArrayDefinition( + vararg types: Type, +) : ByteArrayDefinition{ + override val types: List = types.toList() + + override val size: Int by lazy { + this.types.sumOf { it.size } + } +} + +interface BinaryType { + val name: String + val typeId: Long +} diff --git a/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayExtentions.kt b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayExtentions.kt new file mode 100644 index 0000000..6a6bc3d --- /dev/null +++ b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayExtentions.kt @@ -0,0 +1,69 @@ +package nl.astraeus.tba + +fun ByteArray.setShort(index: Int, value: Short) { + this[index] = (value.toInt() shr 8).toByte() + this[index + 1] = value.toByte() +} + +fun ByteArray.getShort(index: Int): Short { + return ((this[index].toInt() shl 8) or (this[index + 1].toInt() and 0xff)).toShort() +} + +fun ByteArray.setInt(index: Int, value: Int) { + this[index] = ((value shr 24) and 0xff).toByte() + this[index + 1] = ((value shr 16) and 0xff).toByte() + this[index + 2] = ((value shr 8) and 0xff).toByte() + this[index + 3] = (value and 0xff).toByte() +} + +fun ByteArray.getInt(index: Int): Int { + return ( + (this[index].toInt() shl 24) or + ((this[index+1].toInt() shl 16) and 0xff0000) or + ((this[index+2].toInt() shl 8) and 0xff00) or + (this[index+3].toInt() and 0xff) + ) +} + +fun ByteArray.setLong(index: Int, value: Long) { + this[index] = ((value shr 56) and 0xff).toByte() + this[index + 1] = ((value shr 48) and 0xff).toByte() + this[index + 2] = ((value shr 40) and 0xff).toByte() + this[index + 3] = ((value shr 32) and 0xff).toByte() + this[index + 4] = ((value shr 24) and 0xff).toByte() + this[index + 5] = ((value shr 16) and 0xff).toByte() + this[index + 6] = ((value shr 8) and 0xff).toByte() + this[index + 7] = (value and 0xff).toByte() +} + +fun ByteArray.getLong(index: Int): Long { + return ( + (this[index].toLong() shl 56) or + ((this[index+1].toLong() and 0xff) shl 48) or + ((this[index+2].toLong() and 0xff) shl 40) or + ((this[index+3].toLong() and 0xff) shl 32) or + ((this[index+4].toLong() and 0xff) shl 24) or + ((this[index+5].toLong() and 0xff) shl 16) or + ((this[index+6].toLong() and 0xff) shl 8) or + (this[index+7].toLong() and 0xff) + ) +} + +fun ByteArray.setDouble(index: Int, value: Double) = this.setLong(index, value.toRawBits()) +fun ByteArray.getDouble(index: Int): Double = Double.fromBits(this.getLong(index)) + +fun ByteArray.setFloat(index: Int, value: Float) = this.setInt(index, value.toRawBits()) +fun ByteArray.getFloat(index: Int): Float = Float.fromBits(this.getInt(index)) + +fun ByteArray.getString(index: Int): Pair { + val length = this.getInt(index) + val str = this.copyOfRange(index + 4, index + 4 + length).decodeToString() + return Pair(str, index + 4 + length) +} + +fun ByteArray.setString(index: Int, value: String): Int { + val bytes = value.encodeToByteArray() + this.setInt(index, bytes.size) + bytes.copyInto(this, index + 4) + return index + bytes.size + 4 +} diff --git a/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayHandler.kt b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayHandler.kt new file mode 100644 index 0000000..52d6c37 --- /dev/null +++ b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayHandler.kt @@ -0,0 +1,118 @@ +package nl.astraeus.tba + +class MutableByteArrayHandler( + initialSize: Int = 1024, + buffer: ByteArray = ByteArray(initialSize) +) : ByteArrayHandler(initialSize, buffer) { + + operator fun set(index: Int, value: Byte) { + buffer[index] = value + } + + fun setShort(index: Int, value: Short) { + buffer[index] = (value.toInt() shr 8).toByte() + buffer[index + 1] = value.toByte() + } + + fun setInt(index: Int, value: Int) { + buffer[index] = ((value shr 24) and 0xff).toByte() + buffer[index + 1] = ((value shr 16) and 0xff).toByte() + buffer[index + 2] = ((value shr 8) and 0xff).toByte() + buffer[index + 3] = (value and 0xff).toByte() + } + + fun setLong(index: Int, value: Long) { + buffer[index] = ((value shr 56) and 0xff).toByte() + buffer[index + 1] = ((value shr 48) and 0xff).toByte() + buffer[index + 2] = ((value shr 40) and 0xff).toByte() + buffer[index + 3] = ((value shr 32) and 0xff).toByte() + buffer[index + 4] = ((value shr 24) and 0xff).toByte() + buffer[index + 5] = ((value shr 16) and 0xff).toByte() + buffer[index + 6] = ((value shr 8) and 0xff).toByte() + buffer[index + 7] = (value and 0xff).toByte() + } + + fun setFloat(index: Int, value: Float) = buffer.setInt(index, value.toRawBits()) + fun setDouble(index: Int, value: Double) = buffer.setLong(index, value.toRawBits()) + + fun setString(index: Int, value: String, maxLength: Int): Int { + val bytes = value.encodeToByteArray() + if (bytes.size > maxLength) { + throw IllegalArgumentException("String is too long") + } + this.setShort(index, bytes.size.toShort()) + bytes.copyInto(buffer, index + 2) + return index + bytes.size + 2 + } + +} + +open class ByteArrayHandler( + size: Int = 1024, + var buffer: ByteArray = ByteArray(size), + val firstIndex: Int = 0, + val lastIndex: Int = buffer.size +) { + + constructor(buffer: ByteArray, range: IntRange) : this( + buffer = buffer, + firstIndex = range.first, + lastIndex = range.last + ) + + operator fun get(index: Int): Byte { + return buffer[index] + } + + fun getShort(index: Int): Short { + return ((buffer[index].toInt() shl 8) or (buffer[index + 1].toInt() and 0xff)).toShort() + } + + fun getInt(index: Int): Int { + return ( + (buffer[index].toInt() shl 24) or + ((buffer[index+1].toInt() shl 16) and 0xff0000) or + ((buffer[index+2].toInt() shl 8) and 0xff00) or + (buffer[index+3].toInt() and 0xff) + ) + } + + fun getLong(index: Int): Long { + return ( + (buffer[index].toLong() shl 56) or + ((buffer[index+1].toLong() and 0xff) shl 48) or + ((buffer[index+2].toLong() and 0xff) shl 40) or + ((buffer[index+3].toLong() and 0xff) shl 32) or + ((buffer[index+4].toLong() and 0xff) shl 24) or + ((buffer[index+5].toLong() and 0xff) shl 16) or + ((buffer[index+6].toLong() and 0xff) shl 8) or + (buffer[index+7].toLong() and 0xff) + ) + } + + fun getFloat(index: Int): Float = Float.fromBits(buffer.getInt(index)) + fun getDouble(index: Int): Double = Double.fromBits(buffer.getLong(index)) + + fun getString(index: Int): String { + val length = getShort(index) + val str = buffer.copyOfRange(index + 2, index + 2 + length).decodeToString() + return str + } + + fun getClob(index: Int): String { + val length = getInt(index) + val str = buffer.copyOfRange(index + 4, index + 4 + length).decodeToString() + return str + } + + fun slice(range: IntRange): ByteArrayHandler { + return ByteArrayHandler( + buffer, + range + ) + } + + fun asMutable(): MutableByteArrayHandler { + return MutableByteArrayHandler(buffer = buffer.copyOfRange(firstIndex, lastIndex)) + } +} diff --git a/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayProperties.kt b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayProperties.kt new file mode 100644 index 0000000..28594dc --- /dev/null +++ b/src/commonMain/kotlin/nl/astraeus/tba/ByteArrayProperties.kt @@ -0,0 +1,123 @@ +package nl.astraeus.tba + +import kotlin.properties.ReadWriteProperty +import kotlin.reflect.KProperty + +class ByteProperty( + val name: String +) : ReadWriteProperty { + var index: Int? = null + + private fun getIndex(thisRef: TypedByteArray): Int { + if (index == null) { + index = thisRef.indexMap[name] ?: throw IllegalArgumentException("Property $name not found") + } + return index!! + } + + override fun getValue(thisRef: TypedByteArray, property: KProperty<*>): Byte { + return thisRef.data[getIndex(thisRef)] + } + + override fun setValue(thisRef: TypedByteArray, property: KProperty<*>, value: Byte) { + thisRef.data [getIndex(thisRef)] = value + } +} + +class ShortProperty( + val name: String +) : ReadWriteProperty { + var index: Int? = null + + private fun getIndex(thisRef: TypedByteArray): Int { + if (index == null) { + index = thisRef.indexMap[name] ?: throw IllegalArgumentException("Property $name not found") + } + return index!! + } + + override fun getValue(thisRef: TypedByteArray, property: KProperty<*>): Short { + return thisRef.data.getShort(getIndex(thisRef)) + } + + override fun setValue(thisRef: TypedByteArray, property: KProperty<*>, value: Short) { + thisRef.data.setShort(getIndex(thisRef), value) + } +} + +class IntProperty( + val name: String +) : ReadWriteProperty { + var index: Int? = null + + private fun getIndex(thisRef: TypedByteArray): Int { + if (index == null) { + index = thisRef.indexMap[name] ?: throw IllegalArgumentException("Property $name not found") + } + return index!! + } + + override fun getValue(thisRef: TypedByteArray, property: KProperty<*>): Int { + return thisRef.data.getInt(getIndex(thisRef)) + } + + override fun setValue(thisRef: TypedByteArray, property: KProperty<*>, value: Int) { + thisRef.data.setInt(getIndex(thisRef), value) + } +} + +class LongProperty( + val name: String +) : ReadWriteProperty { + var index: Int? = null + + private fun getIndex(thisRef: TypedByteArray): Int { + if (index == null) { + index = thisRef.indexMap[name] ?: throw IllegalArgumentException("Property $name not found") + } + return index!! + } + + override fun getValue(thisRef: TypedByteArray, property: KProperty<*>): Long { + return thisRef.data.getLong(getIndex(thisRef)) + } + + override fun setValue(thisRef: TypedByteArray, property: KProperty<*>, value: Long) { + thisRef.data.setLong(getIndex(thisRef), value) + } +} + +class StringProperty( + val name: String +) : ReadWriteProperty { + var index: Int? = null + var maxLength: Int? = null + + private fun getIndex(thisRef: TypedByteArray): Int { + if (index == null) { + index = thisRef.indexMap[name] ?: throw IllegalArgumentException("Property $name not found") + } + return index!! + } + + private fun getMaxLength(thisRef: TypedByteArray): Int { + if (maxLength == null) { + maxLength = thisRef.typeMap[name]!!.size - 2 + } + return maxLength!! + } + + override fun getValue(thisRef: TypedByteArray, property: KProperty<*>): String { + return thisRef.data.getString(getIndex(thisRef)) + } + + override fun setValue(thisRef: TypedByteArray, property: KProperty<*>, value: String) { + thisRef.data.setString(getIndex(thisRef), value, getMaxLength(thisRef)) + } +} + +fun byte(propertyName: String) = ByteProperty(propertyName) +fun short(propertyName: String) = ShortProperty(propertyName) +fun int(propertyName: String) = IntProperty(propertyName) +fun long(propertyName: String) = LongProperty(propertyName) +fun string(propertyName: String) = StringProperty(propertyName) diff --git a/src/commonMain/kotlin/nl/astraeus/tba/TypedByteArray.kt b/src/commonMain/kotlin/nl/astraeus/tba/TypedByteArray.kt new file mode 100644 index 0000000..1dc479c --- /dev/null +++ b/src/commonMain/kotlin/nl/astraeus/tba/TypedByteArray.kt @@ -0,0 +1,21 @@ +package nl.astraeus.tba + +open class TypedByteArray( + val definition: ByteArrayDefinition, + var data: MutableByteArrayHandler = MutableByteArrayHandler(definition.size), +) { + val typeMap = mutableMapOf() + val indexMap = mutableMapOf() + + init { + var index = 0 + for (type in definition.types) { + check (!typeMap.containsKey(type.name)) { "Duplicate type name ${type.name}" } + check (!indexMap.containsKey(type.name)) { "Duplicate type name ${type.name}" } + + typeMap[type.name] = type + indexMap[type.name] = index + index += type.size + } + } +} diff --git a/src/commonTest/kotlin/nl/astraeus/tba/ExtendedByteArrayDefinition.kt b/src/commonTest/kotlin/nl/astraeus/tba/ExtendedByteArrayDefinition.kt new file mode 100644 index 0000000..53fcdd0 --- /dev/null +++ b/src/commonTest/kotlin/nl/astraeus/tba/ExtendedByteArrayDefinition.kt @@ -0,0 +1,81 @@ +package nl.astraeus.tba + +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertFailsWith + +class ExtendedByteArrayDefinition { + + open class MessageByteArray( + vararg types: Type + ) : TypedByteArray( + BaseByteArrayDefinition( + Type("messageType", DataType.BYTE), + Type("messageLength", DataType.SHORT), + Type("message", DataType.STRING, 1024), + *types, + ) + ) { + var messageType by byte("messageType") + var messageLength by short("messageLength") + var message by string("message") + } + + class MessageBlaat() : MessageByteArray( + Type("name", DataType.STRING, 10), + Type("age", DataType.BYTE), + Type("length", DataType.SHORT), + ) { + var name by string("name") + var age by byte("age") + var length by short("length") + + constructor( + type: Byte, + messageLength: Short, + message: String, + name: String, + age: Byte, + length: Short + ) : this() { + this.messageType = type + this.messageLength = messageLength + this.message = message + this.name = name + this.age = age + this.length = length + } + + constructor(data: ByteArray) : this() { + this.data = MutableByteArrayHandler(buffer = data) + } + } + + @Test + fun testSimpleTypedByteArray() { + val exception = assertFailsWith(IllegalArgumentException::class) { + MessageBlaat( + 12, + 123, + "This is the message!", + "Test is a very long name, now what?", + 42, + 180 + ) + } + + val msg = MessageBlaat( + 12, + 123, + "This is the message!", + "12345678", + 42, + 180 + ) + + assertEquals("12345678", msg.name) + assertEquals(42.toByte(), msg.age) + assertEquals(180.toShort(), msg.length) + } + +} diff --git a/src/commonTest/kotlin/nl/astraeus/tba/TypedByteArrayTest.kt b/src/commonTest/kotlin/nl/astraeus/tba/TypedByteArrayTest.kt new file mode 100644 index 0000000..f2e3973 --- /dev/null +++ b/src/commonTest/kotlin/nl/astraeus/tba/TypedByteArrayTest.kt @@ -0,0 +1,53 @@ +package nl.astraeus.tba + +import kotlin.test.Test +import kotlin.test.assertEquals + +class TypedByteArrayTest { + + class Person() : TypedByteArray( + BaseByteArrayDefinition( + Type("name", DataType.STRING, 102), + Type("age", DataType.BYTE), + Type("length", DataType.SHORT), + ) + ) { + var name by string("name") + var age by byte("age") + var length by short("length") + + constructor(name: String, age: Byte, length: Short): this() { + this.name = name + this.age = age + this.length = length + } + + constructor(data: ByteArray): this() { + this.data = MutableByteArrayHandler(buffer = data) + } + } + + @Test + fun testSimpleTypedByteArray() { + val person = Person("Test", 42, 180) + + assertEquals(4, person.data.buffer[1]) + assertEquals(42, person.data.buffer[102]) + + assertEquals("Test", person.name) + assertEquals(42.toByte(), person.age) + assertEquals(180.toShort(), person.length) + } + + @Test + fun testToByteArrayAndBack() { + val person = Person("Test", 42, 180) + val bytes: ByteArray = person.data.buffer + + val person2 = Person(bytes) + + assertEquals("Test", person2.name) + assertEquals(42.toByte(), person2.age) + assertEquals(180.toShort(), person2.length) + } +}