@serve.zone/dcrouter 13.16.1 → 13.17.2

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.
@@ -78,6 +78,9 @@ let OpsViewRoutes = (() => {
78
78
  let _classExtraInitializers = [];
79
79
  let _classThis;
80
80
  let _classSuper = DeesElement;
81
+ let _routeFilter_decorators;
82
+ let _routeFilter_initializers = [];
83
+ let _routeFilter_extraInitializers = [];
81
84
  let _routeState_decorators;
82
85
  let _routeState_initializers = [];
83
86
  let _routeState_extraInitializers = [];
@@ -88,22 +91,27 @@ let OpsViewRoutes = (() => {
88
91
  static { _classThis = this; }
89
92
  static {
90
93
  const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
94
+ _routeFilter_decorators = [state()];
91
95
  _routeState_decorators = [state()];
92
96
  _profilesTargetsState_decorators = [state()];
97
+ __esDecorate(this, null, _routeFilter_decorators, { kind: "accessor", name: "routeFilter", static: false, private: false, access: { has: obj => "routeFilter" in obj, get: obj => obj.routeFilter, set: (obj, value) => { obj.routeFilter = value; } }, metadata: _metadata }, _routeFilter_initializers, _routeFilter_extraInitializers);
93
98
  __esDecorate(this, null, _routeState_decorators, { kind: "accessor", name: "routeState", static: false, private: false, access: { has: obj => "routeState" in obj, get: obj => obj.routeState, set: (obj, value) => { obj.routeState = value; } }, metadata: _metadata }, _routeState_initializers, _routeState_extraInitializers);
94
99
  __esDecorate(this, null, _profilesTargetsState_decorators, { kind: "accessor", name: "profilesTargetsState", static: false, private: false, access: { has: obj => "profilesTargetsState" in obj, get: obj => obj.profilesTargetsState, set: (obj, value) => { obj.profilesTargetsState = value; } }, metadata: _metadata }, _profilesTargetsState_initializers, _profilesTargetsState_extraInitializers);
95
100
  __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
96
101
  OpsViewRoutes = _classThis = _classDescriptor.value;
97
102
  if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
98
103
  }
99
- #routeState_accessor_storage = __runInitializers(this, _routeState_initializers, {
104
+ #routeFilter_accessor_storage = __runInitializers(this, _routeFilter_initializers, 'User Routes');
105
+ get routeFilter() { return this.#routeFilter_accessor_storage; }
106
+ set routeFilter(value) { this.#routeFilter_accessor_storage = value; }
107
+ #routeState_accessor_storage = (__runInitializers(this, _routeFilter_extraInitializers), __runInitializers(this, _routeState_initializers, {
100
108
  mergedRoutes: [],
101
109
  warnings: [],
102
110
  apiTokens: [],
103
111
  isLoading: false,
104
112
  error: null,
105
113
  lastUpdated: 0,
106
- });
114
+ }));
107
115
  get routeState() { return this.#routeState_accessor_storage; }
108
116
  set routeState(value) { this.#routeState_accessor_storage = value; }
109
117
  #profilesTargetsState_accessor_storage = (__runInitializers(this, _routeState_extraInitializers), __runInitializers(this, _profilesTargetsState_initializers, {
@@ -200,20 +208,20 @@ let OpsViewRoutes = (() => {
200
208
  },
201
209
  {
202
210
  id: 'configRoutes',
203
- title: 'From Config',
211
+ title: 'System Routes',
204
212
  type: 'number',
205
213
  value: configCount,
206
214
  icon: 'lucide:settings',
207
- description: 'Seeded from config/email/DNS',
215
+ description: 'From config, email, and DNS',
208
216
  color: '#8b5cf6',
209
217
  },
210
218
  {
211
219
  id: 'apiRoutes',
212
- title: 'API Created',
220
+ title: 'User Routes',
213
221
  type: 'number',
214
222
  value: apiCount,
215
223
  icon: 'lucide:code',
216
- description: 'Routes added via API',
224
+ description: 'Created via API',
217
225
  color: '#0ea5e9',
218
226
  },
219
227
  {
@@ -226,8 +234,11 @@ let OpsViewRoutes = (() => {
226
234
  color: disabledCount > 0 ? '#ef4444' : '#6b7280',
227
235
  },
228
236
  ];
229
- // Map merged routes to sz-route-list-view format
230
- const szRoutes = mergedRoutes.map((mr) => {
237
+ // Filter routes based on selected tab
238
+ const isUserRoutes = this.routeFilter === 'User Routes';
239
+ const filteredRoutes = mergedRoutes.filter((mr) => isUserRoutes ? mr.origin === 'api' : mr.origin !== 'api');
240
+ // Map filtered routes to sz-route-list-view format
241
+ const szRoutes = filteredRoutes.map((mr) => {
231
242
  const tags = [...(mr.route.tags || [])];
232
243
  tags.push(mr.origin);
233
244
  if (!mr.enabled)
@@ -260,6 +271,13 @@ let OpsViewRoutes = (() => {
260
271
  ]}
261
272
  ></dees-statsgrid>
262
273
 
274
+ <dees-input-multitoggle
275
+ .type=${'single'}
276
+ .options=${['User Routes', 'System Routes']}
277
+ .selectedOption=${this.routeFilter}
278
+ @change=${(e) => { this.routeFilter = e.target.value || e.target.selectedOption; }}
279
+ ></dees-input-multitoggle>
280
+
263
281
  ${warnings.length > 0
264
282
  ? html `
265
283
  <div class="warnings-bar">
@@ -277,6 +295,7 @@ let OpsViewRoutes = (() => {
277
295
  ? html `
278
296
  <sz-route-list-view
279
297
  .routes=${szRoutes}
298
+ .showActionsFilter=${isUserRoutes ? () => true : () => false}
280
299
  @route-click=${(e) => this.handleRouteClick(e)}
281
300
  @route-edit=${(e) => this.handleRouteEdit(e)}
282
301
  @route-delete=${(e) => this.handleRouteDelete(e)}
@@ -284,8 +303,8 @@ let OpsViewRoutes = (() => {
284
303
  `
285
304
  : html `
286
305
  <div class="empty-state">
287
- <p>No routes configured</p>
288
- <p>Add a route to get started.</p>
306
+ <p>No ${isUserRoutes ? 'user' : 'system'} routes</p>
307
+ <p>${isUserRoutes ? 'Add a route to get started.' : 'System routes are generated from config, email, and DNS settings.'}</p>
289
308
  </div>
290
309
  `}
291
310
  </div>
@@ -671,4 +690,4 @@ let OpsViewRoutes = (() => {
671
690
  return OpsViewRoutes = _classThis;
672
691
  })();
673
692
  export { OpsViewRoutes };
674
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-routes.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-routes.ts"],"names":[],"mappings":"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"}
693
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ops-view-routes.js","sourceRoot":"","sources":["../../../../ts_web/elements/network/ops-view-routes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAmB,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EACL,WAAW,EACX,GAAG,EACH,UAAU,EACV,aAAa,EACb,IAAI,EACJ,KAAK,GAEN,MAAM,6BAA6B,CAAC;AAErC,yDAAyD;AACzD,MAAM,cAAc,GAAG;IACrB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE;IAC1C,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,EAAE;IAC7C,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE;IACzC,EAAE,GAAG,EAAE,yBAAyB,EAAE,MAAM,EAAE,wBAAwB,EAAE;CACrE,CAAC;AACF,MAAM,cAAc,GAAG;IACrB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,EAAE;IACrD,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,oBAAoB,EAAE;CAChD,CAAC;AAEF;;GAEG;AACH,SAAS,kBAAkB,CAAC,MAAW;IACrC,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC;QACrE,IAAI,CAAC,SAAS;YAAE,OAAO;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC;QAClC,MAAM,OAAO,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC;QACpF,MAAM,SAAS,GAAG,OAAO,KAAK,WAAW,IAAI,OAAO,KAAK,yBAAyB,CAAC;QACnF,MAAM,SAAS,GAAG,SAAS,CAAC,aAAa,CAAC,sBAAsB,CAAgB,CAAC;QACjF,IAAI,SAAS;YAAE,SAAS,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;QACrE,MAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC;QACzC,MAAM,OAAO,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC;QACpF,MAAM,WAAW,GAAG,SAAS,CAAC,aAAa,CAAC,qBAAqB,CAAgB,CAAC;QAClF,IAAI,WAAW;YAAE,WAAW,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,SAAS,IAAI,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;IACrG,CAAC,CAAC;IACF,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC;IACzD,gBAAgB,EAAE,CAAC;AACrB,CAAC;IAGY,aAAa;4BADzB,aAAa,CAAC,iBAAiB,CAAC;;;;sBACE,WAAW;;;;;;;;;;6BAAnB,SAAQ,WAAW;;;;uCAC3C,KAAK,EAAE;sCAEP,KAAK,EAAE;gDASP,KAAK,EAAE;YAXC,sLAAS,WAAW,6BAAX,WAAW,iGAAkD;YAEtE,mLAAS,UAAU,6BAAV,UAAU,+FAO1B;YAEO,iNAAS,oBAAoB,6BAApB,oBAAoB,mHAMpC;YAlBJ,6KAsnBC;;;;QArnBU,mFAAwD,aAAa,EAAC;QAAtE,IAAS,WAAW,iDAAkD;QAAtE,IAAS,WAAW,uDAAkD;QAEtE,2IAAsD;YAC7D,YAAY,EAAE,EAAE;YAChB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,CAAC;SACf,GAAC;QAPO,IAAS,UAAU,gDAO1B;QAPO,IAAS,UAAU,sDAO1B;QAEO,8JAAgE;YACvE,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,KAAK;YAChB,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,CAAC;SACf,GAAC;QANO,IAAS,oBAAoB,0DAMpC;QANO,IAAS,oBAAoB,gEAMpC;QAEF;YACE,KAAK,EAAE,CAAC;;YACR,MAAM,GAAG,GAAG,QAAQ,CAAC,wBAAwB;iBAC1C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBAChB,SAAS,CAAC,CAAC,UAAU,EAAE,EAAE;gBACxB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;YAC/B,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAE/B,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB;iBAC5C,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBAChB,SAAS,CAAC,CAAC,OAAO,EAAE,EAAE;gBACrB,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC;YACtC,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEjC,gEAAgE;YAChE,uDAAuD;YACvD,MAAM,QAAQ,GAAG,QAAQ,CAAC,cAAc;iBACrC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;iBAC3B,SAAS,CAAC,CAAC,UAAU,EAAE,EAAE;gBACxB,IAAI,UAAU,EAAE,CAAC;oBACf,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;oBACzF,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,CAAC,6BAA6B,EAAE,IAAI,CAAC,CAAC;gBACjG,CAAC;YACH,CAAC,CAAC,CAAC;YACL,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACrC;QAEM,MAAM,CAAC,MAAM,GAAG;YACrB,UAAU,CAAC,aAAa;YACxB,WAAW;YACX,GAAG,CAAA;;;;;;;;sBAQe,UAAU,CAAC,OAAO,CAAC,yBAAyB,EAAE,wBAAwB,CAAC;4BACjE,UAAU,CAAC,OAAO,CAAC,yBAAyB,EAAE,wBAAwB,CAAC;;;;;;;;;;;iBAWlF,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;;;;;;;;;;iBAUrC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,CAAC;;;;;;KAMjD;SACF,CAAC;QAEK,MAAM;YACX,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC;YAEnD,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;YACtE,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC;YAC5E,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,MAAM,CAAC;YAEzE,MAAM,UAAU,GAAiB;gBAC/B;oBACE,EAAE,EAAE,aAAa;oBACjB,KAAK,EAAE,cAAc;oBACrB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,YAAY,CAAC,MAAM;oBAC1B,IAAI,EAAE,cAAc;oBACpB,WAAW,EAAE,uBAAuB;oBACpC,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,EAAE,EAAE,cAAc;oBAClB,KAAK,EAAE,eAAe;oBACtB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,WAAW;oBAClB,IAAI,EAAE,iBAAiB;oBACvB,WAAW,EAAE,6BAA6B;oBAC1C,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,EAAE,EAAE,WAAW;oBACf,KAAK,EAAE,aAAa;oBACpB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,aAAa;oBACnB,WAAW,EAAE,iBAAiB;oBAC9B,KAAK,EAAE,SAAS;iBACjB;gBACD;oBACE,EAAE,EAAE,UAAU;oBACd,KAAK,EAAE,UAAU;oBACjB,IAAI,EAAE,QAAQ;oBACd,KAAK,EAAE,aAAa;oBACpB,IAAI,EAAE,oBAAoB;oBAC1B,WAAW,EAAE,2BAA2B;oBACxC,KAAK,EAAE,aAAa,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;iBACjD;aACF,CAAC;YAEF,sCAAsC;YACtC,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,KAAK,aAAa,CAAC;YACxD,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAChD,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,KAAK,CACzD,CAAC;YAEF,mDAAmD;YACnD,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBACzC,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;gBACrB,IAAI,CAAC,EAAE,CAAC,OAAO;oBAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAEvC,OAAO;oBACL,GAAG,EAAE,CAAC,KAAK;oBACX,OAAO,EAAE,EAAE,CAAC,OAAO;oBACnB,IAAI;oBACJ,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,IAAI,SAAS;oBACvC,QAAQ,EAAE,EAAE,CAAC,QAAQ;iBACtB,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO,IAAI,CAAA;;;;;mBAKI,UAAU;yBACJ;gBACb;oBACE,IAAI,EAAE,WAAW;oBACjB,QAAQ,EAAE,aAAa;oBACvB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE;iBAC3C;gBACD;oBACE,IAAI,EAAE,SAAS;oBACf,QAAQ,EAAE,kBAAkB;oBAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;iBACjC;aACF;;;;kBAIO,QAAQ;qBACL,CAAC,aAAa,EAAE,eAAe,CAAC;4BACzB,IAAI,CAAC,WAAW;oBACxB,CAAC,CAAM,EAAE,EAAE,GAAG,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;;;UAGvF,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACnB,CAAC,CAAC,IAAI,CAAA;;kBAEE,QAAQ,CAAC,GAAG,CACZ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAA;;;8BAGC,CAAC,CAAC,OAAO;;mBAEpB,CACF;;aAEJ;gBACH,CAAC,CAAC,EAAE;;UAEJ,QAAQ,CAAC,MAAM,GAAG,CAAC;gBACnB,CAAC,CAAC,IAAI,CAAA;;0BAEU,QAAQ;qCACG,YAAY,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK;+BAC7C,CAAC,CAAc,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;8BAC7C,CAAC,CAAc,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;gCACzC,CAAC,CAAc,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;;aAEhE;gBACH,CAAC,CAAC,IAAI,CAAA;;wBAEQ,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ;qBACnC,YAAY,CAAC,CAAC,CAAC,6BAA6B,CAAC,CAAC,CAAC,mEAAmE;;aAE1H;;KAER,CAAC;QACJ,CAAC;QAEO,KAAK,CAAC,gBAAgB,CAAC,CAAc;YAC3C,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,YAAY;gBAAE,OAAO;YAE1B,sCAAsC;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAC9C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAC5C,CAAC;YACF,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAElE,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC7B,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,UAAU,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;gBACtC,OAAO,EAAE,IAAI,CAAA;;oDAEiC,MAAM,CAAC,MAAM;+BAClC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU;8CACxB,MAAM,CAAC,EAAE;YAC3C,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAA,sDAAsD,IAAI,CAAC,iBAAiB,eAAe,CAAC,CAAC,CAAC,EAAE;YAC9H,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAA,sDAAsD,IAAI,CAAC,iBAAiB,eAAe,CAAC,CAAC,CAAC,EAAE;;OAEnI;gBACD,WAAW,EAAE;oBACX;wBACE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;wBAC3C,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa;wBACzD,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CACpD,QAAQ,CAAC,iBAAiB,EAC1B,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,CAC5C,CAAC;4BACF,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wBAC3B,CAAC;qBACF;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,eAAe;wBACzB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;4BACzB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;wBACnC,CAAC;qBACF;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,gBAAgB;wBAC1B,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CACpD,QAAQ,CAAC,iBAAiB,EAC1B,MAAM,CAAC,EAAE,CACV,CAAC;4BACF,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wBAC3B,CAAC;qBACF;oBACD;wBACE,IAAI,EAAE,OAAO;wBACb,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE;qBAC1D;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,eAAe,CAAC,CAAc;YAC1C,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,YAAY;gBAAE,OAAO;YAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAC9C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAC5C,CAAC;YACF,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACnC,CAAC;QAEO,KAAK,CAAC,iBAAiB,CAAC,CAAc;YAC5C,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,CAAC,YAAY;gBAAE,OAAO;YAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAC9C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAC5C,CAAC;YACF,IAAI,CAAC,MAAM;gBAAE,OAAO;YAEpB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC5B,OAAO,EAAE,iBAAiB,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE;gBAC7C,OAAO,EAAE,IAAI,CAAA;;;;OAIZ;gBACD,WAAW,EAAE;oBACX;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE;qBAC1D;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,gBAAgB;wBAC1B,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CACpD,QAAQ,CAAC,iBAAiB,EAC1B,MAAM,CAAC,EAAE,CACV,CAAC;4BACF,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wBAC3B,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QAEO,KAAK,CAAC,mBAAmB,CAAC,MAAoC;YACpE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YAElD,MAAM,cAAc,GAAG;gBACrB,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE;gBAC/C,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACtB,GAAG,EAAE,CAAC,CAAC,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;iBACjE,CAAC,CAAC;aACJ,CAAC;YACF,MAAM,aAAa,GAAG;gBACpB,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE;gBAC7C,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACrB,GAAG,EAAE,CAAC,CAAC,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,GAAG;iBACrF,CAAC,CAAC;aACJ,CAAC;YAEF,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;YAC3B,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;gBACnD,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;gBACvG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,cAAc,GAAa,KAAK,CAAC,KAAK,CAAC,OAAO;gBAClD,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACpF,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAG,WAAW;gBACnC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC5E,CAAC,CAAC,EAAE,CAAC;YACP,MAAM,iBAAiB,GAAG,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAEpF,+CAA+C;YAC/C,MAAM,UAAU,GAAI,KAAK,CAAC,MAAc,CAAC,GAAG,CAAC;YAC7C,MAAM,cAAc,GAAG,UAAU,EAAE,IAAI,IAAI,MAAM,CAAC;YAClD,MAAM,cAAc,GAAG,UAAU;gBAC/B,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,KAAK,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;gBACpF,CAAC,CAAC,MAAM,CAAC;YACX,MAAM,gBAAgB,GAAG,CAAC,OAAO,UAAU,EAAE,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YACzG,MAAM,iBAAiB,GAAG,CAAC,OAAO,UAAU,EAAE,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3G,MAAM,SAAS,GAAG,cAAc,KAAK,WAAW,IAAI,cAAc,KAAK,yBAAyB,CAAC;YACjG,MAAM,QAAQ,GAAG,cAAc,KAAK,QAAQ,CAAC;YAE7C,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC;gBAC9C,OAAO,EAAE,eAAe,KAAK,CAAC,IAAI,EAAE;gBACpC,OAAO,EAAE,IAAI,CAAA;;kCAEe,MAAM,WAAW,YAAY,WAAW,KAAK,CAAC,IAAI,IAAI,EAAE,cAAc,IAAI;kCAC1E,OAAO,WAAW,OAAO,iBAAiB,+BAA+B,WAAW,YAAY,cAAc,IAAI;kCAClH,SAAS,WAAW,SAAS,iBAAiB,eAAe,WAAW,cAAc;kCACtF,UAAU,WAAW,UAAU,iBAAiB,iCAAiC,WAAW,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;sCAC5I,kBAAkB,WAAW,gBAAgB,aAAa,cAAc,oBAAoB,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI;sCACnL,kBAAkB,WAAW,gBAAgB,aAAa,aAAa,oBAAoB,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,gBAAgB,IAAI,EAAE,CAAC,CAAC,IAAI,IAAI;kCACrL,YAAY,WAAW,aAAa,iBAAiB,yCAAyC,WAAW,iBAAiB;kCAC1H,YAAY,WAAW,aAAa,iBAAiB,yCAAyC,WAAW,iBAAiB;sCACtH,SAAS,WAAW,UAAU,aAAa,cAAc,oBAAoB,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,cAAc,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC;6DAC/H,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;wCAChD,gBAAgB,WAAW,aAAa,aAAa,cAAc,oBAAoB,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,cAAc,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC;8DAC1I,SAAS,IAAI,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;sCAC/D,YAAY,WAAW,aAAa,iBAAiB,yBAAyB,WAAW,gBAAgB;sCACzG,aAAa,WAAW,aAAa,iBAAiB,yBAAyB,WAAW,iBAAiB;;;;OAI1I;gBACD,WAAW,EAAE;oBACX;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE;qBAC1D;oBACD;wBACE,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,cAAc;wBACxB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;4BACxF,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;4BAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK;gCAAE,OAAO;4BAE9C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;4BACpH,MAAM,OAAO,GAAa,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gCACvD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gCAClC,CAAC,CAAC,EAAE,CAAC;4BACP,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;4BAEjF,MAAM,YAAY,GAAQ;gCACxB,IAAI,EAAE,QAAQ,CAAC,IAAI;gCACnB,KAAK,EAAE;oCACL,KAAK;oCACL,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iCAC3C;gCACD,MAAM,EAAE;oCACN,IAAI,EAAE,SAAS;oCACf,OAAO,EAAE;wCACP;4CACE,IAAI,EAAE,QAAQ,CAAC,UAAU,IAAI,WAAW;4CACxC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,GAAG;yCAC/C;qCACF;iCACF;gCACD,GAAG,CAAC,QAAQ,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;6BAC9D,CAAC;4BAEF,6BAA6B;4BAC7B,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAc,CAAC;4BAC7C,MAAM,UAAU,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC;4BACvF,IAAI,UAAU,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gCACxC,MAAM,GAAG,GAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;gCACtC,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;oCACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,cAAqB,CAAC;oCACpD,MAAM,UAAU,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC;oCACvF,IAAI,UAAU,KAAK,QAAQ,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wCAC3E,GAAG,CAAC,WAAW,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC;oCAC7E,CAAC;yCAAM,CAAC;wCACN,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;oCAC3B,CAAC;gCACH,CAAC;gCACD,YAAY,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;4BAChC,CAAC;iCAAM,CAAC;gCACN,YAAY,CAAC,MAAM,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,mBAAmB;4BACrD,CAAC;4BAED,MAAM,QAAQ,GAAQ,EAAE,CAAC;4BACzB,MAAM,eAAe,GAAG,QAAQ,CAAC,gBAAuB,CAAC;4BACzD,MAAM,UAAU,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC;4BAChG,IAAI,UAAU,EAAE,CAAC;gCACf,QAAQ,CAAC,gBAAgB,GAAG,UAAU,CAAC;4BACzC,CAAC;4BACD,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAuB,CAAC;4BACxD,MAAM,SAAS,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC;4BAC5F,IAAI,SAAS,EAAE,CAAC;gCACd,QAAQ,CAAC,gBAAgB,GAAG,SAAS,CAAC;4BACxC,CAAC;4BAED,MAAM,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CACpD,QAAQ,CAAC,iBAAiB,EAC1B;gCACE,EAAE,EAAE,MAAM,CAAC,EAAE;gCACb,KAAK,EAAE,YAAY;gCACnB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;6BAClE,CACF,CAAC;4BACF,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wBAC3B,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;YACH,6DAA6D;YAC7D,MAAM,QAAQ,GAAG,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAQ,CAAC;YACrG,IAAI,QAAQ,EAAE,CAAC;gBACb,MAAM,QAAQ,CAAC,cAAc,CAAC;gBAC9B,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;QAEO,KAAK,CAAC,qBAAqB;YACjC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;YAClE,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC;YACpD,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC;YAElD,kDAAkD;YAClD,MAAM,cAAc,GAAG;gBACrB,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,0BAA0B,EAAE;gBAC/C,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACtB,GAAG,EAAE,CAAC,CAAC,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;iBACjE,CAAC,CAAC;aACJ,CAAC;YACF,MAAM,aAAa,GAAG;gBACpB,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,wBAAwB,EAAE;gBAC7C,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACrB,GAAG,EAAE,CAAC,CAAC,EAAE;oBACT,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,GAAG;iBACrF,CAAC,CAAC;aACJ,CAAC;YAEF,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,aAAa,CAAC;gBAChD,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,IAAI,CAAA;;kCAEe,MAAM,WAAW,YAAY,cAAc,IAAI;kCAC/C,OAAO,WAAW,OAAO,iBAAiB,+BAA+B,cAAc,IAAI;kCAC3F,SAAS,WAAW,SAAS,iBAAiB,eAAe;kCAC7D,UAAU,WAAW,UAAU,iBAAiB,iCAAiC;sCAC7E,kBAAkB,WAAW,gBAAgB,aAAa,cAAc;sCACxE,kBAAkB,WAAW,gBAAgB,aAAa,aAAa;kCAC3E,YAAY,WAAW,aAAa,iBAAiB,yCAAyC,WAAW,WAAW;kCACpH,YAAY,WAAW,aAAa,iBAAiB,yCAAyC;sCAC1F,SAAS,WAAW,UAAU,aAAa,cAAc,oBAAoB,cAAc,CAAC,CAAC,CAAC;;wCAE5F,gBAAgB,WAAW,aAAa,aAAa,cAAc,oBAAoB,cAAc,CAAC,CAAC,CAAC;;sCAE1G,YAAY,WAAW,aAAa,iBAAiB,yBAAyB;sCAC9E,aAAa,WAAW,aAAa,iBAAiB,yBAAyB;;;;OAI9G;gBACD,WAAW,EAAE;oBACX;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,UAAU;wBACpB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE;qBAC1D;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,aAAa;wBACvB,MAAM,EAAE,KAAK,EAAE,QAAa,EAAE,EAAE;4BAC9B,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;4BACxF,IAAI,CAAC,IAAI;gCAAE,OAAO;4BAClB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;4BAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK;gCAAE,OAAO;4BAE9C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;4BACpH,MAAM,OAAO,GAAa,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gCACvD,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;gCAClC,CAAC,CAAC,EAAE,CAAC;4BACP,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;4BAEjF,MAAM,KAAK,GAAQ;gCACjB,IAAI,EAAE,QAAQ,CAAC,IAAI;gCACnB,KAAK,EAAE;oCACL,KAAK;oCACL,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iCAC3C;gCACD,MAAM,EAAE;oCACN,IAAI,EAAE,SAAS;oCACf,OAAO,EAAE;wCACP;4CACE,IAAI,EAAE,QAAQ,CAAC,UAAU,IAAI,WAAW;4CACxC,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,GAAG;yCAC/C;qCACF;iCACF;gCACD,GAAG,CAAC,QAAQ,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;6BAC9D,CAAC;4BAEF,6BAA6B;4BAC7B,MAAM,YAAY,GAAG,QAAQ,CAAC,OAAc,CAAC;4BAC7C,MAAM,UAAU,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC;4BACvF,IAAI,UAAU,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gCACxC,MAAM,GAAG,GAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;gCACtC,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;oCACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,cAAqB,CAAC;oCACpD,MAAM,UAAU,GAAG,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,EAAE,GAAG,CAAC;oCACvF,IAAI,UAAU,KAAK,QAAQ,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;wCAC3E,GAAG,CAAC,WAAW,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC;oCAC7E,CAAC;yCAAM,CAAC;wCACN,GAAG,CAAC,WAAW,GAAG,MAAM,CAAC;oCAC3B,CAAC;gCACH,CAAC;gCACD,KAAK,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,CAAC;4BACzB,CAAC;4BAED,4CAA4C;4BAC5C,MAAM,QAAQ,GAAQ,EAAE,CAAC;4BACzB,MAAM,eAAe,GAAG,QAAQ,CAAC,gBAAuB,CAAC;4BACzD,MAAM,UAAU,GAAG,OAAO,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,eAAe,EAAE,GAAG,CAAC;4BAChG,IAAI,UAAU,EAAE,CAAC;gCACf,QAAQ,CAAC,gBAAgB,GAAG,UAAU,CAAC;4BACzC,CAAC;4BACD,MAAM,cAAc,GAAG,QAAQ,CAAC,gBAAuB,CAAC;4BACxD,MAAM,SAAS,GAAG,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC;4BAC5F,IAAI,SAAS,EAAE,CAAC;gCACd,QAAQ,CAAC,gBAAgB,GAAG,SAAS,CAAC;4BACxC,CAAC;4BAED,MAAM,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CACpD,QAAQ,CAAC,iBAAiB,EAC1B;gCACE,KAAK;gCACL,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;6BAClE,CACF,CAAC;4BACF,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC;wBAC3B,CAAC;qBACF;iBACF;aACF,CAAC,CAAC;YACH,6DAA6D;YAC7D,MAAM,UAAU,GAAG,WAAW,EAAE,UAAU,EAAE,aAAa,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC,WAAW,CAAQ,CAAC;YACzG,IAAI,UAAU,EAAE,CAAC;gBACf,MAAM,UAAU,CAAC,cAAc,CAAC;gBAChC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;QAEO,WAAW;YACjB,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QAC3F,CAAC;QAED,KAAK,CAAC,YAAY;YAChB,MAAM,QAAQ,CAAC,wBAAwB,CAAC,cAAc,CAAC,QAAQ,CAAC,uBAAuB,EAAE,IAAI,CAAC,CAAC;QACjG,CAAC;;YArnBU,uDAAa;;;;;SAAb,aAAa"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@serve.zone/dcrouter",
3
3
  "private": false,
4
- "version": "13.16.1",
4
+ "version": "13.17.2",
5
5
  "description": "A multifaceted routing service handling mail and SMS delivery functions.",
6
6
  "type": "module",
7
7
  "exports": {
@@ -54,7 +54,7 @@
54
54
  "@push.rocks/smartnetwork": "^4.5.2",
55
55
  "@push.rocks/smartpath": "^6.0.0",
56
56
  "@push.rocks/smartpromise": "^4.2.3",
57
- "@push.rocks/smartproxy": "^27.5.0",
57
+ "@push.rocks/smartproxy": "^27.6.0",
58
58
  "@push.rocks/smartradius": "^1.1.1",
59
59
  "@push.rocks/smartrequest": "^5.0.1",
60
60
  "@push.rocks/smartrx": "^3.0.10",
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.16.1',
6
+ version: '13.17.2',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -560,7 +560,7 @@ export class MetricsManager {
560
560
  requestsPerSecond: 0,
561
561
  requestsTotal: 0,
562
562
  backends: [] as Array<any>,
563
- domainActivity: [] as Array<{ domain: string; bytesInPerSecond: number; bytesOutPerSecond: number; activeConnections: number; routeCount: number }>,
563
+ domainActivity: [] as Array<{ domain: string; bytesInPerSecond: number; bytesOutPerSecond: number; activeConnections: number; routeCount: number; requestCount: number }>,
564
564
  };
565
565
  }
566
566
 
@@ -720,11 +720,20 @@ export class MetricsManager {
720
720
  .slice(0, 10)
721
721
  .map(([ip, data]) => ({ ip, count: data.count, bwIn: data.bwIn, bwOut: data.bwOut }));
722
722
 
723
- // Build domain activity from per-route metrics
723
+ // Build domain activity using per-IP domain request counts from Rust engine
724
724
  const connectionsByRoute = proxyMetrics.connections.byRoute();
725
725
  const throughputByRoute = proxyMetrics.throughput.byRoute();
726
726
 
727
- // Map route name ALL its domains (not just the first one)
727
+ // Aggregate per-IP domain request counts into per-domain totals
728
+ const domainRequestTotals = new Map<string, number>();
729
+ const domainRequestsByIP = proxyMetrics.connections.domainRequestsByIP();
730
+ for (const [, domainMap] of domainRequestsByIP) {
731
+ for (const [domain, count] of domainMap) {
732
+ domainRequestTotals.set(domain, (domainRequestTotals.get(domain) || 0) + count);
733
+ }
734
+ }
735
+
736
+ // Map route name → domains from route config
728
737
  const routeDomains = new Map<string, string[]>();
729
738
  if (this.dcRouter.smartProxy) {
730
739
  for (const route of this.dcRouter.smartProxy.routeManager.getRoutes()) {
@@ -738,34 +747,26 @@ export class MetricsManager {
738
747
  }
739
748
  }
740
749
 
741
- // Use protocol cache to discover actual active domains (resolves wildcards)
742
- const activeDomains = new Set<string>();
743
- const domainToBackend = new Map<string, string>(); // domain → host:port
750
+ // Resolve wildcards using domains seen in request metrics
751
+ const allKnownDomains = new Set<string>(domainRequestTotals.keys());
744
752
  for (const entry of protocolCache) {
745
- if (entry.domain) {
746
- activeDomains.add(entry.domain);
747
- domainToBackend.set(entry.domain, `${entry.host}:${entry.port}`);
748
- }
753
+ if (entry.domain) allKnownDomains.add(entry.domain);
749
754
  }
750
755
 
751
- // Build reverse map: domain → route name(s) that handle it
752
- // For concrete domains: direct lookup from route config
753
- // For wildcard patterns: match active domains from protocol cache
756
+ // Build reverse map: concrete domain → route name(s)
754
757
  const domainToRoutes = new Map<string, string[]>();
755
758
  for (const [routeName, domains] of routeDomains) {
756
759
  for (const pattern of domains) {
757
760
  if (pattern.includes('*')) {
758
- // Wildcard pattern — match against active domains from protocol cache
759
761
  const regex = new RegExp('^' + pattern.replace(/\./g, '\\.').replace(/\*/g, '[^.]+') + '$');
760
- for (const activeDomain of activeDomains) {
761
- if (regex.test(activeDomain)) {
762
- const existing = domainToRoutes.get(activeDomain);
762
+ for (const knownDomain of allKnownDomains) {
763
+ if (regex.test(knownDomain)) {
764
+ const existing = domainToRoutes.get(knownDomain);
763
765
  if (existing) { existing.push(routeName); }
764
- else { domainToRoutes.set(activeDomain, [routeName]); }
766
+ else { domainToRoutes.set(knownDomain, [routeName]); }
765
767
  }
766
768
  }
767
769
  } else {
768
- // Concrete domain
769
770
  const existing = domainToRoutes.get(pattern);
770
771
  if (existing) { existing.push(routeName); }
771
772
  else { domainToRoutes.set(pattern, [routeName]); }
@@ -773,37 +774,40 @@ export class MetricsManager {
773
774
  }
774
775
  }
775
776
 
776
- // Aggregate metrics per domain
777
- // For each domain, sum metrics from all routes that serve it,
778
- // divided by the number of domains each route serves
777
+ // For each route, compute the total request count across all its resolved domains
778
+ // so we can distribute throughput/connections proportionally
779
+ const routeTotalRequests = new Map<string, number>();
780
+ for (const [domain, routeNames] of domainToRoutes) {
781
+ const reqs = domainRequestTotals.get(domain) || 0;
782
+ for (const routeName of routeNames) {
783
+ routeTotalRequests.set(routeName, (routeTotalRequests.get(routeName) || 0) + reqs);
784
+ }
785
+ }
786
+
787
+ // Aggregate metrics per domain using request-count-proportional splitting
779
788
  const domainAgg = new Map<string, {
780
789
  activeConnections: number;
781
790
  bytesInPerSec: number;
782
791
  bytesOutPerSec: number;
783
792
  routeCount: number;
793
+ requestCount: number;
784
794
  }>();
785
795
 
786
- // Track which routes are accounted for
787
- const accountedRoutes = new Set<string>();
788
-
789
796
  for (const [domain, routeNames] of domainToRoutes) {
797
+ const domainReqs = domainRequestTotals.get(domain) || 0;
790
798
  let totalConns = 0;
791
799
  let totalIn = 0;
792
800
  let totalOut = 0;
793
801
 
794
802
  for (const routeName of routeNames) {
795
- accountedRoutes.add(routeName);
796
803
  const conns = connectionsByRoute.get(routeName) || 0;
797
804
  const tp = throughputByRoute.get(routeName) || { in: 0, out: 0 };
798
- // Count how many resolved domains share this route
799
- let domainsInRoute = 0;
800
- for (const [, routes] of domainToRoutes) {
801
- if (routes.includes(routeName)) domainsInRoute++;
802
- }
803
- const share = Math.max(domainsInRoute, 1);
804
- totalConns += conns / share;
805
- totalIn += tp.in / share;
806
- totalOut += tp.out / share;
805
+ const routeTotal = routeTotalRequests.get(routeName) || 0;
806
+
807
+ const share = routeTotal > 0 ? domainReqs / routeTotal : 0;
808
+ totalConns += conns * share;
809
+ totalIn += tp.in * share;
810
+ totalOut += tp.out * share;
807
811
  }
808
812
 
809
813
  domainAgg.set(domain, {
@@ -811,31 +815,10 @@ export class MetricsManager {
811
815
  bytesInPerSec: totalIn,
812
816
  bytesOutPerSec: totalOut,
813
817
  routeCount: routeNames.length,
818
+ requestCount: domainReqs,
814
819
  });
815
820
  }
816
821
 
817
- // Include routes with no domain config (fallback: use route name)
818
- for (const [routeName, activeConns] of connectionsByRoute) {
819
- if (accountedRoutes.has(routeName)) continue;
820
- if (routeDomains.has(routeName)) continue; // has domains but no traffic matched
821
- const tp = throughputByRoute.get(routeName) || { in: 0, out: 0 };
822
- if (activeConns === 0 && tp.in === 0 && tp.out === 0) continue;
823
- const existing = domainAgg.get(routeName);
824
- if (existing) {
825
- existing.activeConnections += activeConns;
826
- existing.bytesInPerSec += tp.in;
827
- existing.bytesOutPerSec += tp.out;
828
- existing.routeCount++;
829
- } else {
830
- domainAgg.set(routeName, {
831
- activeConnections: activeConns,
832
- bytesInPerSec: tp.in,
833
- bytesOutPerSec: tp.out,
834
- routeCount: 1,
835
- });
836
- }
837
- }
838
-
839
822
  const domainActivity = Array.from(domainAgg.entries())
840
823
  .map(([domain, data]) => ({
841
824
  domain,
@@ -843,6 +826,7 @@ export class MetricsManager {
843
826
  bytesOutPerSecond: data.bytesOutPerSec,
844
827
  activeConnections: data.activeConnections,
845
828
  routeCount: data.routeCount,
829
+ requestCount: data.requestCount,
846
830
  }))
847
831
  .sort((a, b) => (b.bytesInPerSecond + b.bytesOutPerSecond) - (a.bytesInPerSecond + a.bytesOutPerSecond));
848
832
 
@@ -3,6 +3,6 @@
3
3
  */
4
4
  export const commitinfo = {
5
5
  name: '@serve.zone/dcrouter',
6
- version: '13.16.1',
6
+ version: '13.17.2',
7
7
  description: 'A multifaceted routing service handling mail and SMS delivery functions.'
8
8
  }
@@ -560,11 +560,12 @@ export class OpsViewNetworkActivity extends DeesElement {
560
560
  'Throughput Out': this.formatBitsPerSecond(item.bytesOutPerSecond),
561
561
  'Transferred / min': this.formatBytes(totalBytesPerMin),
562
562
  'Connections': item.activeConnections,
563
+ 'Requests': item.requestCount?.toLocaleString() ?? '0',
563
564
  'Routes': item.routeCount,
564
565
  };
565
566
  }}
566
567
  heading1="Domain Activity"
567
- heading2="Per-domain network activity aggregated from route metrics"
568
+ heading2="Per-domain network activity from request-level metrics"
568
569
  searchable
569
570
  .showColumnFilters=${true}
570
571
  .pagination=${false}
@@ -49,6 +49,8 @@ function setupTlsVisibility(formEl: any) {
49
49
 
50
50
  @customElement('ops-view-routes')
51
51
  export class OpsViewRoutes extends DeesElement {
52
+ @state() accessor routeFilter: 'User Routes' | 'System Routes' = 'User Routes';
53
+
52
54
  @state() accessor routeState: appstate.IRouteManagementState = {
53
55
  mergedRoutes: [],
54
56
  warnings: [],
@@ -156,20 +158,20 @@ export class OpsViewRoutes extends DeesElement {
156
158
  },
157
159
  {
158
160
  id: 'configRoutes',
159
- title: 'From Config',
161
+ title: 'System Routes',
160
162
  type: 'number',
161
163
  value: configCount,
162
164
  icon: 'lucide:settings',
163
- description: 'Seeded from config/email/DNS',
165
+ description: 'From config, email, and DNS',
164
166
  color: '#8b5cf6',
165
167
  },
166
168
  {
167
169
  id: 'apiRoutes',
168
- title: 'API Created',
170
+ title: 'User Routes',
169
171
  type: 'number',
170
172
  value: apiCount,
171
173
  icon: 'lucide:code',
172
- description: 'Routes added via API',
174
+ description: 'Created via API',
173
175
  color: '#0ea5e9',
174
176
  },
175
177
  {
@@ -183,8 +185,14 @@ export class OpsViewRoutes extends DeesElement {
183
185
  },
184
186
  ];
185
187
 
186
- // Map merged routes to sz-route-list-view format
187
- const szRoutes = mergedRoutes.map((mr) => {
188
+ // Filter routes based on selected tab
189
+ const isUserRoutes = this.routeFilter === 'User Routes';
190
+ const filteredRoutes = mergedRoutes.filter((mr) =>
191
+ isUserRoutes ? mr.origin === 'api' : mr.origin !== 'api'
192
+ );
193
+
194
+ // Map filtered routes to sz-route-list-view format
195
+ const szRoutes = filteredRoutes.map((mr) => {
188
196
  const tags = [...(mr.route.tags || [])];
189
197
  tags.push(mr.origin);
190
198
  if (!mr.enabled) tags.push('disabled');
@@ -218,6 +226,13 @@ export class OpsViewRoutes extends DeesElement {
218
226
  ]}
219
227
  ></dees-statsgrid>
220
228
 
229
+ <dees-input-multitoggle
230
+ .type=${'single'}
231
+ .options=${['User Routes', 'System Routes']}
232
+ .selectedOption=${this.routeFilter}
233
+ @change=${(e: any) => { this.routeFilter = e.target.value || e.target.selectedOption; }}
234
+ ></dees-input-multitoggle>
235
+
221
236
  ${warnings.length > 0
222
237
  ? html`
223
238
  <div class="warnings-bar">
@@ -237,6 +252,7 @@ export class OpsViewRoutes extends DeesElement {
237
252
  ? html`
238
253
  <sz-route-list-view
239
254
  .routes=${szRoutes}
255
+ .showActionsFilter=${isUserRoutes ? () => true : () => false}
240
256
  @route-click=${(e: CustomEvent) => this.handleRouteClick(e)}
241
257
  @route-edit=${(e: CustomEvent) => this.handleRouteEdit(e)}
242
258
  @route-delete=${(e: CustomEvent) => this.handleRouteDelete(e)}
@@ -244,8 +260,8 @@ export class OpsViewRoutes extends DeesElement {
244
260
  `
245
261
  : html`
246
262
  <div class="empty-state">
247
- <p>No routes configured</p>
248
- <p>Add a route to get started.</p>
263
+ <p>No ${isUserRoutes ? 'user' : 'system'} routes</p>
264
+ <p>${isUserRoutes ? 'Add a route to get started.' : 'System routes are generated from config, email, and DNS settings.'}</p>
249
265
  </div>
250
266
  `}
251
267
  </div>