Skip to content

Commit

Permalink
Prepare for publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
sgwilym committed Nov 17, 2022
1 parent 9301654 commit da19470
Show file tree
Hide file tree
Showing 9 changed files with 147 additions and 155 deletions.
57 changes: 57 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/>

Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.

This version of the GNU Lesser General Public License incorporates the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below.

0. Additional Definitions.
As used herein, “this License” refers to version 3 of the GNU Lesser General Public License, and the “GNU GPL” refers to version 3 of the GNU General Public License.

“The Library” refers to a covered work governed by this License, other than an Application or a Combined Work as defined below.

An “Application” is any work that makes use of an interface provided by the Library, but which is not otherwise based on the Library. Defining a subclass of a class defined by the Library is deemed a mode of using an interface provided by the Library.

A “Combined Work” is a work produced by combining or linking an Application with the Library. The particular version of the Library with which the Combined Work was made is also called the “Linked Version”.

The “Minimal Corresponding Source” for a Combined Work means the Corresponding Source for the Combined Work, excluding any source code for portions of the Combined Work that, considered in isolation, are based on the Application, and not on the Linked Version.

The “Corresponding Application Code” for a Combined Work means the object code and/or source code for the Application, including any data and utility programs needed for reproducing the Combined Work from the Application, but excluding the System Libraries of the Combined Work.

1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License without being bound by section 3 of the GNU GPL.

2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a facility refers to a function or data to be supplied by an Application that uses the facility (other than as an argument passed when the facility is invoked), then you may convey a copy of the modified version:

a) under this License, provided that you make a good faith effort to ensure that, in the event an Application does not supply the function or data, the facility still operates, and performs whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from a header file that is part of the Library. You may convey such object code under terms of your choice, provided that, if the incorporated material is not limited to numerical parameters, data structure layouts and accessors, or small macros, inline functions and templates (ten or fewer lines in length), you do both of the following:

a) Give prominent notice with each copy of the object code that the Library is used in it and that the Library and its use are covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this license document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken together, effectively do not restrict modification of the portions of the Library contained in the Combined Work and reverse engineering for debugging such modifications, if you also do each of the following:

