Update drpc library version

This exposes the watches' file system over FUSE. This way, we can access files on the watch without having to go through `itctl` or developing 3rd party tools.

**Features**

- [x] read/write access to the file system
- [x] read access to momentary sensor data
- [x] live access to sensor data (i.e. WatchMotion rather than Motion)
- [x] configuration of mount point

Co-authored-by: Yannick Ulrich <yannick.ulrich@durham.ac.uk>
Reviewed-on: https://gitea.arsenm.dev/Arsen6331/itd/pulls/55
Co-authored-by: yannickulrich <yannick.ulrich@protonmail.com>
Co-committed-by: yannickulrich <yannick.ulrich@protonmail.com>

.gitignore

@@ -1,4 +1,6 @@
 /itctl
 /itd
 /itgui
-/version.txt
+/itgui-linux-*
+/version.txt
+dist/

.gitm.toml

@@ -1,3 +0,0 @@
-[repos]
-origin = "ssh://git@192.168.100.62:2222/Arsen6331/itd.git"
-gitlab = "git@gitlab.com:moussaelianarsen/itd.git"

.goreleaser.yaml

@@ -0,0 +1,119 @@
+before:
+  hooks:
+    - go generate
+    - go mod tidy
+builds:
+  - id: itd
+    env:
+      - CGO_ENABLED=0
+    binary: itd
+    goos:
+      - linux
+    goarch:
+      - 386
+      - amd64
+      - arm
+      - arm64
+    goarm:
+      - 7
+  - id: itctl
+    env:
+      - CGO_ENABLED=0
+    main: ./cmd/itctl
+    binary: itctl
+    goos:
+      - linux
+    goarch:
+      - 386
+      - amd64
+      - arm
+      - arm64
+    goarm:
+      -  7
+archives:
+  - name_template: >-
+       {{- .ProjectName }}-{{.Version}}-{{.Os}}-
+       {{- if eq .Arch "386" }}i386
+       {{- else if eq .Arch "amd64" }}x86_64
+       {{- else if eq .Arch "arm64" }}aarch64
+       {{- else }}{{.Arch}}
+       {{- end }}
+    files:
+      - LICENSE
+      - README.md
+      - itd.toml
+      - itd.service
+nfpms:
+  - id: itd
+    file_name_template: >-
+        {{- .PackageName }}-{{.Version}}-{{.Os}}-
+        {{- if eq .Arch "386" }}i386
+        {{- else if eq .Arch "amd64" }}x86_64
+        {{- else if eq .Arch "arm64" }}aarch64
+        {{- else }}{{.Arch}}
+        {{- end }}
+    description: "Companion daemon for the InfiniTime firmware on the PineTime smartwatch"
+    homepage: 'https://gitea.arsenm.dev/Arsen6331/itd'
+    maintainer: 'Arsen Musyaelyan <arsen@arsenm.dev>'
+    license: GPLv3
+    formats:
+      - apk
+      - deb
+      - rpm
+      - archlinux
+    dependencies:
+      - dbus
+      - bluez
+    contents:
+      - src: itd.toml
+        dst: /etc/itd.toml
+        type: "config|noreplace"
+      - src: itd.service
+        dst: /usr/lib/systemd/user/itd.service
+        file_info:
+          mode: 0755
+aurs:
+  - name: itd-bin
+    homepage: 'https://gitea.arsenm.dev/Arsen6331/itd'
+    description: "Companion daemon for the InfiniTime firmware on the PineTime smartwatch"
+    maintainers:
+      - 'Arsen Musyaelyan <arsen@arsenm.dev>'
+    license: GPLv3
+    private_key: '{{ .Env.AUR_KEY }}'
+    git_url: 'ssh://aur@aur.archlinux.org/itd-bin.git'
+    provides:
+      - itd
+      - itctl
+    conflicts:
+      - itd
+      - itctl
+    depends:
+      - dbus
+      - bluez
+    package: |-
+      # binaries
+      install -Dm755 ./itd "${pkgdir}/usr/bin/itd"
+      install -Dm755 ./itctl "${pkgdir}/usr/bin/itctl"
+
+      # service
+      install -Dm644 "./itd.service" ${pkgdir}/usr/lib/systemd/user/itd.service
+
+      # config
+      install -Dm644 "./itd.toml" ${pkgdir}/etc/itd.toml
+      
+      # license
+      install -Dm644 "./LICENSE" "${pkgdir}/usr/share/licenses/itd/LICENSE"
+release:
+  gitea:
+    owner: Arsen6331
+    name: itd
+gitea_urls:
+  api: 'https://gitea.arsenm.dev/api/v1/'
+  download: 'https://gitea.arsenm.dev'
+  skip_tls_verify: false
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ incpatch .Version }}-next"
+changelog:
+  sort: asc

.woodpecker.yml

@@ -0,0 +1,8 @@
+pipeline:
+  release:
+    image: goreleaser/goreleaser
+    commands:
+      - goreleaser release
+    secrets: [ gitea_token, aur_key ]
+    when:
+      event: tag

Makefile

@@ -25,6 +25,6 @@ uninstall:
 	rm $(CFG_PREFIX)/itd.toml
 
 version.txt:
-	printf "r%s.%s" "$(shell git rev-list --count HEAD)" "$(shell git rev-parse --short HEAD)" > version.txt
+	go generate
 
 .PHONY: all clean install uninstall

README.md

