merge main to demo

Author: manojown

ui/package.json

@@ -11,7 +11,6 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@bany/curl-to-json": "^1.2.7",
     "@chakra-ui/icons": "^2.0.17",
     "@chakra-ui/react": "^2.4.9",
     "@clerk/clerk-react": "^4.17.0",
@@ -28,6 +27,7 @@
     "echarts-for-react": "^3.0.2",
     "framer-motion": "^9.0.2",
     "html-react-parser": "^3.0.16",
+    "minimist": "^1.2.8",
     "query-string": "^8.1.0",
     "react": "^18.2.0",
     "react-animated-number": "^0.4.4",

ui/src/pages/Dashboard/AddEditRequest/selectedRequest.tsx

@@ -59,6 +59,8 @@ function ImportCurl() {
 
   const importCurlCmd = async () => {
     try {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
       const payload = convertToCurl(text);
       dispatch(curlToRequest(payload as CurlToJSONPayload));
       setOpen(false);

ui/src/utils/curlParser/convertor.js

@@ -0,0 +1,74 @@
+/* eslint-disable prefer-destructuring */
+/**
+ * Parse header field.
+ */
+
+function parseField(s) {
+  return s.replace(/:(\s+)/, ":").split(/:(.+)/);
+}
+
+function parseFieldWithEqual(s) {
+  return s.split(/=(.+)/);
+}
+
+function pareString(s, pareCallBack = parseField) {
+  const result = {};
+  const field = pareCallBack(s);
+  result[field[0]] = field[1];
+  return result;
+}
+
+function parseParamsField(s) {
+  if (s === "") return null;
+  const object = {};
+  const allParamsArr = s.split(/&/);
+  allParamsArr.forEach((element) => {
+    const field = element.split(/=/);
+    object[field[0]] = field[1];
+  });
+
+  return object;
+}
+
+const option = {
+  header: (data) => {
+    let ouput = {};
+    if (typeof data === "string") {
+      ouput = pareString(data);
+    } else {
+      data.forEach((element) => {
+        ouput = {
+          ...ouput,
+          ...pareString(element, parseField),
+        };
+      });
+      return ouput;
+    }
+    return ouput;
+  },
+  body: (data) => {
+    if (typeof data === "string") {
+      try {
+        return JSON.parse(data);
+      } catch {
+        try {
+          return parseParamsField(data);
+        } catch {
+          return data;
+        }
+      }
+    } else {
+      let ouput = {};
+      data.forEach((element) => {
+        ouput = {
+          ...ouput,
+          ...pareString(element, parseFieldWithEqual),
+        };
+      });
+      return ouput;
+    }
+  },
+  parseParamsField,
+};
+
+export default option;

ui/src/utils/curlParser/matcher.js

@@ -0,0 +1,20 @@
+/* eslint-disable @typescript-eslint/no-shadow */
+const option = {
+  matchArgv(s) {
+    // ref: https://stackoverflow.com/questions/366202/regex-for-splitting-a-string-using-space-when-not-surrounded-by-single-or-double
+    return s
+      .replace(/\\\n/g, " ")
+      .match(/"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|[^\s]+/g)
+      .map((s) => {
+        if (
+          (s.startsWith("'") && s.endsWith("'")) ||
+          (s.startsWith('"') && s.endsWith('"'))
+        ) {
+          // remove quotes on both sides
+          return s.substring(1, s.length - 1);
+        }
+        return s;
+      });
+  },
+};
+export default option;

ui/src/utils/curlParser/option.js

@@ -0,0 +1,153 @@
+/* eslint-disable import/no-import-module-exports */
+import convertor from "./convertor";
+
+const options = [
+  {
+    name: "url",
+    alias: ["url", "curl"],
+    description: "Url request",
+    convertor: null,
+  },
+  {
+    name: "cookie",
+    alias: ["b", "cookie"],
+    description:
+      "<name=data> Supply cookie with request. If no =, then specifies the cookie file to use (see -c).",
+    convertor: null,
+  },
+  {
+    name: "cookie-jar",
+    alias: ["c", "cookie-jar"],
+    description: "<file name> File to save response cookies to.",
+    convertor: null,
+  },
+  {
+    name: "data",
+    alias: ["d", "data", "data-raw", "data-urlencode", "data-binary"],
+    description:
+      "<data> Send specified data in POST request. Details provided below.",
+    convertor: convertor.body,
+  },
+  /* -f, --fail Fail silently (don't output HTML error form if returned). */
+  {
+    name: "fail",
+    alias: ["f", "fail"],
+    description: "Fail silently (don't output HTML error form if returned).",
+    convertor: null,
+  },
+  // -F, --form <name=content> Submit form data.
+  {
+    name: "form",
+    alias: ["F", "form"],
+    description: "<name=content> Submit form data.",
+    convertor: null,
+  },
+  // -H, --header <header> Headers to supply with request.
+  {
+    name: "header",
+    alias: ["H", "header"],
+    description: "<header> Headers to supply with request.",
+    convertor: convertor.header,
+  },
+
+  // -i, --include Include HTTP headers in the output.
+  {
+    name: "include",
+    alias: ["i", "include"],
+    description: "Include HTTP headers in the output.",
+    convertor: null,
+  },
+
+  // -I, --head Fetch headers only.
+  {
+    name: "head",
+    alias: ["I", "head"],
+    description: "Fetch headers only.",
+    convertor: null,
+  },
+
+  // -k, --insecure Allow insecure connections to succeed.
+  {
+    name: "insecure",
+    alias: ["k", "insecure"],
+    description: "Allow insecure connections to succeed.",
+    convertor: null,
+  },
+
+  // -L, --location Follow redirects.
+  {
+    name: "location",
+    alias: ["L", "location"],
+    description: "v",
+    convertor: null,
+  },
+
+  // -o, --output <file> Write output to . Can use --create-dirs in conjunction with this to create any directories specified in the -o path.
+  {
+    name: "output",
+    alias: ["o", "output"],
+    description:
+      "<file> Write output to . Can use --create-dirs in conjunction with this to create any directories specified in the -o path.",
+    convertor: null,
+  },
+
+  // -O, --remote-name Write output to file named like the remote file (only writes to current directory).
+  {
+    name: "remote-name",
+    alias: ["remote-name", "O"],
+    description:
+      "Write output to file named like the remote file (only writes to current directory).",
+    convertor: null,
+  },
+
+  // -s, --silent Silent (quiet) mode. Use with -S to force it to show errors.
+  {
+    name: "silent",
+    alias: ["s", "silent"],
+    description: "Silent (quiet) mode. Use with -S to force it to show errors.",
+    convertor: null,
+  },
+
+  // -v, --verbose Provide more information (useful for debugging).
+  {
+    name: "verbose",
+    alias: ["v", "verbose"],
+    description: "Provide more information (useful for debugging).",
+    convertor: null,
+  },
+
+  // -w, --write-out <format> Make curl display information on stdout after a completed transfer. See man page for more details on available variables. Convenient way to force curl to append a newline to output: -w "\n" (can add to ~/.curlrc).
+  {
+    name: "write-out",
+    alias: ["write-out", "w"],
+    description:
+      '<format> Make curl display information on stdout after a completed transfer. See man page for more details on available variables. Convenient way to force curl to append a newline to output: -w "\n" (can add to ~/.curlrc).',
+    convertor: null,
+  },
+
+  // -X, --request The request method to use.
+  {
+    name: "method",
+    alias: ["X", "request"],
+    description: "The request method to use.",
+    convertor: null,
+  },
+
+  // -A, --user-agent <name>
+  {
+    name: "user-agent",
+    alias: ["A", "user-agent"],
+    description: "Specify the User-Agent send to the HTTP server.",
+    convertor: null,
+  },
+
+  // -e, --referer <URL>
+  {
+    name: "referer",
+    alias: ["e", "referer"],
+    description: 'Sends the "Referrer Page" information to the HTTP server.',
+    convertor: null,
+  },
+];
+
+export default options;

ui/src/utils/curlParser/pare-json.js

@@ -0,0 +1,54 @@
+/* eslint-disable import/no-import-module-exports */
+/* eslint-disable no-param-reassign */
+/* eslint-disable no-multi-assign */
+/* eslint-disable @typescript-eslint/no-shadow */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import minimistParser from "minimist";
+import convertor from "./convertor";
+import options from "./option";
+import matcher from "./matcher";
+
+export function parse(data) {
+  if (typeof data === "string" || data instanceof String) {
+    // minimistParser cannot parse from string
+    // parse string to argvs array for minimistParser
+    data = matcher.matchArgv(data);
+  }
+  const argv = minimistParser(data);
+
+  const result = {};
+
+  if (argv._[1]) {
+    result.url = argv._[1].replace(/'/g, "");
+  }
+
+  options.forEach((element) => {
+    const { alias } = element;
+    const value = alias
+      .map((element) => argv[element])
+      .filter((element) => element)[0];
+    if (value) {
+      if (element.convertor) {
+        result[element.name] = element.convertor(value);
+      } else {
+        result[element.name] = value;
+      }
+    }
+  });
+
+  if (result.url) {
+    const url = new URL(result.url);
+    result.url = url.origin + url.pathname;
+    const params = new URLSearchParams(url.search);
+    if (Array.from(params).length) {
+      result.params = convertor.parseParamsField(params.toString());
+    }
+  }
+
+  if (!result.method) {
+    // When there is a "data" parameter, the default is "post" request mode
+    result.method = result.data ? "POST" : "GET";
+  }
+
+  return result;
+}

ui/src/utils/curlToRequest.ts

@@ -1,30 +1,13 @@
+/* eslint-disable import/extensions */
 // eslint-disable-next-line import/no-extraneous-dependencies
-import * as parse from "@bany/curl-to-json";
-
-// TODO: @bany/curl-to-json library failed to parse header if there is no space between key and value. so added this patch
-const headerFix = (payload: Record<string, string>) => {
-  return Object.keys(payload || {}).reduce(
-    (acc: Record<string, string>, key: string) => {
-      if (!payload[key]) {
-        if (key.includes(":")) {
-          const [mapKey, value] = key.split(":");
-          acc[mapKey] = value;
-        }
-      } else {
-        acc[key] = payload[key];
-      }
-      return acc;
-    },
-    {} as Record<string, string>
-  );
-};
+import { parse } from "./curlParser/pare-json.js";
 
 export const convertToCurl = (curl: string) => {
   try {
     const payload = parse(curl) as any;
     return {
       ...payload,
-      header: headerFix(payload.header),
+      url: payload.url ? payload.url : payload.location,
     };
   } catch (e) {
     throw new Error("Error while parsing curl");