wiliot-certificate 4.4.3__py3-none-any.whl → 4.5.0a1__py3-none-any.whl

common/web/web_utils.py

@@ -0,0 +1,377 @@
+from __future__ import annotations
+from flask import render_template, request
+import inspect
+import argparse
+import json
+import re
+from pathlib import Path
+from typing import Any, Dict, List
+import os, platform, shutil, subprocess, shlex
+from certificate.cert_defines import *
+from certificate.cert_prints import *
+from certificate.wlt_types import *
+
+##### Defines #####
+
+CREATE_NEW_CONSOLE = getattr(subprocess, "CREATE_NEW_CONSOLE", 0x00000010)
+CFG_STRS = [
+    WLT_SERVER,
+    LAT,
+    LNG,
+    WIFI_VERSION,
+    BLE_VERSION,
+    GW_API_VERSION,
+    SERIALIZATION_FORMAT
+]
+# App names
+FDM = "FDM"
+CERT_WEB = "CERTIFICATE WEB"
+
+# Defines to update jinja_env globals
+GLOBAL_DEFINES_TO_UPDATE = {k:v for k,v in ag.__dict__.items() if 'GROUP_ID' in k}
+
+TestSchema = Dict[str, Any]
+ModuleSchema = Dict[str, Any]
+hex_str2int = lambda x: int(x,16)
+txt2html = lambda txt : str(txt).replace(" ", "&nbsp").replace("\n", "<br>").replace("\\r\\n", "<br>").replace("//", "<br>//").lstrip("b").strip('"')
+def num_to_str(id):
+    return str(id).zfill(2)
+
+##### Template Handling Functions #####
+
+def utils_data_structs(app):
+    title="Enums & Packet Sructures"
+    wlt_types_html = "wlt_types.html"
+    return render_template('index.html',
+                           app=app, title=title, wlt_types_html=wlt_types_html)
+
+def utils_parser(app):
+    title = "Packet Parser"
+    output = ""
+    received_payload = request.args.get('payload')
+    received_payload = received_payload.upper() if received_payload else received_payload
+    if received_payload:
+        wlt_pkt = WltPkt(received_payload)
+        if wlt_pkt.pkt != None:
+            output += f"<br>Raw Packet:<br>{received_payload}<br><br>Parsed Packet:<br>{wlt_pkt}"
+        else:
+            output += "<br>Unable to parse received payload!"
+    print(f"output: {output}")
+    return render_template('parser.html',
+                            app=app, title=title, output=txt2html(output))
+
+def utils_generator(app):
+    title = "Packet Generator"
+    output = ""
+    wanted_pkt_type = request.args.get('radios')
+    pkt = None
+    dont_generate = ["Generic", "Gw2BrgHb", "PktTypesMask", "WltPkt"]
+    wlt_pkt_types = {
+    name: cls()
+    for name, cls in inspect.getmembers(ag, inspect.isclass)
+    if cls.__module__ == ag.__name__ and name not in dont_generate
+    }
+    # Find selected pkt type
+    for name ,p in wlt_pkt_types.items():
+        if name == wanted_pkt_type:
+            pkt = p
+            break
+    
+    # Handle Hdr
+    hdr = wlt_pkt_types['Hdr']
+    wlt_pkt_types = {'Hdr': hdr, **{k: v for k, v in wlt_pkt_types.items() if k != 'Hdr'}} # Put 'Hdr' first
+    hdr_string = ""
+    for k in hdr.__dict__.keys():
+        if not request.args.get(f"Hdr_{k}"):
+            hdr_string += "{}={},".format(k, str(hdr.__dict__[k]))
+        else:
+            hdr_string += "{}={},".format(k, str(request.args.get(f"Hdr_{k}")))
+    hdr = eval_pkt(f"Hdr({hdr_string[:-1]})")
+    output += hdr.dump()
+    
+    # Handle selected pkt
+    if pkt:
+        pkt_string = ""
+        for k in pkt.__dict__.keys():
+            if not request.args.get(f"{type(pkt).__name__}_{k}"):
+                pkt_string += "{}={},".format(k, str(0))
+            else:
+                pkt_string += "{}={},".format(k, str(request.args.get(f"{type(pkt).__name__}_{k}")))
+        pkt = eval_pkt(f"{type(pkt).__name__}({pkt_string[0:-1]})")
+        output += pkt.dump()
+    print(output)
+    return render_template('generator.html',
+                            app=app, title=title, output=txt2html(output),
+                            pkt_types=wlt_pkt_types, pkt_types_list=[k for k in wlt_pkt_types.keys() if k != 'Hdr'])
+
+def utils_tag2brg(app):
+    title = "Tag to Bridge Packet Converter"
+    output = ""
+    # Get the inputs
+    payload = request.args.get('payload')
+    payload = payload.upper() if payload else payload
+
+    brg_id = request.args.get('brg_id')
+    brg_id = brg_id.upper() if brg_id else brg_id
+    rssi = request.args.get('rssi')
+    tbc = request.args.get('tbc')
+    nfpkt = request.args.get('nfpkt')
+    brg_latency = request.args.get('brg_latency')
+
+    if payload and brg_id and rssi and tbc and nfpkt and brg_latency:
+        try:
+            if len(payload) < 37 * 2:
+                raise Exception("The payload should be of size 37 bytes!")
+            
+            hdr = ag.DataHdr(group_id_minor=hex_str2int(payload[20:24]), group_id_major=ag.GROUP_ID_UNIFIED_PKT_V1, pkt_type=hex_str2int(payload[24:26]))
+    
+            # Convert inputs to appropriate types
+            rssi = int(rssi)
+            tbc = int(tbc)
+            nfpkt = int(nfpkt)
+            brg_latency = int(brg_latency)
+
+            # Create the bridge packet
+            brg_pkt = ag.UnifiedEchoPktV1(
+                nonce_n_unique_id=hex_str2int(payload[26:46]),
+                tbc=tbc,
+                rssi=rssi,
+                brg_latency=brg_latency,
+                nfpkt=nfpkt,
+                mic=hex_str2int(payload[52:58]),
+                data=hex_str2int(payload[58:74])
+            )
+
+            output += "Bridge Packet:<br>"
+            output += brg_id
+            output += hdr.dump()
+            output += brg_pkt.dump()
+        except Exception as e:
+            output = f"Error processing packet: {str(e)}"
+    else:
+        output = "Please fill in all required fields"
+
+    return render_template('tag2brg.html',
+                         app=app, title=title,
+                         output=txt2html(output))
+
+##### Utility Functions #####
+
+def action_to_field(a: argparse.Action) -> Dict[str, Any]:
+    # field name = dest
+    name = a.dest
+
+    # Basic widget inference
+    choices = list(a.choices) if getattr(a, "choices", None) else None
+    is_multi = a.nargs in ("+", "*")  # '+' = at least one, '*' = zero or more
+    is_flag = isinstance(a, (argparse._StoreTrueAction, argparse._StoreFalseAction))
+    
+    html_type = "checkbox" if is_flag else "text"
+    widget = "input"
+    if choices and is_multi:
+        widget, html_type = "checkbox_group", "checkbox"
+    elif choices:
+        widget, html_type = "select", "text"
+
+    default = None if a.default is argparse.SUPPRESS else a.default
+
+    # Extract URL from help text if present
+    help_text = (a.help or "").strip()
+    help_link = None
+    if help_text:
+        # Match URLs (http:// or https:// followed by non-whitespace characters)
+        url_pattern = r'https?://[^\s]+'
+        url_match = re.search(url_pattern, help_text)
+        if url_match:
+            help_link = url_match.group(0)
+            # Remove URL from help text to avoid duplication
+            help_text = re.sub(url_pattern, '', help_text).strip()
+    return {
+        "name": name,
+        "label": (a.help or name).split('.')[0].strip().title(),
+        "help": help_text,
+        "help_link": help_link,
+        "required": bool(getattr(a, "required", False)) or (not a.option_strings),
+        "default": default,
+        "choices": choices,
+        "nargs": a.nargs,
+        "type": html_type,
+        "widget": widget,
+        "is_flag": is_flag,
+        "option_strings": a.option_strings,
+    }
+
+def parser_to_schema(parser: argparse.ArgumentParser) -> Dict[str, Any]:
+    fields: List[Dict[str, Any]] = []
+    for a in parser._actions:
+        if argparse.SUPPRESS in a.help: continue
+        if isinstance(a, (argparse._HelpAction, argparse._VersionAction)):
+            continue
+        fields.append(action_to_field(a))
+    return {
+        "title": parser.prog or "CLI",
+        "description": parser.description or "",
+        "fields": fields,
+    }
+
+def open_in_terminal(base_cmd: list[str], preferred: str = "auto"):
+    """
+    base_cmd: e.g. ["wlt-cert-cli", "--gw", "SIM", "--brg", "XYZ", ...]
+    preferred: terminal choice ("auto", "terminal", "iterm", "cmd", "powershell", "gnome-terminal", etc.)
+    Returns Popen handle (may be None-like if osascript exits immediately).
+    """
+    system = platform.system()
+    _as_quote_for_applescript = lambda s: s.replace("\\", "\\\\").replace('"', '\\"')
+
+    if system == "Windows":
+        term = preferred.lower()
+        # On Windows, use subprocess.list2cmdline for proper Windows command line formatting
+        import subprocess as sp
+        cmd_line = sp.list2cmdline(base_cmd)
+        if term in ("auto", "cmd"):
+            return subprocess.Popen(["cmd.exe", "/k", cmd_line], creationflags=CREATE_NEW_CONSOLE)
+        if term == "powershell":
+            return subprocess.Popen(["powershell.exe", "-NoExit", "-Command", cmd_line], creationflags=CREATE_NEW_CONSOLE)
+        # Default to cmd
+        return subprocess.Popen(["cmd.exe", "/k", cmd_line], creationflags=CREATE_NEW_CONSOLE)
+    
+    # For non-Windows systems, use shlex.join (POSIX-safe)
+    cmd_str = shlex.join(base_cmd)
+
+    if system == "Darwin":  # macOS
+        term = preferred.lower()
+        shell = os.environ.get("SHELL", "/bin/zsh")
+        # Run in login shell (loads PATH/env) and keep window open
+        inner = f'{shell} -lc {shlex.quote(cmd_str + f"; exec {shell}")}'
+
+        if term in ("auto", "terminal"):
+            scpt_activate = 'tell application "Terminal" to activate'
+            scpt_run = 'tell application "Terminal" to do script "{}"'.format(
+                _as_quote_for_applescript(inner)
+            )
+            return subprocess.Popen(["osascript", "-e", scpt_activate, "-e", scpt_run])
+
+        if term in ("iterm", "iterm2"):
+            scpt = (
+                'tell application "iTerm"\n'
+                '  if (count of windows) = 0 then create window with default profile\n'
+                '  tell current session of current window to write text "{}"\n'
+                '  activate\n'
+                'end tell'.format(_as_quote_for_applescript(inner))
+            )
+            return subprocess.Popen(["osascript", "-e", scpt])
+
+        # fallback to Terminal
+        scpt_activate = 'tell application "Terminal" to activate'
+        scpt_run = 'tell application "Terminal" to do script "{}"'.format(
+            _as_quote_for_applescript(inner)
+        )
+        return subprocess.Popen(["osascript", "-e", scpt_activate, "-e", scpt_run])
+
+    # Linux / Unix
+    term = preferred
+    def have(x): return shutil.which(x) is not None
+    if term == "auto":
+        for t in ("gnome-terminal", "konsole", "xfce4-terminal", "xterm"):
+            if have(t):
+                term = t
+                break
+    if term == "gnome-terminal":
+        return subprocess.Popen(["gnome-terminal", "--", "bash", "-lc", cmd_str + "; exec bash"])
+    if term == "konsole":
+        return subprocess.Popen(["konsole", "-e", "bash", "-lc", cmd_str + "; exec bash"])
+    if term == "xfce4-terminal":
+        return subprocess.Popen(["xfce4-terminal", "--command", f"bash -lc {shlex.quote(cmd_str)}; exec bash"])
+    if term == "xterm":
+        return subprocess.Popen(["xterm", "-e", f"bash -lc {shlex.quote(cmd_str)}; exec bash"])
+
+    # last resort: run without opening a new terminal
+    return subprocess.Popen(base_cmd)
+
+def _read_json_safe(p: Path) -> Dict[str, Any]:
+    try:
+        with p.open("r", encoding="utf-8") as f:
+            return json.load(f)
+    except Exception:
+        return {}
+    
+def _tooltip(meta: Dict[str, Any], fallback: str) -> str:
+    if not meta:
+        return fallback
+    # prefer human fields; keep it short
+    parts: List[str] = []
+    # for k in ("name", "title"):
+    #     if isinstance(meta.get(k), str):
+    #         parts.append(meta[k].strip())
+    for k in ("description", "desc", "objective", "purpose"):
+        if isinstance(meta.get(k), str):
+            parts.append(meta[k].strip())
+            break
+    if parts:
+        return "\n".join(parts[:2])
+    try:
+        s = json.dumps(meta, ensure_ascii=False, separators=(",", ":"))
+        return s[:240] + ("…" if len(s) > 240 else "")
+    except Exception:
+        return fallback
+
+def scan_tests_dir(root: str | Path) -> Dict[str, Any]:
+    """
+    Expect: <root>/<module>/<test>/{<test>.py, <test>.json}
+    Returns:
+      {
+        "root": "<abs>",
+        "modules": [
+          {"name": "datapath", "path": ".../datapath", "tests": [
+            {"id": "datapath/interval_test", "module": "datapath", "name": "interval_test",
+             "label": "interval test", "dir": "...", "py": ".../interval_test.py",
+             "json_path": ".../interval_test.json", "meta": {...}, "tooltip": "..." }
+          ]},
+          ...
+        ],
+        "id_to_py": {"datapath/interval_test": ".../interval_test.py", ...}
+      }
+    """
+    root = Path(root).resolve()
+    modules: List[ModuleSchema] = []
+    id_to_py: Dict[str, str] = {}
+
+    if not root.exists():
+        return {"root": str(root), "modules": [], "id_to_py": {}}
+
+    for mod_dir in sorted([p for p in root.iterdir() if p.is_dir()]):
+        if mod_dir.name == 'ut': continue
+        tests: List[TestSchema] = []
+        for test_dir in sorted([p for p in mod_dir.iterdir() if p.is_dir()]):
+            if test_dir.name == 'ut' or test_dir.name == 'registration_test': continue
+            # prefer <dir>/<dir>.py then first *.py
+            py = test_dir / (test_dir.name + ".py")
+            if not py.exists():
+                py = next(test_dir.glob("*.py"), None)
+            # prefer <dir>/<dir>.json then first *.json
+            j = test_dir / (test_dir.name + ".json")
+            if not j.exists():
+                j = next(test_dir.glob("*.json"), None)
+
+            meta = _read_json_safe(j) if j else {}
+            tid = f"{mod_dir.name}/{test_dir.name}"
+            item = {
+                "id": tid,
+                "module": mod_dir.name,
+                "name": test_dir.name,
+                # "label": test_dir.name.replace("_", " "),
+                "label": meta.get('name', test_dir.name.replace("_", " ")),
+                "dir": str(test_dir),
+                "py": str(py) if py else "",
+                "json_path": str(j) if j else "",
+                "meta": meta,
+                "tooltip": _tooltip(meta, test_dir.name),
+            }
+            tests.append(item)
+            if py:
+                id_to_py[tid] = str(py)
+
+        if tests:
+            modules.append({"name": mod_dir.name, "path": str(mod_dir), "tests": tests})
+
+    return {"root": str(root), "modules": modules, "id_to_py": id_to_py}

