Skip to content
Merged
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
4 changes: 2 additions & 2 deletions website/app/logbook/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const voltageSourceSchema = z.object({
bands: z.array(voltageBandSchema).min(1).max(10),
});

export const logbookConfigSchema = z.object({
export const logbookConfigSchema = z.compile(z.object({
stationary: z
.object({
/** A run of fixes staying within this distance of its first fix counts as stopped. */
Expand Down Expand Up @@ -138,7 +138,7 @@ export const logbookConfigSchema = z.object({
.default({
noiseFloorMeters: LOGBOOK_DEFAULT_DISTANCE_NOISE_FLOOR_METERS,
}),
});
}));

export type LogbookConfig = z.infer<typeof logbookConfigSchema>;
export type LogbookVoltageSource = LogbookConfig["voltage"]["sources"][number];
Expand Down
36 changes: 19 additions & 17 deletions website/app/routes/api/appUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,27 @@ import { getH3IndexForLocation, toUtcDateString } from "~/utils/h3";

export const loader = async ({}: Route.LoaderArgs) => redirect("/");

const validator = zod.object({
location: zod.object({
coords: zod.object({
accuracy: zod.number(),
longitude: zod.number(),
altitude: zod.number(),
heading: zod.number(),
latitude: zod.number(),
altitudeAccuracy: zod.number(),
speed: zod.number(),
const validator = zod.compile(
zod.object({
location: zod.object({
coords: zod.object({
accuracy: zod.number(),
longitude: zod.number(),
altitude: zod.number(),
heading: zod.number(),
latitude: zod.number(),
altitudeAccuracy: zod.number(),
speed: zod.number(),
}),
mocked: zod.boolean(),
timestamp: zod.number(),
}),
battery: zod.object({
percentage: zod.number(),
charging: zod.boolean(),
}),
mocked: zod.boolean(),
timestamp: zod.number(),
}),
battery: zod.object({
percentage: zod.number(),
charging: zod.boolean(),
}),
});
);

export const action = async ({ context, request }: Route.ActionArgs) => {
return data({}, 200);
Expand Down
34 changes: 18 additions & 16 deletions website/app/routes/api/flespiUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,24 @@ import { eq, inArray } from "drizzle-orm";
import type { Route } from "./+types/flespiUpload";
import { getH3IndexForLocation, toUtcDateString } from "~/utils/h3";

const rawMessageSchema = zod.record(zod.string(), zod.unknown());

const normalizedMessageSchema = zod.object({
timestamp: zod.coerce.number().positive(),
latitude: zod.coerce.number().min(-90).max(90),
longitude: zod.coerce.number().min(-180).max(180),
altitude: zod.coerce.number().optional(),
speed: zod.coerce.number().min(0).optional(),
heading: zod.coerce.number().min(0).max(360).optional(),
accuracy: zod.coerce.number().min(0).optional(),
batteryPercentage: zod.coerce.number().min(0).max(100).optional(),
batteryCharging: zod.coerce.boolean().optional(),
batteryVoltage: zod.coerce.number().min(0).optional(),
identifier: zod.string().min(1),
deviceTypeId: zod.coerce.string().min(1).optional(),
});
const rawMessageSchema = zod.compile(zod.record(zod.string(), zod.unknown()));

const normalizedMessageSchema = zod.compile(
zod.object({
timestamp: zod.coerce.number().positive(),
latitude: zod.coerce.number().min(-90).max(90),
longitude: zod.coerce.number().min(-180).max(180),
altitude: zod.coerce.number().optional(),
speed: zod.coerce.number().min(0).optional(),
heading: zod.coerce.number().min(0).max(360).optional(),
accuracy: zod.coerce.number().min(0).optional(),
batteryPercentage: zod.coerce.number().min(0).max(100).optional(),
batteryCharging: zod.coerce.boolean().optional(),
batteryVoltage: zod.coerce.number().min(0).optional(),
identifier: zod.string().min(1),
deviceTypeId: zod.coerce.string().min(1).optional(),
}),
);

const INSERT_CHUNK_SIZE = 200;

Expand Down
70 changes: 38 additions & 32 deletions website/app/routes/api/traccarUpload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { Events } from "~/database/schema/Events";
import type { Route } from "./+types/traccarUpload";
import { getH3IndexForLocation, toUtcDateString } from "~/utils/h3";

export const loader = async ({ context, request }: Route.LoaderArgs) => {
const getRequestParameters = zod.object({
const getRequestParameters = zod.compile(
zod.object({
name: zod.string().optional(),
uniqueId: zod.string().optional(),
status: zod.string().optional(),
Expand All @@ -25,7 +25,42 @@ export const loader = async ({ context, request }: Route.LoaderArgs) => {
address: zod.string().optional(),
attributes: zod.string().optional(),
gprmc: zod.string().optional(),
});
}),
);

const postPayloadSchema = zod.compile(
zod.object({
event: zod.object({
id: zod.coerce.number(),
attributes: zod.object({}).optional(),
deviceId: zod.coerce.number(),
type: zod.string(),
eventTime: zod.string(),
positionId: zod.coerce.number(),
geofenceId: zod.coerce.number(),
maintenanceId: zod.coerce.number(),
}),
device: zod.object({
id: zod.coerce.number(),
attributes: zod.object({}).optional(),
groupId: zod.coerce.number(),
calendarId: zod.coerce.number(),
name: zod.string(),
uniqueId: zod.string(),
status: zod.string(),
lastUpdate: zod.string(),
positionId: zod.coerce.number(),
phone: zod.string().optional(),
model: zod.string().optional(),
contact: zod.string().optional(),
category: zod.string().optional(),
disabled: zod.string(),
expirationTime: zod.string().optional(),
}),
}),
);

export const loader = async ({ context, request }: Route.LoaderArgs) => {
// Get parameters from the request
const url = new URL(request.url);
console.log(
Expand Down Expand Up @@ -77,35 +112,6 @@ export const loader = async ({ context, request }: Route.LoaderArgs) => {

export const action = async ({ context, request }: Route.ActionArgs) => {
if (request.method === "POST") {
const postPayloadSchema = zod.object({
event: zod.object({
id: zod.coerce.number(),
attributes: zod.object({}).optional(),
deviceId: zod.coerce.number(),
type: zod.string(),
eventTime: zod.string(),
positionId: zod.coerce.number(),
geofenceId: zod.coerce.number(),
maintenanceId: zod.coerce.number(),
}),
device: zod.object({
id: zod.coerce.number(),
attributes: zod.object({}).optional(),
groupId: zod.coerce.number(),
calendarId: zod.coerce.number(),
name: zod.string(),
uniqueId: zod.string(),
status: zod.string(),
lastUpdate: zod.string(),
positionId: zod.coerce.number(),
phone: zod.string().optional(),
model: zod.string().optional(),
contact: zod.string().optional(),
category: zod.string().optional(),
disabled: zod.string(),
expirationTime: zod.string().optional(),
}),
});
let payload: unknown;
try {
payload = await request.json();
Expand Down
Loading