lula2 0.7.3-nightly.5 → 0.7.5

package/dist/cli/server/websocketServer.js

@@ -109,6 +109,7 @@ import {
 } from "fs";
 import * as yaml2 from "js-yaml";
 import { join as join2 } from "path";
+import { createHash } from "crypto";
 var FileStore;
 var init_fileStore = __esm({
   "cli/server/infrastructure/fileStore.ts"() {
@@ -406,6 +407,10 @@ var init_fileStore = __esm({
               const content = readFileSync2(mappingFile, "utf8");
               const parsed = yaml2.load(content);
               if (Array.isArray(parsed)) {
+                parsed.forEach((mapping) => {
+                  mapping.hash = createHash("sha256").update(JSON.stringify(mapping)).digest("hex");
+                  return mapping;
+                });
                 mappings.push(...parsed);
               }
             } catch (error) {
@@ -440,12 +445,9 @@ var init_fileStore = __esm({
             existingMappings = [];
           }
         }
-        const existingIndex = existingMappings.findIndex((m) => m.uuid === mapping.uuid);
-        if (existingIndex >= 0) {
-          existingMappings[existingIndex] = mapping;
-        } else {
-          existingMappings.push(mapping);
-        }
+        const cleanMapping = { ...mapping };
+        delete cleanMapping.hash;
+        existingMappings.push(cleanMapping);
         try {
           const yamlContent = yaml2.dump(existingMappings, {
             indent: 2,
@@ -470,7 +472,8 @@ var init_fileStore = __esm({
             let mappings = yaml2.load(content) || [];
             const originalLength = mappings.length;
             mappings = mappings.filter((m) => {
-              return `${m.control_id}:${m.uuid}` !== compositeKey;
+              const hash = createHash("sha256").update(JSON.stringify(m)).digest("hex");
+              return `${m.control_id}:${hash}` !== compositeKey;
             });
             if (mappings.length < originalLength) {
               if (mappings.length === 0) {
@@ -533,8 +536,13 @@ var init_fileStore = __esm({
           if (!existsSync2(familyDir)) {
             mkdirSync(familyDir, { recursive: true });
           }
+          const cleanMappings = controlMappings.map((m) => {
+            const clean = { ...m };
+            delete clean.hash;
+            return clean;
+          });
           try {
-            const yamlContent = yaml2.dump(controlMappings, {
+            const yamlContent = yaml2.dump(cleanMappings, {
               indent: 2,
               lineWidth: -1,
               noRefs: true
@@ -1453,6 +1461,7 @@ __export(serverState_exports, {
   saveMappingsToFile: () => saveMappingsToFile
 });
 import { join as join3 } from "path";
+import { createHash as createHash2 } from "crypto";
 function initializeServerState(controlSetDir, subdir = ".") {
   const fullPath = subdir === "." ? controlSetDir : join3(controlSetDir, subdir);
   serverState = {
@@ -1495,11 +1504,11 @@ function addMappingToIndexes(mapping) {
   if (!state.mappingsByFamily.has(family)) {
     state.mappingsByFamily.set(family, /* @__PURE__ */ new Set());
   }
-  state.mappingsByFamily.get(family).add(mapping.uuid);
+  state.mappingsByFamily.get(family).add(mapping.hash);
   if (!state.mappingsByControl.has(mapping.control_id)) {
     state.mappingsByControl.set(mapping.control_id, /* @__PURE__ */ new Set());
   }
-  state.mappingsByControl.get(mapping.control_id).add(mapping.uuid);
+  state.mappingsByControl.get(mapping.control_id).add(mapping.hash);
 }
 async function loadAllData() {
   const state = getServerState();
@@ -1513,7 +1522,10 @@ async function loadAllData() {
     debug(`Loaded ${controls.length} controls from individual files`);
     const mappings = await state.fileStore.loadMappings();
     for (const mapping of mappings) {
-      const compositeKey = `${mapping.control_id}:${mapping.uuid}`;
+      if (!mapping.hash) {
+        mapping.hash = createHash2("sha256").update(JSON.stringify(mapping)).digest("hex");
+      }
+      const compositeKey = `${mapping.control_id}:${mapping.hash}`;
       state.mappingsCache.set(compositeKey, mapping);
       addMappingToIndexes(mapping);
     }
@@ -2646,6 +2658,7 @@ init_gitHistory();
 import * as yaml5 from "js-yaml";
 import { join as join5 } from "path";
 import { WebSocket, WebSocketServer } from "ws";
+import crypto2 from "node:crypto";
 var WebSocketManager = class {
   wss = null;
   clients = /* @__PURE__ */ new Set();
@@ -2710,21 +2723,24 @@ var WebSocketManager = class {
           if (payload && payload.control_id) {
             const mapping = payload;
             if (!mapping.uuid) {
-              const crypto2 = await import("crypto");
-              mapping.uuid = crypto2.randomUUID();
+              const crypto3 = await import("crypto");
+              mapping.uuid = crypto3.randomUUID();
             }
+            if (!mapping.hash || mapping.hash === "") {
+              mapping.hash = crypto2.createHash("sha256").update(JSON.stringify(mapping)).digest("hex");
+            }
+            const compositeKey = `${mapping.control_id}:${mapping.hash}`;
             await state.fileStore.saveMapping(mapping);
-            const compositeKey = `${mapping.control_id}:${mapping.uuid}`;
             state.mappingsCache.set(compositeKey, mapping);
             const family = mapping.control_id.split("-")[0];
             if (!state.mappingsByFamily.has(family)) {
               state.mappingsByFamily.set(family, /* @__PURE__ */ new Set());
             }
-            state.mappingsByFamily.get(family)?.add(mapping.uuid);
+            state.mappingsByFamily.get(family)?.add(mapping.hash);
             if (!state.mappingsByControl.has(mapping.control_id)) {
               state.mappingsByControl.set(mapping.control_id, /* @__PURE__ */ new Set());
             }
-            state.mappingsByControl.get(mapping.control_id)?.add(mapping.uuid);
+            state.mappingsByControl.get(mapping.control_id)?.add(mapping.hash);
             ws.send(
               JSON.stringify({
                 type: "mapping-created",
@@ -2735,38 +2751,21 @@ var WebSocketManager = class {
           }
           break;
         }
-        case "update-mapping": {
-          const state = getServerState();
-          if (payload && payload.uuid) {
-            const mapping = payload;
-            await state.fileStore.saveMapping(mapping);
-            const compositeKey = `${mapping.control_id}:${mapping.uuid}`;
-            state.mappingsCache.set(compositeKey, mapping);
-            ws.send(
-              JSON.stringify({
-                type: "mapping-updated",
-                payload: { uuid: mapping.uuid, success: true }
-              })
-            );
-            this.broadcastState();
-          }
-          break;
-        }
         case "delete-mapping": {
           const state = getServerState();
-          if (payload && payload.uuid) {
-            const uuid = payload.uuid;
-            const mapping = state.mappingsCache.get(uuid);
+          if (payload && payload.composite_key) {
+            const composite_key = payload.composite_key;
+            const mapping = state.mappingsCache.get(composite_key);
             if (mapping) {
-              await state.fileStore.deleteMapping(uuid);
-              state.mappingsCache.delete(uuid);
+              await state.fileStore.deleteMapping(composite_key);
+              state.mappingsCache.delete(composite_key);
               const family = mapping.control_id.split("-")[0];
-              state.mappingsByFamily.get(family)?.delete(uuid);
-              state.mappingsByControl.get(mapping.control_id)?.delete(uuid);
+              state.mappingsByFamily.get(family)?.delete(mapping.hash);
+              state.mappingsByControl.get(mapping.control_id)?.delete(mapping.hash);
               ws.send(
                 JSON.stringify({
                   type: "mapping-deleted",
-                  payload: { uuid, success: true }
+                  payload: { hash: mapping.hash, success: true }
                 })
               );
               this.broadcastState();

package/dist/index.html

@@ -6,10 +6,10 @@
 		<link rel="icon" href="/lula.png" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
 		
-		<link rel="modulepreload" href="/_app/immutable/entry/start.9roQ_xwc.js">
-		<link rel="modulepreload" href="/_app/immutable/chunks/CgqRWI7t.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/start.Bgy9x4Qb.js">
+		<link rel="modulepreload" href="/_app/immutable/chunks/DH2IP9c7.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/CxBMFlfX.js">
-		<link rel="modulepreload" href="/_app/immutable/entry/app.BVCY-_ev.js">
+		<link rel="modulepreload" href="/_app/immutable/entry/app.CjycYot0.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/DXSHWIjJ.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/Cng7c2CG.js">
 		<link rel="modulepreload" href="/_app/immutable/chunks/urFjAlpd.js">
@@ -19,15 +19,15 @@
 		<div style="display: contents">
 			<script>
 				{
-					__sveltekit_67d1hx = {
+					__sveltekit_sd3spo = {
 						base: ""
 					};
 
 					const element = document.currentScript.parentElement;
 
 					Promise.all([
-						import("/_app/immutable/entry/start.9roQ_xwc.js"),
-						import("/_app/immutable/entry/app.BVCY-_ev.js")
+						import("/_app/immutable/entry/start.Bgy9x4Qb.js"),
+						import("/_app/immutable/entry/app.CjycYot0.js")
 					]).then(([kit, app]) => {
 						kit.start(app, element);
 					});

package/dist/index.js

@@ -1681,6 +1681,7 @@ import {
 } from "fs";
 import * as yaml2 from "js-yaml";
 import { join as join2 } from "path";
+import { createHash as createHash2 } from "crypto";
 var FileStore;
 var init_fileStore = __esm({
   "cli/server/infrastructure/fileStore.ts"() {
@@ -1978,6 +1979,10 @@ var init_fileStore = __esm({
               const content = readFileSync2(mappingFile, "utf8");
               const parsed = yaml2.load(content);
               if (Array.isArray(parsed)) {
+                parsed.forEach((mapping) => {
+                  mapping.hash = createHash2("sha256").update(JSON.stringify(mapping)).digest("hex");
+                  return mapping;
+                });
                 mappings.push(...parsed);
               }
             } catch (error) {
@@ -2012,12 +2017,9 @@ var init_fileStore = __esm({
             existingMappings = [];
           }
         }
-        const existingIndex = existingMappings.findIndex((m) => m.uuid === mapping.uuid);
-        if (existingIndex >= 0) {
-          existingMappings[existingIndex] = mapping;
-        } else {
-          existingMappings.push(mapping);
-        }
+        const cleanMapping = { ...mapping };
+        delete cleanMapping.hash;
+        existingMappings.push(cleanMapping);
         try {
           const yamlContent = yaml2.dump(existingMappings, {
             indent: 2,
@@ -2042,7 +2044,8 @@ var init_fileStore = __esm({
             let mappings = yaml2.load(content) || [];
             const originalLength = mappings.length;
             mappings = mappings.filter((m) => {
-              return `${m.control_id}:${m.uuid}` !== compositeKey;
+              const hash = createHash2("sha256").update(JSON.stringify(m)).digest("hex");
+              return `${m.control_id}:${hash}` !== compositeKey;
             });
             if (mappings.length < originalLength) {
               if (mappings.length === 0) {
@@ -2105,8 +2108,13 @@ var init_fileStore = __esm({
           if (!existsSync2(familyDir)) {
             mkdirSync(familyDir, { recursive: true });
           }
+          const cleanMappings = controlMappings.map((m) => {
+            const clean = { ...m };
+            delete clean.hash;
+            return clean;
+          });
           try {
-            const yamlContent = yaml2.dump(controlMappings, {
+            const yamlContent = yaml2.dump(cleanMappings, {
               indent: 2,
               lineWidth: -1,
               noRefs: true
@@ -3025,6 +3033,7 @@ __export(serverState_exports, {
   saveMappingsToFile: () => saveMappingsToFile
 });
 import { join as join3 } from "path";
+import { createHash as createHash3 } from "crypto";
 function initializeServerState(controlSetDir, subdir = ".") {
   const fullPath = subdir === "." ? controlSetDir : join3(controlSetDir, subdir);
   serverState = {
@@ -3067,11 +3076,11 @@ function addMappingToIndexes(mapping) {
   if (!state.mappingsByFamily.has(family)) {
     state.mappingsByFamily.set(family, /* @__PURE__ */ new Set());
   }
-  state.mappingsByFamily.get(family).add(mapping.uuid);
+  state.mappingsByFamily.get(family).add(mapping.hash);
   if (!state.mappingsByControl.has(mapping.control_id)) {
     state.mappingsByControl.set(mapping.control_id, /* @__PURE__ */ new Set());
   }
-  state.mappingsByControl.get(mapping.control_id).add(mapping.uuid);
+  state.mappingsByControl.get(mapping.control_id).add(mapping.hash);
 }
 async function loadAllData() {
   const state = getServerState();
@@ -3085,7 +3094,10 @@ async function loadAllData() {
     debug(`Loaded ${controls.length} controls from individual files`);
     const mappings = await state.fileStore.loadMappings();
     for (const mapping of mappings) {
-      const compositeKey = `${mapping.control_id}:${mapping.uuid}`;
+      if (!mapping.hash) {
+        mapping.hash = createHash3("sha256").update(JSON.stringify(mapping)).digest("hex");
+      }
+      const compositeKey = `${mapping.control_id}:${mapping.hash}`;
       state.mappingsCache.set(compositeKey, mapping);
       addMappingToIndexes(mapping);
     }
@@ -5136,6 +5148,7 @@ init_gitHistory();
 import * as yaml5 from "js-yaml";
 import { join as join5 } from "path";
 import { WebSocket, WebSocketServer } from "ws";
+import crypto2 from "node:crypto";
 var WebSocketManager = class {
   wss = null;
   clients = /* @__PURE__ */ new Set();
@@ -5200,21 +5213,24 @@ var WebSocketManager = class {
           if (payload && payload.control_id) {
             const mapping = payload;
             if (!mapping.uuid) {
-              const crypto2 = await import("crypto");
-              mapping.uuid = crypto2.randomUUID();
+              const crypto3 = await import("crypto");
+              mapping.uuid = crypto3.randomUUID();
             }
+            if (!mapping.hash || mapping.hash === "") {
+              mapping.hash = crypto2.createHash("sha256").update(JSON.stringify(mapping)).digest("hex");
+            }
+            const compositeKey = `${mapping.control_id}:${mapping.hash}`;
             await state.fileStore.saveMapping(mapping);
-            const compositeKey = `${mapping.control_id}:${mapping.uuid}`;
             state.mappingsCache.set(compositeKey, mapping);
             const family = mapping.control_id.split("-")[0];
             if (!state.mappingsByFamily.has(family)) {
               state.mappingsByFamily.set(family, /* @__PURE__ */ new Set());
             }
-            state.mappingsByFamily.get(family)?.add(mapping.uuid);
+            state.mappingsByFamily.get(family)?.add(mapping.hash);
             if (!state.mappingsByControl.has(mapping.control_id)) {
               state.mappingsByControl.set(mapping.control_id, /* @__PURE__ */ new Set());
             }
-            state.mappingsByControl.get(mapping.control_id)?.add(mapping.uuid);
+            state.mappingsByControl.get(mapping.control_id)?.add(mapping.hash);
             ws.send(
               JSON.stringify({
                 type: "mapping-created",
@@ -5225,38 +5241,21 @@ var WebSocketManager = class {
           }
           break;
         }
-        case "update-mapping": {
-          const state = getServerState();
-          if (payload && payload.uuid) {
-            const mapping = payload;
-            await state.fileStore.saveMapping(mapping);
-            const compositeKey = `${mapping.control_id}:${mapping.uuid}`;
-            state.mappingsCache.set(compositeKey, mapping);
-            ws.send(
-              JSON.stringify({
-                type: "mapping-updated",
-                payload: { uuid: mapping.uuid, success: true }
-              })
-            );
-            this.broadcastState();
-          }
-          break;
-        }
         case "delete-mapping": {
           const state = getServerState();
-          if (payload && payload.uuid) {
-            const uuid = payload.uuid;
-            const mapping = state.mappingsCache.get(uuid);
+          if (payload && payload.composite_key) {
+            const composite_key = payload.composite_key;
+            const mapping = state.mappingsCache.get(composite_key);
             if (mapping) {
-              await state.fileStore.deleteMapping(uuid);
-              state.mappingsCache.delete(uuid);
+              await state.fileStore.deleteMapping(composite_key);
+              state.mappingsCache.delete(composite_key);
               const family = mapping.control_id.split("-")[0];
-              state.mappingsByFamily.get(family)?.delete(uuid);
-              state.mappingsByControl.get(mapping.control_id)?.delete(uuid);
+              state.mappingsByFamily.get(family)?.delete(mapping.hash);
+              state.mappingsByControl.get(mapping.control_id)?.delete(mapping.hash);
               ws.send(
                 JSON.stringify({
                   type: "mapping-deleted",
-                  payload: { uuid, success: true }
+                  payload: { hash: mapping.hash, success: true }
                 })
               );
               this.broadcastState();
@@ -5733,6 +5732,7 @@ var WebSocketManager = class {
 var wsManager = new WebSocketManager();
 
 // cli/server/server.ts
+import { createHash as createHash4 } from "crypto";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname2(__filename);
 async function createServer(options) {
@@ -5758,6 +5758,11 @@ async function createServer(options) {
   app.get("/*splat", (req, res) => {
     res.sendFile("index.html", { root: distPath });
   });
+  app.post("/hash", (req, res) => {
+    delete req.body.hash;
+    const hash = createHash4("sha256").update(JSON.stringify(req.body)).digest("hex");
+    res.status(200).json({ hash });
+  });
   const httpServer = createHttpServer(app);
   wsManager.initialize(httpServer);
   return {
@@ -5869,7 +5874,7 @@ function getVersion() {
 import fs4 from "fs";
 import { Octokit } from "@octokit/rest";
 import { Command, Option } from "commander";
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash5 } from "crypto";
 var closingBody = `
 
 ---
@@ -6077,7 +6082,7 @@ function generateChangedBlocksContent(filename, changedBlocks, newText) {
 `;
   for (const block of changedBlocks) {
     const newBlockText = newText.split("\n").slice(block.startLine, block.endLine).join("\n");
-    const blockSha256 = createHash2("sha256").update(newBlockText).digest("hex");
+    const blockSha256 = createHash5("sha256").update(newBlockText).digest("hex");
     content += `**UUID:** \`${block.uuid}\`
 **sha256:** \`${blockSha256}\`
 
@@ -6110,7 +6115,7 @@ function generateRemovedBlocksContent(filename, removedBlocks, oldText) {
 `;
   for (const block of removedBlocks) {
     const oldBlockText = oldText.split("\n").slice(block.startLine, block.endLine).join("\n");
-    const blockSha256 = createHash2("sha256").update(oldBlockText).digest("hex");
+    const blockSha256 = createHash5("sha256").update(oldBlockText).digest("hex");
     content += `**UUID:** \`${block.uuid}\`
 **sha256:** \`${blockSha256}\`