npm - @kenkaiiii/gg-pixel - Versions diffs - 4.3.86 → 4.3.88 - Mend

@kenkaiiii/gg-pixel 4.3.86 → 4.3.88

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.

Files changed (7) hide show

package/dist/index.cjs CHANGED Viewed

@@ -535,10 +535,13 @@ function findMappingByPath(projectsJsonPath, projectRoot) {
   } catch {
     return null;
   }
+  let fallback = null;
   for (const [id, entry] of Object.entries(map)) {
-    if (entry.path === projectRoot) return { id, ...entry };
+    if (entry.path !== projectRoot) continue;
+    if (entry.secret) return { id, ...entry };
+    if (!fallback) fallback = { id, ...entry };
   }
-  return null;
+  return fallback;
 }
 function readEnvKey(envPath, key) {
   if (!(0, import_node_fs3.existsSync)(envPath)) return null;
@@ -821,8 +824,9 @@ function wireNextjs({ projectRoot, projectKey, ingestUrl }) {
 }
 function writeNextInstrumentation(path, ingestUrl, projectKey) {
   const existing = (0, import_node_fs3.existsSync)(path) ? (0, import_node_fs3.readFileSync)(path, "utf8") : "";
+  const cleaned = stripLegacyPixelContent(existing);
   const block = nextInstrumentationBlock(ingestUrl, projectKey);
-  const next = upsertPixelBlock(existing, block);
+  const next = upsertPixelBlock(cleaned, block);
   if (next !== existing) (0, import_node_fs3.writeFileSync)(path, next, "utf8");
 }
 function nextInstrumentationBlock(ingestUrl, projectKey) {
@@ -1088,13 +1092,12 @@ function wireElectron({ projectRoot, pkg, projectKey, ingestUrl }) {
         "Could not copy gg-pixel browser IIFE bundle \u2014 install @kenkaiiii/gg-pixel and re-run."
       );
     }
-    let patchedAny = false;
+    let wiredAny = false;
     for (const html of htmlFiles) {
-      if (patchRendererHtml(html, rendererInitPath, projectKey, ingestUrl) === "patched") {
-        patchedAny = true;
-      }
+      const r = patchRendererHtml(html, rendererInitPath, projectKey, ingestUrl);
+      if (r === "patched" || r === "already") wiredAny = true;
     }
-    if (!patchedAny) {
+    if (!wiredAny) {
       warnings.push(
         `Found HTML files in ${rendererDir} but couldn't patch any \u2014 they may have unusual CSP or no <head>.`
       );
@@ -1213,6 +1216,7 @@ function copyIifeBundle(projectRoot, dest) {
   }
   return false;
 }
+var PIXEL_HTML_MARKER = "<!-- gg-pixel: auto-wired by ggcoder pixel install -->";
 function patchRendererHtml(htmlPath, iifePath, projectKey, ingestUrl) {
   let content;
   try {
@@ -1220,7 +1224,20 @@ function patchRendererHtml(htmlPath, iifePath, projectKey, ingestUrl) {
   } catch {
     return "not-applicable";
   }
-  if (content.includes("gg-pixel.browser.iife")) return "already";
+  const original = content;
+  const markerIdx = content.indexOf(PIXEL_HTML_MARKER);
+  if (markerIdx !== -1) {
+    const firstScriptEnd = content.indexOf("</script>", markerIdx);
+    const secondScriptEnd = firstScriptEnd !== -1 ? content.indexOf("</script>", firstScriptEnd + "</script>".length) : -1;
+    if (secondScriptEnd !== -1) {
+      let stripEnd = secondScriptEnd + "</script>".length;
+      while (stripEnd < content.length && /\s/.test(content[stripEnd])) stripEnd++;
+      let stripStart = markerIdx;
+      while (stripStart > 0 && /[ \t]/.test(content[stripStart - 1])) stripStart--;
+      if (stripStart > 0 && content[stripStart - 1] === "\n") stripStart--;
+      content = content.slice(0, stripStart) + content.slice(stripEnd);
+    }
+  }
   const ingestOrigin = new URL(ingestUrl).origin;
   content = content.replace(
     /(<meta[^>]+http-equiv=["']?content-security-policy["']?[^>]*content=)("([^"]+)"|'([^']+)')/i,
@@ -1240,7 +1257,7 @@ function patchRendererHtml(htmlPath, iifePath, projectKey, ingestUrl) {
   );
   const relScript = (0, import_node_path2.relative)((0, import_node_path2.dirname)(htmlPath), iifePath).split(import_node_path2.sep).join("/");
   const inject = `
-  <!-- gg-pixel: auto-wired by ggcoder pixel install -->
+  ${PIXEL_HTML_MARKER}
   <script src="${relScript}"></script>
   <script>
     if (window.GGPixel) GGPixel.initPixel({ projectKey: ${JSON.stringify(projectKey)}, ingestUrl: ${JSON.stringify(ingestUrl)} });
@@ -1253,6 +1270,7 @@ function patchRendererHtml(htmlPath, iifePath, projectKey, ingestUrl) {
   } else {
     return "not-applicable";
   }
+  if (content === original) return "already";
   (0, import_node_fs3.writeFileSync)(htmlPath, content, "utf8");
   return "patched";
 }
@@ -1352,9 +1370,64 @@ function upsertPixelBlock(existing, block) {
 }
 function upsertPixelBlockInFile(filePath, block) {
   const existing = (0, import_node_fs3.existsSync)(filePath) ? (0, import_node_fs3.readFileSync)(filePath, "utf8") : "";
-  const next = upsertPixelBlock(existing, block);
+  const cleaned = stripLegacyPixelContent(existing);
+  const next = upsertPixelBlock(cleaned, block);
   if (next !== existing) (0, import_node_fs3.writeFileSync)(filePath, next, "utf8");
 }
+function stripLegacyPixelContent(content) {
+  if (!content.includes("@kenkaiiii/gg-pixel")) return content;
+  const beginIdx = content.indexOf(PIXEL_MARK_BEGIN);
+  const endIdx = beginIdx === -1 ? -1 : content.indexOf(PIXEL_MARK_END, beginIdx);
+  const insideMarkers = (start, end) => beginIdx !== -1 && endIdx !== -1 && start >= beginIdx && end <= endIdx + PIXEL_MARK_END.length;
+  const ranges = [];
+  const registerRe = /(?:^|\n)((?:[ \t]*\/\/[^\n]*\n)*)[ \t]*export\s+async\s+function\s+register\s*\(\s*\)\s*\{/g;
+  let m;
+  while ((m = registerRe.exec(content)) !== null) {
+    const blockStart = m.index + (content[m.index] === "\n" ? 1 : 0);
+    const openBraceIdx = m.index + m[0].length - 1;
+    let depth = 1;
+    let i = openBraceIdx + 1;
+    while (i < content.length && depth > 0) {
+      const ch = content[i];
+      if (ch === "{") depth++;
+      else if (ch === "}") depth--;
+      i++;
+    }
+    if (depth !== 0) continue;
+    const blockEnd = i;
+    const blockText = content.slice(blockStart, blockEnd);
+    if (!blockText.includes("@kenkaiiii/gg-pixel")) continue;
+    if (insideMarkers(blockStart, blockEnd)) continue;
+    const trailingNL = content[blockEnd] === "\n" ? 1 : 0;
+    ranges.push({ start: blockStart, end: blockEnd + trailingNL });
+  }
+  const importRe = /(?:^|\n)((?:[ \t]*\/\/[^\n]*\n)*)[ \t]*import\s*\{\s*initPixel[^}]*\}\s*from\s*"@kenkaiiii\/gg-pixel(?:\/[\w-]+)?"\s*;?\s*\n/g;
+  while ((m = importRe.exec(content)) !== null) {
+    const blockStart = m.index + (content[m.index] === "\n" ? 1 : 0);
+    const callIdx = content.indexOf("initPixel(", importRe.lastIndex);
+    if (callIdx === -1 || callIdx - importRe.lastIndex > 2048) continue;
+    const openParen = content.indexOf("(", callIdx);
+    let depth = 1;
+    let i = openParen + 1;
+    while (i < content.length && depth > 0) {
+      const ch = content[i];
+      if (ch === "(" || ch === "{") depth++;
+      else if (ch === ")" || ch === "}") depth--;
+      i++;
+    }
+    if (depth !== 0) continue;
+    while (i < content.length && (content[i] === ";" || content[i] === " ")) i++;
+    const trailingNL = content[i] === "\n" ? 1 : 0;
+    const blockEnd = i + trailingNL;
+    if (insideMarkers(blockStart, blockEnd)) continue;
+    ranges.push({ start: blockStart, end: blockEnd });
+  }
+  if (ranges.length === 0) return content;
+  ranges.sort((a, b) => b.start - a.start);
+  let out = content;
+  for (const r of ranges) out = out.slice(0, r.start) + out.slice(r.end);
+  return out.replace(/\n{3,}/g, "\n\n");
+}
 function injectImport(entryPath, initFilePath) {
   let content;
   try {