@bridgething/updater 0.7.0 → 0.9.0

package/README.md

@@ -1,36 +1,31 @@
 # @bridgething/updater
 
-Transport-agnostic OTA updater for a [bridgething](https://github.com/JoeyEamigh/bridgething)
-Spotify Car Thing: a `bunx`/`npx` CLI that brings a device to the latest release
-on a channel, plus the library the CLI is built from.
+CLI that brings a [bridgething](https://github.com/JoeyEamigh/bridgething) Spotify
+Car Thing to a release on a channel.
 
 It updates the **device** (daemon binary and/or full image), not a webapp. To
 install or share a webapp, use [`@bridgething/client`](https://www.npmjs.com/package/@bridgething/client)
 and the `push`/`share` scripts a [`create-bridgething`](https://www.npmjs.com/package/create-bridgething)
 project ships.
 
-## CLI
-
 ```sh
 bunx @bridgething/updater
 ```
 
-Connects to a Car Thing over the daemon's network gateway (the USB-gadget link
-by default), reads the discover manifest, resolves the target channel's `latest`
-composite version, downloads whatever artifacts are missing, and pushes the
-update. If the image half of the version changed it pushes a full image OTA,
-otherwise it pushes just the daemon binary. A `latest` release that is yanked or
-deprecated is refused.
-
-Options:
+Connects to a Car Thing over the daemon's network gateway (the USB-gadget link by
+default), reads the discover manifest, resolves the target channel's `latest`
+composite version, and applies it. If the image half of the version changed it
+pushes a full image OTA, otherwise it pushes just the daemon binary, preferring a
+published delta over a full artifact. A release that is yanked or deprecated is
+refused.
 
 | Flag | Default | Meaning |
 | --- | --- | --- |
 | `--root <url>` | `https://ota.bridgething.com` | Manifest + artifact root. |
-| `--channel <name>` | `stable` | Channel to track. |
+| `--channel <name>` | the channel the device reports | Channel to track. |
 | `--host <ws-url>` | `ws://bridgething.local:8892/` | Daemon network gateway. |
-| `--cache-dir <path>` | OS tmpdir `/bridgething-updater` | Artifact download cache. |
-| `--daemon-only` | off | Skip the image OTA even if the image half changed. |
+| `--cache-dir <path>` | a directory under the OS tmpdir | Artifact download cache. |
+| `--version <ver>` | the channel's `latest` | Composite version to install. |
 
 Multiple devices on the network resolve to distinct mDNS names; point `--host` at
 the one you mean:
@@ -39,67 +34,13 @@ the one you mean:
 bunx @bridgething/updater --host ws://bridgething-<serial>.local:8892/
 ```
 
-## Library
-
-The CLI is a thin driver over `OtaDriver`, which streams an artifact to the
-daemon with sender-side flow control and reports progress to a terminal state.
-
-```ts
-import { BridgethingGateway } from '@bridgething/gateway';
-import { NetworkAdapter } from '@bridgething/adapter-network';
-import { OtaDriver } from '@bridgething/updater';
-import { fileArtifactSource } from '@bridgething/updater/node';
-
-const gateway = new BridgethingGateway(new NetworkAdapter());
-await gateway.start();
-// resolve a deviceId from a 'version' announce event, then:
-
-const driver = new OtaDriver(gateway, deviceId);
-try {
-  const snapshot = await driver.pushDaemon(await fileArtifactSource('./bridgething'), s =>
-    console.log(s.phase, 'percent' in s ? s.percent : ''),
-  );
-  if (snapshot.phase === 'failed') console.error(snapshot.reason);
-} finally {
-  driver.close();
-}
-```
-
-`OtaDriver` covers every OTA kind the daemon accepts:
-
-- `pushImage({ source, zcks, updateUrlBase })` - full image OTA. When the daemon
-  requests delta ranges of the compressed asset, `zcks` (a map of asset name to
-  source) serves them back over the same link; `serveAssetRanges` wires that up.
-- `pushDaemon(source)` - stage and activate a new daemon binary.
-- `pushBuiltinWebapp(source)` - stage and activate a built-in webapp.
-- `pushBandaidBatch(artifacts)` - stage several bandaid artifacts, then commit
-  them together.
-- `installWebapp(source)` - install a third-party webapp bundle.
-
-### Artifact sources
-
-An `ArtifactSource` is a random-access, sized byte source. The driver reads it in
-64 KiB fragments and never buffers the whole file. Construct one from wherever
-the bytes live:
-
-- `fileArtifactSource(path)` from `@bridgething/updater/node` - a filesystem file.
-- `bytesArtifactSource(bytes)` - an in-memory `Uint8Array`.
-- `blobArtifactSource(blob)` - a browser `Blob` / `File`.
-
-### Manifest helpers
-
-`@bridgething/updater/manifest` exposes the discover-manifest types and helpers
-the CLI uses: `fetchManifest`, `parseCompositeVersion`, `otaArtifactUrls`, and
-`builtinWebappUrl`.
-
-### Adapters
-
-Re-exported for convenience so a consumer needs one import:
+## What it is built on
 
-- `@bridgething/updater/websocket` - `NetworkAdapter` (network gateway, any host
-  that can open a WebSocket).
-- `@bridgething/updater/web-serial` - `WebSerialAdapter` (in-browser Bluetooth
-  Classic over Web Serial).
+Everything below the flags - the wire protocol, transfer pacing, delta selection,
+artifact downloads, and the OTA state machine - runs in the Rust delivery core,
+reached through [`@bridgething/core-node`](https://www.npmjs.com/package/@bridgething/core-node).
+Drive updates from your own program by using that package directly. For the same
+thing in a browser, use [`@bridgething/browser`](https://www.npmjs.com/package/@bridgething/browser).
 
 ## Posture
 

package/dist/cli.js

@@ -1,33 +1,21 @@
 #!/usr/bin/env node
-import { mkdir, stat, writeFile } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { BridgethingGateway } from '@bridgething/gateway';
-import { OtaDriver } from './driver.js';
-import { daemonPatchUrl, fetchManifest, imageVariantForChannel, otaArtifactUrls, parseCompositeVersion, } from './manifest.js';
-import { fileArtifactSource } from './node.js';
-import { NetworkAdapter } from './websocket.js';
+import { DeliveryClient, parseCompositeVersion } from '@bridgething/core-node';
 const DEFAULT_ROOT = 'https://ota.bridgething.com';
 const DEFAULT_HOST = 'ws://bridgething.local:8892/';
-const CONNECT_TIMEOUT_MS = 15_000;
 function parseArgs(argv) {
-    let root = DEFAULT_ROOT;
-    let channel = null;
-    let host = DEFAULT_HOST;
-    let cacheDir = join(tmpdir(), 'bridgething-updater');
-    let daemonOnly = false;
+    const args = { root: DEFAULT_ROOT, channel: null, host: DEFAULT_HOST, cacheDir: null, version: null };
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
         if (arg === '--root')
-            root = requireValue(argv, ++i, arg);
+            args.root = requireValue(argv, ++i, arg);
         else if (arg === '--channel')
-            channel = requireValue(argv, ++i, arg);
+            args.channel = requireValue(argv, ++i, arg);
         else if (arg === '--host')
-            host = requireValue(argv, ++i, arg);
+            args.host = requireValue(argv, ++i, arg);
         else if (arg === '--cache-dir')
-            cacheDir = requireValue(argv, ++i, arg);
-        else if (arg === '--daemon-only')
-            daemonOnly = true;
+            args.cacheDir = requireValue(argv, ++i, arg);
+        else if (arg === '--version')
+            args.version = requireValue(argv, ++i, arg);
         else if (arg === '--help' || arg === '-h') {
             printHelp();
             process.exit(0);
@@ -38,7 +26,8 @@ function parseArgs(argv) {
             process.exit(1);
         }
     }
-    return { root: root.replace(/\/$/, ''), channel, host, cacheDir, daemonOnly };
+    args.root = args.root.replace(/\/$/, '');
+    return args;
 }
 function requireValue(argv, idx, flag) {
     const value = argv[idx];
@@ -51,198 +40,86 @@ function requireValue(argv, idx, flag) {
 function printHelp() {
     console.log(`Usage: bridgething-updater [options]
 
-Updates a Car Thing over its network gateway (USB-gadget by default) to the latest
-release on a channel, per the discover manifest.
+Updates a Car Thing over its network gateway (USB-gadget by default) to a release
+on a channel, per the discover manifest.
 
 Options:
-  --root <url>       Manifest root URL. Default ${DEFAULT_ROOT}.
+  --root <url>        Manifest root URL. Default ${DEFAULT_ROOT}.
   --channel <name>    Channel to track. Defaults to the channel the device reports.
   --host <ws-url>     Daemon network gateway URL. Default ${DEFAULT_HOST}.
-  --cache-dir <path>  Artifact download cache. Default a bridgething-updater dir under the OS tmpdir.
-  --daemon-only       Skip the image OTA even if the manifest's image half changed.
+  --cache-dir <path>  Artifact download cache. Defaults to a directory under the OS tmpdir.
+  --version <ver>     Composite version to install. Defaults to the channel's latest.
 `);
 }
 async function main() {
     const args = parseArgs(process.argv.slice(2));
-    await mkdir(args.cacheDir, { recursive: true });
     console.log(`connecting to ${args.host} ...`);
-    const adapter = new NetworkAdapter({ discovery: args.host });
-    const gateway = new BridgethingGateway(adapter);
-    await gateway.start();
-    const { deviceId, meta } = await waitForDevice(gateway);
-    console.log(`connected: ${meta.modelName} (${deviceId}) - daemon ${meta.appVersion}, image ${meta.imageVersion} (${meta.imageVariant}/${meta.channel})`);
+    const client = await DeliveryClient.connect(args.host, {
+        appName: 'bridgething-updater',
+        cacheDir: args.cacheDir ?? undefined,
+    });
+    const meta = (await client.meta());
+    if (!meta)
+        fail('the device connected but never announced its version');
+    console.log(`connected: ${meta.modelName} (${client.deviceId()}) - daemon ${meta.appVersion}, image ${meta.imageVersion} (${meta.imageVariant}/${meta.channel})`);
     const channelName = args.channel ?? meta.channel;
     console.log(`fetching manifest from ${args.root} (channel ${channelName}) ...`);
-    const manifest = await fetchManifest(args.root);
+    const manifest = (await client.discoverManifest(args.root));
     const channel = manifest.channels[channelName];
-    if (!channel) {
-        fail(`channel '${channelName}' not present in manifest`);
-    }
-    const composite = parseCompositeVersion(channel.latest);
-    if (!composite) {
-        fail(`channel.latest '${channel.latest}' is not a composite version`);
-    }
-    const release = manifest.releases[channel.latest];
+    if (!channel)
+        fail(`channel '${channelName}' is not in the manifest`);
+    const version = args.version ?? channel.latest;
+    const release = manifest.releases[version];
     if (release && (release.yanked !== null || release.deprecated)) {
-        fail(`latest release ${channel.latest} is ${release.yanked !== null ? 'yanked' : 'deprecated'}; refusing to install`);
+        fail(`${version} is ${release.yanked !== null ? 'yanked' : 'deprecated'}; refusing to install`);
     }
-    const urls = otaArtifactUrls({
-        rootURL: args.root,
-        channel: channelName,
-        daemonVersion: composite.daemon,
-        imageVersion: composite.image,
-        imageVariant: imageVariantForChannel(channelName),
-    });
-    const driver = new OtaDriver(gateway, deviceId);
-    let ok = true;
-    try {
-        if (!args.daemonOnly && meta.imageVersion !== composite.image) {
-            ok = await runImagePush(driver, args, urls, `${channelName}-${composite.image}`);
-        }
-        else if (meta.appVersion !== composite.daemon) {
-            ok = await runDaemonPush(driver, args, {
-                fullUrl: urls.daemonBinary,
-                zstUrl: urls.daemonBinaryZst,
-                toVersion: composite.daemon,
-                fromVersion: meta.appVersion,
-                fromSha256: meta.daemonSha256 ?? null,
-                channel: channelName,
-                release,
-            });
-        }
-        else {
-            console.log('already up to date.');
-        }
-    }
-    finally {
-        driver.close();
+    const target = parseCompositeVersion(version);
+    if (!target)
+        fail(`'${version}' is not a composite version`);
+    if (meta.appVersion === target.daemon && meta.imageVersion === target.image) {
+        console.log('already up to date.');
+        process.exit(0);
     }
-    await gateway.stop();
-    process.exit(ok ? 0 : 1);
+    console.log(`applying ${version} ...`);
+    const watching = watch(client);
+    await client.applyVersion(channelName, version, args.root);
+    process.exit((await watching) ? 0 : 1);
 }
-async function runImagePush(driver, args, urls, tag) {
-    console.log('downloading image artifacts ...');
-    const swuPath = await downloadIfNeeded(urls.imageSwu, args.cacheDir, `image-${tag}.swu`);
-    const zckPath = await downloadIfNeeded(urls.imageZck, args.cacheDir, `image-${tag}.zck`);
-    const bootZckPath = await downloadIfNeeded(urls.imageBootZck, args.cacheDir, `image-${tag}-boot.zck`);
-    const source = await fileArtifactSource(swuPath);
-    const zcks = new Map([
-        ['system.img.zck', await fileArtifactSource(zckPath)],
-        ['boot.vfat.zck', await fileArtifactSource(bootZckPath)],
-    ]);
-    console.log('pushing image OTA ...');
-    const snapshot = await driver.pushImage({ source, zcks, updateUrlBase: args.root, onProgress: logProgress });
-    return reportOutcome(snapshot);
-}
-async function runDaemonPush(driver, args, opts) {
-    const artifacts = opts.release?.artifacts;
-    const patchDigest = artifacts?.daemon_patches?.[opts.fromVersion];
-    const daemonDigest = artifacts?.daemon;
-    const sourceMatches = !patchDigest?.source_sha256 || !opts.fromSha256 || patchDigest.source_sha256 === opts.fromSha256;
-    if (patchDigest && !sourceMatches) {
-        console.log(`skipping daemon delta: device binary ${opts.fromSha256?.slice(0, 12)} is not the published ` +
-            `${opts.fromVersion} (${patchDigest.source_sha256?.slice(0, 12)}); full binary instead.`);
-    }
-    if (patchDigest && daemonDigest && sourceMatches) {
-        console.log(`downloading daemon delta ${opts.fromVersion} -> ${opts.toVersion} ...`);
-        const patchUrl = daemonPatchUrl({
-            rootURL: args.root,
-            channel: opts.channel,
-            toVersion: opts.toVersion,
-            fromVersion: opts.fromVersion,
-        });
-        const patchPath = await downloadIfNeeded(patchUrl, args.cacheDir, `daemon-${opts.toVersion}-from-${opts.fromVersion}.patch`);
-        const patchSource = await fileArtifactSource(patchPath);
-        console.log('pushing daemon delta OTA ...');
-        const snapshot = await driver.pushDaemon(patchSource, logProgress, {
-            algorithm: 'zstdPatchFrom',
-            resultSha256: daemonDigest.sha256,
-            resultSize: daemonDigest.size,
-            sourceSha256: patchDigest.source_sha256 ?? null,
-        });
-        if (snapshot.phase !== 'failed')
-            return reportOutcome(snapshot);
-        console.log(`daemon delta failed (${snapshot.reason}); falling back to full binary ...`);
-    }
-    const zst = artifacts?.daemon_zst;
-    if (zst && daemonDigest) {
-        console.log(`downloading compressed daemon ${opts.toVersion} ...`);
-        const zstPath = await downloadIfNeeded(opts.zstUrl, args.cacheDir, `daemon-${opts.toVersion}.zst`);
-        const zstSource = await fileArtifactSource(zstPath);
-        console.log('pushing compressed daemon OTA ...');
-        const snapshot = await driver.pushDaemon(zstSource, logProgress, {
-            algorithm: 'zstd',
-            resultSha256: daemonDigest.sha256,
-            resultSize: daemonDigest.size,
-            sourceSha256: null,
-        });
-        if (snapshot.phase !== 'failed')
-            return reportOutcome(snapshot);
-        console.log(`compressed daemon push failed (${snapshot.reason}); falling back to the raw binary ...`);
-    }
-    console.log(`downloading daemon ${opts.toVersion} ...`);
-    const path = await downloadIfNeeded(opts.fullUrl, args.cacheDir, `daemon-${opts.toVersion}`);
-    const source = await fileArtifactSource(path);
-    console.log('pushing daemon OTA ...');
-    const snapshot = await driver.pushDaemon(source, logProgress);
-    return reportOutcome(snapshot);
-}
-function logProgress(snapshot) {
-    switch (snapshot.phase) {
-        case 'streaming':
-            console.log(`  streaming: ${snapshot.percent}%`);
-            break;
-        case 'applying':
-            console.log(`  ${snapshot.otaPhase}: ${snapshot.percent}%`);
-            break;
-        case 'staged':
-            console.log('  staged, activating ...');
-            break;
-        case 'completed':
-            console.log('  completed.');
-            break;
-        case 'failed':
-            console.error(`  failed: ${snapshot.reason}`);
-            break;
-    }
-}
-function reportOutcome(snapshot) {
-    if (snapshot.phase === 'failed') {
-        console.error(`update failed: ${snapshot.reason}`);
-        return false;
-    }
-    console.log('update finished.');
-    return true;
-}
-async function waitForDevice(gateway) {
-    return new Promise((resolve, reject) => {
-        const timeout = setTimeout(() => {
-            unsubscribe();
-            reject(new Error(`no device announced itself within ${CONNECT_TIMEOUT_MS / 1000}s`));
-        }, CONNECT_TIMEOUT_MS);
-        const unsubscribe = gateway.on(event => {
-            if (event.type !== 'message')
-                return;
-            if (event.message.data.type !== 'version')
-                return;
-            clearTimeout(timeout);
-            unsubscribe();
-            resolve({ deviceId: event.deviceId, meta: event.message.data.data });
-        });
-    });
+function watch(client) {
+    return (async () => {
+        for (;;) {
+            const event = await client.nextEvent();
+            switch (event.kind) {
+                case 'planned':
+                    console.log(`  plan: ${(event.steps ?? []).map(step => step.label).join(' -> ')}`);
+                    break;
+                case 'progress':
+                    if (event.phase)
+                        console.log(`  ${describe(event.phase)}`);
+                    break;
+                case 'updated':
+                    console.log(`update finished: ${event.version ?? ''}`.trimEnd());
+                    return true;
+                case 'failed':
+                    console.error(`update failed: ${event.reason ?? 'no reason given'}`);
+                    return false;
+                case 'lagged':
+                    console.log('  (progress entries were dropped)');
+                    break;
+            }
+        }
+    })();
 }
-async function downloadIfNeeded(url, cacheDir, filename) {
-    const target = join(cacheDir, filename);
-    const existing = await stat(target).catch(() => null);
-    if (existing && existing.size > 0)
-        return target;
-    const response = await fetch(url);
-    if (!response.ok || !response.body) {
-        throw new Error(`download failed: HTTP ${response.status} for ${url}`);
-    }
-    const bytes = new Uint8Array(await response.arrayBuffer());
-    await writeFile(target, bytes);
-    return target;
+function describe(phase) {
+    const head = [phase.kind, phase.asset].filter(Boolean).join(' ');
+    const done = phase.received ?? phase.sent;
+    if (done !== undefined && phase.total)
+        return `${head} ${Math.floor((done * 100) / phase.total)}%`;
+    if (phase.writePercent !== undefined)
+        return `${head} ${phase.writePercent}%`;
+    if (phase.reason)
+        return `${head}: ${phase.reason}`;
+    return head;
 }
 function fail(message) {
     console.error(message);

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bridgething/updater",
-  "version": "0.7.0",
-  "description": "Transport-agnostic OTA updater for bridgething: library + bunx/npx CLI.",
+  "version": "0.9.0",
+  "description": "Update a Spotify Car Thing from the command line, over its network gateway.",
   "license": "MIT",
   "author": "Joey Eamigh <55670930+JoeyEamigh@users.noreply.github.com> (https://github.com/JoeyEamigh)",
   "homepage": "https://bridgething.com",
@@ -19,45 +19,20 @@
     "registry": "https://registry.npmjs.org/"
   },
   "type": "module",
-  "types": "./dist/index.d.ts",
   "bin": {
     "bridgething-updater": "./dist/cli.js"
   },
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "default": "./dist/index.js"
-    },
-    "./manifest": {
-      "types": "./dist/manifest.d.ts",
-      "default": "./dist/manifest.js"
-    },
-    "./node": {
-      "types": "./dist/node.d.ts",
-      "default": "./dist/node.js"
-    },
-    "./websocket": {
-      "types": "./dist/websocket.d.ts",
-      "default": "./dist/websocket.js"
-    },
-    "./web-serial": {
-      "types": "./dist/web-serial.d.ts",
-      "default": "./dist/web-serial.js"
-    }
-  },
   "files": ["dist"],
   "scripts": {
     "prebuild": "rm -rf dist",
     "build": "tsc -p tsconfig.build.json && chmod +x dist/cli.js",
     "dev": "tsc -p tsconfig.build.json --watch",
     "typecheck": "tsc --noEmit",
-    "lint": "eslint .",
-    "test": "bun test"
+    "lint": "eslint ."
   },
   "dependencies": {
-    "@bridgething/adapter-network": "0.7.0",
-    "@bridgething/gateway": "0.7.0",
-    "@bridgething/lib": "0.7.0"
+    "@bridgething/core-node": "0.9.0",
+    "@bridgething/lib": "0.9.0"
   },
   "peerDependencies": {
     "typescript": "^6.0.3"

package/dist/ack-window.d.ts

@@ -1,38 +0,0 @@
-/**
- * Sender-side flow control, ported from `host-gateway`'s `AckWindow`/`AckRegistry`
- * (`crates/host-gateway/src/transfer.rs`): the daemon acks the byte offset it has durably
- * consumed, and the streamer holds no more than `OTA_WINDOW_BYTES` past that. Acks are absolute
- * file offsets, so the baseline seeds to the resume point.
- *
- * The Rust version uses an atomic + `Notify` with `notify_one` specifically to avoid a lost
- * wakeup between a waiter's recheck and its `await`. That race doesn't exist here: JS is
- * single-threaded, so a synchronous "check the ack, then register a listener" pair can't be
- * interleaved by another callback - there's no gap for a `note()` to land in.
- */
-export type AckWindowOptions = {
-    windowBytes?: number;
-    ackTimeoutMs?: number;
-};
-export declare class AckWindow {
-    private acked;
-    private waiters;
-    private readonly windowBytes;
-    private readonly ackTimeoutMs;
-    constructor(baseline: number, options?: AckWindowOptions);
-    note(received: number): void;
-    get ackedBytes(): number;
-    waitForRoom(offset: number): Promise<boolean>;
-    private waitForProgress;
-}
-export declare class AckRegistry {
-    private readonly windowOptions;
-    private readonly windows;
-    constructor(windowOptions?: AckWindowOptions);
-    register(transferId: string, baseline: number): AckWindow;
-    deregister(transferId: string): void;
-    note(transferId: string, received: number): void;
-}
-export declare class TransferStalledError extends Error {
-    constructor(offset: number, totalSize: number);
-}
-//# sourceMappingURL=ack-window.d.ts.map

package/dist/ack-window.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ack-window.d.ts","sourceRoot":"","sources":["../src/ack-window.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,OAAO,CAAyB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;gBAE1B,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,gBAAqB;IAM5D,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAQ5B,IAAI,UAAU,IAAI,MAAM,CAEvB;IAEK,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IASnD,OAAO,CAAC,eAAe;CAgBxB;AAED,qBAAa,WAAW;IAGV,OAAO,CAAC,QAAQ,CAAC,aAAa;IAF1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgC;gBAE3B,aAAa,GAAE,gBAAqB;IAEjE,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS;IAMzD,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIpC,IAAI,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAGjD;AAED,qBAAa,oBAAqB,SAAQ,KAAK;gBACjC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;CAI9C"}