Merge branch 'develop' into feature/ci-s3-fix

OpenShock · Apr 17, 2024 · 479ada6 · 479ada6
2 parents a8e1362 + a7cc803
commit 479ada6
Show file tree

Hide file tree

Showing 40 changed files with 678 additions and 212 deletions.
diff --git a/.env b/.env
@@ -3,3 +3,4 @@ OPENSHOCK_FW_CDN_DOMAIN=firmware.openshock.org
 OPENSHOCK_FW_VERSION=0.0.0-unknown
 OPENSHOCK_FW_HOSTNAME=OpenShock
 OPENSHOCK_FW_AP_PREFIX=OpenShock-
+OPENSHOCK_URI_BUFFER_SIZE=256
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -15,26 +15,26 @@
 		"test:unit": "vitest"
 	},
 	"devDependencies": {
-		"@playwright/test": "1.43.0",
+		"@playwright/test": "1.43.1",
 		"@skeletonlabs/skeleton": "2.9.1",
 		"@skeletonlabs/tw-plugin": "0.4.0",
 		"@sveltejs/adapter-static": "^3.0.1",
-		"@sveltejs/kit": "2.5.5",
+		"@sveltejs/kit": "2.5.6",
 		"@sveltejs/vite-plugin-svelte": "^3.1.0",
 		"@tailwindcss/forms": "0.5.7",
 		"@tailwindcss/typography": "0.5.12",
 		"@types/node": "20.12.7",
 		"@typescript-eslint/eslint-plugin": "7.6.0",
 		"@typescript-eslint/parser": "7.6.0",
 		"autoprefixer": "10.4.19",
-		"eslint": "8.57.0",
+		"eslint": "^8.5.7",
 		"eslint-config-prettier": "9.1.0",
 		"eslint-plugin-svelte": "2.37.0",
 		"flatbuffers": "24.3.25",
 		"postcss": "8.4.38",
 		"prettier": "3.2.5",
-		"prettier-plugin-svelte": "3.2.2",
-		"svelte": "4.2.13",
+		"prettier-plugin-svelte": "3.2.3",
+		"svelte": "4.2.14",
 		"svelte-check": "3.6.9",
 		"tailwindcss": "3.4.3",
 		"tslib": "2.6.2",

diff --git a/frontend/src/lib/_fbs/open-shock/serialization/configuration/backend-config.ts b/frontend/src/lib/_fbs/open-shock/serialization/configuration/backend-config.ts
@@ -42,8 +42,18 @@ authToken(optionalEncoding?:any):string|Uint8Array|null {
   return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
 }
 
+/**
+ * Override the Live-Control-Gateway (LCG) URL
+ */
+lcgOverride():string|null
+lcgOverride(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
+lcgOverride(optionalEncoding?:any):string|Uint8Array|null {
+  const offset = this.bb!.__offset(this.bb_pos, 8);
+  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
+}
+
 static startBackendConfig(builder:flatbuffers.Builder) {
-  builder.startObject(2);
+  builder.startObject(3);
 }
 
 static addDomain(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset) {
@@ -54,15 +64,20 @@ static addAuthToken(builder:flatbuffers.Builder, authTokenOffset:flatbuffers.Off
   builder.addFieldOffset(1, authTokenOffset, 0);
 }
 
+static addLcgOverride(builder:flatbuffers.Builder, lcgOverrideOffset:flatbuffers.Offset) {
+  builder.addFieldOffset(2, lcgOverrideOffset, 0);
+}
+
 static endBackendConfig(builder:flatbuffers.Builder):flatbuffers.Offset {
   const offset = builder.endObject();
   return offset;
 }
 
-static createBackendConfig(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset, authTokenOffset:flatbuffers.Offset):flatbuffers.Offset {
+static createBackendConfig(builder:flatbuffers.Builder, domainOffset:flatbuffers.Offset, authTokenOffset:flatbuffers.Offset, lcgOverrideOffset:flatbuffers.Offset):flatbuffers.Offset {
   BackendConfig.startBackendConfig(builder);
   BackendConfig.addDomain(builder, domainOffset);
   BackendConfig.addAuthToken(builder, authTokenOffset);
+  BackendConfig.addLcgOverride(builder, lcgOverrideOffset);
   return BackendConfig.endBackendConfig(builder);
 }
 }
diff --git a/include/Common.h b/include/Common.h
@@ -20,7 +20,6 @@
 #error "OPENSHOCK_FW_VERSION must be defined"
 #endif
 
-#define OPENSHOCK_API_URL(path)    "https://" OPENSHOCK_API_DOMAIN path
 #define OPENSHOCK_FW_CDN_URL(path) "https://" OPENSHOCK_FW_CDN_DOMAIN path
 
 #define OPENSHOCK_GPIO_INVALID 0

diff --git a/include/GatewayClient.h b/include/GatewayClient.h
@@ -32,6 +32,7 @@ namespace OpenShock {
     bool loop();
 
   private:
+    void _setState(State state);
     void _sendKeepAlive();
     void _sendBootStatus();
     void _handleEvent(WStype_t type, std::uint8_t* payload, std::size_t length);

diff --git a/include/config/BackendConfig.h b/include/config/BackendConfig.h
@@ -7,10 +7,11 @@
 namespace OpenShock::Config {
   struct BackendConfig : public ConfigBase<Serialization::Configuration::BackendConfig> {
     BackendConfig();
-    BackendConfig(const std::string& domain, const std::string& authToken);
+    BackendConfig(const std::string& domain, const std::string& authToken, const std::string& lcgOverride);
 
     std::string domain;
     std::string authToken;
+    std::string lcgOverride;
 
     void ToDefault() override;
 

diff --git a/include/config/Config.h b/include/config/Config.h
@@ -69,8 +69,14 @@ namespace OpenShock::Config {
   bool GetOtaUpdateStep(OtaUpdateStep& out);
   bool SetOtaUpdateStep(OtaUpdateStep updateStep);
 
+  bool GetBackendDomain(std::string& out);
+  bool SetBackendDomain(const std::string& domain);
   bool HasBackendAuthToken();
   bool GetBackendAuthToken(std::string& out);
   bool SetBackendAuthToken(const std::string& token);
   bool ClearBackendAuthToken();
+  bool HasBackendLCGOverride();
+  bool GetBackendLCGOverride(std::string& out);
+  bool SetBackendLCGOverride(const std::string& lcgOverride);
+  bool ClearBackendLCGOverride();
 }  // namespace OpenShock::Config