@push.rocks/smartproxy 19.3.2 → 19.3.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.
Files changed (313) hide show
  1. package/dist_ts/00_commitinfo_data.js +1 -1
  2. package/dist_ts/forwarding/factory/forwarding-factory.js +29 -1
  3. package/dist_ts/http/index.d.ts +1 -3
  4. package/dist_ts/http/index.js +4 -10
  5. package/dist_ts/http/models/http-types.d.ts +4 -91
  6. package/dist_ts/http/models/http-types.js +5 -60
  7. package/dist_ts/http/router/proxy-router.d.ts +1 -1
  8. package/dist_ts/http/router/route-router.d.ts +1 -1
  9. package/dist_ts/index.d.ts +9 -7
  10. package/dist_ts/index.js +10 -7
  11. package/dist_ts/proxies/{network-proxy → http-proxy}/certificate-manager.d.ts +2 -2
  12. package/dist_ts/proxies/{network-proxy → http-proxy}/certificate-manager.js +1 -1
  13. package/dist_ts/proxies/{network-proxy → http-proxy}/connection-pool.d.ts +2 -2
  14. package/dist_ts/proxies/http-proxy/connection-pool.js +210 -0
  15. package/dist_ts/proxies/http-proxy/context-creator.js +108 -0
  16. package/dist_ts/proxies/{network-proxy → http-proxy}/function-cache.js +1 -1
  17. package/dist_ts/proxies/http-proxy/handlers/index.d.ts +5 -0
  18. package/dist_ts/proxies/http-proxy/handlers/index.js +6 -0
  19. package/dist_ts/proxies/http-proxy/handlers/redirect-handler.d.ts +18 -0
  20. package/dist_ts/proxies/http-proxy/handlers/redirect-handler.js +78 -0
  21. package/dist_ts/proxies/http-proxy/handlers/static-handler.d.ts +19 -0
  22. package/dist_ts/proxies/http-proxy/handlers/static-handler.js +203 -0
  23. package/dist_ts/proxies/{network-proxy/network-proxy.d.ts → http-proxy/http-proxy.d.ts} +10 -9
  24. package/dist_ts/proxies/{network-proxy/network-proxy.js → http-proxy/http-proxy.js} +13 -12
  25. package/dist_ts/proxies/{network-proxy → http-proxy}/http-request-handler.js +1 -1
  26. package/dist_ts/proxies/http-proxy/http2-request-handler.js +201 -0
  27. package/dist_ts/proxies/{network-proxy → http-proxy}/index.d.ts +2 -2
  28. package/dist_ts/proxies/http-proxy/index.js +12 -0
  29. package/dist_ts/proxies/http-proxy/models/http-types.d.ts +119 -0
  30. package/dist_ts/proxies/http-proxy/models/http-types.js +112 -0
  31. package/dist_ts/proxies/http-proxy/models/index.d.ts +5 -0
  32. package/dist_ts/proxies/http-proxy/models/index.js +6 -0
  33. package/dist_ts/proxies/{network-proxy → http-proxy}/models/types.d.ts +2 -2
  34. package/dist_ts/proxies/http-proxy/models/types.js +276 -0
  35. package/dist_ts/proxies/{network-proxy → http-proxy}/request-handler.d.ts +3 -3
  36. package/dist_ts/proxies/{network-proxy → http-proxy}/request-handler.js +2 -2
  37. package/dist_ts/proxies/http-proxy/security-manager.js +255 -0
  38. package/dist_ts/proxies/{network-proxy → http-proxy}/websocket-handler.d.ts +3 -3
  39. package/dist_ts/proxies/{network-proxy → http-proxy}/websocket-handler.js +2 -2
  40. package/dist_ts/proxies/index.d.ts +5 -5
  41. package/dist_ts/proxies/index.js +5 -5
  42. package/dist_ts/proxies/smart-proxy/certificate-manager.d.ts +4 -4
  43. package/dist_ts/proxies/smart-proxy/certificate-manager.js +11 -11
  44. package/dist_ts/proxies/smart-proxy/http-proxy-bridge.d.ts +41 -0
  45. package/dist_ts/proxies/smart-proxy/http-proxy-bridge.js +121 -0
  46. package/dist_ts/proxies/smart-proxy/index.d.ts +2 -1
  47. package/dist_ts/proxies/smart-proxy/index.js +4 -2
  48. package/dist_ts/proxies/smart-proxy/models/interfaces.d.ts +2 -2
  49. package/dist_ts/proxies/smart-proxy/port-manager.js +3 -3
  50. package/dist_ts/proxies/smart-proxy/route-connection-handler.d.ts +3 -3
  51. package/dist_ts/proxies/smart-proxy/route-connection-handler.js +24 -265
  52. package/dist_ts/proxies/smart-proxy/smart-proxy.d.ts +1 -1
  53. package/dist_ts/proxies/smart-proxy/smart-proxy.js +25 -25
  54. package/dist_ts/routing/index.d.ts +5 -0
  55. package/dist_ts/routing/index.js +8 -0
  56. package/dist_ts/routing/models/http-types.d.ts +6 -0
  57. package/dist_ts/routing/models/http-types.js +7 -0
  58. package/dist_ts/routing/router/index.d.ts +8 -0
  59. package/dist_ts/routing/router/index.js +7 -0
  60. package/dist_ts/{classes.router.d.ts → routing/router/proxy-router.d.ts} +14 -11
  61. package/dist_ts/{classes.router.js → routing/router/proxy-router.js} +2 -2
  62. package/dist_ts/routing/router/route-router.d.ts +108 -0
  63. package/dist_ts/routing/router/route-router.js +393 -0
  64. package/package.json +1 -1
  65. package/readme.md +18 -35
  66. package/readme.plan.md +173 -271
  67. package/ts/00_commitinfo_data.ts +1 -1
  68. package/ts/forwarding/factory/forwarding-factory.ts +28 -0
  69. package/ts/index.ts +13 -9
  70. package/ts/proxies/{network-proxy → http-proxy}/certificate-manager.ts +2 -2
  71. package/ts/proxies/{network-proxy → http-proxy}/connection-pool.ts +2 -2
  72. package/ts/proxies/http-proxy/handlers/index.ts +6 -0
  73. package/ts/proxies/http-proxy/handlers/redirect-handler.ts +105 -0
  74. package/ts/proxies/http-proxy/handlers/static-handler.ts +251 -0
  75. package/ts/proxies/{network-proxy/network-proxy.ts → http-proxy/http-proxy.ts} +15 -14
  76. package/ts/proxies/{network-proxy → http-proxy}/index.ts +3 -3
  77. package/ts/proxies/http-proxy/models/http-types.ts +165 -0
  78. package/ts/proxies/http-proxy/models/index.ts +5 -0
  79. package/ts/proxies/{network-proxy → http-proxy}/models/types.ts +2 -2
  80. package/ts/proxies/{network-proxy → http-proxy}/request-handler.ts +3 -3
  81. package/ts/proxies/{network-proxy → http-proxy}/websocket-handler.ts +3 -3
  82. package/ts/proxies/index.ts +7 -7
  83. package/ts/proxies/smart-proxy/certificate-manager.ts +10 -10
  84. package/ts/proxies/smart-proxy/{network-proxy-bridge.ts → http-proxy-bridge.ts} +44 -44
  85. package/ts/proxies/smart-proxy/index.ts +4 -1
  86. package/ts/proxies/smart-proxy/models/interfaces.ts +3 -3
  87. package/ts/proxies/smart-proxy/port-manager.ts +2 -2
  88. package/ts/proxies/smart-proxy/route-connection-handler.ts +23 -307
  89. package/ts/proxies/smart-proxy/smart-proxy.ts +25 -25
  90. package/ts/routing/index.ts +9 -0
  91. package/ts/routing/models/http-types.ts +6 -0
  92. package/ts/{http → routing}/router/proxy-router.ts +1 -1
  93. package/ts/{http → routing}/router/route-router.ts +1 -1
  94. package/dist_ts/certificate/acme/acme-factory.d.ts +0 -17
  95. package/dist_ts/certificate/acme/acme-factory.js +0 -40
  96. package/dist_ts/certificate/acme/challenge-handler.d.ts +0 -44
  97. package/dist_ts/certificate/acme/challenge-handler.js +0 -92
  98. package/dist_ts/certificate/acme/index.d.ts +0 -4
  99. package/dist_ts/certificate/acme/index.js +0 -5
  100. package/dist_ts/certificate/certificate-manager.d.ts +0 -150
  101. package/dist_ts/certificate/certificate-manager.js +0 -505
  102. package/dist_ts/certificate/events/certificate-events.d.ts +0 -33
  103. package/dist_ts/certificate/events/certificate-events.js +0 -38
  104. package/dist_ts/certificate/events/simplified-events.d.ts +0 -56
  105. package/dist_ts/certificate/events/simplified-events.js +0 -13
  106. package/dist_ts/certificate/index.d.ts +0 -30
  107. package/dist_ts/certificate/index.js +0 -37
  108. package/dist_ts/certificate/models/certificate-errors.d.ts +0 -69
  109. package/dist_ts/certificate/models/certificate-errors.js +0 -141
  110. package/dist_ts/certificate/models/certificate-strategy.d.ts +0 -60
  111. package/dist_ts/certificate/models/certificate-strategy.js +0 -73
  112. package/dist_ts/certificate/models/certificate-types.d.ts +0 -97
  113. package/dist_ts/certificate/models/certificate-types.js +0 -2
  114. package/dist_ts/certificate/providers/cert-provisioner.d.ts +0 -119
  115. package/dist_ts/certificate/providers/cert-provisioner.js +0 -422
  116. package/dist_ts/certificate/providers/index.d.ts +0 -4
  117. package/dist_ts/certificate/providers/index.js +0 -5
  118. package/dist_ts/certificate/simplified-certificate-manager.d.ts +0 -150
  119. package/dist_ts/certificate/simplified-certificate-manager.js +0 -501
  120. package/dist_ts/certificate/storage/file-storage.d.ts +0 -66
  121. package/dist_ts/certificate/storage/file-storage.js +0 -194
  122. package/dist_ts/certificate/storage/index.d.ts +0 -4
  123. package/dist_ts/certificate/storage/index.js +0 -5
  124. package/dist_ts/certificate/utils/certificate-helpers.d.ts +0 -17
  125. package/dist_ts/certificate/utils/certificate-helpers.js +0 -45
  126. package/dist_ts/classes.iptablesproxy.d.ts +0 -112
  127. package/dist_ts/classes.iptablesproxy.js +0 -765
  128. package/dist_ts/classes.networkproxy.d.ts +0 -243
  129. package/dist_ts/classes.networkproxy.js +0 -1424
  130. package/dist_ts/classes.nftablesproxy.d.ts +0 -219
  131. package/dist_ts/classes.nftablesproxy.js +0 -1542
  132. package/dist_ts/classes.port80handler.d.ts +0 -215
  133. package/dist_ts/classes.port80handler.js +0 -736
  134. package/dist_ts/classes.portproxy.d.ts +0 -171
  135. package/dist_ts/classes.portproxy.js +0 -1802
  136. package/dist_ts/classes.pp.acmemanager.d.ts +0 -34
  137. package/dist_ts/classes.pp.acmemanager.js +0 -123
  138. package/dist_ts/classes.pp.connectionhandler.d.ts +0 -39
  139. package/dist_ts/classes.pp.connectionhandler.js +0 -754
  140. package/dist_ts/classes.pp.connectionmanager.d.ts +0 -78
  141. package/dist_ts/classes.pp.connectionmanager.js +0 -378
  142. package/dist_ts/classes.pp.domainconfigmanager.d.ts +0 -55
  143. package/dist_ts/classes.pp.domainconfigmanager.js +0 -103
  144. package/dist_ts/classes.pp.interfaces.d.ts +0 -133
  145. package/dist_ts/classes.pp.interfaces.js +0 -2
  146. package/dist_ts/classes.pp.networkproxybridge.d.ts +0 -57
  147. package/dist_ts/classes.pp.networkproxybridge.js +0 -306
  148. package/dist_ts/classes.pp.portproxy.d.ts +0 -64
  149. package/dist_ts/classes.pp.portproxy.js +0 -567
  150. package/dist_ts/classes.pp.portrangemanager.d.ts +0 -56
  151. package/dist_ts/classes.pp.portrangemanager.js +0 -179
  152. package/dist_ts/classes.pp.securitymanager.d.ts +0 -47
  153. package/dist_ts/classes.pp.securitymanager.js +0 -126
  154. package/dist_ts/classes.pp.snihandler.d.ts +0 -153
  155. package/dist_ts/classes.pp.snihandler.js +0 -1053
  156. package/dist_ts/classes.pp.timeoutmanager.d.ts +0 -47
  157. package/dist_ts/classes.pp.timeoutmanager.js +0 -154
  158. package/dist_ts/classes.pp.tlsalert.d.ts +0 -149
  159. package/dist_ts/classes.pp.tlsalert.js +0 -225
  160. package/dist_ts/classes.pp.tlsmanager.d.ts +0 -57
  161. package/dist_ts/classes.pp.tlsmanager.js +0 -132
  162. package/dist_ts/classes.snihandler.d.ts +0 -198
  163. package/dist_ts/classes.snihandler.js +0 -1210
  164. package/dist_ts/classes.sslredirect.d.ts +0 -8
  165. package/dist_ts/classes.sslredirect.js +0 -28
  166. package/dist_ts/common/acmeFactory.d.ts +0 -9
  167. package/dist_ts/common/acmeFactory.js +0 -20
  168. package/dist_ts/common/port80-adapter.d.ts +0 -11
  169. package/dist_ts/common/port80-adapter.js +0 -87
  170. package/dist_ts/examples/forwarding-example.d.ts +0 -1
  171. package/dist_ts/examples/forwarding-example.js +0 -96
  172. package/dist_ts/forwarding/config/domain-config.d.ts +0 -12
  173. package/dist_ts/forwarding/config/domain-config.js +0 -12
  174. package/dist_ts/forwarding/config/domain-manager.d.ts +0 -86
  175. package/dist_ts/forwarding/config/domain-manager.js +0 -242
  176. package/dist_ts/helpers.certificates.d.ts +0 -5
  177. package/dist_ts/helpers.certificates.js +0 -23
  178. package/dist_ts/http/port80/acme-interfaces.d.ts +0 -108
  179. package/dist_ts/http/port80/acme-interfaces.js +0 -51
  180. package/dist_ts/http/port80/challenge-responder.d.ts +0 -53
  181. package/dist_ts/http/port80/challenge-responder.js +0 -203
  182. package/dist_ts/http/port80/index.d.ts +0 -6
  183. package/dist_ts/http/port80/index.js +0 -9
  184. package/dist_ts/http/port80/port80-handler.d.ts +0 -136
  185. package/dist_ts/http/port80/port80-handler.js +0 -592
  186. package/dist_ts/http/redirects/index.d.ts +0 -4
  187. package/dist_ts/http/redirects/index.js +0 -5
  188. package/dist_ts/networkproxy/classes.np.certificatemanager.d.ts +0 -77
  189. package/dist_ts/networkproxy/classes.np.certificatemanager.js +0 -372
  190. package/dist_ts/networkproxy/classes.np.connectionpool.d.ts +0 -47
  191. package/dist_ts/networkproxy/classes.np.connectionpool.js +0 -210
  192. package/dist_ts/networkproxy/classes.np.networkproxy.d.ts +0 -118
  193. package/dist_ts/networkproxy/classes.np.networkproxy.js +0 -387
  194. package/dist_ts/networkproxy/classes.np.requesthandler.d.ts +0 -56
  195. package/dist_ts/networkproxy/classes.np.requesthandler.js +0 -393
  196. package/dist_ts/networkproxy/classes.np.types.d.ts +0 -83
  197. package/dist_ts/networkproxy/classes.np.types.js +0 -35
  198. package/dist_ts/networkproxy/classes.np.websockethandler.d.ts +0 -38
  199. package/dist_ts/networkproxy/classes.np.websockethandler.js +0 -188
  200. package/dist_ts/networkproxy/index.d.ts +0 -1
  201. package/dist_ts/networkproxy/index.js +0 -4
  202. package/dist_ts/nfttablesproxy/classes.nftablesproxy.d.ts +0 -219
  203. package/dist_ts/nfttablesproxy/classes.nftablesproxy.js +0 -1542
  204. package/dist_ts/port80handler/classes.port80handler.d.ts +0 -10
  205. package/dist_ts/port80handler/classes.port80handler.js +0 -16
  206. package/dist_ts/proxies/network-proxy/connection-pool.js +0 -210
  207. package/dist_ts/proxies/network-proxy/context-creator.js +0 -108
  208. package/dist_ts/proxies/network-proxy/http2-request-handler.js +0 -201
  209. package/dist_ts/proxies/network-proxy/index.js +0 -12
  210. package/dist_ts/proxies/network-proxy/models/index.d.ts +0 -4
  211. package/dist_ts/proxies/network-proxy/models/index.js +0 -5
  212. package/dist_ts/proxies/network-proxy/models/types.js +0 -276
  213. package/dist_ts/proxies/network-proxy/security-manager.js +0 -255
  214. package/dist_ts/proxies/network-proxy/simplified-certificate-bridge.d.ts +0 -48
  215. package/dist_ts/proxies/network-proxy/simplified-certificate-bridge.js +0 -76
  216. package/dist_ts/proxies/smart-proxy/connection-handler.d.ts +0 -39
  217. package/dist_ts/proxies/smart-proxy/connection-handler.js +0 -894
  218. package/dist_ts/proxies/smart-proxy/domain-config-manager.d.ts +0 -110
  219. package/dist_ts/proxies/smart-proxy/domain-config-manager.js +0 -386
  220. package/dist_ts/proxies/smart-proxy/legacy-smart-proxy.d.ts +0 -168
  221. package/dist_ts/proxies/smart-proxy/legacy-smart-proxy.js +0 -642
  222. package/dist_ts/proxies/smart-proxy/models/simplified-smartproxy-config.d.ts +0 -65
  223. package/dist_ts/proxies/smart-proxy/models/simplified-smartproxy-config.js +0 -31
  224. package/dist_ts/proxies/smart-proxy/models/smartproxy-options.d.ts +0 -102
  225. package/dist_ts/proxies/smart-proxy/models/smartproxy-options.js +0 -73
  226. package/dist_ts/proxies/smart-proxy/network-proxy-bridge.d.ts +0 -41
  227. package/dist_ts/proxies/smart-proxy/network-proxy-bridge.js +0 -121
  228. package/dist_ts/proxies/smart-proxy/port-range-manager.d.ts +0 -56
  229. package/dist_ts/proxies/smart-proxy/port-range-manager.js +0 -176
  230. package/dist_ts/proxies/smart-proxy/route-helpers/index.d.ts +0 -9
  231. package/dist_ts/proxies/smart-proxy/route-helpers/index.js +0 -11
  232. package/dist_ts/proxies/smart-proxy/route-helpers.d.ts +0 -7
  233. package/dist_ts/proxies/smart-proxy/route-helpers.js +0 -9
  234. package/dist_ts/proxies/smart-proxy/simplified-smart-proxy.d.ts +0 -41
  235. package/dist_ts/proxies/smart-proxy/simplified-smart-proxy.js +0 -132
  236. package/dist_ts/proxies/smart-proxy/utils/route-migration-utils.d.ts +0 -51
  237. package/dist_ts/proxies/smart-proxy/utils/route-migration-utils.js +0 -124
  238. package/dist_ts/redirect/classes.redirect.d.ts +0 -96
  239. package/dist_ts/redirect/classes.redirect.js +0 -194
  240. package/dist_ts/smartproxy/classes.pp.certprovisioner.d.ts +0 -54
  241. package/dist_ts/smartproxy/classes.pp.certprovisioner.js +0 -179
  242. package/dist_ts/smartproxy/classes.pp.connectionhandler.d.ts +0 -39
  243. package/dist_ts/smartproxy/classes.pp.connectionhandler.js +0 -894
  244. package/dist_ts/smartproxy/classes.pp.connectionmanager.d.ts +0 -78
  245. package/dist_ts/smartproxy/classes.pp.connectionmanager.js +0 -378
  246. package/dist_ts/smartproxy/classes.pp.domainconfigmanager.d.ts +0 -94
  247. package/dist_ts/smartproxy/classes.pp.domainconfigmanager.js +0 -255
  248. package/dist_ts/smartproxy/classes.pp.interfaces.d.ts +0 -103
  249. package/dist_ts/smartproxy/classes.pp.interfaces.js +0 -2
  250. package/dist_ts/smartproxy/classes.pp.networkproxybridge.d.ts +0 -62
  251. package/dist_ts/smartproxy/classes.pp.networkproxybridge.js +0 -316
  252. package/dist_ts/smartproxy/classes.pp.portrangemanager.d.ts +0 -56
  253. package/dist_ts/smartproxy/classes.pp.portrangemanager.js +0 -176
  254. package/dist_ts/smartproxy/classes.pp.securitymanager.d.ts +0 -64
  255. package/dist_ts/smartproxy/classes.pp.securitymanager.js +0 -149
  256. package/dist_ts/smartproxy/classes.pp.snihandler.d.ts +0 -153
  257. package/dist_ts/smartproxy/classes.pp.snihandler.js +0 -1053
  258. package/dist_ts/smartproxy/classes.pp.timeoutmanager.d.ts +0 -47
  259. package/dist_ts/smartproxy/classes.pp.timeoutmanager.js +0 -154
  260. package/dist_ts/smartproxy/classes.pp.tlsalert.d.ts +0 -149
  261. package/dist_ts/smartproxy/classes.pp.tlsalert.js +0 -225
  262. package/dist_ts/smartproxy/classes.pp.tlsmanager.d.ts +0 -57
  263. package/dist_ts/smartproxy/classes.pp.tlsmanager.js +0 -132
  264. package/dist_ts/smartproxy/classes.smartproxy.d.ts +0 -63
  265. package/dist_ts/smartproxy/classes.smartproxy.js +0 -521
  266. package/dist_ts/smartproxy/forwarding/domain-config.d.ts +0 -12
  267. package/dist_ts/smartproxy/forwarding/domain-config.js +0 -12
  268. package/dist_ts/smartproxy/forwarding/domain-manager.d.ts +0 -86
  269. package/dist_ts/smartproxy/forwarding/domain-manager.js +0 -241
  270. package/dist_ts/smartproxy/forwarding/forwarding.factory.d.ts +0 -24
  271. package/dist_ts/smartproxy/forwarding/forwarding.factory.js +0 -137
  272. package/dist_ts/smartproxy/forwarding/forwarding.handler.d.ts +0 -55
  273. package/dist_ts/smartproxy/forwarding/forwarding.handler.js +0 -94
  274. package/dist_ts/smartproxy/forwarding/http.handler.d.ts +0 -25
  275. package/dist_ts/smartproxy/forwarding/http.handler.js +0 -123
  276. package/dist_ts/smartproxy/forwarding/https-passthrough.handler.d.ts +0 -24
  277. package/dist_ts/smartproxy/forwarding/https-passthrough.handler.js +0 -154
  278. package/dist_ts/smartproxy/forwarding/https-terminate-to-http.handler.d.ts +0 -36
  279. package/dist_ts/smartproxy/forwarding/https-terminate-to-http.handler.js +0 -229
  280. package/dist_ts/smartproxy/forwarding/https-terminate-to-https.handler.d.ts +0 -35
  281. package/dist_ts/smartproxy/forwarding/https-terminate-to-https.handler.js +0 -254
  282. package/dist_ts/smartproxy/forwarding/index.d.ts +0 -16
  283. package/dist_ts/smartproxy/forwarding/index.js +0 -23
  284. package/dist_ts/smartproxy/types/forwarding.types.d.ts +0 -104
  285. package/dist_ts/smartproxy/types/forwarding.types.js +0 -50
  286. package/dist_ts/smartproxy.classes.networkproxy.d.ts +0 -31
  287. package/dist_ts/smartproxy.classes.networkproxy.js +0 -305
  288. package/dist_ts/smartproxy.classes.router.d.ts +0 -13
  289. package/dist_ts/smartproxy.classes.router.js +0 -33
  290. package/dist_ts/smartproxy.classes.sslredirect.d.ts +0 -8
  291. package/dist_ts/smartproxy.classes.sslredirect.js +0 -28
  292. package/dist_ts/smartproxy.helpers.certificates.d.ts +0 -5
  293. package/dist_ts/smartproxy.helpers.certificates.js +0 -23
  294. package/dist_ts/smartproxy.plugins.d.ts +0 -18
  295. package/dist_ts/smartproxy.plugins.js +0 -23
  296. package/dist_ts/smartproxy.portproxy.d.ts +0 -26
  297. package/dist_ts/smartproxy.portproxy.js +0 -295
  298. package/ts/http/index.ts +0 -16
  299. package/ts/http/models/http-types.ts +0 -108
  300. package/ts/http/redirects/index.ts +0 -3
  301. package/ts/proxies/network-proxy/models/index.ts +0 -4
  302. package/ts/redirect/classes.redirect.ts +0 -295
  303. /package/dist_ts/proxies/{network-proxy → http-proxy}/context-creator.d.ts +0 -0
  304. /package/dist_ts/proxies/{network-proxy → http-proxy}/function-cache.d.ts +0 -0
  305. /package/dist_ts/proxies/{network-proxy → http-proxy}/http-request-handler.d.ts +0 -0
  306. /package/dist_ts/proxies/{network-proxy → http-proxy}/http2-request-handler.d.ts +0 -0
  307. /package/dist_ts/proxies/{network-proxy → http-proxy}/security-manager.d.ts +0 -0
  308. /package/ts/proxies/{network-proxy → http-proxy}/context-creator.ts +0 -0
  309. /package/ts/proxies/{network-proxy → http-proxy}/function-cache.ts +0 -0
  310. /package/ts/proxies/{network-proxy → http-proxy}/http-request-handler.ts +0 -0
  311. /package/ts/proxies/{network-proxy → http-proxy}/http2-request-handler.ts +0 -0
  312. /package/ts/proxies/{network-proxy → http-proxy}/security-manager.ts +0 -0
  313. /package/ts/{http → routing}/router/index.ts +0 -0
