Added HIDScript background jobs to CLI; Added test scripts for HIDScript

2025-03-27 01:51:45 +01:00 · 2018-06-29 20:42:55 +00:00 · 2018-06-29 20:42:55 +00:00 · ae87064ae9
commit ae87064ae9
parent 1c7389f77f
16 changed files with 454 additions and 188 deletions
--- a/HIDScripts/cosmouse.js
+++ b/HIDScripts/cosmouse.js
@ -0,0 +1,11 @@
+step = Math.PI / 90.0;
+scale = 6.0
+alpha = 0.0
+horizontal = false;
+while(true) {
+	v = Math.cos(alpha) * scale;
+	alpha += step;
+	if (horizontal) moveStepped(v,0);
+	else moveStepped(0,v);
+	delay(10);
+}
--- a/HIDScripts/mousejiggle.js
+++ b/HIDScripts/mousejiggle.js
@ -0,0 +1,17 @@
+//Creds to Rogan Dawes
+//
+// Moves the mouse slightly from time, to simulate user activity (supress screensaver/lockscreen)
+// Meant to run as background job
+// With extrem settings, it could be use to prank users
+
+scale = 2.0; //if not stepped, 127 is vali max
+sleeptime = 3000;
+stepped = true;
+while (true) {
+	x = (Math.random() * 2.0 - 1.0) * scale;
+	y = (Math.random() * 2.0 - 1.0) * scale;
+	if (stepped) moveStepped(x,y);
+	else move(x,y);
+	delay(sleeptime);
+}
+
--- a/HIDScripts/ms_snake.js
+++ b/HIDScripts/ms_snake.js
@ -0,0 +1,60 @@
+button(BTNONE);
+
+//Log something to internal console
+console.log("HID testscript");
+
+layout("US"); //set US layout
+
+//Natural typing speed (100 ms between keys + additional jitter up to 200 ms)
+typingSpeed(100,200);
+type("Typing in natural speed");
+
+layout("DE"); //Switching language layout, while script still running
+
+//Fastest typing speed (no delays)
+typingSpeed(0,0);
+type("Typing fast, including  unicode: üÜöÖäÄ");
+
+//Do some relative mouse movement
+for (var i = 0; i<10; i++) {
+    x = Math.random() * 256 - 128; //x, scaled between -128 and 127
+    y = Math.random() * 256 - 128; //y, scaled between -128 and 127
+    move(x,y);
+    delay(500); //wait a half a second
+}
+
+//Do some relative mouse movement, but divide it into 1 DPI substeps (pixel perfect mouse move, but slow)
+for (var i = 0; i<10; i++) {
+    x = Math.random() * 256 - 128; //x, scaled between -128 and 127
+    y = Math.random() * 256 - 128; //y, scaled between -128 and 127
+    moveStepped(x,y);
+    delay(500); //wait a half a second
+}
+
+//Do some absolute Mouse positioning (not stepped, mouse moves immediately, thus delays are added)
+moveTo(0.2,0.2);
+delay(1000);
+moveTo(0.8,0.2);
+delay(1000);
+moveTo(0.8,0.8);
+delay(1000);
+moveTo(0.2,0.8);
+delay(1000);
+
+//press button 1, move mouse stepped, release button 1
+console.log("Moving mouse with button 1 pressed");
+button(BT1);
+moveStepped(20,0);
+button(BTNONE);
+delay(500);
+
+//Click button 2
+console.log("Click button 2");
+click(BT2);
+
+//Doubleclick button 1
+console.log("Double click button 2");
+doubleClick(BT1);
+
+//release all buttons
+button(BTNONE);
--- a/HIDScripts/sinmouse.js
+++ b/HIDScripts/sinmouse.js
@ -0,0 +1,11 @@
+step = Math.PI / 90.0;
+scale = 6.0
+alpha = 0.0
+horizontal = true;
+while(true) {
+	v = Math.sin(alpha) * scale;
+	alpha += step;
+	if (horizontal) moveStepped(v,0);
+	else moveStepped(0,v);
+	delay(10);
+}
--- a/HIDScripts/test1.js
+++ b/HIDScripts/test1.js
@ -0,0 +1,8 @@
+//Endless looping script moving mouse, used to test interrupts and timeouts
+while(true) {
+	moveStepped(200,0);
+	moveStepped(0,-200);
+	moveStepped(-200,0);
+	moveStepped(0,200);
+	delay(1000);
+}
--- a/HIDScripts/test2.js
+++ b/HIDScripts/test2.js
@ -0,0 +1,8 @@
+//Endless looping script moving mouse, used to test interrupts and timeouts
+while(true) {
+	moveStepped(200,0);
+	moveStepped(0,-200);
+	moveStepped(-200,0);
+	moveStepped(0,200);
+	delay(1000);
+}
--- a/ToDo.txt
+++ b/ToDo.txt
@ -1,30 +1,55 @@
 CLI
 - add config caps for missing USB settings (serial, vid, pid ...)
- PARTIALY: add functionality to issue HIDScripts
-	- run async scripts
-	- proper job management and cancelation
-	- retrieve log output of scripts
+- DONE: add functionality to issue HIDScripts
+	- DEONE: run async scripts
+	- DONE: proper job management and cancelation
+- retrieve log output of scripts - !LOGGING HAS TO BE REWORKED COMPLETELY, TONS OF DEBUG OUT RIGHT NOW, MIXED
+USE OF STDOUT/STDERR!!
+- function to retrieve running HIDScript background jobs + function to interrupt all jobs

 BOOT
- deploy a default boot payload (Post Run in systemd service ??, config via /etc/P4wnP1/settings)
+- deploy a default boot payload/configuration (Post Run in systemd service ??, config via /etc/P4wnP1/settings)

 USB
 - DONE: add functionality to fetch target devices for HID (e.g. keyboard could be at /dev/hidg0..n depending on USB config)
- init HIDController
+- DONE: init HIDController

 HID
 - add additional keyboard layouts (not for first release)
+- add function to retrieve LED state (currently changes only)
 - DONE: fix absolute mouse movement
- DONE: avoid memory leak on reinit of HIDController
+- DONE: avoid memory leak on re-init of HIDController (re-use of memory leaking VMs + limited VM pool size, to keep
+impact reasonable)
 - DONE: implement job management
 - DONE: implement context for cancellation and cancellation propagation
- DONE: blocking JavaScript to go callbacks (waitLED, delay, waitLEDRepeated) have to consume the otto.Otto.Interrupt channel
-to be able to be aborted when Otto is interrupted
+- DONE: interrupt blocking JavaScript to Go callbacks (waitLED, delay, waitLEDRepeated) by consuming VM IRQ channel

 WIFI
 - implement connection to OPEN-AUTH network as STA
 - implement nexmon firmware support (not for first release)

+BLUETOOTH:
+- configuration cpabilities for BNEP/NAP on server, keep in mind BLE use cases (idea of stand-alone proxy)
+- gRPC implementation
+- CLI client support
+
+FILESYSTEM (not for first release)
+- remote pwd, cd, download, upload (up and download already implemented for HID script transfer)
+
+DOCUMENTATION (not on first release ... yes, I know, anyway)
+- HIDScript docu (basically ES5 with some additional commands)
+- CLI docu (let's rely on the built-in help screens, for now. They need to be reworked themselves)
+- folder structure of resources/configuration files
+- language map format
+--> Lesson learned: Documenting, by providing example payloads didn't worked out for the P4wnP1 community (nearly no
+external payload contributions)
+
+OTHER:
+- extend installer to movee HIDScripts to a fixed absolute path
+
 TO FIX:
 - debug out of HIDScript puts way to much CPU load on journaling daemon (floods logs)
