pmxtjs 1.0.3 → 1.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -136,8 +136,16 @@ export class Exchange {
136
136
  // (may differ from default if default port was busy)
137
137
  const actualPort = this.serverManager.getRunningPort();
138
138
  const newBaseUrl = `http://localhost:${actualPort}`;
139
+ const accessToken = this.serverManager.getAccessToken();
140
+ const headers = {};
141
+ if (accessToken) {
142
+ headers['x-pmxt-access-token'] = accessToken;
143
+ }
139
144
  // Update API client with actual base URL
140
- const newConfig = new Configuration({ basePath: newBaseUrl });
145
+ const newConfig = new Configuration({
146
+ basePath: newBaseUrl,
147
+ headers
148
+ });
141
149
  this.api = new DefaultApi(newConfig);
142
150
  }
143
151
  catch (error) {
@@ -28,8 +28,9 @@ export declare class ServerManager {
28
28
  */
29
29
  getRunningPort(): number;
30
30
  /**
31
- * Check if the server is running.
31
+ * Get the access token from the lock file.
32
32
  */
33
+ getAccessToken(): string | undefined;
33
34
  /**
34
35
  * Check if the server is running.
35
36
  */
@@ -42,4 +43,6 @@ export declare class ServerManager {
42
43
  * Ensure the server is running, starting it if necessary.
43
44
  */
44
45
  ensureServerRunning(): Promise<void>;
46
+ private isVersionMismatch;
47
+ private killOldServer;
45
48
  }
@@ -48,8 +48,12 @@ export class ServerManager {
48
48
  return info?.port || ServerManager.DEFAULT_PORT;
49
49
  }
50
50
  /**
51
- * Check if the server is running.
51
+ * Get the access token from the lock file.
52
52
  */
53
+ getAccessToken() {
54
+ const info = this.getServerInfo();
55
+ return info?.accessToken;
56
+ }
53
57
  /**
54
58
  * Check if the server is running.
55
59
  */
@@ -86,9 +90,18 @@ export class ServerManager {
86
90
  * Ensure the server is running, starting it if necessary.
87
91
  */
88
92
  async ensureServerRunning() {
89
- // Check if already running
93
+ // Check for force restart
94
+ if (process.env.PMXT_ALWAYS_RESTART === '1') {
95
+ await this.killOldServer();
96
+ }
97
+ // Check if already running and version matches
90
98
  if (await this.isServerRunning()) {
91
- return;
99
+ if (await this.isVersionMismatch()) {
100
+ await this.killOldServer();
101
+ }
102
+ else {
103
+ return;
104
+ }
92
105
  }
93
106
  // Locate pmxt-ensure-server
94
107
  let launcherPath = 'pmxt-ensure-server'; // Default to PATH
@@ -124,4 +137,56 @@ export class ServerManager {
124
137
  `Or start the server manually: pmxt-server`);
125
138
  }
126
139
  }
140
+ async isVersionMismatch() {
141
+ const info = this.getServerInfo();
142
+ if (!info || !info.version) {
143
+ return true; // Old server without version
144
+ }
145
+ try {
146
+ // 1. Try to find package.json relative to the installed location (Production)
147
+ let corePackageJsonPath;
148
+ try {
149
+ corePackageJsonPath = require.resolve('pmxt-core/package.json');
150
+ }
151
+ catch {
152
+ // 2. Try dev path (Monorepo)
153
+ const devPath = join(dirname(__dirname), '../../core/package.json');
154
+ if (existsSync(devPath)) {
155
+ corePackageJsonPath = devPath;
156
+ }
157
+ }
158
+ if (corePackageJsonPath && existsSync(corePackageJsonPath)) {
159
+ const content = readFileSync(corePackageJsonPath, 'utf-8');
160
+ const pkg = JSON.parse(content);
161
+ // Check if running version starts with package version
162
+ // (Server version might have extra hash in dev mode)
163
+ if (pkg.version && !info.version.startsWith(pkg.version)) {
164
+ return true;
165
+ }
166
+ }
167
+ }
168
+ catch {
169
+ // Ignore errors
170
+ }
171
+ return false;
172
+ }
173
+ async killOldServer() {
174
+ const info = this.getServerInfo();
175
+ if (info && info.pid) {
176
+ try {
177
+ process.kill(info.pid, 'SIGTERM');
178
+ // Brief wait
179
+ await new Promise(resolve => setTimeout(resolve, 500));
180
+ }
181
+ catch {
182
+ // Ignore
183
+ }
184
+ }
185
+ // Remove lock file (best effort)
186
+ try {
187
+ const { unlinkSync } = await import('fs');
188
+ unlinkSync(this.lockPath);
189
+ }
190
+ catch { }
191
+ }
127
192
  }
@@ -139,8 +139,16 @@ class Exchange {
139
139
  // (may differ from default if default port was busy)
140
140
  const actualPort = this.serverManager.getRunningPort();
141
141
  const newBaseUrl = `http://localhost:${actualPort}`;
142
+ const accessToken = this.serverManager.getAccessToken();
143
+ const headers = {};
144
+ if (accessToken) {
145
+ headers['x-pmxt-access-token'] = accessToken;
146
+ }
142
147
  // Update API client with actual base URL
143
- const newConfig = new index_js_1.Configuration({ basePath: newBaseUrl });
148
+ const newConfig = new index_js_1.Configuration({
149
+ basePath: newBaseUrl,
150
+ headers
151
+ });
144
152
  this.api = new index_js_1.DefaultApi(newConfig);
145
153
  }
146
154
  catch (error) {
@@ -28,8 +28,9 @@ export declare class ServerManager {
28
28
  */
29
29
  getRunningPort(): number;
30
30
  /**
31
- * Check if the server is running.
31
+ * Get the access token from the lock file.
32
32
  */
33
+ getAccessToken(): string | undefined;
33
34
  /**
34
35
  * Check if the server is running.
35
36
  */
@@ -42,4 +43,6 @@ export declare class ServerManager {
42
43
  * Ensure the server is running, starting it if necessary.
43
44
  */
44
45
  ensureServerRunning(): Promise<void>;
46
+ private isVersionMismatch;
47
+ private killOldServer;
45
48
  }
@@ -84,8 +84,12 @@ class ServerManager {
84
84
  return info?.port || ServerManager.DEFAULT_PORT;
85
85
  }
86
86
  /**
87
- * Check if the server is running.
87
+ * Get the access token from the lock file.
88
88
  */
89
+ getAccessToken() {
90
+ const info = this.getServerInfo();
91
+ return info?.accessToken;
92
+ }
89
93
  /**
90
94
  * Check if the server is running.
91
95
  */
@@ -122,9 +126,18 @@ class ServerManager {
122
126
  * Ensure the server is running, starting it if necessary.
123
127
  */
124
128
  async ensureServerRunning() {
125
- // Check if already running
129
+ // Check for force restart
130
+ if (process.env.PMXT_ALWAYS_RESTART === '1') {
131
+ await this.killOldServer();
132
+ }
133
+ // Check if already running and version matches
126
134
  if (await this.isServerRunning()) {
127
- return;
135
+ if (await this.isVersionMismatch()) {
136
+ await this.killOldServer();
137
+ }
138
+ else {
139
+ return;
140
+ }
128
141
  }
129
142
  // Locate pmxt-ensure-server
130
143
  let launcherPath = 'pmxt-ensure-server'; // Default to PATH
@@ -160,5 +173,57 @@ class ServerManager {
160
173
  `Or start the server manually: pmxt-server`);
161
174
  }
162
175
  }
176
+ async isVersionMismatch() {
177
+ const info = this.getServerInfo();
178
+ if (!info || !info.version) {
179
+ return true; // Old server without version
180
+ }
181
+ try {
182
+ // 1. Try to find package.json relative to the installed location (Production)
183
+ let corePackageJsonPath;
184
+ try {
185
+ corePackageJsonPath = require.resolve('pmxt-core/package.json');
186
+ }
187
+ catch {
188
+ // 2. Try dev path (Monorepo)
189
+ const devPath = (0, path_1.join)((0, path_1.dirname)(__dirname), '../../core/package.json');
190
+ if ((0, fs_1.existsSync)(devPath)) {
191
+ corePackageJsonPath = devPath;
192
+ }
193
+ }
194
+ if (corePackageJsonPath && (0, fs_1.existsSync)(corePackageJsonPath)) {
195
+ const content = (0, fs_1.readFileSync)(corePackageJsonPath, 'utf-8');
196
+ const pkg = JSON.parse(content);
197
+ // Check if running version starts with package version
198
+ // (Server version might have extra hash in dev mode)
199
+ if (pkg.version && !info.version.startsWith(pkg.version)) {
200
+ return true;
201
+ }
202
+ }
203
+ }
204
+ catch {
205
+ // Ignore errors
206
+ }
207
+ return false;
208
+ }
209
+ async killOldServer() {
210
+ const info = this.getServerInfo();
211
+ if (info && info.pid) {
212
+ try {
213
+ process.kill(info.pid, 'SIGTERM');
214
+ // Brief wait
215
+ await new Promise(resolve => setTimeout(resolve, 500));
216
+ }
217
+ catch {
218
+ // Ignore
219
+ }
220
+ }
221
+ // Remove lock file (best effort)
222
+ try {
223
+ const { unlinkSync } = await Promise.resolve().then(() => __importStar(require('fs')));
224
+ unlinkSync(this.lockPath);
225
+ }
226
+ catch { }
227
+ }
163
228
  }
164
229
  exports.ServerManager = ServerManager;
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmxtjs",
3
- "version": "1.0.3",
3
+ "version": "1.0.4",
4
4
  "description": "OpenAPI client for pmxtjs",
5
5
  "author": "OpenAPI-Generator",
6
6
  "repository": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pmxtjs",
3
- "version": "1.0.3",
3
+ "version": "1.0.4",
4
4
  "description": "Unified prediction market data API - The ccxt for prediction markets",
5
5
  "author": "PMXT Contributors",
6
6
  "repository": {
@@ -42,7 +42,7 @@
42
42
  "unified"
43
43
  ],
44
44
  "dependencies": {
45
- "pmxt-core": "1.0.3"
45
+ "pmxt-core": "1.0.4"
46
46
  },
47
47
  "devDependencies": {
48
48
  "@types/jest": "^30.0.0",
package/pmxt/client.ts CHANGED
@@ -203,8 +203,17 @@ export abstract class Exchange {
203
203
  const actualPort = this.serverManager.getRunningPort();
204
204
  const newBaseUrl = `http://localhost:${actualPort}`;
205
205
 
206
+ const accessToken = this.serverManager.getAccessToken();
207
+ const headers: any = {};
208
+ if (accessToken) {
209
+ headers['x-pmxt-access-token'] = accessToken;
210
+ }
211
+
206
212
  // Update API client with actual base URL
207
- const newConfig = new Configuration({ basePath: newBaseUrl });
213
+ const newConfig = new Configuration({
214
+ basePath: newBaseUrl,
215
+ headers
216
+ });
208
217
  this.api = new DefaultApi(newConfig);
209
218
  } catch (error) {
210
219
  throw new Error(
@@ -18,6 +18,8 @@ export interface ServerManagerOptions {
18
18
  interface ServerLockInfo {
19
19
  port: number;
20
20
  pid: number;
21
+ accessToken?: string;
22
+ version?: string;
21
23
  timestamp: number;
22
24
  }
23
25
 
@@ -66,8 +68,13 @@ export class ServerManager {
66
68
  }
67
69
 
68
70
  /**
69
- * Check if the server is running.
71
+ * Get the access token from the lock file.
70
72
  */
73
+ getAccessToken(): string | undefined {
74
+ const info = this.getServerInfo();
75
+ return info?.accessToken;
76
+ }
77
+
71
78
  /**
72
79
  * Check if the server is running.
73
80
  */
@@ -108,9 +115,18 @@ export class ServerManager {
108
115
  * Ensure the server is running, starting it if necessary.
109
116
  */
110
117
  async ensureServerRunning(): Promise<void> {
111
- // Check if already running
118
+ // Check for force restart
119
+ if (process.env.PMXT_ALWAYS_RESTART === '1') {
120
+ await this.killOldServer();
121
+ }
122
+
123
+ // Check if already running and version matches
112
124
  if (await this.isServerRunning()) {
113
- return;
125
+ if (await this.isVersionMismatch()) {
126
+ await this.killOldServer();
127
+ } else {
128
+ return;
129
+ }
114
130
  }
115
131
 
116
132
  // Locate pmxt-ensure-server
@@ -152,5 +168,56 @@ export class ServerManager {
152
168
  );
153
169
  }
154
170
  }
155
- }
156
171
 
172
+ private async isVersionMismatch(): Promise<boolean> {
173
+ const info = this.getServerInfo();
174
+ if (!info || !info.version) {
175
+ return true; // Old server without version
176
+ }
177
+
178
+ try {
179
+ // 1. Try to find package.json relative to the installed location (Production)
180
+ let corePackageJsonPath: string | undefined;
181
+ try {
182
+ corePackageJsonPath = require.resolve('pmxt-core/package.json');
183
+ } catch {
184
+ // 2. Try dev path (Monorepo)
185
+ const devPath = join(dirname(__dirname), '../../core/package.json');
186
+ if (existsSync(devPath)) {
187
+ corePackageJsonPath = devPath;
188
+ }
189
+ }
190
+
191
+ if (corePackageJsonPath && existsSync(corePackageJsonPath)) {
192
+ const content = readFileSync(corePackageJsonPath, 'utf-8');
193
+ const pkg = JSON.parse(content);
194
+ // Check if running version starts with package version
195
+ // (Server version might have extra hash in dev mode)
196
+ if (pkg.version && !info.version.startsWith(pkg.version)) {
197
+ return true;
198
+ }
199
+ }
200
+ } catch {
201
+ // Ignore errors
202
+ }
203
+ return false;
204
+ }
205
+
206
+ private async killOldServer(): Promise<void> {
207
+ const info = this.getServerInfo();
208
+ if (info && info.pid) {
209
+ try {
210
+ process.kill(info.pid, 'SIGTERM');
211
+ // Brief wait
212
+ await new Promise(resolve => setTimeout(resolve, 500));
213
+ } catch {
214
+ // Ignore
215
+ }
216
+ }
217
+ // Remove lock file (best effort)
218
+ try {
219
+ const { unlinkSync } = await import('fs');
220
+ unlinkSync(this.lockPath);
221
+ } catch { }
222
+ }
223
+ }