pmxt-core 2.44.5 → 2.45.0

package/dist/server/ws-handler.js

@@ -4,6 +4,7 @@ exports.createWebSocketHandler = createWebSocketHandler;
 const ws_1 = require("ws");
 const errors_1 = require("../errors");
 const exchange_factory_1 = require("./exchange-factory");
+const feed_factory_1 = require("./feed-factory");
 const logger_1 = require("../utils/logger");
 // ---------------------------------------------------------------------------
 // Streaming methods
@@ -14,6 +15,10 @@ const WATCH_METHODS = new Set([
     "watchOrderBooks",
     "watchTrades",
 ]);
+/** Data-feed methods that produce streaming data. */
+const FEED_WATCH_METHODS = new Set([
+    "watchTicker",
+]);
 /** Methods for unsubscribing. */
 const UNWATCH_METHODS = {
     unwatchOrderBook: "watchOrderBook",
@@ -30,7 +35,10 @@ function sendError(ws, id, message, code) {
  * Build a unique key for a subscription so we can cancel it.
  */
 function subscriptionKey(msg) {
-    return `${msg.exchange}:${msg.method}:${JSON.stringify(msg.args)}`;
+    const target = msg.targetKind === "feed"
+        ? `feed:${msg.feed}`
+        : `exchange:${msg.exchange}`;
+    return `${target}:${msg.method}:${JSON.stringify(msg.args)}`;
 }
 /**
  * Start a streaming loop for a single-ticker watch method
@@ -101,6 +109,78 @@ async function streamBatch(exchange, method, args, id, ws, signal) {
         }
     }
 }
+/**
+ * Start a streaming loop for feed watch methods.
+ *
+ * Data feeds expose callback-driven watch methods rather than the exchange
+ * layer's await-next-update methods, so lifecycle is tied to the returned
+ * unsubscribe callback and the client's AbortSignal.
+ */
+async function streamFeedSingle(feed, feedName, method, args, id, ws, signal) {
+    const symbol = typeof args[0] === "string" ? args[0] : String(args[0] ?? "");
+    let unsubscribe;
+    let settled = false;
+    let resolveDone = () => { };
+    const done = new Promise((resolve) => {
+        resolveDone = resolve;
+    });
+    const cleanup = () => {
+        if (settled)
+            return;
+        settled = true;
+        signal.removeEventListener("abort", cleanup);
+        ws.removeListener("close", cleanup);
+        if (unsubscribe) {
+            try {
+                unsubscribe();
+            }
+            catch (err) {
+                logger_1.logger.warn('ws-handler: feed unsubscribe failed', {
+                    feed: feedName,
+                    method,
+                    id,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            }
+        }
+        resolveDone();
+    };
+    signal.addEventListener("abort", cleanup, { once: true });
+    ws.once("close", cleanup);
+    try {
+        if (typeof feed.connect === "function") {
+            await feed.connect();
+        }
+        if (signal.aborted || ws.readyState !== ws_1.WebSocket.OPEN) {
+            cleanup();
+            return;
+        }
+        if (method !== "watchTicker" || typeof feed.watchTicker !== "function") {
+            sendError(ws, id, `Method '${method}' not found on ${feedName}`);
+            cleanup();
+            return;
+        }
+        unsubscribe = feed.watchTicker(symbol, (data) => {
+            if (!signal.aborted && ws.readyState === ws_1.WebSocket.OPEN) {
+                send(ws, { id, event: "data", method, symbol, source: feedName, data });
+            }
+        });
+        send(ws, { event: "subscribed", id });
+        await done;
+    }
+    catch (err) {
+        if (!signal.aborted) {
+            const message = err instanceof errors_1.BaseError
+                ? err.message
+                : err instanceof Error
+                    ? err.message
+                    : "Unknown streaming error";
+            const code = err instanceof errors_1.BaseError ? err.code : undefined;
+            sendError(ws, id, message, code);
+        }
+        cleanup();
+    }
+}
 // ---------------------------------------------------------------------------
 // Public API
 // ---------------------------------------------------------------------------
@@ -158,32 +238,75 @@ function createWebSocketHandler(options = {}) {
             const id = parsed.id;
             const action = parsed.action;
             const exchange = parsed.exchange;
+            const feed = parsed.feed;
             const method = parsed.method;
-            if (!id || !action || !exchange || !method) {
-                sendError(ws, id, "Missing required fields: id, action, exchange, method");
+            if (!id || !action) {
+                sendError(ws, id, "Missing required fields: id, action");
+                return;
+            }
+            if (action === "unsubscribe" && !method && !exchange && !feed) {
+                handleUnsubscribeById(ws, state, id);
+                return;
+            }
+            if (!method) {
+                sendError(ws, id, "Missing required field: method");
+                return;
+            }
+            if ((exchange && feed) || (!exchange && !feed)) {
+                sendError(ws, id, "Missing required target: provide exactly one of exchange or feed");
                 return;
             }
-            const exchangeName = exchange.toLowerCase();
             if (action === "subscribe") {
-                const msg = {
-                    id,
-                    action: "subscribe",
-                    exchange: exchangeName,
-                    method,
-                    args: parsed.args || [],
-                    credentials: parsed.credentials,
-                };
-                handleSubscribe(ws, state, msg, exchangeName);
+                if (feed) {
+                    const feedName = feed.toLowerCase();
+                    const msg = {
+                        id,
+                        action: "subscribe",
+                        targetKind: "feed",
+                        feed: feedName,
+                        method,
+                        args: parsed.args || [],
+                    };
+                    handleFeedSubscribe(ws, state, msg, feedName);
+                }
+                else {
+                    const exchangeName = exchange.toLowerCase();
+                    const msg = {
+                        id,
+                        action: "subscribe",
+                        targetKind: "exchange",
+                        exchange: exchangeName,
+                        method,
+                        args: parsed.args || [],
+                        credentials: parsed.credentials,
+                    };
+                    handleSubscribe(ws, state, msg, exchangeName);
+                }
             }
             else if (action === "unsubscribe") {
-                const msg = {
-                    id,
-                    action: "unsubscribe",
-                    exchange: exchangeName,
-                    method,
-                    args: parsed.args || [],
-                };
-                handleUnsubscribe(ws, state, msg, exchangeName);
+                if (feed) {
+                    const msg = {
+                        id,
+                        action: "unsubscribe",
+                        targetKind: "feed",
+                        feed: feed.toLowerCase(),
+                        method,
+                        args: parsed.args || [],
+                    };
+                    handleUnsubscribe(ws, state, msg);
+                }
+                else {
+                    const exchangeName = exchange.toLowerCase();
+                    const msg = {
+                        id,
+                        action: "unsubscribe",
+                        targetKind: "exchange",
+                        exchange: exchangeName,
+                        method,
+                        args: parsed.args || [],
+                    };
+                    handleUnsubscribe(ws, state, msg);
+                }
             }
             else {
                 sendError(ws, id, `Unknown action: ${action}`);
@@ -257,7 +380,7 @@ function handleSubscribe(ws, state, msg, exchangeName) {
         return;
     }
     const abortController = new AbortController();
-    state.subscriptions.set(key, { abortController });
+    state.subscriptions.set(key, { id, abortController });
     const streamFn = method === "watchOrderBooks" ? streamBatch : streamSingle;
     // Fire and forget -- the loop runs until aborted or WS closes
     streamFn(exchange, method, args || [], id, ws, abortController.signal).catch((err) => {
@@ -270,10 +393,45 @@ function handleSubscribe(ws, state, msg, exchangeName) {
             error: err instanceof Error ? err.message : String(err),
         });
         sendError(ws, id, err instanceof Error ? err.message : 'Streaming error');
+    }).finally(() => {
         state.subscriptions.delete(key);
     });
 }
-function handleUnsubscribe(ws, state, msg, exchangeName) {
+function handleFeedSubscribe(ws, state, msg, feedName) {
+    const { id, method, args } = msg;
+    if (!FEED_WATCH_METHODS.has(method)) {
+        sendError(ws, id, `Method '${method}' is not a feed streaming method. Use the HTTP API for non-streaming calls.`);
+        return;
+    }
+    const key = subscriptionKey(msg);
+    if (state.subscriptions.has(key)) {
+        sendError(ws, id, `Already subscribed to ${key}`);
+        return;
+    }
+    let feed;
+    try {
+        feed = (0, feed_factory_1.getFeed)(feedName);
+    }
+    catch (err) {
+        const message = err instanceof Error ? err.message : "Failed to create feed";
+        sendError(ws, id, message);
+        return;
+    }
+    const abortController = new AbortController();
+    state.subscriptions.set(key, { id, abortController });
+    streamFeedSingle(feed, feedName, method, args || [], id, ws, abortController.signal).catch((err) => {
+        logger_1.logger.warn('ws-handler: feed stream ended with unexpected error', {
+            feed: feedName,
+            method,
+            id,
+            error: err instanceof Error ? err.message : String(err),
+        });
+        sendError(ws, id, err instanceof Error ? err.message : 'Streaming error');
+    }).finally(() => {
+        state.subscriptions.delete(key);
+    });
+}
+function handleUnsubscribe(ws, state, msg) {
     const { id } = msg;
     // Build the key of the subscription to cancel.
     // For unsubscribe actions, the corresponding subscribe key uses the watch method.
@@ -289,3 +447,18 @@ function handleUnsubscribe(ws, state, msg, exchangeName) {
     state.subscriptions.delete(key);
     send(ws, { event: "subscribed", id }); // Acknowledge unsubscribe
 }
+function handleUnsubscribeById(ws, state, id) {
+    let cancelled = false;
+    for (const [key, sub] of state.subscriptions) {
+        if (sub.id === id) {
+            sub.abortController.abort();
+            state.subscriptions.delete(key);
+            cancelled = true;
+        }
+    }
+    if (!cancelled) {
+        sendError(ws, id, `No active subscription for id ${id}`);
+        return;
+    }
+    send(ws, { event: "subscribed", id });
+}

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "pmxt-core",
-  "version": "2.44.5",
+  "version": "2.45.0",
   "description": "pmxt is a unified prediction market data API. The ccxt for prediction markets.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
-    "url": "https://github.com/pmxt-dev/pmxt.git"
+    "url": "git+https://github.com/pmxt-dev/pmxt.git"
   },
   "bin": {
-    "pmxt-server": "./dist/server/index.js",
-    "pmxt-ensure-server": "./bin/pmxt-ensure-server"
+    "pmxt-server": "dist/server/index.js",
+    "pmxt-ensure-server": "bin/pmxt-ensure-server"
   },
   "files": [
     "dist",
@@ -29,8 +29,8 @@
     "test": "jest -c jest.config.js",
     "server": "tsx watch src/server/index.ts",
     "server:prod": "node dist/server/index.js",
-    "generate:sdk:python": "npx @openapitools/openapi-generator-cli generate -i src/server/openapi.yaml -g python -o ../sdks/python/generated --package-name pmxt_internal --additional-properties=projectName=pmxt-internal,packageVersion=2.44.5,library=urllib3",
-    "generate:sdk:typescript": "npx @openapitools/openapi-generator-cli generate -i src/server/openapi.yaml -g typescript-fetch -o ../sdks/typescript/generated --additional-properties=npmName=pmxtjs,npmVersion=2.44.5,supportsES6=true,typescriptThreePlus=true && node ../sdks/typescript/scripts/fix-generated.js",
+    "generate:sdk:python": "npx @openapitools/openapi-generator-cli generate -i src/server/openapi.yaml -g python -o ../sdks/python/generated --package-name pmxt_internal --additional-properties=projectName=pmxt-internal,packageVersion=2.45.0,library=urllib3",
+    "generate:sdk:typescript": "npx @openapitools/openapi-generator-cli generate -i src/server/openapi.yaml -g typescript-fetch -o ../sdks/typescript/generated --additional-properties=npmName=pmxtjs,npmVersion=2.45.0,supportsES6=true,typescriptThreePlus=true && node ../sdks/typescript/scripts/fix-generated.js",
     "fetch:openapi": "node scripts/fetch-openapi-specs.js",
     "extract:jsdoc": "node ../scripts/extract-jsdoc.js",
     "generate:docs": "npm run extract:jsdoc && node ../scripts/generate-api-docs.js",