@onekeyfe/hd-transport-web-device 1.2.8-alpha.127 → 1.2.8-alpha.129

package/__tests__/electron-ble-transport.test.ts

@@ -286,6 +286,192 @@ describe('ElectronBleTransport protocol detection', () => {
     expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
   });
 
+  test.each([false, true])(
+    'forwards the existing keepSession=%s release intent to native',
+    async keepSession => {
+      const device = { id: 'release-intent-pro2-id', name: 'OneKey Pro 2' };
+      const release = jest.fn().mockResolvedValue(undefined);
+      const nobleBle = { ...createNobleBle(device), release };
+      echoProtocolV2(nobleBle, device.id);
+      const bleTransport = configureTransport(nobleBle);
+      await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+
+      await bleTransport.release(device.id, false, keepSession);
+
+      expect(release).toHaveBeenCalledWith(device.id, keepSession);
+      expect(nobleBle.disconnect).not.toHaveBeenCalled();
+      expect(nobleBle.unsubscribe).not.toHaveBeenCalled();
+    }
+  );
+
+  test.each(['Pro 2', 'Neo'])(
+    'reuses the connection, subscription and V2 sequence for %s after release',
+    async name => {
+      const device = { id: 'retained-v2-id', name };
+      const release = jest.fn().mockResolvedValue(undefined);
+      const nobleBle = { ...createNobleBle(device), release };
+      echoProtocolV2(nobleBle, device.id);
+      const bleTransport = configureTransport(nobleBle);
+      await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      await bleTransport.call(device.id, 'Ping', { message: 'before-release' });
+      const notifyCleanup = nobleBle.onNotification.mock.results[0].value;
+
+      try {
+        await bleTransport.release(device.id, false, true);
+        expect(bleTransport.getProtocolType(device.id)).toBe('V2');
+        expect(notifyCleanup).not.toHaveBeenCalled();
+        await expect(
+          bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' })
+        ).resolves.toMatchObject({ uuid: device.id, protocolType: 'V2' });
+        await expect(
+          bleTransport.call(device.id, 'Ping', { message: 'after-release' })
+        ).resolves.toMatchObject({ type: 'Success' });
+
+        expect(nobleBle.connect).toHaveBeenCalledTimes(1);
+        expect(nobleBle.subscribe).toHaveBeenCalledTimes(1);
+        expect(nobleBle.onNotification).toHaveBeenCalledTimes(1);
+        expect(nobleBle.onMtuChanged).toHaveBeenCalledTimes(1);
+        expect(release).toHaveBeenCalledWith(device.id, true);
+        expect(
+          nobleBle.write.mock.calls.map(([, hex]) => Number.parseInt(hex.slice(12, 14), 16))
+        ).toEqual([1, 2, 3]);
+      } finally {
+        await bleTransport.disconnect(device.id);
+      }
+      expect(notifyCleanup).toHaveBeenCalledTimes(1);
+      expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+    }
+  );
+
+  test.each(['ordinary release', 'onclose', 'forced probe'])(
+    'does not retain renderer state for %s',
+    async mode => {
+      const device = { id: 'release-fallback-id', name: 'Pro 2' };
+      const nobleBle = createNobleBle(device);
+      echoProtocolV2(nobleBle, device.id);
+      const bleTransport = configureTransport(nobleBle);
+      await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      const notifyCleanup = nobleBle.onNotification.mock.results[0].value;
+      await bleTransport.release(device.id, mode === 'onclose', mode !== 'ordinary release');
+
+      const input = {
+        uuid: device.id,
+        expectedProtocol: 'V2' as const,
+        forceProtocolDetection: mode === 'forced probe',
+      };
+      await bleTransport.acquire(input);
+
+      expect(notifyCleanup).toHaveBeenCalledTimes(1);
+      expect(nobleBle.connect).toHaveBeenCalledTimes(2);
+      expect(nobleBle.subscribe).toHaveBeenCalledTimes(2);
+      await bleTransport.disconnect(device.id);
+    }
+  );
+
+  test.each([false, true])(
+    'rebuilds a retained link after a disconnect, including during lookup: %s',
+    async duringLookup => {
+      const device = { id: 'retained-drop-id', name: 'Pro 2' };
+      const nobleBle = createNobleBle(device);
+      echoProtocolV2(nobleBle, device.id);
+      const bleTransport = configureTransport(nobleBle);
+      await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      await bleTransport.release(device.id, false, true);
+      const disconnectHandler = nobleBle.onDeviceDisconnected.mock.calls[0][0];
+      const notifyCleanup = nobleBle.onNotification.mock.results[0].value;
+      const drop = () =>
+        disconnectHandler({ ...device, reason: EBleDisconnectReason.DeviceDisconnected });
+      if (duringLookup) {
+        nobleBle.getDevice.mockImplementationOnce(() => {
+          drop();
+          return Promise.resolve(device);
+        });
+      } else {
+        drop();
+      }
+
+      await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+      await expect(bleTransport.call(device.id, 'Ping', {})).resolves.toMatchObject({
+        type: 'Success',
+      });
+
+      expect(notifyCleanup).toHaveBeenCalledTimes(1);
+      expect(nobleBle.connect).toHaveBeenCalledTimes(2);
+      expect(nobleBle.subscribe).toHaveBeenCalledTimes(2);
+      await bleTransport.disconnect(device.id);
+    }
+  );
+
+  test('disconnects a reused link on timeout without replaying the call', async () => {
+    const device = { id: 'retained-timeout-id', name: 'Pro 2' };
+    const nobleBle = createNobleBle(device);
+    echoProtocolV2(nobleBle, device.id);
+    const bleTransport = configureTransport(nobleBle);
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    await bleTransport.release(device.id, false, true);
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    nobleBle.write.mockImplementationOnce(() => Promise.resolve());
+
+    await expect(bleTransport.call(device.id, 'Ping', {}, { timeoutMs: 10 })).rejects.toMatchObject(
+      {
+        errorCode: HardwareErrorCode.BleTimeoutError,
+      }
+    );
+
+    expect(nobleBle.write).toHaveBeenCalledTimes(2);
+    expect(nobleBle.unsubscribe).toHaveBeenCalledWith(device.id);
+    expect(nobleBle.disconnect).toHaveBeenCalledWith(device.id);
+    expect(bleTransport.getProtocolType(device.id)).toBeUndefined();
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    expect(nobleBle.subscribe).toHaveBeenCalledTimes(2);
+    await bleTransport.disconnect(device.id);
+  });
+
+  test('invalidates a retained link when native release fails', async () => {
+    const device = { id: 'retained-release-failure-id', name: 'Pro 2' };
+    const release = jest.fn().mockRejectedValueOnce(new Error('IPC release failed'));
+    const nobleBle = { ...createNobleBle(device), release };
+    echoProtocolV2(nobleBle, device.id);
+    const bleTransport = configureTransport(nobleBle);
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    const notifyCleanup = nobleBle.onNotification.mock.results[0].value;
+
+    await bleTransport.release(device.id, false, true);
+
+    expect(bleTransport.getProtocolType(device.id)).toBeUndefined();
+    expect(notifyCleanup).toHaveBeenCalledTimes(1);
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    expect(nobleBle.subscribe).toHaveBeenCalledTimes(2);
+    await bleTransport.disconnect(device.id);
+  });
+
+  test('still cancels an in-flight V2 write when release requests retention', async () => {
+    const device = { id: 'active-release-id', name: 'Pro 2' };
+    const nobleBle = createNobleBle(device);
+    echoProtocolV2(nobleBle, device.id);
+    const bleTransport = configureTransport(nobleBle);
+    await bleTransport.acquire({ uuid: device.id, expectedProtocol: 'V2' });
+    const started = createDeferred<void>();
+    const write = createDeferred<void>();
+    nobleBle.write.mockImplementationOnce(() => {
+      started.resolve();
+      return write.promise;
+    });
+    const result = bleTransport.call(device.id, 'Ping', {}).catch(error => error);
+    await started.promise;
+
+    try {
+      const releasing = bleTransport.release(device.id, false, true);
+      write.resolve();
+      await releasing;
+      await expect(result).resolves.toMatchObject({ message: 'Electron BLE transport released' });
+      expect(bleTransport.getProtocolType(device.id)).toBeUndefined();
+    } finally {
+      write.resolve();
+      await bleTransport.disconnect(device.id);
+    }
+  });
+
   test('forceNative disconnects a device the renderer no longer tracks', async () => {
     const device = { id: 'presumed-dead-id', name: 'OneKey Pro 2' };
     const nobleBle = createNobleBle(device);
@@ -488,6 +674,10 @@ describe('ElectronBleTransport protocol detection', () => {
         })
       );
       expect(transport.getProtocolType(device.id)).toBe('V1');
+      const notifyCleanup = nobleBle.onNotification.mock.results[0].value;
+      await transport.release(device.id, false, true);
+      expect(transport.getProtocolType(device.id)).toBeUndefined();
+      expect(notifyCleanup).toHaveBeenCalledTimes(1);
       await expect(transport.acquire({ uuid: device.id, expectedProtocol: 'V1' })).resolves.toEqual(
         expect.objectContaining({
           uuid: device.id,

package/dist/electron-ble-transport.d.ts

@@ -25,6 +25,8 @@ export default class ElectronBleTransport {
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
+    private retainedDevices;
+    private protocolV2CallCounts;
     private acquiringDevices;
     private deviceProtocol;
     private deviceProtocolHints;
@@ -62,7 +64,7 @@ export default class ElectronBleTransport {
         bleColorCode?: string | undefined;
         protocolType?: ProtocolType | undefined;
     }>;
-    release(id: string, _onclose?: boolean, keepSession?: boolean): Promise<void>;
+    release(id: string, onclose?: boolean, keepSession?: boolean): Promise<void>;
     disconnect(id: string): Promise<void>;
     private releaseNative;
     private releaseLogical;

package/dist/electron-ble-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"electron-ble-transport.d.ts","sourceRoot":"","sources":["../src/electron-ble-transport.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -255,6 +255,8 @@ declare class ElectronBleTransport {
     Log?: any;
     emitter?: EventEmitter;
     private connectedDevices;
+    private retainedDevices;
+    private protocolV2CallCounts;
     /**
      * Devices whose acquire() is still in flight.
      *
@@ -313,7 +315,7 @@ declare class ElectronBleTransport {
         bleColorCode?: string | undefined;
         protocolType?: ProtocolType | undefined;
     }>;
-    release(id: string, _onclose?: boolean, keepSession?: boolean): Promise<void>;
+    release(id: string, onclose?: boolean, keepSession?: boolean): Promise<void>;
     disconnect(id: string): Promise<void>;
     private releaseNative;
     private releaseLogical;

package/dist/index.js

@@ -1532,6 +1532,8 @@ class ElectronBleTransport {
         this.runPromise = null;
         this.runPromiseDeviceId = null;
         this.connectedDevices = new Set();
+        this.retainedDevices = new Set();
+        this.protocolV2CallCounts = new Map();
         this.acquiringDevices = new Set();
         this.deviceProtocol = new Map();
         this.deviceProtocolHints = new Map();
@@ -1611,6 +1613,7 @@ class ElectronBleTransport {
             .invalidateLink(deviceId, 'Electron BLE device state cleaned')
             .catch(error => { var _a; return (_a = this.Log) === null || _a === void 0 ? void 0 : _a.debug('[Electron BLE] link cleanup failed:', error); });
         this.connectedDevices.delete(deviceId);
+        this.retainedDevices.delete(deviceId);
         this.deviceProtocol.delete(deviceId);
         this.deviceMtus.delete(deviceId);
         this.devicePacketCapacities.delete(deviceId);
@@ -1707,11 +1710,18 @@ class ElectronBleTransport {
     acquire(input) {
         var _a, _b, _c, _d, _e, _f, _g;
         return __awaiter(this, void 0, void 0, function* () {
-            const { uuid, forceCleanRunPromise, expectedProtocol } = input;
+            const { uuid, forceCleanRunPromise, expectedProtocol, forceProtocolDetection } = input;
             if (!uuid) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.BleRequiredUUID);
             }
-            if (this.connectedDevices.has(uuid)) {
+            const retainedToken = this.retainedDevices.has(uuid) &&
+                !forceProtocolDetection &&
+                (!expectedProtocol || expectedProtocol === 'V2') &&
+                this.deviceProtocol.get(uuid) === 'V2'
+                ? this.notificationTokens.get(uuid)
+                : undefined;
+            this.retainedDevices.delete(uuid);
+            if (this.connectedDevices.has(uuid) && retainedToken === undefined) {
                 yield this.release(uuid);
             }
             if (forceCleanRunPromise && this.runPromise) {
@@ -1729,6 +1739,12 @@ class ElectronBleTransport {
                 if (!device) {
                     throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.DeviceNotFound, `Device ${uuid} not found`);
                 }
+                if (retainedToken !== undefined &&
+                    this.notificationTokens.get(uuid) === retainedToken &&
+                    this.connectedDevices.has(uuid) &&
+                    this.deviceProtocol.get(uuid) === 'V2') {
+                    return Object.assign(Object.assign({}, toBleDescriptor({ id: device.id, name: device.name }, 'V2')), { uuid });
+                }
                 const protocolHint = expectedProtocol
                     ? undefined
                     : (_b = input.protocolHint) !== null && _b !== void 0 ? _b : this.deviceProtocolHints.get(uuid);
@@ -1792,12 +1808,19 @@ class ElectronBleTransport {
             }
         });
     }
-    release(id, _onclose, keepSession) {
+    release(id, onclose, keepSession) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                yield this.protocolV2Links.invalidateLink(id, 'Electron BLE transport released');
-                yield this.releaseLogical(id, keepSession);
+                const retainLink = keepSession === true &&
+                    !onclose &&
+                    this.connectedDevices.has(id) &&
+                    this.deviceProtocol.get(id) === 'V2' &&
+                    !this.protocolV2CallCounts.has(id);
+                if (!retainLink) {
+                    yield this.protocolV2Links.invalidateLink(id, 'Electron BLE transport released');
+                }
+                yield this.releaseLogical(id, keepSession, retainLink);
             }
             catch (error) {
                 (_a = this.Log) === null || _a === void 0 ? void 0 : _a.error('[Electron BLE] release failed:', error);
@@ -1834,13 +1857,18 @@ class ElectronBleTransport {
             }
         });
     }
-    releaseLogical(id, keepSession) {
+    releaseLogical(id, keepSession, retainLink = false) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 if (!this.connectedDevices.has(id))
                     return;
-                this.cleanupDeviceState(id);
+                if (retainLink) {
+                    this.retainedDevices.add(id);
+                }
+                else {
+                    this.cleanupDeviceState(id);
+                }
                 const release = (_b = (_a = window.desktopApi) === null || _a === void 0 ? void 0 : _a.nobleBle) === null || _b === void 0 ? void 0 : _b.release;
                 if (!release) {
                     if (!this.warnedMissingRelease) {
@@ -2272,19 +2300,27 @@ class ElectronBleTransport {
         });
     }
     callProtocolV2(uuid, name, data, options) {
-        var _a;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (!this._messages || !this._messagesV2) {
                 throw hdShared.ERRORS.TypedError(hdShared.HardwareErrorCode.TransportNotConfigured);
             }
             const callOptions = options;
+            this.protocolV2CallCounts.set(uuid, ((_a = this.protocolV2CallCounts.get(uuid)) !== null && _a !== void 0 ? _a : 0) + 1);
             try {
                 return yield this.protocolV2Links.call(uuid, () => this.createProtocolV2Adapter(uuid), name, data, callOptions);
             }
             catch (e) {
-                (_a = this.Log) === null || _a === void 0 ? void 0 : _a.error('[Electron BLE] Protocol V2 call error:', e);
+                (_b = this.Log) === null || _b === void 0 ? void 0 : _b.error('[Electron BLE] Protocol V2 call error:', e);
                 throw e;
             }
+            finally {
+                const remaining = ((_c = this.protocolV2CallCounts.get(uuid)) !== null && _c !== void 0 ? _c : 1) - 1;
+                if (remaining > 0)
+                    this.protocolV2CallCounts.set(uuid, remaining);
+                else
+                    this.protocolV2CallCounts.delete(uuid);
+            }
         });
     }
     createProtocolV2Adapter(uuid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/hd-transport-web-device",
-  "version": "1.2.8-alpha.127",
+  "version": "1.2.8-alpha.129",
   "author": "OneKey",
   "homepage": "https://github.com/OneKeyHQ/hardware-js-sdk#readme",
   "license": "MIT",
@@ -21,13 +21,13 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "@onekeyfe/hd-shared": "1.2.8-alpha.127",
-    "@onekeyfe/hd-transport": "1.2.8-alpha.127"
+    "@onekeyfe/hd-shared": "1.2.8-alpha.129",
+    "@onekeyfe/hd-transport": "1.2.8-alpha.129"
   },
   "devDependencies": {
-    "@onekeyfe/hd-transport-electron": "1.2.8-alpha.127",
+    "@onekeyfe/hd-transport-electron": "1.2.8-alpha.129",
     "@types/w3c-web-usb": "^1.0.6",
     "@types/web-bluetooth": "^0.0.17"
   },
-  "gitHead": "1fdcafbc25357d5f4372dc8f89f8c97e561fd153"
+  "gitHead": "e340d9447b375a9d79afd737bec50ff8c5a46aba"
 }

package/src/electron-ble-transport.ts

@@ -26,6 +26,7 @@ import { resolveBlePacketCapacity } from './ble-packet-capacity';
 import type { Deferred } from '@onekeyfe/hd-shared';
 import type { DesktopAPI, NobleBleIpcErrorResponse } from '@onekeyfe/hd-transport-electron';
 import type {
+  AcquireInput,
   OneKeyDeviceInfo,
   ProtocolType,
   ProtocolV2CallContext,
@@ -117,6 +118,10 @@ export default class ElectronBleTransport {
 
   private connectedDevices: Set<string> = new Set();
 
+  private retainedDevices: Set<string> = new Set();
+
+  private protocolV2CallCounts: Map<string, number> = new Map();
+
   /**
    * Devices whose acquire() is still in flight.
    *
@@ -234,6 +239,7 @@ export default class ElectronBleTransport {
       .invalidateLink(deviceId, 'Electron BLE device state cleaned')
       .catch(error => this.Log?.debug('[Electron BLE] link cleanup failed:', error));
     this.connectedDevices.delete(deviceId);
+    this.retainedDevices.delete(deviceId);
     this.deviceProtocol.delete(deviceId);
     this.deviceMtus.delete(deviceId);
     this.devicePacketCapacities.delete(deviceId);
@@ -358,13 +364,22 @@ export default class ElectronBleTransport {
   }
 
   async acquire(input: BleAcquireInput) {
-    const { uuid, forceCleanRunPromise, expectedProtocol } = input;
+    const { uuid, forceCleanRunPromise, expectedProtocol, forceProtocolDetection }: AcquireInput =
+      input;
 
     if (!uuid) {
       throw ERRORS.TypedError(HardwareErrorCode.BleRequiredUUID);
     }
 
-    if (this.connectedDevices.has(uuid)) {
+    const retainedToken =
+      this.retainedDevices.has(uuid) &&
+      !forceProtocolDetection &&
+      (!expectedProtocol || expectedProtocol === 'V2') &&
+      this.deviceProtocol.get(uuid) === 'V2'
+        ? this.notificationTokens.get(uuid)
+        : undefined;
+    this.retainedDevices.delete(uuid);
+    if (this.connectedDevices.has(uuid) && retainedToken === undefined) {
       await this.release(uuid);
     }
 
@@ -385,6 +400,18 @@ export default class ElectronBleTransport {
       if (!device) {
         throw ERRORS.TypedError(HardwareErrorCode.DeviceNotFound, `Device ${uuid} not found`);
       }
+      // A disconnect during the IPC lookup invalidates the retained notification generation.
+      if (
+        retainedToken !== undefined &&
+        this.notificationTokens.get(uuid) === retainedToken &&
+        this.connectedDevices.has(uuid) &&
+        this.deviceProtocol.get(uuid) === 'V2'
+      ) {
+        return {
+          ...toBleDescriptor({ id: device.id, name: device.name }, 'V2'),
+          uuid,
+        };
+      }
       const protocolHint = expectedProtocol
         ? undefined
         : input.protocolHint ?? this.deviceProtocolHints.get(uuid);
@@ -452,10 +479,18 @@ export default class ElectronBleTransport {
     }
   }
 
-  async release(id: string, _onclose?: boolean, keepSession?: boolean) {
+  async release(id: string, onclose?: boolean, keepSession?: boolean) {
     try {
-      await this.protocolV2Links.invalidateLink(id, 'Electron BLE transport released');
-      await this.releaseLogical(id, keepSession);
+      const retainLink =
+        keepSession === true &&
+        !onclose &&
+        this.connectedDevices.has(id) &&
+        this.deviceProtocol.get(id) === 'V2' &&
+        !this.protocolV2CallCounts.has(id);
+      if (!retainLink) {
+        await this.protocolV2Links.invalidateLink(id, 'Electron BLE transport released');
+      }
+      await this.releaseLogical(id, keepSession, retainLink);
     } catch (error) {
       this.Log?.error('[Electron BLE] release failed:', error);
       this.cleanupDeviceState(id);
@@ -500,12 +535,15 @@ export default class ElectronBleTransport {
     }
   }
 
-  // Logical release: link and subscription stay up for the next call. Renderer
-  // listeners are still torn down, or fresh ones would double-process packets.
-  private async releaseLogical(id: string, keepSession?: boolean) {
+  // Retained V2 links reuse their renderer listeners; legacy releases remove them.
+  private async releaseLogical(id: string, keepSession?: boolean, retainLink = false) {
     try {
       if (!this.connectedDevices.has(id)) return;
-      this.cleanupDeviceState(id);
+      if (retainLink) {
+        this.retainedDevices.add(id);
+      } else {
+        this.cleanupDeviceState(id);
+      }
 
       const release = window.desktopApi?.nobleBle?.release;
       if (!release) {
@@ -1016,6 +1054,7 @@ export default class ElectronBleTransport {
 
     const callOptions = options;
 
+    this.protocolV2CallCounts.set(uuid, (this.protocolV2CallCounts.get(uuid) ?? 0) + 1);
     try {
       return await this.protocolV2Links.call(
         uuid,
@@ -1027,6 +1066,10 @@ export default class ElectronBleTransport {
     } catch (e) {
       this.Log?.error('[Electron BLE] Protocol V2 call error:', e);
       throw e;
+    } finally {
+      const remaining = (this.protocolV2CallCounts.get(uuid) ?? 1) - 1;
+      if (remaining > 0) this.protocolV2CallCounts.set(uuid, remaining);
+      else this.protocolV2CallCounts.delete(uuid);
     }
   }