From 9c913151bc2fdbf1cff202234a9a13078f84b3a1 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Wed, 8 Dec 2021 04:25:28 -0800
Subject: [PATCH] Fix issue server-core not cleaning up devices properly

Summary:
Notice during debugging that devices keep unregistering. Doesn't lead to any practical issues, but still incorrect.

Also noticed that the server didn't restart when changing flipper-server-core, or recompile its deps, so fixed that as well.

Reviewed By: passy

Differential Revision: D32644276

fbshipit-source-id: 5384a30c9d293acda04b6e6f940268ddcd65a870
---
 desktop/flipper-server-core/src/FlipperServerImpl.tsx | 1 +
 desktop/flipper-server/package.json                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/desktop/flipper-server-core/src/FlipperServerImpl.tsx b/desktop/flipper-server-core/src/FlipperServerImpl.tsx
index 92865c283..f5f4d79df 100644
--- a/desktop/flipper-server-core/src/FlipperServerImpl.tsx
+++ b/desktop/flipper-server-core/src/FlipperServerImpl.tsx
@@ -275,6 +275,7 @@ export class FlipperServerImpl implements FlipperServer {
     if (!device) {
       return;
     }
+    this.devices.delete(serial);
     device.disconnect(); // we'll only destroy upon replacement
     this.emit('device-disconnected', device.info);
   }
diff --git a/desktop/flipper-server/package.json b/desktop/flipper-server/package.json
index 786a761c3..b2fbf8864 100644
--- a/desktop/flipper-server/package.json
+++ b/desktop/flipper-server/package.json
@@ -32,7 +32,7 @@
     "reset": "rimraf lib *.tsbuildinfo",
     "build": "tsc -b",
     "prepack": "yarn reset && yarn build",
-    "start": "cross-env NODE_ENV=development nodemon --watch './src/**/*.tsx' --watch '../flipper-server-core/src/**/*.tsx' --exec '../ts-node' src/index.tsx"
+    "start": "cross-env NODE_ENV=development nodemon --watch './src/**/*.tsx' --watch '../flipper-server-core/src/**/*.tsx' --exec 'yarn build && ../ts-node src/index.tsx'"
   },
   "files": [
     "lib/**/*"