@ywfe/fe-tools 1.2.1-beta.30 → 1.2.1-beta.31

package/lib/userInputToJson.d.ts

@@ -4,9 +4,5 @@ interface userInput {
 }
 declare function userInputToJson({ input }: {
     input: userInput;
-}): Promise<{
-    message: string;
-    success: boolean;
-    data: any;
-}>;
+}): Promise<any>;
 export default userInputToJson;

package/lib/ywfe-tools.cjs

@@ -8723,16 +8723,12 @@ function request(_a) {
                         return basePathMap.get(env);
                     };
                     isValidURL = function (url) {
-                        var pattern = new RegExp("^(https?:\/\/)?" + // protocol
-                            "((([a-z\d]([a-z\d-]*[a-z\d])*)\.)+[a-z]{2,}|" + // domain name
-                            "((\d{1,3}\.){3}\d{1,3}))" + // OR ip (v4) address
-                            "(\:\d+)?(\/[-a-z\d%_.~+]*)*" + // port and path
-                            "(\?[;&a-z\d%_.~+=-]*)?" + // query string
-                            "(\#[-a-z\d_]*)?$", "i"); // fragment locator
-                        return !!pattern.test(url);
+                        var regex = /^https?:\/\//;
+                        return regex.test(url);
                     };
                     prefix = getBasePath();
                     requestUrl = isValidURL(input.url) ? input.url : "".concat(prefix).concat(input.url);
+                    console.log('requestUrl', requestUrl, isValidURL(input.url));
                     fetchOption = {
                         method: method,
                         headers: {
@@ -8764,20 +8760,28 @@ function request(_a) {
 
 function userInputToJson(_a) {
     return __awaiter(this, arguments, void 0, function (_b) {
-        var res;
+        var res, result;
         var input = _b.input;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, request({
-                        input: {
-                            url: "https://fc-typechat.ywwl.com/userInputToJson",
-                            method: "GET",
-                            params: input,
-                        },
-                    })];
+                case 0:
+                    console.log("input", input);
+                    return [4 /*yield*/, request({
+                            input: {
+                                url: "https://fc-typechat.ywwl.com/userInputToJson",
+                                method: "GET",
+                                params: input,
+                            },
+                        })];
                 case 1:
                     res = _c.sent();
-                    return [2 /*return*/, res];
+                    if (res.success) {
+                        result = res.data;
+                        return [2 /*return*/, result.success ? result.data : result];
+                    }
+                    else {
+                        return [2 /*return*/, res.success ? res.data : res];
+                    }
             }
         });
     });