{brg_certificate → common}/wltPb_pb2.py

@@ -24,7 +24,7 @@ _sym_db = _symbol_database.Default()
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0bwltPb.proto\x12\x05wltPb\"$\n\x08Location\x12\x0b\n\x03lat\x18\x01 \x01(\x01\x12\x0b\n\x03lng\x18\x02 \x01(\x01\"j\n\x05Value\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x42\x06\n\x04type\"\x89\x02\n\x0bGatewayData\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12*\n\x07packets\x18\x03 \x03(\x0b\x32\x19.wltPb.GatewayData.Packet\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x00\x88\x01\x01\x1as\n\x06Packet\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12\x12\n\nsequenceId\x18\x03 \x01(\r\x12\x11\n\x04rssi\x18\x04 \x01(\rH\x00\x88\x01\x01\x12\x15\n\raliasBridgeId\x18\x05 \x01(\tB\x07\n\x05_rssiB\x0b\n\t_location\"\xc9\x01\n\rUplinkMessage\x12-\n\rgatewayStatus\x18\x01 \x01(\x0b\x32\x14.wltPb.GatewayStatusH\x00\x12)\n\x0bgatewayInfo\x18\x02 \x01(\x0b\x32\x12.wltPb.GatewayInfoH\x00\x12)\n\x0bgatewayLogs\x18\x03 \x01(\x0b\x32\x12.wltPb.GatewayLogsH\x00\x12+\n\x0c\x61\x63tionStatus\x18\x04 \x01(\x0b\x32\x13.wltPb.ActionStatusH\x00\x42\x06\n\x04type\"&\n\x03\x41\x43L\x12\x12\n\nmode_allow\x18\x01 \x01(\x08\x12\x0b\n\x03ids\x18\x02 \x03(\x0c\"\x97\x01\n\x12GatewayConfigValue\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x12\x1e\n\x08\x61\x63lValue\x18\x05 \x01(\x0b\x32\n.wltPb.ACLH\x00\x42\x06\n\x04type\"\xe8\x03\n\rGatewayStatus\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x13\n\x0bgatewayType\x18\x02 \x01(\t\x12\x19\n\x11\x64ownlinkSupported\x18\x03 \x01(\x08\x12!\n\x19\x62ridgeOtaUpgradeSupported\x18\x04 \x01(\x08\x12\x12\n\napiVersion\x18\x05 \x01(\r\x12\x14\n\x07version\x18\x06 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x08 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\t \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\n \x03(\x0b\x32 .wltPb.GatewayStatus.ConfigEntry\x12\x17\n\nbleAddress\x18\x0b \x01(\tH\x04\x88\x01\x01\x1aH\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.wltPb.GatewayConfigValue:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_locationB\r\n\x0b_bleAddress\"}\n\x0bGatewayInfo\x12\x30\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x1f.wltPb.GatewayInfo.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\"\x1b\n\x0bGatewayLogs\x12\x0c\n\x04logs\x18\x01 \x03(\t\"\x92\x01\n\x0c\x41\x63tionStatus\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\r\x12\x0e\n\x06status\x18\x02 \x01(\r\x12\x11\n\x04step\x18\x03 \x01(\rH\x00\x88\x01\x01\x12\x15\n\x08progress\x18\x04 \x01(\rH\x01\x88\x01\x01\x12\x15\n\x08\x62ridgeId\x18\x05 \x01(\x0cH\x02\x88\x01\x01\x42\x07\n\x05_stepB\x0b\n\t_progressB\x0b\n\t_bridgeId\"\x8e\x02\n\x0f\x44ownlinkMessage\x12#\n\x08txPacket\x18\x01 \x01(\x0b\x32\x0f.wltPb.TxPacketH\x00\x12-\n\rgatewayAction\x18\x02 \x01(\x0b\x32\x14.wltPb.GatewayActionH\x00\x12-\n\rbridgeUpgrade\x18\x03 \x01(\x0b\x32\x14.wltPb.BridgeUpgradeH\x00\x12-\n\rgatewayConfig\x18\x04 \x01(\x0b\x32\x14.wltPb.GatewayConfigH\x00\x12-\n\rcustomMessage\x18\x06 \x01(\x0b\x32\x14.wltPb.CustomMessageH\x00\x42\x06\n\x04typeJ\x04\x08\x05\x10\x06R\x0c\x63ustomBroker\"F\n\x08TxPacket\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x12\n\nmaxRetries\x18\x02 \x01(\r\x12\x15\n\rmaxDurationMs\x18\x03 \x01(\r\"\x1f\n\rGatewayAction\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\"\xa5\x01\n\rBridgeUpgrade\x12\x14\n\x0crebootPacket\x18\x01 \x01(\x0c\x12\x17\n\x0ftxMaxDurationMs\x18\x02 \x01(\r\x12\x14\n\x0ctxMaxRetries\x18\x03 \x01(\r\x12\x10\n\x08\x62ridgeId\x18\x04 \x01(\t\x12\x13\n\x0bversionUuid\x18\x05 \x01(\t\x12\x13\n\x0bupgradeBlSd\x18\x06 \x01(\x08\x12\x13\n\x0bimageDirUrl\x18\x07 \x01(\t\"\xc6\x02\n\rGatewayConfig\x12\x14\n\x07version\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x03 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\x05 \x03(\x0b\x32 .wltPb.GatewayConfig.ConfigEntry\x1aH\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.wltPb.GatewayConfigValue:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_location\"\x81\x01\n\rCustomMessage\x12\x32\n\x07\x65ntries\x18\x01 \x03(\x0b\x32!.wltPb.CustomMessage.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\x62\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0bwltPb.proto\x12\x05wltPb\"$\n\x08Location\x12\x0b\n\x03lat\x18\x01 \x01(\x01\x12\x0b\n\x03lng\x18\x02 \x01(\x01\"j\n\x05Value\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x42\x06\n\x04type\"\x89\x02\n\x0bGatewayData\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12*\n\x07packets\x18\x03 \x03(\x0b\x32\x19.wltPb.GatewayData.Packet\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x00\x88\x01\x01\x1as\n\x06Packet\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x11\n\ttimestamp\x18\x02 \x01(\x04\x12\x12\n\nsequenceId\x18\x03 \x01(\r\x12\x11\n\x04rssi\x18\x04 \x01(\rH\x00\x88\x01\x01\x12\x15\n\raliasBridgeId\x18\x05 \x01(\tB\x07\n\x05_rssiB\x0b\n\t_location\"\xc9\x01\n\rUplinkMessage\x12-\n\rgatewayStatus\x18\x01 \x01(\x0b\x32\x14.wltPb.GatewayStatusH\x00\x12)\n\x0bgatewayInfo\x18\x02 \x01(\x0b\x32\x12.wltPb.GatewayInfoH\x00\x12)\n\x0bgatewayLogs\x18\x03 \x01(\x0b\x32\x12.wltPb.GatewayLogsH\x00\x12+\n\x0c\x61\x63tionStatus\x18\x04 \x01(\x0b\x32\x13.wltPb.ActionStatusH\x00\x42\x06\n\x04type\"&\n\x03\x41\x43L\x12\x12\n\nmode_allow\x18\x01 \x01(\x08\x12\x0b\n\x03ids\x18\x02 \x03(\x0c\"\x97\x01\n\x12GatewayConfigValue\x12\x16\n\x0cintegerValue\x18\x01 \x01(\x03H\x00\x12\x15\n\x0bnumberValue\x18\x02 \x01(\x01H\x00\x12\x15\n\x0bstringValue\x18\x03 \x01(\tH\x00\x12\x13\n\tboolValue\x18\x04 \x01(\x08H\x00\x12\x1e\n\x08\x61\x63lValue\x18\x05 \x01(\x0b\x32\n.wltPb.ACLH\x00\x42\x06\n\x04type\"\xe8\x03\n\rGatewayStatus\x12\x11\n\tgatewayId\x18\x01 \x01(\t\x12\x13\n\x0bgatewayType\x18\x02 \x01(\t\x12\x19\n\x11\x64ownlinkSupported\x18\x03 \x01(\x08\x12!\n\x19\x62ridgeOtaUpgradeSupported\x18\x04 \x01(\x08\x12\x12\n\napiVersion\x18\x05 \x01(\r\x12\x14\n\x07version\x18\x06 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x07 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x08 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\t \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\n \x03(\x0b\x32 .wltPb.GatewayStatus.ConfigEntry\x12\x17\n\nbleAddress\x18\x0b \x01(\tH\x04\x88\x01\x01\x1aH\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.wltPb.GatewayConfigValue:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_locationB\r\n\x0b_bleAddress\"}\n\x0bGatewayInfo\x12\x30\n\x07\x65ntries\x18\x01 \x03(\x0b\x32\x1f.wltPb.GatewayInfo.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\"\x1b\n\x0bGatewayLogs\x12\x0c\n\x04logs\x18\x01 \x03(\t\"\x92\x01\n\x0c\x41\x63tionStatus\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\r\x12\x0e\n\x06status\x18\x02 \x01(\r\x12\x11\n\x04step\x18\x03 \x01(\rH\x00\x88\x01\x01\x12\x15\n\x08progress\x18\x04 \x01(\rH\x01\x88\x01\x01\x12\x15\n\x08\x62ridgeId\x18\x05 \x01(\x0cH\x02\x88\x01\x01\x42\x07\n\x05_stepB\x0b\n\t_progressB\x0b\n\t_bridgeId\"\xbf\x02\n\x0f\x44ownlinkMessage\x12#\n\x08txPacket\x18\x01 \x01(\x0b\x32\x0f.wltPb.TxPacketH\x00\x12-\n\rgatewayAction\x18\x02 \x01(\x0b\x32\x14.wltPb.GatewayActionH\x00\x12-\n\rbridgeUpgrade\x18\x03 \x01(\x0b\x32\x14.wltPb.BridgeUpgradeH\x00\x12-\n\rgatewayConfig\x18\x04 \x01(\x0b\x32\x14.wltPb.GatewayConfigH\x00\x12-\n\rcustomMessage\x18\x06 \x01(\x0b\x32\x14.wltPb.CustomMessageH\x00\x12/\n\x0egatewayUpgrade\x18\x07 \x01(\x0b\x32\x15.wltPb.GatewayUpgradeH\x00\x42\x06\n\x04typeJ\x04\x08\x05\x10\x06R\x0c\x63ustomBroker\"F\n\x08TxPacket\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x12\n\nmaxRetries\x18\x02 \x01(\r\x12\x15\n\rmaxDurationMs\x18\x03 \x01(\r\"\x1f\n\rGatewayAction\x12\x0e\n\x06\x61\x63tion\x18\x01 \x01(\t\"\xa5\x01\n\rBridgeUpgrade\x12\x14\n\x0crebootPacket\x18\x01 \x01(\x0c\x12\x17\n\x0ftxMaxDurationMs\x18\x02 \x01(\r\x12\x14\n\x0ctxMaxRetries\x18\x03 \x01(\r\x12\x10\n\x08\x62ridgeId\x18\x04 \x01(\t\x12\x13\n\x0bversionUuid\x18\x05 \x01(\t\x12\x13\n\x0bupgradeBlSd\x18\x06 \x01(\x08\x12\x13\n\x0bimageDirUrl\x18\x07 \x01(\t\"\xc6\x02\n\rGatewayConfig\x12\x14\n\x07version\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x02 \x01(\tH\x01\x88\x01\x01\x12\x1f\n\x12interfaceSwVersion\x18\x03 \x01(\tH\x02\x88\x01\x01\x12&\n\x08location\x18\x04 \x01(\x0b\x32\x0f.wltPb.LocationH\x03\x88\x01\x01\x12\x30\n\x06\x63onfig\x18\x05 \x03(\x0b\x32 .wltPb.GatewayConfig.ConfigEntry\x1aH\n\x0b\x43onfigEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12(\n\x05value\x18\x02 \x01(\x0b\x32\x19.wltPb.GatewayConfigValue:\x02\x38\x01\x42\n\n\x08_versionB\x0f\n\r_bleSwVersionB\x15\n\x13_interfaceSwVersionB\x0b\n\t_location\"\x81\x01\n\rCustomMessage\x12\x32\n\x07\x65ntries\x18\x01 \x03(\x0b\x32!.wltPb.CustomMessage.EntriesEntry\x1a<\n\x0c\x45ntriesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\x1b\n\x05value\x18\x02 \x01(\x0b\x32\x0c.wltPb.Value:\x02\x38\x01\"\x9a\x01\n\x0eGatewayUpgrade\x12\x13\n\x0bimageDirUrl\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\t\x12\x1f\n\x12interfaceSwVersion\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x19\n\x0c\x62leSwVersion\x18\x04 \x01(\tH\x01\x88\x01\x01\x42\x15\n\x13_interfaceSwVersionB\x0f\n\r_bleSwVersionb\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -66,19 +66,21 @@ if not _descriptor._USE_C_DESCRIPTORS:
   _globals['_ACTIONSTATUS']._serialized_start=1482
   _globals['_ACTIONSTATUS']._serialized_end=1628
   _globals['_DOWNLINKMESSAGE']._serialized_start=1631
