Issue date: 2026-10-19T00:00:00Z
${text}
`); + const localized = await run(requestCode, alertRequest, undefined, (outgoing, callback) => { + assert.equal(new URL(outgoing.url).pathname.startsWith("/en/"), language === "en"); + assert.equal(outgoing.headers["Accept-Language"], language); + callback(null, { status: 200, headers: { "Content-Type": "text/html" } }, source); + }, { "WeatherAlerts.Language": language }); + assert.equal(localized.nativeRequests, 1); + assert.equal(localized.output.response.headers["Cache-Control"], "no-store"); + const row = JSON.parse(localized.output.response.body)[0]; + assert.equal(row.messages[0].text, text); + assert.equal(row.messages[0].language, "und"); + assert.equal(row.expireTime, "9999-12-31T00:00:00Z"); + assert.equal(Object.hasOwn(row, "eventEndTime"), false); + scenarios.push(`${language}: compiled Loon preference requests source language without translating original text`); + } + const second = await run(requestCode, alertRequest, undefined, (_, callback) => callback(null, { status: 200, headers: { "Content-Type": "text/html" } }, html)); + assert.equal(second.nativeRequests, 1); + assert.equal(second.output.response.body, first.output.response.body); + scenarios.push("a repeated warning request fetches independently without persistent response reuse"); + storage.clear(); + const failed = await run(requestCode, alertRequest, undefined, (_, callback) => callback("timeout fixture-secret", {}, ""), {}, true); + assert.equal(failed.output.response, undefined); + assert.equal(failed.output.url, alertRequest.url); + assert.equal(failed.messages.filter(message => message.startsWith("[WeatherKit]")).length, 0); + scenarios.push("failed warning request passes through without the removed runtime statistics"); + const appleDetails = { url: "https://weatherkit.apple.com/api/v1/weatherAlerts?ids=31.2,121.5", method: "GET", headers: { "If-None-Match": "apple-entity" } }; + const retainedDetails = await run(requestCode, appleDetails, undefined, noNetwork, { "WeatherAlerts.Provider": "WeatherKit" }); + assert.equal(retainedDetails.output.response, undefined); + assert.equal(retainedDetails.output.headers["If-None-Match"], "apple-entity"); + assert.equal(retainedDetails.nativeRequests, 0); + scenarios.push("WeatherKit-selected coordinate warning details retain the original Apple request and validators"); + const { default: WeatherKit2 } = await import(new URL("../src/class/WeatherKit2.mjs", import.meta.url)); + const raw = WeatherKit2.encode(undefined, { + currentWeather: { + metadata: { providerName: "Apple", temporarilyUnavailable: false }, + temperature: 27, + precipitationAmountNext1hByType: [], + precipitationAmountNext24hByType: [], + precipitationAmountNext6hByType: [], + precipitationAmountPrevious1hByType: [], + precipitationAmountPrevious24hByType: [], + precipitationAmountPrevious6hByType: [], + }, + forecastHourly: { metadata: { providerName: "Apple", temporarilyUnavailable: false }, hours: [] }, + }); + const recovered = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-US/32.390/119.499?country=CN&dataSets=currentWeather,forecastHourly", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: raw }, + (_, callback) => callback("timeout", {}, ""), + { LogLevel: "ERROR", DataSets: "currentWeather,forecastHourly", "Weather.Provider": "QWeather" }, + true, + ); + assert.equal(recovered.nativeRequests, 2, "Both requested provider products must complete"); + const { ByteBuffer } = await import("flatbuffers"); + const decoded = WeatherKit2.decode(new ByteBuffer(recovered.output.body), ["currentWeather"]); + assert.equal(decoded.currentWeather.temperature, 27); + scenarios.push("binary weather response retains Apple values and completes after native failures"); + storage.clear(); + const empty = WeatherKit2.encode(undefined, {}); + const nativeMinute = WeatherKit2.encode(undefined, { forecastNextHour: { metadata: { providerName: "Apple", temporarilyUnavailable: false }, condition: [], summary: [], minutes: [] } }); + const keptMinute = await run(responseCode, { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-US/32.390/119.499?country=CN&dataSets=forecastNextHour", method: "GET", headers: {} }, { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: nativeMinute }, noNetwork, { + DataSets: "forecastNextHour", + "NextHour.Provider": "ColorfulClouds", + }); + assert.deepEqual(Array.from(keptMinute.output.body), Array.from(nativeMinute)); + assert.equal(keptMinute.messages.length, 0, "LogLevel OFF suppresses startup, provider and completion logs"); + scenarios.push("existing Apple minute table is preserved without provider work or routine logs"); + const disabled = await run(responseCode, { url: "https://weatherkit.apple.com/api/v2/weather/en-US/31.2/121.5?country=CN&dataSets=currentWeather,forecastHourly", method: "GET", headers: {} }, { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: raw }, noNetwork, { + DataSets: "currentWeather,forecastHourly", + "Weather.Provider": "WeatherKit", + }); + assert.deepEqual(Array.from(disabled.output.body), Array.from(raw)); + scenarios.push("Apple-only provider preserves original binary weather without a decoder round trip"); + const large = new Uint8Array(4 * 1024 * 1024 + 1); + const bounded = await run(responseCode, { url: "https://weatherkit.apple.com/api/v2/weather/en-US/31.2/121.5?country=CN&dataSets=forecastHourly", method: "GET", headers: {} }, { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: large }, noNetwork); + assert.strictEqual(bounded.output.body, large); + scenarios.push("oversized binary input retains the original view without decoding or provider work"); + const hourlyRaw = WeatherKit2.encode(undefined, { forecastHourly: { metadata: { providerName: "Apple", temporarilyUnavailable: false }, hours: [0, 1].map(i => ({ forecastStart: 1792368000 + i * 3600, temperature: 20 + i, precipitationAmountByType: [] })) } }); + const replacedHourly = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-CN/31.2/121.5?country=CN&dataSets=forecastHourly", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: hourlyRaw }, + (_, callback) => + callback( + null, + { status: 200, headers: {} }, + JSON.stringify({ code: "200", updateTime: "2026-10-19T00:00:00Z", hourly: [{ fxTime: new Date(1792368000000).toISOString(), temp: "30", text: "晴", cloud: "20", humidity: "50", precip: "0", pop: "10", pressure: "1000", dew: "10", wind360: "90", windSpeed: "2" }] }), + ), + { DataSets: "forecastHourly", "Weather.Provider": "QWeather" }, + ); + const hours = WeatherKit2.decode(new ByteBuffer(replacedHourly.output.body), ["forecastHourly"]).forecastHourly.hours; + assert.equal(replacedHourly.nativeRequests, 1); + assert.equal(hours[0].temperature, 30); + assert.equal(hours[1].temperature, 21); + assert.equal(WeatherKit2.decode(new ByteBuffer(hourlyRaw), ["forecastHourly"]).forecastHourly.hours[0].temperature, 20); + scenarios.push("partial hourly replacement changes only a matching row and leaves source binary intact"); + const noBackup = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-CN/32.390/119.499?country=CN&dataSets=forecastNextHour", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: empty }, + (request, callback) => { + assert.ok(request.url.includes("caiyunapp.com")); + callback("timeout", {}, ""); + }, + { LogLevel: "ERROR", DataSets: "forecastNextHour", "NextHour.Provider": "ColorfulClouds", "API.QWeather.Token": "configured-for-another-product" }, + true, + ); + assert.equal(noBackup.nativeRequests, 1); + assert.deepEqual(noBackup.output.body, empty); + scenarios.push("a dedicated token alone never switches away from the explicitly selected provider"); + const legacySettings = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-US/32.390/119.499?country=CN&dataSets=forecastNextHour", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: empty }, + (request, callback) => { + assert.ok(request.url.includes("caiyunapp.com"), "Legacy fallback settings must never trigger a different provider"); + callback("timeout", {}, ""); + }, + { LogLevel: "ERROR", DataSets: "forecastNextHour", "NextHour.Provider": "ColorfulClouds", "API.QWeather.Token": "fixture-account", "ProviderFallback.Enabled": true, "Region.Fallback": "Auto", "RequestCache.Diagnostics": true }, + true, + ); + assert.equal(legacySettings.nativeRequests, 1); + assert.deepEqual(legacySettings.output.body, empty); + assert.equal(legacySettings.messages.filter(line => line.startsWith("[WeatherKit]")).length, 0); + scenarios.push("legacy stored fallback, region and statistics settings cannot reactivate removed features"); + for (const [status, temperature, reason] of [ + [502, "99", "http"], + [200, "not-a-number", "invalid"], + ]) { + storage.clear(); + const guarded = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-US/32.390/119.499?country=CN&dataSets=currentWeather", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: raw }, + (_, callback) => callback(null, { status, headers: { "Content-Type": "application/json" } }, JSON.stringify({ code: "200", now: { temp: temperature } })), + { DataSets: "currentWeather", "Weather.Provider": "QWeather" }, + true, + ); + assert.equal(guarded.nativeRequests, 1); + assert.deepEqual(Array.from(guarded.output.body), Array.from(raw)); + scenarios.push(`HTTP ${status} provider body with ${reason} failure cannot overwrite Apple weather`); + } + storage.clear(); + const mixedRaw = WeatherKit2.encode(undefined, { + currentWeather: WeatherKit2.decode(new ByteBuffer(raw), ["currentWeather"]).currentWeather, + weatherAlerts: { metadata: { providerName: "National Early Warning Center", temporarilyUnavailable: false }, detailsUrl: "https://weatherkit.apple.com/alertDetails/index.html?ids=32.390,119.499", alerts: [] }, + }); + const mixed = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-US/32.390/119.499?country=CN&dataSets=weatherAlerts,currentWeather", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer", ETag: "original", "Content-Length": "1", "Content-Encoding": "gzip" }, body: mixedRaw }, + (_, callback) => + callback( + null, + { status: 200, headers: { "Content-Type": "application/json" } }, + JSON.stringify({ + status: "ok", + location: [32.39, 119.499], + result: { server_time: 1792368000, alert: { status: "error" }, realtime: { status: "ok", temperature: 23, apparent_temperature: 24, cloudrate: 0.2, skycon: "CLEAR_DAY", humidity: 0.8, precipitation: { local: { intensity: 0 } }, pressure: 100000, visibility: 10, wind: { direction: 90, speed: 1 } } }, + }), + ), + { DataSets: "weatherAlerts,currentWeather", "Weather.Provider": "ColorfulClouds", "WeatherAlerts.Provider": "ColorfulClouds" }, + true, + ); + assert.equal(mixed.nativeRequests, 2); + for (const name of ["ETag", "Content-Length", "Content-Encoding"]) assert.equal(mixed.output.headers[name], undefined); + assert.equal(mixed.output.headers["Cache-Control"], "no-store"); + scenarios.push("modified WK2 binary invalidates original HTTP entity headers"); + const mixedDecoded = WeatherKit2.decode(new ByteBuffer(mixed.output.body), ["currentWeather", "weatherAlerts"]); + assert.equal(mixedDecoded.currentWeather.temperature, 23); + assert.equal(mixedDecoded.weatherAlerts.metadata.providerName, "National Early Warning Center"); + scenarios.push("independent Caiyun product requests replace healthy weather while preserving failed Apple alerts"); + storage.clear(); + const { futureHourlyFixture, futureHourlyText, readFutureHourly, weatherFixture, weatherNow } = await import("../tests/fixtures/processingMemoryFixture.mjs"); + const futureRaw = futureHourlyFixture(); + const partial = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-CN/32.39/119.499?country=CN&dataSets=currentWeather,forecastHourly", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: futureRaw }, + (request, callback) => callback(null, { status: request.url.includes("/weather/now") ? 200 : 503, headers: {} }, request.url.includes("/weather/now") ? JSON.stringify(weatherNow) : "{}"), + { DataSets: "currentWeather,forecastHourly", "Weather.Provider": "QWeather" }, + true, + ); + assert.equal(partial.nativeRequests, 2); + assert.equal(WeatherKit2.decode(new ByteBuffer(partial.output.body), ["currentWeather"]).currentWeather.temperature, 23); + assert.equal(readFutureHourly(partial.output.body), futureHourlyText); + scenarios.push("partial replacement preserves future fields inside an unchanged selected hourly table"); + storage.clear(); + const alertsRaw = weatherFixture(0, 48); + const failedAlerts = await run( + responseCode, + { url: "https://weatherkit.apple.com/api/v2/weather/zh-Hans-CN/32.39/119.499?country=CN&dataSets=weatherAlerts", method: "GET", headers: {} }, + { status: 200, headers: { "Content-Type": "application/vnd.apple.flatbuffer" }, body: alertsRaw }, + (_, callback) => callback(null, { status: 503, headers: {} }, "{}"), + { DataSets: "weatherAlerts", "WeatherAlerts.Provider": "ColorfulClouds" }, + true, + ); + assert.equal(failedAlerts.nativeRequests, 1); + assert.strictEqual(failedAlerts.output.body, alertsRaw); + scenarios.push("failed alert replacement retains the complete original binary response"); + const unavailableBody = JSON.stringify({ weatherAlerts: { metadata: { temporarilyUnavailable: true }, alerts: [] } }); + const unavailable = await run( + responseCode, + { ...v3Request, url: v3Request.url.replace("dataSets=currentWeather", "dataSets=weatherAlerts") }, + { status: 200, headers: { "Content-Type": "application/json", ETag: "keep" }, body: unavailableBody }, + (_, callback) => callback(null, { status: 200, headers: {} }, JSON.stringify({ metadata: {}, alerts: [] })), + { DataSets: "weatherAlerts", "WeatherAlerts.Provider": "QWeather" }, + ); + assert.equal(unavailable.nativeRequests, 1); + assert.equal(unavailable.output.body, unavailableBody); + assert.equal(unavailable.output.headers.ETag, "keep"); + scenarios.push("available provider with no native warning merge cannot clear Apple unavailability"); + const futureContainer = { conditionCode: ["OPAQUE"], index: "future", precipitationAmount: { expected: 8 } }; + const opaqueNested = await run(responseCode, v3Request, { status: 200, headers: { "Content-Type": "application/json" }, body: JSON.stringify({ currentWeather: { metadata: {}, conditionCode: ["RAIN"], future: futureContainer } }) }, noNetwork, { DataSets: "" }); + const opaqueProduct = JSON.parse(opaqueNested.output.body).currentWeather; + assert.equal(opaqueProduct.conditionCode, "RAIN"); + assert.deepEqual(opaqueProduct.future, futureContainer); + scenarios.push("known Weather fields adapt while an unknown nested container stays opaque"); + const populatedUnavailableBody = JSON.stringify({ weatherAlerts: { metadata: { temporarilyUnavailable: true }, alerts: [{ id: "00112233-4455-6677-8899-aabbccddeeff", description: "Apple fixture warning" }] } }); + const populatedUnavailable = await run( + responseCode, + { ...v3Request, url: v3Request.url.replace("dataSets=currentWeather", "dataSets=weatherAlerts") }, + { status: 200, headers: { "Content-Type": "application/json", ETag: "keep-populated" }, body: populatedUnavailableBody }, + (_, callback) => callback(null, { status: 200, headers: {} }, JSON.stringify({ metadata: {}, alerts: [] })), + { DataSets: "weatherAlerts", "WeatherAlerts.Provider": "QWeather" }, + ); + assert.equal(populatedUnavailable.nativeRequests, 1); + assert.equal(populatedUnavailable.output.body, populatedUnavailableBody); + assert.equal(populatedUnavailable.output.headers.ETag, "keep-populated"); + scenarios.push("metadata-only warning supplementation preserves populated Apple alerts and their unavailable state"); + // Both inputs fit independently; the real provider conversion makes their combined output exceed 1 Mi characters. + const oversizedApple = { + currentWeather: { metadata: { temporarilyUnavailable: false }, temperature: 18, conditionCode: ["CLOUDY"] }, + forecastPeriodic: { metadata: {}, forecasts: [{ periods: [{ conditionCode: ["RAIN"], precipitationAmountByType: [{ expected: 2, precipitationType: ["RAIN"] }] }] }] }, + futureProduct: { padding: "x".repeat(768 * 1024) }, + }; + const oversizedOriginal = JSON.stringify(oversizedApple); + const oversizedProviderBody = JSON.stringify({ code: "200", fxLink: `https://fixture.example/${"p".repeat(384 * 1024)}`, now: { pubTime: "2026-11-14T00:00:00Z", temp: "23", text: "晴", feelsLike: "24", cloud: "20", humidity: "50", precip: "0", pressure: "1000", dew: "10", vis: "10", wind360: "90", windSpeed: "2" } }); + const oversizedProvider = (_, callback) => callback(null, { status: 200, headers: {} }, oversizedProviderBody); + const acceptedControl = await run(responseCode, v3Request, { status: 200, headers: { "Content-Type": "application/json" }, body: JSON.stringify({ currentWeather: oversizedApple.currentWeather }) }, oversizedProvider, { DataSets: "currentWeather", "Weather.Provider": "QWeather" }); + const acceptedBody = JSON.parse(acceptedControl.output.body); + assert.equal(acceptedControl.nativeRequests, 1); + assert.equal(acceptedBody.currentWeather.temperature, 23, "The overflow fixture must be a valid provider replacement before combining it with the large Apple payload"); + assert.ok(acceptedBody.currentWeather.metadata.attributionUrl.length > 384 * 1024); + const outputFallback = await run( + responseCode, + v3Request, + { status: 200, headers: { "Content-Type": "application/json", ETag: "before-fallback" }, body: oversizedOriginal }, + oversizedProvider, + { DataSets: "currentWeather", "Weather.Provider": "QWeather" }, + ); + const fallbackBody = JSON.parse(outputFallback.output.body); + assert.equal(outputFallback.nativeRequests, 1); + assert.equal(fallbackBody.currentWeather.temperature, 18); + assert.equal(fallbackBody.currentWeather.conditionCode, "CLOUDY"); + assert.equal(fallbackBody.forecastPeriodic.forecasts[0].periods[0].conditionCode, "RAIN"); + assert.equal(fallbackBody.forecastPeriodic.forecasts[0].periods[0].precipitationAmount, 2); + assert.deepEqual(fallbackBody.futureProduct, oversizedApple.futureProduct); + assert.ok(outputFallback.output.body.length < 1024 * 1024); + assert.equal(outputFallback.output.headers.ETag, undefined); + assert.equal(outputFallback.output.headers["Cache-Control"], "no-store"); + assert.equal(JSON.stringify(oversizedApple), oversizedOriginal); + scenarios.push("provider output overflow returns normalized Apple weather and periodic data through the compiled Loon script"); + return { + pass: scenarios.length, + fail: 0, + scenarios, + nativeRewrites, + upstreamArgumentDefaultsVerified: Object.keys(upstreamDefaults).length, + withoutNodeWebCryptoHostTextEncoder: true, + providedWebAPIs: ["URL", "URLSearchParams", "TextDecoder"], + doneExactlyOnce: true, + liveWeatherRequests: false, + deviceVPNValidation: false, + }; +} diff --git a/scripts/verify-loon-rewrites.mjs b/scripts/verify-loon-rewrites.mjs new file mode 100644 index 00000000..e91d8a4f --- /dev/null +++ b/scripts/verify-loon-rewrites.mjs @@ -0,0 +1,136 @@ +// Copyright 2026 hhhoratioxu. SPDX-License-Identifier: Apache-2.0 +// Checks the emitted expressions and jq program. This is not a Loon parser or device test. +import assert from "node:assert/strict"; +import { execFileSync } from "node:child_process"; + +export function readLoonRules(plugin) { + const lines = plugin.split("\n"); + const availability = lines.find(line => line.startsWith("response if ") && line.includes("response.json.jq(")); + const scale = lines.find(line => line.startsWith("request if ") && line.includes("url.replace(")); + const jsonTransport = lines.find(line => line.startsWith("request if ") && line.includes('request.header.set("Accept", "application/json")')); + assert.ok(jsonTransport, "v3 must negotiate Apple's JSON representation without a request script"); + assert.ok(jsonTransport.startsWith('request if ${request.method} == "GET" && ')); + const transportGuard = jsonTransport.match(/\$\{url\} ~= \/((?:\\.|[^/])*)\/ then /); + assert.ok(transportGuard); + const transportRegex = new RegExp(transportGuard[1]); + const userAgentGuard = /\$\{request\.header\['User-Agent'\]\} ~= \/((?:\\.|[^/])*)\//; + const transportAgent = jsonTransport.match(userAgentGuard); + assert.ok(transportAgent, "Background clients must retain Apple's original transport"); + const appAgentRegex = new RegExp(transportAgent[1]); + assert.ok(availability && scale, "Both native Rewrite actions must be present"); + const jq = JSON.parse(availability.slice(availability.indexOf("response.json.jq(") + "response.json.jq(".length, -1)); + const expression = scale.match(/\$\{url\} ~= \/((?:\\.|[^/])*)\/([i]*) as scale then url\.replace\("\$\{scale\.1\}"\)$/); + assert.ok(expression, "Use the documented named capture and a unique required URL guard"); + assert.ok(scale.startsWith(`request if (\${request.method} == "GET" || \${request.method} == "HEAD" || \${request.method} == "OPTIONS") && `)); + const regex = new RegExp(expression[1], expression[2]); + const scripts = lines + .filter(line => /^http-(request|response) /.test(line)) + .map(line => { + const [stage, pattern] = line.split(" "); + return { stage, regex: new RegExp(pattern), line }; + }); + const v3Script = lines.find(line => line.startsWith("response if ") && line.includes(" then script(") && line.includes("api.v3.weather.json.response")); + assert.ok(v3Script); + const v3Guard = v3Script.match(/\$\{url\} ~= \/((?:\\.|[^/])*)\//); + const v3Agent = v3Script.match(userAgentGuard); + const v3Format = v3Script.match(/\$\{response\.header\['Content-Type'\]\} ~= \/((?:\\.|[^/])*)\/i/); + assert.ok(v3Guard && v3Agent && v3Format); + assert.ok(v3Script.includes('${request.method} == "GET"') && v3Script.includes("${response.status} == 200")); + const v3AgentRegex = new RegExp(v3Agent[1]), + v3FormatRegex = new RegExp(v3Format[1], "i"); + scripts.push({ stage: "http-response", regex: new RegExp(v3Guard[1]), line: v3Script, accepts: ({ method = "GET", status = 200, contentType, userAgent } = {}) => method === "GET" && status === 200 && v3FormatRegex.test(contentType ?? "") && v3AgentRegex.test(userAgent ?? "") }); + const declared = lines.filter(line => /^[\w.]+ = (input|select|switch),/.test(line)).map(line => line.split(" = ")[0]); + // Template declarations are generated later; actual imports must bind every parameter. + if (declared.length) + assert.deepEqual( + [...v3Script.matchAll(/\$\{([\w.]+)\}/g)].map(match => match[1]).filter(name => !["url", "request.method", "response.status"].includes(name)), + declared, + ); + return { + jq, + scripts, + negotiatesJSON(url, method = "GET", userAgent = "") { + return method === "GET" && transportRegex.test(url) && appAgentRegex.test(userAgent); + }, + normalizeScale(url, method = "GET") { + return ["GET", "HEAD", "OPTIONS"].includes(method) ? url.replace(regex, (_match, prefix) => prefix) : url; + }, + mergeAvailability(value) { + return JSON.parse(execFileSync("jq", ["-c", jq], { input: JSON.stringify(value), encoding: "utf8", maxBuffer: 1024 * 1024 })); + }, + matchingScripts(url, stage = "http-request", context) { + return scripts.filter(script => script.stage === stage && script.regex.test(url) && (!script.accepts || script.accepts(context))); + }, + }; +} + +export default function verifyLoonRewrites(plugin) { + const rules = readLoonRules(plugin), + scenarios = []; + assert.equal(rules.scripts.length, 5); + const v3URL = "https://weatherkit.apple.com/api/v3/weather/en-GB/53.38/-1.47?dataSets=airQuality"; + const appAgent = "WeatherKit_Weather_iOS_Version 27.3 (Build fixture)", + context = { userAgent: appAgent, contentType: "application/json" }; + assert.ok(rules.negotiatesJSON(v3URL, "GET", appAgent)); + const macAgent = "WeatherKit_Weather_macOS_Version 27.3 (Build fixture)"; + assert.ok(rules.negotiatesJSON(v3URL, "GET", macAgent)); + assert.equal(rules.matchingScripts(v3URL, "http-response", { ...context, userAgent: macAgent }).length, 1); + scenarios.push("iOS and macOS main Weather app fixtures select the same guarded v3 transport"); + for (const [url, method] of [ + [v3URL, "POST"], + [v3URL.replace("https:", "http:"), "GET"], + [v3URL.replace("weatherkit.apple.com", "example.com"), "GET"], + [v3URL.replace("/v3/", "/v2/"), "GET"], + ]) + assert.equal(rules.negotiatesJSON(url, method, appAgent), false); + scenarios.push("native v3 JSON negotiation changes only HTTPS Apple weather GET requests"); + const [v3] = rules.matchingScripts(v3URL, "http-response", context); + assert.ok(v3?.line.includes("requires_body=true")); + assert.ok(v3.line.includes("${DataSets}")); + assert.doesNotMatch(v3.line, /RequestCache|Region\.Fallback|ProviderFallback/); + assert.doesNotMatch(v3.line, /binary_body_mode=true/); + assert.equal(rules.matchingScripts(v3URL, "http-response", context).length, 1); + assert.match(rules.matchingScripts(v3URL.replace("/v3/", "/v2/"), "http-response")[0].line, /binary-body-mode=1/); + scenarios.push("v3 text and v2 binary weather select exactly one body script each"); + for (const userAgent of ["", "WeatherKit_destinationd_iOS_Version 27.3", "WeatherKit_nanoweatherd_watchOS_Version 27.3", "WeatherKit_WidgetExtension_iOS_Version 27.3"]) { + assert.equal(rules.negotiatesJSON(v3URL, "GET", userAgent), false); + assert.equal(rules.matchingScripts(v3URL, "http-response", { ...context, userAgent }).length, 0); + } + for (const contentType of [undefined, "application/vnd.apple.flatbuffer;messageType=WK3.Weather", "text/html"]) assert.equal(rules.matchingScripts(v3URL, "http-response", { ...context, contentType }).length, 0); + assert.equal(rules.matchingScripts(v3URL, "http-response", { ...context, status: 503 }).length, 0); + scenarios.push("background, watch, non-JSON and failed v3 responses start no body script"); + const base = "https://weatherkit.apple.com/api/v1/airQualityScale/zh-Hans-CN/"; + for (const [suffix, expected] of [ + ["EU.EAQI.2604", "EU.EAQI"], + ["US.AQI.12?lang=en-US&v=1#s", "US.AQI?lang=en-US&v=1#s"], + ["HK.AQHI.8", "HK.AQHI"], + ["CN.AQHI.8", "CN.AQHI"], + ["EU.EAQI", "EU.EAQI"], + ["EU.EAQI.preview", "EU.EAQI.preview"], + ]) { + assert.equal(rules.normalizeScale(base + suffix), base + expected); + scenarios.push(`native scale URL: ${suffix}`); + } + assert.equal(rules.normalizeScale(`${base}EU.EAQI.12`, "POST"), `${base}EU.EAQI.12`); + assert.equal(rules.normalizeScale(`${base.replace("weatherkit.apple.com", "example.com")}EU.EAQI.12`), `${base.replace("weatherkit.apple.com", "example.com")}EU.EAQI.12`); + scenarios.push("URL normalization preserves POST and unrelated hosts"); + for (const suffix of ["EU.EAQI.2604", "US.AQI.12", "HK.AQHI.8", "CN.AQHI.8"]) { + const url = rules.normalizeScale(base + suffix); + assert.equal(rules.matchingScripts(url).length, /^(HK|CN)/.test(suffix) ? 1 : 0); + } + assert.equal(rules.matchingScripts("https://weatherkit.apple.com/api/v1/availability/en-US/31.2/121.5", "http-response").length, 0); + scenarios.push("availability and ordinary scales start no JavaScript; custom scales use the small entry"); + for (const prefix of ["", "lang=zh-CN&"]) { + for (const ids of ["fixture-101190110", "31.2,121.5", "-31.2,-121.5"]) assert.equal(rules.matchingScripts(`https://weatherkit.apple.com/api/v1/weatherAlerts?${prefix}ids=${ids}`).length, 1); + } + scenarios.push("alert routes accept first or subsequent ids parameters"); + const merged = rules.mergeAvailability(["currentWeather", "weatherMaps", "currentWeather"]); + assert.deepEqual(merged.slice(0, 2), ["currentWeather", "weatherMaps"]); + assert.equal(new Set(merged).size, merged.length); + assert.ok(merged.includes("forecastNextHour") && merged.includes("weatherAlerts")); + scenarios.push("native jq keeps Apple ordering and unknown capabilities without duplicates"); + for (const value of [{ error: "fixture" }, ["currentWeather", { future: true }], null, 7]) assert.deepEqual(rules.mergeAvailability(value), value); + assert.ok(rules.mergeAvailability([]).includes("airQuality")); + scenarios.push("native jq preserves unknown shapes and handles an empty capability list"); + return { pass: scenarios.length, fail: 0, scenarios, validation: "emitted expressions, JavaScript regex fixtures and system jq; not a Loon parser", deviceValidation: false }; +} diff --git a/src/class/AirQuality.mjs b/src/class/AirQuality.mjs index b5c4b770..9ad4ef82 100644 --- a/src/class/AirQuality.mjs +++ b/src/class/AirQuality.mjs @@ -15,7 +15,49 @@ export default class AirQuality { const multiplier = 10 ** decimals; // 向上取整 - return Math.ceil(a * multiplier) / multiplier; + const scaled = a * multiplier; + return Math.ceil(scaled - Number.EPSILON * Math.max(1, Math.abs(scaled)) * 8) / multiplier; + } + + static RequiredPollutants = ["PM2_5", "PM10", "OZONE", "NO2", "SO2", "CO"]; + + static ValidPollutants(pollutants) { + if (!Array.isArray(pollutants)) return []; + const units = AirQuality.Config.Units.Friendly, seen = new Set(), result = []; + for (const pollutant of pollutants) { + if (!pollutant || typeof pollutant.pollutantType !== "string" || !pollutant.pollutantType || seen.has(pollutant.pollutantType) || !Object.hasOwn(units, pollutant.units)) continue; + const raw = pollutant.amount; + const amount = typeof raw === "number" ? raw : typeof raw === "string" && raw.trim() ? Number(raw) : NaN; + if (!Number.isFinite(amount) || amount < 0) continue; + const value = { ...pollutant, amount }; + if (!Number.isFinite(value.index) || value.index < 0) delete value.index; + seen.add(value.pollutantType); + result.push(value); + } + return result; + } + + static MissingPollutants(pollutants) { + const present = new Set(AirQuality.ValidPollutants(pollutants).map(({ pollutantType }) => pollutantType)); + return AirQuality.RequiredPollutants.filter(type => !present.has(type)); + } + + static MergePollutants(current, supplement) { + return AirQuality.ValidPollutants([...(Array.isArray(current) ? current : []), ...(Array.isArray(supplement) ? supplement : [])]); + } + + static HasUsableIndex(airQuality) { + return Boolean(airQuality?.metadata && airQuality.metadata.temporarilyUnavailable !== true && typeof airQuality.scale === "string" && airQuality.scale.length && Number.isFinite(airQuality.index) && airQuality.index >= 0 && airQuality.index <= 65535 && Number.isInteger(airQuality.categoryIndex) && airQuality.categoryIndex >= 1 && airQuality.categoryIndex <= 255); + } + + static #Unavailable(pollutants = []) { + return { metadata: { providerName: "iRingo", temporarilyUnavailable: true }, pollutants }; + } + + static #HasRiskInputs(pollutants, scale) { + const present = new Set(pollutants.filter(p => p.units === scale.pollutants[p.pollutantType]?.units && Number.isFinite(p.amount) && p.amount >= 0).map(p => p.pollutantType)); + const hasPM = ["PM10", "PM2_5"].some(type => scale.pollutants[type] && present.has(type)); + return Object.keys(scale.pollutants).every(type => type === "PM10" || type === "PM2_5" ? hasPM : present.has(type)); } /** @@ -44,8 +86,8 @@ export default class AirQuality { const failedCategoryIndex = -1; - if (!categories?.ranges || !Array.isArray(categories.ranges) || categories.ranges.length === 0) { - Console.debug(`categories: ${JSON.stringify(categories)}`); + if (!Number.isFinite(index) || index < 0 || !categories?.ranges || !Array.isArray(categories.ranges) || categories.ranges.length === 0) { + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug(`categories: ${JSON.stringify(categories)}`); Console.error("GetPrimaryPollutant", "categories无效"); return failedCategoryIndex; } @@ -64,17 +106,18 @@ export default class AirQuality { } static CompareCategoryIndexes(todayCategoryIndex, yesterdayCategoryIndex) { - Console.info("☑️ CompareCategoryIndexes", `todayCategoryIndex: ${todayCategoryIndex}`, `yesterdayCategoryIndex: ${yesterdayCategoryIndex}`); + Console.info("☑️ CompareCategoryIndexes"); const { UNKNOWN, SAME, WORSE, BETTER } = AirQuality.Config.CompareCategoryIndexes; - const today = Number(todayCategoryIndex); - const yesterday = Number(yesterdayCategoryIndex); - - // -1、0 和 null 都表示“无可用等级”，不能参与好转/恶化比较。 - if (![today, yesterday].every(categoryIndex => Number.isFinite(categoryIndex) && categoryIndex > 0)) { + // Input-validation direction: Patrick Yan, PR #108 at 24c3f9311f051a9df9465238ee85b4a5f2c4f9c2, Apache-2.0. + // Preserve numeric strings; booleans, objects and fractional categories are not valid levels. + const validCategory = value => (typeof value === "number" || (typeof value === "string" && value.trim() !== "")) && Number.isInteger(Number(value)) && Number(value) > 0; + if (![todayCategoryIndex, yesterdayCategoryIndex].every(validCategory)) { Console.error("CompareCategoryIndexes", "categoryIndex无效"); return UNKNOWN; } else { + const today = Number(todayCategoryIndex); + const yesterday = Number(yesterdayCategoryIndex); const diff = today - yesterday; if (diff === 0) { Console.info("✅ CompareCategoryIndexes"); @@ -104,7 +147,7 @@ export default class AirQuality { Console.info("ConvertUnits", `Converting ${pollutant.pollutantType}`); const amount = AirQuality.ConvertUnit(pollutant.amount, pollutant.units, pollutantScale.units, stpConversionFactors?.[pollutant.pollutantType] || -1, pollutantScale?.stpConversionFactor || -1); - if (amount < 0) { + if (!Number.isFinite(amount) || amount < 0) { Console.error( "ConvertUnits", `无法转换${pollutant.pollutantType}的单位`, @@ -125,30 +168,25 @@ export default class AirQuality { * * 说明： * - 这是空气质量数据修复的统一入口（当前聚焦污染物单位修复）； - * - 当前仅处理和风天气（QWeather）CO 单位场景：其 CO 原始单位为 mg/m3， - * 需转换为 WeatherKit 使用的 µg/m3； + * - QWeather 供应商结果按明确单位处理； + * - Apple 原始 QWeather 产品的 CO 数值为 mg/m3，但可能标成 µg/m3。 + * 只有在原始 Apple 产品入口显式声明 appleProduct 时修复这个标签错误， + * 不对已归一化的供应商结果重复换算，也不按浓度大小猜测单位。 * - 后续同类修复请统一收敛到本方法内，必要时可将本方法升级为 FixAirQuality。 * * @param {any} airQuality - 空气质量数据对象 + * @param {{appleProduct?: boolean}} options - 仅原始 Apple 产品入口设为 true * @returns {any} 单位修复后的空气质量数据对象 */ - static FixPollutantsUnits(airQuality) { + static FixPollutantsUnits(airQuality, options = {}) { Console.info("☑️ FixPollutantsUnits"); switch (airQuality?.metadata?.providerName) { case "和风天气": case "QWeather": { - airQuality.pollutants = airQuality?.pollutants?.map(pollutant => { - switch (pollutant.pollutantType) { - case "CO": { - const { mgm3, ugm3 } = AirQuality.Config.Units.WeatherKit; - pollutant.amount = AirQuality.ConvertUnit(pollutant.amount, mgm3, ugm3); - break; - } - default: - break; - } - return pollutant; - }); + const { mgm3, ugm3 } = AirQuality.Config.Units.WeatherKit; + airQuality = { ...airQuality, pollutants: airQuality?.pollutants?.map(pollutant => pollutant?.pollutantType === "CO" && (pollutant.units === mgm3 || options.appleProduct === true && pollutant.units === ugm3) + ? { ...pollutant, amount: AirQuality.ConvertUnit(pollutant.amount, mgm3, ugm3), units: ugm3 } + : pollutant) }; break; } default: { @@ -175,12 +213,16 @@ export default class AirQuality { static Pollutants2AQI(airQuality, Settings, options = {}) { Console.info("☑️ Pollutants2AQI"); - const algorithm = options?.algorithm ?? Settings?.AirQuality?.Calculate?.Algorithm; + const algorithm = options?.algorithm ?? Settings?.AirQuality?.Calculate?.Algorithm ?? "UBA"; + if (algorithm === "None") return airQuality; const forcePrimaryPollutant = options?.forcePrimaryPollutant ?? Settings?.AirQuality?.Current?.Index?.ForceCNPrimaryPollutants; const allowOverRange = options?.allowOverRange ?? Settings?.AirQuality?.Calculate?.AllowOverRange; const stpConversionFactors = AirQuality.#GetStpConversionFactors(airQuality); - const scale = AirQuality.Config.Scales[algorithm] ?? AirQuality.Config.Scales.UBA; + const scale = AirQuality.Config.Scales[algorithm]; + const pollutants = AirQuality.ValidPollutants(airQuality?.pollutants); + if (!scale || !pollutants.length) return AirQuality.#Unavailable(pollutants); + airQuality = { ...airQuality, pollutants }; switch (algorithm) { case "None": { @@ -196,7 +238,7 @@ export default class AirQuality { case "WAQI_InstantCast_US": { // PollutantsToInstantCastUS Console.info("☑️ PollutantsToInstantCastUS", `allowOverRange: ${allowOverRange}`); - airQuality = AirQuality.#PollutantsToAirQuality(airQuality.pollutants, scale, { stpConversionFactors, allowOverRange }); + airQuality = AirQuality.#PollutantsToAirQuality(airQuality.pollutants, scale, { stpConversionFactors, allowOverRange, concentrationSteps: { PM2_5: 0.1, PM10: 1, OZONE: 0.1, NO2: 1, SO2: 1, CO: 100 } }); Console.info("✅ PollutantsToInstantCastUS"); break; } @@ -257,6 +299,7 @@ export default class AirQuality { } } + if (!Number.isFinite(airQuality.index) || airQuality.index < 0 || !Number.isInteger(airQuality.categoryIndex) || airQuality.categoryIndex < 1) return AirQuality.#Unavailable(airQuality.pollutants); Console.info("✅ Pollutants2AQI"); return airQuality; } @@ -486,10 +529,12 @@ export default class AirQuality { * @returns {number} * 该污染物的 index；低于最小阈值时返回 min.indexes[0]；超上限时使用 max 区间外推。 */ - static #ComputePollutantIndex(pollutant, pollutantType, pollutantScale, friendlyUnits) { - if (!pollutantScale) { - Console.warn("PollutantsToIndexes", `标准未定义污染物${pollutantType}，index将标记为-1`); - return -1; + static #ComputePollutantIndex(pollutant, pollutantType, pollutantScale, friendlyUnits, step) { + if (!pollutantScale || pollutant.units !== pollutantScale.units || !Number.isFinite(pollutant.amount) || pollutant.amount < 0) return undefined; + let amount = pollutant.amount; + if (step) { + const scaled = amount / step; + amount = Math.floor(scaled + Number.EPSILON * Math.max(1, Math.abs(scaled)) * 8) * step; } const { add, subtract, multiply, divide } = SimplePrecisionMath; @@ -497,29 +542,33 @@ export default class AirQuality { Console.debug(`${pollutantType}: ${pollutant.amount} ${friendlyUnits[pollutant.units] ?? pollutant.units}`); const minValidAmount = pollutantScale.ranges.min.amounts[0]; - if (pollutant.amount < minValidAmount) { + if (amount < minValidAmount) { Console.error("PollutantsToIndexes", `${pollutantType}的含量无效：${pollutant.amount} ${friendlyUnits[pollutantScale.units]}需要 >= ${minValidAmount}`); return pollutantScale.ranges.min.indexes[0]; } - const isOverRange = pollutant.amount > pollutantScale.ranges.max.amounts[1]; + const isOverRange = amount > pollutantScale.ranges.max.amounts[1]; if (isOverRange) { Console.warn("PollutantsToIndexes", `检测到爆表指数！${pollutantType}：${pollutant.amount} ${friendlyUnits[pollutantScale.units]}`); Console.warn("PollutantsToIndexes", "注意身体！"); } - const { indexes, amounts } = isOverRange + const range = isOverRange ? pollutantScale.ranges.max : pollutantScale.ranges.value.find(({ amounts }) => { const [minAmount, maxAmount] = amounts; - return AirQuality.#CeilByPrecision(pollutant.amount, minAmount) >= minAmount && AirQuality.#CeilByPrecision(pollutant.amount, maxAmount) <= maxAmount; + return AirQuality.#CeilByPrecision(amount, minAmount) >= minAmount && AirQuality.#CeilByPrecision(amount, maxAmount) <= maxAmount; }); - Console.debug(`indexes: ${JSON.stringify(indexes)}`, `amounts: ${JSON.stringify(amounts)}`); + if (!range) return undefined; + const { indexes, amounts } = range; + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug(`indexes: ${JSON.stringify(indexes)}`, `amounts: ${JSON.stringify(amounts)}`); const [minIndex, maxIndex] = indexes; const [minAmount, maxAmount] = amounts; - const index = add(multiply(divide(subtract(maxIndex, minIndex), subtract(maxAmount, minAmount)), subtract(pollutant.amount, minAmount)), pollutant.amount > maxAmount ? maxIndex : minIndex); - return index; + if (minIndex === maxIndex) return minIndex; + const concentration = isOverRange ? amount : Math.max(minAmount, Math.min(maxAmount, amount)); + const index = add(multiply(divide(subtract(maxIndex, minIndex), subtract(maxAmount, minAmount)), subtract(concentration, minAmount)), minIndex); + return Number.isFinite(index) && index >= 0 ? index : undefined; } /** @@ -547,12 +596,13 @@ export default class AirQuality { * * @returns {Array<{pollutantType: string, index: number}>} * 每种标准污染物对应的 index 列表。 - * - 若标准所需污染物缺失，返回该污染物 index=-1。 + * - 标准未定义的分项不输出 index，保留有效物理浓度。 */ - static #PollutantsToIndexes(pollutants = [], pollutantScales) { + static #PollutantsToIndexes(pollutants = [], pollutantScales, concentrationSteps) { return pollutants.map(pollutant => { - const index = AirQuality.#ComputePollutantIndex(pollutant, pollutant.pollutantType, pollutantScales?.[pollutant.pollutantType], AirQuality.Config.Units.Friendly); - pollutant.index = index; + const index = AirQuality.#ComputePollutantIndex(pollutant, pollutant.pollutantType, pollutantScales?.[pollutant.pollutantType], AirQuality.Config.Units.Friendly, concentrationSteps?.[pollutant.pollutantType]); + if (index === undefined) delete pollutant.index; + else pollutant.index = index; return pollutant; }); } @@ -562,35 +612,19 @@ export default class AirQuality { const failedPollutant = { pollutantType: "NOT_AVAILABLE", index: -1, categoryIndex: -1 }; if (!Array.isArray(pollutants) || pollutants.length === 0) { - Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); Console.error("PrimaryPollutant", "pollutants无效"); return failedPollutant; } - const indexesWithCategory = pollutants - .filter(({ index }) => Number.isFinite(index)) - .map(pollutant => ({ - ...pollutant, - categoryIndex: AirQuality.CategoryIndex(pollutant.index, categories), - })) - .sort((a, b) => b.index - a.index); - - if (indexesWithCategory.length === 0) { - Console.debug(`pollutants: ${JSON.stringify(pollutants)}`, `indexesWithCategory: ${JSON.stringify(indexesWithCategory)}`); - Console.error("PrimaryPollutant", "找不到有效的index"); - return failedPollutant; + let primaryPollutant = failedPollutant; + for (const pollutant of pollutants) { + if (!Number.isFinite(pollutant.index) || pollutant.index < 0) continue; + const categoryIndex = AirQuality.CategoryIndex(pollutant.index, categories); + if (categoryIndex < 1) continue; + if (categoryIndex > primaryPollutant.categoryIndex || (categoryIndex === primaryPollutant.categoryIndex && pollutant.index > primaryPollutant.index)) primaryPollutant = { ...pollutant, categoryIndex }; } - - const maxCategoryIndex = indexesWithCategory.reduce((max, { categoryIndex }) => (categoryIndex > max ? categoryIndex : max), Number.NEGATIVE_INFINITY); - const primaryPollutants = indexesWithCategory.filter(({ categoryIndex }) => categoryIndex === maxCategoryIndex); - - if (primaryPollutants.length > 1) { - Console.warn("PrimaryPollutant", `检测到多个同级别的污染物，maxCategoryIndex：${maxCategoryIndex}`); - primaryPollutants.map(({ pollutantType, index }) => Console.warn("GetPrimaryPollutants", `${pollutantType}：${index}`)); - } - - const primaryPollutant = primaryPollutants[0]; - Console.info("✅ PrimaryPollutant", `primaryPollutant: ${JSON.stringify(primaryPollutant)}`); + if (Console.logLevel === "INFO" || Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.info("✅ PrimaryPollutant", `primaryPollutant: ${JSON.stringify(primaryPollutant)}`); return primaryPollutant; } @@ -640,18 +674,18 @@ export default class AirQuality { const allowOverRange = options?.allowOverRange ?? true; if (!Array.isArray(pollutants) || pollutants.length === 0) { - Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); Console.error("PollutantsToAirQuality", "pollutants无效"); return { metadata: { providerName: "iRingo", temporarilyUnavailable: true } }; } - let newPollutants = []; + let newPollutants = pollutants; if (stpConversionFactors) { newPollutants = AirQuality.ConvertUnits(pollutants, stpConversionFactors, scale.pollutants); } - newPollutants = AirQuality.#PollutantsToIndexes(newPollutants, scale.pollutants); - Console.debug("PollutantsToAirQuality", `convertedPollutants: ${JSON.stringify(newPollutants)}`); + newPollutants = AirQuality.#PollutantsToIndexes(newPollutants, scale.pollutants, options.concentrationSteps); + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug("PollutantsToAirQuality", `convertedPollutants: ${JSON.stringify(newPollutants)}`); const primaryPollutant = AirQuality.PrimaryPollutant(newPollutants, scale.categories); const maxIndex = scale?.weatherKitScale?.maxIndex; @@ -688,32 +722,27 @@ export default class AirQuality { Console.info("☑️ PollutantsToAQHI"); if (!Array.isArray(pollutants) || pollutants.length === 0) { - Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); Console.error("PollutantsToAQHI", "pollutants无效"); return { metadata: { providerName: "iRingo", temporarilyUnavailable: true } }; } const stpConversionFactors = options?.stpConversionFactors; - const { ugm3 } = AirQuality.Config.Units.WeatherKit; - - // 先做单位转换（目标单位均为 µg/m³） + // 加拿大气体使用 ppb，其余模型按各自 scale 的单位计算。 const convertedPollutants = stpConversionFactors ? AirQuality.ConvertUnits(pollutants, stpConversionFactors, scale.pollutants) : pollutants; + if (!AirQuality.#HasRiskInputs(convertedPollutants, scale)) return AirQuality.#Unavailable(convertedPollutants); // 按 pollutantType 索引浓度 const getAmount = type => { const p = convertedPollutants.find(({ pollutantType }) => pollutantType === type); - if (!p) return null; - if (p.units !== ugm3) { - Console.warn("PollutantsToAQHI", `${type} 单位不是 µg/m³（${p.units}），跳过`); - return null; - } + if (!scale.pollutants[type] || !p || p.units !== scale.pollutants[type].units) return null; return p.amount; }; const { betas } = scale; const ar = (beta, concentration) => { if (concentration === null || concentration < 0) return 0; - return (Math.exp(beta * concentration) - 1) * 100; + return Math.expm1(beta * concentration) * 100; }; const arNO2 = ar(betas.NO2 || 0, getAmount("NO2")); @@ -724,10 +753,12 @@ export default class AirQuality { const arPM = Math.max(arPM10, arPM2_5); const totalAR = arNO2 + arSO2 + arO3 + arPM; + if (!Number.isFinite(totalAR)) return AirQuality.#Unavailable(convertedPollutants); Console.info("PollutantsToAQHI", `%AR: NO2=${arNO2.toFixed(4)}, SO2=${arSO2.toFixed(4)}, O3=${arO3.toFixed(4)}, PM=${arPM.toFixed(4)} (PM10=${arPM10.toFixed(4)}, PM2.5=${arPM2_5.toFixed(4)}), total=${totalAR.toFixed(4)}`); // 设置每个污染物的内部 index 为它的 %AR 值 convertedPollutants.forEach(p => { + if (!scale.pollutants[p.pollutantType]) { delete p.index; return; } switch (p.pollutantType) { case "NO2": p.index = arNO2; @@ -745,12 +776,12 @@ export default class AirQuality { p.index = arPM2_5; break; default: - p.index = -1; + delete p.index; } }); // 将 %AR 映射到 1–11 的 categoryIndex (即 AQHI 指数) - const categoryIndex = AirQuality.CategoryIndex(totalAR, scale.categories); + const categoryIndex = scale.indexScaleFactor ? Math.max(1, Math.min(11, Math.round(totalAR * scale.indexScaleFactor))) : AirQuality.CategoryIndex(totalAR, scale.categories); // 以最大 %AR 对应的污染物作为主污染物 const primaryPollutant = convertedPollutants.reduce((max, cur) => (cur.index > max.index ? cur : max), { pollutantType: "NOT_AVAILABLE", index: -1 }); @@ -771,22 +802,18 @@ export default class AirQuality { Console.info("☑️ PollutantsToAQHIMulti"); if (!Array.isArray(pollutants) || pollutants.length === 0) { - Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); + if (Console.logLevel === "DEBUG" || Console.logLevel === "ALL") Console.debug(`pollutants: ${JSON.stringify(pollutants)}`); Console.error("PollutantsToAQHIMulti", "pollutants无效"); return { metadata: { providerName: "iRingo", temporarilyUnavailable: true } }; } const stpConversionFactors = options?.stpConversionFactors; - const { ugm3 } = AirQuality.Config.Units.WeatherKit; const convertedPollutants = stpConversionFactors ? AirQuality.ConvertUnits(pollutants, stpConversionFactors, scale.pollutants) : pollutants; + if (!AirQuality.#HasRiskInputs(convertedPollutants, scale)) return AirQuality.#Unavailable(convertedPollutants); const getAmount = type => { const p = convertedPollutants.find(({ pollutantType }) => pollutantType === type); - if (!p) return null; - if (p.units !== ugm3) { - Console.warn("PollutantsToAQHIMulti", `${type} 单位不是 µg/m³（${p.units}），跳过`); - return null; - } + if (!scale.pollutants[type] || !p || p.units !== scale.pollutants[type].units) return null; return p.amount; }; @@ -803,6 +830,7 @@ export default class AirQuality { const pmContribution = usePM10 ? contributions.PM10 : contributions.PM2_5; const totalWeighted = contributions.OZONE + contributions.NO2 + contributions.SO2 + pmContribution; const totalRisk = (beta || 0) * totalWeighted; + if (!Number.isFinite(totalRisk)) return AirQuality.#Unavailable(convertedPollutants); Console.info( "PollutantsToAQHIMulti", @@ -810,6 +838,7 @@ export default class AirQuality { ); convertedPollutants.forEach(p => { + if (!scale.pollutants[p.pollutantType]) { delete p.index; return; } switch (p.pollutantType) { case "OZONE": p.index = contributions.OZONE; @@ -827,7 +856,7 @@ export default class AirQuality { p.index = contributions.SO2; break; default: - p.index = -1; + delete p.index; } }); @@ -1667,18 +1696,18 @@ export default class AirQuality { }, CO: { units: "PARTS_PER_BILLION", - stpConversionFactor: 1.144511152104645, + stpConversionFactor: 1.14491990608754, ranges: { min: { indexes: [0, 50], amounts: [0, 4400] }, - max: { indexes: [301, 500], amounts: [30401, 50400] }, + max: { indexes: [301, 500], amounts: [30500, 50400] }, value: [ { indexes: [0, 50], amounts: [0, 4400] }, // Good - { indexes: [51, 100], amounts: [4401, 9400] }, // Moderate - { indexes: [101, 150], amounts: [9401, 12400] }, // Unhealthy for Sensitive Groups - { indexes: [151, 200], amounts: [12401, 15400] }, // Unhealthy - { indexes: [201, 300], amounts: [15401, 30400] }, // Very Unhealthy - { indexes: [301, 500], amounts: [30401, 50400] }, // Hazardous - { indexes: [501, Number.POSITIVE_INFINITY], amounts: [50401, Number.POSITIVE_INFINITY] }, // Hazardous + { indexes: [51, 100], amounts: [4500, 9400] }, // Moderate + { indexes: [101, 150], amounts: [9500, 12400] }, // Unhealthy for Sensitive Groups + { indexes: [151, 200], amounts: [12500, 15400] }, // Unhealthy + { indexes: [201, 300], amounts: [15500, 30400] }, // Very Unhealthy + { indexes: [301, 500], amounts: [30500, 50400] }, // Hazardous + { indexes: [501, Number.POSITIVE_INFINITY], amounts: [50500, Number.POSITIVE_INFINITY] }, // Hazardous ], }, }, @@ -1858,7 +1887,7 @@ export default class AirQuality { categories: { significantIndex: 3, // 轻度污染 ranges: [ - { categoryIndex: 1, indexes: [1, 50] }, // 优 + { categoryIndex: 1, indexes: [0, 50] }, // 优 { categoryIndex: 2, indexes: [51, 100] }, // 良 { categoryIndex: 3, indexes: [101, 150] }, // 轻度污染 { categoryIndex: 4, indexes: [151, 200] }, // 中度污染 @@ -2045,15 +2074,17 @@ export default class AirQuality { { categoryIndex: 11, indexes: [10.41, Number.POSITIVE_INFINITY] }, ], }, - // β 系数（回归系数），浓度单位 µg/m³ + // %AR × 10 / 10.4，四舍五入到 1–10，11 表示 10+。 + indexScaleFactor: 10 / 10.4, + // NO2、O3 使用 ppb；PM2.5 使用 µg/m³。 betas: { NO2: 0.000871, O3: 0.000537, PM2_5: 0.000487, }, pollutants: { - NO2: { units: "PARTS_PER_BILLION", stpConversionFactor: -1 }, - OZONE: { units: "PARTS_PER_BILLION", stpConversionFactor: -1 }, + NO2: { units: "PARTS_PER_BILLION", stpConversionFactor: 1.880472698306222 }, + OZONE: { units: "PARTS_PER_BILLION", stpConversionFactor: 1.96189649169881 }, PM2_5: { units: "MICROGRAMS_PER_CUBIC_METER", stpConversionFactor: -1 }, }, }, @@ -2279,7 +2310,8 @@ export default class AirQuality { Console.info("☑️ ConvertUnit"); const friendlyUnits = AirQuality.Config.Units.Friendly; Console.info(`Convert ${amount} from ${friendlyUnits[from]} with ${fromStpConversionFactor} to ${friendlyUnits[to]} with ${toStpConversionFactor}`); - if (amount < 0) { + amount = typeof amount === "number" ? amount : typeof amount === "string" && amount.trim() ? Number(amount) : NaN; + if (!Number.isFinite(amount) || amount < 0) { Console.error("ConvertUnit", `Amount ${amount} < 0`); return -1; } @@ -2297,16 +2329,7 @@ export default class AirQuality { const isPpxFrom = ppx.includes(from); const isPpxTo = ppx.includes(to); const isBothPpx = isPpxFrom && isPpxTo; - if (isBothPpx && fromStpConversionFactor !== toStpConversionFactor) { - if (fromStpConversionFactor <= 0 || toStpConversionFactor <= 0) { - Console.error("ConvertUnit", "无效的STP conversion factor", `fromStpConversionFactor: ${fromStpConversionFactor}`, `toStpConversionFactor: ${toStpConversionFactor}`); - return -1; - } - - const intermediate = AirQuality.ConvertUnit(numAmount, from, ugm3, fromStpConversionFactor); - return AirQuality.ConvertUnit(intermediate, ugm3, to, -1, toStpConversionFactor); - } - + // ppm/ppb 都是摩尔分数，只改变十进制倍率，不经过质量浓度绕行。 if (!isBothPpx && isPpxFrom && fromStpConversionFactor <= 0) { Console.error("ConvertUnit", `fromStpConversionFactor ${fromStpConversionFactor} <= 0`); return -1; diff --git a/src/class/ColorfulClouds.mjs b/src/class/ColorfulClouds.mjs index 45cfaf7b..5d0a1de1 100644 --- a/src/class/ColorfulClouds.mjs +++ b/src/class/ColorfulClouds.mjs @@ -1,14 +1,18 @@ -import { Console, fetch, Lodash as _ } from "@nsnanocat/util"; -import Weather from "./Weather.mjs"; +// WeatherKit provider processing. +import { Console } from "@nsnanocat/util"; +import fetch from "../function/fetchProvider.mjs"; +import providerNameToLogo from "../function/providerNameToLogo.mjs"; import AirQuality from "./AirQuality.mjs"; import ForecastNextHour from "./ForecastNextHour.mjs"; -import providerNameToLogo from "../function/providerNameToLogo.mjs"; +import ProviderTransport, { providerErrorCode, readProviderJSON } from "./ProviderTransport.mjs"; +import Weather from "./Weather.mjs"; export default class ColorfulClouds { - constructor(parameters, token) { + constructor(parameters, token, transport = new ProviderTransport()) { + this.#requests = transport; this.Name = "ColorfulClouds"; this.Version = "4.3.0"; - Console.log(`🟧 ${this.Name} v${this.Version}`); + Console.info(`🟧 ${this.Name} v${this.Version}`); this.endpoint = `https://api.caiyunapp.com/v2.6/${token}/${parameters.longitude},${parameters.latitude}`; this.headers = { Referer: "https://caiyunapp.com/" }; this.token = token; @@ -25,10 +29,35 @@ export default class ColorfulClouds { this.weatherKitLanguage = String(parameters.weatherKitLanguage ?? parameters.language ?? "").trim() || "zh-CN"; } - #cache = { - alert: {}, - realtime: {}, - }; + #requests; + + #Fetch(request, kind) { + const product = new URL(request.url).pathname.split("/").at(-1); + return this.#requests.fetch(typeof $loon === "string" ? { ...request, timeout: request.timeout ?? 5000 } : request, { + fetcher: fetch, + includeJSON: true, + validate: body => { + if (product === "location") return !body?.error && Array.isArray(body?.alerts); + const result = body?.result; + if (body?.status !== "ok" || result?.[product]?.status !== "ok") return false; + if (product === "minutely") { + const { precipitation_2h: minutes, probability, description } = result.minutely; + return ( + Number.isFinite(body.server_time) && + Array.isArray(minutes) && + minutes.length > 0 && + minutes.length <= 8192 && + minutes.every(value => Number.isFinite(value) && value >= 0) && + Array.isArray(probability) && + probability.length >= Math.ceil(Math.min(85, minutes.length) / 30) && + probability.every(value => Number.isFinite(value) && value >= 0 && value <= 1) && + (description === undefined || typeof description === "string") + ); + } + return product !== "realtime" || kind !== "alerts" || (result.alert?.status === "ok" && Array.isArray(result.alert.content)); + }, + }); + } #Config = { Language: { @@ -206,39 +235,24 @@ export default class ColorfulClouds { }, }; - async #RealTime() { + async #RealTime(kind = "current") { Console.info("☑️ RealTime"); - - if (this.#cache.realtime?.result?.realtime?.status === "ok") { - Console.info("✅ RealTime", "Using cache"); - return this.#cache.realtime; - } - const request = { url: `${this.endpoint}/realtime?lang=${this.language}&alert=true`, headers: this.headers, }; try { - const body = await fetch(request).then(response => JSON.parse(response?.body ?? "{}")); + const body = await this.#Fetch(request, kind).then(response => readProviderJSON(response)); switch (body?.status) { case "ok": { switch (body?.result?.realtime?.status) { case "ok": { - this.#cache.realtime = body; break; } case "error": case undefined: throw Error(JSON.stringify({ status: body?.result?.realtime?.status, reason: body?.result?.realtime })); } - switch (body?.result?.alert?.status) { - case "ok": - this.#cache.alert = body.result.alert; - break; - case "error": - case undefined: - break; - } Console.info("✅ RealTime"); return body; } @@ -248,7 +262,7 @@ export default class ColorfulClouds { throw Error(JSON.stringify(body ?? {})); } } catch (error) { - Console.error(`RealTime: ${error}`); + Console.error(`RealTime: ${providerErrorCode(error)}`); } finally { //Console.debug(`airQuality: ${JSON.stringify(airQuality, null, 2)}`); Console.info("✅ RealTime"); @@ -270,7 +284,7 @@ export default class ColorfulClouds { }; let forecastNextHour; try { - const body = await fetch(request).then(response => JSON.parse(response?.body ?? "{}")); + const body = await this.#Fetch(request).then(response => readProviderJSON(response)); switch (body?.status) { case "ok": switch (body?.result?.minutely?.status) { @@ -297,7 +311,7 @@ export default class ColorfulClouds { condition: [], forecastEnd: 0, forecastStart: minuteStemp, - minutes: body?.result?.minutely?.precipitation_2h?.map((precipitationIntensity, index) => { + minutes: body.result.minutely.precipitation_2h.slice(0, 85).map((precipitationIntensity, index) => { const minute = { perceivedPrecipitationIntensity: 0, precipitationChance: 0, @@ -331,7 +345,7 @@ export default class ColorfulClouds { throw Error(JSON.stringify(body ?? {})); } } catch (error) { - Console.error(`Minutely: ${error}`); + Console.error(`Minutely: ${providerErrorCode(error)}`); } finally { //Console.debug(`forecastNextHour: ${JSON.stringify(forecastNextHour, null, 2)}`); Console.info("✅ Minutely"); @@ -340,8 +354,8 @@ export default class ColorfulClouds { } /** - * 从彩云实况缓存读取 v2.6 预警，并标准化为 WeatherAlerts.mergeAlerts 可消费的来源结构。 - * Read Caiyun v2.6 alerts from the realtime cache and normalize them for WeatherAlerts.mergeAlerts. + * 拉取彩云 v2.6 预警，并标准化为 WeatherAlerts.mergeAlerts 可消费的来源结构。 + * Fetch Caiyun v2.6 alerts and normalize them for WeatherAlerts.mergeAlerts. * @link https://docs.caiyunapp.com/weather-api/v2/v2.6/5-alert.html * @returns {Promise<{metadata: object, detailsUrl: string, alerts: Array