maplibre-tilepackage-protocol 1.2.0 → 1.2.1

package/eslint.config.mjs

@@ -0,0 +1,28 @@
+import globals from "globals";
+import pluginJs from "@eslint/js";
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  {
+    rules: {
+      semi: "error",
+      "no-var": "error",
+      "prefer-const": "error",
+    },
+    languageOptions: {
+      ecmaVersion: 2017,
+      sourceType: "module",
+      globals: globals.browser,
+    },
+    plugins: {
+      prettier: {
+        "prettier/prettier": "error",
+        //"linebreak-style": ["error", "windows"],
+        "no-console": ["error", { allow: ["info", "warn", "error"] }],
+        "no-unused-vars": ["error", { vars: "all", args: "none" }],
+        semi: ["error", "always"],
+      },
+    },
+  },
+  pluginJs.configs.recommended,
+];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maplibre-tilepackage-protocol",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Maplibre-gl-js protocol for reading VTPK and TPKX files",
   "homepage": "https://github.com/spatialillusions/maplibre-tilepackage-protocol#readme",
   "bugs": {
@@ -40,4 +40,4 @@
       "require": "./src/index.js"
     }
   }
-}
+}

package/src/default-decompress.js

@@ -12,16 +12,23 @@ export default async function defaultDecompress(buf, compression) {
     return buf;
   }
   if (compression === "gzip") {
-    if (typeof globalThis.DecompressionStream === "undefined") {
+    // Safe global detection for DecompressionStream feature test
+    const g =
+      typeof globalThis !== "undefined"
+        ? globalThis
+        : typeof window !== "undefined"
+        ? window
+        : typeof self !== "undefined"
+        ? self
+        : {};
+    if (typeof g.DecompressionStream === "undefined") {
       return fflate.decompressSync(new Uint8Array(buf));
     }
     const stream = new Response(buf).body;
     if (!stream) {
       throw new Error("Failed to read response stream");
     }
-    const result = stream.pipeThrough(
-      new globalThis.DecompressionStream("gzip"),
-    );
+    const result = stream.pipeThrough(new g.DecompressionStream("gzip"));
     return new Response(result).arrayBuffer();
   }
   throw new Error("Compression method not supported");

package/src/index.js

@@ -6,13 +6,23 @@ import defaultDecompress from "./default-decompress.js";
 import getJsonFromFile from "./get-json-from-file.js";
 import SharedPromiseCache from "./shared-promise-cache.js";
 
+/**
+ * Escape literal newlines in JSON text.
+ * Replaces actual newline characters with the JSON escape sequence.
+ */
+function escapeJsonNewlines(text) {
+  // Replace literal newlines with JSON escape sequences
+  // This handles \r\n, \n, and \r
+  return text.replace(/\r\n/g, "\\n").replace(/[\r\n]/g, "\\n");
+}
+
 function calculateFilename(z, x, y, header) {
   const zoom = z.toString().padStart(2, "0");
   const baseRow = Math.floor(y / 128) * 128;
   const baseCol = Math.floor(x / 128) * 128;
   const rowHex = baseRow.toString(16).padStart(4, "0");
   const colHex = baseCol.toString(16).padStart(4, "0");
-  let basePath = header.type === "tpkx" ? "tile" : "p12/tile";
+  const basePath = header.type === "tpkx" ? "tile" : "p12/tile";
   return `${basePath}/L${zoom}/R${rowHex}C${colHex}.bundle`;
 }
 
@@ -172,13 +182,16 @@ export class TilePackage {
     let metadata = {};
     if (header.packageType === "vtpk") {
       const resp = await this.source.getBytes(
-        header.jsonMetadataOffset,
-        header.jsonMetadataLength,
+        header.metadataOffset,
+        header.metadataLength,
         undefined,
         header.etag,
       );
       const decoder = new TextDecoder("utf-8");
-      metadata = JSON.parse(decoder.decode(resp.data));
+      const jsonText = decoder.decode(resp.data);
+      console.log("test", jsonText);
+      console.log("escaped text", escapeJsonNewlines(jsonText));
+      metadata = JSON.parse(escapeJsonNewlines(jsonText));
     }
     metadata.name = header.name;
     return metadata;

package/src/source.js

@@ -56,9 +56,18 @@ export class FetchSource extends Source {
     this.url = url;
     this.customHeaders = customHeaders;
     this.mustReload = false;
+    // Safe global detection for legacy environments without globalThis
+    const g =
+      typeof globalThis !== "undefined"
+        ? globalThis
+        : typeof window !== "undefined"
+        ? window
+        : typeof self !== "undefined"
+        ? self
+        : {};
     let userAgent = "";
-    if ("navigator" in globalThis) {
-      userAgent = globalThis.navigator.userAgent || "";
+    if (g && typeof g.navigator !== "undefined") {
+      userAgent = g.navigator.userAgent || "";
     }
     const isWindows = userAgent.indexOf("Windows") > -1;
     const isChromiumBased = /Chrome|Chromium|Edg|OPR|Brave/.test(userAgent);