@drift-labs/sdk 2.96.0-beta.4 → 2.96.0-beta.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/VERSION +1 -1
  2. package/lib/events/eventSubscriber.js +9 -8
  3. package/package.json +1 -1
  4. package/src/events/eventSubscriber.ts +18 -11
package/VERSION CHANGED
@@ -1 +1 @@
1
- 2.96.0-beta.4
1
+ 2.96.0-beta.6
package/lib/events/eventSubscriber.js CHANGED
@@ -28,23 +28,24 @@ class EventSubscriber {
28
28
  this.initializeLogProvider();
29
29
  }
30
30
  initializeLogProvider(subscribe = false) {
31
+ const logProviderConfig = this.options.logProviderConfig;
31
32
  if (this.currentProviderType === 'websocket') {
32
- const logProviderConfig = this.options
33
- .logProviderConfig;
34
33
  this.logProvider = new webSocketLogProvider_1.WebSocketLogProvider(
35
34
  // @ts-ignore
36
- this.connection, this.address, this.options.commitment, logProviderConfig.resubTimeoutMs);
35
+ this.connection, this.address, this.options.commitment, this.options.logProviderConfig.resubTimeoutMs);
37
36
  }
38
37
  else if (this.currentProviderType === 'polling') {
39
- const logProviderConfig = this.options
40
- .logProviderConfig;
38
+ const frequency = 'frequency' in logProviderConfig
39
+ ? logProviderConfig.frequency
40
+ : logProviderConfig.fallbackFrequency;
41
+ const batchSize = 'batchSize' in logProviderConfig
42
+ ? logProviderConfig.batchSize
43
+ : logProviderConfig.fallbackBatchSize;
41
44
  this.logProvider = new pollingLogProvider_1.PollingLogProvider(
42
45
  // @ts-ignore
43
- this.connection, this.address, this.options.commitment, logProviderConfig.frequency, logProviderConfig.batchSize);
46
+ this.connection, this.address, this.options.commitment, frequency, batchSize);
44
47
  }
45
48
  else if (this.currentProviderType === 'events-server') {
46
- const logProviderConfig = this.options
47
- .logProviderConfig;
48
49
  this.logProvider = new eventsServerLogProvider_1.EventsServerLogProvider(logProviderConfig.url, this.options.eventTypes, this.options.address ? this.options.address.toString() : undefined);
49
50
  }
50
51
  else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@drift-labs/sdk",
3
- "version": "2.96.0-beta.4",
3
+ "version": "2.96.0-beta.6",
4
4
  "main": "lib/index.js",
5
5
  "types": "lib/index.d.ts",
6
6
  "author": "crispheaney",
package/src/events/eventSubscriber.ts CHANGED
@@ -9,10 +9,10 @@ import {
9
9
  LogProvider,
10
10
  EventSubscriberEvents,
11
11
  WebSocketLogProviderConfig,
12
- PollingLogProviderConfig,
13
12
  EventsServerLogProviderConfig,
14
13
  LogProviderType,
15
14
  StreamingLogProviderConfig,
15
+ PollingLogProviderConfig,
16
16
  } from './types';
17
17
  import { TxEventCache } from './txEventCache';
18
18
  import { EventList } from './eventList';
@@ -54,32 +54,39 @@ export class EventSubscriber {
54
54
  }
55
55
 
56
56
  private initializeLogProvider(subscribe = false) {
57
+ const logProviderConfig = this.options.logProviderConfig;
58
+
57
59
  if (this.currentProviderType === 'websocket') {
58
- const logProviderConfig = this.options
59
- .logProviderConfig as WebSocketLogProviderConfig;
60
60
  this.logProvider = new WebSocketLogProvider(
61
61
  // @ts-ignore
62
62
  this.connection,
63
63
  this.address,
64
64
  this.options.commitment,
65
- logProviderConfig.resubTimeoutMs
65
+ (
66
+ this.options.logProviderConfig as WebSocketLogProviderConfig
67
+ ).resubTimeoutMs
66
68
  );
67
69
  } else if (this.currentProviderType === 'polling') {
68
- const logProviderConfig = this.options
69
- .logProviderConfig as PollingLogProviderConfig;
70
+ const frequency =
71
+ 'frequency' in logProviderConfig
72
+ ? (logProviderConfig as PollingLogProviderConfig).frequency
73
+ : (logProviderConfig as StreamingLogProviderConfig).fallbackFrequency;
74
+ const batchSize =
75
+ 'batchSize' in logProviderConfig
76
+ ? (logProviderConfig as PollingLogProviderConfig).batchSize
77
+ : (logProviderConfig as StreamingLogProviderConfig).fallbackBatchSize;
78
+
70
79
  this.logProvider = new PollingLogProvider(
71
80
  // @ts-ignore
72
81
  this.connection,
73
82
  this.address,
74
83
  this.options.commitment,
75
- logProviderConfig.frequency,
76
- logProviderConfig.batchSize
84
+ frequency,
85
+ batchSize
77
86
  );
78
87
  } else if (this.currentProviderType === 'events-server') {
79
- const logProviderConfig = this.options
80
- .logProviderConfig as EventsServerLogProviderConfig;
81
88
  this.logProvider = new EventsServerLogProvider(
82
- logProviderConfig.url,
89
+ (logProviderConfig as EventsServerLogProviderConfig).url,
83
90
  this.options.eventTypes,
84
91
  this.options.address ? this.options.address.toString() : undefined
85
92
  );