@@ -0,0 +1,393 @@
1
+ import * as plugins from '../../plugins.js';
2
+ /**
3
+ * Router for HTTP reverse proxy requests based on route configurations
4
+ *
5
+ * Supports the following domain matching patterns:
6
+ * - Exact matches: "example.com"
7
+ * - Wildcard subdomains: "*.example.com" (matches any subdomain of example.com)
8
+ * - TLD wildcards: "example.*" (matches example.com, example.org, etc.)
9
+ * - Complex wildcards: "*.lossless*" (matches any subdomain of any lossless domain)
10
+ * - Default fallback: "*" (matches any unmatched domain)
11
+ *
12
+ * Also supports path pattern matching for each domain:
13
+ * - Exact path: "/api/users"
14
+ * - Wildcard paths: "/api/*"
15
+ * - Path parameters: "/users/:id/profile"
16
+ */
17
+ export class RouteRouter {
18
+ constructor(routes, logger) {
19
+ // Store original routes for reference
20
+ this.routes = [];
21
+ // Store path patterns separately since they're not in the original interface
22
+ this.pathPatterns = new Map();
23
+ this.logger = logger || {
24
+ error: console.error,
25
+ warn: console.warn,
26
+ info: console.info,
27
+ debug: console.debug
28
+ };
29
+ if (routes) {
30
+ this.setRoutes(routes);
31
+ }
32
+ }
33
+ /**
34
+ * Sets a new set of routes to be routed to
35
+ * @param routes Array of route configurations
36
+ */
37
+ setRoutes(routes) {
38
+ this.routes = [...routes];
39
+ // Sort routes by priority
40
+ this.routes.sort((a, b) => {
41
+ const priorityA = a.priority ?? 0;
42
+ const priorityB = b.priority ?? 0;
43
+ return priorityB - priorityA;
44
+ });
45
+ // Find default route if any (route with "*" as domain)
46
+ this.defaultRoute = this.routes.find(route => {
47
+ const domains = Array.isArray(route.match.domains)
48
+ ? route.match.domains
49
+ : [route.match.domains];
50
+ return domains.includes('*');
51
+ });
52
+ // Extract path patterns from route match.path
53
+ for (const route of this.routes) {
54
+ if (route.match.path) {
55
+ this.pathPatterns.set(route, route.match.path);
56
+ }
57
+ }
58
+ const uniqueDomains = this.getHostnames();
59
+ this.logger.info(`Router initialized with ${this.routes.length} routes (${uniqueDomains.length} unique hosts)`);
60
+ }
61
+ /**
62
+ * Routes a request based on hostname and path
63
+ * @param req The incoming HTTP request
64
+ * @returns The matching route or undefined if no match found
65
+ */
66
+ routeReq(req) {
67
+ const result = this.routeReqWithDetails(req);
68
+ return result ? result.route : undefined;
69
+ }
70
+ /**
71
+ * Routes a request with detailed matching information
72
+ * @param req The incoming HTTP request
73
+ * @returns Detailed routing result including matched route and path information
74
+ */
75
+ routeReqWithDetails(req) {
76
+ // Extract and validate host header
77
+ const originalHost = req.headers.host;
78
+ if (!originalHost) {
79
+ this.logger.error('No host header found in request');
80
+ return this.defaultRoute ? { route: this.defaultRoute } : undefined;
81
+ }
82
+ // Parse URL for path matching
83
+ const parsedUrl = plugins.url.parse(req.url || '/');
84
+ const urlPath = parsedUrl.pathname || '/';
85
+ // Extract hostname without port
86
+ const hostWithoutPort = originalHost.split(':')[0].toLowerCase();
87
+ // First try exact hostname match
88
+ const exactRoute = this.findRouteForHost(hostWithoutPort, urlPath);
89
+ if (exactRoute) {
90
+ return exactRoute;
91
+ }
92
+ // Try various wildcard patterns
93
+ if (hostWithoutPort.includes('.')) {
94
+ const domainParts = hostWithoutPort.split('.');
95
+ // Try wildcard subdomain (*.example.com)
96
+ if (domainParts.length > 2) {
97
+ const wildcardDomain = `*.${domainParts.slice(1).join('.')}`;
98
+ const wildcardRoute = this.findRouteForHost(wildcardDomain, urlPath);
99
+ if (wildcardRoute) {
100
+ return wildcardRoute;
101
+ }
102
+ }
103
+ // Try TLD wildcard (example.*)
104
+ const baseDomain = domainParts.slice(0, -1).join('.');
105
+ const tldWildcardDomain = `${baseDomain}.*`;
106
+ const tldWildcardRoute = this.findRouteForHost(tldWildcardDomain, urlPath);
107
+ if (tldWildcardRoute) {
108
+ return tldWildcardRoute;
109
+ }
110
+ // Try complex wildcard patterns
111
+ const wildcardPatterns = this.findWildcardMatches(hostWithoutPort);
112
+ for (const pattern of wildcardPatterns) {
113
+ const wildcardRoute = this.findRouteForHost(pattern, urlPath);
114
+ if (wildcardRoute) {
115
+ return wildcardRoute;
116
+ }
117
+ }
118
+ }
119
+ // Fall back to default route if available
120
+ if (this.defaultRoute) {
121
+ this.logger.warn(`No specific route found for host: ${hostWithoutPort}, using default`);
122
+ return { route: this.defaultRoute };
123
+ }
124
+ this.logger.error(`No route found for host: ${hostWithoutPort}`);
125
+ return undefined;
126
+ }
127
+ /**
128
+ * Find potential wildcard patterns that could match a given hostname
129
+ * Handles complex patterns like "*.lossless*" or other partial matches
130
+ * @param hostname The hostname to find wildcard matches for
131
+ * @returns Array of potential wildcard patterns that could match
132
+ */
133
+ findWildcardMatches(hostname) {
134
+ const patterns = [];
135
+ // Find all routes with wildcard domains
136
+ for (const route of this.routes) {
137
+ if (!route.match.domains)
138
+ continue;
139
+ const domains = Array.isArray(route.match.domains)
140
+ ? route.match.domains
141
+ : [route.match.domains];
142
+ // Filter to only wildcard domains
143
+ const wildcardDomains = domains.filter(domain => domain.includes('*'));
144
+ // Convert each wildcard domain to a regex pattern and check if it matches
145
+ for (const domain of wildcardDomains) {
146
+ // Skip the default wildcard '*'
147
+ if (domain === '*')
148
+ continue;
149
+ // Skip already checked patterns (*.domain.com and domain.*)
150
+ if (domain.startsWith('*.') && domain.indexOf('*', 2) === -1)
151
+ continue;
152
+ if (domain.endsWith('.*') && domain.indexOf('*') === domain.length - 1)
153
+ continue;
154
+ // Convert wildcard pattern to regex
155
+ const regexPattern = domain
156
+ .replace(/\./g, '\\.') // Escape dots
157
+ .replace(/\*/g, '.*'); // Convert * to .* for regex
158
+ // Create regex object with case insensitive flag
159
+ const regex = new RegExp(`^${regexPattern}$`, 'i');
160
+ // If hostname matches this complex pattern, add it to the list
161
+ if (regex.test(hostname)) {
162
+ patterns.push(domain);
163
+ }
164
+ }
165
+ }
166
+ return patterns;
167
+ }
168
+ /**
169
+ * Find a route for a specific host and path
170
+ */
171
+ findRouteForHost(hostname, path) {
172
+ // Find all routes for this hostname
173
+ const matchingRoutes = this.routes.filter(route => {
174
+ if (!route.match.domains)
175
+ return false;
176
+ const domains = Array.isArray(route.match.domains)
177
+ ? route.match.domains
178
+ : [route.match.domains];
179
+ return domains.some(domain => domain.toLowerCase() === hostname.toLowerCase());
180
+ });
181
+ if (matchingRoutes.length === 0) {
182
+ return undefined;
183
+ }
184
+ // First try routes with path patterns
185
+ const routesWithPaths = matchingRoutes.filter(route => this.pathPatterns.has(route));
186
+ // Already sorted by priority during setRoutes
187
+ // Check each route with path pattern
188
+ for (const route of routesWithPaths) {
189
+ const pathPattern = this.pathPatterns.get(route);
190
+ if (pathPattern) {
191
+ const pathMatch = this.matchPath(path, pathPattern);
192
+ if (pathMatch) {
193
+ return {
194
+ route,
195
+ pathMatch: pathMatch.matched,
196
+ pathParams: pathMatch.params,
197
+ pathRemainder: pathMatch.remainder
198
+ };
199
+ }
200
+ }
201
+ }
202
+ // If no path pattern matched, use the first route without a path pattern
203
+ const routeWithoutPath = matchingRoutes.find(route => !this.pathPatterns.has(route));
204
+ if (routeWithoutPath) {
205
+ return { route: routeWithoutPath };
206
+ }
207
+ return undefined;
208
+ }
209
+ /**
210
+ * Matches a URL path against a pattern
211
+ * Supports:
212
+ * - Exact matches: /users/profile
213
+ * - Wildcards: /api/* (matches any path starting with /api/)
214
+ * - Path parameters: /users/:id (captures id as a parameter)
215
+ *
216
+ * @param path The URL path to match
217
+ * @param pattern The pattern to match against
218
+ * @returns Match result with params and remainder, or null if no match
219
+ */
220
+ matchPath(path, pattern) {
221
+ // Handle exact match
222
+ if (path === pattern) {
223
+ return {
224
+ matched: pattern,
225
+ params: {},
226
+ remainder: ''
227
+ };
228
+ }
229
+ // Handle wildcard match
230
+ if (pattern.endsWith('/*')) {
231
+ const prefix = pattern.slice(0, -2);
232
+ if (path === prefix || path.startsWith(`${prefix}/`)) {
233
+ return {
234
+ matched: prefix,
235
+ params: {},
236
+ remainder: path.slice(prefix.length)
237
+ };
238
+ }
239
+ return null;
240
+ }
241
+ // Handle path parameters
242
+ const patternParts = pattern.split('/').filter(p => p);
243
+ const pathParts = path.split('/').filter(p => p);
244
+ // Too few path parts to match
245
+ if (pathParts.length < patternParts.length) {
246
+ return null;
247
+ }
248
+ const params = {};
249
+ // Compare each part
250
+ for (let i = 0; i < patternParts.length; i++) {
251
+ const patternPart = patternParts[i];
252
+ const pathPart = pathParts[i];
253
+ // Handle parameter
254
+ if (patternPart.startsWith(':')) {
255
+ const paramName = patternPart.slice(1);
256
+ params[paramName] = pathPart;
257
+ continue;
258
+ }
259
+ // Handle wildcard at the end
260
+ if (patternPart === '*' && i === patternParts.length - 1) {
261
+ break;
262
+ }
263
+ // Handle exact match for this part
264
+ if (patternPart !== pathPart) {
265
+ return null;
266
+ }
267
+ }
268
+ // Calculate the remainder - the unmatched path parts
269
+ const remainderParts = pathParts.slice(patternParts.length);
270
+ const remainder = remainderParts.length ? '/' + remainderParts.join('/') : '';
271
+ // Calculate the matched path
272
+ const matchedParts = patternParts.map((part, i) => {
273
+ return part.startsWith(':') ? pathParts[i] : part;
274
+ });
275
+ const matched = '/' + matchedParts.join('/');
276
+ return {
277
+ matched,
278
+ params,
279
+ remainder
280
+ };
281
+ }
282
+ /**
283
+ * Gets all currently active route configurations
284
+ * @returns Array of all active routes
285
+ */
286
+ getRoutes() {
287
+ return [...this.routes];
288
+ }
289
+ /**
290
+ * Gets all hostnames that this router is configured to handle
291
+ * @returns Array of hostnames
292
+ */
293
+ getHostnames() {
294
+ const hostnames = new Set();
295
+ for (const route of this.routes) {
296
+ if (!route.match.domains)
297
+ continue;
298
+ const domains = Array.isArray(route.match.domains)
299
+ ? route.match.domains
300
+ : [route.match.domains];
301
+ for (const domain of domains) {
302
+ if (domain !== '*') {
303
+ hostnames.add(domain.toLowerCase());
304
+ }
305
+ }
306
+ }
307
+ return Array.from(hostnames);
308
+ }
309
+ /**
310
+ * Adds a single new route configuration
311
+ * @param route The route configuration to add
312
+ */
313
+ addRoute(route) {
314
+ this.routes.push(route);
315
+ // Store path pattern if present
316
+ if (route.match.path) {
317
+ this.pathPatterns.set(route, route.match.path);
318
+ }
319
+ // Re-sort routes by priority
320
+ this.routes.sort((a, b) => {
321
+ const priorityA = a.priority ?? 0;
322
+ const priorityB = b.priority ?? 0;
323
+ return priorityB - priorityA;
324
+ });
325
+ }
326
+ /**
327
+ * Removes routes by domain pattern
328
+ * @param domain The domain pattern to remove routes for
329
+ * @returns Boolean indicating whether any routes were removed
330
+ */
331
+ removeRoutesByDomain(domain) {
332
+ const initialCount = this.routes.length;
333
+ // Find routes to remove
334
+ const routesToRemove = this.routes.filter(route => {
335
+ if (!route.match.domains)
336
+ return false;
337
+ const domains = Array.isArray(route.match.domains)
338
+ ? route.match.domains
339
+ : [route.match.domains];
340
+ return domains.includes(domain);
341
+ });
342
+ // Remove them from the patterns map
343
+ for (const route of routesToRemove) {
344
+ this.pathPatterns.delete(route);
345
+ }
346
+ // Filter them out of the routes array
347
+ this.routes = this.routes.filter(route => {
348
+ if (!route.match.domains)
349
+ return true;
350
+ const domains = Array.isArray(route.match.domains)
351
+ ? route.match.domains
352
+ : [route.match.domains];
353
+ return !domains.includes(domain);
354
+ });
355
+ return this.routes.length !== initialCount;
356
+ }
357
+ /**
358
+ * Legacy method for compatibility with ProxyRouter
359
+ * Converts IReverseProxyConfig to IRouteConfig and calls setRoutes
360
+ *
361
+ * @param configs Array of legacy proxy configurations
362
+ */
363
+ setNewProxyConfigs(configs) {
364
+ // Convert legacy configs to routes and add them
365
+ const routes = configs.map(config => {
366
+ // Create a basic route configuration from the legacy config
367
+ return {
368
+ match: {
369
+ ports: config.destinationPorts[0], // Just use the first port
370
+ domains: config.hostName
371
+ },
372
+ action: {
373
+ type: 'forward',
374
+ target: {
375
+ host: config.destinationIps,
376
+ port: config.destinationPorts[0]
377
+ },
378
+ tls: {
379
+ mode: 'terminate',
380
+ certificate: {
381
+ key: config.privateKey,
382
+ cert: config.publicKey
383
+ }
384
+ }
385
+ },
386
+ name: `Legacy Config - ${config.hostName}`,
387
+ enabled: true
388
+ };
389
+ });
390
+ this.setRoutes(routes);
391
+ }
392
+ }
393
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-router.js","sourceRoot":"","sources":["../../../ts/routing/router/route-router.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.3.2",
3
+ "version": "19.3.4",
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",
package/readme.md CHANGED
@@ -43,7 +43,7 @@ SmartProxy has been restructured using a modern, modular architecture with a uni
43
43
  │ │ ├── route-manager.ts # Route management system
