@n1xyz/nord-ts 0.0.4 → 0.0.5

package/src/nord/client/Nord.ts

@@ -1,4 +1,4 @@
-import { EventEmitter } from 'events';
+import { EventEmitter } from "events";
 import {
   Account,
   ActionQuery,
@@ -23,14 +23,14 @@ import {
   TradesResponse,
   UserAccountIdsQuery,
   UserAccountIdsResponse,
-} from '../../types';
-import { NordWebSocketClient } from '../../websocket/index';
-import * as core from '../api/core';
-import * as market from '../api/market';
-import * as metrics from '../api/metrics';
-import * as queries from '../api/queries';
-import { OrderbookSubscription, TradeSubscription } from '../models/Subscriber';
-import { NordError } from '../utils/NordError';
+} from "../../types";
+import { NordWebSocketClient } from "../../websocket/index";
+import * as core from "../api/core";
+import * as market from "../api/market";
+import * as metrics from "../api/metrics";
+import * as queries from "../api/queries";
+import { OrderbookSubscription, TradeSubscription } from "../models/Subscriber";
+import { NordError } from "../utils/NordError";
 
 /**
  * User subscription interface
@@ -112,15 +112,15 @@ export class Nord {
     deltasSubscriptions,
   }: NordConfig) {
     if (!webServerUrl) {
-      throw new NordError('webServerUrl is required');
+      throw new NordError("webServerUrl is required");
     }
 
     if (!solanaProgramId) {
-      throw new NordError('solanaProgramId is required');
+      throw new NordError("solanaProgramId is required");
     }
 
     if (!solanaUrl) {
-      throw new NordError('solanaUrl is required');
+      throw new NordError("solanaUrl is required");
     }
 
     this.webServerUrl = webServerUrl;
@@ -160,12 +160,12 @@ export class Nord {
     // Initialize WebSocket clients for each endpoint with subscriptions
     this.tradesWs = core.initWebSocketClient(
       this.webServerUrl,
-      'trades',
+      "trades",
       trades,
     );
     this.deltasWs = core.initWebSocketClient(
       this.webServerUrl,
-      'deltas',
+      "deltas",
       deltas,
     );
   }
@@ -207,7 +207,7 @@ export class Nord {
         this.symbolToMarketId.set(market.symbol, market.marketId);
       });
     } catch (error) {
-      throw new NordError('Failed to fetch Nord info', { cause: error });
+      throw new NordError("Failed to fetch Nord info", { cause: error });
     }
   }
 
@@ -320,7 +320,7 @@ export class Nord {
    * @returns Current TPS value
    * @throws {NordError} If the request fails
    */
