node-osc 11.2.1 → 11.2.2

package/test/test-client.mjs

@@ -1,13 +1,12 @@
-import { beforeEach, test } from 'tap';
-import { bootstrap } from './util.mjs';
+import { once } from 'node:events';
+import { test } from 'tap';
 
 import { Server, Client } from 'node-osc';
 
-beforeEach(bootstrap);
-
-test('client: with array', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: with array', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -22,9 +21,10 @@ test('client: with array', (t) => {
   });
 });
 
-test('client: array is not mutated when sent', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: array is not mutated when sent', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(3);
 
@@ -44,9 +44,10 @@ test('client: array is not mutated when sent', (t) => {
   });
 });
 
-test('client: with string', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: with string', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -61,9 +62,10 @@ test('client: with string', (t) => {
   });
 });
 
-test('client: with Message object', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: with Message object', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -87,9 +89,10 @@ test('client: with Message object', (t) => {
   });
 });
 
-test('client: with Bundle object', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: with Bundle object', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -113,8 +116,8 @@ test('client: with Bundle object', (t) => {
   });
 });
 
-test('client: failure', (t) => {
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: failure', async (t) => {
+  const client = new Client('127.0.0.1', 9999);
 
   t.plan(2);
 
@@ -129,8 +132,8 @@ test('client: failure', (t) => {
   });
 });
 
-test('client: close with callback', (t) => {
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: close with callback', async (t) => {
+  const client = new Client('127.0.0.1', 9999);
 
   t.plan(1);
 
@@ -139,9 +142,10 @@ test('client: close with callback', (t) => {
   });
 });
 
-test('client: send bundle with non-numeric timetag', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: send bundle with non-numeric timetag', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -168,9 +172,10 @@ test('client: send bundle with non-numeric timetag', (t) => {
   client.send(bundle);
 });
 
-test('client: send bundle with null timetag', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: send bundle with null timetag', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -197,9 +202,10 @@ test('client: send bundle with null timetag', (t) => {
   client.send(bundle);
 });
 
-test('client: send message with float type arg', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: send message with float type arg', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -218,9 +224,10 @@ test('client: send message with float type arg', (t) => {
   });
 });
 
-test('client: send message with blob type arg', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: send message with blob type arg', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -239,9 +246,10 @@ test('client: send message with blob type arg', (t) => {
   });
 });
 
-test('client: send message with double type arg', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: send message with double type arg', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 
@@ -260,9 +268,10 @@ test('client: send message with double type arg', (t) => {
   });
 });
 
