sumor 3.0.6 → 3.0.7

package/dist/server/index.d.ts

@@ -3,6 +3,9 @@
  * 统一管理 OAuth 权限同步、JWT 用户加载和 OAuth 路由注册
  */
 import { Express } from 'express';
+import { loadJwtUserMiddleware } from './middlewares/loadJwtUserMiddleware';
+import { isLoggedMiddleware } from './middlewares/isLoggedMiddleware';
+import { isVerifiedMiddleware } from './middlewares/isVerifiedMiddleware';
 import type { PermissionConfig } from './types/oauth';
 /**
  * 初始化 Sumor OAuth 集成
@@ -12,4 +15,8 @@ import type { PermissionConfig } from './types/oauth';
  * @param permissionConfig 权限配置 { permissions, permissionLabels }
  */
 export default function setupSumor(app: Express, permissionConfig: PermissionConfig): Promise<void>;
+/**
+ * 导出中间件供 client 使用
+ */
+export { loadJwtUserMiddleware, isLoggedMiddleware, isVerifiedMiddleware };
 //# sourceMappingURL=index.d.ts.map

package/dist/server/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAKjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAiBrD;;;;;;GAMG;AACH,wBAA8B,UAAU,CACtC,GAAG,EAAE,OAAO,EACZ,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAGjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAA;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAEzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAiBrD;;;;;;GAMG;AACH,wBAA8B,UAAU,CACtC,GAAG,EAAE,OAAO,EACZ,gBAAgB,EAAE,gBAAgB,GACjC,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED;;GAEG;AACH,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAA"}

package/dist/server/index.js

@@ -7,10 +7,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVerifiedMiddleware = exports.isLoggedMiddleware = exports.loadJwtUserMiddleware = void 0;
 exports.default = setupSumor;
 const oauthService_1 = __importDefault(require("./services/oauthService"));
 const routes_1 = __importDefault(require("./routes"));
 const loadJwtUserMiddleware_1 = require("./middlewares/loadJwtUserMiddleware");
