@novasamatech/statement-store 0.7.6 → 0.7.7

package/dist/session/session.js

@@ -19,6 +19,7 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
     const incomingSessionId = createSessionId(remoteAccount.publicKey, remoteAccount, localAccount);
     const state = {
         phase: 'initialization',
+        initError: null,
         expiry: 0n,
         outgoingRequest: null,
         incomingRequest: null,
@@ -99,7 +100,7 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
                 deliverStatementData(statementData);
             }
             else if (statementData.tag === 'response') {
-                if (state.outgoingRequest?.requestId !== statementData.value.requestId)
+                if (!state.outgoingRequest?.requestIds.includes(statementData.value.requestId))
                     return;
                 const responseMessage = {
                     type: 'response',
@@ -123,7 +124,7 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
     function processNewMessage(encoded, token) {
         if (state.outgoingRequest === null) {
             const requestId = nanoid();
-            state.outgoingRequest = { requestId, messages: [encoded], tokens: [token] };
+            state.outgoingRequest = { requestIds: [requestId], messages: [encoded], tokens: [token] };
             encodeAndSubmitRequest(requestId, state.outgoingRequest.messages);
         }
         else {
@@ -131,8 +132,9 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
             if (currentTotal + encoded.length <= maxRequestSize) {
                 state.outgoingRequest.messages.push(encoded);
                 state.outgoingRequest.tokens.push(token);
-                state.outgoingRequest.requestId = nanoid();
-                encodeAndSubmitRequest(state.outgoingRequest.requestId, state.outgoingRequest.messages);
+                const newRequestId = nanoid();
+                state.outgoingRequest.requestIds.push(newRequestId);
+                encodeAndSubmitRequest(newRequestId, state.outgoingRequest.messages);
             }
             else {
                 state.messageQueue.push({ encoded, token });
@@ -140,9 +142,10 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
         }
     }
     function processMessageQueue() {
-        const currentTotal = state.outgoingRequest?.messages.reduce((s, m) => s + m.length, 0) ?? 0;
         while (state.messageQueue.length > 0) {
             const head = state.messageQueue[0];
+            // Recompute per iteration; `processNewMessage` mutates outgoingRequest.messages in place.
+            const currentTotal = state.outgoingRequest?.messages.reduce((s, m) => s + m.length, 0) ?? 0;
             if (state.outgoingRequest !== null && currentTotal + head.encoded.length > maxRequestSize)
                 break;
             state.messageQueue.shift();
@@ -166,13 +169,31 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
             }
         });
     }
+    function rejectAllPending(error) {
+        for (const [, deferred] of state.pendingDelivery) {
+            deferred.reject(error);
+        }
+        state.pendingDelivery.clear();
+    }
+    function failInit(error) {
+        state.phase = 'failed';
+        state.initError = error;
+        state.messageQueue = [];
+        rejectAllPending(error);
+    }
     async function init() {
         const [ownResult, peerResult] = await Promise.all([
             statementStore.queryStatements({ matchAll: [outgoingSessionId] }),
             statementStore.queryStatements({ matchAll: [incomingSessionId] }),
         ]);
-        if (ownResult.isErr() || peerResult.isErr())
+        if (ownResult.isErr()) {
+            failInit(ownResult.error);
+            return;
+        }
+        if (peerResult.isErr()) {
+            failInit(peerResult.error);
             return;
+        }
         const ownStatements = ownResult.value;
         const peerStatements = peerResult.value;
         let maxExpiry = 0n;
@@ -195,7 +216,7 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
             const hasResponse = ownResponse?.tag === 'response' && ownResponse.value.requestId === ownRequest.value.requestId;
             if (!hasResponse) {
                 state.outgoingRequest = {
-                    requestId: ownRequest.value.requestId,
+                    requestIds: [ownRequest.value.requestId],
                     messages: ownRequest.value.data,
                     tokens: [], // tokens from previous session cannot be restored
                 };
@@ -229,6 +250,9 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
             const encoded = encodedResult.value;
             if (encoded.length > maxRequestSize)
                 return errAsync(new Error('message too big'));
+            if (state.phase === 'failed') {
+                return errAsync(state.initError ?? new Error('Session initialization failed'));
+            }
             const token = nanoid();
             let resolveFn;
             let rejectFn;
@@ -314,10 +338,7 @@ export function createSession({ localAccount, remoteAccount, statementStore, enc
             responseStoreUnsub?.();
             responseStoreUnsub = null;
             subscribers = [];
-            for (const [, deferred] of state.pendingDelivery) {
-                deferred.reject(new Error('Session disposed'));
-            }
-            state.pendingDelivery.clear();
+            rejectAllPending(new Error('Session disposed'));
         },
     };
     void init();

package/dist/session/session.spec.js

@@ -5,7 +5,21 @@ import { describe, expect, it, vi } from 'vitest';
 import { createAccountId, createLocalSessionAccount, createRemoteSessionAccount } from '../model/sessionAccount.js';
 import { StatementData } from './scale/statementData.js';
 import { createSession, nextExpiry } from './session.js';
-import { createSr25519Prover } from './statementProver.js';
+// Real signature work belongs in statementProver tests; this stub stamps a
+// non-empty proof so submitted statements are well-formed.
+const mockProver = {
+    generateMessageProof: statement => okAsync({
+        ...statement,
+        proof: {
+            type: 'sr25519',
+            value: {
+                signature: `0x${'00'.repeat(64)}`,
+                signer: `0x${'00'.repeat(32)}`,
+            },
+        },
+    }),
+    verifyMessageProof: () => okAsync(true),
+};
 function makeAccounts() {
     const localAccount = createLocalSessionAccount(createAccountId(new Uint8Array(32).fill(1)));
     const remoteAccount = createRemoteSessionAccount(createAccountId(new Uint8Array(32).fill(2)), new Uint8Array(32).fill(3));
@@ -42,7 +56,7 @@ function makeSession(overrides) {
         remoteAccount,
         statementStore: adapter,
         encryption: mockEncryption(),
-        prover: createSr25519Prover(new Uint8Array(64).fill(1)),
+        prover: mockProver,
         maxRequestSize,
     });
     return { session, adapter };

package/dist/session/statementProver.js

@@ -14,8 +14,7 @@ export function createSr25519Prover(secret) {
         verifyMessageProof(statement) {
             const { proof, ...unsigned } = statement;
             if (!proof) {
-                // TODO should we pass check when proof is not presented?
-                return okAsync(true);
+                return errAsync(new Error('Proof is not provided'));
             }
             const encoded = statementCodec.enc(unsigned);
             const compactLen = compact.enc(compact.dec(encoded)).length;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@novasamatech/statement-store",
   "type": "module",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "Statement store integration",
   "license": "Apache-2.0",
   "repository": {
@@ -25,7 +25,7 @@
     "README.md"
   ],
   "dependencies": {
-    "@novasamatech/scale": "0.7.6",
+    "@novasamatech/scale": "0.7.7",
     "@novasamatech/sdk-statement": "^0.6.0",
     "@polkadot-api/substrate-bindings": "^0.20.1",
     "@polkadot-api/substrate-client": "^0.7.0",