Treat "simple-obfs" in sing-box configs as obfs-local

tindy2013 · Nov 19, 2023 · 7968d54 · 7968d54
1 parent c578ea6
commit 7968d54
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/generator/config/subexport.cpp b/src/generator/config/subexport.cpp
@@ -2140,6 +2140,8 @@ void proxyToSingBox(std::vector<Proxy> &nodes, rapidjson::Document &json, std::v
                 proxy.AddMember("password", rapidjson::StringRef(x.Password.c_str()), allocator);
                 if(!x.Plugin.empty() && !x.PluginOption.empty())
                 {
+                    if (x.Plugin == "simple-obfs")
+                        x.Plugin = "obfs-local";
                     proxy.AddMember("plugin", rapidjson::StringRef(x.Plugin.c_str()), allocator);
                     proxy.AddMember("plugin_opts", rapidjson::StringRef(x.PluginOption.c_str()), allocator);
                 }

diff --git a/src/script/script_quickjs.cpp b/src/script/script_quickjs.cpp
@@ -255,7 +255,7 @@ namespace qjs
             string_icase_map res;
             JSPropertyEnum *props = nullptr, *props_begin;
             uint32_t len = 0;
-            JS_GetOwnPropertyNames(ctx, &props, &len, v, 1);
+            JS_GetOwnPropertyNames(ctx, &props, &len, v, JS_GPN_STRING_MASK | JS_GPN_ENUM_ONLY);
             props_begin = props;
             while(len > 0)
             {

diff --git a/src/script/script_quickjs.h b/src/script/script_quickjs.h
@@ -68,7 +68,7 @@ namespace qjs
     {
         static StringArray unwrap(JSContext *ctx, JSValueConst v) {
             StringArray arr;
-            uint32_t length = unwrap_free<uint32_t>(ctx, v, "length");
+            auto length = unwrap_free<uint32_t>(ctx, v, "length");
             for (uint32_t i = 0; i < length; i++) {
                 arr.push_back(JS_GetPropertyIndexToString(ctx, v, i));
             }