-  _globals['_DOWNLINKMESSAGE']._serialized_end=1901
-  _globals['_TXPACKET']._serialized_start=1903
-  _globals['_TXPACKET']._serialized_end=1973
-  _globals['_GATEWAYACTION']._serialized_start=1975
-  _globals['_GATEWAYACTION']._serialized_end=2006
-  _globals['_BRIDGEUPGRADE']._serialized_start=2009
-  _globals['_BRIDGEUPGRADE']._serialized_end=2174
-  _globals['_GATEWAYCONFIG']._serialized_start=2177
-  _globals['_GATEWAYCONFIG']._serialized_end=2503
+  _globals['_DOWNLINKMESSAGE']._serialized_end=1950
+  _globals['_TXPACKET']._serialized_start=1952
+  _globals['_TXPACKET']._serialized_end=2022
+  _globals['_GATEWAYACTION']._serialized_start=2024
+  _globals['_GATEWAYACTION']._serialized_end=2055
+  _globals['_BRIDGEUPGRADE']._serialized_start=2058
+  _globals['_BRIDGEUPGRADE']._serialized_end=2223
+  _globals['_GATEWAYCONFIG']._serialized_start=2226
+  _globals['_GATEWAYCONFIG']._serialized_end=2552
   _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_start=1171
   _globals['_GATEWAYCONFIG_CONFIGENTRY']._serialized_end=1243
