Merge pull request #119 from allproxy/v3-52-1

V3 52 1: Handle invalid JSON format
allproxy · Nov 21, 2024 · 33a7dfc · 33a7dfc
2 parents 790fba2 + 19ee528
commit 33a7dfc
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 16 deletions.
diff --git a/docs/asset-manifest.json b/docs/asset-manifest.json
@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "/static/css/main.59dadba0.css",
-    "main.js": "/static/js/main.2bf8f2f4.js",
+    "main.css": "/static/css/main.e8b3c1bc.css",
+    "main.js": "/static/js/main.1c9ac67d.js",
     "static/js/787.44e022fc.chunk.js": "/static/js/787.44e022fc.chunk.js",
     "static/media/fa-solid-900.svg": "/static/media/fa-solid-900.7a8b4f130182d19a2d7c.svg",
     "static/media/fa-brands-400.svg": "/static/media/fa-brands-400.2f517e09eb2ca6650ff5.svg",
@@ -19,12 +19,12 @@
     "static/media/fa-regular-400.woff": "/static/media/fa-regular-400.bb58e57c48a3e911f15f.woff",
     "static/media/fa-regular-400.woff2": "/static/media/fa-regular-400.7a3337626410ca2f4071.woff2",
     "index.html": "/index.html",
-    "main.59dadba0.css.map": "/static/css/main.59dadba0.css.map",
-    "main.2bf8f2f4.js.map": "/static/js/main.2bf8f2f4.js.map",
+    "main.e8b3c1bc.css.map": "/static/css/main.e8b3c1bc.css.map",
+    "main.1c9ac67d.js.map": "/static/js/main.1c9ac67d.js.map",
     "787.44e022fc.chunk.js.map": "/static/js/787.44e022fc.chunk.js.map"
   },
   "entrypoints": [
-    "static/css/main.59dadba0.css",
-    "static/js/main.2bf8f2f4.js"
+    "static/css/main.e8b3c1bc.css",
+    "static/js/main.1c9ac67d.js"
   ]
 }
diff --git a/docs/index.html b/docs/index.html
@@ -11,8 +11,8 @@
     <link rel="manifest" href="manifest.json" />
     <title>AllProxy</title>
     <script>var exports = { __esModule: !0 }</script>
-    <script defer="defer" src="static/js/main.2bf8f2f4.js"></script>
-    <link href="static/css/main.59dadba0.css" rel="stylesheet">
+    <script defer="defer" src="static/js/main.1c9ac67d.js"></script>
+    <link href="static/css/main.e8b3c1bc.css" rel="stylesheet">
 </head>
 
 <body><noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/docs/plugins/parsejson/plugin.js b/docs/plugins/parsejson/plugin.js
@@ -18,6 +18,7 @@ function parseJSON(preJSONString, jsonObject) {
     let rawLine;
     // Copy any JSON fields not defined in jsonObject
     let additionalJSON = {};
+    let ignoreFields = [];
 
     // Set the level
     // level = jsonObject.m_level;
@@ -31,5 +32,5 @@ function parseJSON(preJSONString, jsonObject) {
     // Set message
     //message = jsonObject.my_message;
 
-    return { date, level, category, kind, message, rawLine, additionalJSON };
+    return { date, level, category, kind, message, rawLine, additionalJSON, ignoreFields };
 }
diff --git a/docs/static/css/main.59dadba0.css.map b/docs/static/css/main.59dadba0.css.map
diff --git a/docs/static/css/main.59dadba0.css → docs/static/css/main.e8b3c1bc.css b/docs/static/css/main.59dadba0.css → docs/static/css/main.e8b3c1bc.css
diff --git a/docs/static/css/main.e8b3c1bc.css.map b/docs/static/css/main.e8b3c1bc.css.map
diff --git a/docs/static/js/main.1c9ac67d.js b/docs/static/js/main.1c9ac67d.js
diff --git a/docs/static/js/main.2bf8f2f4.js.LICENSE.txt → docs/static/js/main.1c9ac67d.js.LICENSE.txt b/docs/static/js/main.2bf8f2f4.js.LICENSE.txt → docs/static/js/main.1c9ac67d.js.LICENSE.txt
diff --git a/docs/static/js/main.1c9ac67d.js.map b/docs/static/js/main.1c9ac67d.js.map
diff --git a/docs/static/js/main.2bf8f2f4.js b/docs/static/js/main.2bf8f2f4.js
diff --git a/docs/static/js/main.2bf8f2f4.js.map b/docs/static/js/main.2bf8f2f4.js.map