@tdxvolt/volt-client-grpc 0.17.0 → 0.18.0

package/README.md

@@ -1,5 +1,41 @@
-# volt-client-grpc
+# @tdxvolt/volt-client-grpc
 
-Javascript client library for accessing Volts.
+Javascript client library for accessing Volts using gRPC.
+
+n.b. This is nodejs only - for browser support use [`@tdxvolt/volt-client-web`](https://npmjs.org/@tdxvolt/volt-client-web).
+
+## Installation
+
+```bash
+npm install @tdxvolt/volt-client-grpc
+```
+
+## Usage
+
+```js
+import grpc from "@grpc/grpc-js";
+import { VoltClient } from "@tdxvolt/volt-client-grpc";
+
+const configPath = "./volt.config.json";
+
+let client = new VoltClient(grpc);
+
+client
+  .initialise(configPath)
+  .then(() => {
+    return client.GetResourceDescendants({
+      resource_id: client.config.volt.id,
+      depth: 1
+    });
+  })
+  .then((response) => {
+    console.log(response);
+  })
+  .catch((err) => {
+    console.error("failure in simple-client [%s]", err.message);
+  })
+  .finally(() => {
+    console.log("finished");
+  });
+```
 
-n.b. This is nodejs only - for browser support use @tdxvolt/volt-client-web.

package/lib/index.cjs

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var lodash = require('lodash');
 var ip = require('ip');
-var voltClientWeb = require('@tdxvolt/volt-client-web');
+var js = require('@tdxvolt/volt-client-web/js');
 var debug = require('debug');
 var EventEmitter = require('events');
 var fs = require('fs');
@@ -17,27 +17,8 @@ var uuid = require('uuid');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n["default"] = e;
-  return Object.freeze(n);
-}
-
 var lodash__default = /*#__PURE__*/_interopDefaultLegacy(lodash);
 var ip__default = /*#__PURE__*/_interopDefaultLegacy(ip);
-var voltClientWeb__namespace = /*#__PURE__*/_interopNamespace(voltClientWeb);
 var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var fs__default = /*#__PURE__*/_interopDefaultLegacy(fs);
@@ -46,60 +27,13 @@ var protoLoader__default = /*#__PURE__*/_interopDefaultLegacy(protoLoader);
 var bent__default = /*#__PURE__*/_interopDefaultLegacy(bent);
 var jwt__default = /*#__PURE__*/_interopDefaultLegacy(jwt);
 
