rename nim-ws to nim-websock

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: nim-ws CI
+name: CI
 on: [push, pull_request]
 
 jobs:
@@ -38,10 +38,10 @@ jobs:
     name: "${{ matrix.target.os }}-${{ matrix.target.cpu }} (${{ matrix.branch }})"
     runs-on: ${{ matrix.builder }}
     steps:
-      - name: Checkout nim-ws
+      - name: Checkout nim-websock
         uses: actions/checkout@v2
         with:
-          path: nim-ws
+          path: nim-websock
           submodules: true
 
       - name: Derive environment variables
@@ -193,11 +193,11 @@ jobs:
           rm -rf dist
           rm -rf .git
 
-      - name: Run nim-ws tests
+      - name: Run nim-websock tests
         shell: bash
         run: |
           export UCPU="$cpu"
-          cd nim-ws
+          cd nim-websock
           nimble install -y --depsOnly
           nimble test
 
@@ -218,7 +218,7 @@ jobs:
           virtualenv --python=/usr/bin/python2 autobahn
           source autobahn/bin/activate
           pip install autobahntestsuite
-          cd nim-ws
+          cd nim-websock
           mkdir autobahn/reports
           sed -i "s/COMMIT_SHA_SHORT/${GITHUB_SHA::7}/g" autobahn/index.md
           sed -i "s/COMMIT_SHA/$GITHUB_SHA/g" autobahn/index.md
@@ -265,4 +265,4 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           personal_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./nim-ws/autobahn/reports
+          publish_dir: ./nim-websock/autobahn/reports

autobahn/fuzzingclient.json

@@ -2,7 +2,7 @@
   "outdir": "./reports/server",
 
   "servers": [{
-    "agent": "nim-ws server",
+    "agent": "websock server",
     "url": "ws://127.0.0.1:8888/ws"
   }],
 

autobahn/fuzzingclient_tls.json

@@ -2,7 +2,7 @@
   "outdir": "./reports/server_tls",
 
   "servers": [{
-    "agent": "nim-wss server",
+    "agent": "websock secure server",
     "url": "wss://127.0.0.1:8889/wss"
   }],
 

autobahn/index.md

@@ -1,6 +1,6 @@
 # Autobahn summary report
 
-Generated by commit [COMMIT_SHA_SHORT](https://github.com/status-im/nim-ws/commit/COMMIT_SHA).
+Generated by commit [COMMIT_SHA_SHORT](https://github.com/status-im/nim-websock/commit/COMMIT_SHA).
 
 * [ws server summary report](server/index.html)
 * [wss server summary report](server_tls/index.html)

examples/autobahn_client.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -10,7 +10,7 @@
 import
   std/[strutils],
   pkg/[chronos, chronicles, stew/byteutils],
-  ../ws/[ws, types, frame, extensions/compression/deflate]
+  ../websock/[websock, types, frame, extensions/compression/deflate]
 
 const
   clientFlags = {NoVerifyHost, NoVerifyServerName}
@@ -19,12 +19,12 @@ const
 # so we are using different port
 when defined tls:
   const
-    agent      = "nim-wss-client"
+    agent      = "websock secure client"
     secure     = true
     serverPort = 9002
 else:
   const
-    agent      = "nim-ws-client"
+    agent      = "websock client"
     secure     = false
     serverPort = 9001
 

examples/client.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -12,7 +12,7 @@ import pkg/[
   chronicles,
   stew/byteutils]
 
-import ../ws/ws
+import ../websock/websock
 
 proc main() {.async.} =
   let ws = when defined tls:

examples/server.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -12,7 +12,7 @@ import pkg/[chronos,
              chronicles,
              httputils]
 
-import ../ws/[ws, extensions/compression/deflate]
+import ../websock/[websock, extensions/compression/deflate]
 import ../tests/keys
 
 proc handle(request: HttpRequest) {.async.} =

tests/asyncunit.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

tests/extensions/base64ext.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -13,8 +13,8 @@ import
     stew/base64,
     chronos,
     chronicles],
-  ../../ws/types,
+  ../../websock/types,
-  ../../ws/frame
+  ../../websock/frame
 
 type
   Base64Ext = ref object of Ext

tests/extensions/hexext.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -13,8 +13,8 @@ import
     stew/byteutils,
     chronos,
     chronicles],
-  ../../ws/types,
+  ../../websock/types,
-  ../../ws/frame
+  ../../websock/frame
 
 type
   HexExt = ref object of Ext

tests/extensions/testcompression.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -10,8 +10,8 @@
 import std/os
 import pkg/[chronos, stew/byteutils, stew/io2]
 import ../asyncunit
-import ../../ws/ws, ../helpers
+import ../../websock/websock, ../helpers
-import ../../ws/extensions/compression/deflate
+import ../../websock/extensions/compression/deflate
 
 const
   dataFolder = "tests" / "extensions" / "data"

tests/extensions/testextflow.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

tests/extensions/testexts.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -10,7 +10,7 @@
 import pkg/[chronos, stew/byteutils]
 import ../asyncunit
 import ./base64ext, ./hexext
-import ../../ws/ws, ../helpers
+import ../../websock/websock, ../helpers
 
 suite "multiple extensions flow":
   var server: HttpServer

tests/helpers.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -17,7 +17,7 @@ import pkg/[
   chronicles,
   stew/byteutils]
 
-import ../ws/ws
+import ../websock/websock
 import ./keys
 
 let

tests/keys.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

tests/testcommon.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

tests/testextutils.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,7 +9,7 @@
 
 import
   pkg/[asynctest, chronos],
-  ../ws/extensions
+  ../websock/extensions
 
 suite "extension parser":
   test "single extension":

tests/testframes.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -9,8 +9,8 @@
 
 import pkg/[asynctest, stew/byteutils]
 
-include ../ws/frame
+include ../websock/frame
-include ../ws/utils
+include ../websock/utils
 
 # TODO: Fix Test.
 

tests/testutf8.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -15,7 +15,7 @@ import
     chronos,
     chronicles
   ],
-  ../ws/[ws, utf8dfa]
+  ../websock/[websock, utf8dfa]
 
 suite "UTF-8 DFA validator":
   test "single octet":

tests/testwebsockets.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -14,7 +14,7 @@ import pkg/[
   chronicles,
   stew/byteutils]
 
-import ../ws/ws
+import ../websock/websock
 
 import ./asynctest
 import ./helpers

websock.nimble

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))
@@ -7,14 +7,14 @@
 ## This file may not be copied, modified, or distributed except according to
 ## those terms.
 
-packageName = "ws"
+packageName = "websock"
 version     = "0.1.0"
 author      = "Status Research & Development GmbH"
 description = "WS protocol implementation"
 license     = "MIT"
 skipDirs    = @["examples", "tests"]
 
-requires "nim >= 1.2.0" # nimble will fail to install nim-ws if we are using 1.2.6 here
+requires "nim >= 1.2.0" # nimble will fail to install nim-websock if we are using 1.2.6 here
 requires "chronos >= 3.0.0"
 requires "httputils >= 0.2.0"
 requires "chronicles#ba2817f1"

websock/extensions.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/extensions/compression/deflate.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/extensions/extutils.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/frame.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/http.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/http/client.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/http/common.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/http/server.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/session.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/types.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/utf8dfa.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/utils.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))

websock/websock.nim

@@ -1,4 +1,4 @@
-## nim-ws
+## nim-websock
 ## Copyright (c) 2021 Status Research & Development GmbH
 ## Licensed under either of
 ##  * Apache License, version 2.0, ([LICENSE-APACHE](LICENSE-APACHE))