aviation-chart 2.0.33 → 2.0.34

package/dist/nav-sdk.d.ts

@@ -964,6 +964,7 @@ declare class MapSDK implements IMapSDK {
     private _chartApiUrl;
     private _apiVersion;
     private _tileCipher;
+    private _stopAMMVersioning;
     readonly ready: Promise<void>;
     private _resolveReady;
     private _rejectReady;

package/dist/nav-sdk.esm.js

@@ -9810,7 +9810,8 @@ class TileCipher {
         const blob = b64ToBytes(wrapped);
         return aesGcmDecrypt(this.customerKeyRaw, blob.slice(0, IV_LEN), blob.slice(IV_LEN));
     }
-    async decrypt(realUrl, envelope) {
+    async decrypt(realUrl, envelope, signal) {
+        signal?.throwIfAborted();
         const m = realUrl.match(/\/tiles\/e\/([^/]+)\//);
         const period = m?.[1];
         if (!period)
@@ -9825,13 +9826,103 @@ class TileCipher {
         const iv = bytes.slice(HEADER_LEN, HEADER_LEN + IV_LEN);
         const ct = bytes.slice(HEADER_LEN + IV_LEN);
         const key = await this.periodKey(period);
+        signal?.throwIfAborted();
         let plain = await aesGcmDecrypt(key, iv, ct, aad);
+        signal?.throwIfAborted();
         if (flags & FLAG_GZIP)
             plain = await gunzip(plain);
+        signal?.throwIfAborted();
         return plain.buffer.slice(plain.byteOffset, plain.byteOffset + plain.byteLength);
     }
 }
 
+function createTileProtocol(cipher, fetchImpl = fetch) {
+    return async (params, controller) => {
+        const signal = controller.signal;
+        signal.throwIfAborted();
+        const url = String(params.url).replace(/^kunyu:\/\//, "");
+        const response = await fetchImpl(url, {
+            signal,
+            ...(params.headers ? { headers: params.headers } : {}),
+            ...(params.credentials ? { credentials: params.credentials } : {}),
+        });
+        if (!response.ok)
+            throw new Error(`tile ${response.status}`);
+        const envelope = await response.arrayBuffer();
+        signal.throwIfAborted();
+        const data = envelope.byteLength ? await cipher.decrypt(url, envelope, signal) : new ArrayBuffer(0);
+        signal.throwIfAborted();
+        return {
+            data,
+            cacheControl: response.headers.get("Cache-Control"),
+            expires: response.headers.get("Expires"),
+        };
+    };
+}
+
+function watchAMMVersion(map, fetchImpl = fetch, intervalMs = 60000) {
+    let stopped = false;
+    let pending;
+    let appliedSource;
+    let appliedTiles = "";
+    let appliedVersion = "";
+    async function refresh() {
+        if (stopped || pending)
+            return;
+        const source = map.getSource("amm");
+        const definition = map.getStyle()?.sources["amm"];
+        const tiles = definition?.tiles;
+        const template = tiles?.[0];
+        if (!source?.setTiles || !tiles || !template)
+            return;
+        const position = template.indexOf("/amm/{z}/{x}/{y}.pbf");
+        if (position < 0 || template.startsWith("pmtiles:"))
+            return;
+        const controller = new AbortController();
+        pending = controller;
+        const timeout = setTimeout(() => controller.abort(), 10000);
+        try {
+            const response = await fetchImpl(template.slice(0, position) + "/amm/manifest", {
+                cache: "no-store", signal: controller.signal,
+            });
+            if (!response.ok)
+                return;
+            const manifest = await response.json();
+            if (stopped || controller.signal.aborted || map.getSource("amm") !== source ||
+                !manifest?.available || typeof manifest.version !== "string" || !manifest.version)
+                return;
+            if (source === appliedSource && manifest.version === appliedVersion && JSON.stringify(tiles) === appliedTiles)
+                return;
+            const next = tiles.map(tile => {
+                const [path, query = ""] = tile.split("?");
+                const params = new URLSearchParams(query);
+                params.set("v", manifest.version);
+                return path + "?" + params.toString();
+            });
+            source.setTiles(next);
+            appliedSource = source;
+            appliedTiles = JSON.stringify(next);
+            appliedVersion = manifest.version;
+        }
+        catch {
+        }
+        finally {
+            clearTimeout(timeout);
+            pending = undefined;
+        }
+    }
+    const timer = setInterval(() => { void refresh(); }, intervalMs);
+    const stop = () => {
+        stopped = true;
+        clearInterval(timer);
+        pending?.abort();
+        map.off("remove", stop);
+    };
+    map.on("remove", stop);
+    void refresh();
+    return stop;
+}
+
 // ICAO aviation chart layer styles — token-driven multi-theme.
 //
 // 单一 buildLayers(T)：图层结构只写一份（以 light 为准）；凡随主题变化的值
@@ -11118,18 +11209,7 @@ class MapSDK {
         if (options.licenseKey) {
             try {
                 this._tileCipher = new TileCipher(this._chartApiUrl, this._apiVersion, options.licenseKey);
-                const cipher = this._tileCipher;
-                _mlGlExports.addProtocol("kunyu", async (params) => {
-                    const realUrl = String(params.url).replace(/^kunyu:\/\//, "");
-                    const resp = await fetch(realUrl, { signal: params.signal });
-                    if (!resp.ok)
-                        throw new Error(`tile ${resp.status}`);
-                    const buf = await resp.arrayBuffer();
-                    if (buf.byteLength === 0)
-                        return { data: null };
-                    const data = await cipher.decrypt(realUrl, buf);
-                    return { data };
-                });
+                _mlGlExports.addProtocol("kunyu", createTileProtocol(this._tileCipher));
             }
             catch (e) {
                 this._tileCipher = undefined;
@@ -11176,6 +11256,8 @@ class MapSDK {
             this.initializeChartFeatures();
             if (!options.style) {
                 this.initializeAviationLayers();
+                this._stopAMMVersioning?.();
+                this._stopAMMVersioning = watchAMMVersion(this.map);
             }
             this.map.fire("loadComplete", { notam: this.notam, adsb: this.adsb });
             this.map.fire("aviation:ready", { notam: this.notam, adsb: this.adsb });
@@ -11769,6 +11851,8 @@ class MapSDK {
     destroy() {
         if (this.isDestroyed)
             return;
+        this._stopAMMVersioning?.();
+        this._stopAMMVersioning = undefined;
         this.globalConfig.setMapReinitCallback(null);
         this.pluginManager.destroy();
         this.performanceManager.destroy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aviation-chart",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "description": "KunYu aviation map SDK",
   "main": "dist/nav-sdk.esm.js",
   "module": "dist/nav-sdk.esm.js",
@@ -19,6 +19,7 @@
     "dist/sdk.style.css"
   ],
   "scripts": {
+    "test:unit": "node --test tests/*.test.mjs",
     "dev": "vite",
     "build:dev": "rollup -c --environment NODE_ENV:development && node scripts/version-dist.mjs",
     "build:prod": "rollup -c --environment NODE_ENV:production && node scripts/version-dist.mjs",