@tdxvolt/volt-client-grpc 0.20.10 → 0.20.12

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.20.10",
+  "version": "0.20.12",
   "description": "tdx Volt library for nodejs clients",
   "type": "module",
   "exports": {
@@ -43,4 +43,4 @@
     "protobufjs": "^7.4.0",
     "uuid": "^8.1.0"
   }
-}
+}

package/src/grpc-call.js

@@ -361,11 +361,6 @@ export default class GRPCCall extends EventEmitter {
     );
 
     this._call.on("data", (streamResponse) => {
-      if (this._ended) {
-        log("ignoring data after end on %s", this._methodName);
-        return;
-      }
-
       try {
         const parsedResponse = _parseResponse.call(
           this,
@@ -373,6 +368,13 @@ export default class GRPCCall extends EventEmitter {
           this._initialRequest.meta,
           streamResponse
         );
+
+        if (this._ended && !parsedResponse.ended) {
+          log("ignoring data after end on %s", this._methodName);
+          log(parsedResponse);
+          return;
+        }
+
         if (parsedResponse.key_exchange) {
           const peerKey = keyFromPem(
             parsedResponse.key_exchange.encryption_key
@@ -404,9 +406,6 @@ export default class GRPCCall extends EventEmitter {
         } else if (parsedResponse.ended) {
           if (parsedResponse.error) {
             this.emit("error", new Error(parsedResponse.error));
-          } else {
-            // Not sure this is necessary - we should receive "end" from grpc soon...
-            this.emit("end");
           }
         } else {
           log("method id is %s", parsedResponse.methodId);

package/src/volt-client-internal.js

@@ -265,18 +265,18 @@ export function connectInternal(helloPayload) {
     this._voltConnection.on("connected", (session) => {
       this._session = session;
       this._connected = !!session;
+      this.emit("connected", session);
       if (!this._connected) {
         onDisconnected();
       }
-      this.emit("connected", session);
     });
 
     this._voltConnection.on("error", (err) => {
       // Should auto-reconnect.
       log("Volt connection error [%s]", err.message);
       if (this._connected) {
-        onDisconnected();
         this.emit("connected", false);
+        onDisconnected();
       }
 
       if (err.message.endsWith("session invalid")) {

package/src/volt-client.js

@@ -1,3 +1,4 @@
+import { resolveVoltConfig } from "@tdxvolt/volt-utility";
 import debug from "debug";
 import EventEmitter from "events";
 import fs from "fs";
@@ -11,7 +12,6 @@ import {
   unaryCallInternal
 } from "./volt-client-internal.js";
 import { VoltCredential } from "./volt-credential.js";
-import { resolveVoltConfig } from "@tdxvolt/volt-utility";
 
 const { readFile } = fs.promises;
 const log = debug("volt-client-grpc:volt-client");
@@ -86,12 +86,19 @@ export class VoltClient extends EventEmitter {
    * instead of a DID-based authentication session.
    * @param {string} [options.exchangeToken] - optional token to exchange in return for an authenticated session.
    * @param {boolean} [options.waitForAuth] - whether to block and poll on 'prompt' authenticate decisions. Default is true.
+   * @param {boolean} [options.noResolve] - whether to skip resolving the Volt configuration. Default is false.
    */
   async initialise(config, options = {}) {
     log("initialise ", config, options);
 
-    const { ownDID, noDID, didRegistryList, exchangeToken, extraConfig } =
-      options;
+    const {
+      ownDID,
+      noDID,
+      didRegistryList,
+      exchangeToken,
+      extraConfig,
+      noResolve
+    } = options;
     const waitForAuth =
       options.waitForAuth === undefined ? true : !!options.waitForAuth;
 
@@ -141,10 +148,12 @@ export class VoltClient extends EventEmitter {
         throw new Error("client_name property required in config");
       }
 
-      this._config.volt = await resolveVoltConfig(
-        this._config.volt,
-        didRegistryList
-      );
+      if (!noResolve) {
+        this._config.volt = await resolveVoltConfig(
+          this._config.volt,
+          didRegistryList
+        );
+      }
 
       this._voltConfig = this._config.volt;
 
@@ -207,7 +216,7 @@ export class VoltClient extends EventEmitter {
         this._credential.saveCache();
       }
 
-      return Promise.resolve(this._config);
+      return Promise.resolve(this.credential.config);
     } catch (err) {
       log("failure starting Volt client [%s]", err.message);
       throw err;
@@ -322,10 +331,18 @@ export class VoltClient extends EventEmitter {
    * VoltAPI - resource management
    */
 
+  AddRelay(request) {
+    return unaryCallInternal.call(this, "AddRelay", request);
+  }
+
   CanAccessResource(request) {
     return unaryCallInternal.call(this, "CanAccessResource", request);
   }
 
+  CopyResource(request) {
+    return unaryCallInternal.call(this, "CopyResource", request);
+  }
+
   DeleteResource(request) {
     return unaryCallInternal.call(this, "DeleteResource", request);
   }
@@ -350,6 +367,10 @@ export class VoltClient extends EventEmitter {
     return unaryCallInternal.call(this, "GetResourceDescendants", request);
   }
 
+  MoveResource(request) {
+    return unaryCallInternal.call(this, "MoveResource", request);
+  }
+
   RequestAccess(request) {
     return unaryCallInternal.call(this, "RequestAccess", request);
   }
@@ -358,8 +379,44 @@ export class VoltClient extends EventEmitter {
     return unaryCallInternal.call(this, "SaveResource", request);
   }
 
-  SaveResourceAttribute(request) {
-    return unaryCallInternal.call(this, "SaveResourceAttribute", request);
+  SaveDatabase(request) {
+    return unaryCallInternal.call(this, "SaveDatabase", request);
+  }
+
+  SaveHttpFileServer(request) {
+    return unaryCallInternal.call(this, "SaveHttpFileServer", request);
+  }
+
+  SaveHttpForwarder(request) {
+    return unaryCallInternal.call(this, "SaveHttpForwarder", request);
+  }
+
+  SaveHttpRestApiServer(request) {
+    return unaryCallInternal.call(this, "SaveHttpRestApiServer", request);
+  }
+
+  SaveHttpRestApiNode(request) {
+    return unaryCallInternal.call(this, "SaveHttpRestApiNode", request);
+  }
+
+  SaveMirroredLink(request) {
+    return unaryCallInternal.call(this, "SaveMirroredLink", request);
+  }
+
+  SaveSyncDatabase(request) {
+    return unaryCallInternal.call(this, "SaveSyncDatabase", request);
+  }
+
+  SaveSynapse(request) {
+    return unaryCallInternal.call(this, "SaveSynapse", request);
+  }
+
+  CreateSynapseConnection(request) {
+    return unaryCallInternal.call(this, "CreateSynapseConnection", request);
+  }
+
+  SaveSymbolicLink(request) {
+    return unaryCallInternal.call(this, "SaveSymbolicLink", request);
   }
 
   SetServiceStatus(request) {
@@ -374,26 +431,18 @@ export class VoltClient extends EventEmitter {
     return unaryCallInternal.call(this, "Authenticate", request);
   }
 
-  Bind(request) {
-    return unaryCallInternal.call(this, "Bind", request);
+  CheckCompatibility(request) {
+    return unaryCallInternal.call(this, "CheckCompatibility", request);
   }
 
   DeleteAccess(request) {
     return unaryCallInternal.call(this, "DeleteAccess", request);
   }
 
-  DeleteVolt(request) {
-    return unaryCallInternal.call(this, "DeleteVolt", request);
-  }
-
   GetAccess(request) {
     return unaryCallInternal.call(this, "GetAccess", request);
   }
 
-  GetBindings(request) {
-    return unaryCallInternal.call(this, "GetBindings", request);
-  }
-
   GetIdentities(request) {
     return unaryCallInternal.call(this, "GetIdentities", request);
   }
@@ -402,40 +451,44 @@ export class VoltClient extends EventEmitter {
     return unaryCallInternal.call(this, "GetIdentity", request);
   }
 
-  GetIdentityToken(request) {
-    return unaryCallInternal.call(this, "GetIdentityToken", request);
+  GetOneTimeToken(request) {
+    return unaryCallInternal.call(this, "GetOneTimeToken", request);
+  }
+
+  GetParameters(request) {
+    return unaryCallInternal.call(this, "GetParameters", request);
   }
 
   GetPolicy(request) {
     return unaryCallInternal.call(this, "GetPolicy", request);
   }
 
-  GetSettings(request) {
-    return unaryCallInternal.call(this, "GetSettings", request);
+  GetSessions(request) {
+    return unaryCallInternal.call(this, "GetSessions", request);
   }
 
   SaveAccess(request) {
     return unaryCallInternal.call(this, "SaveAccess", request);
   }
 
-  SaveCloudConnection(request) {
-    return unaryCallInternal.call(this, "SaveCloudConnection", request);
-  }
-
   SaveIdentity(request) {
     return unaryCallInternal.call(this, "SaveIdentity", request);
   }
 
-  SaveSettings(request) {
-    return unaryCallInternal.call(this, "SaveSettings", request);
+  SaveParameters(request) {
+    return unaryCallInternal.call(this, "SaveParameters", request);
+  }
+
+  SaveSession(request) {
+    return unaryCallInternal.call(this, "SaveSession", request);
   }
 
   SetAccessRequestDecision(request) {
     return unaryCallInternal.call(this, "SetAccessRequestDecision", request);
   }
 
-  SetBindingDecision(request) {
-    return unaryCallInternal.call(this, "SetBindingDecision", request);
+  SetPolicy(request) {
+    return unaryCallInternal.call(this, "SetPolicy", request);
   }
 
   Shutdown(request) {
@@ -446,6 +499,16 @@ export class VoltClient extends EventEmitter {
     return unaryCallInternal.call(this, "SignVerify", request);
   }
 
+  /**
+   * VoltAPI - streaming (bidi). Use connect() for Connect stream.
+   * Invoke is for relay proxying; returns a duplex stream of InvokeRequest/InvokeResponse.
+   */
+  Invoke(request) {
+    const grpcClient = this.getVoltAPIClient();
+    const invokeCall = new GRPCCall(this, "Invoke", "METHOD_TYPE_BIDI");
+    return invokeCall.start(grpcClient, request);
+  }
+
   /**
    * FileAPI
    */
@@ -662,6 +725,9 @@ export class VoltClient extends EventEmitter {
     return subscribeCall.start(grpcClient, request);
   }
 
+  /**
+   * SyncAPI
+   */
   SyncDocument(request) {
     const grpcClient = this.getVoltAPIClient();
 
@@ -672,4 +738,23 @@ export class VoltClient extends EventEmitter {
     );
     return syncDocumentCall.start(grpcClient, request);
   }
+  
+  SetSynapseDocumentMetadata(request) {
+    return unaryCallInternal.call(this, "SetSynapseDocumentMetadata", request);
+  }
+
+  WatchSynapsePath(request) {
+    const grpcClient = this.getVoltAPIClient();
+
+    const watchPathCall = new GRPCCall(
+      this, 
+      "WatchSynapsePath", 
+      "METHOD_TYPE_BIDI"
+    );
+    return watchPathCall.start(grpcClient, request);
+  }
+
+  WriteSynapsePath(request) {
+    return unaryCallInternal.call(this, "WriteSynapsePath", request);
+  }
 }

package/src/volt-connection.js

@@ -20,6 +20,7 @@ function _cleanUp(immediateReconnect) {
   }
 
   if (this._dying) {
+    log("dying - clearing reconnect timer");
     clearTimeout(this._reconnectTimer);
   } else if (immediateReconnect || (this._autoRetry && !this._reconnectTimer)) {
     this._reconnectTimer = setTimeout(
@@ -32,6 +33,7 @@ function _cleanUp(immediateReconnect) {
   }
 
   if (this.call?.writable) {
+    log("ending Connect call");
     this.call.end();
   }
 }
@@ -122,9 +124,7 @@ function _doConnect(connectHello) {
   });
 
   this.call.on("end", () => {
-    if (this._connectionId) {
-      this.emit("connected", false);
-    }
+    this.emit("connected", false);
     _cleanUp.call(this);
   });