Skip to content

Commit 3499c52

Browse files
committed
Update dependencies
1 parent fa537cf commit 3499c52

File tree

5 files changed

+39
-108
lines changed

5 files changed

+39
-108
lines changed

deno.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"jose": "^5.2.1",
2424
"tslib": "^2.6.2",
2525
"y-protocols": "^1.0.6",
26-
"yjs": "^13.6.11"
26+
"yjs": "^13.6.12"
2727
},
2828
"devDependencies": {
2929
"@ndn/endpoint": "https://ndnts-nightly.ndn.today/endpoint.tgz",
@@ -37,7 +37,7 @@
3737
"@ndn/node-transport": "https://ndnts-nightly.ndn.today/node-transport.tgz",
3838
"@ndn/packet": "https://ndnts-nightly.ndn.today/packet.tgz",
3939
"@ndn/segmented-object": "https://ndnts-nightly.ndn.today/segmented-object.tgz",
40-
"@ndn/sync": "https://ndnts-nightly.ndn.today/sync.tgz",
40+
"@ndn/svs": "https://ndnts-nightly.ndn.today/svs.tgz",
4141
"@ndn/tlv": "https://ndnts-nightly.ndn.today/tlv.tgz",
4242
"@ndn/util": "https://ndnts-nightly.ndn.today/util.tgz",
4343
"@ndn/ws-transport": "https://ndnts-nightly.ndn.today/ws-transport.tgz",
@@ -59,7 +59,7 @@
5959
"@ndn/node-transport": ">=0.0.0",
6060
"@ndn/packet": ">=0.0.0",
6161
"@ndn/segmented-object": ">=0.0.0",
62-
"@ndn/sync": ">=0.0.0",
62+
"@ndn/svs": ">=0.0.0",
6363
"@ndn/tlv": ">=0.0.0",
6464
"@ndn/util": ">=0.0.0",
6565
"@ndn/ws-transport": ">=0.0.0"

pnpm-lock.yaml

Lines changed: 10 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/sync-agent/deliveries.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
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';
33
import { Data, digestSigning, Name, Signer, type Verifier } from '@ndn/packet';
44
import { SequenceNum } from '@ndn/naming-convention2';
55
import { Decoder, Encoder } from '@ndn/tlv';
@@ -8,17 +8,17 @@ import { getNamespace } from './namespace.ts';
88
import { Storage } from '../storage/mod.ts';
99
import { panic } from '../utils/panic.ts';
1010

11-
export function encodeSyncState(state: SvStateVector): Uint8Array {
11+
export function encodeSyncState(state: StateVector): Uint8Array {
1212
return Encoder.encode(state);
1313
}
1414

15-
export function parseSyncState(vector: Uint8Array): SvStateVector {
15+
export function parseSyncState(vector: Uint8Array): StateVector {
1616
try {
17-
const ret = Decoder.decode(vector, SvStateVector);
17+
const ret = Decoder.decode(vector, StateVector);
1818
return ret;
1919
} 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();
2222
}
2323
}
2424

@@ -42,7 +42,7 @@ export abstract class SyncDelivery implements AsyncDisposable {
4242
private _startPromiseResolve?: () => void;
4343
protected _onReset?: () => void;
4444
protected _abortController: AbortController;
45-
protected _lastTillNow: SvStateVector;
45+
protected _lastTillNow: StateVector;
4646

4747
// TODO: Use options to configure parameters
4848
constructor(
@@ -52,7 +52,7 @@ export abstract class SyncDelivery implements AsyncDisposable {
5252
readonly signer: Signer,
5353
readonly verifier: Verifier,
5454
onUpdatePromise: Promise<UpdateEvent>,
55-
protected state?: SvStateVector,
55+
protected state?: StateVector,
5656
) {
5757
// const nodeId = getNamespace().nodeIdFromSigner(this.signer.name)
5858
this.baseName = getNamespace().baseName(nodeId, syncPrefix);
@@ -63,14 +63,14 @@ export abstract class SyncDelivery implements AsyncDisposable {
6363
}
6464
});
6565
this._abortController = new AbortController();
66-
this._lastTillNow = new SvStateVector(this.state);
66+
this._lastTillNow = new StateVector(this.state);
6767

6868
SvSync.create({
6969
endpoint: endpoint,
7070
syncPrefix: syncPrefix,
7171
signer: signer,
7272
verifier: verifier,
73-
initialStateVector: new SvStateVector(state),
73+
initialStateVector: new StateVector(state),
7474
initialize: async (svSync) => {
7575
this._syncInst = svSync;
7676
this._syncInst.addEventListener('update', (update) => this.handleSyncUpdate(update));
@@ -101,7 +101,7 @@ export abstract class SyncDelivery implements AsyncDisposable {
101101
}
102102

103103
public get syncState() {
104-
return new SvStateVector(this.state);
104+
return new StateVector(this.state);
105105
}
106106

107107
/**
@@ -155,15 +155,15 @@ export abstract class SyncDelivery implements AsyncDisposable {
155155
console.warn('A Sync reset is scheduled.');
156156
this._abortController.abort('Reset');
157157
this._abortController = new AbortController();
158-
this._lastTillNow = new SvStateVector(this.state);
158+
this._lastTillNow = new StateVector(this.state);
159159
this._syncInst.close();
160160
this._syncNode = undefined;
161161
const svSync = await SvSync.create({
162162
endpoint: this.endpoint,
163163
syncPrefix: this.syncPrefix,
164164
signer: digestSigning,
165165
// We can do so because the state has not been set
166-
initialStateVector: new SvStateVector(this.state),
166+
initialStateVector: new StateVector(this.state),
167167
initialize: (svSync) => {
168168
this._syncInst = svSync;
169169
this._syncInst.addEventListener('update', (update) => this.handleSyncUpdate(update));
@@ -227,7 +227,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
227227
readonly verifier: Verifier,
228228
readonly storage: Storage,
229229
onUpdatePromise: Promise<UpdateEvent>,
230-
protected state?: SvStateVector,
230+
protected state?: StateVector,
231231
) {
232232
super(nodeId, endpoint, syncPrefix, signer, verifier, onUpdatePromise, state);
233233
}
@@ -263,7 +263,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
263263

264264
// Callback
265265
// 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
267267
await this._onUpdate!(data.content, update.id, this);
268268
}
269269
} catch (error) {
@@ -358,7 +358,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
358358
// const nodeId = getNamespace().nodeIdFromSigner(signer.name)
359359
const baseName = getNamespace().baseName(nodeId, syncPrefix);
360360
const encoded = await storage.get(getNamespace().syncStateKey(baseName));
361-
let syncState = new SvStateVector();
361+
let syncState = new StateVector();
362362
if (encoded) {
363363
syncState = parseSyncState(encoded);
364364
}
@@ -369,7 +369,7 @@ export class AtLeastOnceDelivery extends SyncDelivery {
369369
return await super.destroy(this.storage);
370370
}
371371

372-
async replay(startFrom: SvStateVector, callback: UpdateEvent) {
372+
async replay(startFrom: StateVector, callback: UpdateEvent) {
373373
for (const [key, last] of this.syncState) {
374374
const first = startFrom.get(key);
375375
const prefix = getNamespace().baseName(key, this.syncPrefix);
@@ -401,7 +401,7 @@ export class LatestOnlyDelivery extends SyncDelivery {
401401
readonly pktStorage: Storage,
402402
readonly stateStorage: Storage,
403403
readonly onUpdatePromise: Promise<UpdateEvent>,
404-
protected state?: SvStateVector,
404+
protected state?: StateVector,
405405
) {
406406
super(nodeId, endpoint, syncPrefix, signer, verifier, onUpdatePromise, state);
407407
}
@@ -467,7 +467,7 @@ export class LatestOnlyDelivery extends SyncDelivery {
467467
// const nodeId = getNamespace().nodeIdFromSigner(signer.name)
468468
const baseName = getNamespace().baseName(nodeId, syncPrefix);
469469
const encoded = await stateStorage.get(getNamespace().syncStateKey(baseName));
470-
let syncState = new SvStateVector();
470+
let syncState = new StateVector();
471471
if (encoded) {
472472
syncState = parseSyncState(encoded);
473473
}

src/sync-agent/sync-agent.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Endpoint } from '@ndn/endpoint';
22
import { Data, type Interest, Name, Signer, type Verifier } from '@ndn/packet';
33
import { Decoder, Encoder } from '@ndn/tlv';
4-
import { DataProducer, fetch, makeChunkSource } from '@ndn/segmented-object';
4+
import { BufferChunkSource, DataProducer, fetch } from '@ndn/segmented-object';
55
import { concatBuffers } from '@ndn/util';
66
import { AtLeastOnceDelivery, LatestOnlyDelivery, UpdateEvent } from './deliveries.ts';
77
import { getNamespace } from './namespace.ts';
88
import { InMemoryStorage, Storage } from '../storage/mod.ts';
9-
import { SvStateVector } from '@ndn/sync';
9+
import { StateVector } from '@ndn/svs';
1010
import { panic } from '../utils/panic.ts';
1111

1212
export type ChannelType = 'update' | 'blob' | 'status' | 'blobUpdate';
@@ -246,7 +246,7 @@ export class SyncAgent implements AsyncDisposable {
246246
await this.persistStorage.set(name.toString(), blobContent);
247247

248248
// Put segmented packets
249-
const producer = DataProducer.create(makeChunkSource(blobContent), name, { signer: this.signer });
249+
const producer = DataProducer.create(new BufferChunkSource(blobContent), name, { signer: this.signer });
250250
for await (const segment of producer.listData()) {
251251
this.persistStorage.set(segment.name.toString(), Encoder.encode(segment));
252252
}
@@ -329,13 +329,13 @@ export class SyncAgent implements AsyncDisposable {
329329
/**
330330
* Replay existing updates under specific topic
331331
*/
332-
async replayUpdates(topic: string, startFrom?: SvStateVector) {
332+
async replayUpdates(topic: string, startFrom?: StateVector) {
333333
const listener = this.listeners[`update.${topic}`];
334334
if (!listener) {
335335
throw new Error('You cannot call replayUpdates without a listener');
336336
}
337337

338-
const start = startFrom ?? new SvStateVector();
338+
const start = startFrom ?? new StateVector();
339339
await this.atLeastOnce.replay(start, async (wire, id) => {
340340
const inner = this.parseInnerData(wire);
341341
if (!inner) {
@@ -363,7 +363,7 @@ export class SyncAgent implements AsyncDisposable {
363363
}
364364

365365
public getUpdateSyncSV() {
366-
return new SvStateVector(this.atLeastOnce.syncState);
366+
return new StateVector(this.atLeastOnce.syncState);
367367
}
368368

369369
static async create(

0 commit comments

Comments
 (0)