@kenkaiiii/gg-pixel 4.3.84 → 4.3.86

package/dist/cli.js

@@ -50,8 +50,8 @@ async function install(opts = {}) {
   const existingKey = readEnvKey(envFilePath, "GG_PIXEL_KEY");
   let created;
   let reused = false;
-  if (existing && existingKey) {
-    created = { id: existing.id, key: existingKey };
+  if (existing && existing.secret && existingKey) {
+    created = { id: existing.id, key: existingKey, secret: existing.secret };
     reused = true;
   } else {
     created = await createProject(fetchFn, ingestUrl, projectName);
@@ -68,10 +68,11 @@ async function install(opts = {}) {
   if (kind !== "browser" && kind !== "tauri") {
     writeEnvKey(envFilePath, "GG_PIXEL_KEY", created.key);
   }
-  writeProjectsMapping(projectsJsonPath, created.id, projectName, nodeRoot);
+  writeProjectsMapping(projectsJsonPath, created.id, projectName, nodeRoot, created.secret);
   return {
     projectId: created.id,
     projectKey: created.key,
+    projectSecret: created.secret,
     projectName,
     projectKind: kind,
     initFilePath: wired.primaryInitPath,
@@ -128,8 +129,10 @@ async function createProject(fetchFn, ingestUrl, name) {
     throw new Error(`POST /api/projects failed: ${res.status} ${await safeText(res)}`);
   }
   const body = await res.json();
-  if (!body.id || !body.key) throw new Error("response missing id/key");
-  return { id: body.id, key: body.key };
+  if (!body.id || !body.key || !body.secret) {
+    throw new Error("response missing id/key/secret");
+  }
+  return { id: body.id, key: body.key, secret: body.secret };
 }
 async function safeText(r) {
   try {
@@ -377,11 +380,11 @@ 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 block = nextInstrumentationBlock(ingestUrl, projectKey);
+  const next = upsertPixelBlock(existing, 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,
@@ -394,20 +397,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 = [
@@ -540,25 +530,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,
@@ -900,14 +886,33 @@ 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 next = upsertPixelBlock(existing, block);
+  if (next !== existing) writeFileSync(filePath, next, "utf8");
 }
 function injectImport(entryPath, initFilePath) {
   let content;
@@ -1035,8 +1040,8 @@ async function installGo(ctx) {
   const existingKey = readEnvKey(envFilePath, "GG_PIXEL_KEY");
   let created;
   let reused = false;
-  if (existing && existingKey) {
-    created = { id: existing.id, key: existingKey };
+  if (existing && existing.secret && existingKey) {
+    created = { id: existing.id, key: existingKey, secret: existing.secret };
     reused = true;
   } else {
     created = await createProject(fetchFn, ingestUrl, projectName);
@@ -1064,10 +1069,11 @@ func init() {
     "utf8"
   );
   writeEnvKey(envFilePath, "GG_PIXEL_KEY", created.key);
-  writeProjectsMapping(projectsJsonPath, created.id, projectName, projectRoot);
+  writeProjectsMapping(projectsJsonPath, created.id, projectName, projectRoot, created.secret);
   return {
     projectId: created.id,
     projectKey: created.key,
+    projectSecret: created.secret,
     projectName,
     projectKind: "go",
     initFilePath,
@@ -1108,8 +1114,8 @@ async function installRuby(ctx) {
   const existingKey = readEnvKey(envFilePath, "GG_PIXEL_KEY");
   let created;
   let reused = false;
-  if (existing && existingKey) {
-    created = { id: existing.id, key: existingKey };
+  if (existing && existing.secret && existingKey) {
+    created = { id: existing.id, key: existingKey, secret: existing.secret };
     reused = true;
   } else {
     created = await createProject(fetchFn, ingestUrl, projectName);
@@ -1128,10 +1134,11 @@ GGPixel.init(
     "utf8"
   );
   writeEnvKey(envFilePath, "GG_PIXEL_KEY", created.key);
-  writeProjectsMapping(projectsJsonPath, created.id, projectName, projectRoot);
+  writeProjectsMapping(projectsJsonPath, created.id, projectName, projectRoot, created.secret);
   return {
     projectId: created.id,
     projectKey: created.key,
+    projectSecret: created.secret,
     projectName,
     projectKind: "ruby",
     initFilePath,
@@ -1184,8 +1191,8 @@ async function installPython(ctx) {
   const existingKey = readEnvKey(envFilePath, "GG_PIXEL_KEY");
   let created;
   let reused = false;
-  if (existing && existingKey) {
-    created = { id: existing.id, key: existingKey };
+  if (existing && existing.secret && existingKey) {
+    created = { id: existing.id, key: existingKey, secret: existing.secret };
     reused = true;
   } else {
     created = await createProject(fetchFn, ingestUrl, projectName);
@@ -1195,11 +1202,12 @@ async function installPython(ctx) {
   const initFilePath = join(projectRoot, "gg_pixel_init.py");
   writeFileSync(initFilePath, renderPythonInitFile(ingestUrl, created.key), "utf8");
   writeEnvKey(envFilePath, "GG_PIXEL_KEY", created.key);
-  writeProjectsMapping(projectsJsonPath, created.id, projectName, projectRoot);
+  writeProjectsMapping(projectsJsonPath, created.id, projectName, projectRoot, created.secret);
   const entryWiring = wirePythonEntry(projectRoot, initFilePath);
   return {
     projectId: created.id,
     projectKey: created.key,
+    projectSecret: created.secret,
     projectName,
     projectKind: "python",
     initFilePath,
@@ -1317,7 +1325,7 @@ function findPythonEntryFile(projectRoot) {
   }
   return null;
 }
-function writeProjectsMapping(projectsJsonPath, projectId, name, path) {
+function writeProjectsMapping(projectsJsonPath, projectId, name, path, secret) {
   mkdirSync(dirname(projectsJsonPath), { recursive: true });
   let map = {};
   if (existsSync(projectsJsonPath)) {
@@ -1326,7 +1334,9 @@ function writeProjectsMapping(projectsJsonPath, projectId, name, path) {
     } catch {
     }
   }
-  map[projectId] = { name, path };
+  const entry = { name, path };
+  if (secret) entry.secret = secret;
+  map[projectId] = entry;
   writeFileSync(projectsJsonPath, `${JSON.stringify(map, null, 2)}
 `, "utf8");
 }