Update data generator and researcher maps

generate-data.mjs

@@ -2,7 +2,7 @@ import fs from "node:fs/promises";
 import crypto from "node:crypto";
 import { FileBlob, SpreadsheetFile } from "@oai/artifact-tool";
 
-const [inputPath, outputPath, password = "20302030"] = process.argv.slice(2);
+const [inputPath, outputPath, password = "20302030", supervisorPassword = "1448"] = process.argv.slice(2);
 
 const MAP_URLS = [
   ["أماني مصطفى عبدالله الطيب", "https://stat2025-map.static.hf.space/Rahn/01.html"],
@@ -89,6 +89,41 @@ function mapUrlFor(researcher) {
   return partial?.[1] || "";
 }
 
+function sampleKey(row) {
+  const parts = [
+    row.commercialRecord,
+    row.contractNumber,
+    row.establishmentName,
+    row.researcher,
+  ].map(normalize);
+  return crypto.createHash("sha256").update(parts.join("|")).digest("hex").slice(0, 24);
+}
+
+function encryptPayload(plainPayload, secret, iterations) {
+  const salt = crypto.randomBytes(16);
+  const iv = crypto.randomBytes(12);
+  const key = crypto.pbkdf2Sync(secret, salt, iterations, 32, "sha256");
+  const cipher = crypto.createCipheriv("aes-256-gcm", key, iv);
+  const encrypted = Buffer.concat([cipher.update(plainPayload, "utf8"), cipher.final()]);
+  return {
+    iterations,
+    salt: salt.toString("base64"),
+    iv: iv.toString("base64"),
+    payload: Buffer.concat([encrypted, cipher.getAuthTag()]).toString("base64"),
+  };
+}
+
+function encryptedBlock(name, encrypted) {
+  return [
+    `const ${name} = Object.freeze({`,
+    `  iterations: ${encrypted.iterations},`,
+    `  salt: "${encrypted.salt}",`,
+    `  iv: "${encrypted.iv}",`,
+    `  payload: "${encrypted.payload}",`,
+    "});",
+  ].join("\n");
+}
+
 if (!inputPath || !outputPath) {
   console.error("Usage: node generate-data.mjs <input.xlsx> <output.js> [password]");
   process.exitCode = 1;
@@ -119,7 +154,7 @@ if (!inputPath || !outputPath) {
           ? "statement"
           : "none";
 
-    rows.push({
+    const row = {
       researcher,
       establishmentName,
       contractNumber: clean(source[3]),
@@ -135,7 +170,9 @@ if (!inputPath || !outputPath) {
       unifiedNumber: clean(source[12]),
       activityCode: clean(source[13]),
       activity: clean(source[14]),
-    });
+    };
+    row.sampleKey = sampleKey(row);
+    rows.push(row);
   }
 
   const counts = new Map();
@@ -155,20 +192,13 @@ if (!inputPath || !outputPath) {
   });
 
   const iterations = 310000;
-  const salt = crypto.randomBytes(16);
-  const iv = crypto.randomBytes(12);
-  const key = crypto.pbkdf2Sync(password, salt, iterations, 32, "sha256");
-  const cipher = crypto.createCipheriv("aes-256-gcm", key, iv);
-  const encrypted = Buffer.concat([cipher.update(plainPayload, "utf8"), cipher.final()]);
-  const combined = Buffer.concat([encrypted, cipher.getAuthTag()]);
+  const researcherEncrypted = encryptPayload(plainPayload, password, iterations);
+  const supervisorEncrypted = encryptPayload(plainPayload, supervisorPassword, iterations);
   const output = [
     "/* Generated encrypted data. Rebuild this file from the source workbook. */",
-    "const ENCRYPTED_DATA = Object.freeze({",
-    `  iterations: ${iterations},`,
-    `  salt: "${salt.toString("base64")}",`,
-    `  iv: "${iv.toString("base64")}",`,
-    `  payload: "${combined.toString("base64")}",`,
-    "});",
+    encryptedBlock("ENCRYPTED_DATA", researcherEncrypted),
+    "",
+    encryptedBlock("SUPERVISOR_ENCRYPTED_DATA", supervisorEncrypted),
     "",
   ].join("\n");