Move the registeredByAPlugin signal to the DeviceRegistryItem class.

Author: HaudinFlorence

src/bluetooth/BluetoothManager.ts

@@ -13,10 +13,6 @@ export class BluetoothManager implements IBluetoothManager {
     this.deviceListChanged = new Signal<this, Array<BluetoothManager.Device>>(
       this
     );
-    this.registeredByAPlugin = new Signal<
-      this,
-      BluetoothManager.DeviceTypeRegistry
-    >(this);
     this._deviceTypeRegistry = new BluetoothManager.DeviceTypeRegistry();
     this._deviceList = [];
     this._identifierRegistry = [];
@@ -191,32 +187,6 @@ export namespace BluetoothManager {
       }
     }
 
-    /*async connectAndGetAllServices(): Promise<
-      Array<BluetoothRemoteGATTService> | undefined
-    > {
-      this.native.addEventListener('gattserverdisconnected', event => {
-        this.isConnected = false;
-        this.disconnected.emit(true);
-      });
-      const server = this.native.gatt
-      if (server) {
-        server.connect();
-        if (server.connected === true) {
-          const services = await server.getPrimaryServices();
-          this.isConnected = true;
-          if (!services || services.length === 0) {
-            throw new Error('Server exists but no service found on the device.');
-          } else { return services; }
-        }
-        else {
-          throw new Error('There is no connection to server. No attempt to get a service.')
-        }
-      }
-      else {
-        throw new Error('Server is not defined.');
-      }
-    }*/
-
     async disconnect(): Promise<void> {
       if (this.native) {
         this.native.gatt?.disconnect();
@@ -272,9 +242,15 @@ export namespace BluetoothManager {
 
   export class DeviceTypeRegistry implements IDeviceTypeRegistry {
     private _deviceTypeRegistry: Array<IDeviceTypeRegistryItem>;
+    private _registeredByAPlugin: Signal<
+      this,
+      BluetoothManager.DeviceTypeRegistry>
+
+
     public registryItem: IDeviceTypeRegistryItem;
     constructor() {
       this._deviceTypeRegistry = [];
+      this._registeredByAPlugin = new Signal<this, BluetoothManager.DeviceTypeRegistry>(this);
     }
 
     add(registryItem: IDeviceTypeRegistryItem) {
@@ -283,6 +259,9 @@ export namespace BluetoothManager {
     get itemsList(): Array<IDeviceTypeRegistryItem> {
       return this._deviceTypeRegistry;
     }
+    get registeredByAPlugin(): Signal<this, BluetoothManager.DeviceTypeRegistry> {
+      return this._registeredByAPlugin;
+    }
   }
 }
 
@@ -294,10 +273,6 @@ export interface IBluetoothManager {
   connect(registryItem: IDeviceTypeRegistryItem): any;
   disconnect(device: BluetoothManager.Device): void;
   deviceListChanged: Signal<BluetoothManager, Array<BluetoothManager.Device>>;
-  registeredByAPlugin: Signal<
-    BluetoothManager,
-    BluetoothManager.DeviceTypeRegistry
-  >;
   get deviceList(): Array<BluetoothManager.Device>;
   get deviceTypeRegistry(): BluetoothManager.DeviceTypeRegistry;
 }
@@ -308,6 +283,10 @@ export interface IDeviceTypeRegistryItem {
     native: BluetoothDevice
   ) => Promise<BluetoothManager.Device | undefined>;
   options: IDeviceOptions;
+  registeredByAPlugin: Signal<
+    BluetoothManager,
+    BluetoothManager.DeviceTypeRegistry
+  >;
 }
 
 export interface IDeviceTypeRegistry {

src/movehub-extension/index.ts

@@ -57,7 +57,7 @@ const MoveHubRegisterPlugin: JupyterFrontEndPlugin<void> = {
   ): void => {
     console.log('JupyterLab move-hub-register plugin is activated!');
     bluetoothManager.deviceTypeRegistry.add(movehubRegistryItem);
-    bluetoothManager.registeredByAPlugin.emit(bluetoothManager.deviceTypeRegistry);
+    bluetoothManager.deviceTypeRegistry.registeredByAPlugin.emit(bluetoothManager.deviceTypeRegistry);
     console.warn(
       `New item from category ${movehubRegistryItem} is added to the registry.`
     );