diff --git a/packages/sdk/src/sdk.ts b/packages/sdk/src/sdk.ts index de82220d1..3f3b8550b 100644 --- a/packages/sdk/src/sdk.ts +++ b/packages/sdk/src/sdk.ts @@ -2,7 +2,7 @@ import * as logger from "@onflow/util-logger" // Base export {build} from "./build/build.js" export {resolve} from "./resolve/resolve.js" -export {send} from "./transport" +export {send, subscribe, rawSubscribe} from "./transport" export {decode} from "./decode/sdk-decode.js" export { encodeTransactionPayload, @@ -113,5 +113,3 @@ import * as TestUtils from "./test-utils" export {TestUtils} export {VERSION} from "./VERSION" - -export {subscribe, rawSubscribe} from "./transport" diff --git a/packages/transport-http/src/subscribe/subscription-manager.ts b/packages/transport-http/src/subscribe/subscription-manager.ts index bc119abce..cc9c3bf3e 100644 --- a/packages/transport-http/src/subscribe/subscription-manager.ts +++ b/packages/transport-http/src/subscribe/subscription-manager.ts @@ -22,7 +22,7 @@ type DeepRequired = Required<{ type InferHandler = T extends SubscriptionHandler ? H : never -interface SubscriptionInfo> { +interface SubscriptionInfo { // Internal ID for the subscription id: number // Remote ID assigned by the server used for message routing and unsubscribing @@ -63,7 +63,7 @@ export interface SubscriptionManagerConfig { export class SubscriptionManager[]> { private counter = 0 private socket: WebSocket | null = null - private subscriptions: SubscriptionInfo>[] = [] + private subscriptions: SubscriptionInfo[] = [] private config: DeepRequired private reconnectAttempts = 0 private handlers: Record> @@ -203,7 +203,7 @@ export class SubscriptionManager[]> { ) // Track the subscription locally - const sub: SubscriptionInfo> = { + const sub: SubscriptionInfo = { id: this.counter++, topic: opts.topic, subscriber: subscriber, @@ -248,9 +248,7 @@ export class SubscriptionManager[]> { } } - private async sendSubscribe( - sub: SubscriptionInfo> - ) { + private async sendSubscribe(sub: SubscriptionInfo) { // Send the subscription message const request: SubscribeMessageRequest = { action: Action.SUBSCRIBE, @@ -270,9 +268,7 @@ export class SubscriptionManager[]> { return response } - private async sendUnsubscribe( - sub: SubscriptionInfo> - ) { + private async sendUnsubscribe(sub: SubscriptionInfo) { // Send the unsubscribe message if the subscription has a remote id const {remoteId} = sub if (remoteId) {