node-osc 8.0.11 → 8.1.0

package/.github/workflows/bump-version.yml

@@ -38,9 +38,9 @@ jobs:
         ssh-key: ${{ secrets.DEPLOY_KEY }}
 
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
-        node-version: '16'
+        node-version: 18
         cache: 'npm'
 
     - name: Install npm packages

package/.github/workflows/nodejs.yml

@@ -11,7 +11,7 @@ jobs:
   run-tests:
     strategy:
       matrix:
-        node-version: ['19', '18', '16', '14']
+        node-version: ['20', '18', '16', '14']
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     runs-on: ${{ matrix.os }}

package/dist/lib/Server.js

@@ -5,8 +5,12 @@ var node_events = require('node:events');
 var decode = require('./internal/decode.js');
 
 class Server extends node_events.EventEmitter {
-  constructor(port, host, cb) {
+  constructor(port, host='127.0.0.1', cb) {
     super();
+    if (typeof host === 'function') {
+      cb = host;
+      host = '127.0.0.1';
+    }
     if (!cb) cb = () => {};
     let decoded;
     this.port = port;
@@ -15,7 +19,7 @@ class Server extends node_events.EventEmitter {
       type: 'udp4',
       reuseAddr: true
     });
-    this._sock.bind(port);
+    this._sock.bind(port, host);
     this._sock.on('listening', () => {
       this.emit('listening');
       cb();

package/dist/test/test-server.js

@@ -14,8 +14,32 @@ tap.test('server: create and close', (t) => {
   });
 });
 
-tap.test('client: listen to message', (t) => {
-  const oscServer = new nodeOsc.Server(t.context.port, '127.0.0.1');
+tap.test('server: listen to message', (t) => {
+  const oscServer = new nodeOsc.Server(t.context.port);
+  const client = new nodeOsc.Client('127.0.0.1', t.context.port);
+
+  t.plan(3);
+
+  t.teardown(() => {
+    oscServer.close();
+    client.close();
+  });
+
+  oscServer.on('message', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+  
+  oscServer.on('/test', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+
+  client.send('/test', (err) => {
+    t.error(err, 'there should be no error');
+  });
+});
+
+tap.test('server: no defined host', (t) => {
+  const oscServer = new nodeOsc.Server(t.context.port);
   const client = new nodeOsc.Client('127.0.0.1', t.context.port);
 
   t.plan(3);
@@ -38,6 +62,31 @@ tap.test('client: listen to message', (t) => {
   });
 });
 
+tap.test('server: callback as second arg', (t) => {
+  t.plan(4);
+  const oscServer = new nodeOsc.Server(t.context.port, () => {
+    t.ok('callback called');
+  });
+  const client = new nodeOsc.Client('127.0.0.1', t.context.port);
+
+  t.teardown(() => {
+    oscServer.close();
+    client.close();
+  });
+
+  oscServer.on('message', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+  
+  oscServer.on('/test', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+
+  client.send('/test', (err) => {
+    t.error(err, 'there should be no error');
+  });
+});
+
 tap.test('server: bad message', (t) => {
   t.plan(2);
   const oscServer = new nodeOsc.Server(t.context.port, '127.0.0.1');

package/lib/Server.mjs

@@ -4,8 +4,12 @@ import { EventEmitter } from 'node:events';
 import decode from './internal/decode.mjs';
 
 class Server extends EventEmitter {
-  constructor(port, host, cb) {
+  constructor(port, host='127.0.0.1', cb) {
     super();
+    if (typeof host === 'function') {
+      cb = host;
+      host = '127.0.0.1';
+    }
     if (!cb) cb = () => {};
     let decoded;
     this.port = port;
@@ -14,7 +18,7 @@ class Server extends EventEmitter {
       type: 'udp4',
       reuseAddr: true
     });
-    this._sock.bind(port);
+    this._sock.bind(port, host);
     this._sock.on('listening', () => {
       this.emit('listening');
       cb();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-osc",
   "description": "pyOSC inspired library for sending and receiving OSC messages",
-  "version": "8.0.11",
+  "version": "8.1.0",
   "exports": {
     "require": "./dist/lib/index.js",
     "default": "./lib/index.mjs"
@@ -40,7 +40,7 @@
     "osc-min": "^1.1.1"
   },
   "devDependencies": {
-    "c8": "^7.13.0",
+    "c8": "^8.0.1",
     "eslint": "^8.36.0",
     "get-port": "^6.1.2",
     "rollup": "^3.20.1",

package/test/test-server.mjs

@@ -13,8 +13,32 @@ test('server: create and close', (t) => {
   });
 });
 
-test('client: listen to message', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
+test('server: listen to message', (t) => {
+  const oscServer = new Server(t.context.port);
+  const client = new Client('127.0.0.1', t.context.port);
+
+  t.plan(3);
+
+  t.teardown(() => {
+    oscServer.close();
+    client.close();
+  });
+
+  oscServer.on('message', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+  
+  oscServer.on('/test', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+
+  client.send('/test', (err) => {
+    t.error(err, 'there should be no error');
+  });
+});
+
+test('server: no defined host', (t) => {
+  const oscServer = new Server(t.context.port);
   const client = new Client('127.0.0.1', t.context.port);
 
   t.plan(3);
@@ -37,6 +61,31 @@ test('client: listen to message', (t) => {
   });
 });
 
+test('server: callback as second arg', (t) => {
+  t.plan(4);
+  const oscServer = new Server(t.context.port, () => {
+    t.ok('callback called');
+  });
+  const client = new Client('127.0.0.1', t.context.port);
+
+  t.teardown(() => {
+    oscServer.close();
+    client.close();
+  });
+
+  oscServer.on('message', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+  
+  oscServer.on('/test', (msg) => {
+    t.same(msg, ['/test'], 'We should receive expected payload');
+  });
+
+  client.send('/test', (err) => {
+    t.error(err, 'there should be no error');
+  });
+});
+
 test('server: bad message', (t) => {
   t.plan(2);
   const oscServer = new Server(t.context.port, '127.0.0.1');