CovenantSQL · laodouya · Mar 20, 2019 · Mar 7, 2019 · Mar 14, 2019 · Mar 14, 2019
diff --git a/bin/docker-entry.sh b/bin/docker-entry.sh
@@ -12,16 +12,16 @@ blockproducer)
     exec /app/cqld -config "${COVENANT_CONF}" -metric-web "${METRIC_WEB_ADDR}" "${@}"
     ;;
 observer)
-    exec /app/cql -config "${COVENANT_CONF}" -web "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
+    exec /app/cql web -config "${COVENANT_CONF}" -no-password "${COVENANTSQL_OBSERVER_ADDR}" "${@}"
     ;;
 adapter)
-    exec /app/cql -config "${COVENANT_CONF}" -adapter "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
+    exec /app/cql adapter -config "${COVENANT_CONF}" -no-password "${COVENANTSQL_ADAPTER_ADDR}" "${@}"
     ;;
 mysql-adapter)
     exec /app/cql-mysql-adapter -config "${COVENANT_CONF}" "${@}"
     ;;
 cli)
-    exec /app/cql -config ${COVENANT_CONF} "${@}"
+    exec /app/cql console -config ${COVENANT_CONF} -no-password "${@}"
     ;;
 faucet)
     exec /app/cql-faucet -config ${COVENANT_CONF} "${@}"

diff --git a/cmd/cql/README-zh.md b/cmd/cql/README-zh.md
@@ -18,8 +18,9 @@ $ go get github.com/CovenantSQL/CovenantSQL/cmd/cql
 ## 检查钱包余额
 
 使用 `cql` 命令来检查钱包余额：
+
 ```bash
-$ cql -get-balance
+$ cql balance
 INFO[0000] 
 ### Public Key ###
 0388954cf083bb6bb2b9c7248849b57c76326296fcc0d69764fc61eedb5b8d820c
@@ -36,7 +37,7 @@ INFO[0000] covenant coin balance is: 0                   caller="main.go:247 mai
 
 ```bash
 # if a non-default password applied on master key, use `-password` to pass it
-$ cql -create 1
+$ cql create '{"node":1}'
 INFO[0000]
 ### Public Key ###
 039bc931161383c994ab9b81e95ddc1494b0efeb1cb735bb91e1043a1d6b98ebfd
@@ -45,17 +46,17 @@ INFO[0000]
 INFO[0000] the newly created database is: covenantsql://0e9103318821b027f35b96c4fd5562683543276b72c488966d616bfe0fe4d213  caller="main.go:297 main.main"
 ```
 
-这里 `-create 1` 表示创建一个单节点的 SQLChain。
+这里 `create '{"node":1}'` 表示创建一个单节点的 SQLChain。
 
 ```bash
-$ cql -dsn covenantsql://address
+$ cql console -dsn covenantsql://address
 ```
 `address` 就是你的数据库 ID。
 
 `cql` 命令的详细使用帮助如下：
 
 ```bash
-$ cql -help
+$ cql help
 ```
 
 ## 使用 `cql`

diff --git a/cmd/cql/README.md b/cmd/cql/README.md
@@ -1,4 +1,4 @@
-This doc introduce the usage of CovenantSQL commandline client `cql`. `cql` is a command line interface for batch scripting used for creating, querying, updating, and deleting the SQLChain and database adhere to the SQLChain.
+This doc introduces the usage of CovenantSQL command line client `cql`. `cql` is a command line interface for batch scripting used for creating, querying, updating, and deleting the SQLChain and database adhere to the SQLChain.
 
 ## Install
 Download [Latest Release](https://github.com/CovenantSQL/CovenantSQL/releases) or build from src:
@@ -18,8 +18,9 @@ See: [cql-utils doc](https://github.com/CovenantSQL/CovenantSQL/tree/develop/cmd
 ## Check balance
 
 Use `cql` to check your wallet balance:
+
 ```bash
-$ cql -get-balance
+$ cql balance
 INFO[0000] 
 ### Public Key ###
 0388954cf083bb6bb2b9c7248849b57c76326296fcc0d69764fc61eedb5b8d820c
@@ -37,7 +38,7 @@ You can get a database id when create a new SQL Chain:
 
 ```bash
 # if a non-default password applied on master key, use `-password` to pass it
-$ cql -create 1
+$ cql create '{"node":1}'
 INFO[0000]
 ### Public Key ###
 039bc931161383c994ab9b81e95ddc1494b0efeb1cb735bb91e1043a1d6b98ebfd
@@ -46,17 +47,17 @@ INFO[0000]
 INFO[0000] the newly created database is: covenantsql://0e9103318821b027f35b96c4fd5562683543276b72c488966d616bfe0fe4d213  caller="main.go:297 main.main"
 ```
 
-Here, `-create 1` refers that there is only one node in SQL Chain.
+Here, `create '{"node":1}'` refers that there is only one node in SQL Chain.
 
 ```bash
-$ cql -dsn covenantsql://address
+$ cql console -dsn covenantsql://address
 ```
 `address` is database id. 
 
 Show the complete usage of `cql`:
 
 ```bash
-$ cql -help
+$ cql help
 ```
 
 ## Use the `cql`

