ech_config 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aea6ddd0220d3da3c9e6867b3be96b0911d004aa4da06f80961ce64704ed3d10
-  data.tar.gz: 7d4f0be4dc45cdee0d217427207e7552d7add18d9a6b9edb8544c56ed617a044
+  metadata.gz: 97281007956e8eac019720dc5d956d3fdb14c5b3fd9f30cc46516ba7d14ab996
+  data.tar.gz: c49c4e9da620abcb1aeb378439c5bb214c99505a81283aa5f80dd240254df56c
 SHA512:
-  metadata.gz: d0ccf17e3769c48b7a67de2103cd19d119921a2319bf2021b7564e9679e48494614fe890c78eb3cbb6d39460da02a2f5216186d259339c5a18a7b33f47543eb8
-  data.tar.gz: 3f7b0f9ae30c38fc121259e38f547d04bd1900a00fe3c5c360b1af9de407bb017364fc5299d63bce9fed477f480e2197f6b79da0f4dc4bfd537ee68339c7d58c
+  metadata.gz: bb658a90c4c70e66f73a97e59e5ac1c77b98806a79586942c44bb55e314b93cbea11d16f7a7a79051655cea0eb9466c4452a3e900a360c4e63668e8414985eba
+  data.tar.gz: 2e39c8d66c0736bc9e8beeba461d4005455125cc239a2fdfdc6e87d8fe267a6b14fd0d9daff6a5a0010a69fd02ae50e4037c931769a5fa91772422b957ac9140

data/.rubocop.yml

@@ -1,6 +1,8 @@
 AllCops:
-  SuggestExtensions: false
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 4.0
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: compact
 
 Style/ConditionalAssignment:
   Enabled: false
@@ -11,8 +13,11 @@ Style/Documentation:
 Style/NumericLiterals:
   Enabled: false
 
-Style/ClassAndModuleChildren:
-  EnforcedStyle: compact
+Style/RedundantReturn:
+  Enabled: false
+
+Layout/LeadingCommentSpace:
+  Enabled: false
 
 Metrics/AbcSize:
   Max: 30
@@ -26,10 +31,3 @@ Naming/MethodParameterName:
 Metrics/BlockLength:
   Exclude:
     - 'spec/*.rb'
-    - 'sorbet/**/*'
-
-require:
-  - rubocop-sorbet
-
-Sorbet:
-  Enabled: true

data/.ruby-version

@@ -1 +1 @@
-3.1.2
+4.0.1

data/Gemfile

@@ -4,15 +4,13 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'sorbet-runtime'
-
 group :test do
   gem 'byebug'
   gem 'openssl'
   gem 'rake'
-  gem 'rspec', '3.11'
-  gem 'rubocop', '1.42'
-  gem 'rubocop-sorbet'
-  gem 'sorbet'
+  gem 'rbs-inline'
+  gem 'rspec'
+  gem 'rubocop', '1.82.1'
+  gem 'steep'
   gem 'webrick'
 end

data/Gemfile.lock

@@ -1,64 +1,153 @@
 PATH
   remote: .
   specs:
