@push.rocks/smartproxy 5.0.0 → 6.0.0

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.
Files changed (78) hide show
  1. package/dist_ts/00_commitinfo_data.js +1 -1
  2. package/dist_ts/classes.pp.interfaces.d.ts +23 -0
  3. package/dist_ts/classes.pp.networkproxybridge.d.ts +15 -1
  4. package/dist_ts/classes.pp.networkproxybridge.js +116 -21
  5. package/dist_ts/classes.pp.portproxy.d.ts +20 -4
  6. package/dist_ts/classes.pp.portproxy.js +321 -22
  7. package/dist_ts/index.d.ts +6 -6
  8. package/dist_ts/index.js +7 -7
  9. package/dist_ts/networkproxy/classes.np.certificatemanager.d.ts +77 -0
  10. package/dist_ts/networkproxy/classes.np.certificatemanager.js +354 -0
  11. package/dist_ts/networkproxy/classes.np.connectionpool.d.ts +47 -0
  12. package/dist_ts/networkproxy/classes.np.connectionpool.js +210 -0
  13. package/dist_ts/networkproxy/classes.np.networkproxy.d.ts +117 -0
  14. package/dist_ts/networkproxy/classes.np.networkproxy.js +375 -0
  15. package/dist_ts/networkproxy/classes.np.requesthandler.d.ts +51 -0
  16. package/dist_ts/networkproxy/classes.np.requesthandler.js +210 -0
  17. package/dist_ts/networkproxy/classes.np.types.d.ts +82 -0
  18. package/dist_ts/networkproxy/classes.np.types.js +35 -0
  19. package/dist_ts/networkproxy/classes.np.websockethandler.d.ts +38 -0
  20. package/dist_ts/networkproxy/classes.np.websockethandler.js +188 -0
  21. package/dist_ts/networkproxy/index.d.ts +6 -0
  22. package/dist_ts/networkproxy/index.js +8 -0
  23. package/dist_ts/nfttablesproxy/classes.nftablesproxy.d.ts +219 -0
  24. package/dist_ts/nfttablesproxy/classes.nftablesproxy.js +1542 -0
  25. package/dist_ts/port80handler/classes.port80handler.d.ts +260 -0
  26. package/dist_ts/port80handler/classes.port80handler.js +928 -0
  27. package/dist_ts/smartproxy/classes.pp.connectionhandler.d.ts +39 -0
  28. package/dist_ts/smartproxy/classes.pp.connectionhandler.js +754 -0
  29. package/dist_ts/smartproxy/classes.pp.connectionmanager.d.ts +78 -0
  30. package/dist_ts/smartproxy/classes.pp.connectionmanager.js +378 -0
  31. package/dist_ts/smartproxy/classes.pp.domainconfigmanager.d.ts +55 -0
  32. package/dist_ts/smartproxy/classes.pp.domainconfigmanager.js +103 -0
  33. package/dist_ts/smartproxy/classes.pp.interfaces.d.ts +133 -0
  34. package/dist_ts/smartproxy/classes.pp.interfaces.js +2 -0
  35. package/dist_ts/smartproxy/classes.pp.networkproxybridge.d.ts +57 -0
  36. package/dist_ts/smartproxy/classes.pp.networkproxybridge.js +306 -0
  37. package/dist_ts/smartproxy/classes.pp.portrangemanager.d.ts +56 -0
  38. package/dist_ts/smartproxy/classes.pp.portrangemanager.js +179 -0
  39. package/dist_ts/smartproxy/classes.pp.securitymanager.d.ts +47 -0
  40. package/dist_ts/smartproxy/classes.pp.securitymanager.js +126 -0
  41. package/dist_ts/smartproxy/classes.pp.snihandler.d.ts +153 -0
  42. package/dist_ts/smartproxy/classes.pp.snihandler.js +1053 -0
  43. package/dist_ts/smartproxy/classes.pp.timeoutmanager.d.ts +47 -0
  44. package/dist_ts/smartproxy/classes.pp.timeoutmanager.js +154 -0
  45. package/dist_ts/smartproxy/classes.pp.tlsalert.d.ts +149 -0
  46. package/dist_ts/smartproxy/classes.pp.tlsalert.js +225 -0
  47. package/dist_ts/smartproxy/classes.pp.tlsmanager.d.ts +57 -0
  48. package/dist_ts/smartproxy/classes.pp.tlsmanager.js +132 -0
  49. package/dist_ts/smartproxy/classes.smartproxy.d.ts +64 -0
  50. package/dist_ts/smartproxy/classes.smartproxy.js +567 -0
  51. package/package.json +1 -1
  52. package/readme.md +77 -27
  53. package/ts/00_commitinfo_data.ts +1 -1
  54. package/ts/index.ts +6 -6
  55. package/ts/networkproxy/classes.np.certificatemanager.ts +398 -0
  56. package/ts/networkproxy/classes.np.connectionpool.ts +241 -0
  57. package/ts/networkproxy/classes.np.networkproxy.ts +469 -0
  58. package/ts/networkproxy/classes.np.requesthandler.ts +278 -0
  59. package/ts/networkproxy/classes.np.types.ts +123 -0
  60. package/ts/networkproxy/classes.np.websockethandler.ts +226 -0
  61. package/ts/networkproxy/index.ts +7 -0
  62. package/ts/{classes.port80handler.ts → port80handler/classes.port80handler.ts} +249 -1
  63. package/ts/{classes.pp.connectionhandler.ts → smartproxy/classes.pp.connectionhandler.ts} +1 -1
  64. package/ts/{classes.pp.connectionmanager.ts → smartproxy/classes.pp.connectionmanager.ts} +1 -1
  65. package/ts/{classes.pp.domainconfigmanager.ts → smartproxy/classes.pp.domainconfigmanager.ts} +1 -1
  66. package/ts/{classes.pp.interfaces.ts → smartproxy/classes.pp.interfaces.ts} +31 -5
  67. package/ts/{classes.pp.networkproxybridge.ts → smartproxy/classes.pp.networkproxybridge.ts} +129 -28
  68. package/ts/{classes.pp.securitymanager.ts → smartproxy/classes.pp.securitymanager.ts} +1 -1
  69. package/ts/{classes.pp.tlsmanager.ts → smartproxy/classes.pp.tlsmanager.ts} +1 -1
  70. package/ts/smartproxy/classes.smartproxy.ts +679 -0
  71. package/ts/classes.networkproxy.ts +0 -1730
  72. package/ts/classes.pp.acmemanager.ts +0 -149
  73. package/ts/classes.pp.portproxy.ts +0 -344
  74. /package/ts/{classes.nftablesproxy.ts → nfttablesproxy/classes.nftablesproxy.ts} +0 -0
  75. /package/ts/{classes.pp.portrangemanager.ts → smartproxy/classes.pp.portrangemanager.ts} +0 -0
  76. /package/ts/{classes.pp.snihandler.ts → smartproxy/classes.pp.snihandler.ts} +0 -0
  77. /package/ts/{classes.pp.timeoutmanager.ts → smartproxy/classes.pp.timeoutmanager.ts} +0 -0
  78. /package/ts/{classes.pp.tlsalert.ts → smartproxy/classes.pp.tlsalert.ts} +0 -0