diff --git a/cmd/cql/internal/adapter.go b/cmd/cql/internal/adapter.go
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package internal
+
+import (
+	"context"
+	"net/http"
+	"time"
+
+	"github.com/CovenantSQL/CovenantSQL/sqlchain/adapter"
+	"github.com/CovenantSQL/CovenantSQL/utils"
+)
+
+var (
+	adapterAddr string // adapter listen addr
+
+	adapterHTTPServer *http.Server
+)
+
+// CmdAdapter is cql adapter command entity.
+var CmdAdapter = &Command{
+	UsageLine: "cql adapter [-config file] [-tmp-path path] [-bg-log-level level] address",
+	Short:     "start a SQLChain adapter",
+	Long: `
+Adapter command serves a SQLChain adapter
+e.g.
+    cql adapter 127.0.0.1:7784
+`,
+}
+
+func init() {
+	CmdAdapter.Run = runAdapter
+
+	addCommonFlags(CmdAdapter)
+	addBgServerFlag(CmdAdapter)
+}
+
+func startAdapterServer(adapterAddr string) func() {
+	adapterHTTPServer, err := adapter.NewHTTPAdapter(adapterAddr, configFile)
+	if err != nil {
+		ConsoleLog.WithError(err).Error("init adapter failed")
+		SetExitStatus(1)
+		return nil
+	}
+
+	if err = adapterHTTPServer.Serve(); err != nil {
+		ConsoleLog.WithError(err).Error("start adapter failed")
+		SetExitStatus(1)
+		return nil
+	}
+
+	ConsoleLog.Infof("adapter started on %s", adapterAddr)
+
+	return func() {
+		ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+		defer cancel()
+		adapterHTTPServer.Shutdown(ctx)
+		ConsoleLog.Info("adapter stopped")
+	}
+}
+
+func runAdapter(cmd *Command, args []string) {
+	configInit()
+	bgServerInit()
+
+	if len(args) != 1 {
+		ConsoleLog.Error("Adapter command need listen address as param")
+		SetExitStatus(1)
+		return
+	}
+	adapterAddr = args[0]
+
+	cancelFunc := startAdapterServer(adapterAddr)
+	ExitIfErrors()
+	defer cancelFunc()
+
+	ConsoleLog.Printf("Ctrl + C to stop adapter server on %s\n", adapterAddr)
+	<-utils.WaitForExit()
+}
diff --git a/cmd/cql/internal/balance.go b/cmd/cql/internal/balance.go
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2018-2019 The CovenantSQL Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package internal
+
+import (
+	"strings"
+
+	"github.com/CovenantSQL/CovenantSQL/client"
+	"github.com/CovenantSQL/CovenantSQL/types"
+)
+
+var (
+	tokenName string // get specific token's balance of current account
+)
+
+// CmdBalance is cql balance command entity.
+var CmdBalance = &Command{
+	UsageLine: "cql balance [-config file] [-token token_name]",
+	Short:     "get the balance of current account",
+	Long: `
+Balance command can get CovenantSQL token balance of current account
+e.g.
+    cql balance
+
+    cql balance -token Particle
+`,
+}
+
+func init() {
+	CmdBalance.Run = runBalance
+
+	addCommonFlags(CmdBalance)
+	CmdBalance.Flag.StringVar(&tokenName, "token", "", "Get specific token's balance of current account, e.g. Particle, Wave, and etc.")
+}
+
+func runBalance(cmd *Command, args []string) {
+	configInit()
+
+	var err error
+	if tokenName == "" {
+		var stableCoinBalance, covenantCoinBalance uint64
+
+		if stableCoinBalance, err = client.GetTokenBalance(types.Particle); err != nil {
+			ConsoleLog.WithError(err).Error("get Particle balance failed")
+			SetExitStatus(1)
+			return
+		}
+		if covenantCoinBalance, err = client.GetTokenBalance(types.Wave); err != nil {
+			ConsoleLog.WithError(err).Error("get Wave balance failed")
+			SetExitStatus(1)
+			return
+		}
+
+		ConsoleLog.Infof("Particle balance is: %d", stableCoinBalance)
+		ConsoleLog.Infof("Wave balance is: %d", covenantCoinBalance)
+	} else {
+		var tokenBalance uint64
+		tokenType := types.FromString(tokenName)
+		if !tokenType.Listed() {
+			values := make([]string, len(types.TokenList))
+			for i := types.Particle; i < types.SupportTokenNumber; i++ {
+				values[i] = types.TokenList[i]
+			}
+			ConsoleLog.Errorf("no such token supporting in CovenantSQL (what we support: %s)",
+				strings.Join(values, ", "))
+			SetExitStatus(1)
+			return
+		}
+		if tokenBalance, err = client.GetTokenBalance(tokenType); err != nil {
+			ConsoleLog.WithError(err).Error("get token balance failed")
+			SetExitStatus(1)
+			return
+		}
+		ConsoleLog.Infof("%s balance is: %d", tokenType.String(), tokenBalance)
+	}
+}