Refactor delay timer into wait

Resolves: #326 (comment)

common/keyboard.go

@@ -260,15 +260,9 @@ func (k *Keyboard) modifierBitFromKeyName(key string) int64 {
 }
 
 func (k *Keyboard) comboPress(keys string, opts *KeyboardOptions) error {
-	if opts.Delay != 0 {
-		t := time.NewTimer(time.Duration(opts.Delay) * time.Millisecond)
-		select {
-		case <-k.ctx.Done():
-			if !t.Stop() {
-				<-t.C
-			}
-			return context.Canceled
-		case <-t.C:
+	if opts.Delay > 0 {
+		if err := wait(k.ctx, opts.Delay); err != nil {
+			return err
 		}
 	}
 
@@ -312,12 +306,9 @@ func split(keys string) []string {
 }
 
 func (k *Keyboard) press(key string, opts *KeyboardOptions) error {
-	if opts.Delay != 0 {
-		t := time.NewTimer(time.Duration(opts.Delay) * time.Millisecond)
-		select {
-		case <-k.ctx.Done():
-			t.Stop()
-		case <-t.C:
+	if opts.Delay > 0 {
+		if err := wait(k.ctx, opts.Delay); err != nil {
+			return err
 		}
 	}
 	if err := k.down(key); err != nil {
@@ -329,12 +320,9 @@ func (k *Keyboard) press(key string, opts *KeyboardOptions) error {
 func (k *Keyboard) typ(text string, opts *KeyboardOptions) error {
 	layout := keyboardlayout.GetKeyboardLayout(k.layoutName)
 	for _, c := range text {
-		if opts.Delay != 0 {
-			t := time.NewTimer(time.Duration(opts.Delay) * time.Millisecond)
-			select {
-			case <-k.ctx.Done():
-				t.Stop()
-			case <-t.C:
+		if opts.Delay > 0 {
+			if err := wait(k.ctx, opts.Delay); err != nil {
+				return err
 			}
 		}
 		keyInput := keyboardlayout.KeyInput(c)
@@ -350,3 +338,17 @@ func (k *Keyboard) typ(text string, opts *KeyboardOptions) error {
 	}
 	return nil
 }
+
+func wait(ctx context.Context, delay int64) error {
+	t := time.NewTimer(time.Duration(delay) * time.Millisecond)
+	select {
+	case <-ctx.Done():
+		if !t.Stop() {
+			<-t.C
+		}
+		return ctx.Err()
+	case <-t.C:
+	}
+
+	return nil
+}