Refactor formHandler and main.ts to improve PSK type handling

Signed-off-by: Daniel Kastl <daniel@georepublic.de>

src/formHandler.ts

@@ -1,3 +1,5 @@
+// formHandler.ts
+
 /**
  * Get the values from the form using FormData API.
  */
@@ -12,7 +14,6 @@ export function getFormValues() {
 
   // Extract form values and ensure the correct types
   const channelName = formData.get('channelName') as string;
-  const pskType = formData.get('pskType') as string;
   const psk = formData.get('psk') as string;
 
   // FormData returns strings, so we need to parse the necessary fields
@@ -25,13 +26,11 @@ export function getFormValues() {
   const downlinkEnabled = formData.get('downlinkEnabled') === 'on';
   const positionPrecision = Number(formData.get('positionPrecision'));
   const isClientMuted = formData.get('isClientMuted') === 'on';
-
   const configOkToMqtt = formData.get('configOkToMqtt') === 'on';
   const ignoreMqtt = formData.get('ignoreMqtt') === 'on';
 
   return {
     channelName,
-    pskType,
     psk,
     region,
     modemPreset,
@@ -64,4 +63,15 @@ export function populateForm(formValues: any) {
   (form.elements.namedItem('hopLimit') as HTMLInputElement).value = String(formValues.hopLimit || 3);
   (form.elements.namedItem('ignoreMqtt') as HTMLInputElement).checked = formValues.ignoreMqtt || false;
   (form.elements.namedItem('configOkToMqtt') as HTMLInputElement).checked = formValues.configOkToMqtt || false;
+
+  // Set the pskType based on the byte length of the psk (psk.length / 2)
+  let pskType = 'none';  // Default to 'none'
+  if (formValues.psk && formValues.psk.length === 64) {
+    pskType = 'aes256';  // AES-256
+  } else if (formValues.psk && formValues.psk.length === 32) {
+    pskType = 'aes128';  // AES-128
+  }
+
+  // Update the pskType dropdown
+  (form.elements.namedItem('pskType') as HTMLSelectElement).value = pskType;
 }

src/main.ts

@@ -1,3 +1,5 @@
+// main.ts
+
 import { getFormValues, populateForm } from './formHandler';
 import { generatePSK } from './pskGenerator';
 import { buildProtobuf } from './protobufBuilder';
@@ -45,8 +47,19 @@ function loadConfigurationFromHash(hash: string): void {
 
     // Extract the channel settings from the Protobuf message
     const channelSettings = channelSet.settings[0];
+
+    // Determine PSK type based on the length of the PSK
+    const pskLength = channelSettings.psk.length;
+    let pskType = 'none';
+    if (pskLength === 16) {
+      pskType = 'aes128';
+    } else if (pskLength === 32) {
+      pskType = 'aes256';
+    }
+
     const formValues = {
       channelName: channelSettings.name,
+      pskType: pskType,  // Derived from PSK length
       psk: new TextDecoder().decode(channelSettings.psk),
       uplinkEnabled: channelSettings.uplinkEnabled,
       downlinkEnabled: channelSettings.downlinkEnabled,

src/protobufBuilder.ts

@@ -1,10 +1,11 @@
+// protobufBuilder.ts
+
 import { Protobuf } from "@meshtastic/js";
 
 /**
  * Build a Protobuf message for a channel.
  * @param channelName - The name of the channel.
  * @param psk - The pre-shared key for the channel.
- * @param pskType - The type of pre-shared key.
  * @param region - The region for the channel.
  * @param modemPreset - The modem preset for the channel.
  * @param hopLimit - The hop limit for the channel.
@@ -19,7 +20,6 @@ import { Protobuf } from "@meshtastic/js";
 export function buildProtobuf({
   channelName,
   psk,
-  pskType,
   region,
   modemPreset,
   hopLimit,
@@ -32,7 +32,6 @@ export function buildProtobuf({
 }: {
   channelName: string;
   psk: string;
-  pskType: string;
   region: number;
   modemPreset: number;
   hopLimit: number;
@@ -58,7 +57,7 @@ export function buildProtobuf({
   });
 
   const channelSettings = new Protobuf.Channel.ChannelSettings({
-    psk: pskType === 'none' ? new Uint8Array() : new TextEncoder().encode(psk),
+    psk: psk ? new TextEncoder().encode(psk) : new Uint8Array(),  // Encode PSK
     name: channelName,
     uplinkEnabled: uplinkEnabled || false,
     downlinkEnabled: downlinkEnabled || false,

src/pskGenerator.ts

@@ -1,3 +1,5 @@
+// pskGenerator.ts
+
 /**
  * Generate a PSK (Pre-Shared Key) for the given PSK type.
  * @param pskType

src/qrCodeGenerator.ts

@@ -1,3 +1,5 @@
+// qrCodeGenerator.ts
+
 import QRCode from 'qrcode';
 
 /**

src/utils.ts

@@ -1,3 +1,5 @@
+// utils.ts
+
 import { fromByteArray, toByteArray } from "base64-js";
 
 /**