Skip to content

Commit 46aa5ce

Browse files
committed
Resolve conflicts
1 parent 522f054 commit 46aa5ce

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

standalone-server.js

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ function startReactotronServer(opts = {}) {
105105
// We will forward this to all connected Reactotron apps.
106106
// https://github.com/infinitered/reactotron/blob/bba01082f882307773a01e4f90ccf25ccff76949/apps/reactotron-app/src/renderer/contexts/Standalone/useStandalone.ts#L18
107107
reactotronApp.send(JSON.stringify({ type: "disconnect", conn }))
108-
109-
// Remove the client from the list of connected clients
110-
const delIndex = connectedClients.findIndex((c) => c.clientId === conn.clientId)
111-
if (delIndex !== -1) connectedClients.splice(delIndex, 1)
112108
})
109+
110+
// Remove the client from the list of connected clients
111+
const delIndex = connectedClients.findIndex((c) => c.clientId === conn.clientId)
112+
if (delIndex !== -1) connectedClients.splice(delIndex, 1)
113113
})
114114

115115
// The server has stopped.
@@ -124,21 +124,6 @@ function startReactotronServer(opts = {}) {
124124
return
125125
}
126126

127-
// // say hello when we connect (this is automatic, you don't send this)
128-
// server.send("hello.server", {})
129-
130-
// // request some values from state
131-
// server.send("state.values.request", { path: "user.givenName" })
132-
133-
// // request some keys from state
134-
// server.send("state.keys.request", { path: "" })
135-
136-
// // subscribe to some state paths so when then change, we get notified
137-
// server.send("state.values.subscribe", { paths: ["user.givenName", "user"] })
138-
139-
// // stop the server
140-
// server.stop()
141-
142127
// stop the server on SIGINT (metro shutdown)
143128
process.on("SIGINT", () => {
144129
server.stop()

0 commit comments

Comments
 (0)