Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ jobs:
echo "Publishing $dir to npm…"
( cd "$dir"
[ -d dist ] || pnpm run build
npm publish --access public
pnpm publish --access public --no-git-checks
)
fi
done
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from "@components/UI/Dialog.tsx";
import { Input } from "@components/UI/Input.tsx";
import { useDevice } from "@core/stores";
import { Protobuf } from "@meshtastic/core";
import { Protobuf } from "@meshtastic/sdk";
import { useState } from "react";
import { useTranslation } from "react-i18next";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,46 @@ import {
type DynamicFormFormInit,
} from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores";
import { deepCompareConfig } from "@core/utils/deepCompareConfig.ts";
import type { Protobuf } from "@meshtastic/sdk";
import { useConfigEditor, useSignal } from "@meshtastic/sdk-react";
import { useTranslation } from "react-i18next";

interface RemoteHardwareModuleConfigProps {
onFormInit: DynamicFormFormInit<RemoteHardwareValidation>;
}

const EMPTY_MODULES_SIGNAL = {
value: {} as {
remoteHardware?: Protobuf.ModuleConfig.ModuleConfig_RemoteHardwareConfig;
},
peek: () =>
({}) as {
remoteHardware?: Protobuf.ModuleConfig.ModuleConfig_RemoteHardwareConfig;
},
subscribe: () => () => {},
} as const;