-  _globals['_CUSTOMMESSAGE']._serialized_start=2506
-  _globals['_CUSTOMMESSAGE']._serialized_end=2635
+  _globals['_CUSTOMMESSAGE']._serialized_start=2555
+  _globals['_CUSTOMMESSAGE']._serialized_end=2684
   _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_start=1390
   _globals['_CUSTOMMESSAGE_ENTRIESENTRY']._serialized_end=1450
+  _globals['_GATEWAYUPGRADE']._serialized_start=2687
+  _globals['_GATEWAYUPGRADE']._serialized_end=2841
 # @@protoc_insertion_point(module_scope)

{gw_certificate/common → common}/wltPb_pb2.pyi

@@ -152,18 +152,20 @@ class ActionStatus(_message.Message):
     def __init__(self, action: _Optional[int] = ..., status: _Optional[int] = ..., step: _Optional[int] = ..., progress: _Optional[int] = ..., bridgeId: _Optional[bytes] = ...) -> None: ...
 
 class DownlinkMessage(_message.Message):
-    __slots__ = ("txPacket", "gatewayAction", "bridgeUpgrade", "gatewayConfig", "customMessage")
+    __slots__ = ("txPacket", "gatewayAction", "bridgeUpgrade", "gatewayConfig", "customMessage", "gatewayUpgrade")
     TXPACKET_FIELD_NUMBER: _ClassVar[int]
     GATEWAYACTION_FIELD_NUMBER: _ClassVar[int]
     BRIDGEUPGRADE_FIELD_NUMBER: _ClassVar[int]
     GATEWAYCONFIG_FIELD_NUMBER: _ClassVar[int]
     CUSTOMMESSAGE_FIELD_NUMBER: _ClassVar[int]
