@benev/tact 0.4.0-6 → 0.4.0-8

package/s/lib/ui/deck/setup/deck.ts

@@ -1,31 +1,44 @@
 
-import {IdbMagazine, idbOpen, Kv} from "@e280/kv"
-
+import {disposer, ev} from "@e280/stz"
 import {Hub} from "../hub.js"
 import {asDeck} from "../types.js"
+import {setupKv} from "./utils/kv.js"
 import {SetupParams} from "./types.js"
 import {Controls} from "../controls/controls.js"
 import {Bindings} from "../../../input/types.js"
 import {firstPreset} from "../utils/first-preset.js"
+import {setupBroadcastChannel} from "./utils/broadcast-channel.js"
 
 export async function setupDeck<B extends Bindings>(params: SetupParams<B>) {
-	const kv = params.kv
-		?? new Kv(new IdbMagazine(await idbOpen("tact", "kv")))
-
-	const broadcastChannel = params.broadcastChannel
-		?? new BroadcastChannel("tact")
-
-	const {maxPlayers} = params
-	const {bindings} = firstPreset(params.presets).profile
-
-	const hub = new Hub(bindings)
-	const controls = new Controls({...params, kv})
-
-	await controls.load()
-
-	broadcastChannel.onmessage = () => controls.load()
-	controls.on(() => broadcastChannel.postMessage({}))
-
-	return asDeck({hub, controls, maxPlayers})
+	const {dispose, schedule, disposable} = disposer()
+
+	const namespace = params.namespace
+		? `tact_${params.namespace}`
+		: "tact"
+
+	const {kv} = disposable(
+		await setupKv(namespace, params.kv)
+	)
+
+	const {broadcastChannel} = disposable(
+		await setupBroadcastChannel(namespace, params.broadcastChannel)
+	)
+
+	try {
+		const {maxPlayers} = params
+		const {bindings} = firstPreset(params.presets).profile
+		const hub = new Hub(bindings)
+		const controls = new Controls({...params, kv})
+
+		schedule(ev(broadcastChannel, {message: () => controls.load()}))
+		schedule(controls.on(() => broadcastChannel.postMessage({})))
+
+		await controls.load()
+		return asDeck({hub, controls, maxPlayers, dispose})
+	}
+	catch (error) {
+		dispose()
+		throw error
+	}
 }
 

package/s/lib/ui/deck/setup/tact.ts

@@ -1,9 +1,9 @@
 
+import {disposer} from "@e280/stz"
 import {register} from "@e280/sly"
 
 import {setupDeck} from "./deck.js"
 import {SetupParams} from "./types.js"
-import {Collector} from "../collector.js"
 import {Bindings} from "../../../input/types.js"
 import {autoGamepads} from "../auto-gamepads.js"
 import {ellipsis} from "../../../utils/ellipsis.js"
