nsekit 0.3.17 → 0.3.18
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.
|
@@ -26,6 +26,9 @@ export declare class FlattradeSocket {
|
|
|
26
26
|
private readonly userId;
|
|
27
27
|
private accessToken;
|
|
28
28
|
private authMethod;
|
|
29
|
+
/** true → `{t:'a', accesstoken}` connect frame, false → `{t:'c', susertoken}`. */
|
|
30
|
+
private accessTokenFrame;
|
|
31
|
+
private alternateFrameTried;
|
|
29
32
|
private reconnectAttempts;
|
|
30
33
|
private maxReconnects;
|
|
31
34
|
private reconnectTimer;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"flattrade-socket.d.ts","sourceRoot":"","sources":["../../../src/brokers/flattrade/flattrade-socket.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAe,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmBlF;;;;;;;0DAO0D;AAC1D,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAEzC;0EAC0E;AAC1E,eAAO,MAAM,gBAAgB,QAAS,CAAC;AAIvC,qBAAa,eAAe;IAC1B,OAAO,CAAC,EAAE,CAAmB;IAC7B,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAmB;IACrC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAG9C,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAA+C;gBAGjE,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,IAAI,EACzB,UAAU,GAAE,MAAM,GAAG,OAAgB,EACrC,QAAQ,CAAC,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"flattrade-socket.d.ts","sourceRoot":"","sources":["../../../src/brokers/flattrade/flattrade-socket.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAe,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAmBlF;;;;;;;0DAO0D;AAC1D,eAAO,MAAM,kBAAkB,QAAS,CAAC;AAEzC;0EAC0E;AAC1E,eAAO,MAAM,gBAAgB,QAAS,CAAC;AAIvC,qBAAa,eAAe;IAC1B,OAAO,CAAC,EAAE,CAAmB;IAC7B,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,aAAa,CAAmC;IACxD,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAChC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,UAAU,CAAmB;IACrC,kFAAkF;IAClF,OAAO,CAAC,gBAAgB,CAAU;IAClC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,iBAAiB,CAAK;IAC9B,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,cAAc,CAA8C;IACpE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAa;IAC3C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAG9C,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,YAAY,CAA+C;gBAGjE,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,YAAY,CAAC,EAAE,MAAM,IAAI,EACzB,UAAU,GAAE,MAAM,GAAG,OAAgB,EACrC,QAAQ,CAAC,EAAE,MAAM;IAUnB,mDAAmD;IACnD,OAAO,IAAI,IAAI;IAyFf,6BAA6B;IAC7B,UAAU,IAAI,IAAI;IAYlB;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI;IAalC;;;OAGG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;IA2BlG,0DAA0D;IAC1D,WAAW,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAuBpC,gCAAgC;IAChC,kBAAkB,IAAI,iBAAiB;IAIvC,oDAAoD;IACpD,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAe5C,OAAO,CAAC,aAAa;IAyErB,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,eAAe;IAUvB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,mBAAmB;IAO3B,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,mBAAmB;IAO3B;;;;;;;;;OASG;IACH,wBAAwB,IAAI,OAAO;CAkBpC"}
|
package/dist/index.js
CHANGED
|
@@ -23149,6 +23149,8 @@ class FlattradeSocket {
|
|
|
23149
23149
|
userId;
|
|
23150
23150
|
accessToken;
|
|
23151
23151
|
authMethod;
|
|
23152
|
+
accessTokenFrame;
|
|
23153
|
+
alternateFrameTried = false;
|
|
23152
23154
|
reconnectAttempts = 0;
|
|
23153
23155
|
maxReconnects = 5;
|
|
23154
23156
|
reconnectTimer = null;
|
|
@@ -23160,6 +23162,7 @@ class FlattradeSocket {
|
|
|
23160
23162
|
this.userId = userId;
|
|
23161
23163
|
this.accessToken = accessToken;
|
|
23162
23164
|
this.authMethod = authMethod;
|
|
23165
|
+
this.accessTokenFrame = authMethod === "oauth";
|
|
23163
23166
|
this.onAuthFailed = onAuthFailed;
|
|
23164
23167
|
this.egressIp = egressIp;
|
|
23165
23168
|
}
|
|
@@ -23177,15 +23180,9 @@ class FlattradeSocket {
|
|
|
23177
23180
|
this.ws.on("open", () => {
|
|
23178
23181
|
this.lastMessageAt = Date.now();
|
|
23179
23182
|
this.startSilenceWatchdog();
|
|
23180
|
-
|
|
23181
|
-
|
|
23182
|
-
|
|
23183
|
-
uid: this.userId,
|
|
23184
|
-
actid: this.userId,
|
|
23185
|
-
susertoken: this.accessToken,
|
|
23186
|
-
source: "API"
|
|
23187
|
-
});
|
|
23188
|
-
this.ws.send(authMsg);
|
|
23183
|
+
const frame = this.accessTokenFrame ? { t: "a", uid: this.userId, actid: this.userId, accesstoken: this.accessToken, source: "API" } : { t: "c", uid: this.userId, actid: this.userId, susertoken: this.accessToken, source: "API" };
|
|
23184
|
+
console.log(`${TAG2} WS open, sending auth for uid=${this.userId} (frame=${frame.t})`);
|
|
23185
|
+
this.ws.send(JSON.stringify(frame));
|
|
23189
23186
|
});
|
|
23190
23187
|
this.ws.on("message", (raw) => {
|
|
23191
23188
|
this.lastMessageAt = Date.now();
|
|
@@ -23228,6 +23225,7 @@ class FlattradeSocket {
|
|
|
23228
23225
|
if (newToken)
|
|
23229
23226
|
this.accessToken = newToken;
|
|
23230
23227
|
this.reconnectAttempts = 0;
|
|
23228
|
+
this.alternateFrameTried = false;
|
|
23231
23229
|
if (this.ws) {
|
|
23232
23230
|
this.ws.close();
|
|
23233
23231
|
this.ws = null;
|
|
@@ -23298,11 +23296,27 @@ class FlattradeSocket {
|
|
|
23298
23296
|
}
|
|
23299
23297
|
if (type === "ck" || type === "ak") {
|
|
23300
23298
|
if (data["s"] === "OK") {
|
|
23299
|
+
console.log(`${TAG2} Auth accepted (${type} OK, frame=${this.accessTokenFrame ? "a" : "c"})`);
|
|
23301
23300
|
this.state = "CONNECTED";
|
|
23302
23301
|
this.reconnectAttempts = 0;
|
|
23302
|
+
this.alternateFrameTried = false;
|
|
23303
23303
|
if (this.subscribedTokens.size > 0) {
|
|
23304
23304
|
this.sendSubscribe(Array.from(this.subscribedTokens));
|
|
23305
23305
|
}
|
|
23306
|
+
} else if (!this.alternateFrameTried) {
|
|
23307
|
+
this.alternateFrameTried = true;
|
|
23308
|
+
this.accessTokenFrame = !this.accessTokenFrame;
|
|
23309
|
+
console.warn(`${TAG2} Auth rejected (${type} NOT_OK) \u2014 retrying with frame=${this.accessTokenFrame ? "a" : "c"}`);
|
|
23310
|
+
const old = this.ws;
|
|
23311
|
+
this.ws = null;
|
|
23312
|
+
this.stopSilenceWatchdog();
|
|
23313
|
+
this.state = "DISCONNECTED";
|
|
23314
|
+
if (old) {
|
|
23315
|
+
old.removeAllListeners();
|
|
23316
|
+
old.on("error", () => {});
|
|
23317
|
+
old.close();
|
|
23318
|
+
}
|
|
23319
|
+
this.connect();
|
|
23306
23320
|
} else {
|
|
23307
23321
|
console.error(`${TAG2} Auth rejected (${type} NOT_OK) \u2014 token invalid, stopping reconnect`);
|
|
23308
23322
|
this.reconnectAttempts = this.maxReconnects;
|