+    GATEWAYUPGRADE_FIELD_NUMBER: _ClassVar[int]
     txPacket: TxPacket
     gatewayAction: GatewayAction
     bridgeUpgrade: BridgeUpgrade
     gatewayConfig: GatewayConfig
     customMessage: CustomMessage
-    def __init__(self, txPacket: _Optional[_Union[TxPacket, _Mapping]] = ..., gatewayAction: _Optional[_Union[GatewayAction, _Mapping]] = ..., bridgeUpgrade: _Optional[_Union[BridgeUpgrade, _Mapping]] = ..., gatewayConfig: _Optional[_Union[GatewayConfig, _Mapping]] = ..., customMessage: _Optional[_Union[CustomMessage, _Mapping]] = ...) -> None: ...
+    gatewayUpgrade: GatewayUpgrade
+    def __init__(self, txPacket: _Optional[_Union[TxPacket, _Mapping]] = ..., gatewayAction: _Optional[_Union[GatewayAction, _Mapping]] = ..., bridgeUpgrade: _Optional[_Union[BridgeUpgrade, _Mapping]] = ..., gatewayConfig: _Optional[_Union[GatewayConfig, _Mapping]] = ..., customMessage: _Optional[_Union[CustomMessage, _Mapping]] = ..., gatewayUpgrade: _Optional[_Union[GatewayUpgrade, _Mapping]] = ...) -> None: ...
 
 class TxPacket(_message.Message):
     __slots__ = ("payload", "maxRetries", "maxDurationMs")
