web-dc-api 0.0.60 → 0.0.62

package/dist/cjs/implements/threaddb/lsstoreds/keybook.js

@@ -1,9 +1,8 @@
 'use strict';
 
 var key = require('../../../node_modules/interface-datastore/dist/src/key.js');
-var peerId = require('@libp2p/peer-id');
-var crypto = require('@libp2p/crypto');
-var ThreadID = require('@textile/threads-id');
+var index$1 = require('../../../node_modules/@libp2p/peer-id/dist/src/index.js');
+var index$2 = require('../../../node_modules/@textile/threads-id/dist/esm/index.js');
 var global = require('./global.js');
 var keyManager = require('../../../common/dc-key/keyManager.js');
 var index = require('../../../node_modules/@libp2p/crypto/dist/src/keys/index.js');
@@ -28,7 +27,7 @@ class DsKeyBook {
     const key = global.dsLogKey(t, p, KB_BASE).child(PUB_SUFFIX);
     try {
       const value = await this.ds.get(key);
-      return crypto.keys.publicKeyFromRaw(value);
+      return index.publicKeyFromRaw(value);
     } catch (err) {
       if (err.code === 'ERR_NOT_FOUND') return;
       throw new Error(`Error getting public key: ${err.message}`);
@@ -36,8 +35,8 @@ class DsKeyBook {
   }
   async addPubKey(t, p, pk) {
     if (!pk) throw new Error('Public key is null');
-    const peerId$1 = peerId.peerIdFromPublicKey(pk);
-    if (!peerId$1.equals(p)) {
+    const peerId = index$1.peerIdFromPublicKey(pk);
+    if (!peerId.equals(p)) {
       throw new Error("Log ID doesn't match provided public key");
     }
     const value = pk.raw;
@@ -48,7 +47,7 @@ class DsKeyBook {
     const key = global.dsLogKey(t, p, KB_BASE).child(PRIV_SUFFIX);
     try {
       const value = await this.ds.get(key);
-      return crypto.keys.privateKeyFromRaw(value);
+      return index.privateKeyFromRaw(value);
     } catch (err) {
       if (err.code === 'ERR_NOT_FOUND') return null;
       throw new Error(`Error getting private key: ${err.message}`);
@@ -56,8 +55,8 @@ class DsKeyBook {
   }
   async addPrivKey(t, p, sk) {
     if (!sk) throw new Error('Private key is null');
-    const peerId$1 = await peerId.peerIdFromPrivateKey(sk);
-    if (!peerId$1.equals(p)) {
+    const peerId = await index$1.peerIdFromPrivateKey(sk);
+    if (!peerId.equals(p)) {
       throw new Error("Peer ID doesn't match private key");
     }
     const value = sk.raw;
@@ -204,7 +203,7 @@ class DsKeyBook {
         if (!pubKey) {
           continue;
         }
-        await this.addPubKey(ThreadID.ThreadID.fromString(tid), peerId.peerIdFromPublicKey(pubKey), pubKey);
+        await this.addPubKey(index$2.default.fromString(tid), index$1.peerIdFromPublicKey(pubKey), pubKey);
       }
     }
     for (const tid in dump.data.private) {
@@ -213,7 +212,7 @@ class DsKeyBook {
         if (!privKey) {
           continue;
         }
-        await this.addPrivKey(ThreadID.ThreadID.fromString(tid), peerId.peerIdFromPrivateKey(privKey), privKey);
+        await this.addPrivKey(index$2.default.fromString(tid), index$1.peerIdFromPrivateKey(privKey), privKey);
       }
     }
     for (const tid in dump.data.read) {
@@ -222,7 +221,7 @@ class DsKeyBook {
         continue;
       }
       const key = await keyManager.symKeyFromBytes(rk);
-      await this.addReadKey(ThreadID.ThreadID.fromString(tid), key);
+      await this.addReadKey(index$2.default.fromString(tid), key);
     }
     for (const tid in dump.data.service) {
       const sk = dump.data.service[tid];
@@ -230,7 +229,7 @@ class DsKeyBook {
         continue;
       }
       const key = await keyManager.symKeyFromBytes(sk);
-      await this.addServiceKey(ThreadID.ThreadID.fromString(tid), key);
+      await this.addServiceKey(index$2.default.fromString(tid), key);
     }
   }
 }

package/dist/cjs/implements/threaddb/lsstoreds/metadata.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var key = require('../../../node_modules/interface-datastore/dist/src/key.js');
-var ThreadID = require('@textile/threads-id');
-require('../../../_virtual/index.js');
+var index = require('../../../node_modules/@textile/threads-id/dist/esm/index.js');
+require('../../../_virtual/index2.js');
 
 // 元数据键前缀  
 const tmetaBase = new key.Key('/thread/meta');
@@ -156,7 +156,7 @@ class DsThreadMetadata {
   }
   parseThreadID(ts) {
     try {
-      return ThreadID.ThreadID.fromString(ts);
+      return index.default.fromString(ts);
     } catch (err) {
       throw new Error(`Invalid thread ID: ${ts}`);
     }

package/dist/cjs/implements/threaddb/net/define.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var multiaddr = require('multiaddr');
+var index = require('../../../_virtual/index5.js');
 
 const netPullingLimit = 1000; // 拉取记录数的限制
 // 协议常量定义  
@@ -34,14 +34,14 @@ function createProtocol(code, size, name, resolvable, path) {
 // populate tables
 table.forEach(row => {
   const proto = createProtocol(...row);
-  if (!multiaddr.protocols.codes[proto.code]) {
-    multiaddr.protocols.codes[proto.code] = proto;
-    multiaddr.protocols.names[proto.name] = proto;
+  if (!index.srcExports.protocols.codes[proto.code]) {
+    index.srcExports.protocols.codes[proto.code] = proto;
+    index.srcExports.protocols.names[proto.name] = proto;
   }
 });
-if (!multiaddr.protocols.codes[Protocol.code]) {
-  multiaddr.protocols.codes[Protocol.code] = Protocol;
-  multiaddr.protocols.names[Protocol.name] = Protocol;
+if (!index.srcExports.protocols.codes[Protocol.code]) {
+  index.srcExports.protocols.codes[Protocol.code] = Protocol;
+  index.srcExports.protocols.names[Protocol.name] = Protocol;
 }
 /**
  * Record implements IThreadRecord

package/dist/cjs/implements/threaddb/net/grpcClient.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var ThreadID = require('@textile/threads-id');
+var index = require('../../../node_modules/@textile/threads-id/dist/esm/index.js');
 var dcnet_proto = require('../../../proto/dcnet_proto.js');
 var net_pb = require('../pb/net_pb.js');
-var grpcLibp2pClient = require('grpc-libp2p-client');
-var multiaddr = require('@multiformats/multiaddr');
+var index_esm = require('../../../node_modules/grpc-libp2p-client/dist/index.esm.js');
+var index$2 = require('../../../node_modules/@multiformats/multiaddr/dist/src/index.js');
 var toString = require('../../../node_modules/uint8arrays/dist/src/to-string.js');
 var ed25519 = require('../../../common/dc-key/ed25519.js');
 var keyManager = require('../../../common/dc-key/keyManager.js');
@@ -12,14 +12,15 @@ var core = require('../core/core.js');
 var cid = require('../../../node_modules/multiformats/dist/src/cid.js');
 var define = require('./define.js');
 var record = require('../cbor/record.js');
-var index$1 = require('../../../node_modules/uint8-varint/dist/src/index.js');
+var index$3 = require('../../../node_modules/uint8-varint/dist/src/index.js');
 var protoCustomTypes = require('../pb/proto-custom-types.js');
-var index = require('../../../_virtual/index.js');
+var index$1 = require('../../../_virtual/index2.js');
 var db = require('../core/db.js');
+var protocolsTable = require('../../../node_modules/@multiformats/multiaddr/dist/src/protocols-table.js');
 
 const {
   Buffer
-} = index;
+} = index$1;
 class DBGrpcClient {
   constructor(node, peerAddr, token, net, protocol) {
     Object.defineProperty(this, "grpcClient", {
@@ -46,7 +47,7 @@ class DBGrpcClient {
       writable: true,
       value: void 0
     });
-    this.grpcClient = new grpcLibp2pClient.Libp2pGrpcClient(node, peerAddr, token, protocol);
+    this.grpcClient = new index_esm.Libp2pGrpcClient(node, peerAddr, token, protocol);
     this.token = token;
     this.net = net;
   }
@@ -116,7 +117,7 @@ class DBGrpcClient {
     if (!reply.threadID) {
       throw new Error('Missing required field: threadID');
     }
-    const threadID = ThreadID.ThreadID.fromString(new TextDecoder().decode(reply.threadID));
+    const threadID = index.default.fromString(new TextDecoder().decode(reply.threadID));
     const logs = reply.logs ? await Promise.all(reply.logs.map(async lg => {
       if (!lg.ID || !lg.pubKey) {
         throw new Error('Missing required fields in LogInfo: id or pubKey');
@@ -160,7 +161,7 @@ class DBGrpcClient {
           // thread 协议码为 406
           let processedBytes = this.removeThreadProtocol(addrBytes);
           // 使用处理后的字节创建多地址
-          let addr = multiaddr.multiaddr(processedBytes);
+          let addr = index$2.multiaddr(processedBytes);
           const threadMultiaddr = new core.ThreadMuliaddr(addr, threadID);
           addrs.push(threadMultiaddr);
         } catch (addrErr) {
@@ -175,13 +176,13 @@ class DBGrpcClient {
   removeThreadProtocol(bytes) {
     let i = 0;
     while (i < bytes.length) {
-      const code = index$1.decode(bytes, i);
+      const code = index$3.decode(bytes, i);
       if (code == define.Protocol.code) {
         // 406,截取前面的数据
         return bytes.slice(0, i);
       }
-      const n = index$1.encodingLength(code);
-      const p = multiaddr.protocols(code);
+      const n = index$3.encodingLength(code);
+      const p = protocolsTable.getProtocol(code);
       const size = this.sizeForAddr(p, bytes.slice(i + n));
       if (size === 0) {
         i += n;
@@ -204,8 +205,8 @@ class DBGrpcClient {
     } else if (p.size === 0) {
       return 0;
     } else {
-      const size = index$1.decode(addr instanceof Uint8Array ? addr : Uint8Array.from(addr));
-      return size + index$1.encodingLength(size);
+      const size = index$3.decode(addr instanceof Uint8Array ? addr : Uint8Array.from(addr));
+      return size + index$3.encodingLength(size);
     }
   }
   async getThreadKeys(sPubkey, args) {

package/dist/cjs/implements/threaddb/net/grpcserver.js

@@ -1,14 +1,14 @@
 'use strict';
 
 var cid = require('../../../node_modules/multiformats/dist/src/cid.js');
-var multiaddr = require('@multiformats/multiaddr');
+var index$1 = require('../../../node_modules/@multiformats/multiaddr/dist/src/index.js');
 var stream_esm = require('../../../node_modules/grpc-libp2p-client/dist/dc-http2/stream.esm.js');
 var frame_esm = require('../../../node_modules/grpc-libp2p-client/dist/dc-http2/frame.esm.js');
 var net_pb = require('../pb/net_pb.js');
 var parser_esm = require('../../../node_modules/grpc-libp2p-client/dist/dc-http2/parser.esm.js');
 var hpack_esm = require('../../../node_modules/grpc-libp2p-client/dist/dc-http2/hpack.esm.js');
-var crypto = require('@libp2p/crypto');
 var protoCustomTypes = require('../pb/proto-custom-types.js');
+var index = require('../../../node_modules/@libp2p/crypto/dist/src/keys/index.js');
 
 class DCGrpcServer {
   constructor(libp2p, protocol) {
@@ -87,13 +87,13 @@ class DCGrpcServer {
       console.log('Service Key:', serviceKey.toString());
     }
     const response = new net_pb.net.pb.GetLogsReply();
-    const keyPair = await crypto.keys.generateKeyPair("Ed25519");
+    const keyPair = await index.generateKeyPair("Ed25519");
     // 获取公钥
     const publicKey = keyPair.publicKey;
     const pid = this.libp2p.peerId.toString();
     // const headBytes  = new TextEncoder().encode("bafybeiai3u5rmdsbmqklo7icdn3x5suoyepu2mqms3vgj4rvnkuyjnivmy")
     const head = cid.CID.parse("bafybeiai3u5rmdsbmqklo7icdn3x5suoyepu2mqms3vgj4rvnkuyjnivmy");
-    const addr = protoCustomTypes.MultiaddrConverter.toBytes(multiaddr.multiaddr('/ip4/10.0.0.1/tcp/4001/p2p/' + pid));
+    const addr = protoCustomTypes.MultiaddrConverter.toBytes(index$1.multiaddr('/ip4/10.0.0.1/tcp/4001/p2p/' + pid));
     let pubkeyBytes = await protoCustomTypes.KeyConverter.publicToBytes(publicKey);
     const addrs = [];
     addrs.push(addr);

package/dist/cjs/implements/threaddb/net/net.js

@@ -1,9 +1,8 @@
 'use strict';
 
-var peerId = require('@libp2p/peer-id');
-var crypto = require('@libp2p/crypto');
-var multiaddr = require('@multiformats/multiaddr');
-var ThreadID = require('@textile/threads-id');
+var index$2 = require('../../../node_modules/@libp2p/peer-id/dist/src/index.js');
+var index = require('../../../node_modules/@multiformats/multiaddr/dist/src/index.js');
+var index$3 = require('../../../node_modules/@textile/threads-id/dist/esm/index.js');
 var ed25519 = require('../../../common/dc-key/ed25519.js');
 var key = require('../common/key.js');
 var global = require('../lsstoreds/global.js');
@@ -21,12 +20,13 @@ var net_pb = require('../pb/net_pb.js');
 var logstore = require('../common/logstore.js');
 var types = require('../../../common/types/types.js');
 var protoCustomTypes = require('../pb/proto-custom-types.js');
-var index = require('../../../_virtual/index.js');
+var index$1 = require('../../../_virtual/index2.js');
 var AsyncMutex = require('../common/AsyncMutex.js');
+var index$4 = require('../../../node_modules/@libp2p/crypto/dist/src/keys/index.js');
 
 const {
   Buffer
-} = index;
+} = index$1;
 /**
  * Creates a new ThreadRecord
  */
@@ -151,7 +151,7 @@ class Network {
       if (!this.context.publicKey) {
         throw new Error("publicKey is null");
       }
-      const addr = multiaddr.multiaddr(peerAddr);
+      const addr = index.multiaddr(peerAddr);
       const client = new dcapi.Client(this.libp2p, this.bstore, addr, define.dc_protocol);
       //获取token
       const token = await client.GetToken(this.context.appInfo.appId || "", this.context.publicKey.string(), payload => {
@@ -165,7 +165,7 @@ class Network {
           if (!peerAddr) {
             throw new Error("peerAddr is null");
           }
-          const addr = multiaddr.multiaddr(peerAddr);
+          const addr = index.multiaddr(peerAddr);
           const client = new dcapi.Client(this.libp2p, this.bstore, addr, define.dc_protocol);
           const token = await client.GetToken(this.context.appInfo.appId || "", this.context.publicKey.string(), payload => {
             return this.sign(payload);
@@ -197,11 +197,11 @@ class Network {
     const peerIds = [];
     for (const peer of peers) {
       const peerStr = Buffer.from(peer.slice(2), "hex").toString("utf8");
-      const peerId$1 = peerId.peerIdFromString(peerStr);
-      if (!peerId$1) {
+      const peerId = index$2.peerIdFromString(peerStr);
+      if (!peerId) {
         continue;
       }
-      peerIds.push(peerId$1);
+      peerIds.push(peerId);
     }
     return peerIds;
   }
@@ -236,7 +236,7 @@ class Network {
       if (!idStr) {
         throw new Error("Invalid thread address");
       }
-      const id = ThreadID.ThreadID.fromString(idStr);
+      const id = index$3.default.fromString(idStr);
       // 验证身份
       let identity = await this.validate(id, options.token);
       if (identity) {
@@ -251,11 +251,11 @@ class Network {
       // const peerAddr = multiaddr(addr.toString().split(threadComp)[0]);
       const peerAddr = addr.addr;
       // 获取对等点信息
-      const peerId$1 = peerAddr.getPeerId();
-      if (!peerId$1) {
+      const peerId = peerAddr.getPeerId();
+      if (!peerId) {
         throw new Error("Invalid peer address");
       }
-      const pid = peerId.peerIdFromString(peerId$1);
+      const pid = index$2.peerIdFromString(peerId);
       const addFromSelf = pid.toString() === this.hostID;
       // 如果我们从自己添加，检查threaddb 是否存在
       if (addFromSelf) {
@@ -390,9 +390,9 @@ class Network {
       if (key) {
         // 根据密钥类型处理
         if (key instanceof ed25519.Ed25519PubKey) {
-          lid = peerId.peerIdFromPublicKey(key);
+          lid = index$2.peerIdFromPublicKey(key);
         } else if (key instanceof ed25519.Ed25519PrivKey) {
-          lid = peerId.peerIdFromPrivateKey(key);
+          lid = index$2.peerIdFromPrivateKey(key);
         } else {
           throw new Error("Invalid log key");
         }
@@ -415,7 +415,7 @@ class Network {
           }
           const lidbstr = new TextDecoder().decode(lidb);
           // 从字节转换为PeerId
-          lid = peerId.peerIdFromString(lidbstr);
+          lid = index$2.peerIdFromString(lidbstr);
         } catch (error) {
           throw error;
         }
@@ -477,7 +477,7 @@ class Network {
       // Handle records
       const tRecords = [];
       for (const [lidStr, rec] of Object.entries(recs)) {
-        const lid = peerId.peerIdFromString(lidStr);
+        const lid = index$2.peerIdFromString(lidStr);
         const rs = rec;
         if (appConnected) {
           // 使用并发控制，但不分批 - 避免慢任务拖累整批
@@ -618,39 +618,39 @@ class Network {
   async createLog(id, key, identity) {
     let privKey;
     let pubKey;
-    let peerId$1;
+    let peerId;
     if (!key) {
-      const keyPair = await crypto.keys.generateKeyPair("Ed25519");
+      const keyPair = await index$4.generateKeyPair("Ed25519");
       privKey = new ed25519.Ed25519PrivKey(keyPair.raw);
       pubKey = keyPair.publicKey;
-      peerId$1 = peerId.peerIdFromPrivateKey(privKey);
+      peerId = index$2.peerIdFromPrivateKey(privKey);
     } else {
       if (key instanceof ed25519.Ed25519PrivKey) {
         privKey = key;
         pubKey = key.publicKey;
-        peerId$1 = peerId.peerIdFromPrivateKey(key);
+        peerId = index$2.peerIdFromPrivateKey(key);
       } else if (key instanceof ed25519.Ed25519PubKey) {
         pubKey = key;
-        peerId$1 = peerId.peerIdFromPublicKey(key);
+        peerId = index$2.peerIdFromPublicKey(key);
       } else {
         throw new Error("Invalid key type.");
       }
     }
-    const addr = multiaddr.multiaddr(`/p2p/${this.hostID}`); // 基于 hostID 生成地址
+    const addr = index.multiaddr(`/p2p/${this.hostID}`); // 基于 hostID 生成地址
     const head = {
       counter: 0
     };
     const logInfo = {
       privKey,
       pubKey,
-      id: peerId$1,
+      id: peerId,
       addrs: [addr],
       managed: true,
       head: head
     };
     // 将日志添加到threaddb存储
     await this.logstore.addLog(id, logInfo);
-    const logIDBytes = new TextEncoder().encode(peerId$1.toString());
+    const logIDBytes = new TextEncoder().encode(peerId.toString());
     await this.logstore.metadata.putBytes(id, identity?.toString() || "", logIDBytes);
     return logInfo;
   }
@@ -720,7 +720,7 @@ class Network {
    * @param pid 对等点ID
    * @returns 无返回值，但会抛出错误
    */
-  async updateRecordsFromPeer(tid, peerId$1, client) {
+  async updateRecordsFromPeer(tid, peerId, client) {
     try {
       // 获取threaddb 偏移量
       const [offsets, peers] = await this.threadOffsets(tid);
@@ -733,17 +733,17 @@ class Network {
       if (client) {
         recs = await this.getRecordsWithDbClient(client, req, serviceKey);
       } else {
-        if (!peerId$1) {
+        if (!peerId) {
           throw new Error("A peer-id is required to request records");
         }
         // 从对等点获取记录
-        recs = await this.getRecordsFromPeer(peerId$1, req, serviceKey);
+        recs = await this.getRecordsFromPeer(peerId, req, serviceKey);
       }
       // 处理接收到的记录
       for (const [lidStr, rs] of Object.entries(recs)) {
         try {
           // 将字符串ID转换为PeerId对象
-          const lid = peerId.peerIdFromString(lidStr);
+          const lid = index$2.peerIdFromString(lidStr);
           // 将记录添加到本地存储
           await this.putRecords(tid, lid, rs.records, rs.counter);
         } catch (err) {
@@ -753,12 +753,12 @@ class Network {
       // 检查是否可能有更多记录需要获取
       for (const [lidStr, rs] of Object.entries(recs)) {
         try {
-          const lid = peerId.peerIdFromString(lidStr);
+          const lid = index$2.peerIdFromString(lidStr);
           const head = await this.currentHead(tid, lid);
           // 如果我们收到了最大数量的记录，并且可能还有更多
           if (head.counter <= rs.counter && rs.records.length === define$1.netPullingLimit) {
             // 递归调用继续获取更多记录
-            return this.updateRecordsFromPeer(tid, peerId$1, client);
+            return this.updateRecordsFromPeer(tid, peerId, client);
           }
         } catch (err) {
           // 忽略获取头部的错误，继续检查其他日志
@@ -1030,7 +1030,7 @@ class Network {
     if (!p) {
       throw new Error("Address does not contain peer ID");
     }
-    const pid = peerId.peerIdFromString(p);
+    const pid = index$2.peerIdFromString(p);
     // Don't call ourselves
     if (pid.toString() === this.hostID) {
       return [pid, false];
@@ -1326,7 +1326,7 @@ class Network {
     } else if (lidb) {
       // 获取现有日志
       const lidbstr = new TextDecoder().decode(lidb);
-      const lid = peerId.peerIdFromString(lidbstr);
+      const lid = index$2.peerIdFromString(lidbstr);
       return this.logstore.getLog(id, lid);
     }
     // 创建新日志，如果不存在