@agentdeck/bridge 1.0.24 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -6
- package/assets/fonts/NOTICE-PocketSansWorld.md +10 -0
- package/assets/fonts/OFL-PocketSansWorld.txt +93 -0
- package/assets/fonts/PocketSansWorld_12.cpfont +0 -0
- package/assets/fonts/pocket-sans-world.manifest.json +49 -0
- package/assets/learning/LICENSE-CC-BY-SA-4.0.txt +10 -0
- package/assets/learning/NOTICE.md +33 -0
- package/assets/learning/jp-n3-ko.manifest.json +27 -0
- package/assets/learning/jp-n3-ko.pdl +0 -0
- package/dist/adapters/openclaw.d.ts +74 -4
- package/dist/adapters/openclaw.d.ts.map +1 -1
- package/dist/adapters/openclaw.js +235 -43
- package/dist/adapters/openclaw.js.map +1 -1
- package/dist/agent-cli-diagnostics.d.ts +20 -0
- package/dist/agent-cli-diagnostics.d.ts.map +1 -0
- package/dist/agent-cli-diagnostics.js +100 -0
- package/dist/agent-cli-diagnostics.js.map +1 -0
- package/dist/apme/adapters/openclaw-hook.d.ts +38 -10
- package/dist/apme/adapters/openclaw-hook.d.ts.map +1 -1
- package/dist/apme/adapters/openclaw-hook.js +181 -37
- package/dist/apme/adapters/openclaw-hook.js.map +1 -1
- package/dist/apme/collector.d.ts +55 -2
- package/dist/apme/collector.d.ts.map +1 -1
- package/dist/apme/collector.js +324 -37
- package/dist/apme/collector.js.map +1 -1
- package/dist/apme/dashboard-html.d.ts.map +1 -1
- package/dist/apme/dashboard-html.js +275 -35
- package/dist/apme/dashboard-html.js.map +1 -1
- package/dist/apme/http.d.ts.map +1 -1
- package/dist/apme/http.js +33 -5
- package/dist/apme/http.js.map +1 -1
- package/dist/apme/index.d.ts.map +1 -1
- package/dist/apme/index.js +6 -2
- package/dist/apme/index.js.map +1 -1
- package/dist/apme/pareto.d.ts +2 -1
- package/dist/apme/pareto.d.ts.map +1 -1
- package/dist/apme/pareto.js +15 -4
- package/dist/apme/pareto.js.map +1 -1
- package/dist/apme/recommend.d.ts +24 -1
- package/dist/apme/recommend.d.ts.map +1 -1
- package/dist/apme/recommend.js +43 -7
- package/dist/apme/recommend.js.map +1 -1
- package/dist/apme/store.d.ts +47 -1
- package/dist/apme/store.d.ts.map +1 -1
- package/dist/apme/store.js +397 -99
- package/dist/apme/store.js.map +1 -1
- package/dist/bridge-core.d.ts +25 -1
- package/dist/bridge-core.d.ts.map +1 -1
- package/dist/bridge-core.js +50 -9
- package/dist/bridge-core.js.map +1 -1
- package/dist/card-feed.d.ts +46 -1
- package/dist/card-feed.d.ts.map +1 -1
- package/dist/card-feed.js +166 -6
- package/dist/card-feed.js.map +1 -1
- package/dist/cli.d.ts +56 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +442 -34
- package/dist/cli.js.map +1 -1
- package/dist/codex-rate-limits-live.d.ts +180 -10
- package/dist/codex-rate-limits-live.d.ts.map +1 -1
- package/dist/codex-rate-limits-live.js +475 -22
- package/dist/codex-rate-limits-live.js.map +1 -1
- package/dist/daemon-build-identity.d.ts +124 -0
- package/dist/daemon-build-identity.d.ts.map +1 -0
- package/dist/daemon-build-identity.js +310 -0
- package/dist/daemon-build-identity.js.map +1 -0
- package/dist/daemon-server.d.ts +34 -6
- package/dist/daemon-server.d.ts.map +1 -1
- package/dist/daemon-server.js +876 -109
- package/dist/daemon-server.js.map +1 -1
- package/dist/daemon-takeover.d.ts +11 -0
- package/dist/daemon-takeover.d.ts.map +1 -1
- package/dist/daemon-takeover.js +62 -17
- package/dist/daemon-takeover.js.map +1 -1
- package/dist/daemon-ws-client.d.ts +1 -0
- package/dist/daemon-ws-client.d.ts.map +1 -1
- package/dist/daemon-ws-client.js +25 -16
- package/dist/daemon-ws-client.js.map +1 -1
- package/dist/daemon.js +1 -1
- package/dist/daemon.js.map +1 -1
- package/dist/esp32-serial.d.ts +18 -0
- package/dist/esp32-serial.d.ts.map +1 -1
- package/dist/esp32-serial.js +23 -1
- package/dist/esp32-serial.js.map +1 -1
- package/dist/font-pack.d.ts +15 -0
- package/dist/font-pack.d.ts.map +1 -0
- package/dist/font-pack.js +75 -0
- package/dist/font-pack.js.map +1 -0
- package/dist/glance-frame.d.ts.map +1 -1
- package/dist/glance-frame.js +5 -1
- package/dist/glance-frame.js.map +1 -1
- package/dist/hook-codex-sessions.d.ts +3 -1
- package/dist/hook-codex-sessions.d.ts.map +1 -1
- package/dist/hook-codex-sessions.js +27 -7
- package/dist/hook-codex-sessions.js.map +1 -1
- package/dist/http-auth-gate.d.ts.map +1 -1
- package/dist/http-auth-gate.js +9 -1
- package/dist/http-auth-gate.js.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/learning-pack.d.ts +24 -0
- package/dist/learning-pack.d.ts.map +1 -0
- package/dist/learning-pack.js +125 -0
- package/dist/learning-pack.js.map +1 -0
- package/dist/legacy-rearm-ledger.d.ts +56 -0
- package/dist/legacy-rearm-ledger.d.ts.map +1 -0
- package/dist/legacy-rearm-ledger.js +66 -0
- package/dist/legacy-rearm-ledger.js.map +1 -0
- package/dist/mdns.d.ts +33 -0
- package/dist/mdns.d.ts.map +1 -1
- package/dist/mdns.js +92 -3
- package/dist/mdns.js.map +1 -1
- package/dist/openclaw-session.d.ts.map +1 -1
- package/dist/openclaw-session.js +13 -0
- package/dist/openclaw-session.js.map +1 -1
- package/dist/openclaw-timeline-feed.d.ts +84 -0
- package/dist/openclaw-timeline-feed.d.ts.map +1 -0
- package/dist/openclaw-timeline-feed.js +162 -0
- package/dist/openclaw-timeline-feed.js.map +1 -0
- package/dist/openclaw-transcript-timeline.d.ts +103 -0
- package/dist/openclaw-transcript-timeline.d.ts.map +1 -0
- package/dist/openclaw-transcript-timeline.js +328 -0
- package/dist/openclaw-transcript-timeline.js.map +1 -0
- package/dist/pairing-knocks.d.ts +80 -0
- package/dist/pairing-knocks.d.ts.map +1 -0
- package/dist/pairing-knocks.js +312 -0
- package/dist/pairing-knocks.js.map +1 -0
- package/dist/passive-observer.d.ts +21 -1
- package/dist/passive-observer.d.ts.map +1 -1
- package/dist/passive-observer.js +37 -3
- package/dist/passive-observer.js.map +1 -1
- package/dist/pixoo/micro-glyphs.d.ts +4 -0
- package/dist/pixoo/micro-glyphs.d.ts.map +1 -1
- package/dist/pixoo/micro-glyphs.js +29 -0
- package/dist/pixoo/micro-glyphs.js.map +1 -1
- package/dist/pixoo/pixoo-font.d.ts.map +1 -1
- package/dist/pixoo/pixoo-font.js +3 -1
- package/dist/pixoo/pixoo-font.js.map +1 -1
- package/dist/pixoo/pixoo-renderer.d.ts +1 -1
- package/dist/pixoo/pixoo-renderer.d.ts.map +1 -1
- package/dist/pixoo/pixoo-renderer.js +17 -2
- package/dist/pixoo/pixoo-renderer.js.map +1 -1
- package/dist/pty-manager.d.ts +9 -0
- package/dist/pty-manager.d.ts.map +1 -1
- package/dist/pty-manager.js +63 -4
- package/dist/pty-manager.js.map +1 -1
- package/dist/relayed-usage.d.ts +98 -0
- package/dist/relayed-usage.d.ts.map +1 -0
- package/dist/relayed-usage.js +103 -0
- package/dist/relayed-usage.js.map +1 -0
- package/dist/session-aggregator.d.ts +3 -0
- package/dist/session-aggregator.d.ts.map +1 -1
- package/dist/session-aggregator.js.map +1 -1
- package/dist/session-registry.d.ts +1 -0
- package/dist/session-registry.d.ts.map +1 -1
- package/dist/surface-protocol.d.ts +84 -0
- package/dist/surface-protocol.d.ts.map +1 -0
- package/dist/surface-protocol.js +237 -0
- package/dist/surface-protocol.js.map +1 -0
- package/dist/timeline-store.d.ts +1 -1
- package/dist/timeline-store.d.ts.map +1 -1
- package/dist/timeline-store.js +16 -1
- package/dist/timeline-store.js.map +1 -1
- package/dist/tui/dashboard.d.ts.map +1 -1
- package/dist/tui/dashboard.js +8 -1
- package/dist/tui/dashboard.js.map +1 -1
- package/dist/tui/renderer.d.ts.map +1 -1
- package/dist/tui/renderer.js +35 -0
- package/dist/tui/renderer.js.map +1 -1
- package/dist/weather-config.d.ts +17 -0
- package/dist/weather-config.d.ts.map +1 -0
- package/dist/weather-config.js +54 -0
- package/dist/weather-config.js.map +1 -0
- package/dist/weather.d.ts +44 -4
- package/dist/weather.d.ts.map +1 -1
- package/dist/weather.js +223 -15
- package/dist/weather.js.map +1 -1
- package/dist/ws-server.d.ts +18 -0
- package/dist/ws-server.d.ts.map +1 -1
- package/dist/ws-server.js +95 -7
- package/dist/ws-server.js.map +1 -1
- package/fm-helper/AgentDeckFMHelper.swift +51 -5
- package/package.json +4 -3
- package/src/timebox/sync_ble.py +35 -16
package/dist/weather.d.ts
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Glance weather
|
|
2
|
+
* Provider-neutral Glance weather — daemon-side module for the card-feed
|
|
3
3
|
* sleep dashboard. The device never fetches weather itself; the daemon fetches,
|
|
4
4
|
* caches, and pre-renders it into `CardFeedResponse.glance.weather`
|
|
5
5
|
* (shared/src/protocol.ts § Glance).
|
|
6
6
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
7
|
+
* MET Norway Locationforecast is the zero-account default. Open-Meteo remains
|
|
8
|
+
* an explicit custom-provider compatibility path; its public endpoint is not a
|
|
9
|
+
* commercial-product default. Config comes from settings.json:
|
|
9
10
|
*
|
|
10
11
|
* "weather": { "lat": 37.57, "lon": 126.98, "place": "Seoul" }
|
|
11
12
|
*
|
|
@@ -16,6 +17,10 @@ export interface WeatherSettings {
|
|
|
16
17
|
lat: number;
|
|
17
18
|
lon: number;
|
|
18
19
|
place?: string;
|
|
20
|
+
timeZone?: string;
|
|
21
|
+
provider?: 'met-no' | 'open-meteo';
|
|
22
|
+
endpoint?: string;
|
|
23
|
+
apiKey?: string;
|
|
19
24
|
}
|
|
20
25
|
/** Serve from cache inside this window — weather cadence is slower than the
|
|
21
26
|
* fastest pull cadence (900s), so a fresh fetch per pull would be waste. */
|
|
@@ -56,17 +61,52 @@ export declare function findTodayRainWindow(hourly: {
|
|
|
56
61
|
precipitation_probability?: number[];
|
|
57
62
|
} | undefined, now: Date): GlanceRainWindow | undefined;
|
|
58
63
|
export declare function toGlanceWeather(raw: OpenMeteoResponse, cfg: WeatherSettings, now: Date): GlanceWeather;
|
|
64
|
+
interface MetNoPeriod {
|
|
65
|
+
summary?: {
|
|
66
|
+
symbol_code?: string;
|
|
67
|
+
};
|
|
68
|
+
details?: {
|
|
69
|
+
precipitation_amount?: number;
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
interface MetNoPoint {
|
|
73
|
+
time?: string;
|
|
74
|
+
data?: {
|
|
75
|
+
instant?: {
|
|
76
|
+
details?: {
|
|
77
|
+
air_temperature?: number;
|
|
78
|
+
};
|
|
79
|
+
};
|
|
80
|
+
next_1_hours?: MetNoPeriod;
|
|
81
|
+
next_6_hours?: MetNoPeriod;
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
interface MetNoResponse {
|
|
85
|
+
properties?: {
|
|
86
|
+
meta?: {
|
|
87
|
+
updated_at?: string;
|
|
88
|
+
};
|
|
89
|
+
timeseries?: MetNoPoint[];
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
export declare function buildMetNoForecastUrl(cfg: WeatherSettings): string;
|
|
93
|
+
/** Stable WMO-compatible projection used by existing icon renderers. */
|
|
94
|
+
export declare function metSymbolToWmo(symbol: string | undefined): number;
|
|
95
|
+
export declare function toMetNoGlanceWeather(raw: MetNoResponse, cfg: WeatherSettings, now: Date): GlanceWeather;
|
|
59
96
|
export declare class WeatherProvider {
|
|
60
97
|
private readonly fetchImpl;
|
|
61
98
|
private readonly log;
|
|
99
|
+
private readonly cachePath?;
|
|
62
100
|
private cache;
|
|
63
101
|
private inflight;
|
|
64
|
-
constructor(fetchImpl?: typeof fetch, log?: (msg: string) => void);
|
|
102
|
+
constructor(fetchImpl?: typeof fetch, log?: (msg: string) => void, cachePath?: string | undefined);
|
|
65
103
|
/** Current weather for `cfg`, from cache when fresh. Resolves `undefined`
|
|
66
104
|
* when unconfigured or when no report (fresh or stale-servable) exists —
|
|
67
105
|
* the glance simply omits weather. Never throws. */
|
|
68
106
|
get(cfg: WeatherSettings | null, now?: number): Promise<GlanceWeather | undefined>;
|
|
69
107
|
private fetchFresh;
|
|
108
|
+
private loadCache;
|
|
109
|
+
private persistCache;
|
|
70
110
|
}
|
|
71
111
|
export {};
|
|
72
112
|
//# sourceMappingURL=weather.d.ts.map
|
package/dist/weather.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weather.d.ts","sourceRoot":"","sources":["../src/weather.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"weather.d.ts","sourceRoot":"","sources":["../src/weather.ts"],"names":[],"mappings":"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"}
|
package/dist/weather.js
CHANGED
|
@@ -1,17 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* Glance weather
|
|
2
|
+
* Provider-neutral Glance weather — daemon-side module for the card-feed
|
|
3
3
|
* sleep dashboard. The device never fetches weather itself; the daemon fetches,
|
|
4
4
|
* caches, and pre-renders it into `CardFeedResponse.glance.weather`
|
|
5
5
|
* (shared/src/protocol.ts § Glance).
|
|
6
6
|
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
7
|
+
* MET Norway Locationforecast is the zero-account default. Open-Meteo remains
|
|
8
|
+
* an explicit custom-provider compatibility path; its public endpoint is not a
|
|
9
|
+
* commercial-product default. Config comes from settings.json:
|
|
9
10
|
*
|
|
10
11
|
* "weather": { "lat": 37.57, "lon": 126.98, "place": "Seoul" }
|
|
11
12
|
*
|
|
12
13
|
* No config → no weather in the glance (never a guess, never IP geolocation).
|
|
13
14
|
*/
|
|
14
|
-
import {
|
|
15
|
+
import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
|
|
16
|
+
import { dirname } from 'node:path';
|
|
17
|
+
import { GLANCE_MAX_WEATHER_CUES, GLANCE_MAX_WEATHER_DAYS, GLANCE_RAIN_PROBABILITY_MIN } from '@agentdeck/shared';
|
|
15
18
|
/** Serve from cache inside this window — weather cadence is slower than the
|
|
16
19
|
* fastest pull cadence (900s), so a fresh fetch per pull would be waste. */
|
|
17
20
|
export const WEATHER_CACHE_MS = 30 * 60 * 1000;
|
|
@@ -34,8 +37,21 @@ export function parseWeatherSettings(settings) {
|
|
|
34
37
|
lat,
|
|
35
38
|
lon,
|
|
36
39
|
...(typeof w.place === 'string' && w.place ? { place: w.place } : {}),
|
|
40
|
+
...(typeof w.timeZone === 'string' && validTimeZone(w.timeZone) ? { timeZone: w.timeZone } : {}),
|
|
41
|
+
...(w.provider === 'open-meteo' ? { provider: 'open-meteo' } : {}),
|
|
42
|
+
...(typeof w.endpoint === 'string' && w.endpoint.startsWith('https://') ? { endpoint: w.endpoint } : {}),
|
|
43
|
+
...(typeof w.apiKey === 'string' && w.apiKey ? { apiKey: w.apiKey } : {}),
|
|
37
44
|
};
|
|
38
45
|
}
|
|
46
|
+
function validTimeZone(value) {
|
|
47
|
+
try {
|
|
48
|
+
new Intl.DateTimeFormat('en', { timeZone: value }).format();
|
|
49
|
+
return true;
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
39
55
|
/** WMO weather interpretation code → one short summary word. Kept ASCII so
|
|
40
56
|
* every panel font can draw it; codes ride alongside for icon-capable
|
|
41
57
|
* clients. */
|
|
@@ -74,7 +90,9 @@ export function buildForecastUrl(cfg) {
|
|
|
74
90
|
timezone: 'auto',
|
|
75
91
|
forecast_days: '2',
|
|
76
92
|
});
|
|
77
|
-
|
|
93
|
+
if (cfg.apiKey)
|
|
94
|
+
p.set('apikey', cfg.apiKey);
|
|
95
|
+
return `${cfg.endpoint ?? 'https://api.open-meteo.com/v1/forecast'}?${p.toString()}`;
|
|
78
96
|
}
|
|
79
97
|
const hmOf = (iso) => iso.slice(11, 16);
|
|
80
98
|
const dayOf = (iso) => iso.slice(0, 10);
|
|
@@ -155,14 +173,163 @@ export function toGlanceWeather(raw, cfg, now) {
|
|
|
155
173
|
out.rain = rain;
|
|
156
174
|
return out;
|
|
157
175
|
}
|
|
176
|
+
export function buildMetNoForecastUrl(cfg) {
|
|
177
|
+
const base = cfg.endpoint ?? 'https://api.met.no/weatherapi/locationforecast/2.0/compact';
|
|
178
|
+
const p = new URLSearchParams({
|
|
179
|
+
// MET rejects more than four decimals. Three is already ~100 m.
|
|
180
|
+
lat: cfg.lat.toFixed(3), lon: cfg.lon.toFixed(3),
|
|
181
|
+
});
|
|
182
|
+
return `${base}?${p.toString()}`;
|
|
183
|
+
}
|
|
184
|
+
const MET_SOURCE = {
|
|
185
|
+
id: 'met-no', displayName: 'MET Norway',
|
|
186
|
+
attributionText: 'Data from MET Norway',
|
|
187
|
+
attributionUrl: 'https://api.met.no/', modified: true,
|
|
188
|
+
};
|
|
189
|
+
/** Stable WMO-compatible projection used by existing icon renderers. */
|
|
190
|
+
export function metSymbolToWmo(symbol) {
|
|
191
|
+
const s = (symbol ?? '').toLowerCase();
|
|
192
|
+
if (s.includes('thunder'))
|
|
193
|
+
return 95;
|
|
194
|
+
if (s.includes('snow') || s.includes('sleet'))
|
|
195
|
+
return 75;
|
|
196
|
+
if (s.includes('rainshowers'))
|
|
197
|
+
return 81;
|
|
198
|
+
if (s.includes('rain'))
|
|
199
|
+
return 63;
|
|
200
|
+
if (s.includes('fog'))
|
|
201
|
+
return 45;
|
|
202
|
+
if (s.includes('cloudy'))
|
|
203
|
+
return 3;
|
|
204
|
+
if (s.includes('partlycloudy'))
|
|
205
|
+
return 2;
|
|
206
|
+
if (s.includes('fair'))
|
|
207
|
+
return 1;
|
|
208
|
+
return 0;
|
|
209
|
+
}
|
|
210
|
+
function localParts(at, timeZone) {
|
|
211
|
+
const parts = new Intl.DateTimeFormat('en-CA', {
|
|
212
|
+
timeZone, year: 'numeric', month: '2-digit', day: '2-digit',
|
|
213
|
+
hour: '2-digit', minute: '2-digit', hourCycle: 'h23',
|
|
214
|
+
}).formatToParts(at);
|
|
215
|
+
const get = (type) => parts.find((p) => p.type === type)?.value ?? '';
|
|
216
|
+
return { date: `${get('year')}-${get('month')}-${get('day')}`, hm: `${get('hour')}:${get('minute')}` };
|
|
217
|
+
}
|
|
218
|
+
function metPeriod(point) {
|
|
219
|
+
return point.data?.next_1_hours ?? point.data?.next_6_hours;
|
|
220
|
+
}
|
|
221
|
+
function metIsWet(point) {
|
|
222
|
+
const period = metPeriod(point);
|
|
223
|
+
const amount = period?.details?.precipitation_amount ?? 0;
|
|
224
|
+
const symbol = period?.summary?.symbol_code ?? '';
|
|
225
|
+
return amount >= 0.05 || /rain|snow|sleet/.test(symbol);
|
|
226
|
+
}
|
|
227
|
+
function cueId(kind, startsAt) {
|
|
228
|
+
return `${kind}:${new Date(startsAt).toISOString().slice(0, 13)}`;
|
|
229
|
+
}
|
|
230
|
+
export function toMetNoGlanceWeather(raw, cfg, now) {
|
|
231
|
+
const points = (raw.properties?.timeseries ?? [])
|
|
232
|
+
.filter((p) => typeof p.time === 'string' && Number.isFinite(Date.parse(p.time)))
|
|
233
|
+
.slice(0, 24 * GLANCE_MAX_WEATHER_DAYS + 12);
|
|
234
|
+
const current = points.find((p) => Date.parse(p.time) >= now.getTime()) ?? points[0];
|
|
235
|
+
const issuedAt = Date.parse(raw.properties?.meta?.updated_at ?? '') || now.getTime();
|
|
236
|
+
const daysByDate = new Map();
|
|
237
|
+
for (const point of points) {
|
|
238
|
+
const at = new Date(point.time);
|
|
239
|
+
const { date } = localParts(at, cfg.timeZone);
|
|
240
|
+
let d = daysByDate.get(date);
|
|
241
|
+
if (!d) {
|
|
242
|
+
d = { temps: [], amount: 0 };
|
|
243
|
+
daysByDate.set(date, d);
|
|
244
|
+
}
|
|
245
|
+
const temp = point.data?.instant?.details?.air_temperature;
|
|
246
|
+
if (typeof temp === 'number')
|
|
247
|
+
d.temps.push(temp);
|
|
248
|
+
const period = metPeriod(point);
|
|
249
|
+
const amount = period?.details?.precipitation_amount;
|
|
250
|
+
if (typeof amount === 'number')
|
|
251
|
+
d.amount += amount;
|
|
252
|
+
const symbol = period?.summary?.symbol_code;
|
|
253
|
+
if (symbol && (!d.symbol || metIsWet(point)))
|
|
254
|
+
d.symbol = symbol;
|
|
255
|
+
}
|
|
256
|
+
const days = Array.from(daysByDate.entries()).slice(0, GLANCE_MAX_WEATHER_DAYS).map(([date, d]) => {
|
|
257
|
+
const code = metSymbolToWmo(d.symbol);
|
|
258
|
+
return {
|
|
259
|
+
date, code, summary: wmoSummary(code),
|
|
260
|
+
...(d.temps.length ? { minC: Math.round(Math.min(...d.temps)), maxC: Math.round(Math.max(...d.temps)) } : {}),
|
|
261
|
+
...(d.amount > 0 ? { precipitationMm: Math.round(d.amount * 10) / 10 } : {}),
|
|
262
|
+
};
|
|
263
|
+
});
|
|
264
|
+
const cues = [];
|
|
265
|
+
let i = 0;
|
|
266
|
+
while (i < points.length && cues.length < GLANCE_MAX_WEATHER_CUES) {
|
|
267
|
+
if (!metIsWet(points[i])) {
|
|
268
|
+
i++;
|
|
269
|
+
continue;
|
|
270
|
+
}
|
|
271
|
+
const start = Date.parse(points[i].time);
|
|
272
|
+
let end = start + 60 * 60 * 1000;
|
|
273
|
+
let amount = 0;
|
|
274
|
+
let snow = false;
|
|
275
|
+
while (i < points.length && metIsWet(points[i])) {
|
|
276
|
+
const p = points[i];
|
|
277
|
+
amount += metPeriod(p)?.details?.precipitation_amount ?? 0;
|
|
278
|
+
snow ||= /snow|sleet/.test(metPeriod(p)?.summary?.symbol_code ?? '');
|
|
279
|
+
end = Date.parse(p.time) + 60 * 60 * 1000;
|
|
280
|
+
i++;
|
|
281
|
+
}
|
|
282
|
+
if (end <= now.getTime())
|
|
283
|
+
continue;
|
|
284
|
+
const kind = snow ? 'snow.start' : 'precipitation.start';
|
|
285
|
+
const hm = localParts(new Date(start), cfg.timeZone).hm;
|
|
286
|
+
const notifyAt = start - 30 * 60 * 1000;
|
|
287
|
+
cues.push({
|
|
288
|
+
id: cueId(kind, start), revision: 1, kind,
|
|
289
|
+
severity: amount >= 5 ? 'warning' : 'notice',
|
|
290
|
+
displayAt: Math.max(issuedAt, start - 3 * 60 * 60 * 1000),
|
|
291
|
+
...(notifyAt > now.getTime() ? { notifyAt } : {}),
|
|
292
|
+
startsAt: start, endsAt: end, expiresAt: end,
|
|
293
|
+
title: `${snow ? 'Snow' : 'Rain'} around ${hm}`,
|
|
294
|
+
detail: amount > 0 ? `${Math.round(amount * 10) / 10} mm forecast` : undefined,
|
|
295
|
+
});
|
|
296
|
+
}
|
|
297
|
+
const curTemp = current?.data?.instant?.details?.air_temperature;
|
|
298
|
+
const curCode = metSymbolToWmo(metPeriod(current ?? {})?.summary?.symbol_code);
|
|
299
|
+
const out = {
|
|
300
|
+
...(cfg.place ? { place: cfg.place } : {}),
|
|
301
|
+
...(typeof curTemp === 'number' ? { tempC: Math.round(curTemp) } : {}),
|
|
302
|
+
code: curCode, summary: wmoSummary(curCode), issuedAt,
|
|
303
|
+
validUntil: points.length ? Date.parse(points[points.length - 1].time) + 60 * 60 * 1000 : issuedAt,
|
|
304
|
+
...(cfg.timeZone ? { timeZone: cfg.timeZone } : {}), source: MET_SOURCE,
|
|
305
|
+
days, ...(cues.length ? { cues } : {}),
|
|
306
|
+
};
|
|
307
|
+
if (days[0]) {
|
|
308
|
+
out.todayMinC = days[0].minC;
|
|
309
|
+
out.todayMaxC = days[0].maxC;
|
|
310
|
+
}
|
|
311
|
+
if (days[1])
|
|
312
|
+
out.tomorrow = days[1];
|
|
313
|
+
const firstWet = cues[0];
|
|
314
|
+
if (firstWet) {
|
|
315
|
+
const start = localParts(new Date(firstWet.startsAt), cfg.timeZone).hm;
|
|
316
|
+
const end = firstWet.endsAt ? localParts(new Date(firstWet.endsAt), cfg.timeZone).hm : undefined;
|
|
317
|
+
out.rain = { startHm: start, ...(end ? { endHm: end } : {}),
|
|
318
|
+
...(days[0]?.precipitationMm !== undefined ? { amountMm: days[0].precipitationMm } : {}) };
|
|
319
|
+
}
|
|
320
|
+
return out;
|
|
321
|
+
}
|
|
158
322
|
export class WeatherProvider {
|
|
159
323
|
fetchImpl;
|
|
160
324
|
log;
|
|
325
|
+
cachePath;
|
|
161
326
|
cache = null;
|
|
162
327
|
inflight = null;
|
|
163
|
-
constructor(fetchImpl = fetch, log = () => { }) {
|
|
328
|
+
constructor(fetchImpl = fetch, log = () => { }, cachePath) {
|
|
164
329
|
this.fetchImpl = fetchImpl;
|
|
165
330
|
this.log = log;
|
|
331
|
+
this.cachePath = cachePath;
|
|
332
|
+
this.loadCache();
|
|
166
333
|
}
|
|
167
334
|
/** Current weather for `cfg`, from cache when fresh. Resolves `undefined`
|
|
168
335
|
* when unconfigured or when no report (fresh or stale-servable) exists —
|
|
@@ -170,9 +337,9 @@ export class WeatherProvider {
|
|
|
170
337
|
async get(cfg, now = Date.now()) {
|
|
171
338
|
if (!cfg)
|
|
172
339
|
return undefined;
|
|
173
|
-
const key = `${cfg.lat},${cfg.lon}`;
|
|
340
|
+
const key = `${cfg.provider ?? 'met-no'}:${cfg.lat.toFixed(3)},${cfg.lon.toFixed(3)}:${cfg.timeZone ?? ''}`;
|
|
174
341
|
const cached = this.cache;
|
|
175
|
-
if (cached && cached.key === key && now
|
|
342
|
+
if (cached && cached.key === key && now < (cached.refreshAt ?? cached.at + WEATHER_CACHE_MS))
|
|
176
343
|
return cached.data;
|
|
177
344
|
if (this.inflight)
|
|
178
345
|
return this.inflight;
|
|
@@ -183,24 +350,65 @@ export class WeatherProvider {
|
|
|
183
350
|
const ctl = new AbortController();
|
|
184
351
|
const timer = setTimeout(() => ctl.abort(), WEATHER_FETCH_TIMEOUT_MS);
|
|
185
352
|
try {
|
|
186
|
-
const
|
|
353
|
+
const met = (cfg.provider ?? 'met-no') === 'met-no';
|
|
354
|
+
const headers = met
|
|
355
|
+
? { 'User-Agent': 'AgentDeck/1.0 (+https://github.com/puritysb/AgentDeck)', Accept: 'application/json' }
|
|
356
|
+
: {};
|
|
357
|
+
if (met && this.cache?.key === key && this.cache.lastModified)
|
|
358
|
+
headers['If-Modified-Since'] = this.cache.lastModified;
|
|
359
|
+
const res = await this.fetchImpl(met ? buildMetNoForecastUrl(cfg) : buildForecastUrl(cfg), { signal: ctl.signal, headers });
|
|
360
|
+
if (res.status === 304 && this.cache?.key === key) {
|
|
361
|
+
this.cache.refreshAt = now + WEATHER_CACHE_MS;
|
|
362
|
+
this.persistCache();
|
|
363
|
+
return this.cache.data;
|
|
364
|
+
}
|
|
187
365
|
if (!res.ok)
|
|
188
|
-
throw new Error(
|
|
189
|
-
const raw =
|
|
190
|
-
const data =
|
|
191
|
-
|
|
366
|
+
throw new Error(`${met ? 'met-no' : 'open-meteo'} HTTP ${res.status}`);
|
|
367
|
+
const raw = await res.json();
|
|
368
|
+
const data = met ? toMetNoGlanceWeather(raw, cfg, new Date(now))
|
|
369
|
+
: toGlanceWeather(raw, cfg, new Date(now));
|
|
370
|
+
const expires = Date.parse(res.headers?.get?.('expires') ?? '');
|
|
371
|
+
this.cache = { key, at: now, refreshAt: Number.isFinite(expires) ? Math.max(now, expires) : now + WEATHER_CACHE_MS,
|
|
372
|
+
lastModified: res.headers?.get?.('last-modified') ?? undefined, data };
|
|
373
|
+
this.persistCache();
|
|
192
374
|
return data;
|
|
193
375
|
}
|
|
194
376
|
catch (err) {
|
|
195
377
|
this.log(`[weather] fetch failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
196
378
|
const cached = this.cache;
|
|
197
|
-
if (cached && cached.key === key
|
|
198
|
-
|
|
379
|
+
if (cached && cached.key === key) {
|
|
380
|
+
const forecastStillUseful = typeof cached.data.validUntil === 'number' && now < cached.data.validUntil;
|
|
381
|
+
if (now - cached.at < WEATHER_STALE_SERVE_MS || forecastStillUseful)
|
|
382
|
+
return cached.data;
|
|
383
|
+
}
|
|
199
384
|
return undefined;
|
|
200
385
|
}
|
|
201
386
|
finally {
|
|
202
387
|
clearTimeout(timer);
|
|
203
388
|
}
|
|
204
389
|
}
|
|
390
|
+
loadCache() {
|
|
391
|
+
if (!this.cachePath)
|
|
392
|
+
return;
|
|
393
|
+
try {
|
|
394
|
+
const parsed = JSON.parse(readFileSync(this.cachePath, 'utf8'));
|
|
395
|
+
if (parsed && typeof parsed.key === 'string' && typeof parsed.at === 'number' && parsed.data)
|
|
396
|
+
this.cache = parsed;
|
|
397
|
+
}
|
|
398
|
+
catch { /* first run or corrupt cache: fetch normally */ }
|
|
399
|
+
}
|
|
400
|
+
persistCache() {
|
|
401
|
+
if (!this.cachePath || !this.cache)
|
|
402
|
+
return;
|
|
403
|
+
try {
|
|
404
|
+
mkdirSync(dirname(this.cachePath), { recursive: true });
|
|
405
|
+
const tmp = `${this.cachePath}.tmp-${process.pid}`;
|
|
406
|
+
writeFileSync(tmp, JSON.stringify(this.cache));
|
|
407
|
+
renameSync(tmp, this.cachePath);
|
|
408
|
+
}
|
|
409
|
+
catch (err) {
|
|
410
|
+
this.log(`[weather] cache persist failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
411
|
+
}
|
|
412
|
+
}
|
|
205
413
|
}
|
|
206
414
|
//# sourceMappingURL=weather.js.map
|
package/dist/weather.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"weather.js","sourceRoot":"","sources":["../src/weather.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"weather.js","sourceRoot":"","sources":["../src/weather.ts"],"names":[],"mappings":"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"}
|
package/dist/ws-server.d.ts
CHANGED
|
@@ -23,6 +23,14 @@ export declare class WsServer {
|
|
|
23
23
|
* has no business provisioning boards.
|
|
24
24
|
*/
|
|
25
25
|
private esp32AdoptionProvider;
|
|
26
|
+
/**
|
|
27
|
+
* The operator-approval half of the credential path, or null when this server
|
|
28
|
+
* must not consult it. Injected for the same reason as the provider above: a
|
|
29
|
+
* session bridge shares this class, and an approval roster is the daemon's to
|
|
30
|
+
* own — a bridge answering "is this peer approved?" would be a second, unowned
|
|
31
|
+
* copy of the decision.
|
|
32
|
+
*/
|
|
33
|
+
private pairingApproval;
|
|
26
34
|
private socketRemoteIp;
|
|
27
35
|
private eventTransformer;
|
|
28
36
|
private ulanziClients;
|
|
@@ -61,6 +69,16 @@ export declare class WsServer {
|
|
|
61
69
|
bridgeIp: string;
|
|
62
70
|
bridgePort: number;
|
|
63
71
|
} | null) | null): void;
|
|
72
|
+
/**
|
|
73
|
+
* Enable operator-approval authentication on this server (daemon only).
|
|
74
|
+
*
|
|
75
|
+
* With no hooks the server behaves exactly as before: a peer authenticates by
|
|
76
|
+
* token or not at all, and a refusal is only logged.
|
|
77
|
+
*/
|
|
78
|
+
setPairingApprovalHooks(hooks: {
|
|
79
|
+
isApproved: (ip: string, deviceId: string | null) => boolean;
|
|
80
|
+
record: (ip: string, deviceId: string | null, staleToken: boolean) => void;
|
|
81
|
+
} | null): void;
|
|
64
82
|
onClientConnect(callback: (ws: WebSocket) => void): void;
|
|
65
83
|
onClientDisconnect(callback: (ws: WebSocket) => void): void;
|
|
66
84
|
sendTo(ws: WebSocket, event: BridgeEvent): void;
|
package/dist/ws-server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-server.d.ts","sourceRoot":"","sources":["../src/ws-server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAE,MAAM,IAAI,CAAC;AAChD,OAAO,KAAK,EAAE,MAAM,EAAmB,MAAM,MAAM,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAM7D,qBAAa,QAAQ;IACnB,OAAO,CAAC,GAAG,CAAkB;IAC7B,OAAO,CAAC,eAAe,CAA+C;IACtE,OAAO,CAAC,kBAAkB,CAA+E;IACzG,OAAO,CAAC,cAAc,CAA4D;IAClF,OAAO,CAAC,cAAc,CAA0C;IAChE,OAAO,CAAC,iBAAiB,CAA0C;IACnE,OAAO,CAAC,oBAAoB,CAA0C;IACtE,OAAO,CAAC,WAAW,CAAiC;IACpD,OAAO,CAAC,YAAY,CAAwB;IAM5C,OAAO,CAAC,gBAAgB,CAA+D;IACvF,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,CAAU;IAE9D,OAAO,CAAC,kBAAkB,CAA+B;IACzD,OAAO,CAAC,eAAe,CAAwB;IAO/C,OAAO,CAAC,aAAa,CAAqB;IAC1C;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB,CAEb;IAChB,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,gBAAgB,CAAgF;IAGxG,OAAO,CAAC,aAAa,CAAwB;IAK7C,OAAO,CAAC,UAAU,CAAsD;IACxE,OAAO,CAAC,SAAS,CAAiC;gBAEtC,MAAM,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"ws-server.d.ts","sourceRoot":"","sources":["../src/ws-server.ts"],"names":[],"mappings":"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"}
|