@@ -232,3 +234,15 @@ class CustomMessage(_message.Message):
     ENTRIES_FIELD_NUMBER: _ClassVar[int]
     entries: _containers.MessageMap[str, Value]
     def __init__(self, entries: _Optional[_Mapping[str, Value]] = ...) -> None: ...
+
+class GatewayUpgrade(_message.Message):
+    __slots__ = ("imageDirUrl", "version", "interfaceSwVersion", "bleSwVersion")
+    IMAGEDIRURL_FIELD_NUMBER: _ClassVar[int]
+    VERSION_FIELD_NUMBER: _ClassVar[int]
+    INTERFACESWVERSION_FIELD_NUMBER: _ClassVar[int]
+    BLESWVERSION_FIELD_NUMBER: _ClassVar[int]
+    imageDirUrl: str
+    version: str
+    interfaceSwVersion: str
+    bleSwVersion: str
+    def __init__(self, imageDirUrl: _Optional[str] = ..., version: _Optional[str] = ..., interfaceSwVersion: _Optional[str] = ..., bleSwVersion: _Optional[str] = ...) -> None: ...

gui_certificate/gui_certificate_cli.py

@@ -0,0 +1,14 @@
+import argparse
+import webbrowser
+from .server import app
+
+def main():
+    parser = argparse.ArgumentParser(prog="wlt-cert-gui")
+    parser.add_argument("--host", default="127.0.0.1")
+    parser.add_argument("--port", type=int, default=5000)
+    parser.add_argument("--debug", action="store_true")
+    args = parser.parse_args()
+
+    webbrowser.open(f"http://{args.host}:{args.port}")
+    app.run(host=args.host, port=args.port, debug=args.debug)
+