@dxos/hypercore 0.1.51-main.e7215ae → 0.1.51-next.5787f10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/hypercore",
-  "version": "0.1.51-main.e7215ae",
+  "version": "0.1.51-next.5787f10",
   "description": "Hypercore wrapper and utils.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,14 +20,14 @@
     "sodium-native": "^3.2.0",
     "sodium-universal": "^3.0.2",
     "streamx": "^2.12.5",
-    "@dxos/async": "0.1.51-main.e7215ae",
-    "@dxos/codec-protobuf": "0.1.51-main.e7215ae",
-    "@dxos/crypto": "0.1.51-main.e7215ae",
-    "@dxos/debug": "0.1.51-main.e7215ae",
-    "@dxos/keys": "0.1.51-main.e7215ae",
-    "@dxos/node-std": "0.1.51-main.e7215ae",
-    "@dxos/random-access-storage": "0.1.51-main.e7215ae",
-    "@dxos/typings": "0.1.51-main.e7215ae"
+    "@dxos/async": "0.1.51-next.5787f10",
+    "@dxos/codec-protobuf": "0.1.51-next.5787f10",
+    "@dxos/crypto": "0.1.51-next.5787f10",
+    "@dxos/debug": "0.1.51-next.5787f10",
+    "@dxos/keys": "0.1.51-next.5787f10",
+    "@dxos/node-std": "0.1.51-next.5787f10",
+    "@dxos/random-access-storage": "0.1.51-next.5787f10",
+    "@dxos/typings": "0.1.51-next.5787f10"
   },
   "devDependencies": {
     "@faker-js/faker": "^7.3.0",
@@ -40,8 +40,8 @@
     "hypercore-protocol": "^8.0.7",
     "noise-protocol": "3.0.1",
     "random-access-memory": "^4.1.0",
-    "@dxos/log": "0.1.51-main.e7215ae",
-    "@dxos/util": "0.1.51-main.e7215ae"
+    "@dxos/log": "0.1.51-next.5787f10",
+    "@dxos/util": "0.1.51-next.5787f10"
   },
   "publishConfig": {
     "access": "public"

package/dist/types/src/multiplexer.d.ts

@@ -1,21 +0,0 @@
-import { Hypercore } from 'hypercore';
-import { PassThrough } from 'streamx';
-/**
- * Hypercore multiplexer.
- */
-export declare class Multiplexer {
-    private readonly _id;
-    private readonly _feeds;
-    private readonly _streams;
-    private _isOpen;
-    private _closedTrigger;
-    readonly input: PassThrough;
-    readonly output: PassThrough;
-    constructor(_id: string);
-    get isOpen(): boolean;
-    get feeds(): Hypercore<any>[];
-    addFeed(core: Hypercore, initiator?: boolean): this;
-    open(): Promise<void>;
-    close(): Promise<void>;
-}
-//# sourceMappingURL=multiplexer.d.ts.map

package/dist/types/src/multiplexer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"multiplexer.d.ts","sourceRoot":"","sources":["../../../src/multiplexer.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,OAAO,EAAE,WAAW,EAAuB,MAAM,SAAS,CAAC;AAO3D;;GAEG;AAEH,qBAAa,WAAW;IAYpB,OAAO,CAAC,QAAQ,CAAC,GAAG;IAXtB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAwD;IAC/E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6D;IAEtF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,cAAc,CAAoC;IAE1D,SAAgB,KAAK,cAAqB;IAC1C,SAAgB,MAAM,cAAqB;gBAIxB,GAAG,EAAE,MAAM;IAG9B,IAAI,MAAM,YAET;IAED,IAAI,KAAK,qBAER;IAED,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,UAAQ;IA6BpC,IAAI;IAuBJ,KAAK;CA4BZ"}

package/dist/types/src/multiplexer.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=multiplexer.test.d.ts.map

package/dist/types/src/multiplexer.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"multiplexer.test.d.ts","sourceRoot":"","sources":["../../../src/multiplexer.test.ts"],"names":[],"mappings":""}

package/src/multiplexer.test.ts

