@tdxvolt/volt-client-grpc 0.11.4 → 0.11.6

package/lib/index.cjs

@@ -241,7 +241,7 @@ function createClient(
 ) {
   let grpcCredentials;
   if (credentials) {
-    const ca = credentials.config?.relay?.ca_pem || credentials.cache.ca;
+    const ca = credentials.config?.volt?.relay?.ca_pem || credentials.cache.ca;
     const cert = credentials.cache.cloud_cert || credentials.cache.cert;
     const { key } = credentials.cache;
 
@@ -1376,9 +1376,9 @@ async function bindInternal() {
     }
 
     // For remote connections, add our cloud-issued certificate as an additional credential.
-    if (this._config?.relay?.ca_pem && this._credential.cache.cloud_cert) {
+    if (this._voltConfig?.relay?.ca_pem && this._credential.cache.cloud_cert) {
       bindRequest.x509_credential = bindRequest.x509_credential.concat(
-        this._credential.cache.cloud_cert + this._config.relay.ca_pem,
+        this._credential.cache.cloud_cert + this._voltConfig.relay.ca_pem,
       );
     }
 
@@ -1469,7 +1469,7 @@ function connectInternal() {
 function getVoltAPIClientInternal() {
   if (!this._cachedClient) {
     const serviceAddress = this.isRemote
-      ? this._config.relay.address
+      ? this._voltConfig.relay.address
       : this._voltConfig.address;
     log$1("creating cached VoltAPI service client on %s", serviceAddress);
     let serviceDescriptors = {};
@@ -1484,8 +1484,8 @@ function getVoltAPIClientInternal() {
       serviceAddress,
       this._credential,
       this.isRemote && !this.isVoltRelay,
-      this._config?.relay?.cloud ? this._voltConfig.id : "",
-      this._config?.relay?.cloud ? this._voltConfig.id : "",
+      this._voltConfig?.relay?.cloud ? this._voltConfig.id : "",
+      this._voltConfig?.relay?.cloud ? this._voltConfig.id : "",
     );
   }
 
@@ -1800,7 +1800,7 @@ class VoltClient extends EventEmitter__default["default"] {
     }
 
     if (this.isRemote) {
-      if (!this._config?.relay?.address) {
+      if (!this._voltConfig?.relay?.address) {
         throw new Error(
           "Remote connection enabled but no Relay address - have you called start()?",
         );
@@ -1810,7 +1810,7 @@ class VoltClient extends EventEmitter__default["default"] {
       return createClient(
         this._grpc,
         serviceDescriptors,
-        this._config.relay.address,
+        this._voltConfig.relay.address,
         this._credential,
         false,
         service.volt_id,
@@ -1827,11 +1827,11 @@ class VoltClient extends EventEmitter__default["default"] {
   }
 
   get isRemote() {
-    return !!(this._config?.relay && this._voltConfig.id);
+    return !!(this._voltConfig?.relay && this._voltConfig.id);
   }
 
   get isVoltRelay() {
-    return this.isRemote && !this._config?.relay.cloud;
+    return this.isRemote && !this._voltConfig?.relay.cloud;
   }
 
   connect() {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.11.4",
+  "version": "0.11.6",
   "description": "tdx Volt library for nodejs clients",
   "type": "module",
   "exports": {
@@ -39,6 +39,7 @@
     "@grpc/proto-loader": "^0.6.4",
     "bent": "^7.3.12",
     "bs58": "^4.0.1",
+    "builtin-modules": "^3.3.0",
     "debug": "^4.1.1",
     "ip": "^1.1.5",
     "jsonwebtoken": "^8.5.1",

package/src/grpc-utils.js

@@ -20,7 +20,7 @@ export function createClient(
 ) {
   let grpcCredentials;
   if (credentials) {
-    const ca = credentials.config?.relay?.ca_pem || credentials.cache.ca;
+    const ca = credentials.config?.volt?.relay?.ca_pem || credentials.cache.ca;
     const cert = credentials.cache.cloud_cert || credentials.cache.cert;
     const { key } = credentials.cache;
 

package/src/volt-client-internal.js

@@ -150,9 +150,9 @@ export async function bindInternal() {
     }
 
     // For remote connections, add our cloud-issued certificate as an additional credential.
-    if (this._config?.relay?.ca_pem && this._credential.cache.cloud_cert) {
+    if (this._voltConfig?.relay?.ca_pem && this._credential.cache.cloud_cert) {
       bindRequest.x509_credential = bindRequest.x509_credential.concat(
-        this._credential.cache.cloud_cert + this._config.relay.ca_pem,
+        this._credential.cache.cloud_cert + this._voltConfig.relay.ca_pem,
       );
     }
 
@@ -243,7 +243,7 @@ export function connectInternal() {
 export function getVoltAPIClientInternal() {
   if (!this._cachedClient) {
     const serviceAddress = this.isRemote
-      ? this._config.relay.address
+      ? this._voltConfig.relay.address
       : this._voltConfig.address;
     log("creating cached VoltAPI service client on %s", serviceAddress);
     let serviceDescriptors = {};
@@ -258,8 +258,8 @@ export function getVoltAPIClientInternal() {
       serviceAddress,
       this._credential,
       this.isRemote && !this.isVoltRelay,
-      this._config?.relay?.cloud ? this._voltConfig.id : "",
-      this._config?.relay?.cloud ? this._voltConfig.id : "",
+      this._voltConfig?.relay?.cloud ? this._voltConfig.id : "",
+      this._voltConfig?.relay?.cloud ? this._voltConfig.id : "",
     );
   }
 

package/src/volt-client.js

@@ -231,7 +231,7 @@ export class VoltClient extends EventEmitter {
     }
 
     if (this.isRemote) {
-      if (!this._config?.relay?.address) {
+      if (!this._voltConfig?.relay?.address) {
         throw new Error(
           "Remote connection enabled but no Relay address - have you called start()?",
         );
@@ -241,7 +241,7 @@ export class VoltClient extends EventEmitter {
       return createGrpcClient(
         this._grpc,
         serviceDescriptors,
-        this._config.relay.address,
+        this._voltConfig.relay.address,
         this._credential,
         false,
         service.volt_id,
@@ -258,11 +258,11 @@ export class VoltClient extends EventEmitter {
   }
 
   get isRemote() {
-    return !!(this._config?.relay && this._voltConfig.id);
+    return !!(this._voltConfig?.relay && this._voltConfig.id);
   }
 
   get isVoltRelay() {
-    return this.isRemote && !this._config?.relay.cloud;
+    return this.isRemote && !this._voltConfig?.relay.cloud;
   }
 
   connect() {