@dxos/feed-store 0.3.11-main.fbbdc2a → 0.3.11-main.fc97a54

package/src/feed-set-iterator.test.ts

@@ -2,11 +2,11 @@
 // Copyright 2020 DXOS.org
 //
 
-import { faker } from '@faker-js/faker';
 import { expect } from 'chai';
 
 import { latch } from '@dxos/async';
 import { log } from '@dxos/log';
+import { faker } from '@dxos/random';
 import { describe, test } from '@dxos/test';
 
 import { type FeedBlockSelector, FeedSetIterator } from './feed-set-iterator';
@@ -104,28 +104,31 @@ describe('FeedSetIterator', () => {
     const iterator = new FeedSetIterator(randomFeedBlockSelector);
 
     // Write blocks.
-    setTimeout(async () => {
-      // Create feeds.
-      // TODO(burdon): Test adding feeds on-the-fly.
-      const writers = await Promise.all(
-        Array.from(Array(numFeeds)).map(async () => {
-          const key = await builder.keyring.createKey();
-          const feed = await feedStore.openFeed(key, { writable: true });
-          await iterator.addFeed(feed);
-          return feed.createFeedWriter();
-        }),
-      );
-
-      expect(iterator.size).to.eq(numFeeds);
-
-      for (const _ of Array.from(Array(numBlocks))) {
-        const writer = faker.helpers.arrayElement(writers);
-        const receipts = await builder.generator.writeBlocks(writer, {
-          count: 1,
-        });
-        log('wrote', receipts);
-      }
-    }, faker.number.int({ min: 0, max: 100 }));
+    setTimeout(
+      async () => {
+        // Create feeds.
+        // TODO(burdon): Test adding feeds on-the-fly.
+        const writers = await Promise.all(
+          Array.from(Array(numFeeds)).map(async () => {
+            const key = await builder.keyring.createKey();
+            const feed = await feedStore.openFeed(key, { writable: true });
+            await iterator.addFeed(feed);
+            return feed.createFeedWriter();
+          }),
+        );
+
+        expect(iterator.size).to.eq(numFeeds);
+
+        for (const _ of Array.from(Array(numBlocks))) {
+          const writer = faker.helpers.arrayElement(writers);
+          const receipts = await builder.generator.writeBlocks(writer, {
+            count: 1,
+          });
+          log('wrote', receipts);
+        }
+      },
+      faker.number.int({ min: 0, max: 100 }),
+    );
 
     // Open and start iterator.
     await iterator.open();
@@ -134,16 +137,19 @@ describe('FeedSetIterator', () => {
 
     // Read blocks.
     const [readAll, read] = latch({ count: numBlocks });
-    setTimeout(async () => {
-      for await (const block of iterator) {
-        const { feedKey, seq } = block;
-        const count = read();
-        log('read', { feedKey, seq, count });
-        if (count === numBlocks) {
-          await iterator.stop();
+    setTimeout(
+      async () => {
+        for await (const block of iterator) {
+          const { feedKey, seq } = block;
+          const count = read();
+          log('read', { feedKey, seq, count });
+          if (count === numBlocks) {
+            await iterator.stop();
+          }
         }
-      }
-    }, faker.number.int({ min: 0, max: 100 }));
+      },
+      faker.number.int({ min: 0, max: 100 }),
+    );
 
     // Wait until all written and read.
     const count = await readAll();

package/src/feed-store.test.ts

@@ -2,11 +2,11 @@
 // Copyright 2022 DXOS.org
 //
 
-import { faker } from '@faker-js/faker';
 import chai, { expect } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
 import { PublicKey } from '@dxos/keys';
+import { faker } from '@dxos/random';
 import { createStorage, StorageType } from '@dxos/random-access-storage';
 import { describe, test } from '@dxos/test';
 

package/src/feed-store.ts

@@ -2,7 +2,7 @@
 // Copyright 2019 DXOS.org
 //
 
-import { Event, Lock } from '@dxos/async';
+import { Event, Mutex } from '@dxos/async';
 import { failUndefined } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -21,7 +21,7 @@ export interface FeedStoreOptions<T extends {}> {
  */
 export class FeedStore<T extends {}> {
   private readonly _feeds: ComplexMap<PublicKey, FeedWrapper<T>> = new ComplexMap(PublicKey.hash);
-  private readonly _locks = new ComplexMap<PublicKey, Lock>(PublicKey.hash);
+  private readonly _mutexes = new ComplexMap<PublicKey, Mutex>(PublicKey.hash);
   private readonly _factory: FeedFactory<T>;
 
   private _closed = false;
@@ -56,9 +56,9 @@ export class FeedStore<T extends {}> {
     invariant(feedKey);
     invariant(!this._closed, 'Feed store is closed');
 
-    const lock = defaultMap(this._locks, feedKey, () => new Lock());
+    const mutex = defaultMap(this._mutexes, feedKey, () => new Mutex());
 
-    return lock.executeSynchronized(async () => {
+    return mutex.executeSynchronized(async () => {
       let feed = this.getFeed(feedKey);
       if (feed) {
         // TODO(burdon): Need to check that there's another instance being used (create test and break this).

package/src/feed-wrapper.test.ts

@@ -2,7 +2,6 @@
 // Copyright 2022 DXOS.org
 //
 
-import { faker } from '@faker-js/faker';
 import { expect } from 'chai';
 import waitForExpect from 'wait-for-expect';
 
@@ -10,6 +9,7 @@ import { asyncTimeout, latch, sleep } from '@dxos/async';
 import { createReadable } from '@dxos/hypercore';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
+import { faker } from '@dxos/random';
 import { describe, test } from '@dxos/test';
 import { range } from '@dxos/util';
 

package/src/testing/test-generator.ts

@@ -2,12 +2,12 @@
 // Copyright 2022 DXOS.org
 //
 
-import { faker } from '@faker-js/faker';
 import type { AbstractValueEncoding } from 'hypercore';
 
 import { sleep } from '@dxos/async';
 import { type Codec } from '@dxos/codec-protobuf';
 import { createCodecEncoding } from '@dxos/hypercore';
+import { faker } from '@dxos/random';
 
 import { type FeedWriter } from '../feed-writer';