Merge branch 'release/2023.5.0'

.air.toml

@@ -3,34 +3,34 @@ testdata_dir = "testdata"
 tmp_dir = "tmp"
 
 [build]
-  bin = "suzu-dev"
-  cmd = "go build -race -o suzu-dev cmd/suzu/main.go"
-  delay = 1000
-  exclude_dir = ["assets", "tmp", "vendor", "testdata"]
-  exclude_file = []
-  exclude_regex = ["_test.go"]
-  exclude_unchanged = false
-  follow_symlink = false
-  full_bin = ""
-  include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html"]
-  kill_delay = "0s"
-  log = "build-errors.log"
-  send_interrupt = false
-  stop_on_error = true
+bin = "bin/suzu-dev"
+cmd = "go build -race -o bin/suzu-dev cmd/suzu/main.go"
+delay = 1000
+exclude_dir = ["assets", "tmp", "vendor", "testdata"]
+exclude_file = []
+exclude_regex = ["_test.go"]
+exclude_unchanged = false
+follow_symlink = false
+full_bin = ""
+include_dir = []
+include_ext = ["go", "tpl", "tmpl", "html"]
+kill_delay = "0s"
+log = "build-errors.log"
+send_interrupt = false
+stop_on_error = true
 
 [color]
-  app = ""
-  build = "yellow"
-  main = "magenta"
-  runner = "green"
-  watcher = "cyan"
+app = ""
+build = "yellow"
+main = "magenta"
+runner = "green"
+watcher = "cyan"
 
 [log]
-  time = false
+time = false
 
 [misc]
-  clean_on_exit = false
+clean_on_exit = false
 
 [screen]
-  clear_on_rebuild = false
+clear_on_rebuild = false

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: '^1.20'
+        go-version-file: './go.mod'
 
     - run: go install github.com/tcnksm/ghr@latest
 

.github/workflows/test.yaml

@@ -18,7 +18,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v4
       with:
-        go-version: "^1.20"
+        go-version-file: './go.mod'
 
     - run: go version
 

.gitignore