-// eslint-disable-next-line import/prefer-default-export
 const constants = {
   authTokenName: "volt-token",
-  collectionOperation: {
-    add: "ADD",
-    remove: "REMOVE",
-    update: "UPDATE"
-  },
-  crypto: {
-    subjectDefaults: [
-      {
-        name: "countryName",
-        value: "GB"
-      },
-      {
-        name: "localityName",
-        value: "Southampton"
-      },
-      {
-        name: "organizationName",
-        value: "nquiringminds Ltd"
-      }
-    ],
-    userIdOID: "0.9.2342.19200300.100.1.1"
-  },
   defaultDIDHostName: "tdxvolt.com",
   didServiceType: {
     voltConfig: "volt-discovery"
   },
-  identityType: {
-    did: "did",
-    volt: "volt"
-  },
-  onlineStatus: {
-    offline: "offline",
-    online: "online",
-    unknown: "unknown"
-  },
   privateEncryptedKeyPrefix: "-----BEGIN ENCRYPTED PRIVATE KEY-----",
-  resource: {
-    identity: "ident",
-    identityView: "ident-view",
-    proxy: "proxy",
-    proxyView: "proxy-view",
-    vc: "vc",
-    vcView: "vc-view"
-  },
-  voltStatus: {
-    pending: "",
-    online: "online",
-    offline: "offline",
-    deleted: "deleted",
-    revoked: "revoked"
-  },
   /**
    * These top-level service types should map to a protobuf definition
    * in @tdxvolt/volt-proto.
@@ -112,12 +46,7 @@ const constants = {
     relayAPI: "tdx.volt_api.relay.v1.RelayAPI",
     voltAPI: "tdx.volt_api.volt.v1.VoltAPI",
     wireAPI: "tdx.volt_api.volt.v1.WireAPI"
-  },
-  tunnelInvokeMethod: "/tdx.volt_api.volt.v1.VoltAPI/Invoke",
-  tunnelPingInterval: 10000,
-  tunnelPingTimeout: 2500,
-  tunnelReconnectAfter: 30000,
-  tunnelTimeoutInterval: 10000 * 2 // This must always be greater than `tunnelPingInterval`.
+  }
 };
 
 const createSecureContextOptions = (cryptoOptions) => {
@@ -172,7 +101,7 @@ var utils = /*#__PURE__*/Object.freeze({
   createSecureContextOptions: createSecureContextOptions,
   getServiceAddress: getServiceAddress,
   getDIDResolutionURL: getDIDResolutionURL,
-  crypto: voltClientWeb__namespace
+  crypto: js.voltUtils
 });
 
 /* eslint-disable no-underscore-dangle */
@@ -418,6 +347,15 @@ var grpcUtils = /*#__PURE__*/Object.freeze({
 
 /* eslint-disable no-underscore-dangle */
 
+const {
+  createSigningKey,
+  fingerprintFromPem,
+  getIdentityToken,
+  keyFromPem: keyFromPem$2,
+  privateKeyToPem,
+  publicKeyToPem: publicKeyToPem$2
+} = js.voltUtils;
+
 const log$5 = debug__default["default"]("volt-client-grpc:volt-credential");
 
 class VoltCredential {
@@ -442,13 +380,13 @@ class VoltCredential {
       }
 
       // Need to unencrypt the private key.
-      const decrypted = voltClientWeb.keyFromPem(this._cryptoCache.key, config.p);
+      const decrypted = keyFromPem$2(this._cryptoCache.key, config.p);
 
       if (!decrypted) {
         throw new Error("failed to decrypt key - check passphrase");
       }
 
-      this._cryptoCache.key = voltClientWeb.privateKeyToPem(decrypted.privateKey);
+      this._cryptoCache.key = privateKeyToPem(decrypted.privateKey);
     }
 
     if (this._voltConfig.ca_pem) {
@@ -460,8 +398,8 @@ class VoltCredential {
       // Extract Volt public key (used for encrypting Relay payloads).
       this._voltPublicKey = this._voltConfig.public_key;
 
-      const voltKey = voltClientWeb.keyFromPem(this._voltPublicKey).publicKey;
-      this._voltFingerprint = voltClientWeb.fingerprintFromPublicKey(voltKey);
+      const voltKey = keyFromPem$2(this._voltPublicKey).publicKey;
+      this._voltFingerprint = fingerprintFromPem(voltKey);
     }
   }
 
@@ -490,7 +428,7 @@ class VoltCredential {
   }
 
   get publicKey() {
-    return voltClientWeb.publicKeyToPem(this.getKey().publicKey);
+    return publicKeyToPem$2(this.getKey().publicKey);
   }
 
   get voltFingerprint() {
@@ -498,7 +436,7 @@ class VoltCredential {
   }
 
   getKey() {
-    const key = voltClientWeb.keyFromPem(this._cryptoCache.key);
+    const key = keyFromPem$2(this._cryptoCache.key);
     return key;
   }
 
@@ -512,8 +450,8 @@ class VoltCredential {
       return Promise.resolve(this.getKey());
     } else {
       log$5("creating key");
-      this._cryptoCache.key = voltClientWeb.createKey();
-      const key = voltClientWeb.keyFromPem(this._cryptoCache.key);
+      this._cryptoCache.key = createSigningKey();
+      const key = keyFromPem$2(this._cryptoCache.key);
       log$5("successfully created key");
       return Promise.resolve(key);
     }
@@ -550,9 +488,9 @@ class VoltCredential {
    * @returns
    */
   getIdentityMetadata(grpc, audience, publicKey, tunnelling = false, ttl = 60) {
-    const key = voltClientWeb.keyFromPem(this._cryptoCache.key);
+    const key = keyFromPem$2(this._cryptoCache.key);
 
-    const identityToken = voltClientWeb.getIdentityToken(
+    const identityToken = getIdentityToken(
       this.sessionId,
       key,
       audience || this._voltConfig.id,
@@ -568,8 +506,8 @@ class VoltCredential {
     const clone = { ...this._config, credential: { ...this._cryptoCache } };
     if (this._config.p) {
       // A passphrase option exists => encrypt the key before writing the cache file.
-      const key = voltClientWeb.keyFromPem(this._cryptoCache.key);
-      clone.credential.key = voltClientWeb.privateKeyToPem(key.privateKey, this._config.p);
+      const key = keyFromPem$2(this._cryptoCache.key);
+      clone.credential.key = privateKeyToPem(key.privateKey, this._config.p);
     }
 
     if (this._persistCache) {
@@ -708,6 +646,18 @@ var protoUtils = /*#__PURE__*/Object.freeze({
 
 /* eslint-disable no-underscore-dangle */
 
+const {
+  aesCreateKey,
+  aesEncrypt: aesEncrypt$1,
+  aesDecrypt: aesDecrypt$1,
+  toBase64,
+  formatPEM: formatPEM$1,
+  keyFromPem: keyFromPem$1,
+  verify,
+  deriveSharedKey: deriveSharedKey$1,
+  x25519: x25519$1
+} = js.voltUtils;
+
 const log$4 = debug__default["default"]("volt-client-grpc:grpc-call");
 
 function _prepareInvokeRequest(
@@ -811,10 +761,10 @@ function _prepareInvokeRequest(
     };
 
     let invokePayload;
-    const iv = voltClientWeb.aesCreateKey().iv;
+    const iv = aesCreateKey().iv;
 
     // When sending via a relay we need to encrypt the payload.
-    invokePayload = voltClientWeb.aesEncrypt(
+    invokePayload = aesEncrypt$1(
       this._encryptionKey,
       iv,
       tunnelMethod.responseSerialize(tunnelResp)
@@ -845,7 +795,7 @@ function _preparePayloadRequest(request, invokeInfo) {
 
   let iv;
   if (this._voltClient.isVoltRelay || isServiceRelayed) {
-    iv = voltClientWeb.aesCreateKey().iv;
+    iv = aesCreateKey().iv;
 
     const requestPayload =
       this._grpcClient[invokeInfo.methodName].requestSerialize(request);
@@ -859,7 +809,7 @@ function _preparePayloadRequest(request, invokeInfo) {
       }
     };
 
-    const invokePayload = voltClientWeb.aesEncrypt(
+    const invokePayload = aesEncrypt$1(
       this._encryptionKey,
       iv,
       tunnelMethod.responseSerialize(tunnelResp)
@@ -896,24 +846,24 @@ function _parseResponse(method, meta, response) {
       message.set(nonce, encryptionKey.length);
 
       // Check the signature using the target service public key.
-      const targetKey = voltClientWeb.keyFromPem(
+      const targetKey = keyFromPem$1(
         this._service?.service_description?.host_public_key ||
           this._voltClient.credential.voltPublicKey
       ).publicKey;
 
-      if (!voltClientWeb.verify(targetKey, message, signature)) {
+      if (!verify(targetKey, message, signature)) {
         throw new Error("signature verification failed");
       }
 
       invokeResponse = {
         key_exchange: {
-          encryption_key: voltClientWeb.formatPEM(voltClientWeb.toBase64(encryptionKey), "PUBLIC KEY")
+          encryption_key: formatPEM$1(toBase64(encryptionKey), "PUBLIC KEY")
         }
       };
     } else if (response.payload) {
       let decryptedPayload;
       if (this._encryptionKey) {
-        decryptedPayload = voltClientWeb.aesDecrypt(
+        decryptedPayload = aesDecrypt$1(
           this._encryptionKey,
           response.iv,
           response.payload
@@ -957,7 +907,7 @@ function _parseResponse(method, meta, response) {
       log$4("started method %d for %s", invokeResponse.methodId, method);
     }
   } else if (this._voltClient.isRemote && this._encryptionKey) {
-    const decryptedPayload = voltClientWeb.aesDecrypt(
+    const decryptedPayload = aesDecrypt$1(
       this._encryptionKey,
       meta.sharedKey.iv,
       response
@@ -1024,14 +974,14 @@ class GRPCCall extends EventEmitter__default["default"] {
           streamResponse
         );
         if (parsedResponse.key_exchange) {
-          const peerKey = voltClientWeb.keyFromPem(
+          const peerKey = keyFromPem$1(
             parsedResponse.key_exchange.encryption_key
           ).publicKey;
 
-          this._encryptionKey = voltClientWeb.deriveSharedKey(
+          this._encryptionKey = deriveSharedKey$1(
             this._initialRequest.meta.sharedKey.key,
             peerKey,
-            voltClientWeb.x25519
+            x25519$1
           );
 
           // We've exchanged keys, so send any queued payloads on the next tick.
@@ -1324,6 +1274,22 @@ class VoltConnection extends EventEmitter__default["default"] {
   }
 }
 
+const {
+  aesDecrypt,
+  aesEncrypt,
+  createEncryptionKey,
+  deriveSharedKey,
+  formatPEM,
+  fromBase64,
+  fromBase64Url,
+  keyFromPem,
+  publicKeyToPem: publicKeyToPem$1,
+  randomBytes,
+  signBase64: signBase64$1,
+  stripPEMHeaders,
+  x25519
+} = js.voltUtils;
+
 const log$2 = debug__default["default"]("rpc-invocation");
 
 class RpcInvocation extends EventEmitter__default["default"] {
@@ -1390,29 +1356,29 @@ class RpcInvocation extends EventEmitter__default["default"] {
     this.#token = jwt__default["default"].decode(token);
 
     // Store the JWT key id (kid) for use in the response.
-    const callerPublicKeyPem = voltClientWeb.formatPEM(this.#token.k, "PUBLIC KEY");
-    const callerKey = voltClientWeb.keyFromPem(callerPublicKeyPem, "", voltClientWeb.x25519).publicKey;
+    const callerPublicKeyPem = formatPEM(this.#token.k, "PUBLIC KEY");
+    const callerKey = keyFromPem(callerPublicKeyPem, "", x25519).publicKey;
 
-    const ephemeralKeyPem = voltClientWeb.createEncryptionKey();
-    const ephemeralKey = voltClientWeb.keyFromPem(ephemeralKeyPem, "", voltClientWeb.x25519);
-    const ephemeralPublicKey = voltClientWeb.fromBase64(
-      voltClientWeb.stripPEMHeaders(voltClientWeb.publicKeyToPem(ephemeralKey.publicKey, voltClientWeb.x25519))
+    const ephemeralKeyPem = createEncryptionKey();
+    const ephemeralKey = keyFromPem(ephemeralKeyPem, "", x25519);
+    const ephemeralPublicKey = fromBase64(
+      stripPEMHeaders(publicKeyToPem$1(ephemeralKey.publicKey, x25519))
     );
 
-    this.#derivedKey = voltClientWeb.deriveSharedKey(
+    this.#derivedKey = deriveSharedKey(
       ephemeralKey.privateKey,
       callerKey,
-      voltClientWeb.x25519
+      x25519
     );
 
-    const nonce = voltClientWeb.randomBytes(16);
+    const nonce = randomBytes(16);
 
     // The signed message is the encryption key and the nonce.
     const message = new Uint8Array(ephemeralPublicKey.length + nonce.length);
     message.set(ephemeralPublicKey);
     message.set(nonce, ephemeralPublicKey.length);
 
-    const signature = voltClientWeb.signBase64(
+    const signature = signBase64$1(
       this.#voltClient.credential.getKey().privateKey,
       message
     );
@@ -1422,7 +1388,7 @@ class RpcInvocation extends EventEmitter__default["default"] {
       key_exchange: {
         nonce,
         encryption_key: ephemeralPublicKey,
-        signature: voltClientWeb.fromBase64Url(signature)
+        signature: fromBase64Url(signature)
       }
     };
 
@@ -1459,7 +1425,7 @@ class RpcInvocation extends EventEmitter__default["default"] {
 
         if (encryptIV) {
           // Decrypt the actual payload using the shared key and iv.
-          decryptedPayload = voltClientWeb.aesDecrypt(
+          decryptedPayload = aesDecrypt(
             this.#derivedKey,
             encryptIV,
             invoke_request.payload
@@ -1500,7 +1466,7 @@ class RpcInvocation extends EventEmitter__default["default"] {
 
         if (this.#derivedKey) {
           // Decrypt the actual payload using the shared key and iv.
-          decryptedPayload = voltClientWeb.aesDecrypt(
+          decryptedPayload = aesDecrypt(
             this.#derivedKey,
             invoke_request.iv,
             Buffer.from(invoke_request.json_payload, "base64")
@@ -1562,10 +1528,10 @@ class RpcInvocation extends EventEmitter__default["default"] {
       });
     }
 
-    const iv = voltClientWeb.randomBytes(16);
+    const iv = randomBytes(16);
     if (this.#derivedKey) {
       // Encrypt the response using the shared key and iv.
-      responsePayload = voltClientWeb.aesEncrypt(this.#derivedKey, iv, responsePayload);
+      responsePayload = aesEncrypt(this.#derivedKey, iv, responsePayload);
     }
 
     const invokeResponse = {
@@ -1605,10 +1571,10 @@ class RpcInvocation extends EventEmitter__default["default"] {
       endPayload = tunnelMethod.requestSerialize(endPayload);
     }
 
-    const iv = voltClientWeb.randomBytes(16);
+    const iv = randomBytes(16);
     if (this.#derivedKey) {
       // Encrypt the response using the shared key and iv.
-      endPayload = voltClientWeb.aesEncrypt(this.#derivedKey, iv, endPayload);
+      endPayload = aesEncrypt(this.#derivedKey, iv, endPayload);
     }
 
     const invokeResponse = {
@@ -1631,6 +1597,8 @@ class RpcInvocation extends EventEmitter__default["default"] {
 
 /* eslint-disable no-underscore-dangle */
 
+const { publicKeyToPem, removeCarriageReturn, signBase64 } = js.voltUtils;
+
 const { filter, pick } = lodash__default["default"];
 
 const log$1 = debug__default["default"]("volt-client-grpc:volt-client-internal");
@@ -1763,8 +1731,8 @@ async function authenticateInternal(
     }
 
     const keyPair = this._credential.getKey();
-    const publicKeyPem = voltClientWeb.removeCarriageReturn(
-      voltClientWeb.publicKeyToPem(keyPair.publicKey)
+    const publicKeyPem = removeCarriageReturn(
+      publicKeyToPem(keyPair.publicKey)
     );
 
     if (!this._credential.cache.bindIp) {
@@ -1782,7 +1750,7 @@ async function authenticateInternal(
     };
 
     if (this._voltConfig.challenge_code) {
-      authenticateRequest.challenge = voltClientWeb.signBase64(
+      authenticateRequest.challenge = signBase64(
         keyPair.privateKey,
         this._voltConfig.challenge_code
       );
@@ -1832,7 +1800,7 @@ async function authenticateInternal(
 
         // Now sign the entire DID document, including the proof and set it in the
         // bind request. This is required by the Volt to verify that we have the private key for the DID.
-        authenticateRequest.did_document_signature = voltClientWeb.signBase64(
+        authenticateRequest.did_document_signature = signBase64(
           keyPair.privateKey,
           authenticateRequest.did_document
         );

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.17.0",
+  "version": "0.18.0",
   "description": "tdx Volt library for nodejs clients",
   "type": "module",
   "exports": {
@@ -37,7 +37,7 @@
   "license": "ISC",
   "dependencies": {
     "@grpc/proto-loader": "^0.6.4",
-    "@tdxvolt/volt-client-web": "^0.17.106",
+    "@tdxvolt/volt-client-web": "^0.18.0",
     "bent": "^7.3.12",
     "builtin-modules": "^3.3.0",
     "debug": "^4.1.1",

package/protobuf/tdx/volt_api/volt/v1/ssi_api.proto

@@ -2,18 +2,19 @@ syntax = "proto3";
 
 package tdx.volt_api.volt.v1;
 
-import "tdx/volt_api/volt/v1/ssi.proto";
 import "tdx/volt_api/volt/v1/status.proto";
+import "tdx/volt_api/volt/v1/ssi.proto";
 
 service SsiAPI {
   // Delete a DID document or all DID documents originating from a given Volt.
-  // Requires 'volt:delete-did' API privilege.
+  // Requires `volt:delete-did` API privilege.
   rpc DeleteDID(DeleteDIDRequest) returns (DeleteDIDResponse);
 
   // Get all updates to the DID registry since the specified timestamp.
   // Internal use only.
   rpc GetDIDRegistryUpdates(GetDIDRegistryUpdatesRequest) returns (GetDIDRegistryUpdatesResponse);
 
+  // Import a verifiable credential.
   rpc ImportCredential(ImportCredentialRequest) returns (ImportCredentialResponse);
 
   // Parse a verifiable credential from a URL or a verifiable presentation.
@@ -23,8 +24,8 @@ service SsiAPI {
   rpc ResolveDID(ResolveDIDRequest) returns (ResolveDIDResponse);
 
   // Register a DID document.
-  // This is currently reserved for use by the DID registry when synchronising with other registries.
-  // To register a new DID document, use the VoltAPI Authenticate method.
+  // This is intended for use by the DID registry when synchronising with other registries.
+  // To register a new DID document, it is recommended to use the VoltAPI Authenticate method.
   rpc RegisterDIDDocument(RegisterDIDDocumentRequest) returns (RegisterDIDDocumentResponse);
 
   // Save a verifiable credential.
@@ -153,7 +154,6 @@ message RegisterDIDDocumentRequest {
   DIDRegistryUpdate did_update = 2;
 
   // When updating an existing DID document, it is necessary to include a signature of the document JSON, signed by the DID document's current owner.
-  // This is different from the proof contained in the DID document itself.
   string update_signature = 3;
 }
 

package/protobuf/tdx/volt_api/volt/v1/volt.proto

@@ -309,12 +309,17 @@ message VoltEndpoint {
   // The online status of the Volt.
   OnlineStatus online_status = 11;
 
-  // Set to indicate that this Volt acts as a Relay.
+  // Indicates that this Volt acts as a Relay.
   bool has_relay = 12;
 
+  // The API version supported by the endpoint.
   Version api_version = 13;
 
+  // Optional description of the endpoint.
   string description = 14;
+
+  // The list of DID registries that this Volt trusts.
+  repeated string did_registry = 15;
 }
 
 // Internal use only.

package/protobuf/tdx/volt_api/volt/v1/volt_api.proto

@@ -306,6 +306,9 @@ message ConnectHello {
 
   // The current time on the client.
   uint64 timestamp = 15;
+
+  // Optionally specify the DID registries supported.
+  repeated string did_registry = 16;
 }
 
 message ConnectAcknowledge {

package/protobuf/tdx/volt_api/volt/v1/wire_api.proto

@@ -22,6 +22,10 @@ message PublishWireRequest {
 
   // The chunk of data to publish.
   bytes chunk = 2;
+
+  // Whether to persist the chunk.
+  // This is only valid if the wire is configured to persist messages, i.e. the `volt:wire-persist` attribute is true.
+  bool do_not_persist = 3;
 }
 
 message PublishWireResponse {

package/src/constants.js

@@ -1,57 +1,10 @@
-// eslint-disable-next-line import/prefer-default-export
 export const constants = {
   authTokenName: "volt-token",
-  collectionOperation: {
-    add: "ADD",
-    remove: "REMOVE",
-    update: "UPDATE"
-  },
-  crypto: {
-    subjectDefaults: [
-      {
-        name: "countryName",
-        value: "GB"
-      },
-      {
-        name: "localityName",
-        value: "Southampton"
-      },
-      {
-        name: "organizationName",
-        value: "nquiringminds Ltd"
-      }
-    ],
-    userIdOID: "0.9.2342.19200300.100.1.1"
-  },
   defaultDIDHostName: "tdxvolt.com",
   didServiceType: {
     voltConfig: "volt-discovery"
   },
-  identityType: {
-    did: "did",
-    volt: "volt"
-  },
-  onlineStatus: {
-    offline: "offline",
-    online: "online",
-    unknown: "unknown"
-  },
   privateEncryptedKeyPrefix: "-----BEGIN ENCRYPTED PRIVATE KEY-----",
-  resource: {
-    identity: "ident",
-    identityView: "ident-view",
-    proxy: "proxy",
-    proxyView: "proxy-view",
-    vc: "vc",
-    vcView: "vc-view"
-  },
-  voltStatus: {
-    pending: "",
-    online: "online",
-    offline: "offline",
-    deleted: "deleted",
-    revoked: "revoked"
-  },
   /**
    * These top-level service types should map to a protobuf definition
    * in @tdxvolt/volt-proto.
@@ -64,10 +17,5 @@ export const constants = {
     relayAPI: "tdx.volt_api.relay.v1.RelayAPI",
     voltAPI: "tdx.volt_api.volt.v1.VoltAPI",
     wireAPI: "tdx.volt_api.volt.v1.WireAPI"
-  },
-  tunnelInvokeMethod: "/tdx.volt_api.volt.v1.VoltAPI/Invoke",
-  tunnelPingInterval: 10000,
-  tunnelPingTimeout: 2500,
-  tunnelReconnectAfter: 30000,
-  tunnelTimeoutInterval: 10000 * 2 // This must always be greater than `tunnelPingInterval`.
+  }
 };

package/src/grpc-call.js

@@ -1,7 +1,9 @@
 /* eslint-disable no-underscore-dangle */
 import debug from "debug";
 import EventEmitter from "events";
-import {
+import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
+
+const {
   aesCreateKey,
   aesEncrypt,
   aesDecrypt,
@@ -11,7 +13,7 @@ import {
   verify,
   deriveSharedKey,
   x25519
-} from "@tdxvolt/volt-client-web";
+} = voltClientUtils;
 
 const log = debug("volt-client-grpc:grpc-call");
 

package/src/rpc-invocation.js

@@ -1,7 +1,9 @@
 import debug from "debug";
 import jwt from "jsonwebtoken";
 import EventEmitter from "events";
-import {
+import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
+
+const {
   aesDecrypt,
   aesEncrypt,
   createEncryptionKey,
@@ -15,7 +17,7 @@ import {
   signBase64,
   stripPEMHeaders,
   x25519
-} from "@tdxvolt/volt-client-web";
+} = voltClientUtils;
 
 const log = debug("rpc-invocation");
 

package/src/utils.js

@@ -1,6 +1,6 @@
 import ip from "ip";
 import _ from "lodash";
-export * as crypto from "@tdxvolt/volt-client-web";
+export { voltUtils as crypto } from "@tdxvolt/volt-client-web/js";
 
 import { constants } from "./constants.js";
 

package/src/volt-client-internal.js

@@ -16,11 +16,9 @@ import { constants } from "./constants.js";
 import GRPCCall from "./grpc-call.js";
 import RpcInvocation from "./rpc-invocation.js";
 import { v4 as generateId } from "uuid";
-import {
-  publicKeyToPem,
-  removeCarriageReturn,
-  signBase64
-} from "@tdxvolt/volt-client-web";
+import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
+
+const { publicKeyToPem, removeCarriageReturn, signBase64 } = voltClientUtils;
 
 const { filter, pick } = lodash;
 

package/src/volt-credential.js

@@ -2,14 +2,16 @@
 import debug from "debug";
 import fs from "fs";
 import { constants } from "./constants.js";
-import {
-  createKey,
-  fingerprintFromPublicKey,
+import { voltUtils as voltClientUtils } from "@tdxvolt/volt-client-web/js";
+
+const {
+  createSigningKey,
+  fingerprintFromPem,
   getIdentityToken,
   keyFromPem,
   privateKeyToPem,
   publicKeyToPem
-} from "@tdxvolt/volt-client-web";
+} = voltClientUtils;
 
 const log = debug("volt-client-grpc:volt-credential");
 
@@ -54,7 +56,7 @@ export class VoltCredential {
       this._voltPublicKey = this._voltConfig.public_key;
 
       const voltKey = keyFromPem(this._voltPublicKey).publicKey;
-      this._voltFingerprint = fingerprintFromPublicKey(voltKey);
+      this._voltFingerprint = fingerprintFromPem(voltKey);
     }
   }
 
@@ -105,7 +107,7 @@ export class VoltCredential {
       return Promise.resolve(this.getKey());
     } else {
       log("creating key");
-      this._cryptoCache.key = createKey();
+      this._cryptoCache.key = createSigningKey();
       const key = keyFromPem(this._cryptoCache.key);
       log("successfully created key");
       return Promise.resolve(key);