Skip to content

Commit 0b3c0aa

Browse files
bangjelkoskibangjelkoski
committed
chore: minor import
1 parent 9bc33b5 commit 0b3c0aa

File tree

5 files changed

+40
-46
lines changed

5 files changed

+40
-46
lines changed

‎packages/exceptions/src/exceptions/types/codes.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import * as grpc from '@injectivelabs/grpc-web'
1+
import { grpc } from '@injectivelabs/grpc-web'
22
import { StatusCodes } from 'http-status-codes'
33

4-
// @ts-ignore
5-
const $grpc = (grpc.default || grpc) as typeof grpc
6-
74
export enum TransactionChainErrorModule {
85
Auction = 'auction',
96
CosmosSdk = 'sdk',
@@ -770,11 +767,8 @@ export type IndexerApiErrorCode = number
770767

771768
export const UnspecifiedErrorCode = -1
772769

773-
export type ErrorCode =
774-
| StatusCodes
775-
| typeof UnspecifiedErrorCode
776-
| grpc.grpc.Code
777-
export const GRPC_REQUEST_FAILED = $grpc.grpc.Code.Unavailable
770+
export type ErrorCode = StatusCodes | typeof UnspecifiedErrorCode | grpc.Code
771+
export const GRPC_REQUEST_FAILED = grpc.Code.Unavailable
778772

779773
export type ErrorContextCode =
780774
| ChainAuctionErrorCodes

‎packages/sdk-ts/src/client/base/BaseGrpcConsumer.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import * as grpc from '@injectivelabs/grpc-web'
1+
import { grpc } from '@injectivelabs/grpc-web'
22
import { getGrpcTransport } from '../../utils/grpc.js'
33
import { GrpcWebImpl } from './GrpcWebImpl.js'
44

55
export default class BaseGrpcConsumer extends GrpcWebImpl {
66
protected module: string = ''
77

8-
protected metadata?: grpc.grpc.Metadata
8+
protected metadata?: grpc.Metadata
99

1010
constructor(endpoint: string) {
1111
super(endpoint, {
@@ -14,7 +14,7 @@ export default class BaseGrpcConsumer extends GrpcWebImpl {
1414
}
1515

1616
public setMetadata(map: Record<string, string>) {
17-
const metadata = new grpc.grpc.Metadata()
17+
const metadata = new grpc.Metadata()
1818
Object.keys(map).forEach((key) => metadata.set(key, map[key]))
1919

2020
this.metadata = metadata

‎packages/sdk-ts/src/client/base/GrpcWebImpl.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import * as grpc from '@injectivelabs/grpc-web'
1+
import { grpc } from '@injectivelabs/grpc-web'
22
import { BrowserHeaders } from 'browser-headers'
33

4-
interface UnaryMethodDefinitionR extends grpc.grpc.UnaryMethodDefinition<any, any> {
4+
interface UnaryMethodDefinitionR extends grpc.UnaryMethodDefinition<any, any> {
55
requestStream: any
66
responseStream: any
77
}
@@ -12,15 +12,15 @@ export interface Rpc {
1212
unary<T extends UnaryMethodDefinition>(
1313
methodDesc: T,
1414
request: any,
15-
metadata: grpc.grpc.Metadata | undefined,
15+
metadata: grpc.Metadata | undefined,
1616
): Promise<any>
1717
}
1818

1919
export class GrpcWebError extends Error {
2020
constructor(
2121
message: string,
22-
public code: grpc.grpc.Code,
23-
public metadata: grpc.grpc.Metadata,
22+
public code: grpc.Code,
23+
public metadata: grpc.Metadata,
2424
) {
2525
super(message)
2626
}
@@ -29,20 +29,20 @@ export class GrpcWebError extends Error {
2929
export class GrpcWebImpl {
3030
private host: string
3131
private options: {
32-
transport?: grpc.grpc.TransportFactory
32+
transport?: grpc.TransportFactory
3333
debug?: boolean
3434
setCookieMetadata?: boolean
35-
metadata?: grpc.grpc.Metadata
35+
metadata?: grpc.Metadata
3636
upStreamRetryCodes?: number[]
3737
}
3838

3939
constructor(
4040
host: string,
4141
options: {
42-
transport?: grpc.grpc.TransportFactory
42+
transport?: grpc.TransportFactory
4343
debug?: boolean
4444
setCookieMetadata?: boolean
45-
metadata?: grpc.grpc.Metadata
45+
metadata?: grpc.Metadata
4646
upStreamRetryCodes?: number[]
4747
},
4848
) {
@@ -53,7 +53,7 @@ export class GrpcWebImpl {
5353
unary<T extends UnaryMethodDefinition>(
5454
methodDesc: T,
5555
_request: any,
56-
metadata: grpc.grpc.Metadata | undefined,
56+
metadata: grpc.Metadata | undefined,
5757
): Promise<any> {
5858
const request = { ..._request, ...methodDesc.requestType }
5959
const actualMetadata = new BrowserHeaders({
@@ -62,14 +62,14 @@ export class GrpcWebImpl {
6262
})
6363

6464
return new Promise((resolve, reject) => {
65-
grpc.grpc.unary(methodDesc, {
65+
grpc.unary(methodDesc, {
6666
request,
6767
host: this.host,
6868
metadata: actualMetadata,
6969
transport: this.options.transport,
7070
debug: this.options.debug,
7171
onEnd: (response) => {
72-
if (response.status === grpc.grpc.Code.OK) {
72+
if (response.status === grpc.Code.OK) {
7373
return resolve(response.message!.toObject())
7474
}
7575

‎packages/sdk-ts/src/client/base/IndexerGrpcWebImpl.ts‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import * as grpc from '@injectivelabs/grpc-web'
1+
import { grpc } from '@injectivelabs/grpc-web'
22
import { BrowserHeaders } from 'browser-headers'
33
import { Observable } from 'rxjs'
44
import { share } from 'rxjs/operators'
55

6-
interface UnaryMethodDefinitionR extends grpc.grpc.UnaryMethodDefinition<any, any> {
6+
interface UnaryMethodDefinitionR extends grpc.UnaryMethodDefinition<any, any> {
77
requestStream: any
88
responseStream: any
99
}
@@ -14,20 +14,20 @@ export interface Rpc {
1414
unary<T extends UnaryMethodDefinition>(
1515
methodDesc: T,
1616
request: any,
17-
metadata: grpc.grpc.Metadata | undefined,
17+
metadata: grpc.Metadata | undefined,
1818
): Promise<any>
1919
invoke<T extends UnaryMethodDefinition>(
2020
methodDesc: T,
2121
request: any,
22-
metadata: grpc.grpc.Metadata | undefined,
22+
metadata: grpc.Metadata | undefined,
2323
): Observable<any>
2424
}
2525

2626
export class GrpcWebError extends Error {
2727
constructor(
2828
message: string,
29-
public code: grpc.grpc.Code,
30-
public metadata: grpc.grpc.Metadata,
29+
public code: grpc.Code,
30+
public metadata: grpc.Metadata,
3131
) {
3232
super(message)
3333
}
@@ -36,20 +36,20 @@ export class GrpcWebError extends Error {
3636
export class GrpcWebImpl {
3737
private host: string
3838
private options: {
39-
transport?: grpc.grpc.TransportFactory
40-
streamingTransport?: grpc.grpc.TransportFactory
39+
transport?: grpc.TransportFactory
40+
streamingTransport?: grpc.TransportFactory
4141
debug?: boolean
42-
metadata?: grpc.grpc.Metadata
42+
metadata?: grpc.Metadata
4343
upStreamRetryCodes?: number[]
4444
}
4545

4646
constructor(
4747
host: string,
4848
options: {
49-
transport?: grpc.grpc.TransportFactory
50-
streamingTransport?: grpc.grpc.TransportFactory
49+
transport?: grpc.TransportFactory
50+
streamingTransport?: grpc.TransportFactory
5151
debug?: boolean
52-
metadata?: grpc.grpc.Metadata
52+
metadata?: grpc.Metadata
5353
upStreamRetryCodes?: number[]
5454
},
5555
) {
@@ -60,7 +60,7 @@ export class GrpcWebImpl {
6060
unary<T extends UnaryMethodDefinition>(
6161
methodDesc: T,
6262
_request: any,
63-
metadata: grpc.grpc.Metadata | undefined,
63+
metadata: grpc.Metadata | undefined,
6464
): Promise<any> {
6565
const request = { ..._request, ...methodDesc.requestType }
6666
const metadataWithCookieMetadata = new BrowserHeaders({
@@ -69,14 +69,14 @@ export class GrpcWebImpl {
6969
})
7070

7171
return new Promise((resolve, reject) => {
72-
grpc.grpc.unary(methodDesc, {
72+
grpc.unary(methodDesc, {
7373
request,
7474
host: this.host,
7575
metadata: metadataWithCookieMetadata,
7676
transport: this.options.transport,
7777
debug: this.options.debug,
7878
onEnd: (response) => {
79-
if (response.status === grpc.grpc.Code.OK) {
79+
if (response.status === grpc.Code.OK) {
8080
return resolve(response.message!.toObject())
8181
}
8282

@@ -95,7 +95,7 @@ export class GrpcWebImpl {
9595
invoke<T extends UnaryMethodDefinition>(
9696
methodDesc: T,
9797
_request: any,
98-
metadata: grpc.grpc.Metadata | undefined,
98+
metadata: grpc.Metadata | undefined,
9999
): Observable<any> {
100100
const upStreamCodes = this.options.upStreamRetryCodes || []
101101
const DEFAULT_TIMEOUT_TIME: number = 3_000
@@ -107,17 +107,17 @@ export class GrpcWebImpl {
107107

108108
return new Observable((observer) => {
109109
const upStream = () => {
110-
const client = grpc.grpc.invoke(methodDesc, {
110+
const client = grpc.invoke(methodDesc, {
111111
host: this.host,
112112
request,
113113
transport: this.options.streamingTransport || this.options.transport,
114114
metadata: actualMetadata,
115115
debug: this.options.debug,
116116
onMessage: (next) => observer.next(next),
117117
onEnd: (
118-
code: grpc.grpc.Code,
118+
code: grpc.Code,
119119
message: string,
120-
trailers: grpc.grpc.Metadata,
120+
trailers: grpc.Metadata,
121121
) => {
122122
if (code === 0) {
123123
observer.complete()

‎packages/sdk-ts/src/utils/grpc.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import * as grpc from '@injectivelabs/grpc-web'
1+
import { grpc } from '@injectivelabs/grpc-web'
22
import { NodeHttpTransport } from '@injectivelabs/grpc-web-node-http-transport'
33
import { ReactNativeTransport } from '@injectivelabs/grpc-web-react-native-transport'
44
import { isNode, isReactNative } from './helpers.js'
55

6-
export const getGrpcTransport = (): grpc.grpc.TransportFactory => {
6+
export const getGrpcTransport = (): grpc.TransportFactory => {
77
if (isReactNative()) {
88
return ReactNativeTransport({ withCredentials: true })
99
}
@@ -12,5 +12,5 @@ export const getGrpcTransport = (): grpc.grpc.TransportFactory => {
1212
return NodeHttpTransport()
1313
}
1414

15-
return grpc.grpc.CrossBrowserHttpTransport({ withCredentials: false })
15+
return grpc.CrossBrowserHttpTransport({ withCredentials: false })
1616
}

0 commit comments

Comments
 (0)