@deslop/trips 0.1.1241 → 0.1.1243

package/dist/server.js

@@ -3481,6 +3481,8 @@ const SuccessImpl = function(success) {
 SuccessImpl.prototype = SuccessProto;
 /** @internal */
 const succeed$10 = (success) => new SuccessImpl(success);
+/** @internal */
+const getSuccess$1 = (self) => isFailure$2(self) ? none$1 : some$2(self.success);
 // ../../node_modules/.pnpm/effect@4.1.2/node_modules/effect/dist/Order.js
 /**
 * Defines comparison functions for ordered values.
@@ -5462,6 +5464,37 @@ const isFailure$1 = isFailure$2;
 */
 const isSuccess$1 = isSuccess$2;
 /**
+* Extracts the success value as an `Option`, discarding the failure.
+*
+* **When to use**
+*
+* Use when you need to extract the success value from a `Result` as an
+* `Option` and discard failure information.
+*
+* **Details**
+*
+* - `Success<A>` becomes `Some<A>`
+* - `Failure<E>` becomes `None`
+*
+* **Example** (Extracting the success as an Option)
+*
+* ```ts import.meta.vitest
+* import { Option, Result } from "effect"
+*
+* Result.getSuccess(Result.succeed("ok")) // => Option.some("ok")
+*
+* Result.getSuccess(Result.fail("err")) // => Option.none()
+* ```
+*
+* @see {@link getFailure} to extract the error instead
+* @see {@link fromOption} for the reverse conversion
+*
+* @stability stable
+* @category getters
+* @since 4.0.0
+*/
+const getSuccess = getSuccess$1;
+/**
 * Transforms the success channel of a `Result`, leaving the failure channel unchanged.
 *
 * **When to use**
@@ -6171,7 +6204,7 @@ const makeEquivalence$3 = (equivalence) => {
 * @category constructors
 * @since 4.0.0
 */
-const Array$1 = globalThis.Array;
+const Array$2 = globalThis.Array;
 /**
 * Converts an `Iterable` to an `Array`.
 *
@@ -6200,7 +6233,7 @@ const Array$1 = globalThis.Array;
 * @category constructors
 * @since 2.0.0
 */
-const fromIterable$6 = (collection) => Array$1.isArray(collection) ? collection : Array$1.from(collection);
+const fromIterable$6 = (collection) => Array$2.isArray(collection) ? collection : Array$2.from(collection);
 /**
 * Normalizes a value that is either a single element or an array into an array.
 *
@@ -6231,7 +6264,7 @@ const fromIterable$6 = (collection) => Array$1.isArray(collection) ? collection
 * @category constructors
 * @since 3.3.0
 */
-const ensure = (self) => Array$1.isArray(self) ? self : [self];
+const ensure = (self) => Array$2.isArray(self) ? self : [self];
 /**
 * Pattern-matches on an array, handling empty and non-empty cases separately.
 *
@@ -6348,7 +6381,7 @@ const appendAll$1 = /*#__PURE__*/ dual(2, (self, that) => fromIterable$6(self).c
 * @category guards
 * @since 2.0.0
 */
-const isArray = Array$1.isArray;
+const isArray = Array$2.isArray;
 /**
 * Checks whether a mutable `Array` is empty, narrowing the type to `[]`.
 *
@@ -6748,7 +6781,7 @@ const findLast = /*#__PURE__*/ dual(2, (self, f) => {
 * @category transforming
 * @since 2.0.0
 */
-const reverse = (self) => Array$1.from(self).reverse();
+const reverse = (self) => Array$2.from(self).reverse();
 /**
 * Sorts an array by the given `Order`, returning a new array.
 *
@@ -6777,7 +6810,7 @@ const reverse = (self) => Array$1.from(self).reverse();
 * @since 2.0.0
 */
 const sort = /*#__PURE__*/ dual(2, (self, O) => {
-	const out = Array$1.from(self);
+	const out = Array$2.from(self);
 	out.sort(O);
 	return out;
 });
@@ -6844,6 +6877,50 @@ const hashBucketsAdd = (buckets, value) => {
 	bucket.push(value);
 	return true;
 };
+const makeHashBuckets = (values) => {
+	const buckets = /* @__PURE__ */ new Map();
+	for (const value of values) hashBucketsAdd(buckets, value);
+	return buckets;
+};
+const hashBucketsHas = (buckets, value) => {
+	const bucket = buckets.get(hash(value));
+	if (bucket === void 0) return false;
+	for (const candidate of bucket) if (equals$2(candidate, value)) return true;
+	return false;
+};
+/**
+* Computes elements in the first array that are not in the second, using
+* `Equal.asEquivalence()`.
+*
+* **When to use**
+*
+* Use when you need to keep values from the first array that are absent from
+* the second and the default `Equal.asEquivalence()` comparison is appropriate.
+*
+* **Example** (Computing array differences)
+*
+* ```ts import.meta.vitest
+* import { Array } from "effect"
+*
+* Array.difference([1, 2, 3], [2, 3, 4]) // => [1]
+* ```
+*
+* @see {@link differenceWith} — use custom equality
+* @see {@link union} — elements in either array
+* @see {@link intersection} — elements in both arrays
+*
+* @stability stable
+* @category set operations
+* @since 2.0.0
+*/
+const difference = /*#__PURE__*/ dual(2, (self, that) => {
+	const thatArray = fromIterable$6(that);
+	const selfArray = fromIterable$6(self);
+	if (selfArray.length === 0) return [];
+	if (thatArray.length === 0) return selfArray.filter(() => true);
+	const buckets = makeHashBuckets(thatArray);
+	return selfArray.filter((value) => !hashBucketsHas(buckets, value));
+});
 /**
 * Creates an empty array.
 *
@@ -15181,7 +15258,7 @@ const length$1 = (self) => self.length;
 * @category transforming
 * @since 2.0.0
 */
-const split = /*#__PURE__*/ dual(2, (self, separator) => {
+const split$1 = /*#__PURE__*/ dual(2, (self, separator) => {
 	const out = self.split(separator);
 	return isArrayNonEmpty$1(out) ? out : [self];
 });
@@ -30901,6 +30978,39 @@ function joinKeyValue(options) {
 	return transform$3((input) => Object.entries(input).map(([key, value]) => `${key}${keyValueSeparator}${value}`).join(separator));
 }
 /**
+* Splits a string into an array of strings by a separator.
+*
+* **When to use**
+*
+* Use when you need a schema getter to split a present encoded string
+* containing a delimited list, such as CSV values.
+*
+* **Details**
+*
+* The getter is pure and never fails. It splits by `separator` (default `,`).
+* An empty string produces an empty array, not `[""]`.
+*
+* **Example** (Splitting a comma-separated string)
+*
+* ```ts import.meta.vitest
+* import { Effect, Option, SchemaGetter } from "effect"
+*
+* const splitComma = SchemaGetter.split<string>()
+* const result = Effect.runSync(SchemaGetter.run(splitComma, Option.some("a,b,c"), {}))
+* result // => Option.some(["a", "b", "c"])
+* ```
+*
+* @see {@link splitKeyValue} when values are key-value pairs
+*
+* @stability stable
+* @category splitting
+* @since 4.0.0
+*/
+function split(options) {
+	const separator = options?.separator ?? ",";
+	return transform$3((input) => input === "" ? [] : input.split(separator));
+}
+/**
 * Encodes a `Uint8Array` or string to a Base64 string.
 *
 * **Details**
@@ -46853,6 +46963,16 @@ function succeed$1(value) {
 function String$5(name) {
 	return schema$1(String$6, name);
 }
+function Array$1(value, pathOrOptions, options) {
+	const hasPath = isPath(pathOrOptions);
+	const resolvedOptions = hasPath ? options : pathOrOptions;
+	const array = ArraySchema(value);
+	const separator = resolvedOptions?.separator ?? ",";
+	return schema$1(Union([String$6.pipe(decodeTo(toCodecStringTree(array), {
+		decode: split(resolvedOptions),
+		encode: compose(passthrough$1({ strict: false }), transform$3((input) => input.join(separator)))
+	})), array]), hasPath ? pathOrOptions : void 0);
+}
 function Record(key, value, pathOrOptions, options) {
 	const hasPath = isPath(pathOrOptions);
 	const record = Record$1(key, value);
@@ -49567,6 +49687,17 @@ const updateContentLength = (headers, body) => {
 };
 // ../../node_modules/.pnpm/effect@4.1.2/node_modules/effect/dist/http/Url.js
 /**
+* Parses and edits platform `URL` values.
+*
+* The HTTP modules use the standard `URL` object as their URL representation.
+* This module adds safe parsing and helpers that return updated copies when
+* changing credentials, host, path, protocol, query, or hash parts. Query
+* strings can also be read or updated through `UrlParams`.
+*
+* @stability unstable
+* @since 4.0.0
+*/
+/**
 * Error returned when constructing a `URL` fails.
 *
 * @stability unstable
@@ -49607,6 +49738,51 @@ const baseUrl = () => {
 		}
 	}
 };
+/**
+* Parses a URL string safely into a `URL` object, returning a `Result` type for
+* error handling.
+*
+* **Details**
+*
+* This function converts a string into a `URL` object, enabling safe URL
+* parsing with built-in error handling. If the string is invalid or fails to
+* parse, this function does not throw an error; instead, it wraps the error in
+* a `IllegalArgumentError` and returns it as the `Failure` value of an
+* `Result`. The `Success` value contains the successfully parsed `URL`.
+*
+* An optional `base` parameter can be provided to resolve relative URLs. If
+* specified, the function interprets the input `url` as relative to this
+* `base`. This is especially useful when dealing with URLs that might not be
+* fully qualified.
+*
+* **Example** (Parsing absolute and relative URLs)
+*
+* ```ts import.meta.vitest
+* import { Result } from "effect"
+* import { Url } from "effect/http"
+*
+* // Parse an absolute URL
+* //
+* //      ┌─── Result<URL, IllegalArgumentError>
+* //      ▼
+* const parsed = Url.fromString("https://example.com/path")
+*
+* Result.map(parsed, (url) => url.toString()) // => Result.succeed("https://example.com/path")
+*
+* // Parse a relative URL with a base
+* const relativeParsed = Url.fromString("/relative-path", "https://example.com")
+*
+* Result.map(relativeParsed, (url) => url.toString()) // => Result.succeed("https://example.com/relative-path")
+* ```
+*
+* @stability unstable
+* @category constructors
+* @since 4.0.0
+*/
+const fromString = (url, base) => try_$2({
+	try: () => new URL(url, base),
+	catch: () => new IllegalArgumentError(`Invalid URL: "${url}"${base !== void 0 ? ` with base "${base}"` : ""}`)
+});
 // ../../node_modules/.pnpm/effect@4.1.2/node_modules/effect/dist/http/HttpClientRequest.js
 const TypeId$20 = "~effect/http/HttpClientRequest";
 /**
@@ -76047,32 +76223,23 @@ Struct({
 	expires_in: Finite,
 	refresh_token: NonEmptyString
 });
-const Origin = String$6.check(makeFilter((value) => {
-	if (!URL.canParse(value)) return false;
-	const url = new URL(value);
-	return contains(["http:", "https:"], url.protocol) && url.username === "" && url.password === "" && url.hash === "";
-}, { expected: "an HTTP(S) URL without credentials or a fragment" })).check(makeFilter((value) => {
-	if (!URL.canParse(value)) return false;
-	const url = new URL(value);
-	return url.pathname === "/" && url.search === "";
-}, { expected: "an HTTP(S) origin without a path or query" }));
-const SecureOrigin = Origin.check(makeFilter((value) => {
-	if (!URL.canParse(value)) return false;
-	const url = new URL(value);
-	return url.protocol === "https:" || contains([
-		"localhost",
-		"127.0.0.1",
-		"[::1]"
-	], url.hostname);
-}, { expected: "HTTPS outside loopback" }));
+const Origin = String$6.check(makeFilter((value) => exists(getSuccess(fromString(value)), (url) => contains(["http:", "https:"], url.protocol) && url.username === "" && url.password === "" && url.hash === ""), { expected: "an HTTP(S) URL without credentials or a fragment" })).check(makeFilter((value) => exists(getSuccess(fromString(value)), (url) => url.pathname === "/" && url.search === ""), { expected: "an HTTP(S) origin without a path or query" }));
+const SecureOrigin = Origin.check(makeFilter((value) => exists(getSuccess(fromString(value)), (url) => url.protocol === "https:" || contains([
+	"localhost",
+	"127.0.0.1",
+	"[::1]"
+], url.hostname)), { expected: "HTTPS outside loopback" }));
 const Port = String$6.check(isPattern(/^\d{1,5}$/u), makeFilter((value) => exists(parse$2(value), (port) => port >= 1 && port <= 65535), { expected: "a port between 1 and 65535" }));
 const AppVersion = String$6.check(isPattern(/^0\.1\.\d+$/u));
+const RUNTIME_PATH = "/api/runtime";
 const RuntimeConfig = Struct({
 	auth: optionalKey(String$6),
 	name: String$6,
 	traces: String$6,
 	version: AppVersion
 });
+const RPC_PATH = "/api/rpc";
+const MANIFEST_PATH = "/manifest.webmanifest";
 const Account = Struct({
 	...User.fields,
 	signOut: Boolean$5
@@ -81969,11 +82136,19 @@ function layerOtlp(serviceName, url, runtime, version) {
 	}));
 }
 // ../../packages/runtime/src/auth/lib/utils.ts
+const APPS_PATH = "/api/apps";
+const SESSION_PATH = "/auth/session";
+const VERIFY_PATH = "/auth/verify";
 const DEVELOPER = {
 	id: "github:0",
 	name: "dev"
 };
 const localAuth = map$2(option(String$5("AUTH_URL")), isNone);
+gen(function* () {
+	const listed = Array$1(String$6, "GITHUB_ADMINS");
+	if (yield* localAuth) return yield* withDefault$2(listed, ["0"]);
+	return yield* listed;
+});
 var CurrentUser = class extends Service$1()("@deslop/runtime/auth/lib/utils/CurrentUser") {};
 var RpcAuth = class RpcAuth extends Service()("@deslop/runtime/auth/lib/utils/RpcAuth", { error: AuthError }) {
 	static layerClient = (token) => layerClient(RpcAuth, (options) => gen(function* () {
@@ -82016,7 +82191,7 @@ var Auth = class Auth extends Service$1()("@deslop/runtime/auth/service/Auth") {
 		const canonical = new URL(yield* String$5("APP_URL")).origin;
 		const client = filterStatusOk(yield* HttpClient);
 		const access = fn("Auth.access")(function* (headers, audience) {
-			return yield* pipe(client.get(new URL("/auth/verify", issuer).href, {
+			return yield* pipe(client.get(new URL(VERIFY_PATH, issuer).href, {
 				headers: { authorization: headers["authorization"] ?? "" },
 				urlParams: { resource: audience }
 			}), flatMap$3(schemaBodyJson(User)), timeout("10 seconds"));
@@ -82025,7 +82200,7 @@ var Auth = class Auth extends Service$1()("@deslop/runtime/auth/service/Auth") {
 			access,
 			user: fn("Auth.user")(function* (headers) {
 				if (isSome(get$5(headers, "authorization"))) return yield* access(headers, canonical);
-				return yield* pipe(client.get(new URL("/auth/session", issuer).href, { headers: { cookie: headers["cookie"] ?? "" } }), flatMap$3(schemaBodyJson(User)), timeout("10 seconds"));
+				return yield* pipe(client.get(new URL(SESSION_PATH, issuer).href, { headers: { cookie: headers["cookie"] ?? "" } }), flatMap$3(schemaBodyJson(User)), timeout("10 seconds"));
 			}, rejected("Sign in first"))
 		}));
 	}));
@@ -82097,7 +82272,7 @@ const guard = make$24((app) => gen(function* () {
 		const canonical = new URL(yield* String$5("APP_URL")).hostname;
 		if (!exists(liftThrowable(() => new URL(`http://${host}`))(), (url) => url.hostname === canonical || isSome(match$3(LOOPBACK)(url.hostname)))) return empty$2({ status: 403 });
 	}
-	if (exists(origin, (value) => !exists(liftThrowable(() => new URL(value).host)(), (originHost) => originHost === host)) && request.headers["sec-fetch-site"] !== "same-origin" && !contains(OTLP, headNonEmpty(split(request.url, "?")))) return empty$2({ status: 403 });
+	if (exists(origin, (value) => !exists(liftThrowable(() => new URL(value).host)(), (originHost) => originHost === host)) && request.headers["sec-fetch-site"] !== "same-origin" && !contains(OTLP, headNonEmpty(split$1(request.url, "?")))) return empty$2({ status: 403 });
 	return yield* app;
 }));
 function layerKeyValueStore(directory) {
@@ -82184,7 +82359,7 @@ const layerRoutes = use((router) => gen(function* () {
 			})
 		});
 	});
-	yield* router.add("GET", "/api/runtime", gen(function* () {
+	yield* router.add("GET", RUNTIME_PATH, gen(function* () {
 		return yield* schemaJson(RuntimeConfig)({
 			...match$8(issuer, {
 				onNone: () => ({}),
@@ -82212,7 +82387,7 @@ const layerAnnounce = effectDiscard(gen(function* () {
 	yield* match$8(yield* option(String$5("AUTH_URL")), {
 		onNone: () => void_$1,
 		onSome: fnUntraced(function* (issuer) {
-			yield* pipe(post(new URL("/api/apps", issuer).href), bodyJsonUnsafe({ origin }), client.execute, delay("2 seconds"), retry({
+			yield* pipe(post(new URL(APPS_PATH, issuer).href), bodyJsonUnsafe({ origin }), client.execute, delay("2 seconds"), retry({
 				schedule: spaced("1 minute"),
 				times: 60
 			}), ignore$1({
@@ -82233,7 +82408,7 @@ const layerWeb = unwrap$7(gen(function* () {
 	const client = fileURLToPath(new URL("./client", import.meta.url));
 	if (!(yield* (yield* FileSystem).exists((yield* Path$1).join(client, "index.html")))) return empty$11;
 	const name = capitalize(yield* appName);
-	return mergeAll$2(add("GET", "/manifest.webmanifest", succeed$5(jsonUnsafe({
+	return mergeAll$2(add("GET", MANIFEST_PATH, succeed$5(jsonUnsafe({
 		background_color: "#0a0a0a",
 		display: "standalone",
 		icons: [{
@@ -82262,6 +82437,14 @@ const layerWeb = unwrap$7(gen(function* () {
 		spa: true
 	}));
 }));
+function layerRpc(options) {
+	return pipe(layerHttp({
+		disableTracing: options.disableTracing,
+		group: options.group,
+		path: RPC_PATH,
+		protocol: "websocket"
+	}), provide$2(options.handlers));
+}
 const layerNodeHttpServer = layerConfig(createServer, {
 	gracefulShutdownTimeout: succeed$1("1500 millis"),
 	host: String$5("HOST"),
@@ -82384,7 +82567,7 @@ const update = fnUntraced(function* (name) {
 	yield* activate(name, path.join(directory, "node_modules", "@deslop", name));
 	yield* restart(name);
 	const kept = [latest, ...toArray(map$11(previous, (link) => path.basename(path.resolve(link, "../../.."))))];
-	yield* forEach$1(filter$5(yield* fs.readDirectory(path.join(root, "releases")), (entry) => !contains(kept, entry)), (entry) => fs.remove(path.join(root, "releases", entry), { recursive: true }), { concurrency: 1 });
+	yield* forEach$1(difference(yield* fs.readDirectory(path.join(root, "releases")), kept), (entry) => fs.remove(path.join(root, "releases", entry), { recursive: true }), { concurrency: 1 });
 	return `Updated ${name} from ${running} to ${latest}\n`;
 });
 // ../../packages/runtime/src/cli.ts
@@ -82500,21 +82683,21 @@ const Place = Struct({
 });
 const ReservationStatus = Literals(["confirmed", "cancelled"]);
 const FlightTracking = Struct({
-	aircraft: optional$2(String$6),
-	arrivalActual: optional$2(Finite),
-	arrivalEstimated: optional$2(Finite),
-	arrivalGate: optional$2(String$6),
-	arrivalTerminal: optional$2(String$6),
-	belt: optional$2(String$6),
+	aircraft: optionalKey(String$6),
+	arrivalActual: optionalKey(Finite),
+	arrivalEstimated: optionalKey(Finite),
+	arrivalGate: optionalKey(String$6),
+	arrivalTerminal: optionalKey(String$6),
+	belt: optionalKey(String$6),
 	checkedAt: Finite,
-	departureActual: optional$2(Finite),
-	departureEstimated: optional$2(Finite),
-	departureGate: optional$2(String$6),
-	departureTerminal: optional$2(String$6),
-	landingActual: optional$2(Finite),
-	previousGate: optional$2(String$6),
-	progress: optional$2(Finite),
-	providerId: optional$2(String$6),
+	departureActual: optionalKey(Finite),
+	departureEstimated: optionalKey(Finite),
+	departureGate: optionalKey(String$6),
+	departureTerminal: optionalKey(String$6),
+	landingActual: optionalKey(Finite),
+	previousGate: optionalKey(String$6),
+	progress: optionalKey(Finite),
+	providerId: optionalKey(String$6),
 	state: Literals([
 		"scheduled",
 		"departed",
@@ -82524,7 +82707,7 @@ const FlightTracking = Struct({
 		"cancelled",
 		"diverted"
 	]),
-	takeoffActual: optional$2(Finite)
+	takeoffActual: optionalKey(Finite)
 });
 const Flight = TaggedStruct("flight", {
 	airline: String$6,
@@ -82550,13 +82733,13 @@ const TrainOperator = Literals([
 	"other"
 ]);
 const TrainTracking = Struct({
-	arrivalPlatform: optional$2(String$6),
+	arrivalPlatform: optionalKey(String$6),
 	checkedAt: Finite,
 	delayMinutes: Finite,
-	departureDelay: optional$2(Finite),
-	departurePlatform: optional$2(String$6),
-	departurePlatformPlanned: optional$2(String$6),
-	lastSeen: optional$2(Struct({
+	departureDelay: optionalKey(Finite),
+	departurePlatform: optionalKey(String$6),
+	departurePlatformPlanned: optionalKey(String$6),
+	lastSeen: optionalKey(Struct({
 		at: Finite,
 		station: String$6
 	})),
@@ -92462,7 +92645,7 @@ const GENERIC = [
 	"stazione"
 ];
 function words(text) {
-	return pipe(text, normalize$2("NFD"), replaceAll(/[̀-ͯ]/gu, ""), toLowerCase, split(/[^a-z0-9]+/u));
+	return pipe(text, normalize$2("NFD"), replaceAll(/[̀-ͯ]/gu, ""), toLowerCase, split$1(/[^a-z0-9]+/u));
 }
 function namesIt(name, match) {
 	const own = words(`${match.name} ${join$3(map$8(match.areas ?? [], (area) => area.name), " ")}`);
@@ -92518,7 +92701,7 @@ var Places = class Places extends Service$1()("@deslop/trips/services/bookings/l
 					code: match.id,
 					latitude: match.lat,
 					longitude: match.lon,
-					name: pipe(toLowerCase(match.name), split(" "), map$8((word) => `${toUpperCase(slice$1(0, 1)(word))}${slice$1(1)(word)}`), join$3(" "))
+					name: pipe(toLowerCase(match.name), split$1(" "), map$8((word) => `${toUpperCase(slice$1(0, 1)(word))}${slice$1(1)(word)}`), join$3(" "))
 				})
 			});
 			yield* update$1(stations, set$4(key, place));
@@ -119776,7 +119959,7 @@ function holds(record, window, now) {
 	return record.token !== void 0 || record.channel !== void 0 || now - record.claimedAt < 12e4;
 }
 function announced(sent, key) {
-	const category = headNonEmpty(split(":")(key));
+	const category = headNonEmpty(split$1(":")(key));
 	if (category === key || category === "delay") return contains(sent, key);
 	return exists(findLast(sent, (found) => startsWith(`${category}:`)(found)), (found) => found === key);
 }
@@ -120196,23 +120379,27 @@ function flightState(answer) {
 function flightTracking(answer, checkedAt, previous) {
 	const gate = text(answer.gate_origin);
 	return {
-		aircraft: getOrUndefined$1(text(answer.aircraft_type)),
-		arrivalActual: getOrUndefined$1(instant(answer.actual_in)),
-		arrivalEstimated: getOrUndefined$1(instant(answer.estimated_in)),
-		arrivalGate: getOrUndefined$1(text(answer.gate_destination)),
-		arrivalTerminal: getOrUndefined$1(text(answer.terminal_destination)),
-		belt: getOrUndefined$1(text(answer.baggage_claim)),
+		...getSomes$1({
+			aircraft: text(answer.aircraft_type),
+			arrivalGate: text(answer.gate_destination),
+			arrivalTerminal: text(answer.terminal_destination),
+			belt: text(answer.baggage_claim),
+			departureGate: gate,
+			departureTerminal: text(answer.terminal_origin),
+			previousGate: flatMap$8(gate, (current) => orElse$1(filter$7(fromUndefinedOr(previous?.departureGate), (before) => before !== current), () => filter$7(fromUndefinedOr(previous?.previousGate), () => previous?.departureGate === current))),
+			providerId: fromNullishOr(answer.fa_flight_id)
+		}),
 		checkedAt,
-		departureActual: getOrUndefined$1(instant(answer.actual_out)),
-		departureEstimated: getOrUndefined$1(instant(answer.estimated_out)),
-		departureGate: getOrUndefined$1(gate),
-		departureTerminal: getOrUndefined$1(text(answer.terminal_origin)),
-		landingActual: getOrUndefined$1(instant(answer.actual_on)),
-		previousGate: getOrUndefined$1(flatMap$8(gate, (current) => orElse$1(filter$7(fromUndefinedOr(previous?.departureGate), (before) => before !== current), () => filter$7(fromUndefinedOr(previous?.previousGate), () => previous?.departureGate === current)))),
-		progress: getOrUndefined$1(fromNullishOr(answer.progress_percent)),
-		providerId: answer.fa_flight_id,
-		state: flightState(answer),
-		takeoffActual: getOrUndefined$1(instant(answer.actual_off))
+		...getSomes$1({
+			arrivalActual: instant(answer.actual_in),
+			arrivalEstimated: instant(answer.estimated_in),
+			departureActual: instant(answer.actual_out),
+			departureEstimated: instant(answer.estimated_out),
+			landingActual: instant(answer.actual_on),
+			progress: fromNullishOr(answer.progress_percent),
+			takeoffActual: instant(answer.actual_off)
+		}),
+		state: flightState(answer)
 	};
 }
 function normalized(name) {
@@ -120233,19 +120420,22 @@ function trainTracking(answer, train, checkedAt) {
 	const from = stopFor(answer.fermate, train.from);
 	const to = stopFor(answer.fermate, train.to);
 	if (!exists(from, (stop) => exists(fromNullishOr(stop.programmata), (planned) => Math.abs(planned - train.departs) <= 108e5))) return none();
-	return some$1({
-		arrivalPlatform: getOrUndefined$1(flatMap$8(to, (stop) => orElse$1(text(stop.binarioEffettivoArrivoDescrizione), () => text(stop.binarioProgrammatoArrivoDescrizione)))),
+	const tracking = {
+		...getSomes$1({
+			arrivalPlatform: flatMap$8(to, (stop) => orElse$1(text(stop.binarioEffettivoArrivoDescrizione), () => text(stop.binarioProgrammatoArrivoDescrizione))),
+			departurePlatform: flatMap$8(from, (stop) => orElse$1(text(stop.binarioEffettivoPartenzaDescrizione), () => text(stop.binarioProgrammatoPartenzaDescrizione))),
+			departurePlatformPlanned: flatMap$8(from, (stop) => text(stop.binarioProgrammatoPartenzaDescrizione))
+		}),
 		checkedAt,
 		delayMinutes: getOrElse(orElse$1(flatMap$8(filter$7(to, (stop) => stop.actualFermataType === 1), (stop) => fromNullishOr(stop.ritardo)), () => fromNullishOr(answer.ritardo)), () => 0),
-		departureDelay: getOrUndefined$1(flatMap$8(filter$7(from, left), (stop) => fromNullishOr(stop.ritardo))),
-		departurePlatform: getOrUndefined$1(flatMap$8(from, (stop) => orElse$1(text(stop.binarioEffettivoPartenzaDescrizione), () => text(stop.binarioProgrammatoPartenzaDescrizione)))),
-		departurePlatformPlanned: getOrUndefined$1(flatMap$8(from, (stop) => text(stop.binarioProgrammatoPartenzaDescrizione))),
-		lastSeen: getOrUndefined$1(filter$7(all$4({
+		...getSomes$1({ departureDelay: flatMap$8(filter$7(from, left), (stop) => fromNullishOr(stop.ritardo)) }),
+		...getSomes$1({ lastSeen: filter$7(all$4({
 			at: fromNullishOr(answer.oraUltimoRilevamento),
 			station: text(answer.stazioneUltimoRilevamento)
-		}), (seen) => seen.station !== "--")),
+		}), (seen) => seen.station !== "--") }),
 		state: trainState(from, to)
-	});
+	};
+	return some$1(tracking);
 }
 // src/services/tracking/schema.ts
 function Nullable(schema) {
@@ -120413,30 +120603,27 @@ var Tracker = class Tracker extends Service$1()("@deslop/trips/services/tracking
 		return Tracker.of({ refresh });
 	}));
 };
-// src/rpcs/handlers.ts
-const RpcHandlers = RpcContracts.toLayer(gen(function* () {
-	const bookings = yield* Bookings;
-	const push = yield* Push;
-	const tracker = yield* Tracker;
-	return RpcContracts.of({
-		"activities.claim": (input) => push.claim(input),
-		"activities.register": (input) => push.activity(input),
-		"bookings.refresh": (input) => tracker.refresh(input.id),
-		"bookings.remove": (input) => bookings.remove(input.id),
-		"bookings.restore": (input) => bookings.restore(input),
-		"bookings.save": (input) => bookings.save(input),
-		"bookings.watch": () => bookings.events,
-		"devices.register": (input) => push.register(input)
-	});
-}));
 // src/main.server.ts
 runApp({
 	icon: icon_default,
-	routes: pipe(layerHttp({
+	routes: pipe(layerRpc({
 		group: RpcContracts,
-		path: "/api/rpc",
-		protocol: "websocket"
-	}), provide$2(RpcHandlers), provide$2(layerJson$1), provide$2(mergeAll$2(Push.layer, Tracker.layer)), provide$2(Bookings.layer), provide$2(mergeAll$2(Places.layer, Extractor.layer)), provide$2(layerDataStore)),
+		handlers: RpcContracts.toLayer(gen(function* () {
+			const bookings = yield* Bookings;
+			const push = yield* Push;
+			const tracker = yield* Tracker;
+			return RpcContracts.of({
+				"activities.claim": (input) => push.claim(input),
+				"activities.register": (input) => push.activity(input),
+				"bookings.refresh": (input) => tracker.refresh(input.id),
+				"bookings.remove": (input) => bookings.remove(input.id),
+				"bookings.restore": (input) => bookings.restore(input),
+				"bookings.save": (input) => bookings.save(input),
+				"bookings.watch": () => bookings.events,
+				"devices.register": (input) => push.register(input)
+			});
+		}))
+	}), provide$2(layerJson$1), provide$2(mergeAll$2(Push.layer, Tracker.layer)), provide$2(Bookings.layer), provide$2(mergeAll$2(Places.layer, Extractor.layer)), provide$2(layerDataStore)),
 	settings: {
 		APNS_KEY_ID: {
 			description: "The APNs signing key's id",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@deslop/trips",
-	"version": "0.1.1241",
+	"version": "0.1.1243",
 	"repository": {
 		"type": "git",
 		"url": "git+https://github.com/MP281X/deslop.git",
@@ -30,5 +30,5 @@
 	"engines": {
 		"node": ">=26"
 	},
-	"fingerprint": "03328d7b833229fddcaf35c0954e5d098df1a34454544a05aadf373ac0c09ded"
+	"fingerprint": "f509d7be1d84c6ebc29b29868ba4b4d53a5cb6c7aa5e69d1363ce4254bf2e682"
 }