aviation-chart 2.0.8 → 2.0.10

package/dist/nav-sdk.d.ts

@@ -535,6 +535,7 @@ interface MapSDKOptions {
     staticUrl?: string;
     apiUrl?: string;
     apiVersion?: string;
+    licenseKey?: string;
     spriteUrl?: string;
     terrainUrl?: string;
     layers?: Record<string, boolean>;
@@ -833,8 +834,8 @@ interface GeometryFeature {
     };
     properties: Record<string, any>;
 }
-declare function searchFeatures(baseUrl: string, apiKey: string | undefined, params: SearchParams, version?: string): Promise<SearchResultItem[]>;
-declare function getFeatureGeometry(baseUrl: string, apiKey: string | undefined, params: GeometryParams, version?: string): Promise<GeometryFeature>;
+declare function searchFeatures(baseUrl: string, auth: string | Record<string, string> | undefined, params: SearchParams, version?: string): Promise<SearchResultItem[]>;
+declare function getFeatureGeometry(baseUrl: string, auth: string | Record<string, string> | undefined, params: GeometryParams, version?: string): Promise<GeometryFeature>;
 declare function getPeriods(baseUrl: string, apiKey?: string, signal?: AbortSignal, version?: string): Promise<string[]>;
 
 interface SelectFeatureOptions {
@@ -962,6 +963,7 @@ declare class MapSDK implements IMapSDK {
     private _landGeojson;
     private _chartApiUrl;
     private _apiVersion;
+    private _tileCipher;
     readonly ready: Promise<void>;
     private _resolveReady;
     private _rejectReady;
@@ -1049,6 +1051,7 @@ declare class MapSDK implements IMapSDK {
     getPeriod(): string | undefined;
     generateCurrentPeriod(): Promise<string>;
     search(params: SearchParams): Promise<SearchResultItem[]>;
+    private _apiAuth;
     getGeometry(params: GeometryParams): Promise<GeometryFeature>;
     getPeriods(signal?: AbortSignal): Promise<string[]>;
     showGraticule(): void;

package/dist/nav-sdk.esm.js

@@ -4284,8 +4284,10 @@ class GraticuleManager {
     }
 }
 
-function authHeaders(apiKey) {
-    return apiKey ? { "X-Api-Key": apiKey } : {};
+function authHeaders(auth) {
+    if (!auth)
+        return {};
+    return typeof auth === "string" ? { "X-Api-Key": auth } : auth;
 }
 function apiPrefix$1(baseUrl, version) {
     const base = baseUrl.replace(/\/$/, "");
@@ -4299,14 +4301,15 @@ async function toJSON(res) {
         }
         catch {
         }
+        const detailMsg = detail.trim();
         const msg = res.status === 403
-            ? "搜索接口鉴权失败（403）：请检查初始化传入的 apiKey 是否正确"
-            : `请求失败（${res.status}）${detail ? ": " + detail.trim() : ""}`;
+            ? `接口鉴权失败（403）：${detailMsg || "请检查 licenseKey / apiKey 是否正确"}`
+            : `请求失败（${res.status}）${detailMsg ? ": " + detailMsg : ""}`;
         throw new Error(msg);
     }
     return res.json();
 }
-async function searchFeatures(baseUrl, apiKey, params, version) {
+async function searchFeatures(baseUrl, auth, params, version) {
     const { q, type, period, limit, signal } = params;
     if (!q || !q.trim()) {
         throw new Error("search: q 参数必填");
@@ -4320,13 +4323,13 @@ async function searchFeatures(baseUrl, apiKey, params, version) {
         qs.set("limit", String(limit));
     const res = await fetch(`${apiPrefix$1(baseUrl, version)}/search?${qs.toString()}`, {
         method: "GET",
-        headers: authHeaders(apiKey),
+        headers: authHeaders(auth),
         ...(signal ? { signal } : {}),
     });
     const data = await toJSON(res);
     return data.results ?? [];
 }
-async function getFeatureGeometry(baseUrl, apiKey, params, version) {
+async function getFeatureGeometry(baseUrl, auth, params, version) {
     const { type, id, period, signal } = params;
     if (!type || !id) {
         throw new Error("getGeometry: type 和 id 参数必填");
@@ -4336,7 +4339,7 @@ async function getFeatureGeometry(baseUrl, apiKey, params, version) {
         qs.set("period", period);
     const res = await fetch(`${apiPrefix$1(baseUrl, version)}/geometry?${qs.toString()}`, {
         method: "GET",
-        headers: authHeaders(apiKey),
+        headers: authHeaders(auth),
         ...(signal ? { signal } : {}),
     });
     return toJSON(res);
@@ -7446,13 +7449,15 @@ function getAviationBaseStyle(opts) {
         }
     };
 }
-function navdataTilesUrl(apiUrl, period, version) {
-    return `${apiPrefix(apiUrl, version)}/tiles/${period}/{z}/{x}/{y}.pbf`;
+function navdataTilesUrl(apiUrl, period, version, encrypted) {
+    const seg = encrypted ? "tiles/e" : "tiles";
+    const url = `${apiPrefix(apiUrl, version)}/${seg}/${period}/{z}/{x}/{y}.pbf`;
+    return encrypted ? `kunyu://${url}` : url;
 }
-function getNavdataSource(apiUrl, period, version) {
+function getNavdataSource(apiUrl, period, version, encrypted) {
     return {
         type: "vector",
-        tiles: [navdataTilesUrl(apiUrl, period, version)],
+        tiles: [navdataTilesUrl(apiUrl, period, version, encrypted)],
         minzoom: 0.5,
         maxzoom: 18,
     };
@@ -7591,6 +7596,101 @@ async function fetchGzJson(url, headers = {}) {
     return new Response(stream).json();
 }
 
+const MAGIC = "KYT1";
+const IV_LEN = 12;
+const HEADER_LEN = 6;
+const FLAG_GZIP = 0x01;
+function b64ToBytes(b64) {
+    const bin = atob(b64);
+    const out = new Uint8Array(bin.length);
+    for (let i = 0; i < bin.length; i++)
+        out[i] = bin.charCodeAt(i);
+    return out;
+}
+async function gunzip(buf) {
+    const ds = new globalThis.DecompressionStream("gzip");
+    const stream = new Blob([buf]).stream().pipeThrough(ds);
+    return await new Response(stream).arrayBuffer();
+}
+class TileCipher {
+    constructor(apiUrl, version, licenseKey) {
+        this.periodKeys = new Map();
+        const dot = licenseKey.indexOf(".");
+        if (dot <= 0) {
+            throw new Error("[MapSDK] 无效的 licenseKey，应为 \"customerId.base64Key\"");
+        }
+        this.cid = licenseKey.slice(0, dot);
+        const raw = b64ToBytes(licenseKey.slice(dot + 1));
+        this.customerKeyRaw = raw;
+        this.customerKey = crypto.subtle.importKey("raw", raw, { name: "AES-GCM" }, false, ["decrypt"]);
+        this.wrapBase = apiPrefix(apiUrl, version);
+    }
+    async apiAuthHeaders() {
+        const key = await this.authKey();
+        const ts = Math.floor(Date.now() / 1000);
+        const sigBuf = await crypto.subtle.sign("HMAC", key, new TextEncoder().encode(`${this.cid}|${ts}`));
+        const sig = Array.from(new Uint8Array(sigBuf))
+            .map((b) => b.toString(16).padStart(2, "0"))
+            .join("");
+        return { "X-Cid": this.cid, "X-Ts": String(ts), "X-Sig": sig };
+    }
+    authKey() {
+        if (!this.authKeyPromise) {
+            this.authKeyPromise = (async () => {
+                const ck = await crypto.subtle.importKey("raw", this.customerKeyRaw, { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+                const derived = await crypto.subtle.sign("HMAC", ck, new TextEncoder().encode("kunyu-api-auth-v1"));
+                return crypto.subtle.importKey("raw", derived, { name: "HMAC", hash: "SHA-256" }, false, ["sign"]);
+            })();
+        }
+        return this.authKeyPromise;
+    }
+    periodKey(period) {
+        let p = this.periodKeys.get(period);
+        if (!p) {
+            p = this.fetchPeriodKey(period).catch((e) => {
+                this.periodKeys.delete(period);
+                throw e;
+            });
+            this.periodKeys.set(period, p);
+        }
+        return p;
+    }
+    async fetchPeriodKey(period) {
+        const url = `${this.wrapBase}/tilewrap?cid=${encodeURIComponent(this.cid)}&period=${encodeURIComponent(period)}`;
+        const resp = await fetch(url);
+        if (!resp.ok) {
+            throw new Error(`[MapSDK] 取瓦片密钥失败 (HTTP ${resp.status})`);
+        }
+        const { wrapped } = (await resp.json());
+        const blob = b64ToBytes(wrapped);
+        const iv = blob.slice(0, IV_LEN);
+        const ct = blob.slice(IV_LEN);
+        const ck = await this.customerKey;
+        const rawPeriodKey = await crypto.subtle.decrypt({ name: "AES-GCM", iv: iv }, ck, ct);
+        return crypto.subtle.importKey("raw", rawPeriodKey, { name: "AES-GCM" }, false, ["decrypt"]);
+    }
+    async decrypt(realUrl, envelope) {
+        const m = realUrl.match(/\/tiles\/e\/([^/]+)\//);
+        const period = m?.[1];
+        if (!period)
+            throw new Error("[MapSDK] 无法从 URL 解析期号: " + realUrl);
+        const bytes = new Uint8Array(envelope);
+        const magic = new TextDecoder().decode(bytes.subarray(0, 4));
+        if (bytes.length < HEADER_LEN + IV_LEN || magic !== MAGIC) {
+            throw new Error("[MapSDK] 瓦片信封无效 (magic)");
+        }
+        const flags = bytes[5] ?? 0;
+        const aad = bytes.slice(0, HEADER_LEN);
+        const iv = bytes.slice(HEADER_LEN, HEADER_LEN + IV_LEN);
+        const ct = bytes.slice(HEADER_LEN + IV_LEN);
+        const key = await this.periodKey(period);
+        let plain = await crypto.subtle.decrypt({ name: "AES-GCM", iv: iv, additionalData: aad }, key, ct);
+        if (flags & FLAG_GZIP)
+            plain = await gunzip(plain);
+        return plain;
+    }
+}
+
 // ICAO aviation chart layer styles — token-driven multi-theme.
 //
 // 单一 buildLayers(T)：图层结构只写一份（以 light 为准）；凡随主题变化的值
@@ -7878,7 +7978,7 @@ function buildLayers(themeId = 'light') {
             ["case", ["all", ["has", "TXT_DESIG_HIGH"], ["!=", ["get", "TXT_DESIG_HIGH"], ""]], ["get", "TXT_DESIG_HIGH"], ["all", ["has", "TXT_DESIG_FORWARD"], ["!=", ["get", "TXT_DESIG_FORWARD"], ""]], ["get", "TXT_DESIG_FORWARD"], ["all", ["has", "TXT_DESIG_BACKWARD"], ["!=", ["get", "TXT_DESIG_BACKWARD"], ""]], ["get", "TXT_DESIG_BACKWARD"], "-"], { "font-scale": 0.95, "text-color": T.alDist }
           ]
         ],
-        "text-size": ["interpolate", ["linear"], ["zoom"], 6, 9, 10, 10],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 6.5, 9, 10, 10],
         "icon-text-fit-padding": [0, 3, 0, 3],
       },
       paint: {
@@ -7903,15 +8003,23 @@ function buildLayers(themeId = 'light') {
       paint: { 'text-color': T.segment, ...T.radialHalo },
     },
     {
-      id: 'airport', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
-      filter: ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true],
+      id: 'airport', type: 'symbol', source: sourceId, minzoom: 2, 'source-layer': 'airport',
+      // 4级前就显示大型机场+中型，5级后全部显示
+      filter:
+        ['case',
+          ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 2],   // ≤4 只显 大型+中型
+          true                                                // >4 全部
+        ],
       layout: {
-        "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-mil", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-milext", "airport-civ"], "icon-size": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 0.9], "symbol-z-order": "viewport-y", "text-field": ["get", "codeId"],
+        "icon-image": ["case", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MIL"], "airport-mil", ["==", ["get", "CODE_TYPE_MIL_OPS"], "MILEXT"], "airport-milext", "airport-civ"],
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 4, 0.5, 10, 0.7],
+        "symbol-z-order": "viewport-y",
+        "text-field": ["get", "codeId"],
         "text-letter-spacing": 0.05,
         'text-field': ['get', 'CODE_ID'],
         "text-anchor": "bottom",
         "text-justify": "center",
-        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 10, 9, 12],
+        "text-size": ["interpolate", ["linear"], ["zoom"], 4, 0, 5, 10, 9, 11],
         "text-offset": [
           "interpolate", ["linear"], ["zoom"],
           5, ["literal", [0, -0.8]],
@@ -7923,7 +8031,7 @@ function buildLayers(themeId = 'light') {
         "text-allow-overlap": true,
         "text-ignore-placement": true,
         "visibility": "none",
-        "icon-size": ["interpolate", ["linear"], ["zoom"], 5, 0.6, 9, 1.2, 12, 1.3]
+        "icon-size": ["interpolate", ["linear"], ["zoom"], 5, 0.7, 9, 1.2, 12, 1.3]
       },
       paint: {
         'icon-color': ['case', ['has', 'has_amm'], '#4B2D6E', T.airport],
@@ -7939,37 +8047,37 @@ function buildLayers(themeId = 'light') {
     // keeps the strip aligned to the ground as the map rotates. The `runway-strip`
     // sprite is supplied by the host sprite sheet.
     {
-      id: 'airport-runway', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
-      filter: ['all', ['has', 'RWY_BRG1'], ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true]],
+      id: 'airport-runway', type: 'symbol', source: sourceId, minzoom: 2, 'source-layer': 'airport',
+      filter: ['all', ['has', 'RWY_BRG1'], ['case', ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 2], true]],
       layout: {
         'icon-image': 'runway:runway-strip',
         'icon-rotate': ['get', 'RWY_BRG1'],
         'icon-rotation-alignment': 'map',
-        'icon-size': ['interpolate', ['linear'], ['zoom'], 5, 0.4, 9, 0.7, 12, 0.75],
+        'icon-size': ['interpolate', ['linear'], ['zoom'], 5, 0.5, 9, 0.7, 12, 0.75],
         'icon-allow-overlap': true,
         'icon-ignore-placement': true,
         'visibility': 'none',
       },
       paint: {
         "icon-color": T.airport,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 3, 0.95, 5, 1, 9, 1, 11, 0.2],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.65, 3, 0.85, 5, 0.9, 9, 1, 11, 0.2],
       },
     },
     {
-      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 3, 'source-layer': 'airport',
-      filter: ['all', ['has', 'RWY_BRG2'], ['case', ['<', ['zoom'], 6], ['==', ['get', 'level'], 1], true]],
+      id: 'airport-runway-cross', type: 'symbol', source: sourceId, minzoom: 2, 'source-layer': 'airport',
+      filter: ['all', ['has', 'RWY_BRG2'], ['case', ['<=', ['zoom'], 3], ['<=', ['get', 'level'], 2], true]],
       layout: {
         'icon-image': 'runway:runway-strip',
         'icon-rotate': ['get', 'RWY_BRG2'],
         'icon-rotation-alignment': 'map',
-        'icon-size': ['interpolate', ['linear'], ['zoom'], 5, 0.4, 9, 0.7, 12, 0.75],
+        'icon-size': ['interpolate', ['linear'], ['zoom'], 5, 0.5, 9, 0.7, 12, 0.75],
         'icon-allow-overlap': true,
         'icon-ignore-placement': true,
         'visibility': 'none',
       },
       paint: {
         "icon-color": T.airport,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.75, 3, 0.95, 5, 1, 9, 1, 11, 0.2],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 2, 0.65, 3, 0.85, 5, 0.9, 9, 1, 11, 0.2],
       },
     },
     {
@@ -8051,11 +8159,11 @@ function buildLayers(themeId = 'light') {
         'text-color': T.waypoint,
         "icon-halo-color": "rgba(0,0,0,0)",
         "icon-halo-width": 0,
-        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 6, 0.5, 12, 1, 15, 0.2],
+        "icon-opacity": ["interpolate", ["linear"], ["zoom"], 6.5, 0.5, 12, 1, 15, 0.2],
         "text-halo-color": T.halo,
         "text-halo-width": 1,
         "text-halo-blur": 0,
-        "text-opacity": ["interpolate", ["linear"], ["zoom"], 6, 1, 12, 0.9, 15, 0.15],
+        "text-opacity": ["interpolate", ["linear"], ["zoom"], 6.49, 0, 6.5, 1, 12, 0.9, 15, 0.15],
       },
     },
     {
@@ -8185,6 +8293,26 @@ class MapSDK {
         this._baseUrl = options.staticUrl || "https://aips.siniswift.com";
         this._chartApiUrl = (options.apiUrl || DEFAULT_CHART_API_URL).replace(/\/$/, "");
         this._apiVersion = options.apiVersion || undefined;
+        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 };
+                });
+            }
+            catch (e) {
+                this._tileCipher = undefined;
+            }
+        }
         const themeId = this._resolveThemeId(options.theme);
         const themeConfig = CHART_THEMES[themeId] ?? CHART_THEMES.light;
         const style = options.style ??
@@ -8339,7 +8467,7 @@ class MapSDK {
             return;
         }
         if (!this.map.getSource("navdata")) {
-            this.map.addSource("navdata", getNavdataSource(this._chartApiUrl, period, this._apiVersion));
+            this.map.addSource("navdata", getNavdataSource(this._chartApiUrl, period, this._apiVersion, !!this._tileCipher));
         }
         const themeId = this._resolveThemeId(this.initialOptions.theme);
         for (const layer of buildLayers(themeId)) {
@@ -8682,7 +8810,7 @@ class MapSDK {
         this.globalConfig.setPeriod(period);
         const navdata = this.map?.getSource("navdata");
         if (navdata?.setTiles) {
-            navdata.setTiles([navdataTilesUrl(this._chartApiUrl, period, this._apiVersion)]);
+            navdata.setTiles([navdataTilesUrl(this._chartApiUrl, period, this._apiVersion, !!this._tileCipher)]);
         }
         if (from !== undefined && from !== period) {
             this.map?.fire("periodchange", { from, to: period });
@@ -8694,18 +8822,23 @@ class MapSDK {
     async generateCurrentPeriod() {
         return await this.globalConfig.generateCurrentPeriod();
     }
-    search(params) {
-        const apiKey = this.globalConfig.getConfig().apiKey;
+    async search(params) {
+        const auth = await this._apiAuth();
         const period = params.period ?? this.getPeriod();
-        return searchFeatures(this._chartApiUrl, apiKey, {
+        return searchFeatures(this._chartApiUrl, auth, {
             ...params,
             ...(period ? { period } : {}),
         }, this._apiVersion);
     }
-    getGeometry(params) {
-        const apiKey = this.globalConfig.getConfig().apiKey;
+    async _apiAuth() {
+        if (this._tileCipher)
+            return this._tileCipher.apiAuthHeaders();
+        return this.globalConfig.getConfig().apiKey;
+    }
+    async getGeometry(params) {
+        const auth = await this._apiAuth();
         const period = params.period ?? this.getPeriod();
-        return getFeatureGeometry(this._chartApiUrl, apiKey, {
+        return getFeatureGeometry(this._chartApiUrl, auth, {
             ...params,
             ...(period ? { period } : {}),
         }, this._apiVersion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aviation-chart",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "KunYu aviation map SDK",
   "main": "dist/nav-sdk.esm.js",
   "module": "dist/nav-sdk.esm.js",