wsdirector-cli 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02895fab166dd2d388f48dda802e02407e5b7866eb508f1b5787e1a4e1976d6
-  data.tar.gz: e0d5af5ae2de5caed7ccd151538e19ad3c49e08db1217e042f36540d69468314
+  metadata.gz: c0f66338d459486aadbae18daa45b8b3c5dc48c86049fcccfeac2771961ed1f8
+  data.tar.gz: 6be12e017b3ff649bc2e6819e515b4f6dab0ffbb7077ccc8f74387cfa21e39b0
 SHA512:
-  metadata.gz: '09af449361f79d80a4848b0851aa96ada36e363e997bba177e5d96b01005d1c241abee2a1a05781f3a5277de08732f3b1d8afaeaea467d2097050347d2ca295c'
-  data.tar.gz: 8deb112a900d7cdbc710be8b86d57aef8aeaa87bbec78595170bf309088bca9bb88fd58de503e2bcfb32b43df5e08903c322791eb10930aa0fb25f00e26afebb
+  metadata.gz: 72114ec71d8926e0eaa7c70bbda0fc07faa2b941fb679e5c160555c030be75f77df0b9f8c55c13c3c65cf21e93365ba1f12fcbbf27bb9caa41effa56eaf6340a
+  data.tar.gz: 25eec3a5d152683f3c3f8fa4cce48e1ca511442de67ba89c1208f66b8fa8fc51ab0ebbd4b9bf43f9a3002ff4ae59ddb3dfe5dea2201fe6b350b16dcf0c36306b

data/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 ## master
 
+## 1.0.0 (2022-09-19)
+
+- Add Phoenix Channels protocol support. ([@palkan][])
+
+- Make `receive` order-independent. ([@palkan][])
+
+Using `receive` now looks up a matching message through all the mailbox (already received or newly arrived messages).
+If you need strict order guarantees, add `ordered: true` to `receive`.
+
+- Add `WSDirector::Snapshot`. ([@palkan][])
+
+- Add `locals` support when running scenarios programmatically. ([@palkan][])
+
+- Add partial receive data matching support (via `data>` field). ([@palkan][])
+
+- Add `connection_options` support (headers, cookies, query). ([@palkan][])
+
+- Add loading custom protocols support. ([@palkan][])
+
+- Allow passing URL without a scheme part. ([@palkan][])
+
+- Add `-vv` option to print action logs. ([@palkan][])
+
+- Add `--subprotocol` support and `connection_options` in the scenario files. ([@palkan][])
+
+- Add `-f/--file` option to specify scenario path. ([@palkan][])
+
+- Drop Ruby 2.5 support.
+
 ## 0.5.0 (2021-10-13)
 
 - Add JSON support. ([@wazzuper][])

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 palkan
+Copyright (c) 2017-2022 palkan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,66 +4,81 @@
 
 # WebSocket Director
 
-Command line tool for testing websocket servers using scenarios.
+Command line tool for testing WebSocket servers using scenarios.
 