- allow gRPC server to abort Running HID scripts on context.DONE
+- allow gRPC server to abort Running HID scripts on context.Done() -> possible, testing needed
+- jobs aren't deleted from global job list, unless result is fetched with waitResult. This affects interrupted
+jobs (f.e. timeout) and jobs run as background job --> cancelled jobs need a way to communicate back to the controller,
+that they could be deleted (Solution: goroutine listening for context.Done() per job in controller)
--- a/cli_client/cmd_hid.go
+++ b/cli_client/cmd_hid.go
@ -9,12 +9,13 @@ import (
 	"os"
 	"errors"
 	"log"
+	"strconv"
 )

 var (
 	tmpHidCommands = ""
 	tmpRunFromServerPath = ""
-	tmpHidTimeout = -1 // values < 0 = endless
+	tmpHidTimeout = uint32(0) // values < 0 = endless
 )

 var hidCmd = &cobra.Command{
@ -36,6 +37,12 @@ var hidJobCmd = &cobra.Command{
 	Run: cobraHidJob,
 }

+var hidJobCancelCmd = &cobra.Command{
+	Use:   "cancel",
+	Short: "Cancel background job given by its ID",
+	Run: cobraHidJobCancel,
+}
+
 // Decision on how to run scripts (terms "local"/"remote" from perspective of gRPC server):
 //
 // 1) `P4wnP1_cli HID run` (no host flag, no additional args)
@ -174,8 +181,7 @@ func cobraHidRun(cmd *cobra.Command, args []string) {
 	serverScriptFilePath, err := parseHIDRunScripCmd(cmd,args)
 	if err != nil { log.Fatal(err)}

-	//ToDo: retrieve result and print it
-	res,err := ClientHIDRunScript(StrRemoteHost, StrRemotePort, serverScriptFilePath)
+	res,err := ClientHIDRunScript(StrRemoteHost, StrRemotePort, serverScriptFilePath, tmpHidTimeout)
 	if err != nil { log.Fatal(err) }

 	fmt.Println(res.ResultJson)
@ -184,26 +190,25 @@ func cobraHidRun(cmd *cobra.Command, args []string) {


 func cobraHidJob(cmd *cobra.Command, args []string) {
-	parseHIDRunScripCmd(cmd,args)
-	/*
-	settings, err := createWifiAPSettings(tmpWifiStrChannel, tmpWifiStrReg, tmpWifiSSID, tmpWifiPSK, tmpWifiHideSSID, tmpWifiDisableNexmon, tmpWifiDisabled)
-	if err != nil {
-		fmt.Printf("Error: %v\n", err)
-
-		os.Exit(-1) //exit with error
-		return
-	}
+	serverScriptFilePath, err := parseHIDRunScripCmd(cmd,args)
+	if err != nil { log.Fatal(err)}


-	fmt.Printf("Deploying WiFi inteface settings:\n\t%v\n", settings)
+	job,err := ClientHIDRunScriptJob(StrRemoteHost, StrRemotePort, serverScriptFilePath, tmpHidTimeout)
+	if err != nil { log.Fatal(err) }

-	err = ClientDeployWifiSettings(StrRemoteHost, StrRemotePort, settings)
-	if err != nil {
-		fmt.Println(status.Convert(err).Message())
-		os.Exit(-1) //exit with error
-	}
+	fmt.Printf("Job ID: %d\n", job.Id)
+	return
+}
+
+func cobraHidJobCancel(cmd *cobra.Command, args []string) {
+	if len(args) < 1 { log.Fatal("Job ID to cancel has to be given as argument\n")}
+	jobID,err := strconv.ParseUint(args[0], 10, 32)
+	if err != nil { log.Fatalf("Error parsing job ID '%s' ton integer\n", args[0])}
+
+	err = ClientHIDCancelScriptJob(StrRemoteHost, StrRemotePort, uint32(jobID))
+	if err != nil { log.Fatal(err) }

-*/
 	return
 }

@ -213,12 +218,13 @@ func init() {
 	rootCmd.AddCommand(hidCmd)
 	hidCmd.AddCommand(hidRunCmd)
 	hidCmd.AddCommand(hidJobCmd)
+	hidJobCmd.AddCommand(hidJobCancelCmd)

 	hidRunCmd.Flags().StringVarP(&tmpHidCommands, "commands","c", "", "HIDScript commands to run, given as string")
 	hidRunCmd.Flags().StringVarP(&tmpRunFromServerPath, "server-path","r", "", "Load HIDScript from given path on P4wnP1 server")
-	hidRunCmd.Flags().IntVarP(&tmpHidTimeout, "timeout","t", -1, "Abort waiting for HIDScript result after this timeout (seconds)")
+	hidRunCmd.Flags().Uint32VarP(&tmpHidTimeout, "timeout","t", 0, "Interrupt HIDScript after this timeout (seconds)")

 	hidJobCmd.Flags().StringVarP(&tmpHidCommands, "commands","c", "", "HIDScript commands to run, given as string")
 	hidJobCmd.Flags().StringVarP(&tmpRunFromServerPath, "server-path","r", "", "Load HIDScript from given path on P4wnP1 server")
-
+	hidJobCmd.Flags().Uint32VarP(&tmpHidTimeout, "timeout","t", 0, "Interrupt HIDScript after this timeout (seconds)")
 }
--- a/cli_client/rpc_client.go
+++ b/cli_client/rpc_client.go
@ -260,9 +260,10 @@ func ClientDeployWifiSettings(host string, port string, settings *pb.WiFiSetting
 	return err
 }

-func ClientHIDRunScript(host string, port string, scriptPath string) (scriptRes *pb.HIDScriptResult, err error) {
+func ClientHIDRunScript(host string, port string, scriptPath string, timeoutSeconds uint32) (scriptRes *pb.HIDScriptResult, err error) {
 	scriptReq := &pb.HIDScriptRequest{
 		ScriptPath: scriptPath,
+		TimeoutSeconds: timeoutSeconds,
 	}

 	address := host + ":" + port
@ -278,9 +279,10 @@ func ClientHIDRunScript(host string, port string, scriptPath string) (scriptRes
 	return
 }

-func ClientHIDRunScriptJob(host string, port string, scriptPath string) (sctipJob *pb.HIDScriptJob, err error) {
+func ClientHIDRunScriptJob(host string, port string, scriptPath string, timeoutSeconds uint32) (scriptJob *pb.HIDScriptJob, err error) {
 	scriptReq := &pb.HIDScriptRequest{
 		ScriptPath: scriptPath,
+		TimeoutSeconds: timeoutSeconds,
 	}

 	address := host + ":" + port
@ -292,6 +294,43 @@ func ClientHIDRunScriptJob(host string, port string, scriptPath string) (sctipJo
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second * 30)
 	defer cancel()

-	sctipJob,err = rpcClient.HIDRunScriptJob(ctx, scriptReq)
+	scriptJob,err = rpcClient.HIDRunScriptJob(ctx, scriptReq)
+	return
+}
+
+func ClientHIDCancelScriptJob(host string, port string, jobID uint32) (err error) {
+	cancelReq := &pb.HIDScriptJob{
+		Id: jobID,
+	}
+
+	address := host + ":" + port
+	connection, err := grpc.Dial(address, grpc.WithInsecure())
+	if err != nil { log.Fatalf("Could not connect to P4wnP1 RPC server: %v", err) }
+	defer connection.Close()
+
+	rpcClient := pb.NewP4WNP1Client(connection)
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second * 30)
+	defer cancel()
+
+	_,err = rpcClient.HIDCancelScriptJob(ctx, cancelReq)
+	return
+}
+
+
+func ClientHIDGetScriptJobResult(host string, port string, jobID uint32) (scriptRes *pb.HIDScriptResult, err error) {
+	req := &pb.HIDScriptJob{
+		Id: jobID,
+	}
+
+	address := host + ":" + port
+	connection, err := grpc.Dial(address, grpc.WithInsecure())
+	if err != nil { log.Fatalf("Could not connect to P4wnP1 RPC server: %v", err) }
+	defer connection.Close()
+
+	rpcClient := pb.NewP4WNP1Client(connection)
+	//	ctx, cancel := context.WithTimeout(context.Background(), time.Second * 30)
+	//	defer cancel()
+
+	scriptRes,err = rpcClient.HIDGetScriptJobResult(context.Background(), req)
 	return
 }
--- a/hid/controller.go
+++ b/hid/controller.go
@ -53,14 +53,14 @@ var (
 type HIDController struct {
 	Keyboard *HIDKeyboard
 	Mouse *Mouse
-	vmPool [MAX_VM]*AsyncOttoVM //ToDo: check if this could be changed to sync.Pool
+	vmPool [MAX_VM]*AsyncOttoVM
 	vmMaster *otto.Otto
 	ctx context.Context
 	cancel context.CancelFunc
 }

 func NewHIDController(ctx context.Context, keyboardDevicePath string, keyboardMapPath string, mouseDevicePath string) (ctl *HIDController, err error) {
-	//ToDo: check if hidcontroller could work with a context whith cancellation, which then could be cancelled on reuse of the object
+	//ToDo: check if hidcontroller could work with a context with cancellation, which then could be cancelled on reuse of the object
 	if hidControllerReuse == nil {
 		hidControllerReuse = &HIDController{}

@ -126,11 +126,19 @@ func (ctl *HIDController) NextUnusedVM() (vm *AsyncOttoVM, err error) {
 }

 func (ctl *HIDController) RunScript(ctx context.Context, script string) (val otto.Value, err error) {
+	/*
 	//fetch next free vm from pool
 	avm,err := ctl.NextUnusedVM()
 	if err != nil { return otto.Value{}, err }

 	val, err = avm.Run(ctx, script)
+	*/
+
+	// use backround job and wait, to force keeping track of job in joblist, in case the result is never fetched due to
+	// remote CLI abort after running endless script (wouldn't cancel the script)
+	job,err := ctl.StartScriptAsBackgroundJob(ctx, script)
+	if err != nil { return val,err }
+	val,err = ctl.WaitBackgroundJobResult(ctx, job)
 	return
 }

@ -168,7 +176,7 @@ func (ctl *HIDController) StartScriptAsBackgroundJob(ctx context.Context,script
 	return
 }

-func (ctl *HIDController) WaitBackgroundJobResult(job *AsyncOttoJob) (val otto.Value, err error) {
+func (ctl *HIDController) WaitBackgroundJobResult(ctx context.Context, job *AsyncOttoJob) (val otto.Value, err error) {
 	globalJobListMutex.Lock()
 	if !globalJobList[job] {
 		err = errors.New(fmt.Sprintf("Tried to retrieve results of job with id %d failed, because it is not in the list of background jobs", job.Id))
@ -176,6 +184,15 @@ func (ctl *HIDController) WaitBackgroundJobResult(job *AsyncOttoJob) (val otto.V
 	globalJobListMutex.Unlock()
 	if err != nil {return}

+	//cancel job when provided context is done
+	// ToDo: do profiling to check if this go routine stays open, in case ctx is never done
+	go func(ctx context.Context, job *AsyncOttoJob) {
+		select {
+		case <- ctx.Done():
+			job.Cancel()
+		}
+	}(ctx,job)
+
 	val,err = job.WaitResult() //Blocking result wait

 	//remove job from global list after result has been retrieved
@ -291,8 +308,7 @@ func (ctl *HIDController) jsDelay(call otto.FunctionCall) (res otto.Value) {
 		return
 	}
 	delay := int(fDelay)
-	log.Printf("HIDScript delay: Sleeping `%v` milliseconds\n", delay)
-	//time.Sleep(time.Millisecond * time.Duration(int(delay)))
+//	log.Printf("HIDScript delay: Sleeping `%v` milliseconds\n", delay)

 	select {
 		case <- time.After(time.Millisecond * time.Duration(int(delay))):
@ -686,7 +702,7 @@ func (ctl *HIDController) initVM(vm *otto.Otto) (err error) {
 	if err != nil { return err }
 	err = vm.Set("waitLEDRepeat", ctl.jsWaitLEDRepeat)
 	if err != nil { return err }
-	err = vm.Set("layout", ctl.jsLayout)
+	err = vm.Set("layout", ctl.jsLayout) // this influences all scripts
 	if err != nil { return err }

 	err = vm.Set("move", ctl.jsMove)
--- a/proto/gopherjs/grpc.pb.gopherjs.go
+++ b/proto/gopherjs/grpc.pb.gopherjs.go
@ -719,7 +719,8 @@ func (m *FileInfoResponse) Unmarshal(rawBytes []byte) (*FileInfoResponse, error)

 // HID
 type HIDScriptRequest struct {
-	ScriptPath string
+	ScriptPath     string
+	TimeoutSeconds uint32
 }

 // GetScriptPath gets the ScriptPath of the HIDScriptRequest.
@ -730,6 +731,14 @@ func (m *HIDScriptRequest) GetScriptPath() (x string) {
 	return m.ScriptPath
 }

+// GetTimeoutSeconds gets the TimeoutSeconds of the HIDScriptRequest.
+func (m *HIDScriptRequest) GetTimeoutSeconds() (x uint32) {
+	if m == nil {
+		return x
+	}
+	return m.TimeoutSeconds
+}
+
 // MarshalToWriter marshals HIDScriptRequest to the provided writer.
 func (m *HIDScriptRequest) MarshalToWriter(writer jspb.Writer) {
 	if m == nil {
@ -740,6 +749,10 @@ func (m *HIDScriptRequest) MarshalToWriter(writer jspb.Writer) {
 		writer.WriteString(1, m.ScriptPath)
 	}

+	if m.TimeoutSeconds != 0 {
+		writer.WriteUint32(2, m.TimeoutSeconds)
+	}
+
 	return
 }

@ -760,6 +773,8 @@ func (m *HIDScriptRequest) UnmarshalFromReader(reader jspb.Reader) *HIDScriptReq
 		switch reader.GetFieldNumber() {
 		case 1:
 			m.ScriptPath = reader.ReadString()
+		case 2:
+			m.TimeoutSeconds = reader.ReadUint32()
 		default:
 			reader.SkipField()
 		}
@ -2330,8 +2345,8 @@ type P4WNP1Client interface {
 	DeployWifiSettings(ctx context.Context, in *WiFiSettings, opts ...grpcweb.CallOption) (*Empty, error)
 	HIDRunScript(ctx context.Context, in *HIDScriptRequest, opts ...grpcweb.CallOption) (*HIDScriptResult, error)
 	HIDRunScriptJob(ctx context.Context, in *HIDScriptRequest, opts ...grpcweb.CallOption) (*HIDScriptJob, error)
-	HIDRGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*HIDScriptResult, error)
-	HIDRCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*Empty, error)
+	HIDGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*HIDScriptResult, error)
+	HIDCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*Empty, error)
 	FSWriteFile(ctx context.Context, in *WriteFileRequest, opts ...grpcweb.CallOption) (*Empty, error)
 	FSReadFile(ctx context.Context, in *ReadFileRequest, opts ...grpcweb.CallOption) (*ReadFileResponse, error)
 	FSGetFileInfo(ctx context.Context, in *FileInfoRequest, opts ...grpcweb.CallOption) (*FileInfoResponse, error)
@ -2448,8 +2463,8 @@ func (c *p4WNP1Client) HIDRunScriptJob(ctx context.Context, in *HIDScriptRequest
 	return new(HIDScriptJob).Unmarshal(resp)
 }

-func (c *p4WNP1Client) HIDRGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*HIDScriptResult, error) {
-	resp, err := c.client.RPCCall(ctx, "HIDRGetScriptJobResult", in.Marshal(), opts...)
+func (c *p4WNP1Client) HIDGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*HIDScriptResult, error) {
+	resp, err := c.client.RPCCall(ctx, "HIDGetScriptJobResult", in.Marshal(), opts...)
 	if err != nil {
 		return nil, err
 	}
@ -2457,8 +2472,8 @@ func (c *p4WNP1Client) HIDRGetScriptJobResult(ctx context.Context, in *HIDScript
 	return new(HIDScriptResult).Unmarshal(resp)
 }

-func (c *p4WNP1Client) HIDRCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*Empty, error) {
-	resp, err := c.client.RPCCall(ctx, "HIDRCancelScriptJob", in.Marshal(), opts...)
+func (c *p4WNP1Client) HIDCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpcweb.CallOption) (*Empty, error) {
+	resp, err := c.client.RPCCall(ctx, "HIDCancelScriptJob", in.Marshal(), opts...)
 	if err != nil {
 		return nil, err
 	}
--- a/proto/grpc.pb.go
+++ b/proto/grpc.pb.go
@ -326,7 +326,8 @@ func (m *FileInfoResponse) GetIsDir() bool {

 // HID
 type HIDScriptRequest struct {
-	ScriptPath string `protobuf:"bytes,1,opt,name=scriptPath" json:"scriptPath,omitempty"`
+	ScriptPath     string `protobuf:"bytes,1,opt,name=scriptPath" json:"scriptPath,omitempty"`
+	TimeoutSeconds uint32 `protobuf:"varint,2,opt,name=timeoutSeconds" json:"timeoutSeconds,omitempty"`
 }

 func (m *HIDScriptRequest) Reset()                    { *m = HIDScriptRequest{} }
@ -341,6 +342,13 @@ func (m *HIDScriptRequest) GetScriptPath() string {
 	return ""
 }

+func (m *HIDScriptRequest) GetTimeoutSeconds() uint32 {
+	if m != nil {
+		return m.TimeoutSeconds
+	}
+	return 0
+}
+
 type HIDScriptJob struct {
 	Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
 }
@ -949,8 +957,8 @@ type P4WNP1Client interface {
 	DeployWifiSettings(ctx context.Context, in *WiFiSettings, opts ...grpc.CallOption) (*Empty, error)
 	HIDRunScript(ctx context.Context, in *HIDScriptRequest, opts ...grpc.CallOption) (*HIDScriptResult, error)
 	HIDRunScriptJob(ctx context.Context, in *HIDScriptRequest, opts ...grpc.CallOption) (*HIDScriptJob, error)
-	HIDRGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*HIDScriptResult, error)
-	HIDRCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*Empty, error)
+	HIDGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*HIDScriptResult, error)
+	HIDCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*Empty, error)
 	FSWriteFile(ctx context.Context, in *WriteFileRequest, opts ...grpc.CallOption) (*Empty, error)
 	FSReadFile(ctx context.Context, in *ReadFileRequest, opts ...grpc.CallOption) (*ReadFileResponse, error)
 	FSGetFileInfo(ctx context.Context, in *FileInfoRequest, opts ...grpc.CallOption) (*FileInfoResponse, error)
@ -1064,18 +1072,18 @@ func (c *p4WNP1Client) HIDRunScriptJob(ctx context.Context, in *HIDScriptRequest
 	return out, nil
 }

-func (c *p4WNP1Client) HIDRGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*HIDScriptResult, error) {
+func (c *p4WNP1Client) HIDGetScriptJobResult(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*HIDScriptResult, error) {
 	out := new(HIDScriptResult)
-	err := grpc.Invoke(ctx, "/P4wnP1_grpc.P4WNP1/HIDRGetScriptJobResult", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/P4wnP1_grpc.P4WNP1/HIDGetScriptJobResult", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }

-func (c *p4WNP1Client) HIDRCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*Empty, error) {
+func (c *p4WNP1Client) HIDCancelScriptJob(ctx context.Context, in *HIDScriptJob, opts ...grpc.CallOption) (*Empty, error) {
 	out := new(Empty)
-	err := grpc.Invoke(ctx, "/P4wnP1_grpc.P4WNP1/HIDRCancelScriptJob", in, out, c.cc, opts...)
+	err := grpc.Invoke(ctx, "/P4wnP1_grpc.P4WNP1/HIDCancelScriptJob", in, out, c.cc, opts...)
 	if err != nil {
 		return nil, err
 	}
@ -1132,8 +1140,8 @@ type P4WNP1Server interface {
 	DeployWifiSettings(context.Context, *WiFiSettings) (*Empty, error)
 	HIDRunScript(context.Context, *HIDScriptRequest) (*HIDScriptResult, error)
 	HIDRunScriptJob(context.Context, *HIDScriptRequest) (*HIDScriptJob, error)
-	HIDRGetScriptJobResult(context.Context, *HIDScriptJob) (*HIDScriptResult, error)
-	HIDRCancelScriptJob(context.Context, *HIDScriptJob) (*Empty, error)
+	HIDGetScriptJobResult(context.Context, *HIDScriptJob) (*HIDScriptResult, error)
+	HIDCancelScriptJob(context.Context, *HIDScriptJob) (*Empty, error)
 	FSWriteFile(context.Context, *WriteFileRequest) (*Empty, error)
 	FSReadFile(context.Context, *ReadFileRequest) (*ReadFileResponse, error)
 	FSGetFileInfo(context.Context, *FileInfoRequest) (*FileInfoResponse, error)
@ -1342,38 +1350,38 @@ func _P4WNP1_HIDRunScriptJob_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }

-func _P4WNP1_HIDRGetScriptJobResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _P4WNP1_HIDGetScriptJobResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(HIDScriptJob)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(P4WNP1Server).HIDRGetScriptJobResult(ctx, in)
+		return srv.(P4WNP1Server).HIDGetScriptJobResult(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/P4wnP1_grpc.P4WNP1/HIDRGetScriptJobResult",
+		FullMethod: "/P4wnP1_grpc.P4WNP1/HIDGetScriptJobResult",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(P4WNP1Server).HIDRGetScriptJobResult(ctx, req.(*HIDScriptJob))
+		return srv.(P4WNP1Server).HIDGetScriptJobResult(ctx, req.(*HIDScriptJob))
 	}
 	return interceptor(ctx, in, info, handler)
 }

-func _P4WNP1_HIDRCancelScriptJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+func _P4WNP1_HIDCancelScriptJob_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(HIDScriptJob)
 	if err := dec(in); err != nil {
 		return nil, err
 	}
 	if interceptor == nil {
-		return srv.(P4WNP1Server).HIDRCancelScriptJob(ctx, in)
+		return srv.(P4WNP1Server).HIDCancelScriptJob(ctx, in)
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: "/P4wnP1_grpc.P4WNP1/HIDRCancelScriptJob",
+		FullMethod: "/P4wnP1_grpc.P4WNP1/HIDCancelScriptJob",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(P4WNP1Server).HIDRCancelScriptJob(ctx, req.(*HIDScriptJob))
+		return srv.(P4WNP1Server).HIDCancelScriptJob(ctx, req.(*HIDScriptJob))
 	}
 	return interceptor(ctx, in, info, handler)
 }
@ -1499,12 +1507,12 @@ var _P4WNP1_serviceDesc = grpc.ServiceDesc{
 			Handler:    _P4WNP1_HIDRunScriptJob_Handler,
 		},
 		{
-			MethodName: "HIDRGetScriptJobResult",
-			Handler:    _P4WNP1_HIDRGetScriptJobResult_Handler,
+			MethodName: "HIDGetScriptJobResult",
+			Handler:    _P4WNP1_HIDGetScriptJobResult_Handler,
 		},
 		{
-			MethodName: "HIDRCancelScriptJob",
-			Handler:    _P4WNP1_HIDRCancelScriptJob_Handler,
+			MethodName: "HIDCancelScriptJob",
+			Handler:    _P4WNP1_HIDCancelScriptJob_Handler,
 		},
 		{
 			MethodName: "FSWriteFile",
@ -1530,114 +1538,116 @@ var _P4WNP1_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("grpc.proto", fileDescriptor0) }

 var fileDescriptor0 = []byte{
-	// 1741 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xeb, 0x72, 0xdc, 0xb6,
-	0x15, 0x96, 0x76, 0xe5, 0xbd, 0x9c, 0xbd, 0x1a, 0x76, 0x5c, 0x5a, 0xb1, 0x65, 0x97, 0x4d, 0x32,
-	0x9a, 0x26, 0xa3, 0x36, 0xaa, 0x66, 0x92, 0xc9, 0x4c, 0xa7, 0xa5, 0xf6, 0x22, 0xad, 0xa5, 0xbd,
-	0x0c, 0x28, 0x45, 0xd3, 0x5f, 0x0c, 0x45, 0x40, 0x5a, 0xd4, 0x5c, 0x92, 0x25, 0x40, 0xc5, 0xea,
-	0x8f, 0x3c, 0x50, 0xdf, 0xa5, 0x0f, 0xd0, 0x07, 0xe8, 0x73, 0xb4, 0x03, 0xf0, 0xb2, 0xe4, 0x7a,
-	0x57, 0xf2, 0xb4, 0xff, 0x80, 0x0f, 0xe7, 0x7c, 0x38, 0xc0, 0xc1, 0x39, 0x87, 0x87, 0x00, 0xb7,
-	0x61, 0xe0, 0x1c, 0x04, 0xa1, 0x2f, 0x7c, 0xd4, 0x98, 0x1d, 0xfd, 0xec, 0xcd, 0xbe, 0xb5, 0x24,
-	0xa4, 0xff, 0x04, 0xcf, 0x2f, 0xe8, 0x22, 0xe8, 0xb3, 0x70, 0x1a, 0x0e, 0x99, 0x4b, 0x31, 0xfd,
-	0x5b, 0x44, 0xb9, 0x40, 0x5d, 0x28, 0x13, 0x16, 0x6a, 0xdb, 0x6f, 0xb7, 0xf7, 0xeb, 0x58, 0x0e,
-	0xd1, 0x0b, 0xa8, 0x04, 0x21, 0xbd, 0x61, 0x1f, 0xb4, 0x92, 0x02, 0x93, 0x19, 0xda, 0x03, 0xf0,
-	0x3d, 0xf7, 0x7e, 0xe8, 0xbb, 0x84, 0x86, 0x5a, 0xf9, 0xed, 0xf6, 0x7e, 0x0d, 0xe7, 0x10, 0xfd,
-	0x3b, 0xf8, 0x6c, 0x65, 0x07, 0x1e, 0xf8, 0x1e, 0xa7, 0x52, 0x31, 0xa4, 0x3c, 0x72, 0xc5, 0xcc,
-	0x16, 0xf3, 0x64, 0xa7, 0x1c, 0xa2, 0x4f, 0xa1, 0x83, 0xa9, 0x4d, 0xf2, 0x56, 0x21, 0xd8, 0x09,
-	0x96, 0xc2, 0x6a, 0x8c, 0x9e, 0xc3, 0x13, 0x2e, 0xec, 0x50, 0x28, 0xb3, 0xca, 0x38, 0x9e, 0x48,
-	0x49, 0x62, 0x0b, 0x5b, 0xd9, 0xd3, 0xc4, 0x6a, 0xac, 0xff, 0x1e, 0xba, 0x4b, 0xc2, 0xc4, 0x88,
-	0x57, 0x50, 0x0f, 0xa9, 0x4d, 0x7a, 0x7e, 0xe4, 0x09, 0x45, 0x5b, 0xc6, 0x4b, 0x40, 0xbf, 0x83,
-	0xee, 0x55, 0xc8, 0x04, 0x7d, 0xcc, 0x86, 0x17, 0x50, 0xb1, 0x83, 0x80, 0x7a, 0x44, 0x19, 0x51,
-	0xc3, 0xc9, 0x0c, 0xe9, 0xd0, 0x5c, 0x44, 0x5c, 0x4c, 0x7c, 0x31, 0xf8, 0xc0, 0xb8, 0x48, 0x6e,
-	0xa7, 0x80, 0x65, 0x96, 0xee, 0xe4, 0x2c, 0xfd, 0x12, 0x3a, 0x72, 0xcb, 0x91, 0x77, 0xe3, 0x3f,
-	0xb0, 0xad, 0xfe, 0x0b, 0x74, 0x97, 0x62, 0xc9, 0x81, 0x10, 0xec, 0x78, 0xf6, 0x82, 0xa6, 0x72,
-	0x72, 0x2c, 0x31, 0xce, 0xfe, 0x4e, 0x93, 0x1b, 0x52, 0x63, 0x89, 0x2d, 0x7c, 0x42, 0x95, 0x49,
-	0x2d, 0xac, 0xc6, 0x48, 0x83, 0xea, 0xc2, 0x27, 0x17, 0x6c, 0x41, 0x95, 0x35, 0x65, 0x9c, 0x4e,
-	0xe5, 0x25, 0x33, 0xde, 0x67, 0xa1, 0xf6, 0x44, 0x9d, 0x20, 0x9e, 0xe8, 0x87, 0xd0, 0x3d, 0x1d,
-	0xf5, 0x4d, 0x27, 0x64, 0x81, 0x48, 0xed, 0xdc, 0x03, 0xe0, 0x0a, 0xc8, 0x7b, 0x75, 0x89, 0xe8,
-	0x7b, 0xd0, 0xcc, 0x74, 0xde, 0xf9, 0xd7, 0xa8, 0x0d, 0x25, 0x46, 0x94, 0x5c, 0x0b, 0x97, 0x18,
-	0xd1, 0x7f, 0x81, 0x4e, 0x8e, 0x53, 0x3e, 0x06, 0xf4, 0x35, 0x94, 0xff, 0xea, 0x5f, 0x2b, 0x99,
-	0xc6, 0xe1, 0xcb, 0x83, 0xdc, 0xf3, 0x3d, 0xc8, 0x53, 0x61, 0x29, 0x25, 0xf7, 0x67, 0x7c, 0xc8,
-	0x3c, 0xc6, 0xe7, 0x34, 0x75, 0x47, 0x0e, 0x59, 0xbe, 0xba, 0x77, 0xdc, 0xf7, 0xd4, 0xe9, 0xb3,
-	0x57, 0x27, 0x11, 0xfd, 0x00, 0x1a, 0xe7, 0x83, 0xbe, 0x49, 0x85, 0x60, 0xde, 0x2d, 0x47, 0x6f,
-	0xa0, 0x71, 0xed, 0x32, 0xef, 0xbd, 0xe5, 0x64, 0x2f, 0xa4, 0x85, 0x41, 0x41, 0xf1, 0x13, 0xf9,
-	0xf7, 0x0e, 0xb4, 0x4f, 0x6c, 0x72, 0x4b, 0x45, 0xa6, 0xa3, 0x41, 0x95, 0x7a, 0xf6, 0xb5, 0x4b,
-	0xe3, 0x73, 0xd5, 0x70, 0x3a, 0x95, 0x51, 0x75, 0xc7, 0x48, 0x12, 0x40, 0x72, 0x28, 0x91, 0x80,
-	0x91, 0xc4, 0x0e, 0x39, 0x54, 0x6f, 0xc6, 0xf6, 0xa2, 0x1b, 0xdb, 0x11, 0x51, 0x48, 0x43, 0xe5,
-	0x89, 0x3a, 0x2e, 0x60, 0x72, 0x87, 0x20, 0xf4, 0x49, 0xe4, 0x08, 0xe5, 0x90, 0x3a, 0x4e, 0xa7,
-	0xf2, 0x25, 0x72, 0x1a, 0x32, 0xdb, 0xd5, 0x2a, 0x71, 0x94, 0xc6, 0x33, 0xb4, 0x07, 0x8d, 0x88,
-	0x53, 0xab, 0xd7, 0xef, 0x59, 0x83, 0xde, 0x58, 0xab, 0x2a, 0xbb, 0xea, 0x11, 0xa7, 0xbd, 0x7e,
-	0x6f, 0xd0, 0x1b, 0xa3, 0xcf, 0x41, 0x4e, 0x2c, 0x3c, 0xe9, 0x8f, 0x4c, 0xad, 0xa6, 0x56, 0x6b,
-	0x11, 0xa7, 0x6a, 0x8e, 0xf6, 0xa1, 0x2b, 0x17, 0x4f, 0x47, 0x7d, 0xeb, 0x6c, 0xf0, 0x97, 0xe3,
-	0xa9, 0x81, 0xfb, 0x5a, 0x5d, 0xc9, 0xb4, 0x23, 0x4e, 0x4f, 0x47, 0xfd, 0x14, 0x45, 0x3a, 0xb4,
-	0x52, 0xc9, 0xf1, 0xf4, 0xd2, 0x1c, 0x68, 0xa0, 0xc4, 0x1a, 0xb1, 0x98, 0x82, 0x52, 0x53, 0xa4,
-	0x0c, 0x36, 0xae, 0xb4, 0x46, 0x66, 0xca, 0xe9, 0xa8, 0x8f, 0x8d, 0x2b, 0xf4, 0x2b, 0xa8, 0xca,
-	0xf5, 0xcb, 0xb1, 0xa9, 0x35, 0xe3, 0x68, 0x8a, 0x38, 0xbd, 0x1c, 0x9b, 0xe8, 0x35, 0x80, 0x5c,
-	0x30, 0x07, 0x78, 0x64, 0x9c, 0x6b, 0xad, 0x4c, 0x2f, 0x06, 0xd0, 0x3b, 0x68, 0x87, 0x1e, 0x61,
-	0xdc, 0xe2, 0x89, 0x23, 0xb4, 0xb6, 0x7a, 0x31, 0xbf, 0x29, 0xbc, 0x98, 0xa2, 0xaf, 0x06, 0x62,
-	0x4e, 0x43, 0x8f, 0x0a, 0xdc, 0x52, 0xaa, 0x99, 0x0b, 0xc7, 0xd0, 0x75, 0x88, 0x63, 0x51, 0x67,
-	0xb1, 0x64, 0xeb, 0x7c, 0x3a, 0x5b, 0xdb, 0x21, 0xce, 0xc0, 0x59, 0x64, 0x74, 0x06, 0x34, 0xa3,
-	0x45, 0xce, 0xb0, 0xae, 0xa2, 0xda, 0x7b, 0x80, 0xea, 0x72, 0x6c, 0xe2, 0x46, 0xb4, 0xc8, 0x2c,
-	0xd2, 0x67, 0xf0, 0x62, 0xfd, 0x66, 0xd2, 0x75, 0x73, 0x9f, 0x0b, 0xcb, 0x26, 0x24, 0x4d, 0xd8,
-	0x35, 0x09, 0x18, 0x84, 0x84, 0xe8, 0x25, 0xd4, 0x08, 0xbd, 0x8b, 0xd7, 0xe2, 0x67, 0x57, 0x25,
-	0xf4, 0x4e, 0x2e, 0xe9, 0x7f, 0x84, 0xa7, 0x1f, 0xed, 0x29, 0x03, 0xdd, 0x21, 0xa1, 0xbf, 0x48,
-	0x5e, 0x6e, 0x3c, 0x91, 0xc9, 0xe2, 0x86, 0xb9, 0x34, 0x61, 0x50, 0x63, 0xfd, 0x9f, 0x25, 0x78,
-	0x99, 0xda, 0x30, 0xf2, 0x04, 0x0d, 0x6f, 0x6c, 0x87, 0x66, 0x27, 0x5e, 0x97, 0x86, 0xfe, 0x94,
-	0xa4, 0x1c, 0xc9, 0xd2, 0x3e, 0xfc, 0xba, 0x70, 0xfa, 0x8d, 0x4c, 0x07, 0x63, 0x9f, 0xd0, 0x24,
-	0x3f, 0xc9, 0xd8, 0x0e, 0xa4, 0xed, 0x94, 0xf3, 0xa3, 0x34, 0x76, 0x97, 0x08, 0xda, 0x85, 0x9a,
-	0x47, 0xc5, 0xc2, 0xe6, 0xef, 0x8f, 0x92, 0xb0, 0xc9, 0xe6, 0xf9, 0xa0, 0x7c, 0x52, 0x0c, 0xca,
-	0x29, 0x20, 0x32, 0x77, 0x02, 0x93, 0x86, 0x77, 0x34, 0x4c, 0xb7, 0x55, 0xe1, 0xd3, 0x38, 0x7c,
-	0x53, 0x30, 0xb2, 0x7f, 0xda, 0x9b, 0x15, 0xc5, 0xf0, 0x1a, 0x55, 0xfd, 0x08, 0x76, 0xa4, 0xd1,
-	0x08, 0xa0, 0x32, 0x36, 0x26, 0x97, 0xc6, 0x79, 0x77, 0x0b, 0x75, 0xa0, 0x21, 0xb5, 0xad, 0xde,
-	0xf9, 0x68, 0x30, 0xb9, 0xe8, 0x6e, 0x67, 0x80, 0x39, 0xc0, 0x3f, 0x0e, 0x70, 0xb7, 0xa4, 0xff,
-	0xa7, 0x0c, 0xe8, 0xe3, 0x0d, 0xe4, 0x99, 0x5d, 0xc6, 0x05, 0xf5, 0x66, 0x7e, 0x98, 0xe5, 0x9f,
-	0x25, 0x82, 0xf6, 0xa1, 0x13, 0xcf, 0xb2, 0x9b, 0x4b, 0xbc, 0xb4, 0x0a, 0xcb, 0x52, 0xe7, 0x52,
-	0x9b, 0xab, 0x62, 0x96, 0x5c, 0xde, 0x12, 0x40, 0xbf, 0x85, 0xae, 0xe7, 0x0b, 0x23, 0x12, 0x73,
-	0x3f, 0x64, 0xc2, 0x16, 0xec, 0x2e, 0x2e, 0x02, 0x35, 0xfc, 0x11, 0x8e, 0x0e, 0x00, 0x11, 0x7f,
-	0xe2, 0x8b, 0x63, 0xe6, 0x91, 0xe5, 0xb6, 0xf1, 0xb5, 0xae, 0x59, 0x41, 0x5f, 0x41, 0xdb, 0xb1,
-	0x5d, 0xf7, 0xda, 0x76, 0xde, 0xc7, 0xd9, 0x3a, 0x49, 0x4e, 0x2b, 0x28, 0x3a, 0x82, 0x4a, 0x68,
-	0x7b, 0xb7, 0x94, 0x6b, 0xd5, 0xb7, 0xe5, 0xfd, 0xc6, 0xe1, 0xab, 0x0d, 0xb7, 0x8f, 0xa5, 0x10,
-	0x4e, 0x64, 0xd1, 0x10, 0xaa, 0x7e, 0x20, 0x98, 0xef, 0x71, 0xad, 0xa6, 0xd4, 0xbe, 0x79, 0xc4,
-	0x69, 0x07, 0xd3, 0x58, 0x7c, 0xe0, 0x89, 0xf0, 0x1e, 0xa7, 0xca, 0xa8, 0x07, 0x0d, 0x2e, 0x0f,
-	0xe8, 0x9c, 0xfa, 0x5c, 0x70, 0xad, 0xae, 0xb8, 0x7e, 0xbd, 0x89, 0x2b, 0x93, 0xc4, 0x79, 0xad,
-	0xdd, 0x1f, 0xa0, 0x99, 0x67, 0x97, 0xf9, 0xfd, 0x3d, 0xbd, 0x4f, 0xfc, 0x26, 0x87, 0x32, 0xc2,
-	0xee, 0x6c, 0x37, 0x4a, 0xdd, 0x14, 0x4f, 0x7e, 0x28, 0x7d, 0xbf, 0xad, 0xfb, 0xd0, 0x59, 0x39,
-	0xa3, 0xaa, 0x56, 0x72, 0x70, 0xee, 0xff, 0x4c, 0xc3, 0xec, 0x1b, 0x29, 0x43, 0xb2, 0xf5, 0xcb,
-	0x20, 0xa0, 0x69, 0x80, 0xe7, 0x90, 0xcc, 0xe7, 0xaa, 0xa6, 0xe7, 0x7d, 0x2e, 0x01, 0xfd, 0x7b,
-	0x78, 0xbe, 0xee, 0x44, 0xd2, 0xe8, 0x85, 0xed, 0xa4, 0x1f, 0x7f, 0x0b, 0xdb, 0x51, 0x55, 0x3a,
-	0x48, 0xf8, 0x4b, 0x2c, 0xd0, 0xff, 0x55, 0x86, 0xe6, 0x15, 0x1b, 0xb2, 0xec, 0x99, 0xee, 0x42,
-	0x8d, 0x30, 0x9e, 0x2f, 0x7a, 0xd9, 0x5c, 0xd2, 0x85, 0xf4, 0x36, 0xad, 0x7a, 0x21, 0xbd, 0x45,
-	0x87, 0xb9, 0x8f, 0x8f, 0xf6, 0x4a, 0x1e, 0xcc, 0xd3, 0xe6, 0x83, 0xdf, 0x80, 0xba, 0x1d, 0x89,
-	0xb9, 0xa5, 0x14, 0x77, 0x94, 0xe2, 0x17, 0x9b, 0x15, 0x8d, 0x99, 0x7c, 0xb2, 0x4a, 0xbd, 0x66,
-	0x27, 0x23, 0x59, 0x40, 0xec, 0xc0, 0x72, 0xe6, 0xb6, 0xe7, 0x51, 0x57, 0xbd, 0xd7, 0x16, 0xae,
-	0xdb, 0x41, 0x2f, 0x06, 0xd0, 0xef, 0xa0, 0x76, 0xcc, 0x79, 0xef, 0xe6, 0xd6, 0x98, 0x25, 0xe1,
-	0xff, 0xac, 0xb0, 0xc1, 0xb1, 0x69, 0xf6, 0x6e, 0x6e, 0x71, 0x26, 0x84, 0xbe, 0x83, 0x66, 0x3c,
-	0xee, 0xb9, 0x8c, 0x7a, 0x42, 0x55, 0xd5, 0x0d, 0x4a, 0x05, 0x41, 0xf4, 0x16, 0x9a, 0x76, 0x60,
-	0xcd, 0x19, 0xa1, 0x16, 0xe7, 0x8c, 0x24, 0x05, 0x17, 0xec, 0xe0, 0x94, 0x11, 0x6a, 0x72, 0x46,
-	0xd0, 0x97, 0xd0, 0x4e, 0xee, 0xcf, 0xf2, 0xe8, 0x87, 0x85, 0xef, 0x25, 0x95, 0xb4, 0x95, 0xa0,
-	0x13, 0x05, 0xea, 0xdf, 0x24, 0xa9, 0xa6, 0x02, 0x25, 0x63, 0xd6, 0xdd, 0x42, 0x55, 0x28, 0x9b,
-	0x17, 0x46, 0x77, 0x1b, 0x3d, 0x83, 0x8e, 0x79, 0x61, 0x58, 0x43, 0x63, 0x74, 0x3e, 0xfd, 0x71,
-	0x80, 0x2d, 0x63, 0xd6, 0x2d, 0xe9, 0x5f, 0x00, 0x2c, 0xef, 0x05, 0x35, 0xa1, 0x76, 0x35, 0x33,
-	0x0e, 0xad, 0x99, 0x79, 0xd6, 0xdd, 0x42, 0x35, 0xd8, 0x99, 0xce, 0x06, 0x93, 0xee, 0xb6, 0x7e,
-	0x00, 0x95, 0xd8, 0x68, 0x99, 0xc4, 0x4d, 0x73, 0xd4, 0x4f, 0x93, 0xb8, 0x1c, 0x4b, 0x67, 0xce,
-	0xcc, 0xb3, 0xd4, 0x99, 0x33, 0xf3, 0x4c, 0xaf, 0xc2, 0x93, 0xc1, 0x22, 0x10, 0xf7, 0x87, 0xff,
-	0x00, 0xa8, 0xcc, 0x8e, 0xae, 0x26, 0xb3, 0x6f, 0xd1, 0x18, 0xb4, 0x13, 0x2a, 0xfa, 0x34, 0x70,
-	0xfd, 0x7b, 0x4a, 0x0a, 0x65, 0x06, 0xa1, 0x62, 0xe2, 0x97, 0xaa, 0xbb, 0x9f, 0x3f, 0x50, 0x0a,
-	0xf5, 0x2d, 0x74, 0x0a, 0xcf, 0x62, 0xae, 0xff, 0x9b, 0x69, 0x08, 0x4f, 0x4f, 0xa8, 0x58, 0xf9,
-	0x60, 0xfb, 0x1f, 0x78, 0xa6, 0xf0, 0xd4, 0xfc, 0x88, 0xe7, 0x21, 0x9d, 0xc7, 0x08, 0xff, 0x0c,
-	0xed, 0x13, 0x2a, 0xf2, 0x9f, 0x9e, 0xeb, 0xac, 0xd2, 0x0a, 0x58, 0x4e, 0x3a, 0x66, 0x30, 0x8b,
-	0x0c, 0x1b, 0xa5, 0x77, 0xd7, 0x70, 0xeb, 0x5b, 0xa8, 0x0f, 0xcd, 0xb1, 0xfc, 0xa8, 0xbd, 0x1c,
-	0x9b, 0xaa, 0x26, 0x3c, 0xf2, 0x81, 0xb2, 0x81, 0xc5, 0x82, 0x37, 0xb1, 0xb3, 0x36, 0x7f, 0x1d,
-	0x7c, 0xf5, 0x69, 0xb5, 0x7f, 0xc3, 0x06, 0x03, 0x40, 0xf1, 0x06, 0x57, 0xec, 0x66, 0x99, 0x81,
-	0x5e, 0x6e, 0x4c, 0x06, 0x1b, 0x68, 0xc6, 0xaa, 0x13, 0xc1, 0x91, 0x97, 0x54, 0x9f, 0xd7, 0xeb,
-	0x3b, 0x8b, 0xa4, 0xb1, 0xd9, 0x7d, 0xb5, 0x69, 0x59, 0xb6, 0x0e, 0x8a, 0xae, 0x93, 0xa7, 0x93,
-	0xbd, 0xcd, 0x23, 0x8c, 0x9b, 0x5b, 0x19, 0x7d, 0x0b, 0x99, 0xf0, 0x42, 0xd2, 0x9d, 0x50, 0xb1,
-	0x6c, 0x70, 0xe2, 0x76, 0x68, 0xb3, 0xda, 0xa3, 0x36, 0x0e, 0xe1, 0x99, 0x24, 0xed, 0xd9, 0x9e,
-	0x43, 0xdd, 0xa5, 0x9d, 0x0f, 0x30, 0xae, 0xbf, 0xba, 0x63, 0x68, 0x0c, 0xcd, 0xac, 0x33, 0x5e,
-	0x39, 0xe7, 0x6a, 0xc7, 0xbc, 0x81, 0xe3, 0x0c, 0x60, 0x68, 0xa6, 0xfd, 0x38, 0x2a, 0x5a, 0xbe,
-	0xd2, 0xf7, 0xef, 0xbe, 0xde, 0xb0, 0x1a, 0xf7, 0xbc, 0xfa, 0x16, 0x9a, 0x40, 0x6b, 0x68, 0x9e,
-	0x50, 0x91, 0xb6, 0xc3, 0x2b, 0x7c, 0x2b, 0xcd, 0xf4, 0x0a, 0xdf, 0x6a, 0x0f, 0xad, 0x6f, 0xa1,
-	0x9f, 0xe0, 0xb3, 0xa1, 0xd9, 0x0b, 0xa9, 0x2d, 0x68, 0xe1, 0xe7, 0x05, 0x2a, 0x7e, 0x0f, 0xac,
-	0xfb, 0x75, 0xb2, 0xab, 0x3f, 0x24, 0x92, 0xee, 0x70, 0x5d, 0x51, 0x3f, 0x63, 0xfe, 0xf0, 0xdf,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0x40, 0x38, 0x11, 0x29, 0x9a, 0x11, 0x00, 0x00,
+	// 1761 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x58, 0xeb, 0x72, 0xe3, 0xb6,
+	0x15, 0xb6, 0x25, 0xaf, 0x2e, 0x47, 0xd7, 0xc5, 0x5e, 0xca, 0x75, 0x76, 0xbd, 0x5b, 0x36, 0xc9,
+	0x78, 0x9a, 0x8c, 0xdb, 0xb8, 0x9e, 0x49, 0x26, 0x33, 0x9d, 0x96, 0x96, 0x28, 0x4b, 0x6b, 0xeb,
+	0x32, 0xa0, 0x1d, 0x4f, 0xfb, 0x87, 0xa1, 0x09, 0xd8, 0x42, 0x57, 0x22, 0x59, 0x02, 0x74, 0xd6,
+	0xfd, 0x91, 0xe7, 0xe9, 0xcb, 0xf4, 0x01, 0xfa, 0x00, 0x7d, 0x8e, 0x76, 0x00, 0x5e, 0x44, 0xc9,
+	0x92, 0xbd, 0xd3, 0xfc, 0x03, 0x3e, 0x9c, 0xf3, 0xe1, 0x00, 0xe7, 0xe0, 0x1c, 0x1e, 0x02, 0xdc,
+	0x84, 0x81, 0x7b, 0x10, 0x84, 0xbe, 0xf0, 0x51, 0x6d, 0x72, 0xf4, 0x93, 0x37, 0xf9, 0xc6, 0x96,
+	0x90, 0xfe, 0x23, 0x3c, 0x3f, 0xa7, 0xf3, 0xa0, 0xcb, 0xc2, 0x71, 0xd8, 0x63, 0x33, 0x8a, 0xe9,
+	0xdf, 0x23, 0xca, 0x05, 0x6a, 0x43, 0x91, 0xb0, 0x50, 0xdb, 0x7e, 0xb7, 0xbd, 0x5f, 0xc5, 0x72,
+	0x88, 0x5e, 0x42, 0x29, 0x08, 0xe9, 0x35, 0xfb, 0xa8, 0x15, 0x14, 0x98, 0xcc, 0xd0, 0x1e, 0x80,
+	0xef, 0xcd, 0xee, 0x7a, 0xfe, 0x8c, 0xd0, 0x50, 0x2b, 0xbe, 0xdb, 0xde, 0xaf, 0xe0, 0x1c, 0xa2,
+	0x7f, 0x0b, 0x2f, 0x56, 0x76, 0xe0, 0x81, 0xef, 0x71, 0x2a, 0x15, 0x43, 0xca, 0xa3, 0x99, 0x98,
+	0x38, 0x62, 0x9a, 0xec, 0x94, 0x43, 0xf4, 0x31, 0xb4, 0x30, 0x75, 0x48, 0xde, 0x2a, 0x04, 0x3b,
+	0xc1, 0x42, 0x58, 0x8d, 0xd1, 0x73, 0x78, 0xc2, 0x85, 0x13, 0x0a, 0x65, 0x56, 0x11, 0xc7, 0x13,
+	0x29, 0x49, 0x1c, 0xe1, 0x28, 0x7b, 0xea, 0x58, 0x8d, 0xf5, 0xdf, 0x43, 0x7b, 0x41, 0x98, 0x18,
+	0xf1, 0x1a, 0xaa, 0x21, 0x75, 0x48, 0xc7, 0x8f, 0x3c, 0xa1, 0x68, 0x8b, 0x78, 0x01, 0xe8, 0xb7,
+	0xd0, 0xbe, 0x0c, 0x99, 0xa0, 0x8f, 0xd9, 0xf0, 0x12, 0x4a, 0x4e, 0x10, 0x50, 0x8f, 0x28, 0x23,
+	0x2a, 0x38, 0x99, 0x21, 0x1d, 0xea, 0xf3, 0x88, 0x8b, 0x91, 0x2f, 0xcc, 0x8f, 0x8c, 0x8b, 0xe4,
+	0x76, 0x96, 0xb0, 0xcc, 0xd2, 0x9d, 0x9c, 0xa5, 0x5f, 0x40, 0x4b, 0x6e, 0x39, 0xf0, 0xae, 0xfd,
+	0x07, 0xb6, 0xd5, 0x7f, 0x86, 0xf6, 0x42, 0x2c, 0x39, 0x10, 0x82, 0x1d, 0xcf, 0x99, 0xd3, 0x54,
+	0x4e, 0x8e, 0x25, 0xc6, 0xd9, 0x3f, 0x68, 0x72, 0x43, 0x6a, 0x2c, 0xb1, 0xb9, 0x4f, 0xa8, 0x32,
+	0xa9, 0x81, 0xd5, 0x18, 0x69, 0x50, 0x9e, 0xfb, 0xe4, 0x9c, 0xcd, 0xa9, 0xb2, 0xa6, 0x88, 0xd3,
+	0xa9, 0xbc, 0x64, 0xc6, 0xbb, 0x2c, 0xd4, 0x9e, 0xa8, 0x13, 0xc4, 0x13, 0xfd, 0xaf, 0xd0, 0xee,
+	0x0f, 0xba, 0x96, 0x1b, 0xb2, 0x40, 0xa4, 0x76, 0xee, 0x01, 0x70, 0x05, 0xe4, 0xbd, 0xba, 0x40,
+	0xd0, 0x97, 0xd0, 0x14, 0x6c, 0x4e, 0xfd, 0x48, 0x58, 0xd4, 0xf5, 0x3d, 0xc2, 0x95, 0x55, 0x0d,
+	0xbc, 0x82, 0xea, 0x7b, 0x50, 0xcf, 0xb8, 0xdf, 0xfb, 0x57, 0xa8, 0x09, 0x05, 0x46, 0x14, 0x5f,
+	0x03, 0x17, 0x18, 0xd1, 0x7f, 0x86, 0x56, 0x6e, 0x6f, 0x19, 0x34, 0xe8, 0x2b, 0x28, 0xfe, 0xcd,
+	0xbf, 0x52, 0x32, 0xb5, 0xc3, 0x57, 0x07, 0xb9, 0x30, 0x3f, 0xc8, 0x53, 0x61, 0x29, 0x25, 0xed,
+	0x64, 0xbc, 0xc7, 0x3c, 0xc6, 0xa7, 0x34, 0x75, 0x5b, 0x0e, 0x59, 0x44, 0xe7, 0x7b, 0xee, 0x7b,
+	0xea, 0x96, 0xb2, 0xe8, 0x94, 0x88, 0x7e, 0x00, 0xb5, 0x33, 0xb3, 0x6b, 0x51, 0x21, 0x98, 0x77,
+	0xc3, 0xd1, 0x5b, 0xa8, 0x5d, 0xcd, 0x98, 0xf7, 0xc1, 0x76, 0xb3, 0x48, 0x6a, 0x60, 0x50, 0x50,
+	0x1c, 0x4a, 0xff, 0xd9, 0x81, 0xe6, 0x89, 0x43, 0x6e, 0xa8, 0xc8, 0x74, 0x34, 0x28, 0x53, 0xcf,
+	0xb9, 0x9a, 0xd1, 0xf8, 0x5c, 0x15, 0x9c, 0x4e, 0xe5, 0xeb, 0xbb, 0x65, 0x24, 0x79, 0x68, 0x72,
+	0x28, 0x91, 0x80, 0x91, 0xc4, 0x0e, 0x39, 0x54, 0xb1, 0xe5, 0x78, 0xd1, 0xb5, 0xe3, 0x8a, 0x28,
+	0xa4, 0xa1, 0xf2, 0x58, 0x15, 0x2f, 0x61, 0x72, 0x87, 0x20, 0xf4, 0x49, 0xe4, 0x0a, 0xe5, 0xb8,
+	0x2a, 0x4e, 0xa7, 0x32, 0x62, 0x39, 0x0d, 0x99, 0x33, 0xd3, 0x4a, 0xf1, 0x6b, 0x8e, 0x67, 0x68,
+	0x0f, 0x6a, 0x11, 0xa7, 0x76, 0xa7, 0xdb, 0xb1, 0xcd, 0xce, 0x50, 0x2b, 0x2b, 0xbb, 0xaa, 0x11,
+	0xa7, 0x9d, 0x6e, 0xc7, 0xec, 0x0c, 0xd1, 0x67, 0x20, 0x27, 0x36, 0x1e, 0x75, 0x07, 0x96, 0x56,
+	0x51, 0xab, 0x95, 0x88, 0x53, 0x35, 0x47, 0xfb, 0xd0, 0x96, 0x8b, 0xfd, 0x41, 0xd7, 0x3e, 0x35,
+	0xff, 0x72, 0x3c, 0x36, 0x70, 0x57, 0xab, 0x2a, 0x99, 0x66, 0xc4, 0x69, 0x7f, 0xd0, 0x4d, 0x51,
+	0xa4, 0x43, 0x23, 0x95, 0x1c, 0x8e, 0x2f, 0x2c, 0x53, 0x03, 0x25, 0x56, 0x8b, 0xc5, 0x14, 0x94,
+	0x9a, 0x22, 0x65, 0xb0, 0x71, 0xa9, 0xd5, 0x32, 0x53, 0xfa, 0x83, 0x2e, 0x36, 0x2e, 0xd1, 0xaf,
+	0xa0, 0x2c, 0xd7, 0x2f, 0x86, 0x96, 0x56, 0x8f, 0x5f, 0x5d, 0xc4, 0xe9, 0xc5, 0xd0, 0x42, 0x6f,
+	0x00, 0xe4, 0x82, 0x65, 0xe2, 0x81, 0x71, 0xa6, 0x35, 0x32, 0xbd, 0x18, 0x40, 0xef, 0xa1, 0x19,
+	0x7a, 0x84, 0x71, 0x9b, 0x27, 0x8e, 0xd0, 0x9a, 0x2a, 0x62, 0x7e, 0xb3, 0x14, 0x31, 0xcb, 0xbe,
+	0x32, 0xc5, 0x94, 0x86, 0x1e, 0x15, 0xb8, 0xa1, 0x54, 0x33, 0x17, 0x0e, 0xa1, 0xed, 0x12, 0xd7,
+	0xa6, 0xee, 0x7c, 0xc1, 0xd6, 0xfa, 0x74, 0xb6, 0xa6, 0x4b, 0x5c, 0xd3, 0x9d, 0x67, 0x74, 0x06,
+	0xd4, 0xa3, 0x79, 0xce, 0xb0, 0xb6, 0xa2, 0xda, 0x7b, 0x80, 0xea, 0x62, 0x68, 0xe1, 0x5a, 0x34,
+	0xcf, 0x2c, 0xd2, 0x27, 0xf0, 0x72, 0xfd, 0x66, 0xd2, 0x75, 0x53, 0x9f, 0x0b, 0xdb, 0x21, 0x24,
+	0x4d, 0xec, 0x15, 0x09, 0x18, 0x84, 0x84, 0xe8, 0x15, 0x54, 0x08, 0xbd, 0x8d, 0xd7, 0xe2, 0xb0,
+	0x2b, 0x13, 0x7a, 0x2b, 0x97, 0xf4, 0x3f, 0xc2, 0xd3, 0x7b, 0x7b, 0xca, 0x84, 0xe0, 0x92, 0xd0,
+	0x9f, 0x27, 0x91, 0x1b, 0x4f, 0x64, 0x52, 0xb9, 0x66, 0x33, 0x9a, 0x30, 0xa8, 0xb1, 0xfe, 0xaf,
+	0x02, 0xbc, 0x4a, 0x6d, 0x18, 0x78, 0x82, 0x86, 0xd7, 0x8e, 0x4b, 0xb3, 0x13, 0xaf, 0x4b, 0x57,
+	0x7f, 0x4a, 0x52, 0x93, 0x64, 0x69, 0x1e, 0x7e, 0xb5, 0x74, 0xfa, 0x8d, 0x4c, 0x07, 0x43, 0x9f,
+	0xd0, 0x24, 0x8f, 0xc9, 0xb7, 0x1d, 0x48, 0xdb, 0x29, 0xe7, 0x47, 0xe9, 0xdb, 0x5d, 0x20, 0x68,
+	0x17, 0x2a, 0x1e, 0x15, 0x73, 0x87, 0x7f, 0x38, 0x4a, 0x9e, 0x4d, 0x36, 0xcf, 0x3f, 0xca, 0x27,
+	0xcb, 0x8f, 0x72, 0x0c, 0x88, 0x4c, 0xdd, 0xc0, 0xa2, 0xe1, 0x2d, 0x0d, 0xd3, 0x6d, 0xd5, 0xf3,
+	0xa9, 0x1d, 0xbe, 0x5d, 0x32, 0xb2, 0xdb, 0xef, 0x4c, 0x96, 0xc5, 0xf0, 0x1a, 0x55, 0xfd, 0x08,
+	0x76, 0xa4, 0xd1, 0x08, 0xa0, 0x34, 0x34, 0x46, 0x17, 0xc6, 0x59, 0x7b, 0x0b, 0xb5, 0xa0, 0x26,
+	0xb5, 0xed, 0xce, 0xd9, 0xc0, 0x1c, 0x9d, 0xb7, 0xb7, 0x33, 0xc0, 0x32, 0xf1, 0x0f, 0x26, 0x6e,
+	0x17, 0xf4, 0xff, 0x16, 0x01, 0xdd, 0xdf, 0x40, 0x9e, 0x79, 0xc6, 0xb8, 0xa0, 0xde, 0xc4, 0x0f,
+	0xb3, 0xfc, 0xb3, 0x40, 0xd0, 0x3e, 0xb4, 0xe2, 0x59, 0x76, 0x73, 0x89, 0x97, 0x56, 0x61, 0x59,
+	0x12, 0x67, 0xd4, 0xe1, 0xaa, 0xe8, 0x25, 0x97, 0xb7, 0x00, 0xd0, 0x6f, 0xa1, 0xed, 0xf9, 0xc2,
+	0x88, 0xc4, 0xd4, 0x0f, 0x99, 0x70, 0x04, 0xbb, 0x8d, 0x8b, 0x45, 0x05, 0xdf, 0xc3, 0xd1, 0x01,
+	0x20, 0xe2, 0x8f, 0x7c, 0x71, 0xcc, 0x3c, 0xb2, 0xd8, 0x36, 0xbe, 0xd6, 0x35, 0x2b, 0xb2, 0x36,
+	0xb8, 0xce, 0x6c, 0x76, 0xe5, 0xb8, 0x1f, 0xe2, 0x6c, 0x9d, 0x24, 0xa7, 0x15, 0x14, 0x1d, 0x41,
+	0x29, 0x74, 0xbc, 0x1b, 0xca, 0xb5, 0xf2, 0xbb, 0xe2, 0x7e, 0xed, 0xf0, 0xf5, 0x86, 0xdb, 0xc7,
+	0x52, 0x08, 0x27, 0xb2, 0xa8, 0x07, 0x65, 0x3f, 0x10, 0xcc, 0xf7, 0xb8, 0x56, 0x51, 0x6a, 0x5f,
+	0x3f, 0xe2, 0xb4, 0x83, 0x71, 0x2c, 0x6e, 0x7a, 0x22, 0xbc, 0xc3, 0xa9, 0x32, 0xea, 0x40, 0x8d,
+	0xcb, 0x03, 0xba, 0x7d, 0x9f, 0x0b, 0xae, 0x55, 0x15, 0xd7, 0xaf, 0x37, 0x71, 0x65, 0x92, 0x38,
+	0xaf, 0xb5, 0xfb, 0x3d, 0xd4, 0xf3, 0xec, 0x32, 0xbf, 0x7f, 0xa0, 0x77, 0x89, 0xdf, 0xe4, 0x50,
+	0xbe, 0xb0, 0x5b, 0x67, 0x16, 0xa5, 0x6e, 0x8a, 0x27, 0xdf, 0x17, 0xbe, 0xdb, 0xd6, 0x7d, 0x68,
+	0xad, 0x9c, 0x51, 0x55, 0x2b, 0x39, 0x38, 0xf3, 0x7f, 0xa2, 0x61, 0xf6, 0x2d, 0x95, 0x21, 0xd9,
+	0xfa, 0x45, 0x10, 0xd0, 0xf4, 0x81, 0xe7, 0x90, 0xcc, 0xe7, 0xaa, 0xf6, 0xe7, 0x7d, 0x2e, 0x01,
+	0xfd, 0x3b, 0x78, 0xbe, 0xee, 0x44, 0xd2, 0xe8, 0xb9, 0xe3, 0xa6, 0x1f, 0x89, 0x73, 0xc7, 0x55,
+	0x55, 0x3a, 0x48, 0xf8, 0x0b, 0x2c, 0xd0, 0xff, 0x5d, 0x84, 0xfa, 0x25, 0xeb, 0xb1, 0x2c, 0x4c,
+	0x77, 0xa1, 0x42, 0x18, 0xcf, 0x17, 0xbd, 0x6c, 0x2e, 0xe9, 0x42, 0x7a, 0x93, 0x56, 0xbd, 0x90,
+	0xde, 0xa0, 0xc3, 0xdc, 0x47, 0x4a, 0x73, 0x25, 0x0f, 0xe6, 0x69, 0xf3, 0x8f, 0xdf, 0x80, 0xaa,
+	0x13, 0x89, 0xa9, 0xad, 0x14, 0x77, 0x94, 0xe2, 0xe7, 0x9b, 0x15, 0x8d, 0x89, 0x0c, 0x59, 0xa5,
+	0x5e, 0x71, 0x92, 0x91, 0x2c, 0x20, 0x4e, 0x60, 0xbb, 0x53, 0xc7, 0xf3, 0xe8, 0x4c, 0xc5, 0x6b,
+	0x03, 0x57, 0x9d, 0xa0, 0x13, 0x03, 0xe8, 0x77, 0x50, 0x39, 0xe6, 0xbc, 0x73, 0x7d, 0x63, 0x4c,
+	0x92, 0xe7, 0xff, 0x6c, 0x69, 0x83, 0x63, 0xcb, 0xea, 0x5c, 0xdf, 0xe0, 0x4c, 0x08, 0x7d, 0x0b,
+	0xf5, 0x78, 0xdc, 0x99, 0x31, 0xea, 0x09, 0x55, 0x55, 0x37, 0x28, 0x2d, 0x09, 0xa2, 0x77, 0x50,
+	0x77, 0x02, 0x7b, 0xca, 0x08, 0xb5, 0x39, 0x67, 0x24, 0x29, 0xb8, 0xe0, 0x04, 0x7d, 0x46, 0xa8,
+	0xc5, 0x19, 0x41, 0x5f, 0x40, 0x33, 0xb9, 0x3f, 0xdb, 0xa3, 0x1f, 0xe7, 0xbe, 0x97, 0x54, 0xd2,
+	0x46, 0x82, 0x8e, 0x14, 0xa8, 0x7f, 0x9d, 0xa4, 0x9a, 0x12, 0x14, 0x8c, 0x49, 0x7b, 0x0b, 0x95,
+	0xa1, 0x68, 0x9d, 0x1b, 0xed, 0x6d, 0xf4, 0x0c, 0x5a, 0xd6, 0xb9, 0x61, 0xf7, 0x8c, 0xc1, 0xd9,
+	0xf8, 0x07, 0x13, 0xdb, 0xc6, 0xa4, 0x5d, 0xd0, 0x3f, 0x07, 0x58, 0xdc, 0x0b, 0xaa, 0x43, 0xe5,
+	0x72, 0x62, 0x1c, 0xda, 0x13, 0xeb, 0xb4, 0xbd, 0x85, 0x2a, 0xb0, 0x33, 0x9e, 0x98, 0xa3, 0xf6,
+	0xb6, 0x7e, 0x00, 0xa5, 0xd8, 0x68, 0x99, 0xc4, 0x2d, 0x6b, 0xd0, 0x4d, 0x93, 0xb8, 0x1c, 0x4b,
+	0x67, 0x4e, 0xac, 0xd3, 0xd4, 0x99, 0x13, 0xeb, 0x54, 0x2f, 0xc3, 0x13, 0x73, 0x1e, 0x88, 0xbb,
+	0xc3, 0x7f, 0x02, 0x94, 0x26, 0x47, 0x97, 0xa3, 0xc9, 0x37, 0x68, 0x08, 0xda, 0x09, 0x15, 0x5d,
+	0x1a, 0xcc, 0xfc, 0x3b, 0x4a, 0x96, 0xca, 0x0c, 0x42, 0xcb, 0x89, 0x5f, 0xaa, 0xee, 0x7e, 0xf6,
+	0x40, 0x29, 0xd4, 0xb7, 0x50, 0x1f, 0x9e, 0xc5, 0x5c, 0xbf, 0x98, 0xa9, 0x07, 0x4f, 0x4f, 0xa8,
+	0x58, 0xf9, 0x60, 0xfb, 0x3f, 0x78, 0xc6, 0xf0, 0xd4, 0xba, 0xc7, 0xf3, 0x90, 0xce, 0x63, 0x84,
+	0x7f, 0x86, 0xe6, 0x09, 0x15, 0xf9, 0x4f, 0xcf, 0x75, 0x56, 0x69, 0x4b, 0x58, 0x4e, 0x3a, 0x66,
+	0xb0, 0x96, 0x19, 0x36, 0x4a, 0xef, 0xae, 0xe1, 0xd6, 0xb7, 0x50, 0x17, 0xea, 0x43, 0xf9, 0x51,
+	0x7b, 0x31, 0xb4, 0x54, 0x4d, 0x78, 0xe4, 0x03, 0x65, 0x03, 0x8b, 0x0d, 0x6f, 0x63, 0x67, 0x6d,
+	0xfe, 0x3a, 0xf8, 0xf2, 0xd3, 0x6a, 0xff, 0x86, 0x0d, 0x4c, 0x40, 0xf1, 0x06, 0x97, 0xec, 0x7a,
+	0x91, 0x81, 0x5e, 0x6d, 0x4c, 0x06, 0x1b, 0x68, 0x86, 0xaa, 0x13, 0xc1, 0x91, 0x97, 0x54, 0x9f,
+	0x37, 0xeb, 0x3b, 0x8b, 0xa4, 0x01, 0xda, 0x7d, 0xbd, 0x69, 0x59, 0xb6, 0x0e, 0x8a, 0xae, 0x95,
+	0xa7, 0x93, 0xbd, 0xcd, 0x23, 0x8c, 0x9b, 0x5b, 0x19, 0x7d, 0x0b, 0x61, 0x78, 0xd1, 0x1f, 0x74,
+	0x4f, 0xa8, 0x58, 0xf4, 0x37, 0x71, 0x37, 0xb4, 0x59, 0xeb, 0x51, 0x13, 0x4d, 0x40, 0xfd, 0x41,
+	0xb7, 0xe3, 0x78, 0x2e, 0x9d, 0x2d, 0xac, 0x7c, 0x80, 0x70, 0xfd, 0xc5, 0x1d, 0x43, 0xad, 0x67,
+	0x65, 0xfd, 0xf3, 0xca, 0x29, 0x57, 0xfb, 0xea, 0x0d, 0x1c, 0xa7, 0x00, 0x3d, 0x2b, 0xed, 0xda,
+	0xd1, 0xb2, 0xe1, 0x2b, 0x7f, 0x07, 0x76, 0xdf, 0x6c, 0x58, 0x8d, 0x3b, 0x63, 0x7d, 0x0b, 0x8d,
+	0xa0, 0xd1, 0xb3, 0x4e, 0xa8, 0x48, 0x9b, 0xe6, 0x15, 0xbe, 0x95, 0x96, 0x7b, 0x85, 0x6f, 0xb5,
+	0xd3, 0xd6, 0xb7, 0xd0, 0x8f, 0xf0, 0xa2, 0x67, 0x75, 0x42, 0xea, 0x08, 0xba, 0xf4, 0x8b, 0x03,
+	0x2d, 0x7f, 0x0d, 0xac, 0xfb, 0xc1, 0xb2, 0xab, 0x3f, 0x24, 0x92, 0xee, 0x70, 0x55, 0x52, 0xbf,
+	0x6c, 0xfe, 0xf0, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x94, 0x19, 0x23, 0xc0, 0x11, 0x00,
+	0x00,
 }
--- a/proto/grpc.proto
+++ b/proto/grpc.proto
@ -17,8 +17,8 @@ service P4WNP1 {

 	rpc HIDRunScript(HIDScriptRequest) returns (HIDScriptResult) {}
 	rpc HIDRunScriptJob(HIDScriptRequest) returns (HIDScriptJob) {}
-	rpc HIDRGetScriptJobResult(HIDScriptJob) returns (HIDScriptResult) {}
-	rpc HIDRCancelScriptJob(HIDScriptJob) returns (Empty) {}
+	rpc HIDGetScriptJobResult(HIDScriptJob) returns (HIDScriptResult) {}
+	rpc HIDCancelScriptJob(HIDScriptJob) returns (Empty) {}

 	rpc FSWriteFile(WriteFileRequest) returns (Empty) {}
 	rpc FSReadFile(ReadFileRequest) returns (ReadFileResponse) {}
@ -68,7 +68,8 @@ message FileInfoResponse {

 /* HID */
 message HIDScriptRequest {
-	string scriptPath = 1; //for scripts hosted on the device
+	string scriptPath = 1;
+	uint32 timeoutSeconds = 2; //a timeout > 0 interrupts the HIDScript when reached, meassurement in seconds
 }

 message HIDScriptJob {
--- a/service/rpc_server.go
+++ b/service/rpc_server.go
@ -68,10 +68,15 @@ func (s *server) FSCreateTempDirOrFile(ctx context.Context, req *pb.TempDirOrFil
 	}
 }

-func (s *server) HIDRCancelScriptJob(ctx context.Context, job *pb.HIDScriptJob) (empty *pb.Empty, err error) {
+func (s *server) HIDCancelScriptJob(ctx context.Context, sJob *pb.HIDScriptJob) (empty *pb.Empty, err error) {
 	empty = &pb.Empty{}
 	if HidCtl == nil { return empty, rpcErrNoHid}

+	// Try to find script
+	job,err := HidCtl.GetBackgroundJobByID(int(sJob.Id))
+	if err != nil { return empty, err }
+
+	job.Cancel()
 	return
 }

@ -81,8 +86,10 @@ func (s *server) HIDRunScript(ctx context.Context, scriptReq *pb.HIDScriptReques
 	if scriptFile, err := ioutil.ReadFile(scriptReq.ScriptPath); err != nil {
 		return nil, errors.New(fmt.Sprintf("Couldn't load HIDScript '%s': %v\n", scriptReq.ScriptPath, err))
 	} else {
-		//ToDo: check influence of request context
-		scriptVal,err := HidCtl.RunScript(ctx, string(scriptFile))
+		jobCtx := context.Background()
+		// ToDo: we don't retrieve the cancelFunc which should be called to free resources. Solution: use withCancel context and call cancel by go routine on timeout
+		if scriptReq.TimeoutSeconds > 0 { jobCtx,_ = context.WithTimeout(jobCtx, time.Second * time.Duration(scriptReq.TimeoutSeconds))}
+		scriptVal,err := HidCtl.RunScript(jobCtx, string(scriptFile))
 		if err != nil { return nil,err }
 		val,_ := scriptVal.Export() //Convert to Go representation, error is always nil
 		jsonVal,err := json.Marshal(val)
@ -98,15 +105,49 @@ func (s *server) HIDRunScript(ctx context.Context, scriptReq *pb.HIDScriptReques
 	}
 }

-func (s *server) HIDRunScriptJob(ctx context.Context, scriptReq *pb.HIDScriptRequest) (job *pb.HIDScriptJob, err error) {
+func (s *server) HIDRunScriptJob(ctx context.Context, scriptReq *pb.HIDScriptRequest) (rJob *pb.HIDScriptJob, err error) {
 	if HidCtl == nil { return nil, rpcErrNoHid}

+	if scriptFile, err := ioutil.ReadFile(scriptReq.ScriptPath); err != nil {
+		return nil, errors.New(fmt.Sprintf("Couldn't load HIDScript '%s': %v\n", scriptReq.ScriptPath, err))
+	} else {
+		//Note: Don't use the gRPC context, it would cancel after this call and thus interrupt the job immediately
+		jobCtx := context.Background()
+		// ToDo: we don't retrieve the cancelFunc which should be called to free resources. Solution: use withCancel context and call cancel by go routine on timeout
+		if scriptReq.TimeoutSeconds > 0 { jobCtx,_ = context.WithTimeout(jobCtx, time.Second * time.Duration(scriptReq.TimeoutSeconds))}
+		job,err := HidCtl.StartScriptAsBackgroundJob(jobCtx, string(scriptFile))
+		if err != nil { return nil,err }
+
+		rJob = &pb.HIDScriptJob{
+			Id: uint32(job.Id),
+		}
+		return rJob,nil
+	}
 	return
 }

-func (s *server) HIDRGetScriptJobResult(ctx context.Context,job *pb.HIDScriptJob) (scriptRes *pb.HIDScriptResult, err error) {
+func (s *server) HIDGetScriptJobResult(ctx context.Context, sJob *pb.HIDScriptJob) (scriptRes *pb.HIDScriptResult, err error) {
 	if HidCtl == nil { return nil, rpcErrNoHid}

+	// Try to find script
+	job,err := HidCtl.GetBackgroundJobByID(int(sJob.Id))
+	if err != nil { return scriptRes, err }
+
+
+	//ToDo: check impact/behavior, because ctx is provided by gRPC server
+	scriptVal,err := HidCtl.WaitBackgroundJobResult(ctx, job)
+	if err != nil { return nil,err }
+	val,_ := scriptVal.Export() //Convert to Go representation, error is always nil
+	jsonVal,err := json.Marshal(val)
+	if err != nil {
+		return nil, errors.New(fmt.Sprintf("Script seems to have succeeded but result couldn't be converted to JSON: %v\n", err))
+	}
+	scriptRes = &pb.HIDScriptResult{
+		IsFinished: true,
+		Job: &pb.HIDScriptJob{Id:0},
+		ResultJson: string(jsonVal),
+	}
+	return scriptRes,nil
 	return
 }

--- a/testotto.go
+++ b/testotto.go
@ -1 +0,0 @@
-package main
--- a/tests.go
+++ b/tests.go
@ -1 +0,0 @@
-package main