44
44
  │ │ ├── smart-proxy.ts # Main SmartProxy class
45
45
  │ │ └── ... # Supporting classes
46
- │ ├── /network-proxy # NetworkProxy implementation
46
+ │ ├── /http-proxy # HttpProxy implementation (HTTP/HTTPS handling)
47
47
  │ └── /nftables-proxy # NfTablesProxy implementation
48
48
  ├── /tls # TLS-specific functionality
49
49
  │ ├── /sni # SNI handling components
@@ -79,7 +79,7 @@ SmartProxy has been restructured using a modern, modular architecture with a uni
79
79
 
80
80
  ### Specialized Components
81
81
 
82
- - **NetworkProxy** (`ts/proxies/network-proxy/network-proxy.ts`)
82
+ - **HttpProxy** (`ts/proxies/http-proxy/http-proxy.ts`)
83
83
  HTTP/HTTPS reverse proxy with TLS termination and WebSocket support
84
84
  - **Port80Handler** (`ts/http/port80/port80-handler.ts`)
85
85
  ACME HTTP-01 challenge handler for Let's Encrypt certificates
@@ -101,7 +101,7 @@ SmartProxy has been restructured using a modern, modular architecture with a uni
101
101
 
102
102
  - `IRouteConfig`, `IRouteMatch`, `IRouteAction` (`ts/proxies/smart-proxy/models/route-types.ts`)
