UI: каналы 1..32, публичный type=1 и актуальный prevLine перед записью

2026-05-14 17:58:16 +03:00
parent 01b38952e5
commit ab31ccf6d8
6 changed files with 55 additions and 58 deletions
@@ -791,14 +791,21 @@ export class AuthService {
    if (!cleanLogin) throw new Error('Missing login for AddBlock');
    if (!storagePwd) throw new Error('Missing storagePwd for AddBlock signing');

-    const user = await this.getUser(cleanLogin);
-    const blockchainName = String(user?.blockchainName || `${cleanLogin}-${BCH_SUFFIX}`).trim();
-    const freshNum = Number(user?.serverLastGlobalNumber);
-    const freshHash = normalizeHex32(user?.serverLastGlobalHash, ZERO64);
-    const freshCursor = {
-      serverLastGlobalNumber: Number.isFinite(freshNum) ? freshNum : -1,
-      serverLastGlobalHash: freshHash,
+    const resolveFreshCursor = async () => {
+      const user = await this.getUser(cleanLogin);
+      const blockchainName = String(user?.blockchainName || `${cleanLogin}-${BCH_SUFFIX}`).trim();
+      const freshNum = Number(user?.serverLastGlobalNumber);
+      const freshHash = normalizeHex32(user?.serverLastGlobalHash, ZERO64);
+      return {
+        blockchainName,
+        cursor: {
+          serverLastGlobalNumber: Number.isFinite(freshNum) ? freshNum : -1,
+          serverLastGlobalHash: freshHash,
+        },
+      };
    };
+    const freshState = await resolveFreshCursor();
+    const blockchainName = freshState.blockchainName;

    const savedKeys = await loadEncryptedUserSecrets(cleanLogin, storagePwd);
    const blockchainPrivatePkcs8 = savedKeys?.blockchainKey;
@@ -832,7 +839,7 @@ export class AuthService {
      });
    };

-    let cursor = freshCursor;
+    let cursor = freshState.cursor;
    let response = await tryAdd(cursor);
    if (response.status !== 200) {
      const knownNum = Number(response?.payload?.serverLastGlobalNumber);
@@ -840,6 +847,10 @@ export class AuthService {
      if (Number.isFinite(knownNum) && /^[0-9a-fA-F]{64}$/.test(knownHash)) {
        cursor = { serverLastGlobalNumber: knownNum, serverLastGlobalHash: knownHash.toLowerCase() };
        response = await tryAdd(cursor);
+      } else {
+        const refreshed = await resolveFreshCursor();
+        cursor = refreshed.cursor;
+        response = await tryAdd(cursor);
      }
    }

@@ -1211,11 +1222,32 @@ export class AuthService {
        rootHashHex = normalizeHex32(rootChannel.rootBlockHash, ZERO64);
      }

+      let prevLineNumber = lineCode;
+      let prevLineHashHex = rootHashHex;
+      let thisLineNumber = 0;
+      try {
+        const latestPayload = await this.getChannelMessages({
+          ownerBlockchainName,
+          channelRootBlockNumber: lineCode,
+          channelRootBlockHash: rootHashHex,
+        }, 1, 'desc', cleanLogin);
+        const latestMessage = Array.isArray(latestPayload?.messages) ? latestPayload.messages[0] : null;
+        const latestBlockNumber = Number(latestMessage?.messageRef?.blockNumber);
+        const latestBlockHash = normalizeHex32(latestMessage?.messageRef?.blockHash, '');
+        if (Number.isFinite(latestBlockNumber) && latestBlockNumber >= 0 && latestBlockHash) {
+          prevLineNumber = latestBlockNumber;
+          prevLineHashHex = latestBlockHash;
+          thisLineNumber = latestBlockNumber + 1;
+        }
+      } catch {
+        // fallback to root anchor
+      }
+
      const bodyBytes = makeTextPostBodyBytes({
        lineCode,
-        prevLineNumber: lineCode,
-        prevLineHashHex: rootHashHex,
-        thisLineNumber: 0,
+        prevLineNumber,
+        prevLineHashHex,
+        thisLineNumber,
        text: cleanText,
      });