Merge d124ac1 into 9d919c5

.travis.yml

@@ -38,6 +38,7 @@ matrix:
 script:
   - npm run lint;
   - npm run test:all:coverage;
+  - bash scripts/package.sh true
 
 addons:
   apt:

CHANGELOG.md

@@ -1,3 +1,13 @@
+## [4.0.0-rc.11] - 2019.07.03
+
+### Feat
+
+- Adding support for a notify API via HTTP
+
+### Misc
+
+- Updating uws to support node12
+
 ## [4.0.0-rc.10] - 2019.06.10
 
 ### Feat

Dockerfile

@@ -1,7 +1,7 @@
 FROM node:10
 COPY package*.json ./
 RUN npm install --production
-RUN npm install --production deepstream.io-storage-rethinkdb deepstream.io-cache-redis
+RUN npm install --production @deepstream/storage-rethinkdb @deepstream/cache-redis
 COPY . ./
 
 EXPOSE 6020

appveyor.yml

@@ -6,6 +6,9 @@ os:
 
 install:
   - ps: Install-Product node 10 x64
+  - curl -L -o nasm.exe https://www.nasm.us/pub/nasm/releasebuilds/2.13.03/win64/nasm-2.13.03-installer-x64.exe 
+  - start /wait nasm.exe /S 
+  - ps: $env:path="C:\Program Files\nasm;$($env:path)" 
   - sed -i "s@git\@github.com:@https:\/\/github.com\/@" .gitmodules
   - git submodule update --init --recursive
   - npm install
@@ -15,8 +18,8 @@ test_script:
   - npm --version
   - npm test
   # Artifacts are packaged before before_deploy
-  # - bash scripts\package.sh
-  # - For /d %%d in ( build\** ) do MOVE %%d %cd%
+  - bash scripts\package.sh
+  - For /d %%d in ( build\** ) do MOVE %%d %cd%
 
 artifacts:
   - path: 'build\*.zip'

conf/config.yml

@@ -58,8 +58,7 @@ listen:
 # Connection Endpoint Configuration
 # to disable, replace configuration with null eg. `http: null`
 connectionEndpoints:
-  websocket:
-    name: uws
+  - type: ws-websocket
     options:
         # port for the websocket server
         port: 6020
@@ -73,6 +72,9 @@ connectionEndpoints:
         heartbeatInterval: 30000
         # the amount of milliseconds that writes to sockets are buffered
         outgoingBufferTimeout: 50
+        # the maximum amount of bytes to buffer before flushing, stops the client from large enough packages
+        # to block its responsivness
+        maxBufferByteSize: 100000
 
         # Headers to copy over from websocket
         headers:
@@ -88,8 +90,7 @@ connectionEndpoints:
         # maximum allowed size of an individual message in bytes
         maxMessageSize: 1048576
 
-  http:
-    name: http
+  - type: node-http
     options:
       # port for the http server
       port: 8080
@@ -125,6 +126,38 @@ connectionEndpoints:
       # maximum allowed size of an individual message in bytes
       maxMessageSize: 1024
 
+  # - type: uws-websocket
+  #   options:
+  #       # port for the websocket server
+  #       port: 6020
+  #       # host for the websocket server
+  #       host: 0.0.0.0
+  #       # url path websocket connections connect to
+  #       urlPath: /deepstream
+  #       # url path for http health-checks, GET requests to this path will return 200 if deepstream is alive
+  #       healthCheckPath: /health-check
+  #       # the amount of milliseconds between each ping/heartbeat message
+  #       heartbeatInterval: 30000
+  #       # the amount of milliseconds that writes to sockets are buffered
+  #       outgoingBufferTimeout: 50
+  #       # the maximum amount of bytes to buffer before flushing, stops the client from large enough packages
+  #       # to block its responsivness
+  #       maxBufferByteSize: 100000
+
+  #       # Headers to copy over from websocket
+  #       headers:
+  #         - user-agent
+
+  #       # Security
+  #       # amount of time a connection can remain open while not being logged in
+  #       unauthenticatedClientTimeout: 180000
+  #       # invalid login attempts before the connection is cut
+  #       maxAuthAttempts: 3
+  #       # if true, the logs will contain the cleartext username / password of invalid login attempts
+  #       logInvalidAuthData: false
+  #       # maximum allowed size of an individual message in bytes
+  #       maxMessageSize: 1048576
+
 # Logger Configuration
 logger:
   # use either the default logger

conf/permissions.yml

@@ -8,6 +8,7 @@ record:
     read: true
     delete: true
     listen: true
+    notify: true
 event:
   "*":
     publish: true