shoonya-sdk 1.3.2 → 1.4.0

package/dist/index.cjs

@@ -77,6 +77,14 @@ var import_totp_generator2 = __toESM(require("totp-generator"), 1);
 
 // src/token-manager.ts
 var import_totp_generator = __toESM(require("totp-generator"), 1);
+
+// src/utils/common.ts
+function ensureTrailingSlash(url) {
+  return url.endsWith("/") ? url : url + "/";
+}
+__name(ensureTrailingSlash, "ensureTrailingSlash");
+
+// src/token-manager.ts
 var Tokens = class {
   static {
     __name(this, "Tokens");
@@ -90,6 +98,7 @@ var Tokens = class {
   imei;
   source = "API";
   twoFactor;
+  authBaseUrl = "https://api.shoonya.com/NorenWClientTP/";
   constructor() {
   }
   updateCred(cred) {
@@ -118,6 +127,12 @@ var Tokens = class {
       twoFa: this.twoFactor
     };
   }
+  updateAuthBaseUrl(url) {
+    this.authBaseUrl = ensureTrailingSlash(url);
+  }
+  getAuthBaseUrl() {
+    return this.authBaseUrl;
+  }
 };
 var tokens = new Tokens();
 async function refreshAccessToken(retryCount = 1) {
@@ -153,7 +168,7 @@ function getAccessToken() {
   };
   return new Promise((resolve2, reject) => {
     const jData = `jData=${JSON.stringify(cred)}`;
-    fetch("https://api.shoonya.com/NorenWClientTP/QuickAuth", {
+    fetch(tokens.getAuthBaseUrl() + "QuickAuth", {
       method: "POST",
       body: jData
     }).then((res) => res.json()).then((data) => {
@@ -266,11 +281,13 @@ var RestClient = class {
   accountId = "";
   logger;
   constructor(cred, params) {
-    const { logging = false } = params || {};
+    const { logging = false, baseUrl = this.httpBaseUrl } = params || {};
     tokens.updateCred(cred);
     this.userId = this.accountId = cred.userId;
     this.logger = new logger_default("shoonya_rest-client", 1024 * 1024);
     this.logger.logging = logging;
+    this.httpBaseUrl = ensureTrailingSlash(baseUrl);
+    tokens.updateAuthBaseUrl(this.httpBaseUrl);
   }
   async request(path, body) {
     const needsAuth = !tokens.getAccessToken() && !["login", "logout"].includes(path);
@@ -788,7 +805,8 @@ var WebsocketClient = class extends import_events.EventEmitter {
       logging = false,
       logFileType = "SEPARATE",
       maxRetryAttempt = 3,
-      heartbeatInterval = 15e3
+      heartbeatInterval = 15e3,
+      baseUrl = this.wsBaseUrl
     } = params || {};
     this.maxRetryAttempt = maxRetryAttempt;
     this.heartbeatInterval = heartbeatInterval;
@@ -798,6 +816,11 @@ var WebsocketClient = class extends import_events.EventEmitter {
       logFileType
     );
     this.logger.logging ||= logging;
+    this.wsBaseUrl = ensureTrailingSlash(baseUrl);
+    const derivedAuthBaseUrl = this.inferAuthBaseUrlFromWs(this.wsBaseUrl);
+    if (derivedAuthBaseUrl) {
+      tokens.updateAuthBaseUrl(derivedAuthBaseUrl);
+    }
     const storedCred = tokens.getCred();
     const c = storedCred.userId ? storedCred : cred;
     if (!c) {
@@ -815,6 +838,19 @@ var WebsocketClient = class extends import_events.EventEmitter {
       );
     }
   }
+  inferAuthBaseUrlFromWs(wsBaseUrl) {
+    if (!wsBaseUrl.includes("/NorenWSTP/")) {
+      return null;
+    }
+    let url = wsBaseUrl.replace("/NorenWSTP/", "/NorenWClientTP/");
+    if (url.startsWith("ws://")) {
+      url = "http://" + url.slice(5);
+    }
+    if (url.startsWith("wss://")) {
+      url = "https://" + url.slice(6);
+    }
+    return url;
+  }
   connect() {
     if (this.ws && (this.ws.readyState === this.ws.CONNECTING || this.ws.readyState === this.ws.OPEN))
       return;
@@ -825,23 +861,40 @@ var WebsocketClient = class extends import_events.EventEmitter {
     this.ws.on("error", this.wsErrorEvent);
   }
   wsOpenEvent = async () => {
-    if (!tokens.getAccessToken()) {
-      await refreshAccessToken();
+    try {
+      if (!tokens.getAccessToken()) {
+        await refreshAccessToken();
+      }
+      const { userId, accountId } = tokens.getCred();
+      const msg = {
+        t: "c",
+        uid: userId,
+        actid: accountId,
+        source: "API",
+        susertoken: tokens.getAccessToken()
+      };
+      this.send(msg);
+      this.emit("open");
+    } catch (error) {
+      this.logger.log(`Error in wsOpenEvent: ${error.message}`, "ERROR");
+      console.error("Error in wsOpenEvent:", error);
+      this.emit("error", error);
+      this.ws?.close(1011, "Internal Error");
     }
-    const { userId, accountId } = tokens.getCred();
-    const msg = {
-      t: "c",
-      uid: userId,
-      actid: accountId,
-      source: "API",
-      susertoken: tokens.getAccessToken()
-    };
-    this.send(msg);
-    this.emit("open");
   };
   wsMessageEvent = (msg) => {
-    const result = JSON.parse(msg.toString());
-    if (result.t === "ck" && result.s.toLowerCase() === "ok") {
+    let result;
+    try {
+      result = JSON.parse(msg.toString());
+    } catch (error) {
+      this.logger.log(`Error parsing message: ${error.message}`, "ERROR");
+      console.error("Error parsing message:", error);
+      return;
+    }
+    if (!result || typeof result !== "object") {
+      return;
+    }
+    if (result.t === "ck" && result.s?.toLowerCase() === "ok") {
       setTimeout(() => {
         this.logger.log("|WSClient| Connected with Shoonya WS.");
         this.sendHeartbeat(this.heartbeatInterval);

package/dist/index.d.cts

@@ -751,6 +751,7 @@ declare class RestClient {
     private logger;
     constructor(cred: UserCred, params?: {
         logging?: boolean;
+        baseUrl?: string;
     });
     request<T>(path: Path, body: {
         data: Record<string, string>;
@@ -931,7 +932,9 @@ declare class WebsocketClient extends EventEmitter {
         logFileType?: LoggerType;
         maxRetryAttempt?: number;
         heartbeatInterval?: number;
+        baseUrl?: string;
     });
+    private inferAuthBaseUrlFromWs;
     connect(): void;
     private wsOpenEvent;
     private wsMessageEvent;

package/dist/index.d.ts

@@ -751,6 +751,7 @@ declare class RestClient {
     private logger;
     constructor(cred: UserCred, params?: {
         logging?: boolean;
+        baseUrl?: string;
     });
     request<T>(path: Path, body: {
         data: Record<string, string>;
@@ -931,7 +932,9 @@ declare class WebsocketClient extends EventEmitter {
         logFileType?: LoggerType;
         maxRetryAttempt?: number;
         heartbeatInterval?: number;
+        baseUrl?: string;
     });
+    private inferAuthBaseUrlFromWs;
     connect(): void;
     private wsOpenEvent;
     private wsMessageEvent;

package/dist/index.js

@@ -42,6 +42,14 @@ import totp2 from "totp-generator";
 
 // src/token-manager.ts
 import totp from "totp-generator";
+
+// src/utils/common.ts
+function ensureTrailingSlash(url) {
+  return url.endsWith("/") ? url : url + "/";
+}
+__name(ensureTrailingSlash, "ensureTrailingSlash");
+
+// src/token-manager.ts
 var Tokens = class {
   static {
     __name(this, "Tokens");
@@ -55,6 +63,7 @@ var Tokens = class {
   imei;
   source = "API";
   twoFactor;
+  authBaseUrl = "https://api.shoonya.com/NorenWClientTP/";
   constructor() {
   }
   updateCred(cred) {
@@ -83,6 +92,12 @@ var Tokens = class {
       twoFa: this.twoFactor
     };
   }
+  updateAuthBaseUrl(url) {
+    this.authBaseUrl = ensureTrailingSlash(url);
+  }
+  getAuthBaseUrl() {
+    return this.authBaseUrl;
+  }
 };
 var tokens = new Tokens();
 async function refreshAccessToken(retryCount = 1) {
@@ -118,7 +133,7 @@ function getAccessToken() {
   };
   return new Promise((resolve2, reject) => {
     const jData = `jData=${JSON.stringify(cred)}`;
-    fetch("https://api.shoonya.com/NorenWClientTP/QuickAuth", {
+    fetch(tokens.getAuthBaseUrl() + "QuickAuth", {
       method: "POST",
       body: jData
     }).then((res) => res.json()).then((data) => {
@@ -238,11 +253,13 @@ var RestClient = class {
   accountId = "";
   logger;
   constructor(cred, params) {
-    const { logging = false } = params || {};
+    const { logging = false, baseUrl = this.httpBaseUrl } = params || {};
     tokens.updateCred(cred);
     this.userId = this.accountId = cred.userId;
     this.logger = new logger_default("shoonya_rest-client", 1024 * 1024);
     this.logger.logging = logging;
+    this.httpBaseUrl = ensureTrailingSlash(baseUrl);
+    tokens.updateAuthBaseUrl(this.httpBaseUrl);
   }
   async request(path, body) {
     const needsAuth = !tokens.getAccessToken() && !["login", "logout"].includes(path);
@@ -760,7 +777,8 @@ var WebsocketClient = class extends EventEmitter {
       logging = false,
       logFileType = "SEPARATE",
       maxRetryAttempt = 3,
-      heartbeatInterval = 15e3
+      heartbeatInterval = 15e3,
+      baseUrl = this.wsBaseUrl
     } = params || {};
     this.maxRetryAttempt = maxRetryAttempt;
     this.heartbeatInterval = heartbeatInterval;
@@ -770,6 +788,11 @@ var WebsocketClient = class extends EventEmitter {
       logFileType
     );
     this.logger.logging ||= logging;
+    this.wsBaseUrl = ensureTrailingSlash(baseUrl);
+    const derivedAuthBaseUrl = this.inferAuthBaseUrlFromWs(this.wsBaseUrl);
+    if (derivedAuthBaseUrl) {
+      tokens.updateAuthBaseUrl(derivedAuthBaseUrl);
+    }
     const storedCred = tokens.getCred();
     const c = storedCred.userId ? storedCred : cred;
     if (!c) {
@@ -787,6 +810,19 @@ var WebsocketClient = class extends EventEmitter {
       );
     }
   }
+  inferAuthBaseUrlFromWs(wsBaseUrl) {
+    if (!wsBaseUrl.includes("/NorenWSTP/")) {
+      return null;
+    }
+    let url = wsBaseUrl.replace("/NorenWSTP/", "/NorenWClientTP/");
+    if (url.startsWith("ws://")) {
+      url = "http://" + url.slice(5);
+    }
+    if (url.startsWith("wss://")) {
+      url = "https://" + url.slice(6);
+    }
+    return url;
+  }
   connect() {
     if (this.ws && (this.ws.readyState === this.ws.CONNECTING || this.ws.readyState === this.ws.OPEN))
       return;
@@ -797,23 +833,40 @@ var WebsocketClient = class extends EventEmitter {
     this.ws.on("error", this.wsErrorEvent);
   }
   wsOpenEvent = async () => {
-    if (!tokens.getAccessToken()) {
-      await refreshAccessToken();
+    try {
+      if (!tokens.getAccessToken()) {
+        await refreshAccessToken();
+      }
+      const { userId, accountId } = tokens.getCred();
+      const msg = {
+        t: "c",
+        uid: userId,
+        actid: accountId,
+        source: "API",
+        susertoken: tokens.getAccessToken()
+      };
+      this.send(msg);
+      this.emit("open");
+    } catch (error) {
+      this.logger.log(`Error in wsOpenEvent: ${error.message}`, "ERROR");
+      console.error("Error in wsOpenEvent:", error);
+      this.emit("error", error);
+      this.ws?.close(1011, "Internal Error");
     }
-    const { userId, accountId } = tokens.getCred();
-    const msg = {
-      t: "c",
-      uid: userId,
-      actid: accountId,
-      source: "API",
-      susertoken: tokens.getAccessToken()
-    };
-    this.send(msg);
-    this.emit("open");
   };
   wsMessageEvent = (msg) => {
-    const result = JSON.parse(msg.toString());
-    if (result.t === "ck" && result.s.toLowerCase() === "ok") {
+    let result;
+    try {
+      result = JSON.parse(msg.toString());
+    } catch (error) {
+      this.logger.log(`Error parsing message: ${error.message}`, "ERROR");
+      console.error("Error parsing message:", error);
+      return;
+    }
+    if (!result || typeof result !== "object") {
+      return;
+    }
+    if (result.t === "ck" && result.s?.toLowerCase() === "ok") {
       setTimeout(() => {
         this.logger.log("|WSClient| Connected with Shoonya WS.");
         this.sendHeartbeat(this.heartbeatInterval);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shoonya-sdk",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Wrapper around Shoonya API",
   "main": "dist/index.cjs",
   "module": "dist/index.js",