Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/lib/apple-tv/devicectl-enrichment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ function mergeMetadata(
model: extra.model || base.model,
version: extra.version || base.version,
deviceType: extra.deviceType || base.deviceType,
minVersion: base.minVersion,
authTag: base.authTag,
serviceType: base.serviceType,
};
}

Expand Down
6 changes: 6 additions & 0 deletions src/lib/apple-tv/discovered-device-mapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ export function toAppleTVDevice(
const identifier = toStringValue(device.metadata.identifier) || device.id;
const model = toStringValue(device.metadata.model);
const version = toStringValue(device.metadata.version);
const minVersion = toStringValue(device.metadata.minVersion) || '17';
const authTag = toStringValue(device.metadata.authTag) || undefined;
const interfaceIndex: number | undefined = undefined;

return {
name: device.name,
Expand All @@ -26,6 +29,9 @@ export function toAppleTVDevice(
port,
model,
version,
minVersion,
authTag,
interfaceIndex,
};
}

Expand Down
6 changes: 6 additions & 0 deletions src/lib/apple-tv/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ export interface AppleTVDevice {
port: number;
model: string;
version: string;
/** @deprecated Retained for backward compatibility; not actively used. */
minVersion: string;
/** @deprecated Retained for backward compatibility; not actively used. */
authTag?: string;
/** @deprecated Retained for backward compatibility; not actively used. */
interfaceIndex?: number;
}

// Configuration options for the pairing process
Expand Down
6 changes: 5 additions & 1 deletion src/lib/discovery/dnssd-discovery-backend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ export class DnssdDiscoveryBackend implements IDeviceDiscoveryBackend {
return;
}
const key = `${service.name ?? hostname}:${hostname}:${service.port}`;
devices.set(key, resolveDiscoveredDevice(service, hostname));
devices.set(key, resolveDiscoveredDevice(service, hostname, serviceType));
});

browser.on('error', (err: Error) => {
Expand Down Expand Up @@ -91,6 +91,7 @@ export class DnssdDiscoveryBackend implements IDeviceDiscoveryBackend {
async function resolveDiscoveredDevice(
service: Service,
hostname: string,
serviceType: string,
): Promise<DiscoveredDevice | null> {
try {
if (!service.port) {
Expand All @@ -103,6 +104,9 @@ async function resolveDiscoveredDevice(
identifier,
model: txt.model ?? '',
version: txt.ver ?? '',
minVersion: txt.minVer ?? '17',
authTag: txt.authTag,
serviceType,
};
return {
id: identifier,
Expand Down
6 changes: 6 additions & 0 deletions src/lib/discovery/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@ export interface DiscoveredDeviceMetadata {
identifier?: string;
model?: string;
version?: string;
/** @deprecated Retained for backward compatibility; not actively used. */
minVersion?: string;
deviceType?: string;
/** @deprecated Retained for backward compatibility; not actively used. */
authTag?: string;
/** @deprecated Retained for backward compatibility; not actively used. */
serviceType?: string;
}

export interface DiscoveredDevice {
Expand Down
6 changes: 6 additions & 0 deletions src/lib/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1228,6 +1228,12 @@ export interface WebInspectorService extends BaseService {
*/
listenMessage(): AsyncGenerator<PlistMessage, void, unknown>;

/**
* Stop listening to messages
* @deprecated Use stopListeningAsync() instead for connecting with multiple connections
*/
stopListening(): void;

/**
* Stop listening to messages
*/
Expand Down
9 changes: 9 additions & 0 deletions src/services/ios/webinspector/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,15 @@ export class WebInspectorService extends BaseService {
}
}

/**
* Stop listening to messages
* @deprecated Use stopListeningAsync() instead for connecting with multiple connections
*/
stopListening(): void {
this.isReceiving = false;
this.messageEmitter.emit('stop');
}

/**
* Stop listening to messages
*/
Expand Down
6 changes: 6 additions & 0 deletions test/unit/apple-tv/devicectl-enrichment.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ describe('devicectl-enrichment', function () {
model: '',
version: '',
deviceType: '',
minVersion: '17',
authTag: 'base-auth-tag',
serviceType: '_remotepairing._tcp',
},
},
];
Expand All @@ -69,6 +72,9 @@ describe('devicectl-enrichment', function () {
expect(enriched[0].metadata.model).to.equal('AppleTV6,2');
expect(enriched[0].metadata.version).to.equal('17.4');
expect(enriched[0].metadata.deviceType).to.equal('tv');
expect(enriched[0].metadata.minVersion).to.equal('17');
expect(enriched[0].metadata.authTag).to.equal('base-auth-tag');
expect(enriched[0].metadata.serviceType).to.equal('_remotepairing._tcp');
});

it('keeps device unchanged when hostnames do not match', async function () {
Expand Down
Loading