.github/FUNDING.yml

@@ -1 +0,0 @@
-liberapay: Elara6331

.gitignore

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

.gitm.toml

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

.goreleaser.yaml

@@ -1,121 +0,0 @@
-before:
-  hooks:
-    - go generate
-    - go mod tidy
-builds:
-  - id: itd
-    env:
-      - CGO_ENABLED=0
-    binary: itd
-    goos:
-      - linux
-    goarch:
-      - 386
-      - amd64
-      - arm
-      - arm64
-      - riscv64
-    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
-    allow_different_binary_count: true
-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.elara.ws/Elara6331/itd'
-    maintainer: 'Elara Ivy <elara@elara.ws>'
-    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.elara.ws/Elara6331/itd'
-    description: "Companion daemon for the InfiniTime firmware on the PineTime smartwatch"
-    maintainers:
-      - 'Elara Ivy <elara@elara.ws>'
-    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: Elara6331
-    name: itd
-gitea_urls:
-  api: 'https://gitea.elara.ws/api/v1/'
-  download: 'https://gitea.elara.ws'
-  skip_tls_verify: false
-checksum:
-  name_template: 'checksums.txt'
-snapshot:
-  name_template: "{{ incpatch .Version }}-next"
-changelog:
-  sort: asc

.woodpecker.yml

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

Makefile

@@ -3,14 +3,14 @@ BIN_PREFIX = $(DESTDIR)$(PREFIX)/bin
 SERVICE_PREFIX = $(DESTDIR)$(PREFIX)/lib/systemd/user
 CFG_PREFIX = $(DESTDIR)/etc
 
-all: version.txt
+all: version
-	go build
+	go build $(GOFLAGS)
-	go build ./cmd/itctl
+	go build ./cmd/itctl $(GOFLAGS)
 
 clean:
 	rm -f itctl
 	rm -f itd
-	rm -f version.txt
+	printf "unknown" > version.txt
 
 install:
 	install -Dm755 ./itd $(BIN_PREFIX)/itd
@@ -24,7 +24,7 @@ uninstall:
 	rm $(SERVICE_PREFIX)/itd.service
 	rm $(CFG_PREFIX)/itd.toml
 
-version.txt:
+version:
-	go generate
+	printf "r%s.%s" "$(shell git rev-list --count HEAD)" "$(shell git rev-parse --short HEAD)" > version.txt
 
-.PHONY: all clean install uninstall
+.PHONY: all clean install uninstall version

README.md

@@ -1,17 +1,11 @@
 # ITD
 ## InfiniTime Daemon
 