@@ -3,9 +3,9 @@
 
 `itd` is a daemon that uses my infinitime [library](https://go.arsenm.dev/infinitime) to interact with the [PineTime](https://www.pine64.org/pinetime/) running [InfiniTime](https://infinitime.io).
 
-[![Build status](https://ci.appveyor.com/api/projects/status/xgj5sobw76ndqaod?svg=true)](https://ci.appveyor.com/project/moussaelianarsen/itd)
-[![Binary downloads](https://img.shields.io/badge/download-binary-orange)](https://minio.arsenm.dev/minio/itd/)
-[![AUR package](https://img.shields.io/aur/version/itd-git?label=itd-git&logo=archlinux)](https://aur.archlinux.org/packages/itd-git/)
+[![status-badge](https://ci.arsenm.dev/api/badges/Arsen6331/itd/status.svg)](https://ci.arsenm.dev/Arsen6331/itd)
+[![itd-git AUR package](https://img.shields.io/aur/version/itd-git?label=itd-git&logo=archlinux)](https://aur.archlinux.org/packages/itd-git/)
+[![itd-bin AUR package](https://img.shields.io/aur/version/itd-bin?label=itd-bin&logo=archlinux)](https://aur.archlinux.org/packages/itd-bin/)
 
 ---
 
@@ -21,57 +21,38 @@
 - Firmware upgrades
 - Weather
 - BLE Filesystem
+- Navigation (PureMaps)
+- FUSE Filesystem
 
 ---
 
-### Socket
+### Installation
 
-This daemon creates a UNIX socket at `/tmp/itd/socket`. It allows you to directly control the daemon and, by extension, the connected watch.
+Since ITD 0.0.7, packages are built and uploaded whenever a new release is created.
 
-The socket uses my [lrpc](https://gitea.arsenm.dev/Arsen6331/lrpc) library for requests. This library accepts requests in msgpack, with the following format:
+#### Arch Linux
 
-```json
-{"Receiver": "ITD", "Method": "Notify", "Arg": {"title": "title1", "body": "body1"}, "ID": "some-id-here"}
-```
+Use the `itd-bin` or `itd-git` AUR packages.
 
-It will return a msgpack response, the format of which can be found [here](https://gitea.arsenm.dev/Arsen6331/lrpc/src/branch/master/internal/types/types.go#L30). The response will have the same ID as was sent in the request in order to allow the client to keep track of which request the response belongs to.
+#### Debian/Ubuntu
 
----
+- Go to the [latest release](https://gitea.arsenm.dev/Arsen6331/itd/releases/latest) and download the `.deb` package for your CPU architecture. You can find your architecture by running `uname -m` in the terminal.
+- Run `sudo apt install <package>`, replacing `<package>` with the path to the downloaded file. Note: relative paths must begin with `./`.
+- Example: `sudo apt install ~/Downloads/itd-0.0.7-linux-aarch64.deb`
 
-### Transliteration
+#### Fedora
 
-Since the PineTime does not have enough space to store all unicode glyphs, it only stores the ASCII space and Cyrillic. Therefore, this daemon can transliterate unsupported characters into supported ones. Since some languages have different transliterations, the transliterators to be used must be specified in the config. Here are the available transliterators:
+- Go to the [latest release](https://gitea.arsenm.dev/Arsen6331/itd/releases/latest) and download the `.rpm` package for your CPU architecture. You can find your architecture by running `uname -m` in the terminal.
+- Run `sudo dnf install <package>`, replacing `<package>` with the path to the downloaded file.
+- Example: `sudo dnf install ~/Downloads/itd-0.0.7-linux-aarch64.rpm`
 
-- eASCII
-- Scandinavian
-- German
-- Hebrew
-- Greek
-- Russian
-- Ukranian
-- Arabic
-- Farsi
-- Polish
-- Lithuanian
-- Estonian
-- Icelandic
-- Czech
-- French
-- Armenian
-- Korean
-- Chinese
-- Romanian
-- Emoji
+#### Alpine (and postmarketOS)
 
-Place the desired map names in an array as `notifs.translit.use`. They will be evaluated in order. You can also put custom transliterations in `notifs.translit.custom`. These take priority over any other maps. The `notifs.translit` config section should look like this:
+- Go to the [latest release](https://gitea.arsenm.dev/Arsen6331/itd/releases/latest) and download the `.apk` package for your CPU architecture. You can find your architecture by running `uname -m` in the terminal.
+- Run `sudo apk add --allow-untrusted <package>`, replacing `<package>` with the path to the downloaded file.
+- Example: `sudo apk add --allow-untrusted ~/Downloads/itd-0.0.7-linux-aarch64.apk`
 
-```toml
-[notifs.translit]
-    use = ["eASCII", "Russian", "Emoji"]
-    custom = [
-        "test", "replaced"
-    ]
-```
+Note: `--allow-untrusted` is required because ITD isn't part of a repository, and therefore is not signed.
 
 ---
 
@@ -81,36 +62,58 @@ This daemon comes with a binary called `itctl` which uses the socket to control
 
 This is the `itctl` usage screen:
 ```
-Control the itd daemon for InfiniTime smartwatches
+NAME:
+   itctl - A new cli application
 
-Usage:
-  itctl [flags]
-  itctl [command]
+USAGE:
+   itctl [global options] command [command options] [arguments...]
 
-Available Commands:
-  firmware    Manage InfiniTime firmware
-  get         Get information from InfiniTime
-  help        Help about any command
-  notify      Send notification to InfiniTime
-  set         Set information on InfiniTime
+COMMANDS:
+   help            Display help screen for a command
+   resources, res  Handle InfiniTime resource loading
+   filesystem, fs  Perform filesystem operations on the PineTime
+   firmware, fw    Manage InfiniTime firmware
+   get             Get information from InfiniTime
+   notify          Send notification to InfiniTime
+   set             Set information on InfiniTime
+   update, upd     Update information on InfiniTime
+   watch           Watch a value for changes
 
-Flags:
-  -h, --help                 help for itctl
-  -s, --socket-path string   Path to itd socket
-
-Use "itctl [command] --help" for more information about a command.
+GLOBAL OPTIONS:
+   --socket-path value, -s value  Path to itd socket (default: "/tmp/itd/socket")
 ```
 
 ---
 
 ### `itgui`
 
-In `cmd/itgui`, there is a gui frontend to the socket of `itd`. It uses the [fyne library](https://fyne.io/) for Go. It can be compiled by running:
+In `cmd/itgui`, there is a gui frontend to the socket of `itd`. It uses the [Fyne library](https://fyne.io/) for Go.
+
+#### Easy Installation
+
+The easiest way to install `itgui` is to use my other project, [LURE](https://gitea.arsenm.dev/Arsen6331/lure). LURE will only work if your package manager is `apt`, `dnf`, `yum`, `zypper`, `pacman`, or `apk`.
+
+Instructions:
+
+1. Install LURE. This can be done with the following command: `curl https://www.arsenm.dev/lure.sh | bash`.
+2. Check to make sure LURE is properly installed by running `lure ref`.
+3. Run `lure in itgui`. This process may take a while as it will compile `itgui` from source and package it for your distro.
+4. Once the process is complete, you should be able to open and use `itgui` like any other app.
+
+#### Compilation
+
+Before compiling, certain prerequisites must be installed. These are listed on the following page: https://developer.fyne.io/started/#prerequisites
+
+It can be compiled by running:
 
 ```shell
 go build ./cmd/itgui
 ```
 
+#### Cross-compilation
+
+Due to the use of OpenGL, cross-compilation of `itgui` isn't as simple as that of `itd` and `itctl`. The following guide from the Fyne website should work for `itgui`: https://developer.fyne.io/started/cross-compiling.
+
 #### Screenshots
 
 ![Info tab](cmd/itgui/screenshots/info.png)
@@ -123,6 +126,8 @@ go build ./cmd/itgui
 
 ![FS mkdir](cmd/itgui/screenshots/mkdir.png)
 
+![FS resource upload](cmd/itgui/screenshots/resources.png)
+
 ![Time tab](cmd/itgui/screenshots/time.png)
 
 ![Firmware tab](cmd/itgui/screenshots/firmware.png)
@@ -144,6 +149,16 @@ make && sudo make install
 
 ---
 
+### Socket
+
+This daemon creates a UNIX socket at `/tmp/itd/socket`. It allows you to directly control the daemon and, by extension, the connected watch.
+
+The socket uses the [DRPC](https://github.com/storj/drpc) library for requests. The code generated by this framework is located in [`internal/rpc`](internal/rpc)
+
+The API description is located in the [`internal/rpc/itd.proto`](internal/rpc/itd.proto) file.
+
+---
+
 ### Starting
 
 To start the daemon, run the following **without root**:
@@ -183,4 +198,4 @@ Most of the time, the daemon does not need to be restarted for config changes to
 
 Location data from OpenStreetMap Nominatim, &copy; [OpenStreetMap](https://www.openstreetmap.org/copyright) contributors
 
-Weather data from the [Norwegian Meteorological Institute](https://www.met.no/en)
+Weather data from the [Norwegian Meteorological Institute](https://www.met.no/en)

api/api.go

@@ -4,34 +4,59 @@ import (
 	"io"
 	"net"
 
-	"go.arsenm.dev/lrpc/client"
-	"go.arsenm.dev/lrpc/codec"
+	"go.arsenm.dev/drpc/muxconn"
+	"go.arsenm.dev/itd/internal/rpc"
+	"storj.io/drpc"
 )
 
 const DefaultAddr = "/tmp/itd/socket"
 
+// Client is a client for ITD's socket API
 type Client struct {
-	client *client.Client
+	conn   drpc.Conn
+	client rpc.DRPCITDClient
 }
 
+// New connects to the UNIX socket at the given
+// path, and returns a client that communicates
+// with that socket.
 func New(sockPath string) (*Client, error) {
 	conn, err := net.Dial("unix", sockPath)
 	if err != nil {
 		return nil, err
 	}
 
-	out := &Client{
-		client: client.New(conn, codec.Default),
+	mconn, err := muxconn.New(conn)
+	if err != nil {
+		return nil, err
 	}
-	return out, nil
-}
 
-func NewFromConn(conn io.ReadWriteCloser) *Client {
 	return &Client{
-		client: client.New(conn, codec.Default),
-	}
+		conn:   mconn,
+		client: rpc.NewDRPCITDClient(mconn),
+	}, nil
 }
 
-func (c *Client) Close() error {
-	return c.client.Close()
+// NewFromConn returns a client that communicates
+// over the given connection.
+func NewFromConn(conn io.ReadWriteCloser) (*Client, error) {
+	mconn, err := muxconn.New(conn)
+	if err != nil {
+		return nil, err
+	}
+
+	return &Client{
+		conn:   mconn,
+		client: rpc.NewDRPCITDClient(mconn),
+	}, nil
+}
+
+// FS returns the filesystem API client
+func (c *Client) FS() *FSClient {
+	return &FSClient{rpc.NewDRPCFSClient(c.conn)}
+}
+
+// Close closes the client connection
+func (c *Client) Close() error {
+	return c.conn.Close()
 }

api/firmware.go

@@ -3,24 +3,34 @@ package api
 import (
 	"context"
 
-	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/rpc"
 )
 
-func (c *Client) FirmwareUpgrade(ctx context.Context, upgType UpgradeType, files ...string) (chan infinitime.DFUProgress, error) {
-	progressCh := make(chan infinitime.DFUProgress, 5)
-	err := c.client.Call(
-		ctx,
-		"ITD",
-		"FirmwareUpgrade",
-		FwUpgradeData{
-			Type:  upgType,
-			Files: files,
-		},
-		progressCh,
-	)
+type DFUProgress struct {
+	Sent     int64
+	Received int64
+	Total    int64
+	Err      error
+}
+
+func (c *Client) FirmwareUpgrade(ctx context.Context, upgType UpgradeType, files ...string) (chan DFUProgress, error) {
+	progressCh := make(chan DFUProgress, 5)
+	fc, err := c.client.FirmwareUpgrade(ctx, &rpc.FirmwareUpgradeRequest{
+		Type:  rpc.FirmwareUpgradeRequest_Type(upgType),
+		Files: files,
+	})
 	if err != nil {
 		return nil, err
 	}
 
+	go fsRecvToChannel[rpc.DFUProgress](fc, progressCh, func(evt *rpc.DFUProgress, err error) DFUProgress {
+		return DFUProgress{
+			Sent:     evt.Sent,
+			Received: evt.Recieved,
+			Total:    evt.Total,
+			Err:      err,
+		}
+	})
+
 	return progressCh, nil
 }

api/fs.go

@@ -1,76 +1,119 @@
 package api
 
-import "context"
+import (
+	"context"
+	"errors"
+	"io"
 
-func (c *Client) Remove(ctx context.Context, paths ...string) error {
-	return c.client.Call(
-		ctx,
-		"FS",
-		"Remove",
-		paths,
-		nil,
-	)
+	"go.arsenm.dev/itd/internal/rpc"
+)
+
+type FSClient struct {
+	client rpc.DRPCFSClient
 }
 
-func (c *Client) Rename(ctx context.Context, old, new string) error {
-	return c.client.Call(
-		ctx,
-		"FS",
-		"Rename",
-		[2]string{old, new},
-		nil,
-	)
+func (c *FSClient) RemoveAll(ctx context.Context, paths ...string) error {
+	_, err := c.client.RemoveAll(ctx, &rpc.PathsRequest{Paths: paths})
+	return err
 }
 
-func (c *Client) Mkdir(ctx context.Context, paths ...string) error {
-	return c.client.Call(
-		ctx,
-		"FS",
-		"Mkdir",
-		paths,
-		nil,
-	)
+func (c *FSClient) Remove(ctx context.Context, paths ...string) error {
+	_, err := c.client.Remove(ctx, &rpc.PathsRequest{Paths: paths})
+	return err
 }
 
-func (c *Client) ReadDir(ctx context.Context, dir string) (out []FileInfo, err error) {
-	err = c.client.Call(
-		ctx,
-		"FS",
-		"ReadDir",
-		dir,
-		&out,
-	)
-	return
+func (c *FSClient) Rename(ctx context.Context, old, new string) error {
+	_, err := c.client.Rename(ctx, &rpc.RenameRequest{
+		From: old,
+		To:   new,
+	})
+	return err
 }
 
-func (c *Client) Upload(ctx context.Context, dst, src string) (chan FSTransferProgress, error) {
+func (c *FSClient) MkdirAll(ctx context.Context, paths ...string) error {
+	_, err := c.client.MkdirAll(ctx, &rpc.PathsRequest{Paths: paths})
+	return err
+}
+
+func (c *FSClient) Mkdir(ctx context.Context, paths ...string) error {
+	_, err := c.client.Mkdir(ctx, &rpc.PathsRequest{Paths: paths})
+	return err
+}
+
+func (c *FSClient) ReadDir(ctx context.Context, dir string) ([]FileInfo, error) {
+	res, err := c.client.ReadDir(ctx, &rpc.PathRequest{Path: dir})
+	return convertEntries(res.Entries), err
+}
+
+func convertEntries(e []*rpc.FileInfo) []FileInfo {
+	out := make([]FileInfo, len(e))
+	for i, fi := range e {
+		out[i] = FileInfo{
+			Name:  fi.Name,
+			Size:  fi.Size,
+			IsDir: fi.IsDir,
+		}
+	}
+	return out
+}
+
+func (c *FSClient) Upload(ctx context.Context, dst, src string) (chan FSTransferProgress, error) {
 	progressCh := make(chan FSTransferProgress, 5)
-	err := c.client.Call(
-		ctx,
-		"FS",
-		"Upload",
-		[2]string{dst, src},
-		progressCh,
-	)
+	tc, err := c.client.Upload(ctx, &rpc.TransferRequest{Source: src, Destination: dst})
 	if err != nil {
 		return nil, err
 	}
 
+	go fsRecvToChannel[rpc.TransferProgress](tc, progressCh, func(evt *rpc.TransferProgress, err error) FSTransferProgress {
+		return FSTransferProgress{
+			Sent:  evt.Sent,
+			Total: evt.Total,
+			Err:   err,
+		}
+	})
+
 	return progressCh, nil
 }
 
-func (c *Client) Download(ctx context.Context, dst, src string) (chan FSTransferProgress, error) {
+func (c *FSClient) Download(ctx context.Context, dst, src string) (chan FSTransferProgress, error) {
 	progressCh := make(chan FSTransferProgress, 5)
-	err := c.client.Call(
-		ctx,
-		"FS",
-		"Download",
-		[2]string{dst, src},
-		progressCh,
-	)
+	tc, err := c.client.Download(ctx, &rpc.TransferRequest{Source: src, Destination: dst})
 	if err != nil {
 		return nil, err
 	}
 
+	go fsRecvToChannel[rpc.TransferProgress](tc, progressCh, func(evt *rpc.TransferProgress, err error) FSTransferProgress {
+		return FSTransferProgress{
+			Sent:  evt.Sent,
+			Total: evt.Total,
+			Err:   err,
+		}
+	})
+
 	return progressCh, nil
 }
+
+// fsRecvToChannel converts a DRPC stream client to a Go channel, using cf to convert
+// RPC generated types to API response types.
+func fsRecvToChannel[R any, A any](s StreamClient[R], ch chan<- A, cf func(evt *R, err error) A) {
+	defer close(ch)
+
+	var err error
+	var evt *R
+
+	for {
+		select {
+		case <-s.Context().Done():
+			return
+		default:
+			evt, err = s.Recv()
+			if errors.Is(err, io.EOF) {
+				return
+			} else if err != nil {
+				ch <- cf(new(R), err)
+				return
+			}
+			ch <- cf(evt, nil)
+		}
+	}
+}

api/get.go

@@ -3,71 +3,39 @@ package api
 import (
 	"context"
 
-	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/rpc"
 )
 
-func (c *Client) HeartRate(ctx context.Context) (out uint8, err error) {
-	err = c.client.Call(
-		ctx,
-		"ITD",
-		"HeartRate",
-		nil,
-		&out,
-	)
-	return
+func (c *Client) HeartRate(ctx context.Context) (uint8, error) {
+	res, err := c.client.HeartRate(ctx, &rpc.Empty{})
+	return uint8(res.Value), err
 }
 
-func (c *Client) BatteryLevel(ctx context.Context) (out uint8, err error) {
-	err = c.client.Call(
-		ctx,
-		"ITD",
-		"BatteryLevel",
-		nil,
-		&out,
-	)
-	return
+func (c *Client) BatteryLevel(ctx context.Context) (uint8, error) {
+	res, err := c.client.BatteryLevel(ctx, &rpc.Empty{})
+	return uint8(res.Value), err
 }
 
-func (c *Client) Motion(ctx context.Context) (out infinitime.MotionValues, err error) {
-	err = c.client.Call(
-		ctx,
-		"ITD",
-		"Motion",
-		nil,
-		&out,
-	)
-	return
+type MotionValues struct {
+	X, Y, Z int16
+}
+
+func (c *Client) Motion(ctx context.Context) (MotionValues, error) {
+	res, err := c.client.Motion(ctx, &rpc.Empty{})
+	return MotionValues{int16(res.X), int16(res.Y), int16(res.Z)}, err
 }
 
 func (c *Client) StepCount(ctx context.Context) (out uint32, err error) {
-	err = c.client.Call(
-		ctx,
-		"ITD",
-		"StepCount",
-		nil,
-		&out,
-	)
-	return
+	res, err := c.client.StepCount(ctx, &rpc.Empty{})
+	return res.Value, err
 }
 
 func (c *Client) Version(ctx context.Context) (out string, err error) {
-	err = c.client.Call(
-		ctx,
-		"ITD",
-		"Version",
-		nil,
-		&out,
-	)
-	return
+	res, err := c.client.Version(ctx, &rpc.Empty{})
+	return res.Value, err
 }
 
 func (c *Client) Address(ctx context.Context) (out string, err error) {
-	err = c.client.Call(
-		ctx,
-		"ITD",
-		"Address",
-		nil,
-		&out,
-	)
-	return
+	res, err := c.client.Address(ctx, &rpc.Empty{})
+	return res.Value, err
 }

api/notify.go

@@ -1,16 +1,15 @@
 package api
 
-import "context"
+import (
+	"context"
+
+	"go.arsenm.dev/itd/internal/rpc"
+)
 
 func (c *Client) Notify(ctx context.Context, title, body string) error {
-	return c.client.Call(
-		ctx,
-		"ITD",
-		"Notify",
-		NotifyData{
-			Title: title,
-			Body:  body,
-		},
-		nil,
-	)
+	_, err := c.client.Notify(ctx, &rpc.NotifyRequest{
+		Title: title,
+		Body:  body,
+	})
+	return err
 }

api/resources.go

@@ -0,0 +1,51 @@
+package api
+
+import (
+	"context"
+
+	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/rpc"
+)
+
+type ResourceOperation uint8
+
+const (
+	ResourceOperationRemoveObsolete = infinitime.ResourceOperationRemoveObsolete
+	ResourceOperationUpload         = infinitime.ResourceOperationUpload
+)
+
+type ResourceLoadProgress struct {
+	Operation ResourceOperation
+	Name      string
+	Total     int64
+	Sent      int64
+	Err       error
+}
+
+// LoadResources loads resources onto the watch from the given
+// file path to the resources zip
+func (c *FSClient) LoadResources(ctx context.Context, path string) (<-chan ResourceLoadProgress, error) {
+	progCh := make(chan ResourceLoadProgress, 2)
+
+	rc, err := c.client.LoadResources(ctx, &rpc.PathRequest{Path: path})
+	if err != nil {
+		return nil, err
+	}
+
+	go fsRecvToChannel[rpc.ResourceLoadProgress](rc, progCh, func(evt *rpc.ResourceLoadProgress, err error) ResourceLoadProgress {
+		return ResourceLoadProgress{
+			Operation: ResourceOperation(evt.Operation),
+			Name:      evt.Name,
+			Sent:      evt.Sent,
+			Total:     evt.Total,
+			Err:       err,
+		}
+	})
+
+	return progCh, nil
+}
+
+type StreamClient[T any] interface {
+	Recv() (*T, error)
+	Context() context.Context
+}

api/set.go

@@ -3,14 +3,11 @@ package api
 import (
 	"context"
 	"time"
+
+	"go.arsenm.dev/itd/internal/rpc"
 )
 
 func (c *Client) SetTime(ctx context.Context, t time.Time) error {
-	return c.client.Call(
-		ctx,
-		"ITD",
-		"SetTime",
-		t,
-		nil,
-	)
+	_, err := c.client.SetTime(ctx, &rpc.SetTimeRequest{UnixNano: t.UnixNano()})
+	return err
 }

api/types.go

@@ -30,6 +30,7 @@ type NotifyData struct {
 type FSTransferProgress struct {
 	Total uint32
 	Sent  uint32
+	Err   error
 }
 
 type FileInfo struct {

api/update.go

@@ -1,13 +1,12 @@
 package api
 
-import "context"
+import (
+	"context"
+
+	"go.arsenm.dev/itd/internal/rpc"
+)
 
 func (c *Client) WeatherUpdate(ctx context.Context) error {
-	return c.client.Call(
-		ctx,
-		"ITD",
-		"WeatherUpdate",
-		nil,
-		nil,
-	)
+	_, err := c.client.WeatherUpdate(ctx, &rpc.Empty{})
+	return err
 }

api/watch.go

@@ -3,69 +3,133 @@ package api
 import (
 	"context"
 
-	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/rpc"
 )
 
 func (c *Client) WatchHeartRate(ctx context.Context) (<-chan uint8, error) {
 	outCh := make(chan uint8, 2)
-	err := c.client.Call(
-		ctx,
-		"ITD",
-		"WatchHeartRate",
-		nil,
-		outCh,
-	)
+	wc, err := c.client.WatchHeartRate(ctx, &rpc.Empty{})
 	if err != nil {
 		return nil, err
 	}
 
+	go func() {
+		defer close(outCh)
+
+		var err error
+		var evt *rpc.IntResponse
+
+		for {
+			select {
+			case <-ctx.Done():
+				wc.Close()
+				return
+			default:
+				evt, err = wc.Recv()
+				if err != nil {
+					return
+				}
+			}
+
+			outCh <- uint8(evt.Value)
+		}
+	}()
+
 	return outCh, nil
 }
 
 func (c *Client) WatchBatteryLevel(ctx context.Context) (<-chan uint8, error) {
 	outCh := make(chan uint8, 2)
-	err := c.client.Call(
-		ctx,
-		"ITD",
-		"WatchBatteryLevel",
-		nil,
-		outCh,
-	)
+	wc, err := c.client.WatchBatteryLevel(ctx, &rpc.Empty{})
 	if err != nil {
 		return nil, err
 	}
 
+	go func() {
+		defer close(outCh)
+
+		var err error
+		var evt *rpc.IntResponse
+
+		for {
+			select {
+			case <-ctx.Done():
+				wc.Close()
+				return
+			default:
+				evt, err = wc.Recv()
+				if err != nil {
+					return
+				}
+			}
+
+			outCh <- uint8(evt.Value)
+		}
+	}()
+
 	return outCh, nil
 }
 
 func (c *Client) WatchStepCount(ctx context.Context) (<-chan uint32, error) {
 	outCh := make(chan uint32, 2)
-	err := c.client.Call(
-		ctx,
-		"ITD",
-		"WatchStepCount",
-		nil,
-		outCh,
-	)
+	wc, err := c.client.WatchStepCount(ctx, &rpc.Empty{})
 	if err != nil {
 		return nil, err
 	}
 
+	go func() {
+		defer close(outCh)
+
+		var err error
+		var evt *rpc.IntResponse
+
+		for {
+			select {
+			case <-ctx.Done():
+				wc.Close()
+				return
+			default:
+				evt, err = wc.Recv()
+				if err != nil {
+					return
+				}
+			}
+
+			outCh <- evt.Value
+		}
+	}()
+
 	return outCh, nil
 }
 
-func (c *Client) WatchMotion(ctx context.Context) (<-chan infinitime.MotionValues, error) {
-	outCh := make(chan infinitime.MotionValues, 2)
-	err := c.client.Call(
-		ctx,
-		"ITD",
-		"WatchMotion",
-		nil,
-		outCh,
-	)
+func (c *Client) WatchMotion(ctx context.Context) (<-chan MotionValues, error) {
+	outCh := make(chan MotionValues, 2)
+	wc, err := c.client.WatchMotion(ctx, &rpc.Empty{})
 	if err != nil {
 		return nil, err
 	}
 
+	go func() {
+		defer close(outCh)
+
+		var err error
+		var evt *rpc.MotionResponse
+
+		for {
+			select {
+			case <-ctx.Done():
+				wc.Close()
+				return
+			default:
+				evt, err = wc.Recv()
+				if err != nil {
+					return
+				}
+			}
+
+			outCh <- MotionValues{int16(evt.X), int16(evt.Y), int16(evt.Z)}
+		}
+	}()
+
 	return outCh, nil
 }

calls.go

@@ -5,13 +5,14 @@ import (
 	"sync"
 
 	"github.com/godbus/dbus/v5"
-	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/utils"
+	"go.arsenm.dev/logger/log"
 )
 
-func initCallNotifs(ctx context.Context, dev *infinitime.Device) error {
+func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
 	// Connect to system bus. This connection is for method calls.
-	conn, err := newSystemBusConn(ctx)
+	conn, err := utils.NewSystemBusConn(ctx)
 	if err != nil {
 		return err
 	}
@@ -29,7 +30,7 @@ func initCallNotifs(ctx context.Context, dev *infinitime.Device) error {
 	}
 
 	// Connect to system bus. This connection is for monitoring.
-	monitorConn, err := newSystemBusConn(ctx)
+	monitorConn, err := utils.NewSystemBusConn(ctx)
 	if err != nil {
 		return err
 	}
@@ -52,53 +53,59 @@ func initCallNotifs(ctx context.Context, dev *infinitime.Device) error {
 	var respHandlerOnce sync.Once
 	var callObj dbus.BusObject
 
+	wg.Add(1)
 	go func() {
-		// For every message received
-		for event := range callCh {
-			// Get path to call object
-			callPath := event.Body[0].(dbus.ObjectPath)
-			// Get call object
-			callObj = conn.Object("org.freedesktop.ModemManager1", callPath)
+		defer wg.Done("callNotifs")
+		for {
+			select {
+			case event := <-callCh:
+				// Get path to call object
+				callPath := event.Body[0].(dbus.ObjectPath)
+				// Get call object
+				callObj = conn.Object("org.freedesktop.ModemManager1", callPath)
 
-			// Get phone number from call object using method call connection
-			phoneNum, err := getPhoneNum(conn, callObj)
-			if err != nil {
-				log.Error().Err(err).Msg("Error getting phone number")
-				continue
-			}
-
-			// Send call notification to InfiniTime
-			resCh, err := dev.NotifyCall(phoneNum)
-			if err != nil {
-				continue
-			}
-
-			go respHandlerOnce.Do(func() {
-				// Wait for PineTime response
-				for res := range resCh {
-					switch res {
-					case infinitime.CallStatusAccepted:
-						// Attempt to accept call
-						err = acceptCall(ctx, conn, callObj)
-						if err != nil {
-							log.Warn().Err(err).Msg("Error accepting call")
-						}
-					case infinitime.CallStatusDeclined:
-						// Attempt to decline call
-						err = declineCall(ctx, conn, callObj)
-						if err != nil {
-							log.Warn().Err(err).Msg("Error declining call")
-						}
-					case infinitime.CallStatusMuted:
-						// Warn about unimplemented muting
-						log.Warn().Msg("Muting calls is not implemented")
-					}
+				// Get phone number from call object using method call connection
+				phoneNum, err := getPhoneNum(conn, callObj)
+				if err != nil {
+					log.Error("Error getting phone number").Err(err).Send()
+					continue
 				}
-			})
+
+				// Send call notification to InfiniTime
+				resCh, err := dev.NotifyCall(phoneNum)
+				if err != nil {
+					continue
+				}
+
+				go respHandlerOnce.Do(func() {
+					// Wait for PineTime response
+					for res := range resCh {
+						switch res {
+						case infinitime.CallStatusAccepted:
+							// Attempt to accept call
+							err = acceptCall(ctx, conn, callObj)
+							if err != nil {
+								log.Warn("Error accepting call").Err(err).Send()
+							}
+						case infinitime.CallStatusDeclined:
+							// Attempt to decline call
+							err = declineCall(ctx, conn, callObj)
+							if err != nil {
+								log.Warn("Error declining call").Err(err).Send()
+							}
+						case infinitime.CallStatusMuted:
+							// Warn about unimplemented muting
+							log.Warn("Muting calls is not implemented").Send()
+						}
+					}
+				})
+			case <-ctx.Done():
+				return
+			}
 		}
 	}()
 
-	log.Info().Msg("Relaying calls to InfiniTime")
+	log.Info("Relaying calls to InfiniTime").Send()
 	return nil
 }
 

cmd/itctl/firmware.go

@@ -8,9 +8,24 @@ import (
 	"github.com/cheggaaa/pb/v3"
 	"github.com/urfave/cli/v2"
 	"go.arsenm.dev/itd/api"
+	"go.arsenm.dev/logger/log"
 )
 
 func fwUpgrade(c *cli.Context) error {
+	resources := c.String("resources")
+	if resources != "" {
+		absRes, err := filepath.Abs(resources)
+		if err != nil {
+			return err
+		}
+
+		err = resLoad(c.Context, []string{absRes})
+		if err != nil {
+			log.Error("Resource loading has returned an error. This can happen if your current version of InfiniTime doesn't support BLE FS. Try updating without resource loading, and then load them after using the `itctl res load` command.").Send()
+			return err
+		}
+	}
+
 	start := time.Now()
 
 	var upgType api.UpgradeType
@@ -39,6 +54,10 @@ func fwUpgrade(c *cli.Context) error {
 	bar := pb.ProgressBarTemplate(barTmpl).Start(0)
 	// Create new scanner of connection
 	for event := range progress {
+		if event.Err != nil {
+			return event.Err
+		}
+
 		// Set total bytes in progress bar
 		bar.SetTotal(event.Total)
 		// Set amount of bytes received in progress bar

cmd/itctl/fs.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -17,7 +16,7 @@ func fsList(c *cli.Context) error {
 		dirPath = c.Args().Get(0)
 	}
 
-	listing, err := client.ReadDir(c.Context, dirPath)
+	listing, err := client.FS().ReadDir(c.Context, dirPath)
 	if err != nil {
 		return err
 	}
@@ -34,7 +33,12 @@ func fsMkdir(c *cli.Context) error {
 		return cli.Exit("Command mkdir requires one or more arguments", 1)
 	}
 
-	err := client.Mkdir(c.Context, c.Args().Slice()...)
+	var err error
+	if c.Bool("parents") {
+		err = client.FS().MkdirAll(c.Context, c.Args().Slice()...)
+	} else {
+		err = client.FS().Mkdir(c.Context, c.Args().Slice()...)
+	}
 	if err != nil {
 		return err
 	}
@@ -47,7 +51,7 @@ func fsMove(c *cli.Context) error {
 		return cli.Exit("Command move requires two arguments", 1)
 	}
 
-	err := client.Rename(c.Context, c.Args().Get(0), c.Args().Get(1))
+	err := client.FS().Rename(c.Context, c.Args().Get(0), c.Args().Get(1))
 	if err != nil {
 		return err
 	}
@@ -64,7 +68,7 @@ func fsRead(c *cli.Context) error {
 	var path string
 	var err error
 	if c.Args().Get(1) == "-" {
-		tmpFile, err = ioutil.TempFile("/tmp", "itctl.*")
+		tmpFile, err = os.CreateTemp("/tmp", "itctl.*")
 		if err != nil {
 			return err
 		}
@@ -76,7 +80,7 @@ func fsRead(c *cli.Context) error {
 		}
 	}
 
-	progress, err := client.Download(c.Context, path, c.Args().Get(0))
+	progress, err := client.FS().Download(c.Context, path, c.Args().Get(0))
 	if err != nil {
 		return err
 	}
@@ -87,6 +91,10 @@ func fsRead(c *cli.Context) error {
 	bar := pb.ProgressBarTemplate(barTmpl).Start(0)
 	// Get progress events
 	for event := range progress {
+		if event.Err != nil {
+			return event.Err
+		}
+
 		// Set total bytes in progress bar
 		bar.SetTotal(int64(event.Total))
 		// Set amount of bytes sent in progress bar
@@ -109,7 +117,12 @@ func fsRemove(c *cli.Context) error {
 		return cli.Exit("Command remove requires one or more arguments", 1)
 	}
 
-	err := client.Remove(c.Context, c.Args().Slice()...)
+	var err error
+	if c.Bool("recursive") {
+		err = client.FS().RemoveAll(c.Context, c.Args().Slice()...)
+	} else {
+		err = client.FS().Remove(c.Context, c.Args().Slice()...)
+	}
 	if err != nil {
 		return err
 	}
@@ -126,7 +139,7 @@ func fsWrite(c *cli.Context) error {
 	var path string
 	var err error
 	if c.Args().Get(0) == "-" {
-		tmpFile, err = ioutil.TempFile("/tmp", "itctl.*")
+		tmpFile, err = os.CreateTemp("/tmp", "itctl.*")
 		if err != nil {
 			return err
 		}
@@ -144,7 +157,7 @@ func fsWrite(c *cli.Context) error {
 		defer os.Remove(path)
 	}
 
-	progress, err := client.Upload(c.Context, c.Args().Get(1), path)
+	progress, err := client.FS().Upload(c.Context, c.Args().Get(1), path)
 	if err != nil {
 		return err
 	}
@@ -155,6 +168,10 @@ func fsWrite(c *cli.Context) error {
 	bar := pb.ProgressBarTemplate(barTmpl).Start(0)
 	// Get progress events
 	for event := range progress {
+		if event.Err != nil {
+			return event.Err
+		}
+
 		// Set total bytes in progress bar
 		bar.SetTotal(int64(event.Total))
 		// Set amount of bytes sent in progress bar

cmd/itctl/main.go

@@ -1,22 +1,22 @@
 package main
 
 import (
-	"time"
 	"context"
 	"os"
 	"os/signal"
 	"syscall"
+	"time"
 
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
 	"go.arsenm.dev/itd/api"
+	"go.arsenm.dev/logger"
+	"go.arsenm.dev/logger/log"
 )
 
 var client *api.Client
 
 func main() {
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+	log.Logger = logger.NewPretty(os.Stderr)
 
 	ctx := context.Background()
 	ctx, _ = signal.NotifyContext(
@@ -24,17 +24,17 @@ func main() {
 		syscall.SIGINT,
 		syscall.SIGTERM,
 	)
-	
+
 	// This goroutine ensures that itctl will exit
 	// at most 200ms after the user sends SIGINT/SIGTERM.
 	go func() {
 		<-ctx.Done()
-		time.Sleep(200*time.Millisecond)
+		time.Sleep(200 * time.Millisecond)
 		os.Exit(0)
 	}()
 
 	app := cli.App{
-		Name: "itctl",
+		Name:            "itctl",
 		HideHelpCommand: true,
 		Flags: []cli.Flag{
 			&cli.StringFlag{
@@ -46,10 +46,23 @@ func main() {
 		},
 		Commands: []*cli.Command{
 			{
-				Name: "help",
+				Name:      "help",
 				ArgsUsage: "<command>",
-				Usage: "Display help screen for a command",
-				Action: helpCmd,
+				Usage:     "Display help screen for a command",
+				Action:    helpCmd,
+			},
+			{
+				Name:    "resources",
+				Aliases: []string{"res"},
+				Usage:   "Handle InfiniTime resource loading",
+				Subcommands: []*cli.Command{
+					{
+						Name:      "load",
+						ArgsUsage: "<path>",
+						Usage:     "Load an InifiniTime resources package",
+						Action:    resourcesLoad,
+					},
+				},
 			},
 			{
 				Name:    "filesystem",
@@ -64,6 +77,13 @@ func main() {
 						Action:    fsList,
 					},
 					{
+						Flags: []cli.Flag{
+							&cli.BoolFlag{
+								Name:    "parents",
+								Aliases: []string{"p"},
+								Usage:   "Make parent directories if needed, no error if already existing",
+							},
+						},
 						Name:      "mkdir",
 						ArgsUsage: "<paths...>",
 						Usage:     "Create new directories",
@@ -84,6 +104,13 @@ func main() {
 						Action:      fsRead,
 					},
 					{
+						Flags: []cli.Flag{
+							&cli.BoolFlag{
+								Name:    "recursive",
+								Aliases: []string{"r", "R"},
+								Usage:   "Remove directories and their contents recursively",
+							},
+						},
 						Name:      "remove",
 						ArgsUsage: "<paths...>",
 						Aliases:   []string{"rm"},
@@ -116,6 +143,11 @@ func main() {
 								Aliases: []string{"f"},
 								Usage:   "Path to firmware image (.bin file)",
 							},
+							&cli.PathFlag{
+								Name:    "resources",
+								Aliases: []string{"r"},
+								Usage:   "Path to resources file (.zip file)",
+							},
 							&cli.PathFlag{
 								Name:    "archive",
 								Aliases: []string{"a"},
@@ -264,7 +296,7 @@ func main() {
 
 	err := app.RunContext(ctx, os.Args)
 	if err != nil {
-		log.Fatal().Err(err).Msg("Error while running app")
+		log.Fatal("Error while running app").Err(err).Send()
 	}
 }
 
@@ -284,4 +316,4 @@ func isHelpCmd() bool {
 		}
 	}
 	return false
-}
+}

cmd/itctl/resources.go

@@ -0,0 +1,57 @@
+package main
+
+import (
+	"context"
+	"path/filepath"
+
+	"github.com/cheggaaa/pb/v3"
+	"github.com/urfave/cli/v2"
+	"go.arsenm.dev/infinitime"
+)
+
+func resourcesLoad(c *cli.Context) error {
+	return resLoad(c.Context, c.Args().Slice())
+}
+
+func resLoad(ctx context.Context, args []string) error {
+	if len(args) == 0 {
+		return cli.Exit("Command load requires one argument.", 1)
+	}
+
+	// Create progress bar templates
+	rmTmpl := `Removing {{string . "filename"}}`
+	upTmpl := `Uploading {{string . "filename"}} {{counters . }} B {{bar . "|" "-" (cycle .) " " "|"}} {{percent . }} {{rtime . "%s"}}`
+	// Start full bar at 0 total
+	bar := pb.ProgressBarTemplate(rmTmpl).Start(0)
+
+	path, err := filepath.Abs(args[0])
+	if err != nil {
+		return err
+	}
+
+	progCh, err := client.FS().LoadResources(ctx, path)
+	if err != nil {
+		return err
+	}
+
+	for evt := range progCh {
+		if evt.Err != nil {
+			return evt.Err
+		}
+
+		if evt.Operation == infinitime.ResourceOperationRemoveObsolete {
+			bar.SetTemplateString(rmTmpl)
+			bar.Set("filename", evt.Name)
+		} else {
+			bar.SetTemplateString(upTmpl)
+			bar.Set("filename", evt.Name)
+
+			bar.SetTotal(evt.Total)
+			bar.SetCurrent(evt.Sent)
+		}
+	}
+
+	bar.Finish()
+
+	return nil
+}

cmd/itgui/fs.go

@@ -8,8 +8,10 @@ import (
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/data/binding"
 	"fyne.io/fyne/v2/dialog"
+	"fyne.io/fyne/v2/storage"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
+	"go.arsenm.dev/infinitime"
 	"go.arsenm.dev/itd/api"
 )
 
@@ -34,7 +36,7 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
 		loading.Show()
 
 		// Read root directory
-		ls, err := client.ReadDir(ctx, "/")
+		ls, err := client.FS().ReadDir(ctx, "/")
 		if err != nil {
 			guiErr(err, "Error reading directory", false, w)
 			return
@@ -53,6 +55,47 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
 				refresh(ctx, cwdData, lsData, client, w, c)
 			},
 		),
+		widget.NewToolbarAction(
+			theme.FileApplicationIcon(),
+			func() {
+				dlg := dialog.NewFileOpen(func(uc fyne.URIReadCloser, err error) {
+					if err != nil || uc == nil {
+						return
+					}
+
+					resPath := uc.URI().Path()
+					uc.Close()
+
+					progressDlg := newProgress(w)
+					progressDlg.Show()
+
+					progCh, err := client.FS().LoadResources(ctx, resPath)
+					if err != nil {
+						guiErr(err, "Error loading resources", false, w)
+						return
+					}
+
+					for evt := range progCh {
+						switch evt.Operation {
+						case infinitime.ResourceOperationRemoveObsolete:
+							progressDlg.SetText("Removing " + evt.Name)
+						case infinitime.ResourceOperationUpload:
+							progressDlg.SetText("Uploading " + evt.Name)
+							progressDlg.SetTotal(float64(evt.Total))
+							progressDlg.SetValue(float64(evt.Sent))
+						}
+					}
+
+					progressDlg.Hide()
+					refresh(ctx, cwdData, lsData, client, w, c)
+				}, w)
+				dlg.SetConfirmText("Upload Resources")
+				dlg.SetFilter(storage.NewExtensionFileFilter([]string{
+					".zip",
+				}))
+				dlg.Show()
+			},
+		),
 		widget.NewToolbarAction(
 			theme.UploadIcon(),
 			func() {
@@ -87,7 +130,7 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
 						progressDlg.Show()
 
 						// Upload file
-						progressCh, err := client.Upload(ctx, remotePath, localPath)
+						progressCh, err := client.FS().Upload(ctx, remotePath, localPath)
 						if err != nil {
 							guiErr(err, "Error uploading file", false, w)
 							return
@@ -113,7 +156,6 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
 					uploadDlg.Show()
 				}, w)
 				dlg.Show()
-
 			},
 		),
 		widget.NewToolbarAction(
@@ -135,7 +177,7 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
 					remotePath := filepath.Join(cwd, filenameEntry.Text)
 
 					// Make directory
-					err := client.Mkdir(ctx, remotePath)
+					err := client.FS().Mkdir(ctx, remotePath)
 					if err != nil {
 						guiErr(err, "Error creating directory", false, w)
 						return
@@ -235,7 +277,7 @@ func makeItems(
 					progressDlg.Show()
 
 					// Download file
-					progressCh, err := client.Download(ctx, localPath, remotePath)
+					progressCh, err := client.FS().Download(ctx, localPath, remotePath)
 					if err != nil {
 						guiErr(err, "Error downloading file", false, w)
 						return
@@ -276,7 +318,7 @@ func makeItems(
 				oldPath := filepath.Join(cwd, item.Name)
 
 				// Rename file
-				err := client.Rename(ctx, oldPath, moveEntry.Text)
+				err := client.FS().Rename(ctx, oldPath, moveEntry.Text)
 				if err != nil {
 					guiErr(err, "Error renaming file", false, w)
 					return
@@ -295,7 +337,7 @@ func makeItems(
 			path := filepath.Join(cwd, item.Name)
 
 			// Remove file
-			err := client.Remove(ctx, path)
+			err := client.FS().Remove(ctx, path)
 			if err != nil {
 				guiErr(err, "Error removing file", false, w)
 				return
@@ -334,7 +376,7 @@ func refresh(
 	// Get current directory
 	cwd, _ := cwdData.Get()
 	// Read directory
-	ls, err := client.ReadDir(ctx, cwd)
+	ls, err := client.FS().ReadDir(ctx, cwd)
 	if err != nil {
 		guiErr(err, "Error reading directory", false, w)
 		return

cmd/itgui/progress.go

@@ -11,17 +11,21 @@ import (
 )
 
 type progress struct {
-	lbl *widget.Label
-	pb  *widget.ProgressBar
+	lbl     *widget.Label
+	progLbl *widget.Label
+	pb      *widget.ProgressBar
 	*widget.PopUp
 }
 
 func newProgress(w fyne.Window) progress {
 	out := progress{}
 
+	out.lbl = widget.NewLabel("")
+	out.lbl.Hide()
+
 	// Create label to show how many bytes transfered and center it
-	out.lbl = widget.NewLabel("0 / 0 B")
-	out.lbl.Alignment = fyne.TextAlignCenter
+	out.progLbl = widget.NewLabel("0 / 0 B")
+	out.progLbl.Alignment = fyne.TextAlignCenter
 
 	// Create new progress bar
 	out.pb = widget.NewProgressBar()
@@ -31,20 +35,30 @@ func newProgress(w fyne.Window) progress {
 	sizeRect.SetMinSize(fyne.NewSize(300, 50))
 
 	// Create vbox for label and progress bar
-	l := container.NewVBox(out.lbl, out.pb)
+	l := container.NewVBox(out.lbl, out.progLbl, out.pb)
 	// Create popup
 	out.PopUp = widget.NewModalPopUp(container.NewMax(l, sizeRect), w.Canvas())
 
 	return out
 }
 
+func (p progress) SetText(s string) {
+	p.lbl.SetText(s)
+
+	if s == "" {
+		p.lbl.Hide()
+	} else {
+		p.lbl.Show()
+	}
+}
+
 func (p progress) SetTotal(v float64) {
 	p.pb.Max = v
 	p.pb.Refresh()
-	p.lbl.SetText(fmt.Sprintf("%.0f / %.0f B", p.pb.Value, v))
+	p.progLbl.SetText(fmt.Sprintf("%.0f / %.0f B", p.pb.Value, v))
 }
 
 func (p progress) SetValue(v float64) {
 	p.pb.SetValue(v)
-	p.lbl.SetText(fmt.Sprintf("%.0f / %.0f B", v, p.pb.Max))
+	p.progLbl.SetText(fmt.Sprintf("%.0f / %.0f B", v, p.pb.Max))
 }

config.go

@@ -9,15 +9,17 @@ import (
 	"github.com/knadh/koanf/providers/confmap"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/file"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
+	"go.arsenm.dev/logger"
+	"go.arsenm.dev/logger/log"
 )
 
 var cfgDir string
 
 func init() {
+	etcPath := "/etc/itd.toml"
+
 	// Set up logger
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+	log.Logger = logger.NewPretty(os.Stderr)
 
 	// Get user's configuration directory
 	userCfgDir, err := os.UserConfigDir()
@@ -29,7 +31,7 @@ func init() {
 	// If config dir is not readable
 	if _, err = os.ReadDir(cfgDir); err != nil {
 		// Create config dir with 700 permissions
-		err = os.MkdirAll(cfgDir, 0700)
+		err = os.MkdirAll(cfgDir, 0o700)
 		if err != nil {
 			panic(err)
 		}
@@ -51,15 +53,9 @@ func init() {
 	// Set config defaults
 	setCfgDefaults()
 
-	// Load config files
-	etcProvider := file.Provider("/etc/itd.toml")
-	cfgProvider := file.Provider(cfgPath)
-	k.Load(etcProvider, toml.Parser())
-	k.Load(cfgProvider, toml.Parser())
-
-	// Watch configs for changes
-	cfgWatch(etcProvider)
-	cfgWatch(cfgProvider)
+	// Load and watch config files
+	loadAndwatchCfgFile(etcPath)
+	loadAndwatchCfgFile(cfgPath)
 
 	// Load envireonment variables
 	k.Load(env.Provider("ITD_", "_", func(s string) string {
@@ -67,14 +63,22 @@ func init() {
 	}), nil)
 }
 
-func cfgWatch(provider *file.File) {
+func loadAndwatchCfgFile(filename string) {
+	provider := file.Provider(filename)
+
+	if cfgError := k.Load(provider, toml.Parser()); cfgError != nil {
+		log.Warn("Error while trying to read config file").Str("filename", filename).Err(cfgError).Send()
+	}
+
 	// Watch for changes and reload when detected
 	provider.Watch(func(_ interface{}, err error) {
 		if err != nil {
 			return
 		}
 
-		k.Load(provider, toml.Parser())
+		if cfgError := k.Load(provider, toml.Parser()); cfgError != nil {
+			log.Warn("Error while trying to read config file").Str("filename", filename).Err(cfgError).Send()
+		}
 	})
 }
 
@@ -102,5 +106,8 @@ func setCfgDefaults() {
 		"notifs.ignore.body":    []string{},
 
 		"music.vol.interval": 5,
+
+		"fuse.enabled":    false,
+		"fuse.mountpoint": "/tmp/itd/mnt",
 	}, "."), nil)
 }

fuse.go

@@ -0,0 +1,66 @@
+package main
+
+import (
+	"context"
+	"os"
+
+	"github.com/hanwen/go-fuse/v2/fs"
+	"github.com/hanwen/go-fuse/v2/fuse"
+	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/fusefs"
+	"go.arsenm.dev/logger/log"
+)
+
+func startFUSE(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+	// This is where we'll mount the FS
+	err := os.MkdirAll(k.String("fuse.mountpoint"), 0o755)
+	if err != nil && !os.IsExist(err) {
+		return err
+	}
+
+	// Ignore the error because nothing might be mounted on the mountpoint
+	_ = fusefs.Unmount(k.String("fuse.mountpoint"))
+
+	root, err := fusefs.BuildRootNode(dev)
+	if err != nil {
+		log.Error("Building root node failed").
+			Err(err).
+			Send()
+		return err
+	}
+
+	server, err := fs.Mount(k.String("fuse.mountpoint"), root, &fs.Options{
+		MountOptions: fuse.MountOptions{
+			// Set to true to see how the file system works.
+			Debug:          false,
+			SingleThreaded: true,
+		},
+	})
+	if err != nil {
+		log.Error("Mounting failed").
+			Str("target", k.String("fuse.mountpoint")).
+			Err(err).
+			Send()
+		return err
+	}
+
+	log.Info("Mounted on target").
+		Str("target", k.String("fuse.mountpoint")).
+		Send()
+
+	fusefs.BuildProperties(dev)
+
+	if err != nil {
+		log.Warn("Error getting BLE filesystem").Err(err).Send()
+		return err
+	}
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done("fuse")
+		<-ctx.Done()
+		server.Unmount()
+	}()
+
+	return nil
+}

go.mod

@@ -1,77 +1,90 @@
 module go.arsenm.dev/itd
 
-go 1.17
+go 1.18
 
 replace fyne.io/x/fyne => github.com/metal3d/fyne-x v0.0.0-20220508095732-177117e583fb
 
 require (
-	fyne.io/fyne/v2 v2.1.4
+	fyne.io/fyne/v2 v2.3.0
 	fyne.io/x/fyne v0.0.0-20220107050838-c4a1de51d4ce
-	github.com/cheggaaa/pb/v3 v3.0.8
-	github.com/gen2brain/dlgs v0.0.0-20211108104213-bade24837f0b
-	github.com/godbus/dbus/v5 v5.0.6
-	github.com/knadh/koanf v1.4.0
-	github.com/mattn/go-isatty v0.0.14
+	github.com/cheggaaa/pb/v3 v3.1.0
+	github.com/gen2brain/dlgs v0.0.0-20220603100644-40c77870fa8d
+	github.com/godbus/dbus/v5 v5.1.0
+	github.com/hanwen/go-fuse/v2 v2.2.0
+	github.com/knadh/koanf v1.4.4
+	github.com/mattn/go-isatty v0.0.17
 	github.com/mozillazg/go-pinyin v0.19.0
-	github.com/rs/zerolog v1.26.1
-	github.com/urfave/cli/v2 v2.3.0
-	go.arsenm.dev/infinitime v0.0.0-20220511202257-9ed74726c478
-	go.arsenm.dev/lrpc v0.0.0-20220513001344-3bcc01fdb6a0
-	golang.org/x/text v0.3.7
-	modernc.org/sqlite v1.17.2
+	github.com/urfave/cli/v2 v2.23.7
+	go.arsenm.dev/drpc v0.0.0-20230328202554-c1f2aa71e794
+	go.arsenm.dev/infinitime v0.0.0-20230104230015-512d48bc2469
+	go.arsenm.dev/logger v0.0.0-20230104225304-d706171ea6df
+	golang.org/x/text v0.5.0
+	google.golang.org/protobuf v1.28.1
+	modernc.org/sqlite v1.20.1
+	storj.io/drpc v0.0.32
 )
 
 require (
-	github.com/VividCortex/ewma v1.1.1 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
+	fyne.io/systray v1.10.1-0.20221115204952-d16a6177e6f1 // indirect
+	github.com/VividCortex/ewma v1.2.0 // indirect
+	github.com/benoitkugler/textlayout v0.3.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/fatih/color v1.10.0 // indirect
+	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/fatih/color v1.13.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fredbi/uri v1.0.0 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
+	github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 // indirect
+	github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 // indirect
+	github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345 // indirect
 	github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211204153444-caad923f49f4 // indirect
-	github.com/gofrs/uuid v4.2.0+incompatible // indirect
-	github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
+	github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181 // indirect
+	github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/gookit/color v1.5.1 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
+	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/mattn/go-colorable v0.1.8 // indirect
-	github.com/mattn/go-runewidth v0.0.12 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/muka/go-bluetooth v0.0.0-20220219050759-674a63b8741a // indirect
-	github.com/pelletier/go-toml v1.9.3 // indirect
+	github.com/muka/go-bluetooth v0.0.0-20220819140550-1d8857e3b268 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/srwiley/oksvg v0.0.0-20211120171407-1837d6608d8c // indirect
-	github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 // indirect
-	github.com/stretchr/testify v1.7.1 // indirect
-	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
-	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
+	github.com/rivo/uniseg v0.4.3 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
+	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
+	github.com/stretchr/testify v1.8.1 // indirect
+	github.com/tevino/abool v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	github.com/yuin/goldmark v1.4.4 // indirect
-	golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
-	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect
-	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
-	golang.org/x/tools v0.1.7 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	lukechampine.com/uint128 v1.1.1 // indirect
-	modernc.org/cc/v3 v3.36.0 // indirect
-	modernc.org/ccgo/v3 v3.16.6 // indirect
-	modernc.org/libc v1.16.7 // indirect
-	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.1.1 // indirect
-	modernc.org/opt v0.1.1 // indirect
-	modernc.org/strutil v1.1.1 // indirect
-	modernc.org/token v1.0.0 // indirect
+	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/yuin/goldmark v1.5.3 // indirect
+	github.com/zeebo/errs v1.3.0 // indirect
+	golang.org/x/image v0.2.0 // indirect
+	golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
+	golang.org/x/mod v0.7.0 // indirect
+	golang.org/x/net v0.4.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/tools v0.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.40.0 // indirect
+	modernc.org/ccgo/v3 v3.16.13 // indirect
+	modernc.org/libc v1.22.2 // indirect
+	modernc.org/mathutil v1.5.0 // indirect
+	modernc.org/memory v1.5.0 // indirect
+	modernc.org/opt v0.1.3 // indirect
+	modernc.org/strutil v1.1.3 // indirect
+	modernc.org/token v1.1.0 // indirect
 )

go.sum

@@ -38,20 +38,31 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 fyne.io/fyne/v2 v2.1.0/go.mod h1:c1vwI38Ebd0dAdxVa6H1Pj6/+cK1xtDy61+I31g+s14=
-fyne.io/fyne/v2 v2.1.4 h1:bt1+28++kAzRzPB0GM2EuSV4cnl8rXNX4cjfd8G06Rc=
-fyne.io/fyne/v2 v2.1.4/go.mod h1:p+E/Dh+wPW8JwR2DVcsZ9iXgR9ZKde80+Y+40Is54AQ=
+fyne.io/fyne/v2 v2.3.0 h1:g9tPI3lyBK50IvyPbXqv2zI3JJ4uhMAffu89f3nX5PU=
+fyne.io/fyne/v2 v2.3.0/go.mod h1:odfJmbFnODiKn1MXdL44JR6CK+0v8lrmgdPlrUF6w0M=
+fyne.io/systray v1.10.1-0.20221115204952-d16a6177e6f1 h1:OiHw+bZAGEaSreHsA8dDkBOVJmSFzsNTOc/htpM+fOc=
+fyne.io/systray v1.10.1-0.20221115204952-d16a6177e6f1/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE=
 github.com/Andrew-M-C/go.jsonvalue v1.1.2-0.20211223013816-e873b56b4a84/go.mod h1:oTJGG91FhtsxvUFVwHSvr6zuaTcAuroj/ToxfT7Ox8U=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v0.4.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/Kodeworks/golang-image-ico v0.0.0-20141118225523-73f0f4cfade9/go.mod h1:7uhhqiBaR4CpN0k9rMjOtjpcfGd6DG2m04zQxKnWQ0I=
-github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM=
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
+github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
+github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
 github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
 github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
 github.com/aws/aws-sdk-go-v2/credentials v1.4.3/go.mod h1:FNNC6nQZQUuyhq5aE5c7ata8o9e4ECGmS4lAXC7o1mQ=
@@ -62,11 +73,20 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72H
 github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk=
 github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g=
 github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
+github.com/benoitkugler/pstokenizer v1.0.0/go.mod h1:l1G2Voirz0q/jj0TQfabNxVsa8HZXh/VMxFSRALWTiE=
+github.com/benoitkugler/textlayout v0.3.0 h1:2ehWXEkgb6RUokTjXh1LzdGwG4dRP6X3dqhYYDYhUVk=
+github.com/benoitkugler/textlayout v0.3.0/go.mod h1:o+1hFV+JSHBC9qNLIuwVoLedERU7sBPgEFcuSgfvi/w=
+github.com/benoitkugler/textlayout-testdata v0.1.1 h1:AvFxBxpfrQd8v55qH59mZOJOQjtD6K2SFe9/HvnIbJk=
+github.com/benoitkugler/textlayout-testdata v0.1.1/go.mod h1:i/qZl09BbUOtd7Bu/W1CAubRwTWrEXWq6JwMkw8wYxo=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cheggaaa/pb/v3 v3.0.8 h1:bC8oemdChbke2FHIIGy9mn4DPJ2caZYQnfbRqwmdCoA=
-github.com/cheggaaa/pb/v3 v3.0.8/go.mod h1:UICbiLec/XO6Hw6k+BHEtHeQFzzBH4i2/qk/ow1EJTA=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cheggaaa/pb/v3 v3.1.0 h1:3uouEsl32RL7gTiQsuaXD4Bzbfl5tGztXGUvXbs4O04=
+github.com/cheggaaa/pb/v3 v3.1.0/go.mod h1:YjrevcBqadFDaGQKRdmZxTY42pXEqda48Ea3lt0K/BE=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -77,8 +97,10 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -93,44 +115,68 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg=
+github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM=
+github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3 h1:FDqhDm7pcsLhhWl1QtD8vlzI4mm59llRvNzrFg6/LAA=
 github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3/go.mod h1:CzM2G82Q9BDUvMTGHnXf/6OExw/Dz2ivDj48nVg7Lg8=
+github.com/fredbi/uri v0.1.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0=
+github.com/fredbi/uri v1.0.0 h1:s4QwUAZ8fz+mbTsukND+4V5f+mJ/wjaTokwstGUAemg=
+github.com/fredbi/uri v1.0.0/go.mod h1:1xC40RnIOGCaQzswaOvrzvG/3M3F0hyDVb3aO/1iGy0=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/gen2brain/dlgs v0.0.0-20211108104213-bade24837f0b h1:M0/hjawi9ur15zpqL/h66ga87jlYA7iAuZ4HC6ak08k=
-github.com/gen2brain/dlgs v0.0.0-20211108104213-bade24837f0b/go.mod h1:/eFcjDXaU2THSOOqLxOPETIbHETnamk8FA/hMjhg/gU=
+github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
+github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 h1:SFtj9yo9C7F4CxyJeSJi9AjT6x9c88gnY1tjlXWh9QU=
+github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg=
+github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E=
+github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 h1:0Ayg0/do/sqX2R7NonoLZvWxGrd9utTVf3A0QvCbC88=
+github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E=
+github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0=
+github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345 h1:ONkcbJmsWUOHyjUm0wlnkFc/uaacFFtStVbsG6qJfew=
+github.com/fyne-io/image v0.0.0-20221020213044-f609c6a24345/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0=
+github.com/gen2brain/dlgs v0.0.0-20220603100644-40c77870fa8d h1:dHYKX8CBAs1zSGXm3q3M15CLAEwPEkwrK1ed8FCo+Xo=
+github.com/gen2brain/dlgs v0.0.0-20220603100644-40c77870fa8d/go.mod h1:/eFcjDXaU2THSOOqLxOPETIbHETnamk8FA/hMjhg/gU=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-gl/gl v0.0.0-20210813123233-e4099ee2221f/go.mod h1:wjpnOv6ONl2SuJSxqCPVaPZibGFdSci9HFocT9qtVYM=
 github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk=
 github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1 h1:QbL/5oDUmRBzO9/Z7Seo6zf912W/a6Sr4Eu0G/3Jho0=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210410170116-ea3d685f79fb/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211024062804-40e447a793be/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211204153444-caad923f49f4 h1:KgfIc81yNEUKNAsF+Mt3C1Cl+iQqKF1r7nWEKzL0c2Y=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211204153444-caad923f49f4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
+github.com/go-text/typesetting v0.0.0-20221212183139-1eb938670a1f/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI=
+github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181 h1:J6XG/Xx7uCCpskM71R6YAgPHd/E8FzhyPhL6Ll94uMY=
+github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181/go.mod h1:/cmOXaoTiO+lbCwkTZBgCvevJpbFsZ5reXIpEJVh5MI=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro=
 github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0=
-github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff h1:W71vTCKoxtdXgnm1ECDFkfQnpdqAO00zzGXLA5yaEX8=
 github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
+github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c h1:JGCm/+tJ9gC6THUxooTldS+CUDsba0qvkvU3DHklqW8=
+github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c/go.mod h1:wfqRWLHRBsRgkp5dmbG56SA0DmVtwrF5N3oPdI8t+Aw=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -174,8 +220,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
@@ -191,6 +238,7 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -198,25 +246,38 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/gookit/color v1.5.1 h1:Vjg2VEcdHpwq+oY63s/ksHrgJYCTo0bwWvmmYWdE9fQ=
+github.com/gookit/color v1.5.1/go.mod h1:wZFzea4X8qN6vHOSP2apMb4/+w/orMznEzYsIHPaqKM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY=
+github.com/goxjs/glfw v0.0.0-20191126052801-d2efb5f20838/go.mod h1:oS8P8gVOT4ywTcjV6wZlOU4GuVFQ8F5328KY3MJ79CY=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hanwen/go-fuse/v2 v2.2.0 h1:jo5QZYmBLNcl9ovypWaQ5yXMSSV+Ch68xoC3rtZvvBM=
+github.com/hanwen/go-fuse/v2 v2.2.0/go.mod h1:B1nGE/6RBFyBRC1RRnf23UpwCdyJ31eukw34oAKukAc=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
+github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ=
 github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
+github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
 github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
 github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
 github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
+github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
 github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
 github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
 github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
 github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
 github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
 github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
 github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
@@ -230,54 +291,89 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
 github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
+github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
+github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
+github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
 github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q=
 github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE=
+github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
+github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs=
+github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jackmordaunt/icns v0.0.0-20181231085925-4f16af745526/go.mod h1:UQkeMHVoNcyXYq9otUupF7/h/2tmHlhrS2zw7ZVvUqc=
+github.com/jackmordaunt/icns/v2 v2.2.1/go.mod h1:6aYIB9eSzyfHHMKqDf17Xrs1zetQPReAkiUSHzdw4cI=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/josephspurrier/goversioninfo v0.0.0-20200309025242-14b0ab84c6ca/go.mod h1:eJTEwMjXb7kZ633hO3Ln9mBUCOjX2+FlTljvpl9SYdE=
+github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
+github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk=
+github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/knadh/koanf v1.4.0 h1:/k0Bh49SqLyLNfte9r6cvuZWrApOQhglOmhIU3L/zDw=
-github.com/knadh/koanf v1.4.0/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs=
+github.com/knadh/koanf v1.4.4 h1:d2jY5nCCeoaiqvEKSBW9rEc93EfNy/XWgWsSB3j7JEA=
+github.com/knadh/koanf v1.4.4/go.mod h1:Hgyjp4y8v44hpZtPzs7JZfRAW5AhN7KfZcwv1RYggDs=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4=
+github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k=
 github.com/lucor/goinfo v0.0.0-20210802170112-c078a2b0f08b/go.mod h1:PRq09yoB+Q2OJReAmwzKivcYyremnibWGbK7WfftHzc=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
+github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.12 h1:Y41i/hVW3Pgwr8gV+J23B9YEY0zxjptBuCWEaxmAOow=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
+github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
-github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
-github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
+github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo=
 github.com/metal3d/fyne-x v0.0.0-20220508095732-177117e583fb h1:+fP6ENsbd+BUOmD/kSjNtrOmi2vgJ/JfWDSWjTKmTVY=
 github.com/metal3d/fyne-x v0.0.0-20220508095732-177117e583fb/go.mod h1:jBspDudEQ+Rdono8vBGHDtMUPE8ZpB/xq7FUYRqT3CI=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
+github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
+github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
+github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
 github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
@@ -297,12 +393,15 @@ github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mozillazg/go-pinyin v0.19.0 h1:p+J8/kjJ558KPvVGYLvqBhxf8jbZA2exSLCs2uUVN8c=
 github.com/mozillazg/go-pinyin v0.19.0/go.mod h1:iR4EnMMRXkfpFVV5FMi4FNB6wGq9NV6uDWbUuPhP4Yc=
-github.com/muka/go-bluetooth v0.0.0-20220219050759-674a63b8741a h1:fnzS9RRQW8B5AgNCxkN0vJ/AoX+Xfqk3sAYon3iVrzA=
-github.com/muka/go-bluetooth v0.0.0-20220219050759-674a63b8741a/go.mod h1:dMCjicU6vRBk34dqOmIZm0aod6gUwZXOXzBROqGous0=
+github.com/muka/go-bluetooth v0.0.0-20220819140550-1d8857e3b268 h1:kOnq7TfaAO2Vc/MHxPqFIXe00y1qBxJAvhctXdko6vo=
+github.com/muka/go-bluetooth v0.0.0-20220819140550-1d8857e3b268/go.mod h1:dMCjicU6vRBk34dqOmIZm0aod6gUwZXOXzBROqGous0=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
 github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
@@ -314,8 +413,9 @@ github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FI
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/paypal/gatt v0.0.0-20151011220935-4ae819d591cf/go.mod h1:+AwQL2mK3Pd3S+TUwg0tYQjid0q1txyNUJuuSmz8Kdk=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
+github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -324,32 +424,49 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
+github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa h1:tEkEyxYeZ43TR55QU/hsIt9aRGBxbgGuz9CGykjvogY=
+github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
+github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
-github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
-github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
-github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -362,31 +479,43 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4=
-github.com/srwiley/oksvg v0.0.0-20211120171407-1837d6608d8c h1:+e9myEHblxwU1r2Jb5PKzepMcsuig7+NUz+K53lBNaQ=
-github.com/srwiley/oksvg v0.0.0-20211120171407-1837d6608d8c/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4=
+github.com/srwiley/oksvg v0.0.0-20220731023508-a61f04f16b76/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
+github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
+github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
 github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
-github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 h1:oDMiXaTMyBEuZMU53atpxqYsSB3U1CHkeAu2zr6wTeY=
 github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU=
+github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
+github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/suapapa/go_eddystone v1.3.1/go.mod h1:bXC11TfJOS+3g3q/Uzd7FKd5g62STQEfeEIhcKe4Qy8=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M=
+github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA=
+github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
-github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
-github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
-github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
+github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg=
+github.com/urfave/cli/v2 v2.23.7 h1:YHDQ46s3VghFHFf1DdF+Sh7H4RqhcM+t0TmZRJx4oJY=
+github.com/urfave/cli/v2 v2.23.7/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
 github.com/wagslane/go-password-validator v0.3.0/go.mod h1:TI1XJ6T5fRdRnHqHt14pvy1tNVnrwe7m3/f1f2fDphQ=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 h1:QldyIu/L63oPpyvQmHgvgickp1Yw510KJOqX7H24mg8=
+github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -394,15 +523,24 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.3.8/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.4 h1:zNWRjYUW32G9KirMXYHQHVNFkXvMI7LpgNW2AgYAoIs=
-github.com/yuin/goldmark v1.4.4/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg=
-go.arsenm.dev/infinitime v0.0.0-20220511202257-9ed74726c478 h1:HO+fteXuSnnT7po1PhGJK6nk8qMAGN2RqDaVP4sRN8g=
-go.arsenm.dev/infinitime v0.0.0-20220511202257-9ed74726c478/go.mod h1:1cBQ3fp6QlRbSqu9kEBAHsVThINj31FtqHIYVsQ7wgg=
-go.arsenm.dev/lrpc v0.0.0-20220513001344-3bcc01fdb6a0 h1:1K96g1eww+77GeGchwMhd0NTrs7Mk/Hc3M3ItW5NbG4=
-go.arsenm.dev/lrpc v0.0.0-20220513001344-3bcc01fdb6a0/go.mod h1:goK9z735lfXmqlDxu9qN7FS8t0HJHN3PjyDtCToUY4w=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.5.3 h1:3HUJmBFbQW9fhQOzMgseU134xfi6hU+mjWywx5Ty+/M=
+github.com/yuin/goldmark v1.5.3/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/errs v1.3.0 h1:hmiaKqgYZzcVgRL1Vkc1Mn2914BbzB0IBxs+ebeutGs=
+github.com/zeebo/errs v1.3.0/go.mod h1:sgbWHsvVuTPHcqJJGQ1WhI5KbWlHYz+2+2C/LSEtCw4=
+go.arsenm.dev/drpc v0.0.0-20230328202554-c1f2aa71e794 h1:8KQpRoQmCTgDvyHFStaIiz5NUNNqMHqVlZoGvIk+OwQ=
+go.arsenm.dev/drpc v0.0.0-20230328202554-c1f2aa71e794/go.mod h1:K5cFls42m5q1RIphTVojRdXLaoCknq/kBqQt8Ow3XuA=
+go.arsenm.dev/infinitime v0.0.0-20230104230015-512d48bc2469 h1:LsJHg+8rQSYnTE1sSCjBCACxUUVMZIOQani8J6wF2/E=
+go.arsenm.dev/infinitime v0.0.0-20230104230015-512d48bc2469/go.mod h1:scUyDmLmCHn6CanGbau8yjTjzyhUbLJcsjmDCCKMIII=
+go.arsenm.dev/logger v0.0.0-20230104225304-d706171ea6df h1:8mBHvEe7BJmpOeKSMA5YLqrGo9dCpePocTeR0C1+/2w=
+go.arsenm.dev/logger v0.0.0-20230104225304-d706171ea6df/go.mod h1:RV2qydKDdoyaRkhAq8JEGvojR8eJ6bjq5WnSIlH7gYw=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
+go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
+go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
+go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -413,18 +551,21 @@ go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
 golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
 golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
 golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
@@ -435,8 +576,12 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20200430140353-33d19683fad8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
+golang.org/x/image v0.0.0-20210504121937-7319ad40d33e/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.0.0-20220601225756-64ec528b34cd/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
+golang.org/x/image v0.2.0 h1:/DcQ0w3VHKCC5p0/P2B0JpAZ9Z++V2KOo2fyU89CXBQ=
+golang.org/x/image v0.2.0/go.mod h1:la7oBXb9w3YFjBqaAwtynVioc1ZvOnNteUNrifGNmAI=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -451,6 +596,9 @@ golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPI
 golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
+golang.org/x/mobile v0.0.0-20221110043201-43a038452099 h1:aIu0lKmfdgtn2uTj7JI2oN4TUrQvgB+wzTPO23bCKt8=
+golang.org/x/mobile v0.0.0-20221110043201-43a038452099/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
@@ -459,11 +607,14 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -472,9 +623,11 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -498,9 +651,13 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
+golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 h1:HVyaeDAYux4pnY+D/SiwmLOR36ewZ4iGQIIrtnuCjFA=
-golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20211118161319-6a13c67c3ce4/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -524,11 +681,16 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -539,14 +701,19 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -557,6 +724,8 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -565,7 +734,9 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -573,14 +744,20 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw=
-golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -592,8 +769,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -611,6 +789,7 @@ golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgw
 golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -643,7 +822,6 @@ golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
 golang.org/x/tools v0.0.0-20200925191224-5d1fdd8fa346/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU=
 golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -651,12 +829,13 @@ golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
-golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
+golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -763,22 +942,33 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+honnef.co/go/js/dom v0.0.0-20210725211120-f030747120f2/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4=
+honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 h1:2ZZFiPwRLxiNX2E/YO6Jgw1pCjDRDgmx20PGyw/cw+M=
+honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70/go.mod h1:sUMDUKNB2ZcVjt92UnLy3cdGs+wDAcrPdV3JP6sVgA4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -786,41 +976,33 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU=
-lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-modernc.org/cc/v3 v3.36.0 h1:0kmRkTmqNidmu3c7BNDSdVHCxXCkWLmWmCIVX4LUboo=
-modernc.org/cc/v3 v3.36.0/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
-modernc.org/ccgo/v3 v3.0.0-20220428102840-41399a37e894/go.mod h1:eI31LL8EwEBKPpNpA4bU1/i+sKOwOrQy8D87zWUcRZc=
-modernc.org/ccgo/v3 v3.0.0-20220430103911-bc99d88307be/go.mod h1:bwdAnOoaIt8Ax9YdWGjxWsdkPcZyRPHqrOvJxaKAKGw=
-modernc.org/ccgo/v3 v3.16.4/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
-modernc.org/ccgo/v3 v3.16.6 h1:3l18poV+iUemQ98O3X5OMr97LOqlzis+ytivU4NqGhA=
-modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWsQ=
+lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
+lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
+modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
+modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
+modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
+modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
 modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
-modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
-modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
-modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA=
-modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A=
-modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU=
-modernc.org/libc v1.16.7 h1:qzQtHhsZNpVPpeCu+aMIQldXeV1P0vRhSqCL0nOIJOA=
-modernc.org/libc v1.16.7/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU=
-modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
-modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.1.1 h1:bDOL0DIDLQv7bWhP3gMvIrnoFw+Eo6F7a2QK9HPDiFU=
-modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
-modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
-modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.17.2 h1:TjmF36Wi5QcPYqRoAacV1cAyJ7xB/CD0ExpVUEMebnw=
-modernc.org/sqlite v1.17.2/go.mod h1:GOQmuiXd6pTTes1Fi2s9apiCcD/wbKQtBZ0Nw6/etjM=
-modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs=
-modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/tcl v1.13.1 h1:npxzTwFTZYM8ghWicVIX1cRWzj7Nd8i6AqqX2p+IYao=
-modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw=
-modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
-modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.5.1 h1:RTNHdsrOpeoSeOF4FbzTo8gBYByaJ5xT7NgZ9ZqRiJM=
-modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8=
+modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
+modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
+modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
+modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
+modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
+modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
+modernc.org/sqlite v1.20.1 h1:z6qRLw72B0VfRrJjs3l6hWkzYDx1bo0WGVrBGP4ohhM=
+modernc.org/sqlite v1.20.1/go.mod h1:fODt+bFmc/j8LcoCbMSkAuKuGmhxjG45KGc25N2705M=
+modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY=
+modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
+modernc.org/tcl v1.15.0 h1:oY+JeD11qVVSgVvodMJsu7Edf8tr5E/7tuhF5cNYz34=
+modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
+modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
+modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+storj.io/drpc v0.0.32 h1:5p5ZwsK/VOgapaCu+oxaPVwO6UwIs+iwdMiD50+R4PI=
+storj.io/drpc v0.0.32/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=

internal/fusefs/fuse.go

@@ -0,0 +1,607 @@
+package fusefs
+
+import (
+	"bytes"
+	"context"
+	"io"
+	"strconv"
+	"syscall"
+
+	"github.com/hanwen/go-fuse/v2/fs"
+	"github.com/hanwen/go-fuse/v2/fuse"
+	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/infinitime/blefs"
+	"go.arsenm.dev/logger/log"
+)
+
+type ITProperty struct {
+	name string
+	Ino  uint64
+	gen  func() ([]byte, error)
+}
+
+type DirEntry struct {
+	isDir   bool
+	modtime uint64
+	size    uint32
+	path    string
+}
+
+type ITNode struct {
+	fs.Inode
+	kind nodeKind
+	Ino  uint64
+
+	lst  []DirEntry
+	self DirEntry
+	path string
+}
+
+type nodeKind uint8
+
+const (
+	nodeKindRoot = iota
+	nodeKindInfo
+	nodeKindFS
+	nodeKindReadOnly
+)
+
+var (
+	myfs     *blefs.FS         = nil
+	inodemap map[string]uint64 = nil
+)
+
+func BuildRootNode(dev *infinitime.Device) (*ITNode, error) {
+	var err error
+	inodemap = make(map[string]uint64)
+	myfs, err = dev.FS()
+	if err != nil {
+		log.Error("FUSE Failed to get filesystem").Err(err).Send()
+		return nil, err
+	}
+
+	return &ITNode{kind: nodeKindRoot}, nil
+}
+
+var properties = make([]ITProperty, 6)
+
+func BuildProperties(dev *infinitime.Device) {
+	properties[0] = ITProperty{
+		"heartrate", 2,
+		func() ([]byte, error) {
+			ans, err := dev.HeartRate()
+			return []byte(strconv.Itoa(int(ans)) + "\n"), err
+		},
+	}
+	properties[1] = ITProperty{
+		"battery", 3,
+		func() ([]byte, error) {
+			ans, err := dev.BatteryLevel()
+			return []byte(strconv.Itoa(int(ans)) + "\n"), err
+		},
+	}
+	properties[2] = ITProperty{
+		"motion", 4,
+		func() ([]byte, error) {
+			ans, err := dev.Motion()
+			return []byte(strconv.Itoa(int(ans.X)) + " " + strconv.Itoa(int(ans.Y)) + " " + strconv.Itoa(int(ans.Z)) + "\n"), err
+		},
+	}
+	properties[3] = ITProperty{
+		"stepcount", 6,
+		func() ([]byte, error) {
+			ans, err := dev.StepCount()
+			return []byte(strconv.Itoa(int(ans)) + "\n"), err
+		},
+	}
+	properties[4] = ITProperty{
+		"version", 7,
+		func() ([]byte, error) {
+			ans, err := dev.Version()
+			return []byte(ans + "\n"), err
+		},
+	}
+	properties[5] = ITProperty{
+		"address", 8,
+		func() ([]byte, error) {
+			ans := dev.Address()
+			return []byte(ans + "\n"), nil
+		},
+	}
+}
+
+var _ fs.NodeReaddirer = (*ITNode)(nil)
+
+// Readdir is part of the NodeReaddirer interface
+func (n *ITNode) Readdir(ctx context.Context) (fs.DirStream, syscall.Errno) {
+	switch n.kind {
+	case 0:
+		// root folder
+		r := make([]fuse.DirEntry, 2)
+		r[0] = fuse.DirEntry{
+			Name: "info",
+			Ino:  0,
+			Mode: fuse.S_IFDIR,
+		}
+		r[1] = fuse.DirEntry{
+			Name: "fs",
+			Ino:  1,
+			Mode: fuse.S_IFDIR,
+		}
+		return fs.NewListDirStream(r), 0
+
+	case 1:
+		// info folder
+		r := make([]fuse.DirEntry, 6)
+		for ind, value := range properties {
+			r[ind] = fuse.DirEntry{
+				Name: value.name,
+				Ino:  value.Ino,
+				Mode: fuse.S_IFREG,
+			}
+		}
+
+		return fs.NewListDirStream(r), 0
+
+	case 2:
+		// on info
+		files, err := myfs.ReadDir(n.path)
+		if err != nil {
+			log.Error("FUSE ReadDir failed").Str("path", n.path).Err(err).Send()
+			return nil, syscallErr(err)
+		}
+
+		log.Debug("FUSE ReadDir succeeded").Str("path", n.path).Int("objects", len(files)).Send()
+		r := make([]fuse.DirEntry, len(files))
+		n.lst = make([]DirEntry, len(files))
+		for ind, entry := range files {
+			info, err := entry.Info()
+			if err != nil {
+				log.Error("FUSE Info failed").Str("path", n.path).Err(err).Send()
+				return nil, syscallErr(err)
+			}
+			name := info.Name()
+
+			file := DirEntry{
+				path:    n.path + "/" + name,
+				size:    uint32(info.Size()),
+				modtime: uint64(info.ModTime().Unix()),
+				isDir:   info.IsDir(),
+			}
+			n.lst[ind] = file
+
+			ino := inodemap[file.path]
+			if ino == 0 {
+				ino = uint64(len(inodemap)) + 1
+				inodemap[file.path] = ino
+			}
+
+			if file.isDir {
+				r[ind] = fuse.DirEntry{
+					Name: name,
+					Mode: fuse.S_IFDIR,
+					Ino:  ino + 10,
+				}
+			} else {
+				r[ind] = fuse.DirEntry{
+					Name: name,
+					Mode: fuse.S_IFREG,
+					Ino:  ino + 10,
+				}
+			}
+		}
+		return fs.NewListDirStream(r), 0
+	}
+	r := make([]fuse.DirEntry, 0)
+	return fs.NewListDirStream(r), 0
+}
+
+var _ fs.NodeLookuper = (*ITNode)(nil)
+
+func (n *ITNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
+	switch n.kind {
+	case 0:
+		// root folder
+		if name == "info" {
+			stable := fs.StableAttr{
+				Mode: fuse.S_IFDIR,
+				Ino:  uint64(0),
+			}
+			operations := &ITNode{kind: nodeKindInfo, Ino: 0}
+			child := n.NewInode(ctx, operations, stable)
+			return child, 0
+		} else if name == "fs" {
+			stable := fs.StableAttr{
+				Mode: fuse.S_IFDIR,
+				Ino:  uint64(1),
+			}
+			operations := &ITNode{kind: nodeKindFS, Ino: 1, path: ""}
+			child := n.NewInode(ctx, operations, stable)
+			return child, 0
+		}
+	case 1:
+		// info folder
+		for _, value := range properties {
+			if value.name == name {
+				stable := fs.StableAttr{
+					Mode: fuse.S_IFREG,
+					Ino:  uint64(value.Ino),
+				}
+				operations := &ITNode{kind: nodeKindReadOnly, Ino: value.Ino}
+				child := n.NewInode(ctx, operations, stable)
+				return child, 0
+			}
+		}
+
+	case 2:
+		// FS object
+		if len(n.lst) == 0 {
+			n.Readdir(ctx)
+		}
+
+		for _, file := range n.lst {
+			if file.path != n.path+"/"+name {
+				continue
+			}
+			log.Debug("FUSE Lookup successful").Str("path", file.path).Send()
+
+			if file.isDir {
+				stable := fs.StableAttr{
+					Mode: fuse.S_IFDIR,
+					Ino:  inodemap[file.path],
+				}
+				operations := &ITNode{kind: nodeKindFS, path: file.path}
+				child := n.NewInode(ctx, operations, stable)
+				return child, 0
+			} else {
+				stable := fs.StableAttr{
+					Mode: fuse.S_IFREG,
+					Ino:  inodemap[file.path],
+				}
+				operations := &ITNode{
+					kind: nodeKindFS, path: file.path,
+					self: file,
+				}
+				child := n.NewInode(ctx, operations, stable)
+				return child, 0
+			}
+		}
+		log.Warn("FUSE Lookup failed").Str("path", n.path+"/"+name).Send()
+	}
+	return nil, syscall.ENOENT
+}
+
+type bytesFileReadHandle struct {
+	content []byte
+}
+
+var _ fs.FileReader = (*bytesFileReadHandle)(nil)
+
+func (fh *bytesFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
+	log.Debug("FUSE Executing Read").Int("size", len(fh.content)).Send()
+	end := off + int64(len(dest))
+	if end > int64(len(fh.content)) {
+		end = int64(len(fh.content))
+	}
+	return fuse.ReadResultData(fh.content[off:end]), 0
+}
+
+type sensorFileReadHandle struct {
+	content []byte
+}
+
+var _ fs.FileReader = (*sensorFileReadHandle)(nil)
+
+func (fh *sensorFileReadHandle) Read(ctx context.Context, dest []byte, off int64) (fuse.ReadResult, syscall.Errno) {
+	log.Debug("FUSE Executing Read").Int("size", len(fh.content)).Send()
+	end := off + int64(len(dest))
+	if end > int64(len(fh.content)) {
+		end = int64(len(fh.content))
+	}
+	return fuse.ReadResultData(fh.content[off:end]), 0
+}
+
+var _ fs.FileFlusher = (*sensorFileReadHandle)(nil)
+
+func (fh *sensorFileReadHandle) Flush(ctx context.Context) (errno syscall.Errno) {
+	return 0
+}
+
+type bytesFileWriteHandle struct {
+	content []byte
+	path    string
+}
+
+var _ fs.FileWriter = (*bytesFileWriteHandle)(nil)
+
+func (fh *bytesFileWriteHandle) Write(ctx context.Context, data []byte, off int64) (written uint32, errno syscall.Errno) {
+	log.Debug("FUSE Executing Write").Str("path", fh.path).Int("prev_size", len(fh.content)).Int("next_size", len(data)).Send()
+	if off != int64(len(fh.content)) {
+		log.Error("FUSE Write file size changed unexpectedly").Int("expect", int(off)).Int("received", len(fh.content)).Send()
+		return 0, syscall.ENXIO
+	}
+	fh.content = append(fh.content[:], data[:]...)
+	return uint32(len(data)), 0
+}
+
+var _ fs.FileFlusher = (*bytesFileWriteHandle)(nil)
+
+func (fh *bytesFileWriteHandle) Flush(ctx context.Context) (errno syscall.Errno) {
+	log.Debug("FUSE Attempting flush").Str("path", fh.path).Send()
+	fp, err := myfs.Create(fh.path, uint32(len(fh.content)))
+	if err != nil {
+		log.Error("FUSE Flush failed: create").Str("path", fh.path).Err(err).Send()
+		return syscallErr(err)
+	}
+
+	if len(fh.content) == 0 {
+		log.Debug("FUSE Flush no data to write").Str("path", fh.path).Send()
+		err = fp.Close()
+		if err != nil {
+			log.Error("FUSE Flush failed during close").Str("path", fh.path).Err(err).Send()
+			return syscallErr(err)
+		}
+		return 0
+	}
+
+	go func() {
+		// For every progress event
+		for sent := range fp.Progress() {
+			log.Debug("FUSE Flush progress").Int("bytes", int(sent)).Int("total", len(fh.content)).Send()
+		}
+	}()
+
+	r := bytes.NewReader(fh.content)
+	nread, err := io.Copy(fp, r)
+	if err != nil {
+		log.Error("FUSE Flush failed during write").Str("path", fh.path).Err(err).Send()
+		fp.Close()
+		return syscallErr(err)
+	}
+	if int(nread) != len(fh.content) {
+		log.Error("FUSE Flush failed during write").Str("path", fh.path).Int("expect", len(fh.content)).Int("got", int(nread)).Send()
+		fp.Close()
+		return syscall.EIO
+	}
+	err = fp.Close()
+	if err != nil {
+		log.Error("FUSE Flush failed during close").Str("path", fh.path).Err(err).Send()
+		return syscallErr(err)
+	}
+	log.Debug("FUSE Flush done").Str("path", fh.path).Int("size", len(fh.content)).Send()
+
+	return 0
+}
+
+var _ fs.FileFsyncer = (*bytesFileWriteHandle)(nil)
+
+func (fh *bytesFileWriteHandle) Fsync(ctx context.Context, flags uint32) (errno syscall.Errno) {
+	return fh.Flush(ctx)
+}
+
+var _ fs.NodeGetattrer = (*ITNode)(nil)
+
+func (bn *ITNode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
+	log.Debug("FUSE getattr").Str("path", bn.path).Send()
+	out.Ino = bn.Ino
+	out.Mtime = bn.self.modtime
+	out.Ctime = bn.self.modtime
+	out.Atime = bn.self.modtime
+	out.Size = uint64(bn.self.size)
+	return 0
+}
+
+var _ fs.NodeSetattrer = (*ITNode)(nil)
+
+func (bn *ITNode) Setattr(ctx context.Context, fh fs.FileHandle, in *fuse.SetAttrIn, out *fuse.AttrOut) syscall.Errno {
+	log.Debug("FUSE setattr").Str("path", bn.path).Send()
+	out.Size = 0
+	out.Mtime = 0
+	return 0
+}
+
+var _ fs.NodeOpener = (*ITNode)(nil)
+
+func (f *ITNode) Open(ctx context.Context, openFlags uint32) (fh fs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
+	switch f.kind {
+	case 2:
+		// FS file
+		if openFlags&syscall.O_RDWR != 0 {
+			log.Error("FUSE Open failed: RDWR").Str("path", f.path).Send()
+			return nil, 0, syscall.EROFS
+		}
+
+		if openFlags&syscall.O_WRONLY != 0 {
+			log.Debug("FUSE Opening for write").Str("path", f.path).Send()
+			fh = &bytesFileWriteHandle{
+				path:    f.path,
+				content: make([]byte, 0),
+			}
+			return fh, fuse.FOPEN_DIRECT_IO, 0
+		} else {
+			log.Debug("FUSE Opening for read").Str("path", f.path).Send()
+			fp, err := myfs.Open(f.path)
+			if err != nil {
+				log.Error("FUSE: Opening failed").Str("path", f.path).Err(err).Send()
+				return nil, 0, syscallErr(err)
+			}
+
+			defer fp.Close()
+
+			b := &bytes.Buffer{}
+
+			go func() {
+				// For every progress event
+				for sent := range fp.Progress() {
+					log.Debug("FUSE Read progress").Int("bytes", int(sent)).Int("total", int(f.self.size)).Send()
+				}
+			}()
+
+			_, err = io.Copy(b, fp)
+			if err != nil {
+				log.Error("FUSE Read failed").Str("path", f.path).Err(err).Send()
+				fp.Close()
+				return nil, 0, syscallErr(err)
+			}
+
+			fh = &bytesFileReadHandle{
+				content: b.Bytes(),
+			}
+			return fh, fuse.FOPEN_DIRECT_IO, 0
+		}
+
+	case 3:
+		// Device file
+
+		// disallow writes
+		if openFlags&(syscall.O_RDWR|syscall.O_WRONLY) != 0 {
+			return nil, 0, syscall.EROFS
+		}
+
+		for _, value := range properties {
+			if value.Ino == f.Ino {
+				ans, err := value.gen()
+				if err != nil {
+					return nil, 0, syscallErr(err)
+				}
+
+				fh = &sensorFileReadHandle{
+					content: ans,
+				}
+				return fh, fuse.FOPEN_DIRECT_IO, 0
+			}
+		}
+	}
+	return nil, 0, syscall.EINVAL
+}
+
+var _ fs.NodeCreater = (*ITNode)(nil)
+
+func (f *ITNode) Create(ctx context.Context, name string, flags uint32, mode uint32, out *fuse.EntryOut) (node *fs.Inode, fh fs.FileHandle, fuseFlags uint32, errno syscall.Errno) {
+	if f.kind != 2 {
+		return nil, nil, 0, syscall.EROFS
+	}
+
+	path := f.path + "/" + name
+	ino := uint64(len(inodemap)) + 11
+	inodemap[path] = ino
+
+	stable := fs.StableAttr{
+		Mode: fuse.S_IFREG,
+		Ino:  ino,
+	}
+	operations := &ITNode{
+		kind: nodeKindFS, Ino: ino,
+		path: path,
+	}
+	node = f.NewInode(ctx, operations, stable)
+
+	fh = &bytesFileWriteHandle{
+		path:    path,
+		content: make([]byte, 0),
+	}
+
+	log.Debug("FUSE Creating file").Str("path", path).Send()
+
+	errno = 0
+	return node, fh, fuseFlags, 0
+}
+
+var _ fs.NodeMkdirer = (*ITNode)(nil)
+
+func (f *ITNode) Mkdir(ctx context.Context, name string, mode uint32, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
+	if f.kind != 2 {
+		return nil, syscall.EROFS
+	}
+
+	path := f.path + "/" + name
+	err := myfs.Mkdir(path)
+	if err != nil {
+		log.Error("FUSE Mkdir failed").
+			Str("path", path).
+			Err(err).
+			Send()
+		return nil, syscallErr(err)
+	}
+
+	ino := uint64(len(inodemap)) + 11
+	inodemap[path] = ino
+
+	stable := fs.StableAttr{
+		Mode: fuse.S_IFDIR,
+		Ino:  ino,
+	}
+	operations := &ITNode{
+		kind: nodeKindFS, Ino: ino,
+		path: path,
+	}
+	node := f.NewInode(ctx, operations, stable)
+
+	log.Debug("FUSE Mkdir success").
+		Str("path", path).
+		Int("ino", int(ino)).
+		Send()
+	return node, 0
+}
+
+var _ fs.NodeRenamer = (*ITNode)(nil)
+
+func (f *ITNode) Rename(ctx context.Context, name string, newParent fs.InodeEmbedder, newName string, flags uint32) syscall.Errno {
+	if f.kind != 2 {
+		return syscall.EROFS
+	}
+
+	p1 := f.path + "/" + name
+	p2 := newParent.EmbeddedInode().Path(nil)[2:] + "/" + newName
+
+	err := myfs.Rename(p1, p2)
+	if err != nil {
+		log.Error("FUSE Rename failed").
+			Str("src", p1).
+			Str("dest", p2).
+			Err(err).
+			Send()
+
+		return syscallErr(err)
+	}
+	log.Debug("FUSE Rename sucess").
+		Str("src", p1).
+		Str("dest", p2).
+		Send()
+
+	ino := inodemap[p1]
+	delete(inodemap, p1)
+	inodemap[p2] = ino
+
+	return 0
+}
+
+var _ fs.NodeUnlinker = (*ITNode)(nil)
+
+func (f *ITNode) Unlink(ctx context.Context, name string) syscall.Errno {
+	if f.kind != 2 {
+		return syscall.EROFS
+	}
+
+	delete(inodemap, f.path+"/"+name)
+	err := myfs.Remove(f.path + "/" + name)
+	if err != nil {
+		log.Error("FUSE Unlink failed").
+			Str("file", f.path+"/"+name).
+			Err(err).
+			Send()
+
+		return syscallErr(err)
+	}
+
+	log.Debug("FUSE Unlink success").
+		Str("file", f.path+"/"+name).
+		Send()
+	return 0
+}
+
+var _ fs.NodeRmdirer = (*ITNode)(nil)
+
+func (f *ITNode) Rmdir(ctx context.Context, name string) syscall.Errno {
+	return f.Unlink(ctx, name)
+}

internal/fusefs/syscallerr.go

@@ -0,0 +1,74 @@
+package fusefs
+
+import (
+	"syscall"
+
+	"go.arsenm.dev/infinitime/blefs"
+)
+
+func syscallErr(err error) syscall.Errno {
+	if err == nil {
+		return 0
+	}
+
+	switch err := err.(type) {
+	case blefs.FSError:
+		switch err.Code {
+		case 0x02: // filesystem error
+			return syscall.EIO // TODO
+		case 0x05: // read-only filesystem
+			return syscall.EROFS
+		case 0x03: // no such file
+			return syscall.ENOENT
+		case 0x04: // protocol error
+			return syscall.EPROTO
+		case -5: // input/output error
+			return syscall.EIO
+		case -84: // filesystem is corrupted
+			return syscall.ENOTRECOVERABLE // TODO
+		case -2: // no such directory entry
+			return syscall.ENOENT
+		case -17: // entry already exists
+			return syscall.EEXIST
+		case -20: // entry is not a directory
+			return syscall.ENOTDIR
+		case -39: // directory is not empty
+			return syscall.ENOTEMPTY
+		case -9: // bad file number
+			return syscall.EBADF
+		case -27: // file is too large
+			return syscall.EFBIG
+		case -22: // invalid parameter
+			return syscall.EINVAL
+		case -28: // no space left on device
+			return syscall.ENOSPC
+		case -12: // no more memory available
+			return syscall.ENOMEM
+		case -61: // no attr available
+			return syscall.ENODATA // TODO
+		case -36: // file name is too long
+			return syscall.ENAMETOOLONG
+		}
+	default:
+		switch err {
+		case blefs.ErrFileNotExists: // file does not exist
+			return syscall.ENOENT
+		case blefs.ErrFileReadOnly: // file is read only
+			return syscall.EACCES
+		case blefs.ErrFileWriteOnly: // file is write only
+			return syscall.EACCES
+		case blefs.ErrInvalidOffset: // invalid file offset
+			return syscall.EINVAL
+		case blefs.ErrOffsetChanged: // offset has already been changed
+			return syscall.ESPIPE
+		case blefs.ErrReadOpen: // only one file can be opened for reading at a time
+			return syscall.ENFILE
+		case blefs.ErrWriteOpen: // only one file can be opened for writing at a time
+			return syscall.ENFILE
+		case blefs.ErrNoRemoveRoot: // refusing to remove root directory
+			return syscall.EPERM
+		}
+	}
+
+	return syscall.EIO
+}

internal/fusefs/unmount.go

@@ -0,0 +1,17 @@
+package fusefs
+
+import (
+	_ "unsafe"
+
+	"github.com/hanwen/go-fuse/v2/fuse"
+)
+
+func Unmount(mountPoint string) error {
+	return unmount(mountPoint, &fuse.MountOptions{DirectMount: false})
+}
+
+// Unfortunately, the FUSE library does not export its unmount function,
+// so this is required until that changes
+//
+//go:linkname unmount github.com/hanwen/go-fuse/v2/fuse.unmount
+func unmount(mountPoint string, opts *fuse.MountOptions) error

internal/rpc/gen.go

@@ -0,0 +1,3 @@
+package rpc
+
+//go:generate protoc --go_out=. --go_opt=paths=source_relative --go-drpc_out=. --go-drpc_opt=paths=source_relative itd.proto

internal/rpc/itd.proto

@@ -0,0 +1,124 @@
+syntax = "proto3";
+package rpc;
+option go_package = "go.arsenm.dev/itd/internal/rpc";
+
+message Empty {};
+
+message IntResponse {
+    uint32 value = 1;
+}
+
+message StringResponse {
+    string value = 1;
+}
+
+message MotionResponse {
+    int32 x = 1;
+    int32 y = 2;
+    int32 z = 3;
+}
+
+message NotifyRequest {
+    string title = 1;
+    string body = 2;
+}
+
+message SetTimeRequest {
+    int64 unix_nano = 1;
+}
+
+
+message FirmwareUpgradeRequest {
+    enum Type {
+        Archive = 0;
+        Files = 1;
+    }
+
+    Type type = 1;
+    repeated string files = 2;
+}
+
+message DFUProgress {
+    int64 sent = 1;
+    int64 recieved = 2;
+    int64 total = 3;
+}
+
+service ITD {
+    rpc HeartRate(Empty) returns (IntResponse);
+    rpc WatchHeartRate(Empty) returns (stream IntResponse);
+
+    rpc BatteryLevel(Empty) returns (IntResponse);
+    rpc WatchBatteryLevel(Empty) returns (stream IntResponse);
+
+    rpc Motion(Empty) returns (MotionResponse);
+    rpc WatchMotion(Empty) returns (stream MotionResponse);
+
+    rpc StepCount(Empty) returns (IntResponse);
+    rpc WatchStepCount(Empty) returns (stream IntResponse);
+
+    rpc Version(Empty) returns (StringResponse);
+    rpc Address(Empty) returns (StringResponse);
+
+    rpc Notify(NotifyRequest) returns (Empty);
+    rpc SetTime(SetTimeRequest) returns (Empty);
+    rpc WeatherUpdate(Empty) returns (Empty);
+    rpc FirmwareUpgrade(FirmwareUpgradeRequest) returns (stream DFUProgress);
+}
+
+message PathRequest {
+    string path = 1;
+}
+
+message PathsRequest {
+    repeated string paths = 1;
+}
+
+message RenameRequest {
+    string from = 1;
+    string to = 2;
+}
+
+message TransferRequest {
+    string source = 1;
+    string destination = 2;
+}
+
+message FileInfo {
+    string name = 1;
+    int64 size = 2;
+    bool is_dir = 3;
+}
+
+message DirResponse {
+    repeated FileInfo entries = 1;
+}
+
+message TransferProgress {
+    uint32 sent = 1;
+    uint32 total = 2;
+}
+
+message ResourceLoadProgress {
+    enum Operation {
+        Upload = 0;
+        RemoveObsolete = 1;
+    }
+
+    string name = 1;
+    int64 total = 2;
+    int64 sent = 3;
+    Operation operation = 4;
+}
+
+service FS {
+    rpc RemoveAll(PathsRequest) returns (Empty);
+    rpc Remove(PathsRequest) returns (Empty);
+    rpc Rename(RenameRequest) returns (Empty);
+    rpc MkdirAll(PathsRequest) returns (Empty);
+    rpc Mkdir(PathsRequest) returns (Empty);
+    rpc ReadDir(PathRequest) returns (DirResponse);
+    rpc Upload(TransferRequest) returns (stream TransferProgress);
+    rpc Download(TransferRequest) returns (stream TransferProgress);
+    rpc LoadResources(PathRequest) returns (stream ResourceLoadProgress);
+}

internal/utils/dbus.go

@@ -1,4 +1,4 @@
-package main
+package utils
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"github.com/godbus/dbus/v5"
 )
 
-func newSystemBusConn(ctx context.Context) (*dbus.Conn, error) {
+func NewSystemBusConn(ctx context.Context) (*dbus.Conn, error) {
 	// Connect to dbus session bus
 	conn, err := dbus.SystemBusPrivate(dbus.WithContext(ctx))
 	if err != nil {
@@ -23,7 +23,7 @@ func newSystemBusConn(ctx context.Context) (*dbus.Conn, error) {
 	return conn, nil
 }
 
-func newSessionBusConn(ctx context.Context) (*dbus.Conn, error) {
+func NewSessionBusConn(ctx context.Context) (*dbus.Conn, error) {
 	// Connect to dbus session bus
 	conn, err := dbus.SessionBusPrivate(dbus.WithContext(ctx))
 	if err != nil {

itgui.desktop

@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Application
+Terminal=false
+Exec=/usr/bin/itgui
+Name=itgui

main.go

@@ -26,22 +26,21 @@ import (
 	"os"
 	"os/signal"
 	"strconv"
+	"sync"
+
 	"syscall"
 	"time"
 
 	"github.com/gen2brain/dlgs"
 	"github.com/knadh/koanf"
 	"github.com/mattn/go-isatty"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/logger"
+	"go.arsenm.dev/logger/log"
 )
 
 var k = koanf.New(".")
 
-//go:embed version.txt
-var version string
-
 var (
 	firmwareUpdating = false
 	// The FS must be updated when the watch is reconnected
@@ -57,9 +56,9 @@ func main() {
 		return
 	}
 
-	level, err := zerolog.ParseLevel(k.String("logging.level"))
-	if err != nil || level == zerolog.NoLevel {
-		level = zerolog.InfoLevel
+	level, err := logger.ParseLogLevel(k.String("logging.level"))
+	if err != nil {
+		level = logger.LogLevelInfo
 	}
 
 	// Initialize infinitime library
@@ -77,26 +76,12 @@ func main() {
 		LogLevel:         level,
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	sigCh := make(chan os.Signal, 1)
-	go func() {
-		<-sigCh
-		cancel()
-		time.Sleep(200 * time.Millisecond)
-		os.Exit(0)
-	}()
-	signal.Notify(
-		sigCh,
-		syscall.SIGINT,
-		syscall.SIGTERM,
-	)
+	ctx := context.Background()
 
 	// Connect to InfiniTime with default options
 	dev, err := infinitime.Connect(ctx, opts)
 	if err != nil {
-		log.Fatal().Err(err).Msg("Error connecting to InfiniTime")
+		log.Fatal("Error connecting to InfiniTime").Err(err).Send()
 	}
 
 	// When InfiniTime reconnects
@@ -127,64 +112,109 @@ func main() {
 	// Get firmware version
 	ver, err := dev.Version()
 	if err != nil {
-		log.Error().Err(err).Msg("Error getting firmware version")
+		log.Error("Error getting firmware version").Err(err).Send()
 	}
 
 	// Log connection
-	log.Info().Str("version", ver).Msg("Connected to InfiniTime")
+	log.Info("Connected to InfiniTime").Str("version", ver).Send()
 
 	// If config specifies to notify on connect
 	if k.Bool("on.connect.notify") {
 		// Send notification to InfiniTime
 		err = dev.Notify("itd", "Successfully connected")
 		if err != nil {
-			log.Error().Err(err).Msg("Error sending notification to InfiniTime")
+			log.Error("Error sending notification to InfiniTime").Err(err).Send()
 		}
 	}
 
 	// Set time to current time
 	err = dev.SetTime(time.Now())
 	if err != nil {
-		log.Error().Err(err).Msg("Error setting current time on connected InfiniTime")
+		log.Error("Error setting current time on connected InfiniTime").Err(err).Send()
 	}
 
+	sigCh := make(chan os.Signal, 1)
+	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
+
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	go func() {
+		sig := <-sigCh
+		log.Warn("Signal received, shutting down").Stringer("signal", sig).Send()
+		cancel()
+	}()
+
+	wg := WaitGroup{&sync.WaitGroup{}}
+
 	// Initialize music controls
-	err = initMusicCtrl(dev)
+	err = initMusicCtrl(ctx, wg, dev)
 	if err != nil {
-		log.Error().Err(err).Msg("Error initializing music control")
+		log.Error("Error initializing music control").Err(err).Send()
 	}
 
 	// Start control socket
-	err = initCallNotifs(ctx, dev)
+	err = initCallNotifs(ctx, wg, dev)
 	if err != nil {
-		log.Error().Err(err).Msg("Error initializing call notifications")
+		log.Error("Error initializing call notifications").Err(err).Send()
 	}
 
 	// Initialize notification relay
-	err = initNotifRelay(ctx, dev)
+	err = initNotifRelay(ctx, wg, dev)
 	if err != nil {
-		log.Error().Err(err).Msg("Error initializing notification relay")
+		log.Error("Error initializing notification relay").Err(err).Send()
 	}
 
 	// Initializa weather
-	err = initWeather(ctx, dev)
+	err = initWeather(ctx, wg, dev)
 	if err != nil {
-		log.Error().Err(err).Msg("Error initializing weather")
+		log.Error("Error initializing weather").Err(err).Send()
 	}
 
 	// Initialize metrics collection
-	err = initMetrics(ctx, dev)
+	err = initMetrics(ctx, wg, dev)
 	if err != nil {
-		log.Error().Err(err).Msg("Error intializing metrics collection")
+		log.Error("Error intializing metrics collection").Err(err).Send()
+	}
+
+	// Initialize puremaps integration
+	err = initPureMaps(ctx, wg, dev)
+	if err != nil {
+		log.Error("Error intializing puremaps integration").Err(err).Send()
+	}
+
+	// Start fuse socket
+	if k.Bool("fuse.enabled") {
+		err = startFUSE(ctx, wg, dev)
+		if err != nil {
+			log.Error("Error starting fuse socket").Err(err).Send()
+		}
 	}
 
 	// Start control socket
-	err = startSocket(ctx, dev)
+	err = startSocket(ctx, wg, dev)
 	if err != nil {
-		log.Error().Err(err).Msg("Error starting socket")
+		log.Error("Error starting socket").Err(err).Send()
 	}
-	// Block forever
-	select {}
+
+	wg.Wait()
+}
+
+type x struct {
+	n int
+	*sync.WaitGroup
+}
+
+func (xy *x) Add(i int) {
+	xy.n += i
+	xy.WaitGroup.Add(i)
+	fmt.Println("add: counter:", xy.n)
+}
+
+func (xy *x) Done() {
+	xy.n -= 1
+	xy.WaitGroup.Done()
+	fmt.Println("done: counter:", xy.n)
 }
 
 func onReqPasskey() (uint32, error) {

maps.go

@@ -0,0 +1,214 @@
+package main
+
+import (
+	"context"
+	"strings"
+
+	"github.com/godbus/dbus/v5"
+	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/utils"
+	"go.arsenm.dev/logger/log"
+)
+
+const (
+	interfaceName     = "io.github.rinigus.PureMaps.navigator"
+	iconProperty      = interfaceName + ".icon"
+	narrativeProperty = interfaceName + ".narrative"
+	manDistProperty   = interfaceName + ".manDist"
+	progressProperty  = interfaceName + ".progress"
+)
+
+func initPureMaps(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+	// Connect to session bus. This connection is for method calls.
+	conn, err := utils.NewSessionBusConn(ctx)
+	if err != nil {
+		return err
+	}
+
+	exists, err := pureMapsExists(ctx, conn)
+	if err != nil {
+		return err
+	}
+
+	// Connect to session bus. This connection is for method calls.
+	monitorConn, err := utils.NewSessionBusConn(ctx)
+	if err != nil {
+		return err
+	}
+
+	// Define rules to listen for
+	rules := []string{
+		"type='signal',interface='io.github.rinigus.PureMaps.navigator'",
+	}
+	var flag uint = 0
+	// Becode monitor for notifications
+	call := monitorConn.BusObject().CallWithContext(
+		ctx, "org.freedesktop.DBus.Monitoring.BecomeMonitor", 0, rules, flag,
+	)
+	if call.Err != nil {
+		return call.Err
+	}
+
+	var navigator dbus.BusObject
+
+	if exists {
+		navigator = conn.Object("io.github.rinigus.PureMaps", "/io/github/rinigus/PureMaps/navigator")
+		err = setAll(navigator, dev)
+		if err != nil {
+			log.Error("Error setting all navigation fields").Err(err).Send()
+		}
+	}
+
+	wg.Add(1)
+	go func() {
+		defer wg.Done("pureMaps")
+
+		signalCh := make(chan *dbus.Message, 10)
+		monitorConn.Eavesdrop(signalCh)
+
+		for {
+			select {
+			case sig := <-signalCh:
+				if sig.Type != dbus.TypeSignal {
+					continue
+				}
+
+				var member string
+				err = sig.Headers[dbus.FieldMember].Store(&member)
+				if err != nil {
+					log.Error("Error getting dbus member field").Err(err).Send()
+					continue
+				}
+
+				if !strings.HasSuffix(member, "Changed") {
+					continue
+				}
+
+				log.Debug("Signal received from PureMaps navigator").Str("member", member).Send()
+
+				// The object must be retrieved in this loop in case PureMaps was not
+				// open at the time ITD was started.
+				navigator = conn.Object("io.github.rinigus.PureMaps", "/io/github/rinigus/PureMaps/navigator")
+				member = strings.TrimSuffix(member, "Changed")
+
+				switch member {
+				case "icon":
+					var icon string
+					err = navigator.StoreProperty(iconProperty, &icon)
+					if err != nil {
+						log.Error("Error getting property").Err(err).Str("property", member).Send()
+						continue
+					}
+
+					err = dev.Navigation.SetFlag(infinitime.NavFlag(icon))
+					if err != nil {
+						log.Error("Error setting flag").Err(err).Str("property", member).Send()
+						continue
+					}
+				case "narrative":
+					var narrative string
+					err = navigator.StoreProperty(narrativeProperty, &narrative)
+					if err != nil {
+						log.Error("Error getting property").Err(err).Str("property", member).Send()
+						continue
+					}
+
+					err = dev.Navigation.SetNarrative(narrative)
+					if err != nil {
+						log.Error("Error setting flag").Err(err).Str("property", member).Send()
+						continue
+					}
+				case "manDist":
+					var manDist string
+					err = navigator.StoreProperty(manDistProperty, &manDist)
+					if err != nil {
+						log.Error("Error getting property").Err(err).Str("property", member).Send()
+						continue
+					}
+
+					err = dev.Navigation.SetManDist(manDist)
+					if err != nil {
+						log.Error("Error setting flag").Err(err).Str("property", member).Send()
+						continue
+					}
+				case "progress":
+					var progress int32
+					err = navigator.StoreProperty(progressProperty, &progress)
+					if err != nil {
+						log.Error("Error getting property").Err(err).Str("property", member).Send()
+						continue
+					}
+
+					err = dev.Navigation.SetProgress(uint8(progress))
+					if err != nil {
+						log.Error("Error setting flag").Err(err).Str("property", member).Send()
+						continue
+					}
+				}
+			case <-ctx.Done():
+				return
+			}
+		}
+	}()
+
+	if exists {
+		log.Info("Sending PureMaps data to InfiniTime").Send()
+	}
+
+	return nil
+}
+
+func setAll(navigator dbus.BusObject, dev *infinitime.Device) error {
+	var icon string
+	err := navigator.StoreProperty(iconProperty, &icon)
+	if err != nil {
+		return err
+	}
+
+	err = dev.Navigation.SetFlag(infinitime.NavFlag(icon))
+	if err != nil {
+		return err
+	}
+
+	var narrative string
+	err = navigator.StoreProperty(narrativeProperty, &narrative)
+	if err != nil {
+		return err
+	}
+
+	err = dev.Navigation.SetNarrative(narrative)
+	if err != nil {
+		return err
+	}
+
+	var manDist string
+	err = navigator.StoreProperty(manDistProperty, &manDist)
+	if err != nil {
+		return err
+	}
+
+	err = dev.Navigation.SetManDist(manDist)
+	if err != nil {
+		return err
+	}
+
+	var progress int32
+	err = navigator.StoreProperty(progressProperty, &progress)
+	if err != nil {
+		return err
+	}
+
+	return dev.Navigation.SetProgress(uint8(progress))
+}
+
+// pureMapsExists checks to make sure the PureMaps service exists on the bus
+func pureMapsExists(ctx context.Context, conn *dbus.Conn) (bool, error) {
+	var names []string
+	err := conn.BusObject().CallWithContext(
+		ctx, "org.freedesktop.DBus.ListNames", 0,
+	).Store(&names)
+	if err != nil {
+		return false, err
+	}
+	return strSlcContains(names, "io.github.rinigus.PureMaps"), nil
+}

metrics.go

@@ -4,14 +4,15 @@ import (
 	"context"
 	"database/sql"
 	"path/filepath"
+
 	"time"
 
-	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/logger/log"
 	_ "modernc.org/sqlite"
 )
 
-func initMetrics(ctx context.Context, dev *infinitime.Device) error {
+func initMetrics(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
 	// If metrics disabled, return nil
 	if !k.Bool("metrics.enabled") {
 		return nil
@@ -125,7 +126,14 @@ func initMetrics(ctx context.Context, dev *infinitime.Device) error {
 		}()
 	}
 
-	log.Info().Msg("Initialized metrics collection")
+	wg.Add(1)
+	go func() {
+		defer wg.Done("metrics")
+		<-ctx.Done()
+		db.Close()
+	}()
+
+	log.Info("Initialized metrics collection").Send()
 
 	return nil
 }

mpris/mpris.go

@@ -0,0 +1,270 @@
+package mpris
+
+import (
+	"context"
+	"strings"
+	"sync"
+
+	"github.com/godbus/dbus/v5"
+	"go.arsenm.dev/itd/internal/utils"
+)
+
+var (
+	method, monitor *dbus.Conn
+	monitorCh       chan *dbus.Message
+	onChangeOnce    sync.Once
+)
+
+// Init makes required connections to DBus and
+// initializes change monitoring channel
+func Init(ctx context.Context) error {
+	// Connect to session bus for monitoring
+	monitorConn, err := utils.NewSessionBusConn(ctx)
+	if err != nil {
+		return err
+	}
+	// Add match rule for PropertiesChanged on media player
+	monitorConn.AddMatchSignal(
+		dbus.WithMatchObjectPath("/org/mpris/MediaPlayer2"),
+		dbus.WithMatchInterface("org.freedesktop.DBus.Properties"),
+		dbus.WithMatchMember("PropertiesChanged"),
+	)
+	monitorCh = make(chan *dbus.Message, 10)
+	monitorConn.Eavesdrop(monitorCh)
+
+	// Connect to session bus for method calls
+	methodConn, err := utils.NewSessionBusConn(ctx)
+	if err != nil {
+		return err
+	}
+	method, monitor = methodConn, monitorConn
+	return nil
+}
+
+// Exit closes all connections and channels
+func Exit() {
+	close(monitorCh)
+	method.Close()
+	monitor.Close()
+}
+
+// Play uses MPRIS to play media
+func Play() error {
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+		call := player.Call("org.mpris.MediaPlayer2.Player.Play", 0)
+		if call.Err != nil {
+			return call.Err
+		}
+	}
+	return nil
+}
+
+// Pause uses MPRIS to pause media
+func Pause() error {
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+		call := player.Call("org.mpris.MediaPlayer2.Player.Pause", 0)
+		if call.Err != nil {
+			return call.Err
+		}
+	}
+	return nil
+}
+
+// Next uses MPRIS to skip to next media
+func Next() error {
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+		call := player.Call("org.mpris.MediaPlayer2.Player.Next", 0)
+		if call.Err != nil {
+			return call.Err
+		}
+	}
+	return nil
+}
+
+// Prev uses MPRIS to skip to previous media
+func Prev() error {
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+		call := player.Call("org.mpris.MediaPlayer2.Player.Previous", 0)
+		if call.Err != nil {
+			return call.Err
+		}
+	}
+	return nil
+}
+
+func VolUp(percent uint) error {
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+		currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
+		if err != nil {
+			return err
+		}
+		newVal := currentVal.Value().(float64) + (float64(percent) / 100)
+		err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func VolDown(percent uint) error {
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+		currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
+		if err != nil {
+			return err
+		}
+		newVal := currentVal.Value().(float64) - (float64(percent) / 100)
+		err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+type ChangeType int
+
+const (
+	ChangeTypeTitle ChangeType = iota
+	ChangeTypeArtist
+	ChangeTypeAlbum
+	ChangeTypeStatus
+)
+
+func (ct ChangeType) String() string {
+	switch ct {
+	case ChangeTypeTitle:
+		return "Title"
+	case ChangeTypeAlbum:
+		return "Album"
+	case ChangeTypeArtist:
+		return "Artist"
+	case ChangeTypeStatus:
+		return "Status"
+	}
+	return ""
+}
+
+// OnChange runs cb when a value changes
+func OnChange(cb func(ChangeType, string)) {
+	go onChangeOnce.Do(func() {
+		// For every message on channel
+		for msg := range monitorCh {
+			// Parse PropertiesChanged
+			iface, changed, ok := parsePropertiesChanged(msg)
+			if !ok || iface != "org.mpris.MediaPlayer2.Player" {
+				continue
+			}
+
+			// For every property changed
+			for name, val := range changed {
+				// If metadata changed
+				if name == "Metadata" {
+					// Get fields
+					fields := val.Value().(map[string]dbus.Variant)
+					// For every field
+					for name, val := range fields {
+						// Handle each field appropriately
+						if strings.HasSuffix(name, "title") {
+							title := val.Value().(string)
+							if title == "" {
+								title = "Unknown " + ChangeTypeTitle.String()
+							}
+							cb(ChangeTypeTitle, title)
+						} else if strings.HasSuffix(name, "album") {
+							album := val.Value().(string)
+							if album == "" {
+								album = "Unknown " + ChangeTypeAlbum.String()
+							}
+							cb(ChangeTypeAlbum, album)
+						} else if strings.HasSuffix(name, "artist") {
+							var artists string
+							switch artistVal := val.Value().(type) {
+							case string:
+								artists = artistVal
+							case []string:
+								artists = strings.Join(artistVal, ", ")
+							}
+							if artists == "" {
+								artists = "Unknown " + ChangeTypeArtist.String()
+							}
+							cb(ChangeTypeArtist, artists)
+						}
+					}
+				} else if name == "PlaybackStatus" {
+					// Handle status change
+					cb(ChangeTypeStatus, val.Value().(string))
+				}
+			}
+		}
+	})
+}
+
+// getPlayerNames gets all DBus MPRIS player bus names
+func getPlayerNames(conn *dbus.Conn) ([]string, error) {
+	var names []string
+	err := conn.BusObject().Call("org.freedesktop.DBus.ListNames", 0).Store(&names)
+	if err != nil {
+		return nil, err
+	}
+	var players []string
+	for _, name := range names {
+		if strings.HasPrefix(name, "org.mpris.MediaPlayer2") {
+			players = append(players, name)
+		}
+	}
+	return players, nil
+}
+
+// GetPlayerObj gets the object corresponding to the first
+// bus name found in DBus
+func getPlayerObj() (dbus.BusObject, error) {
+	players, err := getPlayerNames(method)
+	if err != nil {
+		return nil, err
+	}
+	if len(players) == 0 {
+		return nil, nil
+	}
+	return method.Object(players[0], "/org/mpris/MediaPlayer2"), nil
+}
+
+// parsePropertiesChanged parses a DBus PropertiesChanged signal
+func parsePropertiesChanged(msg *dbus.Message) (iface string, changed map[string]dbus.Variant, ok bool) {
+	if len(msg.Body) != 3 {
+		return "", nil, false
+	}
+	iface, ok = msg.Body[0].(string)
+	if !ok {
+		return
+	}
+	changed, ok = msg.Body[1].(map[string]dbus.Variant)
+	if !ok {
+		return
+	}
+	return
+}

mpris/mpris_test.go

@@ -0,0 +1,84 @@
+package mpris
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/godbus/dbus/v5"
+)
+
+// TestParsePropertiesChanged checks the parsePropertiesChanged function to
+// make sure it correctly parses a DBus PropertiesChanged signal.
+func TestParsePropertiesChanged(t *testing.T) {
+	// Create a DBus message
+	msg := &dbus.Message{
+		Body: []interface{}{
+			"com.example.Interface",
+			map[string]dbus.Variant{
+				"Property1": dbus.MakeVariant(true),
+				"Property2": dbus.MakeVariant("Hello, world!"),
+			},
+			[]string{},
+		},
+	}
+
+	// Parse the message
+	iface, changed, ok := parsePropertiesChanged(msg)
+	if !ok {
+		t.Error("Expected parsePropertiesChanged to return true, but got false")
+	}
+
+	// Check the parsed values
+	expectedIface := "com.example.Interface"
+	if iface != expectedIface {
+		t.Errorf("Expected iface to be %q, but got %q", expectedIface, iface)
+	}
+
+	expectedChanged := map[string]dbus.Variant{
+		"Property1": dbus.MakeVariant(true),
+		"Property2": dbus.MakeVariant("Hello, world!"),
+	}
+	if !reflect.DeepEqual(changed, expectedChanged) {
+		t.Errorf("Expected changed to be %v, but got %v", expectedChanged, changed)
+	}
+
+	// Test a message with an invalid number of arguments
+	msg = &dbus.Message{
+		Body: []interface{}{
+			"com.example.Interface",
+		},
+	}
+	_, _, ok = parsePropertiesChanged(msg)
+	if ok {
+		t.Error("Expected parsePropertiesChanged to return false, but got true")
+	}
+
+	// Test a message with an invalid first argument
+	msg = &dbus.Message{
+		Body: []interface{}{
+			123,
+			map[string]dbus.Variant{
+				"Property1": dbus.MakeVariant(true),
+				"Property2": dbus.MakeVariant("Hello, world!"),
+			},
+			[]string{},
+		},
+	}
+	_, _, ok = parsePropertiesChanged(msg)
+	if ok {
+		t.Error("Expected parsePropertiesChanged to return false, but got true")
+	}
+
+	// Test a message with an invalid second argument
+	msg = &dbus.Message{
+		Body: []interface{}{
+			"com.example.Interface",
+			123,
+			[]string{},
+		},
+	}
+	_, _, ok = parsePropertiesChanged(msg)
+	if ok {
+		t.Error("Expected parsePropertiesChanged to return false, but got true")
+	}
+}

music.go

@@ -19,29 +19,32 @@
 package main
 
 import (
-	"github.com/rs/zerolog/log"
+	"context"
+	
+
 	"go.arsenm.dev/infinitime"
-	"go.arsenm.dev/infinitime/pkg/player"
+	"go.arsenm.dev/itd/mpris"
 	"go.arsenm.dev/itd/translit"
+	"go.arsenm.dev/logger/log"
 )
 
-func initMusicCtrl(dev *infinitime.Device) error {
-	player.Init()
+func initMusicCtrl(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+	mpris.Init(ctx)
 
 	maps := k.Strings("notifs.translit.use")
 	translit.Transliterators["custom"] = translit.Map(k.Strings("notifs.translit.custom"))
 
-	player.OnChange(func(ct player.ChangeType, val string) {
+	mpris.OnChange(func(ct mpris.ChangeType, val string) {
 		newVal := translit.Transliterate(val, maps...)
 		if !firmwareUpdating {
 			switch ct {
-			case player.ChangeTypeStatus:
+			case mpris.ChangeTypeStatus:
 				dev.Music.SetStatus(val == "Playing")
-			case player.ChangeTypeTitle:
+			case mpris.ChangeTypeTitle:
 				dev.Music.SetTrack(newVal)
-			case player.ChangeTypeAlbum:
+			case mpris.ChangeTypeAlbum:
 				dev.Music.SetAlbum(newVal)
-			case player.ChangeTypeArtist:
+			case mpris.ChangeTypeArtist:
 				dev.Music.SetArtist(newVal)
 			}
 		}
@@ -52,29 +55,37 @@ func initMusicCtrl(dev *infinitime.Device) error {
 	if err != nil {
 		return err
 	}
+	
+	wg.Add(1)
 	go func() {
+		defer wg.Done("musicCtrl")
 		// For every music event received
-		for musicEvt := range musicEvtCh {
-			// Perform appropriate action based on event
-			switch musicEvt {
-			case infinitime.MusicEventPlay:
-				player.Play()
-			case infinitime.MusicEventPause:
-				player.Pause()
-			case infinitime.MusicEventNext:
-				player.Next()
-			case infinitime.MusicEventPrev:
-				player.Prev()
-			case infinitime.MusicEventVolUp:
-				player.VolUp(uint(k.Int("music.vol.interval")))
-			case infinitime.MusicEventVolDown:
-				player.VolDown(uint(k.Int("music.vol.interval")))
+		for {
+			select {
+			case musicEvt := <-musicEvtCh:
+				// Perform appropriate action based on event
+				switch musicEvt {
+				case infinitime.MusicEventPlay:
+					mpris.Play()
+				case infinitime.MusicEventPause:
+					mpris.Pause()
+				case infinitime.MusicEventNext:
+					mpris.Next()
+				case infinitime.MusicEventPrev:
+					mpris.Prev()
+				case infinitime.MusicEventVolUp:
+					mpris.VolUp(uint(k.Int("music.vol.interval")))
+				case infinitime.MusicEventVolDown:
+					mpris.VolDown(uint(k.Int("music.vol.interval")))
+				}
+			case <-ctx.Done():
+				return
 			}
 		}
 	}()
 
 	// Log completed initialization
-	log.Info().Msg("Initialized InfiniTime music controls")
+	log.Info("Initialized InfiniTime music controls").Send()
 
 	return nil
 }

notifs.go

@@ -23,20 +23,21 @@ import (
 	"fmt"
 
 	"github.com/godbus/dbus/v5"
-	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/itd/internal/utils"
 	"go.arsenm.dev/itd/translit"
+	"go.arsenm.dev/logger/log"
 )
 
-func initNotifRelay(ctx context.Context, dev *infinitime.Device) error {
+func initNotifRelay(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
 	// Connect to dbus session bus
-	bus, err := newSessionBusConn(ctx)
+	bus, err := utils.NewSessionBusConn(ctx)
 	if err != nil {
 		return err
 	}
 
 	// Define rules to listen for
-	var rules = []string{
+	rules := []string{
 		"type='method_call',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",
 	}
 	var flag uint = 0
@@ -53,47 +54,55 @@ func initNotifRelay(ctx context.Context, dev *infinitime.Device) error {
 	// Send events to channel
 	bus.Eavesdrop(notifCh)
 
+	wg.Add(1)
 	go func() {
+		defer wg.Done("notifRelay")
 		// For every event sent to channel
-		for v := range notifCh {
-			// If firmware is updating, skip
-			if firmwareUpdating {
-				continue
+		for {
+			select {
+			case v := <-notifCh:
+				// If firmware is updating, skip
+				if firmwareUpdating {
+					continue
+				}
+
+				// If body does not contain 5 elements, skip
+				if len(v.Body) < 5 {
+					continue
+				}
+
+				// Get requred fields
+				sender, summary, body := v.Body[0].(string), v.Body[3].(string), v.Body[4].(string)
+
+				// If fields are ignored in config, skip
+				if ignored(sender, summary, body) {
+					continue
+				}
+
+				maps := k.Strings("notifs.translit.use")
+				translit.Transliterators["custom"] = translit.Map(k.Strings("notifs.translit.custom"))
+				sender = translit.Transliterate(sender, maps...)
+				summary = translit.Transliterate(summary, maps...)
+				body = translit.Transliterate(body, maps...)
+
+				var msg string
+				// If summary does not exist, set message to body.
+				// If it does, set message to summary, two newlines, and then body
+				if summary == "" {
+					msg = body
+				} else {
+					msg = fmt.Sprintf("%s\n\n%s", summary, body)
+				}
+
+				dev.Notify(sender, msg)
+			case <-ctx.Done():
+				bus.Close()
+				return
 			}
-
-			// If body does not contain 5 elements, skip
-			if len(v.Body) < 5 {
-				continue
-			}
-
-			// Get requred fields
-			sender, summary, body := v.Body[0].(string), v.Body[3].(string), v.Body[4].(string)
-
-			// If fields are ignored in config, skip
-			if ignored(sender, summary, body) {
-				continue
-			}
-
-			maps := k.Strings("notifs.translit.use")
-			translit.Transliterators["custom"] = translit.Map(k.Strings("notifs.translit.custom"))
-			sender = translit.Transliterate(sender, maps...)
-			summary = translit.Transliterate(summary, maps...)
-			body = translit.Transliterate(body, maps...)
-
-			var msg string
-			// If summary does not exist, set message to body.
-			// If it does, set message to summary, two newlines, and then body
-			if summary == "" {
-				msg = body
-			} else {
-				msg = fmt.Sprintf("%s\n\n%s", summary, body)
-			}
-
-			dev.Notify(sender, msg)
 		}
 	}()
 
-	log.Info().Msg("Relaying notifications to InfiniTime")
+	log.Info("Relaying notifications to InfiniTime").Send()
 	return nil
 }
 

scripts/gen-version.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+git describe --tags > version.txt

socket.go

@@ -25,14 +25,15 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	
 	"time"
 
-	"github.com/rs/zerolog/log"
+	"go.arsenm.dev/drpc/muxserver"
 	"go.arsenm.dev/infinitime"
 	"go.arsenm.dev/infinitime/blefs"
-	"go.arsenm.dev/itd/api"
-	"go.arsenm.dev/lrpc/codec"
-	"go.arsenm.dev/lrpc/server"
+	"go.arsenm.dev/itd/internal/rpc"
+	"go.arsenm.dev/logger/log"
+	"storj.io/drpc/drpcmux"
 )
 
 var (
@@ -41,9 +42,9 @@ var (
 	ErrDFUInvalidUpgType = errors.New("invalid upgrade type")
 )
 
-func startSocket(ctx context.Context, dev *infinitime.Device) error {
+func startSocket(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
 	// Make socket directory if non-existant
-	err := os.MkdirAll(filepath.Dir(k.String("socket.path")), 0755)
+	err := os.MkdirAll(filepath.Dir(k.String("socket.path")), 0o755)
 	if err != nil {
 		return err
 	}
@@ -62,32 +63,28 @@ func startSocket(ctx context.Context, dev *infinitime.Device) error {
 
 	fs, err := dev.FS()
 	if err != nil {
-		log.Warn().Err(err).Msg("Error getting BLE filesystem")
+		log.Warn("Error getting BLE filesystem").Err(err).Send()
 	}
 
-	srv := server.New()
+	mux := drpcmux.New()
 
-	itdAPI := &ITD{
-		dev: dev,
-	}
-	err = srv.Register(itdAPI)
+	err = rpc.DRPCRegisterITD(mux, &ITD{dev})
 	if err != nil {
 		return err
 	}
 
-	fsAPI := &FS{
-		dev: dev,
-		fs:  fs,
-	}
-	err = srv.Register(fsAPI)
+	err = rpc.DRPCRegisterFS(mux, &FS{dev, fs})
 	if err != nil {
 		return err
 	}
 
-	go srv.Serve(ctx, ln, codec.Default)
+	log.Info("Starting control socket").Str("path", k.String("socket.path")).Send()
 
-	// Log socket start
-	log.Info().Str("path", k.String("socket.path")).Msg("Started control socket")
+	wg.Add(1)
+	go func() {
+		defer wg.Done("socket")
+		muxserver.New(mux).Serve(ctx, ln)
+	}()
 
 	return nil
 }
@@ -96,159 +93,153 @@ type ITD struct {
 	dev *infinitime.Device
 }
 
-func (i *ITD) HeartRate(_ *server.Context) (uint8, error) {
-	return i.dev.HeartRate()
+func (i *ITD) HeartRate(_ context.Context, _ *rpc.Empty) (*rpc.IntResponse, error) {
+	hr, err := i.dev.HeartRate()
+	return &rpc.IntResponse{Value: uint32(hr)}, err
 }
 
-func (i *ITD) WatchHeartRate(ctx *server.Context) error {
-	ch, err := ctx.MakeChannel()
+func (i *ITD) WatchHeartRate(_ *rpc.Empty, s rpc.DRPCITD_WatchHeartRateStream) error {
+	heartRateCh, err := i.dev.WatchHeartRate(s.Context())
 	if err != nil {
 		return err
 	}
 
-	heartRateCh, err := i.dev.WatchHeartRate(ctx)
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		// For every heart rate value
-		for heartRate := range heartRateCh {
-			ch <- heartRate
-		}
-	}()
-
-	return nil
-}
-
-func (i *ITD) BatteryLevel(_ *server.Context) (uint8, error) {
-	return i.dev.BatteryLevel()
-}
-
-func (i *ITD) WatchBatteryLevel(ctx *server.Context) error {
-	ch, err := ctx.MakeChannel()
-	if err != nil {
-		return err
-	}
-
-	battLevelCh, err := i.dev.WatchBatteryLevel(ctx)
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		// For every heart rate value
-		for battLevel := range battLevelCh {
-			ch <- battLevel
-		}
-	}()
-
-	return nil
-}
-
-func (i *ITD) Motion(_ *server.Context) (infinitime.MotionValues, error) {
-	return i.dev.Motion()
-}
-
-func (i *ITD) WatchMotion(ctx *server.Context) error {
-	ch, err := ctx.MakeChannel()
-	if err != nil {
-		return err
-	}
-
-	motionValsCh, err := i.dev.WatchMotion(ctx)
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		// For every heart rate value
-		for motionVals := range motionValsCh {
-			ch <- motionVals
-		}
-	}()
-
-	return nil
-}
-
-func (i *ITD) StepCount(_ *server.Context) (uint32, error) {
-	return i.dev.StepCount()
-}
-
-func (i *ITD) WatchStepCount(ctx *server.Context) error {
-	ch, err := ctx.MakeChannel()
-	if err != nil {
-		return err
-	}
-
-	stepCountCh, err := i.dev.WatchStepCount(ctx)
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		// For every heart rate value
-		for stepCount := range stepCountCh {
-			ch <- stepCount
-		}
-	}()
-
-	return nil
-}
-
-func (i *ITD) Version(_ *server.Context) (string, error) {
-	return i.dev.Version()
-}
-
-func (i *ITD) Address(_ *server.Context) string {
-	return i.dev.Address()
-}
-
-func (i *ITD) Notify(_ *server.Context, data api.NotifyData) error {
-	return i.dev.Notify(data.Title, data.Body)
-}
-
-func (i *ITD) SetTime(_ *server.Context, t *time.Time) error {
-	return i.dev.SetTime(*t)
-}
-
-func (i *ITD) WeatherUpdate(_ *server.Context) {
-	sendWeatherCh <- struct{}{}
-}
-
-func (i *ITD) FirmwareUpgrade(ctx *server.Context, reqData api.FwUpgradeData) error {
-	i.dev.DFU.Reset()
-
-	switch reqData.Type {
-	case api.UpgradeTypeArchive:
-		// If less than one file, return error
-		if len(reqData.Files) < 1 {
-			return ErrDFUNotEnoughFiles
-		}
-		// If file is not zip archive, return error
-		if filepath.Ext(reqData.Files[0]) != ".zip" {
-			return ErrDFUInvalidFile
-		}
-		// Load DFU archive
-		err := i.dev.DFU.LoadArchive(reqData.Files[0])
+	for heartRate := range heartRateCh {
+		err = s.Send(&rpc.IntResponse{Value: uint32(heartRate)})
 		if err != nil {
 			return err
 		}
-	case api.UpgradeTypeFiles:
+	}
+
+	return nil
+}
+
+func (i *ITD) BatteryLevel(_ context.Context, _ *rpc.Empty) (*rpc.IntResponse, error) {
+	bl, err := i.dev.BatteryLevel()
+	return &rpc.IntResponse{Value: uint32(bl)}, err
+}
+
+func (i *ITD) WatchBatteryLevel(_ *rpc.Empty, s rpc.DRPCITD_WatchBatteryLevelStream) error {
+	battLevelCh, err := i.dev.WatchBatteryLevel(s.Context())
+	if err != nil {
+		return err
+	}
+
+	for battLevel := range battLevelCh {
+		err = s.Send(&rpc.IntResponse{Value: uint32(battLevel)})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (i *ITD) Motion(_ context.Context, _ *rpc.Empty) (*rpc.MotionResponse, error) {
+	motionVals, err := i.dev.Motion()
+	return &rpc.MotionResponse{
+		X: int32(motionVals.X),
+		Y: int32(motionVals.Y),
+		Z: int32(motionVals.Z),
+	}, err
+}
+
+func (i *ITD) WatchMotion(_ *rpc.Empty, s rpc.DRPCITD_WatchMotionStream) error {
+	motionValsCh, err := i.dev.WatchMotion(s.Context())
+	if err != nil {
+		return err
+	}
+
+	for motionVals := range motionValsCh {
+		err = s.Send(&rpc.MotionResponse{
+			X: int32(motionVals.X),
+			Y: int32(motionVals.Y),
+			Z: int32(motionVals.Z),
+		})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (i *ITD) StepCount(_ context.Context, _ *rpc.Empty) (*rpc.IntResponse, error) {
+	sc, err := i.dev.StepCount()
+	return &rpc.IntResponse{Value: sc}, err
+}
+
+func (i *ITD) WatchStepCount(_ *rpc.Empty, s rpc.DRPCITD_WatchStepCountStream) error {
+	stepCountCh, err := i.dev.WatchStepCount(s.Context())
+	if err != nil {
+		return err
+	}
+
+	for stepCount := range stepCountCh {
+		err = s.Send(&rpc.IntResponse{Value: stepCount})
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (i *ITD) Version(_ context.Context, _ *rpc.Empty) (*rpc.StringResponse, error) {
+	v, err := i.dev.Version()
+	return &rpc.StringResponse{Value: v}, err
+}
+
+func (i *ITD) Address(_ context.Context, _ *rpc.Empty) (*rpc.StringResponse, error) {
+	return &rpc.StringResponse{Value: i.dev.Address()}, nil
+}
+
+func (i *ITD) Notify(_ context.Context, data *rpc.NotifyRequest) (*rpc.Empty, error) {
+	return &rpc.Empty{}, i.dev.Notify(data.Title, data.Body)
+}
+
+func (i *ITD) SetTime(_ context.Context, data *rpc.SetTimeRequest) (*rpc.Empty, error) {
+	return &rpc.Empty{}, i.dev.SetTime(time.Unix(0, data.UnixNano))
+}
+
+func (i *ITD) WeatherUpdate(context.Context, *rpc.Empty) (*rpc.Empty, error) {
+	sendWeatherCh <- struct{}{}
+	return &rpc.Empty{}, nil
+}
+
+func (i *ITD) FirmwareUpgrade(data *rpc.FirmwareUpgradeRequest, s rpc.DRPCITD_FirmwareUpgradeStream) error {
+	i.dev.DFU.Reset()
+
+	switch data.Type {
+	case rpc.FirmwareUpgradeRequest_Archive:
+		// If less than one file, return error
+		if len(data.Files) < 1 {
+			return ErrDFUNotEnoughFiles
+		}
+		// If file is not zip archive, return error
+		if filepath.Ext(data.Files[0]) != ".zip" {
+			return ErrDFUInvalidFile
+		}
+		// Load DFU archive
+		err := i.dev.DFU.LoadArchive(data.Files[0])
+		if err != nil {
+			return err
+		}
+	case rpc.FirmwareUpgradeRequest_Files:
 		// If less than two files, return error
-		if len(reqData.Files) < 2 {
+		if len(data.Files) < 2 {
 			return ErrDFUNotEnoughFiles
 		}
 		// If first file is not init packet, return error
-		if filepath.Ext(reqData.Files[0]) != ".dat" {
+		if filepath.Ext(data.Files[0]) != ".dat" {
 			return ErrDFUInvalidFile
 		}
 		// If second file is not firmware image, return error
-		if filepath.Ext(reqData.Files[1]) != ".bin" {
+		if filepath.Ext(data.Files[1]) != ".bin" {
 			return ErrDFUInvalidFile
 		}
 		// Load individual DFU files
-		err := i.dev.DFU.LoadFiles(reqData.Files[0], reqData.Files[1])
+		err := i.dev.DFU.LoadFiles(data.Files[0], data.Files[1])
 		if err != nil {
 			return err
 		}
@@ -256,34 +247,27 @@ func (i *ITD) FirmwareUpgrade(ctx *server.Context, reqData api.FwUpgradeData) er
 		return ErrDFUInvalidUpgType
 	}
 
-	ch, err := ctx.MakeChannel()
-	if err != nil {
-		return err
-	}
-
 	go func() {
-		// For every progress event
 		for event := range i.dev.DFU.Progress() {
-			ch <- event
+			_ = s.Send(&rpc.DFUProgress{
+				Sent:     int64(event.Sent),
+				Recieved: int64(event.Received),
+				Total:    event.Total,
+			})
 		}
 
 		firmwareUpdating = false
-		// Send zero object to signal completion
-		close(ch)
 	}()
 
 	// Set firmwareUpdating
 	firmwareUpdating = true
 
-	go func() {
-		// Start DFU
-		err := i.dev.DFU.Start()
-		if err != nil {
-			log.Error().Err(err).Msg("Error while upgrading firmware")
-			firmwareUpdating = false
-			return
-		}
-	}()
+	// Start DFU
+	err := i.dev.DFU.Start()
+	if err != nil {
+		firmwareUpdating = false
+		return err
+	}
 
 	return nil
 }
@@ -293,60 +277,82 @@ type FS struct {
 	fs  *blefs.FS
 }
 
-func (fs *FS) Remove(_ *server.Context, paths []string) error {
+func (fs *FS) RemoveAll(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
 	fs.updateFS()
-	for _, path := range paths {
+	for _, path := range req.Paths {
+		err := fs.fs.RemoveAll(path)
+		if err != nil {
+			return &rpc.Empty{}, err
+		}
+	}
+	return &rpc.Empty{}, nil
+}
+
+func (fs *FS) Remove(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
+	fs.updateFS()
+	for _, path := range req.Paths {
 		err := fs.fs.Remove(path)
 		if err != nil {
-			return err
+			return &rpc.Empty{}, err
 		}
 	}
-	return nil
+	return &rpc.Empty{}, nil
 }
 
-func (fs *FS) Rename(_ *server.Context, paths [2]string) error {
+func (fs *FS) Rename(_ context.Context, req *rpc.RenameRequest) (*rpc.Empty, error) {
 	fs.updateFS()
-	return fs.fs.Rename(paths[0], paths[1])
+	return &rpc.Empty{}, fs.fs.Rename(req.From, req.To)
 }
 
-func (fs *FS) Mkdir(_ *server.Context, paths []string) error {
+func (fs *FS) MkdirAll(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
 	fs.updateFS()
-	for _, path := range paths {
+	for _, path := range req.Paths {
+		err := fs.fs.MkdirAll(path)
+		if err != nil {
+			return &rpc.Empty{}, err
+		}
+	}
+	return &rpc.Empty{}, nil
+}
+
+func (fs *FS) Mkdir(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
+	fs.updateFS()
+	for _, path := range req.Paths {
 		err := fs.fs.Mkdir(path)
 		if err != nil {
-			return err
+			return &rpc.Empty{}, err
 		}
 	}
-	return nil
+	return &rpc.Empty{}, nil
 }
 
-func (fs *FS) ReadDir(_ *server.Context, dir string) ([]api.FileInfo, error) {
+func (fs *FS) ReadDir(_ context.Context, req *rpc.PathRequest) (*rpc.DirResponse, error) {
 	fs.updateFS()
 
-	entries, err := fs.fs.ReadDir(dir)
+	entries, err := fs.fs.ReadDir(req.Path)
 	if err != nil {
 		return nil, err
 	}
-	var fileInfo []api.FileInfo
+	var fileInfo []*rpc.FileInfo
 	for _, entry := range entries {
 		info, err := entry.Info()
 		if err != nil {
 			return nil, err
 		}
-		fileInfo = append(fileInfo, api.FileInfo{
+		fileInfo = append(fileInfo, &rpc.FileInfo{
 			Name:  info.Name(),
 			Size:  info.Size(),
 			IsDir: info.IsDir(),
 		})
 	}
 
-	return fileInfo, nil
+	return &rpc.DirResponse{Entries: fileInfo}, nil
 }
 
-func (fs *FS) Upload(ctx *server.Context, paths [2]string) error {
+func (fs *FS) Upload(req *rpc.TransferRequest, s rpc.DRPCFS_UploadStream) error {
 	fs.updateFS()
 
-	localFile, err := os.Open(paths[1])
+	localFile, err := os.Open(req.Source)
 	if err != nil {
 		return err
 	}
@@ -356,70 +362,84 @@ func (fs *FS) Upload(ctx *server.Context, paths [2]string) error {
 		return err
 	}
 
-	remoteFile, err := fs.fs.Create(paths[0], uint32(localInfo.Size()))
+	remoteFile, err := fs.fs.Create(req.Destination, uint32(localInfo.Size()))
 	if err != nil {
 		return err
 	}
 
-	ch, err := ctx.MakeChannel()
-	if err != nil {
-		return err
-	}
 	go func() {
 		// For every progress event
 		for sent := range remoteFile.Progress() {
-			ch <- api.FSTransferProgress{
+			_ = s.Send(&rpc.TransferProgress{
 				Total: remoteFile.Size(),
 				Sent:  sent,
-			}
+			})
 		}
-
-		// Send zero object to signal completion
-		close(ch)
 	}()
 
-	go func() {
-		io.Copy(remoteFile, localFile)
-		localFile.Close()
-		remoteFile.Close()
-	}()
+	io.Copy(remoteFile, localFile)
+	localFile.Close()
+	remoteFile.Close()
 
 	return nil
 }
 
-func (fs *FS) Download(ctx *server.Context, paths [2]string) error {
+func (fs *FS) Download(req *rpc.TransferRequest, s rpc.DRPCFS_DownloadStream) error {
 	fs.updateFS()
 
-	localFile, err := os.Create(paths[0])
+	localFile, err := os.Create(req.Destination)
 	if err != nil {
 		return err
 	}
 
-	remoteFile, err := fs.fs.Open(paths[1])
+	remoteFile, err := fs.fs.Open(req.Source)
 	if err != nil {
 		return err
 	}
 
-	ch, err := ctx.MakeChannel()
-	if err != nil {
-		return err
-	}
+	defer localFile.Close()
+	defer remoteFile.Close()
+
 	go func() {
 		// For every progress event
 		for sent := range remoteFile.Progress() {
-			ch <- api.FSTransferProgress{
+			_ = s.Send(&rpc.TransferProgress{
 				Total: remoteFile.Size(),
 				Sent:  sent,
-			}
+			})
 		}
-
-		// Send zero object to signal completion
-		close(ch)
-		localFile.Close()
-		remoteFile.Close()
 	}()
 
-	go io.Copy(localFile, remoteFile)
+	_, err = io.Copy(localFile, remoteFile)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (fs *FS) LoadResources(req *rpc.PathRequest, s rpc.DRPCFS_LoadResourcesStream) error {
+	resFl, err := os.Open(req.Path)
+	if err != nil {
+		return err
+	}
+
+	progCh, err := infinitime.LoadResources(resFl, fs.fs)
+	if err != nil {
+		return err
+	}
+
+	for evt := range progCh {
+		err = s.Send(&rpc.ResourceLoadProgress{
+			Name:      evt.Name,
+			Total:     evt.Total,
+			Sent:      evt.Sent,
+			Operation: rpc.ResourceLoadProgress_Operation(evt.Operation),
+		})
+		if err != nil {
+			return err
+		}
+	}
 
 	return nil
 }
@@ -429,7 +449,7 @@ func (fs *FS) updateFS() {
 		// Get new FS
 		newFS, err := fs.dev.FS()
 		if err != nil {
-			log.Warn().Err(err).Msg("Error updating BLE filesystem")
+			log.Warn("Error updating BLE filesystem").Err(err).Send()
 		} else {
 			// Set FS pointer to new FS
 			fs.fs = newFS

translit/chinese.go

@@ -35,8 +35,6 @@ func (ct *ChineseTranslit) Transliterate(s string) string {
 				// Reset temporary buffer
 				tmpBuf.Reset()
 			}
-			// Write character to output
-			outBuf.WriteRune(char)
 		}
 	}
 	// If buffer contains characters

translit/translit_test.go

@@ -0,0 +1,47 @@
+package translit
+
+import "testing"
+
+func TestTransliterate(t *testing.T) {
+	type testCase struct {
+		name     string
+		input    string
+		expected string
+	}
+
+	cases := []testCase{
+		{"eASCII", "œª°«»", `oeao""`},
+		{"Scandinavian", "ÆæØøÅå", "AeaeOeoeAaaa"},
+		{"German", "äöüÄÖÜßẞ", "aeoeueAeOeUessSS"},
+		{"Hebrew", "אבגדהוזחטיכלמנסעפצקרשתףץךםן", "abgdhuzkhtyclmns'ptskrshthftschmn"},
+		{"Greek", "αάβγδεέζηήθιίϊΐκλμνξοόπρσςτυύϋΰφχψωώΑΆΒΓΔΕΈΖΗΉΘΙΊΪΚΛΜΝΞΟΌΠΡΣΤΥΎΫΦΧΨΩΏ", "aavgdeeziithiiiiklmnksooprsstyyyyfchpsooAABGDEEZIIThIIIKLMNKsOOPRSTYYYFChPsOO"},
+		{"Russian", "Ёё", "Йoйo"},
+		{"Ukranian", "ґєіїҐЄІЇ", "ghjeijiGhJeIJI"},
+		{"Arabic", "ابتثجحخدذرزسشصضطظعغفقكلمنهويىﺓآئإؤأء٠١٢٣٤٥٦٧٨٩", "abtthj75dthrzssh99'66'33'fqklmnhwya2222220123456789"},
+		{"Farsi", "پچژکگی\u200c؟٪؛،۱۲۳۴۵۶۷۸۹۰»«َُِّ", "pchzhkgy ?%;:1234567890<>eao"},
+		{"Polish", "Łł", "Ll"},
+		{"Lithuanian", "ąčęėįšųūž", "aceeisuuz"},
+		{"Estonian", "äÄöõÖÕüÜ", "aAooOOuU"},
+		{"Icelandic", "ÞþÐð", "ThthDd"},
+		{"Czech", "řěýáíéóúůďťň", "reyaieouudtn"},
+		{"French", "àâéèêëùüÿç", "aaeeeeuuyc"},
+		{"Romanian", "ăĂâÂîÎșȘțȚşŞţŢ„”", `aAaAiIsStTsStT""`},
+		{
+			"Emoji",
+			"😂🤣😊☺️😌😃😁😋😛😜🙃😎😶😩😕😏💜💖💗❤️💕💞💘💓💚💙💟❣️💔😱😮😯😝🤔😔😍😘😚😙👍👌🤞✌️🌄🌞🤗🌻🥱🙄🔫🥔😬✨🌌💀😅😢💯🔥😉😴💤",
+			`XDXD:):):):D:D:P:P;P(:8):#-_-:(:‑J<3<3<3<3<3<3<3<3<3<3<3<3!</3D::O:OxP',:-|:|:*:*:*:*:thumbsup::ok_hand::crossed_fingers::victory_hand::sunrise_over_mountains::sun_with_face::hugging_face::sunflower::yawning_face::face_with_rolling_eyes::gun::potato::E******8-X':D:'(:100::fire:;):zzz::zzz:`,
+		},
+		{"Korean", "\ucc2c\ubbf8\ub97c \uc637\uc744 \uc5bc\ub9c8\ub098 \ud48d\ubd80\ud558\uac8c \uccad\ucd98\uc774 \uc5ed\uc0ac\ub97c", "chanmireul oteul eolmana pungbuhage cheongchuni yeoksareul"},
+		{"Chinese", "\u81e8\u8cc7\u601d\u7531\u554f\u805e\u907f\u6c5a\u81f3\u5c0e\u524d\u99ac\u59cb\u4e00\u79fb\u3002", "lin zi si you wen wen bi wu zhi dao qian ma shi yi yi"},
+		{"Armenian", "\u0531\u0532\u0533\u0534\u0535\u0536\u0537\u0538\u0539\u053a\u053b\u053c\u053d\u053e\u053f\u0540\u0541\u0542\u0543\u0544\u0545\u0546\u0547\u0548\u0549\u054a\u054b\u054c\u054d\u054e\u054f\u0550\u0551\u0552\u0553\u0554\u0555\u0556\u0561\u0562\u0563\u0564\u0565\u0566\u0567\u0568\u0569\u056a\u056b\u056c\u056d\u056e\u056f\u0570\u0571\u0572\u0573\u0574\u0575\u0576\u0577\u0578\u0579\u057a\u057b\u057c\u057d\u057e\u057f\u0580\u0581\u0582\u0583\u0584\u0585\u0586\u0587", "ABGDEZEYTJILXCKHDzXCMYNShVoChPJRSVTRCPQOFabgdezeytjilxckhdzxcmynsochpjrsvtrcpqofev"},
+	}
+
+	for _, tCase := range cases {
+		t.Run(tCase.name, func(t *testing.T) {
+			out := Transliterate(tCase.input, tCase.name)
+			if out != tCase.expected {
+				t.Errorf("Expected %q, got %q", tCase.expected, out)
+			}
+		})
+	}
+}

version.go

@@ -0,0 +1,8 @@
+package main
+
+import _ "embed"
+
+//go:generate scripts/gen-version.sh
+
+//go:embed version.txt
+var version string

waitgroup.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"sync"
+
+	"go.arsenm.dev/logger/log"
+)
+
+type WaitGroup struct {
+	*sync.WaitGroup
+}
+
+func (wg WaitGroup) Done(c string) {
+	log.Info("Component stopped").Str("name", c).Send()
+	wg.WaitGroup.Done()
+}

weather.go

@@ -9,11 +9,12 @@ import (
 	"net/url"
 	"strconv"
 	"strings"
+
 	"time"
 
-	"github.com/rs/zerolog/log"
 	"go.arsenm.dev/infinitime"
 	"go.arsenm.dev/infinitime/weather"
+	"go.arsenm.dev/logger/log"
 )
 
 // METResponse represents a response from
@@ -61,7 +62,14 @@ type OSMData []struct {
 
 var sendWeatherCh = make(chan struct{}, 1)
 
-func initWeather(ctx context.Context, dev *infinitime.Device) error {
+func sleepCtx(ctx context.Context, d time.Duration) {
+	select {
+	case <-time.After(d):
+	case <-ctx.Done():
+	}
+}
+
+func initWeather(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
 	if !k.Bool("weather.enabled") {
 		return nil
 	}
@@ -74,14 +82,21 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 
 	timer := time.NewTimer(time.Hour)
 
+	wg.Add(1)
 	go func() {
+		defer wg.Done("weather")
 		for {
+			_, ok := <-ctx.Done()
+			if !ok {
+				return
+			}
+
 			// Attempt to get weather
 			data, err := getWeather(ctx, lat, lon)
 			if err != nil {
-				log.Warn().Err(err).Msg("Error getting weather data")
+				log.Warn("Error getting weather data").Err(err).Send()
 				// Wait 15 minutes before retrying
-				time.Sleep(15 * time.Minute)
+				sleepCtx(ctx, 15*time.Minute)
 				continue
 			}
 
@@ -99,7 +114,7 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 				DewPoint:    int16(round(currentData.DewPoint)),
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("Error adding temperature event")
+				log.Error("Error adding temperature event").Err(err).Send()
 			}
 
 			// Add precipitation event
@@ -112,7 +127,7 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 				Amount: uint8(round(current.Data.NextHour.Details.PrecipitationAmount)),
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("Error adding precipitation event")
+				log.Error("Error adding precipitation event").Err(err).Send()
 			}
 
 			// Add wind event
@@ -127,7 +142,7 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 				DirectionMax: uint8(round(currentData.WindDirection)),
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("Error adding wind event")
+				log.Error("Error adding wind event").Err(err).Send()
 			}
 
 			// Add cloud event
@@ -139,7 +154,7 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 				Amount: uint8(round(currentData.CloudAreaFraction)),
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("Error adding clouds event")
+				log.Error("Error adding clouds event").Err(err).Send()
 			}
 
 			// Add humidity event
@@ -151,7 +166,7 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 				Humidity: uint8(round(currentData.RelativeHumidity)),
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("Error adding humidity event")
+				log.Error("Error adding humidity event").Err(err).Send()
 			}
 
 			// Add pressure event
@@ -163,7 +178,7 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 				Pressure: int16(round(currentData.AirPressure)),
 			})
 			if err != nil {
-				log.Error().Err(err).Msg("Error adding pressure event")
+				log.Error("Error adding pressure event").Err(err).Send()
 			}
 
 			// Reset timer to 1 hour
@@ -174,6 +189,8 @@ func initWeather(ctx context.Context, dev *infinitime.Device) error {
 			select {
 			case <-timer.C:
 			case <-sendWeatherCh:
+			case <-ctx.Done():
+				return
 			}
 		}
 	}()