@push.rocks/smartproxy 19.5.2 → 19.5.3

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.
@@ -161,9 +161,10 @@ export class RouteManager extends plugins.EventEmitter {
161
161
  }
162
162
  /**
163
163
  * Check if a client IP is allowed by a route's security settings
164
+ * @deprecated Security is now checked in route-connection-handler.ts after route matching
164
165
  */
165
166
  isClientIpAllowed(route, clientIp) {
166
- const security = route.action.security;
167
+ const security = route.security;
167
168
  if (!security) {
168
169
  return true; // No security settings means allowed
169
170
  }
@@ -258,14 +259,14 @@ export class RouteManager extends plugins.EventEmitter {
258
259
  * Find the matching route for a connection
259
260
  */
260
261
  findMatchingRoute(options) {
261
- const { port, domain, clientIp, path, tlsVersion } = options;
262
+ const { port, domain, clientIp, path, tlsVersion, skipDomainCheck } = options;
262
263
  // Get all routes for this port
263
264
  const routesForPort = this.getRoutesForPort(port);
264
265
  // Find the first matching route based on priority order
265
266
  for (const route of routesForPort) {
266
267
  // Check domain match
267
268
  // If the route has domain restrictions and we have a domain to check
268
- if (route.match.domains) {
269
+ if (route.match.domains && !skipDomainCheck) {
269
270
  // If no domain was provided (non-TLS or no SNI), this route doesn't match
270
271
  if (!domain) {
271
272
  continue;
@@ -276,6 +277,7 @@ export class RouteManager extends plugins.EventEmitter {
276
277
  }
277
278
  }
278
279
  // If route has no domain restrictions, it matches all domains
280
+ // If skipDomainCheck is true, we skip domain validation for HTTP connections
279
281
  // Check path match if specified in both route and request
280
282
  if (path && route.match.path) {
281
283
  if (!this.matchPath(route.match.path, path)) {
@@ -291,11 +293,8 @@ export class RouteManager extends plugins.EventEmitter {
291
293
  !route.match.tlsVersion.includes(tlsVersion)) {
292
294
  continue;
293
295
  }
294
- // Check security settings
295
- if (!this.isClientIpAllowed(route, clientIp)) {
296
- continue;
297
- }
298
296
  // All checks passed, this route matches
297
+ // NOTE: Security is checked AFTER route matching in route-connection-handler.ts
299
298
  return { route };
300
299
  }
301
300
  return null;
@@ -451,4 +450,4 @@ export class RouteManager extends plugins.EventEmitter {
451
450
  return match1Points > match2Points;
452
451
  }
453
452
  }
454
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/route-manager.ts"],"names":[],"mappings":"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"}
453
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-manager.js","sourceRoot":"","sources":["../../../ts/proxies/smart-proxy/route-manager.ts"],"names":[],"mappings":"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"}
@@ -450,13 +450,6 @@ export function createNfTablesRoute(nameOrDomains, target, options = {}) {
450
450
  useAdvancedNAT: options.useAdvancedNAT
451
451
  }
452
452
  };
453
- // Add security if allowed or blocked IPs are specified
454
- if (options.ipAllowList?.length || options.ipBlockList?.length) {
455
- action.security = {
456
- ipAllowList: options.ipAllowList,
457
- ipBlockList: options.ipBlockList
458
- };
459
- }
460
453
  // Add TLS options if needed
461
454
  if (options.useTls) {
462
455
  action.tls = {
@@ -464,11 +457,19 @@ export function createNfTablesRoute(nameOrDomains, target, options = {}) {
464
457
  };
465
458
  }
466
459
  // Create the route config
467
- return {
460
+ const routeConfig = {
468
461
  name,
469
462
  match,
470
463
  action
471
464
  };
465
+ // Add security if allowed or blocked IPs are specified
466
+ if (options.ipAllowList?.length || options.ipBlockList?.length) {
467
+ routeConfig.security = {
468
+ ipAllowList: options.ipAllowList,
469
+ ipBlockList: options.ipBlockList
470
+ };
471
+ }
472
+ return routeConfig;
472
473
  }
473
474
  /**
474
475
  * Create an NFTables-based TLS termination route
@@ -761,4 +762,4 @@ export const SocketHandlers = {
761
762
  });
762
763
  }
763
764
  };
764
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-helpers.js","sourceRoot":"","sources":["../../../../ts/proxies/smart-proxy/utils/route-helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAG/C;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAC7B,OAA0B,EAC1B,MAAiD,EACjD,UAAiC,EAAE;IAEnC,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO;KACR,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM;KACP,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,kBAAkB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAC/F,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAA0B,EAC1B,MAAiD,EACjD,UAOI,EAAE;IAEN,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,SAAS,IAAI,GAAG;QAC/B,OAAO;KACR,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM;QACN,GAAG,EAAE;YACH,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,WAAW;YACjE,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,MAAM;SAC3C;KACF,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,mBAAmB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAChG,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAA0B,EAC1B,YAAoB,GAAG,EACvB,UAAiC,EAAE;IAEnC,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;QACjC,OAAO;KACR,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,gBAAgB;QACtB,aAAa,EAAE,cAAc,CAAC,YAAY,CAAC,oBAAoB,SAAS,QAAQ,EAAE,GAAG,CAAC;KACvF,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,8BAA8B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAC3G,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CACzC,OAA0B,EAC1B,MAAiD,EACjD,UAAiC,EAAE;IAEnC,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,GAAG;QAClC,OAAO;KACR,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM;QACN,GAAG,EAAE;YACH,IAAI,EAAE,aAAa;SACpB;KACF,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,yBAAyB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QACtG,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,yBAAyB,CACvC,OAA0B,EAC1B,MAAiD,EACjD,UAOI,EAAE;IAEN,yBAAyB;IACzB,MAAM,UAAU,GAAG,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IAEvE,iCAAiC;IACjC,MAAM,iBAAiB,GAAG,yBAAyB,CACjD,OAAO;IACP,qEAAqE;IACrE,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACzD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAC/D;QACE,oBAAoB;QACpB,KAAK,EAAE;YACL,KAAK,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;YAC7B,OAAO;SACR;QACD,IAAI,EAAE,8BAA8B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;KAC5F,CACF,CAAC;IAEF,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CACrC,OAA0B,EAC1B,KAAe,EACf,IAAY,EACZ,UAMI,EAAE;IAEN,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,OAAO;KACR,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,KAAK;QACX,IAAI;KACL,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM;KACP,CAAC;IAEF,oCAAoC;IACpC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAChB,MAAM,CAAC,GAAG,GAAG;YACX,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;YACtB,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,IAAI,MAAM;SAC/C,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,qBAAqB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAClG,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAC5B,OAA0B,EAC1B,OAAe,EACf,MAAiD,EACjD,UAQI,EAAE;IAEN,qBAAqB;IACrB,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IACzE,MAAM,gBAAgB,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC;QACnD,CAAC,CAAC,GAAG,cAAc,GAAG;QACtB,CAAC,CAAC,GAAG,cAAc,IAAI,CAAC;IAE1B,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,MAAM;YACnB,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC;YAC5B,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC5B,OAAO;QACP,IAAI,EAAE,gBAAgB;KACvB,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM;KACP,CAAC;IAEF,uCAAuC;IACvC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,GAAG,GAAG;YACX,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,MAAM;SAC3C,CAAC;IACJ,CAAC;IAED,gCAAgC;IAChC,MAAM,OAAO,GAA2C,EAAE,CAAC;IAC3D,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO,CAAC,QAAQ,GAAG;YACjB,6BAA6B,EAAE,GAAG;YAClC,8BAA8B,EAAE,iCAAiC;YACjE,8BAA8B,EAAE,6BAA6B;YAC7D,wBAAwB,EAAE,OAAO;SAClC,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QAC9D,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,aAAa,cAAc,QAAQ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QAChH,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG,EAAE,4CAA4C;QAC/E,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAA0B,EAC1B,MAAc,EACd,MAAiD,EACjD,UASI,EAAE;IAEN,2BAA2B;IAC3B,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC;IAEtE,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,MAAM;YACnB,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC;YAC5B,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC5B,OAAO;QACP,IAAI,EAAE,cAAc;KACrB,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM;QACN,SAAS,EAAE;YACT,OAAO,EAAE,IAAI;YACb,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,KAAK,EAAE,aAAa;YAC1D,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,IAAI,CAAI,YAAY;SACzD;KACF,CAAC;IAEF,uCAAuC;IACvC,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,GAAG,GAAG;YACX,IAAI,EAAE,WAAW;YACjB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,MAAM;SAC3C,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,mBAAmB,cAAc,QAAQ,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;QACtH,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG,EAAE,uCAAuC;QAC1E,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,MAAc;IAC7C,OAAO,CAAC,OAAsB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,MAAM,CAAC;AAC3D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAQtC;IACC,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,eAAe;QAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE;YACN,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,IAAI,EAAE,OAAO,CAAC,UAAU;SACzB;KACF,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,0BAA0B,OAAO,CAAC,OAAO,IAAI,aAAa,EAAE;QAClF,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAAC,OAQ5C;IACC,OAAO,sBAAsB,CAAC;QAC5B,eAAe,EAAE,OAAO,CAAC,KAAK;QAC9B,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM;QACtD,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,mBAAmB,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,CAAC,MAAM,SAAS,OAAO,CAAC,OAAO,IAAI,aAAa,EAAE;QAClI,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,GAAG,OAAO;KACX,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAUlC;IACC,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE;YACN,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,IAAI,EAAE,OAAO,CAAC,UAAU;SACzB;KACF,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,qBAAqB,OAAO,CAAC,OAAO,IAAI,aAAa,EAAE;QAC7E,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAQvC;IACC,uDAAuD;IACvD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnD,0CAA0C;IAC1C,MAAM,YAAY,GAAG,CAAC,OAAsB,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;QACpC,OAAO,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,aAAa,IAAI,WAAW,CAAC;IAC/E,CAAC,CAAC;IAEF,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO;KACR,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,OAAO,CAAC,UAAU;SACzB;KACF,CAAC;IAEF,0BAA0B;IAC1B,OAAO;QACL,KAAK;QACL,MAAM;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,2BAA2B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACrE,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,GAAG,OAAO;KACX,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CACjC,aAAgC,EAChC,MAAmD,EACnD,UAYI,EAAE;IAEN,wCAAwC;IACxC,IAAI,IAAY,CAAC;IACjB,IAAI,OAAsC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,aAAa,KAAK,QAAQ,IAAI,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACvG,OAAO,GAAG,aAAa,CAAC;QACxB,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IACzE,CAAC;SAAM,CAAC;QACN,IAAI,GAAG,aAAa,CAAC;QACrB,OAAO,GAAG,SAAS,CAAC,CAAC,aAAa;IACpC,CAAC;IAED,qBAAqB;IACrB,MAAM,KAAK,GAAgB;QACzB,OAAO;QACP,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE;KAC3B,CAAC;IAEF,sBAAsB;IACtB,MAAM,MAAM,GAAiB;QAC3B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE;YACN,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB;QACD,gBAAgB,EAAE,UAAU;QAC5B,QAAQ,EAAE;YACR,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,KAAK;YACnC,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,cAAc,EAAE,OAAO,CAAC,cAAc;SACvC;KACF,CAAC;IAEF,uDAAuD;IACvD,IAAI,OAAO,CAAC,WAAW,EAAE,MAAM,IAAI,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,CAAC;QAC/D,MAAM,CAAC,QAAQ,GAAG;YAChB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,WAAW,EAAE,OAAO,CAAC,WAAW;SACjC,CAAC;IACJ,CAAC;IAED,4BAA4B;IAC5B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,CAAC,GAAG,GAAG;YACX,IAAI,EAAE,aAAa;SACpB,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,OAAO;QACL,IAAI;QACJ,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B,CAC1C,aAAgC,EAChC,MAAmD,EACnD,UAYI,EAAE;IAEN,8BAA8B;IAC9B,MAAM,KAAK,GAAG,mBAAmB,CAC/B,aAAa,EACb,MAAM,EACN;QACE,GAAG,OAAO;QACV,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,GAAG;QAC3B,MAAM,EAAE,KAAK;KACd,CACF,CAAC;IAEF,sBAAsB;IACtB,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG;QACjB,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,MAAM;KAC3C,CAAC;IAEF,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iCAAiC,CAC/C,aAAgC,EAChC,MAAmD,EACnD,UAaI,EAAE;IAEN,wCAAwC;IACxC,MAAM,UAAU,GAAG,4BAA4B,CAC7C,aAAa,EACb,MAAM,EACN;QACE,GAAG,OAAO;QACV,KAAK,EAAE,OAAO,CAAC,SAAS,IAAI,GAAG;KAChC,CACF,CAAC;IAEF,4CAA4C;IAC5C,MAAM,OAAO,GAAG,OAAO,aAAa,KAAK,QAAQ,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC/E,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,aAAa,CAAC;IAElB,sDAAsD;IACtD,MAAM,SAAS,GAAG,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;QACrD,CAAC,CAAC,OAAO,CAAC,SAAS;QACnB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,QAAQ;YAC5E,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;YACtB,CAAC,CAAC,GAAG,CAAC;IAEV,+EAA+E;IAC/E,MAAM,iBAAiB,GAAG,yBAAyB,CACjD,OAAc,EAAE,sDAAsD;IACtE,SAAS,EACT;QACE,KAAK,EAAE;YACL,KAAK,EAAE,OAAO,CAAC,QAAQ,IAAI,EAAE;YAC7B,OAAO,EAAE,OAAc,CAAC,sDAAsD;SAC/E;QACD,IAAI,EAAE,8BAA8B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,IAAI,aAAa,EAAE;KAC7G,CACF,CAAC;IAEF,OAAO,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;AACzC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CACtC,OAA0B,EAC1B,KAAiB,EACjB,OAA6D,EAC7D,UAII,EAAE;IAEN,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,sBAAsB;QAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QAChE,KAAK,EAAE;YACL,OAAO;YACP,KAAK;YACL,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;SAC5C;QACD,MAAM,EAAE;YACN,IAAI,EAAE,gBAAgB;YACtB,aAAa,EAAE,OAAO;SACvB;KACF,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B;;OAEG;IACH,IAAI,EAAE,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QAC3D,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;OAEG;IACH,KAAK,EAAE,CAAC,UAAkB,EAAE,UAAkB,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QACxG,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;QAC3D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpB,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACzB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;YAC1C,MAAM,CAAC,OAAO,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,YAAY,EAAE,CAAC,OAA2D,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QACpI,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;YAC3B,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACnB,IAAI,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;oBAChB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC;gBAC/B,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,YAAY,EAAE,CAAC,UAAkB,EAAE,IAAY,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QACzG,MAAM,QAAQ,GAAG;YACf,YAAY,UAAU,IAAI,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;YAC/D,0BAA0B;YAC1B,mBAAmB,IAAI,CAAC,MAAM,EAAE;YAChC,mBAAmB;YACnB,EAAE;YACF,IAAI;SACL,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEf,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;IAED;;OAEG;IACH,KAAK,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QAClF,MAAM,YAAY,GAAG,OAAO,IAAI,2BAA2B,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9E,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC7B,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;IAED;;OAEG;IACH,SAAS,EAAE,CAAC,aAAqB,GAAG,EAAE,OAAgB,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QAChH,MAAM,cAAc,GAAG,wBAAwB,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACpF,MAAM,YAAY,GAAG,OAAO,IAAI,cAAc,CAAC;QAE/C,MAAM,QAAQ,GAAG;YACf,YAAY,UAAU,IAAI,YAAY,EAAE;YACxC,0BAA0B;YAC1B,mBAAmB,YAAY,CAAC,MAAM,EAAE;YACxC,mBAAmB;YACnB,EAAE;YACF,YAAY;SACb,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEf,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACvB,MAAM,CAAC,GAAG,EAAE,CAAC;IACf,CAAC;IAED;;OAEG;IACH,YAAY,EAAE,CAAC,gBAAwB,EAAE,aAAqB,GAAG,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QAC3H,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC3B,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE1B,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE9C,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,WAAW,CAAC;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YAE1B,IAAI,aAAa,GAAG,gBAAgB;iBACjC,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC;iBAC3B,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;iBAC/B,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC;iBACvB,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;YAE3C,MAAM,OAAO,GAAG,kBAAkB,aAAa,EAAE,CAAC;YAClD,MAAM,QAAQ,GAAG;gBACf,YAAY,UAAU,IAAI,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,OAAO,EAAE;gBAC9E,aAAa,aAAa,EAAE;gBAC5B,0BAA0B;gBAC1B,mBAAmB,OAAO,CAAC,MAAM,EAAE;gBACnC,mBAAmB;gBACnB,EAAE;gBACF,OAAO;aACR,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEf,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YACvB,MAAM,CAAC,GAAG,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,UAAU,EAAE,CAAC,OAA8O,EAAE,EAAE,CAAC,CAAC,MAA0B,EAAE,OAAsB,EAAE,EAAE;QACrT,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,aAAa,GAAG,KAAK,CAAC;QAE1B,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YACzB,IAAI,aAAa;gBAAE,OAAO,CAAC,gCAAgC;YAE3D,MAAM,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAE1B,2CAA2C;YAC3C,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAClD,IAAI,cAAc,KAAK,CAAC,CAAC;gBAAE,OAAO,CAAC,iBAAiB;YAEpD,aAAa,GAAG,IAAI,CAAC;YAErB,yBAAyB;YACzB,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;YAEtD,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACvC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAE1C,MAAM,OAAO,GAA2B,EAAE,CAAC;YAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACtC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBACzC,IAAI,UAAU,GAAG,CAAC,EAAE,CAAC;oBACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;oBACpE,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;oBACxD,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBACxB,CAAC;YACH,CAAC;YAED,wBAAwB;YACxB,MAAM,GAAG,GAAG;gBACV,MAAM,EAAE,MAAM,IAAI,KAAK;gBACvB,GAAG,EAAE,GAAG,IAAI,GAAG;gBACf,OAAO;gBACP,IAAI,EAAE,QAAQ;aACf,CAAC;YAEF,yBAAyB;YACzB,IAAI,UAAU,GAAG,GAAG,CAAC;YACrB,MAAM,eAAe,GAA2B,EAAE,CAAC;YACnD,IAAI,KAAK,GAAG,KAAK,CAAC;YAElB,MAAM,GAAG,GAAG;gBACV,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;oBACvB,UAAU,GAAG,IAAI,CAAC;gBACpB,CAAC;gBACD,MAAM,EAAE,CAAC,IAAY,EAAE,KAAa,EAAE,EAAE;oBACtC,eAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;gBAChC,CAAC;gBACD,IAAI,EAAE,CAAC,IAAY,EAAE,EAAE;oBACrB,IAAI,KAAK;wBAAE,OAAO;oBAClB,KAAK,GAAG,IAAI,CAAC;oBAEb,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,CAAC;wBACrC,eAAe,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC;oBACjD,CAAC;oBACD,eAAe,CAAC,gBAAgB,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;oBACxD,eAAe,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC;oBAExC,MAAM,UAAU,GAAG,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;wBAC7B,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;4BAClC,UAAU,KAAK,GAAG,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,UAAU,CAAC;oBAE3E,IAAI,QAAQ,GAAG,YAAY,UAAU,IAAI,UAAU,MAAM,CAAC;oBAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;wBAC5D,QAAQ,IAAI,GAAG,IAAI,KAAK,KAAK,MAAM,CAAC;oBACtC,CAAC;oBACD,QAAQ,IAAI,MAAM,CAAC;oBACnB,QAAQ,IAAI,IAAI,CAAC;oBAEjB,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBACvB,MAAM,CAAC,GAAG,EAAE,CAAC;gBACf,CAAC;gBACD,GAAG,EAAE,GAAG,EAAE;oBACR,IAAI,KAAK;wBAAE,OAAO;oBAClB,KAAK,GAAG,IAAI,CAAC;oBACb,MAAM,CAAC,KAAK,CAAC,mEAAmE,CAAC,CAAC;oBAClF,MAAM,CAAC,GAAG,EAAE,CAAC;gBACf,CAAC;aACF,CAAC;YAEF,IAAI,CAAC;gBACH,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAClB,8DAA8D;gBAC9D,UAAU,CAAC,GAAG,EAAE;oBACd,IAAI,CAAC,KAAK,EAAE,CAAC;wBACX,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACf,CAAC;gBACH,CAAC,EAAE,IAAI,CAAC,CAAC;YACX,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChB,GAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;YACtB,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,MAAM,CAAC,GAAG,EAAE,CAAC;YACf,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
765
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-helpers.js","sourceRoot":"","sources":["../../../../ts/proxies/smart-proxy/utils/route-helpers.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": "19.5.2",
3
+ "version": "19.5.3",
4
4
  "private": false,
5
5
  "description": "A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.",
6
6
  "main": "dist_ts/index.js",
@@ -75,7 +75,7 @@
75
75
  "url": "https://code.foss.global/push.rocks/smartproxy/issues"
76
76
  },
77
77
  "scripts": {
78
- "test": "(tstest test/**/test*.ts --verbose --timeout 600)",
78
+ "test": "(tstest test/**/test*.ts --verbose --timeout 60 --logfile)",
79
79
  "build": "(tsbuild tsfolders --allowimplicitany)",
80
80
  "format": "(gitzone format)",
81
81
  "buildDocs": "tsdoc"
package/readme.hints.md CHANGED
@@ -30,10 +30,72 @@
30
30
  - Test: `pnpm test` (runs `tstest test/`).
31
31
  - Format: `pnpm format` (runs `gitzone format`).
32
32
 
33
- ## Testing Framework
34
- - Uses `@push.rocks/tapbundle` (`tap`, `expect`, `expactAsync`).
35
- - Test files: must start with `test.` and use `.ts` extension.
36
- - Run specific tests via `tsx`, e.g., `tsx test/test.router.ts`.
33
+ ## How to Test
34
+
35
+ ### Test Structure
36
+ Tests use tapbundle from `@git.zone/tstest`. The correct pattern is:
37
+
38
+ ```typescript
39
+ import { tap, expect } from '@git.zone/tstest/tapbundle';
40
+
41
+ tap.test('test description', async () => {
42
+ // Test logic here
43
+ expect(someValue).toEqual(expectedValue);
44
+ });
45
+
46
+ // IMPORTANT: Must end with tap.start()
47
+ tap.start();
48
+ ```
49
+
50
+ ### Expect Syntax (from @push.rocks/smartexpect)
51
+ ```typescript
52
+ // Type assertions
53
+ expect('hello').toBeTypeofString();
54
+ expect(42).toBeTypeofNumber();
55
+
56
+ // Equality
57
+ expect('hithere').toEqual('hithere');
58
+
59
+ // Negated assertions
60
+ expect(1).not.toBeTypeofString();
61
+
62
+ // Regular expressions
63
+ expect('hithere').toMatch(/hi/);
64
+
65
+ // Numeric comparisons
66
+ expect(5).toBeGreaterThan(3);
67
+ expect(0.1 + 0.2).toBeCloseTo(0.3, 10);
68
+
69
+ // Arrays
70
+ expect([1, 2, 3]).toContain(2);
71
+ expect([1, 2, 3]).toHaveLength(3);
72
+
73
+ // Async assertions
74
+ await expect(asyncFunction()).resolves.toEqual('expected');
75
+ await expect(asyncFunction()).resolves.withTimeout(5000).toBeTypeofString();
76
+
77
+ // Complex object navigation
78
+ expect(complexObject)
79
+ .property('users')
80
+ .arrayItem(0)
81
+ .property('name')
82
+ .toEqual('Alice');
83
+ ```
84
+
85
+ ### Test Modifiers
86
+ - `tap.only.test()` - Run only this test
87
+ - `tap.skip.test()` - Skip a test
88
+ - `tap.timeout()` - Set test-specific timeout
89
+
90
+ ### Running Tests
91
+ - All tests: `pnpm test`
92
+ - Specific test: `tsx test/test.router.ts`
93
+ - With options: `tstest test/**/*.ts --verbose --timeout 60`
94
+
95
+ ### Test File Requirements
96
+ - Must start with `test.` prefix
97
+ - Must use `.ts` extension
98
+ - Must call `tap.start()` at the end
37
99
 
38
100
  ## Coding Conventions
39
101
  - Import modules via `plugins.ts`:
@@ -192,4 +254,68 @@ if (result instanceof Promise) {
192
254
  - Verifies that initial data is received even when handler sets up listeners after async work
193
255
 
194
256
  ### Usage Note
195
- Socket handlers require initial data from the client to trigger routing (not just a TLS handshake). Clients must send at least one byte of data for the handler to be invoked.
257
+ Socket handlers require initial data from the client to trigger routing (not just a TLS handshake). Clients must send at least one byte of data for the handler to be invoked.
258
+
259
+ ## Route-Specific Security Implementation (v19.5.3)
260
+
261
+ ### Issue
262
+ Route-specific security configurations (ipAllowList, ipBlockList, authentication) were defined in the route types but not enforced at runtime.
263
+
264
+ ### Root Cause
265
+ The RouteConnectionHandler only checked global IP validation but didn't enforce route-specific security rules after matching a route.
266
+
267
+ ### Solution
268
+ Added security checks after route matching:
269
+ ```typescript
270
+ // Apply route-specific security checks
271
+ const routeSecurity = route.action.security || route.security;
272
+ if (routeSecurity) {
273
+ // Check IP allow/block lists
274
+ if (routeSecurity.ipAllowList || routeSecurity.ipBlockList) {
275
+ const isIPAllowed = this.securityManager.isIPAuthorized(
276
+ remoteIP,
277
+ routeSecurity.ipAllowList || [],
278
+ routeSecurity.ipBlockList || []
279
+ );
280
+
281
+ if (!isIPAllowed) {
282
+ socket.end();
283
+ this.connectionManager.cleanupConnection(record, 'route_ip_blocked');
284
+ return;
285
+ }
286
+ }
287
+ }
288
+ ```
289
+
290
+ ### Test Coverage
291
+ - `test/test.route-security-unit.ts` - Unit tests verifying SecurityManager.isIPAuthorized logic
292
+ - Tests confirm IP allow/block lists work correctly with glob patterns
293
+
294
+ ### Configuration Example
295
+ ```typescript
296
+ const routes: IRouteConfig[] = [{
297
+ name: 'secure-api',
298
+ match: { ports: 8443, domains: 'api.example.com' },
299
+ action: {
300
+ type: 'forward',
301
+ target: { host: 'localhost', port: 3000 },
302
+ security: {
303
+ ipAllowList: ['192.168.1.*', '10.0.0.0/8'], // Allow internal IPs
304
+ ipBlockList: ['192.168.1.100'], // But block specific IP
305
+ maxConnections: 100, // Per-route limit (TODO)
306
+ authentication: { // HTTP-only, requires TLS termination
307
+ type: 'basic',
308
+ credentials: [{ username: 'api', password: 'secret' }]
309
+ }
310
+ }
311
+ }
312
+ }];
313
+ ```
314
+
315
+ ### Notes
316
+ - IP lists support glob patterns (via minimatch): `192.168.*`, `10.?.?.1`
317
+ - Block lists take precedence over allow lists
318
+ - Authentication requires TLS termination (cannot be enforced on passthrough/direct connections)
319
+ - Per-route connection limits are not yet implemented
320
+ - Security is defined at the route level (route.security), not in the action
321
+ - Route matching is based solely on match criteria; security is enforced after matching
@@ -0,0 +1,86 @@
1
+ # SmartProxy Module Problems
2
+
3
+ Based on test analysis, the following potential issues have been identified in the SmartProxy module:
4
+
5
+ ## 1. HttpProxy Route Configuration Issue
6
+ **Location**: `ts/proxies/http-proxy/http-proxy.ts:380`
7
+ **Problem**: The HttpProxy is trying to read the 'type' property of an undefined object when updating route configurations.
8
+ **Evidence**: `test.http-forwarding-fix.ts` fails with:
9
+ ```
10
+ TypeError: Cannot read properties of undefined (reading 'type')
11
+ at HttpProxy.updateRouteConfigs (/mnt/data/lossless/push.rocks/smartproxy/ts/proxies/http-proxy/http-proxy.ts:380:24)
12
+ ```
13
+ **Impact**: Routes with `useHttpProxy` configuration may not work properly.
14
+
15
+ ## 2. Connection Forwarding Issues
16
+ **Problem**: Basic TCP forwarding appears to not be working correctly after the simplification to just 'forward' and 'socket-handler' action types.
17
+ **Evidence**: Multiple forwarding tests timeout waiting for data to be forwarded:
18
+ - `test.forwarding-fix-verification.ts` - times out waiting for forwarded data
19
+ - `test.connection-forwarding.ts` - times out on SNI-based forwarding
20
+ **Impact**: The 'forward' action type may not be properly forwarding connections to target servers.
21
+
22
+ ## 3. Missing Certificate Manager Methods
23
+ **Problem**: Tests expect `provisionAllCertificates` method on certificate manager but it may not exist or may not be properly initialized.
24
+ **Evidence**: Multiple tests fail with "this.certManager.provisionAllCertificates is not a function"
25
+ **Impact**: Certificate provisioning may not work as expected.
26
+
27
+ ## 4. Route Update Mechanism
28
+ **Problem**: The route update mechanism may have issues preserving certificate manager callbacks and other state.
29
+ **Evidence**: Tests specifically designed to verify callback preservation after route updates.
30
+ **Impact**: Dynamic route updates might break certificate management functionality.
31
+
32
+ ## 5. Route-Specific Security Not Fully Implemented
33
+ **Problem**: While the route definitions support security configurations (ipAllowList, ipBlockList, authentication), these are not being enforced at the route level.
34
+ **Evidence**:
35
+ - SecurityManager has methods like `isIPAuthorized` for route-specific security
36
+ - Route connection handler only checks global IP validation, not route-specific security rules
37
+ - No evidence of route.action.security being checked when handling connections
38
+ **Impact**: Route-specific security rules defined in configuration are not enforced, potentially allowing unauthorized access.
39
+ **Status**: ✅ FIXED - Route-specific IP allow/block lists are now enforced when a route is matched. Authentication is logged as not enforceable for non-terminated connections.
40
+ **Additional Fix**: Removed security checks from route matching logic - security is now properly enforced AFTER a route is matched, not during matching.
41
+
42
+ ## 6. Security Property Location Consolidation
43
+ **Problem**: Security was defined in two places - route.security and route.action.security - causing confusion.
44
+ **Status**: ✅ FIXED - Consolidated to only route.security. Removed action.security from types and updated all references.
45
+
46
+ ## Recommendations
47
+
48
+ 1. **Verify Forward Action Implementation**: Check that the 'forward' action type properly establishes bidirectional data flow between client and target server. ✅ FIXED - Basic forwarding now works correctly.
49
+
50
+ 2. **Fix HttpProxy Route Handling**: Ensure that route objects passed to HttpProxy.updateRouteConfigs have the expected structure with all required properties. ✅ FIXED - Routes now preserve their structure.
51
+
52
+ 3. **Review Certificate Manager API**: Ensure all expected methods exist and are properly documented.
53
+
54
+ 4. **Add Integration Tests**: Many unit tests are testing internal implementation details. Consider adding more integration tests that test the public API.
55
+
56
+ 5. **Implement Route-Specific Security**: Add security checks when a route is matched to enforce route-specific IP allow/block lists and authentication rules. ✅ FIXED - IP allow/block lists are now enforced at the route level.
57
+
58
+ 6. **Fix TLS Detection Logic**: The connection handler was treating all connections as TLS. This has been partially fixed but needs proper testing for all TLS modes.
59
+
60
+ ## 7. HTTP Domain Matching Issue
61
+ **Problem**: Routes with domain restrictions fail to match HTTP connections because domain information is only available after HTTP headers are received, but route matching happens immediately upon connection.
62
+ **Evidence**:
63
+ - `test.http-port8080-forwarding.ts` - "No route found for connection on port 8080" despite having a matching route
64
+ - HTTP connections provide domain info via the Host header, which arrives after the initial TCP connection
65
+ - Route matching in `handleInitialData` happens before HTTP headers are parsed
66
+ **Impact**: HTTP routes with domain restrictions cannot be matched, forcing users to remove domain restrictions for HTTP routes.
67
+ **Root Cause**: For non-TLS connections, SmartProxy attempts to match routes immediately, but the domain information needed for matching is only available after parsing HTTP headers.
68
+ **Status**: ✅ FIXED - Added skipDomainCheck parameter to route matching for HTTP proxy ports. When a port is configured with useHttpProxy and the connection is not TLS, domain validation is skipped at the initial route matching stage, allowing the HttpProxy to handle domain-based routing after headers are received.
69
+
70
+ ## 8. HttpProxy Plain HTTP Forwarding Issue
71
+ **Problem**: HttpProxy is an HTTPS server but SmartProxy forwards plain HTTP connections to it via `useHttpProxy` configuration.
72
+ **Evidence**:
73
+ - `test.http-port8080-forwarding.ts` - Connection immediately closed after forwarding to HttpProxy
74
+ - HttpProxy is created with `http2.createSecureServer` expecting TLS connections
75
+ - SmartProxy forwards raw HTTP data to HttpProxy's HTTPS port
76
+ **Impact**: Plain HTTP connections cannot be handled by HttpProxy, despite `useHttpProxy` configuration suggesting this should work.
77
+ **Root Cause**: Design mismatch - HttpProxy is designed for HTTPS/TLS termination, not plain HTTP forwarding.
78
+ **Status**: Documented. The `useHttpProxy` configuration should only be used for ports that receive TLS connections requiring termination. For plain HTTP forwarding, use direct forwarding without HttpProxy.
79
+
80
+ ## 9. Route Security Configuration Location Issue
81
+ **Problem**: Tests were placing security configuration in `route.action.security` instead of `route.security`.
82
+ **Evidence**:
83
+ - `test.route-security.ts` - IP block list test failing because security was in wrong location
84
+ - IRouteConfig interface defines security at route level, not inside action
85
+ **Impact**: Security rules defined in action.security were ignored, causing tests to fail.
86
+ **Status**: ✅ FIXED - Updated tests to place security configuration at the correct location (route.security).
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@push.rocks/smartproxy',
6
- version: '19.5.2',
6
+ version: '19.5.3',
7
7
  description: 'A powerful proxy package with unified route-based configuration for high traffic management. Features include SSL/TLS support, flexible routing patterns, WebSocket handling, advanced security options, and automatic ACME certificate management.'
8
8
  }
@@ -153,7 +153,7 @@ export function convertLegacyConfigToRouteConfig(
153
153
 
154
154
  // Add authentication if present
155
155
  if (legacyConfig.authentication) {
156
- routeConfig.action.security = {
156
+ routeConfig.security = {
157
157
  authentication: {
158
158
  type: 'basic',
159
159
  credentials: [{
@@ -73,10 +73,7 @@ export class HttpProxyBridge {
73
73
  }
74
74
 
75
75
  return {
76
- domain,
77
- target: route.action.target,
78
- tls: route.action.tls,
79
- security: route.action.security,
76
+ ...route, // Keep the original route structure
80
77
  match: {
81
78
  ...route.match,
82
79
  domains: domain // Ensure domains is always set for HttpProxy
@@ -233,9 +233,6 @@ export interface IRouteAction {
233
233
  // Load balancing options
234
234
  loadBalancing?: IRouteLoadBalancing;
235
235
 
236
- // Security options
237
- security?: IRouteSecurity;
238
-
239
236
  // Advanced options
240
237
  advanced?: IRouteAdvanced;
241
238
 
@@ -175,13 +175,12 @@ export class NFTablesManager {
175
175
  };
176
176
 
177
177
  // Add security-related options
178
- const security = action.security || route.security;
179
- if (security?.ipAllowList?.length) {
180
- options.ipAllowList = security.ipAllowList;
178
+ if (route.security?.ipAllowList?.length) {
179
+ options.ipAllowList = route.security.ipAllowList;
181
180
  }
182
181
 
183
- if (security?.ipBlockList?.length) {
184
- options.ipBlockList = security.ipBlockList;
182
+ if (route.security?.ipBlockList?.length) {
183
+ options.ipBlockList = route.security.ipBlockList;
185
184
  }
186
185
 
187
186
  // Add QoS options