@@ -23,9 +23,10 @@ import devicesSvg from "../../icons/akar/devices.svg.js"
 import gameControllerSvg from "../../icons/akar/game-controller.svg.js"
 
 export async function setupTact<B extends Bindings>(params: SetupParams<B>) {
-	const deck = await setupDeck(params)
+	const {dispose, schedule, disposable} = disposer()
+
+	const deck = disposable(await setupDeck(params))
 	const first = firstPreset(deck.controls.presets)
-	const collector = new Collector(first.profile.bindings)
 	const visualizer = new Visualizer()
 
 	const elements = {
@@ -36,7 +37,7 @@ export async function setupTact<B extends Bindings>(params: SetupParams<B>) {
 	}
 
 	function gamepads(defaultProfileKey?: string) {
-		return autoGamepads(deck.hub, (controller, source) => {
+		const stop = autoGamepads(deck.hub, (controller, source) => {
 			const handle = `${source.pad.gamepad.id} ${source.pad.gamepad.index + 1}`
 			deck.controls.attach(controller, {
 				icon: gameControllerSvg,
@@ -47,18 +48,20 @@ export async function setupTact<B extends Bindings>(params: SetupParams<B>) {
 			})
 			return () => deck.controls.detach(controller)
 		})
+		schedule(stop)
+		return stop
 	}
 
 	function mouseKeyboard() {
 		const {key, profile} = first
 
-		const controller = new Controller({
+		const controller = disposable(new Controller({
 			bindings: profile.bindings,
-			source: new Sources(
-				new KeyboardSource(),
-				new PointerSource(),
-			),
-		})
+			source: disposable(new Sources(
+				disposable(new KeyboardSource()),
+				disposable(new PointerSource()),
+			)),
+		}))
 
 		deck.hub.plug(controller)
 
@@ -70,6 +73,11 @@ export async function setupTact<B extends Bindings>(params: SetupParams<B>) {
 			defaultProfileKey: key,
 		})
 
+		schedule(() => {
+			deck.hub.remove(controller)
+			deck.controls.detach(controller)
+		})
+
 		return controller
 	}
 
@@ -79,12 +87,13 @@ export async function setupTact<B extends Bindings>(params: SetupParams<B>) {
 
 	return {
 		deck,
-		collector,
 		gamepads,
 		mouseKeyboard,
 		visualizer,
 		elements,
 		registerElements,
+		encodeAll: deck.hub.encodeAll.bind(deck.hub),
+		dispose,
 	}
 }
 

package/s/lib/ui/deck/setup/types.ts

@@ -6,6 +6,7 @@ import {Bindings} from "../../../input/types.js"
 export type SetupParams<B extends Bindings> = {
 	maxPlayers: number
 	presets: Presets<B>
+	namespace?: string
 	kv?: Kv
 	broadcastChannel?: BroadcastChannel
 }

package/s/lib/ui/deck/setup/utils/broadcast-channel.ts

@@ -0,0 +1,17 @@
+
+export async function setupBroadcastChannel(
+		namespace: string,
+		broadcastChannel: BroadcastChannel | undefined,
+	) {
+
+	let dispose = () => {}
+
+	if (!broadcastChannel) {
+		const bc = new BroadcastChannel(namespace)
+		broadcastChannel = bc
+		dispose = () => bc.close()
+	}
+
+	return {broadcastChannel, dispose}
+}
+

package/s/lib/ui/deck/setup/utils/kv.ts

@@ -0,0 +1,20 @@
+
+import {IdbMagazine, idbOpen, Kv} from "@e280/kv"
+
+export async function setupKv(
+		namespace: string,
+		kv: Kv | undefined,
+	) {
+
+	let dispose = () => {}
+
+	if (!kv) {
+		const idb = await idbOpen(namespace, "kv")
+		const magazine = new IdbMagazine(idb)
+		kv = new Kv(magazine)
+		dispose = () => idb.db.close()
+	}
+
+	return {kv, dispose}
+}
+

package/s/lib/ui/deck/types.ts

@@ -4,7 +4,6 @@ import {Bindings} from "../../input/types.js"
 import {Controls} from "./controls/controls.js"
 
 export type PlayerId = number
-
 export type ProfileKey = string
 
 export type Profile<B extends Bindings = any> = {
@@ -19,6 +18,7 @@ export type Deck<B extends Bindings = any> = {
 	hub: Hub<B>
 	maxPlayers: number
 	controls: Controls<B>
+	dispose: () => void
 }
 
 export const asDeck = <B extends Bindings>(deck: Deck<B>) => deck

package/s/lib/ui/views/customize/view.ts

@@ -27,17 +27,17 @@ export const [CustomizeView, makeCustomizeElement] = shadowDuplex((options: {con
 		? profiles.get(profile.basedOn)
 		: profile
 
-	const updateBindings = (bindings: Bindings) => {
+	const updateBindings = async(bindings: Bindings) => {
 		let key = $profileKey()
 
 		if (profiles.isPreset(key)) {
 			const basedOn = key
 			const freshKey = makeId()
 			key = freshKey
-			profiles.clone(freshKey, basedOn)
+			await profiles.clone(freshKey, basedOn)
 		}
 
-		profiles.update(key, {bindings})
+		await profiles.update(key, {bindings})
 		$profileKey(key)
 	}
 

package/s/lib/utils/hash.ts

@@ -0,0 +1,47 @@
+
+import {blake3} from "@awasm/noble/js.js"
+import {dataViewFrom, txt} from "@e280/stz"
+
+const endian = false
+enum EntropyType {String, Number, Bytes}
+
+export function hash(...entropy: (string | number | Uint8Array)[]) {
+	if (entropy.length === 0)
+		throw new RangeError("hash requires entropy")
+
+	const hasher = blake3.create()
+	const typeTag = new Uint8Array(1)
+	const lengthTag = new Uint8Array(4)
+	const lengthDataview = dataViewFrom(lengthTag)
+
+	for (const part of entropy) {
+		if (typeof part === "string") {
+			const bytes = txt.toBytes(part)
+			typeTag[0] = EntropyType.String
+			lengthDataview.setUint32(0, bytes.byteLength, endian)
+			hasher.update(typeTag)
+			hasher.update(lengthTag)
+			hasher.update(bytes)
+		}
+		else if (typeof part === "number") {
+			const bytes = new Uint8Array(8)
+			dataViewFrom(bytes).setFloat64(0, part, endian)
+			typeTag[0] = EntropyType.Number
+			lengthDataview.setUint32(0, bytes.byteLength, endian)
+			hasher.update(typeTag)
+			hasher.update(lengthTag)
+			hasher.update(bytes)
+		}
+		else if (part instanceof Uint8Array) {
+			typeTag[0] = EntropyType.Bytes
+			lengthDataview.setUint32(0, part.byteLength, endian)
+			hasher.update(typeTag)
+			hasher.update(lengthTag)
+			hasher.update(part)
+		}
+		else throw new Error("unknown part type")
+	}
+
+	return hasher.digest() as Uint8Array
+}
+