#106: work in progress: updated elixir and erlang, added ping command

Author: zookzook

CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Enhancements
   * Fix for serializing BSON Regex without options (thanks to MillionIntegrals)
   * Misc doc changes (thanks to kianmeng)
+  * Added support for OP_MSG exhaustAllowed flag
+  * Added support for streaming protocol 
+  * Added Insights app for development 
 
 ## 0.8.0 (2021-11-07) (0.7.5 was not published)
 * Enhancements
@@ -22,7 +25,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   * added a new option to specify a timeout, when increasing the connection pool is no option
 
 ## 0.7.3 (2021-05-29)
-
 * Enhancements
   * added support for OTP 24
   * Add support for tls setting in connection string (tschmittni)

config/config.exs

@@ -1,6 +1,6 @@
 # This file is responsible for configuring your application
 # and its dependencies with the aid of the Mix.Config module.
-use Mix.Config
+import Config
 
 # This configuration is loaded before any dependency and is restricted
 # to this project. If another project depends on this project, this

lib/mongo/mongo_db_connection.ex

@@ -16,6 +16,7 @@ defmodule Mongo.MongoDBConnection do
   @timeout        5_000
   @find_one_flags ~w(slave_ok exhaust partial)a
   @write_concern  ~w(w j wtimeout)a
+  @insecure_cmds [:authenticate, :saslStart, :saslContinue, :getnonce, :createUser, :updateUser, :copydbgetnonce, :copydbsaslstart, :copydb, :isMaster, :ismaster]
 
   @impl true
   def connect(opts) do
@@ -40,17 +41,6 @@ defmodule Mongo.MongoDBConnection do
     connect(opts, state)
   end
 
-  @impl true
-  def disconnect(_error, %{connection: {mod, socket}} = state) do
-    notify_disconnect(state)
-    mod.close(socket)
-    :ok
-  end
-
-  defp notify_disconnect(%{connection_type: type, topology_pid: pid, host: host}) do
-    GenServer.cast(pid, {:disconnect, type, host})
-  end
-
   defp connect(opts, state) do
 
     result =
@@ -127,24 +117,27 @@ defmodule Mongo.MongoDBConnection do
     end
   end
 
-  defp wire_version(state, client) do
-    # wire version
-    # https://github.com/mongodb/mongo/blob/master/src/mongo/db/wire_version.h
-
+  defp post_hello_command(state, client) do
     cmd = [ismaster: 1, client: client]
 
     case Utils.command(-1, cmd, state) do
-      {:ok, _flags, %{"ok" => ok, "maxWireVersion" => version}}  when ok == 1 -> {:ok, %{state | wire_version: version}}
-      {:ok, _flags, %{"ok" => ok}} when ok == 1 ->  {:ok, %{state | wire_version: 0}}
+      {:ok, _flags, %{"ok" => ok, "maxWireVersion" => version}} when ok == 1 ->
+        {:ok, %{state | wire_version: version}}
+
+      {:ok, _flags, %{"ok" => ok}} when ok == 1 ->
+        {:ok, %{state | wire_version: 0}}
+
       {:ok, _flags, %{"ok" => ok, "errmsg" => msg, "code" => code}} when ok == 0 ->
         err = Mongo.Error.exception(message: msg, code: code)
         {:disconnect, err, state}
-      {:disconnect, _, _} = error -> error
+
+      {:disconnect, _, _} = error ->
+        error
     end
   end
 
   defp hand_shake(opts, state) do
-    wire_version(state, driver(opts[:appname] || "My killer app"))
+    post_hello_command(state, driver(opts[:appname] || "My killer app"))
   end
 
   defp driver(appname) do
@@ -194,6 +187,13 @@ defmodule Mongo.MongoDBConnection do
   defp pretty_name("apple"), do: "Mac OS X"
   defp pretty_name(name), do: name
 
+  @impl true
+  def disconnect(_error, %{connection: {mod, socket}, connection_type: type, topology_pid: pid, host: host}) do
+    GenServer.cast(pid, {:disconnect, type, host})
+    mod.close(socket)
+    :ok
+  end
+
   @impl true
   def checkout(state), do: {:ok, state}
   @impl true
@@ -219,23 +219,23 @@ defmodule Mongo.MongoDBConnection do
   def handle_status(_opts, state), do: {:idle, state}
 
   @impl true
-  def ping(%{wire_version: _wire_version} = state) do
-    ###with {:ok, %{wire_version: ^wire_version}} <- wire_version(state), do: {:ok, state}
-    ## todo Logger.info("Ignoring ping")
-    {:ok, state}
-  end
+  def ping(%{connection_type: :client} = state) do
+    cmd = [ping: 1]
+    case Utils.command(-1, cmd, state) do
+      {:ok, _flags, %{"ok" => ok}} when ok == 1 ->
+        {:ok, state}
 
