@push.rocks/smartproxy 19.3.2 → 19.3.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.
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 +12 -12
  66. package/readme.plan.md +152 -257
  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
@@ -1,736 +0,0 @@
1
- import * as plugins from './plugins.js';
2
- import { IncomingMessage, ServerResponse } from 'http';
3
- /**
4
- * Custom error classes for better error handling
5
- */
6
- export class Port80HandlerError extends Error {
7
- constructor(message) {
8
- super(message);
9
- this.name = 'Port80HandlerError';
10
- }
11
- }
12
- export class CertificateError extends Port80HandlerError {
13
- constructor(message, domain, isRenewal = false) {
14
- super(`${message} for domain ${domain}${isRenewal ? ' (renewal)' : ''}`);
15
- this.domain = domain;
16
- this.isRenewal = isRenewal;
17
- this.name = 'CertificateError';
18
- }
19
- }
20
- export class ServerError extends Port80HandlerError {
21
- constructor(message, code) {
22
- super(message);
23
- this.code = code;
24
- this.name = 'ServerError';
25
- }
26
- }
27
- /**
28
- * Events emitted by the Port80Handler
29
- */
30
- export var Port80HandlerEvents;
31
- (function (Port80HandlerEvents) {
32
- Port80HandlerEvents["CERTIFICATE_ISSUED"] = "certificate-issued";
33
- Port80HandlerEvents["CERTIFICATE_RENEWED"] = "certificate-renewed";
34
- Port80HandlerEvents["CERTIFICATE_FAILED"] = "certificate-failed";
35
- Port80HandlerEvents["CERTIFICATE_EXPIRING"] = "certificate-expiring";
36
- Port80HandlerEvents["MANAGER_STARTED"] = "manager-started";
37
- Port80HandlerEvents["MANAGER_STOPPED"] = "manager-stopped";
38
- Port80HandlerEvents["REQUEST_FORWARDED"] = "request-forwarded";
39
- })(Port80HandlerEvents || (Port80HandlerEvents = {}));
40
- /**
41
- * Port80Handler with ACME certificate management and request forwarding capabilities
42
- * Now with glob pattern support for domain matching
43
- */
44
- export class Port80Handler extends plugins.EventEmitter {
45
- /**
46
- * Creates a new Port80Handler
47
- * @param options Configuration options
48
- */
49
- constructor(options = {}) {
50
- super();
51
- this.server = null;
52
- this.acmeClient = null;
53
- this.accountKey = null;
54
- this.renewalTimer = null;
55
- this.isShuttingDown = false;
56
- this.domainCertificates = new Map();
57
- // Default options
58
- this.options = {
59
- port: options.port ?? 80,
60
- contactEmail: options.contactEmail ?? 'admin@example.com',
61
- useProduction: options.useProduction ?? false, // Safer default: staging
62
- renewThresholdDays: options.renewThresholdDays ?? 10, // Changed to 10 days as per requirements
63
- httpsRedirectPort: options.httpsRedirectPort ?? 443,
64
- renewCheckIntervalHours: options.renewCheckIntervalHours ?? 24,
65
- };
66
- }
67
- /**
68
- * Starts the HTTP server for ACME challenges
69
- */
70
- async start() {
71
- if (this.server) {
72
- throw new ServerError('Server is already running');
73
- }
74
- if (this.isShuttingDown) {
75
- throw new ServerError('Server is shutting down');
76
- }
77
- return new Promise((resolve, reject) => {
78
- try {
79
- this.server = plugins.http.createServer((req, res) => this.handleRequest(req, res));
80
- this.server.on('error', (error) => {
81
- if (error.code === 'EACCES') {
82
- reject(new ServerError(`Permission denied to bind to port ${this.options.port}. Try running with elevated privileges or use a port > 1024.`, error.code));
83
- }
84
- else if (error.code === 'EADDRINUSE') {
85
- reject(new ServerError(`Port ${this.options.port} is already in use.`, error.code));
86
- }
87
- else {
88
- reject(new ServerError(error.message, error.code));
89
- }
90
- });
91
- this.server.listen(this.options.port, () => {
92
- console.log(`Port80Handler is listening on port ${this.options.port}`);
93
- this.startRenewalTimer();
94
- this.emit(Port80HandlerEvents.MANAGER_STARTED, this.options.port);
95
- // Start certificate process for domains with acmeMaintenance enabled
96
- for (const [domain, domainInfo] of this.domainCertificates.entries()) {
97
- // Skip glob patterns for certificate issuance
98
- if (this.isGlobPattern(domain)) {
99
- console.log(`Skipping initial certificate for glob pattern: ${domain}`);
100
- continue;
101
- }
102
- if (domainInfo.options.acmeMaintenance && !domainInfo.certObtained && !domainInfo.obtainingInProgress) {
103
- this.obtainCertificate(domain).catch(err => {
104
- console.error(`Error obtaining initial certificate for ${domain}:`, err);
105
- });
106
- }
107
- }
108
- resolve();
109
- });
110
- }
111
- catch (error) {
112
- const message = error instanceof Error ? error.message : 'Unknown error starting server';
113
- reject(new ServerError(message));
114
- }
115
- });
116
- }
117
- /**
118
- * Stops the HTTP server and renewal timer
119
- */
120
- async stop() {
121
- if (!this.server) {
122
- return;
123
- }
124
- this.isShuttingDown = true;
125
- // Stop the renewal timer
126
- if (this.renewalTimer) {
127
- clearInterval(this.renewalTimer);
128
- this.renewalTimer = null;
129
- }
130
- return new Promise((resolve) => {
131
- if (this.server) {
132
- this.server.close(() => {
133
- this.server = null;
134
- this.isShuttingDown = false;
135
- this.emit(Port80HandlerEvents.MANAGER_STOPPED);
136
- resolve();
137
- });
138
- }
139
- else {
140
- this.isShuttingDown = false;
141
- resolve();
142
- }
143
- });
144
- }
145
- /**
146
- * Adds a domain with configuration options
147
- * @param options Domain configuration options
148
- */
149
- addDomain(options) {
150
- if (!options.domainName || typeof options.domainName !== 'string') {
151
- throw new Port80HandlerError('Invalid domain name');
152
- }
153
- const domainName = options.domainName;
154
- if (!this.domainCertificates.has(domainName)) {
155
- this.domainCertificates.set(domainName, {
156
- options,
157
- certObtained: false,
158
- obtainingInProgress: false
159
- });
160
- console.log(`Domain added: ${domainName} with configuration:`, {
161
- sslRedirect: options.sslRedirect,
162
- acmeMaintenance: options.acmeMaintenance,
163
- hasForward: !!options.forward,
164
- hasAcmeForward: !!options.acmeForward
165
- });
166
- // If acmeMaintenance is enabled and not a glob pattern, start certificate process immediately
167
- if (options.acmeMaintenance && this.server && !this.isGlobPattern(domainName)) {
168
- this.obtainCertificate(domainName).catch(err => {
169
- console.error(`Error obtaining initial certificate for ${domainName}:`, err);
170
- });
171
- }
172
- }
173
- else {
174
- // Update existing domain with new options
175
- const existing = this.domainCertificates.get(domainName);
176
- existing.options = options;
177
- console.log(`Domain ${domainName} configuration updated`);
178
- }
179
- }
180
- /**
181
- * Removes a domain from management
182
- * @param domain The domain to remove
183
- */
184
- removeDomain(domain) {
185
- if (this.domainCertificates.delete(domain)) {
186
- console.log(`Domain removed: ${domain}`);
187
- }
188
- }
189
- /**
190
- * Sets a certificate for a domain directly (for externally obtained certificates)
191
- * @param domain The domain for the certificate
192
- * @param certificate The certificate (PEM format)
193
- * @param privateKey The private key (PEM format)
194
- * @param expiryDate Optional expiry date
195
- */
196
- setCertificate(domain, certificate, privateKey, expiryDate) {
197
- if (!domain || !certificate || !privateKey) {
198
- throw new Port80HandlerError('Domain, certificate and privateKey are required');
199
- }
200
- // Don't allow setting certificates for glob patterns
201
- if (this.isGlobPattern(domain)) {
202
- throw new Port80HandlerError('Cannot set certificate for glob pattern domains');
203
- }
204
- let domainInfo = this.domainCertificates.get(domain);
205
- if (!domainInfo) {
206
- // Create default domain options if not already configured
207
- const defaultOptions = {
208
- domainName: domain,
209
- sslRedirect: true,
210
- acmeMaintenance: true
211
- };
212
- domainInfo = {
213
- options: defaultOptions,
214
- certObtained: false,
215
- obtainingInProgress: false
216
- };
217
- this.domainCertificates.set(domain, domainInfo);
218
- }
219
- domainInfo.certificate = certificate;
220
- domainInfo.privateKey = privateKey;
221
- domainInfo.certObtained = true;
222
- domainInfo.obtainingInProgress = false;
223
- if (expiryDate) {
224
- domainInfo.expiryDate = expiryDate;
225
- }
226
- else {
227
- // Extract expiry date from certificate
228
- domainInfo.expiryDate = this.extractExpiryDateFromCertificate(certificate, domain);
229
- }
230
- console.log(`Certificate set for ${domain}`);
231
- // Emit certificate event
232
- this.emitCertificateEvent(Port80HandlerEvents.CERTIFICATE_ISSUED, {
233
- domain,
234
- certificate,
235
- privateKey,
236
- expiryDate: domainInfo.expiryDate || this.getDefaultExpiryDate()
237
- });
238
- }
239
- /**
240
- * Gets the certificate for a domain if it exists
241
- * @param domain The domain to get the certificate for
242
- */
243
- getCertificate(domain) {
244
- // Can't get certificates for glob patterns
245
- if (this.isGlobPattern(domain)) {
246
- return null;
247
- }
248
- const domainInfo = this.domainCertificates.get(domain);
249
- if (!domainInfo || !domainInfo.certObtained || !domainInfo.certificate || !domainInfo.privateKey) {
250
- return null;
251
- }
252
- return {
253
- domain,
254
- certificate: domainInfo.certificate,
255
- privateKey: domainInfo.privateKey,
256
- expiryDate: domainInfo.expiryDate || this.getDefaultExpiryDate()
257
- };
258
- }
259
- /**
260
- * Check if a domain is a glob pattern
261
- * @param domain Domain to check
262
- * @returns True if the domain is a glob pattern
263
- */
264
- isGlobPattern(domain) {
265
- return domain.includes('*');
266
- }
267
- /**
268
- * Get domain info for a specific domain, using glob pattern matching if needed
269
- * @param requestDomain The actual domain from the request
270
- * @returns The domain info or null if not found
271
- */
272
- getDomainInfoForRequest(requestDomain) {
273
- // Try direct match first
274
- if (this.domainCertificates.has(requestDomain)) {
275
- return {
276
- domainInfo: this.domainCertificates.get(requestDomain),
277
- pattern: requestDomain
278
- };
279
- }
280
- // Then try glob patterns
281
- for (const [pattern, domainInfo] of this.domainCertificates.entries()) {
282
- if (this.isGlobPattern(pattern) && this.domainMatchesPattern(requestDomain, pattern)) {
283
- return { domainInfo, pattern };
284
- }
285
- }
286
- return null;
287
- }
288
- /**
289
- * Check if a domain matches a glob pattern
290
- * @param domain The domain to check
291
- * @param pattern The pattern to match against
292
- * @returns True if the domain matches the pattern
293
- */
294
- domainMatchesPattern(domain, pattern) {
295
- // Handle different glob pattern styles
296
- if (pattern.startsWith('*.')) {
297
- // *.example.com matches any subdomain
298
- const suffix = pattern.substring(2);
299
- return domain.endsWith(suffix) && domain.includes('.') && domain !== suffix;
300
- }
301
- else if (pattern.endsWith('.*')) {
302
- // example.* matches any TLD
303
- const prefix = pattern.substring(0, pattern.length - 2);
304
- const domainParts = domain.split('.');
305
- return domain.startsWith(prefix + '.') && domainParts.length >= 2;
306
- }
307
- else if (pattern === '*') {
308
- // Wildcard matches everything
309
- return true;
310
- }
311
- else {
312
- // Exact match (shouldn't reach here as we check exact matches first)
313
- return domain === pattern;
314
- }
315
- }
316
- /**
317
- * Lazy initialization of the ACME client
318
- * @returns An ACME client instance
319
- */
320
- async getAcmeClient() {
321
- if (this.acmeClient) {
322
- return this.acmeClient;
323
- }
324
- try {
325
- // Generate a new account key
326
- this.accountKey = (await plugins.acme.forge.createPrivateKey()).toString();
327
- this.acmeClient = new plugins.acme.Client({
328
- directoryUrl: this.options.useProduction
329
- ? plugins.acme.directory.letsencrypt.production
330
- : plugins.acme.directory.letsencrypt.staging,
331
- accountKey: this.accountKey,
332
- });
333
- // Create a new account
334
- await this.acmeClient.createAccount({
335
- termsOfServiceAgreed: true,
336
- contact: [`mailto:${this.options.contactEmail}`],
337
- });
338
- return this.acmeClient;
339
- }
340
- catch (error) {
341
- const message = error instanceof Error ? error.message : 'Unknown error initializing ACME client';
342
- throw new Port80HandlerError(`Failed to initialize ACME client: ${message}`);
343
- }
344
- }
345
- /**
346
- * Handles incoming HTTP requests
347
- * @param req The HTTP request
348
- * @param res The HTTP response
349
- */
350
- handleRequest(req, res) {
351
- const hostHeader = req.headers.host;
352
- if (!hostHeader) {
353
- res.statusCode = 400;
354
- res.end('Bad Request: Host header is missing');
355
- return;
356
- }
357
- // Extract domain (ignoring any port in the Host header)
358
- const domain = hostHeader.split(':')[0];
359
- // Get domain config, using glob pattern matching if needed
360
- const domainMatch = this.getDomainInfoForRequest(domain);
361
- if (!domainMatch) {
362
- res.statusCode = 404;
363
- res.end('Domain not configured');
364
- return;
365
- }
366
- const { domainInfo, pattern } = domainMatch;
367
- const options = domainInfo.options;
368
- // If the request is for an ACME HTTP-01 challenge, handle it
369
- if (req.url && req.url.startsWith('/.well-known/acme-challenge/') && (options.acmeMaintenance || options.acmeForward)) {
370
- // Check if we should forward ACME requests
371
- if (options.acmeForward) {
372
- this.forwardRequest(req, res, options.acmeForward, 'ACME challenge');
373
- return;
374
- }
375
- // Only handle ACME challenges for non-glob patterns
376
- if (!this.isGlobPattern(pattern)) {
377
- this.handleAcmeChallenge(req, res, domain);
378
- return;
379
- }
380
- }
381
- // Check if we should forward non-ACME requests
382
- if (options.forward) {
383
- this.forwardRequest(req, res, options.forward, 'HTTP');
384
- return;
385
- }
386
- // If certificate exists and sslRedirect is enabled, redirect to HTTPS
387
- // (Skip for glob patterns as they won't have certificates)
388
- if (!this.isGlobPattern(pattern) && domainInfo.certObtained && options.sslRedirect) {
389
- const httpsPort = this.options.httpsRedirectPort;
390
- const portSuffix = httpsPort === 443 ? '' : `:${httpsPort}`;
391
- const redirectUrl = `https://${domain}${portSuffix}${req.url || '/'}`;
392
- res.statusCode = 301;
393
- res.setHeader('Location', redirectUrl);
394
- res.end(`Redirecting to ${redirectUrl}`);
395
- return;
396
- }
397
- // Handle case where certificate maintenance is enabled but not yet obtained
398
- // (Skip for glob patterns as they can't have certificates)
399
- if (!this.isGlobPattern(pattern) && options.acmeMaintenance && !domainInfo.certObtained) {
400
- // Trigger certificate issuance if not already running
401
- if (!domainInfo.obtainingInProgress) {
402
- this.obtainCertificate(domain).catch(err => {
403
- const errorMessage = err instanceof Error ? err.message : 'Unknown error';
404
- this.emit(Port80HandlerEvents.CERTIFICATE_FAILED, {
405
- domain,
406
- error: errorMessage,
407
- isRenewal: false
408
- });
409
- console.error(`Error obtaining certificate for ${domain}:`, err);
410
- });
411
- }
412
- res.statusCode = 503;
413
- res.end('Certificate issuance in progress, please try again later.');
414
- return;
415
- }
416
- // Default response for unhandled request
417
- res.statusCode = 404;
418
- res.end('No handlers configured for this request');
419
- }
420
- /**
421
- * Forwards an HTTP request to the specified target
422
- * @param req The original request
423
- * @param res The response object
424
- * @param target The forwarding target (IP and port)
425
- * @param requestType Type of request for logging
426
- */
427
- forwardRequest(req, res, target, requestType) {
428
- const options = {
429
- hostname: target.ip,
430
- port: target.port,
431
- path: req.url,
432
- method: req.method,
433
- headers: { ...req.headers }
434
- };
435
- const domain = req.headers.host?.split(':')[0] || 'unknown';
436
- console.log(`Forwarding ${requestType} request for ${domain} to ${target.ip}:${target.port}`);
437
- const proxyReq = plugins.http.request(options, (proxyRes) => {
438
- // Copy status code
439
- res.statusCode = proxyRes.statusCode || 500;
440
- // Copy headers
441
- for (const [key, value] of Object.entries(proxyRes.headers)) {
442
- if (value)
443
- res.setHeader(key, value);
444
- }
445
- // Pipe response data
446
- proxyRes.pipe(res);
447
- this.emit(Port80HandlerEvents.REQUEST_FORWARDED, {
448
- domain,
449
- requestType,
450
- target: `${target.ip}:${target.port}`,
451
- statusCode: proxyRes.statusCode
452
- });
453
- });
454
- proxyReq.on('error', (error) => {
455
- console.error(`Error forwarding request to ${target.ip}:${target.port}:`, error);
456
- if (!res.headersSent) {
457
- res.statusCode = 502;
458
- res.end(`Proxy error: ${error.message}`);
459
- }
460
- else {
461
- res.end();
462
- }
463
- });
464
- // Pipe original request to proxy request
465
- if (req.readable) {
466
- req.pipe(proxyReq);
467
- }
468
- else {
469
- proxyReq.end();
470
- }
471
- }
472
- /**
473
- * Serves the ACME HTTP-01 challenge response
474
- * @param req The HTTP request
475
- * @param res The HTTP response
476
- * @param domain The domain for the challenge
477
- */
478
- handleAcmeChallenge(req, res, domain) {
479
- const domainInfo = this.domainCertificates.get(domain);
480
- if (!domainInfo) {
481
- res.statusCode = 404;
482
- res.end('Domain not configured');
483
- return;
484
- }
485
- // The token is the last part of the URL
486
- const urlParts = req.url?.split('/');
487
- const token = urlParts ? urlParts[urlParts.length - 1] : '';
488
- if (domainInfo.challengeToken === token && domainInfo.challengeKeyAuthorization) {
489
- res.statusCode = 200;
490
- res.setHeader('Content-Type', 'text/plain');
491
- res.end(domainInfo.challengeKeyAuthorization);
492
- console.log(`Served ACME challenge response for ${domain}`);
493
- }
494
- else {
495
- res.statusCode = 404;
496
- res.end('Challenge token not found');
497
- }
498
- }
499
- /**
500
- * Obtains a certificate for a domain using ACME HTTP-01 challenge
501
- * @param domain The domain to obtain a certificate for
502
- * @param isRenewal Whether this is a renewal attempt
503
- */
504
- async obtainCertificate(domain, isRenewal = false) {
505
- // Don't allow certificate issuance for glob patterns
506
- if (this.isGlobPattern(domain)) {
507
- throw new CertificateError('Cannot obtain certificates for glob pattern domains', domain, isRenewal);
508
- }
509
- // Get the domain info
510
- const domainInfo = this.domainCertificates.get(domain);
511
- if (!domainInfo) {
512
- throw new CertificateError('Domain not found', domain, isRenewal);
513
- }
514
- // Verify that acmeMaintenance is enabled
515
- if (!domainInfo.options.acmeMaintenance) {
516
- console.log(`Skipping certificate issuance for ${domain} - acmeMaintenance is disabled`);
517
- return;
518
- }
519
- // Prevent concurrent certificate issuance
520
- if (domainInfo.obtainingInProgress) {
521
- console.log(`Certificate issuance already in progress for ${domain}`);
522
- return;
523
- }
524
- domainInfo.obtainingInProgress = true;
525
- domainInfo.lastRenewalAttempt = new Date();
526
- try {
527
- const client = await this.getAcmeClient();
528
- // Create a new order for the domain
529
- const order = await client.createOrder({
530
- identifiers: [{ type: 'dns', value: domain }],
531
- });
532
- // Get the authorizations for the order
533
- const authorizations = await client.getAuthorizations(order);
534
- // Process each authorization
535
- await this.processAuthorizations(client, domain, authorizations);
536
- // Generate a CSR and private key
537
- const [csrBuffer, privateKeyBuffer] = await plugins.acme.forge.createCsr({
538
- commonName: domain,
539
- });
540
- const csr = csrBuffer.toString();
541
- const privateKey = privateKeyBuffer.toString();
542
- // Finalize the order with our CSR
543
- await client.finalizeOrder(order, csr);
544
- // Get the certificate with the full chain
545
- const certificate = await client.getCertificate(order);
546
- // Store the certificate and key
547
- domainInfo.certificate = certificate;
548
- domainInfo.privateKey = privateKey;
549
- domainInfo.certObtained = true;
550
- // Clear challenge data
551
- delete domainInfo.challengeToken;
552
- delete domainInfo.challengeKeyAuthorization;
553
- // Extract expiry date from certificate
554
- domainInfo.expiryDate = this.extractExpiryDateFromCertificate(certificate, domain);
555
- console.log(`Certificate ${isRenewal ? 'renewed' : 'obtained'} for ${domain}`);
556
- // Emit the appropriate event
557
- const eventType = isRenewal
558
- ? Port80HandlerEvents.CERTIFICATE_RENEWED
559
- : Port80HandlerEvents.CERTIFICATE_ISSUED;
560
- this.emitCertificateEvent(eventType, {
561
- domain,
562
- certificate,
563
- privateKey,
564
- expiryDate: domainInfo.expiryDate || this.getDefaultExpiryDate()
565
- });
566
- }
567
- catch (error) {
568
- // Check for rate limit errors
569
- if (error.message && (error.message.includes('rateLimited') ||
570
- error.message.includes('too many certificates') ||
571
- error.message.includes('rate limit'))) {
572
- console.error(`Rate limit reached for ${domain}. Waiting before retry.`);
573
- }
574
- else {
575
- console.error(`Error during certificate issuance for ${domain}:`, error);
576
- }
577
- // Emit failure event
578
- this.emit(Port80HandlerEvents.CERTIFICATE_FAILED, {
579
- domain,
580
- error: error.message || 'Unknown error',
581
- isRenewal
582
- });
583
- throw new CertificateError(error.message || 'Certificate issuance failed', domain, isRenewal);
584
- }
585
- finally {
586
- // Reset flag whether successful or not
587
- domainInfo.obtainingInProgress = false;
588
- }
589
- }
590
- /**
591
- * Process ACME authorizations by verifying and completing challenges
592
- * @param client ACME client
593
- * @param domain Domain name
594
- * @param authorizations Authorizations to process
595
- */
596
- async processAuthorizations(client, domain, authorizations) {
597
- const domainInfo = this.domainCertificates.get(domain);
598
- if (!domainInfo) {
599
- throw new CertificateError('Domain not found during authorization', domain);
600
- }
601
- for (const authz of authorizations) {
602
- const challenge = authz.challenges.find(ch => ch.type === 'http-01');
603
- if (!challenge) {
604
- throw new CertificateError('HTTP-01 challenge not found', domain);
605
- }
606
- // Get the key authorization for the challenge
607
- const keyAuthorization = await client.getChallengeKeyAuthorization(challenge);
608
- // Store the challenge data
609
- domainInfo.challengeToken = challenge.token;
610
- domainInfo.challengeKeyAuthorization = keyAuthorization;
611
- // ACME client type definition workaround - use compatible approach
612
- // First check if challenge verification is needed
613
- const authzUrl = authz.url;
614
- try {
615
- // Check if authzUrl exists and perform verification
616
- if (authzUrl) {
617
- await client.verifyChallenge(authz, challenge);
618
- }
619
- // Complete the challenge
620
- await client.completeChallenge(challenge);
621
- // Wait for validation
622
- await client.waitForValidStatus(challenge);
623
- console.log(`HTTP-01 challenge completed for ${domain}`);
624
- }
625
- catch (error) {
626
- const errorMessage = error instanceof Error ? error.message : 'Unknown challenge error';
627
- console.error(`Challenge error for ${domain}:`, error);
628
- throw new CertificateError(`Challenge verification failed: ${errorMessage}`, domain);
629
- }
630
- }
631
- }
632
- /**
633
- * Starts the certificate renewal timer
634
- */
635
- startRenewalTimer() {
636
- if (this.renewalTimer) {
637
- clearInterval(this.renewalTimer);
638
- }
639
- // Convert hours to milliseconds
640
- const checkInterval = this.options.renewCheckIntervalHours * 60 * 60 * 1000;
641
- this.renewalTimer = setInterval(() => this.checkForRenewals(), checkInterval);
642
- // Prevent the timer from keeping the process alive
643
- if (this.renewalTimer.unref) {
644
- this.renewalTimer.unref();
645
- }
646
- console.log(`Certificate renewal check scheduled every ${this.options.renewCheckIntervalHours} hours`);
647
- }
648
- /**
649
- * Checks for certificates that need renewal
650
- */
651
- checkForRenewals() {
652
- if (this.isShuttingDown) {
653
- return;
654
- }
655
- console.log('Checking for certificates that need renewal...');
656
- const now = new Date();
657
- const renewThresholdMs = this.options.renewThresholdDays * 24 * 60 * 60 * 1000;
658
- for (const [domain, domainInfo] of this.domainCertificates.entries()) {
659
- // Skip glob patterns
660
- if (this.isGlobPattern(domain)) {
661
- continue;
662
- }
663
- // Skip domains with acmeMaintenance disabled
664
- if (!domainInfo.options.acmeMaintenance) {
665
- continue;
666
- }
667
- // Skip domains without certificates or already in renewal
668
- if (!domainInfo.certObtained || domainInfo.obtainingInProgress) {
669
- continue;
670
- }
671
- // Skip domains without expiry dates
672
- if (!domainInfo.expiryDate) {
673
- continue;
674
- }
675
- const timeUntilExpiry = domainInfo.expiryDate.getTime() - now.getTime();
676
- // Check if certificate is near expiry
677
- if (timeUntilExpiry <= renewThresholdMs) {
678
- console.log(`Certificate for ${domain} expires soon, renewing...`);
679
- const daysRemaining = Math.ceil(timeUntilExpiry / (24 * 60 * 60 * 1000));
680
- this.emit(Port80HandlerEvents.CERTIFICATE_EXPIRING, {
681
- domain,
682
- expiryDate: domainInfo.expiryDate,
683
- daysRemaining
684
- });
685
- // Start renewal process
686
- this.obtainCertificate(domain, true).catch(err => {
687
- const errorMessage = err instanceof Error ? err.message : 'Unknown error';
688
- console.error(`Error renewing certificate for ${domain}:`, errorMessage);
689
- });
690
- }
691
- }
692
- }
693
- /**
694
- * Extract expiry date from certificate using a more robust approach
695
- * @param certificate Certificate PEM string
696
- * @param domain Domain for logging
697
- * @returns Extracted expiry date or default
698
- */
699
- extractExpiryDateFromCertificate(certificate, domain) {
700
- try {
701
- // This is still using regex, but in a real implementation you would use
702
- // a library like node-forge or x509 to properly parse the certificate
703
- const matches = certificate.match(/Not After\s*:\s*(.*?)(?:\n|$)/i);
704
- if (matches && matches[1]) {
705
- const expiryDate = new Date(matches[1]);
706
- // Validate that we got a valid date
707
- if (!isNaN(expiryDate.getTime())) {
708
- console.log(`Certificate for ${domain} will expire on ${expiryDate.toISOString()}`);
709
- return expiryDate;
710
- }
711
- }
712
- console.warn(`Could not extract valid expiry date from certificate for ${domain}, using default`);
713
- return this.getDefaultExpiryDate();
714
- }
715
- catch (error) {
716
- console.warn(`Failed to extract expiry date from certificate for ${domain}, using default`);
717
- return this.getDefaultExpiryDate();
718
- }
719
- }
720
- /**
721
- * Get a default expiry date (90 days from now)
722
- * @returns Default expiry date
723
- */
724
- getDefaultExpiryDate() {
725
- return new Date(Date.now() + 90 * 24 * 60 * 60 * 1000); // 90 days default
726
- }
727
- /**
728
- * Emits a certificate event with the certificate data
729
- * @param eventType The event type to emit
730
- * @param data The certificate data
731
- */
732
- emitCertificateEvent(eventType, data) {
733
- this.emit(eventType, data);
734
- }
735
- }
736
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"classes.port80handler.js","sourceRoot":"","sources":["../ts/classes.port80handler.ts"],"names":[],"mappings":"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"}