a) Give prominent notice with each copy of the Combined Work that the Library is used in it and that the Library and its use are covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this license document.
c) For a Combined Work that displays copyright notices during execution, include the copyright notice for the Library among these notices, as well as a reference directing the user to the copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of this License, and the Corresponding Application Code in a form suitable for, and under terms that permit, the user to recombine or relink the Application with a modified version of the Linked Version to produce a modified Combined Work, in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.
1) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (a) uses at run time a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked Version.
e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the GNU GPL, and only to the extent that such information is necessary to install and execute a modified version of the Combined Work produced by recombining or relinking the Application with a modified version of the Linked Version. (If you use option 4d0, the Installation Information must accompany the Minimal Corresponding Source and Corresponding Application Code. If you use option 4d1, you must provide the Installation Information in the manner specified by section 6 of the GNU GPL for conveying Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the Library side by side in a single library together with other library facilities that are not Applications and are not covered by this License, and convey such a combined library under terms of your choice, if you do both of the following:

a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities, conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions of the GNU Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number. If the Library as you received it specifies that a certain numbered version of the GNU Lesser General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that published version or of any later version published by the Free Software Foundation. If the Library as you received it does not specify a version number of the GNU Lesser General Public License, you may choose any version of the GNU Lesser General Public License ever published by the Free Software Foundation.

If the Library as you received it specifies that a proxy can decide whether future versions of the GNU Lesser General Public License shall apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library.

69 changes: 45 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Range-based set reconciliation
# range_reconcile

A module for the efficient reconciliation of sets. This is a TypeScript
implementation of range-based set reconciliation as described in
Expand All @@ -10,14 +10,14 @@ totally ordered set.
When two ranges from different peers hold the same items, they produce the same
fingerprint.

But when two ranges from different peers are different from one another, they
produce different fingeprints. The two peers then subdivide non-matching ranges,
generating and comparing fingerprints until the ranges are whittled down to the
disjoint elements, which are then exchanged.
But when two ranges are different from one another, they produce different
fingeprints. The two peers then subdivide non-matching ranges, generating and
comparing fingerprints until the ranges are whittled down to the disjoint
elements, which are then exchanged.

## About this implementation

This implementation of this implementation has the following features:
This implementation has the following features:

- A reasonably fast self-balancing `FingerprintTree` built upon Deno's std
`RedBlackTree`. This is used to hold your set's values and generate
Expand All @@ -33,7 +33,7 @@ This implementation of this implementation has the following features:
method which takes and returns an encoded message, which you then transport to
the other peer in whichever way you prefer.

One caveat: the `FingerprintTree` provided by this module can only persist its
One caveat: the `FingerprintTree` provided by this module can only store its
values in memory.

## Using this moudule
Expand All @@ -49,24 +49,39 @@ At the broadest level:

### Detailed usage

### Importing

```js
import {
FingerprintTree,
RangeMessenger,
} from "https://deno.land/x/range_reconcile/mod.ts";
```

NPM distribution coming soon!

#### FingerprintTree

The `FingerprintTree` is used as the representation of a set you wish to
reconcile. Instantiation requires a 'lifting monoid' to be provided, and
optionally a function with which to compare inserted values.

The lifting monoid must satisfy the following criteria:
This lifting monoid is important because it is used to generate the fingerprints
which peers exchange and compare their own fingerprints to.

Therefore the lifting monoid **must** satisfy the following criteria:

1. The lift method should create a unique value within the universe of the set,
where each possible value of the set has a unique lifted value (must ask
aljoscha to get this right, I know this isn't)
1. The lift method must map every item that could possibly occur in a set to a
value from the monoid, that is, to a value that can be combined with other
such values according to the next two rules. `lift(item)` is the fingerprint
of the set that contains only item. For larger sets, the fingerprint is
computed by `combine`ing the results of `lift(item)` of all the individual
items in the larger set.
2. The combine method must be associative — i.e.
`combine(a, combine(b, c)) === combine(combine(a, b), c)`
3. The neutral method is a constant value which does not affect the outcome of
the combine method (ask... aljoscha...)

If no comparison function is provided, `FingerprintTree` will use JavaScript's
built in comparison instead. You have been warned!
3. The neutral value must be a value from the monoid that leaves other (monoid)
values unaffected when combining them with it: combine(a, neutral) === a and
combine(neutral, a) === a.

#### RangeMessenger

Expand All @@ -77,13 +92,13 @@ peer.
This `RangeMessenger` requires a configuration which describes how to decode and
encode messages from and to the other peer respectively.

Once instantiated, the initial messages to send the other peer can be generated
with the `initialMessages` method.
Once instantiated, the initial messages to send to the other peer can be
generated with the `initialMessages` method.

Upon receiving a message, it should be passed to `RangeMessenger.respond`, which
returns the response to be sent back in turn.

How messages are sent and received are up to you. Just make sure that whichever
How messages are sent and received is up to you. Just make sure that whichever
system you choose sends and processes the messages in order (i.e. first-in,
first-out).

Expand All @@ -92,15 +107,21 @@ first-out).
This module uses Deno as its development runtime.
[Installation instructions can be found here](https://deno.land/#installation).

Documentation can be viewed with `deno doc mod.ts`.
API documentation can be viewed with `deno doc mod.ts`.

Tests can be run with `deno task test`.

Benchmarks can be run with `deno task bench`.

## TODO
## Acknowledgements

- [Aljoscha Meyer](https://aljoscha-meyer.de), who not only designed this new
method, but also answered my many, many questions; spotted my errors;
suggested improvements; and been an all-round great friend and teacher.
- [NLnet foundation](https://nlnet.nl), whose funding made it possible for me to
work on this.

TODO:

- [ ] Make b and k of MessageBroker configurable.
- [ ] Create comparative benchmarks for syncing with changing b / k.
- [ ] Add `onInsertedValue` callback subscriber to `RangeMessenger` (i.e. to
trigger Earthstar checking if it wants a doc thumbnail)
- [ ] Create a NPM distribution and publish it.
10 changes: 9 additions & 1 deletion src/fingerprint_tree/fingerprint_tree.bench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,15 @@ const sizes = [1, 10, 100, 1000, 10000];
for (const size of sizes) {
const set = makeSet(size);

const tree = new FingerprintTree(concatMonoid);
const tree = new FingerprintTree(concatMonoid, (a, b) => {
if (a > b) {
return 1;
} else if (a < b) {
return -1;
} else {
return 0;
}
});
const rbTree = new RedBlackTree();

Deno.bench(`Insert into RedBlackTree (${size} items)`, {
Expand Down
9 changes: 9 additions & 0 deletions src/fingerprint_tree/fingerprint_tree.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ const rangeVectors: RangeVector[] = [
Deno.test("FingerprintTree", () => {
const tree = new FingerprintTree(
concatMonoid,
(a, b) => {
if (a > b) {
return 1;
} else if (a < b) {
return -1;
} else {
return 0;
}
},
);

const set = ["a", "b", "c", "d", "e", "f", "g"];
Expand Down
2 changes: 1 addition & 1 deletion src/fingerprint_tree/fingerprint_tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ export class FingerprintTree<ValueType, LiftedType>
/** The lifting monoid which is used to label nodes and derive fingerprints from ranges. */
monoid: LiftingMonoid<ValueType, LiftedType>,
/** A function to sort values by. Will use JavaScript's default comparison if not provided. */
compare?: (a: ValueType, b: ValueType) => number,
compare: (a: ValueType, b: ValueType) => number,
) {
super(compare);

Expand Down
20 changes: 0 additions & 20 deletions src/lifting_monoid.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { xxHash32 } from "https://raw.githubusercontent.com/gnlow/deno-xxhash/master/mod.ts";

export type LiftingMonoid<ValueType, LiftedType> = {
lift: (i: ValueType) => LiftedType;
combine: (
Expand Down Expand Up @@ -46,21 +44,3 @@ export const sizeMonoid: LiftingMonoid<unknown, number> = {
combine: (a: number, b: number) => a + b,
neutral: 0,
};

/** A monoid which lifts using xxHash32, and combines the resulting hash using a bitwise XOR.*/
export const xxHash32XorMonoid: LiftingMonoid<Uint8Array, Uint8Array> = {
lift: (v: Uint8Array) => {
const hash = xxHash32(v).toString(16);
return new TextEncoder().encode(hash);
},
combine: (a: Uint8Array, b: Uint8Array) => {
const xored = [];

for (let i = 0; i < a.length; i++) {
xored.push(a[i] ^ b[i]);
}

return new Uint8Array(xored);
},
neutral: new Uint8Array(8),
};
18 changes: 14 additions & 4 deletions src/range_messenger/range_messenger.bench.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,32 +22,42 @@ function nativeEquals(a: string, b: string) {
return a === b;
}

function compare<T>(a: T, b: T) {
if (a > b) {
return 1;
} else if (a < b) {
return -1;
} else {
return 0;
}
}

for (const size of sizes) {
const setA = makeSet(size);
const setB = makeSet(size);

Deno.bench(`Instantiate two sets (size ${size})`, () => {
const treeA = new FingerprintTree(concatMonoid);
const treeA = new FingerprintTree(concatMonoid, compare);

for (const item of setA) {
treeA.insert(`${item}`);
}

const treeB = new FingerprintTree(concatMonoid);
const treeB = new FingerprintTree(concatMonoid, compare);

for (const item of setB) {
treeB.insert(`${item}`);
}
});

Deno.bench(`Instantiate and sync two sets (size ${size})`, async () => {
const treeA = new FingerprintTree(concatMonoid);
const treeA = new FingerprintTree(concatMonoid, compare);

for (const item of setA) {
treeA.insert(`${item}`);
}

const treeB = new FingerprintTree(concatMonoid);
const treeB = new FingerprintTree(concatMonoid, compare);

for (const item of setB) {
treeB.insert(`${item}`);
Expand Down
14 changes: 12 additions & 2 deletions src/range_messenger/range_messenger.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ function multiplyElements(elements: string[], by: number): string[] {

const elements = ["ape", "bee", "cat", "doe", "eel", "fox", "gnu", "hog"];

function compare<T>(a: T, b: T) {
if (a > b) {
return 1;
} else if (a < b) {
return -1;
} else {
return 0;
}
}

function createTestSet() {
const baseCount = Math.floor(Math.random() * 8);

Expand All @@ -45,7 +55,7 @@ function nativeEquals(a: string, b: string) {
}

async function createTestCase() {
const treeA = new FingerprintTree(concatMonoid);
const treeA = new FingerprintTree(concatMonoid, compare);

const setA = createTestSet();

Expand All @@ -63,7 +73,7 @@ async function createTestCase() {

// Other peer

const treeB = new FingerprintTree(concatMonoid);
const treeB = new FingerprintTree(concatMonoid, compare);

const setB = createTestSet();

Expand Down
Loading

0 comments on commit da19470

Please sign in to comment.