@dxos/crypto 0.8.4-main.f9ba587 → 0.8.4-main.fbb7a13

package/package.json

@@ -1,29 +1,32 @@
 {
   "name": "@dxos/crypto",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fbb7a13",
   "description": "Basic cross-platform crypto 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",
   "imports": {
-    "#hypercore-crypto": {
-      "workerd": "./hypercore-crypto-stub.mjs",
-      "default": "hypercore-crypto"
+    "#subtle": {
+      "types": "./vendor/subtle.d.ts",
+      "node": "./vendor/subtle-node.mjs",
+      "browser": "./vendor/subtle-browser.mjs"
     }
   },
   "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"
     }
   },
-  "browser": {
-    "./src/subtle.ts": "./src/browser/subtle.ts"
-  },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {}
@@ -31,13 +34,13 @@
   "files": [
     "dist",
     "src",
-    "./hypercore-crypto-stub.mjs"
+    "vendor"
   ],
   "dependencies": {
-    "hypercore-crypto": "^2.3.0",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/keys": "0.8.4-main.f9ba587",
-    "@dxos/node-std": "0.8.4-main.f9ba587"
+    "@dxos/invariant": "0.8.4-main.fbb7a13",
+    "@dxos/keys": "0.8.4-main.fbb7a13",
+    "@dxos/node-std": "0.8.4-main.fbb7a13",
+    "@dxos/vendor-hypercore": "0.8.4-main.fbb7a13"
   },
   "devDependencies": {},
   "publishConfig": {

package/src/index.ts

@@ -2,9 +2,9 @@
 // Copyright 2020 DXOS.org
 //
 
+export * from '#subtle';
 export * from './keys';
-export * from './signer';
-export * from './subtle';
+export type * from './signer';
+export * from './uuid';
 export * from './validator';
 export * from './verify';
-export * from './uuid';

package/src/keys.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { describe, test, expect } from 'vitest';
+import { describe, expect, test } from 'vitest';
 
 import { createId, createKeyPair, randomBytes, sign, verify } from './keys';
 

package/src/keys.ts

@@ -3,9 +3,8 @@
 //
 
 import { invariant } from '@dxos/invariant';
-import { type KeyPair, PublicKey, type PublicKeyLike, PUBLIC_KEY_LENGTH, SECRET_KEY_LENGTH } from '@dxos/keys';
-
-import crypto from '#hypercore-crypto';
+import { type KeyPair, PUBLIC_KEY_LENGTH, PublicKey, type PublicKeyLike, SECRET_KEY_LENGTH } from '@dxos/keys';
+import crypto from '@dxos/vendor-hypercore/hypercore-crypto';
 
 export const SIGNATURE_LENGTH = 64;
 

package/src/uuid.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { webcrypto } from './subtle';
+import { webcrypto } from '#subtle';
 
 export const randomUUID = (): string => {
   return webcrypto.randomUUID();

package/src/validator.ts

@@ -3,8 +3,7 @@
 //
 
 import { PublicKey } from '@dxos/keys';
-
-import { verify } from '#hypercore-crypto';
+import { verify } from '@dxos/vendor-hypercore/hypercore-crypto';
 
 /**
  * Generator for signature validation function.

package/src/verify.ts

@@ -4,7 +4,7 @@
 
 import { type PublicKey } from '@dxos/keys';
 
-import { subtleCrypto } from './subtle';
+import { subtleCrypto } from '#subtle';
 
 /**
  * Verify a signature with the given key.
@@ -18,7 +18,9 @@ export const verifySignature = async (
   let publicKey!: CryptoKey;
 
   try {
-    publicKey = await subtleCrypto.importKey('raw', key.asUint8Array(), algorithm, true, ['verify']);
+    publicKey = await subtleCrypto.importKey('raw', key.asUint8Array() as Uint8Array<ArrayBuffer>, algorithm, true, [
+      'verify',
+    ]);
   } catch {
     return false;
   }
@@ -29,7 +31,7 @@ export const verifySignature = async (
       hash: 'SHA-256',
     },
     publicKey,
-    signature,
-    message,
+    signature as Uint8Array<ArrayBuffer>,
+    message as Uint8Array<ArrayBuffer>,
   );
 };

package/vendor/subtle.d.ts

@@ -0,0 +1,3 @@
+export const subtleCrypto: SubtleCrypto;
+
+export const webcrypto: Crypto;

package/dist/types/src/browser/subtle.d.ts

@@ -1,3 +0,0 @@
-export declare const subtleCrypto: SubtleCrypto;
-export declare const webcrypto: Crypto;
-//# sourceMappingURL=subtle.d.ts.map

package/dist/types/src/browser/subtle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"subtle.d.ts","sourceRoot":"","sources":["../../../../src/browser/subtle.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,YAAY,cAAgB,CAAC;AAE1C,eAAO,MAAM,SAAS,QAAS,CAAC"}

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

@@ -1,4 +0,0 @@
-import * as nodeCrypto from 'node:crypto';
-export declare const subtleCrypto: nodeCrypto.webcrypto.SubtleCrypto;
-export declare const webcrypto: nodeCrypto.webcrypto.Crypto;
-//# sourceMappingURL=subtle.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"subtle.d.ts","sourceRoot":"","sources":["../../../src/subtle.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAE1C,eAAO,MAAM,YAAY,mCAA8B,CAAC;AAExD,eAAO,MAAM,SAAS,6BAAuB,CAAC"}

package/hypercore-crypto-stub.mjs

@@ -1,11 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-export {};
-
-export const verify = () => {
-  throw new Error('hypercore-crypto is not available on this platform');
-};
-
-export default {};

package/src/shims.d.ts

@@ -1,6 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-// https://nodejs.org/api/packages.html#imports
-declare module '#hypercore-crypto';