Fix address type for sources

There was a bug in handling the AT field
in URIs and how it was displayed in the list

Author: larsgk

web/components/source-item.js

@@ -113,19 +113,24 @@ template.innerHTML = `
 `;
 
 const addrString = (addr) => {
-	if (!addr) {
+	if (!addr || !addr.value) {
 		return "Unknown address";
 	}
 
 	const val = bufToAddressString(addr.value.addr);
+	const addressType = addr.value.type;
 
-	if (addr.type === BT_DataType.BT_DATA_RPA) {
-		return `${val} (random)`;
-	} else if (addr.type === BT_DataType.BT_DATA_IDENTITY) {
+	if (addressType === 0) {
 		return `${val} (public)`;
 	}
 
-	return "Unknown address type";
+	if (addressType === 1) {
+		const isStatic = (addr.value.addr[5] & 0xc0) === 0xc0;
+
+		return `${val} (random${isStatic ? ' static':''})`;
+	}
+
+	return `${val} (unknown type)`;
 }
 
 export class SourceItem extends HTMLElement {

web/models/assistant-model.js

@@ -87,11 +87,13 @@ class AssistantModel extends EventTarget {
 	addSourceFromBroadcastAudioURI(parsedCode) {
 		const source = {};
 
-		// First, fetch the address type
-		let addressType = BT_DataType.BT_DATA_IDENTITY;
+		// Fetch address type (AT)
 		const atToken = parsedCode.find(t => t.type === 'AT');
-		if (atToken?.value === 1) {
-			addressType = BT_DataType.BT_DATA_RPA;
+
+		// Assume 'random'/'random static' AT if not specified
+		let addressType = 1;
+		if (atToken && atToken.value !== undefined) {
+			addressType = atToken.value;
 		}
 
 		parsedCode.forEach(token => {
@@ -100,9 +102,9 @@ class AssistantModel extends EventTarget {
 					source.addr = {
 						value: {
 							...token.value,
-							type: 1,
+							type: addressType
 						},
-						type: addressType
+						type: BT_DataType.BT_DATA_IDENTITY
 					}
 					break;
 				case 'BN':
@@ -471,12 +473,10 @@ class AssistantModel extends EventTarget {
 
 		console.log(`Set size = ${set_size}, rank = ${rank}, sirk = ${sirk}`);
 
-		/**
 		setTimeout(() => {
 			// Delayed setVolume to prevent comm issue
 			this.findSetMembers(set_size, sirk);
 		}, 500);
-		*/
 	}
 
 	handleSetMemberFound(message) {