+Object.defineProperty(exports, "loadJwtUserMiddleware", { enumerable: true, get: function () { return loadJwtUserMiddleware_1.loadJwtUserMiddleware; } });
+const isLoggedMiddleware_1 = require("./middlewares/isLoggedMiddleware");
+Object.defineProperty(exports, "isLoggedMiddleware", { enumerable: true, get: function () { return isLoggedMiddleware_1.isLoggedMiddleware; } });
+const isVerifiedMiddleware_1 = require("./middlewares/isVerifiedMiddleware");
+Object.defineProperty(exports, "isVerifiedMiddleware", { enumerable: true, get: function () { return isVerifiedMiddleware_1.isVerifiedMiddleware; } });
 const config_1 = require("./utils/config");
 /**
  * 初始化 Sumor OAuth 权限同步

package/dist/server/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AA+BH,6BA4BC;AAxDD,2EAAkD;AAClD,sDAAkC;AAClC,+EAA2E;AAC3E,2CAAsD;AAGtD;;;GAGG;AACH,KAAK,UAAU,0BAA0B,CAAC,gBAAkC;IAC1E,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAA;QAEvC,iBAAiB;QACjB,MAAO,YAAoB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IACjE,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,iBAAiB;IACnB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACY,KAAK,UAAU,UAAU,CACtC,GAAY,EACZ,gBAAkC;IAElC,IAAI,CAAC;QACH,0BAA0B;QAC1B,IAAA,8BAAqB,GAAE,CAGtB;QAAC,GAAW,CAAC,KAAK,GAAG,IAAI,sBAAY,EAAE,CAAA;QAExC,oBAAoB;QACpB,MAAM,0BAA0B,CAAC,gBAAgB,CAAC,CAAA;QAElD,oBAAoB;QACpB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,6CAAqB,CAAC,CAAA;QAEtC,oCAAoC;QACpC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtC,GAAG,CAAC,KAAK,GAAI,GAAW,CAAC,KAAK,CAAA;YAC9B,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;QAEF,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAW,CAAC,CAAA;IACpC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/index.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;AAiCH,6BA4BC;AA1DD,2EAAkD;AAClD,sDAAkC;AAClC,+EAA2E;AA6DlE,sGA7DA,6CAAqB,OA6DA;AA5D9B,yEAAqE;AA4DrC,mGA5DvB,uCAAkB,OA4DuB;AA3DlD,6EAAyE;AA2DrB,qGA3D3C,2CAAoB,OA2D2C;AA1DxE,2CAAsD;AAGtD;;;GAGG;AACH,KAAK,UAAU,0BAA0B,CAAC,gBAAkC;IAC1E,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,IAAI,sBAAY,EAAE,CAAA;QAEvC,iBAAiB;QACjB,MAAO,YAAoB,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;IACjE,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,iBAAiB;IACnB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACY,KAAK,UAAU,UAAU,CACtC,GAAY,EACZ,gBAAkC;IAElC,IAAI,CAAC;QACH,0BAA0B;QAC1B,IAAA,8BAAqB,GAAE,CAGtB;QAAC,GAAW,CAAC,KAAK,GAAG,IAAI,sBAAY,EAAE,CAAA;QAExC,oBAAoB;QACpB,MAAM,0BAA0B,CAAC,gBAAgB,CAAC,CAAA;QAElD,oBAAoB;QACpB,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,6CAAqB,CAAC,CAAA;QAEtC,oCAAoC;QACpC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,GAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YACtC,GAAG,CAAC,KAAK,GAAI,GAAW,CAAC,KAAK,CAAA;YAC9B,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;QAEF,iBAAiB;QACjB,GAAG,CAAC,GAAG,CAAC,YAAY,EAAE,gBAAW,CAAC,CAAA;IACpC,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC"}

package/dist/server/middlewares/isLoggedMiddleware.d.ts

@@ -0,0 +1,15 @@
+/**
+ * 检查用户登录中间件
+ * 检查用户是否已登录 (jwtUser 存在)
+ * 如果未登录则返回 401 Unauthorized
+ */
+import { Response, NextFunction } from 'express';
+/**
+ * 检查用户是否已登录
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+export declare function isLoggedMiddleware(req: any, res: Response, next: NextFunction): void;
+export default isLoggedMiddleware;
+//# sourceMappingURL=isLoggedMiddleware.d.ts.map

package/dist/server/middlewares/isLoggedMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isLoggedMiddleware.d.ts","sourceRoot":"","sources":["../../../server/middlewares/isLoggedMiddleware.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEhD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CAkBpF;AAED,eAAe,kBAAkB,CAAA"}

package/dist/server/middlewares/isLoggedMiddleware.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * 检查用户登录中间件
+ * 检查用户是否已登录 (jwtUser 存在)
+ * 如果未登录则返回 401 Unauthorized
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLoggedMiddleware = isLoggedMiddleware;
+/**
+ * 检查用户是否已登录
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+function isLoggedMiddleware(req, res, next) {
+    try {
+        // 检查用户是否存在
+        if (!req.jwtUser || !req.jwtUser.userId) {
+            res.status(401).json({
+                code: 'UNAUTHORIZED',
+                message: '需要登录'
+            });
+            return;
+        }
+        next();
+    }
+    catch (error) {
+        res.status(500).json({
+            code: 'SERVER_ERROR',
+            message: '服务器内部错误'
+        });
+    }
+}
+exports.default = isLoggedMiddleware;
+//# sourceMappingURL=isLoggedMiddleware.js.map

package/dist/server/middlewares/isLoggedMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isLoggedMiddleware.js","sourceRoot":"","sources":["../../../server/middlewares/isLoggedMiddleware.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAUH,gDAkBC;AAxBD;;;;;GAKG;AACH,SAAgB,kBAAkB,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAkB;IAC5E,IAAI,CAAC;QACH,WAAW;QACX,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACxC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,MAAM;aAChB,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAA;IACR,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,SAAS;SACnB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,kBAAe,kBAAkB,CAAA"}

package/dist/server/middlewares/isVerifiedMiddleware.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 验证用户身份中间件
+ * 检查用户是否已认证 (isVerified === 1)
+ * 如果未认证则返回 403 Forbidden
+ */
+import { Response, NextFunction } from 'express';
+/**
+ * 检查用户是否已通过身份认证
+ * 通常需要与 isLoggedMiddleware 一起使用
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+export declare function isVerifiedMiddleware(req: any, res: Response, next: NextFunction): void;
+export default isVerifiedMiddleware;
+//# sourceMappingURL=isVerifiedMiddleware.d.ts.map

package/dist/server/middlewares/isVerifiedMiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"isVerifiedMiddleware.d.ts","sourceRoot":"","sources":["../../../server/middlewares/isVerifiedMiddleware.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEhD;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,GAAG,IAAI,CA2BtF;AAED,eAAe,oBAAoB,CAAA"}

package/dist/server/middlewares/isVerifiedMiddleware.js

@@ -0,0 +1,44 @@
+"use strict";
+/**
+ * 验证用户身份中间件
+ * 检查用户是否已认证 (isVerified === 1)
+ * 如果未认证则返回 403 Forbidden
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isVerifiedMiddleware = isVerifiedMiddleware;
+/**
+ * 检查用户是否已通过身份认证
+ * 通常需要与 isLoggedMiddleware 一起使用
+ * @param req Express Request 对象，应包含 jwtUser（由 loadJwtUserMiddleware 注入）
+ * @param res Express Response 对象
+ * @param next 下一个中间件或路由处理器
+ */
+function isVerifiedMiddleware(req, res, next) {
+    try {
+        // 检查用户是否存在
+        if (!req.jwtUser) {
+            res.status(401).json({
+                code: 'UNAUTHORIZED',
+                message: '未认证，请先登录'
+            });
+            return;
+        }
+        // 检查用户是否已认证
+        if (req.jwtUser.isVerified !== 1) {
+            res.status(403).json({
+                code: 'FORBIDDEN',
+                message: '没有权限访问，用户未通过认证'
+            });
+            return;
+        }
+        next();
+    }
+    catch (error) {
+        res.status(500).json({
+            code: 'SERVER_ERROR',
+            message: '服务器内部错误'
+        });
+    }
+}
+exports.default = isVerifiedMiddleware;
+//# sourceMappingURL=isVerifiedMiddleware.js.map

