mktcms 0.3.12 → 0.3.13

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "mktcms",
   "configKey": "mktcms",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/server/api/traffic/track.post.d.ts

@@ -1,3 +1,4 @@
+export declare function normalizeIp(ip?: string | null): string | undefined;
 declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, {
     tracked: boolean;
 }>;

package/dist/runtime/server/api/traffic/track.post.js

@@ -1,14 +1,25 @@
 import { defineEventHandler, getRequestIP } from "h3";
+import { isIP } from "node:net";
 import { incrementTrafficRequests, trackUniqueIp } from "../../utils/trafficMetrics.js";
-function normalizeIp(ip) {
+export function normalizeIp(ip) {
   if (!ip) {
     return void 0;
   }
-  const normalizedIp = ip.trim();
+  const candidate = ip.split(",")[0]?.trim();
+  if (!candidate) {
+    return void 0;
+  }
+  let normalizedIp = candidate;
   if (normalizedIp.startsWith("::ffff:")) {
-    return normalizedIp.slice(7);
+    normalizedIp = normalizedIp.slice(7);
+  }
+  if (normalizedIp.length > 64) {
+    return void 0;
+  }
+  if (isIP(normalizedIp) === 0) {
+    return void 0;
   }
-  return normalizedIp;
+  return normalizedIp.toLowerCase();
 }
 export default defineEventHandler((event) => {
   const userAgent = event.node.req.headers["user-agent"];

package/dist/runtime/server/utils/trafficMetrics.d.ts

@@ -1,6 +1,8 @@
 export declare function incrementTrafficRequests(): void;
 export declare function trackUniqueIp(ip?: string): void;
+export declare function resetTrafficMetrics(): void;
 export declare function getTrafficMetrics(): {
     requestsTotal: number;
     uniqueIpsTotal: number;
 };
+export declare function getTrackedIpCount(): number;

package/dist/runtime/server/utils/trafficMetrics.js

@@ -1,23 +1,40 @@
 const MAX_STORED_IPS = 1e4;
+const MAX_IP_LENGTH = 64;
 let requestsTotal = 0;
 let uniqueIpsTotal = 0;
-const seenIps = /* @__PURE__ */ new Set();
+const seenIps = /* @__PURE__ */ new Map();
 export function incrementTrafficRequests() {
   requestsTotal += 1;
 }
 export function trackUniqueIp(ip) {
-  if (!ip || seenIps.has(ip)) {
+  if (!ip || ip.length > MAX_IP_LENGTH) {
     return;
   }
-  if (seenIps.size >= MAX_STORED_IPS) {
+  if (seenIps.has(ip)) {
+    seenIps.delete(ip);
+    seenIps.set(ip, true);
     return;
   }
-  seenIps.add(ip);
+  if (seenIps.size >= MAX_STORED_IPS) {
+    const oldestIp = seenIps.keys().next().value;
+    if (oldestIp) {
+      seenIps.delete(oldestIp);
+    }
+  }
+  seenIps.set(ip, true);
   uniqueIpsTotal += 1;
 }
+export function resetTrafficMetrics() {
+  requestsTotal = 0;
+  uniqueIpsTotal = 0;
+  seenIps.clear();
+}
 export function getTrafficMetrics() {
   return {
     requestsTotal,
     uniqueIpsTotal
   };
 }
+export function getTrackedIpCount() {
+  return seenIps.size;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",