echoapi-converter 0.0.89 → 0.0.90

package/dist/index.d.ts

@@ -96,11 +96,17 @@ declare class ApifoxToApipost {
     serversMap: any;
     modelMap: any;
     foldersMap: any;
+    folderNameMap: any;
     apisMap: any;
     dbLinkmap: any;
     commonScripts: any;
     modelIdMap: any;
     envsMap: any;
+    apifoxApiIdMap: any;
+    config: {
+        project_id: string;
+        unrelated_id: boolean;
+    };
     constructor();
     private validate;
     private clear;
@@ -120,6 +126,7 @@ declare class ApifoxToApipost {
     private completionApiRequestAuth;
     private completionApiRequestParameter;
     private completionApiRequestBody;
+    private completionTcpRequestBody;
     private completionApiRequest;
     private completionApiFolder;
     private completionApiTargetMark;
@@ -131,6 +138,10 @@ declare class ApifoxToApipost {
     private completionEventList;
     private completionTestCases;
     private initApis;
+    private initWebSocket;
+    private completionWebsockets;
+    private initSocketIo;
+    private completionSocketIo;
     private completionDocs;
     private initDoc;
     private completionTcpClient;
@@ -139,7 +150,10 @@ declare class ApifoxToApipost {
     private completionTcp;
     private initTcp;
     private initTestCase;
-    convert(json: any, project_id: string): {
+    convert(json: any, config?: {
+        project_id: string;
+        unrelated_id: boolean;
+    }): {
         status: "error" | "success";
         message: string;
         data: any;
@@ -160,6 +174,11 @@ declare class ApifoxcliToApipost {
     foldersMap: any;
     commonScripts: any;
     modelIdMap: any;
+    config: {
+        project_id: string;
+        unrelated_id: boolean;
+    };
+    apifoxApiIdMap: any;
     constructor();
     private validate;
     private clear;
@@ -191,7 +210,10 @@ declare class ApifoxcliToApipost {
     private completionTcpMethodRequest;
     private completionTcpMethod;
     private completionTcp;
-    convert(json: any, project_id: string): {
+    convert(json: any, config?: {
+        project_id: string;
+        unrelated_id: boolean;
+    }): {
         status: "error" | "success";
         message: string;
         data: any;

package/dist/index.js

@@ -24,7 +24,7 @@ var generate__default = /*#__PURE__*/_interopDefaultLegacy(generate);
 var JSON5__default = /*#__PURE__*/_interopDefaultLegacy(JSON5);
 var toJsonSchemasecond__default = /*#__PURE__*/_interopDefaultLegacy(toJsonSchemasecond);
 
-const DEFAULT_FIELD_TYPE$3 = [
+const DEFAULT_FIELD_TYPE$4 = [
     "array",
     "boolean",
     "date",
@@ -194,18 +194,18 @@ const DEFAULT_BODY = {
     binary: {},
 };
 const DEFAULT_DEVELOP_ENUM = [
-    "designing",
-    "developing",
-    "integrating",
-    "testing",
+    "designing", // 设计中
+    "developing", // 开发中
+    "integrating", // 联调中
+    "testing", // 测试中
 ];
-const DEFAULT_COMPLETE_ENUM = ["tested", "released"];
+const DEFAULT_COMPLETE_ENUM = ["tested", "released"]; // 已测完 已发布
 const DEFAULT_EDIT_ENUM = [
-    "pending",
-    "deprecated",
-    "exception",
+    "pending", // 待确定
+    "deprecated", // 将废弃
+    "exception", // 有异常
 ];
-const DEFAULT_DISCARD_ENUM = ["obsolete"];
+const DEFAULT_DISCARD_ENUM = ["obsolete"]; // 已废弃
 const DEFAULT_CONTENT_TYPE = ["json", "xml", "html", "binary"];
 const VARS_TYPE_MAP = {
     local: "variables",
@@ -618,7 +618,10 @@ const getSubstring = (str, length) => {
     }
     return str;
 };
-const hexSnowflake = (input) => {
+const hexSnowflake = (input, unrelated) => {
+    if (unrelated) {
+        return apipostTools.snowflakeId();
+    }
     // 将输入转换为BigInt
     let n;
     if (typeof input === 'number') {
@@ -654,7 +657,7 @@ const hexSnowflake = (input) => {
     // 生成一个56bit范围内的数（确保14位16进制）
     const hashed = (n * 0x9e3779b97f4a7c15n) & ((1n << 56n) - 1n);
     // 转成hex并固定为14位长度
-    return hashed.toString(16).padStart(14, '0');
+    return hashed.toString(16);
 };
 const parseConditionString = (str) => {
     // 定义所有可能的操作符枚举
@@ -1003,7 +1006,7 @@ const transFieldType = (str) => {
 const getFidldType = (type) => {
     if (!type)
         return 'String';
-    if (DEFAULT_FIELD_TYPE$3.includes(type?.toLowerCase())) {
+    if (DEFAULT_FIELD_TYPE$4.includes(type?.toLowerCase())) {
         return transFieldType(type);
     }
     return 'String';
@@ -1019,7 +1022,7 @@ const getExampleId = (status) => {
         return apipostTools.snowflakeId();
     }
 };
-const completionParameter = (parameter) => {
+const completionParameter$1 = (parameter) => {
     if (lodash.isArray(parameter)) {
         return parameter.map((p) => {
             const param = {
@@ -1140,16 +1143,16 @@ const completionRequestParam = (swaggerApi) => {
     const parameters = lodash.isArray(swaggerApi?.parameters) ? swaggerApi.parameters : [];
     return {
         header: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'header' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'header' && p?.name)),
         },
         query: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'query' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'query' && p?.name)),
         },
         restful: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'path' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'path' && p?.name)),
         },
         cookie: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'cookie' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'cookie' && p?.name)),
         },
         body: {
             ...completionBody(swaggerApi),
@@ -1428,13 +1431,13 @@ const completionWs2Request = (swaggerApi) => {
     const parameters = lodash.isArray(swaggerApi?.parameters) ? swaggerApi.parameters : [];
     return {
         header: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'header' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'header' && p?.name)),
         },
         query: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'query' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'query' && p?.name)),
         },
         cookie: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'cookie' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'cookie' && p?.name)),
         },
     };
 };
@@ -1465,13 +1468,13 @@ const completionSocketIoRequest = (swaggerApi) => {
     const parameters = lodash.isArray(swaggerApi?.parameters) ? swaggerApi.parameters : [];
     return {
         header: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'header' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'header' && p?.name)),
         },
         query: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'query' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'query' && p?.name)),
         },
         cookie: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'cookie' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'cookie' && p?.name)),
         },
         event: {
             parameter: lodash.isArray(parameters)
@@ -1514,10 +1517,10 @@ const completionGraphqlRequest = (swaggerApi) => {
     const parameters = lodash.isArray(swaggerApi?.parameters) ? swaggerApi.parameters : [];
     return {
         header: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'header' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'header' && p?.name)),
         },
         cookie: {
-            parameter: completionParameter(parameters.filter(p => p?.in === 'cookie' && p?.name)),
+            parameter: completionParameter$1(parameters.filter(p => p?.in === 'cookie' && p?.name)),
         },
         pre_tasks: [],
         post_tasks: [],