@@ -1,174 +0,0 @@
-//
-// Copyright 2022 DXOS.org
-//
-
-import { faker } from '@faker-js/faker';
-import { expect } from 'chai';
-import { PassThrough, Transform } from 'streamx';
-
-import { latch } from '@dxos/async';
-import { createKeyPair } from '@dxos/crypto';
-import { PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
-import { describe, test } from '@dxos/test';
-
-import { HypercoreFactory } from './hypercore-factory';
-import { Multiplexer } from './multiplexer';
-import { noop } from './testing';
-import { py } from './util';
-
-describe('Multiplexing', () => {
-  test('multiplexes feeds', async () => {
-    const plex1 = new Multiplexer('A');
-    const plex2 = new Multiplexer('B');
-
-    await plex1.open();
-    await plex2.open();
-
-    const numFeeds = 1;
-    const factory = new HypercoreFactory();
-    const feeds = await Promise.all(
-      Array.from(Array(numFeeds)).map(async () => {
-        const { publicKey, secretKey } = createKeyPair();
-        const core1 = factory.createFeed(publicKey, { secretKey });
-        const core2 = factory.createFeed(publicKey);
-
-        await py(core1, core1.open)();
-        await py(core2, core2.open)();
-
-        plex1.addFeed(core1, true);
-        plex2.addFeed(core2);
-        return [core1, core2];
-      }),
-    );
-
-    feeds.forEach(([core1, core2]) => {
-      expect(core1.stats.peers.length).to.eq(1);
-      expect(core2.stats.peers.length).to.eq(1);
-    });
-
-    const [closed, setClosed] = latch({ count: 2 });
-
-    // TODO(burdon): Test with additional PassThrough.
-    plex1.output.pipe(plex2.input, setClosed);
-    plex2.output.pipe(plex1.input, setClosed);
-
-    const numMessages = 1;
-    const written = new Set<string>();
-    Array.from(Array(numMessages)).forEach((_, i) => {
-      const [core] = faker.helpers.arrayElement(feeds);
-      written.add(core.key.toString());
-      core.append(`test-${i}: ${faker.lorem.sentence(10)}`, noop); // Long message.
-    });
-
-    {
-      const [synced, setSynced] = latch({ count: written.size });
-      feeds.forEach(([, core2]) => {
-        core2.on('sync', () => {
-          log('sync', { feedKey: PublicKey.from(core2.key) });
-          setSynced();
-        });
-      });
-
-      await synced();
-    }
-
-    await plex1.close();
-    await plex2.close();
-    await closed();
-
-    expect(plex1.isOpen).to.be.false;
-    expect(plex2.isOpen).to.be.false;
-
-    const count = feeds.reduce((total, [, core2]) => total + core2.length, 0);
-    expect(count).to.eq(numMessages);
-  });
-
-  test('pipelines', async () => {
-    const factory = new HypercoreFactory();
-    const { publicKey, secretKey } = createKeyPair();
-    const core1 = factory.createFeed(publicKey, { secretKey });
-    const core2 = factory.createFeed(publicKey);
-
-    await py(core1, core1.open)();
-    await py(core2, core2.open)();
-
-    const stream1 = core1.replicate(true, { live: true });
-    const stream2 = core2.replicate(false, { live: true });
-
-    //
-    // Pipeline
-    //
-
-    const createWireTap = (label: string) =>
-      new Transform({
-        transform: (data: Buffer, next: (err: Error | null, data: Buffer) => void) => {
-          log(label, { length: data.length });
-          next(null, data);
-        },
-      });
-
-    const [pipelineClosed, onStreamClose] = latch({ count: 2 });
-    const createPipeline = (type: number) => {
-      switch (type) {
-        case 1:
-          // prettier-ignore
-          return stream1
-            .pipe(stream2, onStreamClose)
-            .pipe(stream1, onStreamClose);
-
-        case 2:
-          // prettier-ignore
-          return stream1
-            .pipe(new PassThrough())
-            .pipe(stream2, onStreamClose)
-            .pipe(new PassThrough())
-            .pipe(stream1, onStreamClose);
-
-        case 3:
-          // prettier-ignore
-          return stream1
-            .pipe(createWireTap('send'))
-            .pipe(stream2, onStreamClose)
-            .pipe(createWireTap('recv'))
-            .pipe(stream1, onStreamClose);
-      }
-    };
-
-    const pipeline = createPipeline(3);
-    expect(core1.stats.peers).to.have.lengthOf(1);
-    expect(core2.stats.peers).to.have.lengthOf(1);
-
-    //
-    // Sync
-    //
-
-    const numMessages = 10;
-    const [synced, setSynced] = latch();
-    core2.on('sync', () => {
-      log('sync', { send: core1.stats.totals, recv: core1.stats.totals });
-      expect(core2.length).to.eq(10);
-      setSynced();
-    });
-
-    Array.from(Array(numMessages)).map((_, i) => core1.append(`test-${i}: ${faker.lorem.sentence()}`, noop));
-    await synced();
-
-    //
-    // Close
-    //
-
-    {
-      pipeline.finalize();
-      await pipelineClosed();
-
-      const [feedsClosed, done] = latch({ count: 2 });
-      core1.close(done);
-      core2.close(done);
-      await feedsClosed();
-
-      expect(core1.closed).to.be.true;
-      expect(core2.closed).to.be.true;
-    }
-  });
-});

package/src/multiplexer.ts

@@ -1,122 +0,0 @@
-//
-// Copyright 2022 DXOS.org
-//
-
-import { Hypercore } from 'hypercore';
-import { ProtocolStream } from 'hypercore-protocol';
-import assert from 'node:assert';
-import { PassThrough, Transform, Writable } from 'streamx';
-
-import { latch, Trigger } from '@dxos/async';
-import { PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
-import { ComplexMap } from '@dxos/util';
-
-/**
- * Hypercore multiplexer.
- */
-// TODO(burdon): Add encoding.
-export class Multiplexer {
-  private readonly _feeds = new ComplexMap<PublicKey, Hypercore>(PublicKey.hash);
-  private readonly _streams = new ComplexMap<PublicKey, ProtocolStream>(PublicKey.hash);
-
-  private _isOpen = false;
-  private _closedTrigger = new Trigger({ autoReset: true });
-
-  public readonly input = new PassThrough();
-  public readonly output = new PassThrough();
-
-  // prettier-ignore
-  constructor(
-    private readonly _id: string
-  ) {}
-
-  get isOpen() {
-    return this._isOpen;
-  }
-
-  get feeds() {
-    return Array.from(this._feeds.values());
-  }
-
-  addFeed(core: Hypercore, initiator = false) {
-    const stream = core.replicate(initiator, { live: true });
-
-    const feedKey = PublicKey.from(core.key);
-    this._feeds.set(feedKey, core);
-    this._streams.set(feedKey, stream);
-    log('added', { feedKey: PublicKey.from(feedKey) });
-
-    stream
-      .pipe(
-        new Transform({
-          transform: (data: Buffer, next: (err: Error | null, data: any) => void) => {
-            log('send', { id: this._id, feedKey: PublicKey.from(feedKey), payload: data.length });
-            next(null, {
-              feedKey: core.key,
-              payload: data,
-            });
-          },
-        }),
-      )
-      .pipe(this.output, () => {
-        log('pipeline closed', { id: this._id });
-        this._isOpen = false;
-        this._closedTrigger.wake();
-      });
-
-    return this;
-  }
-
-  async open() {
-    if (this._isOpen) {
-      return;
-    }
-
-    this.input.pipe(
-      new Writable({
-        write: (data: any, next: () => void) => {
-          const { feedKey, payload } = data;
-          const feedStream = this._streams.get(PublicKey.from(feedKey));
-          assert(feedStream, `invalid stream: ${PublicKey.from(feedKey).truncate()}`);
-          log('recv', { id: this._id, feedKey: PublicKey.from(feedKey), payload: (payload as Buffer).length });
-          feedStream.write(payload);
-          next();
-        },
-      }),
-    );
-
-    log('opened');
-    this._isOpen = true;
-  }
-
-  // TODO(burdon): Test if re-entrant?
-  async close() {
-    if (!this._isOpen) {
-      return;
-    }
-
-    log('closing...');
-    const [closed, setClosed] = latch({ count: this._streams.size });
-    Array.from(this._streams.values()).forEach((stream) => {
-      stream.once('end', () => {
-        log('stream closed');
-        setClosed();
-      });
-
-      stream.finalize();
-    });
-
-    await closed();
-
-    // NOTE: Depending on environment, pipeline may close before or after the stream above.
-    if (this._isOpen) {
-      await this._closedTrigger.wait();
-      assert(!this._isOpen);
-    }
-
-    this._feeds.clear();
-    this._streams.clear();
-    log('closed');
-  }
-}