-  @doc """
-  Execute a query prepared by `c:handle_prepare/3`. Return
-  `{:ok, query, result, state}` to return altered query `query` and result
-  `result` and continue, `{:error, exception, state}` to return an error and
-  continue or `{:disconnect, exception, state}` to return an error and
-  disconnect.
+      {:ok, _flags, %{"ok" => ok, "errmsg" => msg, "code" => code}} when ok == 0 ->
+        err = Mongo.Error.exception(message: msg, code: code)
+        {:disconnect, err, state}
 
-  This callback is called in the client process.
-  """
-  def handle_execute_close(query, params, opts, s) do
-    handle_execute(query, params, opts, s)
+      {:disconnect, _, _} = error ->
+        error
+    end
+  end
+  @impl true
+  def ping(state) do
+    {:ok, state}
   end
 
   @impl true
@@ -246,7 +246,7 @@ defmodule Mongo.MongoDBConnection do
     end
   end
 
-  @insecure_cmds [:authenticate, :saslStart, :saslContinue, :getnonce, :createUser, :updateUser, :copydbgetnonce, :copydbsaslstart, :copydb, :isMaster, :ismaster]
+
   defp provide_cmd_data([{command_name,_}|_] = cmd) do
     case Enum.member?(@insecure_cmds, command_name) do
       true  -> {command_name, %{}}

mix.exs

@@ -14,14 +14,6 @@ defmodule Mongodb.Mixfile do
       deps: deps(),
       docs: docs(),
       package: package(),
-      test_coverage: [tool: ExCoveralls],
-      preferred_cli_env: [
-        docs: :docs,
-        coveralls: :test,
-        "coveralls.detail": :test,
-        "coveralls.post": :test,
-        "coveralls.html": :test
-      ],
       consolidate_protocols: Mix.env() != :test
     ]
   end
@@ -43,13 +35,10 @@ defmodule Mongodb.Mixfile do
 
   defp deps do
     [
-      {:db_connection, "~> 2.3"},
+      {:db_connection, "~> 2.4"},
       {:decimal, "~> 2.0"},
-      {:excoveralls, "~> 0.12.1", only: :test},
-      {:benchee, "~> 1.0", only: :dev},
-      {:jason, "~> 1.2", only: :test},
+      {:jason, "~> 1.3", only: :test},
       {:ex_doc, ">= 0.0.0", only: :docs, runtime: false},
-      #{:dialyxir, "~> 0.5", only: :dev, runtime: false}
     ]
   end
 

mix.lock

@@ -14,7 +14,7 @@
   "excoveralls": {:hex, :excoveralls, "0.12.1", "a553c59f6850d0aff3770e4729515762ba7c8e41eedde03208182a8dc9d0ce07", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "5c1f717066a299b1b732249e736c5da96bb4120d1e55dc2e6f442d251e18a812"},
   "hackney": {:hex, :hackney, "1.15.2", "07e33c794f8f8964ee86cebec1a8ed88db5070e52e904b8f12209773c1036085", [:rebar3], [{:certifi, "2.5.1", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "~>1.1", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.5", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm", "e0100f8ef7d1124222c11ad362c857d3df7cb5f4204054f9f0f4a728666591fc"},
   "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "4bdd305eb64e18b0273864920695cb18d7a2021f31a11b9c5fbcd9a253f936e2"},
-  "jason": {:hex, :jason, "1.2.2", "ba43e3f2709fd1aa1dce90aaabfd039d000469c05c56f0b8e31978e03fa39052", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "18a228f5f0058ee183f29f9eae0805c6e59d61c3b006760668d8d18ff0d12179"},
+  "jason": {:hex, :jason, "1.3.0", "fa6b82a934feb176263ad2df0dbd91bf633d4a46ebfdffea0c8ae82953714946", [:mix], [{:decimal, "~> 1.0 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: true]}], "hexpm", "53fc1f51255390e0ec7e50f9cb41e751c260d065dcba2bf0d08dc51a4002c2ac"},
   "makeup": {:hex, :makeup, "1.0.5", "d5a830bc42c9800ce07dd97fa94669dfb93d3bf5fcf6ea7a0c67b2e0e4a7f26c", [:mix], [{:nimble_parsec, "~> 0.5 or ~> 1.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "cfa158c02d3f5c0c665d0af11512fed3fba0144cf1aadee0f2ce17747fba2ca9"},
   "makeup_elixir": {:hex, :makeup_elixir, "0.15.1", "b5888c880d17d1cc3e598f05cdb5b5a91b7b17ac4eaf5f297cb697663a1094dd", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.1", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "db68c173234b07ab2a07f645a5acdc117b9f99d69ebf521821d89690ae6c6ec8"},
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},