package/dist/server/middlewares/isVerifiedMiddleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isVerifiedMiddleware.js","sourceRoot":"","sources":["../../../server/middlewares/isVerifiedMiddleware.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;AAWH,oDA2BC;AAlCD;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAAC,GAAQ,EAAE,GAAa,EAAE,IAAkB;IAC9E,IAAI,CAAC;QACH,WAAW;QACX,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,UAAU;aACpB,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,YAAY;QACZ,IAAI,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,gBAAgB;aAC1B,CAAC,CAAA;YACF,OAAM;QACR,CAAC;QAED,IAAI,EAAE,CAAA;IACR,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,SAAS;SACnB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,kBAAe,oBAAoB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sumor",
-  "version": "3.0.6",
+  "version": "3.0.7",
   "description": "Sumor OAuth framework",
   "main": "dist/server/index.js",
   "types": "dist/server/index.d.ts",

package/dist/server/controllers/getAuthorizeUrlController.d.ts

@@ -1,9 +0,0 @@
-/**
- * 获取授权 URL 控制器
- * GET /api/oauth/authorize
- *
- * 返回跳转到 ITS 的授权 URL，前端将用此 URL 进行重定向
- */
-import { Request, Response } from 'express';
-export default function getAuthorizeUrlController(req: Request, res: Response): void;
-//# sourceMappingURL=getAuthorizeUrlController.d.ts.map

package/dist/server/controllers/getAuthorizeUrlController.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAuthorizeUrlController.d.ts","sourceRoot":"","sources":["../../../server/controllers/getAuthorizeUrlController.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAgE3C,MAAM,CAAC,OAAO,UAAU,yBAAyB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,QAgB5E"}

package/dist/server/controllers/getAuthorizeUrlController.js