-`itd` is a daemon that uses my infinitime [library](https://go.elara.ws/infinitime) to interact with the [PineTime](https://www.pine64.org/pinetime/) running [InfiniTime](https://infinitime.io).
+`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).
 
-[![status-badge](https://ci.elara.ws/api/badges/Elara6331/itd/status.svg)](https://ci.elara.ws/Elara6331/itd)
+[![Build status](https://ci.appveyor.com/api/projects/status/xgj5sobw76ndqaod?svg=true)](https://ci.appveyor.com/project/moussaelianarsen/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/)
+[![Binary downloads](https://img.shields.io/badge/download-binary-orange)](https://minio.arsenm.dev/minio/itd/)
-[![itd-bin AUR package](https://img.shields.io/aur/version/itd-bin?label=itd-bin&logo=archlinux)](https://aur.archlinux.org/packages/itd-bin/)
+[![AUR package](https://img.shields.io/aur/version/itd-git?label=itd-git&logo=archlinux)](https://aur.archlinux.org/packages/itd-git/)
-[![LURE badge for itd-git](https://lure.sh/pkg/default/itd-git/badge.svg)](https://lure.sh/pkg/default/itd-git)
-[![LURE badge for itd-bin](https://lure.sh/pkg/default/itd-bin/badge.svg)](https://lure.sh/pkg/default/itd-bin)
-
-This repository is part of the Software Heritage Archive:
-
-[![SWH](https://archive.softwareheritage.org/badge/swh:1:dir:1374aa47b5c0a0d636d6f9c69f77af5e5bae99b2/)](https://archive.softwareheritage.org/swh:1:dir:1374aa47b5c0a0d636d6f9c69f77af5e5bae99b2;origin=https://gitea.elara.ws/Elara6331/itd;visit=swh:1:snp:d2935acbc966dfe1b15c771927bb08b5fc2ec89f;anchor=swh:1:rev:395cded9758dccc020fcd5b666f83a62308c9ab7)
 
 ---
 
@@ -25,40 +19,59 @@ This repository is part of the Software Heritage Archive:
 - Set current time
 - Control socket
 - Firmware upgrades
-- Weather
-- BLE Filesystem
-- Navigation (PureMaps)
-- FUSE Filesystem
 
 ---
 
-### Installation
+### Socket
 
-Since ITD 0.0.7, packages are built and uploaded whenever a new release is created.
+This daemon creates a UNIX socket at `/tmp/itd/socket`. It allows you to directly control the daemon and, by extension, the connected watch.
 
-#### Arch Linux
+The socket accepts JSON requests. For example, sending a notification looks like this:
 
-Use the `itd-bin` or `itd-git` AUR packages.
+```json
+{"type": 5, "data": {"title": "title1", "body": "body1"}}
+```
 
-#### Debian/Ubuntu
+It will return a JSON response. A response can have 3 fields: `error`, `msg`, and `value`. Error is a boolean that signals whether an error was returned. If error is true, the msg field will contain the error. Value can contain any data and depends on what the request was.
 
-- Go to the [latest release](https://gitea.elara.ws/Elara6331/itd/releases/latest) and download the `.deb` package for your CPU architecture. You can find your architecture by running `uname -m` in the terminal.
+The various request types and their data requirements can be seen in `internal/types`. I can make separate docs for it if I get enough requests.
-- 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`
 
-#### Fedora
+---
 
-- Go to the [latest release](https://gitea.elara.ws/Elara6331/itd/releases/latest) and download the `.rpm` package for your CPU architecture. You can find your architecture by running `uname -m` in the terminal.
+### Transliteration
-- 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`
 
-#### Alpine (and postmarketOS)
+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.elara.ws/Elara6331/itd/releases/latest) and download the `.apk` package for your CPU architecture. You can find your architecture by running `uname -m` in the terminal.
+- eASCII
-- Run `sudo apk add --allow-untrusted <package>`, replacing `<package>` with the path to the downloaded file.
+- Scandinavian
-- Example: `sudo apk add --allow-untrusted ~/Downloads/itd-0.0.7-linux-aarch64.apk`
+- German
+- Hebrew
+- Greek
+- Russian
+- Ukranian
+- Arabic
+- Farsi
+- Polish
+- Lithuanian
+- Estonian
+- Icelandic
+- Czech
+- French
+- Armenian
+- Korean
+- Chinese
+- Romanian
+- Emoji
 
-Note: `--allow-untrusted` is required because ITD isn't part of a repository, and therefore is not signed.
+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:
+
+```toml
+[notifs.translit]
+    use = ["eASCII", "Russian", "Emoji"]
+    custom = [
+        "test", "replaced"
+    ]
+```
 
 ---
 
@@ -68,89 +81,77 @@ This daemon comes with a binary called `itctl` which uses the socket to control
 
 This is the `itctl` usage screen:
 ```
-NAME:
+Control the itd daemon for InfiniTime smartwatches
-   itctl - A new cli application
 
-USAGE:
+Usage:
-   itctl [global options] command [command options] [arguments...]
+  itctl [flags]
+  itctl [command]
 
-COMMANDS:
+Available Commands:
-   help            Display help screen for a command
+  firmware    Manage InfiniTime firmware
-   resources, res  Handle InfiniTime resource loading
+  get         Get information from InfiniTime
-   filesystem, fs  Perform filesystem operations on the PineTime
+  help        Help about any command
-   firmware, fw    Manage InfiniTime firmware
+  notify      Send notification to InfiniTime
-   get             Get information from InfiniTime
+  set         Set information on InfiniTime
-   notify          Send notification to InfiniTime
-   set             Set information on InfiniTime
-   update, upd     Update information on InfiniTime
-   watch           Watch a value for changes
 
-GLOBAL OPTIONS:
+Flags:
-   --socket-path value, -s value  Path to itd socket (default: "/tmp/itd/socket")
+  -h, --help                 help for itctl
+  -s, --socket-path string   Path to itd socket
+
+Use "itctl [command] --help" for more information about a command.
 ```
 
 ---
 
 ### `itgui`
 
-In `cmd/itgui`, there is a gui frontend to the socket of `itd`. It uses the [Fyne library](https://fyne.io/) for Go.
+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:
-
-#### Easy Installation
-
-The easiest way to install `itgui` is to use my other project, [LURE](https://gitea.elara.ws/Elara6331/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.elara.ws/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)
+![Info tab](https://i.imgur.com/okxG9EI.png)
 
-![Motion tab](cmd/itgui/screenshots/motion.png)
+![Notify tab](https://i.imgur.com/DrVhOAq.png)
 
-![Notify tab](cmd/itgui/screenshots/notify.png)
+![Set time tab](https://i.imgur.com/j9civeY.png)
 
-![FS tab](cmd/itgui/screenshots/fs.png)
+![Upgrade tab](https://i.imgur.com/1KY6fG4.png)
 
-![FS mkdir](cmd/itgui/screenshots/mkdir.png)
+![Upgrade in progress](https://i.imgur.com/w5qbWAw.png)
-
-![FS resource upload](cmd/itgui/screenshots/resources.png)
-
-![Time tab](cmd/itgui/screenshots/time.png)
-
-![Firmware tab](cmd/itgui/screenshots/firmware.png)
-
-![Upgrade in progress](cmd/itgui/screenshots/progress.png)
-
-![Metrics tab](cmd/itgui/screenshots/metrics.png)
 
 ---
 
-### Socket
+#### Interactive mode
 
-This daemon creates a UNIX socket at `/tmp/itd/socket`. It allows you to directly control the daemon and, by extension, the connected watch.
+Running `itctl` by itself will open interactive mode. It's essentially a shell where you can enter commands. For example:
 
-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)
+```
+$ itctl                        
+itctl> fw ver
+1.3.0
+itctl> get batt
+81%
+itctl> get heart
+92 BPM
+itctl> set time 2021-08-22T00:06:18-07:00
+itctl> set time now
+itctl> exit
+```
 
-The API description is located in the [`internal/rpc/itd.proto`](internal/rpc/itd.proto) file.
+---
+
+### Installation
+
+To install, install the go compiler and make. Usually, go is provided by a package either named `go` or `golang`, and make is usually provided by `make`. The go compiler must be version 1.16 or newer for the `io/fs` module.
+
+To install, run
+```shell
+make && sudo make install
+```
 
 ---
 

api/api.go

@@ -1,62 +1,117 @@
 package api
 
 import (
-	"io"
+	"context"
-	"net"
 
-	"go.elara.ws/drpc/muxconn"
+	"github.com/smallnest/rpcx/client"
-	"go.elara.ws/itd/internal/rpc"
+	"github.com/smallnest/rpcx/protocol"
-	"storj.io/drpc"
+	"github.com/vmihailenco/msgpack/v5"
+	"go.arsenm.dev/infinitime"
 )
 
 const DefaultAddr = "/tmp/itd/socket"
 
-// Client is a client for ITD's socket API
 type Client struct {
-	conn   drpc.Conn
+	itdClient client.XClient
-	client rpc.DRPCITDClient
+	itdCh     chan *protocol.Message
+	fsClient  client.XClient
+	fsCh      chan *protocol.Message
+	srvVals   map[string]chan interface{}
 }
 
-// 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)
+	d, err := client.NewPeer2PeerDiscovery("unix@"+sockPath, "")
 	if err != nil {
 		return nil, err
 	}
 
-	mconn, err := muxconn.New(conn)
+	out := &Client{}
-	if err != nil {
+
-		return nil, err
+	out.itdCh = make(chan *protocol.Message, 5)
+	out.itdClient = client.NewBidirectionalXClient(
+		"ITD",
+		client.Failtry,
+		client.RandomSelect,
+		d,
+		client.DefaultOption,
+		out.itdCh,
+	)
+
+	out.fsCh = make(chan *protocol.Message, 5)
+	out.fsClient = client.NewBidirectionalXClient(
+		"FS",
+		client.Failtry,
+		client.RandomSelect,
+		d,
+		client.DefaultOption,
+		out.fsCh,
+	)
+
+	out.srvVals = map[string]chan interface{}{}
+
+	go out.handleMessages(out.itdCh)
+	go out.handleMessages(out.fsCh)
+
+	return out, nil
+}
+
+func (c *Client) handleMessages(msgCh chan *protocol.Message) {
+	for msg := range msgCh {
+		_, ok := c.srvVals[msg.ServicePath]
+		if !ok {
+			c.srvVals[msg.ServicePath] = make(chan interface{}, 5)
+		}
+
+		//fmt.Printf("%+v\n", msg)
+
+		ch := c.srvVals[msg.ServicePath]
+
+		switch msg.ServiceMethod {
+		case "FSProgress":
+			var progress FSTransferProgress
+			msgpack.Unmarshal(msg.Payload, &progress)
+			ch <- progress
+		case "DFUProgress":
+			var progress infinitime.DFUProgress
+			msgpack.Unmarshal(msg.Payload, &progress)
+			ch <- progress
+		case "MotionSample":
+			var motionVals infinitime.MotionValues
+			msgpack.Unmarshal(msg.Payload, &motionVals)
+			ch <- motionVals
+		case "Done":
+			close(c.srvVals[msg.ServicePath])
+			delete(c.srvVals, msg.ServicePath)
+		default:
+			var value interface{}
+			msgpack.Unmarshal(msg.Payload, &value)
+			ch <- value
+		}
 	}
-
-	return &Client{
-		conn:   mconn,
-		client: rpc.NewDRPCITDClient(mconn),
-	}, nil
 }
 
-// NewFromConn returns a client that communicates
+func (c *Client) done(id string) error {
-// over the given connection.
+	return c.itdClient.Call(
-func NewFromConn(conn io.ReadWriteCloser) (*Client, error) {
+		context.Background(),
-	mconn, err := muxconn.New(conn)
+		"Done",
-	if err != nil {
+		id,
-		return nil, err
+		nil,
-	}
+	)
-
-	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()
+	err := c.itdClient.Close()
+	if err != nil {
+		return err
+	}
+
+	err = c.fsClient.Close()
+	if err != nil {
+		return err
+	}
+
+	close(c.itdCh)
+	close(c.fsCh)
+
+	return nil
 }

api/firmware.go

@@ -2,35 +2,39 @@ package api
 
 import (
 	"context"
+	"time"
 
-	"go.elara.ws/itd/internal/rpc"
+	"go.arsenm.dev/infinitime"
 )
 
-type DFUProgress struct {
+func (c *Client) FirmwareUpgrade(upgType UpgradeType, files ...string) (chan infinitime.DFUProgress, error) {
-	Sent     int64
+	var id string
-	Received int64
+	err := c.itdClient.Call(
-	Total    int64
+		context.Background(),
-	Err      error
+		"FirmwareUpgrade",
-}
+		FwUpgradeData{
-
+			Type:  upgType,
-func (c *Client) FirmwareUpgrade(ctx context.Context, upgType UpgradeType, files ...string) (chan DFUProgress, error) {
+			Files: files,
-	progressCh := make(chan DFUProgress, 5)
+		},
-	fc, err := c.client.FirmwareUpgrade(ctx, &rpc.FirmwareUpgradeRequest{
+		&id,
-		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 {
+	progressCh := make(chan infinitime.DFUProgress, 5)
-		return DFUProgress{
+	go func() {
-			Sent:     evt.Sent,
+		srvValCh, ok := c.srvVals[id]
-			Received: evt.Recieved,
+		for !ok {
-			Total:    evt.Total,
+			time.Sleep(100 * time.Millisecond)
-			Err:      err,
+			srvValCh, ok = c.srvVals[id]
 		}
-	})
+
+		for val := range srvValCh {
+			progressCh <- val.(infinitime.DFUProgress)
+		}
+		close(progressCh)
+	}()
 
 	return progressCh, nil
 }

api/fs.go

@@ -2,121 +2,100 @@ package api
 
 import (
 	"context"
-	"errors"
+	"time"
-	"io"
-
-	"go.elara.ws/itd/internal/rpc"
 )
 
-type FSClient struct {
+func (c *Client) Remove(paths ...string) error {
-	client rpc.DRPCFSClient
+	return c.fsClient.Call(
+		context.Background(),
+		"Remove",
+		paths,
+		nil,
+	)
 }
 
-func (c *FSClient) RemoveAll(ctx context.Context, paths ...string) error {
+func (c *Client) Rename(old, new string) error {
-	_, err := c.client.RemoveAll(ctx, &rpc.PathsRequest{Paths: paths})
+	return c.fsClient.Call(
-	return err
+		context.Background(),
+		"Remove",
+		[2]string{old, new},
+		nil,
+	)
 }
 
-func (c *FSClient) Remove(ctx context.Context, paths ...string) error {
+func (c *Client) Mkdir(paths ...string) error {
-	_, err := c.client.Remove(ctx, &rpc.PathsRequest{Paths: paths})
+	return c.fsClient.Call(
-	return err
+		context.Background(),
+		"Mkdir",
+		paths,
+		nil,
+	)
 }
 
-func (c *FSClient) Rename(ctx context.Context, old, new string) error {
+func (c *Client) ReadDir(dir string) (out []FileInfo, err error) {
-	_, err := c.client.Rename(ctx, &rpc.RenameRequest{
+	err = c.fsClient.Call(
-		From: old,
+		context.Background(),
-		To:   new,
+		"ReadDir",
-	})
+		dir,
-	return err
+		&out,
+	)
+	return
 }
 
-func (c *FSClient) MkdirAll(ctx context.Context, paths ...string) error {
+func (c *Client) Upload(dst, src string) (chan FSTransferProgress, error) {
-	_, err := c.client.MkdirAll(ctx, &rpc.PathsRequest{Paths: paths})
+	var id string
-	return err
+	err := c.fsClient.Call(
-}
+		context.Background(),
-
+		"Upload",
-func (c *FSClient) Mkdir(ctx context.Context, paths ...string) error {
+		[2]string{dst, src},
-	_, err := c.client.Mkdir(ctx, &rpc.PathsRequest{Paths: paths})
+		&id,
-	return err
+	)
-}
-
-func (c *FSClient) ReadDir(ctx context.Context, dir string) ([]FileInfo, error) {
-	res, err := c.client.ReadDir(ctx, &rpc.PathRequest{Path: dir})
 	if err != nil {
 		return nil, err
 	}
-	return convertEntries(res.Entries), nil
-}
 
-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)
-	tc, err := c.client.Upload(ctx, &rpc.TransferRequest{Source: src, Destination: dst})
+	go func() {
-	if err != nil {
+		srvValCh, ok := c.srvVals[id]
-		return nil, err
+		for !ok {
-	}
+			time.Sleep(100 * time.Millisecond)
-
+			srvValCh, ok = c.srvVals[id]
-	go fsRecvToChannel[rpc.TransferProgress](tc, progressCh, func(evt *rpc.TransferProgress, err error) FSTransferProgress {
-		return FSTransferProgress{
-			Sent:  evt.Sent,
-			Total: evt.Total,
-			Err:   err,
 		}
-	})
+
+		for val := range srvValCh {
+			progressCh <- val.(FSTransferProgress)
+		}
+		close(progressCh)
+	}()
 
 	return progressCh, nil
 }
 
-func (c *FSClient) Download(ctx context.Context, dst, src string) (chan FSTransferProgress, error) {
+func (c *Client) Download(dst, src string) (chan FSTransferProgress, error) {
-	progressCh := make(chan FSTransferProgress, 5)
+	var id string
-	tc, err := c.client.Download(ctx, &rpc.TransferRequest{Source: src, Destination: dst})
+	err := c.fsClient.Call(
+		context.Background(),
+		"Download",
+		[2]string{dst, src},
+		&id,
+	)
 	if err != nil {
 		return nil, err
 	}
 
-	go fsRecvToChannel[rpc.TransferProgress](tc, progressCh, func(evt *rpc.TransferProgress, err error) FSTransferProgress {
+	progressCh := make(chan FSTransferProgress, 5)
-		return FSTransferProgress{
+	go func() {
-			Sent:  evt.Sent,
+		srvValCh, ok := c.srvVals[id]
-			Total: evt.Total,
+		for !ok {
-			Err:   err,
+			time.Sleep(100 * time.Millisecond)
+			srvValCh, ok = c.srvVals[id]
 		}
-	})
+
+		for val := range srvValCh {
+			progressCh <- val.(FSTransferProgress)
+		}
+		close(progressCh)
+	}()
 
 	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,39 +3,65 @@ package api
 import (
 	"context"
 
-	"go.elara.ws/itd/internal/rpc"
+	"go.arsenm.dev/infinitime"
 )
 
-func (c *Client) HeartRate(ctx context.Context) (uint8, error) {
+func (c *Client) HeartRate() (out uint8, err error) {
-	res, err := c.client.HeartRate(ctx, &rpc.Empty{})
+	err = c.itdClient.Call(
-	return uint8(res.Value), err
+		context.Background(),
+		"HeartRate",
+		nil,
+		&out,
+	)
+	return
 }
 
-func (c *Client) BatteryLevel(ctx context.Context) (uint8, error) {
+func (c *Client) BatteryLevel() (out uint8, err error) {
-	res, err := c.client.BatteryLevel(ctx, &rpc.Empty{})
+	err = c.itdClient.Call(
-	return uint8(res.Value), err
+		context.Background(),
+		"BatteryLevel",
+		nil,
+		&out,
+	)
+	return
 }
 
-type MotionValues struct {
+func (c *Client) Motion() (out infinitime.MotionValues, err error) {
-	X, Y, Z int16
+	err = c.itdClient.Call(
+		context.Background(),
+		"Motion",
+		nil,
+		&out,
+	)
+	return
 }
 
-func (c *Client) Motion(ctx context.Context) (MotionValues, error) {
+func (c *Client) StepCount() (out uint32, err error) {
-	res, err := c.client.Motion(ctx, &rpc.Empty{})
+	err = c.itdClient.Call(
-	return MotionValues{int16(res.X), int16(res.Y), int16(res.Z)}, err
+		context.Background(),
+		"StepCount",
+		nil,
+		&out,
+	)
+	return
 }
 
-func (c *Client) StepCount(ctx context.Context) (out uint32, err error) {
+func (c *Client) Version() (out string, err error) {
-	res, err := c.client.StepCount(ctx, &rpc.Empty{})
+	err = c.itdClient.Call(
-	return res.Value, err
+		context.Background(),
+		"Version",
+		nil,
+		&out,
+	)
+	return
 }
 
-func (c *Client) Version(ctx context.Context) (out string, err error) {
+func (c *Client) Address() (out string, err error) {
-	res, err := c.client.Version(ctx, &rpc.Empty{})
+	err = c.itdClient.Call(
-	return res.Value, err
+		context.Background(),
-}
+		"Address",
-
+		nil,
-func (c *Client) Address(ctx context.Context) (out string, err error) {
+		&out,
-	res, err := c.client.Address(ctx, &rpc.Empty{})
+	)
-	return res.Value, err
+	return
 }

api/notify.go

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

api/resources.go

@@ -1,51 +0,0 @@
-package api
-
-import (
-	"context"
-
-	"go.elara.ws/itd/infinitime"
-	"go.elara.ws/itd/internal/rpc"
-)
-
-type ResourceOperation infinitime.ResourceOperation
-
-const (
-	ResourceRemove = infinitime.ResourceRemove
-	ResourceUpload = infinitime.ResourceUpload
-)
-
-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,11 +3,13 @@ package api
 import (
 	"context"
 	"time"
-
-	"go.elara.ws/itd/internal/rpc"
 )
 
-func (c *Client) SetTime(ctx context.Context, t time.Time) error {
+func (c *Client) SetTime(t time.Time) error {
-	_, err := c.client.SetTime(ctx, &rpc.SetTimeRequest{UnixNano: t.UnixNano()})
+	return c.itdClient.Call(
-	return err
+		context.Background(),
+		"SetTime",
+		t,
+		nil,
+	)
 }

api/types.go

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

api/update.go

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

api/watch.go

@@ -2,134 +2,143 @@ package api
 
 import (
 	"context"
+	"time"
 
-	"go.elara.ws/itd/internal/rpc"
+	"go.arsenm.dev/infinitime"
 )
 
-func (c *Client) WatchHeartRate(ctx context.Context) (<-chan uint8, error) {
+func (c *Client) WatchHeartRate() (<-chan uint8, func(), error) {
-	outCh := make(chan uint8, 2)
+	var id string
-	wc, err := c.client.WatchHeartRate(ctx, &rpc.Empty{})
+	err := c.itdClient.Call(
+		context.Background(),
+		"WatchHeartRate",
+		nil,
+		&id,
+	)
 	if err != nil {
-		return nil, err
+		return nil, nil, err
 	}
 
+	outCh := make(chan uint8, 2)
 	go func() {
-		defer close(outCh)
+		srvValCh, ok := c.srvVals[id]
+		for !ok {
+			time.Sleep(100 * time.Millisecond)
+			srvValCh, ok = c.srvVals[id]
+		}
 
-		var err error
+		for val := range srvValCh {
-		var evt *rpc.IntResponse
+			outCh <- val.(uint8)
-
-		for {
-			select {
-			case <-ctx.Done():
-				wc.Close()
-				return
-			default:
-				evt, err = wc.Recv()
-				if err != nil {
-					return
-				}
-			}
-
-			outCh <- uint8(evt.Value)
 		}
 	}()
 
-	return outCh, nil
+	doneFn := func() {
-}
+		c.done(id)
-
+		close(c.srvVals[id])
-func (c *Client) WatchBatteryLevel(ctx context.Context) (<-chan uint8, error) {
+		delete(c.srvVals, id)
-	outCh := make(chan uint8, 2)
-	wc, err := c.client.WatchBatteryLevel(ctx, &rpc.Empty{})
-	if err != nil {
-		return nil, err
 	}
 
+	return outCh, doneFn, nil
+}
+
+func (c *Client) WatchBatteryLevel() (<-chan uint8, func(), error) {
+	var id string
+	err := c.itdClient.Call(
+		context.Background(),
+		"WatchBatteryLevel",
+		nil,
+		&id,
+	)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	outCh := make(chan uint8, 2)
 	go func() {
-		defer close(outCh)
+		srvValCh, ok := c.srvVals[id]
+		for !ok {
+			time.Sleep(100 * time.Millisecond)
+			srvValCh, ok = c.srvVals[id]
+		}
 
-		var err error
+		for val := range srvValCh {
-		var evt *rpc.IntResponse
+			outCh <- val.(uint8)
-
-		for {
-			select {
-			case <-ctx.Done():
-				wc.Close()
-				return
-			default:
-				evt, err = wc.Recv()
-				if err != nil {
-					return
-				}
-			}
-
-			outCh <- uint8(evt.Value)
 		}
 	}()
 
-	return outCh, nil
+	doneFn := func() {
+		c.done(id)
+		close(c.srvVals[id])
+		delete(c.srvVals, id)
+	}
+
+	return outCh, doneFn, nil
 }
 
-func (c *Client) WatchStepCount(ctx context.Context) (<-chan uint32, error) {
+func (c *Client) WatchStepCount() (<-chan uint32, func(), error) {
+	var id string
+	err := c.itdClient.Call(
+		context.Background(),
+		"WatchStepCount",
+		nil,
+		&id,
+	)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	outCh := make(chan uint32, 2)
-	wc, err := c.client.WatchStepCount(ctx, &rpc.Empty{})
-	if err != nil {
-		return nil, err
-	}
-
 	go func() {
-		defer close(outCh)
+		srvValCh, ok := c.srvVals[id]
+		for !ok {
+			time.Sleep(100 * time.Millisecond)
+			srvValCh, ok = c.srvVals[id]
+		}
 
-		var err error
+		for val := range srvValCh {
-		var evt *rpc.IntResponse
+			outCh <- val.(uint32)
-
-		for {
-			select {
-			case <-ctx.Done():
-				wc.Close()
-				return
-			default:
-				evt, err = wc.Recv()
-				if err != nil {
-					return
-				}
-			}
-
-			outCh <- evt.Value
 		}
 	}()
 
-	return outCh, nil
+	doneFn := func() {
-}
+		c.done(id)
-
+		close(c.srvVals[id])
-func (c *Client) WatchMotion(ctx context.Context) (<-chan MotionValues, error) {
+		delete(c.srvVals, id)
-	outCh := make(chan MotionValues, 2)
-	wc, err := c.client.WatchMotion(ctx, &rpc.Empty{})
-	if err != nil {
-		return nil, err
 	}
 
+	return outCh, doneFn, nil
+}
+
+func (c *Client) WatchMotion() (<-chan infinitime.MotionValues, func(), error) {
+	var id string
+	err := c.itdClient.Call(
+		context.Background(),
+		"WatchMotion",
+		nil,
+		&id,
+	)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	outCh := make(chan infinitime.MotionValues, 2)
 	go func() {
-		defer close(outCh)
+		srvValCh, ok := c.srvVals[id]
+		for !ok {
+			time.Sleep(100 * time.Millisecond)
+			srvValCh, ok = c.srvVals[id]
+		}
 
-		var err error
+		for val := range srvValCh {
-		var evt *rpc.MotionResponse
+			outCh <- val.(infinitime.MotionValues)
-
-		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
+	doneFn := func() {
+		c.done(id)
+		close(c.srvVals[id])
+		delete(c.srvVals, id)
+	}
+
+	return outCh, doneFn, nil
 }

calls.go

@@ -1,23 +1,22 @@
 package main
 
 import (
-	"context"
+	"sync"
 
 	"github.com/godbus/dbus/v5"
-	"go.elara.ws/itd/infinitime"
+	"github.com/rs/zerolog/log"
-	"go.elara.ws/itd/internal/utils"
+	"gitea.arsenm.dev/Arsen6331/infinitime"
-	"go.elara.ws/logger/log"
 )
 
-func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+func initCallNotifs(dev *infinitime.Device) error {
 	// Connect to system bus. This connection is for method calls.
-	conn, err := utils.NewSystemBusConn(ctx)
+	conn, err := newSystemBusConn()
 	if err != nil {
 		return err
 	}
 
 	// Check if modem manager interface exists
-	exists, err := modemManagerExists(ctx, conn)
+	exists, err := modemManagerExists(conn)
 	if err != nil {
 		return err
 	}
@@ -29,7 +28,7 @@ func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) e
 	}
 
 	// Connect to system bus. This connection is for monitoring.
-	monitorConn, err := utils.NewSystemBusConn(ctx)
+	monitorConn, err := newSystemBusConn()
 	if err != nil {
 		return err
 	}
@@ -49,75 +48,62 @@ func initCallNotifs(ctx context.Context, wg WaitGroup, dev *infinitime.Device) e
 	// Notify channel upon received message
 	monitorConn.Eavesdrop(callCh)
 
+	var respHandlerOnce sync.Once
 	var callObj dbus.BusObject
 
-	wg.Add(1)
 	go func() {
-		defer wg.Done("callNotifs")
+		// For every message received
-		for {
+		for event := range callCh {
-			select {
+			// Get path to call object
-			case event := <-callCh:
+			callPath := event.Body[0].(dbus.ObjectPath)
-				// Get path to call object
+			// Get call object
-				callPath := event.Body[0].(dbus.ObjectPath)
+			callObj = conn.Object("org.freedesktop.ModemManager1", callPath)
-				// Get call object
-				callObj = conn.Object("org.freedesktop.ModemManager1", callPath)
 
-				// Get phone number from call object using method call connection
+			// Get phone number from call object using method call connection
-				phoneNum, err := getPhoneNum(conn, callObj)
+			phoneNum, err := getPhoneNum(conn, callObj)
-				if err != nil {
+			if err != nil {
-					log.Error("Error getting phone number").Err(err).Send()
+				log.Error().Err(err).Msg("Error getting phone number")
-					continue
+				continue
-				}
+			}
 
-				// Get direction of call object using method call connection
+			// Send call notification to InfiniTime
-				direction, err := getDirection(conn, callObj)
+			resCh, err := dev.NotifyCall(phoneNum)
-				if err != nil {
+			if err != nil {
-					log.Error("Error getting call direction").Err(err).Send()
+				continue
-					continue
+			}
-				}
 
-				if direction != MMCallDirectionIncoming {
+			go respHandlerOnce.Do(func() {
-					continue
+				// Wait for PineTime response
-				}
+				for res := range resCh {
-
+					switch res {
-				// Send call notification to InfiniTime
-				err = dev.NotifyCall(phoneNum, func(cs infinitime.CallStatus) {
-					switch cs {
 					case infinitime.CallStatusAccepted:
 						// Attempt to accept call
-						err = acceptCall(ctx, conn, callObj)
+						err = acceptCall(conn, callObj)
 						if err != nil {
-							log.Warn("Error accepting call").Err(err).Send()
+							log.Warn().Err(err).Msg("Error accepting call")
 						}
 					case infinitime.CallStatusDeclined:
 						// Attempt to decline call
-						err = declineCall(ctx, conn, callObj)
+						err = declineCall(conn, callObj)
 						if err != nil {
-							log.Warn("Error declining call").Err(err).Send()
+							log.Warn().Err(err).Msg("Error declining call")
 						}
 					case infinitime.CallStatusMuted:
 						// Warn about unimplemented muting
-						log.Warn("Muting calls is not implemented").Send()
+						log.Warn().Msg("Muting calls is not implemented")
 					}
-				})
-				if err != nil {
-					continue
 				}
-			case <-ctx.Done():
+			})
-				return
-			}
 		}
 	}()
 
-	log.Info("Relaying calls to InfiniTime").Send()
+	log.Info().Msg("Relaying calls to InfiniTime")
 	return nil
 }
 
-func modemManagerExists(ctx context.Context, conn *dbus.Conn) (bool, error) {
+func modemManagerExists(conn *dbus.Conn) (bool, error) {
 	var names []string
-	err := conn.BusObject().CallWithContext(
+	err := conn.BusObject().Call("org.freedesktop.DBus.ListNames", 0).Store(&names)
-		ctx, "org.freedesktop.DBus.ListNames", 0,
-	).Store(&names)
 	if err != nil {
 		return false, err
 	}
@@ -135,31 +121,10 @@ func getPhoneNum(conn *dbus.Conn, callObj dbus.BusObject) (string, error) {
 	return out, nil
 }
 
-type MMCallDirection int
-
-const (
-	MMCallDirectionUnknown MMCallDirection = iota
-	MMCallDirectionIncoming
-	MMCallDirectionOutgoing
-)
-
-// getDirection gets the direction of a call object using a DBus connection
-func getDirection(conn *dbus.Conn, callObj dbus.BusObject) (MMCallDirection, error) {
-	var out MMCallDirection
-	// Get number property on DBus object and store return value in out
-	err := callObj.StoreProperty("org.freedesktop.ModemManager1.Call.Direction", &out)
-	if err != nil {
-		return 0, err
-	}
-	return out, nil
-}
-
 // getPhoneNum accepts a call using a DBus connection
-func acceptCall(ctx context.Context, conn *dbus.Conn, callObj dbus.BusObject) error {
+func acceptCall(conn *dbus.Conn, callObj dbus.BusObject) error {
 	// Call Accept() method on DBus object
-	call := callObj.CallWithContext(
+	call := callObj.Call("org.freedesktop.ModemManager1.Call.Accept", 0)
-		ctx, "org.freedesktop.ModemManager1.Call.Accept", 0,
-	)
 	if call.Err != nil {
 		return call.Err
 	}
@@ -167,11 +132,9 @@ func acceptCall(ctx context.Context, conn *dbus.Conn, callObj dbus.BusObject) er
 }
 
 // getPhoneNum declines a call using a DBus connection
-func declineCall(ctx context.Context, conn *dbus.Conn, callObj dbus.BusObject) error {
+func declineCall(conn *dbus.Conn, callObj dbus.BusObject) error {
 	// Call Hangup() method on DBus object
-	call := callObj.CallWithContext(
+	call := callObj.Call("org.freedesktop.ModemManager1.Call.Hangup", 0)
-		ctx, "org.freedesktop.ModemManager1.Call.Hangup", 0,
-	)
 	if call.Err != nil {
 		return call.Err
 	}

cmd/itctl/firmware.go

@@ -7,25 +7,10 @@ import (
 
 	"github.com/cheggaaa/pb/v3"
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/itd/api"
+	"go.arsenm.dev/itd/api"
-	"go.elara.ws/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
@@ -43,7 +28,7 @@ func fwUpgrade(c *cli.Context) error {
 		return cli.Exit("Upgrade command requires either archive or init packet and firmware.", 1)
 	}
 
-	progress, err := client.FirmwareUpgrade(c.Context, upgType, abs(files)...)
+	progress, err := client.FirmwareUpgrade(upgType, abs(files)...)
 	if err != nil {
 		return err
 	}
@@ -54,10 +39,6 @@ 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
@@ -77,7 +58,7 @@ func fwUpgrade(c *cli.Context) error {
 }
 
 func fwVersion(c *cli.Context) error {
-	version, err := client.Version(c.Context)
+	version, err := client.Version()
 	if err != nil {
 		return err
 	}

cmd/itctl/fs.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -16,7 +17,7 @@ func fsList(c *cli.Context) error {
 		dirPath = c.Args().Get(0)
 	}
 
-	listing, err := client.FS().ReadDir(c.Context, dirPath)
+	listing, err := client.ReadDir(dirPath)
 	if err != nil {
 		return err
 	}
@@ -33,12 +34,7 @@ func fsMkdir(c *cli.Context) error {
 		return cli.Exit("Command mkdir requires one or more arguments", 1)
 	}
 
-	var err error
+	err := client.Mkdir(c.Args().Slice()...)
-	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
 	}
@@ -51,7 +47,7 @@ func fsMove(c *cli.Context) error {
 		return cli.Exit("Command move requires two arguments", 1)
 	}
 
-	err := client.FS().Rename(c.Context, c.Args().Get(0), c.Args().Get(1))
+	err := client.Rename(c.Args().Get(0), c.Args().Get(1))
 	if err != nil {
 		return err
 	}
@@ -68,7 +64,7 @@ func fsRead(c *cli.Context) error {
 	var path string
 	var err error
 	if c.Args().Get(1) == "-" {
-		tmpFile, err = os.CreateTemp("/tmp", "itctl.*")
+		tmpFile, err = ioutil.TempFile("/tmp", "itctl.*")
 		if err != nil {
 			return err
 		}
@@ -80,7 +76,7 @@ func fsRead(c *cli.Context) error {
 		}
 	}
 
-	progress, err := client.FS().Download(c.Context, path, c.Args().Get(0))
+	progress, err := client.Download(path, c.Args().Get(0))
 	if err != nil {
 		return err
 	}
@@ -91,10 +87,6 @@ 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
@@ -117,12 +109,7 @@ func fsRemove(c *cli.Context) error {
 		return cli.Exit("Command remove requires one or more arguments", 1)
 	}
 
-	var err error
+	err := client.Remove(c.Args().Slice()...)
-	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
 	}
@@ -139,7 +126,7 @@ func fsWrite(c *cli.Context) error {
 	var path string
 	var err error
 	if c.Args().Get(0) == "-" {
-		tmpFile, err = os.CreateTemp("/tmp", "itctl.*")
+		tmpFile, err = ioutil.TempFile("/tmp", "itctl.*")
 		if err != nil {
 			return err
 		}
@@ -157,7 +144,7 @@ func fsWrite(c *cli.Context) error {
 		defer os.Remove(path)
 	}
 
-	progress, err := client.FS().Upload(c.Context, c.Args().Get(1), path)
+	progress, err := client.Upload(c.Args().Get(1), path)
 	if err != nil {
 		return err
 	}
@@ -168,10 +155,6 @@ 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/get.go

@@ -9,7 +9,7 @@ import (
 )
 
 func getAddress(c *cli.Context) error {
-	address, err := client.Address(c.Context)
+	address, err := client.Address()
 	if err != nil {
 		return err
 	}
@@ -19,7 +19,7 @@ func getAddress(c *cli.Context) error {
 }
 
 func getBattery(c *cli.Context) error {
-	battLevel, err := client.BatteryLevel(c.Context)
+	battLevel, err := client.BatteryLevel()
 	if err != nil {
 		return err
 	}
@@ -30,7 +30,7 @@ func getBattery(c *cli.Context) error {
 }
 
 func getHeart(c *cli.Context) error {
-	heartRate, err := client.HeartRate(c.Context)
+	heartRate, err := client.HeartRate()
 	if err != nil {
 		return err
 	}
@@ -41,7 +41,7 @@ func getHeart(c *cli.Context) error {
 }
 
 func getMotion(c *cli.Context) error {
-	motionVals, err := client.Motion(c.Context)
+	motionVals, err := client.Motion()
 	if err != nil {
 		return err
 	}
@@ -60,7 +60,7 @@ func getMotion(c *cli.Context) error {
 }
 
 func getSteps(c *cli.Context) error {
-	stepCount, err := client.StepCount(c.Context)
+	stepCount, err := client.StepCount()
 	if err != nil {
 		return err
 	}

cmd/itctl/main.go

@@ -1,41 +1,23 @@
 package main
 
 import (
-	"context"
 	"os"
 	"os/signal"
 	"syscall"
-	"time"
 
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v2"
-	"go.elara.ws/itd/api"
+	"go.arsenm.dev/itd/api"
-	"go.elara.ws/logger"
-	"go.elara.ws/logger/log"
 )
 
 var client *api.Client
 
 func main() {
-	log.Logger = logger.NewPretty(os.Stderr)
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-
-	ctx := context.Background()
-	ctx, _ = signal.NotifyContext(
-		ctx,
-		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)
-		os.Exit(0)
-	}()
 
 	app := cli.App{
-		Name:            "itctl",
+		Name: "itctl",
-		HideHelpCommand: true,
 		Flags: []cli.Flag{
 			&cli.StringFlag{
 				Name:    "socket-path",
@@ -45,25 +27,6 @@ func main() {
 			},
 		},
 		Commands: []*cli.Command{
-			{
-				Name:      "help",
-				ArgsUsage: "<command>",
-				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",
 				Aliases: []string{"fs"},
@@ -77,13 +40,6 @@ 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",
@@ -104,13 +60,6 @@ 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"},
@@ -143,11 +92,6 @@ 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"},
@@ -277,13 +221,11 @@ func main() {
 			},
 		},
 		Before: func(c *cli.Context) error {
-			if !isHelpCmd() {
+			newClient, err := api.New(c.String("socket-path"))
-				newClient, err := api.New(c.String("socket-path"))
+			if err != nil {
-				if err != nil {
+				return err
-					return err
-				}
-				client = newClient
 			}
+			client = newClient
 			return nil
 		},
 		After: func(*cli.Context) error {
@@ -294,26 +236,22 @@ func main() {
 		},
 	}
 
-	err := app.RunContext(ctx, os.Args)
+	err := app.Run(os.Args)
 	if err != nil {
-		log.Fatal("Error while running app").Err(err).Send()
+		log.Fatal().Err(err).Msg("Error while running app")
 	}
 }
 
-func helpCmd(c *cli.Context) error {
+func catchSignal(fn func()) {
-	cmdArgs := append([]string{os.Args[0]}, c.Args().Slice()...)
+	sigCh := make(chan os.Signal, 1)
-	cmdArgs = append(cmdArgs, "-h")
+	signal.Notify(
-	return c.App.RunContext(c.Context, cmdArgs)
+		sigCh,
-}
+		syscall.SIGINT,
-
+		syscall.SIGTERM,
-func isHelpCmd() bool {
+	)
-	if len(os.Args) == 1 {
+	go func() {
-		return true
+		<-sigCh
-	}
+		fn()
-	for _, arg := range os.Args {
+		os.Exit(0)
-		if arg == "-h" || arg == "help" {
+	}()
-			return true
-		}
-	}
-	return false
 }

cmd/itctl/notify.go

@@ -8,7 +8,7 @@ func notify(c *cli.Context) error {
 		return cli.Exit("Command notify requires two arguments", 1)
 	}
 
-	err := client.Notify(c.Context, c.Args().Get(0), c.Args().Get(1))
+	err := client.Notify(c.Args().Get(0), c.Args().Get(1))
 	if err != nil {
 		return err
 	}

cmd/itctl/resources.go

@@ -1,57 +0,0 @@
-package main
-
-import (
-	"context"
-	"path/filepath"
-
-	"github.com/cheggaaa/pb/v3"
-	"github.com/urfave/cli/v2"
-	"go.elara.ws/itd/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.ResourceRemove {
-			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/itctl/set.go

@@ -13,12 +13,12 @@ func setTime(c *cli.Context) error {
 	}
 
 	if c.Args().Get(0) == "now" {
-		return client.SetTime(c.Context, time.Now())
+		return client.SetTime(time.Now())
 	} else {
 		parsed, err := time.Parse(time.RFC3339, c.Args().Get(0))
 		if err != nil {
 			return err
 		}
-		return client.SetTime(c.Context, parsed)
+		return client.SetTime(parsed)
 	}
 }

cmd/itctl/update.go

@@ -3,5 +3,5 @@ package main
 import "github.com/urfave/cli/v2"
 
 func updateWeather(c *cli.Context) error {
-	return client.WeatherUpdate(c.Context)
+	return client.WeatherUpdate()
 }

cmd/itctl/watch.go

@@ -9,100 +9,96 @@ import (
 )
 
 func watchHeart(c *cli.Context) error {
-	heartCh, err := client.WatchHeartRate(c.Context)
+	heartCh, cancel, err := client.WatchHeartRate()
 	if err != nil {
 		return err
 	}
 
-	for {
+	catchSignal(cancel)
-		select {
+
-		case heartRate := <-heartCh:
+	for heartRate := range heartCh {
-			if c.Bool("json") {
+		if c.Bool("json") {
-				json.NewEncoder(os.Stdout).Encode(
+			json.NewEncoder(os.Stdout).Encode(
-					map[string]uint8{"heartRate": heartRate},
+				map[string]uint8{"heartRate": heartRate},
-				)
+			)
-			} else if c.Bool("shell") {
+		} else if c.Bool("shell") {
-				fmt.Printf("HEART_RATE=%d\n", heartRate)
+			fmt.Printf("HEART_RATE=%d\n", heartRate)
-			} else {
+		} else {
-				fmt.Println(heartRate, "BPM")
+			fmt.Println(heartRate, "BPM")
-			}
-		case <-c.Done():
-			return nil
 		}
 	}
+
+	return nil
 }
 
 func watchBattLevel(c *cli.Context) error {
-	battLevelCh, err := client.WatchBatteryLevel(c.Context)
+	battLevelCh, cancel, err := client.WatchBatteryLevel()
 	if err != nil {
 		return err
 	}
 
-	for {
+	catchSignal(cancel)
-		select {
+
-		case battLevel := <-battLevelCh:
+	for battLevel := range battLevelCh {
-			if c.Bool("json") {
+		if c.Bool("json") {
-				json.NewEncoder(os.Stdout).Encode(
+			json.NewEncoder(os.Stdout).Encode(
-					map[string]uint8{"battLevel": battLevel},
+				map[string]uint8{"battLevel": battLevel},
-				)
+			)
-			} else if c.Bool("shell") {
+		} else if c.Bool("shell") {
-				fmt.Printf("BATTERY_LEVEL=%d\n", battLevel)
+			fmt.Printf("BATTERY_LEVEL=%d\n", battLevel)
-			} else {
+		} else {
-				fmt.Printf("%d%%\n", battLevel)
+			fmt.Printf("%d%%\n", battLevel)
-			}
-		case <-c.Done():
-			return nil
 		}
 	}
+
+	return nil
 }
 
 func watchStepCount(c *cli.Context) error {
-	stepCountCh, err := client.WatchStepCount(c.Context)
+	stepCountCh, cancel, err := client.WatchStepCount()
 	if err != nil {
 		return err
 	}
 
-	for {
+	catchSignal(cancel)
-		select {
+
-		case stepCount := <-stepCountCh:
+	for stepCount := range stepCountCh {
-			if c.Bool("json") {
+		if c.Bool("json") {
-				json.NewEncoder(os.Stdout).Encode(
+			json.NewEncoder(os.Stdout).Encode(
-					map[string]uint32{"stepCount": stepCount},
+				map[string]uint32{"stepCount": stepCount},
-				)
+			)
-			} else if c.Bool("shell") {
+		} else if c.Bool("shell") {
-				fmt.Printf("STEP_COUNT=%d\n", stepCount)
+			fmt.Printf("STEP_COUNT=%d\n", stepCount)
-			} else {
+		} else {
-				fmt.Println(stepCount, "Steps")
+			fmt.Println(stepCount, "Steps")
-			}
-		case <-c.Done():
-			return nil
 		}
 	}
+
+	return nil
 }
 
 func watchMotion(c *cli.Context) error {
-	motionCh, err := client.WatchMotion(c.Context)
+	motionCh, cancel, err := client.WatchMotion()
 	if err != nil {
 		return err
 	}
 
-	for {
+	catchSignal(cancel)
-		select {
+
-		case motionVals := <-motionCh:
+	for motionVals := range motionCh {
-			if c.Bool("json") {
+		if c.Bool("json") {
-				json.NewEncoder(os.Stdout).Encode(motionVals)
+			json.NewEncoder(os.Stdout).Encode(motionVals)
-			} else if c.Bool("shell") {
+		} else if c.Bool("shell") {
-				fmt.Printf(
+			fmt.Printf(
-					"X=%d\nY=%d\nZ=%d\n",
+				"X=%d\nY=%d\nZ=%d\n",
-					motionVals.X,
+				motionVals.X,
-					motionVals.Y,
+				motionVals.Y,
-					motionVals.Z,
+				motionVals.Z,
-				)
+			)
-			} else {
+		} else {
-				fmt.Println(motionVals)
+			fmt.Println(motionVals)
-			}
-		case <-c.Done():
-			return nil
 		}
 	}
+
+	return nil
 }

cmd/itgui/error.go

@@ -28,15 +28,10 @@ func guiErr(err error, msg string, fatal bool, parent fyne.Window) {
 	)
 	if err != nil {
 		// Create new label containing error text
-		errEntry := widget.NewEntry()
+		errLbl := widget.NewLabel(err.Error())
-		errEntry.SetText(err.Error())
-		// If text changed, change it back
-		errEntry.OnChanged = func(string) {
-			errEntry.SetText(err.Error())
-		}
 		// Create new dropdown containing error label
 		content.Add(widget.NewAccordion(
-			widget.NewAccordionItem("More Details", errEntry),
+			widget.NewAccordionItem("More Details", errLbl),
 		))
 	}
 	if fatal {
@@ -54,4 +49,5 @@ func guiErr(err error, msg string, fatal bool, parent fyne.Window) {
 		// Show error dialog
 		dialog.NewCustom("Error", "Ok", content, parent).Show()
 	}
+
 }

cmd/itgui/firmware.go

@@ -1,163 +0,0 @@
-package main
-
-import (
-	"context"
-
-	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/dialog"
-	"fyne.io/fyne/v2/layout"
-	"fyne.io/fyne/v2/storage"
-	"fyne.io/fyne/v2/widget"
-	"go.elara.ws/itd/api"
-)
-
-func firmwareTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject {
-	// Create select to chose between archive and files upgrade
-	typeSelect := widget.NewSelect([]string{"Archive", "Files"}, nil)
-	typeSelect.PlaceHolder = "Upgrade Type"
-
-	// Create map to store files
-	files := map[string]string{}
-
-	// Create and disable start button
-	startBtn := widget.NewButton("Start", nil)
-	startBtn.Disable()
-
-	// Create new file open dialog for archive
-	archiveDlg := dialog.NewFileOpen(func(uc fyne.URIReadCloser, err error) {
-		if err != nil || uc == nil {
-			return
-		}
-		defer uc.Close()
-		// Set archive path in map
-		files[".zip"] = uc.URI().Path()
-		// Enable start button
-		startBtn.Enable()
-	}, w)
-	// Only allow .zip files
-	archiveDlg.SetFilter(storage.NewExtensionFileFilter([]string{".zip"}))
-	// Create button to show dialog
-	archiveBtn := widget.NewButton("Select Archive (.zip)", archiveDlg.Show)
-
-	// Create new file open dialog for firmware image
-	imageDlg := dialog.NewFileOpen(func(uc fyne.URIReadCloser, err error) {
-		if err != nil || uc == nil {
-			return
-		}
-		defer uc.Close()
-
-		// Set firmware image path in map
-		files[".bin"] = uc.URI().Path()
-
-		// If the init packet was already selected
-		_, datOk := files[".dat"]
-		if datOk {
-			// Enable start button
-			startBtn.Enable()
-		}
-	}, w)
-	// Only allow .bin files
-	imageDlg.SetFilter(storage.NewExtensionFileFilter([]string{".bin"}))
-	// Create button to show dialog
-	imageBtn := widget.NewButton("Select Firmware (.bin)", imageDlg.Show)
-
-	// Create new file open dialog for init packet
-	initDlg := dialog.NewFileOpen(func(uc fyne.URIReadCloser, err error) {
-		if err != nil || uc == nil {
-			return
-		}
-		defer uc.Close()
-
-		// Set init packet path in map
-		files[".dat"] = uc.URI().Path()
-
-		// If the firmware image was already selected
-		_, binOk := files[".bin"]
-		if binOk {
-			// Enable start button
-			startBtn.Enable()
-		}
-	}, w)
-	// Only allow .dat files
-	initDlg.SetFilter(storage.NewExtensionFileFilter([]string{".dat"}))
-	// Create button to show dialog
-	initBtn := widget.NewButton("Select Init Packet (.dat)", initDlg.Show)
-
-	var upgType api.UpgradeType = 255
-	// When upgrade type changes
-	typeSelect.OnChanged = func(s string) {
-		// Delete all files from map
-		delete(files, ".bin")
-		delete(files, ".dat")
-		delete(files, ".zip")
-		// Hide all dialog buttons
-		imageBtn.Hide()
-		initBtn.Hide()
-		archiveBtn.Hide()
-		// Disable start button
-		startBtn.Disable()
-
-		switch s {
-		case "Files":
-			// Set file upgrade type
-			upgType = api.UpgradeTypeFiles
-			// Show firmware image and init packet buttons
-			imageBtn.Show()
-			initBtn.Show()
-		case "Archive":
-			// Set archive upgrade type
-			upgType = api.UpgradeTypeArchive
-			// Show archive button
-			archiveBtn.Show()
-		}
-	}
-	// Select archive by default
-	typeSelect.SetSelectedIndex(0)
-
-	// When start button pressed
-	startBtn.OnTapped = func() {
-		var args []string
-		// Append the appropriate files for upgrade type
-		switch upgType {
-		case api.UpgradeTypeArchive:
-			args = append(args, files[".zip"])
-		case api.UpgradeTypeFiles:
-			args = append(args, files[".dat"], files[".bin"])
-		}
-
-		// If args are nil (invalid upgrade type)
-		if args == nil {
-			return
-		}
-
-		// Create new progress dialog
-		progress := newProgress(w)
-		// Start firmware upgrade
-		progressCh, err := client.FirmwareUpgrade(ctx, upgType, args...)
-		if err != nil {
-			guiErr(err, "Error performing firmware upgrade", false, w)
-			return
-		}
-		// Show progress dialog
-		progress.Show()
-		// For every progress event
-		for progressEvt := range progressCh {
-			// Set progress bar values
-			progress.SetTotal(float64(progressEvt.Total))
-			progress.SetValue(float64(progressEvt.Sent))
-		}
-		// Hide progress dialog
-		progress.Hide()
-	}
-
-	return container.NewVBox(
-		layout.NewSpacer(),
-		typeSelect,
-		archiveBtn,
-		imageBtn,
-		initBtn,
-		startBtn,
-		layout.NewSpacer(),
-	)
-}

cmd/itgui/fs.go

@@ -1,402 +0,0 @@
-package main
-
-import (
-	"context"
-	"path/filepath"
-
-	"fyne.io/fyne/v2"
-	"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.elara.ws/itd/api"
-	"go.elara.ws/itd/infinitime"
-)
-
-func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan struct{}) fyne.CanvasObject {
-	c := container.NewVBox()
-
-	// Create new binding to store current directory
-	cwdData := binding.NewString()
-	cwdData.Set("/")
-
-	// Create new list binding to store fs listing entries
-	lsData := binding.NewUntypedList()
-
-	// This goroutine waits until the fs tab is opened to
-	// request the listing from the watch
-	go func() {
-		// Wait for opened signal
-		<-opened
-
-		// Show loading pop up
-		loading := newLoadingPopUp(w)
-		loading.Show()
-
-		// Read root directory
-		ls, err := client.FS().ReadDir(ctx, "/")
-		if err != nil {
-			guiErr(err, "Error reading directory", false, w)
-			return
-		}
-		// Set ls binding
-		lsData.Set(lsToAny(ls))
-
-		// Hide loading pop up
-		loading.Hide()
-	}()
-
-	toolbar := widget.NewToolbar(
-		widget.NewToolbarAction(
-			theme.ViewRefreshIcon(),
-			func() {
-				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.ResourceRemove:
-							progressDlg.SetText("Removing " + evt.Name)
-						case infinitime.ResourceUpload:
-							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() {
-				// Create open dialog for file that will be uploaded
-				dlg := dialog.NewFileOpen(func(uc fyne.URIReadCloser, err error) {
-					if err != nil || uc == nil {
-						return
-					}
-					// Get filepath and close
-					localPath := uc.URI().Path()
-					uc.Close()
-
-					// Create new entry to store filepath
-					filenameEntry := widget.NewEntry()
-					// Set entry text to the file name of the selected file
-					filenameEntry.SetText(filepath.Base(localPath))
-					// Create new dialog asking for the filename of the file to be stored on the watch
-					uploadDlg := dialog.NewForm("Upload", "Upload", "Cancel", []*widget.FormItem{
-						widget.NewFormItem("Filename", filenameEntry),
-					}, func(ok bool) {
-						if !ok {
-							return
-						}
-
-						// Get current directory
-						cwd, _ := cwdData.Get()
-						// Get remote path by joining current directory with filename
-						remotePath := filepath.Join(cwd, filenameEntry.Text)
-
-						// Create new progress dialog
-						progressDlg := newProgress(w)
-						progressDlg.Show()
-
-						// Upload file
-						progressCh, err := client.FS().Upload(ctx, remotePath, localPath)
-						if err != nil {
-							guiErr(err, "Error uploading file", false, w)
-							return
-						}
-
-						for progressEvt := range progressCh {
-							progressDlg.SetTotal(float64(progressEvt.Total))
-							progressDlg.SetValue(float64(progressEvt.Sent))
-							if progressEvt.Sent == progressEvt.Total {
-								break
-							}
-						}
-
-						// Close progress dialog
-						progressDlg.Hide()
-
-						// Add file to listing (avoids full refresh)
-						lsData.Append(api.FileInfo{
-							IsDir: false,
-							Name:  filepath.Base(remotePath),
-						})
-					}, w)
-					uploadDlg.Show()
-				}, w)
-				dlg.Show()
-			},
-		),
-		widget.NewToolbarAction(
-			theme.FolderNewIcon(),
-			func() {
-				// Create new entry for filename
-				filenameEntry := widget.NewEntry()
-				// Create new dialog to ask for the filename
-				mkdirDialog := dialog.NewForm("Make Directory", "Create", "Cancel", []*widget.FormItem{
-					widget.NewFormItem("Filename", filenameEntry),
-				}, func(ok bool) {
-					if !ok {
-						return
-					}
-
-					// Get current directory
-					cwd, _ := cwdData.Get()
-					// Get remote path by joining current directory and filename
-					remotePath := filepath.Join(cwd, filenameEntry.Text)
-
-					// Make directory
-					err := client.FS().Mkdir(ctx, remotePath)
-					if err != nil {
-						guiErr(err, "Error creating directory", false, w)
-						return
-					}
-
-					// Add directory to listing (avoids full refresh)
-					lsData.Append(api.FileInfo{
-						IsDir: true,
-						Name:  filepath.Base(remotePath),
-					})
-				}, w)
-				mkdirDialog.Show()
-			},
-		),
-	)
-
-	// Add listener to listing data to create the new items on the GUI
-	// whenever the listing changes
-	lsData.AddListener(binding.NewDataListener(func() {
-		c.Objects = makeItems(ctx, client, lsData, cwdData, w, c)
-		c.Refresh()
-	}))
-
-	return container.NewBorder(
-		nil,
-		toolbar,
-		nil,
-		nil,
-		container.NewVScroll(c),
-	)
-}
-
-// makeItems creates GUI objects from listing data
-func makeItems(
-	ctx context.Context,
-	client *api.Client,
-	lsData binding.UntypedList,
-	cwdData binding.String,
-	w fyne.Window,
-	c *fyne.Container,
-) []fyne.CanvasObject {
-	// Get listing data
-	ls, _ := lsData.Get()
-
-	// Create output slice with dame length as listing
-	out := make([]fyne.CanvasObject, len(ls))
-	for index, val := range ls {
-		// Assert value as file info
-		item := val.(api.FileInfo)
-
-		var icon fyne.Resource
-		// Decide which icon to use
-		if item.IsDir {
-			if item.Name == ".." {
-				icon = theme.NavigateBackIcon()
-			} else {
-				icon = theme.FolderIcon()
-			}
-		} else {
-			icon = theme.FileIcon()
-		}
-
-		// Create new button with the decided icon and the item name
-		btn := widget.NewButtonWithIcon(item.Name, icon, nil)
-		// Align left
-		btn.Alignment = widget.ButtonAlignLeading
-		// Decide which callback function to use
-		if item.IsDir {
-			btn.OnTapped = func() {
-				// Get current directory
-				cwd, _ := cwdData.Get()
-				// Join current directory with item name
-				cwd = filepath.Join(cwd, item.Name)
-				// Set new current directory
-				cwdData.Set(cwd)
-				// Refresh GUI to display new directory
-				refresh(ctx, cwdData, lsData, client, w, c)
-			}
-		} else {
-			btn.OnTapped = func() {
-				// Get current directory
-				cwd, _ := cwdData.Get()
-				// Join current directory with item name
-				remotePath := filepath.Join(cwd, item.Name)
-				// Create new save dialog
-				dlg := dialog.NewFileSave(func(uc fyne.URIWriteCloser, err error) {
-					if err != nil || uc == nil {
-						return
-					}
-					// Get path of selected file
-					localPath := uc.URI().Path()
-					// Close WriteCloser (it's not needed)
-					uc.Close()
-
-					// Create new progress dialog
-					progressDlg := newProgress(w)
-					progressDlg.Show()
-
-					// Download file
-					progressCh, err := client.FS().Download(ctx, localPath, remotePath)
-					if err != nil {
-						guiErr(err, "Error downloading file", false, w)
-						return
-					}
-
-					// For every progress event
-					for progressEvt := range progressCh {
-						progressDlg.SetTotal(float64(progressEvt.Total))
-						progressDlg.SetValue(float64(progressEvt.Sent))
-					}
-
-					// Close progress dialog
-					progressDlg.Hide()
-				}, w)
-				// Set filename to the item name
-				dlg.SetFileName(item.Name)
-				dlg.Show()
-			}
-		}
-
-		if item.Name == ".." {
-			out[index] = btn
-			continue
-		}
-
-		moveBtn := widget.NewButtonWithIcon("", theme.NavigateNextIcon(), func() {
-			moveEntry := widget.NewEntry()
-			dlg := dialog.NewForm("Move", "Move", "Cancel", []*widget.FormItem{
-				widget.NewFormItem("New Path", moveEntry),
-			}, func(ok bool) {
-				if !ok {
-					return
-				}
-
-				// Get current directory
-				cwd, _ := cwdData.Get()
-				// Join current directory with item name
-				oldPath := filepath.Join(cwd, item.Name)
-
-				// Rename file
-				err := client.FS().Rename(ctx, oldPath, moveEntry.Text)
-				if err != nil {
-					guiErr(err, "Error renaming file", false, w)
-					return
-				}
-
-				// Refresh GUI
-				refresh(ctx, cwdData, lsData, client, w, c)
-			}, w)
-			dlg.Show()
-		})
-
-		removeBtn := widget.NewButtonWithIcon("", theme.DeleteIcon(), func() {
-			// Get current directory
-			cwd, _ := cwdData.Get()
-			// Join current directory with item name
-			path := filepath.Join(cwd, item.Name)
-
-			// Remove file
-			err := client.FS().Remove(ctx, path)
-			if err != nil {
-				guiErr(err, "Error removing file", false, w)
-				return
-			}
-
-			// Refresh GUI
-			refresh(ctx, cwdData, lsData, client, w, c)
-		})
-
-		// Add button to GUI component list
-		out[index] = container.NewBorder(
-			nil,
-			nil,
-			nil,
-			container.NewHBox(moveBtn, removeBtn),
-			btn,
-		)
-	}
-	return out
-}
-
-func refresh(
-	ctx context.Context,
-	cwdData binding.String,
-	lsData binding.UntypedList,
-	client *api.Client,
-	w fyne.Window,
-	c *fyne.Container,
-) {
-	// Create and show new loading pop up
-	loading := newLoadingPopUp(w)
-	loading.Show()
-	// Close pop up at the end of the function
-	defer loading.Hide()
-
-	// Get current directory
-	cwd, _ := cwdData.Get()
-	// Read directory
-	ls, err := client.FS().ReadDir(ctx, cwd)
-	if err != nil {
-		guiErr(err, "Error reading directory", false, w)
-		return
-	}
-	// Set new listing data
-	lsData.Set(lsToAny(ls))
-	// Create new GUI objects
-	c.Objects = makeItems(ctx, client, lsData, cwdData, w, c)
-	// Refresh GUI
-	c.Refresh()
-}
-
-func lsToAny(ls []api.FileInfo) []interface{} {
-	out := make([]interface{}, len(ls)-1)
-	for i, e := range ls {
-		// Skip first element as it is always "."
-		if i == 0 {
-			continue
-		}
-		out[i-1] = e
-	}
-	return out
-}

cmd/itgui/graph.go

@@ -1,150 +0,0 @@
-package main
-
-import (
-	"context"
-	"database/sql"
-	"image/color"
-	"os"
-	"path/filepath"
-
-	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/theme"
-	"fyne.io/x/fyne/widget/charts"
-	"go.elara.ws/itd/api"
-	_ "modernc.org/sqlite"
-)
-
-func graphTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject {
-	// Get user configuration directory
-	userCfgDir, err := os.UserConfigDir()
-	if err != nil {
-		return nil
-	}
-	cfgDir := filepath.Join(userCfgDir, "itd")
-	dbPath := filepath.Join(cfgDir, "metrics.db")
-
-	// If stat on database returns error, return nil
-	if _, err := os.Stat(dbPath); err != nil {
-		return nil
-	}
-
-	// Open database
-	db, err := sql.Open("sqlite", dbPath)
-	if err != nil {
-		return nil
-	}
-
-	// Get heart rate data and create chart
-	heartRateData := getData(db, "bpm", "heartRate")
-	heartRate := newLineChartData(nil, heartRateData)
-
-	// Get step count data and create chart
-	stepCountData := getData(db, "steps", "stepCount")
-	stepCount := newLineChartData(nil, stepCountData)
-
-	// Get battery level data and create chart
-	battLevelData := getData(db, "percent", "battLevel")
-	battLevel := newLineChartData(nil, battLevelData)
-
-	// Get motion data
-	motionData := getMotionData(db)
-	// Create chart for each coordinate
-	xChart := newLineChartData(theme.PrimaryColorNamed(theme.ColorRed), motionData["X"])
-	yChart := newLineChartData(theme.PrimaryColorNamed(theme.ColorGreen), motionData["Y"])
-	zChart := newLineChartData(theme.PrimaryColorNamed(theme.ColorBlue), motionData["Z"])
-
-	// Create new max container with all the charts
-	motion := container.NewMax(xChart, yChart, zChart)
-
-	// Create tabs for charts
-	chartTabs := container.NewAppTabs(
-		container.NewTabItem("Heart Rate", heartRate),
-		container.NewTabItem("Step Count", stepCount),
-		container.NewTabItem("Battery Level", battLevel),
-		container.NewTabItem("Motion", motion),
-	)
-	// Place tabs on left
-	chartTabs.SetTabLocation(container.TabLocationLeading)
-	return chartTabs
-}
-
-func newLineChartData(col color.Color, data []float64) *charts.LineChart {
-	// Create new line chart
-	lc := charts.NewLineChart(nil)
-	setOpts(lc, col)
-	// If no data, make the stroke transparent
-	if len(data) == 0 {
-		lc.Options().StrokeColor = color.RGBA{0, 0, 0, 0}
-	}
-	// Set data
-	lc.SetData(data)
-	return lc
-}
-
-func setOpts(lc *charts.LineChart, col color.Color) {
-	// Get pointer to options
-	opts := lc.Options()
-	// Set fill color to transparent
-	opts.FillColor = color.RGBA{0, 0, 0, 0}
-	// Set stroke width
-	opts.StrokeWidth = 2
-	// If color provided
-	if col != nil {
-		// Set stroke color
-		opts.StrokeColor = col
-	} else {
-		// Set stroke color to orange primary color
-		opts.StrokeColor = theme.PrimaryColorNamed(theme.ColorOrange)
-	}
-}
-
-func getData(db *sql.DB, field, table string) []float64 {
-	// Get data from database
-	rows, err := db.Query("SELECT " + field + " FROM " + table + " ORDER BY time;")
-	if err != nil {
-		return nil
-	}
-	defer rows.Close()
-
-	var out []float64
-	for rows.Next() {
-		var val int64
-		// Scan data into int
-		err := rows.Scan(&val)
-		if err != nil {
-			return nil
-		}
-
-		// Convert to float64 and append to data slice
-		out = append(out, float64(val))
-	}
-
-	return out
-}
-
-func getMotionData(db *sql.DB) map[string][]float64 {
-	// Get data from database
-	rows, err := db.Query("SELECT X, Y, Z FROM motion ORDER BY time;")
-	if err != nil {
-		return nil
-	}
-	defer rows.Close()
-
-	out := map[string][]float64{}
-	for rows.Next() {
-		var x, y, z int64
-		// Scan data into ints
-		err := rows.Scan(&x, &y, &z)
-		if err != nil {
-			return nil
-		}
-
-		// Convert to float64 and append to appropriate slice
-		out["X"] = append(out["X"], float64(x))
-		out["Y"] = append(out["Y"], float64(y))
-		out["Z"] = append(out["Z"], float64(z))
-	}
-
-	return out
-}

cmd/itgui/info.go

@@ -1,86 +1,123 @@
 package main
 
 import (
-	"context"
 	"fmt"
+	"image/color"
 
 	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
-	"go.elara.ws/itd/api"
+	"fyne.io/fyne/v2/theme"
+	"go.arsenm.dev/itd/api"
 )
 
-func infoTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject {
+func infoTab(parent fyne.Window, client *api.Client) *fyne.Container {
-	c := container.NewVBox()
+	infoLayout := container.NewVBox(
+		// Add rectangle for a bit of padding
+		canvas.NewRectangle(color.Transparent),
+	)
 
-	// Create titled text for heart rate
+	// Create label for heart rate
-	heartRateText := newTitledText("Heart Rate", "0 BPM")
+	heartRateLbl := newText("0 BPM", 24)
-	c.Add(heartRateText)
+	// Creae container to store heart rate section
-	// Watch heart rate
+	heartRateSect := container.NewVBox(
-	heartRateCh, err := client.WatchHeartRate(ctx)
+		newText("Heart Rate", 12),
+		heartRateLbl,
+		canvas.NewLine(theme.ShadowColor()),
+	)
+	infoLayout.Add(heartRateSect)
+
+	heartRateCh, cancel, err := client.WatchHeartRate()
 	if err != nil {
-		guiErr(err, "Error watching heart rate", true, w)
+		guiErr(err, "Error getting heart rate channel", true, parent)
 	}
+	onClose = append(onClose, cancel)
 	go func() {
-		// For every heart rate sample
 		for heartRate := range heartRateCh {
-			// Set body of titled text
+			// Change text of heart rate label
-			heartRateText.SetBody(fmt.Sprintf("%d BPM", heartRate))
+			heartRateLbl.Text = fmt.Sprintf("%d BPM", heartRate)
+			// Refresh label
+			heartRateLbl.Refresh()
 		}
 	}()
 
-	// Create titled text for battery level
+	// Create label for heart rate
-	battLevelText := newTitledText("Battery Level", "0%")
+	stepCountLbl := newText("0 Steps", 24)
-	c.Add(battLevelText)
+	// Creae container to store heart rate section
-	// Watch battery level
+	stepCountSect := container.NewVBox(
-	battLevelCh, err := client.WatchBatteryLevel(ctx)
+		newText("Step Count", 12),
-	if err != nil {
+		stepCountLbl,
-		guiErr(err, "Error watching battery level", true, w)
+		canvas.NewLine(theme.ShadowColor()),
-	}
+	)
-	go func() {
+	infoLayout.Add(stepCountSect)
-		// For every battery level sample
-		for battLevel := range battLevelCh {
-			// Set body of titled text
-			battLevelText.SetBody(fmt.Sprintf("%d%%", battLevel))
-		}
-	}()
 
-	// Create titled text for step count
+	stepCountCh, cancel, err := client.WatchStepCount()
-	stepCountText := newTitledText("Step Count", "0 Steps")
-	c.Add(stepCountText)
-	// Watch step count
-	stepCountCh, err := client.WatchStepCount(ctx)
 	if err != nil {
-		guiErr(err, "Error watching step count", true, w)
+		guiErr(err, "Error getting step count channel", true, parent)
 	}
+	onClose = append(onClose, cancel)
 	go func() {
-		// For every step count sample
 		for stepCount := range stepCountCh {
-			// Set body of titled text
+			// Change text of heart rate label
-			stepCountText.SetBody(fmt.Sprintf("%d Steps", stepCount))
+			stepCountLbl.Text = fmt.Sprintf("%d Steps", stepCount)
+			// Refresh label
+			stepCountLbl.Refresh()
 		}
 	}()
 
-	// Create new titled text for address
+	// Create label for battery level
-	addressText := newTitledText("Address", "")
+	battLevelLbl := newText("0%", 24)
-	c.Add(addressText)
+	// Create container to store battery level section
-	// Get address
+	battLevel := container.NewVBox(
-	address, err := client.Address(ctx)
+		newText("Battery Level", 12),
-	if err != nil {
+		battLevelLbl,
-		guiErr(err, "Error getting address", true, w)
+		canvas.NewLine(theme.ShadowColor()),
-	}
+	)
-	// Set body of titled text
+	infoLayout.Add(battLevel)
-	addressText.SetBody(address)
 
-	// Create new titled text for version
+	battLevelCh, cancel, err := client.WatchBatteryLevel()
-	versionText := newTitledText("Version", "")
-	c.Add(versionText)
-	// Get version
-	version, err := client.Version(ctx)
 	if err != nil {
-		guiErr(err, "Error getting version", true, w)
+		guiErr(err, "Error getting battery level channel", true, parent)
 	}
-	// Set body of titled text
+	onClose = append(onClose, cancel)
-	versionText.SetBody(version)
+	go func() {
+		for battLevel := range battLevelCh {
+			// Change text of battery level label
+			battLevelLbl.Text = fmt.Sprintf("%d%%", battLevel)
+			// Refresh label
+			battLevelLbl.Refresh()
+		}
+	}()
 
-	return container.NewVScroll(c)
+	fwVerString, err := client.Version()
+	if err != nil {
+		guiErr(err, "Error getting firmware string", true, parent)
+	}
+
+	fwVer := container.NewVBox(
+		newText("Firmware Version", 12),
+		newText(fwVerString, 24),
+		canvas.NewLine(theme.ShadowColor()),
+	)
+	infoLayout.Add(fwVer)
+
+	btAddrString, err := client.Address()
+	if err != nil {
+		panic(err)
+	}
+
+	btAddr := container.NewVBox(
+		newText("Bluetooth Address", 12),
+		newText(btAddrString, 24),
+		canvas.NewLine(theme.ShadowColor()),
+	)
+	infoLayout.Add(btAddr)
+
+	return infoLayout
+}
+
+func newText(t string, size float32) *canvas.Text {
+	text := canvas.NewText(t, theme.ForegroundColor())
+	text.TextSize = size
+	return text
 }

cmd/itgui/loading.go

@@ -1,21 +0,0 @@
-package main
-
-import (
-	"image/color"
-
-	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/canvas"
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/widget"
-)
-
-func newLoadingPopUp(w fyne.Window) *widget.PopUp {
-	pb := widget.NewProgressBarInfinite()
-	rect := canvas.NewRectangle(color.Transparent)
-	rect.SetMinSize(fyne.NewSize(200, 0))
-
-	return widget.NewModalPopUp(
-		container.NewMax(rect, pb),
-		w.Canvas(),
-	)
-}

cmd/itgui/main.go

@@ -1,60 +1,43 @@
 package main
 
 import (
-	"context"
-	"sync"
-
 	"fyne.io/fyne/v2/app"
 	"fyne.io/fyne/v2/container"
-	"go.elara.ws/itd/api"
+	"go.arsenm.dev/itd/api"
 )
 
+var onClose []func()
+
 func main() {
+	// Create new app
 	a := app.New()
-	w := a.NewWindow("itgui")
+	// Create new window with title "itgui"
+	window := a.NewWindow("itgui")
+	window.SetOnClosed(func() {
+		for _, closeFn := range onClose {
+			closeFn()
+		}
+	})
 
-	// Create new context for use with the API client
-	ctx, cancel := context.WithCancel(context.Background())
-
-	// Connect to ITD API
 	client, err := api.New(api.DefaultAddr)
 	if err != nil {
-		guiErr(err, "Error connecting to ITD", true, w)
+		guiErr(err, "Error connecting to itd", true, window)
 	}
+	onClose = append(onClose, func() {
+		client.Close()
+	})
 
-	// Create channel to signal that the fs tab has been opened
+	// Create new app tabs container
-	fsOpened := make(chan struct{})
-	fsOnce := &sync.Once{}
-
-	// Create app tabs
 	tabs := container.NewAppTabs(
-		container.NewTabItem("Info", infoTab(ctx, client, w)),
+		container.NewTabItem("Info", infoTab(window, client)),
-		container.NewTabItem("Motion", motionTab(ctx, client, w)),
+		container.NewTabItem("Motion", motionTab(window, client)),
-		container.NewTabItem("Notify", notifyTab(ctx, client, w)),
+		container.NewTabItem("Notify", notifyTab(window, client)),
-		container.NewTabItem("FS", fsTab(ctx, client, w, fsOpened)),
+		container.NewTabItem("Set Time", timeTab(window, client)),
-		container.NewTabItem("Time", timeTab(ctx, client, w)),
+		container.NewTabItem("Upgrade", upgradeTab(window, client)),
-		container.NewTabItem("Firmware", firmwareTab(ctx, client, w)),
 	)
 
-	metricsTab := graphTab(ctx, client, w)
+	// Set tabs as window content
-	if metricsTab != nil {
+	window.SetContent(tabs)
-		tabs.Append(container.NewTabItem("Metrics", metricsTab))
+	// Show window and run app
-	}
+	window.ShowAndRun()
-
-	// When a tab is selected
-	tabs.OnSelected = func(ti *container.TabItem) {
-		// If the tab's name is FS
-		if ti.Text == "FS" {
-			// Signal fsOpened only once
-			fsOnce.Do(func() {
-				fsOpened <- struct{}{}
-			})
-		}
-	}
-
-	// Cancel context on close
-	w.SetOnClosed(cancel)
-	// Set content and show window
-	w.SetContent(tabs)
-	w.ShowAndRun()
 }

cmd/itgui/motion.go

@@ -1,62 +1,105 @@
 package main
 
 import (
-	"context"
+	"image/color"
-	"fmt"
+	"strconv"
 
 	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/canvas"
 	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
-	"go.elara.ws/itd/api"
+	"go.arsenm.dev/itd/api"
 )
 
-func motionTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject {
+func motionTab(parent fyne.Window, client *api.Client) *fyne.Container {
-	// Create titledText for each coordinate
+	// Create label for heart rate
-	xText := newTitledText("X Coordinate", "0")
+	xCoordLbl := newText("0", 24)
-	yText := newTitledText("Y Coordinate", "0")
+	// Creae container to store heart rate section
-	zText := newTitledText("Z Coordinate", "0")
+	xCoordSect := container.NewVBox(
+		newText("X Coordinate", 12),
+		xCoordLbl,
+		canvas.NewLine(theme.ShadowColor()),
+	)
 
-	var ctxCancel func()
+	// Create label for heart rate
+	yCoordLbl := newText("0", 24)
+	// Creae container to store heart rate section
+	yCoordSect := container.NewVBox(
+		newText("Y Coordinate", 12),
+		yCoordLbl,
+		canvas.NewLine(theme.ShadowColor()),
+	)
+	// Create label for heart rate
+	zCoordLbl := newText("0", 24)
+	// Creae container to store heart rate section
+	zCoordSect := container.NewVBox(
+		newText("Z Coordinate", 12),
+		zCoordLbl,
+		canvas.NewLine(theme.ShadowColor()),
+	)
 
-	// Create start button
+	// Create variable to keep track of whether motion started
-	toggleBtn := widget.NewButton("Start", nil)
+	started := false
-	// Set button's on tapped callback
+
-	toggleBtn.OnTapped = func() {
+	// Create button to stop motion
-		switch toggleBtn.Text {
+	stopBtn := widget.NewButton("Stop", nil)
-		case "Start":
+	// Create button to start motion
-			// Create new context for motion
+	startBtn := widget.NewButton("Start", func() {
-			motionCtx, cancel := context.WithCancel(ctx)
+		// if motion is started
-			// Set ctxCancel to function so that stop button can run it
+		if started {
-			ctxCancel = cancel
+			// Do nothing
-			// Watch motion
+			return
-			motionCh, err := client.WatchMotion(motionCtx)
+		}
-			if err != nil {
+		// Set motion started
-				guiErr(err, "Error watching motion", false, w)
+		started = true
-				return
+		// Watch motion values
-			}
+		motionCh, cancel, err := client.WatchMotion()
-			go func() {
+		if err != nil {
-				// For every motion event
+			guiErr(err, "Error getting heart rate channel", true, parent)
-				for motion := range motionCh {
+		}
-					// Set coordinates
+		// Create done channel
-					xText.SetBody(fmt.Sprint(motion.X))
+		done := make(chan struct{}, 1)
-					yText.SetBody(fmt.Sprint(motion.Y))
+		go func() {
-					zText.SetBody(fmt.Sprint(motion.Z))
+			for {
-				}
+				select {
-			}()
+				case <-done:
-			// Set button text to "Stop"
+					return
-			toggleBtn.SetText("Stop")
+				case motion := <-motionCh:
-		case "Stop":
+					// Set labels to new values
-			// Cancel motion context
+					xCoordLbl.Text = strconv.Itoa(int(motion.X))
-			ctxCancel()
+					yCoordLbl.Text = strconv.Itoa(int(motion.Y))
-			// Set button text to "Start"
+					zCoordLbl.Text = strconv.Itoa(int(motion.Z))
-			toggleBtn.SetText("Start")
+					// Refresh labels to display new values
+					xCoordLbl.Refresh()
+					yCoordLbl.Refresh()
+					zCoordLbl.Refresh()
+				}
+			}
+		}()
+		// Create stop function
+		stopBtn.OnTapped = func() {
+			done <- struct{}{}
+			started = false
+			cancel()
 		}
-	}
 
-	return container.NewVScroll(container.NewVBox(
+	})
-		toggleBtn,
+	// Run stop button function on close if possible
-		xText,
+	onClose = append(onClose, func() {
-		yText,
+		if stopBtn.OnTapped != nil {
-		zText,
+			stopBtn.OnTapped()
-	))
+		}
+	})
+
+	// Return new container containing all elements
+	return container.NewVBox(
+		// Add rectangle for a bit of padding
+		canvas.NewRectangle(color.Transparent),
+		startBtn,
+		stopBtn,
+		xCoordSect,
+		yCoordSect,
+		zCoordSect,
+	)
 }

cmd/itgui/notify.go

@@ -1,40 +1,37 @@
 package main
 
 import (
-	"context"
-
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/widget"
-	"go.elara.ws/itd/api"
+	"go.arsenm.dev/itd/api"
 )
 
-func notifyTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject {
+func notifyTab(parent fyne.Window, client *api.Client) *fyne.Container {
-	c := container.NewVBox()
+	// Create new entry for notification title
-	c.Add(layout.NewSpacer())
-
-	// Create new entry for title
 	titleEntry := widget.NewEntry()
 	titleEntry.SetPlaceHolder("Title")
-	c.Add(titleEntry)
 
-	// Create new multiline entry for body
+	// Create multiline entry for notification body
 	bodyEntry := widget.NewMultiLineEntry()
 	bodyEntry.SetPlaceHolder("Body")
-	c.Add(bodyEntry)
 
-	// Create new send button
+	// Create new button to send notification
 	sendBtn := widget.NewButton("Send", func() {
-		// Send notification
+		err := client.Notify(titleEntry.Text, bodyEntry.Text)
-		err := client.Notify(ctx, titleEntry.Text, bodyEntry.Text)
 		if err != nil {
-			guiErr(err, "Error sending notification", false, w)
+			guiErr(err, "Error sending notification", false, parent)
 			return
 		}
 	})
-	c.Add(sendBtn)
 
-	c.Add(layout.NewSpacer())
+	// Return new container containing all elements
-	return container.NewVScroll(c)
+	return container.NewVBox(
+		layout.NewSpacer(),
+		titleEntry,
+		bodyEntry,
+		sendBtn,
+		layout.NewSpacer(),
+	)
 }

cmd/itgui/progress.go

@@ -1,64 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"image/color"
-
-	"fyne.io/fyne/v2"
-	"fyne.io/fyne/v2/canvas"
-	"fyne.io/fyne/v2/container"
-	"fyne.io/fyne/v2/widget"
-)
-
-type progress struct {
-	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.progLbl = widget.NewLabel("0 / 0 B")
-	out.progLbl.Alignment = fyne.TextAlignCenter
-
-	// Create new progress bar
-	out.pb = widget.NewProgressBar()
-
-	// Create new rectangle to set the size of the popup
-	sizeRect := canvas.NewRectangle(color.Transparent)
-	sizeRect.SetMinSize(fyne.NewSize(300, 50))
-
-	// Create vbox for label and progress bar
-	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.progLbl.SetText(fmt.Sprintf("%.0f / %.0f B", p.pb.Value, v))
-}
-
-func (p progress) SetValue(v float64) {
-	p.pb.SetValue(v)
-	p.progLbl.SetText(fmt.Sprintf("%.0f / %.0f B", v, p.pb.Max))
-}

cmd/itgui/time.go

@@ -1,57 +1,60 @@
 package main
 
 import (
-	"context"
 	"time"
 
 	"fyne.io/fyne/v2"
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/layout"
 	"fyne.io/fyne/v2/widget"
-	"go.elara.ws/itd/api"
+	"go.arsenm.dev/itd/api"
 )
 
-func timeTab(ctx context.Context, client *api.Client, w fyne.Window) fyne.CanvasObject {
+func timeTab(parent fyne.Window, client *api.Client) *fyne.Container {
-	c := container.NewVBox()
+	// Create new entry for time string
-	c.Add(layout.NewSpacer())
-
-	// Create entry for time string
 	timeEntry := widget.NewEntry()
+	// Set text to current time formatter properly
 	timeEntry.SetText(time.Now().Format(time.RFC1123))
-	timeEntry.SetPlaceHolder("RFC1123")
 
 	// Create button to set current time
-	setCurrentBtn := widget.NewButton("Set current time", func() {
+	currentBtn := widget.NewButton("Set Current", func() {
-		// Set current time
-		err := client.SetTime(ctx, time.Now())
-		if err != nil {
-			guiErr(err, "Error setting time", false, w)
-			return
-		}
-		// Set time entry to current time
 		timeEntry.SetText(time.Now().Format(time.RFC1123))
+		setTime(client, true)
 	})
 
-	// Create button to set time from entry
+	// Create button to set time inside entry
-	setBtn := widget.NewButton("Set", func() {
+	timeBtn := widget.NewButton("Set", func() {
-		// Parse RFC1123 time string in entry
+		// Parse time as RFC1123 string
-		newTime, err := time.Parse(time.RFC1123, timeEntry.Text)
+		parsedTime, err := time.Parse(time.RFC1123, timeEntry.Text)
 		if err != nil {
-			guiErr(err, "Error parsing time string", false, w)
+			guiErr(err, "Error parsing time string", false, parent)
-			return
-		}
-		// Set time from parsed string
-		err = client.SetTime(ctx, newTime)
-		if err != nil {
-			guiErr(err, "Error setting time", false, w)
 			return
 		}
+		// Set time to parsed time
+		setTime(client, false, parsedTime)
 	})
 
-	c.Add(timeEntry)
+	// Return new container with all elements centered
-	c.Add(setBtn)
+	return container.NewVBox(
-	c.Add(setCurrentBtn)
+		layout.NewSpacer(),
-
+		timeEntry,
-	c.Add(layout.NewSpacer())
+		currentBtn,
-	return c
+		timeBtn,
+		layout.NewSpacer(),
+	)
+}
+
+// setTime sets the first element in the variadic parameter
+// if current is false, otherwise, it sets the current time.
+func setTime(client *api.Client, current bool, t ...time.Time) error {
+	var err error
+	if current {
+		err = client.SetTime(time.Now())
+	} else {
+		err = client.SetTime(t[0])
+	}
+	if err != nil {
+		return err
+	}
+	return nil
 }

cmd/itgui/titledText.go

@@ -1,35 +0,0 @@
-package main
-
-import "fyne.io/fyne/v2/widget"
-
-type titledText struct {
-	*widget.RichText
-}
-
-func newTitledText(title, text string) titledText {
-	titleStyle := widget.RichTextStyleHeading
-	titleStyle.TextStyle.Bold = false
-	return titledText{
-		widget.NewRichText(
-			&widget.TextSegment{
-				Style: widget.RichTextStyleParagraph,
-				Text:  title,
-			},
-			&widget.TextSegment{
-				Style: titleStyle,
-				Text:  text,
-			},
-			&widget.SeparatorSegment{},
-		),
-	}
-}
-
-func (t titledText) SetTitle(s string) {
-	t.RichText.Segments[0].(*widget.TextSegment).Text = s
-	t.Refresh()
-}
-
-func (t titledText) SetBody(s string) {
-	t.RichText.Segments[1].(*widget.TextSegment).Text = s
-	t.Refresh()
-}

cmd/itgui/upgrade.go

@@ -0,0 +1,180 @@
+package main
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/dialog"
+	"fyne.io/fyne/v2/layout"
+	"fyne.io/fyne/v2/storage"
+	"fyne.io/fyne/v2/widget"
+	"go.arsenm.dev/itd/api"
+)
+
+func upgradeTab(parent fyne.Window, client *api.Client) *fyne.Container {
+	var (
+		archivePath  string
+		firmwarePath string
+		initPktPath  string
+	)
+
+	var archiveBtn *widget.Button
+	// Create archive selection dialog
+	archiveDialog := dialog.NewFileOpen(func(uc fyne.URIReadCloser, e error) {
+		if e != nil || uc == nil {
+			return
+		}
+		uc.Close()
+		archivePath = uc.URI().Path()
+		archiveBtn.SetText(fmt.Sprintf("Select archive (.zip) [%s]", filepath.Base(archivePath)))
+	}, parent)
+	// Limit dialog to .zip files
+	archiveDialog.SetFilter(storage.NewExtensionFileFilter([]string{".zip"}))
+	// Create button to show dialog
+	archiveBtn = widget.NewButton("Select archive (.zip)", archiveDialog.Show)
+
+	var firmwareBtn *widget.Button
+	// Create firmware selection dialog
+	firmwareDialog := dialog.NewFileOpen(func(uc fyne.URIReadCloser, e error) {
+		if e != nil || uc == nil {
+			return
+		}
+		uc.Close()
+		firmwarePath = uc.URI().Path()
+		firmwareBtn.SetText(fmt.Sprintf("Select firmware (.bin) [%s]", filepath.Base(firmwarePath)))
+	}, parent)
+	// Limit dialog to .bin files
+	firmwareDialog.SetFilter(storage.NewExtensionFileFilter([]string{".bin"}))
+	// Create button to show dialog
+	firmwareBtn = widget.NewButton("Select firmware (.bin)", firmwareDialog.Show)
+
+	var initPktBtn *widget.Button
+	// Create init packet selection dialog
+	initPktDialog := dialog.NewFileOpen(func(uc fyne.URIReadCloser, e error) {
+		if e != nil || uc == nil {
+			return
+		}
+		uc.Close()
+		initPktPath = uc.URI().Path()
+		initPktBtn.SetText(fmt.Sprintf("Select init packet (.dat) [%s]", filepath.Base(initPktPath)))
+	}, parent)
+	// Limit dialog to .dat files
+	initPktDialog.SetFilter(storage.NewExtensionFileFilter([]string{".dat"}))
+	// Create button to show dialog
+	initPktBtn = widget.NewButton("Select init packet (.dat)", initPktDialog.Show)
+
+	// Hide init packet and firmware buttons
+	initPktBtn.Hide()
+	firmwareBtn.Hide()
+
+	// Create dropdown to select upgrade type
+	upgradeTypeSelect := widget.NewSelect([]string{
+		"Archive",
+		"Files",
+	}, func(s string) {
+		// Hide all buttons
+		archiveBtn.Hide()
+		initPktBtn.Hide()
+		firmwareBtn.Hide()
+		// Unhide appropriate button(s)
+		switch s {
+		case "Archive":
+			archiveBtn.Show()
+		case "Files":
+			initPktBtn.Show()
+			firmwareBtn.Show()
+		}
+	})
+	// Select first elemetn
+	upgradeTypeSelect.SetSelectedIndex(0)
+
+	// Create new button to start DFU
+	startBtn := widget.NewButton("Start", func() {
+		// If archive path does not exist and both init packet and firmware paths
+		// also do not exist, return error
+		if archivePath == "" && (initPktPath == "" && firmwarePath == "") {
+			guiErr(nil, "Upgrade requires archive or files selected", false, parent)
+			return
+		}
+
+		// Create new label for byte progress
+		progressLbl := widget.NewLabelWithStyle("0 / 0 B", fyne.TextAlignCenter, fyne.TextStyle{})
+		// Create new progress bar
+		progressBar := widget.NewProgressBar()
+		// Create modal dialog containing label and progress bar
+		progressDlg := widget.NewModalPopUp(container.NewVBox(
+			layout.NewSpacer(),
+			progressLbl,
+			progressBar,
+			layout.NewSpacer(),
+		), parent.Canvas())
+		// Resize modal to 300x100
+		progressDlg.Resize(fyne.NewSize(300, 100))
+
+		var fwUpgType api.UpgradeType
+		var files []string
+		// Get appropriate upgrade type and file paths
+		switch upgradeTypeSelect.Selected {
+		case "Archive":
+			fwUpgType = api.UpgradeTypeArchive
+			files = append(files, archivePath)
+		case "Files":
+			fwUpgType = api.UpgradeTypeFiles
+			files = append(files, initPktPath, firmwarePath)
+		}
+
+		progress, err := client.FirmwareUpgrade(fwUpgType, files...)
+		if err != nil {
+			guiErr(err, "Error initiating DFU", false, parent)
+			return
+		}
+
+		// Show progress dialog
+		progressDlg.Show()
+
+		for event := range progress {
+			// Set label text to received / total B
+			progressLbl.SetText(fmt.Sprintf("%d / %d B", event.Received, event.Total))
+			// Set progress bar values
+			progressBar.Max = float64(event.Total)
+			progressBar.Value = float64(event.Received)
+			// Refresh progress bar
+			progressBar.Refresh()
+			// If transfer finished, break
+			if int64(event.Sent) == event.Total {
+				break
+			}
+		}
+
+		// Hide progress dialog after completion
+		progressDlg.Hide()
+
+		// Reset screen to default
+		upgradeTypeSelect.SetSelectedIndex(0)
+		firmwareBtn.SetText("Select firmware (.bin)")
+		initPktBtn.SetText("Select init packet (.dat)")
+		archiveBtn.SetText("Select archive (.zip)")
+		firmwarePath = ""
+		initPktPath = ""
+		archivePath = ""
+
+		dialog.NewInformation(
+			"Upgrade Complete",
+			"The firmware was transferred successfully.\nRemember to validate the firmware in InfiniTime settings.",
+			parent,
+		).Show()
+	})
+
+	// Return container containing all elements
+	return container.NewVBox(
+		layout.NewSpacer(),
+		upgradeTypeSelect,
+		archiveBtn,
+		firmwareBtn,
+		initPktBtn,
+		startBtn,
+		layout.NewSpacer(),
+	)
+}

config.go

@@ -9,53 +9,32 @@ import (
 	"github.com/knadh/koanf/providers/confmap"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/file"
-	"go.elara.ws/logger"
+	"github.com/rs/zerolog"
-	"go.elara.ws/logger/log"
+	"github.com/rs/zerolog/log"
 )
 
-var cfgDir string
-
 func init() {
-	etcPath := "/etc/itd.toml"
-
 	// Set up logger
-	log.Logger = logger.NewPretty(os.Stderr)
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
 
 	// Get user's configuration directory
-	userCfgDir, err := os.UserConfigDir()
+	cfgDir, err := os.UserConfigDir()
 	if err != nil {
 		panic(err)
 	}
-	cfgDir = filepath.Join(userCfgDir, "itd")
-
-	// If config dir is not readable
-	if _, err = os.ReadDir(cfgDir); err != nil {
-		// Create config dir with 700 permissions
-		err = os.MkdirAll(cfgDir, 0o700)
-		if err != nil {
-			panic(err)
-		}
-	}
-
-	// Get current and old config paths
-	cfgPath := filepath.Join(cfgDir, "itd.toml")
-	oldCfgPath := filepath.Join(userCfgDir, "itd.toml")
-
-	// If old config path exists
-	if _, err = os.Stat(oldCfgPath); err == nil {
-		// Move old config to new path
-		err = os.Rename(oldCfgPath, cfgPath)
-		if err != nil {
-			panic(err)
-		}
-	}
 
 	// Set config defaults
 	setCfgDefaults()
 
-	// Load and watch config files
+	// Load config files
-	loadAndwatchCfgFile(etcPath)
+	etcProvider := file.Provider("/etc/itd.toml")
-	loadAndwatchCfgFile(cfgPath)
+	cfgProvider := file.Provider(filepath.Join(cfgDir, "itd.toml"))
+	k.Load(etcProvider, toml.Parser())
+	k.Load(cfgProvider, toml.Parser())
+
+	// Watch configs for changes
+	cfgWatch(etcProvider)
+	cfgWatch(cfgProvider)
 
 	// Load envireonment variables
 	k.Load(env.Provider("ITD_", "_", func(s string) string {
@@ -63,29 +42,19 @@ func init() {
 	}), nil)
 }
 
-func loadAndwatchCfgFile(filename string) {
+func cfgWatch(provider *file.File) {
-	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
 		}
 
-		if cfgError := k.Load(provider, toml.Parser()); cfgError != nil {
+		k.Load(provider, toml.Parser())
-			log.Warn("Error while trying to read config file").Str("filename", filename).Err(cfgError).Send()
-		}
 	})
 }
 
 func setCfgDefaults() {
 	k.Load(confmap.Provider(map[string]interface{}{
-		"bluetooth.adapter": "hci0",
-
 		"socket.path": "/tmp/itd/socket",
 
 		"conn.reconnect": true,
@@ -106,8 +75,5 @@ func setCfgDefaults() {
 		"notifs.ignore.body":    []string{},
 
 		"music.vol.interval": 5,
-
-		"fuse.enabled":    false,
-		"fuse.mountpoint": "/tmp/itd/mnt",
 	}, "."), nil)
 }

dbus.go

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

fuse.go

@@ -1,66 +0,0 @@
-package main
-
-import (
-	"context"
-	"os"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"go.elara.ws/itd/infinitime"
-	"go.elara.ws/itd/internal/fusefs"
-	"go.elara.ws/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,91 +1,122 @@
-module go.elara.ws/itd
+module gitea.arsenm.dev/cpyarger/itd
 
-go 1.18
+go 1.17
-
-replace fyne.io/x/fyne => github.com/metal3d/fyne-x v0.0.0-20220508095732-177117e583fb
-
-replace tinygo.org/x/bluetooth => github.com/elara6331/bluetooth v0.9.1-0.20240413234149-a0e71474a768
 
 require (
-	fyne.io/fyne/v2 v2.3.0
+	fyne.io/fyne/v2 v2.1.2
-	fyne.io/x/fyne v0.0.0-20220107050838-c4a1de51d4ce
+	github.com/cheggaaa/pb/v3 v3.0.8
-	github.com/cheggaaa/pb/v3 v3.1.0
+	github.com/gen2brain/dlgs v0.0.0-20211108104213-bade24837f0b
-	github.com/gen2brain/dlgs v0.0.0-20220603100644-40c77870fa8d
+	github.com/godbus/dbus/v5 v5.0.6
-	github.com/godbus/dbus/v5 v5.1.0
+	github.com/google/uuid v1.3.0
-	github.com/hanwen/go-fuse/v2 v2.2.0
+	github.com/knadh/koanf v1.4.0
-	github.com/knadh/koanf v1.4.4
+	github.com/mattn/go-isatty v0.0.14
-	github.com/mattn/go-isatty v0.0.17
 	github.com/mozillazg/go-pinyin v0.19.0
-	github.com/urfave/cli/v2 v2.23.7
+	github.com/rs/zerolog v1.26.1
-	go.elara.ws/drpc v0.0.0-20230421021209-fe4c05460a3d
+	github.com/smallnest/rpcx v1.7.4
-	go.elara.ws/logger v0.0.0-20230928062203-85e135cf02ae
+	github.com/urfave/cli/v2 v2.3.0
-	golang.org/x/text v0.5.0
+	github.com/vmihailenco/msgpack/v5 v5.3.5
-	google.golang.org/protobuf v1.28.1
+	gitea.arsenm.dev/Arsen6331/infinitime v0.0.0-20220424030849-6c3f1b14c948
-	modernc.org/sqlite v1.20.1
+	golang.org/x/text v0.3.7
-	storj.io/drpc v0.0.32
-	tinygo.org/x/bluetooth v0.9.0
 )
 
 require (
-	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/akutz/memconn v0.1.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/apache/thrift v0.16.0 // indirect
+	github.com/armon/go-metrics v0.3.10 // indirect
+	github.com/cenk/backoff v2.2.1+incompatible // indirect
+	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dustin/go-humanize v1.0.0 // indirect
+	github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/edwingeng/doublejump v0.0.0-20210724020454-c82f1bcb3280 // indirect
+	github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
 	github.com/fatih/color v1.13.0 // indirect
-	github.com/fredbi/uri v1.0.0 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3 // indirect
-	github.com/fyne-io/gl-js v0.0.0-20220802150000-8e339395f381 // indirect
+	github.com/fsnotify/fsnotify v1.5.1 // indirect
-	github.com/fyne-io/glfw-js v0.0.0-20220517201726-bebc2019cd33 // indirect
+	github.com/fxamacker/cbor/v2 v2.4.0 // 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-20221017161538-93cebf72946b // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211204153444-caad923f49f4 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-text/typesetting v0.0.0-20221219135543-5d0d724ee181 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/goki/freetype v0.0.0-20220119013949-7a161fd3728c // indirect
+	github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/go-redis/redis/v8 v8.11.5 // indirect
-	github.com/gookit/color v1.5.1 // indirect
+	github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/hashicorp/yamux v0.1.1 // indirect
+	github.com/goki/freetype v0.0.0-20181231101311-fa8a33aabaff // indirect
-	github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect
+	github.com/golang/snappy v0.0.4 // indirect
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/grandcat/zeroconf v1.0.0 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/hashicorp/consul/api v1.12.0 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
+	github.com/hashicorp/go-hclog v1.2.0 // indirect
+	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/go-rootcerts v1.0.2 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/hashicorp/serf v0.9.7 // indirect
+	github.com/juju/ratelimit v1.0.1 // indirect
+	github.com/julienschmidt/httprouter v1.3.0 // indirect
+	github.com/kavu/go_reuseport v1.5.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.12 // indirect
+	github.com/klauspost/reedsolomon v1.9.16 // indirect
+	github.com/lucas-clemente/quic-go v0.27.0 // indirect
+	github.com/marten-seemann/qtls-go1-16 v0.1.5 // indirect
+	github.com/marten-seemann/qtls-go1-17 v0.1.1 // indirect
+	github.com/marten-seemann/qtls-go1-18 v0.1.1 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/miekg/dns v1.1.48 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/muka/go-bluetooth v0.0.0-20220219050759-674a63b8741a // indirect
+	github.com/nxadm/tail v1.4.8 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/philhofer/fwd v1.1.1 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20220927061507-ef77025ab5aa // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/rivo/uniseg v0.4.3 // indirect
+	github.com/rpcxio/libkv v0.5.1-0.20210420120011-1fceaedca8a5 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/rs/cors v1.8.2 // indirect
-	github.com/saltosystems/winrt-go v0.0.0-20240320113951-a2e4fc03f5f4 // indirect
+	github.com/rubyist/circuitbreaker v2.2.1+incompatible // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
-	github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect
+	github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414 // indirect
-	github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/stretchr/testify v1.8.1 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/tevino/abool v1.2.0 // indirect
+	github.com/smallnest/quick v0.0.0-20220103065406-780def6371e6 // indirect
-	github.com/tinygo-org/cbgo v0.0.4 // indirect
+	github.com/soheilhy/cmux v0.1.5 // indirect
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
+	github.com/srwiley/oksvg v0.0.0-20211120171407-1837d6608d8c // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/srwiley/rasterx v0.0.0-20210519020934-456a8d69b780 // indirect
-	github.com/yuin/goldmark v1.5.3 // indirect
+	github.com/stretchr/testify v1.7.1 // indirect
-	github.com/zeebo/errs v1.3.0 // indirect
+	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
-	golang.org/x/image v0.2.0 // indirect
+	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
-	golang.org/x/mobile v0.0.0-20221110043201-43a038452099 // indirect
+	github.com/tinylib/msgp v1.1.6 // indirect
-	golang.org/x/mod v0.7.0 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
-	golang.org/x/net v0.4.0 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	github.com/valyala/fastrand v1.1.0 // indirect
-	golang.org/x/tools v0.4.0 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
-	honnef.co/go/js/dom v0.0.0-20221001195520-26252dedbe70 // indirect
+	github.com/xtaci/kcp-go v5.4.20+incompatible // indirect
-	lukechampine.com/uint128 v1.2.0 // indirect
+	github.com/yuin/goldmark v1.4.4 // indirect
-	modernc.org/cc/v3 v3.40.0 // indirect
+	go.opentelemetry.io/otel v1.6.3 // indirect
-	modernc.org/ccgo/v3 v3.16.13 // indirect
+	go.opentelemetry.io/otel/trace v1.6.3 // indirect
-	modernc.org/libc v1.22.2 // indirect
+	golang.org/x/crypto v0.0.0-20220408190544-5352b0902921 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
+	golang.org/x/image v0.0.0-20211028202545-6944b10bf410 // indirect
-	modernc.org/memory v1.5.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
-	modernc.org/opt v0.1.3 // indirect
+	golang.org/x/net v0.0.0-20220407224826-aac1ed45d8e3 // indirect
-	modernc.org/strutil v1.1.3 // indirect
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	modernc.org/token v1.1.0 // indirect
+	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
+	golang.org/x/tools v0.1.10 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

infinitime/chars.go

@@ -1,142 +0,0 @@
-package infinitime
-
-import "tinygo.org/x/bluetooth"
-
-type btChar struct {
-	Name      string
-	ID        bluetooth.UUID
-	ServiceID bluetooth.UUID
-}
-
-var (
-	musicServiceUUID      = mustParse("00000000-78fc-48fe-8e23-433b3a1942d0")
-	navigationServiceUUID = mustParse("00010000-78fc-48fe-8e23-433b3a1942d0")
-	motionServiceUUID     = mustParse("00030000-78fc-48fe-8e23-433b3a1942d0")
-	weatherServiceUUID    = mustParse("00050000-78fc-48fe-8e23-433b3a1942d0")
-)
-
-var (
-	newAlertChar = btChar{
-		"New Alert",
-		bluetooth.CharacteristicUUIDNewAlert,
-		bluetooth.ServiceUUIDAlertNotification,
-	}
-	notifEventChar = btChar{
-		"Notification Event",
-		mustParse("00020001-78fc-48fe-8e23-433b3a1942d0"),
-		bluetooth.ServiceUUIDAlertNotification,
-	}
-	stepCountChar = btChar{
-		"Step Count",
-		mustParse("00030001-78fc-48fe-8e23-433b3a1942d0"),
-		motionServiceUUID,
-	}
-	rawMotionChar = btChar{
-		"Raw Motion",
-		mustParse("00030002-78fc-48fe-8e23-433b3a1942d0"),
-		motionServiceUUID,
-	}
-	firmwareVerChar = btChar{
-		"Firmware Version",
-		bluetooth.CharacteristicUUIDFirmwareRevisionString,
-		bluetooth.ServiceUUIDDeviceInformation,
-	}
-	currentTimeChar = btChar{
-		"Current Time",
-		bluetooth.CharacteristicUUIDCurrentTime,
-		bluetooth.ServiceUUIDCurrentTime,
-	}
-	localTimeChar = btChar{
-		"Local Time",
-		bluetooth.CharacteristicUUIDLocalTimeInformation,
-		bluetooth.ServiceUUIDCurrentTime,
-	}
-	batteryLevelChar = btChar{
-		"Battery Level",
-		bluetooth.CharacteristicUUIDBatteryLevel,
-		bluetooth.ServiceUUIDBattery,
-	}
-	heartRateChar = btChar{
-		"Heart Rate",
-		bluetooth.CharacteristicUUIDHeartRateMeasurement,
-		bluetooth.ServiceUUIDHeartRate,
-	}
-	fsVersionChar = btChar{
-		"Filesystem Version",
-		mustParse("adaf0200-4669-6c65-5472-616e73666572"),
-		bluetooth.ServiceUUIDFileTransferByAdafruit,
-	}
-	fsTransferChar = btChar{
-		"Filesystem Transfer",
-		mustParse("adaf0200-4669-6c65-5472-616e73666572"),
-		bluetooth.ServiceUUIDFileTransferByAdafruit,
-	}
-	dfuCtrlPointChar = btChar{
-		"DFU Control Point",
-		bluetooth.CharacteristicUUIDLegacyDFUControlPoint,
-		bluetooth.ServiceUUIDLegacyDFU,
-	}
-	dfuPacketChar = btChar{
-		"DFU Packet",
-		bluetooth.CharacteristicUUIDLegacyDFUPacket,
-		bluetooth.ServiceUUIDLegacyDFU,
-	}
-	navigationFlagsChar = btChar{
-		"Navigation Flags",
-		mustParse("00010001-78fc-48fe-8e23-433b3a1942d0"),
-		navigationServiceUUID,
-	}
-	navigationNarrativeChar = btChar{
-		"Navigation Narrative",
-		mustParse("00010002-78fc-48fe-8e23-433b3a1942d0"),
-		navigationServiceUUID,
-	}
-	navigationManDist = btChar{
-		"Navigation Man Dist",
-		mustParse("00010003-78fc-48fe-8e23-433b3a1942d0"),
-		navigationServiceUUID,
-	}
-	navigationProgress = btChar{
-		"Navigation Progress",
-		mustParse("00010004-78fc-48fe-8e23-433b3a1942d0"),
-		navigationServiceUUID,
-	}
-	weatherDataChar = btChar{
-		"Weather Data",
-		mustParse("00050001-78fc-48fe-8e23-433b3a1942d0"),
-		weatherServiceUUID,
-	}
-	musicEventChar = btChar{
-		"Music Event",
-		mustParse("00000001-78fc-48fe-8e23-433b3a1942d0"),
-		musicServiceUUID,
-	}
-	musicStatusChar = btChar{
-		"Music Status",
-		mustParse("00000002-78fc-48fe-8e23-433b3a1942d0"),
-		musicServiceUUID,
-	}
-	musicArtistChar = btChar{
-		"Music Artist",
-		mustParse("00000003-78fc-48fe-8e23-433b3a1942d0"),
-		musicServiceUUID,
-	}
-	musicTrackChar = btChar{
-		"Music Track",
-		mustParse("00000004-78fc-48fe-8e23-433b3a1942d0"),
-		musicServiceUUID,
-	}
-	musicAlbumChar = btChar{
-		"Music Album",
-		mustParse("00000005-78fc-48fe-8e23-433b3a1942d0"),
-		musicServiceUUID,
-	}
-)
-
-func mustParse(s string) bluetooth.UUID {
-	uuid, err := bluetooth.ParseUUID(s)
-	if err != nil {
-		panic(err)
-	}
-	return uuid
-}

infinitime/dfu.go

@@ -1,222 +0,0 @@
-package infinitime
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/fs"
-
-	"tinygo.org/x/bluetooth"
-)
-
-const (
-	dfuSegmentSize     = 20 // Size of each firmware packet
-	dfuPktRecvInterval = 10 // Amount of packets to send before checking for receipt
-)
-
-var (
-	dfuCmdStart              = []byte{0x01, 0x04}
-	dfuCmdRecvInitPkt        = []byte{0x02, 0x00}
-	dfuCmdInitPktComplete    = []byte{0x02, 0x01}
-	dfuCmdPktReceiptInterval = []byte{0x08}
-	dfuCmdRecvFirmware       = []byte{0x03}
-	dfuCmdValidate           = []byte{0x04}
-	dfuCmdActivateReset      = []byte{0x05}
-
-	dfuResponseStart            = []byte{0x10, 0x01, 0x01}
-	dfuResponseInitParams       = []byte{0x10, 0x02, 0x01}
-	dfuResponseRecvFwImgSuccess = []byte{0x10, 0x03, 0x01}
-	dfuResponseValidate         = []byte{0x10, 0x04, 0x01}
-)
-
-// DFUOptions contains options for [UpgradeFirmware]
-type DFUOptions struct {
-	InitPacket      fs.File
-	FirmwareImage   fs.File
-	ProgressFunc    func(sent, received, total uint32)
-	SegmentSize     int
-	ReceiveInterval uint8
-}
-
-// UpgradeFirmware upgrades the firmware running on the PineTime.
-func (d *Device) UpgradeFirmware(opts DFUOptions) error {
-	if opts.SegmentSize <= 0 {
-		opts.SegmentSize = dfuSegmentSize
-	}
-
-	if opts.ReceiveInterval <= 0 {
-		opts.ReceiveInterval = dfuPktRecvInterval
-	}
-
-	ctrlPoint, err := d.getChar(dfuCtrlPointChar)
-	if err != nil {
-		return err
-	}
-
-	packet, err := d.getChar(dfuPacketChar)
-	if err != nil {
-		return err
-	}
-
-	d.deviceMtx.Lock()
-	defer d.deviceMtx.Unlock()
-
-	d.updating.Store(true)
-	defer d.updating.Store(false)
-
-	_, err = ctrlPoint.WriteWithoutResponse(dfuCmdStart)
-	if err != nil {
-		return err
-	}
-
-	fi, err := opts.FirmwareImage.Stat()
-	if err != nil {
-		return err
-	}
-	size := uint32(fi.Size())
-
-	sizePacket := make([]byte, 8, 12)
-	sizePacket = binary.LittleEndian.AppendUint32(sizePacket, size)
-	_, err = packet.WriteWithoutResponse(sizePacket)
-	if err != nil {
-		return err
-	}
-
-	_, err = awaitDFUResponse(ctrlPoint, dfuResponseStart)
-	if err != nil {
-		return err
-	}
-
-	err = writeDFUInitPacket(ctrlPoint, packet, opts.InitPacket)
-	if err != nil {
-		return err
-	}
-
-	err = setRecvInterval(ctrlPoint, opts.ReceiveInterval)
-	if err != nil {
-		return err
-	}
-
-	err = sendFirmware(ctrlPoint, packet, opts, size)
-	if err != nil {
-		return err
-	}
-
-	return finalize(ctrlPoint)
-}
-
-func finalize(ctrlPoint *bluetooth.DeviceCharacteristic) error {
-	_, err := ctrlPoint.WriteWithoutResponse(dfuCmdValidate)
-	if err != nil {
-		return err
-	}
-
-	_, err = awaitDFUResponse(ctrlPoint, dfuResponseValidate)
-	if err != nil {
-		return err
-	}
-
-	_, _ = ctrlPoint.WriteWithoutResponse(dfuCmdActivateReset)
-	return nil
-}
-
-func sendFirmware(ctrlPoint, packet *bluetooth.DeviceCharacteristic, opts DFUOptions, totalSize uint32) error {
-	_, err := ctrlPoint.WriteWithoutResponse(dfuCmdRecvFirmware)
-	if err != nil {
-		return err
-	}
-
-	var (
-		chunksSinceReceipt uint8
-		bytesSent          uint32
-	)
-
-	chunk := make([]byte, opts.SegmentSize)
-	for {
-		n, err := opts.FirmwareImage.Read(chunk)
-		if err != nil && !errors.Is(err, io.EOF) {
-			return err
-		} else if n == 0 {
-			break
-		}
-
-		bytesSent += uint32(n)
-		_, err = packet.WriteWithoutResponse(chunk[:n])
-		if err != nil {
-			return err
-		}
-
-		if errors.Is(err, io.EOF) {
-			break
-		}
-
-		chunksSinceReceipt += 1
-		if chunksSinceReceipt == opts.ReceiveInterval {
-			sizeData, err := awaitDFUResponse(ctrlPoint, []byte{0x11})
-			if err != nil {
-				return err
-			}
-			size := binary.LittleEndian.Uint32(sizeData)
-			if size != bytesSent {
-				return fmt.Errorf("size mismatch: expected %d, got %d", bytesSent, size)
-			}
-			if opts.ProgressFunc != nil {
-				opts.ProgressFunc(bytesSent, size, totalSize)
-			}
-			chunksSinceReceipt = 0
-		}
-	}
-
-	return nil
-}
-
-func writeDFUInitPacket(ctrlPoint, packet *bluetooth.DeviceCharacteristic, initPkt fs.File) error {
-	_, err := ctrlPoint.WriteWithoutResponse(dfuCmdRecvInitPkt)
-	if err != nil {
-		return err
-	}
-
-	initData, err := io.ReadAll(initPkt)
-	if err != nil {
-		return err
-	}
-
-	_, err = packet.WriteWithoutResponse(initData)
-	if err != nil {
-		return err
-	}
-
-	_, err = ctrlPoint.WriteWithoutResponse(dfuCmdInitPktComplete)
-	if err != nil {
-		return err
-	}
-
-	_, err = awaitDFUResponse(ctrlPoint, dfuResponseInitParams)
-	return err
-}
-
-func setRecvInterval(ctrlPoint *bluetooth.DeviceCharacteristic, interval uint8) error {
-	_, err := ctrlPoint.WriteWithoutResponse(append(dfuCmdPktReceiptInterval, interval))
-	return err
-}
-
-func awaitDFUResponse(ctrlPoint *bluetooth.DeviceCharacteristic, expect []byte) ([]byte, error) {
-	respCh := make(chan []byte, 1)
-	err := ctrlPoint.EnableNotifications(func(buf []byte) {
-		respCh <- buf
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	data := <-respCh
-	ctrlPoint.EnableNotifications(nil)
-
-	if !bytes.HasPrefix(data, expect) {
-		return nil, fmt.Errorf("unexpected dfu response %x (expected %x)", data, expect)
-	}
-
-	return bytes.TrimPrefix(data, expect), nil
-}

infinitime/fs.go

@@ -1,617 +0,0 @@
-package infinitime
-
-import (
-	"errors"
-	"io"
-	"io/fs"
-	"math"
-	"path"
-	"strings"
-	"sync"
-	"sync/atomic"
-
-	"go.elara.ws/itd/internal/fsproto"
-	"tinygo.org/x/bluetooth"
-)
-
-// FS represents a remote BLE filesystem
-type FS struct {
-	mtx sync.Mutex
-	dev *Device
-}
-
-// Stat gets information about a file at the given path.
-//
-// WARNING: Since there's no stat command in the BLE FS protocol,
-// this function does a ReadDir and then finds the requested file
-// in the results, which makes it pretty slow.
-func (ifs *FS) Stat(p string) (fs.FileInfo, error) {
-	dir := path.Dir(p)
-	entries, err := ifs.ReadDir(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, entry := range entries {
-		if entry.Name() == path.Base(p) {
-			return entry.Info()
-		}
-	}
-
-	return nil, fsproto.ErrFileNotExists
-}
-
-// Remove removes a file or empty directory at the given path.
-//
-// For a function that removes directories recursively, see [FS.RemoveAll]
-func (ifs *FS) Remove(path string) error {
-	ifs.mtx.Lock()
-	defer ifs.mtx.Unlock()
-
-	char, err := ifs.dev.getChar(fsTransferChar)
-	if err != nil {
-		return err
-	}
-
-	return ifs.requestThenAwaitResponse(
-		char,
-		fsproto.DeleteFileOpcode,
-		fsproto.DeleteFileRequest{
-			PathLen: uint16(len(path)),
-			Path:    path,
-		},
-		func(buf []byte) (bool, error) {
-			var mdr fsproto.DeleteFileResponse
-			return true, fsproto.ReadResponse(buf, fsproto.DeleteFileResp, &mdr)
-		},
-	)
-}
-
-// Rename moves a file or directory from an old path to a new path.
-func (ifs *FS) Rename(old, new string) error {
-	ifs.mtx.Lock()
-	defer ifs.mtx.Unlock()
-
-	char, err := ifs.dev.getChar(fsTransferChar)
-	if err != nil {
-		return err
-	}
-
-	return ifs.requestThenAwaitResponse(
-		char,
-		fsproto.MoveFileOpcode,
-		fsproto.MoveFileRequest{
-			OldPathLen: uint16(len(old)),
-			OldPath:    old,
-			NewPathLen: uint16(len(new)),
-			NewPath:    new,
-		},
-		func(buf []byte) (bool, error) {
-			var mfr fsproto.MoveFileResponse
-			return true, fsproto.ReadResponse(buf, fsproto.MoveFileResp, &mfr)
-		},
-	)
-}
-
-// Mkdir creates a new directory at the specified path.
-//
-// For a function that creates necessary parents as well, see [FS.MkdirAll]
-func (ifs *FS) Mkdir(path string) error {
-	ifs.mtx.Lock()
-	defer ifs.mtx.Unlock()
-
-	char, err := ifs.dev.getChar(fsTransferChar)
-	if err != nil {
-		return err
-	}
-
-	return ifs.requestThenAwaitResponse(
-		char,
-		fsproto.MakeDirectoryOpcode,
-		fsproto.MkdirRequest{
-			PathLen: uint16(len(path)),
-			Path:    path,
-		},
-		func(buf []byte) (bool, error) {
-			var mdr fsproto.MkdirResponse
-			return true, fsproto.ReadResponse(buf, fsproto.MakeDirectoryResp, &mdr)
-		},
-	)
-}
-
-// ReadDir reads the directory at the specified path and returns a list of directory entries.
-func (ifs *FS) ReadDir(path string) ([]fs.DirEntry, error) {
-	ifs.mtx.Lock()
-	defer ifs.mtx.Unlock()
-
-	char, err := ifs.dev.getChar(fsTransferChar)
-	if err != nil {
-		return nil, err
-	}
-
-	var out []fs.DirEntry
-	return out, ifs.requestThenAwaitResponse(
-		char,
-		fsproto.ListDirectoryOpcode,
-		fsproto.ListDirRequest{
-			PathLen: uint16(len(path)),
-			Path:    path,
-		},
-		func(buf []byte) (bool, error) {
-			var ldr fsproto.ListDirResponse
-			err := fsproto.ReadResponse(buf, fsproto.ListDirectoryResp, &ldr)
-			if err != nil {
-				return true, err
-			}
-
-			if ldr.EntryNum == ldr.TotalEntries {
-				return true, nil
-			}
-
-			out = append(out, DirEntry{
-				flags:   ldr.Flags,
-				modtime: ldr.ModTime,
-				size:    ldr.FileSize,
-				path:    string(ldr.Path),
-			})
-
-			return false, nil
-		},
-	)
-}
-
-// RemoveAll removes the file at the specified path and any children it contains,
-// similar to the rm -r command.
-func (ifs *FS) RemoveAll(p string) error {
-	if p == "" {
-		return nil
-	}
-
-	if path.Clean(p) == "/" {
-		return fsproto.ErrNoRemoveRoot
-	}
-
-	fi, err := ifs.Stat(p)
-	if err != nil {
-		return nil
-	}
-
-	if fi.IsDir() {
-		return ifs.removeWithChildren(p)
-	} else {
-		err = ifs.Remove(p)
-
-		var code int8
-		if err, ok := err.(fsproto.Error); ok {
-			code = err.Code
-		}
-
-		if err != nil && code != -2 {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// removeWithChildren removes the directory at the given path and its children recursively.
-func (ifs *FS) removeWithChildren(p string) error {
-	list, err := ifs.ReadDir(p)
-	if err != nil {
-		return err
-	}
-
-	for _, entry := range list {
-		name := entry.Name()
-
-		if name == "." || name == ".." {
-			continue
-		}
-		entryPath := path.Join(p, name)
-
-		if entry.IsDir() {
-			err = ifs.removeWithChildren(entryPath)
-		} else {
-			err = ifs.Remove(entryPath)
-		}
-
-		var code int8
-		if err, ok := err.(fsproto.Error); ok {
-			code = err.Code
-		}
-
-		if err != nil && code != -2 {
-			return err
-		}
-	}
-
-	return ifs.Remove(p)
-}
-
-// MkdirAll creates a directory and any necessary parents in the file system,
-// similar to the mkdir -p command.
-func (ifs *FS) MkdirAll(path string) error {
-	if path == "" || path == "/" {
-		return nil
-	}
-
-	splitPath := strings.Split(path, "/")
-	for i := 1; i < len(splitPath); i++ {
-		curPath := strings.Join(splitPath[0:i+1], "/")
-
-		err := ifs.Mkdir(curPath)
-
-		var code int8
-		if err, ok := err.(fsproto.Error); ok {
-			code = err.Code
-		}
-
-		if err != nil && code != -17 {
-			return err
-		}
-	}
-
-	return nil
-}
-
-var _ fs.File = (*File)(nil)
-
-// File represents a remote file on a BLE filesystem.
-//
-// If ProgressFunc is set, it will be called whenever a read or write happens
-// with the amount of bytes transferred and the total size of the file.
-type File struct {
-	fs           *FS
-	path         string
-	offset       uint32
-	size         uint32
-	readOnly     bool
-	closed       bool
-	ProgressFunc func(transferred, total uint32)
-}
-
-// Open opens an existing file at the specified path.
-// It returns a handle for the file and an error, if any.
-func (ifs *FS) Open(path string) (*File, error) {
-	return &File{
-		fs:       ifs,
-		path:     path,
-		offset:   0,
-		readOnly: true,
-	}, nil
-}
-
-// Create creates a new file with the specified path and size.
-// It returns a handle for the created file and an error, if any.
-func (ifs *FS) Create(path string, size uint32) (*File, error) {
-	return &File{
-		fs:     ifs,
-		path:   path,
-		offset: 0,
-		size:   size,
-	}, nil
-}
-
-// Write writes data from the byte slice b to the file.
-// It returns the number of bytes written and an error, if any.
-func (fl *File) Write(b []byte) (int, error) {
-	if fl.closed {
-		return 0, fsproto.ErrFileClosed
-	}
-
-	if fl.readOnly {
-		return 0, fsproto.ErrFileReadOnly
-	}
-
-	fl.fs.mtx.Lock()
-	defer fl.fs.mtx.Unlock()
-
-	char, err := fl.fs.dev.getChar(fsTransferChar)
-	if err != nil {
-		return 0, err
-	}
-	defer char.EnableNotifications(nil)
-
-	var chunkLen uint32
-
-	dataLen := uint32(len(b))
-	transferred := uint32(0)
-	mtu := uint32(fl.fs.mtu(char))
-
-	// continueCh is used to prevent race conditions. When the
-	// request loop starts, it reads from continueCh, blocking it
-	// until it's "released" by the notification function after
-	// the response is processed.
-	continueCh := make(chan struct{}, 2)
-	var notifErr error
-	err = char.EnableNotifications(func(buf []byte) {
-		var wfr fsproto.WriteFileResponse
-		err = fsproto.ReadResponse(buf, fsproto.WriteFileResp, &wfr)
-		if err != nil {
-			notifErr = err
-			char.EnableNotifications(nil)
-			close(continueCh)
-			return
-		}
-
-		transferred += chunkLen
-		fl.offset += chunkLen
-
-		if wfr.FreeSpace == 0 || transferred == dataLen {
-			char.EnableNotifications(nil)
-			close(continueCh)
-			return
-		}
-
-		if fl.ProgressFunc != nil {
-			fl.ProgressFunc(transferred, fl.size)
-		}
-
-		// Release the request loop
-		continueCh <- struct{}{}
-	})
-
-	err = fsproto.WriteRequest(char, fsproto.WriteFileHeaderOpcode, fsproto.WriteFileHeaderRequest{
-		PathLen:  uint16(len(fl.path)),
-		Offset:   fl.offset,
-		FileSize: fl.size,
-		Path:     fl.path,
-	})
-	if err != nil {
-		return int(transferred), err
-	}
-
-	for range continueCh {
-		if notifErr != nil {
-			return int(transferred), notifErr
-		}
-
-		amountLeft := dataLen - transferred
-		chunkLen = mtu
-		if amountLeft < mtu {
-			chunkLen = amountLeft
-		}
-
-		err = fsproto.WriteRequest(char, fsproto.WriteFileOpcode, fsproto.WriteFileRequest{
-			Status:   0x01,
-			Offset:   fl.offset,
-			ChunkLen: chunkLen,
-			Data:     b[transferred : transferred+chunkLen],
-		})
-		if err != nil {
-			return int(transferred), err
-		}
-	}
-
-	return int(transferred), notifErr
-}
-
-// Read reads data from the file into the byte slice b.
-// It returns the number of bytes read and an error, if any.
-func (fl *File) Read(b []byte) (int, error) {
-	if fl.closed {
-		return 0, fsproto.ErrFileClosed
-	}
-
-	fl.fs.mtx.Lock()
-	defer fl.fs.mtx.Unlock()
-
-	char, err := fl.fs.dev.getChar(fsTransferChar)
-	if err != nil {
-		return 0, err
-	}
-	defer char.EnableNotifications(nil)
-
-	transferred := uint32(0)
-	maxLen := uint32(len(b))
-	mtu := uint32(fl.fs.mtu(char))
-
-	var (
-		notifErr error
-		done     bool
-	)
-
-	// continueCh is used to prevent race conditions. When the
-	// request loop starts, it reads from continueCh, blocking it
-	// until it's "released" by the notification function after
-	// the response is processed.
-	continueCh := make(chan struct{}, 2)
-	err = char.EnableNotifications(func(buf []byte) {
-		var rfr fsproto.ReadFileResponse
-		err = fsproto.ReadResponse(buf, fsproto.ReadFileResp, &rfr)
-		if err != nil {
-			notifErr = err
-			char.EnableNotifications(nil)
-			close(continueCh)
-			return
-		}
-
-		fl.size = rfr.FileSize
-
-		if rfr.Offset == rfr.FileSize || rfr.ChunkLen == 0 {
-			notifErr = io.EOF
-			done = true
-			char.EnableNotifications(nil)
-			close(continueCh)
-			return
-		}
-
-		n := copy(b[transferred:], rfr.Data[:rfr.ChunkLen])
-		fl.offset += uint32(n)
-		transferred += uint32(n)
-
-		if fl.ProgressFunc != nil {
-			fl.ProgressFunc(transferred, rfr.FileSize)
-		}
-
-		// Release the request loop
-		continueCh <- struct{}{}
-	})
-	if err != nil {
-		return 0, err
-	}
-	defer char.EnableNotifications(nil)
-
-	amountLeft := maxLen - transferred
-	chunkLen := mtu
-	if amountLeft < mtu {
-		chunkLen = amountLeft
-	}
-
-	err = fsproto.WriteRequest(char, fsproto.ReadFileHeaderOpcode, fsproto.ReadFileHeaderRequest{
-		PathLen: uint16(len(fl.path)),
-		Offset:  fl.offset,
-		ReadLen: chunkLen,
-		Path:    fl.path,
-	})
-	if err != nil {
-		return 0, err
-	}
-
-	if notifErr != nil {
-		return int(transferred), notifErr
-	}
-
-	for !done {
-		// Wait for the notification function to release the loop
-		<-continueCh
-
-		if notifErr != nil {
-			return int(transferred), notifErr
-		}
-
-		amountLeft = maxLen - transferred
-		chunkLen = mtu
-		if amountLeft < mtu {
-			chunkLen = amountLeft
-		}
-
-		err = fsproto.WriteRequest(char, fsproto.ReadFileOpcode, fsproto.ReadFileRequest{
-			Status:  0x01,
-			Offset:  fl.offset,
-			ReadLen: chunkLen,
-		})
-		if err != nil {
-			return int(transferred), err
-		}
-	}
-
-	return int(transferred), notifErr
-}
-
-// Stat returns information about the file,
-func (fl *File) Stat() (fs.FileInfo, error) {
-	return fl.fs.Stat(fl.path)
-}
-
-// Seek sets the offset for the next Read or Write on the file to the specified offset.
-// The whence parameter specifies the seek reference point:
-//
-//	io.SeekStart: offset is relative to the start of the file.
-//	io.SeekCurrent: offset is relative to the current offset.
-//	io.SeekEnd: offset is relative to the end of the file.
-//
-// Seek returns the new offset and an error, if any.
-func (fl *File) Seek(offset int64, whence int) (int64, error) {
-	if fl.closed {
-		return 0, fsproto.ErrFileClosed
-	}
-
-	if offset > math.MaxUint32 {
-		return 0, fsproto.ErrInvalidOffset
-	}
-	u32Offset := uint32(offset)
-
-	fl.fs.mtx.Lock()
-	defer fl.fs.mtx.Unlock()
-
-	if fl.size == 0 {
-		return 0, errors.New("file size unknown")
-	}
-
-	var newOffset uint32
-	switch whence {
-	case io.SeekStart:
-		newOffset = u32Offset
-	case io.SeekCurrent:
-		newOffset = fl.offset + u32Offset
-	case io.SeekEnd:
-		newOffset = fl.size + u32Offset
-	}
-
-	if newOffset > fl.size || newOffset < 0 {
-		return 0, fsproto.ErrInvalidOffset
-	}
-	fl.offset = newOffset
-
-	return int64(fl.offset), nil
-}
-
-// Close closes the file for future operations
-func (fl *File) Close() error {
-	fl.fs.mtx.Lock()
-	defer fl.fs.mtx.Unlock()
-	fl.closed = true
-	return nil
-}
-
-// requestThenAwaitResponse executes a BLE FS request and then waits for one or more responses,
-// until fn returns true or an error is encountered.
-func (ifs *FS) requestThenAwaitResponse(char *bluetooth.DeviceCharacteristic, opcode fsproto.FSReqOpcode, req any, fn func(buf []byte) (bool, error)) error {
-	var stopped atomic.Bool
-	errCh := make(chan error, 1)
-	char.EnableNotifications(func(buf []byte) {
-		stop, err := fn(buf)
-		if err != nil && !stopped.Load() {
-			errCh <- err
-			char.EnableNotifications(nil)
-			return
-		} else if !stopped.Load() {
-			errCh <- nil
-		}
-
-		if stop && !stopped.Load() {
-			stopped.Store(true)
-			close(errCh)
-			char.EnableNotifications(nil)
-		}
-	})
-	defer char.EnableNotifications(nil)
-
-	err := fsproto.WriteRequest(char, opcode, req)
-	if err != nil {
-		return err
-	}
-
-	for err := range errCh {
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (ifs *FS) mtu(char *bluetooth.DeviceCharacteristic) uint16 {
-	mtuVal, _ := char.GetMTU()
-	if mtuVal == 0 {
-		mtuVal = 256
-	}
-	return mtuVal - 20
-}
-
-var _ fs.FS = (*GoFS)(nil)
-var _ fs.StatFS = (*GoFS)(nil)
-var _ fs.ReadDirFS = (*GoFS)(nil)
-
-// GoFS implements [io/fs.FS], [io/fs.StatFS], and [io/fs.ReadDirFS]
-// for the InfiniTime filesystem
-type GoFS struct {
-	*FS
-}
-
-// Open opens an existing file at the specified path.
-// It returns a handle for the file and an error, if any.
-func (gfs GoFS) Open(path string) (fs.File, error) {
-	return gfs.FS.Open(path)
-}

infinitime/fstypes.go

@@ -1,142 +0,0 @@
-package infinitime
-
-import (
-	"fmt"
-	"io/fs"
-	"strconv"
-	"time"
-)
-
-// DirEntry represents an entry from a directory listing
-type DirEntry struct {
-	flags   uint32
-	modtime uint64
-	size    uint32
-	path    string
-}
-
-// Name returns the name of the file described by the entry
-func (de DirEntry) Name() string {
-	return de.path
-}
-
-// IsDir reports whether the entry describes a directory.
-func (de DirEntry) IsDir() bool {
-	return de.flags&0b1 == 1
-}
-
-// Type returns the type bits for the entry.
-func (de DirEntry) Type() fs.FileMode {
-	if de.IsDir() {
-		return fs.ModeDir
-	} else {
-		return 0
-	}
-}
-
-// Info returns the FileInfo for the file or subdirectory described by the entry.
-func (de DirEntry) Info() (fs.FileInfo, error) {
-	return FileInfo{
-		name:    de.path,
-		size:    de.size,
-		modtime: de.modtime,
-		mode:    de.Type(),
-		isDir:   de.IsDir(),
-	}, nil
-}
-
-func (de DirEntry) String() string {
-	var isDirChar rune
-	if de.IsDir() {
-		isDirChar = 'd'
-	} else {
-		isDirChar = '-'
-	}
-
-	// Get human-readable value for file size
-	val, unit := bytesHuman(de.size)
-	prec := 0
-	// If value is less than 10, set precision to 1
-	if val < 10 {
-		prec = 1
-	}
-	// Convert float to string
-	valStr := strconv.FormatFloat(val, 'f', prec, 64)
-
-	// Return string formatted like so:
-	// -  10 kB file
-	// or:
-	// d   0 B  .
-	return fmt.Sprintf(
-		"%c %3s %-2s %s",
-		isDirChar,
-		valStr,
-		unit,
-		de.path,
-	)
-}
-
-func bytesHuman(b uint32) (float64, string) {
-	const unit = 1000
-	// Set possible unit prefixes (PineTime flash is 4MB)
-	units := [2]rune{'k', 'M'}
-	// If amount of bytes is less than smallest unit
-	if b < unit {
-		// Return unchanged with unit "B"
-		return float64(b), "B"
-	}
-
-	div, exp := uint32(unit), 0
-	// Get decimal values and unit prefix index
-	for n := b / unit; n >= unit; n /= unit {
-		div *= unit
-		exp++
-	}
-
-	// Create string for full unit
-	unitStr := string([]rune{units[exp], 'B'})
-
-	// Return decimal with unit string
-	return float64(b) / float64(div), unitStr
-}
-
-// FileInfo implements fs.FileInfo
-type FileInfo struct {
-	name    string
-	size    uint32
-	modtime uint64
-	mode    fs.FileMode
-	isDir   bool
-}
-
-// Name returns the base name of the file
-func (fi FileInfo) Name() string {
-	return fi.name
-}
-
-// Size returns the total size of the file
-func (fi FileInfo) Size() int64 {
-	return int64(fi.size)
-}
-
-// Mode returns the mode of the file
-func (fi FileInfo) Mode() fs.FileMode {
-	return fi.mode
-}
-
-// ModTime returns the modification time of the file
-// As of now, this is unimplemented in InfiniTime, and
-// will always return 0.
-func (fi FileInfo) ModTime() time.Time {
-	return time.Unix(0, int64(fi.modtime))
-}
-
-// IsDir returns whether the file is a directory
-func (fi FileInfo) IsDir() bool {
-	return fi.isDir
-}
-
-// Sys is unimplemented and returns nil
-func (fi FileInfo) Sys() any {
-	return nil
-}

infinitime/infinitime.go

@@ -1,173 +0,0 @@
-package infinitime
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"tinygo.org/x/bluetooth"
-)
-
-type Options struct {
-	Allowlist    []string
-	Blocklist    []string
-	ScanInterval time.Duration
-
-	OnDisconnect func(dev *Device)
-	OnReconnect  func(dev *Device)
-	OnConnect    func(dev *Device)
-}
-
-func reconnect(opts Options, adapter *bluetooth.Adapter, device *Device, mac string) {
-	if device == nil {
-		return
-	}
-
-	done := false
-	for {
-		adapter.Scan(func(a *bluetooth.Adapter, sr bluetooth.ScanResult) {
-			if sr.Address.String() != mac {
-				return
-			}
-
-			dev, err := a.Connect(sr.Address, bluetooth.ConnectionParams{})
-			if err != nil {
-				return
-			}
-			adapter.StopScan()
-
-			device.deviceMtx.Lock()
-			device.device = dev
-			device.deviceMtx.Unlock()
-
-			device.notifierMtx.Lock()
-			for char, notifier := range device.notifierMap {
-				c, err := device.getChar(char)
-				if err != nil {
-					continue
-				}
-
-				err = c.EnableNotifications(nil)
-				if err != nil {
-					continue
-				}
-
-				err = c.EnableNotifications(notifier.notify)
-				if err != nil {
-					continue
-				}
-			}
-			device.notifierMtx.Unlock()
-
-			done = true
-		})
-
-		if done {
-			return
-		}
-
-		time.Sleep(opts.ScanInterval)
-	}
-}
-
-func Connect(opts Options) (device *Device, err error) {
-	adapter := bluetooth.DefaultAdapter
-
-	if opts.ScanInterval == 0 {
-		opts.ScanInterval = 2 * time.Minute
-	}
-
-	var mac string
-	adapter.SetConnectHandler(func(dev bluetooth.Device, connected bool) {
-		if mac == "" || dev.Address.String() != mac {
-			return
-		}
-
-		if connected {
-			if opts.OnReconnect != nil {
-				opts.OnReconnect(device)
-			}
-		} else {
-			if opts.OnDisconnect != nil {
-				opts.OnDisconnect(device)
-			}
-			go reconnect(opts, adapter, device, mac)
-		}
-	})
-
-	err = adapter.Enable()
-	if err != nil {
-		return nil, err
-	}
-
-	var scanErr error
-	err = adapter.Scan(func(a *bluetooth.Adapter, sr bluetooth.ScanResult) {
-		if sr.LocalName() != "InfiniTime" {
-			return
-		}
-
-		dev, err := a.Connect(sr.Address, bluetooth.ConnectionParams{})
-		if err != nil {
-			scanErr = err
-			adapter.StopScan()
-			return
-		}
-		mac = dev.Address.String()
-
-		device = &Device{adapter: a, device: dev, notifierMap: map[btChar]notifier{}}
-		if opts.OnConnect != nil {
-			opts.OnConnect(device)
-		}
-		adapter.StopScan()
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	if scanErr != nil {
-		return nil, scanErr
-	}
-
-	return device, nil
-}
-
-// Device represents an InfiniTime device
-type Device struct {
-	adapter *bluetooth.Adapter
-
-	deviceMtx sync.Mutex
-	device    bluetooth.Device
-	updating  atomic.Bool
-
-	notifierMtx sync.Mutex
-	notifierMap map[btChar]notifier
-}
-
-// FS returns a handle for InifniTime's filesystem'
-func (d *Device) FS() *FS {
-	return &FS{
-		dev: d,
-	}
-}
-
-func (d *Device) getChar(c btChar) (*bluetooth.DeviceCharacteristic, error) {
-	if d.updating.Load() {
-		return nil, fmt.Errorf("device is currently updating")
-	}
-
-	d.deviceMtx.Lock()
-	defer d.deviceMtx.Unlock()
-
-	services, err := d.device.DiscoverServices([]bluetooth.UUID{c.ServiceID})
-	if err != nil {
-		return nil, fmt.Errorf("characteristic %s (%s) not found", c.ID, c.Name)
-	}
-
-	chars, err := services[0].DiscoverCharacteristics([]bluetooth.UUID{c.ID})
-	if err != nil {
-		return nil, fmt.Errorf("characteristic %s (%s) not found", c.ID, c.Name)
-	}
-
-	return chars[0], err
-}

infinitime/info.go

@@ -1,101 +0,0 @@
-package infinitime
-
-import (
-	"context"
-	"encoding/binary"
-)
-
-// Address returns the MAC address of the connected device.
-func (d *Device) Address() string {
-	return d.device.Address.String()
-}
-
-// Version returns the version of InifniTime that the connected device is running.
-func (d *Device) Version() (string, error) {
-	c, err := d.getChar(firmwareVerChar)
-	if err != nil {
-		return "", err
-	}
-
-	ver := make([]byte, 16)
-	n, err := c.Read(ver)
-	return string(ver[:n]), err
-}
-
-// BatteryLevel returns the current battery level of the connected PineTime.
-func (d *Device) BatteryLevel() (lvl uint8, err error) {
-	c, err := d.getChar(batteryLevelChar)
-	if err != nil {
-		return 0, err
-	}
-
-	err = binary.Read(c, binary.LittleEndian, &lvl)
-	return lvl, err
-}
-
-// WatchBatteryLevel calls fn whenever the battery level changes.
-func (d *Device) WatchBatteryLevel(ctx context.Context, fn func(level uint8, err error)) error {
-	return watchChar(ctx, d, batteryLevelChar, fn)
-}
-
-// StepCount returns the current step count recorded on the watch.
-func (d *Device) StepCount() (sc uint32, err error) {
-	c, err := d.getChar(stepCountChar)
-	if err != nil {
-		return 0, err
-	}
-
-	err = binary.Read(c, binary.LittleEndian, &sc)
-	return sc, err
-}
-
-// WatchStepCount calls fn whenever the step count changes.
-func (d *Device) WatchStepCount(ctx context.Context, fn func(count uint32, err error)) error {
-	return watchChar(ctx, d, stepCountChar, fn)
-}
-
-// HeartRate returns the current heart rate recorded on the watch.
-func (d *Device) HeartRate() (uint8, error) {
-	c, err := d.getChar(heartRateChar)
-	if err != nil {
-		return 0, err
-	}
-
-	data := make([]byte, 2)
-	_, err = c.Read(data)
-	if err != nil {
-		return 0, err
-	}
-
-	return data[1], nil
-}
-
-// WatchHeartRate calls fn whenever the heart rate changes.
-func (d *Device) WatchHeartRate(ctx context.Context, fn func(rate uint8, err error)) error {
-	return watchChar(ctx, d, heartRateChar, func(rate [2]uint8, err error) {
-		fn(rate[1], err)
-	})
-}
-
-// MotionValues represents gyroscope coordinates.
-type MotionValues struct {
-	X int16
-	Y int16
-	Z int16
-}
-
-// Motion returns the current gyroscope coordinates of the PineTime.
-func (d *Device) Motion() (mv MotionValues, err error) {
-	c, err := d.getChar(rawMotionChar)
-	if err != nil {
-		return MotionValues{}, err
-	}
-
-	err = binary.Read(c, binary.LittleEndian, &mv)
-	return mv, err
-}
-
-// WatchMotion calls fn whenever the gyroscope coordinates change.
-func (d *Device) WatchMotion(ctx context.Context, fn func(level MotionValues, err error)) error {
-	return watchChar(ctx, d, rawMotionChar, fn)
-}

infinitime/music.go

@@ -1,68 +0,0 @@
-package infinitime
-
-import "context"
-
-type MusicEvent uint8
-
-const (
-	MusicEventOpen    MusicEvent = 0xe0
-	MusicEventPlay    MusicEvent = 0x00
-	MusicEventPause   MusicEvent = 0x01
-	MusicEventNext    MusicEvent = 0x03
-	MusicEventPrev    MusicEvent = 0x04
-	MusicEventVolUp   MusicEvent = 0x05
-	MusicEventVolDown MusicEvent = 0x06
-)
-
-// SetMusicStatus sets whether the music is playing or paused.
-func (d *Device) SetMusicStatus(playing bool) error {
-	char, err := d.getChar(musicStatusChar)
-	if err != nil {
-		return err
-	}
-
-	if playing {
-		_, err = char.WriteWithoutResponse([]byte{0x1})
-	} else {
-		_, err = char.WriteWithoutResponse([]byte{0x0})
-	}
-	return err
-}
-
-// SetMusicArtist sets the music artist.
-func (d *Device) SetMusicArtist(artist string) error {
-	char, err := d.getChar(musicArtistChar)
-	if err != nil {
-		return err
-	}
-
-	_, err = char.WriteWithoutResponse([]byte(artist))
-	return err
-}
-
-// SetMusicTrack sets the music track name.
-func (d *Device) SetMusicTrack(track string) error {
-	char, err := d.getChar(musicTrackChar)
-	if err != nil {
-		return err
-	}
-
-	_, err = char.WriteWithoutResponse([]byte(track))
-	return err
-}
-
-// SetMusicAlbum sets the music album name.
-func (d *Device) SetMusicAlbum(album string) error {
-	char, err := d.getChar(musicAlbumChar)
-	if err != nil {
-		return err
-	}
-
-	_, err = char.WriteWithoutResponse([]byte(album))
-	return err
-}
-
-// WatchMusicEvents calls fn whenever the InfiniTime music app broadcasts an event.
-func (d *Device) WatchMusicEvents(ctx context.Context, fn func(event MusicEvent, err error)) error {
-	return watchChar(ctx, d, musicEventChar, fn)
-}

infinitime/navigation.go

@@ -1,137 +0,0 @@
-package infinitime
-
-type NavFlag string
-
-const (
-	NavFlagArrive                  NavFlag = "arrive"
-	NavFlagArriveLeft              NavFlag = "arrive-left"
-	NavFlagArriveRight             NavFlag = "arrive-right"
-	NavFlagArriveStraight          NavFlag = "arrive-straight"
-	NavFlagClose                   NavFlag = "close"
-	NavFlagContinue                NavFlag = "continue"
-	NavFlagContinueLeft            NavFlag = "continue-left"
-	NavFlagContinueRight           NavFlag = "continue-right"
-	NavFlagContinueSlightLeft      NavFlag = "continue-slight-left"
-	NavFlagContinueSlightRight     NavFlag = "continue-slight-right"
-	NavFlagContinueStraight        NavFlag = "continue-straight"
-	NavFlagContinueUturn           NavFlag = "continue-uturn"
-	NavFlagDepart                  NavFlag = "depart"
-	NavFlagDepartLeft              NavFlag = "depart-left"
-	NavFlagDepartRight             NavFlag = "depart-right"
-	NavFlagDepartStraight          NavFlag = "depart-straight"
-	NavFlagEndOfRoadLeft           NavFlag = "end-of-road-left"
-	NavFlagEndOfRoadRight          NavFlag = "end-of-road-right"
-	NavFlagFerry                   NavFlag = "ferry"
-	NavFlagFlag                    NavFlag = "flag"
-	NavFlagFork                    NavFlag = "fork"
-	NavFlagForkLeft                NavFlag = "fork-left"
-	NavFlagForkRight               NavFlag = "fork-right"
-	NavFlagForkSlightLeft          NavFlag = "fork-slight-left"
-	NavFlagForkSlightRight         NavFlag = "fork-slight-right"
-	NavFlagForkStraight            NavFlag = "fork-straight"
-	NavFlagInvalid                 NavFlag = "invalid"
-	NavFlagInvalidLeft             NavFlag = "invalid-left"
-	NavFlagInvalidRight            NavFlag = "invalid-right"
-	NavFlagInvalidSlightLeft       NavFlag = "invalid-slight-left"
-	NavFlagInvalidSlightRight      NavFlag = "invalid-slight-right"
-	NavFlagInvalidStraight         NavFlag = "invalid-straight"
-	NavFlagInvalidUturn            NavFlag = "invalid-uturn"
-	NavFlagMergeLeft               NavFlag = "merge-left"
-	NavFlagMergeRight              NavFlag = "merge-right"
-	NavFlagMergeSlightLeft         NavFlag = "merge-slight-left"
-	NavFlagMergeSlightRight        NavFlag = "merge-slight-right"
-	NavFlagMergeStraight           NavFlag = "merge-straight"
-	NavFlagNewNameLeft             NavFlag = "new-name-left"
-	NavFlagNewNameRight            NavFlag = "new-name-right"
-	NavFlagNewNameSharpLeft        NavFlag = "new-name-sharp-left"
-	NavFlagNewNameSharpRight       NavFlag = "new-name-sharp-right"
-	NavFlagNewNameSlightLeft       NavFlag = "new-name-slight-left"
-	NavFlagNewNameSlightRight      NavFlag = "new-name-slight-right"
-	NavFlagNewNameStraight         NavFlag = "new-name-straight"
-	NavFlagNotificationLeft        NavFlag = "notification-left"
-	NavFlagNotificationRight       NavFlag = "notification-right"
-	NavFlagNotificationSharpLeft   NavFlag = "notification-sharp-left"
-	NavFlagNotificationSharpRight  NavFlag = "notification-sharp-right"
-	NavFlagNotificationSlightLeft  NavFlag = "notification-slight-left"
-	NavFlagNotificationSlightRight NavFlag = "notification-slight-right"
-	NavFlagNotificationStraight    NavFlag = "notification-straight"
-	NavFlagOffRampLeft             NavFlag = "off-ramp-left"
-	NavFlagOffRampRight            NavFlag = "off-ramp-right"
-	NavFlagOffRampSharpLeft        NavFlag = "off-ramp-sharp-left"
-	NavFlagOffRampSharpRight       NavFlag = "off-ramp-sharp-right"
-	NavFlagOffRampSlightLeft       NavFlag = "off-ramp-slight-left"
-	NavFlagOffRampSlightRight      NavFlag = "off-ramp-slight-right"
-	NavFlagOffRampStraight         NavFlag = "off-ramp-straight"
-	NavFlagOnRampLeft              NavFlag = "on-ramp-left"
-	NavFlagOnRampRight             NavFlag = "on-ramp-right"
-	NavFlagOnRampSharpLeft         NavFlag = "on-ramp-sharp-left"
-	NavFlagOnRampSharpRight        NavFlag = "on-ramp-sharp-right"
-	NavFlagOnRampSlightLeft        NavFlag = "on-ramp-slight-left"
-	NavFlagOnRampSlightRight       NavFlag = "on-ramp-slight-right"
-	NavFlagOnRampStraight          NavFlag = "on-ramp-straight"
-	NavFlagRotary                  NavFlag = "rotary"
-	NavFlagRotaryLeft              NavFlag = "rotary-left"
-	NavFlagRotaryRight             NavFlag = "rotary-right"
-	NavFlagRotarySharpLeft         NavFlag = "rotary-sharp-left"
-	NavFlagRotarySharpRight        NavFlag = "rotary-sharp-right"
-	NavFlagRotarySlightLeft        NavFlag = "rotary-slight-left"
-	NavFlagRotarySlightRight       NavFlag = "rotary-slight-right"
-	NavFlagRotaryStraight          NavFlag = "rotary-straight"
-	NavFlagRoundabout              NavFlag = "roundabout"
-	NavFlagRoundaboutLeft          NavFlag = "roundabout-left"
-	NavFlagRoundaboutRight         NavFlag = "roundabout-right"
-	NavFlagRoundaboutSharpLeft     NavFlag = "roundabout-sharp-left"
-	NavFlagRoundaboutSharpRight    NavFlag = "roundabout-sharp-right"
-	NavFlagRoundaboutSlightLeft    NavFlag = "roundabout-slight-left"
-	NavFlagRoundaboutSlightRight   NavFlag = "roundabout-slight-right"
-	NavFlagRoundaboutStraight      NavFlag = "roundabout-straight"
-	NavFlagTurnLeft                NavFlag = "turn-left"
-	NavFlagTurnRight               NavFlag = "turn-right"
-	NavFlagTurnSharpLeft           NavFlag = "turn-sharp-left"
-	NavFlagTurnSharpRight          NavFlag = "turn-sharp-right"
-	NavFlagTurnSlightLeft          NavFlag = "turn-slight-left"
-	NavFlagTurnSlightRight         NavFlag = "turn-slight-right"
-	NavFlagTurnStraight            NavFlag = "turn-straight"
-	NavFlagUpDown                  NavFlag = "updown"
-	NavFlagUTurn                   NavFlag = "uturn"
-)
-
-// SetNavFlag sets the navigation flag icon.
-func (d *Device) SetNavFlag(flag NavFlag) error {
-	char, err := d.getChar(navigationFlagsChar)
-	if err != nil {
-		return err
-	}
-	_, err = char.WriteWithoutResponse([]byte(flag))
-	return err
-}
-
-// SetNavNarrative sets the navigation narrative string.
-func (d *Device) SetNavNarrative(narrative string) error {
-	char, err := d.getChar(navigationNarrativeChar)
-	if err != nil {
-		return err
-	}
-	_, err = char.WriteWithoutResponse([]byte(narrative))
-	return err
-}
-
-// SetNavManeuverDistance sets the navigation maneuver distance.
-func (d *Device) SetNavManeuverDistance(manDist string) error {
-	char, err := d.getChar(navigationManDist)
-	if err != nil {
-		return err
-	}
-	_, err = char.WriteWithoutResponse([]byte(manDist))
-	return err
-}
-
-// SetNavProgress sets the navigation progress.
-func (d *Device) SetNavProgress(progress uint8) error {
-	char, err := d.getChar(navigationProgress)
-	if err != nil {
-		return err
-	}
-	_, err = char.WriteWithoutResponse([]byte{progress})
-	return err
-}

infinitime/notifs.go

@@ -1,42 +0,0 @@
-package infinitime
-
-var (
-	regularNotifHeader = []byte{0x00, 0x01, 0x00}
-	callNotifHeader    = []byte{0x03, 0x01, 0x00}
-)
-
-// Notify sends a notification to the PineTime using the Alert Notification Service
-func (d *Device) Notify(title, body string) error {
-	c, err := d.getChar(newAlertChar)
-	if err != nil {
-		return err
-	}
-
-	content := title + "\x00" + body
-	_, err = c.WriteWithoutResponse(append(regularNotifHeader, content...))
-	return err
-}
-
-type CallStatus uint8
-
-const (
-	CallStatusDeclined CallStatus = iota
-	CallStatusAccepted
-	CallStatusMuted
-)
-
-// NotifyCall sends a call to the PineTime using the Alert Notification Service,
-// then executes fn once the user presses a button on the watch.
-func (d *Device) NotifyCall(from string, fn func(CallStatus)) error {
-	c, err := d.getChar(newAlertChar)
-	if err != nil {
-		return err
-	}
-
-	_, err = c.WriteWithoutResponse(append(callNotifHeader, from...))
-	if err != nil {
-		return err
-	}
-
-	return watchCharOnce(d, notifEventChar, fn)
-}

infinitime/resources.go

@@ -1,135 +0,0 @@
-package infinitime
-
-import (
-	"archive/zip"
-	"encoding/json"
-	"errors"
-	"io"
-	"path/filepath"
-)
-
-type ResourceOperation int
-
-const (
-	// ResourceUpload represents the upload phase
-	// of resource loading
-	ResourceUpload = iota
-	// ResourceRemove represents the obsolete
-	// file removal phase of resource loading
-	ResourceRemove
-)
-
-// resourceManifest is the structure of the resource manifest file
-type resourceManifest struct {
-	Resources []resource         `json:"resources"`
-	Obsolete  []obsoleteResource `json:"obsolete_files"`
-}
-
-// resource represents a resource entry in the manifest
-type resource struct {
-	Name string `json:"filename"`
-	Path string `json:"path"`
-}
-
-// obsoleteResource represents an obsolete file entry in the manifest
-type obsoleteResource struct {
-	Path  string `json:"path"`
-	Since string `json:"since"`
-}
-
-// ResourceLoadProgress contains information on the progress of
-// a resource load
-type ResourceLoadProgress struct {
-	Operation   ResourceOperation
-	Name        string
-	Total       uint32
-	Transferred uint32
-}
-
-// LoadResources accepts the path of an InfiniTime resource archive and loads its contents to the watch's filesystem.
-func LoadResources(archivePath string, fs *FS, progress func(ResourceLoadProgress)) error {
-	r, err := zip.OpenReader(archivePath)
-	if err != nil {
-		return err
-	}
-	defer r.Close()
-
-	manifestFl, err := r.Open("resources.json")
-	if err != nil {
-		return err
-	}
-
-	var manifest resourceManifest
-	err = json.NewDecoder(manifestFl).Decode(&manifest)
-	if err != nil {
-		return err
-	}
-
-	err = manifestFl.Close()
-	if err != nil {
-		return err
-	}
-
-	for _, file := range manifest.Obsolete {
-		err := fs.RemoveAll(file.Path)
-		if err != nil {
-			return err
-		}
-
-		progress(ResourceLoadProgress{
-			Operation: ResourceRemove,
-			Name:      filepath.Base(file.Path),
-		})
-	}
-
-	for _, file := range manifest.Resources {
-		src, err := r.Open(file.Name)
-		if err != nil {
-			return err
-		}
-
-		fi, err := src.Stat()
-		if err != nil {
-			return err
-		}
-
-		err = fs.MkdirAll(filepath.Dir(file.Path))
-		if err != nil {
-			return err
-		}
-
-		dst, err := fs.Create(file.Path, uint32(fi.Size()))
-		if err != nil {
-			return err
-		}
-
-		dst.ProgressFunc = func(transferred, total uint32) {
-			progress(ResourceLoadProgress{
-				Name:        file.Name,
-				Transferred: transferred,
-				Total:       total,
-			})
-		}
-
-		_, err = io.Copy(dst, src)
-		if err != nil {
-			return errors.Join(
-				err,
-				src.Close(),
-				dst.Close(),
-			)
-		}
-
-		err = src.Close()
-		if err != nil {
-			return err
-		}
-
-		err = dst.Close()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}

infinitime/time.go

@@ -1,58 +0,0 @@
-package infinitime
-
-import (
-	"bytes"
-	"encoding/binary"
-	"time"
-)
-
-// SetTime sets the current time, and then sets the timezone data,
-// if the local time characteristic is available.
-func (d *Device) SetTime(t time.Time) error {
-	c, err := d.getChar(currentTimeChar)
-	if err != nil {
-		return err
-	}
-
-	buf := &bytes.Buffer{}
-	binary.Write(buf, binary.LittleEndian, uint16(t.Year()))
-	binary.Write(buf, binary.LittleEndian, uint8(t.Month()))
-	binary.Write(buf, binary.LittleEndian, uint8(t.Day()))
-	binary.Write(buf, binary.LittleEndian, uint8(t.Hour()))
-	binary.Write(buf, binary.LittleEndian, uint8(t.Minute()))
-	binary.Write(buf, binary.LittleEndian, uint8(t.Second()))
-	binary.Write(buf, binary.LittleEndian, uint8(t.Weekday()))
-	binary.Write(buf, binary.LittleEndian, uint8((t.Nanosecond()/1000)/1e6*256))
-	binary.Write(buf, binary.LittleEndian, uint8(0b0001))
-
-	_, err = c.WriteWithoutResponse(buf.Bytes())
-	if err != nil {
-		return err
-	}
-
-	ltc, err := d.getChar(localTimeChar)
-	if err != nil {
-		return nil
-	}
-
-	_, offset := t.Zone()
-	dst := 0
-
-	// Local time expects two values: the timezone offset and the dst offset, both
-	// expressed in quarters of an hour.
-	// Timezone offset is to be constant over DST, with dst offset holding the offset != 0
-	// when DST is in effect.
-	// As there is no standard way in go to get the actual dst offset, we assume it to be 1h
-	// when DST is in effect
-	if t.IsDST() {
-		dst = 3600
-		offset -= 3600
-	}
-
-	buf.Reset()
-	binary.Write(buf, binary.LittleEndian, uint8(offset/3600*4))
-	binary.Write(buf, binary.LittleEndian, uint8(dst/3600*4))
-
-	_, err = ltc.WriteWithoutResponse(buf.Bytes())
-	return err
-}

infinitime/watch.go

@@ -1,108 +0,0 @@
-package infinitime
-
-import (
-	"bytes"
-	"context"
-	"encoding/binary"
-	"sync"
-
-	"tinygo.org/x/bluetooth"
-)
-
-type notifier interface {
-	notify([]byte)
-}
-
-type watcher[T any] struct {
-	mu         sync.Mutex
-	nextFuncID int
-	callbacks  map[int]func(T, error)
-	char       *bluetooth.DeviceCharacteristic
-}
-
-func (w *watcher[T]) addCallback(fn func(T, error)) int {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	funcID := w.nextFuncID
-	w.callbacks[funcID] = fn
-	w.nextFuncID++
-	return funcID
-}
-
-func (w *watcher[T]) notify(b []byte) {
-	var val T
-	err := binary.Read(bytes.NewReader(b), binary.LittleEndian, &val)
-	w.mu.Lock()
-	for _, fn := range w.callbacks {
-		go fn(val, err)
-	}
-	w.mu.Unlock()
-}
-
-func (w *watcher[T]) cancelFn(d *Device, ch btChar, id int) func() {
-	return func() {
-		w.mu.Lock()
-		delete(w.callbacks, id)
-		w.mu.Unlock()
-
-		if len(w.callbacks) == 0 {
-			d.notifierMtx.Lock()
-			delete(d.notifierMap, ch)
-			d.notifierMtx.Unlock()
-			w.char.EnableNotifications(nil)
-		}
-	}
-}
-
-func watchChar[T any](ctx context.Context, d *Device, ch btChar, fn func(T, error)) error {
-	d.notifierMtx.Lock()
-	defer d.notifierMtx.Unlock()
-
-	if n, ok := d.notifierMap[ch]; ok {
-		w := n.(*watcher[T])
-		funcID := w.addCallback(fn)
-		context.AfterFunc(ctx, w.cancelFn(d, ch, funcID))
-		go func() {
-			<-ctx.Done()
-			w.cancelFn(d, ch, funcID)()
-		}()
-		return nil
-	} else {
-		c, err := d.getChar(ch)
-		if err != nil {
-			return err
-		}
-
-		w := &watcher[T]{callbacks: map[int]func(T, error){}}
-		err = c.EnableNotifications(w.notify)
-		if err != nil {
-			return err
-		}
-		w.char = c
-		funcID := w.addCallback(fn)
-		d.notifierMap[ch] = w
-
-		context.AfterFunc(ctx, w.cancelFn(d, ch, funcID))
-		return nil
-	}
-}
-
-func watchCharOnce[T any](d *Device, ch btChar, fn func(T)) error {
-	ctx, cancel := context.WithCancel(context.Background())
-
-	var watchErr error
-	err := watchChar(ctx, d, ch, func(val T, err error) {
-		defer cancel()
-		if err != nil {
-			watchErr = err
-			return
-		}
-		fn(val)
-	})
-	if err != nil {
-		return err
-	}
-
-	<-ctx.Done()
-	return watchErr
-}

infinitime/weather.go

@@ -1,124 +0,0 @@
-package infinitime
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"time"
-)
-
-const (
-	weatherVersion = 0
-
-	currentWeatherType  = 0
-	forecastWeatherType = 1
-)
-
-type WeatherIcon uint8
-
-const (
-	WeatherIconClear WeatherIcon = iota
-	WeatherIconFewClouds
-	WeatherIconClouds
-	WeatherIconHeavyClouds
-	WeatherIconCloudsWithRain
-	WeatherIconRain
-	WeatherIconThunderstorm
-	WeatherIconSnow
-	WeatherIconMist
-)
-
-// CurrentWeather represents the current weather
-type CurrentWeather struct {
-	Time        time.Time
-	CurrentTemp float32
-	MinTemp     float32
-	MaxTemp     float32
-	Location    string
-	Icon        WeatherIcon
-}
-
-// Bytes returns the [CurrentWeather] struct encoded using the InfiniTime
-// weather wire protocol.
-func (cw CurrentWeather) Bytes() []byte {
-	buf := &bytes.Buffer{}
-
-	buf.WriteByte(currentWeatherType)
-	buf.WriteByte(weatherVersion)
-
-	_, offset := cw.Time.Zone()
-	binary.Write(buf, binary.LittleEndian, cw.Time.Unix()+int64(offset))
-
-	binary.Write(buf, binary.LittleEndian, int16(cw.CurrentTemp*100))
-	binary.Write(buf, binary.LittleEndian, int16(cw.MinTemp*100))
-	binary.Write(buf, binary.LittleEndian, int16(cw.MaxTemp*100))
-
-	location := make([]byte, 32)
-	copy(location, cw.Location)
-	buf.Write(location)
-
-	buf.WriteByte(byte(cw.Icon))
-
-	return buf.Bytes()
-}
-
-// Forecast represents a weather forecast
-type Forecast struct {
-	Time time.Time
-	Days []ForecastDay
-}
-
-// ForecastDay represents a forecast for a single day
-type ForecastDay struct {
-	MinTemp int16
-	MaxTemp int16
-	Icon    WeatherIcon
-}
-
-// Bytes returns the [Forecast] struct encoded using the InfiniTime
-// weather wire protocol.
-func (f Forecast) Bytes() []byte {
-	buf := &bytes.Buffer{}
-
-	buf.WriteByte(forecastWeatherType)
-	buf.WriteByte(weatherVersion)
-
-	_, offset := f.Time.Zone()
-	binary.Write(buf, binary.LittleEndian, f.Time.Unix()+int64(offset))
-
-	buf.WriteByte(uint8(len(f.Days)))
-
-	for _, day := range f.Days {
-		binary.Write(buf, binary.LittleEndian, day.MinTemp*100)
-		binary.Write(buf, binary.LittleEndian, day.MaxTemp*100)
-		buf.WriteByte(byte(day.Icon))
-	}
-
-	return buf.Bytes()
-}
-
-// SetCurrentWeather updates the current weather data on the PineTime
-func (d *Device) SetCurrentWeather(cw CurrentWeather) error {
-	c, err := d.getChar(weatherDataChar)
-	if err != nil {
-		return err
-	}
-
-	_, err = c.WriteWithoutResponse(cw.Bytes())
-	return err
-}
-
-// SetForecast sets future forecast data on the PineTime
-func (d *Device) SetForecast(f Forecast) error {
-	c, err := d.getChar(weatherDataChar)
-	if err != nil {
-		return err
-	}
-
-	if len(f.Days) > 5 {
-		return errors.New("amount of forecast days exceeds maximum of 5")
-	}
-
-	_, err = c.WriteWithoutResponse(f.Bytes())
-	return err
-}

internal/fsproto/errors.go

@@ -1,62 +0,0 @@
-package fsproto
-
-import (
-	"errors"
-	"fmt"
-)
-
-var (
-	ErrFileNotExists = errors.New("file does not exist")
-	ErrFileReadOnly  = errors.New("file is read only")
-	ErrFileWriteOnly = errors.New("file is write only")
-	ErrInvalidOffset = errors.New("offset out of range")
-	ErrNoRemoveRoot  = errors.New("refusing to remove root directory")
-	ErrFileClosed    = errors.New("cannot perform operation on a closed file")
-)
-
-// Error represents an error returned by BLE FS
-type Error struct {
-	Code int8
-}
-
-// Error returns the string associated with the error code
-func (err Error) Error() string {
-	switch err.Code {
-	case 0x02:
-		return "filesystem error"
-	case 0x05:
-		return "read-only filesystem"
-	case 0x03:
-		return "no such file"
-	case 0x04:
-		return "protocol error"
-	case -5:
-		return "input/output error"
-	case -84:
-		return "filesystem is corrupted"
-	case -2:
-		return "no such directory entry"
-	case -17:
-		return "entry already exists"
-	case -20:
-		return "entry is not a directory"
-	case -39:
-		return "directory is not empty"
-	case -9:
-		return "bad file number"
-	case -27:
-		return "file is too large"
-	case -22:
-		return "invalid parameter"
-	case -28:
-		return "no space left on device"
-	case -12:
-		return "no more memory available"
-	case -61:
-		return "no attr available"
-	case -36:
-		return "file name is too long"
-	default:
-		return fmt.Sprintf("unknown error (code %d)", err.Code)
-	}
-}

internal/fsproto/fsproto.go

@@ -1,212 +0,0 @@
-package fsproto
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-
-	"tinygo.org/x/bluetooth"
-)
-
-type FSReqOpcode uint8
-
-const (
-	ReadFileHeaderOpcode  FSReqOpcode = 0x10
-	ReadFileOpcode        FSReqOpcode = 0x12
-	WriteFileHeaderOpcode FSReqOpcode = 0x20
-	WriteFileOpcode       FSReqOpcode = 0x22
-	DeleteFileOpcode      FSReqOpcode = 0x30
-	MakeDirectoryOpcode   FSReqOpcode = 0x40
-	ListDirectoryOpcode   FSReqOpcode = 0x50
-	MoveFileOpcode        FSReqOpcode = 0x60
-)
-
-type FSRespOpcode uint8
-
-const (
-	ReadFileResp      FSRespOpcode = 0x11
-	WriteFileResp     FSRespOpcode = 0x21
-	DeleteFileResp    FSRespOpcode = 0x31
-	MakeDirectoryResp FSRespOpcode = 0x41
-	ListDirectoryResp FSRespOpcode = 0x51
-	MoveFileResp      FSRespOpcode = 0x61
-)
-
-type ReadFileHeaderRequest struct {
-	Padding byte
-	PathLen uint16
-	Offset  uint32
-	ReadLen uint32
-	Path    string
-}
-
-type ReadFileRequest struct {
-	Status  uint8
-	Padding [2]byte
-	Offset  uint32
-	ReadLen uint32
-}
-
-type ReadFileResponse struct {
-	Status   int8
-	Padding  [2]byte
-	Offset   uint32
-	FileSize uint32
-	ChunkLen uint32
-	Data     []byte
-}
-
-type WriteFileHeaderRequest struct {
-	Padding  byte
-	PathLen  uint16
-	Offset   uint32
-	ModTime  uint64
-	FileSize uint32
-	Path     string
-}
-
-type WriteFileRequest struct {
-	Status   uint8
-	Padding  [2]byte
-	Offset   uint32
-	ChunkLen uint32
-	Data     []byte
-}
-
-type WriteFileResponse struct {
-	Status    int8
-	Padding   [2]byte
-	Offset    uint32
-	ModTime   uint64
-	FreeSpace uint32
-}
-
-type DeleteFileRequest struct {
-	Padding byte
-	PathLen uint16
-	Path    string
-}
-
-type DeleteFileResponse struct {
-	Status int8
-}
-
-type MkdirRequest struct {
-	Padding   byte
-	PathLen   uint16
-	Padding2  [4]byte
-	Timestamp uint64
-	Path      string
-}
-
-type MkdirResponse struct {
-	Status  int8
-	Padding [6]byte
-	ModTime uint64
-}
-
-type ListDirRequest struct {
-	Padding byte
-	PathLen uint16
-	Path    string
-}
-
-type ListDirResponse struct {
-	Status       int8
-	PathLen      uint16
-	EntryNum     uint32
-	TotalEntries uint32
-	Flags        uint32
-	ModTime      uint64
-	FileSize     uint32
-	Path         []byte
-}
-
-type MoveFileRequest struct {
-	Padding    byte
-	OldPathLen uint16
-	NewPathLen uint16
-	OldPath    string
-	Padding2   byte
-	NewPath    string
-}
-
-type MoveFileResponse struct {
-	Status int8
-}
-
-func WriteRequest(char *bluetooth.DeviceCharacteristic, opcode FSReqOpcode, req any) error {
-	buf := &bytes.Buffer{}
-	buf.WriteByte(byte(opcode))
-
-	rv := reflect.ValueOf(req)
-	for rv.Kind() == reflect.Pointer {
-		rv = rv.Elem()
-	}
-
-	for i := 0; i < rv.NumField(); i++ {
-		switch field := rv.Field(i); field.Kind() {
-		case reflect.String:
-			io.WriteString(buf, field.String())
-		case reflect.Slice:
-			if field.Type().Elem().Kind() == reflect.Uint8 {
-				buf.Write(field.Bytes())
-			}
-		default:
-			binary.Write(buf, binary.LittleEndian, field.Interface())
-		}
-	}
-
-	_, err := char.WriteWithoutResponse(buf.Bytes())
-	return err
-}
-
-func ReadResponse(b []byte, expect FSRespOpcode, out interface{}) error {
-	if len(b) == 0 {
-		return errors.New("empty response packet")
-	}
-	if opcode := FSRespOpcode(b[0]); opcode != expect {
-		return fmt.Errorf("unexpected response opcode: expected %x, got %x", expect, opcode)
-	}
-
-	r := bytes.NewReader(b[1:])
-
-	ot := reflect.TypeOf(out)
-	if ot.Kind() != reflect.Ptr || ot.Elem().Kind() != reflect.Struct {
-		return errors.New("out parameter must be a pointer to a struct")
-	}
-
-	ov := reflect.ValueOf(out).Elem()
-	for i := 0; i < ot.Elem().NumField(); i++ {
-		field := ot.Elem().Field(i)
-		fieldValue := ov.Field(i)
-
-		// If the last field is a byte slice, just read the remaining data into it and return.
-		if i == ot.Elem().NumField()-1 {
-			if field.Type.Kind() == reflect.Slice && field.Type.Elem().Kind() == reflect.Uint8 {
-				data, err := io.ReadAll(r)
-				if err != nil {
-					return err
-				}
-				fieldValue.SetBytes(data)
-				return nil
-			}
-		}
-
-		if err := binary.Read(r, binary.LittleEndian, fieldValue.Addr().Interface()); err != nil {
-			return err
-		}
-	}
-
-	if statusField := ov.FieldByName("Status"); !statusField.IsZero() {
-		code := statusField.Interface().(int8)
-		if code != 0x01 {
-			return Error{code}
-		}
-	}
-
-	return nil
-}

internal/fusefs/fuse.go

@@ -1,600 +0,0 @@
-package fusefs
-
-import (
-	"bytes"
-	"context"
-	"io"
-	"strconv"
-	"syscall"
-
-	"github.com/hanwen/go-fuse/v2/fs"
-	"github.com/hanwen/go-fuse/v2/fuse"
-	"go.elara.ws/itd/infinitime"
-	"go.elara.ws/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     *infinitime.FS    = nil
-	inodemap map[string]uint64 = nil
-)
-
-func BuildRootNode(dev *infinitime.Device) (*ITNode, error) {
-	var err error
-	inodemap = make(map[string]uint64)
-	myfs = 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
-	}
-	
-	fp.ProgressFunc = func(transferred, total uint32) {
-		log.Debug("FUSE Read progress").Uint32("bytes", transferred).Uint32("total", total).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{}
-
-			fp.ProgressFunc = func(transferred, total uint32) {
-				log.Debug("FUSE Read progress").Uint32("bytes", transferred).Uint32("total", total).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

@@ -1,72 +0,0 @@
-package fusefs
-
-import (
-	"syscall"
-
-	"go.elara.ws/itd/internal/fsproto"
-)
-
-func syscallErr(err error) syscall.Errno {
-	if err == nil {
-		return 0
-	}
-
-	switch err := err.(type) {
-	case fsproto.Error:
-		switch err.Code {
-		case 0x02: // filesystem error
-			return syscall.EIO
-		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
-		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
-		case -36: // file name is too long
-			return syscall.ENAMETOOLONG
-		}
-	default:
-		switch err {
-		case fsproto.ErrFileNotExists: // file does not exist
-			return syscall.ENOENT
-		case fsproto.ErrFileReadOnly: // file is read only
-			return syscall.EACCES
-		case fsproto.ErrFileWriteOnly: // file is write only
-			return syscall.EACCES
-		case fsproto.ErrInvalidOffset: // invalid file offset
-			return syscall.EINVAL
-		case fsproto.ErrNoRemoveRoot: // refusing to remove root directory
-			return syscall.EPERM
-		case fsproto.ErrFileClosed: // cannot perform operation on closed file
-			return syscall.EBADF
-		default:
-			return syscall.EINVAL
-		}
-	}
-
-	return syscall.EIO
-}

internal/fusefs/unmount.go

@@ -1,17 +0,0 @@
-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

@@ -1,3 +0,0 @@
-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

@@ -1,124 +0,0 @@
-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);
-}

itd.toml

@@ -1,25 +1,6 @@
-[bluetooth]
-    adapter = "hci0"
-
 [socket]
     path = "/tmp/itd/socket"
 
-[metrics]
-    enabled = false
-
-    [metrics.heartRate]
-        enabled = true
-
-    [metrics.stepCount]
-        enabled = true
-
-    [metrics.battLevel]
-        enabled = true
-
-    [metrics.motion]
-        # This may lower the battery life of the PineTime
-        enabled = false
-
 [conn]
     reconnect = true
 

itgui.desktop

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

main.go

@@ -19,27 +19,26 @@
 package main
 
 import (
-	"context"
 	_ "embed"
 	"flag"
 	"fmt"
 	"os"
-	"os/signal"
 	"strconv"
-	"sync"
-	"syscall"
 	"time"
 
 	"github.com/gen2brain/dlgs"
 	"github.com/knadh/koanf"
 	"github.com/mattn/go-isatty"
-	"go.elara.ws/itd/infinitime"
+	"github.com/rs/zerolog"
-	"go.elara.ws/logger"
+	"github.com/rs/zerolog/log"
-	"go.elara.ws/logger/log"
+	"gitea.arsenm.dev/cpyarger/itd"
 )
 
 var k = koanf.New(".")
 
+//go:embed version.txt
+var version string
+
 var (
 	firmwareUpdating = false
 	// The FS must be updated when the watch is reconnected
@@ -55,153 +54,113 @@ func main() {
 		return
 	}
 
-	level, err := logger.ParseLogLevel(k.String("logging.level"))
+	level, err := zerolog.ParseLevel(k.String("logging.level"))
-	if err != nil {
+	if err != nil || level == zerolog.NoLevel {
-		level = logger.LogLevelInfo
+		level = zerolog.InfoLevel
 	}
-	log.Logger.SetLevel(level)
+
+	// Initialize infinitime library
+	infinitime.Init()
+	// Cleanly exit after function
+	defer infinitime.Exit()
 
 	// Create infinitime options struct
-	opts := infinitime.Options{
+	opts := &infinitime.Options{
-		OnReconnect: func(dev *infinitime.Device) {
+		AttemptReconnect: k.Bool("conn.reconnect"),
-			if k.Bool("on.reconnect.setTime") {
+		WhitelistEnabled: k.Bool("conn.whitelist.enabled"),
-				// Set time to current time
+		Whitelist:        k.Strings("conn.whitelist.devices"),
-				err = dev.SetTime(time.Now())
+		OnReqPasskey:     onReqPasskey,
-				if err != nil {
+		Logger:           log.Logger,
-					return
+		LogLevel:         level,
-				}
-			}
-
-			// If config specifies to notify on reconnect
-			if k.Bool("on.reconnect.notify") {
-				// Send notification to InfiniTime
-				err = dev.Notify("itd", "Successfully reconnected")
-				if err != nil {
-					return
-				}
-			}
-
-			// FS must be updated on reconnect
-			updateFS = true
-			// Resend weather on reconnect
-			sendWeatherCh <- struct{}{}
-		},
 	}
 
-	ctx := context.Background()
-
 	// Connect to InfiniTime with default options
 	dev, err := infinitime.Connect(opts)
 	if err != nil {
-		log.Fatal("Error connecting to InfiniTime").Err(err).Send()
+		log.Fatal().Err(err).Msg("Error connecting to InfiniTime")
+	}
+
+	// When InfiniTime reconnects
+	opts.OnReconnect = func() {
+		if k.Bool("on.reconnect.setTime") {
+			// Set time to current time
+			err = dev.SetTime(time.Now())
+			if err != nil {
+				return
+			}
+		}
+
+		// If config specifies to notify on reconnect
+		if k.Bool("on.reconnect.notify") {
+			// Send notification to InfiniTime
+			err = dev.Notify("itd", "Successfully reconnected")
+			if err != nil {
+				return
+			}
+		}
+
+		// FS must be updated on reconnect
+		updateFS = true
+		// Resend weather on reconnect
+		sendWeatherCh <- struct{}{}
 	}
 
 	// Get firmware version
 	ver, err := dev.Version()
 	if err != nil {
-		log.Error("Error getting firmware version").Err(err).Send()
+		log.Error().Err(err).Msg("Error getting firmware version")
 	}
 
 	// Log connection
-	log.Info("Connected to InfiniTime").Str("version", ver).Send()
+	log.Info().Str("version", ver).Msg("Connected to InfiniTime")
 
 	// 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("Error sending notification to InfiniTime").Err(err).Send()
+			log.Error().Err(err).Msg("Error sending notification to InfiniTime")
 		}
 	}
 
 	// Set time to current time
 	err = dev.SetTime(time.Now())
 	if err != nil {
-		log.Error("Error setting current time on connected InfiniTime").Err(err).Send()
+		log.Error().Err(err).Msg("Error setting current time on connected InfiniTime")
 	}
 
-	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(ctx, wg, dev)
+	err = initMusicCtrl(dev)
 	if err != nil {
-		log.Error("Error initializing music control").Err(err).Send()
+		log.Error().Err(err).Msg("Error initializing music control")
 	}
 
 	// Start control socket
-	err = initCallNotifs(ctx, wg, dev)
+	err = initCallNotifs(dev)
 	if err != nil {
-		log.Error("Error initializing call notifications").Err(err).Send()
+		log.Error().Err(err).Msg("Error initializing call notifications")
 	}
 
 	// Initialize notification relay
-	err = initNotifRelay(ctx, wg, dev)
+	err = initNotifRelay(dev)
 	if err != nil {
-		log.Error("Error initializing notification relay").Err(err).Send()
+		log.Error().Err(err).Msg("Error initializing notification relay")
 	}
 
 	// Initializa weather
-	err = initWeather(ctx, wg, dev)
+	err = initWeather(dev)
 	if err != nil {
-		log.Error("Error initializing weather").Err(err).Send()
+		log.Error().Err(err).Msg("Error initializing weather")
-	}
-
-	// Initialize metrics collection
-	err = initMetrics(ctx, wg, dev)
-	if err != nil {
-		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, wg, dev)
+	err = startSocket(dev)
 	if err != nil {
-		log.Error("Error starting socket").Err(err).Send()
+		log.Error().Err(err).Msg("Error starting socket")
 	}
 
-	wg.Wait()
+	// Block forever
-}
+	select {}
-
-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

@@ -1,214 +0,0 @@
-package main
-
-import (
-	"context"
-	"strings"
-
-	"github.com/godbus/dbus/v5"
-	"go.elara.ws/itd/infinitime"
-	"go.elara.ws/itd/internal/utils"
-	"go.elara.ws/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.SetNavFlag(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.SetNavNarrative(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.SetNavManeuverDistance(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.SetNavProgress(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.SetNavFlag(infinitime.NavFlag(icon))
-	if err != nil {
-		return err
-	}
-
-	var narrative string
-	err = navigator.StoreProperty(narrativeProperty, &narrative)
-	if err != nil {
-		return err
-	}
-
-	err = dev.SetNavNarrative(narrative)
-	if err != nil {
-		return err
-	}
-
-	var manDist string
-	err = navigator.StoreProperty(manDistProperty, &manDist)
-	if err != nil {
-		return err
-	}
-
-	err = dev.SetNavManeuverDistance(manDist)
-	if err != nil {
-		return err
-	}
-
-	var progress int32
-	err = navigator.StoreProperty(progressProperty, &progress)
-	if err != nil {
-		return err
-	}
-
-	return dev.SetNavProgress(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

@@ -1,151 +0,0 @@
-package main
-
-import (
-	"context"
-	"database/sql"
-	"path/filepath"
-	"time"
-
-	"go.elara.ws/itd/infinitime"
-	"go.elara.ws/logger/log"
-	_ "modernc.org/sqlite"
-)
-
-func initMetrics(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
-	// If metrics disabled, return nil
-	if !k.Bool("metrics.enabled") {
-		return nil
-	}
-
-	// Open metrics database
-	db, err := sql.Open("sqlite", filepath.Join(cfgDir, "metrics.db"))
-	if err != nil {
-		return err
-	}
-
-	// Create heartRate table
-	_, err = db.Exec("CREATE TABLE IF NOT EXISTS heartRate(time INT, bpm INT);")
-	if err != nil {
-		return err
-	}
-
-	// Create stepCount table
-	_, err = db.Exec("CREATE TABLE IF NOT EXISTS stepCount(time INT, steps INT);")
-	if err != nil {
-		return err
-	}
-
-	// Create battLevel table
-	_, err = db.Exec("CREATE TABLE IF NOT EXISTS battLevel(time INT, percent INT);")
-	if err != nil {
-		return err
-	}
-
-	// Create motion table
-	_, err = db.Exec("CREATE TABLE IF NOT EXISTS motion(time INT, X INT, Y INT, Z INT);")
-	if err != nil {
-		return err
-	}
-
-	// Watch heart rate
-	if k.Bool("metrics.heartRate.enabled") {
-		err := dev.WatchHeartRate(ctx, func(heartRate uint8, err error) {
-			if err != nil {
-				// Handle error
-				return
-			}
-			// Get current time
-			unixTime := time.Now().UnixNano()
-			// Insert sample and time into database
-			db.Exec("INSERT INTO heartRate VALUES (?, ?);", unixTime, heartRate)
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	// If step count metrics enabled in config
-	if k.Bool("metrics.stepCount.enabled") {
-		// Watch step count
-		err := dev.WatchStepCount(ctx, func(count uint32, err error) {
-			if err != nil {
-				return
-			}
-			// Get current time
-			unixTime := time.Now().UnixNano()
-			// Insert sample and time into database
-			db.Exec("INSERT INTO stepCount VALUES (?, ?);", unixTime, count)
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	// Watch step count
-	if k.Bool("metrics.stepCount.enabled") {
-		err := dev.WatchStepCount(ctx, func(count uint32, err error) {
-			if err != nil {
-				// Handle error
-				return
-			}
-			// Get current time
-			unixTime := time.Now().UnixNano()
-			// Insert sample and time into database
-			db.Exec("INSERT INTO stepCount VALUES (?, ?);", unixTime, count)
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	// Watch battery level
-	if k.Bool("metrics.battLevel.enabled") {
-		err := dev.WatchBatteryLevel(ctx, func(battLevel uint8, err error) {
-			if err != nil {
-				// Handle error
-				return
-			}
-			// Get current time
-			unixTime := time.Now().UnixNano()
-			// Insert sample and time into database
-			db.Exec("INSERT INTO battLevel VALUES (?, ?);", unixTime, battLevel)
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	// Watch motion values
-	if k.Bool("metrics.motion.enabled") {
-		err := dev.WatchMotion(ctx, func(motionVals infinitime.MotionValues, err error) {
-			if err != nil {
-				// Handle error
-				return
-			}
-			// Get current time
-			unixTime := time.Now().UnixNano()
-			// Insert sample values and time into database
-			db.Exec(
-				"INSERT INTO motion VALUES (?, ?, ?, ?);",
-				unixTime,
-				motionVals.X,
-				motionVals.Y,
-				motionVals.Z,
-			)
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done("metrics")
-		<-ctx.Done()
-		db.Close()
-	}()
-
-	log.Info("Initialized metrics collection").Send()
-
-	return nil
-}

mpris/mpris.go

@@ -1,270 +0,0 @@
-package mpris
-
-import (
-	"context"
-	"strings"
-	"sync"
-
-	"github.com/godbus/dbus/v5"
-	"go.elara.ws/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

@@ -1,84 +0,0 @@
-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,64 +19,62 @@
 package main
 
 import (
-	"context"
+	"github.com/rs/zerolog/log"
-
+	"go.arsenm.dev/infinitime"
-	"go.elara.ws/itd/infinitime"
+	"go.arsenm.dev/infinitime/pkg/player"
-	"go.elara.ws/itd/mpris"
+	"go.arsenm.dev/itd/translit"
-	"go.elara.ws/itd/translit"
-	"go.elara.ws/logger/log"
 )
 
-func initMusicCtrl(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+func initMusicCtrl(dev *infinitime.Device) error {
-	mpris.Init(ctx)
+	player.Init()
 
 	maps := k.Strings("notifs.translit.use")
 	translit.Transliterators["custom"] = translit.Map(k.Strings("notifs.translit.custom"))
 
-	mpris.OnChange(func(ct mpris.ChangeType, val string) {
+	player.OnChange(func(ct player.ChangeType, val string) {
 		newVal := translit.Transliterate(val, maps...)
 		if !firmwareUpdating {
 			switch ct {
-			case mpris.ChangeTypeStatus:
+			case player.ChangeTypeStatus:
-				dev.SetMusicStatus(val == "Playing")
+				dev.Music.SetStatus(val == "Playing")
-			case mpris.ChangeTypeTitle:
+			case player.ChangeTypeTitle:
-				dev.SetMusicTrack(newVal)
+				dev.Music.SetTrack(newVal)
-			case mpris.ChangeTypeAlbum:
+			case player.ChangeTypeAlbum:
-				dev.SetMusicAlbum(newVal)
+				dev.Music.SetAlbum(newVal)
-			case mpris.ChangeTypeArtist:
+			case player.ChangeTypeArtist:
-				dev.SetMusicArtist(newVal)
+				dev.Music.SetArtist(newVal)
 			}
 		}
 	})
 
 	// Watch for music events
-	err := dev.WatchMusicEvents(ctx, func(event infinitime.MusicEvent, err error) {
+	musicEvtCh, err := dev.Music.WatchEvents()
-		if err != nil {
-			log.Error("Music event error").Err(err).Send()
-		}
-		
-		// Perform appropriate action based on event
-		switch event {
-		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")))
-		}
-	})
 	if err != nil {
 		return err
 	}
+	go func() {
+		// 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")))
+			}
+		}
+	}()
 
 	// Log completed initialization
-	log.Info("Initialized InfiniTime music controls").Send()
+	log.Info().Msg("Initialized InfiniTime music controls")
 
 	return nil
 }

notifs.go

@@ -19,32 +19,28 @@
 package main
 
 import (
-	"context"
 	"fmt"
 
 	"github.com/godbus/dbus/v5"
-	"go.elara.ws/itd/infinitime"
+	"github.com/rs/zerolog/log"
-	"go.elara.ws/itd/internal/utils"
+	"go.arsenm.dev/infinitime"
-	"go.elara.ws/itd/translit"
+	"go.arsenm.dev/itd/translit"
-	"go.elara.ws/logger/log"
 )
 
-func initNotifRelay(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+func initNotifRelay(dev *infinitime.Device) error {
 	// Connect to dbus session bus
-	bus, err := utils.NewSessionBusConn(ctx)
+	bus, err := newSessionBusConn()
 	if err != nil {
 		return err
 	}
 
 	// Define rules to listen for
-	rules := []string{
+	var rules = []string{
 		"type='method_call',member='Notify',path='/org/freedesktop/Notifications',interface='org.freedesktop.Notifications'",
 	}
 	var flag uint = 0
 	// Becode monitor for notifications
-	call := bus.BusObject().CallWithContext(
+	call := bus.BusObject().Call("org.freedesktop.DBus.Monitoring.BecomeMonitor", 0, rules, flag)
-		ctx, "org.freedesktop.DBus.Monitoring.BecomeMonitor", 0, rules, flag,
-	)
 	if call.Err != nil {
 		return call.Err
 	}
@@ -54,55 +50,47 @@ func initNotifRelay(ctx context.Context, wg WaitGroup, dev *infinitime.Device) e
 	// Send events to channel
 	bus.Eavesdrop(notifCh)
 
-	wg.Add(1)
 	go func() {
-		defer wg.Done("notifRelay")
 		// For every event sent to channel
-		for {
+		for v := range notifCh {
-			select {
+			// If firmware is updating, skip
-			case v := <-notifCh:
+			if firmwareUpdating {
-				// If firmware is updating, skip
+				continue
-				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("Relaying notifications to InfiniTime").Send()
+	log.Info().Msg("Relaying notifications to InfiniTime")
 	return nil
 }
 

scripts/gen-version.sh

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

socket.go

@@ -19,31 +19,66 @@
 package main
 
 import (
-	"archive/zip"
+	"bytes"
 	"context"
 	"errors"
 	"io"
 	"net"
+	"net/http"
+	"net/url"
 	"os"
 	"path/filepath"
+	"strings"
 	"time"
 
-	"go.elara.ws/drpc/muxserver"
+	"github.com/google/uuid"
-	"go.elara.ws/itd/infinitime"
+	"github.com/rs/zerolog/log"
-	"go.elara.ws/itd/internal/rpc"
+	"github.com/smallnest/rpcx/server"
-	"go.elara.ws/logger/log"
+	"github.com/smallnest/rpcx/share"
-	"storj.io/drpc/drpcmux"
+	"github.com/vmihailenco/msgpack/v5"
+	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/infinitime/blefs"
+	"go.arsenm.dev/itd/api"
 )
 
+// This type signifies an unneeded value.
+// A struct{} is used as it takes no space in memory.
+// This exists for readability purposes
+type none = struct{}
+
 var (
 	ErrDFUInvalidFile    = errors.New("provided file is invalid for given upgrade type")
 	ErrDFUNotEnoughFiles = errors.New("not enough files provided for given upgrade type")
 	ErrDFUInvalidUpgType = errors.New("invalid upgrade type")
+	ErrRPCXNoReturnURL   = errors.New("bidirectional requests over gateway require a returnURL field in the metadata")
 )
 
-func startSocket(ctx context.Context, wg WaitGroup, dev *infinitime.Device) error {
+type DoneMap map[string]chan struct{}
+
+func (dm DoneMap) Exists(key string) bool {
+	_, ok := dm[key]
+	return ok
+}
+
+func (dm DoneMap) Done(key string) {
+	ch := dm[key]
+	ch <- struct{}{}
+}
+
+func (dm DoneMap) Create(key string) {
+	dm[key] = make(chan struct{}, 1)
+}
+
+func (dm DoneMap) Remove(key string) {
+	close(dm[key])
+	delete(dm, key)
+}
+
+var done = DoneMap{}
+
+func startSocket(dev *infinitime.Device) error {
 	// Make socket directory if non-existant
-	err := os.MkdirAll(filepath.Dir(k.String("socket.path")), 0o755)
+	err := os.MkdirAll(filepath.Dir(k.String("socket.path")), 0755)
 	if err != nil {
 		return err
 	}
@@ -60,216 +95,291 @@ func startSocket(ctx context.Context, wg WaitGroup, dev *infinitime.Device) erro
 		return err
 	}
 
-	fs := dev.FS()
+	fs, err := dev.FS()
-	mux := drpcmux.New()
+	if err != nil {
+		log.Warn().Err(err).Msg("Error getting BLE filesystem")
+	}
 
-	err = rpc.DRPCRegisterITD(mux, &ITD{dev})
+	srv := server.NewServer()
+
+	itdAPI := &ITD{
+		dev: dev,
+		srv: srv,
+	}
+	err = srv.Register(itdAPI, "")
 	if err != nil {
 		return err
 	}
 
-	err = rpc.DRPCRegisterFS(mux, &FS{dev, fs})
+	fsAPI := &FS{
+		dev: dev,
+		fs:  fs,
+		srv: srv,
+	}
+	err = srv.Register(fsAPI, "")
 	if err != nil {
 		return err
 	}
 
-	log.Info("Starting control socket").Str("path", k.String("socket.path")).Send()
+	go srv.ServeListener("tcp", ln)
 
-	wg.Add(1)
+	// Log socket start
-	go func() {
+	log.Info().Str("path", k.String("socket.path")).Msg("Started control socket")
-		defer wg.Done("socket")
-		muxserver.New(mux).Serve(ctx, ln)
-	}()
 
 	return nil
 }
 
 type ITD struct {
 	dev *infinitime.Device
+	srv *server.Server
 }
 
-func (i *ITD) HeartRate(_ context.Context, _ *rpc.Empty) (*rpc.IntResponse, error) {
+func (i *ITD) HeartRate(_ context.Context, _ none, out *uint8) error {
-	hr, err := i.dev.HeartRate()
+	heartRate, err := i.dev.HeartRate()
-	return &rpc.IntResponse{Value: uint32(hr)}, err
+	*out = heartRate
+	return err
 }
 
-func (i *ITD) WatchHeartRate(_ *rpc.Empty, s rpc.DRPCITD_WatchHeartRateStream) error {
+func (i *ITD) WatchHeartRate(ctx context.Context, _ none, out *string) error {
-	errCh := make(chan error)
+	// Get client message sender
+	msgSender, ok := getMsgSender(ctx, i.srv)
+	// If user is using gateway, the client connection will not be available
+	if !ok {
+		return ErrRPCXNoReturnURL
+	}
 
-	err := i.dev.WatchHeartRate(s.Context(), func(rate uint8, err error) {
+	heartRateCh, cancel, err := i.dev.WatchHeartRate()
-		if err != nil {
-			errCh <- err
-			return
-		}
-
-		err = s.Send(&rpc.IntResponse{Value: uint32(rate)})
-		if err != nil {
-			errCh <- err
-		}
-	})
 	if err != nil {
 		return err
 	}
 
-	select {
+	id := uuid.New().String()
-	case <-errCh:
+	go func() {
-		return err
+		done.Create(id)
-	case <-s.Context().Done():
+		// For every heart rate value
-		return nil
+		for heartRate := range heartRateCh {
+			select {
+			case <-done[id]:
+				// Stop notifications if done signal received
+				cancel()
+				done.Remove(id)
+				return
+			default:
+				data, err := msgpack.Marshal(heartRate)
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding heart rate")
+					continue
+				}
+
+				// Send response to connection if no done signal received
+				msgSender.SendMessage(id, "HeartRateSample", nil, data)
+			}
+		}
+	}()
+
+	*out = id
+	return nil
+}
+
+func (i *ITD) BatteryLevel(_ context.Context, _ none, out *uint8) error {
+	battLevel, err := i.dev.BatteryLevel()
+	*out = battLevel
+	return err
+}
+
+func (i *ITD) WatchBatteryLevel(ctx context.Context, _ none, out *string) error {
+	// Get client message sender
+	msgSender, ok := getMsgSender(ctx, i.srv)
+	// If user is using gateway, the client connection will not be available
+	if !ok {
+		return ErrRPCXNoReturnURL
 	}
-}
 
-func (i *ITD) BatteryLevel(_ context.Context, _ *rpc.Empty) (*rpc.IntResponse, error) {
+	battLevelCh, cancel, err := i.dev.WatchBatteryLevel()
-	bl, err := i.dev.BatteryLevel()
-	return &rpc.IntResponse{Value: uint32(bl)}, err
-}
-
-func (i *ITD) WatchBatteryLevel(_ *rpc.Empty, s rpc.DRPCITD_WatchBatteryLevelStream) error {
-	errCh := make(chan error)
-
-	err := i.dev.WatchBatteryLevel(s.Context(), func(level uint8, err error) {
-		if err != nil {
-			errCh <- err
-			return
-		}
-
-		err = s.Send(&rpc.IntResponse{Value: uint32(level)})
-		if err != nil {
-			errCh <- err
-		}
-	})
 	if err != nil {
 		return err
 	}
 
-	select {
+	id := uuid.New().String()
-	case <-errCh:
+	go func() {
-		return err
+		done.Create(id)
-	case <-s.Context().Done():
+		// For every heart rate value
-		return nil
+		for battLevel := range battLevelCh {
-	}
+			select {
+			case <-done[id]:
+				// Stop notifications if done signal received
+				cancel()
+				done.Remove(id)
+				return
+			default:
+				data, err := msgpack.Marshal(battLevel)
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding battery level")
+					continue
+				}
+
+				// Send response to connection if no done signal received
+				msgSender.SendMessage(id, "BatteryLevelSample", nil, data)
+			}
+		}
+	}()
+
+	*out = id
+	return nil
 }
 
-func (i *ITD) Motion(_ context.Context, _ *rpc.Empty) (*rpc.MotionResponse, error) {
+func (i *ITD) Motion(_ context.Context, _ none, out *infinitime.MotionValues) error {
 	motionVals, err := i.dev.Motion()
-	return &rpc.MotionResponse{
+	*out = motionVals
-		X: int32(motionVals.X),
+	return err
-		Y: int32(motionVals.Y),
-		Z: int32(motionVals.Z),
-	}, err
 }
 
-func (i *ITD) WatchMotion(_ *rpc.Empty, s rpc.DRPCITD_WatchMotionStream) error {
+func (i *ITD) WatchMotion(ctx context.Context, _ none, out *string) error {
-	errCh := make(chan error)
+	// Get client message sender
+	msgSender, ok := getMsgSender(ctx, i.srv)
+	// If user is using gateway, the client connection will not be available
+	if !ok {
+		return ErrRPCXNoReturnURL
+	}
 
-	err := i.dev.WatchMotion(s.Context(), func(motion infinitime.MotionValues, err error) {
+	motionValsCh, cancel, err := i.dev.WatchMotion()
-		if err != nil {
-			errCh <- err
-			return
-		}
-
-		err = s.Send(&rpc.MotionResponse{
-			X: int32(motion.X),
-			Y: int32(motion.Y),
-			Z: int32(motion.Z),
-		})
-		if err != nil {
-			errCh <- err
-		}
-	})
 	if err != nil {
 		return err
 	}
 
-	select {
+	id := uuid.New().String()
-	case <-errCh:
+	go func() {
-		return err
+		done.Create(id)
-	case <-s.Context().Done():
+		// For every heart rate value
-		return nil
+		for motionVals := range motionValsCh {
+			select {
+			case <-done[id]:
+				// Stop notifications if done signal received
+				cancel()
+				done.Remove(id)
+				return
+			default:
+				data, err := msgpack.Marshal(motionVals)
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding motion values")
+					continue
+				}
+
+				// Send response to connection if no done signal received
+				msgSender.SendMessage(id, "MotionSample", nil, data)
+			}
+		}
+	}()
+
+	*out = id
+	return nil
+}
+
+func (i *ITD) StepCount(_ context.Context, _ none, out *uint32) error {
+	stepCount, err := i.dev.StepCount()
+	*out = stepCount
+	return err
+}
+
+func (i *ITD) WatchStepCount(ctx context.Context, _ none, out *string) error {
+	// Get client message sender
+	msgSender, ok := getMsgSender(ctx, i.srv)
+	// If user is using gateway, the client connection will not be available
+	if !ok {
+		return ErrRPCXNoReturnURL
 	}
-}
 
-func (i *ITD) StepCount(_ context.Context, _ *rpc.Empty) (*rpc.IntResponse, error) {
+	stepCountCh, cancel, err := i.dev.WatchStepCount()
-	sc, err := i.dev.StepCount()
-	return &rpc.IntResponse{Value: sc}, err
-}
-
-func (i *ITD) WatchStepCount(_ *rpc.Empty, s rpc.DRPCITD_WatchStepCountStream) error {
-	errCh := make(chan error)
-
-	err := i.dev.WatchStepCount(s.Context(), func(count uint32, err error) {
-		if err != nil {
-			errCh <- err
-			return
-		}
-
-		err = s.Send(&rpc.IntResponse{Value: count})
-		if err != nil {
-			errCh <- err
-		}
-	})
 	if err != nil {
 		return err
 	}
 
-	select {
+	id := uuid.New().String()
-	case <-errCh:
+	go func() {
-		return err
+		done.Create(id)
-	case <-s.Context().Done():
+		// For every heart rate value
-		return nil
+		for stepCount := range stepCountCh {
-	}
+			select {
+			case <-done[id]:
+				// Stop notifications if done signal received
+				cancel()
+				done.Remove(id)
+				return
+			default:
+				data, err := msgpack.Marshal(stepCount)
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding step count")
+					continue
+				}
+
+				// Send response to connection if no done signal received
+				msgSender.SendMessage(id, "StepCountSample", nil, data)
+			}
+		}
+	}()
+
+	*out = id
+	return nil
 }
 
-func (i *ITD) Version(_ context.Context, _ *rpc.Empty) (*rpc.StringResponse, error) {
+func (i *ITD) Version(_ context.Context, _ none, out *string) error {
-	v, err := i.dev.Version()
+	version, err := i.dev.Version()
-	return &rpc.StringResponse{Value: v}, err
+	*out = version
+	return err
 }
 
-func (i *ITD) Address(_ context.Context, _ *rpc.Empty) (*rpc.StringResponse, error) {
+func (i *ITD) Address(_ context.Context, _ none, out *string) error {
-	return &rpc.StringResponse{Value: i.dev.Address()}, nil
+	addr := i.dev.Address()
+	*out = addr
+	return nil
 }
 
-func (i *ITD) Notify(_ context.Context, data *rpc.NotifyRequest) (*rpc.Empty, error) {
+func (i *ITD) Notify(_ context.Context, data api.NotifyData, _ *none) error {
-	return &rpc.Empty{}, i.dev.Notify(data.Title, data.Body)
+	return i.dev.Notify(data.Title, data.Body)
 }
 
-func (i *ITD) SetTime(_ context.Context, data *rpc.SetTimeRequest) (*rpc.Empty, error) {
+func (i *ITD) SetTime(_ context.Context, t time.Time, _ *none) error {
-	return &rpc.Empty{}, i.dev.SetTime(time.Unix(0, data.UnixNano))
+	return i.dev.SetTime(t)
 }
 
-func (i *ITD) WeatherUpdate(context.Context, *rpc.Empty) (*rpc.Empty, error) {
+func (i *ITD) WeatherUpdate(_ context.Context, _ none, _ *none) error {
 	sendWeatherCh <- struct{}{}
-	return &rpc.Empty{}, nil
+	return nil
 }
 
-func (i *ITD) FirmwareUpgrade(data *rpc.FirmwareUpgradeRequest, s rpc.DRPCITD_FirmwareUpgradeStream) (err error) {
+func (i *ITD) FirmwareUpgrade(ctx context.Context, reqData api.FwUpgradeData, out *string) error {
-	var fwimg, initpkt *os.File
+	i.dev.DFU.Reset()
 
-	switch data.Type {
+	switch reqData.Type {
-	case rpc.FirmwareUpgradeRequest_Archive:
+	case api.UpgradeTypeArchive:
-		fwimg, initpkt, err = extractDFU(data.Files[0])
+		// If less than one file, return error
-		if err != nil {
+		if len(reqData.Files) < 1 {
-			return err
-		}
-	case rpc.FirmwareUpgradeRequest_Files:
-		if len(data.Files) < 2 {
 			return ErrDFUNotEnoughFiles
 		}
-
+		// If file is not zip archive, return error
-		if filepath.Ext(data.Files[0]) != ".dat" {
+		if filepath.Ext(reqData.Files[0]) != ".zip" {
 			return ErrDFUInvalidFile
 		}
-
+		// Load DFU archive
-		if filepath.Ext(data.Files[1]) != ".bin" {
+		err := i.dev.DFU.LoadArchive(reqData.Files[0])
-			return ErrDFUInvalidFile
-		}
-
-		initpkt, err = os.Open(data.Files[0])
 		if err != nil {
 			return err
 		}
-
+	case api.UpgradeTypeFiles:
-		fwimg, err = os.Open(data.Files[1])
+		// If less than two files, return error
+		if len(reqData.Files) < 2 {
+			return ErrDFUNotEnoughFiles
+		}
+		// If first file is not init packet, return error
+		if filepath.Ext(reqData.Files[0]) != ".dat" {
+			return ErrDFUInvalidFile
+		}
+		// If second file is not firmware image, return error
+		if filepath.Ext(reqData.Files[1]) != ".bin" {
+			return ErrDFUInvalidFile
+		}
+		// Load individual DFU files
+		err := i.dev.DFU.LoadFiles(reqData.Files[0], reqData.Files[1])
 		if err != nil {
 			return err
 		}
@@ -277,99 +387,112 @@ func (i *ITD) FirmwareUpgrade(data *rpc.FirmwareUpgradeRequest, s rpc.DRPCITD_Fi
 		return ErrDFUInvalidUpgType
 	}
 
-	defer os.Remove(fwimg.Name())
+	id := uuid.New().String()
-	defer os.Remove(initpkt.Name())
+	*out = id
-	defer fwimg.Close()
-	defer initpkt.Close()
 
+	// Get client message sender
+	msgSender, ok := getMsgSender(ctx, i.srv)
+	// If user is using gateway, the client connection will not be available
+	if ok {
+		go func() {
+			// For every progress event
+			for event := range i.dev.DFU.Progress() {
+				data, err := msgpack.Marshal(event)
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding DFU progress event")
+					continue
+				}
+
+				msgSender.SendMessage(id, "DFUProgress", nil, data)
+			}
+
+			firmwareUpdating = false
+			msgSender.SendMessage(id, "Done", nil, nil)
+		}()
+	}
+
+	// Set firmwareUpdating
 	firmwareUpdating = true
-	defer func() { firmwareUpdating = false }()
 
-	return i.dev.UpgradeFirmware(infinitime.DFUOptions{
+	go func() {
-		InitPacket:    initpkt,
+		// Start DFU
-		FirmwareImage: fwimg,
+		err := i.dev.DFU.Start()
-		ProgressFunc: func(sent, received, total uint32) {
+		if err != nil {
-			_ = s.Send(&rpc.DFUProgress{
+			log.Error().Err(err).Msg("Error while upgrading firmware")
-				Sent:     int64(sent),
+			firmwareUpdating = false
-				Recieved: int64(received),
+			return
-				Total:    int64(total),
+		}
-			})
+	}()
-		},
+
-	})
+	return nil
+}
+
+func (i *ITD) Done(_ context.Context, id string, _ *none) error {
+	done.Done(id)
+	return nil
 }
 
 type FS struct {
 	dev *infinitime.Device
-	fs  *infinitime.FS
+	fs  *blefs.FS
+	srv *server.Server
 }
 
-func (fs *FS) RemoveAll(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
+func (fs *FS) Remove(_ context.Context, paths []string, _ *none) error {
-	for _, path := range req.Paths {
+	fs.updateFS()
-		err := fs.fs.RemoveAll(path)
+	for _, path := range paths {
-		if err != nil {
-			return &rpc.Empty{}, err
-		}
-	}
-	return &rpc.Empty{}, nil
-}
-
-func (fs *FS) Remove(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
-	for _, path := range req.Paths {
 		err := fs.fs.Remove(path)
 		if err != nil {
-			return &rpc.Empty{}, err
+			return err
 		}
 	}
-	return &rpc.Empty{}, nil
+	return nil
 }
 
-func (fs *FS) Rename(_ context.Context, req *rpc.RenameRequest) (*rpc.Empty, error) {
+func (fs *FS) Rename(_ context.Context, paths [2]string, _ *none) error {
-	return &rpc.Empty{}, fs.fs.Rename(req.From, req.To)
+	fs.updateFS()
+	return fs.fs.Rename(paths[0], paths[1])
 }
 
-func (fs *FS) MkdirAll(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
+func (fs *FS) Mkdir(_ context.Context, paths []string, _ *none) error {
-	for _, path := range req.Paths {
+	fs.updateFS()
-		err := fs.fs.MkdirAll(path)
+	for _, path := range paths {
-		if err != nil {
-			return &rpc.Empty{}, err
-		}
-	}
-	return &rpc.Empty{}, nil
-}
-
-func (fs *FS) Mkdir(_ context.Context, req *rpc.PathsRequest) (*rpc.Empty, error) {
-	for _, path := range req.Paths {
 		err := fs.fs.Mkdir(path)
 		if err != nil {
-			return &rpc.Empty{}, err
+			return err
 		}
 	}
-	return &rpc.Empty{}, nil
+	return nil
 }
 
-func (fs *FS) ReadDir(_ context.Context, req *rpc.PathRequest) (*rpc.DirResponse, error) {
+func (fs *FS) ReadDir(_ context.Context, dir string, out *[]api.FileInfo) error {
-	entries, err := fs.fs.ReadDir(req.Path)
+	fs.updateFS()
+
+	entries, err := fs.fs.ReadDir(dir)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	var fileInfo []*rpc.FileInfo
+	var fileInfo []api.FileInfo
 	for _, entry := range entries {
 		info, err := entry.Info()
 		if err != nil {
-			return nil, err
+			return err
 		}
-		fileInfo = append(fileInfo, &rpc.FileInfo{
+		fileInfo = append(fileInfo, api.FileInfo{
 			Name:  info.Name(),
 			Size:  info.Size(),
 			IsDir: info.IsDir(),
 		})
 	}
 
-	return &rpc.DirResponse{Entries: fileInfo}, nil
+	*out = fileInfo
+	return nil
 }
 
-func (fs *FS) Upload(req *rpc.TransferRequest, s rpc.DRPCFS_UploadStream) error {
+func (fs *FS) Upload(ctx context.Context, paths [2]string, out *string) error {
-	localFile, err := os.Open(req.Source)
+	fs.updateFS()
+
+	localFile, err := os.Open(paths[1])
 	if err != nil {
 		return err
 	}
@@ -379,135 +502,187 @@ func (fs *FS) Upload(req *rpc.TransferRequest, s rpc.DRPCFS_UploadStream) error
 		return err
 	}
 
-	remoteFile, err := fs.fs.Create(req.Destination, uint32(localInfo.Size()))
+	remoteFile, err := fs.fs.Create(paths[0], uint32(localInfo.Size()))
 	if err != nil {
 		return err
 	}
 
-	remoteFile.ProgressFunc = func(transferred, total uint32) {
+	id := uuid.New().String()
-		_ = s.Send(&rpc.TransferProgress{
+	*out = id
-			Total: total,
+
-			Sent:  transferred,
+	// Get client message sender
-		})
+	msgSender, ok := getMsgSender(ctx, fs.srv)
+	// If user is using gateway, the client connection will not be available
+	if ok {
+		go func() {
+			// For every progress event
+			for sent := range remoteFile.Progress() {
+				data, err := msgpack.Marshal(api.FSTransferProgress{
+					Total: remoteFile.Size(),
+					Sent:  sent,
+				})
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding filesystem transfer progress event")
+					continue
+				}
+
+				msgSender.SendMessage(id, "FSProgress", nil, data)
+			}
+
+			msgSender.SendMessage(id, "Done", nil, nil)
+		}()
 	}
 
-	io.Copy(remoteFile, localFile)
+	go func() {
-	localFile.Close()
+		io.Copy(remoteFile, localFile)
-	remoteFile.Close()
+		localFile.Close()
+		remoteFile.Close()
+	}()
 
 	return nil
 }
 
-func (fs *FS) Download(req *rpc.TransferRequest, s rpc.DRPCFS_DownloadStream) error {
+func (fs *FS) Download(ctx context.Context, paths [2]string, out *string) error {
-	localFile, err := os.Create(req.Destination)
+	fs.updateFS()
+
+	localFile, err := os.Create(paths[0])
 	if err != nil {
 		return err
 	}
 
-	remoteFile, err := fs.fs.Open(req.Source)
+	remoteFile, err := fs.fs.Open(paths[1])
 	if err != nil {
 		return err
 	}
 
-	defer localFile.Close()
+	id := uuid.New().String()
-	defer remoteFile.Close()
+	*out = id
 
-	remoteFile.ProgressFunc = func(transferred, total uint32) {
+	// Get client message sender
-		_ = s.Send(&rpc.TransferProgress{
+	msgSender, ok := getMsgSender(ctx, fs.srv)
-			Total: total,
+	// If user is using gateway, the client connection will not be available
-			Sent:  transferred,
+	if ok {
-		})
+		go func() {
+			// For every progress event
+			for rcvd := range remoteFile.Progress() {
+				data, err := msgpack.Marshal(api.FSTransferProgress{
+					Total: remoteFile.Size(),
+					Sent:  rcvd,
+				})
+				if err != nil {
+					log.Error().Err(err).Msg("Error encoding filesystem transfer progress event")
+					continue
+				}
+
+				msgSender.SendMessage(id, "FSProgress", nil, data)
+			}
+
+			msgSender.SendMessage(id, "Done", nil, nil)
+			localFile.Close()
+			remoteFile.Close()
+		}()
 	}
 
-	_, err = io.Copy(localFile, remoteFile)
+	go io.Copy(localFile, remoteFile)
-	if err != nil {
-		return err
-	}
 
 	return nil
 }
 
-func (fs *FS) LoadResources(req *rpc.PathRequest, s rpc.DRPCFS_LoadResourcesStream) error {
+func (fs *FS) updateFS() {
-	return infinitime.LoadResources(req.Path, fs.fs, func(evt infinitime.ResourceLoadProgress) {
+	if fs.fs == nil || updateFS {
-		_ = s.Send(&rpc.ResourceLoadProgress{
+		// Get new FS
-			Name:      evt.Name,
+		newFS, err := fs.dev.FS()
-			Total:     int64(evt.Total),
+		if err != nil {
-			Sent:      int64(evt.Transferred),
+			log.Warn().Err(err).Msg("Error updating BLE filesystem")
-			Operation: rpc.ResourceLoadProgress_Operation(evt.Operation),
+		} else {
-		})
+			// Set FS pointer to new FS
-	})
+			fs.fs = newFS
+			// Reset updateFS
+			updateFS = false
+		}
+	}
 }
 
-func extractDFU(path string) (fwimg, initpkt *os.File, err error) {
+// cleanPaths runs strings.TrimSpace and filepath.Clean
-	zipReader, err := zip.OpenReader(path)
+// on all inputs, and returns the updated slice
+func cleanPaths(paths []string) []string {
+	for index, path := range paths {
+		newPath := strings.TrimSpace(path)
+		paths[index] = filepath.Clean(newPath)
+	}
+	return paths
+}
+
+func getMsgSender(ctx context.Context, srv *server.Server) (MessageSender, bool) {
+	// Get client message sender
+	clientConn, ok := ctx.Value(server.RemoteConnContextKey).(net.Conn)
+	// If the connection exists, use rpcMsgSender
+	if ok {
+		return &rpcMsgSender{srv, clientConn}, true
+	} else {
+		// Get metadata if it exists
+		metadata, ok := ctx.Value(share.ReqMetaDataKey).(map[string]string)
+		if !ok {
+			return nil, false
+		}
+		// Get returnURL field from metadata if it exists
+		returnURL, ok := metadata["returnURL"]
+		if !ok {
+			return nil, false
+		}
+		// Use httpMsgSender
+		return &httpMsgSender{returnURL}, true
+	}
+
+}
+
+// The MessageSender interface sends messages to the client
+type MessageSender interface {
+	SendMessage(servicePath, serviceMethod string, metadata map[string]string, data []byte) error
+}
+
+// rpcMsgSender sends messages using RPCX, for clients that support it
+type rpcMsgSender struct {
+	srv  *server.Server
+	conn net.Conn
+}
+
+// SendMessage uses the server to send an RPCX message back to the client
+func (r *rpcMsgSender) SendMessage(servicePath, serviceMethod string, metadata map[string]string, data []byte) error {
+	return r.srv.SendMessage(r.conn, servicePath, serviceMethod, metadata, data)
+}
+
+// httpMsgSender sends messages to the given return URL, for clients that provide it
+type httpMsgSender struct {
+	url string
+}
+
+// SendMessage uses HTTP to send a message back to the client
+func (h *httpMsgSender) SendMessage(servicePath, serviceMethod string, metadata map[string]string, data []byte) error {
+	// Create new POST request with provided URL
+	req, err := http.NewRequest(http.MethodPost, h.url, bytes.NewReader(data))
 	if err != nil {
-		return nil, nil, err
+		return err
-	}
-	defer zipReader.Close()
-
-	for _, file := range zipReader.File {
-		if fwimg != nil && initpkt != nil {
-			break
-		}
-
-		switch filepath.Ext(file.Name) {
-		case ".bin":
-			fwimg, err = os.CreateTemp(os.TempDir(), "itd_dfu_fwimg_*.bin")
-			if err != nil {
-				return nil, nil, err
-			}
-
-			zipFile, err := file.Open()
-			if err != nil {
-				return nil, nil, err
-			}
-			defer zipFile.Close()
-
-			_, err = io.Copy(fwimg, zipFile)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			err = zipFile.Close()
-			if err != nil {
-				return nil, nil, err
-			}
-
-			_, err = fwimg.Seek(0, io.SeekStart)
-			if err != nil {
-				return nil, nil, err
-			}
-		case ".dat":
-			initpkt, err = os.CreateTemp(os.TempDir(), "itd_dfu_initpkt_*.dat")
-			if err != nil {
-				return nil, nil, err
-			}
-
-			zipFile, err := file.Open()
-			if err != nil {
-				return nil, nil, err
-			}
-
-			_, err = io.Copy(initpkt, zipFile)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			err = zipFile.Close()
-			if err != nil {
-				return nil, nil, err
-			}
-
-			_, err = initpkt.Seek(0, io.SeekStart)
-			if err != nil {
-				return nil, nil, err
-			}
-		}
 	}
 
-	if fwimg == nil || initpkt == nil {
+	// Set service path and method headers
-		return nil, nil, errors.New("invalid dfu archive")
+	req.Header.Set("X-RPCX-ServicePath", servicePath)
-	}
+	req.Header.Set("X-RPCX-ServiceMethod", serviceMethod)
 
-	return fwimg, initpkt, nil
+	// Create new URL query values
+	query := url.Values{}
+	// Transfer values from metadata to query
+	for k, v := range metadata {
+		query.Set(k, v)
+	}
+	// Set metadata header by encoding query values
+	req.Header.Set("X-RPCX-Meta", query.Encode())
+
+	// Perform request
+	res, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+	// Close body
+	return res.Body.Close()
 }

translit/chinese.go

@@ -35,6 +35,8 @@ 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

@@ -1,47 +0,0 @@
-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

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

version.txt

@@ -0,0 +1 @@
+unknown

waitgroup.go

@@ -1,16 +0,0 @@
-package main
-
-import (
-	"sync"
-
-	"go.elara.ws/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

@@ -1,17 +1,18 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
+	"math"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
 	"time"
 
-	"go.elara.ws/itd/infinitime"
+	"github.com/rs/zerolog/log"
-	"go.elara.ws/logger/log"
+	"go.arsenm.dev/infinitime"
+	"go.arsenm.dev/infinitime/weather"
 )
 
 // METResponse represents a response from
@@ -30,7 +31,7 @@ type METData struct {
 	Instant struct {
 		Details struct {
 			AirPressure       float32 `json:"air_pressure_at_sea_level"`
-			Temperature       float32 `json:"air_temperature"`
+			AirTemperature    float32 `json:"air_temperature"`
 			DewPoint          float32 `json:"dew_point_temperature"`
 			CloudAreaFraction float32 `json:"cloud_area_fraction"`
 			FogAreaFraction   float32 `json:"fog_area_fraction"`
@@ -48,12 +49,6 @@ type METData struct {
 			PrecipitationAmount float32 `json:"precipitation_amount"`
 		}
 	} `json:"next_1_hours"`
-	Next6Hours struct {
-		Details struct {
-			MaxTemp float32 `json:"air_temperature_max"`
-			MinTemp float32 `json:"air_temperature_min"`
-		}
-	} `json:"next_6_hours"`
 }
 
 // OSMData represents lat/long data from
@@ -65,44 +60,27 @@ type OSMData []struct {
 
 var sendWeatherCh = make(chan struct{}, 1)
 
-func sleepCtx(ctx context.Context, d time.Duration) {
+func initWeather(dev *infinitime.Device) error {
-	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
 	}
 
 	// Get location based on string in config
-	lat, lon, err := getLocation(ctx, k.String("weather.location"))
+	lat, lon, err := getLocation(k.String("weather.location"))
 	if err != nil {
 		return err
 	}
 
 	timer := time.NewTimer(time.Hour)
 
-	wg.Add(1)
 	go func() {
-		defer wg.Done("weather")
 		for {
-			select {
-			case _, ok := <-ctx.Done():
-				if !ok {
-					return
-				}
-			default:
-			}
-
 			// Attempt to get weather
-			data, err := getWeather(ctx, lat, lon)
+			data, err := getWeather(lat, lon)
 			if err != nil {
-				log.Warn("Error getting weather data").Err(err).Send()
+				log.Warn().Err(err).Msg("Error getting weather data")
 				// Wait 15 minutes before retrying
-				sleepCtx(ctx, 15*time.Minute)
+				time.Sleep(15 * time.Minute)
 				continue
 			}
 
@@ -110,28 +88,81 @@ func initWeather(ctx context.Context, wg WaitGroup, dev *infinitime.Device) erro
 			current := data.Properties.Timeseries[0]
 			currentData := current.Data.Instant.Details
 
-			icon := parseSymbol(current.Data.NextHour.Summary.SymbolCode)
+			// Add temperature event
-			if icon == infinitime.WeatherIconClear {
+			err = dev.AddWeatherEvent(weather.TemperatureEvent{
-				switch {
+				TimelineHeader: weather.NewHeader(
-				case currentData.CloudAreaFraction > 50:
+					weather.EventTypeTemperature,
-					icon = infinitime.WeatherIconHeavyClouds
+					time.Hour,
-				case currentData.CloudAreaFraction == 50:
+				),
-					icon = infinitime.WeatherIconClouds
+				Temperature: int16(round(currentData.AirTemperature * 100)),
-				case currentData.CloudAreaFraction > 0:
+				DewPoint:    int16(round(currentData.DewPoint)),
-					icon = infinitime.WeatherIconFewClouds
-				}
-			}
-
-			err = dev.SetCurrentWeather(infinitime.CurrentWeather{
-				Time:        time.Now(),
-				CurrentTemp: currentData.Temperature,
-				MaxTemp:     current.Data.Next6Hours.Details.MaxTemp,
-				MinTemp:     current.Data.Next6Hours.Details.MinTemp,
-				Location:    k.String("weather.location"),
-				Icon:        icon,
 			})
 			if err != nil {
-				log.Error("Error setting weather").Err(err).Send()
+				log.Error().Err(err).Msg("Error adding temperature event")
+			}
+
+			// Add precipitation event
+			err = dev.AddWeatherEvent(weather.PrecipitationEvent{
+				TimelineHeader: weather.NewHeader(
+					weather.EventTypePrecipitation,
+					time.Hour,
+				),
+				Type:   parseSymbol(current.Data.NextHour.Summary.SymbolCode),
+				Amount: uint8(round(current.Data.NextHour.Details.PrecipitationAmount)),
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("Error adding precipitation event")
+			}
+
+			// Add wind event
+			err = dev.AddWeatherEvent(weather.WindEvent{
+				TimelineHeader: weather.NewHeader(
+					weather.EventTypeWind,
+					time.Hour,
+				),
+				SpeedMin:     uint8(round(currentData.WindSpeed)),
+				SpeedMax:     uint8(round(currentData.WindSpeed)),
+				DirectionMin: uint8(round(currentData.WindDirection)),
+				DirectionMax: uint8(round(currentData.WindDirection)),
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("Error adding wind event")
+			}
+
+			// Add cloud event
+			err = dev.AddWeatherEvent(weather.CloudsEvent{
+				TimelineHeader: weather.NewHeader(
+					weather.EventTypeClouds,
+					time.Hour,
+				),
+				Amount: uint8(round(currentData.CloudAreaFraction)),
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("Error adding clouds event")
+			}
+
+			// Add humidity event
+			err = dev.AddWeatherEvent(weather.HumidityEvent{
+				TimelineHeader: weather.NewHeader(
+					weather.EventTypeHumidity,
+					time.Hour,
+				),
+				Humidity: uint8(round(currentData.RelativeHumidity)),
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("Error adding humidity event")
+			}
+
+			// Add pressure event
+			err = dev.AddWeatherEvent(weather.PressureEvent{
+				TimelineHeader: weather.NewHeader(
+					weather.EventTypePressure,
+					time.Hour,
+				),
+				Pressure: int16(round(currentData.AirPressure)),
+			})
+			if err != nil {
+				log.Error().Err(err).Msg("Error adding pressure event")
 			}
 
 			// Reset timer to 1 hour
@@ -142,8 +173,6 @@ func initWeather(ctx context.Context, wg WaitGroup, dev *infinitime.Device) erro
 			select {
 			case <-timer.C:
 			case <-sendWeatherCh:
-			case <-ctx.Done():
-				return
 			}
 		}
 	}()
@@ -152,15 +181,10 @@ func initWeather(ctx context.Context, wg WaitGroup, dev *infinitime.Device) erro
 
 // getLocation returns the latitude and longitude
 // given a location
-func getLocation(ctx context.Context, loc string) (lat, lon float64, err error) {
+func getLocation(loc string) (lat, lon float64, err error) {
 	// Create request URL and perform GET request
 	reqURL := fmt.Sprintf("https://nominatim.openstreetmap.org/search.php?q=%s&format=jsonv2", url.QueryEscape(loc))
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, reqURL, nil)
+	res, err := http.Get(reqURL)
-	if err != nil {
-		return
-	}
-	req.Header.Set("User-Agent", fmt.Sprintf("ITD/%s gitea.elara.ws/Elara6331/itd", strings.TrimSpace(version)))
-	res, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return
 	}
@@ -194,10 +218,9 @@ func getLocation(ctx context.Context, loc string) (lat, lon float64, err error)
 }
 
 // getWeather gets weather data given a latitude and longitude
-func getWeather(ctx context.Context, lat, lon float64) (*METResponse, error) {
+func getWeather(lat, lon float64) (*METResponse, error) {
 	// Create new GET request
-	req, err := http.NewRequestWithContext(
+	req, err := http.NewRequest(
-		ctx,
 		http.MethodGet,
 		fmt.Sprintf(
 			"https://api.met.no/weatherapi/locationforecast/2.0/complete?lat=%.2f&lon=%.2f",
@@ -211,7 +234,7 @@ func getWeather(ctx context.Context, lat, lon float64) (*METResponse, error) {
 	}
 
 	// Set identifying user agent as per NMI requirements
-	req.Header.Set("User-Agent", fmt.Sprintf("ITD/%s gitea.elara.ws/Elara6331/itd", strings.TrimSpace(version)))
+	req.Header.Set("User-Agent", fmt.Sprintf("ITD/%s gitea.arsenm.dev/Arsen6331/itd", version))
 
 	// Perform request
 	res, err := http.DefaultClient.Do(req)
@@ -229,19 +252,26 @@ func getWeather(ctx context.Context, lat, lon float64) (*METResponse, error) {
 	return out, nil
 }
 
-// parseSymbol determines what weather icon a symbol code codes for.
+// parseSymbol determines what type of precipitation a symbol code
-func parseSymbol(symCode string) infinitime.WeatherIcon {
+// codes for.
+func parseSymbol(symCode string) weather.PrecipitationType {
 	switch {
 	case strings.Contains(symCode, "lightrain"):
-		return infinitime.WeatherIconRain
+		return weather.PrecipitationTypeRain
 	case strings.Contains(symCode, "rain"):
-		return infinitime.WeatherIconCloudsWithRain
+		return weather.PrecipitationTypeRain
-	case strings.Contains(symCode, "snow"),
+	case strings.Contains(symCode, "snow"):
-		strings.Contains(symCode, "sleet"):
+		return weather.PrecipitationTypeSnow
-		return infinitime.WeatherIconSnow
+	case strings.Contains(symCode, "sleet"):
-	case strings.Contains(symCode, "thunder"):
+		return weather.PrecipitationTypeSleet
-		return infinitime.WeatherIconThunderstorm
+	case strings.Contains(symCode, "snow"):
+		return weather.PrecipitationTypeSnow
 	default:
-		return infinitime.WeatherIconClear
+		return weather.PrecipitationTypeNone
 	}
 }
+
+// round rounds 32-bit floats to 32-bit integers
+func round(f float32) int32 {
+	return int32(math.Round(float64(f)))
+}