apps/iot/src/http_handlers/container_handler.erl

@@ -63,27 +63,21 @@ handle_request("POST", "/container/push_config", _,
 handle_request("POST", "/container/deploy", _, #{<<"uuid">> := UUID, <<"task_id">> := TaskId, <<"config">> := Config})
     when is_binary(UUID), is_integer(TaskId), is_map(Config) ->
 
-    case validate_config(Config) of
+    case iot_host:get_pid(UUID) of
-        ok ->
+        undefined ->
-            case iot_host:get_pid(UUID) of
+            {ok, 200, iot_util:json_error(404, <<"host not found">>)};
-                undefined ->
+        Pid when is_pid(Pid) ->
-                    {ok, 200, iot_util:json_error(404, <<"host not found">>)};
+            case iot_host:deploy_container(Pid, TaskId, Config) of
-                Pid when is_pid(Pid) ->
+                {ok, Ref} ->
-                    case iot_host:deploy_container(Pid, TaskId, Config) of
+                    case iot_host:await_reply(Ref, ?REQ_TIMEOUT) of
-                        {ok, Ref} ->
+                        {ok, Result} ->
-                            case iot_host:await_reply(Ref, ?REQ_TIMEOUT) of
+                            {ok, 200, iot_util:json_data(Result)};
-                                {ok, Result} ->
+                        {error, Reason} ->
-                                    {ok, 200, iot_util:json_data(Result)};
-                                {error, Reason} ->
-                                    {ok, 200, iot_util:json_error(400, Reason)}
-                            end;
-                        {error, Reason} when is_binary(Reason) ->
                             {ok, 200, iot_util:json_error(400, Reason)}
-                    end
+                    end;
-            end;
+                {error, Reason} when is_binary(Reason) ->
-        {error, Errors} ->
+                    {ok, 200, iot_util:json_error(400, Reason)}
-            Reason = iolist_to_binary(lists:join(<<"|||">>, Errors)),
+            end
-            {ok, 200, iot_util:json_error(400, Reason)}
     end;
 
 %% 启动服务
@@ -186,120 +180,3 @@ handle_request(_, Path, _, _) ->
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% helper methods
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-validate_config(Config) when is_map(Config) ->
-    %% 必选参数
-    Required = [
-        {image, binary},
-        {container_name, binary},
-        {command, {list, binary}},
-        {restart, binary},
-        {privileged, boolean}
-    ],
-
-    %% 可选参数（附带默认值）
-    Optional = [
-        {envs, {list, binary}},
-        {ports, {list, binary}},
-        {expose, {list, binary}},
-        {volumes, {list, binary}},
-        {networks, {list, binary}},
-        {labels, {map, {binary, binary}}},
-        {user, binary},
-        {working_dir, binary},
-        {hostname, binary},
-        {cap_add, {list, binary}},
-        {cap_drop, {list, binary}},
-        {devices, {list, binary}},
-        {mem_limit, binary},
-        {mem_reservation, binary},
-        {cpu_shares, integer},
-        {cpus, number},
-        {ulimits, {map, {binary, binary}}},
-        {sysctls, {map, {binary, binary}}},
-        {tmpfs, {list, binary}},
-        {extra_hosts, {list, binary}},
-        {healthcheck, {map, {binary, any}}}
-    ],
-
-    Errors1 = check_required(Config, Required),
-    Errors2 = check_optional(Config, Optional),
-
-    Errors = Errors1 ++ Errors2,
-    case Errors of
-        [] ->
-            ok;
-        _  ->
-            {error, lists:map(fun erlang:iolist_to_binary/1, Errors)}
-    end;
-
-validate_config(_) ->
-    {error, [<<"Config 必须为 map() 类型">>]}.
-
-%%------------------------------------------------------------------------------
-%% 校验必选项
-%%------------------------------------------------------------------------------
-check_required(Config, Fields) ->
-    lists:foldl(
-        fun({Key, Type}, ErrAcc) ->
-            case maps:get(Key, Config, undefined) of
-                undefined ->
-                    [io_lib:format("缺少必选参数: ~p", [Key]) | ErrAcc];
-                Value ->
-                    case check_type(Value, Type) of
-                        true ->
-                            ErrAcc;
-                        false ->
-                            [io_lib:format("参数 ~p 类型错误，应为 ~p", [Key, Type]) | ErrAcc]
-                    end
-            end
-        end,
-        [], Fields).
-
-%%------------------------------------------------------------------------------
-%% 校验可选项（支持默认值填充）
-%%------------------------------------------------------------------------------
-check_optional(Config, Fields) ->
-    lists:foldl(
-        fun({Key, Type}, ErrAcc) ->
-            case maps:get(Key, Config, undefined) of
-                undefined ->
-                    ErrAcc;
-                Value ->
-                    case check_type(Value, Type) of
-                        true ->
-                            ErrAcc;
-                        false ->
-                            [io_lib:format("可选参数 ~p 类型错误，应为 ~p", [Key, Type]) | ErrAcc]
-                    end
-            end
-        end,
-        [], Fields).
-
-%%------------------------------------------------------------------------------
-%% 类型检查辅助函数（binary版）
-%%------------------------------------------------------------------------------
-check_type(Value, binary) ->
-    is_binary(Value);
-check_type(Value, integer) ->
-    is_integer(Value);
-check_type(Value, number) ->
-    is_number(Value);
-check_type(Value, list) when is_list(Value) ->
-    true;
-check_type(Value, {list, binary}) when is_list(Value) ->
-    lists:all(fun(E) -> is_binary(E) end, Value);
-check_type(Value, {list, number}) when is_list(Value) ->
-    lists:all(fun(E) -> is_number(E) end, Value);
-check_type(Value, {list, integer}) when is_list(Value) ->
-    lists:all(fun(E) -> is_integer(E) end, Value);
-check_type(Value, map) when is_map(Value) ->
-    true;
-check_type(Value, {map, {binary, binary}}) when is_map(Value) ->
-    lists:all(fun({K, V}) -> is_binary(K) andalso is_binary(V) end, maps:to_list(Value));
-check_type(Value, {map, {binary, any}}) when is_map(Value) ->
-    lists:all(fun({K, _}) -> is_binary(K) end, maps:to_list(Value));
-check_type(Value, boolean) ->
-    is_boolean(Value);
-check_type(_, _) ->
-    false.

apps/iot/src/http_handlers/event_stream_handler.erl

@@ -23,9 +23,8 @@ init(Req0, Opts) ->
 
     lager:debug("method: ~p, path: ~p,  get: ~p", [Method, Path, GetParams]),
     Req1 = cowboy_req:stream_reply(200, #{
-        <<"Content-Type">> => <<"text/event-stream">>,
+        <<"content-type">> => <<"text/event-stream">>,
-        <<"Cache-Control">> => <<"no-cache">>,
+        <<"cache-control">> => <<"no-cache">>
-        <<"Connection">> => <<"keep-alive">>
     }, Req0),
 
     ok = iot_event_stream_observer:add_listener(self(), TaskId),