-Suitable for testing any websocket server implementation, like [Action Cable](https://github.com/rails/rails/tree/master/actioncable), [Websocket Eventmachine Server](https://github.com/imanel/websocket-eventmachine-server), [Litecable](https://github.com/palkan/litecable) and so on.
+Suitable for testing any websocket server implementation, like [Action Cable](https://github.com/rails/rails/tree/master/actioncable), [AnyCable](https://anycable.io), [Phoenix Channels](https://hexdocs.pm/phoenix/channels.html), [GraphQL WS](https://github.com/enisdenjo/graphql-ws) and so on.
 
 ## Installation
 
-```bash
+Install CLI:
+
+```sh
 gem install wsdirector-cli
 ```
 
+Or use WebSockets Director as a library (see below for intructions):
+
+```ruby
+# Gemfile
+gem "wsdirector-core", "~> 1.0"
+```
+
 ## Usage
 
 Create YAML file with simple testing script:
 
 ```yml
-  # script.yml
-  - receive: "Welcome" # expect to receive message
-  - send:
-      data: "send message" # send message, all messages in data will be parse to json
-  - receive:
-      data: "receive message" # expect to receive json message
+# script.yml
+- receive: "Welcome" # expect to receive message
+- send:
+    data: "send message" # send message, all messages in data will be parse to json
+- receive:
+    data: "receive message" # expect to receive json message
 ```
 
 and run it with this command:
 
 ```bash
-wsdirector script.yml ws://websocket.server:9876/ws
+wsdirector -f script.yml -u ws://websocket.server:9876/ws
 
 #=> 1 clients, 0 failures
 ```
 
+You can also use positional arguments:
+
+```sh
+wsdirector script.yml ws://websocket.server:9876/ws
+```
+
 You can create more complex scenarios with multiple client groups:
 
 ```yml
-  # script.yml
-  - client: # first clients group
-      name: "publisher" # optional group name
-      multiplier: ":scale" # :scale take number from -s param, and run :scale number of clients in this group
-      actions:
-        - receive:
-            data: "Welcome"
-        - wait_all # makes all clients in all groups wait untill every client get this point (global barrier)
-        - send:
-            data: "test message"
-  - client:
-      name: "listeners"
-      multiplier: ":scale * 2"
-      actions:
-        - receive:
-            data: "Welcome"
-        - wait_all
-        - receive:
-            multiplier: ":scale" # you can use multiplier with any action
-            data: "test message"
+# script.yml
+- client: # first clients group
+    name: "publisher" # optional group name
+    multiplier: ":scale" # :scale take number from -s param, and run :scale number of clients in this group
+    actions:
+      - receive:
+          data: "Welcome"
+      - wait_all # makes all clients in all groups wait untill every client get this point (global barrier)
+      - send:
+          data: "test message"
+- client:
+    name: "listeners"
+    multiplier: ":scale * 2"
+    actions:
+      - receive:
+          data: "Welcome"
+      - wait_all
+      - receive:
+          multiplier: ":scale" # you can use multiplier with any action
+          data: "test message"
 ```
 
 Run with scale factor:
 
 ```bash
-wsdirector script.yml ws://websocket.server:9876 -s 10
+wsdirector -f script.yml -u ws://websocket.server:9876 -s 10
 
 #=> Group publisher: 10 clients, 0 failures
 #=> Group listeners: 20 clients, 0 failures
@@ -74,7 +89,7 @@ The simpliest scenario is just checking that socket is succesfully connected:
 ```yml
 - client:
     name: connection check
-  # no actions
+    # no actions
 ```
 
 Run with loop option:
@@ -102,24 +117,100 @@ Run with loop option:
               multiplier: ":scale + 1"
 ```
 
+By default, `receive` action expects the exact `data` match. In some cases, it's useful to only match the specified keys (inclusion). For that, you can use `data>` field instead:
+
+```yml
+- client:
+  actions:
+    - receive:
+        data:
+          type: "welcome"
+    - send:
+        data:
+          command: "subscribe"
+          identifier: "{\"channel\":\"Channel\"}"
+    - receive:
+        data>:
+          type: "confirm_subscription"
+```
+
 Also you can pass a JSON file with some testing scripts:
 
 ```bash
-wsdirector scenario.json ws://websocket.server:9876
+wsdirector -f scenario.json -u ws://websocket.server:9876
 ```
 
 or pass a JSON scenario directly to the CLI without creating a file:
 
 ```bash
-wsdirector -i '[{"receive": {"data":"welcome"}},{"send":{"data":"send message"}},{"receive":{"data":"receive message"}}]' ws://websocket.server:9876
+wsdirector -i '[{"receive": {"data":"welcome"}},{"send":{"data":"send message"}},{"receive":{"data":"receive message"}}]' -u ws://websocket.server:9876
 ```
 
 Type `wsdirector --help` to check all commands.
 
+### Receive order
+
+By default, the `receive` action scans through all available or newly added message to find a matching one.
+If you want to check the order of incoming messages, add the `ordered: true` option to the `receive` action.
+
+### Connection configuration
+
+You can specify client's headers, cookies or query string params via the `connection_options` directive:
+
+```yml
+- client:
+    connection_options:
+      headers:
+        "X-API-KEY": "secret"
+      query:
+        token: "123"
+      cookies:
+        session_id: "2022"
+```
+
+**NOTE**: Query string params could also be passed as a part of the URL. Specifying them in the scenario allows you to provide values via the interpolation.
+
+### Using as a library
+
+You can integrate WS Director into your library or application by using its APIs:
+
+```ruby
+# Could be a file path or JSON-encoded string as well
+scenario = [
+  {
+    send: {
+      data: "ping"
+    }
+  },
+  {
+    receive: {
+      data: "pong"
+    }
+  }
+]
+
+result = WSDirector.run(scenario, url: "ws://my.ws.server:4949/live")
+result.success? #=> true of false
+result.groups #=> result data for each client group
+```
+
+If you're using YAML-based scenarios, you can also pass local variables to be used with ERB via the `locals` option:
+
+```yml
+- client:
+    connection_options:
+      headers:
+        "X-API-TOKEN": <%= token %>
+```
+
+```ruby
+token = UserToken.generate
+WSDirector.run(scenario, url: "ws://my.ws.server:4949/live", locals: {token:})
+```
+
 ### Protocols
 
-WSDirector uses protocols to handle different actions.
-Currently, we support "base" protocol (with `send`, `receive`, `wait_all` actions) and "action_cable" protocol, which extends "base" with `subscribe` and `perform` actions.
+WSDirector uses protocols to handle provide convinient actions for some popular protocols.
 
 #### ActionCable Example
 
@@ -170,21 +261,87 @@ Scenario:
             text: "hello"
 ```
 
-## Future Ideas
+#### Phoenix Channels
 
-- Report timings (per-client and aggregates)
+With "phoenix" protocol, you can use communicate with a [Phoenix Channels](https://hexdocs.pm/phoenix/channels.html) server:
+
+```yml
+- client:
+    protocol: phoenix
+    multiplier: ":scale"
+    actions:
+      - join:
+          topic: room:lobby
+      - wait_all
+      - send:
+          topic: room:lobby
+          event: new_msg
+          data:
+            body: "Hey from WS director!"
+      - receive:
+          topic: room:lobby
+          multiplier: ":scale"
+          event: new_msg
+          data:
+            body: "Hey from WS director!"
+```
+
+**IMPORTANT**: We support only v2 version of the Channels protocol.
 
-- File-less scenarios (JSON-encoded?), e.g.
+#### Custom protocols
 
-```shell
-wsdirector -i '{"receive": "hello"}' localhost:9898/ws
+You can define your own protocol and load it dynamically:
+
+```ruby
+# It's important to put a custom protocol class under WSDirector::Protocols
+module WSDirector::Protocols
+  class CustomProtocol < Base
+    def send_ping_and_receive_pong
+      send("data" => {"type" => "ping"})
+      receive("data" => {"type" => "pong"})
+    end
+  end
+end
+```
+
+Now you can load it via the `-r` option:
+
+```sh
+$ wsdirector -u localhost:3232/ws -i '["send_ping_and_receive_pong"]' -r ./path/to/custom_protocol.rb -vv
+
+hh:mm:ss client=default_1 Connecting
+hh:mm:ss client=default_1 Connected (45ms)
+hh:mm:ss client=default_1 Sent message: {"type":"ping"}
+hh:mm:ss client=default_1 Receive message: {"type":"pong"}
+hh:mm:ss client=default_1 Received message: {"type":"pong"} (21ms)
 ```
 
-- Connection parameters (headers, query params, etc)
+## Testing frameworks integration
+
+WSDirector does not provide any specific helpers for RSpec or Minitest. Instead, we provide an example setup, which you could adjust to your needs (and which is too small to be a part of the library).
+
+The example below implies running tests against an Action Cable server with a token-based authentication
 
-- Testing frameworks integrations
+```ruby
+module WSDirectorTestHelper
+  def run_websocket_scenario(path, token:, url: ActionCable.server.config.url, **options)
+    url = "#{url}?jid=#{token}"
+    scenario = Rails.root.join "spec" / "fixtures" / "wsdirector" / path
+
+    WSDirector.run(scenario, url:, **options)
+  end
+end
+
+# In RSpec, you can include this modules via the configuration
+RSpec.configure do |config|
+  # Here we only add this helper to system tests
+  config.include WSDirectorTestHelper, type: :system
+end
+```
 
-- Loading protocols dynamically
+## Future Ideas
+
+- Report timings (per-client and aggregates)
 
 - What else? [Submit an issue!](https://github.com/palkan/wsdirector/issues/new)
 

metadata

@@ -1,45 +1,31 @@
 --- !ruby/object:Gem::Specification
 name: wsdirector-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
+- Vladimir Dementyev
 - Kirill Arkhipov
 - Grandman
-- palkan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-13 00:00:00.000000000 Z
+date: 2022-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: websocket-client-simple
+  name: wsdirector
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -47,157 +33,25 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: websocket-eventmachine-server
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: litecable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.9'
-description: Command line tool for testing websocket servers using scenarios.
+description: Command line tool for testing WebSocket servers using scenarios.
 email:
+- dementiev.vm@gmail.com
 - kirillvs@mail.ru
 - root@grandman73.ru
-- dementiev.vm@gmail.com
-executables:
-- wsdirector
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
-- bin/wsdirector
-- lib/wsdirector-cli.rb
-- lib/wsdirector.rb
-- lib/wsdirector/cli.rb
-- lib/wsdirector/client.rb
-- lib/wsdirector/clients_holder.rb
-- lib/wsdirector/configuration.rb
-- lib/wsdirector/ext/deep_dup.rb
-- lib/wsdirector/printer.rb
-- lib/wsdirector/protocols.rb
-- lib/wsdirector/protocols/action_cable.rb
-- lib/wsdirector/protocols/base.rb
-- lib/wsdirector/result.rb
-- lib/wsdirector/results_holder.rb
-- lib/wsdirector/runner.rb
-- lib/wsdirector/scenario_reader.rb
-- lib/wsdirector/task.rb
-- lib/wsdirector/utils.rb
-- lib/wsdirector/version.rb
 homepage: https://github.com/palkan/wsdirector
 licenses:
 - MIT
@@ -210,15 +64,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
-summary: Command line tool for testing websocket servers using scenarios.
+summary: Command line tool for testing WebSocket servers using scenarios.
 test_files: []

data/bin/wsdirector

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-
-require "rubygems"
-
-$:.unshift(File.expand_path(__dir__ + "/../lib"))
-
-require "wsdirector/cli"
-
-begin
-  WSDirector::CLI.new.tap { |cli| cli.run }
-rescue => e
-  STDERR.puts e.message
-  STDERR.puts e.backtrace.join("\n")
-  exit 1
-end