export const RemoteHardware = ({
onFormInit,
}: RemoteHardwareModuleConfigProps) => {
useWaitForConfig({ moduleConfigCase: "remoteHardware" });

const { moduleConfig, setChange, getEffectiveModuleConfig, removeChange } =
useDevice();
const { moduleConfig, getEffectiveModuleConfig } = useDevice();
const editor = useConfigEditor();
const modules = useSignal(editor?.modules ?? EMPTY_MODULES_SIGNAL);
const effective =
modules.remoteHardware ??
(getEffectiveModuleConfig("remoteHardware") as
| Protobuf.ModuleConfig.ModuleConfig_RemoteHardwareConfig
| undefined);

const { t } = useTranslation("moduleConfig");

const onSubmit = (data: RemoteHardwareValidation) => {
if (deepCompareConfig(moduleConfig.remoteHardware, data, true)) {
removeChange({ type: "moduleConfig", variant: "remoteHardware" });
return;
}

setChange(
{ type: "moduleConfig", variant: "remoteHardware" },
data,
moduleConfig.remoteHardware,
if (!editor) return;
editor.setModuleSection(
Comment thread
coderabbitai[bot] marked this conversation as resolved.
"remoteHardware",
data as unknown as Protobuf.ModuleConfig.ModuleConfig_RemoteHardwareConfig,
);
};

Expand All @@ -43,7 +57,7 @@ export const RemoteHardware = ({
onFormInit={onFormInit}
validationSchema={RemoteHardwareValidationSchema}
defaultValues={moduleConfig.remoteHardware}
values={getEffectiveModuleConfig("remoteHardware")}
values={effective}
fieldGroups={[
{
label: t("remoteHardware.title"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,46 @@ import {
type DynamicFormFormInit,
} from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores";
import { deepCompareConfig } from "@core/utils/deepCompareConfig.ts";
import type { Protobuf } from "@meshtastic/sdk";
import { useConfigEditor, useSignal } from "@meshtastic/sdk-react";
import { useTranslation } from "react-i18next";

interface StatusMessageModuleConfigProps {
onFormInit: DynamicFormFormInit<StatusMessageValidation>;
}

const EMPTY_MODULES_SIGNAL = {
value: {} as {
statusmessage?: Protobuf.ModuleConfig.ModuleConfig_StatusMessageConfig;
},
peek: () =>
({}) as {
statusmessage?: Protobuf.ModuleConfig.ModuleConfig_StatusMessageConfig;
},
subscribe: () => () => {},
} as const;

export const StatusMessage = ({
onFormInit,
}: StatusMessageModuleConfigProps) => {
useWaitForConfig({ moduleConfigCase: "statusmessage" });

const { moduleConfig, setChange, getEffectiveModuleConfig, removeChange } =
useDevice();
const { moduleConfig, getEffectiveModuleConfig } = useDevice();
const editor = useConfigEditor();
const modules = useSignal(editor?.modules ?? EMPTY_MODULES_SIGNAL);
const effective =
modules.statusmessage ??
(getEffectiveModuleConfig("statusmessage") as
| Protobuf.ModuleConfig.ModuleConfig_StatusMessageConfig
| undefined);

const { t } = useTranslation("moduleConfig");

const onSubmit = (data: StatusMessageValidation) => {
if (deepCompareConfig(moduleConfig.statusmessage, data, true)) {
removeChange({ type: "moduleConfig", variant: "statusmessage" });
return;
}

setChange(
{ type: "moduleConfig", variant: "statusmessage" },
data,
moduleConfig.statusmessage,
if (!editor) return;
editor.setModuleSection(
"statusmessage",
data as unknown as Protobuf.ModuleConfig.ModuleConfig_StatusMessageConfig,
);
};

Expand All @@ -43,7 +57,7 @@ export const StatusMessage = ({
onFormInit={onFormInit}
validationSchema={StatusMessageValidationSchema}
defaultValues={moduleConfig.statusmessage}
values={getEffectiveModuleConfig("statusmessage")}
values={effective}
fieldGroups={[
{
label: t("statusMessage.title"),
Expand Down
34 changes: 23 additions & 11 deletions apps/web/src/components/PageComponents/ModuleConfig/Tak.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,40 @@ import {
type DynamicFormFormInit,
} from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores";
import { deepCompareConfig } from "@core/utils/deepCompareConfig.ts";
import { Protobuf } from "@meshtastic/core";
import { Protobuf } from "@meshtastic/sdk";
import { useConfigEditor, useSignal } from "@meshtastic/sdk-react";
import { useTranslation } from "react-i18next";

interface TakModuleConfigProps {
onFormInit: DynamicFormFormInit<TakValidation>;
}

const EMPTY_MODULES_SIGNAL = {
value: {} as { tak?: Protobuf.ModuleConfig.ModuleConfig_TAKConfig },
peek: () => ({}) as { tak?: Protobuf.ModuleConfig.ModuleConfig_TAKConfig },
subscribe: () => () => {},
} as const;

export const Tak = ({ onFormInit }: TakModuleConfigProps) => {
useWaitForConfig({ moduleConfigCase: "tak" });

const { moduleConfig, setChange, getEffectiveModuleConfig, removeChange } =
useDevice();
const { moduleConfig, getEffectiveModuleConfig } = useDevice();
const editor = useConfigEditor();
const modules = useSignal(editor?.modules ?? EMPTY_MODULES_SIGNAL);
const effective =
modules.tak ??
(getEffectiveModuleConfig("tak") as
| Protobuf.ModuleConfig.ModuleConfig_TAKConfig
| undefined);

const { t } = useTranslation("moduleConfig");

const onSubmit = (data: TakValidation) => {
if (deepCompareConfig(moduleConfig.tak, data, true)) {
removeChange({ type: "moduleConfig", variant: "tak" });
return;
}

setChange({ type: "moduleConfig", variant: "tak" }, data, moduleConfig.tak);
if (!editor) return;
editor.setModuleSection(
"tak",
data as unknown as Protobuf.ModuleConfig.ModuleConfig_TAKConfig,
);
};

return (
Expand All @@ -38,7 +50,7 @@ export const Tak = ({ onFormInit }: TakModuleConfigProps) => {
onFormInit={onFormInit}
validationSchema={TakValidationSchema}
defaultValues={moduleConfig.tak}
values={getEffectiveModuleConfig("tak")}
values={effective}
fieldGroups={[
{
label: t("tak.title"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,46 @@ import {
type DynamicFormFormInit,
} from "@components/Form/DynamicForm.tsx";
import { useDevice } from "@core/stores";
import { deepCompareConfig } from "@core/utils/deepCompareConfig.ts";
import type { Protobuf } from "@meshtastic/sdk";
import { useConfigEditor, useSignal } from "@meshtastic/sdk-react";
import { useTranslation } from "react-i18next";

interface TrafficManagementModuleConfigProps {
onFormInit: DynamicFormFormInit<TrafficManagementValidation>;
}

const EMPTY_MODULES_SIGNAL = {
value: {} as {
trafficManagement?: Protobuf.ModuleConfig.ModuleConfig_TrafficManagementConfig;
},
peek: () =>
({}) as {
trafficManagement?: Protobuf.ModuleConfig.ModuleConfig_TrafficManagementConfig;
},
subscribe: () => () => {},
} as const;

export const TrafficManagement = ({
onFormInit,
}: TrafficManagementModuleConfigProps) => {
useWaitForConfig({ moduleConfigCase: "trafficManagement" });

const { moduleConfig, setChange, getEffectiveModuleConfig, removeChange } =
useDevice();
const { moduleConfig, getEffectiveModuleConfig } = useDevice();
const editor = useConfigEditor();
const modules = useSignal(editor?.modules ?? EMPTY_MODULES_SIGNAL);
const effective =
modules.trafficManagement ??
(getEffectiveModuleConfig("trafficManagement") as
| Protobuf.ModuleConfig.ModuleConfig_TrafficManagementConfig
| undefined);

const { t } = useTranslation("moduleConfig");

const onSubmit = (data: TrafficManagementValidation) => {
if (deepCompareConfig(moduleConfig.trafficManagement, data, true)) {
removeChange({ type: "moduleConfig", variant: "trafficManagement" });
return;
}

setChange(
{ type: "moduleConfig", variant: "trafficManagement" },
data,
moduleConfig.trafficManagement,
if (!editor) return;
editor.setModuleSection(
"trafficManagement",
data as unknown as Protobuf.ModuleConfig.ModuleConfig_TrafficManagementConfig,
);
};

Expand All @@ -43,7 +57,7 @@ export const TrafficManagement = ({
onFormInit={onFormInit}
validationSchema={TrafficManagementValidationSchema}
defaultValues={moduleConfig.trafficManagement}
values={getEffectiveModuleConfig("trafficManagement")}
values={effective}
fieldGroups={[
{
label: t("trafficManagement.title"),
Expand Down
7 changes: 5 additions & 2 deletions apps/web/src/components/UI/ErrorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,15 @@ import newGithubIssueUrl from "@core/utils/github.ts";
import { ExternalLink } from "lucide-react";
import { Trans, useTranslation } from "react-i18next";

export function ErrorPage({ error }: { error: Error }) {
// react-error-boundary types the caught value as `unknown` — anything can be
// thrown, so normalize non-Error values before rendering.
export function ErrorPage({ error: caught }: { error: unknown }) {
const { t } = useTranslation();

if (!error) {
if (!caught) {
return null;
}
const error = caught instanceof Error ? caught : new Error(String(caught));

return (
<article className="w-full h-screen overflow-y-auto bg-background-primary text-text-primary">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ function createMockNode(): Protobuf.Mesh.NodeInfo {
isMuted: false,
hopsAway: 2,
isKeyManuallyVerified: false,
hasXeddsaSigned: false,
user: {
$typeName: "meshtastic.User",
id: "!12345678",
Expand Down
4 changes: 3 additions & 1 deletion apps/web/src/pages/Connections/useConnections.ts
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,9 @@ export function useConnections() {
// Read from the live store, not the memoized `connections` closure: callers
// such as addConnectionAndConnect() add a connection and connect to it in the
// same tick, before this hook re-renders, so the closure would be stale.
const conn = useDeviceStore.getState().savedConnections.find((c) => c.id === id);
const conn = useDeviceStore
.getState()
.savedConnections.find((c) => c.id === id);
if (!conn) {
log.warn("connect: unknown connection id", { id });
return false;
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/sdk-preview/adapters/fromMeshDevice.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MeshDevice } from "@meshtastic/core";
import type { MeshDevice } from "@meshtastic/sdk";
import type { MeshClientPort } from "../core/index.ts";
import { ConfigEditor } from "../features/config/index.ts";

Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/sdk-preview/core/client/MeshClientPort.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { Protobuf, Types } from "@meshtastic/core";
import type { Protobuf, Types } from "@meshtastic/sdk";

/**
* Minimal subscribe-only view of an event source. `ste-simple-events`'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { create } from "@bufbuild/protobuf";
import { Protobuf, Types } from "@meshtastic/core";
import { Protobuf, Types } from "@meshtastic/sdk";
import { Result } from "better-result";
import { describe, expect, it } from "vitest";
import type { MeshClientPort, Subscribable } from "../../../core/index.ts";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import type { Protobuf } from "@meshtastic/core";
import type { Protobuf } from "@meshtastic/sdk";
import { Result } from "better-result";
import type { ResultType } from "better-result";
import type { MeshClientPort } from "../../../core/client/MeshClientPort.ts";
import { type MeshError, toMeshError } from "../../../core/errors/MeshError.ts";

Expand All @@ -12,7 +11,7 @@ import { type MeshError, toMeshError } from "../../../core/errors/MeshError.ts";

export async function beginEditSettings(
client: MeshClientPort,
): Promise<ResultType<number, MeshError>> {
): Promise<Result<number, MeshError>> {
try {
return Result.ok(await client.beginEditSettings());
} catch (error) {
Expand All @@ -22,7 +21,7 @@ export async function beginEditSettings(

export async function commitEditSettings(
client: MeshClientPort,
): Promise<ResultType<number, MeshError>> {
): Promise<Result<number, MeshError>> {
try {
return Result.ok(await client.commitEditSettings());
} catch (error) {
Expand All @@ -33,7 +32,7 @@ export async function commitEditSettings(
export async function setConfig(
client: MeshClientPort,
config: Protobuf.Config.Config,
): Promise<ResultType<number, MeshError>> {
): Promise<Result<number, MeshError>> {
try {
return Result.ok(await client.setConfig(config));
} catch (error) {
Expand All @@ -44,7 +43,7 @@ export async function setConfig(
export async function setModuleConfig(
client: MeshClientPort,
moduleConfig: Protobuf.ModuleConfig.ModuleConfig,
): Promise<ResultType<number, MeshError>> {
): Promise<Result<number, MeshError>> {
try {
return Result.ok(await client.setModuleConfig(moduleConfig));
} catch (error) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Types } from "@meshtastic/core";
import { Types } from "@meshtastic/sdk";
import { signal } from "@preact/signals-core";
import { Result } from "better-result";
import type { ResultType } from "better-result";
import type { MeshClientPort } from "../../../core/client/MeshClientPort.ts";
import type { MeshError } from "../../../core/errors/MeshError.ts";
import {
Expand Down Expand Up @@ -144,7 +143,7 @@ export class ConfigEditor {
* inbound config packets after commit reconcile. Any failure aborts and
* returns the error — the baseline is left untouched.
*/
public async commit(): Promise<ResultType<void, MeshError>> {
public async commit(): Promise<Result<void, MeshError>> {
if (!this._isDirty.peek()) {
return Result.ok(undefined);
}
Expand Down
Loading
Loading