resolve conflicts

Author: ym

.vite/deps/_metadata.json

@@ -0,0 +1,8 @@
+{
+  "hash": "10b5fb8d",
+  "configHash": "fd609f12",
+  "lockfileHash": "e3b0c442",
+  "browserHash": "4bebaebb",
+  "optimized": {},
+  "chunks": {}
+}

.vite/deps/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

Dockerfile.build

@@ -0,0 +1,33 @@
+# syntax=docker/dockerfile:1
+FROM golang:1.24.4-bookworm
+
+ENV GOTOOLCHAIN=local
+ENV GOPATH /go
+ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
+
+# Install build dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  build-essential \
+  device-tree-compiler \
+  gperf g++-multilib gcc-multilib \
+  libnl-3-dev libdbus-1-dev libelf-dev libmpc-dev dwarves \
+  bc openssl flex bison libssl-dev python3 python-is-python3 texinfo kmod cmake \
+  wget zstd \
+  && rm -rf /var/lib/apt/lists/*
+
+# Install buildkit
+ENV BUILDKIT_VERSION="v0.2.2"
+RUN wget https://github.com/jetkvm/rv1106-system/releases/download/${BUILDKIT_VERSION}/buildkit.tar.zst && \
+    mkdir -p /opt/jetkvm-native-buildkit && \
+    tar --use-compress-program="unzstd --long=31" -xvf buildkit.tar.zst -C /opt/jetkvm-native-buildkit && \
+    rm buildkit.tar.zst
+
+# Create build directory
+RUN mkdir -p /build/
+
+# Copy go.mod and go.sum
+COPY go.mod go.sum /build/
+
+WORKDIR /build
+
+RUN go mod download && go mod verify

buildkit.tar.zst

@@ -0,0 +1,59 @@
+{"Time":"2025-05-16T20:06:50.904437+02:00","Action":"start","Package":"github.com/jetkvm/kvm"}
+{"Time":"2025-05-16T20:06:50.904512+02:00","Action":"output","Package":"github.com/jetkvm/kvm","Output":"?   \tgithub.com/jetkvm/kvm\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:50.904531+02:00","Action":"skip","Package":"github.com/jetkvm/kvm","Elapsed":0}
+{"Time":"2025-05-16T20:06:50.916238+02:00","Action":"start","Package":"github.com/jetkvm/kvm/cmd"}
+{"Time":"2025-05-16T20:06:50.91626+02:00","Action":"output","Package":"github.com/jetkvm/kvm/cmd","Output":"?   \tgithub.com/jetkvm/kvm/cmd\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:50.916272+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/cmd","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071519+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/confparser"}
+{"Time":"2025-05-16T20:06:51.071566+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/logging"}
+{"Time":"2025-05-16T20:06:51.071596+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/logging","Output":"?   \tgithub.com/jetkvm/kvm/internal/logging\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.07161+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/mdns"}
+{"Time":"2025-05-16T20:06:51.071611+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/internal/logging","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071621+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/mdns","Output":"?   \tgithub.com/jetkvm/kvm/internal/mdns\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.071629+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/internal/mdns","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071645+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/network"}
+{"Time":"2025-05-16T20:06:51.071667+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/network","Output":"?   \tgithub.com/jetkvm/kvm/internal/network\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.071676+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/internal/network","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071677+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/timesync"}
+{"Time":"2025-05-16T20:06:51.071684+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/timesync","Output":"?   \tgithub.com/jetkvm/kvm/internal/timesync\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.071687+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/udhcpc"}
+{"Time":"2025-05-16T20:06:51.071688+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/internal/timesync","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071709+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/usbgadget"}
+{"Time":"2025-05-16T20:06:51.071715+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/usbgadget","Output":"?   \tgithub.com/jetkvm/kvm/internal/usbgadget\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.071721+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/internal/usbgadget","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071722+02:00","Action":"start","Package":"github.com/jetkvm/kvm/internal/websecure"}
+{"Time":"2025-05-16T20:06:51.071739+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/websecure","Output":"?   \tgithub.com/jetkvm/kvm/internal/websecure\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.071744+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/internal/websecure","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.071747+02:00","Action":"start","Package":"github.com/jetkvm/kvm/resource"}
+{"Time":"2025-05-16T20:06:51.071752+02:00","Action":"output","Package":"github.com/jetkvm/kvm/resource","Output":"?   \tgithub.com/jetkvm/kvm/resource\t[no test files]\n"}
+{"Time":"2025-05-16T20:06:51.071755+02:00","Action":"skip","Package":"github.com/jetkvm/kvm/resource","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.270727+02:00","Action":"run","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateConfig"}
+{"Time":"2025-05-16T20:06:51.270772+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateConfig","Output":"=== RUN   TestValidateConfig\n"}
+{"Time":"2025-05-16T20:06:51.27085+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateConfig","Output":"--- PASS: TestValidateConfig (0.00s)\n"}
+{"Time":"2025-05-16T20:06:51.270864+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateConfig","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.270873+02:00","Action":"run","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskRequiredIfStatic"}
+{"Time":"2025-05-16T20:06:51.270879+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskRequiredIfStatic","Output":"=== RUN   TestValidateIPv4StaticConfigNetmaskRequiredIfStatic\n"}
+{"Time":"2025-05-16T20:06:51.270882+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskRequiredIfStatic","Output":"--- PASS: TestValidateIPv4StaticConfigNetmaskRequiredIfStatic (0.00s)\n"}
+{"Time":"2025-05-16T20:06:51.270886+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskRequiredIfStatic","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.270889+02:00","Action":"run","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic"}
+{"Time":"2025-05-16T20:06:51.2709+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic","Output":"=== RUN   TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic\n"}
+{"Time":"2025-05-16T20:06:51.270906+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic","Output":"--- PASS: TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic (0.00s)\n"}
+{"Time":"2025-05-16T20:06:51.27091+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigNetmaskNotRequiredIfStatic","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.270914+02:00","Action":"run","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigRequiredIf"}
+{"Time":"2025-05-16T20:06:51.270918+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigRequiredIf","Output":"=== RUN   TestValidateIPv4StaticConfigRequiredIf\n"}
+{"Time":"2025-05-16T20:06:51.270925+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigRequiredIf","Output":"--- PASS: TestValidateIPv4StaticConfigRequiredIf (0.00s)\n"}
+{"Time":"2025-05-16T20:06:51.270927+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigRequiredIf","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.270929+02:00","Action":"run","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigValidateType"}
+{"Time":"2025-05-16T20:06:51.270932+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigValidateType","Output":"=== RUN   TestValidateIPv4StaticConfigValidateType\n"}
+{"Time":"2025-05-16T20:06:51.270991+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigValidateType","Output":"--- PASS: TestValidateIPv4StaticConfigValidateType (0.00s)\n"}
+{"Time":"2025-05-16T20:06:51.270995+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/confparser","Test":"TestValidateIPv4StaticConfigValidateType","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.270997+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Output":"PASS\n"}
+{"Time":"2025-05-16T20:06:51.271289+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/confparser","Output":"ok  \tgithub.com/jetkvm/kvm/internal/confparser\t0.200s\n"}
+{"Time":"2025-05-16T20:06:51.272057+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/confparser","Elapsed":0.201}
+{"Time":"2025-05-16T20:06:51.42069+02:00","Action":"run","Package":"github.com/jetkvm/kvm/internal/udhcpc","Test":"TestUnmarshalDHCPCLease"}
+{"Time":"2025-05-16T20:06:51.420713+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/udhcpc","Test":"TestUnmarshalDHCPCLease","Output":"=== RUN   TestUnmarshalDHCPCLease\n"}
+{"Time":"2025-05-16T20:06:51.420737+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/udhcpc","Test":"TestUnmarshalDHCPCLease","Output":"--- PASS: TestUnmarshalDHCPCLease (0.00s)\n"}
+{"Time":"2025-05-16T20:06:51.420743+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/udhcpc","Test":"TestUnmarshalDHCPCLease","Elapsed":0}
+{"Time":"2025-05-16T20:06:51.420748+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/udhcpc","Output":"PASS\n"}
+{"Time":"2025-05-16T20:06:51.421071+02:00","Action":"output","Package":"github.com/jetkvm/kvm/internal/udhcpc","Output":"ok  \tgithub.com/jetkvm/kvm/internal/udhcpc\t0.349s\n"}
+{"Time":"2025-05-16T20:06:51.422515+02:00","Action":"pass","Package":"github.com/jetkvm/kvm/internal/udhcpc","Elapsed":0.351}

cprof.out

@@ -0,0 +1,76 @@
+import { ISettingsParam, Logger as TSLogger, ILogObj } from "tslog";
+
+class Logger<T> extends TSLogger<T> {
+  constructor(settings?: ISettingsParam<T>, logObj?: T) {
+    super(settings, logObj);
+    // https://github.com/fullstack-build/tslog/issues/302
+    // @ts-expect-error TS2341
+    this.stackDepthLevel = 6
+  }
+}
+
+const debugModeDefaultSettings: Partial<ISettingsParam<ILogObj>> = {
+  minLevel: 0, // 0 = silly
+  hideLogPositionForProduction: false,
+};
+
+const prodModeDefaultSettings: Partial<ISettingsParam<ILogObj>> = {
+  minLevel: 3, // 3 = info
+  hideLogPositionForProduction: true,
+};
+
+export const logger = new Logger<ILogObj>({
+  name: "jetkvm",
+  ...(import.meta.env.DEV ? debugModeDefaultSettings : prodModeDefaultSettings),
+});
+
+export const jsonRpcLogger = logger.getSubLogger({ name: "json-rpc" });
+
+export const diffSettings = (currentSettings: ISettingsParam<ILogObj>, newSettings: ISettingsParam<ILogObj>) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const diffKeys = Object.keys(newSettings).filter(key => (currentSettings as unknown as any)[key] !== (newSettings as unknown as any)[key]); 
+  const difference = Array<{
+    key: string;
+    oldValue: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+    newValue: any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  }>();
+  diffKeys.forEach(key => {
+    difference.push({
+      key,
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      oldValue: (currentSettings as unknown as any)[key],
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      newValue: (newSettings as unknown as any)[key],
+    });
+  });
+  return difference;
+};
+
+export const updateLogSettings = (settings: Partial<ISettingsParam<ILogObj>>) => {
+  // compare the settings to the current settings
+  const currentSettings = logger.settings;
+  logger.settings = {
+    ...logger.settings,
+    ...settings,
+  };
+
+  const diff = diffSettings(currentSettings, logger.settings);
+
+  if (diff.length > 0) {
+    logger.info("Updating log settings", { diff });
+  }
+
+  jsonRpcLogger.settings = {
+    ...jsonRpcLogger.settings,
+    ...settings,
+  };
+};
+
+export const enableDebugMode = () => updateLogSettings(debugModeDefaultSettings);
+export const disableDebugMode = () => updateLogSettings(prodModeDefaultSettings);
+
+if (import.meta.env.DEV) {
+  enableDebugMode();
+} else {
+  disableDebugMode();
+}