@@ -4355,6 +4358,199 @@ class ApidocToApipost {
     }
 }
 
+const DEFAULT_FIELD_TYPE$3 = ["string", "integer", "boolean", "number", "array"];
+const completionApiTargetMark = (status) => {
+    if (DEFAULT_DEVELOP_ENUM.includes(status)) {
+        return "1";
+    }
+    if (DEFAULT_COMPLETE_ENUM.includes(status)) {
+        return "2";
+    }
+    if (DEFAULT_EDIT_ENUM.includes(status)) {
+        return "3";
+    }
+    if (DEFAULT_DISCARD_ENUM.includes(status)) {
+        return "4";
+    }
+    return "1";
+};
+const completionParameter = (parameter) => {
+    if (lodash.isArray(parameter)) {
+        return parameter?.map((item) => ({
+            param_id: apipostTools.snowflakeId(),
+            description: item?.description || "",
+            field_type: lodash.has(item, "type") && DEFAULT_FIELD_TYPE$3?.includes(item?.type)
+                ? item.type.charAt(0).toUpperCase() + item.type.slice(1)
+                : "String",
+            is_checked: lodash.has(item, 'enable') ? (item?.enable ? 1 : -1) : 1,
+            key: item?.name || item?.relatedName || "",
+            value: item?.example || item?.value || "",
+            not_null: item?.required ? 1 : -1,
+            schema: item?.schema || {}
+        }));
+    }
+    return [];
+};
+// const websocket2SendType = {
+//   "text":"text",
+//   "json":"json",
+//   "xml":"xml",
+//   "html":"html",
+//   "base64":"base64",
+//   "hexadecimal":"hexadecimal"
+// }
+const completionWebsocketTarget = (item, baseInfo, parentInfo) => {
+    const { api } = item || {};
+    let apifoxApi = api;
+    let queryParameter = [];
+    if (lodash.isArray(apifoxApi?.parameters?.query)) {
+        queryParameter = completionParameter(apifoxApi?.parameters?.query);
+    }
+    return {
+        ...baseInfo,
+        parent_id: parentInfo?.target_id || "0",
+        target_type: 'websocket2',
+        name: getSubstring(item?.name || apifoxApi?.name, 255) || "Unnamed WS Connection",
+        sort: 0,
+        version: 0,
+        mark_id: completionApiTargetMark(apifoxApi?.status),
+        status: 1,
+        is_changed: -1,
+        is_create: 1,
+        method: '',
+        request: {
+            cookie: {
+                parameter: lodash.isArray(apifoxApi?.parameters?.cookie) ? completionParameter(apifoxApi?.parameters?.cookie) : [],
+            },
+            header: {
+                parameter: lodash.isArray(apifoxApi?.parameters?.header) ? completionParameter(apifoxApi?.parameters?.header) : [],
+            },
+            query: {
+                parameter: queryParameter,
+            },
+        },
+        message: [{
+                name: 'Message',
+                param_id: apipostTools.snowflakeId(),
+                request: {
+                    mode: apifoxApi?.requestBody?.messageType || 'text',
+                    raw: apifoxApi?.requestBody?.message || '',
+                    raw_parameter: [],
+                    raw_schema: { type: 'object' },
+                },
+                response: {
+                    mode: 'text',
+                    raw: '',
+                    raw_parameter: [],
+                    raw_schema: { type: 'object' },
+                },
+            }],
+        url: apifoxApi?.path || "",
+        description: apifoxApi?.description || "",
+        attribute_info: {},
+        tags: lodash.isArray(apifoxApi?.tags) ? apifoxApi?.tags : [],
+        config: {
+            certificate_verification: apifoxApi?.advancedSettings?.SSLValidate === true ? 1 : -1,
+            information_size: 5,
+            reconnect_num: 5,
+            reconnect_time: 5000,
+            // shake_hands_path: '',
+            shake_hands_timeout: 0,
+            // socket_version: 'v4',
+        },
+    };
+};
+const completionSocketIoTarget = (item, baseInfo, parentInfo) => {
+    const { api } = item || {};
+    return {
+        ...baseInfo,
+        parent_id: parentInfo?.target_id || "0",
+        target_type: 'socketio',
+        name: getSubstring(item?.name || api?.name, 255) || "Unnamed Socket.IO Session",
+        sort: 0,
+        version: 0,
+        mark_id: completionApiTargetMark(api?.status),
+        status: 1,
+        is_changed: -1,
+        is_create: 1,
+        method: '',
+        request: {
+            cookie: {
+                parameter: lodash.isArray(api?.parameters?.cookie) ? completionParameter(api?.parameters?.cookie) : [],
+            },
+            header: {
+                parameter: lodash.isArray(api?.parameters?.header) ? completionParameter(api?.parameters?.header) : [],
+            },
+            query: {
+                parameter: lodash.isArray(api?.parameters?.query) ? completionParameter(api?.parameters?.query) : [],
+            },
+            event: {
+                parameter: lodash.isArray(api?.events) ? api.events.map(e => {
+                    return {
+                        description: e?.description || '',
+                        field_type: "string",
+                        is_checked: 1,
+                        key: e?.name || "",
+                        value: e?.listen ? "1" : '',
+                        not_null: 1,
+                        schema: {
+                            type: "string"
+                        },
+                        param_id: apipostTools.snowflakeId()
+                    };
+                }) : [],
+            },
+        },
+        message: lodash.isArray(api?.requestBody?.args) ? api.requestBody.args.map((arg, index) => {
+            return {
+                name: `Message${index + 1}`,
+                param_id: apipostTools.snowflakeId(),
+                request: {
+                    mode: arg?.type || 'text',
+                    raw: arg?.content || '',
+                    raw_parameter: [],
+                    raw_schema: { type: 'object' },
+                },
+                response: {
+                    mode: 'text',
+                    raw: '',
+                    raw_parameter: [],
+                    raw_schema: { type: 'object' },
+                },
+            };
+        }) : [{
+                name: 'Message',
+                param_id: apipostTools.snowflakeId(),
+                request: {
+                    mode: 'text',
+                    raw: '',
+                    raw_parameter: [],
+                    raw_schema: { type: 'object' },
+                },
+                response: {
+                    mode: 'text',
+                    raw: '',
+                    raw_parameter: [],
+                    raw_schema: { type: 'object' },
+                },
+            }],
+        url: api?.path || "",
+        description: api?.description || '',
+        attribute_info: {},
+        tags: lodash.isArray(api?.tags) ? api?.tags : [],
+        config: {
+            reconnect_num: 5,
+            reconnect_time: 5000,
+            shake_hands_path: api?.advancedSettings?.handshakePath ? api.advancedSettings.handshakePath : '/socket.io',
+            shake_hands_timeout: 0,
+            socket_version: api?.advancedSettings?.clientVersion ? `v${api.advancedSettings.clientVersion}` : 'v4',
+            certificate_verification: api?.advancedSettings?.SSLValidate ? 1 : -1,
+        },
+        ask: api?.requestBody?.ack ? 1 : -1,
+        msg_data: api?.requestBody?.eventName ? api?.requestBody?.eventName : ''
+    };
+};
+
 // @ts-nocheck
 const throwResult$1 = (status, message, data = "") => {
     return {
@@ -4473,6 +4669,12 @@ class ApifoxToApipost {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "folderNameMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "apisMap", {
             enumerable: true,
             configurable: true,
@@ -4503,6 +4705,18 @@ class ApifoxToApipost {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "apifoxApiIdMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "recursionSchema", {
             enumerable: true,
             configurable: true,
@@ -4564,6 +4778,10 @@ class ApifoxToApipost {
             mock_custom_rules: [],
             db_link: [],
         };
+        this.config = {
+            project_id: "",
+            unrelated_id: false
+        };
         this.apis = [];
         this.models = [];
         this.samples = [];
@@ -4572,11 +4790,13 @@ class ApifoxToApipost {
         this.serversMap = {};
         this.modelMap = {};
         this.foldersMap = { "0": "0" };
+        this.folderNameMap = {};
         this.commonScripts = [];
         this.apisMap = {};
         this.modelIdMap = {};
         this.dbLinkmap = {};
         this.envsMap = {};
+        this.apifoxApiIdMap = {};
     }
     validate(json) {
         if (lodash.has(json, "apifoxProject")) {
@@ -4618,6 +4838,10 @@ class ApifoxToApipost {
             mock_custom_rules: [],
             db_link: [],
         };
+        this.config = {
+            project_id: "",
+            unrelated_id: false
+        };
         this.apis = [];
         this.models = [];
         this.samples = [];
@@ -4625,10 +4849,12 @@ class ApifoxToApipost {
         this.serversMap = {};
         this.modelMap = {};
         this.foldersMap = { "0": "0" };
+        this.folderNameMap = {};
         this.apisMap = {};
         this.modelIdMap = {};
         this.dbLinkmap = {};
         this.envsMap = {};
+        this.apifoxApiIdMap = {};
     }
     initProject(json, project_id) {
         this.project.name = getSubstring(json?.info?.name, 64) || "New Project";
@@ -4924,7 +5150,7 @@ class ApifoxToApipost {
                     let model_id = apipostTools.snowflakeId();
                     if (lodash.isString(item?.id)) {
                         let refId = item.id.split('/').pop();
-                        model_id = refId ? hexSnowflake(refId) : model_id;
+                        model_id = refId ? hexSnowflake(refId, this.config.unrelated_id) : model_id;
                     }
                     if (!lodash.has(this.modelIdMap, model_id)) {
                         this.modelIdMap[model_id] = model_id;
@@ -5332,6 +5558,10 @@ class ApifoxToApipost {
                     body["raw"] = requestBody?.example || requestBody?.data || "";
                 }
             }
+            else if (!requestBody?.[type] && requestBody?.data) {
+                body["mode"] = "plain";
+                body["raw"] = requestBody?.data || "";
+            }
             return {
                 mode: "none",
                 parameter: [],
@@ -5357,6 +5587,63 @@ class ApifoxToApipost {
             binary: {},
         };
     }
+    completionTcpRequestBody(requestBody, type = "type") {
+        if (requestBody && isObject(requestBody)) {
+            let foxMode = requestBody?.[type] || 'text';
+            return {
+                mode: foxMode === "raw" ? "text" : foxMode,
+                "parameter": [
+                    {
+                        "definition": "",
+                        "key": "",
+                        "value": "",
+                        "description": "",
+                        "is_checked": 1,
+                        "param_id": "309780acf12016",
+                        "static": true,
+                        "rules": {
+                            "common": "",
+                            "content_type": "custom",
+                            "custom": "",
+                            "fill_type": "",
+                            "length": 0,
+                            "delimiter": ""
+                        }
+                    }
+                ],
+                "raw": requestBody?.example || "",
+                "raw_parameter": [],
+                "raw_schema": this.recursionSchema(requestBody?.jsonSchema || { type: "object", properties: {} }, this.modelMap)
+            };
+        }
+        return {
+            "mode": "xml",
+            "parameter": [
+                {
+                    "definition": "",
+                    "key": "",
+                    "value": "",
+                    "description": "",
+                    "is_checked": 1,
+                    "param_id": "309780acf12016",
+                    "static": true,
+                    "rules": {
+                        "common": "",
+                        "content_type": "custom",
+                        "custom": "",
+                        "fill_type": "",
+                        "length": 0,
+                        "delimiter": ""
+                    }
+                }
+            ],
+            "raw": "",
+            "raw_parameter": [],
+            "raw_schema": {
+                "type": "object"
+            }
+        };
+    }
     completionApiRequest(item, requestBody, apiRequestBody) {
         return {
             auth: this.completionApiRequestAuth(item?.auth),
@@ -5380,7 +5667,7 @@ class ApifoxToApipost {
     completionApiFolder(item, parentInfo) {
         let target_id = apipostTools.snowflakeId();
         if (lodash.has(item, 'id')) {
-            target_id = hexSnowflake(item?.id);
+            target_id = hexSnowflake(item?.id, this.config.unrelated_id);
         }
         if (item?.id) {
             this.foldersMap[item.id] = target_id;
@@ -5430,7 +5717,7 @@ class ApifoxToApipost {
             // );
             return {
                 example_id: apipostTools.snowflakeId(),
-                raw: raw ? getBeautifulRaw$1(raw?.data || "") : "",
+                raw: raw ? getBeautifulRaw$1(raw?.data || raw?.content || "") : "",
                 raw_parameter: [],
                 expect: {
                     name: getSubstring(item?.name, 255) || "",
@@ -5471,7 +5758,13 @@ class ApifoxToApipost {
         const { api, customHttpRequest } = item || {};
         let apifoxApi = api || customHttpRequest;
         if (lodash.has(apifoxApi, 'id')) {
-            baseInfo.target_id = hexSnowflake(apifoxApi?.id);
+            if (lodash.has(this.apifoxApiIdMap, String(apifoxApi?.id))) {
+                baseInfo.target_id = this.apifoxApiIdMap[String(apifoxApi.id)];
+            }
+            else {
+                baseInfo.target_id = hexSnowflake(apifoxApi?.id, this.config.unrelated_id);
+                this.apifoxApiIdMap[String(apifoxApi.id)] = baseInfo.target_id;
+            }
         }
         if (apifoxApi?.requestBody?.type === 'graphql') {
             const request = this.completionApiRequest({
@@ -5532,7 +5825,7 @@ class ApifoxToApipost {
         cases?.forEach((caseItem) => {
             let sample_id = apipostTools.snowflakeId();
             if (lodash.has(caseItem, 'id')) {
-                sample_id = hexSnowflake(caseItem?.id);
+                sample_id = hexSnowflake(caseItem?.id, this.config.unrelated_id);
             }
             if (!lodash.has(this.apisMap, sample_id)) {
                 this.apisMap[sample_id] = sample_id;
@@ -5573,6 +5866,10 @@ class ApifoxToApipost {
                 if (lodash.has(item, "items") && !lodash.has(item, "api")) {
                     // 这是目录操作
                     const parent = this.completionApiFolder(item, parentInfo);
+                    // 记录以目录名称为key的对象
+                    if (!lodash.has(this.folderNameMap, parent.name)) {
+                        this.folderNameMap[parent.name] = parent;
+                    }
                     if (!lodash.has(this.apisMap, parent.target_id)) {
                         this.apisMap[parent.target_id] = parent.target_id;
                         pre.push(parent);
@@ -5602,7 +5899,7 @@ class ApifoxToApipost {
         }
         return [];
     }
-    completionEventList(steps, parentEventId = '0', result = [], testing_id) {
+    completionEventList(steps, parentEventId = '0', result = [], testing_id, apis = []) {
         let sortCounter = 1;
         // 记录上一个if类型数据, 主要用来生成else的数据
         const ifStack = [];
@@ -5726,17 +6023,39 @@ class ApifoxToApipost {
                     mappedType = "api";
                     // 这是接口操作
                     const base = {
-                        target_id: hexSnowflake(item?.bindId),
+                        target_id: hexSnowflake(item?.bindId, this.config.unrelated_id),
                         project_id: this.project.project_id || "",
                     };
-                    // 判断接口列表中是否有
+                    // 判断接口列表中是否有重复id的接口
                     const targetApi = this.apis.find(i => i?.target_id === base.target_id);
                     let apiData = {};
                     if (lodash.isPlainObject(item?.httpApiCase)) {
-                        const targetData = this.completionApiTarget({
-                            name: item?.httpApiCase?.name || item?.name,
+                        let httpApiCaseData = {
+                            name: item?.name || item?.httpApiCase?.name,
                             api: { ...item?.httpApiCase, id: item?.httpApiCase?.apiId || item?.bindId }
-                        }, base);
+                        };
+                        const newId = this.apifoxApiIdMap[String(httpApiCaseData.api.id)];
+                        // 获取接口列表中的接口
+                        const targetApiData = this.apis.find(i => i?.target_id === newId);
+                        if (targetApiData !== undefined) {
+                            // 补齐url
+                            if ((httpApiCaseData.api.path === null || !httpApiCaseData?.api?.path)) {
+                                httpApiCaseData.api.path = targetApiData.url;
+                            }
+                            // 补齐method
+                            if ((httpApiCaseData.api.method === null || !httpApiCaseData?.api?.method)) {
+                                httpApiCaseData.api.method = targetApiData.method;
+                            }
+                            // 判断名字是否需要拼接
+                            if (!item?.name && targetApiData.name !== httpApiCaseData.name) {
+                                httpApiCaseData.name = `${targetApiData.name}(${httpApiCaseData.name})`;
+                            }
+                            // 补齐body 的mode
+                            if (httpApiCaseData?.api?.requestBody && !httpApiCaseData?.api?.requestBody?.type && targetApiData?.body?.mode) {
+                                httpApiCaseData.api.requestBody.type = MODE_TYPE2[targetApiData?.body?.mode] || '';
+                            }
+                        }
+                        const targetData = this.completionApiTarget(httpApiCaseData, base);
                         apiData = targetData;
                     }
                     else if (targetApi === undefined) {
@@ -5758,6 +6077,8 @@ class ApifoxToApipost {
                     };
                     if (!lodash.has(this.apisMap, apiData.target_id)) {
                         this.apisMap[apiData.target_id] = apiData.target_id;
+                        // 接口列表不存在的接口
+                        apis.push(apiData);
                     }
                     // 自动同步
                     if (item?.syncMode === 'SYNC_WITH_API') {
@@ -5815,7 +6136,7 @@ class ApifoxToApipost {
             result.push(currentItem);
             // 2. 处理子项（steps/children/items）
             if (isArray(item.children)) {
-                this.completionEventList(item.children, currentItem.event_id, result, testing_id);
+                this.completionEventList(item.children, currentItem.event_id, result, testing_id, apis);
             }
         });
         return result;
@@ -5825,7 +6146,7 @@ class ApifoxToApipost {
             // 1. 处理目录（folder类型）
             if ((isArray(item.children) || isArray(item.items)) && !lodash.has(item, 'steps')) {
                 const folder = {
-                    testing_id: hexSnowflake(item?.id), // 如果没有id则生成一个
+                    testing_id: hexSnowflake(item?.id, this.config.unrelated_id), // 如果没有id则生成一个
                     parent_id: parentId,
                     testing_type: 'folder',
                     name: item.name || 'Unnamed Folder',
@@ -5850,14 +6171,15 @@ class ApifoxToApipost {
                     eventList: [],
                     tags: isArray(item?.tags) ? item.tags : [],
                     options: item?.options || {},
-                    apiTestDataSets: item?.apiTestDataSets || []
+                    apiTestDataSets: item?.apiTestDataSets || [],
+                    apis: [],
                 };
                 let foxEnvironmentId = String(item?.options?.environmentId);
                 if (lodash.has(this.envsMap, foxEnvironmentId)) {
                     // 替换新的环境ID
                     item.options.environmentId = this.envsMap[foxEnvironmentId];
                 }
-                caseData.eventList = this.completionEventList(item.steps, '0', [], caseData.testing_id);
+                caseData.eventList = this.completionEventList(item.steps, '0', [], caseData.testing_id, caseData.apis);
                 result.push(caseData);
             }
         });
@@ -5869,6 +6191,102 @@ class ApifoxToApipost {
             this.apis = this.completionApis(root?.items);
         }
     }
+    initWebSocket(wsCollection) {
+        const root = wsCollection?.[0];
+        if (root?.items && isArray(root?.items)) {
+            this.apis = this.apis.concat(this.completionWebsockets(root?.items));
+        }
+    }
+    completionWebsockets(items, parentInfo) {
+        if (items?.length) {
+            return items?.reduce((pre, item) => {
+                if (lodash.has(item, "items") && !lodash.has(item, "api")) {
+                    // 这是目录操作
+                    let parent = this.completionApiFolder(item, parentInfo);
+                    // 记录以目录名称为key的对象 没有目录才新建目录,有的话直接把ws放到该目录下
+                    if (!lodash.has(this.folderNameMap, parent.name)) {
+                        this.folderNameMap[parent.name] = parent;
+                    }
+                    else {
+                        parent = this.folderNameMap[parent.name];
+                        pre = pre.concat(this.completionWebsockets(item?.items, parent));
+                        return pre;
+                    }
+                    if (!lodash.has(this.apisMap, parent.target_id)) {
+                        this.apisMap[parent.target_id] = parent.target_id;
+                        pre.push(parent);
+                    }
+                    else {
+                        return pre;
+                        // 重复id数据 先忽略
+                    }
+                    pre = pre.concat(this.completionWebsockets(item?.items, parent));
+                }
+                if (!lodash.has(item, "items") && lodash.has(item, "api")) {
+                    // 这是接口操作
+                    const base = {
+                        target_id: apipostTools.snowflakeId(),
+                        project_id: this.project.project_id || "",
+                    };
+                    const target = completionWebsocketTarget(item, base, parentInfo);
+                    if (!lodash.has(this.apisMap, target.target_id)) {
+                        this.apisMap[target.target_id] = target.target_id;
+                        pre.push(target);
+                    }
+                }
+                return pre;
+            }, []);
+        }
+        return [];
+    }
+    initSocketIo(socketIOCollection) {
+        const root = socketIOCollection?.[0];
+        if (root?.items && isArray(root?.items)) {
+            this.apis = this.apis.concat(this.completionSocketIo(root?.items));
+        }
+    }
+    completionSocketIo(items, parentInfo) {
+        if (items?.length) {
+            return items?.reduce((pre, item) => {
+                if (lodash.has(item, "items") && !lodash.has(item, "api")) {
+                    // 这是目录操作
+                    let parent = this.completionApiFolder(item, parentInfo);
+                    // 记录以目录名称为key的对象 没有目录才新建目录,有的话直接把ws放到该目录下
+                    if (!lodash.has(this.folderNameMap, parent.name)) {
+                        this.folderNameMap[parent.name] = parent;
+                    }
+                    else {
+                        parent = this.folderNameMap[parent.name];
+                        pre = pre.concat(this.completionSocketIo(item?.items, parent));
+                        return pre;
+                    }
+                    if (!lodash.has(this.apisMap, parent.target_id)) {
+                        this.apisMap[parent.target_id] = parent.target_id;
+                        pre.push(parent);
+                    }
+                    else {
+                        return pre;
+                        // 重复id数据 先忽略
+                    }
+                    pre = pre.concat(this.completionSocketIo(item?.items, parent));
+                }
+                if (!lodash.has(item, "items") && lodash.has(item, "api")) {
+                    // 这是接口操作
+                    const base = {
+                        target_id: apipostTools.snowflakeId(),
+                        project_id: this.project.project_id || "",
+                    };
+                    const target = completionSocketIoTarget(item, base, parentInfo);
+                    if (!lodash.has(this.apisMap, target.target_id)) {
+                        this.apisMap[target.target_id] = target.target_id;
+                        pre.push(target);
+                    }
+                }
+                return pre;
+            }, []);
+        }
+        return [];
+    }
     completionDocs(items) {
         if (items?.length) {
             return items?.reduce((pre, item) => {
@@ -5933,13 +6351,32 @@ class ApifoxToApipost {
         };
     }
     completionTcpMethodRequest(parameter) {
+        const funcRequest = [];
+        if (isArray(parameter?.dataProcessors)) {
+            lodash.forEach(parameter.dataProcessors, (item) => {
+                if (item?.id == 101) {
+                    funcRequest.push({
+                        "id": "addCharToPacketEnd",
+                        "title": "包尾添加特殊字符",
+                        "option": "\\n"
+                    });
+                }
+                if (item?.id == 102) {
+                    funcRequest.push({
+                        "id": "calcLengthToPacketHeader",
+                        "title": "计算内容长度并添加到包头（文本）",
+                        "option": item?.options?.headerLength || 8
+                    });
+                }
+            });
+        }
         return {
-            body: this.completionApiRequestBody(parameter, "contentType"),
+            body: this.completionTcpRequestBody(parameter, "contentType"),
             post_tasks: [],
             configs: {
                 charset: "utf8",
                 func: {
-                    request: [],
+                    request: funcRequest,
                     response: [],
                 },
             },
@@ -6005,19 +6442,25 @@ class ApifoxToApipost {
     initTestCase(apiTestCaseCollection) {
         // 判断是否有测试用例数据
         if (isArray(apiTestCaseCollection) && apiTestCaseCollection.length > 0 && isArray(apiTestCaseCollection[0]?.items)) {
-            this.test_cases = this.completionTestCases(apiTestCaseCollection[0].items);
+            this.test_cases = this.completionTestCases(apiTestCaseCollection[0].items.concat(isArray(apiTestCaseCollection[0]?.children) ? apiTestCaseCollection[0].children : []));
         }
     }
-    convert(json, project_id) {
+    convert(json, config = {
+        project_id: "",
+        unrelated_id: false
+    }) {
         this.clear();
         try {
+            this.config = config;
             this.validate(json);
-            this.initProject(json, project_id);
+            this.initProject(json, config?.project_id);
             this.initGlobal(json);
             this.initModels(json?.schemaCollection);
             this.initApis(json?.apiCollection);
             this.initDoc(json?.docCollection);
             this.initTcp(json?.socketCollection);
+            this.initWebSocket(json?.webSocketCollection);
+            this.initSocketIo(json?.socketIOCollection);
             this.initTestCase(json?.apiTestCaseCollection);
             const data = {
                 ...this.project,
@@ -6029,7 +6472,7 @@ class ApifoxToApipost {
                 samples: this.samples,
                 test_cases: this.test_cases,
             };
-            // console.log(JSON.stringify(data.test_cases[1]));
+            // console.log(JSON.stringify(this.apis));
             return throwResult$1("success", "", data);
         }
         catch (err) {
@@ -6153,6 +6596,18 @@ class ApifoxcliToApipost {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "config", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "apifoxApiIdMap", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "recursionSchema", {
             enumerable: true,
             configurable: true,
@@ -6213,6 +6668,10 @@ class ApifoxcliToApipost {
             mock_custom_rules: [],
             db_link: [],
         };
+        this.config = {
+            project_id: "",
+            unrelated_id: false
+        };
         this.apis = [];
         this.eventList = [];
         this.models = [];
@@ -6224,6 +6683,7 @@ class ApifoxcliToApipost {
         this.foldersMap = { "0": "0" };
         this.commonScripts = [];
         this.modelIdMap = {};
+        this.apifoxApiIdMap = {};
     }
     validate(json) {
         if (lodash.has(json, "apifoxCli")) {
@@ -6259,6 +6719,10 @@ class ApifoxcliToApipost {
             mock_custom_rules: [],
             db_link: [],
         };
+        this.config = {
+            project_id: "",
+            unrelated_id: false
+        };
         this.apis = [];
         this.eventList = [];
         this.models = [];
@@ -6268,6 +6732,7 @@ class ApifoxcliToApipost {
         this.modelMap = {};
         this.foldersMap = { "0": "0" };
         this.modelIdMap = {};
+        this.apifoxApiIdMap = {};
     }
     initProject(json, project_id) {
         // this.project.testing_type = "testing";
@@ -6418,7 +6883,7 @@ class ApifoxcliToApipost {
                 if (key) {
                     // 这是模型操作
                     // 这里要做Map映射 引用ref替换使用
-                    const model_id = hexSnowflake(key);
+                    const model_id = hexSnowflake(key, this.config.unrelated_id);
                     if (!lodash.has(this.modelIdMap, model_id)) {
                         this.modelIdMap[model_id] = model_id;
                     }
@@ -6906,7 +7371,7 @@ class ApifoxcliToApipost {
     completionApiFolder(item, parentInfo) {
         let target_id = apipostTools.snowflakeId();
         if (lodash.has(item, 'id')) {
-            target_id = hexSnowflake(item?.id);
+            target_id = hexSnowflake(item?.id, this.config.unrelated_id);
         }
         if (item?.id) {
             this.foldersMap[item.id] = target_id;
@@ -7018,7 +7483,13 @@ class ApifoxcliToApipost {
     completionApiTarget(item, baseInfo) {
         const { request, response, responseDefinition, requestDefinition, metaInfo } = item || {};
         if (lodash.has(metaInfo, 'httpApiId')) {
-            baseInfo.target_id = hexSnowflake(metaInfo?.httpApiId);
+            if (lodash.has(this.apifoxApiIdMap, String(metaInfo?.httpApiId))) {
+                baseInfo.target_id = this.apifoxApiIdMap[String(metaInfo.httpApiId)];
+            }
+            else {
+                baseInfo.target_id = hexSnowflake(metaInfo?.httpApiId, this.config.unrelated_id);
+                this.apifoxApiIdMap[String(metaInfo.httpApiId)] = baseInfo.target_id;
+            }
         }
         return {
             ...baseInfo,
@@ -7048,7 +7519,7 @@ class ApifoxcliToApipost {
         return cases?.map((caseItem) => {
             let sample_id = apipostTools.snowflakeId();
             if (lodash.has(caseItem, 'id')) {
-                sample_id = hexSnowflake(caseItem?.id);
+                sample_id = hexSnowflake(caseItem?.id, this.config.unrelated_id);
             }
             return {
                 ...baseInfo,
@@ -7424,11 +7895,15 @@ class ApifoxcliToApipost {
         }
         return [];
     }
-    convert(json, project_id) {
+    convert(json, config = {
+        project_id: "",
+        unrelated_id: false
+    }) {
         this.clear();
         try {
+            this.config = config;
             this.validate(json);
-            this.initProject(json, project_id);
+            this.initProject(json, config?.project_id);
             this.initGlobal(json);
             this.initModels(json?.dataSchemas);
             this.initEventList(json?.item);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoapi-converter",
-  "version": "0.0.89",
+  "version": "0.0.90",
   "description": "echoapi to swagger",
   "main": "dist/index.js",
   "files": [