@@ -0,0 +1,567 @@
1
+ import * as plugins from '../plugins.js';
2
+ import { ConnectionManager } from './classes.pp.connectionmanager.js';
3
+ import { SecurityManager } from './classes.pp.securitymanager.js';
4
+ import { DomainConfigManager } from './classes.pp.domainconfigmanager.js';
5
+ import { TlsManager } from './classes.pp.tlsmanager.js';
6
+ import { NetworkProxyBridge } from './classes.pp.networkproxybridge.js';
7
+ import { TimeoutManager } from './classes.pp.timeoutmanager.js';
8
+ import { PortRangeManager } from './classes.pp.portrangemanager.js';
9
+ import { ConnectionHandler } from './classes.pp.connectionhandler.js';
10
+ import { Port80Handler, Port80HandlerEvents } from '../port80handler/classes.port80handler.js';
11
+ import * as path from 'path';
12
+ import * as fs from 'fs';
13
+ /**
14
+ * SmartProxy - Main class that coordinates all components
15
+ */
16
+ export class SmartProxy {
17
+ constructor(settingsArg) {
18
+ this.netServers = [];
19
+ this.connectionLogger = null;
20
+ this.isShuttingDown = false;
21
+ // Port80Handler for ACME certificate management
22
+ this.port80Handler = null;
23
+ // Set reasonable defaults for all settings
24
+ this.settings = {
25
+ ...settingsArg,
26
+ targetIP: settingsArg.targetIP || 'localhost',
27
+ initialDataTimeout: settingsArg.initialDataTimeout || 120000,
28
+ socketTimeout: settingsArg.socketTimeout || 3600000,
29
+ inactivityCheckInterval: settingsArg.inactivityCheckInterval || 60000,
30
+ maxConnectionLifetime: settingsArg.maxConnectionLifetime || 86400000,
31
+ inactivityTimeout: settingsArg.inactivityTimeout || 14400000,
32
+ gracefulShutdownTimeout: settingsArg.gracefulShutdownTimeout || 30000,
33
+ noDelay: settingsArg.noDelay !== undefined ? settingsArg.noDelay : true,
34
+ keepAlive: settingsArg.keepAlive !== undefined ? settingsArg.keepAlive : true,
35
+ keepAliveInitialDelay: settingsArg.keepAliveInitialDelay || 10000,
36
+ maxPendingDataSize: settingsArg.maxPendingDataSize || 10 * 1024 * 1024,
37
+ disableInactivityCheck: settingsArg.disableInactivityCheck || false,
38
+ enableKeepAliveProbes: settingsArg.enableKeepAliveProbes !== undefined ? settingsArg.enableKeepAliveProbes : true,
39
+ enableDetailedLogging: settingsArg.enableDetailedLogging || false,
40
+ enableTlsDebugLogging: settingsArg.enableTlsDebugLogging || false,
41
+ enableRandomizedTimeouts: settingsArg.enableRandomizedTimeouts || false,
42
+ allowSessionTicket: settingsArg.allowSessionTicket !== undefined ? settingsArg.allowSessionTicket : true,
43
+ maxConnectionsPerIP: settingsArg.maxConnectionsPerIP || 100,
44
+ connectionRateLimitPerMinute: settingsArg.connectionRateLimitPerMinute || 300,
45
+ keepAliveTreatment: settingsArg.keepAliveTreatment || 'extended',
46
+ keepAliveInactivityMultiplier: settingsArg.keepAliveInactivityMultiplier || 6,
47
+ extendedKeepAliveLifetime: settingsArg.extendedKeepAliveLifetime || 7 * 24 * 60 * 60 * 1000,
48
+ networkProxyPort: settingsArg.networkProxyPort || 8443,
49
+ port80HandlerConfig: settingsArg.port80HandlerConfig || {},
50
+ globalPortRanges: settingsArg.globalPortRanges || [],
51
+ };
52
+ // Set port80HandlerConfig defaults, using legacy acme config if available
53
+ if (!this.settings.port80HandlerConfig || Object.keys(this.settings.port80HandlerConfig).length === 0) {
54
+ if (this.settings.acme) {
55
+ // Migrate from legacy acme config
56
+ this.settings.port80HandlerConfig = {
57
+ enabled: this.settings.acme.enabled,
58
+ port: this.settings.acme.port || 80,
59
+ contactEmail: this.settings.acme.contactEmail || 'admin@example.com',
60
+ useProduction: this.settings.acme.useProduction || false,
61
+ renewThresholdDays: this.settings.acme.renewThresholdDays || 30,
62
+ autoRenew: this.settings.acme.autoRenew !== false, // Default to true
63
+ certificateStore: this.settings.acme.certificateStore || './certs',
64
+ skipConfiguredCerts: this.settings.acme.skipConfiguredCerts || false,
65
+ httpsRedirectPort: this.settings.fromPort,
66
+ renewCheckIntervalHours: 24
67
+ };
68
+ }
69
+ else {
70
+ // Set defaults if no config provided
71
+ this.settings.port80HandlerConfig = {
72
+ enabled: false,
73
+ port: 80,
74
+ contactEmail: 'admin@example.com',
75
+ useProduction: false,
76
+ renewThresholdDays: 30,
77
+ autoRenew: true,
78
+ certificateStore: './certs',
79
+ skipConfiguredCerts: false,
80
+ httpsRedirectPort: this.settings.fromPort,
81
+ renewCheckIntervalHours: 24
82
+ };
83
+ }
84
+ }
85
+ // Initialize component managers
86
+ this.timeoutManager = new TimeoutManager(this.settings);
87
+ this.securityManager = new SecurityManager(this.settings);
88
+ this.connectionManager = new ConnectionManager(this.settings, this.securityManager, this.timeoutManager);
89
+ this.domainConfigManager = new DomainConfigManager(this.settings);
90
+ this.tlsManager = new TlsManager(this.settings);
91
+ this.networkProxyBridge = new NetworkProxyBridge(this.settings);
92
+ this.portRangeManager = new PortRangeManager(this.settings);
93
+ // Initialize connection handler
94
+ this.connectionHandler = new ConnectionHandler(this.settings, this.connectionManager, this.securityManager, this.domainConfigManager, this.tlsManager, this.networkProxyBridge, this.timeoutManager, this.portRangeManager);
95
+ }
96
+ /**
97
+ * Initialize the Port80Handler for ACME certificate management
98
+ */
99
+ async initializePort80Handler() {
100
+ const config = this.settings.port80HandlerConfig;
101
+ if (!config || !config.enabled) {
102
+ console.log('Port80Handler is disabled in configuration');
103
+ return;
104
+ }
105
+ try {
106
+ // Ensure the certificate store directory exists
107
+ if (config.certificateStore) {
108
+ const certStorePath = path.resolve(config.certificateStore);
109
+ if (!fs.existsSync(certStorePath)) {
110
+ fs.mkdirSync(certStorePath, { recursive: true });
111
+ console.log(`Created certificate store directory: ${certStorePath}`);
112
+ }
113
+ }
114
+ // Create Port80Handler with options from config
115
+ this.port80Handler = new Port80Handler({
116
+ port: config.port,
117
+ contactEmail: config.contactEmail,
118
+ useProduction: config.useProduction,
119
+ renewThresholdDays: config.renewThresholdDays,
120
+ httpsRedirectPort: config.httpsRedirectPort || this.settings.fromPort,
121
+ renewCheckIntervalHours: config.renewCheckIntervalHours,
122
+ enabled: config.enabled,
123
+ autoRenew: config.autoRenew,
124
+ certificateStore: config.certificateStore,
125
+ skipConfiguredCerts: config.skipConfiguredCerts
126
+ });
127
+ // Register domain forwarding configurations
128
+ if (config.domainForwards) {
129
+ for (const forward of config.domainForwards) {
130
+ this.port80Handler.addDomain({
131
+ domainName: forward.domain,
132
+ sslRedirect: true,
133
+ acmeMaintenance: true,
134
+ forward: forward.forwardConfig,
135
+ acmeForward: forward.acmeForwardConfig
136
+ });
137
+ console.log(`Registered domain forwarding for ${forward.domain}`);
138
+ }
139
+ }
140
+ // Register all non-wildcard domains from domain configs
141
+ for (const domainConfig of this.settings.domainConfigs) {
142
+ for (const domain of domainConfig.domains) {
143
+ // Skip wildcards
144
+ if (domain.includes('*'))
145
+ continue;
146
+ this.port80Handler.addDomain({
147
+ domainName: domain,
148
+ sslRedirect: true,
149
+ acmeMaintenance: true
150
+ });
151
+ console.log(`Registered domain ${domain} with Port80Handler`);
152
+ }
153
+ }
154
+ // Set up event listeners
155
+ this.port80Handler.on(Port80HandlerEvents.CERTIFICATE_ISSUED, (certData) => {
156
+ console.log(`Certificate issued for ${certData.domain}, valid until ${certData.expiryDate.toISOString()}`);
157
+ });
158
+ this.port80Handler.on(Port80HandlerEvents.CERTIFICATE_RENEWED, (certData) => {
159
+ console.log(`Certificate renewed for ${certData.domain}, valid until ${certData.expiryDate.toISOString()}`);
160
+ });
161
+ this.port80Handler.on(Port80HandlerEvents.CERTIFICATE_FAILED, (failureData) => {
162
+ console.log(`Certificate ${failureData.isRenewal ? 'renewal' : 'issuance'} failed for ${failureData.domain}: ${failureData.error}`);
163
+ });
164
+ this.port80Handler.on(Port80HandlerEvents.CERTIFICATE_EXPIRING, (expiryData) => {
165
+ console.log(`Certificate for ${expiryData.domain} is expiring in ${expiryData.daysRemaining} days`);
166
+ });
167
+ // Share Port80Handler with NetworkProxyBridge
168
+ this.networkProxyBridge.setPort80Handler(this.port80Handler);
169
+ // Start Port80Handler
170
+ await this.port80Handler.start();
171
+ console.log(`Port80Handler started on port ${config.port}`);
172
+ }
173
+ catch (err) {
174
+ console.log(`Error initializing Port80Handler: ${err}`);
175
+ }
176
+ }
177
+ /**
178
+ * Start the proxy server
179
+ */
180
+ async start() {
181
+ // Don't start if already shutting down
182
+ if (this.isShuttingDown) {
183
+ console.log("Cannot start PortProxy while it's shutting down");
184
+ return;
185
+ }
186
+ // Initialize Port80Handler if enabled
187
+ await this.initializePort80Handler();
188
+ // Initialize and start NetworkProxy if needed
189
+ if (this.settings.useNetworkProxy &&
190
+ this.settings.useNetworkProxy.length > 0) {
191
+ await this.networkProxyBridge.initialize();
192
+ await this.networkProxyBridge.start();
193
+ }
194
+ // Validate port configuration
195
+ const configWarnings = this.portRangeManager.validateConfiguration();
196
+ if (configWarnings.length > 0) {
197
+ console.log("Port configuration warnings:");
198
+ for (const warning of configWarnings) {
199
+ console.log(` - ${warning}`);
200
+ }
201
+ }
202
+ // Get listening ports from PortRangeManager
203
+ const listeningPorts = this.portRangeManager.getListeningPorts();
204
+ // Create servers for each port
205
+ for (const port of listeningPorts) {
206
+ const server = plugins.net.createServer((socket) => {
207
+ // Check if shutting down
208
+ if (this.isShuttingDown) {
209
+ socket.end();
210
+ socket.destroy();
211
+ return;
212
+ }
213
+ // Delegate to connection handler
214
+ this.connectionHandler.handleConnection(socket);
215
+ }).on('error', (err) => {
216
+ console.log(`Server Error on port ${port}: ${err.message}`);
217
+ });
218
+ server.listen(port, () => {
219
+ const isNetworkProxyPort = this.settings.useNetworkProxy?.includes(port);
220
+ console.log(`PortProxy -> OK: Now listening on port ${port}${this.settings.sniEnabled && !isNetworkProxyPort ? ' (SNI passthrough enabled)' : ''}${isNetworkProxyPort ? ' (NetworkProxy forwarding enabled)' : ''}`);
221
+ });
222
+ this.netServers.push(server);
223
+ }
224
+ // Set up periodic connection logging and inactivity checks
225
+ this.connectionLogger = setInterval(() => {
226
+ // Immediately return if shutting down
227
+ if (this.isShuttingDown)
228
+ return;
229
+ // Perform inactivity check
230
+ this.connectionManager.performInactivityCheck();
231
+ // Log connection statistics
232
+ const now = Date.now();
233
+ let maxIncoming = 0;
234
+ let maxOutgoing = 0;
235
+ let tlsConnections = 0;
236
+ let nonTlsConnections = 0;
237
+ let completedTlsHandshakes = 0;
238
+ let pendingTlsHandshakes = 0;
239
+ let keepAliveConnections = 0;
240
+ let networkProxyConnections = 0;
241
+ // Get connection records for analysis
242
+ const connectionRecords = this.connectionManager.getConnections();
243
+ // Analyze active connections
244
+ for (const record of connectionRecords.values()) {
245
+ // Track connection stats
246
+ if (record.isTLS) {
247
+ tlsConnections++;
248
+ if (record.tlsHandshakeComplete) {
249
+ completedTlsHandshakes++;
250
+ }
251
+ else {
252
+ pendingTlsHandshakes++;
253
+ }
254
+ }
255
+ else {
256
+ nonTlsConnections++;
257
+ }
258
+ if (record.hasKeepAlive) {
259
+ keepAliveConnections++;
260
+ }
261
+ if (record.usingNetworkProxy) {
262
+ networkProxyConnections++;
263
+ }
264
+ maxIncoming = Math.max(maxIncoming, now - record.incomingStartTime);
265
+ if (record.outgoingStartTime) {
266
+ maxOutgoing = Math.max(maxOutgoing, now - record.outgoingStartTime);
267
+ }
268
+ }
269
+ // Get termination stats
270
+ const terminationStats = this.connectionManager.getTerminationStats();
271
+ // Log detailed stats
272
+ console.log(`Active connections: ${connectionRecords.size}. ` +
273
+ `Types: TLS=${tlsConnections} (Completed=${completedTlsHandshakes}, Pending=${pendingTlsHandshakes}), ` +
274
+ `Non-TLS=${nonTlsConnections}, KeepAlive=${keepAliveConnections}, NetworkProxy=${networkProxyConnections}. ` +
275
+ `Longest running: IN=${plugins.prettyMs(maxIncoming)}, OUT=${plugins.prettyMs(maxOutgoing)}. ` +
276
+ `Termination stats: ${JSON.stringify({
277
+ IN: terminationStats.incoming,
278
+ OUT: terminationStats.outgoing,
279
+ })}`);
280
+ }, this.settings.inactivityCheckInterval || 60000);
281
+ // Make sure the interval doesn't keep the process alive
282
+ if (this.connectionLogger.unref) {
283
+ this.connectionLogger.unref();
284
+ }
285
+ }
286
+ /**
287
+ * Stop the proxy server
288
+ */
289
+ async stop() {
290
+ console.log('PortProxy shutting down...');
291
+ this.isShuttingDown = true;
292
+ // Stop the Port80Handler if running
293
+ if (this.port80Handler) {
294
+ try {
295
+ await this.port80Handler.stop();
296
+ console.log('Port80Handler stopped');
297
+ this.port80Handler = null;
298
+ }
299
+ catch (err) {
300
+ console.log(`Error stopping Port80Handler: ${err}`);
301
+ }
302
+ }
303
+ // Stop accepting new connections
304
+ const closeServerPromises = this.netServers.map((server) => new Promise((resolve) => {
305
+ if (!server.listening) {
306
+ resolve();
307
+ return;
308
+ }
309
+ server.close((err) => {
310
+ if (err) {
311
+ console.log(`Error closing server: ${err.message}`);
312
+ }
313
+ resolve();
314
+ });
315
+ }));
316
+ // Stop the connection logger
317
+ if (this.connectionLogger) {
318
+ clearInterval(this.connectionLogger);
319
+ this.connectionLogger = null;
320
+ }
321
+ // Wait for servers to close
322
+ await Promise.all(closeServerPromises);
323
+ console.log('All servers closed. Cleaning up active connections...');
324
+ // Clean up all active connections
325
+ this.connectionManager.clearConnections();
326
+ // Stop NetworkProxy
327
+ await this.networkProxyBridge.stop();
328
+ // Clear all servers
329
+ this.netServers = [];
330
+ console.log('PortProxy shutdown complete.');
331
+ }
332
+ /**
333
+ * Updates the domain configurations for the proxy
334
+ */
335
+ async updateDomainConfigs(newDomainConfigs) {
336
+ console.log(`Updating domain configurations (${newDomainConfigs.length} configs)`);
337
+ // Update domain configs in DomainConfigManager
338
+ this.domainConfigManager.updateDomainConfigs(newDomainConfigs);
339
+ // If NetworkProxy is initialized, resync the configurations
340
+ if (this.networkProxyBridge.getNetworkProxy()) {
341
+ await this.networkProxyBridge.syncDomainConfigsToNetworkProxy();
342
+ }
343
+ // If Port80Handler is running, register non-wildcard domains
344
+ if (this.port80Handler && this.settings.port80HandlerConfig?.enabled) {
345
+ for (const domainConfig of newDomainConfigs) {
346
+ for (const domain of domainConfig.domains) {
347
+ // Skip wildcards
348
+ if (domain.includes('*'))
349
+ continue;
350
+ this.port80Handler.addDomain({
351
+ domainName: domain,
352
+ sslRedirect: true,
353
+ acmeMaintenance: true
354
+ });
355
+ }
356
+ }
357
+ console.log('Registered non-wildcard domains with Port80Handler');
358
+ }
359
+ }
360
+ /**
361
+ * Updates the Port80Handler configuration
362
+ */
363
+ async updatePort80HandlerConfig(config) {
364
+ if (!config)
365
+ return;
366
+ console.log('Updating Port80Handler configuration');
367
+ // Update the settings
368
+ this.settings.port80HandlerConfig = {
369
+ ...this.settings.port80HandlerConfig,
370
+ ...config
371
+ };
372
+ // Check if we need to restart Port80Handler
373
+ let needsRestart = false;
374
+ // Restart if enabled state changed
375
+ if (this.port80Handler && config.enabled === false) {
376
+ needsRestart = true;
377
+ }
378
+ else if (!this.port80Handler && config.enabled === true) {
379
+ needsRestart = true;
380
+ }
381
+ else if (this.port80Handler && (config.port !== undefined ||
382
+ config.contactEmail !== undefined ||
383
+ config.useProduction !== undefined ||
384
+ config.renewThresholdDays !== undefined ||
385
+ config.renewCheckIntervalHours !== undefined)) {
386
+ // Restart if critical settings changed
387
+ needsRestart = true;
388
+ }
389
+ if (needsRestart) {
390
+ // Stop if running
391
+ if (this.port80Handler) {
392
+ try {
393
+ await this.port80Handler.stop();
394
+ this.port80Handler = null;
395
+ console.log('Stopped Port80Handler for configuration update');
396
+ }
397
+ catch (err) {
398
+ console.log(`Error stopping Port80Handler: ${err}`);
399
+ }
400
+ }
401
+ // Start with new config if enabled
402
+ if (this.settings.port80HandlerConfig.enabled) {
403
+ await this.initializePort80Handler();
404
+ console.log('Restarted Port80Handler with new configuration');
405
+ }
406
+ }
407
+ else if (this.port80Handler) {
408
+ // Just update domain forwards if they changed
409
+ if (config.domainForwards) {
410
+ for (const forward of config.domainForwards) {
411
+ this.port80Handler.addDomain({
412
+ domainName: forward.domain,
413
+ sslRedirect: true,
414
+ acmeMaintenance: true,
415
+ forward: forward.forwardConfig,
416
+ acmeForward: forward.acmeForwardConfig
417
+ });
418
+ }
419
+ console.log('Updated domain forwards in Port80Handler');
420
+ }
421
+ }
422
+ }
423
+ /**
424
+ * Request a certificate for a specific domain
425
+ */
426
+ async requestCertificate(domain) {
427
+ // Validate domain format
428
+ if (!this.isValidDomain(domain)) {
429
+ console.log(`Invalid domain format: ${domain}`);
430
+ return false;
431
+ }
432
+ // Use Port80Handler if available
433
+ if (this.port80Handler) {
434
+ try {
435
+ // Check if we already have a certificate
436
+ const cert = this.port80Handler.getCertificate(domain);
437
+ if (cert) {
438
+ console.log(`Certificate already exists for ${domain}, valid until ${cert.expiryDate.toISOString()}`);
439
+ return true;
440
+ }
441
+ // Register domain for certificate issuance
442
+ this.port80Handler.addDomain({
443
+ domainName: domain,
444
+ sslRedirect: true,
445
+ acmeMaintenance: true
446
+ });
447
+ console.log(`Domain ${domain} registered for certificate issuance`);
448
+ return true;
449
+ }
450
+ catch (err) {
451
+ console.log(`Error registering domain with Port80Handler: ${err}`);
452
+ return false;
453
+ }
454
+ }
455
+ // Fall back to NetworkProxyBridge
456
+ return this.networkProxyBridge.requestCertificate(domain);
457
+ }
458
+ /**
459
+ * Validates if a domain name is valid for certificate issuance
460
+ */
461
+ isValidDomain(domain) {
462
+ // Very basic domain validation
463
+ if (!domain || domain.length === 0) {
464
+ return false;
465
+ }
466
+ // Check for wildcard domains (they can't get ACME certs)
467
+ if (domain.includes('*')) {
468
+ console.log(`Wildcard domains like "${domain}" are not supported for ACME certificates`);
469
+ return false;
470
+ }
471
+ // Check if domain has at least one dot and no invalid characters
472
+ const validDomainRegex = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
473
+ if (!validDomainRegex.test(domain)) {
474
+ console.log(`Domain "${domain}" has invalid format`);
475
+ return false;
476
+ }
477
+ return true;
478
+ }
479
+ /**
480
+ * Get statistics about current connections
481
+ */
482
+ getStatistics() {
483
+ const connectionRecords = this.connectionManager.getConnections();
484
+ const terminationStats = this.connectionManager.getTerminationStats();
485
+ let tlsConnections = 0;
486
+ let nonTlsConnections = 0;
487
+ let keepAliveConnections = 0;
488
+ let networkProxyConnections = 0;
489
+ // Analyze active connections
490
+ for (const record of connectionRecords.values()) {
491
+ if (record.isTLS)
492
+ tlsConnections++;
493
+ else
494
+ nonTlsConnections++;
495
+ if (record.hasKeepAlive)
496
+ keepAliveConnections++;
497
+ if (record.usingNetworkProxy)
498
+ networkProxyConnections++;
499
+ }
500
+ return {
501
+ activeConnections: connectionRecords.size,
502
+ tlsConnections,
503
+ nonTlsConnections,
504
+ keepAliveConnections,
505
+ networkProxyConnections,
506
+ terminationStats,
507
+ acmeEnabled: !!this.port80Handler,
508
+ port80HandlerPort: this.port80Handler ? this.settings.port80HandlerConfig?.port : null
509
+ };
510
+ }
511
+ /**
512
+ * Get a list of eligible domains for ACME certificates
513
+ */
514
+ getEligibleDomainsForCertificates() {
515
+ // Collect all non-wildcard domains from domain configs
516
+ const domains = [];
517
+ for (const config of this.settings.domainConfigs) {
518
+ // Skip domains that can't be used with ACME
519
+ const eligibleDomains = config.domains.filter(domain => !domain.includes('*') && this.isValidDomain(domain));
520
+ domains.push(...eligibleDomains);
521
+ }
522
+ return domains;
523
+ }
524
+ /**
525
+ * Get status of certificates managed by Port80Handler
526
+ */
527
+ getCertificateStatus() {
528
+ if (!this.port80Handler) {
529
+ return {
530
+ enabled: false,
531
+ message: 'Port80Handler is not enabled'
532
+ };
533
+ }
534
+ // Get eligible domains
535
+ const eligibleDomains = this.getEligibleDomainsForCertificates();
536
+ const certificateStatus = {};
537
+ // Check each domain
538
+ for (const domain of eligibleDomains) {
539
+ const cert = this.port80Handler.getCertificate(domain);
540
+ if (cert) {
541
+ const now = new Date();
542
+ const expiryDate = cert.expiryDate;
543
+ const daysRemaining = Math.floor((expiryDate.getTime() - now.getTime()) / (24 * 60 * 60 * 1000));
544
+ certificateStatus[domain] = {
545
+ status: 'valid',
546
+ expiryDate: expiryDate.toISOString(),
547
+ daysRemaining,
548
+ renewalNeeded: daysRemaining <= this.settings.port80HandlerConfig.renewThresholdDays
549
+ };
550
+ }
551
+ else {
552
+ certificateStatus[domain] = {
553
+ status: 'missing',
554
+ message: 'No certificate found'
555
+ };
556
+ }
557
+ }
558
+ return {
559
+ enabled: true,
560
+ port: this.settings.port80HandlerConfig.port,
561
+ useProduction: this.settings.port80HandlerConfig.useProduction,
562
+ autoRenew: this.settings.port80HandlerConfig.autoRenew,
563
+ certificates: certificateStatus
564
+ };
565
+ }
566
+ }
567
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.smartproxy.js","sourceRoot":"","sources":["../../ts/smartproxy/classes.smartproxy.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "5.0.0",
3
+ "version": "6.0.0",
4
4
  "private": false,
5
5
  "description": "A powerful proxy package that effectively handles high traffic, with features such as SSL/TLS support, port proxying, WebSocket handling, dynamic routing with authentication options, and automatic ACME certificate management.",
6
6
  "main": "dist_ts/index.js",