@dxos/feed-store 0.8.4-main.84f28bd → 0.8.4-main.8baae0fced
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/LICENSE +102 -5
- package/README.md +1 -1
- package/dist/lib/browser/{chunk-YBS47XQD.mjs → chunk-MB63GMGR.mjs} +106 -191
- package/dist/lib/browser/chunk-MB63GMGR.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +54 -194
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +14 -16
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/node-esm/{chunk-3SO44TKS.mjs → chunk-VZUET36D.mjs} +106 -191
- package/dist/lib/node-esm/chunk-VZUET36D.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +54 -194
- package/dist/lib/node-esm/index.mjs.map +3 -3
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +14 -16
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/types/src/feed-factory.d.ts.map +1 -1
- package/dist/types/src/feed-iterator.d.ts.map +1 -1
- package/dist/types/src/feed-queue.d.ts +1 -1
- package/dist/types/src/feed-queue.d.ts.map +1 -1
- package/dist/types/src/feed-set-iterator.d.ts.map +1 -1
- package/dist/types/src/feed-store.d.ts.map +1 -1
- package/dist/types/src/feed-wrapper.d.ts +18 -19
- package/dist/types/src/feed-wrapper.d.ts.map +1 -1
- package/dist/types/src/feed-writer.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +1 -1
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/testing/mocks.d.ts.map +1 -1
- package/dist/types/src/testing/test-builder.d.ts +2 -2
- package/dist/types/src/testing/test-builder.d.ts.map +1 -1
- package/dist/types/src/testing/test-generator.d.ts +2 -2
- package/dist/types/src/testing/test-generator.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +27 -27
- package/src/feed-queue.test.ts +1 -1
- package/src/feed-queue.ts +5 -3
- package/src/feed-set-iterator.test.ts +6 -6
- package/src/feed-store.node.test.ts +5 -5
- package/src/feed-wrapper.test.ts +45 -12
- package/src/feed-wrapper.ts +74 -35
- package/src/index.ts +1 -1
- package/src/testing/test-builder.ts +3 -4
- package/src/testing/test-generator.ts +5 -6
- package/dist/lib/browser/chunk-YBS47XQD.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-3SO44TKS.mjs.map +0 -7
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../src/feed-wrapper.ts", "../../../src/feed-factory.ts", "../../../src/feed-store.ts"],
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2022 DXOS.org\n//\n\nimport { inspect } from 'node:util';\nimport { promisify } from 'node:util';\nimport { Readable, Transform } from 'streamx';\n\nimport { Trigger } from '@dxos/async';\nimport { StackTrace, inspectObject } from '@dxos/debug';\nimport type { Hypercore, HypercoreProperties, ReadStreamOptions } from '@dxos/hypercore';\nimport { assertArgument, invariant } from '@dxos/invariant';\nimport { type PublicKey } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { type Directory } from '@dxos/random-access-storage';\nimport { arrayToBuffer, rangeFromTo } from '@dxos/util';\nimport type { GetOptions, Proof } from '@dxos/vendor-hypercore/hypercore';\n\nimport { type FeedWriter, type WriteReceipt } from './feed-writer';\n\n/**\n * Async feed wrapper.\n */\nexport class FeedWrapper<T extends {}> {\n private _hypercore: Hypercore<T>;\n private readonly _pendingWrites = new Set<StackTrace>();\n\n // Pending while writes are happening. Resolves when there are no pending writes.\n private readonly _writeLock = new Trigger();\n\n private _closed = false;\n\n constructor(\n hypercore: Hypercore<T>,\n private _key: PublicKey, // TODO(burdon): Required since currently patching the key inside factory.\n private _storageDirectory: Directory,\n ) {\n assertArgument(hypercore, 'hypercore');\n this._hypercore = hypercore;\n invariant(this._key);\n this._writeLock.wake();\n }\n\n [inspect.custom](): string {\n return inspectObject(this);\n }\n\n toJSON(): { feedKey: PublicKey; length: number; opened: boolean; closed: boolean } {\n return {\n feedKey: this._key,\n length: this.properties.length,\n opened: this.properties.opened,\n closed: this.properties.closed,\n };\n }\n\n get key(): PublicKey {\n return this._key;\n }\n\n get core(): Hypercore<T> {\n return this._hypercore;\n }\n\n // TODO(burdon): Create proxy.\n get properties(): HypercoreProperties {\n return this._hypercore;\n }\n\n createReadableStream(opts?: ReadStreamOptions): Readable {\n // eslint-disable-next-line @typescript-eslint/no-this-alias\n const self = this;\n const transform = new Transform({\n transform(data: any, cb: (err?: Error | null, data?: any) => void) {\n // Delay until write is complete.\n void self._writeLock.wait().then(() => {\n this.push(data);\n cb();\n });\n },\n });\n const readStream =\n opts?.batch !== undefined && opts?.batch > 1\n ? new BatchedReadStream(this._hypercore, opts)\n : this._hypercore.createReadStream(opts);\n\n readStream.pipe(transform, (err: any) => {\n // Ignore errors.\n // We might get \"Writable stream closed prematurely\" error.\n // Its okay since the pipeline is closed and does not expect more messages.\n });\n\n return transform;\n }\n\n createFeedWriter(): FeedWriter<T> {\n return {\n write: async (data: T, { afterWrite } = {}) => {\n log('write', { feed: this._key, seq: this._hypercore.length });\n invariant(!this._closed, 'Feed closed');\n const stackTrace = new StackTrace();\n\n try {\n // Pending writes pause the read stream.\n this._pendingWrites.add(stackTrace);\n if (this._pendingWrites.size === 1) {\n this._writeLock.reset();\n }\n\n const receipt = await this.appendWithReceipt(data);\n\n // TODO(dmaretskyi): Removing this will make user-intiated writes faster but might result in a data-loss.\n await this.flushToDisk();\n\n await afterWrite?.(receipt);\n\n return receipt;\n } finally {\n // Unblock the read stream after the write (and callback) is complete.\n this._pendingWrites.delete(stackTrace);\n if (this._pendingWrites.size === 0) {\n this._writeLock.wake();\n }\n }\n },\n };\n }\n\n async appendWithReceipt(data: T): Promise<WriteReceipt> {\n const seq = await this.append(data);\n invariant(seq < this.length, 'Invalid seq after write');\n log('write complete', { feed: this._key, seq });\n const receipt: WriteReceipt = {\n feedKey: this.key,\n seq,\n };\n return receipt;\n }\n\n /**\n * Flush pending changes to disk.\n * Calling this is not required unless you want to explicitly wait for data to be written.\n */\n async flushToDisk(): Promise<void> {\n await this._storageDirectory.flush();\n }\n\n get opened(): boolean {\n return this._hypercore.opened;\n }\n\n get closed(): boolean {\n return this._hypercore.closed;\n }\n\n get readable(): boolean {\n return this._hypercore.readable;\n }\n\n get length(): number {\n return this._hypercore.length;\n }\n\n get byteLength(): number {\n return this._hypercore.byteLength;\n }\n\n on(...args: any[]) {\n return (this._hypercore as any).on(...args);\n }\n\n off(...args: any[]) {\n return (this._hypercore as any).off(...args);\n }\n\n open(...args: Parameters<Hypercore<T>['open']>) {\n return promisify(this._hypercore.open.bind(this._hypercore) as any)(...args);\n }\n\n _close(...args: Parameters<Hypercore<T>['close']>) {\n return promisify(this._hypercore.close.bind(this._hypercore) as any)(...args);\n }\n\n close = async () => {\n if (this._pendingWrites.size) {\n log.warn('Closing feed with pending writes', {\n feed: this._key,\n count: this._pendingWrites.size,\n pendingWrites: Array.from(this._pendingWrites.values()).map((stack) => stack.getStack()),\n });\n }\n this._closed = true;\n await this.flushToDisk();\n await this._close();\n };\n\n has(start: number, end?: number) {\n return this._hypercore.has(start, end);\n }\n\n get(index: number, options?: GetOptions) {\n return promisify(this._hypercore.get.bind(this._hypercore) as any)(index, options);\n }\n\n // TODO(dmaretskyi): Type better\n append(data: any | any[]): Promise<number> {\n return promisify(this._hypercore.append.bind(this._hypercore))(data);\n }\n\n /**\n * Will not resolve if `end` parameter is not specified and the feed is not closed.\n */\n download(...args: Parameters<Hypercore<T>['download']>) {\n return this._hypercore.download(...args);\n }\n\n undownload(...args: Parameters<Hypercore<T>['undownload']>) {\n return this._hypercore.undownload(...args);\n }\n\n setDownloading(...args: Parameters<Hypercore<T>['setDownloading']>) {\n return this._hypercore.setDownloading(...args);\n }\n\n replicate(...args: Parameters<Hypercore<T>['replicate']>) {\n return this._hypercore.replicate(...args);\n }\n\n clear(start: number, end?: number) {\n return promisify(this._hypercore.clear.bind(this._hypercore))(start, end);\n }\n\n proof(index: number, options?: any) {\n return promisify(this._hypercore.proof.bind(this._hypercore))(index);\n }\n\n put(index: number, data: T, proof: Proof) {\n return promisify(this._hypercore.put.bind(this._hypercore))(index, data, proof);\n }\n\n putBuffer(index: number, data: Buffer | Uint8Array, proof: Proof, peer: null): Promise<void> {\n return promisify((this._hypercore as any)._putBuffer.bind(this._hypercore) as any)(index, data, proof, peer);\n }\n\n /**\n * Clear and check for integrity.\n */\n async safeClear(from: number, to: number): Promise<void> {\n invariant(from >= 0 && from < to && to <= this.length, 'Invalid range');\n\n const CHECK_MESSAGES = 20;\n const checkBegin = to;\n const checkEnd = Math.min(checkBegin + CHECK_MESSAGES, this.length);\n\n const messagesBefore = await Promise.all(\n rangeFromTo(checkBegin, checkEnd).map((idx) =>\n this.get(idx, {\n valueEncoding: { decode: (x: Uint8Array) => x } as any,\n }),\n ),\n );\n\n await this.clear(from, to);\n\n const messagesAfter = await Promise.all(\n rangeFromTo(checkBegin, checkEnd).map((idx) =>\n this.get(idx, {\n valueEncoding: { decode: (x: Uint8Array) => x } as any,\n }),\n ),\n );\n\n for (let i = 0; i < messagesBefore.length; i++) {\n const before = arrayToBuffer(messagesBefore[i]);\n const after = arrayToBuffer(messagesAfter[i]);\n if (!before.equals(after)) {\n throw new Error('Feed corruption on clear. There has likely been a data loss.');\n }\n }\n }\n}\n\nclass BatchedReadStream extends Readable {\n private readonly _feed: Hypercore<any>;\n private readonly _batch: number;\n private _cursor: number;\n private _reading = false;\n\n constructor(feed: Hypercore<any>, opts: ReadStreamOptions = {}) {\n super({ objectMode: true });\n invariant(opts.live === true, 'Only live mode supported');\n invariant(opts.batch !== undefined && opts.batch > 1);\n this._feed = feed;\n this._batch = opts.batch;\n this._cursor = opts.start ?? 0;\n }\n\n override _open(cb: (err: Error | null) => void): void {\n this._feed.ready(cb);\n }\n\n override _read(cb: (err: Error | null) => void): void {\n if (this._reading) {\n return;\n }\n\n if (this._feed.bitfield!.total(this._cursor, this._cursor + this._batch) === this._batch) {\n this._batchedRead(cb);\n } else {\n this._nonBatchedRead(cb);\n }\n }\n\n private _nonBatchedRead(cb: (err: Error | null) => void): void {\n this._feed.get(this._cursor, { wait: true }, (err, data) => {\n if (err) {\n cb(err);\n } else {\n this._cursor++;\n this._reading = false;\n this.push(data);\n cb(null);\n }\n });\n }\n\n private _batchedRead(cb: (err: Error | null) => void): void {\n this._feed.getBatch(this._cursor, this._cursor + this._batch, { wait: true }, (err, data) => {\n if (err) {\n cb(err);\n } else {\n this._cursor += data.length;\n this._reading = false;\n for (const item of data) {\n this.push(item);\n }\n cb(null);\n }\n });\n }\n}\n", "//\n// Copyright 2022 DXOS.org\n//\n\nimport defaultsDeep from 'lodash.defaultsdeep';\n\nimport { type Signer, subtleCrypto } from '@dxos/crypto';\nimport { failUndefined } from '@dxos/debug';\nimport type { HypercoreOptions } from '@dxos/hypercore';\nimport { createCrypto, hypercore } from '@dxos/hypercore';\nimport { type PublicKey } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { type Directory } from '@dxos/random-access-storage';\n\nimport { FeedWrapper } from './feed-wrapper';\n\nexport type FeedFactoryOptions = {\n root: Directory;\n signer?: Signer;\n hypercore?: HypercoreOptions;\n};\n\nexport type FeedOptions = HypercoreOptions & {\n writable?: boolean;\n /**\n * Optional hook called before data is written after being verified.\n * Called for writes done by this peer as well as for data replicated from other peers.\n * NOTE: The callback must be invoked to complete the write operation.\n * @param peer Always null in hypercore@9.12.0.\n */\n onwrite?: (index: number, data: any, peer: null, cb: (err: Error | null) => void) => void;\n};\n\n/**\n * Hypercore factory.\n */\nexport class FeedFactory<T extends {}> {\n private readonly _root: Directory;\n private readonly _signer?: Signer;\n private readonly _hypercoreOptions?: HypercoreOptions;\n\n constructor({ root, signer, hypercore }: FeedFactoryOptions) {\n log('FeedFactory', { options: hypercore });\n this._root = root ?? failUndefined();\n this._signer = signer;\n this._hypercoreOptions = hypercore;\n }\n\n get storageRoot() {\n return this._root;\n }\n\n async createFeed(publicKey: PublicKey, options?: FeedOptions): Promise<FeedWrapper<T>> {\n if (options?.writable && !this._signer) {\n throw new Error('Signer required to create writable feeds.');\n }\n if (options?.secretKey) {\n log.warn('Secret key ignored due to signer.');\n }\n\n // Required due to hypercore's 32-byte key limit.\n const key = await subtleCrypto.digest('SHA-256', Buffer.from(publicKey.toHex()));\n\n const opts = defaultsDeep(\n {\n // sparse: false,\n // stats: false,\n },\n this._hypercoreOptions,\n {\n secretKey: this._signer && options?.writable ? Buffer.from('secret') : undefined,\n crypto: this._signer ? createCrypto(this._signer, publicKey) : undefined,\n onwrite: options?.onwrite,\n noiseKeyPair: {}, // We're not using noise.\n },\n options,\n );\n\n const storageDir = this._root.createDirectory(publicKey.toHex());\n const makeStorage = (filename: string) => {\n const { type, native } = storageDir.getOrCreateFile(filename);\n log('created', {\n path: `${type}:${this._root.path}/${publicKey.truncate()}/${filename}`,\n });\n\n return native;\n };\n\n const core = hypercore(makeStorage, Buffer.from(key), opts);\n return new FeedWrapper(core, publicKey, storageDir);\n }\n}\n", "//\n// Copyright 2019 DXOS.org\n//\n\nimport { Event, Mutex } from '@dxos/async';\nimport { failUndefined } from '@dxos/debug';\nimport { invariant } from '@dxos/invariant';\nimport { PublicKey } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { ComplexMap, defaultMap } from '@dxos/util';\n\nimport { type FeedFactory, type FeedOptions } from './feed-factory';\nimport { type FeedWrapper } from './feed-wrapper';\n\nexport interface FeedStoreOptions<T extends {}> {\n factory: FeedFactory<T>;\n}\n\n/**\n * Persistent hypercore store.\n */\nexport class FeedStore<T extends {}> {\n private readonly _feeds: ComplexMap<PublicKey, FeedWrapper<T>> = new ComplexMap(PublicKey.hash);\n private readonly _mutexes = new ComplexMap<PublicKey, Mutex>(PublicKey.hash);\n private readonly _factory: FeedFactory<T>;\n\n private _closed = false;\n\n readonly feedOpened = new Event<FeedWrapper<T>>();\n\n constructor({ factory }: FeedStoreOptions<T>) {\n this._factory = factory ?? failUndefined();\n }\n\n get size() {\n return this._feeds.size;\n }\n\n get feeds() {\n return Array.from(this._feeds.values());\n }\n\n /**\n * Get the open feed if it exists.\n */\n getFeed(publicKey: PublicKey): FeedWrapper<T> | undefined {\n return this._feeds.get(publicKey);\n }\n\n /**\n * Gets or opens a feed.\n * The feed is readonly unless a secret key is provided.\n */\n async openFeed(feedKey: PublicKey, { writable, sparse }: FeedOptions = {}): Promise<FeedWrapper<T>> {\n log('opening feed', { feedKey });\n invariant(feedKey);\n invariant(!this._closed, 'Feed store is closed');\n\n const mutex = defaultMap(this._mutexes, feedKey, () => new Mutex());\n\n return mutex.executeSynchronized(async () => {\n let feed = this.getFeed(feedKey);\n if (feed) {\n // TODO(burdon): Need to check that there's another instance being used (create test and break this).\n // TODO(burdon): Remove from store if feed is closed externally? (remove wrapped open/close methods?)\n if (writable && !feed.properties.writable) {\n throw new Error(`Read-only feed is already open: ${feedKey.truncate()}`);\n } else if ((sparse ?? false) !== feed.properties.sparse) {\n throw new Error(\n `Feed already open with different sparse setting: ${feedKey.truncate()} [${sparse} !== ${\n feed.properties.sparse\n }]`,\n );\n } else {\n await feed.open();\n return feed;\n }\n }\n\n feed = await this._factory.createFeed(feedKey, { writable, sparse });\n this._feeds.set(feed.key, feed);\n\n await feed.open();\n this.feedOpened.emit(feed);\n log('opened', { feedKey });\n return feed;\n });\n }\n\n /**\n * Close all feeds.\n */\n async close(): Promise<void> {\n log('closing...');\n this._closed = true;\n await Promise.all(\n Array.from(this._feeds.values()).map(async (feed) => {\n await feed.close();\n invariant(feed.closed);\n // TODO(burdon): SpaceProxy still being initialized.\n // SpaceProxy.initialize => Database.createItem => ... => FeedWrapper.append\n // Uncaught Error: Closed [random-access-storage/index.js:181:38]\n // await sleep(100);\n }),\n );\n\n this._feeds.clear();\n log('closed');\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["inspect", "promisify", "Readable", "Transform", "Trigger", "StackTrace", "inspectObject", "assertArgument", "invariant", "log", "arrayToBuffer", "rangeFromTo", "_hypercore", "_pendingWrites", "_writeLock", "hypercore", "_key", "_storageDirectory", "wake", "custom", "toJSON", "feedKey", "length", "opened", "properties", "closed", "key", "core", "createReadableStream", "transform", "self", "cb", "readStream", "createFeedWriter", "seq", "stackTrace", "reset", "receipt", "flushToDisk", "readable", "byteLength", "open", "args", "_close", "close", "feed", "count", "pendingWrites", "_closed", "start", "index", "options", "append", "undownload", "setDownloading", "replicate", "clear", "proof", "data", "putBuffer", "CHECK_MESSAGES", "checkBegin", "to", "checkEnd", "min", "messagesBefore", "valueEncoding", "x", "messagesAfter", "i", "after", "before", "equals", "Error", "_batch", "_cursor", "_reading", "objectMode", "live", "opts", "_open", "_read", "_nonBatchedRead", "err", "push", "_batchedRead", "wait", "item", "defaultsDeep", "subtleCrypto", "failUndefined", "createCrypto", "hypercore", "log", "__dxlog_file", "_signer", "_hypercoreOptions", "options", "hypercore", "log", "root", "signer", "storageRoot", "createFeed", "secretKey", "crypto", "createCrypto", "onwrite", "noiseKeyPair", "storageDir", "makeStorage", "native", "getOrCreateFile", "filename", "path", "type", "truncate", "core", "Event", "Mutex", "failUndefined", "invariant", "PublicKey", "log", "ComplexMap", "defaultMap", "__dxlog_file", "_mutexes", "_factory", "_closed", "feedOpened", "factory", "size", "feeds", "feedKey", "mutex", "executeSynchronized", "feed", "getFeed", "sparse", "properties", "Error", "emit", "from", "_feeds", "close", "closed"]
|
|
7
|
+
}
|
|
@@ -3,7 +3,7 @@ import {
|
|
|
3
3
|
FeedFactory,
|
|
4
4
|
FeedStore,
|
|
5
5
|
FeedWrapper
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-VZUET36D.mjs";
|
|
7
7
|
|
|
8
8
|
// src/feed-iterator.ts
|
|
9
9
|
import safeRace from "race-as-promised";
|
|
@@ -14,7 +14,7 @@ import { log as log2 } from "@dxos/log";
|
|
|
14
14
|
// src/feed-queue.ts
|
|
15
15
|
import { inspect } from "node:util";
|
|
16
16
|
import { Writable } from "streamx";
|
|
17
|
-
import { Event,
|
|
17
|
+
import { Event, Trigger, latch } from "@dxos/async";
|
|
18
18
|
import { inspectObject } from "@dxos/debug";
|
|
19
19
|
import { invariant } from "@dxos/invariant";
|
|
20
20
|
import { log } from "@dxos/log";
|
|
@@ -24,17 +24,20 @@ var defaultReadStreamOptions = {
|
|
|
24
24
|
batch: 1024
|
|
25
25
|
};
|
|
26
26
|
var FeedQueue = class {
|
|
27
|
+
_feed;
|
|
28
|
+
_options;
|
|
29
|
+
updated = new Event();
|
|
30
|
+
_messageTrigger = new Trigger({
|
|
31
|
+
autoReset: true
|
|
32
|
+
});
|
|
33
|
+
_feedConsumer = void 0;
|
|
34
|
+
_next;
|
|
35
|
+
_currentBlock = void 0;
|
|
36
|
+
_index = -1;
|
|
27
37
|
// prettier-ignore
|
|
28
38
|
constructor(_feed, _options = {}) {
|
|
29
39
|
this._feed = _feed;
|
|
30
40
|
this._options = _options;
|
|
31
|
-
this.updated = new Event();
|
|
32
|
-
this._messageTrigger = new Trigger({
|
|
33
|
-
autoReset: true
|
|
34
|
-
});
|
|
35
|
-
this._feedConsumer = void 0;
|
|
36
|
-
this._currentBlock = void 0;
|
|
37
|
-
this._index = -1;
|
|
38
41
|
}
|
|
39
42
|
[inspect.custom]() {
|
|
40
43
|
return inspectObject(this);
|
|
@@ -73,12 +76,7 @@ var FeedQueue = class {
|
|
|
73
76
|
this._index = options.start ?? 0;
|
|
74
77
|
log("opening", {
|
|
75
78
|
feedKey: this._feed.key
|
|
76
|
-
}, {
|
|
77
|
-
F: __dxlog_file,
|
|
78
|
-
L: 92,
|
|
79
|
-
S: this,
|
|
80
|
-
C: (f, a) => f(...a)
|
|
81
|
-
});
|
|
79
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 69, S: this });
|
|
82
80
|
const opts = Object.assign({}, defaultReadStreamOptions, options);
|
|
83
81
|
const feedStream = this._feed.createReadableStream(opts);
|
|
84
82
|
this._feedConsumer = new Writable({
|
|
@@ -105,6 +103,9 @@ var FeedQueue = class {
|
|
|
105
103
|
this._destroyConsumer();
|
|
106
104
|
};
|
|
107
105
|
const onError = (err) => {
|
|
106
|
+
if (!this.isOpen) {
|
|
107
|
+
return;
|
|
108
|
+
}
|
|
108
109
|
if (!err) {
|
|
109
110
|
return;
|
|
110
111
|
}
|
|
@@ -113,12 +114,7 @@ var FeedQueue = class {
|
|
|
113
114
|
}
|
|
114
115
|
log.catch(err, {
|
|
115
116
|
feedKey: this._feed.key
|
|
116
|
-
}, {
|
|
117
|
-
F: __dxlog_file,
|
|
118
|
-
L: 135,
|
|
119
|
-
S: this,
|
|
120
|
-
C: (f, a) => f(...a)
|
|
121
|
-
});
|
|
117
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 108, S: this });
|
|
122
118
|
};
|
|
123
119
|
this._feed.core.once("close", onClose);
|
|
124
120
|
this._feedConsumer.on("error", onError);
|
|
@@ -129,55 +125,24 @@ var FeedQueue = class {
|
|
|
129
125
|
}
|
|
130
126
|
this._destroyConsumer();
|
|
131
127
|
});
|
|
132
|
-
log("opened", void 0, {
|
|
133
|
-
F: __dxlog_file,
|
|
134
|
-
L: 153,
|
|
135
|
-
S: this,
|
|
136
|
-
C: (f, a) => f(...a)
|
|
137
|
-
});
|
|
128
|
+
log("opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 124, S: this });
|
|
138
129
|
}
|
|
139
130
|
/**
|
|
140
131
|
* Closes the queue.
|
|
141
132
|
*/
|
|
142
133
|
async close() {
|
|
143
134
|
if (this.isOpen) {
|
|
144
|
-
invariant(this._feedConsumer, void 0, {
|
|
145
|
-
|
|
146
|
-
L: 161,
|
|
147
|
-
S: this,
|
|
148
|
-
A: [
|
|
149
|
-
"this._feedConsumer",
|
|
150
|
-
""
|
|
151
|
-
]
|
|
152
|
-
});
|
|
153
|
-
invariant(!this._feed.properties.closed, void 0, {
|
|
154
|
-
F: __dxlog_file,
|
|
155
|
-
L: 162,
|
|
156
|
-
S: this,
|
|
157
|
-
A: [
|
|
158
|
-
"!this._feed.properties.closed",
|
|
159
|
-
""
|
|
160
|
-
]
|
|
161
|
-
});
|
|
135
|
+
invariant(this._feedConsumer, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 130, S: this, A: ["this._feedConsumer", ""] });
|
|
136
|
+
invariant(!this._feed.properties.closed, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 131, S: this, A: ["!this._feed.properties.closed", ""] });
|
|
162
137
|
log("closing", {
|
|
163
138
|
feedKey: this._feed.key
|
|
164
|
-
}, {
|
|
165
|
-
F: __dxlog_file,
|
|
166
|
-
L: 164,
|
|
167
|
-
S: this,
|
|
168
|
-
C: (f, a) => f(...a)
|
|
169
|
-
});
|
|
139
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 132, S: this });
|
|
170
140
|
const [closed, setClosed] = latch();
|
|
171
141
|
this._feedConsumer.once("close", setClosed);
|
|
172
142
|
this._feedConsumer.destroy();
|
|
173
143
|
this._next?.();
|
|
174
144
|
await closed();
|
|
175
|
-
log("closed", void 0, {
|
|
176
|
-
F: __dxlog_file,
|
|
177
|
-
L: 170,
|
|
178
|
-
S: this,
|
|
179
|
-
C: (f, a) => f(...a)
|
|
180
|
-
});
|
|
145
|
+
log("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 140, S: this });
|
|
181
146
|
}
|
|
182
147
|
}
|
|
183
148
|
/**
|
|
@@ -206,12 +171,7 @@ var FeedQueue = class {
|
|
|
206
171
|
if (this._feedConsumer) {
|
|
207
172
|
log("queue closed", {
|
|
208
173
|
feedKey: this._feed.key
|
|
209
|
-
}, {
|
|
210
|
-
F: __dxlog_file,
|
|
211
|
-
L: 203,
|
|
212
|
-
S: this,
|
|
213
|
-
C: (f, a) => f(...a)
|
|
214
|
-
});
|
|
174
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 165, S: this });
|
|
215
175
|
this._feedConsumer = void 0;
|
|
216
176
|
this._next = void 0;
|
|
217
177
|
this._currentBlock = void 0;
|
|
@@ -223,11 +183,9 @@ var FeedQueue = class {
|
|
|
223
183
|
// src/feed-iterator.ts
|
|
224
184
|
var __dxlog_file2 = "/__w/dxos/dxos/packages/common/feed-store/src/feed-iterator.ts";
|
|
225
185
|
var AbstractFeedIterator = class {
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
this._running = false;
|
|
230
|
-
}
|
|
186
|
+
_stopTrigger = new Trigger2();
|
|
187
|
+
_open = false;
|
|
188
|
+
_running = false;
|
|
231
189
|
toJSON() {
|
|
232
190
|
return {
|
|
233
191
|
open: this.isOpen,
|
|
@@ -242,66 +200,30 @@ var AbstractFeedIterator = class {
|
|
|
242
200
|
}
|
|
243
201
|
async open() {
|
|
244
202
|
if (!this._open) {
|
|
245
|
-
log2("opening...", void 0, {
|
|
246
|
-
F: __dxlog_file2,
|
|
247
|
-
L: 41,
|
|
248
|
-
S: this,
|
|
249
|
-
C: (f, a) => f(...a)
|
|
250
|
-
});
|
|
203
|
+
log2("opening...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 29, S: this });
|
|
251
204
|
await this._onOpen();
|
|
252
205
|
this._open = true;
|
|
253
206
|
await this.start();
|
|
254
|
-
log2("opened", void 0, {
|
|
255
|
-
F: __dxlog_file2,
|
|
256
|
-
L: 46,
|
|
257
|
-
S: this,
|
|
258
|
-
C: (f, a) => f(...a)
|
|
259
|
-
});
|
|
207
|
+
log2("opened", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 33, S: this });
|
|
260
208
|
}
|
|
261
209
|
}
|
|
262
210
|
async close() {
|
|
263
211
|
if (this._open) {
|
|
264
|
-
log2("closing...", void 0, {
|
|
265
|
-
F: __dxlog_file2,
|
|
266
|
-
L: 52,
|
|
267
|
-
S: this,
|
|
268
|
-
C: (f, a) => f(...a)
|
|
269
|
-
});
|
|
212
|
+
log2("closing...", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 38, S: this });
|
|
270
213
|
await this.stop();
|
|
271
214
|
await this._onClose();
|
|
272
215
|
this._open = false;
|
|
273
|
-
log2("closed", void 0, {
|
|
274
|
-
F: __dxlog_file2,
|
|
275
|
-
L: 57,
|
|
276
|
-
S: this,
|
|
277
|
-
C: (f, a) => f(...a)
|
|
278
|
-
});
|
|
216
|
+
log2("closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 42, S: this });
|
|
279
217
|
}
|
|
280
218
|
}
|
|
281
219
|
async start() {
|
|
282
|
-
invariant2(this._open, void 0, {
|
|
283
|
-
F: __dxlog_file2,
|
|
284
|
-
L: 62,
|
|
285
|
-
S: this,
|
|
286
|
-
A: [
|
|
287
|
-
"this._open",
|
|
288
|
-
""
|
|
289
|
-
]
|
|
290
|
-
});
|
|
220
|
+
invariant2(this._open, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 46, S: this, A: ["this._open", ""] });
|
|
291
221
|
if (!this._running) {
|
|
292
222
|
this._running = true;
|
|
293
223
|
}
|
|
294
224
|
}
|
|
295
225
|
async stop() {
|
|
296
|
-
invariant2(this._open, void 0, {
|
|
297
|
-
F: __dxlog_file2,
|
|
298
|
-
L: 69,
|
|
299
|
-
S: this,
|
|
300
|
-
A: [
|
|
301
|
-
"this._open",
|
|
302
|
-
""
|
|
303
|
-
]
|
|
304
|
-
});
|
|
226
|
+
invariant2(this._open, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 52, S: this, A: ["this._open", ""] });
|
|
305
227
|
if (this._running) {
|
|
306
228
|
this._running = false;
|
|
307
229
|
this._stopTrigger.wake();
|
|
@@ -314,12 +236,7 @@ var AbstractFeedIterator = class {
|
|
|
314
236
|
return this._generator();
|
|
315
237
|
}
|
|
316
238
|
async *_generator() {
|
|
317
|
-
log2("started", void 0, {
|
|
318
|
-
F: __dxlog_file2,
|
|
319
|
-
L: 85,
|
|
320
|
-
S: this,
|
|
321
|
-
C: (f, a) => f(...a)
|
|
322
|
-
});
|
|
239
|
+
log2("started", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 65, S: this });
|
|
323
240
|
while (this._running) {
|
|
324
241
|
const block = await safeRace([
|
|
325
242
|
this._stopTrigger.wait(),
|
|
@@ -330,15 +247,12 @@ var AbstractFeedIterator = class {
|
|
|
330
247
|
}
|
|
331
248
|
yield block;
|
|
332
249
|
}
|
|
333
|
-
log2("stopped", void 0, {
|
|
334
|
-
F: __dxlog_file2,
|
|
335
|
-
L: 97,
|
|
336
|
-
S: this,
|
|
337
|
-
C: (f, a) => f(...a)
|
|
338
|
-
});
|
|
250
|
+
log2("stopped", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 77, S: this });
|
|
339
251
|
}
|
|
340
252
|
};
|
|
341
253
|
var FeedIterator = class extends AbstractFeedIterator {
|
|
254
|
+
_feed;
|
|
255
|
+
_queue;
|
|
342
256
|
constructor(_feed) {
|
|
343
257
|
super(), this._feed = _feed;
|
|
344
258
|
this._queue = new FeedQueue(this._feed);
|
|
@@ -367,28 +281,18 @@ var defaultFeedSetIteratorOptions = {
|
|
|
367
281
|
stallTimeout: 1e3
|
|
368
282
|
};
|
|
369
283
|
var FeedSetIterator = class extends AbstractFeedIterator {
|
|
284
|
+
_selector;
|
|
285
|
+
options;
|
|
286
|
+
_feedQueues = new ComplexMap(PublicKey.hash);
|
|
287
|
+
_trigger = new Trigger3({
|
|
288
|
+
autoReset: true
|
|
289
|
+
});
|
|
290
|
+
_subscriptions = new SubscriptionList();
|
|
291
|
+
stalled = new Event2();
|
|
370
292
|
constructor(_selector, options = defaultFeedSetIteratorOptions) {
|
|
371
|
-
super(), this._selector = _selector, this.options = options
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
invariant3(_selector, void 0, {
|
|
375
|
-
F: __dxlog_file3,
|
|
376
|
-
L: 55,
|
|
377
|
-
S: this,
|
|
378
|
-
A: [
|
|
379
|
-
"_selector",
|
|
380
|
-
""
|
|
381
|
-
]
|
|
382
|
-
});
|
|
383
|
-
invariant3(options, void 0, {
|
|
384
|
-
F: __dxlog_file3,
|
|
385
|
-
L: 56,
|
|
386
|
-
S: this,
|
|
387
|
-
A: [
|
|
388
|
-
"options",
|
|
389
|
-
""
|
|
390
|
-
]
|
|
391
|
-
});
|
|
293
|
+
super(), this._selector = _selector, this.options = options;
|
|
294
|
+
invariant3(_selector, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 29, S: this, A: ["_selector", ""] });
|
|
295
|
+
invariant3(options, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 30, S: this, A: ["options", ""] });
|
|
392
296
|
}
|
|
393
297
|
[inspect2.custom]() {
|
|
394
298
|
return inspectObject2(this);
|
|
@@ -416,32 +320,11 @@ var FeedSetIterator = class extends AbstractFeedIterator {
|
|
|
416
320
|
this._trigger.wake();
|
|
417
321
|
}
|
|
418
322
|
async addFeed(feed) {
|
|
419
|
-
invariant3(!this._feedQueues.has(feed.key), `Feed already added: ${feed.key}`, {
|
|
420
|
-
|
|
421
|
-
L: 91,
|
|
422
|
-
S: this,
|
|
423
|
-
A: [
|
|
424
|
-
"!this._feedQueues.has(feed.key)",
|
|
425
|
-
"`Feed already added: ${feed.key}`"
|
|
426
|
-
]
|
|
427
|
-
});
|
|
428
|
-
invariant3(feed.properties.opened, void 0, {
|
|
429
|
-
F: __dxlog_file3,
|
|
430
|
-
L: 92,
|
|
431
|
-
S: this,
|
|
432
|
-
A: [
|
|
433
|
-
"feed.properties.opened",
|
|
434
|
-
""
|
|
435
|
-
]
|
|
436
|
-
});
|
|
323
|
+
invariant3(!this._feedQueues.has(feed.key), `Feed already added: ${feed.key}`, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 58, S: this, A: ["!this._feedQueues.has(feed.key)", "`Feed already added: ${feed.key}`"] });
|
|
324
|
+
invariant3(feed.properties.opened, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 59, S: this, A: ["feed.properties.opened", ""] });
|
|
437
325
|
log3("feed added", {
|
|
438
326
|
feedKey: feed.key
|
|
439
|
-
}, {
|
|
440
|
-
F: __dxlog_file3,
|
|
441
|
-
L: 93,
|
|
442
|
-
S: this,
|
|
443
|
-
C: (f, a) => f(...a)
|
|
444
|
-
});
|
|
327
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 60, S: this });
|
|
445
328
|
const queue = new FeedQueue(feed);
|
|
446
329
|
this._feedQueues.set(feed.key, queue);
|
|
447
330
|
this._subscriptions.add(queue.updated.on(() => {
|
|
@@ -478,12 +361,7 @@ var FeedSetIterator = class extends AbstractFeedIterator {
|
|
|
478
361
|
log3("selected", {
|
|
479
362
|
idx,
|
|
480
363
|
blocks
|
|
481
|
-
}, {
|
|
482
|
-
F: __dxlog_file3,
|
|
483
|
-
L: 143,
|
|
484
|
-
S: this,
|
|
485
|
-
C: (f, a) => f(...a)
|
|
486
|
-
});
|
|
364
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 100, S: this });
|
|
487
365
|
if (idx === void 0) {
|
|
488
366
|
if (t === void 0) {
|
|
489
367
|
t = setTimeout(() => {
|
|
@@ -500,33 +378,15 @@ var FeedSetIterator = class extends AbstractFeedIterator {
|
|
|
500
378
|
throw new Error(`Index out of bounds: ${idx} of ${blocks.length}`);
|
|
501
379
|
}
|
|
502
380
|
const queue = this._feedQueues.get(blocks[idx].feedKey);
|
|
503
|
-
log3("popping", queue.toJSON(), {
|
|
504
|
-
F: __dxlog_file3,
|
|
505
|
-
L: 163,
|
|
506
|
-
S: this,
|
|
507
|
-
C: (f, a) => f(...a)
|
|
508
|
-
});
|
|
381
|
+
log3("popping", queue.toJSON(), { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 122, S: this });
|
|
509
382
|
try {
|
|
510
383
|
const message = await queue.pop();
|
|
511
|
-
invariant3(message === blocks[idx], void 0, {
|
|
512
|
-
F: __dxlog_file3,
|
|
513
|
-
L: 166,
|
|
514
|
-
S: this,
|
|
515
|
-
A: [
|
|
516
|
-
"message === blocks[idx]",
|
|
517
|
-
""
|
|
518
|
-
]
|
|
519
|
-
});
|
|
384
|
+
invariant3(message === blocks[idx], void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 125, S: this, A: ["message === blocks[idx]", ""] });
|
|
520
385
|
return message;
|
|
521
386
|
} catch (err) {
|
|
522
387
|
log3.warn("queue closed", {
|
|
523
388
|
feedKey: queue.feed.key
|
|
524
|
-
}, {
|
|
525
|
-
F: __dxlog_file3,
|
|
526
|
-
L: 170,
|
|
527
|
-
S: this,
|
|
528
|
-
C: (f, a) => f(...a)
|
|
529
|
-
});
|
|
389
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 129, S: this });
|
|
530
390
|
}
|
|
531
391
|
}
|
|
532
392
|
}
|