@serve.zone/dcrouter 11.12.4 → 11.14.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (214) hide show
  1. package/dist_serve/bundle.js +705 -548
  2. package/dist_ts_interfaces/data/index.d.ts +1 -0
  3. package/dist_ts_interfaces/data/index.js +2 -1
  4. package/dist_ts_interfaces/data/remoteingress.d.ts +10 -1
  5. package/dist_ts_interfaces/data/vpn.d.ts +43 -0
  6. package/dist_ts_interfaces/data/vpn.js +2 -0
  7. package/dist_ts_interfaces/requests/index.d.ts +1 -0
  8. package/dist_ts_interfaces/requests/index.js +2 -1
  9. package/dist_ts_interfaces/requests/vpn.d.ts +135 -0
  10. package/dist_ts_interfaces/requests/vpn.js +3 -0
  11. package/package.json +2 -1
  12. package/readme.md +107 -3
  13. package/ts/00_commitinfo_data.ts +1 -1
  14. package/ts/classes.dcrouter.ts +126 -0
  15. package/ts/config/classes.route-config-manager.ts +20 -3
  16. package/ts/opsserver/classes.opsserver.ts +2 -0
  17. package/ts/opsserver/handlers/index.ts +2 -1
  18. package/ts/opsserver/handlers/vpn.handler.ts +257 -0
  19. package/ts/plugins.ts +2 -1
  20. package/ts/vpn/classes.vpn-manager.ts +378 -0
  21. package/ts/vpn/index.ts +1 -0
  22. package/ts_web/00_commitinfo_data.ts +1 -1
  23. package/ts_web/appstate.ts +164 -0
  24. package/ts_web/elements/index.ts +1 -0
  25. package/ts_web/elements/ops-dashboard.ts +6 -0
  26. package/ts_web/elements/ops-view-vpn.ts +330 -0
  27. package/ts_web/readme.md +17 -0
  28. package/ts_web/router.ts +1 -1
  29. package/dist_ts/00_commitinfo_data.d.ts +0 -8
  30. package/dist_ts/00_commitinfo_data.js +0 -9
  31. package/dist_ts/cache/classes.cache.cleaner.d.ts +0 -47
  32. package/dist_ts/cache/classes.cache.cleaner.js +0 -130
  33. package/dist_ts/cache/classes.cached.document.d.ts +0 -76
  34. package/dist_ts/cache/classes.cached.document.js +0 -100
  35. package/dist_ts/cache/classes.cachedb.d.ts +0 -60
  36. package/dist_ts/cache/classes.cachedb.js +0 -126
  37. package/dist_ts/cache/documents/classes.cached.email.d.ts +0 -125
  38. package/dist_ts/cache/documents/classes.cached.email.js +0 -337
  39. package/dist_ts/cache/documents/classes.cached.ip.reputation.d.ts +0 -119
  40. package/dist_ts/cache/documents/classes.cached.ip.reputation.js +0 -323
  41. package/dist_ts/cache/documents/index.d.ts +0 -2
  42. package/dist_ts/cache/documents/index.js +0 -3
  43. package/dist_ts/cache/index.d.ts +0 -4
  44. package/dist_ts/cache/index.js +0 -7
  45. package/dist_ts/classes.cert-provision-scheduler.d.ts +0 -54
  46. package/dist_ts/classes.cert-provision-scheduler.js +0 -118
  47. package/dist_ts/classes.dcrouter.d.ts +0 -356
  48. package/dist_ts/classes.dcrouter.js +0 -1592
  49. package/dist_ts/classes.storage-cert-manager.d.ts +0 -18
  50. package/dist_ts/classes.storage-cert-manager.js +0 -43
  51. package/dist_ts/config/classes.api-token-manager.d.ts +0 -46
  52. package/dist_ts/config/classes.api-token-manager.js +0 -150
  53. package/dist_ts/config/classes.route-config-manager.d.ts +0 -37
  54. package/dist_ts/config/classes.route-config-manager.js +0 -240
  55. package/dist_ts/config/index.d.ts +0 -3
  56. package/dist_ts/config/index.js +0 -5
  57. package/dist_ts/config/validator.d.ts +0 -104
  58. package/dist_ts/config/validator.js +0 -152
  59. package/dist_ts/errors/base.errors.d.ts +0 -224
  60. package/dist_ts/errors/base.errors.js +0 -320
  61. package/dist_ts/errors/error-handler.d.ts +0 -98
  62. package/dist_ts/errors/error-handler.js +0 -282
  63. package/dist_ts/errors/error.codes.d.ts +0 -115
  64. package/dist_ts/errors/error.codes.js +0 -136
  65. package/dist_ts/errors/index.d.ts +0 -54
  66. package/dist_ts/errors/index.js +0 -136
  67. package/dist_ts/errors/reputation.errors.d.ts +0 -183
  68. package/dist_ts/errors/reputation.errors.js +0 -292
  69. package/dist_ts/http3/http3-route-augmentation.d.ts +0 -50
  70. package/dist_ts/http3/http3-route-augmentation.js +0 -98
  71. package/dist_ts/http3/index.d.ts +0 -1
  72. package/dist_ts/http3/index.js +0 -2
  73. package/dist_ts/index.d.ts +0 -8
  74. package/dist_ts/index.js +0 -29
  75. package/dist_ts/logger.d.ts +0 -21
  76. package/dist_ts/logger.js +0 -81
  77. package/dist_ts/monitoring/classes.metricscache.d.ts +0 -32
  78. package/dist_ts/monitoring/classes.metricscache.js +0 -63
  79. package/dist_ts/monitoring/classes.metricsmanager.d.ts +0 -184
  80. package/dist_ts/monitoring/classes.metricsmanager.js +0 -744
  81. package/dist_ts/monitoring/index.d.ts +0 -1
  82. package/dist_ts/monitoring/index.js +0 -2
  83. package/dist_ts/opsserver/classes.opsserver.d.ts +0 -37
  84. package/dist_ts/opsserver/classes.opsserver.js +0 -85
  85. package/dist_ts/opsserver/handlers/admin.handler.d.ts +0 -31
  86. package/dist_ts/opsserver/handlers/admin.handler.js +0 -180
  87. package/dist_ts/opsserver/handlers/api-token.handler.d.ts +0 -6
  88. package/dist_ts/opsserver/handlers/api-token.handler.js +0 -62
  89. package/dist_ts/opsserver/handlers/certificate.handler.d.ts +0 -32
  90. package/dist_ts/opsserver/handlers/certificate.handler.js +0 -421
  91. package/dist_ts/opsserver/handlers/config.handler.d.ts +0 -7
  92. package/dist_ts/opsserver/handlers/config.handler.js +0 -192
  93. package/dist_ts/opsserver/handlers/email-ops.handler.d.ts +0 -30
  94. package/dist_ts/opsserver/handlers/email-ops.handler.js +0 -227
  95. package/dist_ts/opsserver/handlers/index.d.ts +0 -11
  96. package/dist_ts/opsserver/handlers/index.js +0 -12
  97. package/dist_ts/opsserver/handlers/logs.handler.d.ts +0 -25
  98. package/dist_ts/opsserver/handlers/logs.handler.js +0 -256
  99. package/dist_ts/opsserver/handlers/radius.handler.d.ts +0 -6
  100. package/dist_ts/opsserver/handlers/radius.handler.js +0 -295
  101. package/dist_ts/opsserver/handlers/remoteingress.handler.d.ts +0 -6
  102. package/dist_ts/opsserver/handlers/remoteingress.handler.js +0 -156
  103. package/dist_ts/opsserver/handlers/route-management.handler.d.ts +0 -14
  104. package/dist_ts/opsserver/handlers/route-management.handler.js +0 -117
  105. package/dist_ts/opsserver/handlers/security.handler.d.ts +0 -9
  106. package/dist_ts/opsserver/handlers/security.handler.js +0 -233
  107. package/dist_ts/opsserver/handlers/stats.handler.d.ts +0 -11
  108. package/dist_ts/opsserver/handlers/stats.handler.js +0 -403
  109. package/dist_ts/opsserver/helpers/guards.d.ts +0 -27
  110. package/dist_ts/opsserver/helpers/guards.js +0 -43
  111. package/dist_ts/opsserver/index.d.ts +0 -1
  112. package/dist_ts/opsserver/index.js +0 -2
  113. package/dist_ts/paths.d.ts +0 -26
  114. package/dist_ts/paths.js +0 -45
  115. package/dist_ts/plugins.d.ts +0 -80
  116. package/dist_ts/plugins.js +0 -114
  117. package/dist_ts/radius/classes.accounting.manager.d.ts +0 -231
  118. package/dist_ts/radius/classes.accounting.manager.js +0 -462
  119. package/dist_ts/radius/classes.radius.server.d.ts +0 -171
  120. package/dist_ts/radius/classes.radius.server.js +0 -386
  121. package/dist_ts/radius/classes.vlan.manager.d.ts +0 -128
  122. package/dist_ts/radius/classes.vlan.manager.js +0 -279
  123. package/dist_ts/radius/index.d.ts +0 -13
  124. package/dist_ts/radius/index.js +0 -14
  125. package/dist_ts/remoteingress/classes.remoteingress-manager.d.ts +0 -94
  126. package/dist_ts/remoteingress/classes.remoteingress-manager.js +0 -271
  127. package/dist_ts/remoteingress/classes.tunnel-manager.d.ts +0 -59
  128. package/dist_ts/remoteingress/classes.tunnel-manager.js +0 -165
  129. package/dist_ts/remoteingress/index.d.ts +0 -2
  130. package/dist_ts/remoteingress/index.js +0 -3
  131. package/dist_ts/security/classes.contentscanner.d.ts +0 -164
  132. package/dist_ts/security/classes.contentscanner.js +0 -642
  133. package/dist_ts/security/classes.ipreputationchecker.d.ts +0 -160
  134. package/dist_ts/security/classes.ipreputationchecker.js +0 -537
  135. package/dist_ts/security/classes.securitylogger.d.ts +0 -144
  136. package/dist_ts/security/classes.securitylogger.js +0 -235
  137. package/dist_ts/security/index.d.ts +0 -3
  138. package/dist_ts/security/index.js +0 -4
  139. package/dist_ts/sms/classes.smsservice.d.ts +0 -15
  140. package/dist_ts/sms/classes.smsservice.js +0 -72
  141. package/dist_ts/sms/config/sms.config.d.ts +0 -93
  142. package/dist_ts/sms/config/sms.config.js +0 -2
  143. package/dist_ts/sms/config/sms.schema.d.ts +0 -5
  144. package/dist_ts/sms/config/sms.schema.js +0 -121
  145. package/dist_ts/sms/index.d.ts +0 -1
  146. package/dist_ts/sms/index.js +0 -2
  147. package/dist_ts/storage/classes.storagemanager.d.ts +0 -83
  148. package/dist_ts/storage/classes.storagemanager.js +0 -348
  149. package/dist_ts/storage/index.d.ts +0 -1
  150. package/dist_ts/storage/index.js +0 -3
  151. package/dist_ts_apiclient/classes.apitoken.d.ts +0 -41
  152. package/dist_ts_apiclient/classes.apitoken.js +0 -115
  153. package/dist_ts_apiclient/classes.certificate.d.ts +0 -57
  154. package/dist_ts_apiclient/classes.certificate.js +0 -69
  155. package/dist_ts_apiclient/classes.config.d.ts +0 -7
  156. package/dist_ts_apiclient/classes.config.js +0 -11
  157. package/dist_ts_apiclient/classes.dcrouterapiclient.d.ts +0 -41
  158. package/dist_ts_apiclient/classes.dcrouterapiclient.js +0 -81
  159. package/dist_ts_apiclient/classes.email.d.ts +0 -30
  160. package/dist_ts_apiclient/classes.email.js +0 -52
  161. package/dist_ts_apiclient/classes.logs.d.ts +0 -21
  162. package/dist_ts_apiclient/classes.logs.js +0 -14
  163. package/dist_ts_apiclient/classes.radius.d.ts +0 -59
  164. package/dist_ts_apiclient/classes.radius.js +0 -95
  165. package/dist_ts_apiclient/classes.remoteingress.d.ts +0 -54
  166. package/dist_ts_apiclient/classes.remoteingress.js +0 -136
  167. package/dist_ts_apiclient/classes.route.d.ts +0 -42
  168. package/dist_ts_apiclient/classes.route.js +0 -154
  169. package/dist_ts_apiclient/classes.stats.d.ts +0 -47
  170. package/dist_ts_apiclient/classes.stats.js +0 -38
  171. package/dist_ts_apiclient/index.d.ts +0 -10
  172. package/dist_ts_apiclient/index.js +0 -14
  173. package/dist_ts_apiclient/plugins.d.ts +0 -3
  174. package/dist_ts_apiclient/plugins.js +0 -5
  175. package/dist_ts_web/00_commitinfo_data.d.ts +0 -8
  176. package/dist_ts_web/00_commitinfo_data.js +0 -9
  177. package/dist_ts_web/appstate.d.ts +0 -216
  178. package/dist_ts_web/appstate.js +0 -1064
  179. package/dist_ts_web/elements/index.d.ts +0 -12
  180. package/dist_ts_web/elements/index.js +0 -13
  181. package/dist_ts_web/elements/ops-dashboard.d.ts +0 -23
  182. package/dist_ts_web/elements/ops-dashboard.js +0 -317
  183. package/dist_ts_web/elements/ops-view-apitokens.d.ts +0 -13
  184. package/dist_ts_web/elements/ops-view-apitokens.js +0 -371
  185. package/dist_ts_web/elements/ops-view-certificates.d.ts +0 -22
  186. package/dist_ts_web/elements/ops-view-certificates.js +0 -528
  187. package/dist_ts_web/elements/ops-view-config.d.ts +0 -19
  188. package/dist_ts_web/elements/ops-view-config.js +0 -339
  189. package/dist_ts_web/elements/ops-view-emails.d.ts +0 -21
  190. package/dist_ts_web/elements/ops-view-emails.js +0 -165
  191. package/dist_ts_web/elements/ops-view-logs.d.ts +0 -13
  192. package/dist_ts_web/elements/ops-view-logs.js +0 -159
  193. package/dist_ts_web/elements/ops-view-network.d.ts +0 -71
  194. package/dist_ts_web/elements/ops-view-network.js +0 -764
  195. package/dist_ts_web/elements/ops-view-overview.d.ts +0 -22
  196. package/dist_ts_web/elements/ops-view-overview.js +0 -456
  197. package/dist_ts_web/elements/ops-view-remoteingress.d.ts +0 -20
  198. package/dist_ts_web/elements/ops-view-remoteingress.js +0 -494
  199. package/dist_ts_web/elements/ops-view-routes.d.ts +0 -12
  200. package/dist_ts_web/elements/ops-view-routes.js +0 -404
  201. package/dist_ts_web/elements/ops-view-security.d.ts +0 -21
  202. package/dist_ts_web/elements/ops-view-security.js +0 -574
  203. package/dist_ts_web/elements/shared/css.d.ts +0 -1
  204. package/dist_ts_web/elements/shared/css.js +0 -10
  205. package/dist_ts_web/elements/shared/index.d.ts +0 -2
  206. package/dist_ts_web/elements/shared/index.js +0 -3
  207. package/dist_ts_web/elements/shared/ops-sectionheading.d.ts +0 -5
  208. package/dist_ts_web/elements/shared/ops-sectionheading.js +0 -82
  209. package/dist_ts_web/index.d.ts +0 -1
  210. package/dist_ts_web/index.js +0 -10
  211. package/dist_ts_web/plugins.d.ts +0 -6
  212. package/dist_ts_web/plugins.js +0 -11
  213. package/dist_ts_web/router.d.ts +0 -19
  214. package/dist_ts_web/router.js +0 -91
