npm - @kenkaiiii/gg-pixel - Versions diffs - 4.3.87 → 4.3.89 - Mend

@kenkaiiii/gg-pixel 4.3.87 → 4.3.89

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

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 // src/index.ts
@@ -385,8 +375,21 @@ var NodeHttpSink = class extends HttpSink {
 // src/core/sinks/local-sqlite.ts
 var import_node_os = require("os");
 var import_node_fs2 = require("fs");
+var import_node_module = require("module");
 var import_node_path = require("path");
-var import_better_sqlite3 = __toESM(require("better-sqlite3"), 1);
+var import_meta = {};
+var requireBSQ = (0, import_node_module.createRequire)(import_meta.url);
+function loadBetterSqlite3() {
+  try {
+    const mod = requireBSQ("better-sqlite3");
+    return typeof mod === "function" ? mod : mod.default;
+  } catch (err) {
+    throw new Error(
+      `@kenkaiiii/gg-pixel: \`kind: "local"\` requires the optional peer dependency \`better-sqlite3\`. Install it with \`npm install better-sqlite3\` (or your package manager's equivalent). Underlying error: ${err.message}`,
+      { cause: err }
+    );
+  }
+}
 var SCHEMA = `
   CREATE TABLE IF NOT EXISTS events (
     id            INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -410,9 +413,10 @@ var LocalSqliteSink = class {
   db;
   insert;
   constructor(path) {
+    const Database = loadBetterSqlite3();
     const resolved = path ?? (0, import_node_path.join)((0, import_node_os.homedir)(), ".gg", "errors.db");
     (0, import_node_fs2.mkdirSync)((0, import_node_path.dirname)(resolved), { recursive: true });
-    this.db = new import_better_sqlite3.default(resolved);
+    this.db = new Database(resolved);
     this.db.pragma("journal_mode = WAL");
     this.db.exec(SCHEMA);
     this.insert = this.db.prepare(`
@@ -1092,13 +1096,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>.`
       );
@@ -1217,6 +1220,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 {
@@ -1224,7 +1228,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,
@@ -1244,7 +1261,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)} });
@@ -1257,6 +1274,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";
 }