@@ -1,9 +1,7 @@
-suzu-dev
-tmp/*
+.DS_Store
 bin/*
-config.yaml
-config.toml
-suzu.log
-suzu.jsonl
-*.pem
+.grafana/*
+tmp/*
 
+config.ini
+suzu.jsonl

CHANGES.md

@@ -11,6 +11,23 @@
 
 ## develop
 
+## 2023.5.0
+
+- [ADD] -V で VERSION ファイルを表示する
+  - @voluntas
+- [ADD] VERSION ファイルを追加する
+  - @voluntas
+- [ADD] `h2c` を有効にするため `https` を追加する
+  - @voluntas
+- [ADD] exporter で HTTPS を有効にする `exporter_https` を追加する
+  - @voluntas
+- [CHANGE] コンソールログの日付フォーマットを修正する
+  - @voluntas
+- [CHANGE] lumberjack を公式に戻す
+  - @voluntas
+- [UPDATE] go.mod, Github Actions で使用する Go のバージョンを 1.21.0 にあげる
+  - @Hexa
+
 ## 2023.4.0
 
 - [CHANGE] サンプル設定ファイル名を変更する

README.md

@@ -124,7 +124,5 @@ limitations under the License.
 - [Microsoft Azure Speech Translation](https://azure.microsoft.com/ja-jp/products/cognitive-services/speech-translation/) 対応
 - [Deepgram](https://deepgram.com/) 対応
 - [AmiVoice Cloud Platform](https://acp.amivoice.com/amivoice/) 対応
-- [ggerganov/whisper\.cpp: Port of OpenAI's Whisper model in C/C\+\+](https://github.com/ggerganov/whisper.cpp) 対応
-    - Suzu から利用できるようになる Whisper サーバーを開発し、OSS として公開します
 - ウェブフック機能対応
     - クライアントごとに接続先サービスを変更できるようになる

VERSION

@@ -0,0 +1 @@
+2023.5.0

cert/client/ca.pem

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIBwTCCAWegAwIBAgIUXw8Hn+Vm7RHgSqQHCirncw5sSXcwCgYIKoZIzj0EAwIw
+NjELMAkGA1UEBhMCSlAxDjAMBgNVBAgMBVRva3lvMRcwFQYDVQQDDA5UZXN0IENs
+aWVudCBDQTAeFw0yMjEyMjkwMTIxMTZaFw0zMjEyMjYwMTIxMTZaMDYxCzAJBgNV
+BAYTAkpQMQ4wDAYDVQQIDAVUb2t5bzEXMBUGA1UEAwwOVGVzdCBDbGllbnQgQ0Ew
+WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARtGIINoL/DuZBggvCV+eaa/x9yEEE7
+Fn0Vm+iwD6vkIf4oL7UC/6fSHf6BfYJO9VjMj3xQB9aeomD9iTVDL+hyo1MwUTAd
+BgNVHQ4EFgQUq+B5YTvqWi8T/F0MTZsIjm+zPb4wHwYDVR0jBBgwFoAUq+B5YTvq
+Wi8T/F0MTZsIjm+zPb4wDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAgNIADBF
+AiEA2y/2fnmWirPtxnd47PqI4xbKtd5zOwaJQhXLbKrCqdgCICw53m5GtPRDUyLZ
+qSxuSSUGSLx//NIXUSPVpwskrFBW
+-----END CERTIFICATE-----

cert/client/invalid.key

@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEINIlVUwQGqSP35DHB1s/lkL1RGetGW5BHvHatRTgAUO6oAoGCCqGSM49
+AwEHoUQDQgAED9X8YnLBtsRxSEHymKfZPmxHDttHpqdgtgciB8N+voChcSZ5HMgb
+FoM4gaMzDqzrm8Zm5qdZF6QkSpXaG3VaQQ==
+-----END EC PRIVATE KEY-----

cert/client/invalid.pem

@@ -0,0 +1,54 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: ecdsa-with-SHA256
+        Issuer: C=JP, ST=Tokyo, CN=Test CA
+        Validity
+            Not Before: Dec 29 01:19:46 2022 GMT
+            Not After : Dec 26 01:19:46 2032 GMT
+        Subject: C=JP, ST=Tokyo, CN=invalid-user
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (256 bit)
+                pub:
+                    04:0f:d5:fc:62:72:c1:b6:c4:71:48:41:f2:98:a7:
+                    d9:3e:6c:47:0e:db:47:a6:a7:60:b6:07:22:07:c3:
+                    7e:be:80:a1:71:26:79:1c:c8:1b:16:83:38:81:a3:
+                    33:0e:ac:eb:9b:c6:66:e6:a7:59:17:a4:24:4a:95:
+                    da:1b:75:5a:41
+                ASN1 OID: prime256v1
+                NIST CURVE: P-256
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                AD:B5:3D:64:F3:D3:CF:B5:49:61:97:8A:65:2D:C0:E2:A2:9D:B7:DA
+            X509v3 Authority Key Identifier: 
+                C2:9B:17:82:58:EC:C7:2D:F4:B7:59:25:48:D8:83:4B:8D:F2:95:30
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication, TLS Web Client Authentication
+            X509v3 Subject Alternative Name: 
+                DNS:localhost, DNS:example.com, DNS:www.example.com
+    Signature Algorithm: ecdsa-with-SHA256
+    Signature Value:
+        30:45:02:20:14:d5:f5:00:41:70:e0:0a:ca:0d:75:d8:dc:e8:
+        b2:69:47:4f:09:e2:86:c1:76:8b:07:75:3c:c1:83:f4:bf:0f:
+        02:21:00:d5:a9:6d:aa:90:62:81:15:f0:83:6e:a2:c3:33:7a:
+        78:f9:de:28:d6:42:1c:23:17:cd:a6:05:0a:ac:a0:08:b6
+-----BEGIN CERTIFICATE-----
+MIICIjCCAcigAwIBAgIBADAKBggqhkjOPQQDAjAvMQswCQYDVQQGEwJKUDEOMAwG
+A1UECAwFVG9reW8xEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjIxMjI5MDExOTQ2WhcN
+MzIxMjI2MDExOTQ2WjA0MQswCQYDVQQGEwJKUDEOMAwGA1UECAwFVG9reW8xFTAT
+BgNVBAMMDGludmFsaWQtdXNlcjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABA/V
+/GJywbbEcUhB8pin2T5sRw7bR6anYLYHIgfDfr6AoXEmeRzIGxaDOIGjMw6s65vG
+ZuanWRekJEqV2ht1WkGjgc8wgcwwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYd
+T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFK21PWTz08+1
+SWGXimUtwOKinbfaMB8GA1UdIwQYMBaAFMKbF4JY7Mct9LdZJUjYg0uN8pUwMB0G
+A1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHREEKzApgglsb2NhbGhv
+c3SCC2V4YW1wbGUuY29tgg93d3cuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSAAw
+RQIgFNX1AEFw4ArKDXXY3OiyaUdPCeKGwXaLB3U8wYP0vw8CIQDVqW2qkGKBFfCD
+bqLDM3p4+d4o1kIcIxfNpgUKrKAItg==
+-----END CERTIFICATE-----

cert/client/user.key

@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOkbVgnaoSV6qF0MCtiDQxhWPHPATbAhPtIvofz6ClTRoAoGCCqGSM49
+AwEHoUQDQgAE8GBVe1LeJhLI3gCaJQP8GDZmSu47cDSwb5RIqNodZL1vBkMvpbLy
+R7WgSiI95FeL8BoiA0B5AseWV0HuOi5k5g==
+-----END EC PRIVATE KEY-----

cert/client/user.pem

@@ -0,0 +1,51 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: ecdsa-with-SHA256
+        Issuer: C=JP, ST=Tokyo, CN=Test Client CA
+        Validity
+            Not Before: Dec 29 01:22:31 2022 GMT
+            Not After : Dec 26 01:22:31 2032 GMT
+        Subject: C=JP, ST=Tokyo, CN=test-user
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (256 bit)
+                pub:
+                    04:f0:60:55:7b:52:de:26:12:c8:de:00:9a:25:03:
+                    fc:18:36:66:4a:ee:3b:70:34:b0:6f:94:48:a8:da:
+                    1d:64:bd:6f:06:43:2f:a5:b2:f2:47:b5:a0:4a:22:
+                    3d:e4:57:8b:f0:1a:22:03:40:79:02:c7:96:57:41:
+                    ee:3a:2e:64:e6
+                ASN1 OID: prime256v1
+                NIST CURVE: P-256
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                F8:62:F4:92:71:DE:A1:E1:3F:78:F1:12:93:41:55:B0:E2:84:DC:DA
+            X509v3 Authority Key Identifier: 
+                AB:E0:79:61:3B:EA:5A:2F:13:FC:5D:0C:4D:9B:08:8E:6F:B3:3D:BE
+            X509v3 Extended Key Usage: 
+                TLS Web Client Authentication
+    Signature Algorithm: ecdsa-with-SHA256
+    Signature Value:
+        30:46:02:21:00:93:c9:49:4e:1b:33:5c:68:df:2a:e0:98:36:
+        96:e4:b3:78:0a:56:f7:6f:64:f9:74:1e:e5:36:f9:49:27:99:
+        50:02:21:00:df:e4:a9:46:b5:f9:66:6f:c1:04:68:6b:d0:41:
+        4a:2f:0e:3f:02:78:63:47:34:5f:ea:cc:25:15:d6:6d:b8:13
+-----BEGIN CERTIFICATE-----
+MIIB6TCCAY6gAwIBAgIBADAKBggqhkjOPQQDAjA2MQswCQYDVQQGEwJKUDEOMAwG
+A1UECAwFVG9reW8xFzAVBgNVBAMMDlRlc3QgQ2xpZW50IENBMB4XDTIyMTIyOTAx
+MjIzMVoXDTMyMTIyNjAxMjIzMVowMTELMAkGA1UEBhMCSlAxDjAMBgNVBAgMBVRv
+a3lvMRIwEAYDVQQDDAl0ZXN0LXVzZXIwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC
+AATwYFV7Ut4mEsjeAJolA/wYNmZK7jtwNLBvlEio2h1kvW8GQy+lsvJHtaBKIj3k
+V4vwGiIDQHkCx5ZXQe46LmTmo4GRMIGOMAkGA1UdEwQCMAAwLAYJYIZIAYb4QgEN
+BB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBT4YvSS
+cd6h4T948RKTQVWw4oTc2jAfBgNVHSMEGDAWgBSr4HlhO+paLxP8XQxNmwiOb7M9
+vjATBgNVHSUEDDAKBggrBgEFBQcDAjAKBggqhkjOPQQDAgNJADBGAiEAk8lJThsz
+XGjfKuCYNpbks3gKVvdvZPl0HuU2+UknmVACIQDf5KlGtflmb8EEaGvQQUovDj8C
+eGNHNF/qzCUV1m24Ew==
+-----END CERTIFICATE-----

cert/server/server.key

@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIOPHRsS8m+VS05SIlEIiAKJlulG4hniXzNAJ2Lq9r2emoAoGCCqGSM49
+AwEHoUQDQgAEy96PdYc/XAAAA4fOOei3OBUKxadrWtwaC0U769u+VQ41ag8Uj7hP
+GmYJlnKSY3uVvTvO35qzDMzhFQTk6OU2mA==
+-----END EC PRIVATE KEY-----

cert/server/server.pem

@@ -0,0 +1,54 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 0 (0x0)
+        Signature Algorithm: ecdsa-with-SHA256
+        Issuer: C=JP, ST=Tokyo, CN=Test CA
+        Validity
+            Not Before: Dec 29 01:12:26 2022 GMT
+            Not After : Dec 26 01:12:26 2032 GMT
+        Subject: C=JP, ST=Tokyo, CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (256 bit)
+                pub:
+                    04:cb:de:8f:75:87:3f:5c:00:00:03:87:ce:39:e8:
+                    b7:38:15:0a:c5:a7:6b:5a:dc:1a:0b:45:3b:eb:db:
+                    be:55:0e:35:6a:0f:14:8f:b8:4f:1a:66:09:96:72:
+                    92:63:7b:95:bd:3b:ce:df:9a:b3:0c:cc:e1:15:04:
+                    e4:e8:e5:36:98
+                ASN1 OID: prime256v1
+                NIST CURVE: P-256
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                3C:FA:43:84:3C:D8:5D:7B:4C:8B:D1:D1:8B:17:4B:CD:4D:15:85:87
+            X509v3 Authority Key Identifier: 
+                C2:9B:17:82:58:EC:C7:2D:F4:B7:59:25:48:D8:83:4B:8D:F2:95:30
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication, TLS Web Client Authentication
+            X509v3 Subject Alternative Name: 
+                DNS:localhost, DNS:example.com, DNS:www.example.com
+    Signature Algorithm: ecdsa-with-SHA256
+    Signature Value:
+        30:46:02:21:00:9a:db:9d:84:72:b1:fd:fd:93:d8:c4:72:f9:
+        cd:f9:2a:34:96:39:0e:61:05:45:51:d7:ee:9e:70:6d:44:69:
+        e7:02:21:00:a5:7f:cc:be:fa:ab:3a:d5:cf:68:d9:d5:fb:b2:
+        aa:9b:2f:81:90:9c:b0:a3:19:1a:04:d1:44:e9:fa:2c:82:6a
+-----BEGIN CERTIFICATE-----
+MIICIDCCAcWgAwIBAgIBADAKBggqhkjOPQQDAjAvMQswCQYDVQQGEwJKUDEOMAwG
+A1UECAwFVG9reW8xEDAOBgNVBAMMB1Rlc3QgQ0EwHhcNMjIxMjI5MDExMjI2WhcN
+MzIxMjI2MDExMjI2WjAxMQswCQYDVQQGEwJKUDEOMAwGA1UECAwFVG9reW8xEjAQ
+BgNVBAMMCWxvY2FsaG9zdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMvej3WH
+P1wAAAOHzjnotzgVCsWna1rcGgtFO+vbvlUONWoPFI+4TxpmCZZykmN7lb07zt+a
+swzM4RUE5OjlNpijgc8wgcwwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3Bl
+blNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFDz6Q4Q82F17TIvR
+0YsXS81NFYWHMB8GA1UdIwQYMBaAFMKbF4JY7Mct9LdZJUjYg0uN8pUwMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAyBgNVHREEKzApgglsb2NhbGhvc3SC
+C2V4YW1wbGUuY29tgg93d3cuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSQAwRgIh
+AJrbnYRysf39k9jEcvnN+So0ljkOYQVFUdfunnBtRGnnAiEApX/MvvqrOtXPaNnV
++7Kqmy+BkJywoxkaBNFE6fosgmo=
+-----END CERTIFICATE-----