@@ -1,421 +0,0 @@
1
- import * as plugins from '../../plugins.js';
2
- import * as interfaces from '../../../dist_ts_interfaces/index.js';
3
- export class CertificateHandler {
4
- opsServerRef;
5
- constructor(opsServerRef) {
6
- this.opsServerRef = opsServerRef;
7
- this.registerHandlers();
8
- }
9
- registerHandlers() {
10
- const viewRouter = this.opsServerRef.viewRouter;
11
- const adminRouter = this.opsServerRef.adminRouter;
12
- // ---- Read endpoints (viewRouter — valid identity required via middleware) ----
13
- // Get Certificate Overview
14
- viewRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('getCertificateOverview', async (dataArg) => {
15
- const certificates = await this.buildCertificateOverview();
16
- const summary = this.buildSummary(certificates);
17
- return { certificates, summary };
18
- }));
19
- // ---- Write endpoints (adminRouter — admin identity required via middleware) ----
20
- // Legacy route-based reprovision (backward compat)
21
- adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('reprovisionCertificate', async (dataArg) => {
22
- return this.reprovisionCertificateByRoute(dataArg.routeName);
23
- }));
24
- // Domain-based reprovision (preferred)
25
- adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('reprovisionCertificateDomain', async (dataArg) => {
26
- return this.reprovisionCertificateDomain(dataArg.domain);
27
- }));
28
- // Delete certificate
29
- adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('deleteCertificate', async (dataArg) => {
30
- return this.deleteCertificate(dataArg.domain);
31
- }));
32
- // Export certificate
33
- adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('exportCertificate', async (dataArg) => {
34
- return this.exportCertificate(dataArg.domain);
35
- }));
36
- // Import certificate
37
- adminRouter.addTypedHandler(new plugins.typedrequest.TypedHandler('importCertificate', async (dataArg) => {
38
- return this.importCertificate(dataArg.cert);
39
- }));
40
- }
41
- /**
42
- * Build domain-centric certificate overview.
43
- * Instead of one row per route, we produce one row per unique domain.
44
- */
45
- async buildCertificateOverview() {
46
- const dcRouter = this.opsServerRef.dcRouterRef;
47
- const smartProxy = dcRouter.smartProxy;
48
- if (!smartProxy)
49
- return [];
50
- const routes = smartProxy.routeManager.getRoutes();
51
- // Phase 1: Collect unique domains with their associated route info
52
- const domainMap = new Map();
53
- for (const route of routes) {
54
- if (!route.name)
55
- continue;
56
- const tls = route.action?.tls;
57
- if (!tls)
58
- continue;
59
- // Skip passthrough routes - they don't manage certificates
60
- if (tls.mode === 'passthrough')
61
- continue;
62
- const routeDomains = route.match.domains
63
- ? (Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains])
64
- : [];
65
- // Determine source
66
- let source = 'none';
67
- if (tls.certificate === 'auto') {
68
- if (smartProxy.settings.certProvisionFunction) {
69
- source = 'provision-function';
70
- }
71
- else {
72
- source = 'acme';
73
- }
74
- }
75
- else if (tls.certificate && typeof tls.certificate === 'object') {
76
- source = 'static';
77
- }
78
- const canReprovision = source === 'acme' || source === 'provision-function';
79
- const tlsMode = tls.mode;
80
- for (const domain of routeDomains) {
81
- const existing = domainMap.get(domain);
82
- if (existing) {
83
- // Add this route name to the existing domain entry
84
- if (!existing.routeNames.includes(route.name)) {
85
- existing.routeNames.push(route.name);
86
- }
87
- // Upgrade source if more specific
88
- if (existing.source === 'none' && source !== 'none') {
89
- existing.source = source;
90
- existing.canReprovision = canReprovision;
91
- }
92
- }
93
- else {
94
- domainMap.set(domain, {
95
- routeNames: [route.name],
96
- source,
97
- tlsMode,
98
- canReprovision,
99
- });
100
- }
101
- }
102
- }
103
- // Phase 2: Resolve status for each unique domain
104
- const certificates = [];
105
- for (const [domain, info] of domainMap) {
106
- let status = 'unknown';
107
- let expiryDate;
108
- let issuedAt;
109
- let issuer;
110
- let error;
111
- // Check event-based status from certificateStatusMap (now keyed by domain)
112
- const eventStatus = dcRouter.certificateStatusMap.get(domain);
113
- if (eventStatus) {
114
- status = eventStatus.status;
115
- expiryDate = eventStatus.expiryDate;
116
- issuedAt = eventStatus.issuedAt;
117
- error = eventStatus.error;
118
- if (eventStatus.source) {
119
- issuer = eventStatus.source;
120
- }
121
- }
122
- // Try SmartProxy certificate status if no event data
123
- if (status === 'unknown' && info.routeNames.length > 0) {
124
- try {
125
- const rustStatus = await smartProxy.getCertificateStatus(info.routeNames[0]);
126
- if (rustStatus) {
127
- if (rustStatus.expiryDate)
128
- expiryDate = rustStatus.expiryDate;
129
- if (rustStatus.issuer)
130
- issuer = rustStatus.issuer;
131
- if (rustStatus.issuedAt)
132
- issuedAt = rustStatus.issuedAt;
133
- if (rustStatus.status === 'valid' || rustStatus.status === 'expired') {
134
- status = rustStatus.status;
135
- }
136
- }
137
- }
138
- catch {
139
- // Rust bridge may not support this command yet — ignore
140
- }
141
- }
142
- // Check persisted cert data from StorageManager
143
- if (status === 'unknown') {
144
- const cleanDomain = domain.replace(/^\*\.?/, '');
145
- let certData = await dcRouter.storageManager.getJSON(`/certs/${cleanDomain}`);
146
- if (!certData) {
147
- // Also check certStore path (proxy-certs)
148
- certData = await dcRouter.storageManager.getJSON(`/proxy-certs/${domain}`);
149
- }
150
- if (certData?.validUntil) {
151
- expiryDate = new Date(certData.validUntil).toISOString();
152
- if (certData.created) {
153
- issuedAt = new Date(certData.created).toISOString();
154
- }
155
- issuer = 'smartacme-dns-01';
156
- }
157
- else if (certData?.publicKey) {
158
- // certStore has the cert — parse PEM for expiry
159
- try {
160
- const x509 = new plugins.crypto.X509Certificate(certData.publicKey);
161
- expiryDate = new Date(x509.validTo).toISOString();
162
- issuedAt = new Date(x509.validFrom).toISOString();
163
- }
164
- catch { /* PEM parsing failed */ }
165
- status = 'valid';
166
- issuer = 'cert-store';
167
- }
168
- else if (certData) {
169
- status = 'valid';
170
- issuer = 'cert-store';
171
- }
172
- }
173
- // Compute status from expiry date
174
- if (expiryDate && (status === 'valid' || status === 'unknown')) {
175
- const expiry = new Date(expiryDate);
176
- const now = new Date();
177
- const daysUntilExpiry = (expiry.getTime() - now.getTime()) / (1000 * 60 * 60 * 24);
178
- if (daysUntilExpiry < 0) {
179
- status = 'expired';
180
- }
181
- else if (daysUntilExpiry < 30) {
182
- status = 'expiring';
183
- }
184
- else {
185
- status = 'valid';
186
- }
187
- }
188
- // Static certs with no other info default to 'valid'
189
- if (info.source === 'static' && status === 'unknown') {
190
- status = 'valid';
191
- }
192
- // ACME/provision-function routes with no cert data are still provisioning
193
- if (status === 'unknown' && (info.source === 'acme' || info.source === 'provision-function')) {
194
- status = 'provisioning';
195
- }
196
- // Phase 3: Attach backoff info
197
- let backoffInfo;
198
- if (dcRouter.certProvisionScheduler) {
199
- const bi = await dcRouter.certProvisionScheduler.getBackoffInfo(domain);
200
- if (bi) {
201
- backoffInfo = bi;
202
- }
203
- }
204
- certificates.push({
205
- domain,
206
- routeNames: info.routeNames,
207
- status,
208
- source: info.source,
209
- tlsMode: info.tlsMode,
210
- expiryDate,
211
- issuer,
212
- issuedAt,
213
- error,
214
- canReprovision: info.canReprovision,
215
- backoffInfo,
216
- });
217
- }
218
- return certificates;
219
- }
220
- buildSummary(certificates) {
221
- const summary = { total: 0, valid: 0, expiring: 0, expired: 0, failed: 0, unknown: 0 };
222
- summary.total = certificates.length;
223
- for (const cert of certificates) {
224
- switch (cert.status) {
225
- case 'valid':
226
- summary.valid++;
227
- break;
228
- case 'expiring':
229
- summary.expiring++;
230
- break;
231
- case 'expired':
232
- summary.expired++;
233
- break;
234
- case 'failed':
235
- summary.failed++;
236
- break;
237
- case 'provisioning': // count as unknown
238
- case 'unknown':
239
- summary.unknown++;
240
- break;
241
- }
242
- }
243
- return summary;
244
- }
245
- /**
246
- * Legacy route-based reprovisioning
247
- */
248
- async reprovisionCertificateByRoute(routeName) {
249
- const dcRouter = this.opsServerRef.dcRouterRef;
250
- const smartProxy = dcRouter.smartProxy;
251
- if (!smartProxy) {
252
- return { success: false, message: 'SmartProxy is not running' };
253
- }
254
- try {
255
- await smartProxy.provisionCertificate(routeName);
256
- // Clear event-based status for domains in this route
257
- for (const [domain, entry] of dcRouter.certificateStatusMap) {
258
- if (entry.routeNames.includes(routeName)) {
259
- dcRouter.certificateStatusMap.delete(domain);
260
- }
261
- }
262
- return { success: true, message: `Certificate reprovisioning triggered for route '${routeName}'` };
263
- }
264
- catch (err) {
265
- return { success: false, message: err.message || 'Failed to reprovision certificate' };
266
- }
267
- }
268
- /**
269
- * Domain-based reprovisioning — clears backoff first, then triggers provision
270
- */
271
- async reprovisionCertificateDomain(domain) {
272
- const dcRouter = this.opsServerRef.dcRouterRef;
273
- const smartProxy = dcRouter.smartProxy;
274
- if (!smartProxy) {
275
- return { success: false, message: 'SmartProxy is not running' };
276
- }
277
- // Clear backoff for this domain (user override)
278
- if (dcRouter.certProvisionScheduler) {
279
- await dcRouter.certProvisionScheduler.clearBackoff(domain);
280
- }
281
- // Clear status map entry so it gets refreshed
282
- dcRouter.certificateStatusMap.delete(domain);
283
- // Try to provision via SmartAcme directly
284
- if (dcRouter.smartAcme) {
285
- try {
286
- await dcRouter.smartAcme.getCertificateForDomain(domain);
287
- return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}'` };
288
- }
289
- catch (err) {
290
- return { success: false, message: err.message || `Failed to reprovision certificate for ${domain}` };
291
- }
292
- }
293
- // Fallback: try provisioning via the first matching route
294
- const routeNames = dcRouter.findRouteNamesForDomain(domain);
295
- if (routeNames.length > 0) {
296
- try {
297
- await smartProxy.provisionCertificate(routeNames[0]);
298
- return { success: true, message: `Certificate reprovisioning triggered for domain '${domain}' via route '${routeNames[0]}'` };
299
- }
300
- catch (err) {
301
- return { success: false, message: err.message || `Failed to reprovision certificate for ${domain}` };
302
- }
303
- }
304
- return { success: false, message: `No routes found for domain '${domain}'` };
305
- }
306
- /**
307
- * Delete certificate data for a domain from storage
308
- */
309
- async deleteCertificate(domain) {
310
- const dcRouter = this.opsServerRef.dcRouterRef;
311
- const cleanDomain = domain.replace(/^\*\.?/, '');
312
- // Delete from all known storage paths
313
- const paths = [
314
- `/proxy-certs/${domain}`,
315
- `/proxy-certs/${cleanDomain}`,
316
- `/certs/${cleanDomain}`,
317
- ];
318
- for (const path of paths) {
319
- try {
320
- await dcRouter.storageManager.delete(path);
321
- }
322
- catch {
323
- // Path may not exist — ignore
324
- }
325
- }
326
- // Clear from in-memory status map
327
- dcRouter.certificateStatusMap.delete(domain);
328
- // Clear backoff info
329
- if (dcRouter.certProvisionScheduler) {
330
- await dcRouter.certProvisionScheduler.clearBackoff(domain);
331
- }
332
- return { success: true, message: `Certificate data deleted for '${domain}'` };
333
- }
334
- /**
335
- * Export certificate data for a domain as ICert-shaped JSON
336
- */
337
- async exportCertificate(domain) {
338
- const dcRouter = this.opsServerRef.dcRouterRef;
339
- const cleanDomain = domain.replace(/^\*\.?/, '');
340
- // Try SmartAcme /certs/ path first (has full ICert fields)
341
- let certData = await dcRouter.storageManager.getJSON(`/certs/${cleanDomain}`);
342
- if (certData && certData.publicKey && certData.privateKey) {
343
- return {
344
- success: true,
345
- cert: {
346
- id: certData.id || plugins.crypto.randomUUID(),
347
- domainName: certData.domainName || domain,
348
- created: certData.created || Date.now(),
349
- validUntil: certData.validUntil || 0,
350
- privateKey: certData.privateKey,
351
- publicKey: certData.publicKey,
352
- csr: certData.csr || '',
353
- },
354
- };
355
- }
356
- // Fallback: try /proxy-certs/ with original domain
357
- certData = await dcRouter.storageManager.getJSON(`/proxy-certs/${domain}`);
358
- if (!certData || !certData.publicKey) {
359
- // Try with clean domain
360
- certData = await dcRouter.storageManager.getJSON(`/proxy-certs/${cleanDomain}`);
361
- }
362
- if (certData && certData.publicKey && certData.privateKey) {
363
- return {
364
- success: true,
365
- cert: {
366
- id: plugins.crypto.randomUUID(),
367
- domainName: domain,
368
- created: certData.validFrom || Date.now(),
369
- validUntil: certData.validUntil || 0,
370
- privateKey: certData.privateKey,
371
- publicKey: certData.publicKey,
372
- csr: '',
373
- },
374
- };
375
- }
376
- return { success: false, message: `No certificate data found for '${domain}'` };
377
- }
378
- /**
379
- * Import a certificate from ICert-shaped JSON
380
- */
381
- async importCertificate(cert) {
382
- // Validate PEM content
383
- if (!cert.publicKey || !cert.publicKey.includes('-----BEGIN CERTIFICATE-----')) {
384
- return { success: false, message: 'Invalid publicKey: must contain a PEM-encoded certificate' };
385
- }
386
- if (!cert.privateKey || !cert.privateKey.includes('-----BEGIN')) {
387
- return { success: false, message: 'Invalid privateKey: must contain a PEM-encoded key' };
388
- }
389
- const dcRouter = this.opsServerRef.dcRouterRef;
390
- const cleanDomain = cert.domainName.replace(/^\*\.?/, '');
391
- // Save to /certs/ (SmartAcme-compatible path)
392
- await dcRouter.storageManager.setJSON(`/certs/${cleanDomain}`, {
393
- id: cert.id,
394
- domainName: cert.domainName,
395
- created: cert.created,
396
- validUntil: cert.validUntil,
397
- privateKey: cert.privateKey,
398
- publicKey: cert.publicKey,
399
- csr: cert.csr || '',
400
- });
401
- // Also save to /proxy-certs/ (proxy-cert format)
402
- await dcRouter.storageManager.setJSON(`/proxy-certs/${cert.domainName}`, {
403
- domain: cert.domainName,
404
- publicKey: cert.publicKey,
405
- privateKey: cert.privateKey,
406
- ca: undefined,
407
- validUntil: cert.validUntil,
408
- validFrom: cert.created,
409
- });
410
- // Update in-memory status map
411
- dcRouter.certificateStatusMap.set(cert.domainName, {
412
- status: 'valid',
413
- source: 'static',
414
- expiryDate: cert.validUntil ? new Date(cert.validUntil).toISOString() : undefined,
415
- issuedAt: cert.created ? new Date(cert.created).toISOString() : undefined,
416
- routeNames: [],
417
- });
418
- return { success: true, message: `Certificate imported for '${cert.domainName}'` };
419
- }
420
- }
421
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"certificate.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/certificate.handler.ts"],"names":[],"mappings":"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"}
@@ -1,7 +0,0 @@
1
- import type { OpsServer } from '../classes.opsserver.js';
2
- export declare class ConfigHandler {
3
- private opsServerRef;
4
- constructor(opsServerRef: OpsServer);
5
- private registerHandlers;
6
- private getConfiguration;
7
- }
@@ -1,192 +0,0 @@
1
- import * as plugins from '../../plugins.js';
2
- import * as paths from '../../paths.js';
3
- import * as interfaces from '../../../dist_ts_interfaces/index.js';
4
- export class ConfigHandler {
5
- opsServerRef;
6
- constructor(opsServerRef) {
7
- this.opsServerRef = opsServerRef;
8
- this.registerHandlers();
9
- }
10
- registerHandlers() {
11
- // Config endpoint registers directly on viewRouter (valid identity required via middleware)
12
- const router = this.opsServerRef.viewRouter;
13
- // Get Configuration Handler (read-only)
14
- router.addTypedHandler(new plugins.typedrequest.TypedHandler('getConfiguration', async (dataArg, toolsArg) => {
15
- const config = await this.getConfiguration();
16
- return {
17
- config,
18
- section: dataArg.section,
19
- };
20
- }));
21
- }
22
- async getConfiguration() {
23
- const dcRouter = this.opsServerRef.dcRouterRef;
24
- const opts = dcRouter.options;
25
- const resolvedPaths = dcRouter.resolvedPaths;
26
- // --- System ---
27
- const storageBackend = opts.storage?.readFunction
28
- ? 'custom'
29
- : opts.storage?.fsPath
30
- ? 'filesystem'
31
- : 'memory';
32
- // Resolve proxy IPs: fall back to SmartProxy's runtime proxyIPs if not in opts
33
- let proxyIps = opts.proxyIps || [];
34
- if (proxyIps.length === 0 && dcRouter.smartProxy) {
35
- const spSettings = dcRouter.smartProxy.settings;
36
- if (spSettings?.proxyIPs?.length > 0) {
37
- proxyIps = spSettings.proxyIPs;
38
- }
39
- }
40
- const system = {
41
- baseDir: resolvedPaths.dcrouterHomeDir,
42
- dataDir: resolvedPaths.dataDir,
43
- publicIp: opts.publicIp || dcRouter.detectedPublicIp || null,
44
- proxyIps,
45
- uptime: Math.floor(process.uptime()),
46
- storageBackend,
47
- storagePath: opts.storage?.fsPath || null,
48
- };
49
- // --- SmartProxy ---
50
- let acmeInfo = null;
51
- if (opts.smartProxyConfig?.acme) {
52
- const acme = opts.smartProxyConfig.acme;
53
- acmeInfo = {
54
- enabled: acme.enabled !== false,
55
- accountEmail: acme.accountEmail || '',
56
- useProduction: acme.useProduction !== false,
57
- autoRenew: acme.autoRenew !== false,
58
- renewThresholdDays: acme.renewThresholdDays || 30,
59
- };
60
- }
61
- let routeCount = 0;
62
- if (dcRouter.routeConfigManager) {
63
- try {
64
- const merged = await dcRouter.routeConfigManager.getMergedRoutes();
65
- routeCount = merged.routes.length;
66
- }
67
- catch {
68
- routeCount = opts.smartProxyConfig?.routes?.length || 0;
69
- }
70
- }
71
- else if (opts.smartProxyConfig?.routes) {
72
- routeCount = opts.smartProxyConfig.routes.length;
73
- }
74
- const smartProxy = {
75
- enabled: !!dcRouter.smartProxy,
76
- routeCount,
77
- acme: acmeInfo,
78
- };
79
- // --- Email ---
80
- let emailDomains = [];
81
- if (dcRouter.emailServer && dcRouter.emailServer.domainRegistry) {
82
- emailDomains = dcRouter.emailServer.domainRegistry.getAllDomains();
83
- }
84
- else if (opts.emailConfig?.domains) {
85
- emailDomains = opts.emailConfig.domains.map((d) => typeof d === 'string' ? d : d.domain);
86
- }
87
- let portMapping = null;
88
- if (opts.emailPortConfig?.portMapping) {
89
- portMapping = {};
90
- for (const [ext, int] of Object.entries(opts.emailPortConfig.portMapping)) {
91
- portMapping[String(ext)] = int;
92
- }
93
- }
94
- const email = {
95
- enabled: !!dcRouter.emailServer,
96
- ports: opts.emailConfig?.ports || [],
97
- portMapping,
98
- hostname: opts.emailConfig?.hostname || null,
99
- domains: emailDomains,
100
- emailRouteCount: opts.emailConfig?.routes?.length || 0,
101
- receivedEmailsPath: opts.emailPortConfig?.receivedEmailsPath || null,
102
- };
103
- // --- DNS ---
104
- const dnsRecords = (opts.dnsRecords || []).map(r => ({
105
- name: r.name,
106
- type: r.type,
107
- value: r.value,
108
- ttl: r.ttl,
109
- }));
110
- const dns = {
111
- enabled: !!dcRouter.dnsServer,
112
- port: 53,
113
- nsDomains: opts.dnsNsDomains || [],
114
- scopes: opts.dnsScopes || [],
115
- recordCount: dnsRecords.length,
116
- records: dnsRecords,
117
- dnsChallenge: !!opts.dnsChallenge?.cloudflareApiKey,
118
- };
119
- // --- TLS ---
120
- let tlsSource = 'none';
121
- if (opts.tls?.certPath && opts.tls?.keyPath) {
122
- tlsSource = 'static';
123
- }
124
- else if (opts.smartProxyConfig?.acme?.enabled !== false && opts.smartProxyConfig?.acme) {
125
- tlsSource = 'acme';
126
- }
127
- const tls = {
128
- contactEmail: opts.tls?.contactEmail || opts.smartProxyConfig?.acme?.accountEmail || null,
129
- domain: opts.tls?.domain || null,
130
- source: tlsSource,
131
- certPath: opts.tls?.certPath || null,
132
- keyPath: opts.tls?.keyPath || null,
133
- };
134
- // --- Cache ---
135
- const cacheConfig = opts.cacheConfig;
136
- const cache = {
137
- enabled: cacheConfig?.enabled !== false,
138
- storagePath: cacheConfig?.storagePath || resolvedPaths.defaultTsmDbPath,
139
- dbName: cacheConfig?.dbName || 'dcrouter',
140
- defaultTTLDays: cacheConfig?.defaultTTLDays || 30,
141
- cleanupIntervalHours: cacheConfig?.cleanupIntervalHours || 1,
142
- ttlConfig: cacheConfig?.ttlConfig ? { ...cacheConfig.ttlConfig } : {},
143
- };
144
- // --- RADIUS ---
145
- const radiusCfg = opts.radiusConfig;
146
- const radius = {
147
- enabled: !!dcRouter.radiusServer,
148
- authPort: radiusCfg?.authPort || null,
149
- acctPort: radiusCfg?.acctPort || null,
150
- bindAddress: radiusCfg?.bindAddress || null,
151
- clientCount: radiusCfg?.clients?.length || 0,
152
- vlanDefaultVlan: radiusCfg?.vlanAssignment?.defaultVlan ?? null,
153
- vlanAllowUnknownMacs: radiusCfg?.vlanAssignment?.allowUnknownMacs ?? null,
154
- vlanMappingCount: radiusCfg?.vlanAssignment?.mappings?.length || 0,
155
- };
156
- // --- Remote Ingress ---
157
- const riCfg = opts.remoteIngressConfig;
158
- const connectedEdgeIps = dcRouter.tunnelManager?.getConnectedEdgeIps() || [];
159
- // Determine TLS mode: custom certs > ACME from cert store > self-signed fallback
160
- let tlsMode = 'self-signed';
161
- if (riCfg?.tls?.certPath && riCfg?.tls?.keyPath) {
162
- tlsMode = 'custom';
163
- }
164
- else if (riCfg?.hubDomain) {
165
- try {
166
- const stored = await dcRouter.storageManager.getJSON(`/proxy-certs/${riCfg.hubDomain}`);
167
- if (stored?.publicKey && stored?.privateKey) {
168
- tlsMode = 'acme';
169
- }
170
- }
171
- catch { /* no stored cert */ }
172
- }
173
- const remoteIngress = {
174
- enabled: !!dcRouter.remoteIngressManager,
175
- tunnelPort: riCfg?.tunnelPort || null,
176
- hubDomain: riCfg?.hubDomain || null,
177
- tlsMode,
178
- connectedEdgeIps,
179
- };
180
- return {
181
- system,
182
- smartProxy,
183
- email,
184
- dns,
185
- tls,
186
- cache,
187
- radius,
188
- remoteIngress,
189
- };
190
- }
191
- }
192
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"config.handler.js","sourceRoot":"","sources":["../../../../ts/opsserver/handlers/config.handler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAC;AAExC,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAE9D,MAAM,OAAO,aAAa;IACJ;IAApB,YAAoB,YAAuB;QAAvB,iBAAY,GAAZ,YAAY,CAAW;QACzC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAEO,gBAAgB;QACtB,4FAA4F;QAC5F,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC;QAE5C,wCAAwC;QACxC,MAAM,CAAC,eAAe,CACpB,IAAI,OAAO,CAAC,YAAY,CAAC,YAAY,CACnC,kBAAkB,EAClB,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC7C,OAAO;gBACL,MAAM;gBACN,OAAO,EAAE,OAAO,CAAC,OAAO;aACzB,CAAC;QACJ,CAAC,CACF,CACF,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC;QAC/C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC;QAC9B,MAAM,aAAa,GAAG,QAAQ,CAAC,aAAa,CAAC;QAE7C,iBAAiB;QACjB,MAAM,cAAc,GAAuC,IAAI,CAAC,OAAO,EAAE,YAAY;YACnF,CAAC,CAAC,QAAQ;YACV,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM;gBACpB,CAAC,CAAC,YAAY;gBACd,CAAC,CAAC,QAAQ,CAAC;QAEf,+EAA+E;QAC/E,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QACnC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,UAAU,EAAE,CAAC;YACjD,MAAM,UAAU,GAAI,QAAQ,CAAC,UAAkB,CAAC,QAAQ,CAAC;YACzD,IAAI,UAAU,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrC,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC;YACjC,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAA8C;YACxD,OAAO,EAAE,aAAa,CAAC,eAAe;YACtC,OAAO,EAAE,aAAa,CAAC,OAAO;YAC9B,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,gBAAgB,IAAI,IAAI;YAC5D,QAAQ;YACR,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACpC,cAAc;YACd,WAAW,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,IAAI,IAAI;SAC1C,CAAC;QAEF,qBAAqB;QACrB,IAAI,QAAQ,GAA0D,IAAI,CAAC;QAC3E,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACxC,QAAQ,GAAG;gBACT,OAAO,EAAE,IAAI,CAAC,OAAO,KAAK,KAAK;gBAC/B,YAAY,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;gBACrC,aAAa,EAAE,IAAI,CAAC,aAAa,KAAK,KAAK;gBAC3C,SAAS,EAAE,IAAI,CAAC,SAAS,KAAK,KAAK;gBACnC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,IAAI,EAAE;aAClD,CAAC;QACJ,CAAC;QAED,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,QAAQ,CAAC,kBAAkB,EAAE,CAAC;YAChC,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,eAAe,EAAE,CAAC;gBACnE,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,CAAC;YAAC,MAAM,CAAC;gBACP,UAAU,GAAG,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;aAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE,MAAM,EAAE,CAAC;YACzC,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC;QACnD,CAAC;QAED,MAAM,UAAU,GAAkD;YAChE,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,UAAU;YAC9B,UAAU;YACV,IAAI,EAAE,QAAQ;SACf,CAAC;QAEF,gBAAgB;QAChB,IAAI,YAAY,GAAa,EAAE,CAAC;QAChC,IAAI,QAAQ,CAAC,WAAW,IAAK,QAAQ,CAAC,WAAmB,CAAC,cAAc,EAAE,CAAC;YACzE,YAAY,GAAI,QAAQ,CAAC,WAAmB,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;QAC9E,CAAC;aAAM,IAAI,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;YACrC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CACrD,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CACrC,CAAC;QACJ,CAAC;QAED,IAAI,WAAW,GAAkC,IAAI,CAAC;QACtD,IAAI,IAAI,CAAC,eAAe,EAAE,WAAW,EAAE,CAAC;YACtC,WAAW,GAAG,EAAE,CAAC;YACjB,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC1E,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,GAAa,CAAC;YAC3C,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GAA6C;YACtD,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW;YAC/B,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,IAAI,EAAE;YACpC,WAAW;YACX,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,IAAI,IAAI;YAC5C,OAAO,EAAE,YAAY;YACrB,eAAe,EAAE,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC;YACtD,kBAAkB,EAAE,IAAI,CAAC,eAAe,EAAE,kBAAkB,IAAI,IAAI;SACrE,CAAC;QAEF,cAAc;QACd,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnD,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,GAAG,EAAE,CAAC,CAAC,GAAG;SACX,CAAC,CAAC,CAAC;QAEJ,MAAM,GAAG,GAA2C;YAClD,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS;YAC7B,IAAI,EAAE,EAAE;YACR,SAAS,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE;YAClC,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,EAAE;YAC5B,WAAW,EAAE,UAAU,CAAC,MAAM;YAC9B,OAAO,EAAE,UAAU;YACnB,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,gBAAgB;SACpD,CAAC;QAEF,cAAc;QACd,IAAI,SAAS,GAA+B,MAAM,CAAC;QACnD,IAAI,IAAI,CAAC,GAAG,EAAE,QAAQ,IAAI,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,CAAC;YAC5C,SAAS,GAAG,QAAQ,CAAC;QACvB,CAAC;aAAM,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,OAAO,KAAK,KAAK,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC;YACzF,SAAS,GAAG,MAAM,CAAC;QACrB,CAAC;QAED,MAAM,GAAG,GAA2C;YAClD,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE,YAAY,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,YAAY,IAAI,IAAI;YACzF,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,MAAM,IAAI,IAAI;YAChC,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,IAAI,IAAI;YACpC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,IAAI,IAAI;SACnC,CAAC;QAEF,gBAAgB;QAChB,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,MAAM,KAAK,GAA6C;YACtD,OAAO,EAAE,WAAW,EAAE,OAAO,KAAK,KAAK;YACvC,WAAW,EAAE,WAAW,EAAE,WAAW,IAAI,aAAa,CAAC,gBAAgB;YACvE,MAAM,EAAE,WAAW,EAAE,MAAM,IAAI,UAAU;YACzC,cAAc,EAAE,WAAW,EAAE,cAAc,IAAI,EAAE;YACjD,oBAAoB,EAAE,WAAW,EAAE,oBAAoB,IAAI,CAAC;YAC5D,SAAS,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,WAAW,CAAC,SAAS,EAA4B,CAAC,CAAC,CAAC,EAAE;SAChG,CAAC;QAEF,iBAAiB;QACjB,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;QACpC,MAAM,MAAM,GAA8C;YACxD,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY;YAChC,QAAQ,EAAE,SAAS,EAAE,QAAQ,IAAI,IAAI;YACrC,QAAQ,EAAE,SAAS,EAAE,QAAQ,IAAI,IAAI;YACrC,WAAW,EAAE,SAAS,EAAE,WAAW,IAAI,IAAI;YAC3C,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;YAC5C,eAAe,EAAE,SAAS,EAAE,cAAc,EAAE,WAAW,IAAI,IAAI;YAC/D,oBAAoB,EAAE,SAAS,EAAE,cAAc,EAAE,gBAAgB,IAAI,IAAI;YACzE,gBAAgB,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;SACnE,CAAC;QAEF,yBAAyB;QACzB,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC;QACvC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,aAAa,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC;QAE7E,iFAAiF;QACjF,IAAI,OAAO,GAAsC,aAAa,CAAC;QAC/D,IAAI,KAAK,EAAE,GAAG,EAAE,QAAQ,IAAI,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;YAChD,OAAO,GAAG,QAAQ,CAAC;QACrB,CAAC;aAAM,IAAI,KAAK,EAAE,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,OAAO,CAAC,gBAAgB,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;gBACxF,IAAI,MAAM,EAAE,SAAS,IAAI,MAAM,EAAE,UAAU,EAAE,CAAC;oBAC5C,OAAO,GAAG,MAAM,CAAC;gBACnB,CAAC;YACH,CAAC;YAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,aAAa,GAAqD;YACtE,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB;YACxC,UAAU,EAAE,KAAK,EAAE,UAAU,IAAI,IAAI;YACrC,SAAS,EAAE,KAAK,EAAE,SAAS,IAAI,IAAI;YACnC,OAAO;YACP,gBAAgB;SACjB,CAAC;QAEF,OAAO;YACL,MAAM;YACN,UAAU;YACV,KAAK;YACL,GAAG;YACH,GAAG;YACH,KAAK;YACL,MAAM;YACN,aAAa;SACd,CAAC;IACJ,CAAC;CACF"}