terraform_shelly/scripts/Taupi-4.0.js

@@ -193,10 +193,7 @@ const BTH = {
   0x01: { n: "battery", t: uint8 },
   0x02: { n: "temperature", t: int16, f: 0.01 },
   0x03: { n: "humidity", t: uint16, f: 0.01 },
-  0x1e: { n: "light", t: uint8 },
-  0x2d: { n: "window", t: uint8 },
   0x2e: { n: "humidity", t: uint8 },
-  0x3f: { n: "rotation", t: int16, f: 0.1 },
   0x45: { n: "temperature", t: int16, f: 0.1 }
 };
 
@@ -212,24 +209,24 @@ const BTHomeDecoder = {
     const mask = 1 << (bitsz - 1);
     return num & mask ? num - (1 << bitsz) : num;
   },
-  getUInt8: function (buffer, offset) {
-    return buffer.at(offset);
+  getUInt8: function (buffer) {
+    return buffer.at(0);
   },
-  getInt8: function (buffer, offset) {
-    return this.utoi(this.getUInt8(buffer, offset), 8);
+  getInt8: function (buffer) {
+    return this.utoi(this.getUInt8(buffer), 8);
   },
-  getUInt16LE: function (buffer, offset) {
-    return 0xffff & ((buffer.at(offset + 1) << 8) | buffer.at(offset));
+  getUInt16LE: function (buffer) {
+    return 0xffff & ((buffer.at(1) << 8) | buffer.at(0));
   },
-  getInt16LE: function (buffer, offset) {
-    return this.utoi(this.getUInt16LE(buffer, offset), 16);
+  getInt16LE: function (buffer) {
+    return this.utoi(this.getUInt16LE(buffer), 16);
   },
-  getBufValue: function (type, buffer, offset) {
-    if (buffer.length - offset < getByteSize(type)) return null;
-    if (type === uint8) return this.getUInt8(buffer, offset);
-    if (type === int8) return this.getInt8(buffer, offset);
-    if (type === uint16) return this.getUInt16LE(buffer, offset);
-    if (type === int16) return this.getInt16LE(buffer, offset);
+  getBufValue: function (type, buffer) {
+    if (buffer.length < getByteSize(type)) return null;
+    if (type === uint8) return this.getUInt8(buffer);
+    if (type === int8) return this.getInt8(buffer);
+    if (type === uint16) return this.getUInt16LE(buffer);
+    if (type === int16) return this.getInt16LE(buffer);
     return null;
   },
 
@@ -241,17 +238,17 @@ const BTHomeDecoder = {
     result["BTHome_version"] = _dib >> 5;
     if (result["BTHome_version"] !== 2) return null;
     if (result["encryption"]) return result;
+    buffer = buffer.slice(1);
 
-    let offset = 1;
     let _bth;
     let _value;
-    while (offset < buffer.length) {
-      _bth = BTH[buffer.at(offset)];
+    while (buffer.length > 0) {
+      _bth = BTH[buffer.at(0)];
       if (typeof _bth === "undefined") {
         break;
       }
-      offset++;
-      _value = this.getBufValue(_bth.t, buffer, offset);
+      buffer = buffer.slice(1);
+      _value = this.getBufValue(_bth.t, buffer);
 
       if (_value === null) break;
       if (typeof _bth.f !== "undefined") _value = _value * _bth.f;
@@ -271,7 +268,7 @@ const BTHomeDecoder = {
         }
       }
 
-      offset += getByteSize(_bth.t);
+      buffer = buffer.slice(getByteSize(_bth.t));
     }
     return result;
   },
@@ -350,6 +347,10 @@ if (typeof HTTPServer !== "undefined" && typeof HTTPServer.registerEndpoint ===
     function addGauge(name, val, help) {
       if ((typeof val === "number" && !isNaN(val)) || typeof val === "boolean") {
         var numVal = (typeof val === "boolean") ? (val ? 1 : 0) : val;
+        if (help) {
+          body += "# HELP " + name + " " + help + "\n";
+        }
+        body += "# TYPE " + name + " gauge\n";
         body += name + " " + numVal + "\n";
       }
     }

terraform_shelly/scripts/upload.py

@@ -7,15 +7,6 @@ def upload(ip, script_id, code_file):
     with open(code_file, 'r', encoding='utf-8') as f:
         code = f.read()
 
-    import re
-    # Remove comments and whitespace to save Shelly RAM
-    # Remove multi-line comments
-    code = re.sub(r'/\*.*?\*/', '', code, flags=re.DOTALL)
-    # Remove single-line comments (ignoring http:// or https://)
-    code = re.sub(r'(?<!:)\/\/.*', '', code)
-    # Strip leading/trailing whitespace and drop empty lines
-    code = '\n'.join([line.strip() for line in code.split('\n') if line.strip()])
-
     url = f"http://{ip}/rpc"
 
     # Stop the script first to prevent write locks
@@ -58,23 +49,6 @@ def upload(ip, script_id, code_file):
             
     print("Script upload complete!")
 
-    # Start the script after upload
-    print(f"Starting script {script_id}...")
-    req = urllib.request.Request(
-        url,
-        data=json.dumps({"id": 1, "method": "Script.Start", "params": {"id": int(script_id)}}).encode('utf-8'),
-        headers={'Content-Type': 'application/json'}
-    )
-    try:
-        with urllib.request.urlopen(req) as resp:
-            res = json.loads(resp.read().decode('utf-8'))
-            if "error" in res:
-                print(f"Start request returned error: {res['error']}")
-            else:
-                print("Script started successfully.")
-    except Exception as e:
-        print(f"Start request failed: {e}")
-
 if __name__ == "__main__":
     if len(sys.argv) < 4:
         print("Usage: python3 upload.py <ip> <script_id> <code_file>")

terraform_shelly/variables.tf

@@ -71,5 +71,5 @@ variable "critical_humi_ref_temp" {
 variable "critical_humi_buffer" {
   type        = number
   description = "Safety buffer [%] subtracted from the critical relative humidity threshold"
-  default     = 5
+  default     = 15
 }