-  async getCurrentTps(period: string = '1m') {
+  async getCurrentTps(period: string = "1m") {
     return metrics.getCurrentTps(this.webServerUrl, period);
   }
 
@@ -331,7 +331,7 @@ export class Nord {
    * @returns Peak TPS value
    * @throws {NordError} If the request fails
    */
-  async getPeakTps(period: string = '24h') {
+  async getPeakTps(period: string = "24h") {
     return metrics.getPeakTps(this.webServerUrl, period);
   }
 
@@ -342,7 +342,7 @@ export class Nord {
    * @returns Median latency in milliseconds
    * @throws {NordError} If the request fails
    */
-  async getMedianLatency(period: string = '1m') {
+  async getMedianLatency(period: string = "1m") {
     return metrics.getMedianLatency(this.webServerUrl, period);
   }
 
@@ -461,7 +461,7 @@ export class Nord {
   public getUserWebSocketClient(): NordWebSocketClient {
     if (!this.userWs) {
       // Initialize user WebSocket client on demand
-      this.userWs = core.initWebSocketClient(this.webServerUrl, 'user');
+      this.userWs = core.initWebSocketClient(this.webServerUrl, "user");
       return this.userWs;
     }
     return this.userWs;
@@ -485,7 +485,7 @@ export class Nord {
         return;
       }
 
-      subscription.emit('message', update);
+      subscription.emit("message", update);
     };
 
     // Initialize deltas websocket if it doesn't exist
@@ -493,12 +493,12 @@ export class Nord {
       this.initializeWebSockets();
     }
 
-    this.deltasWs!.on('delta', handleDelta);
+    this.deltasWs!.on("delta", handleDelta);
     this.deltasWs!.subscribe([`deltas@${symbol}`]);
 
     subscription.close = () => {
       this.deltasWs!.unsubscribe([`deltas@${symbol}`]);
-      this.deltasWs!.removeListener('delta', handleDelta);
+      this.deltasWs!.removeListener("delta", handleDelta);
       subscription.removeAllListeners();
     };
 
@@ -527,7 +527,7 @@ export class Nord {
         return;
       }
 
-      subscription.emit('message', update);
+      subscription.emit("message", update);
     };
 
     // Initialize trades websocket if it doesn't exist
@@ -535,12 +535,12 @@ export class Nord {
       this.initializeWebSockets();
     }
 
-    this.tradesWs!.on('trade', handleTrade);
+    this.tradesWs!.on("trade", handleTrade);
     this.tradesWs!.subscribe([`trades@${symbol}`]);
 
     subscription.close = () => {
       this.tradesWs!.unsubscribe([`trades@${symbol}`]);
-      this.tradesWs!.removeListener('trade', handleTrade);
+      this.tradesWs!.removeListener("trade", handleTrade);
       subscription.removeAllListeners();
     };
 
@@ -598,7 +598,7 @@ export class Nord {
 
     // Ensure market_id is provided
     if (query.market_id === undefined) {
-      throw new NordError('market_id is required for orderbook query');
+      throw new NordError("market_id is required for orderbook query");
     }
 
     return market.getOrderbook(this.webServerUrl, query);
@@ -645,7 +645,7 @@ export class Nord {
     try {
       await market.getUserAccountIds(this.webServerUrl, { pubkey: address });
       return true;
-    } catch (error) {
+    } catch {
       return false;
     }
   }

package/src/nord/client/NordUser.ts

@@ -1,16 +1,16 @@
-import * as anchor from '@coral-xyz/anchor';
+import * as anchor from "@coral-xyz/anchor";
 import {
   ASSOCIATED_TOKEN_PROGRAM_ID,
   getAssociatedTokenAddress,
   TOKEN_2022_PROGRAM_ID,
-} from '@solana/spl-token';
-import { Connection, Keypair, PublicKey, Transaction } from '@solana/web3.js';
-import Decimal from 'decimal.js';
-import * as nacl from 'tweetnacl';
-import { SolanaBridgeClient } from '../../bridge/client';
-import { SPLTokenInfo } from '../../bridge/types';
-import { keypairFromPrivateKey } from '../../bridge/utils';
-import { FillMode, Order, Side } from '../../types';
+} from "@solana/spl-token";
+import { Connection, Keypair, PublicKey, Transaction } from "@solana/web3.js";
+import Decimal from "decimal.js";
+import * as nacl from "tweetnacl";
+import { SolanaBridgeClient } from "../../bridge/client";
+import { SPLTokenInfo } from "../../bridge/types";
+import { keypairFromPrivateKey } from "../../bridge/utils";
+import { FillMode, Order, Side } from "../../types";
 import {
   BigIntValue,
   checkedFetch,
@@ -18,7 +18,7 @@ import {
   findToken,
   optExpect,
   toBN as utilsToBN,
-} from '../../utils';
+} from "../../utils";
 import {
   cancelOrder,
   createSession,
@@ -26,9 +26,9 @@ import {
   revokeSession,
   transfer,
   withdraw,
-} from '../api/actions';
-import { NordError } from '../utils/NordError';
-import { Nord } from './Nord';
+} from "../api/actions";
+import { NordError } from "../utils/NordError";
+import { Nord } from "./Nord";
 
 /**
  * Parameters for creating a NordUser instance
@@ -218,19 +218,19 @@ export class NordUser {
    */
   constructor(params: NordUserParams) {
     if (!params.nord) {
-      throw new NordError('Nord instance is required');
+      throw new NordError("Nord instance is required");
     }
     if (!params.address) {
-      throw new NordError('Address is required');
+      throw new NordError("Address is required");
     }
     if (!params.walletSignFn) {
-      throw new NordError('Wallet sign function is required');
+      throw new NordError("Wallet sign function is required");
     }
     if (!params.sessionSignFn) {
-      throw new NordError('Session sign function is required');
+      throw new NordError("Session sign function is required");
     }
     if (!params.sessionPubKey) {
-      throw new NordError('Session public key is required');
+      throw new NordError("Session public key is required");
     }
 
     this.nord = params.nord;
@@ -243,7 +243,7 @@ export class NordUser {
     this.connection =
       params.connection ||
       new Connection(params.nord.solanaUrl, {
-        commitment: 'confirmed',
+        commitment: "confirmed",
       });
 
     // Set sessionId if provided
@@ -255,7 +255,7 @@ export class NordUser {
     try {
       this.initBridgeClient();
     } catch (error) {
-      console.warn('Failed to initialize bridge client:', error);
+      console.warn("Failed to initialize bridge client:", error);
     }
 
     // Convert tokens from info endpoint to SPLTokenInfo
@@ -314,7 +314,7 @@ export class NordUser {
       !this.nord.solanaProgramId
     ) {
       throw new NordError(
-        'Solana public key, connection, and program ID are required to initialize bridge client',
+        "Solana public key, connection, and program ID are required to initialize bridge client",
       );
     }
 
@@ -322,14 +322,12 @@ export class NordUser {
     const wallet: anchor.Wallet = {
       publicKey: this.getSolanaPublicKey(),
       signTransaction: async (tx: any) => {
-        await this.transactionSignFn(tx);
-        return tx;
+        return await this.transactionSignFn(tx);
       },
       signAllTransactions: async (txs: any[]) => {
         return Promise.all(
           txs.map(async (tx) => {
-            await this.transactionSignFn(tx);
-            return tx;
+            return await this.transactionSignFn(tx);
           }),
         );
       },
@@ -345,7 +343,7 @@ export class NordUser {
       {
         rpcUrl: this.connection.rpcEndpoint,
         programId: this.nord.solanaProgramId,
-        commitment: 'confirmed',
+        commitment: "confirmed",
         tokenInfos: this.splTokenInfos,
       },
       wallet,
@@ -375,7 +373,7 @@ export class NordUser {
         message: Uint8Array | string,
       ): Promise<Uint8Array> => {
         const messageBuffer =
-          typeof message === 'string'
+          typeof message === "string"
             ? Buffer.from(message)
             : Buffer.from(message);
 
@@ -401,7 +399,7 @@ export class NordUser {
         }
 
         // For other transaction types, would need specific implementation
-        throw new NordError('Unsupported transaction type for signing');
+        throw new NordError("Unsupported transaction type for signing");
       };
 
       return new NordUser({
@@ -415,7 +413,7 @@ export class NordUser {
         sessionPubKey: publicKey.toBytes(), // Use the public key derived from the private key as the session public key
       });
     } catch (error) {
-      throw new NordError('Failed to create NordUser from private key', {
+      throw new NordError("Failed to create NordUser from private key", {
         cause: error,
       });
     }
@@ -431,7 +429,7 @@ export class NordUser {
   async getAssociatedTokenAccount(mint: PublicKey): Promise<PublicKey> {
     if (!this.getSolanaPublicKey()) {
       throw new NordError(
-        'Solana public key is required to get associated token account',
+        "Solana public key is required to get associated token account",
       );
     }
 
@@ -444,7 +442,7 @@ export class NordUser {
         ASSOCIATED_TOKEN_PROGRAM_ID,
       );
     } catch (error) {
-      throw new NordError('Failed to get associated token account', {
+      throw new NordError("Failed to get associated token account", {
         cause: error,
       });
     }
@@ -461,7 +459,7 @@ export class NordUser {
   async depositSpl(amount: number, tokenId: number): Promise<string> {
     if (!this.bridgeClient || !this.getSolanaPublicKey() || !this.connection) {
       throw new NordError(
-        'Bridge client, Solana public key, and connection are required for deposit',
+        "Bridge client, Solana public key, and connection are required for deposit",
       );
     }
 
@@ -513,7 +511,7 @@ export class NordUser {
   async withdrawSpl(claim: any): Promise<string> {
     if (!this.bridgeClient || !this.getSolanaPublicKey() || !this.connection) {
       throw new NordError(
-        'Bridge client, Solana public key, and connection are required for withdrawal',
+        "Bridge client, Solana public key, and connection are required for withdrawal",
       );
     }
 
@@ -546,9 +544,7 @@ export class NordUser {
         secretKey: new Uint8Array(64), // Dummy secret key, not actually used
         sign: async (tx: Transaction) => {
           const message = tx.serializeMessage();
-          const signature = await this.walletSignFn(message);
-          // todo: fixxxxx
-          // tx.addSignature(this.getSolanaPublicKey()!, signature);
+          await this.walletSignFn(message);
           return tx;
         },
       };
@@ -563,7 +559,7 @@ export class NordUser {
         transactionSigner as unknown as Keypair, // Type cast to satisfy the API
       );
     } catch (error) {
-      throw new NordError('Failed to withdraw SPL tokens', { cause: error });
+      throw new NordError("Failed to withdraw SPL tokens", { cause: error });
     }
   }
 
@@ -584,7 +580,7 @@ export class NordUser {
   async updateAccountId(): Promise<void> {
     try {
       if (!this.publicKey) {
-        throw new NordError('Public key is required to update account ID');
+        throw new NordError("Public key is required to update account ID");
       }
 
       const resp = await this.nord.getUserAccountIds({
@@ -593,7 +589,7 @@ export class NordUser {
 
       this.accountIds = resp.accountIds;
     } catch (error) {
-      throw new NordError('Failed to update account ID', { cause: error });
+      throw new NordError("Failed to update account ID", { cause: error });
     }
   }
 
@@ -608,7 +604,7 @@ export class NordUser {
       size: number;
       price: number;
       marketId: number;
-      side: 'ask' | 'bid';
+      side: "ask" | "bid";
       originalOrderSize?: number;
       clientOrderId?: number | null;
     }
@@ -691,7 +687,7 @@ export class NordUser {
           }) => {
             return {
               orderId: order.orderId,
-              isLong: order.side === 'bid',
+              isLong: order.side === "bid",
               size: order.size,
               price: order.price,
               marketId: order.marketId,
@@ -758,7 +754,7 @@ export class NordUser {
   private checkSessionValidity(): void {
     if (this.sessionId === undefined || this.sessionId === BigInt(0)) {
       throw new NordError(
-        'Invalid or empty session ID. Please create or refresh your session.',
+        "Invalid or empty session ID. Please create or refresh your session.",
       );
     }
   }
@@ -780,7 +776,7 @@ export class NordUser {
         this.getNonce(),
         {
           sizeDecimals: findToken(this.nord.tokens, tokenId).decimals,
-          sessionId: optExpect(this.sessionId, 'No session'),
+          sessionId: optExpect(this.sessionId, "No session"),
           tokenId: tokenId,
           amount,
         },
@@ -814,7 +810,7 @@ export class NordUser {
         await this.nord.getTimestamp(),
         this.getNonce(),
         {
-          sessionId: optExpect(this.sessionId, 'No session'),
+          sessionId: optExpect(this.sessionId, "No session"),
           senderId: params.accountId,
           sizeDecimals: market.sizeDecimals,
           priceDecimals: market.priceDecimals,
@@ -828,7 +824,7 @@ export class NordUser {
         },
       );
     } catch (error) {
-      throw new NordError('Failed to place order', { cause: error });
+      throw new NordError("Failed to place order", { cause: error });
     }
   }
 
@@ -844,7 +840,7 @@ export class NordUser {
     orderId: BigIntValue,
     providedAccountId?: number,
   ): Promise<bigint> {
-    let accountId =
+    const accountId =
       providedAccountId != null ? providedAccountId : this.accountIds?.[0];
     try {
       this.checkSessionValidity();
@@ -854,7 +850,7 @@ export class NordUser {
         await this.nord.getTimestamp(),
         this.getNonce(),
         {
-          sessionId: optExpect(this.sessionId, 'No session'),
+          sessionId: optExpect(this.sessionId, "No session"),
           senderId: accountId,
           orderId,
         },
@@ -883,16 +879,16 @@ export class NordUser {
         await this.nord.getTimestamp(),
         this.getNonce(),
         {
-          sessionId: optExpect(this.sessionId, 'No session'),
-          fromAccountId: optExpect(params.fromAccountId, 'No source account'),
-          toAccountId: optExpect(params.toAccountId, 'No target account'),
+          sessionId: optExpect(this.sessionId, "No session"),
+          fromAccountId: optExpect(params.fromAccountId, "No source account"),
+          toAccountId: optExpect(params.toAccountId, "No target account"),
           tokenId: params.tokenId,
           tokenDecimals: token.decimals,
           amount: params.amount,
         },
       );
     } catch (error) {
-      throw new NordError('Failed to transfer tokens', { cause: error });
+      throw new NordError("Failed to transfer tokens", { cause: error });
     }
   }
 
@@ -921,16 +917,16 @@ export class NordUser {
         to: newUser,
         tokenId: params.tokenId,
         amount: params.amount,
-        fromAccountId: optExpect(this.accountIds?.[0], 'No account ID'),
+        fromAccountId: optExpect(this.accountIds?.[0], "No account ID"),
         toAccountId: optExpect(
           newUser.accountIds?.[0],
-          'No account ID for new user',
+          "No account ID for new user",
         ),
       });
 
       return newUser;
     } catch (error) {
-      throw new NordError('Failed to create account', { cause: error });
+      throw new NordError("Failed to create account", { cause: error });
     }
   }
 
@@ -961,9 +957,9 @@ export class NordUser {
         // Check if error is rate limiting related
         const isRateLimitError =
           error instanceof Error &&
-          (error.message.includes('rate limit') ||
-            error.message.includes('429') ||
-            error.message.includes('too many requests'));
+          (error.message.includes("rate limit") ||
+            error.message.includes("429") ||
+            error.message.includes("too many requests"));
 
         if (!isRateLimitError) {
           throw error;
@@ -1007,7 +1003,7 @@ export class NordUser {
 
     if (!this.connection || !this.getSolanaPublicKey()) {
       throw new NordError(
-        'Connection and Solana public key are required to get Solana balances',
+        "Connection and Solana public key are required to get Solana balances",
       );
     }
 
@@ -1020,9 +1016,9 @@ export class NordUser {
         () => this.connection!.getBalance(this.getSolanaPublicKey()),
         maxRetries,
       );
-      balances['SOL'] = solBalance / 1e9; // Convert lamports to SOL
+      balances["SOL"] = solBalance / 1e9; // Convert lamports to SOL
       if (includeTokenAccounts) {
-        tokenAccounts['SOL'] = this.getSolanaPublicKey().toString();
+        tokenAccounts["SOL"] = this.getSolanaPublicKey().toString();
       }
 
       // Get SPL token balances using mintAddr from Nord tokens
@@ -1060,7 +1056,7 @@ export class NordUser {
                 if (balance > 0 || includeZeroBalances) {
                   balances[token.symbol] = balance;
                 }
-              } catch (error) {
+              } catch {
                 // Token account might not exist yet, set balance to 0
                 if (includeZeroBalances) {
                   balances[token.symbol] = 0;
@@ -1084,7 +1080,7 @@ export class NordUser {
 
       return includeTokenAccounts ? { balances, tokenAccounts } : { balances };
     } catch (error) {
-      throw new NordError('Failed to get Solana token balances', {
+      throw new NordError("Failed to get Solana token balances", {
         cause: error,
       });
     }
@@ -1099,7 +1095,7 @@ export class NordUser {
     try {
       return new PublicKey(this.address);
     } catch (error) {
-      throw new NordError('Invalid Solana address', { cause: error });
+      throw new NordError("Invalid Solana address", { cause: error });
     }
   }
 }

package/src/nord/index.ts

@@ -1,16 +1,16 @@
 // Export main client classes
-export { Nord } from './client/Nord';
-export { NordUser } from './client/NordUser';
+export { Nord } from "./client/Nord";
+export { NordUser } from "./client/NordUser";
 
 // Export utility classes
-export { NordError } from './utils/NordError';
+export { NordError } from "./utils/NordError";
 
 // Export API modules
-export * from './api/core';
-export * from './api/metrics';
-export * from './api/queries';
-export * from './api/market';
-export * from './api/actions';
+export * from "./api/core";
+export * from "./api/metrics";
+export * from "./api/queries";
+export * from "./api/market";
+export * from "./api/actions";
 
 // Export models
-export * from './models/Subscriber';
+export * from "./models/Subscriber";

package/src/nord/models/Subscriber.ts

@@ -1,14 +1,13 @@
-import WebSocket from 'ws';
-import { EventEmitter } from 'events';
+import { EventEmitter } from "events";
 import {
-  DeltaEvent,
-  Trades,
   Account,
-  SubscriberConfig,
+  DeltaEvent,
   OrderbookResponse,
+  SubscriberConfig,
   Trade,
-} from '../../types';
-import { MAX_BUFFER_LEN } from '../../utils';
+  Trades,
+} from "../../types";
+import { MAX_BUFFER_LEN } from "../../utils";
 
 /**
  * Subscriber class for handling WebSocket subscriptions
@@ -32,7 +31,7 @@ export class Subscriber {
    * Subscribe to WebSocket events
    */
   subscribe(): void {
-    const ws = new WebSocket(this.streamURL);
+    // TODO: Implement subscription logic
   }
 }
 
@@ -40,8 +39,8 @@ export class Subscriber {
  * Interface for orderbook subscription
  */
 export interface OrderbookSubscription extends EventEmitter {
-  on(event: 'message', listener: (data: OrderbookResponse) => void): this;
-  on(event: 'error', listener: (error: Error) => void): this;
+  on(event: "message", listener: (data: OrderbookResponse) => void): this;
+  on(event: "error", listener: (error: Error) => void): this;
   close(): void;
   removeAllListeners(event?: string): this;
 }
@@ -50,8 +49,8 @@ export interface OrderbookSubscription extends EventEmitter {
  * Interface for trade subscription
  */
 export interface TradeSubscription extends EventEmitter {
-  on(event: 'message', listener: (data: Trade[]) => void): this;
-  on(event: 'error', listener: (error: Error) => void): this;
+  on(event: "message", listener: (data: Trade[]) => void): this;
+  on(event: "error", listener: (error: Error) => void): this;
   close(): void;
   removeAllListeners(event?: string): this;
 }

package/src/nord/utils/NordError.ts

@@ -34,7 +34,7 @@ export class NordError extends Error {
   constructor(message: string, options: NordErrorOptions = {}) {
     super(message);
 
-    this.name = 'NordError';
+    this.name = "NordError";
     this.cause = options.cause;
     this.statusCode = options.statusCode;
     this.details = options.details;
@@ -47,7 +47,7 @@ export class NordError extends Error {
     // Handle nested errors
     if (this.cause instanceof Error) {
       this.stack =
-        this.stack + '\nCaused by: ' + (this.cause.stack || this.cause.message);
+        this.stack + "\nCaused by: " + (this.cause.stack || this.cause.message);
     }
   }