pmxtjs 1.0.1 → 1.0.4

package/dist/esm/pmxt/client.js

@@ -136,8 +136,16 @@ export class Exchange {
                 // (may differ from default if default port was busy)
                 const actualPort = this.serverManager.getRunningPort();
                 const newBaseUrl = `http://localhost:${actualPort}`;
+                const accessToken = this.serverManager.getAccessToken();
+                const headers = {};
+                if (accessToken) {
+                    headers['x-pmxt-access-token'] = accessToken;
+                }
                 // Update API client with actual base URL
-                const newConfig = new Configuration({ basePath: newBaseUrl });
+                const newConfig = new Configuration({
+                    basePath: newBaseUrl,
+                    headers
+                });
                 this.api = new DefaultApi(newConfig);
             }
             catch (error) {

package/dist/esm/pmxt/server-manager.d.ts

@@ -28,8 +28,9 @@ export declare class ServerManager {
      */
     getRunningPort(): number;
     /**
-     * Check if the server is running.
+     * Get the access token from the lock file.
      */
+    getAccessToken(): string | undefined;
     /**
      * Check if the server is running.
      */
@@ -42,4 +43,6 @@ export declare class ServerManager {
      * Ensure the server is running, starting it if necessary.
      */
     ensureServerRunning(): Promise<void>;
+    private isVersionMismatch;
+    private killOldServer;
 }

package/dist/esm/pmxt/server-manager.js

@@ -6,7 +6,7 @@
 import { DefaultApi, Configuration } from "../generated/src/index.js";
 import { readFileSync, existsSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { join, dirname } from "path";
 export class ServerManager {
     baseUrl;
     maxRetries;
@@ -48,8 +48,12 @@ export class ServerManager {
         return info?.port || ServerManager.DEFAULT_PORT;
     }
     /**
-     * Check if the server is running.
+     * Get the access token from the lock file.
      */
+    getAccessToken() {
+        const info = this.getServerInfo();
+        return info?.accessToken;
+    }
     /**
      * Check if the server is running.
      */
@@ -86,14 +90,40 @@ export class ServerManager {
      * Ensure the server is running, starting it if necessary.
      */
     async ensureServerRunning() {
-        // Check if already running
+        // Check for force restart
+        if (process.env.PMXT_ALWAYS_RESTART === '1') {
+            await this.killOldServer();
+        }
+        // Check if already running and version matches
         if (await this.isServerRunning()) {
-            return;
+            if (await this.isVersionMismatch()) {
+                await this.killOldServer();
+            }
+            else {
+                return;
+            }
+        }
+        // Locate pmxt-ensure-server
+        let launcherPath = 'pmxt-ensure-server'; // Default to PATH
+        try {
+            // Try to resolve from pmxt-core dependency
+            // For CommonJS build (which is primary), we can use require directly
+            // For ESM build, this will be transpiled appropriately
+            const corePackageJson = require.resolve('pmxt-core/package.json');
+            const coreDir = dirname(corePackageJson);
+            const binPath = join(coreDir, 'bin', 'pmxt-ensure-server');
+            if (existsSync(binPath)) {
+                launcherPath = binPath;
+            }
+        }
+        catch (error) {
+            // If resolution fails, fall back to PATH
+            // This could happen in dev environments where pmxt-core is globally installed
         }
         // Try to start the server using pmxt-ensure-server
         const { spawn } = await import("child_process");
         try {
-            const proc = spawn("pmxt-ensure-server", [], {
+            const proc = spawn(launcherPath, [], {
                 detached: true,
                 stdio: "ignore",
             });
@@ -107,4 +137,56 @@ export class ServerManager {
                 `Or start the server manually: pmxt-server`);
         }
     }
+    async isVersionMismatch() {
+        const info = this.getServerInfo();
+        if (!info || !info.version) {
+            return true; // Old server without version
+        }
+        try {
+            // 1. Try to find package.json relative to the installed location (Production)
+            let corePackageJsonPath;
+            try {
+                corePackageJsonPath = require.resolve('pmxt-core/package.json');
+            }
+            catch {
+                // 2. Try dev path (Monorepo)
+                const devPath = join(dirname(__dirname), '../../core/package.json');
+                if (existsSync(devPath)) {
+                    corePackageJsonPath = devPath;
+                }
+            }
+            if (corePackageJsonPath && existsSync(corePackageJsonPath)) {
+                const content = readFileSync(corePackageJsonPath, 'utf-8');
+                const pkg = JSON.parse(content);
+                // Check if running version starts with package version
+                // (Server version might have extra hash in dev mode)
+                if (pkg.version && !info.version.startsWith(pkg.version)) {
+                    return true;
+                }
+            }
+        }
+        catch {
+            // Ignore errors
+        }
+        return false;
+    }
+    async killOldServer() {
+        const info = this.getServerInfo();
+        if (info && info.pid) {
+            try {
+                process.kill(info.pid, 'SIGTERM');
+                // Brief wait
+                await new Promise(resolve => setTimeout(resolve, 500));
+            }
+            catch {
+                // Ignore
+            }
+        }
+        // Remove lock file (best effort)
+        try {
+            const { unlinkSync } = await import('fs');
+            unlinkSync(this.lockPath);
+        }
+        catch { }
+    }
 }

package/dist/pmxt/client.js

@@ -139,8 +139,16 @@ class Exchange {
                 // (may differ from default if default port was busy)
                 const actualPort = this.serverManager.getRunningPort();
                 const newBaseUrl = `http://localhost:${actualPort}`;
+                const accessToken = this.serverManager.getAccessToken();
+                const headers = {};
+                if (accessToken) {
+                    headers['x-pmxt-access-token'] = accessToken;
+                }
                 // Update API client with actual base URL
-                const newConfig = new index_js_1.Configuration({ basePath: newBaseUrl });
+                const newConfig = new index_js_1.Configuration({
+                    basePath: newBaseUrl,
+                    headers
+                });
                 this.api = new index_js_1.DefaultApi(newConfig);
             }
             catch (error) {

package/dist/pmxt/server-manager.d.ts

@@ -28,8 +28,9 @@ export declare class ServerManager {
      */
     getRunningPort(): number;
     /**
-     * Check if the server is running.
+     * Get the access token from the lock file.
      */
+    getAccessToken(): string | undefined;
     /**
      * Check if the server is running.
      */
@@ -42,4 +43,6 @@ export declare class ServerManager {
      * Ensure the server is running, starting it if necessary.
      */
     ensureServerRunning(): Promise<void>;
+    private isVersionMismatch;
+    private killOldServer;
 }

package/dist/pmxt/server-manager.js

@@ -84,8 +84,12 @@ class ServerManager {
         return info?.port || ServerManager.DEFAULT_PORT;
     }
     /**
-     * Check if the server is running.
+     * Get the access token from the lock file.
      */
+    getAccessToken() {
+        const info = this.getServerInfo();
+        return info?.accessToken;
+    }
     /**
      * Check if the server is running.
      */
@@ -122,14 +126,40 @@ class ServerManager {
      * Ensure the server is running, starting it if necessary.
      */
     async ensureServerRunning() {
-        // Check if already running
+        // Check for force restart
+        if (process.env.PMXT_ALWAYS_RESTART === '1') {
+            await this.killOldServer();
+        }
+        // Check if already running and version matches
         if (await this.isServerRunning()) {
-            return;
+            if (await this.isVersionMismatch()) {
+                await this.killOldServer();
+            }
+            else {
+                return;
+            }
+        }
+        // Locate pmxt-ensure-server
+        let launcherPath = 'pmxt-ensure-server'; // Default to PATH
+        try {
+            // Try to resolve from pmxt-core dependency
+            // For CommonJS build (which is primary), we can use require directly
+            // For ESM build, this will be transpiled appropriately
+            const corePackageJson = require.resolve('pmxt-core/package.json');
+            const coreDir = (0, path_1.dirname)(corePackageJson);
+            const binPath = (0, path_1.join)(coreDir, 'bin', 'pmxt-ensure-server');
+            if ((0, fs_1.existsSync)(binPath)) {
+                launcherPath = binPath;
+            }
+        }
+        catch (error) {
+            // If resolution fails, fall back to PATH
+            // This could happen in dev environments where pmxt-core is globally installed
         }
         // Try to start the server using pmxt-ensure-server
         const { spawn } = await Promise.resolve().then(() => __importStar(require("child_process")));
         try {
-            const proc = spawn("pmxt-ensure-server", [], {
+            const proc = spawn(launcherPath, [], {
                 detached: true,
                 stdio: "ignore",
             });
@@ -143,5 +173,57 @@ class ServerManager {
                 `Or start the server manually: pmxt-server`);
         }
     }
+    async isVersionMismatch() {
+        const info = this.getServerInfo();
+        if (!info || !info.version) {
+            return true; // Old server without version
+        }
+        try {
+            // 1. Try to find package.json relative to the installed location (Production)
+            let corePackageJsonPath;
+            try {
+                corePackageJsonPath = require.resolve('pmxt-core/package.json');
+            }
+            catch {
+                // 2. Try dev path (Monorepo)
+                const devPath = (0, path_1.join)((0, path_1.dirname)(__dirname), '../../core/package.json');
+                if ((0, fs_1.existsSync)(devPath)) {
+                    corePackageJsonPath = devPath;
+                }
+            }
+            if (corePackageJsonPath && (0, fs_1.existsSync)(corePackageJsonPath)) {
+                const content = (0, fs_1.readFileSync)(corePackageJsonPath, 'utf-8');
+                const pkg = JSON.parse(content);
+                // Check if running version starts with package version
+                // (Server version might have extra hash in dev mode)
+                if (pkg.version && !info.version.startsWith(pkg.version)) {
+                    return true;
+                }
+            }
+        }
+        catch {
+            // Ignore errors
+        }
+        return false;
+    }
+    async killOldServer() {
+        const info = this.getServerInfo();
+        if (info && info.pid) {
+            try {
+                process.kill(info.pid, 'SIGTERM');
+                // Brief wait
+                await new Promise(resolve => setTimeout(resolve, 500));
+            }
+            catch {
+                // Ignore
+            }
+        }
+        // Remove lock file (best effort)
+        try {
+            const { unlinkSync } = await Promise.resolve().then(() => __importStar(require('fs')));
+            unlinkSync(this.lockPath);
+        }
+        catch { }
+    }
 }
 exports.ServerManager = ServerManager;

package/generated/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmxtjs",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "OpenAPI client for pmxtjs",
   "author": "OpenAPI-Generator",
   "repository": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmxtjs",
-  "version": "1.0.1",
+  "version": "1.0.4",
   "description": "Unified prediction market data API - The ccxt for prediction markets",
   "author": "PMXT Contributors",
   "repository": {
@@ -41,6 +41,9 @@
     "api",
     "unified"
   ],
+  "dependencies": {
+    "pmxt-core": "1.0.4"
+  },
   "devDependencies": {
     "@types/jest": "^30.0.0",
     "@types/node": "^20.0.0",

package/pmxt/client.ts

@@ -203,8 +203,17 @@ export abstract class Exchange {
                 const actualPort = this.serverManager.getRunningPort();
                 const newBaseUrl = `http://localhost:${actualPort}`;
 
+                const accessToken = this.serverManager.getAccessToken();
+                const headers: any = {};
+                if (accessToken) {
+                    headers['x-pmxt-access-token'] = accessToken;
+                }
+
                 // Update API client with actual base URL
-                const newConfig = new Configuration({ basePath: newBaseUrl });
+                const newConfig = new Configuration({
+                    basePath: newBaseUrl,
+                    headers
+                });
                 this.api = new DefaultApi(newConfig);
             } catch (error) {
                 throw new Error(

package/pmxt/server-manager.ts

@@ -7,7 +7,7 @@
 import { DefaultApi, Configuration } from "../generated/src/index.js";
 import { readFileSync, existsSync } from "fs";
 import { homedir } from "os";
-import { join } from "path";
+import { join, dirname } from "path";
 
 export interface ServerManagerOptions {
     baseUrl?: string;
@@ -18,6 +18,8 @@ export interface ServerManagerOptions {
 interface ServerLockInfo {
     port: number;
     pid: number;
+    accessToken?: string;
+    version?: string;
     timestamp: number;
 }
 
@@ -66,8 +68,13 @@ export class ServerManager {
     }
 
     /**
-     * Check if the server is running.
+     * Get the access token from the lock file.
      */
+    getAccessToken(): string | undefined {
+        const info = this.getServerInfo();
+        return info?.accessToken;
+    }
+
     /**
      * Check if the server is running.
      */
@@ -108,16 +115,44 @@ export class ServerManager {
      * Ensure the server is running, starting it if necessary.
      */
     async ensureServerRunning(): Promise<void> {
-        // Check if already running
+        // Check for force restart
+        if (process.env.PMXT_ALWAYS_RESTART === '1') {
+            await this.killOldServer();
+        }
+
+        // Check if already running and version matches
         if (await this.isServerRunning()) {
-            return;
+            if (await this.isVersionMismatch()) {
+                await this.killOldServer();
+            } else {
+                return;
+            }
+        }
+
+        // Locate pmxt-ensure-server
+        let launcherPath = 'pmxt-ensure-server'; // Default to PATH
+
+        try {
+            // Try to resolve from pmxt-core dependency
+            // For CommonJS build (which is primary), we can use require directly
+            // For ESM build, this will be transpiled appropriately
+            const corePackageJson = require.resolve('pmxt-core/package.json');
+            const coreDir = dirname(corePackageJson);
+            const binPath = join(coreDir, 'bin', 'pmxt-ensure-server');
+
+            if (existsSync(binPath)) {
+                launcherPath = binPath;
+            }
+        } catch (error) {
+            // If resolution fails, fall back to PATH
+            // This could happen in dev environments where pmxt-core is globally installed
         }
 
         // Try to start the server using pmxt-ensure-server
         const { spawn } = await import("child_process");
 
         try {
-            const proc = spawn("pmxt-ensure-server", [], {
+            const proc = spawn(launcherPath, [], {
                 detached: true,
                 stdio: "ignore",
             });
@@ -133,5 +168,56 @@ export class ServerManager {
             );
         }
     }
-}
 
+    private async isVersionMismatch(): Promise<boolean> {
+        const info = this.getServerInfo();
+        if (!info || !info.version) {
+            return true; // Old server without version
+        }
+
+        try {
+            // 1. Try to find package.json relative to the installed location (Production)
+            let corePackageJsonPath: string | undefined;
+            try {
+                corePackageJsonPath = require.resolve('pmxt-core/package.json');
+            } catch {
+                // 2. Try dev path (Monorepo)
+                const devPath = join(dirname(__dirname), '../../core/package.json');
+                if (existsSync(devPath)) {
+                    corePackageJsonPath = devPath;
+                }
+            }
+
+            if (corePackageJsonPath && existsSync(corePackageJsonPath)) {
+                const content = readFileSync(corePackageJsonPath, 'utf-8');
+                const pkg = JSON.parse(content);
+                // Check if running version starts with package version
+                // (Server version might have extra hash in dev mode)
+                if (pkg.version && !info.version.startsWith(pkg.version)) {
+                    return true;
+                }
+            }
+        } catch {
+            // Ignore errors
+        }
+        return false;
+    }
+
+    private async killOldServer(): Promise<void> {
+        const info = this.getServerInfo();
+        if (info && info.pid) {
+            try {
+                process.kill(info.pid, 'SIGTERM');
+                // Brief wait
+                await new Promise(resolve => setTimeout(resolve, 500));
+            } catch {
+                // Ignore
+            }
+        }
+        // Remove lock file (best effort)
+        try {
+            const { unlinkSync } = await import('fs');
+            unlinkSync(this.lockPath);
+        } catch { }
+    }
+}