103
103
  - `IRoutedSmartProxyOptions` (`ts/proxies/smart-proxy/models/route-types.ts`)
104
- - `INetworkProxyOptions` (`ts/proxies/network-proxy/models/types.ts`)
104
+ - `IHttpProxyOptions` (`ts/proxies/http-proxy/models/types.ts`)
105
105
  - `IAcmeOptions`, `IDomainOptions` (`ts/certificate/models/certificate-types.ts`)
106
106
  - `INfTableProxySettings` (`ts/proxies/nftables-proxy/models/interfaces.ts`)
107
107
 
@@ -113,7 +113,7 @@ npm install @push.rocks/smartproxy
113
113
 
114
114
  ## Quick Start with SmartProxy
115
115
 
116
- SmartProxy v18.0.0 continues the evolution of the unified route-based configuration system making your proxy setup more flexible and intuitive with improved helper functions and NFTables integration for high-performance kernel-level routing.
116
+ SmartProxy v19.4.0 provides a unified route-based configuration system with enhanced certificate management, NFTables integration for high-performance kernel-level routing, and improved helper functions for common proxy setups.
117
117
 
118
118
  ```typescript
119
119
  import {
@@ -136,10 +136,12 @@ import {
136
136
  const proxy = new SmartProxy({
137
137
  // Global ACME settings for all routes with certificate: 'auto'
138
138
  acme: {
139
- email: 'ssl@example.com', // Required for Let's Encrypt
139
+ email: 'ssl@bleu.de', // Required for Let's Encrypt
140
140
  useProduction: false, // Use staging by default
141
141
  renewThresholdDays: 30, // Renew 30 days before expiry
142
- port: 80 // Port for HTTP-01 challenges
142
+ port: 80, // Port for HTTP-01 challenges (use 8080 for non-privileged)
143
+ autoRenew: true, // Enable automatic renewal
144
+ renewCheckIntervalHours: 24 // Check for renewals daily
143
145
  },
144
146
 
145
147
  // Define all your routing rules in a single array
@@ -216,26 +218,7 @@ const proxy = new SmartProxy({
216
218
  certificate: 'auto',
217
219
  maxRate: '100mbps'
218
220
  })
219
- ],
220
-
221
- // Global settings that apply to all routes
222
- defaults: {
223
- security: {
224
- maxConnections: 500
225
- }
226
- },
227
-
228
- // Automatic Let's Encrypt integration
229
- acme: {
230
- enabled: true,
231
- contactEmail: 'admin@example.com',
232
- useProduction: true
233
- }
234
- });
235
-
236
- // Listen for certificate events
237
- proxy.on('certificate', evt => {
238
- console.log(`Certificate for ${evt.domain} ready, expires: ${evt.expiryDate}`);
221
+ ]
239
222
  });
240
223
 
241
224
  // Start the proxy
@@ -749,14 +732,14 @@ Available helper functions:
749
732
 
750
733
  While SmartProxy provides a unified API for most needs, you can also use individual components:
751
734
 
752
- ### NetworkProxy
735
+ ### HttpProxy
753
736
  For HTTP/HTTPS reverse proxy with TLS termination and WebSocket support. Now with native route-based configuration support:
754
737
 
755
738
  ```typescript
