@kenkaiiii/gg-pixel 4.3.85 → 4.3.87

package/dist/cli.js

@@ -94,10 +94,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 (!existsSync(envPath)) return null;
@@ -380,11 +383,12 @@ function wireNextjs({ projectRoot, projectKey, ingestUrl }) {
 }
 function writeNextInstrumentation(path, ingestUrl, projectKey) {
   const existing = existsSync(path) ? readFileSync(path, "utf8") : "";
-  if (existing.includes("@kenkaiiii/gg-pixel")) return;
-  const newContent = existing ? existing + "\n" + nextInstrumentationAppend(ingestUrl, projectKey) : nextInstrumentationStandalone(ingestUrl, projectKey);
-  writeFileSync(path, newContent, "utf8");
+  const cleaned = stripLegacyPixelContent(existing);
+  const block = nextInstrumentationBlock(ingestUrl, projectKey);
+  const next = upsertPixelBlock(cleaned, block);
+  if (next !== existing) writeFileSync(path, next, "utf8");
 }
-function nextInstrumentationStandalone(ingestUrl, projectKey) {
+function nextInstrumentationBlock(ingestUrl, projectKey) {
   const fallback = projectKey ? ` ?? ${JSON.stringify(projectKey)}` : "";
   return `// Next.js auto-loads this file on server start. Pixel hooks the
 // uncaughtExceptionMonitor + unhandledRejection events for API routes,
@@ -397,20 +401,7 @@ export async function register() {
       sink: { kind: "http", ingestUrl: ${JSON.stringify(`${ingestUrl}/ingest`)} },
     });
   }
-}
-`;
-}
-function nextInstrumentationAppend(ingestUrl, projectKey) {
-  const fallback = projectKey ? ` ?? ${JSON.stringify(projectKey)}` : "";
-  return `// gg-pixel: server-side error tracking
-import { initPixel } from "@kenkaiiii/gg-pixel";
-if (typeof process !== "undefined" && process.env.NEXT_RUNTIME === "nodejs") {
-  initPixel({
-    projectKey: process.env.GG_PIXEL_KEY${fallback},
-    sink: { kind: "http", ingestUrl: ${JSON.stringify(`${ingestUrl}/ingest`)} },
-  });
-}
-`;
+}`;
 }
 function findNextLayout(projectRoot) {
   const candidates = [
@@ -543,25 +534,21 @@ function wireSveltekit({ projectRoot, projectKey, ingestUrl }) {
   const serverPath = join(projectRoot, "src/hooks.server.ts");
   const clientPath = join(projectRoot, "src/hooks.client.ts");
   if (!existsSync(dirname(serverPath))) mkdirSync(dirname(serverPath), { recursive: true });
-  appendOrCreate(
+  upsertPixelBlockInFile(
     serverPath,
     `import { initPixel } from "@kenkaiiii/gg-pixel";
 initPixel({
   projectKey: process.env.GG_PIXEL_KEY ?? ${JSON.stringify(projectKey)},
   sink: { kind: "http", ingestUrl: ${JSON.stringify(`${ingestUrl}/ingest`)} },
-});
-`,
-    "@kenkaiiii/gg-pixel"
+});`
   );
-  appendOrCreate(
+  upsertPixelBlockInFile(
     clientPath,
     `import { initPixel } from "@kenkaiiii/gg-pixel/browser";
 initPixel({
   projectKey: ${JSON.stringify(projectKey)},
   ingestUrl: ${JSON.stringify(ingestUrl)},
-});
-`,
-    "@kenkaiiii/gg-pixel/browser"
+});`
   );
   return {
     primaryInitPath: clientPath,
@@ -903,14 +890,88 @@ function pickPath(root, candidates) {
   }
   return null;
 }
-function appendOrCreate(filePath, snippet, marker) {
-  if (existsSync(filePath)) {
-    const existing = readFileSync(filePath, "utf8");
-    if (existing.includes(marker)) return;
-    writeFileSync(filePath, existing + "\n" + snippet, "utf8");
-    return;
+var PIXEL_MARK_BEGIN = "// >>> gg-pixel auto-generated \u2014 do not edit between these markers <<<";
+var PIXEL_MARK_END = "// >>> /gg-pixel <<<";
+function wrapPixelBlock(content) {
+  return `${PIXEL_MARK_BEGIN}
+${content.replace(/\s+$/, "")}
+${PIXEL_MARK_END}
+`;
+}
+function upsertPixelBlock(existing, block) {
+  const wrapped = wrapPixelBlock(block);
+  const beginIdx = existing.indexOf(PIXEL_MARK_BEGIN);
+  if (beginIdx !== -1) {
+    const endIdx = existing.indexOf(PIXEL_MARK_END, beginIdx);
+    if (endIdx !== -1) {
+      const after = endIdx + PIXEL_MARK_END.length;
+      const trailNL = existing[after] === "\n" ? 1 : 0;
+      return existing.slice(0, beginIdx) + wrapped + existing.slice(after + trailNL);
+    }
   }
-  writeFileSync(filePath, snippet, "utf8");
+  if (existing.length === 0) return wrapped;
+  const sep2 = existing.endsWith("\n") ? "" : "\n";
+  return existing + sep2 + "\n" + wrapped;
+}
+function upsertPixelBlockInFile(filePath, block) {
+  const existing = existsSync(filePath) ? readFileSync(filePath, "utf8") : "";
+  const cleaned = stripLegacyPixelContent(existing);
+  const next = upsertPixelBlock(cleaned, block);
+  if (next !== existing) 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;