@@ -1,80 +0,0 @@
-"use strict";
-/**
- * 获取授权 URL 控制器
- * GET /api/oauth/authorize
- *
- * 返回跳转到 ITS 的授权 URL，前端将用此 URL 进行重定向
- */
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = getAuthorizeUrlController;
-const crypto_1 = __importDefault(require("crypto"));
-const config_1 = require("../utils/config");
-/**
- * 生成 PKCE code_challenge 和 code_verifier
- */
-function generateCodeChallenge() {
-    const codeVerifier = crypto_1.default.randomBytes(32).toString('hex');
-    const challenge = crypto_1.default
-        .createHash('sha256')
-        .update(codeVerifier)
-        .digest('base64')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=/g, '');
-    return {
-        codeChallenge: challenge,
-        codeVerifier: codeVerifier
-    };
-}
-/**
- * 生成随机 state 参数
- */
-function generateState() {
-    return crypto_1.default.randomBytes(32).toString('hex');
-}
-/**
- * 生成授权 URL
- * RFC 6749 §4.1.1，支持 PKCE（RFC 7636）用于增强安全性
- */
-function generateAuthorizationUrl() {
-    const oauthConfig = (0, config_1.getOAuthConfig)();
-    const { codeChallenge, codeVerifier } = generateCodeChallenge();
-    const uri = oauthConfig.redirectUri;
-    if (!uri || uri.trim() === '') {
-        throw new Error('redirectUri 为空或未配置，无法生成授权 URL');
-    }
-    const randomState = generateState();
-    const encryptedState = Buffer.from(codeVerifier).toString('base64') + ':' + randomState;
-    const params = new URLSearchParams({
-        clientKey: oauthConfig.clientKey,
-        redirectUri: uri,
-        responseType: 'code',
-        scope: 'profile',
-        state: encryptedState,
-        codeChallenge: codeChallenge,
-        codeChallengeMethod: 'S256'
-    });
-    const authUrl = `${oauthConfig.baseUrl}/authorize?${params.toString()}`;
-    return authUrl;
-}
-function getAuthorizeUrlController(req, res) {
-    try {
-        const authUrl = generateAuthorizationUrl();
-        res.json({
-            code: 'OK',
-            data: {
-                authUrl
-            }
-        });
-    }
-    catch (error) {
-        res.status(500).json({
-            code: 'ERROR',
-            message: error.message
-        });
-    }
-}
-//# sourceMappingURL=getAuthorizeUrlController.js.map

package/dist/server/controllers/getAuthorizeUrlController.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getAuthorizeUrlController.js","sourceRoot":"","sources":["../../../server/controllers/getAuthorizeUrlController.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAmEH,4CAgBC;AAjFD,oDAA2B;AAE3B,4CAAgD;AAEhD;;GAEG;AACH,SAAS,qBAAqB;IAI5B,MAAM,YAAY,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC3D,MAAM,SAAS,GAAG,gBAAM;SACrB,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,YAAY,CAAC;SACpB,MAAM,CAAC,QAAQ,CAAC;SAChB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;SACnB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;IAEpB,OAAO;QACL,aAAa,EAAE,SAAS;QACxB,YAAY,EAAE,YAAY;KAC3B,CAAA;AACH,CAAC;AAED;;GAEG;AACH,SAAS,aAAa;IACpB,OAAO,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;AAC/C,CAAC;AAED;;;GAGG;AACH,SAAS,wBAAwB;IAC/B,MAAM,WAAW,GAAG,IAAA,uBAAc,GAAE,CAAA;IACpC,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,qBAAqB,EAAE,CAAA;IAE/D,MAAM,GAAG,GAAG,WAAW,CAAC,WAAW,CAAA;IAEnC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;IAClD,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,EAAE,CAAA;IACnC,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,GAAG,GAAG,WAAW,CAAA;IAEvF,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,SAAS,EAAE,WAAW,CAAC,SAAS;QAChC,WAAW,EAAE,GAAG;QAChB,YAAY,EAAE,MAAM;QACpB,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,cAAc;QACrB,aAAa,EAAE,aAAa;QAC5B,mBAAmB,EAAE,MAAM;KAC5B,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,GAAG,WAAW,CAAC,OAAO,cAAc,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAA;IAEvE,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,SAAwB,yBAAyB,CAAC,GAAY,EAAE,GAAa;IAC3E,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,wBAAwB,EAAE,CAAA;QAE1C,GAAG,CAAC,IAAI,CAAC;YACP,IAAI,EAAE,IAAI;YACV,IAAI,EAAE;gBACJ,OAAO;aACR;SACF,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;YACnB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAA;IACJ,CAAC;AACH,CAAC"}