756
- import { NetworkProxy } from '@push.rocks/smartproxy';
739
+ import { HttpProxy } from '@push.rocks/smartproxy';
757
740
  import * as fs from 'fs';
758
741
 
759
- const proxy = new NetworkProxy({ port: 443 });
742
+ const proxy = new HttpProxy({ port: 443 });
760
743
  await proxy.start();
761
744
 
762
745
  // Modern route-based configuration (recommended)
@@ -781,7 +764,7 @@ await proxy.updateRouteConfigs([
781
764
  },
782
765
  advanced: {
783
766
  headers: {
784
- 'X-Forwarded-By': 'NetworkProxy'
767
+ 'X-Forwarded-By': 'HttpProxy'
785
768
  },
786
769
  urlRewrite: {
787
770
  pattern: '^/old/(.*)$',
@@ -1053,7 +1036,7 @@ flowchart TB
1053
1036
  direction TB
1054
1037
  RouteConfig["Route Configuration<br>(Match/Action)"]
1055
1038
  RouteManager["Route Manager"]
1056
- HTTPS443["HTTPS Port 443<br>NetworkProxy"]
1039
+ HTTPS443["HTTPS Port 443<br>HttpProxy"]
1057
1040
  SmartProxy["SmartProxy<br>(TCP/SNI Proxy)"]
1058
1041
  ACME["Port80Handler<br>(ACME HTTP-01)"]
1059
1042
  Certs[(SSL Certificates)]
@@ -1439,7 +1422,7 @@ createRedirectRoute({
1439
1422
  - `getListeningPorts()` - Get all ports currently being listened on
1440
1423
  - `async updateRoutes(routes: IRouteConfig[])` - Update routes and automatically adjust port listeners
1441
1424
 
1442
- ### NetworkProxy (INetworkProxyOptions)
1425
+ ### HttpProxy (IHttpProxyOptions)
1443
1426
  - `port` (number, required) - Main port to listen on
1444
1427
  - `backendProtocol` ('http1'|'http2', default 'http1') - Protocol to use with backend servers
1445
1428
  - `maxConnections` (number, default 10000) - Maximum concurrent connections
@@ -1452,8 +1435,8 @@ createRedirectRoute({
1452
1435
  - `useExternalPort80Handler` (boolean) - Use external port 80 handler for ACME challenges
1453
1436
  - `portProxyIntegration` (boolean) - Integration with other proxies
1454
1437
 
1455
- #### NetworkProxy Enhanced Features
1456
- NetworkProxy now supports full route-based configuration including:
1438
+ #### HttpProxy Enhanced Features
1439
+ HttpProxy now supports full route-based configuration including:
1457
1440
  - Advanced request and response header manipulation
1458
1441
  - URL rewriting with RegExp pattern matching
1459
1442
  - Template variable resolution for dynamic values (e.g. `{domain}`, `{clientIp}`)
@@ -1507,7 +1490,7 @@ NetworkProxy now supports full route-based configuration including:
1507
1490
  - Ensure domains are publicly accessible for Let's Encrypt validation
1508
1491
  - For TLS handshake issues, increase `initialDataTimeout` and `maxPendingDataSize`
1509
1492
 
1510
- ### NetworkProxy
1493
+ ### HttpProxy
1511
1494
  - Verify ports, certificates and `rejectUnauthorized` for TLS errors
1512
1495
  - Configure CORS for preflight issues
1513
1496
  - Increase `maxConnections` or `connectionPoolSize` under load