@push.rocks/smartproxy 10.0.9 → 10.0.11

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 (14) hide show
  1. package/dist_ts/00_commitinfo_data.js +2 -2
  2. package/dist_ts/common/types.d.ts +1 -1
  3. package/dist_ts/networkproxy/classes.np.certificatemanager.js +1 -1
  4. package/dist_ts/networkproxy/classes.np.networkproxy.js +1 -1
  5. package/dist_ts/port80handler/classes.port80handler.js +4 -4
  6. package/dist_ts/smartproxy/classes.smartproxy.js +1 -1
  7. package/package.json +3 -3
  8. package/readme.md +2 -2
  9. package/ts/00_commitinfo_data.ts +1 -1
  10. package/ts/common/types.ts +1 -1
  11. package/ts/networkproxy/classes.np.certificatemanager.ts +1 -1
  12. package/ts/networkproxy/classes.np.networkproxy.ts +1 -1
  13. package/ts/port80handler/classes.port80handler.ts +3 -3
  14. package/ts/smartproxy/classes.smartproxy.ts +1 -1
package/dist_ts/00_commitinfo_data.js CHANGED
@@ -3,7 +3,7 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '10.0.9',
6
+ version: '10.0.11',
7
7
  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.'
8
8
  };
9
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFFBQVE7SUFDakIsV0FBVyxFQUFFLG1PQUFtTztDQUNqUCxDQUFBIn0=
9
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSx3QkFBd0I7SUFDOUIsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLG1PQUFtTztDQUNqUCxDQUFBIn0=
package/dist_ts/common/types.d.ts CHANGED
@@ -68,9 +68,9 @@ export interface IDomainForwardConfig {
68
68
  * Unified ACME configuration options used across proxies and handlers
69
69
  */
70
70
  export interface IAcmeOptions {
71
+ accountEmail?: string;
71
72
  enabled?: boolean;
72
73
  port?: number;
73
- contactEmail?: string;
74
74
  useProduction?: boolean;
75
75
  httpsRedirectPort?: number;
76
76
  renewThresholdDays?: number;
package/dist_ts/networkproxy/classes.np.certificatemanager.js CHANGED
@@ -312,7 +312,7 @@ export class CertificateManager {
312
312
  // Build and configure Port80Handler
313
313
  this.port80Handler = buildPort80Handler({
314
314
  port: this.options.acme.port,
315
- contactEmail: this.options.acme.contactEmail,
315
+ accountEmail: this.options.acme.accountEmail,
316
316
  useProduction: this.options.acme.useProduction,
317
317
  httpsRedirectPort: this.options.port, // Redirect to our HTTPS port
318
318
  enabled: this.options.acme.enabled,
package/dist_ts/networkproxy/classes.np.networkproxy.js CHANGED
@@ -54,7 +54,7 @@ export class NetworkProxy {
54
54
  acme: {
55
55
  enabled: optionsArg.acme?.enabled || false,
56
56
  port: optionsArg.acme?.port || 80,
57
- contactEmail: optionsArg.acme?.contactEmail || 'admin@example.com',
57
+ accountEmail: optionsArg.acme?.accountEmail || 'admin@example.com',
58
58
  useProduction: optionsArg.acme?.useProduction || false, // Default to staging for safety
59
59
  renewThresholdDays: optionsArg.acme?.renewThresholdDays || 30,
60
60
  autoRenew: optionsArg.acme?.autoRenew !== false, // Default to true
package/dist_ts/port80handler/classes.port80handler.js CHANGED
@@ -67,7 +67,7 @@ export class Port80Handler extends plugins.EventEmitter {
67
67
  // Default options
68
68
  this.options = {
69
69
  port: options.port ?? 80,
70
- contactEmail: options.contactEmail ?? 'admin@example.com',
70
+ accountEmail: options.accountEmail ?? 'admin@example.com',
71
71
  useProduction: options.useProduction ?? false, // Safer default: staging
72
72
  httpsRedirectPort: options.httpsRedirectPort ?? 443,
73
73
  enabled: options.enabled ?? true, // Enable by default
@@ -97,8 +97,8 @@ export class Port80Handler extends plugins.EventEmitter {
97
97
  // Initialize SmartAcme for ACME challenge management (diskless HTTP handler)
98
98
  if (this.options.enabled) {
99
99
  this.smartAcme = new plugins.smartacme.SmartAcme({
100
- accountEmail: this.options.contactEmail,
101
- certManager: new plugins.smartacme.MemoryCertManager(),
100
+ accountEmail: this.options.accountEmail,
101
+ certManager: new plugins.smartacme.certmanagers.MemoryCertManager(),
102
102
  environment: this.options.useProduction ? 'production' : 'integration',
103
103
  challengeHandlers: [new DisklessHttp01Handler(this.acmeHttp01Storage)],
104
104
  challengePriority: ['http-01'],
@@ -646,4 +646,4 @@ export class Port80Handler extends plugins.EventEmitter {
646
646
  await this.obtainCertificate(domain, true);
647
647
  }
648
648
  }
649
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.port80handler.js","sourceRoot":"","sources":["../../ts/port80handler/classes.port80handler.ts"],"names":[],"mappings":"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"}
649
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.port80handler.js","sourceRoot":"","sources":["../../ts/port80handler/classes.port80handler.ts"],"names":[],"mappings":"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"}
package/dist_ts/smartproxy/classes.smartproxy.js CHANGED
@@ -55,7 +55,7 @@ export class SmartProxy extends plugins.EventEmitter {
55
55
  this.settings.acme = {
56
56
  enabled: false,
57
57
  port: 80,
58
- contactEmail: 'admin@example.com',
58
+ accountEmail: 'admin@example.com',
59
59
  useProduction: false,
60
60
  renewThresholdDays: 30,
61
61
  autoRenew: true,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@push.rocks/smartproxy",
3
- "version": "10.0.9",
3
+ "version": "10.0.11",
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",
@@ -18,14 +18,14 @@
18
18
  },
19
19
  "dependencies": {
20
20
  "@push.rocks/lik": "^6.2.2",
21
- "@push.rocks/smartacme": "^7.2.4",
21
+ "@push.rocks/smartacme": "^7.2.5",
22
22
  "@push.rocks/smartdelay": "^3.0.5",
23
23
  "@push.rocks/smartnetwork": "^4.0.1",
24
24
  "@push.rocks/smartpromise": "^4.2.3",
25
25
  "@push.rocks/smartrequest": "^2.1.0",
26
26
  "@push.rocks/smartstring": "^4.0.15",
27
27
  "@push.rocks/taskbuffer": "^3.1.7",
28
- "@tsclass/tsclass": "^9.1.0",
28
+ "@tsclass/tsclass": "^9.2.0",
29
29
  "@types/minimatch": "^5.1.2",
30
30
  "@types/ws": "^8.18.1",
31
31
  "minimatch": "^10.0.1",
package/readme.md CHANGED
@@ -384,7 +384,7 @@ Listen for certificate events via EventEmitter:
384
384
  - **SmartProxy**:
385
385
  - `certificate` (domain, publicKey, privateKey, expiryDate, source, isRenewal)
386
386
 
387
- Provide a `certProviderFunction(domain)` in SmartProxy settings to supply static certs or return `'http01'`.
387
+ Provide a `certProvisionFunction(domain)` in SmartProxy settings to supply static certs or return `'http01'`.
388
388
 
389
389
  ## Configuration Options
390
390
 
@@ -429,7 +429,7 @@ Provide a `certProviderFunction(domain)` in SmartProxy settings to supply static
429
429
  - `sniEnabled`, `defaultAllowedIPs`, `preserveSourceIP` (booleans)
430
430
  - Timeouts: `initialDataTimeout`, `socketTimeout`, `inactivityTimeout`, etc.
431
431
  - Socket opts: `noDelay`, `keepAlive`, `enableKeepAliveProbes`
432
- - `acme` (IAcmeOptions), `certProviderFunction` (callback)
432
+ - `acme` (IAcmeOptions), `certProvisionFunction` (callback)
433
433
  - `useNetworkProxy` (number[]), `networkProxyPort` (number)
434
434
 
435
435
  ## Troubleshooting
package/ts/00_commitinfo_data.ts CHANGED
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '10.0.9',
6
+ version: '10.0.11',
7
7
  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.'
8
8
  }
package/ts/common/types.ts CHANGED
@@ -77,9 +77,9 @@ export interface IDomainForwardConfig {
77
77
  * Unified ACME configuration options used across proxies and handlers
78
78
  */
79
79
  export interface IAcmeOptions {
80
+ accountEmail?: string; // Email for Let's Encrypt account
80
81
  enabled?: boolean; // Whether ACME is enabled
81
82
  port?: number; // Port to listen on for ACME challenges (default: 80)
82
- contactEmail?: string; // Email for Let's Encrypt account
83
83
  useProduction?: boolean; // Use production environment (default: staging)
84
84
  httpsRedirectPort?: number; // Port to redirect HTTP requests to HTTPS (default: 443)
85
85
  renewThresholdDays?: number; // Days before expiry to renew certificates
package/ts/networkproxy/classes.np.certificatemanager.ts CHANGED
@@ -357,7 +357,7 @@ export class CertificateManager {
357
357
  // Build and configure Port80Handler
358
358
  this.port80Handler = buildPort80Handler({
359
359
  port: this.options.acme.port,
360
- contactEmail: this.options.acme.contactEmail,
360
+ accountEmail: this.options.acme.accountEmail,
361
361
  useProduction: this.options.acme.useProduction,
362
362
  httpsRedirectPort: this.options.port, // Redirect to our HTTPS port
363
363
  enabled: this.options.acme.enabled,
package/ts/networkproxy/classes.np.networkproxy.ts CHANGED
@@ -76,7 +76,7 @@ export class NetworkProxy implements IMetricsTracker {
76
76
  acme: {
77
77
  enabled: optionsArg.acme?.enabled || false,
78
78
  port: optionsArg.acme?.port || 80,
79
- contactEmail: optionsArg.acme?.contactEmail || 'admin@example.com',
79
+ accountEmail: optionsArg.acme?.accountEmail || 'admin@example.com',
80
80
  useProduction: optionsArg.acme?.useProduction || false, // Default to staging for safety
81
81
  renewThresholdDays: optionsArg.acme?.renewThresholdDays || 30,
82
82
  autoRenew: optionsArg.acme?.autoRenew !== false, // Default to true
package/ts/port80handler/classes.port80handler.ts CHANGED
@@ -101,7 +101,7 @@ export class Port80Handler extends plugins.EventEmitter {
101
101
  // Default options
102
102
  this.options = {
103
103
  port: options.port ?? 80,
104
- contactEmail: options.contactEmail ?? 'admin@example.com',
104
+ accountEmail: options.accountEmail ?? 'admin@example.com',
105
105
  useProduction: options.useProduction ?? false, // Safer default: staging
106
106
  httpsRedirectPort: options.httpsRedirectPort ?? 443,
107
107
  enabled: options.enabled ?? true, // Enable by default
@@ -134,8 +134,8 @@ export class Port80Handler extends plugins.EventEmitter {
134
134
  // Initialize SmartAcme for ACME challenge management (diskless HTTP handler)
135
135
  if (this.options.enabled) {
136
136
  this.smartAcme = new plugins.smartacme.SmartAcme({
137
- accountEmail: this.options.contactEmail,
138
- certManager: new plugins.smartacme.MemoryCertManager(),
137
+ accountEmail: this.options.accountEmail,
138
+ certManager: new plugins.smartacme.certmanagers.MemoryCertManager(),
139
139
  environment: this.options.useProduction ? 'production' : 'integration',
140
140
  challengeHandlers: [ new DisklessHttp01Handler(this.acmeHttp01Storage) ],
141
141
  challengePriority: ['http-01'],
package/ts/smartproxy/classes.smartproxy.ts CHANGED
@@ -78,7 +78,7 @@ export class SmartProxy extends plugins.EventEmitter {
78
78
  this.settings.acme = {
79
79
  enabled: false,
80
80
  port: 80,
81
- contactEmail: 'admin@example.com',
81
+ accountEmail: 'admin@example.com',
82
82
  useProduction: false,
83
83
  renewThresholdDays: 30,
84
84
  autoRenew: true,