-test('client: send message with midi type arg', (t) => {
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+test('client: send message with midi type arg', async (t) => {
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 

package/test/test-decode.mjs

@@ -106,3 +106,38 @@ test('decode: malformed structure with unexpected oscType', async (t) => {
   
   t.end();
 });
+
+test('decode: message without args defaults to empty array', (t) => {
+  const mockFromBuffer = () => ({
+    oscType: 'message',
+    address: '/test'
+  });
+
+  t.same(
+    decode(Buffer.from('test'), mockFromBuffer),
+    ['/test'],
+    'should default args to empty array'
+  );
+  t.end();
+});
+
+test('decode: bundle element must be message or bundle', (t) => {
+  const mockFromBuffer = () => ({
+    oscType: 'bundle',
+    elements: [
+      {
+        oscType: 'message',
+        address: '/ok',
+        args: []
+      },
+      {
+        oscType: 'nope'
+      }
+    ]
+  });
+
+  t.throws(() => {
+    decode(Buffer.from('test'), mockFromBuffer);
+  }, /Malformed Packet/, 'should throw for invalid bundle element');
+  t.end();
+});

package/test/test-e2e.mjs

@@ -1,10 +1,8 @@
-import { beforeEach, test } from 'tap';
-import { bootstrap } from './util.mjs';
+import { once } from 'node:events';
+import { test } from 'tap';
 
 import { Server, Client } from 'node-osc';
 
-beforeEach(bootstrap);
-
 function flaky() {
   return process.release.lts === 'Dubnium' && process.platform === 'win32';
 }
@@ -14,11 +12,12 @@ function skip(t) {
   t.end();
 }
 
-test('osc: argument message no callback', (t) => {
+test('osc: argument message no callback', async (t) => {
   if (flaky()) return skip(t);
 
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(1);
 
@@ -34,11 +33,12 @@ test('osc: argument message no callback', (t) => {
   client.send('/test', 1, 2, 'testing');
 });
 
-test('osc: client with callback and message as arguments', (t) => {
+test('osc: client with callback and message as arguments', async (t) => {
   if (flaky()) return skip(t);
 
-  const oscServer = new Server(t.context.port, '127.0.0.1');
-  const client = new Client('127.0.0.1', t.context.port);
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
+  const client = new Client('127.0.0.1', oscServer.port);
 
   t.plan(2);
 

package/test/test-encode-decode.mjs

@@ -293,6 +293,102 @@ test('decode: error on malformed type tags (no leading comma)', (t) => {
   t.end();
 });
 
+test('decode: error on truncated blob data', (t) => {
+  const addressBuf = Buffer.from('/b\0\0', 'ascii');
+  const typeTagsBuf = Buffer.from(',b\0\0', 'ascii');
+  const lengthBuf = Buffer.alloc(4);
+  lengthBuf.writeInt32BE(4, 0);
+  const dataBuf = Buffer.from([0x01, 0x02]);
+  const buffer = Buffer.concat([addressBuf, typeTagsBuf, lengthBuf, dataBuf]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet: Not enough bytes for blob/, 'should throw when blob data is truncated');
+
+  t.end();
+});
+
+test('decode: error on missing blob padding', (t) => {
+  const addressBuf = Buffer.from('/b\0\0', 'ascii');
+  const typeTagsBuf = Buffer.from(',b\0\0', 'ascii');
+  const lengthBuf = Buffer.alloc(4);
+  lengthBuf.writeInt32BE(3, 0);
+  const dataBuf = Buffer.from([0x01, 0x02, 0x03]);
+  const buffer = Buffer.concat([addressBuf, typeTagsBuf, lengthBuf, dataBuf]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet: Not enough bytes for blob padding/, 'should throw when blob padding is missing');
+
+  t.end();
+});
+
+test('decode: error on truncated float32', (t) => {
+  const addressBuf = Buffer.from('/f\0\0', 'ascii');
+  const typeTagsBuf = Buffer.from(',f\0\0', 'ascii');
+  const dataBuf = Buffer.from([0x3f, 0x80, 0x00]);
+  const buffer = Buffer.concat([addressBuf, typeTagsBuf, dataBuf]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet: Not enough bytes for float32/, 'should throw when float32 data is truncated');
+
+  t.end();
+});
+
+test('decode: error on truncated int32', (t) => {
+  const addressBuf = Buffer.from('/i\0\0', 'ascii');
+  const typeTagsBuf = Buffer.from(',i\0\0', 'ascii');
+  const dataBuf = Buffer.from([0x00, 0x01]);
+  const buffer = Buffer.concat([addressBuf, typeTagsBuf, dataBuf]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet: Not enough bytes for int32/, 'should throw when int32 data is truncated');
+
+  t.end();
+});
+
+test('decode: error on negative blob length', (t) => {
+  const addressBuf = Buffer.from('/b\0\0', 'ascii');
+  const typeTagsBuf = Buffer.from(',b\0\0', 'ascii');
+  const lengthBuf = Buffer.alloc(4);
+  lengthBuf.writeInt32BE(-1, 0);
+  const buffer = Buffer.concat([addressBuf, typeTagsBuf, lengthBuf]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet: Invalid blob length/, 'should throw when blob length is negative');
+
+  t.end();
+});
+
+test('decode: error on bundle element size overflow', (t) => {
+  const bundleHeader = Buffer.from('#bundle\0', 'ascii');
+  const timetag = Buffer.alloc(8);
+  const sizeBuf = Buffer.alloc(4);
+  sizeBuf.writeInt32BE(0, 0);
+  const buffer = Buffer.concat([bundleHeader, timetag, sizeBuf]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet/, 'should throw when bundle element size is invalid');
+
+  t.end();
+});
+
+test('decode: error on truncated bundle timetag', (t) => {
+  const bundleHeader = Buffer.from('#bundle\0', 'ascii');
+  const timetag = Buffer.alloc(4);
+  const buffer = Buffer.concat([bundleHeader, timetag]);
+
+  t.throws(() => {
+    decode(buffer);
+  }, /Malformed Packet: Not enough bytes for timetag/, 'should throw when timetag is truncated');
+
+  t.end();
+});
+
 test('encode and decode: nested bundle with message and bundle elements', (t) => {
   // Test the else branch in encodeBundleToBuffer for message elements
   const innerBundle = new Bundle(['/inner/message', 123]);

package/test/test-error-handling.mjs

@@ -1,13 +1,12 @@
-import { beforeEach, test } from 'tap';
-import { bootstrap } from './util.mjs';
+import { once } from 'node:events';
+import { test } from 'tap';
 
 import { Server, Client } from 'node-osc';
 
-beforeEach(bootstrap);
-
-test('server: socket error event is emitted', (t) => {
+test('server: socket error event is emitted', async (t) => {
   t.plan(1);
-  const oscServer = new Server(t.context.port, '127.0.0.1');
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
   
   oscServer.on('error', (err) => {
     t.ok(err, 'error event should be emitted');
@@ -18,9 +17,10 @@ test('server: socket error event is emitted', (t) => {
   oscServer._sock.emit('error', new Error('test socket error'));
 });
 
-test('server: error listener can be added before listening', (t) => {
+test('server: error listener can be added before listening', async (t) => {
   t.plan(2);
-  const oscServer = new Server(t.context.port, '127.0.0.1');
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
   
   oscServer.on('error', (err) => {
     t.ok(err, 'error event should be emitted');
@@ -37,7 +37,7 @@ test('server: error listener can be added before listening', (t) => {
 
 test('client: socket error event is emitted', (t) => {
   t.plan(1);
-  const client = new Client('127.0.0.1', t.context.port);
+  const client = new Client('127.0.0.1', 9999);
   
   client.on('error', (err) => {
     t.ok(err, 'error event should be emitted');
@@ -50,7 +50,7 @@ test('client: socket error event is emitted', (t) => {
 
 test('client: error listener can be added at construction', (t) => {
   t.plan(2);
-  const client = new Client('127.0.0.1', t.context.port);
+  const client = new Client('127.0.0.1', 9999);
   
   client.on('error', (err) => {
     t.ok(err, 'error event should be emitted');
@@ -67,16 +67,17 @@ test('client: error listener can be added at construction', (t) => {
 
 test('client: is an EventEmitter instance', (t) => {
   t.plan(1);
-  const client = new Client('127.0.0.1', t.context.port);
+  const client = new Client('127.0.0.1', 9999);
   
   t.ok(typeof client.on === 'function', 'client should have EventEmitter methods');
   
   client.close();
 });
 
-test('server: multiple error listeners can be attached', (t) => {
+test('server: multiple error listeners can be attached', async (t) => {
   t.plan(2);
-  const oscServer = new Server(t.context.port, '127.0.0.1');
+  const oscServer = new Server(0, '127.0.0.1');
+  await once(oscServer, 'listening');
   
   oscServer.on('error', (err) => {
     t.ok(err, 'first listener should receive error');
@@ -96,7 +97,7 @@ test('server: multiple error listeners can be attached', (t) => {
 
 test('client: multiple error listeners can be attached', (t) => {
   t.plan(2);
-  const client = new Client('127.0.0.1', t.context.port);
+  const client = new Client('127.0.0.1', 9999);
   
   client.on('error', (err) => {
     t.ok(err, 'first listener should receive error');