DeviceManager: order-based discovery (extracted from #865)

src/BrightScriptCommands.spec.ts

@@ -97,6 +97,43 @@ describe('BrightScriptFileUtils ', () => {
         });
     });
 
+    describe('refreshDeviceList / rescanDevices', () => {
+        let capturedCommands: Record<string, (...args: any[]) => any>;
+        let deviceManager: any;
+
+        beforeEach(() => {
+            deviceManager = {
+                submitOrders: sinon.stub(),
+                broadcast: sinon.stub(),
+                reconcile: sinon.stub()
+            };
+            const localCommands = new BrightScriptCommands({} as any, {} as any, vscode.context, deviceManager, {} as any, {} as any, {} as any, {} as any);
+            capturedCommands = {};
+            sinon.stub(vscode.commands as any, 'registerCommand').callsFake((name: any, cb: any) => {
+                capturedCommands[name] = cb;
+            });
+            localCommands.registerCommands();
+        });
+
+        afterEach(() => {
+            (vscode.commands.registerCommand as any).restore();
+        });
+
+        it('refreshDeviceList submits refresh orders instead of scanning directly', () => {
+            capturedCommands['extension.brightscript.refreshDeviceList']();
+            assert.isTrue(deviceManager.submitOrders.calledOnceWith([{ type: 'broadcast', reason: 'refresh-clicked' }, { type: 'reconcile', reason: 'refresh-clicked' }]));
+            assert.isTrue(deviceManager.broadcast.notCalled);
+            assert.isTrue(deviceManager.reconcile.notCalled);
+        });
+
+        it('rescanDevices submits refresh orders instead of scanning directly', () => {
+            capturedCommands['extension.brightscript.rescanDevices']();
+            assert.isTrue(deviceManager.submitOrders.calledOnceWith([{ type: 'broadcast', reason: 'refresh-clicked' }, { type: 'reconcile', reason: 'refresh-clicked' }]));
+            assert.isTrue(deviceManager.broadcast.notCalled);
+            assert.isTrue(deviceManager.reconcile.notCalled);
+        });
+    });
+
     describe('setDefaultDevicePassword', () => {
         let localCommands: BrightScriptCommands;
         let capturedCommands: Record<string, (...args: any[]) => any>;

src/BrightScriptCommands.ts

@@ -59,11 +59,17 @@ export class BrightScriptCommands {
 
         //the "Refresh" button in the Devices list
         this.registerCommand('refreshDeviceList', (key: string) => {
-            this.deviceManager.refresh(true);
+            this.deviceManager.submitOrders([
+                { type: 'broadcast', reason: 'refresh-clicked' },
+                { type: 'reconcile', reason: 'refresh-clicked' }
+            ]);
         });
 
         this.registerCommand('rescanDevices', () => {
-            this.deviceManager.refresh(true);
+            this.deviceManager.submitOrders([
+                { type: 'broadcast', reason: 'refresh-clicked' },
+                { type: 'reconcile', reason: 'refresh-clicked' }
+            ]);
         });
 
         // Refresh a single device (inline button on hover in devices panel)
@@ -349,7 +355,7 @@ export class BrightScriptCommands {
 
         this.registerCommand('clearCurrentDeviceList', async () => {
             const toatsPromise = util.showTimedNotification('Clearing device list');
-            await this.deviceManager.clearCurrentDeviceList();
+            this.deviceManager.clearCurrentDeviceList();
             await toatsPromise;
         });