@peopl-health/nexus 5.44.0-dev.6210 → 5.44.0-dev.6227

package/lib/models/tokenMapModel.js

@@ -9,7 +9,8 @@ const PHI_CATEGORIES = Object.freeze(['PERSONA', 'TELEFONO', 'EMAIL', 'ID']);
 const tokenMapSchema = new mongoose.Schema({
   code:   { type: String, required: true },
   encode: { type: Map, of: String, default: () => new Map() },
-  decode: { type: Map, of: String, default: () => new Map() }
+  decode: { type: Map, of: String, default: () => new Map() },
+  seq:    { type: Number }
 }, { timestamps: true });
 
 tokenMapSchema.index({ code: 1 }, { unique: true });

package/lib/services/tokenMapService.js

@@ -24,12 +24,23 @@ const preferredSurface = (current, candidate) => {
   return richer > 0 ? candidate : current;
 };
 
-const tokenCache = new MapCache({ maxSize: 500, ttl: 60 * 1000 });
+const CLAIM_ATTEMPTS = 3;
+
+const NEXT_INDEX_PIPELINE = [{
+  $set: {
+    seq: {
+      $add: [
+        { $ifNull: ['$seq', { $size: { $objectToArray: { $ifNull: ['$encode', {}] } } }] },
+        1,
+      ],
+    },
+  },
+}];
 
-const getSubmap = async (code) => {
-  const cached = tokenCache.get(code);
-  if (cached) return cached;
+const tokenCache = new MapCache({ maxSize: 500, ttl: 60 * 1000 });
+const inFlight = new Map();
 
+const readSubmap = async (code) => {
   const doc = await getTokenMap().findOne({ code }).lean();
   const submap = {
     encode: new Map(Object.entries(doc?.encode || {})),
@@ -39,32 +50,34 @@ const getSubmap = async (code) => {
   return submap;
 };
 
-const allocateToken = async (code, plaintext, category, normalized, submap) => {
-  const counter = submap.encode.size + 1;
-  const token = `<<${category}_${counter}>>`;
+const getSubmap = async (code) => {
+  const cached = tokenCache.get(code);
+  if (cached) return cached;
+  if (!inFlight.has(code)) {
+    inFlight.set(code, readSubmap(code).finally(() => inFlight.delete(code)));
+  }
+  return inFlight.get(code);
+};
 
-  submap.encode.set(normalized, token);
-  submap.decode.set(token, plaintext);
+const nextIndex = async (code) => {
+  const doc = await getTokenMap().findOneAndUpdate({ code }, NEXT_INDEX_PIPELINE, {
+    upsert: true, new: true, projection: { seq: 1 }, lean: true,
+  });
+  return doc.seq;
+};
 
-  const res = await getTokenMap().updateOne(
-    { code },
-    {
-      $set: {
-        encode: Object.fromEntries(submap.encode),
-        decode: Object.fromEntries(submap.decode),
-      }
-    },
-    { upsert: true }
-  );
-  if (!res || (res.modifiedCount === 0 && !res.upsertedCount)) {
-    logger.error('[allocateToken] Mapping write modified 0 docs', { code, category, token });
-    throw new Error(`[allocateToken] Mapping write modified 0 docs for token ${token}`);
-  }
-  return token;
+const rememberSurface = (code, token, plaintext) => {
+  const live = tokenCache.get(code);
+  if (live && plaintext !== undefined) live.decode.set(token, plaintext);
+};
+
+const rememberMapping = (code, normalized, token, plaintext) => {
+  const live = tokenCache.get(code);
+  if (live) live.encode.set(normalized, token);
+  rememberSurface(code, token, plaintext);
 };
 
-const upgradeSurface = async (code, token, plaintext, submap) => {
-  const current = submap.decode.get(token);
+const upgradeSurface = async (code, token, current, plaintext) => {
   const preferred = preferredSurface(current, plaintext);
   if (preferred === current) return;
 
@@ -75,13 +88,55 @@ const upgradeSurface = async (code, token, plaintext, submap) => {
   );
 
   if (res?.modifiedCount) {
-    submap.decode.set(token, preferred);
+    rememberSurface(code, token, preferred);
     logger.debug('[upgradeSurface] Decode surface upgraded', { code, token });
     return;
   }
   tokenCache.delete(code);
 };
 
+const claimToken = async (code, plaintext, category, normalized) => {
+  const token = `<<${category}_${await nextIndex(code)}>>`;
+  const res = await getTokenMap().updateOne(
+    {
+      code,
+      [`encode.${normalized}`]: { $exists: false },
+      [`decode.${token}`]: { $exists: false },
+    },
+    { $set: { [`encode.${normalized}`]: token, [`decode.${token}`]: plaintext } },
+  );
+  return res?.modifiedCount ? token : null;
+};
+
+const adoptClaimedToken = async (code, plaintext, normalized) => {
+  const doc = await getTokenMap().findOne({ code }).lean();
+  const winner = doc?.encode?.[normalized];
+  if (!winner) return null;
+
+  rememberMapping(code, normalized, winner, doc.decode?.[winner]);
+  await upgradeSurface(code, winner, doc.decode?.[winner], plaintext);
+  return winner;
+};
+
+const allocateToken = async (code, plaintext, category, normalized) => {
+  for (let attempt = 1; attempt <= CLAIM_ATTEMPTS; attempt += 1) {
+    let token = null;
+    try {
+      token = await claimToken(code, plaintext, category, normalized);
+    } catch (err) {
+      if (err?.code !== 11000 || attempt === CLAIM_ATTEMPTS) throw err;
+    }
+    if (token) {
+      rememberMapping(code, normalized, token, plaintext);
+      return token;
+    }
+    const winner = await adoptClaimedToken(code, plaintext, normalized);
+    if (winner) return winner;
+    logger.error('[allocateToken] Token claim failed, retrying', { code, category, attempt });
+  }
+  throw new Error(`[allocateToken] Could not claim a ${category} token for ${code}`);
+};
+
 const encode = async (code, plaintext, category) => {
   if (!PHI_CATEGORIES.includes(category)) {
     throw new Error(`[encode] Unknown category: ${category}`);
@@ -96,11 +151,11 @@ const encode = async (code, plaintext, category) => {
   const submap = await getSubmap(code);
   const existing = submap.encode.get(normalized);
   if (existing) {
-    await upgradeSurface(code, existing, String(plaintext), submap);
+    await upgradeSurface(code, existing, submap.decode.get(existing), String(plaintext));
     return existing;
   }
 
-  const token = await allocateToken(code, String(plaintext), category, normalized, submap);
+  const token = await allocateToken(code, String(plaintext), category, normalized);
   logger.debug('[encode] Allocated', { code, category, token });
   return token;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "5.44.0-dev.6210",
+  "version": "5.44.0-dev.6227",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",