@dxos/feed-store 2.33.5-dev.22471d71 → 2.33.5-dev.33d2877e
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/benchmark.js +22 -26
- package/dist/src/benchmark.js.map +1 -1
- package/dist/src/create-batch-stream.d.ts +1 -1
- package/dist/src/create-batch-stream.d.ts.map +1 -1
- package/dist/src/create-batch-stream.js +14 -14
- package/dist/src/create-batch-stream.js.map +1 -1
- package/dist/src/create-batch-stream.test.js +2 -4
- package/dist/src/create-batch-stream.test.js.map +1 -1
- package/dist/src/feed-descriptor.d.ts +3 -3
- package/dist/src/feed-descriptor.d.ts.map +1 -1
- package/dist/src/feed-descriptor.js +13 -3
- package/dist/src/feed-descriptor.js.map +1 -1
- package/dist/src/feed-descriptor.test.js +10 -10
- package/dist/src/feed-descriptor.test.js.map +1 -1
- package/dist/src/feed-store.d.ts +5 -5
- package/dist/src/feed-store.d.ts.map +1 -1
- package/dist/src/feed-store.js +8 -8
- package/dist/src/feed-store.js.map +1 -1
- package/dist/src/feed-store.test.js +16 -39
- package/dist/src/feed-store.test.js.map +1 -1
- package/dist/src/stream.d.ts +4 -4
- package/dist/src/stream.d.ts.map +1 -1
- package/dist/src/stream.js +34 -42
- package/dist/src/stream.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +6 -6
- package/src/benchmark.ts +24 -28
- package/src/create-batch-stream.test.ts +2 -4
- package/src/create-batch-stream.ts +15 -15
- package/src/feed-descriptor.test.ts +10 -10
- package/src/feed-descriptor.ts +30 -7
- package/src/feed-store.test.ts +19 -48
- package/src/feed-store.ts +10 -10
- package/src/stream.ts +32 -40
package/dist/src/benchmark.js
CHANGED
|
@@ -17,39 +17,35 @@ void (async () => {
|
|
|
17
17
|
throw new Error('messages amount expected incorrect');
|
|
18
18
|
}
|
|
19
19
|
};
|
|
20
|
-
const fs = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('.benchmark'), { valueEncoding: 'utf8' });
|
|
20
|
+
const fs = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('').directory('.benchmark'), { valueEncoding: 'utf8' });
|
|
21
21
|
const suite = new benchmark_suite_1.Suite(fs, { maxFeeds, maxMessages });
|
|
22
|
-
suite.beforeAll(() => {
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
feed.append(`${name}/${i}`, (err) => {
|
|
30
|
-
if (err) {
|
|
31
|
-
return reject(err);
|
|
32
|
-
}
|
|
33
|
-
resolve();
|
|
34
|
-
});
|
|
35
|
-
});
|
|
36
|
-
}
|
|
37
|
-
return feed;
|
|
38
|
-
}));
|
|
39
|
-
});
|
|
40
|
-
suite.test('getBatch', async () => {
|
|
41
|
-
let count = 0;
|
|
42
|
-
await Promise.all(Array.from(fs._descriptors.values()).map(({ feed }) => {
|
|
43
|
-
return new Promise((resolve, reject) => {
|
|
44
|
-
feed.getBatch(0, maxMessages, (err, result) => {
|
|
45
|
-
count += result.length;
|
|
22
|
+
suite.beforeAll(() => Promise.all(range(maxFeeds).map(async (i) => {
|
|
23
|
+
const name = `feed/${i}`;
|
|
24
|
+
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
25
|
+
const { feed } = await fs.openReadWriteFeed(crypto_1.PublicKey.from(publicKey), secretKey);
|
|
26
|
+
for (let i = 0; i < maxMessages; i++) {
|
|
27
|
+
await new Promise((resolve, reject) => {
|
|
28
|
+
feed.append(`${name}/${i}`, (err) => {
|
|
46
29
|
if (err) {
|
|
47
30
|
return reject(err);
|
|
48
31
|
}
|
|
49
32
|
resolve();
|
|
50
33
|
});
|
|
51
34
|
});
|
|
52
|
-
}
|
|
35
|
+
}
|
|
36
|
+
return feed;
|
|
37
|
+
})));
|
|
38
|
+
suite.test('getBatch', async () => {
|
|
39
|
+
let count = 0;
|
|
40
|
+
await Promise.all(Array.from(fs._descriptors.values()).map(({ feed }) => new Promise((resolve, reject) => {
|
|
41
|
+
feed.getBatch(0, maxMessages, (err, result) => {
|
|
42
|
+
count += result.length;
|
|
43
|
+
if (err) {
|
|
44
|
+
return reject(err);
|
|
45
|
+
}
|
|
46
|
+
resolve();
|
|
47
|
+
});
|
|
48
|
+
})));
|
|
53
49
|
check(count);
|
|
54
50
|
});
|
|
55
51
|
const results = await suite.run();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"benchmark.js","sourceRoot":"","sources":["../../src/benchmark.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;AAEF,2DAA8C;AAC9C,yCAAwD;AACxD,mFAAkE;AAElE,6CAAyC;AAEzC,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;AAElD,KAAK,CAAC,KAAK,IAAI,EAAE;IACf,MAAM,QAAQ,GAAG,CAAC,CAAC;IACnB,MAAM,WAAW,GAAG,IAAI,CAAC;IACzB,MAAM,gBAAgB,GAAG,QAAQ,GAAG,WAAW,CAAC;IAEhD,MAAM,KAAK,GAAG,CAAC,KAAa,EAAE,EAAE;QAC9B,IAAI,KAAK,KAAK,gBAAgB,EAAE;YAC9B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACvD;IACH,CAAC,CAAC;IAEF,MAAM,EAAE,GAAG,IAAI,sBAAS,CAAC,IAAA,2CAAa,EAAC,YAAY,CAAC,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"benchmark.js","sourceRoot":"","sources":["../../src/benchmark.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,5 +9,5 @@ export interface CreateBatchStreamOptions {
|
|
|
9
9
|
metadata?: any;
|
|
10
10
|
tail?: boolean;
|
|
11
11
|
}
|
|
12
|
-
export declare
|
|
12
|
+
export declare const createBatchStream: (feed: HypercoreFeed, opts?: CreateBatchStreamOptions) => NodeJS.ReadableStream;
|
|
13
13
|
//# sourceMappingURL=create-batch-stream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-batch-stream.d.ts","sourceRoot":"","sources":["../../src/create-batch-stream.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,
|
|
1
|
+
{"version":3,"file":"create-batch-stream.d.ts","sourceRoot":"","sources":["../../src/create-batch-stream.ts"],"names":[],"mappings":";AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,WAAW,wBAAwB;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,iBAAiB,SAAU,aAAa,SAAQ,wBAAwB,0BA8HpF,CAAC"}
|
|
@@ -9,7 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.createBatchStream = void 0;
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const from2_1 = __importDefault(require("from2"));
|
|
12
|
-
|
|
12
|
+
const createBatchStream = (feed, opts = {}) => {
|
|
13
13
|
(0, assert_1.default)(!opts.batch || opts.batch > 0, 'batch must be major or equal to 1');
|
|
14
14
|
let start = opts.start || 0;
|
|
15
15
|
let end = typeof opts.end === 'number' ? opts.end : -1;
|
|
@@ -23,8 +23,7 @@ function createBatchStream(feed, opts = {}) {
|
|
|
23
23
|
let first = true;
|
|
24
24
|
let firstSyncEnd = end;
|
|
25
25
|
let range = feed.download({ start, end, linear: true });
|
|
26
|
-
|
|
27
|
-
function read(size, cb) {
|
|
26
|
+
const read = (size, cb) => {
|
|
28
27
|
if (!feed.opened) {
|
|
29
28
|
return open(size, cb);
|
|
30
29
|
}
|
|
@@ -85,8 +84,8 @@ function createBatchStream(feed, opts = {}) {
|
|
|
85
84
|
}
|
|
86
85
|
cb(null, messages.map(buildMessage));
|
|
87
86
|
});
|
|
88
|
-
}
|
|
89
|
-
|
|
87
|
+
};
|
|
88
|
+
const buildMessage = (data) => {
|
|
90
89
|
const message = {
|
|
91
90
|
key: feed.key,
|
|
92
91
|
seq: seq++,
|
|
@@ -95,23 +94,23 @@ function createBatchStream(feed, opts = {}) {
|
|
|
95
94
|
...metadata
|
|
96
95
|
};
|
|
97
96
|
return message;
|
|
98
|
-
}
|
|
99
|
-
|
|
97
|
+
};
|
|
98
|
+
const cleanup = () => {
|
|
100
99
|
if (!range) {
|
|
101
100
|
return;
|
|
102
101
|
}
|
|
103
102
|
feed.undownload(range);
|
|
104
103
|
range = null;
|
|
105
|
-
}
|
|
106
|
-
|
|
107
|
-
feed.ready(
|
|
104
|
+
};
|
|
105
|
+
const open = (size, cb) => {
|
|
106
|
+
feed.ready((err) => {
|
|
108
107
|
if (err) {
|
|
109
108
|
return cb(err);
|
|
110
109
|
}
|
|
111
110
|
read(size, cb);
|
|
112
111
|
});
|
|
113
|
-
}
|
|
114
|
-
|
|
112
|
+
};
|
|
113
|
+
const setStart = (value) => {
|
|
115
114
|
const prevStart = start;
|
|
116
115
|
start = value;
|
|
117
116
|
range.start = start;
|
|
@@ -119,7 +118,8 @@ function createBatchStream(feed, opts = {}) {
|
|
|
119
118
|
range.iterator.start = start;
|
|
120
119
|
}
|
|
121
120
|
return prevStart;
|
|
122
|
-
}
|
|
123
|
-
|
|
121
|
+
};
|
|
122
|
+
return from2_1.default.obj(read).on('end', cleanup).on('close', cleanup);
|
|
123
|
+
};
|
|
124
124
|
exports.createBatchStream = createBatchStream;
|
|
125
125
|
//# sourceMappingURL=create-batch-stream.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-batch-stream.js","sourceRoot":"","sources":["../../src/create-batch-stream.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA+B;
|
|
1
|
+
{"version":3,"file":"create-batch-stream.js","sourceRoot":"","sources":["../../src/create-batch-stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,14 +13,12 @@ const random_access_multi_storage_1 = require("@dxos/random-access-multi-storage
|
|
|
13
13
|
const create_batch_stream_1 = require("./create-batch-stream");
|
|
14
14
|
const feed_store_1 = require("./feed-store");
|
|
15
15
|
const createFeed = async () => {
|
|
16
|
-
const feedStore = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM), { valueEncoding: 'utf-8' });
|
|
16
|
+
const feedStore = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'), { valueEncoding: 'utf-8' });
|
|
17
17
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
18
18
|
const { feed } = await feedStore.openReadWriteFeed(crypto_1.PublicKey.from(publicKey), secretKey);
|
|
19
19
|
return feed;
|
|
20
20
|
};
|
|
21
|
-
const append = (feed, message) =>
|
|
22
|
-
return (0, pify_1.default)(feed.append.bind(feed))(message);
|
|
23
|
-
};
|
|
21
|
+
const append = (feed, message) => (0, pify_1.default)(feed.append.bind(feed))(message);
|
|
24
22
|
describe('Batch stream', () => {
|
|
25
23
|
test('Single message', async () => {
|
|
26
24
|
const feed = await createFeed();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-batch-stream.test.js","sourceRoot":"","sources":["../../src/create-batch-stream.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,gDAAwB;AACxB,sEAA4C;AAE5C,yCAAwD;AACxD,mFAA+E;AAE/E,+DAA0D;AAC1D,6CAAyC;AAGzC,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;IAC5B,MAAM,SAAS,GAAG,IAAI,sBAAS,CAAC,IAAA,2CAAa,EAAC,EAAE,EAAE,yCAAW,CAAC,GAAG,CAAC,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"create-batch-stream.test.js","sourceRoot":"","sources":["../../src/create-batch-stream.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { PublicKey } from '@dxos/crypto';
|
|
3
|
-
import type {
|
|
3
|
+
import type { Directory } from '@dxos/random-access-multi-storage';
|
|
4
4
|
import type { HypercoreFeed, Hypercore } from './hypercore-types';
|
|
5
5
|
import type { ValueEncoding } from './types';
|
|
6
6
|
interface FeedDescriptorOptions {
|
|
7
|
-
|
|
7
|
+
directory: Directory;
|
|
8
8
|
key: PublicKey;
|
|
9
9
|
hypercore: Hypercore;
|
|
10
10
|
secretKey?: Buffer;
|
|
@@ -17,7 +17,7 @@ interface FeedDescriptorOptions {
|
|
|
17
17
|
* Abstract handler for an Hypercore instance.
|
|
18
18
|
*/
|
|
19
19
|
export declare class FeedDescriptor {
|
|
20
|
-
private readonly
|
|
20
|
+
private readonly _directory;
|
|
21
21
|
private readonly _key;
|
|
22
22
|
private readonly _secretKey?;
|
|
23
23
|
private readonly _valueEncoding?;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-descriptor.d.ts","sourceRoot":"","sources":["../../src/feed-descriptor.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"feed-descriptor.d.ts","sourceRoot":"","sources":["../../src/feed-descriptor.ts"],"names":[],"mappings":";AAUA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,UAAU,qBAAqB;IAC7B,SAAS,EAAE,SAAS,CAAC;IACrB,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED;;;;GAIG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAS;IACrC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAgB;IAChD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAY;IACvC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAO;IAC7B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAU;IAE1C,OAAO,CAAC,KAAK,CAAuB;gBAEvB,OAAO,EAAE,qBAAqB;IAsB3C,IAAI,IAAI,IAAK,aAAa,CAGzB;IAED,IAAI,MAAM,YAET;IAED,IAAI,GAAG,cAEN;IAED,IAAI,SAAS,uBAEZ;IAED,IAAI,aAAa,8BAEhB;IAED,IAAI,QAAQ,YAEX;IAED;;;;;OAKG;IACG,IAAI,IAAK,OAAO,CAAC,aAAa,CAAC;IAWrC;;OAEG;IACG,KAAK;IAUX;;;OAGG;IAEH,OAAO,CAAC,cAAc;YAeR,KAAK;IAcnB,MAAM,CAAE,OAAO,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;CAIrC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -10,6 +10,7 @@ exports.FeedDescriptor = void 0;
|
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const hypercore_1 = __importDefault(require("hypercore"));
|
|
12
12
|
const pify_1 = __importDefault(require("pify"));
|
|
13
|
+
const util_1 = require("util");
|
|
13
14
|
const async_1 = require("@dxos/async");
|
|
14
15
|
/**
|
|
15
16
|
* FeedDescriptor
|
|
@@ -18,8 +19,8 @@ const async_1 = require("@dxos/async");
|
|
|
18
19
|
*/
|
|
19
20
|
class FeedDescriptor {
|
|
20
21
|
constructor(options) {
|
|
21
|
-
const {
|
|
22
|
-
this.
|
|
22
|
+
const { directory, key, secretKey, valueEncoding, hypercore = hypercore_1.default, disableSigning = false } = options;
|
|
23
|
+
this._directory = directory;
|
|
23
24
|
this._valueEncoding = valueEncoding;
|
|
24
25
|
this._hypercore = hypercore;
|
|
25
26
|
this._key = key;
|
|
@@ -80,7 +81,16 @@ class FeedDescriptor {
|
|
|
80
81
|
*/
|
|
81
82
|
_createStorage(dir = '') {
|
|
82
83
|
return (name) => {
|
|
83
|
-
|
|
84
|
+
const file = this._directory.createOrOpen(`${dir}/${name}`);
|
|
85
|
+
// Separation between our internal File API and Hypercore's.
|
|
86
|
+
return {
|
|
87
|
+
read: (0, util_1.callbackify)(file.read.bind(file)),
|
|
88
|
+
write: (0, util_1.callbackify)(file.write.bind(file)),
|
|
89
|
+
del: (0, util_1.callbackify)(file.truncate.bind(file)),
|
|
90
|
+
stat: (0, util_1.callbackify)(file.stat.bind(file)),
|
|
91
|
+
close: (0, util_1.callbackify)(file.close.bind(file)),
|
|
92
|
+
destroy: (0, util_1.callbackify)(file.delete.bind(file))
|
|
93
|
+
};
|
|
84
94
|
};
|
|
85
95
|
}
|
|
86
96
|
async _open() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-descriptor.js","sourceRoot":"","sources":["../../src/feed-descriptor.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,0DAAyC;AACzC,gDAAwB;
|
|
1
|
+
{"version":3,"file":"feed-descriptor.js","sourceRoot":"","sources":["../../src/feed-descriptor.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ describe('FeedDescriptor', () => {
|
|
|
19
19
|
beforeEach(async () => {
|
|
20
20
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
21
21
|
fd = new feed_descriptor_1.default({
|
|
22
|
-
|
|
22
|
+
directory: (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'),
|
|
23
23
|
key: crypto_1.PublicKey.from(publicKey),
|
|
24
24
|
secretKey,
|
|
25
25
|
hypercore: hypercore_1.default
|
|
@@ -37,14 +37,14 @@ describe('FeedDescriptor', () => {
|
|
|
37
37
|
// When this behaviour was changed, suddenly `protocol-plugin-replicator` tests started hanging forever on network generation.
|
|
38
38
|
const { publicKey } = (0, crypto_1.createKeyPair)();
|
|
39
39
|
const key = crypto_1.PublicKey.from(publicKey);
|
|
40
|
-
const fd = new feed_descriptor_1.default({ key,
|
|
40
|
+
const fd = new feed_descriptor_1.default({ key, directory: (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.NODE).directory('feed'), hypercore: hypercore_1.default });
|
|
41
41
|
expect(fd.key).toEqual(key);
|
|
42
42
|
expect(fd.secretKey).toBeUndefined();
|
|
43
43
|
});
|
|
44
44
|
test('Create custom options', () => {
|
|
45
45
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
46
46
|
const fd = new feed_descriptor_1.default({
|
|
47
|
-
|
|
47
|
+
directory: (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'),
|
|
48
48
|
key: crypto_1.PublicKey.from(publicKey),
|
|
49
49
|
secretKey,
|
|
50
50
|
valueEncoding: 'json',
|
|
@@ -77,7 +77,7 @@ describe('FeedDescriptor', () => {
|
|
|
77
77
|
// If we try to close a feed that is opening should wait for the open result.
|
|
78
78
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
79
79
|
const fd2 = new feed_descriptor_1.default({
|
|
80
|
-
|
|
80
|
+
directory: (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'),
|
|
81
81
|
key: crypto_1.PublicKey.from(publicKey),
|
|
82
82
|
secretKey,
|
|
83
83
|
hypercore: hypercore_1.default
|
|
@@ -90,7 +90,7 @@ describe('FeedDescriptor', () => {
|
|
|
90
90
|
const root = tempy_1.default.directory();
|
|
91
91
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
92
92
|
const fd = new feed_descriptor_1.default({
|
|
93
|
-
|
|
93
|
+
directory: (0, random_access_multi_storage_1.createStorage)(root, random_access_multi_storage_1.StorageType.NODE).directory('feed'),
|
|
94
94
|
key: crypto_1.PublicKey.from(publicKey),
|
|
95
95
|
secretKey,
|
|
96
96
|
valueEncoding: 'utf-8',
|
|
@@ -110,7 +110,7 @@ describe('FeedDescriptor', () => {
|
|
|
110
110
|
test('on open error should unlock the resource', async () => {
|
|
111
111
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
112
112
|
const fd = new feed_descriptor_1.default({
|
|
113
|
-
|
|
113
|
+
directory: (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'),
|
|
114
114
|
key: crypto_1.PublicKey.from(publicKey),
|
|
115
115
|
secretKey,
|
|
116
116
|
hypercore: () => {
|
|
@@ -122,16 +122,16 @@ describe('FeedDescriptor', () => {
|
|
|
122
122
|
test('on close error should unlock the resource', async () => {
|
|
123
123
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
124
124
|
const fd = new feed_descriptor_1.default({
|
|
125
|
-
|
|
125
|
+
directory: (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'),
|
|
126
126
|
key: crypto_1.PublicKey.from(publicKey),
|
|
127
127
|
secretKey,
|
|
128
128
|
hypercore: () => ({
|
|
129
129
|
opened: true,
|
|
130
|
-
on() { },
|
|
131
|
-
ready(cb) {
|
|
130
|
+
on: () => { },
|
|
131
|
+
ready: (cb) => {
|
|
132
132
|
cb();
|
|
133
133
|
},
|
|
134
|
-
close() {
|
|
134
|
+
close: () => {
|
|
135
135
|
throw new Error('close error');
|
|
136
136
|
}
|
|
137
137
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-descriptor.test.js","sourceRoot":"","sources":["../../src/feed-descriptor.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,0CAA0C;AAE1C,oDAA4B;AAC5B,0DAAyC;AACzC,gDAAwB;AACxB,kDAA0B;AAE1B,yCAAwD;AACxD,mFAA+E;AAE/E,wEAA+C;AAE/C,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,IAAI,EAAkB,CAAC;IAEvB,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,IAAA,sBAAa,GAAE,CAAC;QACjD,EAAE,GAAG,IAAI,yBAAc,CAAC;YACtB,
|
|
1
|
+
{"version":3,"file":"feed-descriptor.test.js","sourceRoot":"","sources":["../../src/feed-descriptor.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/feed-store.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
3
|
import { PublicKey } from '@dxos/crypto';
|
|
4
|
-
import {
|
|
4
|
+
import { Directory } from '@dxos/random-access-multi-storage';
|
|
5
5
|
import FeedDescriptor from './feed-descriptor';
|
|
6
6
|
import type { Hypercore } from './hypercore-types';
|
|
7
7
|
import type { ValueEncoding } from './types';
|
|
@@ -33,7 +33,7 @@ export interface FeedStoreOptions {
|
|
|
33
33
|
* into a persist repository storage.
|
|
34
34
|
*/
|
|
35
35
|
export declare class FeedStore {
|
|
36
|
-
private
|
|
36
|
+
private _directory;
|
|
37
37
|
private _valueEncoding;
|
|
38
38
|
private _hypercore;
|
|
39
39
|
private _descriptors;
|
|
@@ -42,14 +42,14 @@ export declare class FeedStore {
|
|
|
42
42
|
*/
|
|
43
43
|
readonly feedOpenedEvent: Event<FeedDescriptor>;
|
|
44
44
|
/**
|
|
45
|
-
* @param
|
|
45
|
+
* @param directory RandomAccessStorage to use by default by the feeds.
|
|
46
46
|
* @param options Feedstore options.
|
|
47
47
|
*/
|
|
48
|
-
constructor(
|
|
48
|
+
constructor(directory: Directory, options?: FeedStoreOptions);
|
|
49
49
|
/**
|
|
50
50
|
* @type {RandomAccessStorage}
|
|
51
51
|
*/
|
|
52
|
-
get storage():
|
|
52
|
+
get storage(): Directory;
|
|
53
53
|
close(): Promise<void>;
|
|
54
54
|
/**
|
|
55
55
|
* Create a feed to Feedstore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-store.d.ts","sourceRoot":"","sources":["../../src/feed-store.ts"],"names":[],"mappings":";AAOA,OAAO,EAAgB,KAAK,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"feed-store.d.ts","sourceRoot":"","sources":["../../src/feed-store.ts"],"names":[],"mappings":";AAOA,OAAO,EAAgB,KAAK,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAE9D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAE7C,MAAM,WAAW,uBAAuB;IACtC,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,GAAG,EAAE,SAAS,CAAC;IACf,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,yBAAyB;IACxC,GAAG,EAAE,SAAS,CAAA;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B;;OAEG;IACH,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED;;;;;GAKG;AACH,qBAAa,SAAS;IACpB,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,YAAY,CAA8B;IAElD;;OAEG;IACH,QAAQ,CAAC,eAAe,wBAA+B;IAEvD;;;OAGG;gBACU,SAAS,EAAE,SAAS,EAAE,OAAO,GAAE,gBAAqB;IAgBjE;;OAEG;IACH,IAAI,OAAO,cAEV;IAGK,KAAK;IAKX;;OAEG;IACG,iBAAiB,CAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAQpF;;OAEG;IACG,gBAAgB,CAAE,GAAG,EAAE,SAAS,GAAG,OAAO,CAAC,cAAc,CAAC;IAKhE;;OAEG;YACW,iBAAiB;CAqBhC"}
|
package/dist/src/feed-store.js
CHANGED
|
@@ -25,16 +25,16 @@ const feed_descriptor_1 = __importDefault(require("./feed-descriptor"));
|
|
|
25
25
|
*/
|
|
26
26
|
class FeedStore {
|
|
27
27
|
/**
|
|
28
|
-
* @param
|
|
28
|
+
* @param directory RandomAccessStorage to use by default by the feeds.
|
|
29
29
|
* @param options Feedstore options.
|
|
30
30
|
*/
|
|
31
|
-
constructor(
|
|
31
|
+
constructor(directory, options = {}) {
|
|
32
32
|
/**
|
|
33
33
|
* Is emitted when a new feed represented by FeedDescriptor is opened.
|
|
34
34
|
*/
|
|
35
35
|
this.feedOpenedEvent = new async_1.Event();
|
|
36
|
-
(0, assert_1.default)(
|
|
37
|
-
this.
|
|
36
|
+
(0, assert_1.default)(directory, 'The storage is required.');
|
|
37
|
+
this._directory = directory;
|
|
38
38
|
const { valueEncoding, hypercore = hypercore_1.default } = options;
|
|
39
39
|
this._valueEncoding = valueEncoding && patchBufferCodec(valueEncoding);
|
|
40
40
|
this._hypercore = hypercore;
|
|
@@ -44,7 +44,7 @@ class FeedStore {
|
|
|
44
44
|
* @type {RandomAccessStorage}
|
|
45
45
|
*/
|
|
46
46
|
get storage() {
|
|
47
|
-
return this.
|
|
47
|
+
return this._directory;
|
|
48
48
|
}
|
|
49
49
|
async close() {
|
|
50
50
|
await Promise.all(Array.from(this._descriptors.values()).map(descriptor => descriptor.close()));
|
|
@@ -74,7 +74,7 @@ class FeedStore {
|
|
|
74
74
|
async _createDescriptor(options) {
|
|
75
75
|
const { key, secretKey } = options;
|
|
76
76
|
const descriptor = new feed_descriptor_1.default({
|
|
77
|
-
|
|
77
|
+
directory: this._directory,
|
|
78
78
|
key,
|
|
79
79
|
secretKey,
|
|
80
80
|
valueEncoding: this._valueEncoding,
|
|
@@ -90,7 +90,7 @@ __decorate([
|
|
|
90
90
|
async_1.synchronized
|
|
91
91
|
], FeedStore.prototype, "close", null);
|
|
92
92
|
exports.FeedStore = FeedStore;
|
|
93
|
-
|
|
93
|
+
const patchBufferCodec = (encoding) => {
|
|
94
94
|
if (typeof encoding === 'string') {
|
|
95
95
|
return encoding;
|
|
96
96
|
}
|
|
@@ -98,5 +98,5 @@ function patchBufferCodec(encoding) {
|
|
|
98
98
|
encode: (x) => Buffer.from(encoding.encode(x)),
|
|
99
99
|
decode: encoding.decode.bind(encoding)
|
|
100
100
|
};
|
|
101
|
-
}
|
|
101
|
+
};
|
|
102
102
|
//# sourceMappingURL=feed-store.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-store.js","sourceRoot":"","sources":["../../src/feed-store.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,0DAAyC;AAEzC,uCAAkD;AAIlD,wEAA+C;AA6B/C;;;;;GAKG;AACH,MAAa,SAAS;IAWpB;;;OAGG;IACH,YAAa,
|
|
1
|
+
{"version":3,"file":"feed-store.js","sourceRoot":"","sources":["../../src/feed-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
/* eslint-disable jest/no-done-callback */
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const hypercore_1 = __importDefault(require("hypercore"));
|
|
12
|
-
const hypertrie_1 = __importDefault(require("hypertrie"));
|
|
13
12
|
const pify_1 = __importDefault(require("pify"));
|
|
14
13
|
const tempy_1 = __importDefault(require("tempy"));
|
|
15
14
|
const async_1 = require("@dxos/async");
|
|
@@ -18,53 +17,31 @@ const random_access_multi_storage_1 = require("@dxos/random-access-multi-storage
|
|
|
18
17
|
const feed_store_1 = require("./feed-store");
|
|
19
18
|
const feedNames = ['booksFeed', 'usersFeed', 'groupsFeed'];
|
|
20
19
|
const createFeedStore = (storage, options = {}) => {
|
|
21
|
-
const feedStore = new feed_store_1.FeedStore(storage, options);
|
|
20
|
+
const feedStore = new feed_store_1.FeedStore(storage.directory('feed'), options);
|
|
22
21
|
return feedStore;
|
|
23
22
|
};
|
|
24
|
-
async
|
|
23
|
+
const createDefault = async () => {
|
|
25
24
|
const directory = tempy_1.default.directory();
|
|
26
25
|
return {
|
|
27
26
|
directory,
|
|
28
27
|
feedStore: createFeedStore((0, random_access_multi_storage_1.createStorage)(directory, random_access_multi_storage_1.StorageType.NODE), { valueEncoding: 'utf-8' })
|
|
29
28
|
};
|
|
30
|
-
}
|
|
31
|
-
async function defaultFeeds(feedStore, keys) {
|
|
32
|
-
return Object.fromEntries(await Promise.all(Object.entries(keys).map(async ([feed, keyPair]) => [feed, await feedStore.openReadWriteFeed(keyPair.key, keyPair.secretKey)])));
|
|
33
|
-
}
|
|
34
|
-
function append(feed, message) {
|
|
35
|
-
return (0, pify_1.default)(feed.append.bind(feed))(message);
|
|
36
|
-
}
|
|
37
|
-
function head(feed) {
|
|
38
|
-
return (0, pify_1.default)(feed.head.bind(feed))();
|
|
39
|
-
}
|
|
40
|
-
const createKeyPairs = () => {
|
|
41
|
-
return Object.fromEntries(feedNames.map(feed => {
|
|
42
|
-
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
43
|
-
return [feed, { key: crypto_1.PublicKey.from(publicKey), secretKey }];
|
|
44
|
-
}));
|
|
45
29
|
};
|
|
30
|
+
const defaultFeeds = async (feedStore, keys) => Object.fromEntries(await Promise.all(Object.entries(keys).map(async ([feed, keyPair]) => [feed, await feedStore.openReadWriteFeed(keyPair.key, keyPair.secretKey)])));
|
|
31
|
+
const append = (feed, message) => (0, pify_1.default)(feed.append.bind(feed))(message);
|
|
32
|
+
const head = (feed) => (0, pify_1.default)(feed.head.bind(feed))();
|
|
33
|
+
const createKeyPairs = () => Object.fromEntries(feedNames.map(feed => {
|
|
34
|
+
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
35
|
+
return [feed, { key: crypto_1.PublicKey.from(publicKey), secretKey }];
|
|
36
|
+
}));
|
|
46
37
|
describe('FeedStore', () => {
|
|
47
38
|
const keys = createKeyPairs();
|
|
48
39
|
test('Config default', async () => {
|
|
49
|
-
const feedStore = await createFeedStore((0, random_access_multi_storage_1.createStorage)('
|
|
40
|
+
const feedStore = await createFeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM));
|
|
50
41
|
expect(feedStore).toBeInstanceOf(feed_store_1.FeedStore);
|
|
51
|
-
const feedStore2 = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('
|
|
42
|
+
const feedStore2 = new feed_store_1.FeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM).directory('feed'));
|
|
52
43
|
expect(feedStore2).toBeInstanceOf(feed_store_1.FeedStore);
|
|
53
44
|
});
|
|
54
|
-
test('Config default + custom database + custom hypercore', async () => {
|
|
55
|
-
const customHypercore = jest.fn((...args) => {
|
|
56
|
-
return (0, hypercore_1.default)(args[0], args[1], args[2]);
|
|
57
|
-
});
|
|
58
|
-
const storage = (0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM);
|
|
59
|
-
const database = (0, hypertrie_1.default)(storage.createOrOpen.bind(storage), { valueEncoding: 'json' });
|
|
60
|
-
database.list = jest.fn((_, cb) => cb(null, []));
|
|
61
|
-
const feedStore = createFeedStore((0, random_access_multi_storage_1.createStorage)('feed', random_access_multi_storage_1.StorageType.RAM), {
|
|
62
|
-
hypercore: customHypercore
|
|
63
|
-
});
|
|
64
|
-
expect(feedStore).toBeInstanceOf(feed_store_1.FeedStore);
|
|
65
|
-
await feedStore.openReadOnlyFeed(crypto_1.PublicKey.random());
|
|
66
|
-
expect(customHypercore.mock.calls.length).toBe(1);
|
|
67
|
-
});
|
|
68
45
|
test('Create feed', async () => {
|
|
69
46
|
const { feedStore } = await createDefault();
|
|
70
47
|
const { booksFeed: { feed: booksFeed } } = await defaultFeeds(feedStore, keys);
|
|
@@ -116,7 +93,7 @@ describe('FeedStore', () => {
|
|
|
116
93
|
expect(Array.from(feedStore._descriptors.values()).map((fd) => fd.key).length).toBe(0);
|
|
117
94
|
});
|
|
118
95
|
test('Default codec: binary', async () => {
|
|
119
|
-
const feedStore = createFeedStore((0, random_access_multi_storage_1.createStorage)('
|
|
96
|
+
const feedStore = createFeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM));
|
|
120
97
|
expect(feedStore).toBeInstanceOf(feed_store_1.FeedStore);
|
|
121
98
|
const { publicKey, secretKey } = (0, crypto_1.createKeyPair)();
|
|
122
99
|
const { feed } = await feedStore.openReadWriteFeed(crypto_1.PublicKey.from(publicKey), secretKey);
|
|
@@ -125,14 +102,14 @@ describe('FeedStore', () => {
|
|
|
125
102
|
await expect(head(feed)).resolves.toBeInstanceOf(Buffer);
|
|
126
103
|
});
|
|
127
104
|
test('on close error should unlock the descriptor', async () => {
|
|
128
|
-
const feedStore = createFeedStore((0, random_access_multi_storage_1.createStorage)('
|
|
105
|
+
const feedStore = createFeedStore((0, random_access_multi_storage_1.createStorage)('', random_access_multi_storage_1.StorageType.RAM), {
|
|
129
106
|
hypercore: () => ({
|
|
130
107
|
opened: true,
|
|
131
|
-
ready(cb) {
|
|
108
|
+
ready: (cb) => {
|
|
132
109
|
cb();
|
|
133
110
|
},
|
|
134
|
-
on() { },
|
|
135
|
-
close() {
|
|
111
|
+
on: () => { },
|
|
112
|
+
close: () => {
|
|
136
113
|
throw new Error('close error');
|
|
137
114
|
}
|
|
138
115
|
})
|