-    ech_config (0.0.3)
-      sorbet-runtime
+    ech_config (0.0.4)
+      base64
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    byebug (11.1.3)
-    diff-lcs (1.5.0)
-    json (2.7.1)
-    openssl (3.2.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    activesupport (8.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    csv (3.3.5)
+    diff-lcs (1.6.2)
+    drb (2.2.3)
+    ffi (1.17.3)
+    ffi (1.17.3-aarch64-linux-gnu)
+    ffi (1.17.3-aarch64-linux-musl)
+    ffi (1.17.3-arm-linux-gnu)
+    ffi (1.17.3-arm-linux-musl)
+    ffi (1.17.3-arm64-darwin)
+    ffi (1.17.3-x86-linux-gnu)
+    ffi (1.17.3-x86-linux-musl)
+    ffi (1.17.3-x86_64-darwin)
+    ffi (1.17.3-x86_64-linux-gnu)
+    ffi (1.17.3-x86_64-linux-musl)
+    fileutils (1.8.0)
+    i18n (1.14.8)
+      concurrent-ruby (~> 1.0)
+    io-console (0.8.2)
+    json (2.19.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    listen (3.10.0)
+      logger
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    logger (1.7.0)
+    minitest (6.0.2)
+      drb (~> 2.0)
+      prism (~> 1.5)
+    mutex_m (0.3.0)
+    openssl (4.0.1)
+    parallel (1.27.0)
+    parser (3.3.10.2)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
+    prism (1.9.0)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.8.3)
-    rexml (3.2.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rake (13.3.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
+      ffi (~> 1.0)
+    rbs (3.10.3)
+      logger
+      tsort
+    rbs-inline (0.13.0)
+      prism (>= 0.29)
+      rbs (>= 3.8.0)
+    regexp_parser (2.11.3)
+    reline (0.6.3)
+      io-console (~> 0.5)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.1)
-    rubocop (1.42.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.82.1)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.48.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-sorbet (0.7.6)
-      rubocop (>= 0.90.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
     ruby-progressbar (1.13.0)
-    sorbet (0.5.11155)
-      sorbet-static (= 0.5.11155)
-    sorbet-runtime (0.5.11155)
-    sorbet-static (0.5.11155-universal-darwin)
-    unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    securerandom (0.4.1)
+    steep (1.10.0)
+      activesupport (>= 5.1)
+      concurrent-ruby (>= 1.1.10)
+      csv (>= 3.0.9)
+      fileutils (>= 1.1.0)
+      json (>= 2.1.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
+      listen (~> 3.0)
+      logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
+      parser (>= 3.1)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (~> 3.9)
+      securerandom (>= 0.1)
+      strscan (>= 1.0.0)
+      terminal-table (>= 2, < 5)
+      uri (>= 0.12.0)
+    strscan (3.1.7)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
+    tsort (0.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    webrick (1.9.2)
 
 PLATFORMS
-  arm64-darwin-21
-  x86_64-darwin-21
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
   bundler
@@ -66,12 +155,76 @@ DEPENDENCIES
   ech_config!
   openssl
   rake
-  rspec (= 3.11)
-  rubocop (= 1.42)
-  rubocop-sorbet
-  sorbet
-  sorbet-runtime
+  rbs-inline
+  rspec
+  rubocop (= 1.82.1)
+  steep
   webrick
 
+CHECKSUMS
+  activesupport (8.1.2) sha256=88842578ccd0d40f658289b0e8c842acfe9af751afee2e0744a7873f50b6fdae
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  bigdecimal (4.0.1) sha256=8b07d3d065a9f921c80ceaea7c9d4ae596697295b584c296fe599dd0ad01c4a7
+  byebug (13.0.0) sha256=d2263efe751941ca520fa29744b71972d39cbc41839496706f5d9b22e92ae05d
+  concurrent-ruby (1.3.6) sha256=6b56837e1e7e5292f9864f34b69c5a2cbc75c0cf5338f1ce9903d10fa762d5ab
+  connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
+  csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
+  ech_config (0.0.4)
+  ffi (1.17.3) sha256=0e9f39f7bb3934f77ad6feab49662be77e87eedcdeb2a3f5c0234c2938563d4c
+  ffi (1.17.3-aarch64-linux-gnu) sha256=28ad573df26560f0aedd8a90c3371279a0b2bd0b4e834b16a2baa10bd7a97068
+  ffi (1.17.3-aarch64-linux-musl) sha256=020b33b76775b1abacc3b7d86b287cef3251f66d747092deec592c7f5df764b2
+  ffi (1.17.3-arm-linux-gnu) sha256=5bd4cea83b68b5ec0037f99c57d5ce2dd5aa438f35decc5ef68a7d085c785668
+  ffi (1.17.3-arm-linux-musl) sha256=0d7626bb96265f9af78afa33e267d71cfef9d9a8eb8f5525344f8da6c7d76053
+  ffi (1.17.3-arm64-darwin) sha256=0c690555d4cee17a7f07c04d59df39b2fba74ec440b19da1f685c6579bb0717f
+  ffi (1.17.3-x86-linux-gnu) sha256=868a88fcaf5186c3a46b7c7c2b2c34550e1e61a405670ab23f5b6c9971529089
+  ffi (1.17.3-x86-linux-musl) sha256=f0286aa6ef40605cf586e61406c446de34397b85dbb08cc99fdaddaef8343945
+  ffi (1.17.3-x86_64-darwin) sha256=1f211811eb5cfaa25998322cdd92ab104bfbd26d1c4c08471599c511f2c00bb5
+  ffi (1.17.3-x86_64-linux-gnu) sha256=3746b01f677aae7b16dc1acb7cb3cc17b3e35bdae7676a3f568153fb0e2c887f
+  ffi (1.17.3-x86_64-linux-musl) sha256=086b221c3a68320b7564066f46fed23449a44f7a1935f1fe5a245bd89d9aea56
+  fileutils (1.8.0) sha256=8c6b1df54e2540bdb2f39258f08af78853aa70bad52b4d394bbc6424593c6e02
+  i18n (1.14.8) sha256=285778639134865c5e0f6269e0b818256017e8cde89993fdfcbfb64d088824a5
+  io-console (0.8.2) sha256=d6e3ae7a7cc7574f4b8893b4fca2162e57a825b223a177b7afa236c5ef9814cc
+  json (2.19.0) sha256=bc5202f083618b3af7aba3184146ec9d820f8f6de261838b577173475e499d9a
+  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  listen (3.10.0) sha256=c6e182db62143aeccc2e1960033bebe7445309c7272061979bb098d03760c9d2
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  minitest (6.0.2) sha256=db6e57956f6ecc6134683b4c87467d6dd792323c7f0eea7b93f66bd284adbc3d
+  mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751
+  openssl (4.0.1) sha256=e27974136b7b02894a1bce46c5397ee889afafe704a839446b54dc81cb9c5f7d
+  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
+  parser (3.3.10.2) sha256=6f60c84aa4bdcedb6d1a2434b738fe8a8136807b6adc8f7f53b97da9bc4e9357
+  prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
+  rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe
+  rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e
+  rbs (3.10.3) sha256=70627f3919016134d554e6c99195552ae3ef6020fe034c8e983facc9c192daa6
+  rbs-inline (0.13.0) sha256=aba6e48c2d1b75276e8557376164f4b4ba96dd0204e779a5cee2af442bd30442
+  regexp_parser (2.11.3) sha256=ca13f381a173b7a93450e53459075c9b76a10433caadcb2f1180f2c741fc55a4
+  reline (0.6.3) sha256=1198b04973565b36ec0f11542ab3f5cfeeec34823f4e54cebde90968092b1835
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.8) sha256=086ad3d3d17533f4237643de0b5c42f04b66348c28bf6b9c2d3f4a3b01af1d47
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  rubocop (1.82.1) sha256=09f1a6a654a960eda767aebea33e47603080f8e9c9a3f019bf9b94c9cab5e273
+  rubocop-ast (1.49.0) sha256=49c3676d3123a0923d333e20c6c2dbaaae2d2287b475273fddee0c61da9f71fd
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
+  steep (1.10.0) sha256=1b295b55f9aaff1b8d3ee42453ee55bc2a1078fda0268f288edb2dc014f4d7d1
+  strscan (3.1.7) sha256=5f76462b94a3ea50b44973225b7d75b2cb96d4e1bee9ef1319b99ca117b72c8c
+  terminal-table (4.0.0) sha256=f504793203f8251b2ea7c7068333053f0beeea26093ec9962e62ea79f94301d2
+  tsort (0.2.0) sha256=9650a793f6859a43b6641671278f79cfead60ac714148aabe4e3f0060480089f
+  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
+  unicode-display_width (3.2.0) sha256=0cdd96b5681a5949cdbc2c55e7b420facae74c4aaf9a9815eee1087cb1853c42
+  unicode-emoji (4.2.0) sha256=519e69150f75652e40bf736106cfbc8f0f73aa3fb6a65afe62fefa7f80b0f80f
+  uri (1.1.1) sha256=379fa58d27ffb1387eaada68c749d1426738bd0f654d812fcc07e7568f5c57c6
+  webrick (1.9.2) sha256=beb4a15fc474defed24a3bda4ffd88a490d517c9e4e6118c3edce59e45864131
+
 BUNDLED WITH
-   2.3.7
+  4.0.7

data/README.md

@@ -3,7 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/ech_config.svg)](https://badge.fury.io/rb/ech_config)
 [![CI](https://github.com/thekuwayama/ech_config/workflows/CI/badge.svg)](https://github.com/thekuwayama/ech_config/actions?workflow=CI)
 
-`ech_config` is Ruby implementation of [Encrypted ClientHello Configuration](https://datatracker.ietf.org/doc/draft-ietf-tls-esni/).
+`ech_config` is Ruby implementation of [Encrypted ClientHello Configuration](https://datatracker.ietf.org/doc/html/rfc9849.html).
 
 `ech_config` supports `0xfe0b` ~ `0xfe0f` ECHConfig.version.
 

data/Rakefile

@@ -1,4 +1,3 @@
-# typed: false
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
@@ -8,9 +7,16 @@ require 'rspec/core/rake_task'
 RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
-desc 'Run Sorbet type checker'
-task :sorbet do
-  sh 'srb tc'
+desc 'Generate RBS signatures for `lib` files'
+task :rbs_inline do
+  sh 'rbs-inline', 'lib', '--output=sig/generated'
 end
 
-task default: %i[rubocop sorbet spec]
+namespace :steep do
+  desc 'Run `steep check`'
+  task :check do
+    sh 'steep', 'check'
+  end
+end
+
+task default: %i[rubocop spec rbs_inline steep:check]

data/Steepfile

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+target :lib do
+  signature 'sig'
+  check 'lib'
+
+  library 'base64'
+end

data/ech_config.gemspec

@@ -13,12 +13,15 @@ Gem::Specification.new do |spec|
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/thekuwayama/ech_config'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>=2.7.0'
+  spec.required_ruby_version = '>=4.0'
 
-  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
+    end
+  end
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
-  spec.add_runtime_dependency 'sorbet-runtime'
+  spec.add_dependency             'base64'
 end

data/example/README.md

@@ -3,7 +3,7 @@
 ```sh-session
 $ cd /path/to/ech_config/example
 
-$ ruby well_known_url_client.rb cover.defo.ie draft-13.esni.defo.ie
+$ bundle exec ruby well_known_url_client.rb cover.defo.ie draft-13.esni.defo.ie
 ```
 
 https://datatracker.ietf.org/meeting/113/materials/slides-113-dispatch-a-well-known-url-for-publishing-echconfiglists-00

data/lib/ech_config/ech_config_contents/extensions.rb

@@ -1,23 +1,25 @@
-# typed: true
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 class ECHConfig::ECHConfigContents::Extensions
-  extend T::Sig
   attr_reader :octet
 
-  sig { params(octet: String).void }
+  # @rbs octet: String
+  # @rbs return: void
   def initialize(octet)
     # Note taht ECHConfig::ECHConfigContents::Extension only has octets.
     # If you need, deserialize octets to get TLS Extension objects.
     @octet = octet
   end
 
-  sig { returns(String) }
+  # @rbs return: String
   def load
     @octet
   end
 
-  sig { params(octet: String).returns(T.attached_class) }
+  # @rbs octet: String
+  # @rbs return: ECHConfig::ECHConfigContents::Extensions
   def self.store(octet)
     new(octet)
   end

data/lib/ech_config/ech_config_contents/hpke_key_config/hpke_kem_id.rb

@@ -1,28 +1,33 @@
-# typed: false
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 class ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeKemId
-  extend T::Sig
   attr_reader :uint16
 
+  # @rbs uint16: Integer
+  # @rbs return: void
   def initialize(uint16)
     @uint16 = uint16
   end
 
-  sig { returns(String) }
+  # @rbs return: String
   def encode
     [@uint16].pack('n')
   end
 
-  sig { params(other: T.self_type).returns(T::Boolean) }
+  # @rbs other: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeKemId
+  # @rbs return: bool
   def ==(other)
     other.uint16 == @uint16
   end
 
-  sig { params(octet: String).returns(T.attached_class) }
+  # @rbs octet: String
+  # @rbs return: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeKemId
   def self.decode(octet)
     raise ::ECHConfig::DecodeError if octet.length != 2
 
-    new(octet.unpack1('n'))
+    id = octet.unpack1('n') #: Integer
+    new(id)
   end
 end

data/lib/ech_config/ech_config_contents/hpke_key_config/hpke_public_key.rb

@@ -1,20 +1,23 @@
-# typed: true
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 class ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkePublicKey
-  extend T::Sig
   attr_reader :opaque
 
+  # @rbs opaque: String
+  # @rbs return: void
   def initialize(opaque)
     @opaque = opaque
   end
 
-  sig { returns(String) }
+  # @rbs return: String
   def encode
     @opaque.then { |s| [s.length].pack('n') + s }
   end
 
-  sig { params(octet: String).returns(T.attached_class) }
+  # @rbs octet: String
+  # @rbs return: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkePublicKey
   def self.decode(octet)
     new(octet)
   end

data/lib/ech_config/ech_config_contents/hpke_key_config/hpke_symmetric_cipher_suite/hpke_aead_id.rb

@@ -1,28 +1,33 @@
-# typed: false
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 class ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeAeadId
-  extend T::Sig
   attr_reader :uint16
 
+  # @rbs uint16: Integer
+  # @rbs return: void
   def initialize(uint16)
     @uint16 = uint16
   end
 
-  sig { returns(String) }
+  # @rbs return: String
   def encode
     [@uint16].pack('n')
   end
 
-  sig { params(other: T.self_type).returns(T::Boolean) }
+  # @rbs other: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeAeadId
+  # @rbs return: bool
   def ==(other)
     other.uint16 == @uint16
   end
 
-  sig { params(octet: String).returns(T.attached_class) }
+  # @rbs octet: String
+  # @rbs return: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeAeadId
   def self.decode(octet)
     raise ::ECHConfig::DecodeError if octet.length != 2
 
-    new(octet.unpack1('n'))
+    id = octet.unpack1('n') #: Integer
+    new(id)
   end
 end

data/lib/ech_config/ech_config_contents/hpke_key_config/hpke_symmetric_cipher_suite/hpke_kdf_id.rb

@@ -1,28 +1,33 @@
-# typed: false
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 class ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeKdfId
-  extend T::Sig
   attr_reader :uint16
 
+  # @rbs uint16: Integer
+  # @rbs return: void
   def initialize(uint16)
     @uint16 = uint16
   end
 
-  sig { returns(String) }
+  # @rbs return: String
   def encode
     [@uint16].pack('n')
   end
 
-  sig { params(other: T.self_type).returns(T::Boolean) }
+  # @rbs other: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeKdfId
+  # @rbs return: bool
   def ==(other)
     other.uint16 == @uint16
   end
 
-  sig { params(octet: String).returns(T.attached_class) }
+  # @rbs octet: String
+  # @rbs return: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeKdfId
   def self.decode(octet)
     raise ::ECHConfig::DecodeError if octet.length != 2
 
-    new(octet.unpack1('n'))
+    uint16 = octet.unpack1('n') # @type var uint16: Integer
+    new(uint16)
   end
 end

data/lib/ech_config/ech_config_contents/hpke_key_config/hpke_symmetric_cipher_suite.rb

@@ -1,8 +1,8 @@
-# typed: false
 # frozen_string_literal: true
 
+# rbs_inline: enabled
+
 class ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite
-  extend T::Sig
   # define class
 end
 
@@ -12,25 +12,30 @@ Dir["#{File.dirname(__FILE__)}/hpke_symmetric_cipher_suite/*.rb"]
 class ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite
   attr_reader :kdf_id, :aead_id
 
+  # @rbs kdf_id: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeKdfId
+  # @rbs aead_id: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite::HpkeAeadId
+  # @rbs return: void
   def initialize(kdf_id, aead_id)
     @kdf_id = kdf_id
     @aead_id = aead_id
   end
 
-  sig { returns(String) }
+  # @rbs return: String
   def encode
     @kdf_id.encode + @aead_id.encode
   end
 
-  sig { params(other: T.self_type).returns(T::Boolean) }
+  # @rbs other: ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite
+  # @rbs return: bool
   def ==(other)
     other.kdf_id == @kdf_id && other.aead_id == @aead_id
   end
 
-  sig { params(octet: String).returns(T::Array[T.attached_class]) }
+  # @rbs octet: String
+  # @rbs return: Array[ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite]
   def self.decode_vectors(octet)
     i = 0
-    cipher_suites = []
+    cipher_suites = [] # @type var cipher_suites: Array[ECHConfig::ECHConfigContents::HpkeKeyConfig::HpkeSymmetricCipherSuite]
     while i < octet.length
       raise ::ECHConfig::DecodeError if i + 4 > octet.length