@join-com/grpc-ts
Advanced tools
Comparing version 2.0.0 to 2.0.1
@@ -47,5 +47,5 @@ import * as grpc from 'grpc'; | ||
}; | ||
protected assignError(metadata: grpc.Metadata, errorJSON: any, code?: grpc.status): ClientError; | ||
protected handleMetaError(metadata: grpc.Metadata, code?: grpc.status): ClientError | undefined; | ||
protected convertError(err: grpc.ServiceError): ClientError; | ||
protected assignError(metadata: grpc.Metadata, errorJSON: any, methodName: string, code?: grpc.status): ClientError; | ||
protected handleMetaError(metadata: grpc.Metadata, methodName: string, code?: grpc.status): ClientError | undefined; | ||
protected convertError(err: grpc.ServiceError, methodName: string): ClientError; | ||
private metadata; | ||
@@ -52,0 +52,0 @@ private addTraceMetadata; |
@@ -33,3 +33,3 @@ "use strict"; | ||
this.log(methodName, req, latency); | ||
err ? reject(this.convertError(err)) : resolve(res); | ||
err ? reject(this.convertError(err, methodName)) : resolve(res); | ||
}); | ||
@@ -53,3 +53,3 @@ }); | ||
call = this.client[methodName](this.metadata(metadata), (err, res) => { | ||
err ? reject(this.convertError(err)) : resolve(res); | ||
err ? reject(this.convertError(err, methodName)) : resolve(res); | ||
}); | ||
@@ -67,8 +67,8 @@ }); | ||
} | ||
assignError(metadata, errorJSON, code) { | ||
assignError(metadata, errorJSON, methodName, code) { | ||
const error = new ClientError_1.ClientError(); | ||
Object.assign(error, Object.assign(Object.assign({}, errorJSON), { grpcCode: code, metadata: metadata })); | ||
Object.assign(error, Object.assign(Object.assign({}, errorJSON), { grpcCode: code, metadata: metadata, methodName })); | ||
return error; | ||
} | ||
handleMetaError(metadata, code) { | ||
handleMetaError(metadata, methodName, code) { | ||
const metadataError = metadata.get('error'); // deprecated, remove in next version | ||
@@ -82,12 +82,12 @@ const metadataBinaryError = metadata.get('error-bin'); | ||
: metadataError[0]); | ||
return this.assignError(metadata, errorJSON, code); | ||
return this.assignError(metadata, errorJSON, methodName, code); | ||
} | ||
convertError(err) { | ||
convertError(err, methodName) { | ||
const { metadata } = err; | ||
if (metadata) { | ||
const error = this.handleMetaError(metadata, err.code); | ||
const error = this.handleMetaError(metadata, methodName, err.code); | ||
if (error) | ||
return error; | ||
} | ||
return Object.assign(err, { grpcCode: err.code }); | ||
return Object.assign(err, { grpcCode: err.code, methodName }); | ||
} | ||
@@ -94,0 +94,0 @@ metadata(attrs) { |
{ | ||
"name": "@join-com/grpc-ts", | ||
"version": "2.0.0", | ||
"version": "2.0.1", | ||
"description": "grpc typescript wrapper", | ||
@@ -54,3 +54,3 @@ "main": "./lib/index.js", | ||
}, | ||
"gitHead": "8728419c69ecc75cd11791a89b18b8de8e9d5d21" | ||
"gitHead": "e9904eb673103215dab4851d8f183e076edf06e9" | ||
} |
Sorry, the diff of this file is not supported yet
29238