From 209e40d0d5acb9ca3f9065cddac69945f7b68ff1 Mon Sep 17 00:00:00 2001 From: Djeeberjr Date: Thu, 15 Dec 2022 14:19:57 +0100 Subject: [PATCH] added entrypoint --- build.hxml | 2 +- src/Startup.hx | 72 ++-------------------------------------- src/kernel/Entrypoint.hx | 12 +++++++ 3 files changed, 16 insertions(+), 70 deletions(-) create mode 100644 src/kernel/Entrypoint.hx diff --git a/build.hxml b/build.hxml index 0ecb83d..76081b0 100644 --- a/build.hxml +++ b/build.hxml @@ -1,5 +1,5 @@ -p src ---main Startup +--main kernel.Entrypoint --library cctweaked:git:https://git.kapelle.org/niklas/cctweaked-haxelib.git --library tink_core diff --git a/src/Startup.hx b/src/Startup.hx index 96c42b0..ace7ad1 100644 --- a/src/Startup.hx +++ b/src/Startup.hx @@ -1,78 +1,12 @@ -import kernel.http.HTTPRequest.Http; -import util.Observable; -import lib.ui.reactive.TextElement; -import lib.ui.reactive.ReactiveUI; -import kernel.ui.WindowManager; -import kernel.net.Net; -import kernel.KernelEvents; -import kernel.Log; -import kernel.Init; +import bin.Terminal; using util.Extender.LambdaExtender; class Startup { public static function main() { - Init.initKernel(); - httpTest(); - } + var terminal = new Terminal(); - private static function httpTest() { - Log.moveToOutput("main"); - // var url = "https://mock.codes/400"; - // var url = "https://jsonplaceholder.typicode.com/todos/1"; - var url = "https://domainnotexsist.net/aaaa"; - Http.request(url).handle((outcome)->{ - switch outcome{ - case Success(data): - Log.debug(data.body); - case Failure(failure): - Log.error(failure.reason); - } - }); - } - - private static function uiTest() { - var context = WindowManager.instance.createNewContext(); - - var text1 = new Observable("My text"); - var text2 = new Observable("Another one"); - - var ui = new ReactiveUI(context,[ - new TextElement(text1,Orange,White,{ - onClick: (p) ->{ - text1.set("Click"); - } - }), - new TextElement(text2,Black,White,{ - onClick: (p)->{ - text2.set("Click"); - } - }) - ]); - - ui.render(); - WindowManager.instance.focusContextToOutput(context,"main"); - } - - private static function sendTest() { - Net.instance.registerProto("ping",(pack)->{ - Log.debug("Message: " + pack.data); - pack.respond("Hello from: "+Net.instance.networkID); - }); - - KernelEvents.instance.onChar.handle((char)->{ - if (char == "s"){ - Log.debug("Sending to 4"); - Net.instance.sendAndAwait(4,"ping","Hello world").handle((result)->{ - switch (result){ - case Success(pack): - Log.debug("Response: "+pack.data); - case Failure(err): - Log.error(err); - } - }); - } - }); + terminal.execute(); } } diff --git a/src/kernel/Entrypoint.hx b/src/kernel/Entrypoint.hx new file mode 100644 index 0000000..eef56dd --- /dev/null +++ b/src/kernel/Entrypoint.hx @@ -0,0 +1,12 @@ +package kernel; + +class Entrypoint { + public static function main() { + Init.initKernel(); + try { + Startup.main(); + }catch(e){ + Log.error('Error in startup: ${e.toString()}'); + } + } +}