@player-devtools/client 0.16.1-next.1 → 0.16.1-next.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -83,8 +83,32 @@ var reducer = (state, transaction) => {
83
83
  return transaction.payload.events.reduce(reducer, state);
84
84
  case "PLAYER_DEVTOOLS_PLAYER_STOPPED":
85
85
  return (0, import_immer.produce)(state, (draft) => {
86
- const { sender } = transaction;
87
- (0, import_utils.dsetAssign)(draft, ["players", sender, "active"], false);
86
+ const { sender, payload } = transaction;
87
+ const player = draft.players[sender];
88
+ if (!player) return;
89
+ const stoppedPluginID = payload?.pluginID;
90
+ if (stoppedPluginID && player.plugins) {
91
+ delete player.plugins[stoppedPluginID];
92
+ const [remaining] = Object.keys(player.plugins);
93
+ if (remaining) {
94
+ if (draft.current.player === sender && draft.current.plugin === stoppedPluginID) {
95
+ draft.current.plugin = remaining;
96
+ }
97
+ return;
98
+ }
99
+ }
100
+ delete draft.players[sender];
101
+ if (draft.current.player === sender) {
102
+ const nextPlayer = Object.keys(draft.players)[0] ?? null;
103
+ draft.current.player = nextPlayer;
104
+ const nextPlugins = Object.keys(
105
+ nextPlayer && draft.players[nextPlayer]?.plugins || {}
106
+ );
107
+ const { plugin } = draft.current;
108
+ if (!plugin || !nextPlugins.includes(plugin)) {
109
+ draft.current.plugin = nextPlugins[0] ?? null;
110
+ }
111
+ }
88
112
  });
89
113
  case "PLAYER_DEVTOOLS_PLAYER_SELECTED":
90
114
  return (0, import_immer.produce)(state, (draft) => {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/index.ts","../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/client.ts","../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/constants/index.ts","../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/reducer.ts"],"sourcesContent":["export { createExtensionClient, type ExtensionClient } from \"./state/client\";\n","import { Messenger } from \"@player-devtools/messenger\";\nimport type {\n CommunicationLayerMethods,\n ExtensionState,\n ExtensionSupportedEvents,\n} from \"@player-devtools/types\";\nimport { useStateReducer } from \"@player-devtools/utils\";\n\nimport { INITIAL_EXTENSION_STATE } from \"../constants\";\nimport { reducer } from \"./reducer\";\n\nconst NOOP_ID = -1;\n\n/**\n * Messenger diagnostics go to stderr, never stdout.\n *\n * This client also runs inside the MCP server process, where stdout is the\n * JSON-RPC channel — `console.log` there would corrupt the protocol stream.\n * `console.error` is stderr in Node and a normal console entry in browsers.\n */\nconst LOGGER = {\n log: (...args: Array<unknown>): void => console.error(...args),\n};\n\nexport type ExtensionClient = {\n getState: () => ExtensionState;\n subscribe: (fn: (state: ExtensionState) => void) => () => void;\n selectPlayer: (playerID: string) => void;\n selectPlugin: (pluginID: string) => void;\n handleInteraction: (interaction: {\n type: string;\n payload?: string;\n target?: string;\n }) => void;\n destroy: () => void;\n};\n\nexport const createExtensionClient = (\n communicationLayer: CommunicationLayerMethods,\n): ExtensionClient => {\n const store = useStateReducer(reducer, INITIAL_EXTENSION_STATE);\n\n const messenger = new Messenger<ExtensionSupportedEvents>({\n context: \"devtools\",\n messageCallback: (message) => store.dispatch(message),\n ...communicationLayer,\n logger: LOGGER,\n });\n\n const selectPlayer = (playerID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLAYER_SELECTED\",\n payload: { playerID },\n });\n\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: {\n type: \"player-selected\",\n payload: playerID,\n },\n });\n };\n\n const selectPlugin = (pluginID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\",\n payload: { pluginID },\n });\n };\n\n const handleInteraction = ({\n type,\n payload,\n target,\n }: {\n type: string;\n payload?: string;\n /** Player to address; defaults to the currently selected player. */\n target?: string;\n }): void => {\n const resolvedTarget = target ?? store.getState().current.player;\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: { type, payload },\n ...(resolvedTarget ? { target: resolvedTarget } : {}),\n });\n };\n\n return {\n getState: store.getState,\n subscribe: store.subscribe,\n selectPlayer,\n selectPlugin,\n handleInteraction,\n destroy: () => messenger.destroy(),\n };\n};\n","import type { ExtensionState } from \"@player-devtools/types\";\n\nexport const INITIAL_EXTENSION_STATE: ExtensionState = {\n current: {\n player: null,\n plugin: null,\n },\n players: {},\n};\n","import type {\n ExtensionState,\n ExtensionSupportedEvents,\n Transaction,\n} from \"@player-devtools/types\";\nimport { dsetAssign } from \"@player-devtools/utils\";\nimport { produce } from \"immer\";\n\n/** Extension state reducer */\nexport const reducer = (\n state: ExtensionState,\n transaction: Transaction<ExtensionSupportedEvents>,\n): ExtensionState => {\n switch (transaction.type) {\n case \"PLAYER_DEVTOOLS_PLAYER_INIT\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { plugins },\n } = transaction;\n\n const [plugin] = Object.values(plugins);\n if (!plugin) return;\n\n draft.current.player = sender;\n draft.current.plugin = draft.current.plugin || plugin.id;\n\n // TODO: Verify this works with multiple plugins\n dsetAssign(draft, [\"players\", sender, \"plugins\"], plugins, true);\n dsetAssign(draft.players, [sender, \"active\"], true);\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_FLOW_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { flow, pluginID },\n } = transaction;\n\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\"],\n flow,\n );\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_DATA_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { data, pluginID },\n } = transaction;\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\", \"data\"],\n data,\n );\n });\n case \"MESSENGER_EVENT_BATCH\":\n return transaction.payload.events.reduce(reducer, state);\n case \"PLAYER_DEVTOOLS_PLAYER_STOPPED\":\n return produce(state, (draft) => {\n const { sender } = transaction;\n dsetAssign(draft, [\"players\", sender, \"active\"], false);\n });\n case \"PLAYER_DEVTOOLS_PLAYER_SELECTED\":\n return produce(state, (draft) => {\n const { playerID } = transaction.payload;\n draft.current.player = playerID;\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\":\n return produce(state, (draft) => {\n const { pluginID } = transaction.payload;\n draft.current.plugin = pluginID;\n });\n default:\n return state;\n }\n};\n"],"mappings":"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","names":["import_utils"]}
1
+ {"version":3,"sources":["../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/index.ts","../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/client.ts","../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/constants/index.ts","../../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/reducer.ts"],"sourcesContent":["export { createExtensionClient, type ExtensionClient } from \"./state/client\";\n","import { Messenger } from \"@player-devtools/messenger\";\nimport type {\n CommunicationLayerMethods,\n ExtensionState,\n ExtensionSupportedEvents,\n} from \"@player-devtools/types\";\nimport { useStateReducer } from \"@player-devtools/utils\";\n\nimport { INITIAL_EXTENSION_STATE } from \"../constants\";\nimport { reducer } from \"./reducer\";\n\nconst NOOP_ID = -1;\n\n/**\n * Messenger diagnostics go to stderr, never stdout.\n *\n * This client also runs inside the MCP server process, where stdout is the\n * JSON-RPC channel — `console.log` there would corrupt the protocol stream.\n * `console.error` is stderr in Node and a normal console entry in browsers.\n */\nconst LOGGER = {\n log: (...args: Array<unknown>): void => console.error(...args),\n};\n\nexport type ExtensionClient = {\n getState: () => ExtensionState;\n subscribe: (fn: (state: ExtensionState) => void) => () => void;\n selectPlayer: (playerID: string) => void;\n selectPlugin: (pluginID: string) => void;\n handleInteraction: (interaction: {\n type: string;\n payload?: string;\n target?: string;\n }) => void;\n destroy: () => void;\n};\n\nexport const createExtensionClient = (\n communicationLayer: CommunicationLayerMethods,\n): ExtensionClient => {\n const store = useStateReducer(reducer, INITIAL_EXTENSION_STATE);\n\n const messenger = new Messenger<ExtensionSupportedEvents>({\n context: \"devtools\",\n messageCallback: (message) => store.dispatch(message),\n ...communicationLayer,\n logger: LOGGER,\n });\n\n const selectPlayer = (playerID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLAYER_SELECTED\",\n payload: { playerID },\n });\n\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: {\n type: \"player-selected\",\n payload: playerID,\n },\n });\n };\n\n const selectPlugin = (pluginID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\",\n payload: { pluginID },\n });\n };\n\n const handleInteraction = ({\n type,\n payload,\n target,\n }: {\n type: string;\n payload?: string;\n /** Player to address; defaults to the currently selected player. */\n target?: string;\n }): void => {\n const resolvedTarget = target ?? store.getState().current.player;\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: { type, payload },\n ...(resolvedTarget ? { target: resolvedTarget } : {}),\n });\n };\n\n return {\n getState: store.getState,\n subscribe: store.subscribe,\n selectPlayer,\n selectPlugin,\n handleInteraction,\n destroy: () => messenger.destroy(),\n };\n};\n","import type { ExtensionState } from \"@player-devtools/types\";\n\nexport const INITIAL_EXTENSION_STATE: ExtensionState = {\n current: {\n player: null,\n plugin: null,\n },\n players: {},\n};\n","import type {\n ExtensionState,\n ExtensionSupportedEvents,\n Transaction,\n} from \"@player-devtools/types\";\nimport { dsetAssign } from \"@player-devtools/utils\";\nimport { produce } from \"immer\";\n\n/** Extension state reducer */\nexport const reducer = (\n state: ExtensionState,\n transaction: Transaction<ExtensionSupportedEvents>,\n): ExtensionState => {\n switch (transaction.type) {\n case \"PLAYER_DEVTOOLS_PLAYER_INIT\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { plugins },\n } = transaction;\n\n const [plugin] = Object.values(plugins);\n if (!plugin) return;\n\n draft.current.player = sender;\n draft.current.plugin = draft.current.plugin || plugin.id;\n\n // TODO: Verify this works with multiple plugins\n dsetAssign(draft, [\"players\", sender, \"plugins\"], plugins, true);\n dsetAssign(draft.players, [sender, \"active\"], true);\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_FLOW_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { flow, pluginID },\n } = transaction;\n\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\"],\n flow,\n );\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_DATA_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { data, pluginID },\n } = transaction;\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\", \"data\"],\n data,\n );\n });\n case \"MESSENGER_EVENT_BATCH\":\n return transaction.payload.events.reduce(reducer, state);\n case \"PLAYER_DEVTOOLS_PLAYER_STOPPED\":\n return produce(state, (draft) => {\n const { sender, payload } = transaction;\n const player = draft.players[sender];\n if (!player) return;\n\n // Only drop the player once its last plugin has stopped\n const stoppedPluginID = payload?.pluginID;\n if (stoppedPluginID && player.plugins) {\n delete player.plugins[stoppedPluginID];\n\n const [remaining] = Object.keys(player.plugins);\n if (remaining) {\n if (\n draft.current.player === sender &&\n draft.current.plugin === stoppedPluginID\n ) {\n draft.current.plugin = remaining;\n }\n return;\n }\n }\n\n delete draft.players[sender];\n\n // Move the selection off the removed player\n if (draft.current.player === sender) {\n const nextPlayer = Object.keys(draft.players)[0] ?? null;\n draft.current.player = nextPlayer;\n\n const nextPlugins = Object.keys(\n (nextPlayer && draft.players[nextPlayer]?.plugins) || {},\n );\n const { plugin } = draft.current;\n if (!plugin || !nextPlugins.includes(plugin)) {\n draft.current.plugin = nextPlugins[0] ?? null;\n }\n }\n });\n case \"PLAYER_DEVTOOLS_PLAYER_SELECTED\":\n return produce(state, (draft) => {\n const { playerID } = transaction.payload;\n draft.current.player = playerID;\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\":\n return produce(state, (draft) => {\n const { pluginID } = transaction.payload;\n draft.current.plugin = pluginID;\n });\n default:\n return state;\n }\n};\n"],"mappings":"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","names":["import_utils"]}
@@ -57,8 +57,32 @@ var reducer = (state, transaction) => {
57
57
  return transaction.payload.events.reduce(reducer, state);
58
58
  case "PLAYER_DEVTOOLS_PLAYER_STOPPED":
59
59
  return produce(state, (draft) => {
60
- const { sender } = transaction;
61
- dsetAssign(draft, ["players", sender, "active"], false);
60
+ const { sender, payload } = transaction;
61
+ const player = draft.players[sender];
62
+ if (!player) return;
63
+ const stoppedPluginID = payload?.pluginID;
64
+ if (stoppedPluginID && player.plugins) {
65
+ delete player.plugins[stoppedPluginID];
66
+ const [remaining] = Object.keys(player.plugins);
67
+ if (remaining) {
68
+ if (draft.current.player === sender && draft.current.plugin === stoppedPluginID) {
69
+ draft.current.plugin = remaining;
70
+ }
71
+ return;
72
+ }
73
+ }
74
+ delete draft.players[sender];
75
+ if (draft.current.player === sender) {
76
+ const nextPlayer = Object.keys(draft.players)[0] ?? null;
77
+ draft.current.player = nextPlayer;
78
+ const nextPlugins = Object.keys(
79
+ nextPlayer && draft.players[nextPlayer]?.plugins || {}
80
+ );
81
+ const { plugin } = draft.current;
82
+ if (!plugin || !nextPlugins.includes(plugin)) {
83
+ draft.current.plugin = nextPlugins[0] ?? null;
84
+ }
85
+ }
62
86
  });
63
87
  case "PLAYER_DEVTOOLS_PLAYER_SELECTED":
64
88
  return produce(state, (draft) => {
package/dist/index.mjs CHANGED
@@ -57,8 +57,32 @@ var reducer = (state, transaction) => {
57
57
  return transaction.payload.events.reduce(reducer, state);
58
58
  case "PLAYER_DEVTOOLS_PLAYER_STOPPED":
59
59
  return produce(state, (draft) => {
60
- const { sender } = transaction;
61
- dsetAssign(draft, ["players", sender, "active"], false);
60
+ const { sender, payload } = transaction;
61
+ const player = draft.players[sender];
62
+ if (!player) return;
63
+ const stoppedPluginID = payload?.pluginID;
64
+ if (stoppedPluginID && player.plugins) {
65
+ delete player.plugins[stoppedPluginID];
66
+ const [remaining] = Object.keys(player.plugins);
67
+ if (remaining) {
68
+ if (draft.current.player === sender && draft.current.plugin === stoppedPluginID) {
69
+ draft.current.plugin = remaining;
70
+ }
71
+ return;
72
+ }
73
+ }
74
+ delete draft.players[sender];
75
+ if (draft.current.player === sender) {
76
+ const nextPlayer = Object.keys(draft.players)[0] ?? null;
77
+ draft.current.player = nextPlayer;
78
+ const nextPlugins = Object.keys(
79
+ nextPlayer && draft.players[nextPlayer]?.plugins || {}
80
+ );
81
+ const { plugin } = draft.current;
82
+ if (!plugin || !nextPlugins.includes(plugin)) {
83
+ draft.current.plugin = nextPlugins[0] ?? null;
84
+ }
85
+ }
62
86
  });
63
87
  case "PLAYER_DEVTOOLS_PLAYER_SELECTED":
64
88
  return produce(state, (draft) => {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/client.ts","../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/constants/index.ts","../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/reducer.ts"],"sourcesContent":["import { Messenger } from \"@player-devtools/messenger\";\nimport type {\n CommunicationLayerMethods,\n ExtensionState,\n ExtensionSupportedEvents,\n} from \"@player-devtools/types\";\nimport { useStateReducer } from \"@player-devtools/utils\";\n\nimport { INITIAL_EXTENSION_STATE } from \"../constants\";\nimport { reducer } from \"./reducer\";\n\nconst NOOP_ID = -1;\n\n/**\n * Messenger diagnostics go to stderr, never stdout.\n *\n * This client also runs inside the MCP server process, where stdout is the\n * JSON-RPC channel — `console.log` there would corrupt the protocol stream.\n * `console.error` is stderr in Node and a normal console entry in browsers.\n */\nconst LOGGER = {\n log: (...args: Array<unknown>): void => console.error(...args),\n};\n\nexport type ExtensionClient = {\n getState: () => ExtensionState;\n subscribe: (fn: (state: ExtensionState) => void) => () => void;\n selectPlayer: (playerID: string) => void;\n selectPlugin: (pluginID: string) => void;\n handleInteraction: (interaction: {\n type: string;\n payload?: string;\n target?: string;\n }) => void;\n destroy: () => void;\n};\n\nexport const createExtensionClient = (\n communicationLayer: CommunicationLayerMethods,\n): ExtensionClient => {\n const store = useStateReducer(reducer, INITIAL_EXTENSION_STATE);\n\n const messenger = new Messenger<ExtensionSupportedEvents>({\n context: \"devtools\",\n messageCallback: (message) => store.dispatch(message),\n ...communicationLayer,\n logger: LOGGER,\n });\n\n const selectPlayer = (playerID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLAYER_SELECTED\",\n payload: { playerID },\n });\n\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: {\n type: \"player-selected\",\n payload: playerID,\n },\n });\n };\n\n const selectPlugin = (pluginID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\",\n payload: { pluginID },\n });\n };\n\n const handleInteraction = ({\n type,\n payload,\n target,\n }: {\n type: string;\n payload?: string;\n /** Player to address; defaults to the currently selected player. */\n target?: string;\n }): void => {\n const resolvedTarget = target ?? store.getState().current.player;\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: { type, payload },\n ...(resolvedTarget ? { target: resolvedTarget } : {}),\n });\n };\n\n return {\n getState: store.getState,\n subscribe: store.subscribe,\n selectPlayer,\n selectPlugin,\n handleInteraction,\n destroy: () => messenger.destroy(),\n };\n};\n","import type { ExtensionState } from \"@player-devtools/types\";\n\nexport const INITIAL_EXTENSION_STATE: ExtensionState = {\n current: {\n player: null,\n plugin: null,\n },\n players: {},\n};\n","import type {\n ExtensionState,\n ExtensionSupportedEvents,\n Transaction,\n} from \"@player-devtools/types\";\nimport { dsetAssign } from \"@player-devtools/utils\";\nimport { produce } from \"immer\";\n\n/** Extension state reducer */\nexport const reducer = (\n state: ExtensionState,\n transaction: Transaction<ExtensionSupportedEvents>,\n): ExtensionState => {\n switch (transaction.type) {\n case \"PLAYER_DEVTOOLS_PLAYER_INIT\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { plugins },\n } = transaction;\n\n const [plugin] = Object.values(plugins);\n if (!plugin) return;\n\n draft.current.player = sender;\n draft.current.plugin = draft.current.plugin || plugin.id;\n\n // TODO: Verify this works with multiple plugins\n dsetAssign(draft, [\"players\", sender, \"plugins\"], plugins, true);\n dsetAssign(draft.players, [sender, \"active\"], true);\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_FLOW_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { flow, pluginID },\n } = transaction;\n\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\"],\n flow,\n );\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_DATA_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { data, pluginID },\n } = transaction;\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\", \"data\"],\n data,\n );\n });\n case \"MESSENGER_EVENT_BATCH\":\n return transaction.payload.events.reduce(reducer, state);\n case \"PLAYER_DEVTOOLS_PLAYER_STOPPED\":\n return produce(state, (draft) => {\n const { sender } = transaction;\n dsetAssign(draft, [\"players\", sender, \"active\"], false);\n });\n case \"PLAYER_DEVTOOLS_PLAYER_SELECTED\":\n return produce(state, (draft) => {\n const { playerID } = transaction.payload;\n draft.current.player = playerID;\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\":\n return produce(state, (draft) => {\n const { pluginID } = transaction.payload;\n draft.current.plugin = pluginID;\n });\n default:\n return state;\n }\n};\n"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/client.ts","../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/constants/index.ts","../../../../../../../../../../../../execroot/_main/bazel-out/k8-fastbuild/bin/devtools/client/core/src/state/reducer.ts"],"sourcesContent":["import { Messenger } from \"@player-devtools/messenger\";\nimport type {\n CommunicationLayerMethods,\n ExtensionState,\n ExtensionSupportedEvents,\n} from \"@player-devtools/types\";\nimport { useStateReducer } from \"@player-devtools/utils\";\n\nimport { INITIAL_EXTENSION_STATE } from \"../constants\";\nimport { reducer } from \"./reducer\";\n\nconst NOOP_ID = -1;\n\n/**\n * Messenger diagnostics go to stderr, never stdout.\n *\n * This client also runs inside the MCP server process, where stdout is the\n * JSON-RPC channel — `console.log` there would corrupt the protocol stream.\n * `console.error` is stderr in Node and a normal console entry in browsers.\n */\nconst LOGGER = {\n log: (...args: Array<unknown>): void => console.error(...args),\n};\n\nexport type ExtensionClient = {\n getState: () => ExtensionState;\n subscribe: (fn: (state: ExtensionState) => void) => () => void;\n selectPlayer: (playerID: string) => void;\n selectPlugin: (pluginID: string) => void;\n handleInteraction: (interaction: {\n type: string;\n payload?: string;\n target?: string;\n }) => void;\n destroy: () => void;\n};\n\nexport const createExtensionClient = (\n communicationLayer: CommunicationLayerMethods,\n): ExtensionClient => {\n const store = useStateReducer(reducer, INITIAL_EXTENSION_STATE);\n\n const messenger = new Messenger<ExtensionSupportedEvents>({\n context: \"devtools\",\n messageCallback: (message) => store.dispatch(message),\n ...communicationLayer,\n logger: LOGGER,\n });\n\n const selectPlayer = (playerID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLAYER_SELECTED\",\n payload: { playerID },\n });\n\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: {\n type: \"player-selected\",\n payload: playerID,\n },\n });\n };\n\n const selectPlugin = (pluginID: string): void => {\n store.dispatch({\n id: NOOP_ID,\n sender: \"internal\",\n context: \"devtools\",\n _messenger_: false,\n timestamp: Date.now(),\n type: \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\",\n payload: { pluginID },\n });\n };\n\n const handleInteraction = ({\n type,\n payload,\n target,\n }: {\n type: string;\n payload?: string;\n /** Player to address; defaults to the currently selected player. */\n target?: string;\n }): void => {\n const resolvedTarget = target ?? store.getState().current.player;\n messenger.sendMessage({\n type: \"PLAYER_DEVTOOLS_PLUGIN_INTERACTION\",\n payload: { type, payload },\n ...(resolvedTarget ? { target: resolvedTarget } : {}),\n });\n };\n\n return {\n getState: store.getState,\n subscribe: store.subscribe,\n selectPlayer,\n selectPlugin,\n handleInteraction,\n destroy: () => messenger.destroy(),\n };\n};\n","import type { ExtensionState } from \"@player-devtools/types\";\n\nexport const INITIAL_EXTENSION_STATE: ExtensionState = {\n current: {\n player: null,\n plugin: null,\n },\n players: {},\n};\n","import type {\n ExtensionState,\n ExtensionSupportedEvents,\n Transaction,\n} from \"@player-devtools/types\";\nimport { dsetAssign } from \"@player-devtools/utils\";\nimport { produce } from \"immer\";\n\n/** Extension state reducer */\nexport const reducer = (\n state: ExtensionState,\n transaction: Transaction<ExtensionSupportedEvents>,\n): ExtensionState => {\n switch (transaction.type) {\n case \"PLAYER_DEVTOOLS_PLAYER_INIT\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { plugins },\n } = transaction;\n\n const [plugin] = Object.values(plugins);\n if (!plugin) return;\n\n draft.current.player = sender;\n draft.current.plugin = draft.current.plugin || plugin.id;\n\n // TODO: Verify this works with multiple plugins\n dsetAssign(draft, [\"players\", sender, \"plugins\"], plugins, true);\n dsetAssign(draft.players, [sender, \"active\"], true);\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_FLOW_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { flow, pluginID },\n } = transaction;\n\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\"],\n flow,\n );\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_DATA_CHANGE\":\n return produce(state, (draft) => {\n const {\n sender,\n payload: { data, pluginID },\n } = transaction;\n dsetAssign(\n draft,\n [\"players\", sender, \"plugins\", pluginID, \"flow\", \"data\"],\n data,\n );\n });\n case \"MESSENGER_EVENT_BATCH\":\n return transaction.payload.events.reduce(reducer, state);\n case \"PLAYER_DEVTOOLS_PLAYER_STOPPED\":\n return produce(state, (draft) => {\n const { sender, payload } = transaction;\n const player = draft.players[sender];\n if (!player) return;\n\n // Only drop the player once its last plugin has stopped\n const stoppedPluginID = payload?.pluginID;\n if (stoppedPluginID && player.plugins) {\n delete player.plugins[stoppedPluginID];\n\n const [remaining] = Object.keys(player.plugins);\n if (remaining) {\n if (\n draft.current.player === sender &&\n draft.current.plugin === stoppedPluginID\n ) {\n draft.current.plugin = remaining;\n }\n return;\n }\n }\n\n delete draft.players[sender];\n\n // Move the selection off the removed player\n if (draft.current.player === sender) {\n const nextPlayer = Object.keys(draft.players)[0] ?? null;\n draft.current.player = nextPlayer;\n\n const nextPlugins = Object.keys(\n (nextPlayer && draft.players[nextPlayer]?.plugins) || {},\n );\n const { plugin } = draft.current;\n if (!plugin || !nextPlugins.includes(plugin)) {\n draft.current.plugin = nextPlugins[0] ?? null;\n }\n }\n });\n case \"PLAYER_DEVTOOLS_PLAYER_SELECTED\":\n return produce(state, (draft) => {\n const { playerID } = transaction.payload;\n draft.current.player = playerID;\n });\n case \"PLAYER_DEVTOOLS_PLUGIN_SELECTED\":\n return produce(state, (draft) => {\n const { pluginID } = transaction.payload;\n draft.current.plugin = pluginID;\n });\n default:\n return state;\n }\n};\n"],"mappings":"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","names":[]}
package/package.json CHANGED
@@ -6,12 +6,12 @@
6
6
  "types"
7
7
  ],
8
8
  "name": "@player-devtools/client",
9
- "version": "0.16.1-next.1",
9
+ "version": "0.16.1-next.3",
10
10
  "main": "dist/cjs/index.cjs",
11
11
  "dependencies": {
12
- "@player-devtools/messenger": "0.16.1-next.1",
13
- "@player-devtools/types": "0.16.1-next.1",
14
- "@player-devtools/utils": "0.16.1-next.1",
12
+ "@player-devtools/messenger": "0.16.1-next.3",
13
+ "@player-devtools/types": "0.16.1-next.3",
14
+ "@player-devtools/utils": "0.16.1-next.3",
15
15
  "immer": "^10.0.3",
16
16
  "dequal": "^2.0.2",
17
17
  "tslib": "^2.6.2"
@@ -1,5 +1,6 @@
1
1
  import { describe, expect, test } from "vitest";
2
2
  import type {
3
+ ExtensionState,
3
4
  Transaction,
4
5
  DevtoolsDataChangeEvent,
5
6
  PlayerInitEvent,
@@ -329,25 +330,167 @@ describe("reducer", () => {
329
330
  `);
330
331
  });
331
332
 
332
- test("PLAYER_DEVTOOLS_PLAYER_STOPPED", () => {
333
- const newState = reducer(
334
- INITIAL_EXTENSION_STATE,
335
- mockPlayerStoppedTransaction,
336
- );
333
+ describe("PLAYER_DEVTOOLS_PLAYER_STOPPED", () => {
334
+ const initWith = (...ids: Array<string>) =>
335
+ ids.reduce(
336
+ (state, id) =>
337
+ reducer(state, { ...mockPlayerInitTransaction, sender: id }),
338
+ INITIAL_EXTENSION_STATE,
339
+ );
337
340
 
338
- expect(newState).toMatchInlineSnapshot(`
339
- {
340
- "current": {
341
- "player": null,
342
- "plugin": null,
343
- },
344
- "players": {
345
- "sender-id": {
346
- "active": false,
341
+ test("removes the player", () => {
342
+ const state = reducer(
343
+ initWith("sender-id"),
344
+ mockPlayerStoppedTransaction,
345
+ );
346
+
347
+ expect(state.players).toEqual({});
348
+ });
349
+
350
+ test("leaves other players alone", () => {
351
+ const state = reducer(
352
+ initWith("sender-id", "other-id"),
353
+ mockPlayerStoppedTransaction,
354
+ );
355
+
356
+ expect(Object.keys(state.players)).toEqual(["other-id"]);
357
+ });
358
+
359
+ test("moves the selection off a removed player", () => {
360
+ const before = initWith("other-id", "sender-id");
361
+ expect(before.current.player).toBe("sender-id");
362
+
363
+ const state = reducer(before, mockPlayerStoppedTransaction);
364
+
365
+ expect(state.current.player).toBe("other-id");
366
+ expect(state.current.plugin).toBe("plugin-id");
367
+ });
368
+
369
+ test("selects a plugin the new player actually has", () => {
370
+ const withPlugin = (
371
+ state: ExtensionState,
372
+ id: string,
373
+ pluginID: string,
374
+ ) =>
375
+ reducer(state, {
376
+ ...mockPlayerInitTransaction,
377
+ sender: id,
378
+ payload: {
379
+ plugins: {
380
+ [pluginID]: {
381
+ ...mockPlayerInitTransaction.payload.plugins["plugin-id"]!,
382
+ id: pluginID,
383
+ },
384
+ },
347
385
  },
348
- },
349
- }
350
- `);
386
+ });
387
+ // The selected player only has "basic". The other one only has "profiler".
388
+ let before = withPlugin(INITIAL_EXTENSION_STATE, "other-id", "profiler");
389
+ before = withPlugin(before, "sender-id", "basic");
390
+ expect(before.current).toEqual({
391
+ player: "sender-id",
392
+ plugin: "profiler",
393
+ });
394
+ before = reducer(before, {
395
+ ...mockPlayerSelectedTransaction,
396
+ payload: { playerID: "sender-id" },
397
+ });
398
+ before = reducer(before, {
399
+ ...mockPluginSelectedTransaction,
400
+ payload: { pluginID: "basic" },
401
+ });
402
+
403
+ const state = reducer(before, mockPlayerStoppedTransaction);
404
+
405
+ expect(state.current).toEqual({ player: "other-id", plugin: "profiler" });
406
+ });
407
+
408
+ test("clears the selection when the last player is removed", () => {
409
+ const state = reducer(
410
+ initWith("sender-id"),
411
+ mockPlayerStoppedTransaction,
412
+ );
413
+
414
+ expect(state.current).toEqual({ player: null, plugin: null });
415
+ });
416
+
417
+ test("keeps the selection when a different player is removed", () => {
418
+ const state = reducer(
419
+ initWith("sender-id", "other-id"),
420
+ mockPlayerStoppedTransaction,
421
+ );
422
+
423
+ expect(state.current.player).toBe("other-id");
424
+ });
425
+
426
+ test("is a no-op for an unknown player", () => {
427
+ const state = reducer(
428
+ INITIAL_EXTENSION_STATE,
429
+ mockPlayerStoppedTransaction,
430
+ );
431
+
432
+ expect(state).toEqual(INITIAL_EXTENSION_STATE);
433
+ });
434
+
435
+ describe("with a pluginID", () => {
436
+ const stopped = (pluginID: string) => ({
437
+ ...mockPlayerStoppedTransaction,
438
+ payload: { pluginID },
439
+ });
440
+ const initPlugin = (state: ExtensionState, pluginID: string) =>
441
+ reducer(state, {
442
+ ...mockPlayerInitTransaction,
443
+ payload: {
444
+ plugins: {
445
+ [pluginID]: {
446
+ ...mockPlayerInitTransaction.payload.plugins["plugin-id"]!,
447
+ id: pluginID,
448
+ },
449
+ },
450
+ },
451
+ });
452
+ const twoPlugins = () =>
453
+ initPlugin(initPlugin(INITIAL_EXTENSION_STATE, "plugin-a"), "plugin-b");
454
+
455
+ test("keeps the player while other plugins remain", () => {
456
+ const state = reducer(twoPlugins(), stopped("plugin-a"));
457
+
458
+ expect(Object.keys(state.players["sender-id"]!.plugins)).toEqual([
459
+ "plugin-b",
460
+ ]);
461
+ expect(state.current.player).toBe("sender-id");
462
+ });
463
+
464
+ test("removes the player when its last plugin stops", () => {
465
+ const state = reducer(
466
+ reducer(twoPlugins(), stopped("plugin-a")),
467
+ stopped("plugin-b"),
468
+ );
469
+
470
+ expect(state.players).toEqual({});
471
+ expect(state.current).toEqual({ player: null, plugin: null });
472
+ });
473
+
474
+ test("moves the selected plugin off a removed one", () => {
475
+ const before = twoPlugins();
476
+ expect(before.current.plugin).toBe("plugin-a");
477
+
478
+ const state = reducer(before, stopped("plugin-a"));
479
+
480
+ expect(state.current.plugin).toBe("plugin-b");
481
+ });
482
+ });
483
+
484
+ test("a re-announce after removal re-adds the player (same ID reuse)", () => {
485
+ const stopped = reducer(
486
+ initWith("sender-id"),
487
+ mockPlayerStoppedTransaction,
488
+ );
489
+ const state = reducer(stopped, mockPlayerInitTransaction);
490
+
491
+ expect(Object.keys(state.players)).toEqual(["sender-id"]);
492
+ expect(state.current.player).toBe("sender-id");
493
+ });
351
494
  });
352
495
 
353
496
  test("PLAYER_DEVTOOLS_PLAYER_SELECTED", () => {
@@ -58,8 +58,42 @@ export const reducer = (
58
58
  return transaction.payload.events.reduce(reducer, state);
59
59
  case "PLAYER_DEVTOOLS_PLAYER_STOPPED":
60
60
  return produce(state, (draft) => {
61
- const { sender } = transaction;
62
- dsetAssign(draft, ["players", sender, "active"], false);
61
+ const { sender, payload } = transaction;
62
+ const player = draft.players[sender];
63
+ if (!player) return;
64
+
65
+ // Only drop the player once its last plugin has stopped
66
+ const stoppedPluginID = payload?.pluginID;
67
+ if (stoppedPluginID && player.plugins) {
68
+ delete player.plugins[stoppedPluginID];
69
+
70
+ const [remaining] = Object.keys(player.plugins);
71
+ if (remaining) {
72
+ if (
73
+ draft.current.player === sender &&
74
+ draft.current.plugin === stoppedPluginID
75
+ ) {
76
+ draft.current.plugin = remaining;
77
+ }
78
+ return;
79
+ }
80
+ }
81
+
82
+ delete draft.players[sender];
83
+
84
+ // Move the selection off the removed player
85
+ if (draft.current.player === sender) {
86
+ const nextPlayer = Object.keys(draft.players)[0] ?? null;
87
+ draft.current.player = nextPlayer;
88
+
89
+ const nextPlugins = Object.keys(
90
+ (nextPlayer && draft.players[nextPlayer]?.plugins) || {},
91
+ );
92
+ const { plugin } = draft.current;
93
+ if (!plugin || !nextPlugins.includes(plugin)) {
94
+ draft.current.plugin = nextPlugins[0] ?? null;
95
+ }
96
+ }
63
97
  });
64
98
  case "PLAYER_DEVTOOLS_PLAYER_SELECTED":
65
99
  return produce(state, (draft) => {