feat: adding apps_list and apps_terminate

gmegidish · gmegidish · commit bb15176ccd28 · 2026-01-13T16:08:05.000+01:00
diff --git a/docs/jsonrpc_README.md b/docs/jsonrpc_README.md
@@ -144,6 +144,17 @@ This section documents the JSON-RPC methods registered by the server and shows e
 		- `deviceId` (string)
 		- `bundleId` (string) - required
 
+- `apps_terminate`
+	- Description: Terminate a running app on a device.
+	- Params: object
+		- `deviceId` (string)
+		- `bundleId` (string) - required
+
+- `apps_list`
+	- Description: List installed apps on a device.
+	- Params: object (optional)
+		- `deviceId` (string)
+
 Common notes:
 - For most methods `deviceId` is optional; when omitted the server auto-selects a single online device or returns an error when multiple devices are available.
 - Methods that interact with the UI/agent (`io_*`, `dump_ui`, `apps_launch`, `device_info`, etc.) call `StartAgent` which may start/forward WDA for iOS devices. If WDA is unresponsive the server will attempt to relaunch it.
@@ -245,3 +256,19 @@ curl -s -X POST http://localhost:12000/rpc \
 	-H 'Content-Type: application/json' \
 	-d '{"jsonrpc":"2.0","method":"apps_launch","params":{"deviceId":"<id>","bundleId":"com.example.app"},"id":20}'
 ```
+
+- Terminate app:
+
+```bash
+curl -s -X POST http://localhost:12000/rpc \
+	-H 'Content-Type: application/json' \
+	-d '{"jsonrpc":"2.0","method":"apps_terminate","params":{"deviceId":"<id>","bundleId":"com.example.app"},"id":21}'
+```
+
+- List apps:
+
+```bash
+curl -s -X POST http://localhost:12000/rpc \
+	-H 'Content-Type: application/json' \
+	-d '{"jsonrpc":"2.0","method":"apps_list","params":{"deviceId":"<id>"},"id":22}'
+```
diff --git a/server/server.go b/server/server.go
@@ -188,6 +188,10 @@ func handleJSONRPC(w http.ResponseWriter, r *http.Request) {
 		result, err = handleDumpUI(req.Params)
 	case "apps_launch":
 		result, err = handleAppsLaunch(req.Params)
+	case "apps_terminate":
+		result, err = handleAppsTerminate(req.Params)
+	case "apps_list":
+		result, err = handleAppsList(req.Params)
 	case "":
 		err = fmt.Errorf("'method' is required")
 
@@ -469,6 +473,15 @@ type AppsLaunchParams struct {
 	BundleID string `json:"bundleId"`
 }
 
+type AppsTerminateParams struct {
+	DeviceID string `json:"deviceId"`
+	BundleID string `json:"bundleId"`
+}
+
+type AppsListParams struct {
+	DeviceID string `json:"deviceId"`
+}
+
 func handleIoButton(params json.RawMessage) (interface{}, error) {
 	if len(params) == 0 {
 		return nil, fmt.Errorf("'params' is required with fields: deviceId, button")
@@ -726,6 +739,49 @@ func handleAppsLaunch(params json.RawMessage) (interface{}, error) {
 	return response.Data, nil
 }
 
+func handleAppsTerminate(params json.RawMessage) (interface{}, error) {
+	if len(params) == 0 {
+		return nil, fmt.Errorf("'params' is required with fields: deviceId, bundleId")
+	}
+
+	var appsTerminateParams AppsTerminateParams
+	if err := json.Unmarshal(params, &appsTerminateParams); err != nil {
+		return nil, fmt.Errorf("invalid parameters: %v. Expected fields: deviceId, bundleId", err)
+	}
+
+	req := commands.AppRequest{
+		DeviceID: appsTerminateParams.DeviceID,
+		BundleID: appsTerminateParams.BundleID,
+	}
+
+	response := commands.TerminateAppCommand(req)
+	if response.Status == "error" {
+		return nil, fmt.Errorf("%s", response.Error)
+	}
+
+	return response.Data, nil
+}
+
+func handleAppsList(params json.RawMessage) (interface{}, error) {
+	var appsListParams AppsListParams
+	if len(params) > 0 {
+		if err := json.Unmarshal(params, &appsListParams); err != nil {
+			return nil, fmt.Errorf("invalid parameters: %v. Expected fields: deviceId (optional)", err)
+		}
+	}
+
+	req := commands.ListAppsRequest{
+		DeviceID: appsListParams.DeviceID,
+	}
+
+	response := commands.ListAppsCommand(req)
+	if response.Status == "error" {
+		return nil, fmt.Errorf("%s", response.Error)
+	}
+
+	return response.Data, nil
+}
+
 func sendJSONRPCError(w http.ResponseWriter, id interface{}, code int, message string, data interface{}) {
 	response := JSONRPCResponse{
 		JSONRPC: "2.0",
