Remove to pkl project

Makefile

@@ -7,16 +7,13 @@ sqlx:
 build-rpi:
 	cross build --target arm-unknown-linux-gnueabihf
 
-emgauwa-%.json: config/%.pkl config/lib/%.pkl
+emgauwa-%.json: config/%.pkl
 	pkl eval -f json -o $@ $<
 
 configs:
 	$(MAKE) emgauwa-core.json
 	$(MAKE) emgauwa-controller.json
 
-pkl-package:
-	pkl project package config --output-path "./out/pkl"
-
 clean:
 	rm -f emgauwa-controller.json
 	rm -f emgauwa-controller.sqlite

config/PklProject

@@ -1,8 +0,0 @@
-amends "pkl:Project"
-
-package {
-  name = "emgauwa"
-  baseUri = "package://emgauwa.app/pkl/\(name)"
-  version = "0.1.0"
-  packageZipUrl = "https://emgauwa.app/pkl/\(name)@\(version).zip"
-}

config/PklProject.deps.json

@@ -1,4 +0,0 @@
-{
-  "schemaVersion": 1,
-  "resolvedDependencies": {}
-}

config/controller.pkl

@@ -1,21 +1,4 @@
-amends "./lib/controller.pkl"
+amends "package://emgauwa.app/pkl/emgauwa@0.1.0#/controller.pkl"
-
-server {
-  host = "127.0.0.1"
-  port = 4419
-}
-
-database = "sqlite://emgauwa-controller.sqlite"
-
-permissions {
-  user = "" // read("env:USER")
-  group = "" // read("env:USER")
-}
-
-logging {
-  level = "INFO"
-  file = "stdout"
-}
 
 relays {
   new {
@@ -70,4 +53,4 @@ relays {
     pin = 21
     inverted = false
   }
-}
+}

config/core.pkl

@@ -1,18 +1 @@
-amends "./lib/core.pkl"
+amends "package://emgauwa.app/pkl/emgauwa@0.1.0#/core.pkl"
-
-server {
-  host = "127.0.0.1"
-  port = 4419
-}
-
-database = "sqlite://emgauwa-core.sqlite"
-
-permissions {
-  user = "" // read("env:USER")
-  group = "" // read("env:USER")
-}
-
-logging {
-  level = "INFO"
-  file = "stdout"
-}

config/lib/common.pkl

@@ -1,15 +0,0 @@
-class ServerConfig {
-  host: String
-  port: UInt16
-}
-
-/// Set to a user and a group to drop privileges to after binding to the port
-class PermissionsConfig {
-  user: String
-  group: String
-}
-
-class LoggingConfig {
-  level: "TRACE"|"DEBUG"|"INFO"|"WARN"|"ERROR"|"FATAL"
-  file: String
-}

config/lib/controller.pkl

@@ -1,17 +0,0 @@
-import "./common.pkl"
-
-server: common.ServerConfig
-
-database: String
-
-permissions: common.PermissionsConfig
-
-logging: common.LoggingConfig
-
-class RelayConfig {
-  driver: "null"|"gpio"|"piface"
-  pin: Number
-  inverted: Boolean
-  pulse: Number(this >= 0)|Null = null
-}
-relays: Listing<RelayConfig>

config/lib/core.pkl

@@ -1,12 +0,0 @@
-import "./common.pkl"
-
-server: common.ServerConfig
-
-database: String
-
-permissions: common.PermissionsConfig
-
-logging: common.LoggingConfig
-
-/// Leave empty to allow all origins (will always respond with Origin and not "*")
-origins: Listing<String>

emgauwa-controller/src/ws/mod.rs

@@ -39,7 +39,7 @@ async fn run_websocket(
 	log::debug!("Trying to connect to {}", url);
 	match connect_async(url).await {
 		Ok(connection) => {
-			log::debug!("Websocket connected");
+			log::info!("Websocket connected");
 			let (ws_stream, _) = connection;
 
 			let (mut write, read) = ws_stream.split();