1
1
import { type Endpoint } from '@ndn/endpoint' ;
2
- import { SvStateVector , SvSync , type SyncNode , type SyncUpdate } from '@ndn/sync ' ;
2
+ import { StateVector , SvSync , type SyncNode , type SyncUpdate } from '@ndn/svs ' ;
3
3
import { Data , digestSigning , Name , Signer , type Verifier } from '@ndn/packet' ;
4
4
import { SequenceNum } from '@ndn/naming-convention2' ;
5
5
import { Decoder , Encoder } from '@ndn/tlv' ;
@@ -8,17 +8,17 @@ import { getNamespace } from './namespace.ts';
8
8
import { Storage } from '../storage/mod.ts' ;
9
9
import { panic } from '../utils/panic.ts' ;
10
10
11
- export function encodeSyncState ( state : SvStateVector ) : Uint8Array {
11
+ export function encodeSyncState ( state : StateVector ) : Uint8Array {
12
12
return Encoder . encode ( state ) ;
13
13
}
14
14
15
- export function parseSyncState ( vector : Uint8Array ) : SvStateVector {
15
+ export function parseSyncState ( vector : Uint8Array ) : StateVector {
16
16
try {
17
- const ret = Decoder . decode ( vector , SvStateVector ) ;
17
+ const ret = Decoder . decode ( vector , StateVector ) ;
18
18
return ret ;
19
19
} catch ( e ) {
20
- console . error ( `Unable to parse SvStateVector : ` , e ) ;
21
- return new SvStateVector ( ) ;
20
+ console . error ( `Unable to parse StateVector : ` , e ) ;
21
+ return new StateVector ( ) ;
22
22
}
23
23
}
24
24
@@ -42,7 +42,7 @@ export abstract class SyncDelivery implements AsyncDisposable {
42
42
private _startPromiseResolve ?: ( ) => void ;
43
43
protected _onReset ?: ( ) => void ;
44
44
protected _abortController : AbortController ;
45
- protected _lastTillNow : SvStateVector ;
45
+ protected _lastTillNow : StateVector ;
46
46
47
47
// TODO: Use options to configure parameters
48
48
constructor (
@@ -52,7 +52,7 @@ export abstract class SyncDelivery implements AsyncDisposable {
52
52
readonly signer : Signer ,
53
53
readonly verifier : Verifier ,
54
54
onUpdatePromise : Promise < UpdateEvent > ,
55
- protected state ?: SvStateVector ,
55
+ protected state ?: StateVector ,
56
56
) {
57
57
// const nodeId = getNamespace().nodeIdFromSigner(this.signer.name)
58
58
this . baseName = getNamespace ( ) . baseName ( nodeId , syncPrefix ) ;
@@ -63,14 +63,14 @@ export abstract class SyncDelivery implements AsyncDisposable {
63
63
}
64
64
} ) ;
65
65
this . _abortController = new AbortController ( ) ;
66
- this . _lastTillNow = new SvStateVector ( this . state ) ;
66
+ this . _lastTillNow = new StateVector ( this . state ) ;
67
67
68
68
SvSync . create ( {
69
69
endpoint : endpoint ,
70
70
syncPrefix : syncPrefix ,
71
71
signer : signer ,
72
72
verifier : verifier ,
73
- initialStateVector : new SvStateVector ( state ) ,
73
+ initialStateVector : new StateVector ( state ) ,
74
74
initialize : async ( svSync ) => {
75
75
this . _syncInst = svSync ;
76
76
this . _syncInst . addEventListener ( 'update' , ( update ) => this . handleSyncUpdate ( update ) ) ;
@@ -101,7 +101,7 @@ export abstract class SyncDelivery implements AsyncDisposable {
101
101
}
102
102
103
103
public get syncState ( ) {
104
- return new SvStateVector ( this . state ) ;
104
+ return new StateVector ( this . state ) ;
105
105
}
106
106
107
107
/**
@@ -155,15 +155,15 @@ export abstract class SyncDelivery implements AsyncDisposable {
155
155
console . warn ( 'A Sync reset is scheduled.' ) ;
156
156
this . _abortController . abort ( 'Reset' ) ;
157
157
this . _abortController = new AbortController ( ) ;
158
- this . _lastTillNow = new SvStateVector ( this . state ) ;
158
+ this . _lastTillNow = new StateVector ( this . state ) ;
159
159
this . _syncInst . close ( ) ;
160
160
this . _syncNode = undefined ;
161
161
const svSync = await SvSync . create ( {
162
162
endpoint : this . endpoint ,
163
163
syncPrefix : this . syncPrefix ,
164
164
signer : digestSigning ,
165
165
// We can do so because the state has not been set
166
- initialStateVector : new SvStateVector ( this . state ) ,
166
+ initialStateVector : new StateVector ( this . state ) ,
167
167
initialize : ( svSync ) => {
168
168
this . _syncInst = svSync ;
169
169
this . _syncInst . addEventListener ( 'update' , ( update ) => this . handleSyncUpdate ( update ) ) ;
@@ -227,7 +227,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
227
227
readonly verifier : Verifier ,
228
228
readonly storage : Storage ,
229
229
onUpdatePromise : Promise < UpdateEvent > ,
230
- protected state ?: SvStateVector ,
230
+ protected state ?: StateVector ,
231
231
) {
232
232
super ( nodeId , endpoint , syncPrefix , signer , verifier , onUpdatePromise , state ) ;
233
233
}
@@ -263,7 +263,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
263
263
264
264
// Callback
265
265
// AtLeastOnce is required to have the callback acknowledged
266
- // before writing the new SvStateVector into the storage
266
+ // before writing the new StateVector into the storage
267
267
await this . _onUpdate ! ( data . content , update . id , this ) ;
268
268
}
269
269
} catch ( error ) {
@@ -358,7 +358,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
358
358
// const nodeId = getNamespace().nodeIdFromSigner(signer.name)
359
359
const baseName = getNamespace ( ) . baseName ( nodeId , syncPrefix ) ;
360
360
const encoded = await storage . get ( getNamespace ( ) . syncStateKey ( baseName ) ) ;
361
- let syncState = new SvStateVector ( ) ;
361
+ let syncState = new StateVector ( ) ;
362
362
if ( encoded ) {
363
363
syncState = parseSyncState ( encoded ) ;
364
364
}
@@ -369,7 +369,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
369
369
return await super . destroy ( this . storage ) ;
370
370
}
371
371
372
- async replay ( startFrom : SvStateVector , callback : UpdateEvent ) {
372
+ async replay ( startFrom : StateVector , callback : UpdateEvent ) {
373
373
for ( const [ key , last ] of this . syncState ) {
374
374
const first = startFrom . get ( key ) ;
375
375
const prefix = getNamespace ( ) . baseName ( key , this . syncPrefix ) ;
@@ -401,7 +401,7 @@ export class LatestOnlyDelivery extends SyncDelivery {
401
401
readonly pktStorage : Storage ,
402
402
readonly stateStorage : Storage ,
403
403
readonly onUpdatePromise : Promise < UpdateEvent > ,
404
- protected state ?: SvStateVector ,
404
+ protected state ?: StateVector ,
405
405
) {
406
406
super ( nodeId , endpoint , syncPrefix , signer , verifier , onUpdatePromise , state ) ;
407
407
}
@@ -467,7 +467,7 @@ export class LatestOnlyDelivery extends SyncDelivery {
467
467
// const nodeId = getNamespace().nodeIdFromSigner(signer.name)
468
468
const baseName = getNamespace ( ) . baseName ( nodeId , syncPrefix ) ;
469
469
const encoded = await stateStorage . get ( getNamespace ( ) . syncStateKey ( baseName ) ) ;
470
- let syncState = new SvStateVector ( ) ;
470
+ let syncState = new StateVector ( ) ;
471
471
if ( encoded ) {
472
472
syncState = parseSyncState ( encoded ) ;
473
473
}
0 commit comments