echoapi-converter 0.0.35 → 0.0.37

package/dist/index.d.ts

@@ -259,6 +259,9 @@ declare class ThunderToApipost {
     private completionTests;
     private completionApiRequest;
     private completionApiTarget;
+    private completionWs2Request;
+    private completionWs2Message;
+    private completionWs2Target;
     private completionApis;
     private initApis;
     private initGlobal;

package/dist/index.js

@@ -500,11 +500,11 @@ const handelPathItemResponse = (response) => {
     return temp_responses;
 };
 
-const throwResult$1 = (status, message, data = '') => {
+const throwResult$1 = (status, message, data = "") => {
     return {
         status,
         message,
-        data
+        data,
     };
 };
 const transExample = (example) => {
@@ -524,21 +524,22 @@ const getBeautifulRaw = (raw) => {
     }
 };
 const isArray = (value) => {
-    return Object.prototype.toString.call(value) === '[object Array]';
+    return Object.prototype.toString.call(value) === "[object Array]";
 };
 const isObject = (value) => {
-    return Object.prototype.toString.call(value) === '[object Object]';
+    return Object.prototype.toString.call(value) === "[object Object]";
 };
 const isURL = (_url) => {
     if (!_url) {
         return false;
     }
     _url = lodash.trim(_url);
-    return (_url.substr(0, 7).toLowerCase() === 'http://' || _url.substr(0, 8).toLowerCase() === 'https://');
+    return (_url.substr(0, 7).toLowerCase() === "http://" ||
+        _url.substr(0, 8).toLowerCase() === "https://");
 };
 const createUrl = (_url) => {
-    if (typeof _url !== 'string') {
-        _url += '';
+    if (typeof _url !== "string") {
+        _url += "";
     }
     if (!isURL(_url)) {
         _url = `http://${_url}`;
@@ -558,7 +559,7 @@ const createUrl = (_url) => {
     }
     catch (_a) {
         const http_url = `https://www.echoapi.cn${_url.substring(origin.length)}`;
-        const a = document.createElement('a');
+        const a = document.createElement("a");
         a.href = http_url;
         urls = {
             source: _url,
@@ -571,23 +572,23 @@ const createUrl = (_url) => {
             search: a.search,
             pathname: a.pathname,
             // eslint-disable-next-line no-useless-escape
-            file: (a.pathname.match(/\/([^\/?#]+)$/i) || ['', ''])[1],
+            file: (a.pathname.match(/\/([^\/?#]+)$/i) || ["", ""])[1],
             hash: a.hash,
         };
     }
     return urls;
 };
 // 根据url生成新的restful数组
-const genRestfulByUrl = (url, oldParameter, key = 'key') => {
+const genRestfulByUrl = (url, oldParameter, key = "key") => {
     const restfulList = [];
     // 自动拼接url http://
     if (!isURL(url)) {
         url = `http://${url}`;
     }
     const urlObj = createUrl(url);
-    const paths = urlObj.pathname.split('/');
+    const paths = urlObj.pathname.split("/");
     lodash.forEach(paths, (pathsItem) => {
-        if (pathsItem.substring(0, 1) === ':' && pathsItem.length > 1) {
+        if (pathsItem.substring(0, 1) === ":" && pathsItem.length > 1) {
             let obj = null;
             const oldIndex = lodash.findIndex(oldParameter, {
                 [key]: pathsItem.substring(1, pathsItem.length),
@@ -597,12 +598,12 @@ const genRestfulByUrl = (url, oldParameter, key = 'key') => {
             }
             restfulList.push({
                 param_id: (obj === null || obj === void 0 ? void 0 : obj.param_id) || ATools.snowflakeId(),
-                field_type: 'String',
+                field_type: "String",
                 is_checked: 1,
                 key: pathsItem.substring(1, pathsItem.length),
                 not_null: 1,
-                value: (obj === null || obj === void 0 ? void 0 : obj.value) || '',
-                description: (obj === null || obj === void 0 ? void 0 : obj.description) || '',
+                value: (obj === null || obj === void 0 ? void 0 : obj.value) || "",
+                description: (obj === null || obj === void 0 ? void 0 : obj.description) || "",
             });
         }
     });
@@ -612,7 +613,7 @@ const genRestfulByUrl = (url, oldParameter, key = 'key') => {
         if (isArray(matches) && matches.length > 0) {
             lodash.forEach(matches, (matchesItem) => {
                 if (matchesItem.length > 0) {
-                    matchesItem = matchesItem.replace(/^{|}$/g, '');
+                    matchesItem = matchesItem.replace(/^{|}$/g, "");
                     let obj = null;
                     const oldIndex = lodash.findIndex(oldParameter, {
                         [key]: matchesItem,
@@ -622,12 +623,12 @@ const genRestfulByUrl = (url, oldParameter, key = 'key') => {
                     }
                     restfulList.push({
                         param_id: (obj === null || obj === void 0 ? void 0 : obj.param_id) || ATools.snowflakeId(),
-                        field_type: 'String',
+                        field_type: "String",
                         is_checked: 1,
                         key: matchesItem,
                         not_null: 1,
-                        value: (obj === null || obj === void 0 ? void 0 : obj.value) || '',
-                        description: (obj === null || obj === void 0 ? void 0 : obj.description) || '',
+                        value: (obj === null || obj === void 0 ? void 0 : obj.value) || "",
+                        description: (obj === null || obj === void 0 ? void 0 : obj.description) || "",
                     });
                 }
             });
@@ -638,7 +639,7 @@ const genRestfulByUrl = (url, oldParameter, key = 'key') => {
 };
 const removePTags = (str) => {
     // 使用正则表达式替换<p>和</p>标签为空字符串
-    return str.replace(/<\/?[^>]+(>|$)/g, '');
+    return str.replace(/<\/?[^>]+(>|$)/g, "");
 };
 const yapiGenRestfulByUrl = (url, oldParameter) => {
     const restfulList = [];
@@ -647,9 +648,9 @@ const yapiGenRestfulByUrl = (url, oldParameter) => {
         url = `http://${url}`;
     }
     const urlObj = createUrl(url);
-    const paths = urlObj.pathname.split('/');
+    const paths = urlObj.pathname.split("/");
     lodash.forEach(paths, (pathsItem) => {
-        if (pathsItem.substring(0, 1) === ':' && pathsItem.length > 1) {
+        if (pathsItem.substring(0, 1) === ":" && pathsItem.length > 1) {
             let obj = null;
             const oldIndex = lodash.findIndex(oldParameter, {
                 name: pathsItem.substring(1, pathsItem.length),
@@ -659,12 +660,12 @@ const yapiGenRestfulByUrl = (url, oldParameter) => {
             }
             restfulList.push({
                 param_id: (obj === null || obj === void 0 ? void 0 : obj.param_id) || ATools.snowflakeId(),
-                field_type: 'String',
+                field_type: "String",
                 is_checked: 1,
                 key: pathsItem.substring(1, pathsItem.length),
                 not_null: 1,
-                value: (obj === null || obj === void 0 ? void 0 : obj.example) || '',
-                description: (obj === null || obj === void 0 ? void 0 : obj.desc) || '',
+                value: (obj === null || obj === void 0 ? void 0 : obj.example) || "",
+                description: (obj === null || obj === void 0 ? void 0 : obj.desc) || "",
             });
         }
     });
@@ -674,7 +675,7 @@ const yapiGenRestfulByUrl = (url, oldParameter) => {
         if (isArray(matches) && matches.length > 0) {
             lodash.forEach(matches, (matchesItem) => {
                 if (matchesItem.length > 0) {
-                    matchesItem = matchesItem.replace(/^{|}$/g, '');
+                    matchesItem = matchesItem.replace(/^{|}$/g, "");
                     let obj = null;
                     const oldIndex = lodash.findIndex(oldParameter, {
                         name: matchesItem,
@@ -684,12 +685,12 @@ const yapiGenRestfulByUrl = (url, oldParameter) => {
                     }
                     restfulList.push({
                         param_id: (obj === null || obj === void 0 ? void 0 : obj.param_id) || ATools.snowflakeId(),
-                        field_type: 'String',
+                        field_type: "String",
                         is_checked: 1,
                         key: matchesItem,
                         not_null: 1,
-                        value: (obj === null || obj === void 0 ? void 0 : obj.example) || '',
-                        description: (obj === null || obj === void 0 ? void 0 : obj.desc) || '',
+                        value: (obj === null || obj === void 0 ? void 0 : obj.example) || "",
+                        description: (obj === null || obj === void 0 ? void 0 : obj.desc) || "",
                     });
                 }
             });
@@ -700,9 +701,9 @@ const yapiGenRestfulByUrl = (url, oldParameter) => {
 };
 const fixUrlPath = (url) => {
     try {
-        const index = url.indexOf('://');
+        const index = url.indexOf("://");
         let path;
-        let protocolAndDomain = '';
+        let protocolAndDomain = "";
         if (index === -1) {
             path = url;
         }
@@ -712,7 +713,7 @@ const fixUrlPath = (url) => {
             path = url.slice(index + 3);
         }
         // 修正路径中的 '//'
-        const fixedPath = path.replace(/\/\/+/g, '/');
+        const fixedPath = path.replace(/\/\/+/g, "/");
         // 拼接返回
         return `${protocolAndDomain}${fixedPath}`;
     }
@@ -734,7 +735,7 @@ const anyToString = (desc) => {
 };
 const completionMethod = (method) => {
     if (!method || !lodash.isString(method))
-        return 'GET';
+        return "GET";
     if (API_METHODS.includes(method === null || method === void 0 ? void 0 : method.toUpperCase())) {
         return method === null || method === void 0 ? void 0 : method.toUpperCase();
     }
@@ -743,26 +744,26 @@ const completionMethod = (method) => {
 // 根据query数组生成新的url
 const genUrlByQuery = (url, parameter, query_add_equal = 1) => {
     var _a;
-    let paramsStr = '';
-    let newUrl = url || '';
-    const handleEncode = (value = '') => {
+    let paramsStr = "";
+    let newUrl = url || "";
+    const handleEncode = (value = "") => {
         let _value = lodash.cloneDeep(value);
         try {
             // 将#符号encode
-            _value = _value.replace(/#/g, encodeURIComponent('#'));
+            _value = _value.replace(/#/g, encodeURIComponent("#"));
             // 将&符号encode
-            _value = _value.replace(/&/g, encodeURIComponent('&'));
+            _value = _value.replace(/&/g, encodeURIComponent("&"));
         }
         catch (e) { }
         return _value;
     };
     lodash.forEach(parameter, (item) => {
         if (item.key && lodash.isEqual(item.is_checked, 1)) {
-            paramsStr += `${paramsStr ? '&' : ''}${handleEncode(item.key)}${lodash.isEqual(query_add_equal, -1) && !item.value ? '' : '='}${handleEncode(item.value)}`;
+            paramsStr += `${paramsStr ? "&" : ""}${handleEncode(item.key)}${lodash.isEqual(query_add_equal, -1) && !item.value ? "" : "="}${handleEncode(item.value)}`;
         }
     });
     // NOTE 原地址有hash的话，需拼接回去
-    newUrl = `${lodash.head(newUrl.split('?'))}${paramsStr ? '?' : ''}${paramsStr}${((_a = urlParse__default["default"](newUrl)) === null || _a === void 0 ? void 0 : _a.hash) || ''}`;
+    newUrl = `${lodash.head(newUrl.split("?"))}${paramsStr ? "?" : ""}${paramsStr}${((_a = urlParse__default["default"](newUrl)) === null || _a === void 0 ? void 0 : _a.hash) || ""}`;
     return newUrl;
 };
 
@@ -1562,8 +1563,8 @@ class SwaggerToApipost {
         }
     }
     handlePathV3(path, pathItem, tags) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let url = path;
             for (const method in pathItem) {
                 const swaggerApi = pathItem[method];
@@ -1980,8 +1981,8 @@ class SwaggerToApipost {
         });
     }
     handlePathsV3(json) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             try {
                 const paths = ((_a = json === null || json === void 0 ? void 0 : json.openapi) === null || _a === void 0 ? void 0 : _a.paths) || json.paths;
                 const tags = ((_b = json === null || json === void 0 ? void 0 : json.openapi) === null || _b === void 0 ? void 0 : _b.tags) || json.tags;
@@ -2013,8 +2014,8 @@ class SwaggerToApipost {
         }
     }
     handlePath(path, pathItem, tags) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
             let url = path;
             url = decodeURI(this.basePath + url);
             url = fixUrlPath(url);
@@ -2421,8 +2422,8 @@ class SwaggerToApipost {
             catch (err) { }
         });
     }
-    convert(json, options = null) {
-        return __awaiter(this, void 0, void 0, function* () {
+    convert(json_1) {
+        return __awaiter(this, arguments, void 0, function* (json, options = null) {
             this.clear();
             try {
                 if (options && options instanceof Object) {
@@ -5722,7 +5723,7 @@ class ThunderToApipost {
     }
     // auth
     completionApiRequestAuth(auth) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const customAuth = {};
         if ((auth === null || auth === void 0 ? void 0 : auth.type) === "bearer") {
             customAuth["type"] = "bearer";
@@ -5758,6 +5759,31 @@ class ThunderToApipost {
                 sessionToken: ((_l = auth === null || auth === void 0 ? void 0 : auth.aws) === null || _l === void 0 ? void 0 : _l.sessionToken) || "",
             };
         }
+        else if ((auth === null || auth === void 0 ? void 0 : auth.type) === "oauth2") {
+            customAuth["type"] = "oauth2";
+            customAuth["oauth2"] = {
+                addTokenTo: "header",
+                headerPrefix: "Bearer",
+                access_token: "",
+                grant_type: ((_m = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _m === void 0 ? void 0 : _m.grantType) || "authorization_code",
+                redirect_uri: ((_o = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _o === void 0 ? void 0 : _o.callbackUrl) || "",
+                authUrl: ((_p = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _p === void 0 ? void 0 : _p.authUrl) || "",
+                accessTokenUrl: ((_q = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _q === void 0 ? void 0 : _q.tokenUrl) || "",
+                clientId: ((_r = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _r === void 0 ? void 0 : _r.clientId) || "",
+                clientSecret: ((_s = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _s === void 0 ? void 0 : _s.clientSecret) || "",
+                username: ((_t = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _t === void 0 ? void 0 : _t.username) || "",
+                password: ((_u = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _u === void 0 ? void 0 : _u.password) || "",
+                challengeAlgorithm: "S256",
+                code_verifier: "Bearer",
+                scope: ((_v = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _v === void 0 ? void 0 : _v.scope) || "",
+                state: ((_w = auth === null || auth === void 0 ? void 0 : auth.oauth2) === null || _w === void 0 ? void 0 : _w.state) || "",
+                client_authentication: "header",
+                refreshTokenUrl: "",
+                authRequestParams: [],
+                tokenRequestParams: [],
+                refreshRequestParams: [],
+            };
+        }
         return Object.assign(Object.assign({}, DEFAULT_AUTH), customAuth);
     }
     // script
@@ -6064,13 +6090,88 @@ class ThunderToApipost {
             is_force: -1,
         };
     }
+    completionWs2Request(item) {
+        const headerParameter = this.completionApiRequestParameter(item === null || item === void 0 ? void 0 : item.headers);
+        const queryParameter = this.completionApiRequestParameter(item === null || item === void 0 ? void 0 : item.params);
+        return {
+            header: {
+                parameter: headerParameter,
+            },
+            query: {
+                parameter: queryParameter,
+            },
+            cookie: {
+                parameter: [],
+            },
+        };
+    }
+    completionWs2Message(item) {
+        var _a, _b;
+        return [
+            {
+                name: "Message",
+                param_id: ATools.snowflakeId(),
+                request: {
+                    mode: (_a = item === null || item === void 0 ? void 0 : item.body) === null || _a === void 0 ? void 0 : _a.type,
+                    raw: ((_b = item === null || item === void 0 ? void 0 : item.body) === null || _b === void 0 ? void 0 : _b.raw) || "",
+                    raw_parameter: [],
+                    raw_schema: {
+                        type: "object",
+                    },
+                },
+                response: {
+                    mode: "text",
+                    raw: "",
+                    raw_parameter: [],
+                    raw_schema: {
+                        type: "object",
+                    },
+                },
+            },
+        ];
+    }
+    // websocket2
+    completionWs2Target(item, parentInfo) {
+        return {
+            target_id: ATools.snowflakeId(),
+            project_id: this.project.project_id || "",
+            parent_id: (parentInfo === null || parentInfo === void 0 ? void 0 : parentInfo.target_id) || "0",
+            target_type: "websocket2",
+            name: (item === null || item === void 0 ? void 0 : item.name) || "New Websocket",
+            version: 0,
+            sort: 0,
+            description: (item === null || item === void 0 ? void 0 : item.docs) || "",
+            method: "",
+            url: (item === null || item === void 0 ? void 0 : item.url) || "",
+            mark_id: "1",
+            request: this.completionWs2Request(item),
+            message: this.completionWs2Message(item),
+            attribute_info: {},
+            tags: [],
+            is_force: -1,
+            config: {
+                certificate_verification: -1,
+                information_size: 5,
+                reconnect_num: 5,
+                reconnect_time: 5000,
+                shake_hands_timeout: 0,
+            },
+        };
+    }
     completionApis(arr, parentInfo) {
         if (arr === null || arr === void 0 ? void 0 : arr.length) {
             return arr === null || arr === void 0 ? void 0 : arr.reduce((pre, targetItem) => {
+                console.log(targetItem, "targetItem.type");
                 if (!lodash.isEqual(targetItem.type, "folder")) {
+                    let target;
                     // 接口
-                    const target = this.completionApiTarget(targetItem, parentInfo);
-                    pre.push(target);
+                    if (lodash.isEqual(targetItem === null || targetItem === void 0 ? void 0 : targetItem.reqType, "ws")) {
+                        target = this.completionWs2Target(targetItem, parentInfo);
+                    }
+                    else {
+                        target = this.completionApiTarget(targetItem, parentInfo);
+                    }
+                    target && pre.push(target);
                 }
                 else {
                     // 目录

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoapi-converter",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "description": "echoapi to swagger",
   "main": "dist/index.js",
   "files": [
@@ -26,7 +26,8 @@
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^4.2.2",
     "rollup-plugin-typescript": "^1.0.1",
-    "rollup-plugin-typescript2": "^0.36.0"
+    "rollup-plugin-typescript2": "^0.36.0",
+    "ts-jest": "^29.2.5"
   },
   "dependencies": {
     "@types/lodash": "^4.14.202",