@tdxvolt/volt-client-grpc 0.1.0 → 0.1.2

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

@@ -22,8 +22,10 @@ service VoltAPI {
   // Third party services can use this to interrogate the Volt policy and determine if a client has permission to perform a certain action on a resource.
   rpc CanAccessResource(CanAccessResourceRequest) returns (CanAccessResourceResponse);
 
+  rpc CheckCompatibility(CheckCompatibilityRequest) returns (CheckCompatibilityResponse);
+
   // Creates a long-lived, bi-directional connection (session) to the Volt.
-  // The connection stream serves several purposes, including remote invocations via a tunnel, Volt event notifications, pings and service registration management.
+  // The connection stream serves several purposes, including remote invocations via a Relay, Volt event notifications, pings and service registration management.
   // A connection session is required in order for a client to be able to register services with the Volt.
   // When the stream is closed, any services registered on it will be set to offline.
   rpc Connect(stream ConnectRequest) returns (stream ConnectResponse);
@@ -83,9 +85,11 @@ service VoltAPI {
   rpc GetResourceDescendants(GetResourceDescendantsRequest) returns (GetResourceDescendantsResponse);
 
   // Invoke a method.
-  // This is primarily for use by tunnel connections when proxying invocations.
+  // This is primarily for use by Relay connections when proxying invocations.
   rpc Invoke(stream InvokeRequest) returns (stream InvokeResponse);
 
+  rpc MoveResource(MoveResourceRequest) returns (MoveResourceResponse);
+
   // Request access to a resource.
   // The subject of the access is assumed to be the identity of the currently authenticated peer.
   rpc RequestAccess(RequestAccessRequest) returns (RequestAccessResponse);
@@ -216,6 +220,19 @@ message CanAccessResourceResponse {
   PolicyDecision decision = 6;
 }
 
+message  CheckCompatibilityRequest {
+  // The client platform API version.
+  Version version = 1;
+}
+
+message CheckCompatibilityResponse {
+  // Details of any error that occurred on the call.
+  tdx.volt_api.volt.v1.Status status = 1;
+
+  // The target Volt API version.
+  Version version = 2;
+}
+
 // All fields in this message are optional, send an empty message if necessary.
 message ConnectHello {
   // Optionally specify the calling address of the peer.
@@ -228,19 +245,19 @@ message ConnectHello {
   // Set to receive notification of resource events.
   bool subscribe_resource_events = 3;
 
-  // Set this to support tunnelled service invocation.
-  // This indicates that the callee is happy to receive method invocations from other clients of the tunnel.
+  // Set this to support Relayled service invocation.
+  // This indicates that the callee is happy to receive method invocations from other clients of the Relay.
   // Currently this will usually be set to the `id` of the calling Volt, but in theory any client could receive remote invocation requests in this way.
-  string tunnel_id = 4;
+  string relay_id = 4;
 
-  // A friendly name to present to other tunnel clients.
-  string tunnel_name = 5;
+  // A friendly name to present to other Relay clients.
+  string relay_name = 5;
 
-  // The certificate authority to present to other tunnel clients.
-  string tunnel_ca_pem = 6;
+  // The certificate authority to present to other Relay clients.
+  string relay_ca_pem = 6;
 
-  // Set to indicate the connection is discoverable to other tunnel clients.
-  bool tunnel_discoverable = 7;
+  // Set to indicate the connection is discoverable to other Relay clients.
+  bool relay_discoverable = 7;
 }
 
 // A session ping message.
@@ -277,7 +294,7 @@ message ConnectMessage {
   string from_identity_id = 10;
   string from_name = 11;
 
-  repeated string receipts = 12;
+  repeated string receipt = 12;
   ConnectMessageType message_type = 15;
   ConnectMessageRelay message_relay = 16;
 }
@@ -290,8 +307,8 @@ message ConnectGoodbye {
   bool ended = 2;
 }
 
-message ConnectTunnel {
-  // Indicates the tunnel connection status.
+message ConnectRelay {
+  // Indicates the Relay connection status.
   bool connected = 1;
 }
 
@@ -317,8 +334,8 @@ message ConnectEvent {
     // A resource event notification, such as updated or deleted.
     ConnectResource connect_resource = 3;
 
-    // Events relating to tunnel connections.
-    ConnectTunnel tunnel = 6;
+    // Events relating to Relay connections.
+    ConnectRelay relay = 6;
   }
 }
 
@@ -338,7 +355,7 @@ message ConnectRequest {
     ConnectPing ping = 4;
 
     // Send invocation responses back to the caller.
-    // n.b. The 'request' and 'response' semantics are inverted with remote invocations because the tunnelled connection is established by a request **from** the 'target' Volt to the tunnel. Hence any invocation on behalf of a client of the tunnel involves sending a **response** back down the tunnel connection to the 'target' Volt.
+    // n.b. The 'request' and 'response' semantics are inverted with remote invocations because the Relayed connection is established by a request **from** the 'target' Volt to the Relay. Hence any invocation on behalf of a client of the Relay involves sending a **response** back down the Relay connection to the 'target' Volt.
     InvokeResponse invoke_response = 5;
 
     // Send HTTP response back to the originating request.
@@ -366,7 +383,7 @@ message ConnectResponse {
     ConnectPing ping = 5;
 
     // Send an invocation request to a remote target.
-    // n.b. The 'request' and 'response' semantics are inverted for remote invocations because the tunnelled connection is established by a request **from** the 'target' Volt to the tunnel. Hence any invocation on behalf of a client of the tunnel involves sending a **response** back down the tunnel connection to the 'target' Volt.
+    // n.b. The 'request' and 'response' semantics are inverted for remote invocations because the Relayed connection is established by a request **from** the 'target' Volt to the Relay. Hence any invocation on behalf of a client of the Relay involves sending a **response** back down the Relay connection to the 'target' Volt.
     InvokeRequest invoke_request = 6;
 
     // Send an HTTP request to a remote target.
@@ -401,6 +418,11 @@ message DeleteResourceRequest {
   // Set to indicate all descendant resources should also be deleted.
   // If this is not set and the resource has descendants, the call will fail.
   bool recursive = 2;
+
+  // Set to attempt to unlink the resource from this parent resource, rather than completely delete it.
+  // The resource will be removed as a descendant from the `parent_id` resource. If the resource is has more than one parent, it will not be removed from those other parents.
+  // Note that if the resource's only parent is `parent_id` it will be removed from that parent and deleted as normal.
+  string parent_id = 3;
 }
 
 message DeleteResourceResponse {
@@ -426,7 +448,7 @@ message DiscoverServicesResponse {
   tdx.volt_api.volt.v1.Status status = 1;
 
   // The services that were discovered.
-  repeated Resource resources = 2;
+  repeated Resource resource = 2;
 }
 
 message GetAccessRequest {
@@ -467,7 +489,7 @@ message GetBindingsResponse {
   tdx.volt_api.volt.v1.Status status = 1;
 
   // The bindings that match the criteria.
-  repeated Binding bindings = 2;
+  repeated Binding binding = 2;
 }
 
 message GetIdentitiesRequest {
@@ -485,7 +507,7 @@ message GetIdentitiesResponse {
   tdx.volt_api.volt.v1.Status status = 1;
 
   // The identity list that matched the criteria.
-  repeated Identity identities = 2;
+  repeated Identity identity = 2;
 }
 
 // One of `identity_id` or `fingerprint` must be populated.
@@ -548,14 +570,8 @@ message GetResourceRequest {
   // The id of the resource to retrieve.
   string resource_id = 1;
 
-  // Set to include resource attributes in the response.
-  bool include_attributes = 2;
-
   // Set to include service description protobuf in the response, if applicable.
   bool include_protobuf = 3;
-
-  // Set to include any aliases associated with the resource.
-  bool include_aliases = 4;
 }
 
 message GetResourceResponse {
@@ -566,8 +582,9 @@ message GetResourceResponse {
   Resource resource = 2;
 }
 
-// Lookup is performed by combining the criteria below in the form:
+// By default, the lookup is performed by combining the criteria below in the form:
 // (id = id[0] or id = id[1]) and (name = name[0] or name = name[1]) etc...
+// To combine using 'or' rather than 'and', set the `combine_terms_exclusive` flag.
 // Also see note below regarding attributes.
 message GetResourcesRequest {
   repeated string id = 1;
@@ -590,9 +607,12 @@ message GetResourcesRequest {
 
   repeated string store = 9;
 
+  // Indicates that the above terms should be combined using 'or' rather than 'and' (the default).
+  bool combine_terms_exclusive = 10;
+
   // Attributes to search by.
   // n.b. currently this API is mutually exclusive in that if any attribute queries are specified the rpc will only search on those attributes, ignoring any parameters defined above.
-  repeated ResourceAttributeQuery attributes = 100;
+  repeated ResourceAttributeQuery attribute = 100;
 
   // If set, will return resources where *any of* the attribute queries apply, otherwise will only return resources where *all of* the attribute queries apply.
   bool any_of = 101;
@@ -606,7 +626,7 @@ message GetResourcesResponse {
   tdx.volt_api.volt.v1.Status status = 1;
 
   // The list of resources that match the lookup.
-  repeated Resource resources = 2;
+  repeated Resource resource = 2;
 }
 
 message GetResourceAncestorsRequest {
@@ -624,12 +644,6 @@ message GetResourceAncestorsRequest {
 
   // Optional - can be used to determine if a resource is an ancestor.
   string ancestor_id = 5;
-
-  // Pre-load all resource attributes.
-  bool include_attributes = 6;
-
-  // Set to include any aliases associated with the resource.
-  bool include_aliases = 7;
 }
 
 message GetResourceAncestorsResponse {
@@ -637,7 +651,7 @@ message GetResourceAncestorsResponse {
   tdx.volt_api.volt.v1.Status status = 1;
 
   // The retrieved ancestors.
-  repeated Resource ancestors = 2;
+  repeated Resource ancestor = 2;
 }
 
 message GetResourceDescendantsRequest {
@@ -662,12 +676,6 @@ message GetResourceDescendantsRequest {
 
   // Restrict to a specific named resource.
   string name = 7;
-
-  // Pre-load all resource attributes.
-  bool include_attributes = 8;
-
-  // Set to include any aliases associated with the resource.
-  bool include_aliases = 9;
 }
 
 message GetResourceDescendantsResponse {
@@ -675,7 +683,7 @@ message GetResourceDescendantsResponse {
   tdx.volt_api.volt.v1.Status status = 1;
 
   // The retrieved descendants.
-  repeated Resource descendants = 2;
+  repeated Resource descendant = 2;
 }
 
 message InvokeRequest {
@@ -686,7 +694,7 @@ message InvokeRequest {
   string token = 2;
 
   // Key fingerprint of the target Volt.
-  // This is used by the tunnel to route the request.
+  // This is used by Relays to route the request.
   string identity_fingerprint = 3;
 
   oneof request_payload {
@@ -720,6 +728,25 @@ message InvokeResponse {
   bool server_end = 5;
 }
 
+enum MoveResourceMode {
+  MOVE_RESOURCE_MODE_UNKNOWN = 0;
+  MOVE_RESOURCE_MODE_MOVE = 1;
+  MOVE_RESOURCE_MODE_LINK = 2;
+  MOVE_RESOURCE_MODE_COPY = 3;
+}
+
+message MoveResourceRequest {
+  string resource_id = 1;
+  string from_resource_id = 2;
+  string to_resource_id = 3;
+  MoveResourceMode move_mode = 4;
+}
+
+message MoveResourceResponse {
+  // Details of any error that occurred on the call.
+  tdx.volt_api.volt.v1.Status status = 1;
+}
+
 message RequestAccessRequest {
   // The target resource id.
   string resource_id = 1;
@@ -847,6 +874,12 @@ message SaveResourceRequest {
   // The id of the folder resource in which a new resource should be created.
   // If omitted, the home folder of the currently authenticated identity will be used.
   string create_in_parent_id = 3;
+
+  // Set to indicate the resource attributes should be purged before saving the resource.
+  // If the `resource` field contains attributes they will be saved after the purge.
+  // If the `resource` field does not contain attributes this effectively deletes all attributes for this resource.
+  // This allows you to selectively update attributes if required, i.e. don't set this flag and include a single attribute in the update.
+  bool purge_attributes = 4;
 }
 
 message SaveResourceResponse {

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

@@ -7,14 +7,16 @@ import "tdx/volt_api/volt/v1/status.proto";
 // The Wire API allows clients to subscribe and publish to Volt wire resources.
 service WireAPI {
   // Establishes a client-streaming call to the wire resource.
-  rpc PublishWire(stream PublishRequest) returns (PublishResponse);
+  rpc PublishWire(stream PublishWireRequest) returns (stream PublishWireResponse);
 
   // Establishes a bi-directional streaming call to the wire resource.
   // Although we're only really interested in receiving data from the wire, a bi-directional stream is required so that we can gracefully stop the subscription.
-  rpc SubscribeWire(stream SubscribeRequest) returns (stream SubscribeResponse);
+  rpc SubscribeWire(stream SubscribeWireRequest) returns (stream SubscribeWireResponse);
 }
 
-message PublishRequest {
+// Because the publish RPC is client-streaming, the policy will not be checked until the first message arrives. This can mean that the `PublishWire` call appears to succeed but then fails after the first attempt to publish a message.
+// To avoid this, clients can immediately send a message with the `wire_id` set and no `chunk` set. This will establish that the correct permissions are in place and fail fast if not.
+message PublishWireRequest {
   // Only necessary in the first payload.
   string wire_id = 1;
 
@@ -22,13 +24,13 @@ message PublishRequest {
   bytes chunk = 2;
 }
 
-message PublishResponse {
+message PublishWireResponse {
   // Details of any error that occurred on the call.
   tdx.volt_api.volt.v1.Status status = 1;
 }
 
 // The request must include one of the following fields.
-message SubscribeRequest {
+message SubscribeWireRequest {
   oneof payload {
     // The wire id, only required for the first message.
     string wire_id = 1;
@@ -38,7 +40,7 @@ message SubscribeRequest {
 }
 
 // One of the following fields will be present in the response.
-message SubscribeResponse {
+message SubscribeWireResponse {
   oneof payload {
     // Details of any error that occured on the call.
     tdx.volt_api.volt.v1.Status status = 1;

package/src/constants.js

@@ -1,75 +1,75 @@
 // eslint-disable-next-line import/prefer-default-export
 export const constants = {
-  authTokenName: "tdx-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: "volt.tdxcloud.com",
-  didServiceType: {
-    voltConfig: "tdx-volt-config",
-  },
-  identityType: {
-    did: "did",
-    volt: "volt",
-  },
-  onlineStatus: {
-    offline: "offline",
-    online: "online",
-    unknown: "unknown",
-  },
-  publicKeyPrefix: "-----BEGIN PUBLIC KEY-----",
-  privateKeyPrefix: "-----BEGIN RSA PRIVATE KEY-----",
-  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.
-   */
-  serviceType: {
-    fileAPI: "tdx.volt_api.volt.v1.FileAPI",
-    protocolBridgeDataStream: "tdx.volt_api.protocol_bridge.v1.ProtocolBridgeStreamAPI",
-    sqliteServerAPI: "tdx.volt_api.data.v1.SqliteServerAPI",
-    ssiAPI: "tdx.volt_api.ssi.v1.SsiAPI",
-    tunnelAPI: "tdx.volt_api.tunnel.v1.TunnelAPI",
-    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`.
+	authTokenName: "tdx-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: "cloud.tdxvolt.com",
+	didServiceType: {
+		voltConfig: "tdx-volt-config",
+	},
+	identityType: {
+		did: "did",
+		volt: "volt",
+	},
+	onlineStatus: {
+		offline: "offline",
+		online: "online",
+		unknown: "unknown",
+	},
+	publicKeyPrefix: "-----BEGIN PUBLIC KEY-----",
+	privateKeyPrefix: "-----BEGIN RSA PRIVATE KEY-----",
+	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.
+	 */
+	serviceType: {
+		fileAPI: "tdx.volt_api.volt.v1.FileAPI",
+		sqliteServerAPI: "tdx.volt_api.data.v1.SqliteServerAPI",
+		sqliteDatabaseAPI: "tdx.volt_api.data.v1.SqliteDatabaseAPI",
+		ssiAPI: "tdx.volt_api.ssi.v1.SsiAPI",
+		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,20 +1,20 @@
 /* eslint-disable no-underscore-dangle */
 import debug from "debug";
 import EventEmitter from "events";
-import {VoltCrypto} from "./volt-crypto.js";
+import {VoltCredential} from "./volt-credential.js";
 
 const log = debug("volt-client-grpc:grpc-call");
 
 function _prepareInvokeRequest(request, method, methodType = "METHOD_TYPE_UNARY") {
-  const meta = this._voltClient.crypto.getIdentityMetadata(
+  const meta = this._voltClient.credential.getIdentityMetadata(
     this._voltClient.grpc,
-    this._voltClient.options.id,
+    this._voltClient.voltConfig.id,
     this._voltClient.isRemote
   );
   let invokeRequest;
   let callMethod = method;
 
-  if (this._voltClient.isVoltTunnel) {
+  if (this._voltClient.isVoltRelay) {
     let requestPayload;
     if (request) {
       requestPayload = this._grpcClient[method].requestSerialize(request);
@@ -35,23 +35,23 @@ function _prepareInvokeRequest(request, method, methodType = "METHOD_TYPE_UNARY"
       },
     };
 
-    const invokePayload = VoltCrypto.aesEncrypt(
+    const invokePayload = VoltCredential.aesEncrypt(
       tunnelMethod.responseSerialize(tunnelResp),
       meta.sharedKey.key,
       meta.sharedKey.iv
     );
 
-    log("target volt is %s", this._voltClient.crypto.voltFingerprint);
+    log("target volt is %s", this._voltClient.credential.voltFingerprint);
 
     invokeRequest = {
-      identity_fingerprint: this._voltClient.crypto.voltFingerprint,
+      identity_fingerprint: this._voltClient.credential.voltFingerprint,
       payload: invokePayload,
     };
 
     callMethod = "Invoke";
   } else if (this._voltClient.isRemote && meta.sharedKey.key) {
     const requestPayload = this._grpcClient[method].requestSerializeOriginal(request);
-    invokeRequest = VoltCrypto.aesEncrypt(requestPayload, meta.sharedKey.key, meta.sharedKey.iv);
+    invokeRequest = VoltCredential.aesEncrypt(requestPayload, meta.sharedKey.key, meta.sharedKey.iv);
   } else {
     invokeRequest = request;
   }
@@ -67,7 +67,7 @@ function _prepareInvokeRequest(request, method, methodType = "METHOD_TYPE_UNARY"
 function _preparePayloadRequest(request, invokeInfo) {
   let payloadRequest;
 
-  if (this._voltClient.isVoltTunnel) {
+  if (this._voltClient.isVoltRelay) {
     const requestPayload = this._grpcClient[invokeInfo.methodName].requestSerialize(request);
     const tunnelMethod = this._grpcClient.Tunnel;
 
@@ -77,7 +77,7 @@ function _preparePayloadRequest(request, invokeInfo) {
       },
     };
 
-    const invokePayload = VoltCrypto.aesEncrypt(
+    const invokePayload = VoltCredential.aesEncrypt(
       tunnelMethod.responseSerialize(tunnelResp),
       invokeInfo.meta.sharedKey.key,
       invokeInfo.meta.sharedKey.iv
@@ -88,7 +88,11 @@ function _preparePayloadRequest(request, invokeInfo) {
     };
   } else if (this._voltClient.isRemote && invokeInfo.meta.sharedKey.key) {
     const requestPayload = this._grpcClient[invokeInfo.methodName].requestSerializeOriginal(request);
-    payloadRequest = VoltCrypto.aesEncrypt(requestPayload, invokeInfo.meta.sharedKey.key, invokeInfo.meta.sharedKey.iv);
+    payloadRequest = VoltCredential.aesEncrypt(
+      requestPayload,
+      invokeInfo.meta.sharedKey.key,
+      invokeInfo.meta.sharedKey.iv
+    );
   } else {
     payloadRequest = request;
   }
@@ -99,9 +103,9 @@ function _preparePayloadRequest(request, invokeInfo) {
 function _parseResponse(method, meta, response) {
   let invokeResponse = {};
 
-  if (this._voltClient.isVoltTunnel) {
+  if (this._voltClient.isVoltRelay) {
     if (response.payload) {
-      const decryptedPayload = VoltCrypto.aesDecrypt(response.payload, meta.sharedKey.key, meta.sharedKey.iv);
+      const decryptedPayload = VoltCredential.aesDecrypt(response.payload, meta.sharedKey.key, meta.sharedKey.iv);
       const tunnelMethod = this._grpcClient.Tunnel;
       const responsePayload = tunnelMethod.requestDeserialize(decryptedPayload);
       if (responsePayload.payload === "method_payload") {
@@ -111,7 +115,7 @@ function _parseResponse(method, meta, response) {
       } else {
         log("unexpected tunnel payload type: %s", responsePayload.payload);
       }
-    } else if (response.status && response.status.message) {
+    } else if (response.status?.message) {
       // There's been an error in the tunnel.
       log(
         "Tunnel status received: %s, code %d, description: %s",
@@ -125,7 +129,7 @@ function _parseResponse(method, meta, response) {
       log("started method %d for %s", invokeResponse.methodId, method);
     }
   } else if (this._voltClient.isRemote && meta.sharedKey.key) {
-    const decryptedPayload = VoltCrypto.aesDecrypt(response, meta.sharedKey.key, meta.sharedKey.iv);
+    const decryptedPayload = VoltCredential.aesDecrypt(response, meta.sharedKey.key, meta.sharedKey.iv);
     invokeResponse = {payload: this._grpcClient[method].responseDeserializeOriginal(decryptedPayload)};
   } else {
     invokeResponse = {payload: response};
@@ -178,6 +182,10 @@ export default class GRPCCall extends EventEmitter {
 
       this._initialRequest = _prepareInvokeRequest.call(this, request, this._methodName, this._methodType);
 
+      if (!this._grpcClient[this._initialRequest.method]) {
+        return reject(new Error(`method not found: '${this._initialRequest.method}'`));
+      }
+
       this._call = this._grpcClient[this._initialRequest.method](this._initialRequest.meta.metadata, callbackIntercept);
 
       this._call.on("data", (streamResponse) => {
@@ -227,28 +235,28 @@ export default class GRPCCall extends EventEmitter {
   }
 
   end() {
-    if (!this._call) {
-      throw new Error("call not initialised");
-    } else {
+    if (this._call) {
       return this._call.end();
+    } else {
+      throw new Error("call not initialised");
     }
   }
 
   get writable() {
-    return this._call && this._call.writable;
+    return this._call?.writable;
   }
 
   write(request) {
     if (!this._call) {
       log("ERROR - call not initialised");
       throw new Error("call not initialised");
-    } else if (!this._initialRequest) {
+    } else if (this._initialRequest) {
+      const payloadRequest = _preparePayloadRequest.call(this, request, this._initialRequest);
+      return this._call.write(payloadRequest);
+    } else {
       this._initialRequest = _prepareInvokeRequest.call(this, request, this._methodName, this._methodType);
 
       return this._call.write(this._initialRequest.request);
-    } else {
-      const payloadRequest = _preparePayloadRequest.call(this, request, this._initialRequest);
-      return this._call.write(payloadRequest);
     }
   }
 }