@n1xyz/nord-ts 0.0.19 → 0.0.21

package/src/nord/api/core.ts

@@ -1,5 +1,4 @@
-import { Account, Info, SubscriptionPattern } from "../../types";
-import { checkedFetch } from "../../utils";
+import { SubscriptionPattern } from "../../types";
 import { NordWebSocketClient } from "../../websocket/index";
 import { NordError } from "../utils/NordError";
 
@@ -19,12 +18,10 @@ import { NordError } from "../utils/NordError";
 export function initWebSocketClient(
   webServerUrl: string,
   subscriptions?: SubscriptionPattern[] | "trades" | "delta" | "account",
-  initialSubscriptions?: SubscriptionPattern[],
 ): NordWebSocketClient {
   try {
     // Determine URL and subscriptions based on parameters
     let wsUrl = webServerUrl.replace(/^http/, "ws") + `/ws`;
-    let wsSubscriptions: SubscriptionPattern[] = [];
 
     // Validate subscriptions parameter
     if (typeof subscriptions === "string") {
@@ -35,12 +32,6 @@ export function initWebSocketClient(
         subscriptions === "account"
       ) {
         wsUrl += `/${subscriptions}`;
-        // If initialSubscriptions provided, use them
-        if (initialSubscriptions && initialSubscriptions.length > 0) {
-          // Validate initialSubscriptions
-          initialSubscriptions.forEach(validateSubscription);
-          wsSubscriptions = initialSubscriptions;
-        }
       } else {
         throw new NordError(
           `Invalid endpoint: ${subscriptions}. Must be "trades", "deltas", or "account".`,
@@ -68,12 +59,6 @@ export function initWebSocketClient(
     // Add connected handler for debugging
     ws.on("connected", () => {
       console.log("Nord WebSocket connected successfully");
-
-      // Subscribe to additional subscriptions if provided
-      // For new format, these are already part of the URL
-      if (wsSubscriptions.length > 0) {
-        ws.subscribe(wsSubscriptions);
-      }
     });
 
     // Connect the WebSocket

package/src/nord/client/Nord.ts

@@ -1,12 +1,16 @@
+import { ProtonClient } from "@n1xyz/proton";
+import { Connection, PublicKey } from "@solana/web3.js";
 import { EventEmitter } from "events";
-import { PublicKey, Connection } from "@solana/web3.js";
 import createClient, { Client, FetchOptions } from "openapi-fetch";
+import * as proto from "../../gen/nord";
+import type { paths } from "../../gen/openapi.ts";
 import {
-  Info,
   Account,
   ActionResponse,
   AggregateMetrics,
+  Info,
   Market,
+  MarketStats,
   NordConfig,
   OrderbookQuery,
   OrderbookResponse,
@@ -15,18 +19,13 @@ import {
   Token,
   TradesResponse,
   User,
-  MarketStats,
 } from "../../types";
-import { ProtonClient } from "@n1xyz/proton";
-import * as proto from "../../gen/nord";
-// import { base64 } from "@scure/base";
+import * as utils from "../../utils";
 import { NordWebSocketClient } from "../../websocket/index";
 import * as core from "../api/core";
 import * as metrics from "../api/metrics";
-import * as utils from "../../utils";
 import { OrderbookSubscription, TradeSubscription } from "../models/Subscriber";
 import { NordError } from "../utils/NordError";
-import type { paths } from "../../gen/openapi.ts";
 
 /**
  * User subscription interface
@@ -427,7 +426,6 @@ export class Nord {
     wsClient.on("delta", handleDelta);
 
     subscription.close = () => {
-      wsClient.unsubscribe([`deltas@${symbol}`]);
       wsClient.removeListener("delta", handleDelta);
       subscription.removeAllListeners();
     };
@@ -471,7 +469,6 @@ export class Nord {
     wsClient.on("trades", handleTrade);
 
     subscription.close = () => {
-      wsClient.unsubscribe([`trades@${symbol}`]);
       wsClient.removeListener("trades", handleTrade);
       subscription.removeAllListeners();
     };
@@ -507,7 +504,6 @@ export class Nord {
     wsClient.on("account", handleAccountUpdate);
 
     subscription.close = () => {
-      wsClient.unsubscribe([`account@${accountId}`]);
       wsClient.removeListener("account", handleAccountUpdate);
       subscription.removeAllListeners();
     };

package/src/types.ts

@@ -251,21 +251,11 @@ export interface ActionNonceResponse {
  * WebSocket message types
  */
 export enum WebSocketMessageType {
-  Subscribe = "subscribe",
-  Unsubscribe = "unsubscribe",
   TradeUpdate = "trades",
   DeltaUpdate = "delta",
   AccountUpdate = "account",
 }
 
-/**
- * WebSocket subscription request
- */
-export interface WebSocketSubscription {
-  e: WebSocketMessageType;
-  streams: string[]; // Array of streams to subscribe/unsubscribe (e.g. ["trades@BTCUSDC", "deltas@BTCUSDC"])
-}
-
 /**
  * WebSocket trade update message
  */
@@ -300,7 +290,6 @@ export interface WebSocketAccountUpdate {
 }
 
 export type WebSocketMessage =
-  | WebSocketSubscription
   | WebSocketTradeUpdate
   | WebSocketDeltaUpdate
   | WebSocketAccountUpdate;

package/src/websocket/NordWebSocketClient.ts

@@ -4,8 +4,6 @@ import {
   WebSocketAccountUpdate,
   WebSocketDeltaUpdate,
   WebSocketMessage,
-  WebSocketMessageType,
-  WebSocketSubscription,
   WebSocketTradeUpdate,
 } from "../types";
 import { NordWebSocketClientEvents } from "./events";
@@ -47,7 +45,6 @@ export class NordWebSocketClient
 {
   private ws: WebSocketInstance | null = null;
   private url: string;
-  private subscriptions: Set<string> = new Set();
   private reconnectAttempts: number = 0;
   private maxReconnectAttempts: number = 5;
   private reconnectDelay: number = 1000;
@@ -174,11 +171,6 @@ export class NordWebSocketClient
           this.emit("connected");
           this.reconnectAttempts = 0;
           this.reconnectDelay = 1000;
-
-          // Resubscribe to previous subscriptions
-          if (this.subscriptions.size > 0) {
-            this.subscribe([...this.subscriptions]);
-          }
         };
 
         (this.ws as BrowserWebSocket).onmessage = (event: { data: any }) => {
@@ -202,13 +194,11 @@ export class NordWebSocketClient
             event && event.reason ? ` Reason: ${event.reason}` : "";
           const code = event && event.code ? ` Code: ${event.code}` : "";
           this.emit("disconnected");
-          console.log(`WebSocket closed.${code}${reason}`);
           this.reconnect();
         };
 
         (this.ws as BrowserWebSocket).onerror = (event: any) => {
           const errorMsg = `WebSocket error: ${event && event.type ? event.type : "unknown"}`;
-          console.error(errorMsg, event);
           this.emit("error", new Error(errorMsg));
         };
       } else {
@@ -221,11 +211,6 @@ export class NordWebSocketClient
           this.reconnectAttempts = 0;
           this.reconnectDelay = 1000;
           this.setupHeartbeat();
-
-          // Resubscribe to previous subscriptions
-          if (this.subscriptions.size > 0) {
-            this.subscribe([...this.subscriptions]);
-          }
         });
 
         nodeWs.on("message", (data: WebSocket.Data) => {
@@ -244,7 +229,6 @@ export class NordWebSocketClient
 
         nodeWs.on("close", (code: number, reason: string) => {
           this.emit("disconnected");
-          console.log(`WebSocket closed. Code: ${code} Reason: ${reason}`);
           if (this.pingInterval) {
             clearInterval(this.pingInterval);
           }
@@ -255,7 +239,6 @@ export class NordWebSocketClient
         });
 
         nodeWs.on("error", (error: Error) => {
-          console.error("WebSocket error:", error);
           this.emit("error", error);
         });
 
@@ -267,105 +250,10 @@ export class NordWebSocketClient
       }
     } catch (error) {
       const errorMsg = `Failed to initialize WebSocket: ${error instanceof Error ? error.message : String(error)}`;
-      console.error(errorMsg);
       this.emit("error", new Error(errorMsg));
     }
   }
 
-  /**
-   * Subscribe to one or more streams
-   * @param streams Array of streams to subscribe to (e.g. ["trades@BTCUSDC", "deltas@BTCUSDC"])
-   */
-  public subscribe(streams: string[]): void {
-    // Validate all streams first
-    try {
-      streams.forEach((stream) => this.validateStream(stream));
-    } catch (error) {
-      this.emit(
-        "error",
-        error instanceof Error ? error : new Error(String(error)),
-      );
-      return;
-    }
-
-    if (
-      !this.ws ||
-      (this.isBrowser
-        ? (this.ws as BrowserWebSocket).readyState !== WS_OPEN
-        : (this.ws as WebSocket).readyState !== WebSocket.OPEN)
-    ) {
-      streams.forEach((stream) => this.subscriptions.add(stream));
-      return;
-    }
-
-    const message: WebSocketSubscription = {
-      e: WebSocketMessageType.Subscribe,
-      streams,
-    };
-
-    try {
-      const messageStr = JSON.stringify(message);
-      if (this.isBrowser) {
-        (this.ws as BrowserWebSocket).send(messageStr);
-      } else {
-        (this.ws as WebSocket).send(messageStr);
-      }
-      streams.forEach((stream) => this.subscriptions.add(stream));
-    } catch (error) {
-      this.emit(
-        "error",
-        error instanceof Error ? error : new Error(String(error)),
-      );
-    }
-  }
-
-  /**
-   * Unsubscribe from one or more streams
-   * @param streams Array of streams to unsubscribe from
-   */
-  public unsubscribe(streams: string[]): void {
-    // Validate all streams first
-    try {
-      streams.forEach((stream) => this.validateStream(stream));
-    } catch (error) {
-      this.emit(
-        "error",
-        error instanceof Error ? error : new Error(String(error)),
-      );
-      return;
-    }
-
-    if (
-      !this.ws ||
-      (this.isBrowser
-        ? (this.ws as BrowserWebSocket).readyState !== WS_OPEN
-        : (this.ws as WebSocket).readyState !== WebSocket.OPEN)
-    ) {
-      streams.forEach((stream) => this.subscriptions.delete(stream));
-      return;
-    }
-
-    const message: WebSocketSubscription = {
-      e: WebSocketMessageType.Unsubscribe,
-      streams,
-    };
-
-    try {
-      const messageStr = JSON.stringify(message);
-      if (this.isBrowser) {
-        (this.ws as BrowserWebSocket).send(messageStr);
-      } else {
-        (this.ws as WebSocket).send(messageStr);
-      }
-      streams.forEach((stream) => this.subscriptions.delete(stream));
-    } catch (error) {
-      this.emit(
-        "error",
-        error instanceof Error ? error : new Error(String(error)),
-      );
-    }
-  }
-
   /**
    * Close the WebSocket connection
    */
@@ -386,7 +274,6 @@ export class NordWebSocketClient
       clearTimeout(this.pingTimeout);
       this.pingTimeout = null;
     }
-    this.subscriptions.clear();
   }
 
   /**

package/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(rg:*)",
-      "Bash(grep:*)",
-      "Bash(npm run build:*)",
-      "Bash(bun run:*)"
-    ],
-    "deny": []
-  }
-}

package/.local/qa.ts

@@ -1,77 +0,0 @@
-// quick script i use to qa sdk against deployed instance. this
-// will no longer be needed once we have proper integration tests.
-
-import { Nord, NordUser } from "../src";
-
-const nord = await Nord.initNord({
-  bridgeVk: "rbrpQMMPaVLSG3hTPZj2GLKxGLbPM2q7gDxc7BTync6",
-  initWebSockets: false,
-  solanaUrl: "https://api.devnet.solana.com",
-  webServerUrl: "https://zo-devnet-rc.n1.xyz",
-});
-
-const poky = await nord.getUser({
-  pubkey: "GSPX6qX4bs8oTU3n5A1Xx8q9MPiGFyxWhMtuVvpZNK52",
-});
-
-console.log("user", poky);
-
-if (!poky) {
-  throw new Error("No user found");
-}
-
-console.log("account", await nord.getAccount(poky.accountIds[0]));
-console.log("timestamp", await nord.getTimestamp());
-console.log("actionNonce", await nord.getActionNonce());
-console.log("lastActionId", await nord.getLastActionId());
-console.log("info", await nord.getInfo());
-
-console.log(
-  "marketStats",
-  await nord.getMarketStats({
-    marketId: 1,
-  }),
-);
-
-console.log(
-  "orderbook",
-  await nord.getOrderbook({
-    market_id: 1,
-  }),
-);
-
-const since = new Date();
-since.setMinutes(0);
-
-console.log(
-  "trades",
-  await nord.getTrades({
-    takerId: poky.accountIds[0],
-    sinceRcf3339: since.toISOString(),
-    untilRfc3339: new Date().toISOString(),
-    pageId: "0",
-  }),
-);
-
-console.log(
-  "recentActions",
-  await nord.queryRecentActions({
-    from: 6,
-    to: 6,
-  }),
-);
-
-console.log("action", await nord.queryAction({ action_id: 0 }));
-console.log("action", await nord.queryAction({ action_id: 1 }));
-console.log("action", await nord.queryAction({ action_id: 2 }));
-console.log("action", await nord.queryAction({ action_id: 5 }));
-console.log("action", await nord.queryAction({ action_id: 100 }));
-
-const user = NordUser.fromPrivateKey(
-  nord,
-  new Uint8Array(JSON.parse(process.env.PRIVATE_KEY!)),
-);
-
-console.log("deposit", await user.deposit({ amount: 2.0, tokenId: 0 }));
-await user.refreshSession();
-console.log("withdraw", await user.withdraw({ amount: 2.0, tokenId: 0 }));

package/.local/test-atomic.ts

@@ -1,112 +0,0 @@
-import { NordWebSocketClient } from "../src/websocket/NordWebSocketClient";
-
-/**
- * All event types that we track in the counters object. Keeping this
- * union type explicit lets TypeScript validate that we use the same
- * keys everywhere and prevents typos.
- */
-export type CounterKeys =
-  | "trade"
-  | "delta"
-  | "account"
-  | "error"
-  | "disconnected";
-
-interface Endpoint {
-  /** WebSocket endpoint URL */
-  url: string;
-  /** Streams we want to subscribe to once connected (can be empty) */
-  streams: string[];
-}
-
-/**
- * Web‑socket endpoints to test.  Keep this list short & focused so the smoke
- * test finishes quickly inside CI.
- */
-const endpoints: Endpoint[] = [
-  //   {
-  //     url: "wss://staging.n1.xyz/ws/",
-  //     streams: [], // no runtime subscribe call needed
-  //   },
-
-  // {
-  //   url: `wss://staging.n1.xyz/ws/account@${process.env.NORD_ACCOUNT_ID ?? "3"}`,
-  //   streams: [],
-  // },
-
-  {
-    url: `wss://zo-devnet-rc.n1.xyz/ws/trades@ETHPERP`,
-    streams: ["trades@ETHPERP"],
-  },
-];
-
-/** How long each endpoint should be observed for (default: 15 s) */
-// const TEST_DURATION_MS = Number(process.env.TEST_DURATION_MS ?? 15_000);
-const TEST_DURATION_MS = 15_000;
-
-/**
- * Simple message counters for every event type the client can emit.
- * This is mutated by the event handlers during the test run.
- */
-const counters: Record<CounterKeys, number> = {
-  trade: 0,
-  delta: 0,
-  account: 0,
-  error: 0,
-  disconnected: 0,
-};
-
-/**
- * Connect to a single endpoint, wait for activity, then verify we received the
- * expected events.
- */
-async function smokeTest(endpoint: Endpoint): Promise<void> {
-  console.log(`🛰️  Connecting to ${endpoint.url} …`);
-  const client = new NordWebSocketClient(endpoint.url);
-  client.connect();
-
-  client.on("connected", () => {
-    console.log("✅ connected");
-  });
-
-  client.on("disconnected", () => {
-    console.log("⚠️  disconnected");
-    counters.disconnected++;
-  });
-
-  client.on("error", (err: unknown) => {
-    console.error("❌ error:", err);
-    counters.error++;
-  });
-
-  client.on("trades", (m) => {
-    console.log({ m });
-    counters.trade++;
-  });
-  client.on("deltas", (m) => {
-    console.log({ m });
-    counters.delta++;
-  });
-  client.on("accounts", (m) => {
-    console.log({ m });
-    counters.account++;
-  });
-
-  // Wait a bit, then close and report
-  await new Promise((resolve) => setTimeout(resolve, TEST_DURATION_MS));
-  client.close();
-}
-
-(async () => {
-  try {
-    for (const ep of endpoints) {
-      await smokeTest(ep);
-    }
-    console.log("\n🎉 All websocket endpoints responded as expected:");
-    console.table(counters);
-  } catch (e) {
-    console.error("\n🔴 Smoke test failed:", (e as Error).message);
-    console.table(counters);
-    process.exitCode = 1;
-  }
-})();

package/.prettierignore

@@ -1,2 +0,0 @@
-src/gen/*
-src/idl/*.json

package/check.sh

@@ -1,4 +0,0 @@
-npm install
-npm build
-npm run test
-npm run ci

package/default.nix

@@ -1,47 +0,0 @@
-{ inputs, ... }:
-{
-  perSystem =
-    {
-      pkgs,
-      self',
-      system,
-      ...
-    }:
-    {
-      packages = {
-        nord-ts-proto =
-          let
-            ts-proto = inputs.n1.packages.${system}.ts-proto;
-          in
-          pkgs.writeShellApplication {
-            name = "nord-ts-proto";
-            runtimeInputs = [ pkgs.protobuf ];
-            text = ''
-              if [ $# -ne 2 ]; then
-                echo >&2 "usage: $(basename "$0") <proto-file> <out-dir>"
-                exit 1
-              fi
-              readonly PROTO_FILE="$1"
-              readonly OUT_DIR="$2"
-              protoc \
-                --plugin="${ts-proto}/bin/protoc-gen-ts_proto" \
-                --ts_proto_opt=forceLong=bigint \
-                --ts_proto_opt=esModuleInterop=true \
-                --ts_proto_opt=oneof=unions-value \
-                --ts_proto_opt=unrecognizedEnum=false \
-                --ts_proto_out="$OUT_DIR" \
-                --proto_path="$(dirname "$PROTO_FILE")" \
-                "$PROTO_FILE"
-            '';
-          };
-        nord-ts-check = pkgs.writeShellApplication {
-          name = "ts-check";
-          runtimeInputs = [
-            pkgs.protobuf
-            pkgs.pnpm
-          ];
-          text = builtins.readFile ./check.sh;
-        };
-      };
-    };
-}

package/eslint.config.mjs

@@ -1,66 +0,0 @@
-import typescriptEslint from "@typescript-eslint/eslint-plugin";
-import globals from "globals";
-import tsParser from "@typescript-eslint/parser";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-  baseDirectory: __dirname,
-  recommendedConfig: js.configs.recommended,
-  allConfig: js.configs.all,
-});
-
-export default [
-  {
-    ignores: [
-      "**/dist",
-      "**/node_modules",
-      "**/.git",
-      "**/docs",
-      "src/gen/*",
-      "*.mjs",
-      "*.js",
-    ],
-  },
-  ...compat.extends(
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-  ),
-  {
-    plugins: {
-      "@typescript-eslint": typescriptEslint,
-    },
-
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-      },
-
-      parser: tsParser,
-      ecmaVersion: "latest",
-      sourceType: "module",
-
-      parserOptions: {
-        project: ["./tsconfig.json", "./tsconfig.eslint.json"],
-        tsconfigRootDir: ".",
-      },
-    },
-
-    rules: {
-      "@typescript-eslint/no-explicit-any": "off",
-
-      "@typescript-eslint/no-unused-vars": [
-        "warn",
-        {
-          argsIgnorePattern: "^_",
-          varsIgnorePattern: "^_",
-        },
-      ],
-    },
-  },
-];