@dxos/hypercore 0.8.3 → 0.8.4-main.1068cf700f

package/package.json

@@ -1,15 +1,20 @@
 {
   "name": "@dxos/hypercore",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1068cf700f",
   "description": "Hypercore wrapper and utils.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
@@ -25,31 +30,26 @@
   ],
   "dependencies": {
     "readable-stream": "^3.6.0",
-    "sodium-native": "^3.2.0",
-    "sodium-universal": "^3.0.2",
     "streamx": "^2.12.5",
-    "@dxos/async": "0.8.3",
-    "@dxos/codec-protobuf": "0.8.3",
-    "@dxos/crypto": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/node-std": "0.8.3",
-    "@dxos/random-access-storage": "0.8.3",
-    "@dxos/typings": "0.8.3",
-    "@dxos/util": "0.8.3"
+    "@dxos/async": "0.8.4-main.1068cf700f",
+    "@dxos/codec-protobuf": "0.8.4-main.1068cf700f",
+    "@dxos/debug": "0.8.4-main.1068cf700f",
+    "@dxos/invariant": "0.8.4-main.1068cf700f",
+    "@dxos/random-access-storage": "0.8.4-main.1068cf700f",
+    "@dxos/node-std": "0.8.4-main.1068cf700f",
+    "@dxos/keys": "0.8.4-main.1068cf700f",
+    "@dxos/crypto": "0.8.4-main.1068cf700f",
+    "@dxos/typings": "0.8.4-main.1068cf700f",
+    "@dxos/util": "0.8.4-main.1068cf700f",
+    "@dxos/vendor-hypercore": "0.8.4-main.1068cf700f"
   },
   "devDependencies": {
-    "@types/randombytes": "^2.0.0",
     "@types/readable-stream": "^2.3.9",
-    "hypercore": "^9.12.0",
     "hypercore-protocol": "^8.0.7",
-    "noise-protocol": "3.0.1",
-    "random-access-memory": "^4.1.0",
-    "@dxos/random": "0.8.3",
-    "@dxos/tracing": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/log": "0.8.3"
+    "@dxos/log": "0.8.4-main.1068cf700f",
+    "@dxos/random": "0.8.4-main.1068cf700f",
+    "@dxos/util": "0.8.4-main.1068cf700f",
+    "@dxos/tracing": "0.8.4-main.1068cf700f"
   },
   "publishConfig": {
     "access": "public"

package/src/crypto.ts

@@ -2,7 +2,6 @@
 // Copyright 2022 DXOS.org
 //
 
-import { type AbstractValueEncoding, type Crypto } from 'hypercore';
 import { callbackify } from 'node:util';
 
 import { type Codec, type EncodingOptions } from '@dxos/codec-protobuf';
@@ -10,6 +9,7 @@ import { type Signer, verifySignature } from '@dxos/crypto';
 import { invariant } from '@dxos/invariant';
 import { type PublicKey } from '@dxos/keys';
 import { arrayToBuffer } from '@dxos/util';
+import { type AbstractValueEncoding, type Crypto } from '@dxos/vendor-hypercore/hypercore';
 
 /**
  * Create encoding (e.g., from protobuf codec).

package/src/defaults.ts

@@ -2,7 +2,12 @@
 // Copyright 2022 DXOS.org
 //
 
-import type { HypercoreOptions, ReadStreamOptions, ReplicationOptions, WriteStreamOptions } from 'hypercore';
+import type {
+  HypercoreOptions,
+  ReadStreamOptions,
+  ReplicationOptions,
+  WriteStreamOptions,
+} from '@dxos/vendor-hypercore/hypercore';
 
 /**
  * https://github.com/hypercore-protocol/hypercore/tree/v9.12.0#var-feed--hypercorestorage-key-options

package/src/hypercore-factory.ts

@@ -2,11 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
-import hypercore from 'hypercore';
-import type { Hypercore, HypercoreOptions } from 'hypercore';
-
 import { invariant } from '@dxos/invariant';
-import { createStorage, type Directory, StorageType } from '@dxos/random-access-storage';
+import { type Directory, StorageType, createStorage } from '@dxos/random-access-storage';
+import hypercore from '@dxos/vendor-hypercore/hypercore';
+import type { Hypercore, HypercoreOptions } from '@dxos/vendor-hypercore/hypercore';
 
 import { py } from './util';
 

package/src/hypercore.test.ts

@@ -2,8 +2,9 @@
 // Copyright 2019 DXOS.org
 //
 
+import { promisify } from 'node:util';
+
 import { type AbstractValueEncoding } from 'hypercore';
-import util from 'node:util';
 import { describe, expect, test } from 'vitest';
 
 import { type Codec } from '@dxos/codec-protobuf';
@@ -32,7 +33,7 @@ describe('Hypercore', () => {
 
     {
       // Check open is idempotent.
-      const open = util.promisify(core.open.bind(core));
+      const open = promisify(core.open.bind(core));
       await open();
       await open();
     }
@@ -40,7 +41,7 @@ describe('Hypercore', () => {
     {
       // Append block.
       expect(core.length).to.eq(0);
-      const append = util.promisify(core.append.bind(core));
+      const append = promisify(core.append.bind(core));
       const seq = await append('test');
       expect(core.length).to.eq(1);
       expect(seq).to.eq(0);
@@ -48,14 +49,14 @@ describe('Hypercore', () => {
 
     {
       // Get block.
-      const get = util.promisify(core.get.bind(core));
+      const get = promisify(core.get.bind(core));
       const block: any = await get(0);
       expect(block.toString()).to.eq('test');
     }
 
     {
       // Check open is idempotent.
-      const close = util.promisify(core.close.bind(core));
+      const close = promisify(core.close.bind(core));
       await close();
       await close();
     }
@@ -67,7 +68,7 @@ describe('Hypercore', () => {
     const core = factory.createFeed(publicKey, { secretKey, valueEncoding });
 
     {
-      const append = util.promisify(core.append.bind(core));
+      const append = promisify(core.append.bind(core));
 
       expect(core.length).to.eq(0);
       const seq = await append({
@@ -80,7 +81,7 @@ describe('Hypercore', () => {
     }
 
     {
-      const head = util.promisify(core.head.bind(core));
+      const head = promisify(core.head.bind(core));
 
       const { key, value } = await head();
       expect(key).to.eq('test-1');
@@ -88,7 +89,7 @@ describe('Hypercore', () => {
     }
 
     {
-      const get = util.promisify(core.get.bind(core));
+      const get = promisify(core.get.bind(core));
 
       const { key, value } = await get(0);
       expect(key).to.eq('test-1');

package/src/index.ts

@@ -2,8 +2,13 @@
 // Copyright 2021 DXOS.org
 //
 
-export { default as hypercore } from 'hypercore';
-export type { Hypercore, HypercoreOptions, HypercoreProperties, ReadStreamOptions } from 'hypercore';
+export { default as hypercore } from '@dxos/vendor-hypercore/hypercore';
+export type {
+  Hypercore,
+  HypercoreOptions,
+  HypercoreProperties,
+  ReadStreamOptions,
+} from '@dxos/vendor-hypercore/hypercore';
 
 export * from './crypto';
 export * from './defaults';

package/src/iterator.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2019 DXOS.org
 //
 
-import util from 'node:util';
+import { promisify } from 'node:util';
+
 import { describe, test } from 'vitest';
 
 import { latch } from '@dxos/async';
@@ -22,7 +23,7 @@ describe('AsyncIterator', () => {
 
     // Write.
     {
-      const append = util.promisify(core.append.bind(core));
+      const append = promisify(core.append.bind(core));
       for (let i = 0; i < numBlocks; i++) {
         await append(`test-${i}`);
       }
@@ -51,7 +52,7 @@ describe('AsyncIterator', () => {
 
             log('received', { data: String(value) });
             inc();
-          } catch (err) {
+          } catch {
             end();
             break;
           }

package/src/replicate.test.ts

@@ -4,17 +4,17 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { latch, sleep, Trigger } from '@dxos/async';
+import { Trigger, latch, sleep } from '@dxos/async';
 import { createKeyPair } from '@dxos/crypto';
 import { log } from '@dxos/log';
 import { faker } from '@dxos/random';
-import { createStorage, StorageType } from '@dxos/random-access-storage';
+import { StorageType, createStorage } from '@dxos/random-access-storage';
 import { TRACE_PROCESSOR } from '@dxos/tracing';
 import { range, sum } from '@dxos/util';
 
 import { HypercoreFactory } from './hypercore-factory';
 import { createReadable } from './iterator';
-import { batch, createDataItem, type TestDataItem } from './testing';
+import { type TestDataItem, batch, createDataItem } from './testing';
 
 const noop = () => {};
 

package/src/streams.test.ts

@@ -2,7 +2,8 @@
 // Copyright 2019 DXOS.org
 //
 
-import util from 'node:util';
+import { promisify } from 'node:util';
+
 import { Writable } from 'streamx';
 import { describe, test } from 'vitest';
 
@@ -34,7 +35,7 @@ describe('Streams', () => {
     );
 
     {
-      const append = util.promisify(core.append.bind(core));
+      const append = promisify(core.append.bind(core));
       for (const i of Array.from(Array(numBlocks)).keys()) {
         await append(`message-${i}`);
       }
@@ -70,7 +71,7 @@ describe('Streams', () => {
     }
     await closed();
 
-    const close = util.promisify(core.close.bind(core));
+    const close = promisify(core.close.bind(core));
     await close();
   });
 });

package/src/util.ts

@@ -2,6 +2,6 @@
 // Copyright 2022 DXOS.org
 //
 
-import util from 'node:util';
+import { promisify } from 'node:util';
 
-export const py = (obj: any, fn: Function) => util.promisify(fn.bind(obj));
+export const py = (obj: any, fn: Function) => promisify(fn.bind(obj));