bump @jwetzell/osc to v1.4.0

fix bundle minimum size check

.github/workflows/check-makeosc-build.yml

@@ -1,25 +0,0 @@
-name: Check makeosc builds
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'apps/makeosc/**'
-jobs:
-  build-webui:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - name: Set up Node.js
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: 'package-lock.json'
-
-      - name: Install Node.js dependencies
-        run: npm ci --workspace makeosc
-
-      - run: npm run build --workspace makeosc

.github/workflows/check-readosc-build.yml

@@ -1,25 +0,0 @@
-name: Check readosc builds
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'apps/readosc/**'
-jobs:
-  build-webui:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - name: Set up Node.js
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: 'package-lock.json'
-
-      - name: Install Node.js dependencies
-        run: npm ci --workspace readosc
-
-      - run: npm run build --workspace readosc

.github/workflows/check-sendosc-build.yml

@@ -1,25 +0,0 @@
-name: Check sendosc builds
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'apps/sendosc/**'
-jobs:
-  build-webui:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - name: Set up Node.js
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
-        with:
-          node-version-file: '.nvmrc'
-          cache: 'npm'
-          cache-dependency-path: 'package-lock.json'
-
-      - name: Install Node.js dependencies
-        run: npm ci --workspace sendosc
-
-      - run: npm run build --workspace sendosc

.npmrc

@@ -0,0 +1 @@
+git-tag-version=false

apps/makeosc/package.json

@@ -21,7 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "@jwetzell/osc": "0.2.2",
-    "commander": "^11.0.0",
+    "commander": "^12.1.0",
     "slip": "^1.0.2"
   }
 }

apps/readosc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "readosc",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Simple NodeJS utility for parsing osc buffers from stdin",
   "main": "src/main.js",
   "bin": {
@@ -20,7 +20,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jwetzell/osc": "0.2.2",
-    "commander": "^11.0.0"
+    "@jwetzell/osc": "1.0.0",
+    "commander": "^12.1.0"
   }
 }

apps/readosc/src/main.js

@@ -10,8 +10,16 @@ program.description('simple util to read osc packets from stdin');
 program.action(() => {
   process.stdin.on('data', (data) => {
     try {
-      const message = osc.messageFromBuffer(data);
-      console.log(JSON.stringify(message));
+      let remainingBytes = data;
+      while (remainingBytes.length > 0) {
+        try {
+          const [message, bytesAfterMessage] = osc.messageFromBuffer(remainingBytes);
+          remainingBytes = bytesAfterMessage;
+          console.log(JSON.stringify(message));
+        } catch (error) {
+          console.error({ error: error.toString() });
+        }
+      }
     } catch (error) {
       console.error({ error: error.toString() });
     }

apps/sendosc/package.json

@@ -21,7 +21,7 @@
   "license": "MIT",
   "dependencies": {
     "@jwetzell/osc": "0.2.2",
-    "commander": "^11.0.0",
+    "commander": "^12.1.0",
     "slip": "^1.0.2"
   }
 }

package-lock.json

@@ -23,36 +23,51 @@
       "license": "MIT",
       "dependencies": {
         "@jwetzell/osc": "0.2.2",
-        "commander": "^11.0.0",
+        "commander": "^12.1.0",
         "slip": "^1.0.2"
       },
       "bin": {
         "makeosc": "src/main.js"
       }
     },
+    "apps/makeosc/node_modules/@jwetzell/osc": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jwetzell/osc/-/osc-0.2.2.tgz",
+      "integrity": "sha512-HobCAMnDDSrKfrMBrF5ySA8fKO8Qjkn2HDKysuV51sHrpXABKJFQt5OemIQgbnSMNWU0kZ0+FF9xRrivHHaDTg=="
+    },
     "apps/readosc": {
-      "version": "0.1.0",
+      "version": "0.2.0",
       "license": "MIT",
       "dependencies": {
-        "@jwetzell/osc": "0.2.2",
-        "commander": "^11.0.0"
+        "@jwetzell/osc": "1.0.0",
+        "commander": "^12.1.0"
       },
       "bin": {
         "readosc": "src/main.js"
       }
     },
+    "apps/readosc/node_modules/@jwetzell/osc": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@jwetzell/osc/-/osc-1.0.0.tgz",
+      "integrity": "sha512-242gA8R4k9vBbRJydqoKAG1WiQ9BUO6tFoemuC3eywRt5ns5qrlzIBEIwX0poQyMZdZB7XyzvR5rtbFC5tadKg=="
+    },
     "apps/sendosc": {
       "version": "1.0.1",
       "license": "MIT",
       "dependencies": {
         "@jwetzell/osc": "0.2.2",
-        "commander": "^11.0.0",
+        "commander": "^12.1.0",
         "slip": "^1.0.2"
       },
       "bin": {
         "sendosc": "src/main.js"
       }
     },
+    "apps/sendosc/node_modules/@jwetzell/osc": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@jwetzell/osc/-/osc-0.2.2.tgz",
+      "integrity": "sha512-HobCAMnDDSrKfrMBrF5ySA8fKO8Qjkn2HDKysuV51sHrpXABKJFQt5OemIQgbnSMNWU0kZ0+FF9xRrivHHaDTg=="
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "dev": true,
@@ -240,9 +255,10 @@
       "peer": true
     },
     "node_modules/@types/node": {
-      "version": "22.7.4",
+      "version": "22.7.5",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
+      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
       }
@@ -596,10 +612,11 @@
       "license": "MIT"
     },
     "node_modules/commander": {
-      "version": "11.1.0",
-      "license": "MIT",
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+      "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
       "engines": {
-        "node": ">=16"
+        "node": ">=18"
       }
     },
     "node_modules/concat-map": {
@@ -3391,9 +3408,10 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.6.2",
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
+      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -3633,12 +3651,12 @@
     },
     "packages/osc": {
       "name": "@jwetzell/osc",
-      "version": "0.2.2",
+      "version": "1.4.0",
       "license": "MIT",
       "devDependencies": {
-        "@types/node": "22.7.4",
+        "@types/node": "22.7.5",
         "rimraf": "6.0.1",
-        "typescript": "5.6.2"
+        "typescript": "5.6.3"
       }
     }
   }

packages/osc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwetzell/osc",
-  "version": "0.2.2",
+  "version": "1.4.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -25,8 +25,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "22.7.4",
+    "@types/node": "22.7.5",
     "rimraf": "6.0.1",
-    "typescript": "5.6.2"
+    "typescript": "5.6.3"
   }
 }

packages/osc/src/bundle.ts

@@ -2,12 +2,12 @@ import { messageFromBuffer, messageToBuffer } from './message';
 import { OSCBundle } from './models';
 import { oscTypeConverterMap } from './osc-types';
 
-export function bundleFromBuffer(bytes: Buffer): OSCBundle | undefined {
-  if (bytes.length < 8) {
+export function bundleFromBuffer(bytes: Uint8Array): [OSCBundle | undefined, Uint8Array | undefined] {
+  if (bytes.length < 20) {
     throw new Error('bundle has to be at least 20 bytes');
   }
 
-  if (bytes.subarray(0, 7).toString('ascii') !== '#bundle') {
+  if (new TextDecoder().decode(bytes.subarray(0, 7)) !== '#bundle') {
     throw new Error('bundle must start with #bundle');
   }
 
@@ -22,44 +22,55 @@ export function bundleFromBuffer(bytes: Buffer): OSCBundle | undefined {
 
   let endOfBundle = false;
 
-  let [contentSize, remainingBytes] = oscTypeConverterMap.i.fromBuffer(bytesAfterTimeTag);
-  if (typeof contentSize === 'number') {
-    while (!endOfBundle) {
-      if (remainingBytes.length < contentSize) {
-        throw new Error('bundle does not contain enough data');
-      }
+  // let [contentSize, remainingBytes] = oscTypeConverterMap.i.fromBuffer(bytesAfterTimeTag);
+  let remainingBytes = bytesAfterTimeTag;
 
-      const bundleContentBytes = remainingBytes.subarray(0, contentSize);
+  while (!endOfBundle) {
+    let [contentSize, bytesAfterContentSize] = oscTypeConverterMap.i.fromBuffer(remainingBytes);
 
-      if (bundleContentBytes[0] === 35) {
-        // # character indicating contents is a bundle
-        const content = bundleFromBuffer(bundleContentBytes);
-        if (content) {
-          bundleContents.push(content);
-        }
-      } else if (bundleContentBytes[0] === 47) {
-        const content = messageFromBuffer(bundleContentBytes);
-        if (content) {
-          bundleContents.push(content);
-        }
-      } else {
-        throw new Error('bundle contents does not look like a OSC message or bundle');
-      }
+    if (typeof contentSize !== 'number') {
+      throw new Error('problem decoding content size');
+    }
 
-      remainingBytes = remainingBytes.subarray(contentSize);
-      if (remainingBytes.length === 0) {
-        endOfBundle = true;
+    remainingBytes = bytesAfterContentSize;
+
+    if (remainingBytes.length < contentSize) {
+      throw new Error('bundle does not contain enough data');
+    }
+
+    const bundleContentBytes = bytesAfterContentSize.subarray(0, contentSize);
+
+    if (bundleContentBytes[0] === 35) {
+      // # character indicating contents is a bundle
+      const [content, bytesAfterContent] = bundleFromBuffer(bundleContentBytes);
+      if (content) {
+        bundleContents.push(content);
       }
+    } else if (bundleContentBytes[0] === 47) {
+      const [content, bytesAfterContent] = messageFromBuffer(bundleContentBytes);
+      if (content && content !== undefined) {
+        bundleContents.push(content);
+      }
+    } else {
+      throw new Error('bundle contents does not look like a OSC message or bundle');
+    }
+
+    remainingBytes = bytesAfterContentSize.subarray(contentSize);
+    if (remainingBytes.length === 0) {
+      endOfBundle = true;
     }
   }
 
-  return {
-    timeTag,
-    contents: bundleContents,
-  };
+  return [
+    {
+      timeTag,
+      contents: bundleContents,
+    },
+    remainingBytes,
+  ];
 }
 
-export function bundleToBuffer(bundle: OSCBundle): Buffer {
+export function bundleToBuffer(bundle: OSCBundle): Uint8Array {
   const headerBuffer = oscTypeConverterMap.s.toBuffer('#bundle');
 
   if (headerBuffer === undefined) {
@@ -72,7 +83,9 @@ export function bundleToBuffer(bundle: OSCBundle): Buffer {
     throw new Error('problem encoding buffer time tag');
   }
 
-  const contentsBuffers: Buffer[] = [];
+  const contentsBuffers: Uint8Array[] = [];
+
+  let contentsBuffersTotalLength = 0;
 
   bundle.contents.forEach((bundleContent) => {
     if ('address' in bundleContent) {
@@ -80,10 +93,25 @@ export function bundleToBuffer(bundle: OSCBundle): Buffer {
       const contentSizeBuffer = oscTypeConverterMap.i.toBuffer(contentBuffer.length);
 
       if (contentBuffer && contentSizeBuffer) {
-        contentsBuffers.push(Buffer.concat([contentSizeBuffer, contentBuffer]));
+        const buffer = new Uint8Array(contentSizeBuffer.length + contentBuffer.length);
+        buffer.set(contentSizeBuffer, 0);
+        buffer.set(contentBuffer, contentSizeBuffer.length);
+        contentsBuffers.push(buffer);
+        contentsBuffersTotalLength += buffer.length;
       }
     }
   });
 
-  return Buffer.concat([headerBuffer, timeTagBuffer, ...contentsBuffers]);
+  const buffer = new Uint8Array(headerBuffer.length + timeTagBuffer.length + contentsBuffersTotalLength);
+  let offset = 0;
+  buffer.set(headerBuffer, offset);
+  offset += headerBuffer.length;
+  buffer.set(timeTagBuffer, offset);
+  offset += timeTagBuffer.length;
+  contentsBuffers.forEach((contentBuffer) => {
+    buffer.set(contentBuffer, offset);
+    offset += contentBuffer.length;
+  });
+
+  return buffer;
 }

packages/osc/src/message.ts

@@ -2,7 +2,8 @@ import { OSCMessage, OSCArg, OSCType } from './models';
 import { oscTypeConverterMap } from './osc-types';
 
 function argsToBuffer(args: OSCArg[]) {
-  const argBuffers: Buffer[] = [];
+  const argBuffers: Uint8Array[] = [];
+  let argBuffersTotalLength = 0;
 
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
@@ -14,44 +15,108 @@ function argsToBuffer(args: OSCArg[]) {
     const buffer = typeConverter.toBuffer(arg.value);
     if (buffer !== undefined) {
       argBuffers.push(buffer);
+      argBuffersTotalLength += buffer.length;
     }
   }
-  return Buffer.concat(argBuffers);
+  const buffer = new Uint8Array(argBuffersTotalLength);
+  let offset = 0;
+  argBuffers.forEach((argBuffer) => {
+    buffer.set(argBuffer, offset);
+    offset += argBuffer.length;
+  });
+  return buffer;
 }
 
-export function messageToBuffer(message: OSCMessage): Buffer {
+export function messageToBuffer(message: OSCMessage): Uint8Array {
+  if (!message.address.startsWith('/')) {
+    throw new Error('osc message must start with a /');
+  }
+
   const addressBuffer = oscTypeConverterMap.s.toBuffer(message.address);
   if (addressBuffer === undefined) {
     throw new Error('problem encoding address');
   }
 
-  const typeString = message.args.map((arg) => arg.type).join('');
-  const typesBuffer = oscTypeConverterMap.s.toBuffer(`,${typeString}`);
+  let typeString = ',';
+
+  const flatOSCArgs: OSCArg[] = [];
+
+  message.args.forEach((oscArg) => {
+    if (Array.isArray(oscArg)) {
+      typeString += '[';
+      oscArg.forEach((oscArg) => {
+        typeString += oscArg.type;
+        flatOSCArgs.push(oscArg);
+      });
+      typeString += ']';
+    } else {
+      typeString += oscArg.type;
+      flatOSCArgs.push(oscArg);
+    }
+  });
+
+  const typesBuffer = oscTypeConverterMap.s.toBuffer(typeString);
   if (typesBuffer === undefined) {
     throw new Error('problem encoding types');
   }
-  const argsBuffer = argsToBuffer(message.args);
-  return Buffer.concat([addressBuffer, typesBuffer, argsBuffer]);
+  const argsBuffer = argsToBuffer(flatOSCArgs);
+  const buffer = new Uint8Array(addressBuffer.length + typesBuffer.length + argsBuffer.length);
+  buffer.set(addressBuffer, 0);
+  buffer.set(typesBuffer, addressBuffer.length);
+  buffer.set(argsBuffer, addressBuffer.length + typesBuffer.length);
+  return buffer;
 }
 
-export function messageFromBuffer(bytes: Buffer): OSCMessage | undefined {
+export function messageFromBuffer(bytes: Uint8Array): [OSCMessage | undefined, Uint8Array | undefined] {
   if (bytes[0] !== 47) {
     throw new Error('osc message must start with a /');
   }
 
-  const oscArgs: OSCArg[] = [];
+  const oscArgs: (OSCArg | OSCArg[])[] = [];
 
   const [address, bytesAfterAddress] = oscTypeConverterMap.s.fromBuffer(bytes);
   if (typeof address === 'string') {
+    if (bytesAfterAddress.length === 0) {
+      // NOTE(jwetzell): OSC 1.0 spec says that messages without a type string should be allowed
+      return [
+        {
+          address,
+          args: [],
+        },
+        bytesAfterAddress,
+      ];
+    }
+
     let [typeString, bytesAfterType] = oscTypeConverterMap.s.fromBuffer(bytesAfterAddress);
     if (typeof typeString === 'string') {
       if (!typeString.startsWith(',')) {
         throw new Error('osc type string must start with a ,');
       }
       let argsBuffer = bytesAfterType;
+      let oscArrayArg: OSCArg[] = [];
+      let insideArgArray = false;
       for (let index = 1; index < typeString.length; index++) {
         const argType = typeString.charAt(index) as OSCType;
 
+        if (argType === '[') {
+          if (insideArgArray) {
+            throw new Error('osc arg array opened without closing previous arg array');
+          }
+          oscArrayArg = [];
+          insideArgArray = true;
+          continue;
+        }
+
+        if (argType === ']') {
+          if (!insideArgArray) {
+            throw new Error('osc arg array closed without opening arg array');
+          }
+          oscArgs.push(oscArrayArg);
+          oscArrayArg = [];
+          insideArgArray = false;
+          continue;
+        }
+
         const oscTypeConverter = oscTypeConverterMap[argType];
         if (oscTypeConverter === undefined) {
           throw new Error('unknown OSC type');
@@ -62,15 +127,22 @@ export function messageFromBuffer(bytes: Buffer): OSCMessage | undefined {
             type: argType,
             value: value,
           };
-          oscArgs.push(arg);
+          if (insideArgArray) {
+            oscArrayArg.push(arg);
+          } else {
+            oscArgs.push(arg);
+          }
         }
         argsBuffer = remainingBytes;
       }
-
-      return {
-        address,
-        args: oscArgs,
-      };
+      return [
+        {
+          address,
+          args: oscArgs,
+        },
+        argsBuffer,
+      ];
     }
   }
+  return [undefined, undefined];
 }

packages/osc/src/models.ts

@@ -1,11 +1,18 @@
-export type OSCType = 's' | 'i' | 'f' | 'b' | 'T' | 'F' | 't';
+export type OSCType = 's' | 'i' | 'f' | 'b' | 'T' | 'F' | 't' | 'r' | 'N' | '[' | ']';
 export type OSCArg = {
   type: OSCType;
-  value: string | number | Buffer | boolean | OSCTimeTag;
+  value: string | number | Uint8Array | boolean | OSCTimeTag | OSCColor | bigint | null;
 };
 
 export type OSCTimeTag = [number, number];
 
+export type OSCColor = {
+  r: number;
+  g: number;
+  b: number;
+  a: number;
+};
+
 export type OSCBundle = {
   timeTag: OSCTimeTag;
   contents: (OSCBundle | OSCMessage)[];
@@ -13,10 +20,14 @@ export type OSCBundle = {
 
 export type OSCMessage = {
   address: string;
-  args: OSCArg[];
+  args: (OSCArg | OSCArg[])[];
 };
 
 export type OSCTypeConverter = {
-  toBuffer: (value: string | number | Buffer | boolean | OSCTimeTag) => Buffer | undefined;
-  fromBuffer: (buffer: Buffer) => [string | number | Buffer | boolean | OSCTimeTag | undefined, Buffer];
+  toBuffer: (
+    value: string | number | Uint8Array | boolean | OSCTimeTag | OSCColor | null | bigint
+  ) => Uint8Array | undefined;
+  fromBuffer: (
+    buffer: Uint8Array
+  ) => [string | number | Uint8Array | boolean | OSCTimeTag | OSCColor | null | bigint | undefined, Uint8Array];
 };

packages/osc/src/osc-types.ts

@@ -1,4 +1,4 @@
-import { OSCType, OSCArg, OSCMessage, OSCTypeConverter, OSCBundle, OSCTimeTag } from './models';
+import { OSCTypeConverter, OSCTimeTag } from './models';
 
 export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
   s: {
@@ -9,11 +9,11 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
         if (padSize < 4) {
           oscString = oscString.padEnd(oscString.length + padSize, '\u0000');
         }
-        return Buffer.from(oscString, 'ascii');
+        return new TextEncoder().encode(oscString);
       }
       throw new TypeError('osc type s toBuffer called with non string value');
     },
-    fromBuffer: (bytes: Buffer) => {
+    fromBuffer: (bytes) => {
       let stringEnd = 0;
       let stringPaddingEnd = 0;
       for (let index = 0; index < bytes.length; index++) {
@@ -29,15 +29,15 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
         }
       }
 
-      return [bytes.toString('ascii', 0, stringEnd), bytes.subarray(stringPaddingEnd)];
+      return [new TextDecoder().decode(bytes.subarray(0, stringEnd)), bytes.subarray(stringPaddingEnd)];
     },
   },
   f: {
     toBuffer: (number) => {
       if (typeof number === 'number') {
-        const buffer = Buffer.alloc(4);
-        buffer.writeFloatBE(number);
-        return buffer;
+        const view = new DataView(new ArrayBuffer(4));
+        view.setFloat32(0, number);
+        return new Uint8Array(view.buffer);
       }
       throw new TypeError('osc type f toBuffer called with non number value');
     },
@@ -45,17 +45,22 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
       if (buffer.length < 4) {
         throw new Error('not enough bytes to read a osc float');
       }
+      const view = new DataView(new ArrayBuffer(4));
 
-      const value = buffer.readFloatBE();
+      buffer.slice(0, 4).forEach((byte, index) => {
+        view.setUint8(index, byte);
+      });
+
+      const value = view.getFloat32(0);
       return [value, buffer.subarray(4)];
     },
   },
   i: {
     toBuffer: (number) => {
       if (typeof number === 'number') {
-        const buffer = Buffer.alloc(4);
-        buffer.writeInt32BE(number);
-        return buffer;
+        const view = new DataView(new ArrayBuffer(4));
+        view.setInt32(0, number);
+        return new Uint8Array(view.buffer);
       }
       throw new TypeError('osc type i toBuffer called with non number value');
     },
@@ -64,21 +69,33 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
         throw new Error('not enough bytes to read a osc integer');
       }
 
-      const value = buffer.readInt32BE();
+      const view = new DataView(new ArrayBuffer(4));
+
+      buffer.slice(0, 4).forEach((byte, index) => {
+        view.setUint8(index, byte);
+      });
+
+      const value = view.getInt32(0);
       return [value, buffer.subarray(4)];
     },
   },
   b: {
     toBuffer: (data) => {
-      if (Buffer.isBuffer(data)) {
+      if (data instanceof Uint8Array) {
         const sizeBuffer = oscTypeConverterMap.i.toBuffer(data.length);
         if (sizeBuffer) {
-          const padSize = 4 - (data.length % 4);
-          const padBuffer = padSize < 4 ? Buffer.from(Array(padSize).fill(0)) : Buffer.from([]);
-          return Buffer.concat([sizeBuffer, data, padBuffer]);
+          let padSize = 4 - (data.length % 4);
+          if (padSize === 4) {
+            padSize = 0;
+          }
+
+          const buffer = new Uint8Array(4 + data.length + padSize);
+          buffer.set(sizeBuffer);
+          buffer.set(data, 4);
+          return buffer;
         }
       }
-      throw new TypeError('osc type b toBuffer called with non Buffer value');
+      throw new TypeError('osc type b toBuffer called with non Uint8Array value');
     },
     fromBuffer: (buffer) => {
       const [blobLength, blobBytes] = oscTypeConverterMap.i.fromBuffer(buffer);
@@ -97,7 +114,7 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
   },
   T: {
     toBuffer: () => {
-      return Buffer.alloc(0);
+      return new Uint8Array(0);
     },
     fromBuffer: (buffer) => {
       return [true, buffer];
@@ -105,7 +122,7 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
   },
   F: {
     toBuffer: () => {
-      return Buffer.alloc(0);
+      return new Uint8Array(0);
     },
     fromBuffer: (buffer) => {
       return [false, buffer];
@@ -135,12 +152,15 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
       const fractionalBuffer = oscTypeConverterMap.i.toBuffer(fractional);
 
       if (secondsBuffer && fractionalBuffer) {
-        return Buffer.concat([secondsBuffer, fractionalBuffer]);
+        const buffer = new Uint8Array(8);
+        buffer.set(secondsBuffer);
+        buffer.set(fractionalBuffer, 4);
+        return buffer;
       }
     },
     fromBuffer: (buffer) => {
       if (buffer.length < 8) {
-        throw new Error('osc time tag must be greater than 8 bytes');
+        throw new Error('osc time tag must be at least 8 bytes');
       }
       const [seconds, bytesAfterSeconds] = oscTypeConverterMap.i.fromBuffer(buffer);
       const [fractional, bytesAfterFractional] = oscTypeConverterMap.i.fromBuffer(bytesAfterSeconds);
@@ -151,4 +171,118 @@ export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
       return [undefined, bytesAfterFractional];
     },
   },
+  r: {
+    toBuffer: (color) => {
+      if (color === undefined || color === null) {
+        throw new TypeError('osc type r called with undefined or null value');
+      }
+
+      if (typeof color === 'object' && 'r' in color && 'g' in color && 'b' in color && 'a' in color) {
+        const view = new DataView(new ArrayBuffer(4));
+
+        view.setUint8(0, color.r);
+        view.setUint8(1, color.g);
+        view.setUint8(2, color.b);
+        view.setUint8(3, color.a);
+
+        return new Uint8Array(view.buffer);
+      }
+      throw new TypeError('osc type r called with non OSCColor object');
+    },
+    fromBuffer: (buffer) => {
+      if (buffer.length < 4) {
+        throw new Error('osc color must be at least 4 bytes');
+      }
+
+      const red = buffer[0];
+      const green = buffer[1];
+      const blue = buffer[2];
+      const alpha = buffer[3];
+
+      if (red !== undefined && green !== undefined && blue !== undefined && alpha !== undefined) {
+        if (
+          typeof red === 'number' &&
+          typeof green === 'number' &&
+          typeof blue === 'number' &&
+          typeof alpha === 'number'
+        ) {
+          return [
+            {
+              r: red,
+              g: green,
+              b: blue,
+              a: alpha,
+            },
+            buffer.subarray(4),
+          ];
+        }
+      }
+      throw new Error('problem converting osc ');
+    },
+  },
+  N: {
+    toBuffer: () => {
+      return new Uint8Array(0);
+    },
+    fromBuffer: (buffer) => {
+      return [null, buffer];
+    },
+  },
+  I: {
+    toBuffer: () => {
+      return new Uint8Array();
+    },
+    fromBuffer: (buffer) => {
+      return [Number.MAX_SAFE_INTEGER, buffer];
+    },
+  },
+  h: {
+    toBuffer: (number) => {
+      const view = new DataView(new ArrayBuffer(8));
+
+      if (typeof number === 'number') {
+        view.setBigInt64(0, BigInt(number));
+      } else if (typeof number === 'bigint') {
+        view.setBigInt64(0, number);
+      } else {
+        throw new TypeError('osc type h toBuffer called with non number or bigint value');
+      }
+      return new Uint8Array(view.buffer);
+    },
+    fromBuffer: (buffer) => {
+      if (buffer.length < 8) {
+        throw new Error('osc int64 must be at least 8 bytes');
+      }
+
+      const view = new DataView(new ArrayBuffer(8));
+      buffer.subarray(0, 8).forEach((byte, index) => {
+        view.setUint8(index, byte);
+      });
+
+      return [view.getBigInt64(0), buffer.subarray(8)];
+    },
+  },
+  d: {
+    toBuffer: (number) => {
+      if (typeof number === 'number') {
+        const view = new DataView(new ArrayBuffer(8));
+        view.setFloat64(0, number);
+        return new Uint8Array(view.buffer);
+      }
+      throw new TypeError('osc type d toBuffer called with non number value');
+    },
+    fromBuffer: (buffer) => {
+      if (buffer.length < 8) {
+        throw new Error('not enough bytes to read a osc float');
+      }
+      const view = new DataView(new ArrayBuffer(8));
+
+      buffer.subarray(0, 8).forEach((byte, index) => {
+        view.setUint8(index, byte);
+      });
+
+      const value = view.getFloat64(0);
+      return [value, buffer.subarray(8)];
+    },
+  },
 };

packages/osc/tests/bundle-decode.test.js

@@ -1,29 +1,200 @@
-const { deepEqual } = require('assert');
+const { deepEqual, equal, throws } = require('assert');
 const { describe, it } = require('node:test');
 const osc = require('../dist/index');
 
-const tests = [
+const goodTests = [
   {
     description: 'simple contents single message',
+    bytes: new Uint8Array([
+      ...new TextEncoder().encode('#bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+      ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+      ...new Uint8Array([
+        0x2f, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x34, 0x2f, 0x66, 0x72, 0x65, 0x71,
+        0x75, 0x65, 0x6e, 0x63, 0x79, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x43, 0xdc, 0x00, 0x00,
+      ]),
+    ]),
     expected: {
       timeTag: [32, 0],
       contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }],
     },
-    bundle: Buffer.concat([
-      Buffer.from('#bundle', 'ascii'),
-      Buffer.from([0x00]),
-      Buffer.from([0, 0, 0, 32, 0, 0, 0, 0]),
-      Buffer.from('00000020', 'hex'),
-      Buffer.from('2f6f7363696c6c61746f722f342f6672657175656e6379002c66000043dc0000', 'hex'),
+  },
+  {
+    description: 'simple contents single bundle',
+    bytes: new Uint8Array([
+      ...new TextEncoder().encode('#bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+      ...new Uint8Array([0x00, 0x00, 0x00, 0x34]),
+      ...new Uint8Array([
+        ...new TextEncoder().encode('#bundle'),
+        ...new Uint8Array([0x00]),
+        ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+        ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+        ...new Uint8Array([
+          0x2f, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x34, 0x2f, 0x66, 0x72, 0x65, 0x71,
+          0x75, 0x65, 0x6e, 0x63, 0x79, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x43, 0xdc, 0x00, 0x00,
+        ]),
+      ]),
     ]),
+    expected: {
+      timeTag: [32, 0],
+      contents: [
+        {
+          timeTag: [32, 0],
+          contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }],
+        },
+      ],
+    },
+  },
+  {
+    description: 'resolume bundle example',
+    bytes: new Uint8Array([
+      0x23, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
+      0x28, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6c, 0x61, 0x79, 0x65, 0x72,
+      0x73, 0x2f, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x3d,
+      0x6d, 0x9c, 0x9c, 0x00, 0x00, 0x00, 0x2c, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+      0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2f, 0x70, 0x6f, 0x73, 0x69,
+      0x74, 0x69, 0x6f, 0x6e, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x3d, 0x6d, 0x9c, 0x9c, 0x00, 0x00, 0x00, 0x3c, 0x2f, 0x63,
+      0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x2f, 0x31,
+      0x2f, 0x63, 0x6c, 0x69, 0x70, 0x73, 0x2f, 0x34, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f,
+      0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x3d, 0x6d, 0x9c,
+      0x9c, 0x00, 0x00, 0x00, 0x38, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x73,
+      0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x6c, 0x69, 0x70, 0x2f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f,
+      0x72, 0x74, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x66, 0x00, 0x00,
+      0x3d, 0x6d, 0x9c, 0x9c, 0x00, 0x00, 0x00, 0x28, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+      0x6e, 0x2f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x73, 0x2f, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+      0x00, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x3d, 0x6d, 0x9c, 0x9c, 0x00, 0x00, 0x00, 0x2c, 0x2f, 0x63, 0x6f, 0x6d, 0x70,
+      0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x6c, 0x61, 0x79,
+      0x65, 0x72, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x3d, 0x6d, 0x9c,
+      0x9c, 0x00, 0x00, 0x00, 0x3c, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6c,
+      0x61, 0x79, 0x65, 0x72, 0x73, 0x2f, 0x31, 0x2f, 0x63, 0x6c, 0x69, 0x70, 0x73, 0x2f, 0x34, 0x2f, 0x74, 0x72, 0x61,
+      0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00, 0x00, 0x00, 0x00,
+      0x2c, 0x66, 0x00, 0x00, 0x3d, 0x6d, 0x9c, 0x9c, 0x00, 0x00, 0x00, 0x38, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x73,
+      0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x65, 0x64, 0x63, 0x6c, 0x69, 0x70, 0x2f,
+      0x74, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x6f, 0x72, 0x74, 0x2f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x00,
+      0x00, 0x00, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x3d, 0x6d, 0x9c, 0x9c,
+    ]),
+    expected: {
+      timeTag: [0, 1],
+      contents: [
+        {
+          address: '/composition/layers/1/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/selectedlayer/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/layers/1/clips/4/transport/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/selectedclip/transport/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/layers/1/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/selectedlayer/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/layers/1/clips/4/transport/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+        {
+          address: '/composition/selectedclip/transport/position',
+          args: [{ type: 'f', value: 0.05801068246364593505859375 }],
+        },
+      ],
+    },
   },
 ];
 
-describe('OSC Bundle Decoding', () => {
-  tests.forEach((bundleTest) => {
+const badTests = [
+  {
+    description: 'bad bundle header',
+    bytes: new Uint8Array([
+      ...new TextEncoder().encode('bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+      ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+      ...new Uint8Array([
+        0x2f, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x34, 0x2f, 0x66, 0x72, 0x65, 0x71,
+        0x75, 0x65, 0x6e, 0x63, 0x79, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x43, 0xdc, 0x00, 0x00,
+      ]),
+    ]),
+    throwsMessage: {
+      name: /^Error$/,
+      message: 'bundle must start with #bundle',
+    },
+  },
+  {
+    description: 'incomplete bundle',
+    bytes: new Uint8Array([
+      ...new TextEncoder().encode('#bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+    ]),
+    throwsMessage: {
+      name: /^Error$/,
+      message: 'bundle has to be at least 20 bytes',
+    },
+  },
+  {
+    description: 'bundle not enough bytes',
+    bytes: new Uint8Array([
+      ...new TextEncoder().encode('#bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+      ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+      ...new Uint8Array([0x2f, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61]),
+    ]),
+    throwsMessage: {
+      name: /^Error$/,
+      message: 'bundle does not contain enough data',
+    },
+  },
+  {
+    description: 'bad bundle contents',
+    bytes: new Uint8Array([
+      ...new TextEncoder().encode('#bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+      ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+      ...new Uint8Array([
+        0x2a, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x34, 0x2f, 0x66, 0x72, 0x65, 0x71,
+        0x75, 0x65, 0x6e, 0x63, 0x79, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x43, 0xdc, 0x00, 0x00,
+      ]),
+    ]),
+    throwsMessage: {
+      name: /^Error$/,
+      message: 'bundle contents does not look like a OSC message or bundle',
+    },
+  },
+];
+
+describe('OSC Bundle Decoding Pass', () => {
+  goodTests.forEach((bundleTest) => {
     it(bundleTest.description, () => {
-      const encoded = osc.bundleFromBuffer(bundleTest.bundle);
+      const [encoded, remainingBytes] = osc.bundleFromBuffer(bundleTest.bytes);
+      equal(remainingBytes.length, 0);
       deepEqual(encoded, bundleTest.expected);
     });
   });
 });
+
+describe('OSC Bundle Decoding Throws', () => {
+  badTests.forEach((bundleTest) => {
+    it(bundleTest.description, () => {
+      throws(() => {
+        osc.bundleFromBuffer(bundleTest.bytes);
+      }, bundleTest.throwsMessage);
+    });
+  });
+});

packages/osc/tests/bundle-encode.test.js

@@ -1,17 +1,23 @@
-const { deepEqual, throws } = require('assert');
+const { deepEqual } = require('assert');
 const { describe, it } = require('node:test');
 const osc = require('../dist/index');
 
 const tests = [
   {
     description: 'simple contents single message',
-    bundle: { timeTag: [32, 0], contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }] },
-    expected: Buffer.concat([
-      Buffer.from('#bundle', 'ascii'),
-      Buffer.from([0x00]),
-      Buffer.from([0, 0, 0, 32, 0, 0, 0, 0]),
-      Buffer.from('00000020', 'hex'),
-      Buffer.from('2f6f7363696c6c61746f722f342f6672657175656e6379002c66000043dc0000', 'hex'),
+    bundle: {
+      timeTag: [32, 0],
+      contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }],
+    },
+    expected: new Uint8Array([
+      ...new TextEncoder().encode('#bundle'),
+      ...new Uint8Array([0x00]),
+      ...new Uint8Array([0, 0, 0, 32, 0, 0, 0, 0]),
+      ...new Uint8Array([0x00, 0x00, 0x00, 0x20]),
+      ...new Uint8Array([
+        0x2f, 0x6f, 0x73, 0x63, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x6f, 0x72, 0x2f, 0x34, 0x2f, 0x66, 0x72, 0x65, 0x71,
+        0x75, 0x65, 0x6e, 0x63, 0x79, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x43, 0xdc, 0x00, 0x00,
+      ]),
     ]),
   },
 ];

packages/osc/tests/message-decode.test.js

@@ -1,51 +1,108 @@
-const { deepEqual, throws } = require('assert');
+const { deepEqual, throws, equal } = require('assert');
 const { describe, it } = require('node:test');
 const osc = require('../dist/index');
 
-const tests = [
+const goodTests = [
   {
     description: 'simple address no args',
-    bytes: Buffer.from('2f68656c6c6f00002c000000', 'hex'),
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0]),
     expected: { address: '/hello', args: [] },
   },
   {
     description: 'simple address string arg',
-    bytes: Buffer.from('2f68656c6c6f00002c7300006172673100000000', 'hex'),
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0]),
     expected: { address: '/hello', args: [{ type: 's', value: 'arg1' }] },
   },
   {
     description: 'simple address integer arg',
-    bytes: Buffer.from('2f68656c6c6f00002c69000000000023', 'hex'),
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35]),
     expected: { address: '/hello', args: [{ type: 'i', value: 35 }] },
   },
   {
     description: 'simple address float arg',
-    bytes: Buffer.from('2f68656c6c6f00002c660000420a0000', 'hex'),
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0]),
     expected: { address: '/hello', args: [{ type: 'f', value: 34.5 }] },
   },
   {
     description: 'simple address blob arg',
-    bytes: Buffer.from('2f68656c6c6f00002c62000000000004626c6f62', 'hex'),
-    expected: { address: '/hello', args: [{ type: 'b', value: Buffer.from('blob') }] },
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98]),
+    expected: { address: '/hello', args: [{ type: 'b', value: new TextEncoder().encode('blob') }] },
   },
   {
     description: 'simple address True arg',
-    bytes: Buffer.from('2f68656c6c6f00002c540000', 'hex'),
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0]),
     expected: { address: '/hello', args: [{ type: 'T', value: true }] },
   },
   {
     description: 'simple address False arg',
-    bytes: Buffer.from('2f68656c6c6f00002c460000', 'hex'),
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0]),
     expected: { address: '/hello', args: [{ type: 'F', value: false }] },
   },
+  {
+    description: 'simple address color arg',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10]),
+    expected: { address: '/hello', args: [{ type: 'r', value: { r: 20, g: 21, b: 22, a: 10 } }] },
+  },
+  {
+    description: 'simple address nil arg',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0]),
+    expected: { address: '/hello', args: [{ type: 'N', value: null }] },
+  },
+  {
+    description: 'simple address Inifinitum arg',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 73, 0, 0]),
+    expected: { address: '/hello', args: [{ type: 'I', value: Number.MAX_SAFE_INTEGER }] },
+  },
+  {
+    description: 'simple address int64 arg',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255]),
+    expected: { address: '/hello', args: [{ type: 'h', value: 281474976710655n }] },
+  },
+  {
+    description: 'simple address float64 arg',
+    bytes: new Uint8Array([
+      47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+    ]),
+    expected: { address: '/hello', args: [{ type: 'd', value: 12.7654763 }] },
+  },
+  {
+    description: 'simple address array arg',
+    bytes: new Uint8Array([
+      47, 104, 101, 108, 108, 111, 0, 0, 44, 91, 100, 105, 93, 0, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+      0, 0, 3, 232,
+    ]),
+    expected: {
+      address: '/hello',
+      args: [
+        [
+          { type: 'd', value: 12.7654763 },
+          { type: 'i', value: 1000 },
+        ],
+      ],
+    },
+  },
+  {
+    description: 'simple address no type string',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0]),
+    expected: {
+      address: '/hello',
+      args: [],
+    },
+  },
   {
     description: 'osc 1.0 spec example 1',
-    bytes: Buffer.from('2f6f7363696c6c61746f722f342f6672657175656e6379002c66000043dc0000', 'hex'),
+    bytes: new Uint8Array([
+      47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
+      102, 0, 0, 67, 220, 0, 0,
+    ]),
     expected: { address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] },
   },
   {
     description: 'osc 1.0 spec example 2',
-    bytes: Buffer.from('2f666f6f000000002c69697366660000000003e8ffffffff68656c6c6f0000003f9df3b640b5b22d', 'hex'),
+    bytes: new Uint8Array([
+      47, 102, 111, 111, 0, 0, 0, 0, 44, 105, 105, 115, 102, 102, 0, 0, 0, 0, 3, 232, 255, 255, 255, 255, 104, 101, 108,
+      108, 111, 0, 0, 0, 63, 157, 243, 182, 64, 181, 178, 45,
+    ]),
     expected: {
       address: '/foo',
       args: [
@@ -60,65 +117,78 @@ const tests = [
   },
 ];
 
-describe('OSC Message Decoding', () => {
-  tests.forEach((messageTest) => {
+const badTests = [
+  {
+    description: 'bad address',
+    bytes: new Uint8Array([0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x42, 0x0a, 0x00, 0x00]),
+    throwsMessage: { name: /^Error$/, message: /must start with/ },
+  },
+
+  {
+    description: 'bad type string',
+    bytes: new Uint8Array([0x2f, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x00, 0x66, 0x00, 0x00, 0x00, 0x42, 0x0a, 0x00]),
+    throwsMessage: { name: /^Error$/, message: /type string must start with/ },
+  },
+  {
+    description: 'unknown type',
+    bytes: new Uint8Array([
+      0x2f, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x00, 0x2c, 0x7a, 0x00, 0x00, 0x42, 0x0a, 0x00, 0x00,
+    ]),
+    throwsMessage: { name: /^Error$/, message: /unknown/ },
+  },
+  {
+    description: 'float arg missing bytes',
+    bytes: new Uint8Array([0x2f, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x00, 0x2c, 0x66, 0x00, 0x00, 0x42, 0x0a, 0x00]),
+    throwsMessage: { name: /^Error$/, message: /not enough bytes/ },
+  },
+  {
+    description: 'int arg missing bytes',
+    bytes: new Uint8Array([0x2f, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x00, 0x2c, 0x69, 0x00, 0x00, 0x00, 0x00, 0x00]),
+    throwsMessage: { name: /^Error$/, message: /not enough bytes/ },
+  },
+  {
+    description: 'blob bytes too small',
+    bytes: new Uint8Array([
+      0x2f, 0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x00, 0x00, 0x2c, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x62, 0x6c, 0x6f,
+    ]),
+    throwsMessage: { name: /^Error$/, message: /not enough bytes/ },
+  },
+  {
+    description: 'float64 missing bytes',
+    bytes: new Uint8Array([
+      47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9,
+    ]),
+    throwsMessage: { name: /^Error$/, message: /not enough bytes/ },
+  },
+  {
+    description: 'int64 missing bytes',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255]),
+    throwsMessage: { name: /^Error$/, message: /must be at least/ },
+  },
+  {
+    description: 'color missing bytes',
+    bytes: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22]),
+    throwsMessage: { name: /^Error$/, message: /must be at least/ },
+  },
+  
+];
+
+describe('OSC Message Decoding Pass', () => {
+  goodTests.forEach((messageTest) => {
     it(messageTest.description, () => {
-      const decoded = osc.messageFromBuffer(messageTest.bytes);
+      const [decoded, remainingBytes] = osc.messageFromBuffer(messageTest.bytes);
+      equal(remainingBytes.length, 0);
       deepEqual(decoded, messageTest.expected);
     });
   });
+});
 
-  it('bad address', () => {
-    throws(
-      () => {
-        osc.messageFromBuffer(Buffer.from('68656c6c6f00002c660000420a0000', 'hex'));
-      },
-      { name: /^Error$/, message: /must start with/ }
-    );
-  });
-
-  it('bad type string', () => {
-    throws(
-      () => {
-        osc.messageFromBuffer(Buffer.from('2f68656c6c6f000066000000420a00', 'hex'));
-      },
-      { name: /^Error$/, message: /type string must start with/ }
-    );
-  });
-
-  it('unknown type', () => {
-    throws(
-      () => {
-        osc.messageFromBuffer(Buffer.from('2f68656c6c6f00002c7a0000420a0000', 'hex'));
-      },
-      { name: /^Error$/, message: /unknown/ }
-    );
-  });
-
-  it('float arg missing bytes', () => {
-    throws(
-      () => {
-        osc.messageFromBuffer(Buffer.from('2f68656c6c6f00002c660000420a00', 'hex'));
-      },
-      { name: /^Error$/, message: /not enough bytes/ }
-    );
-  });
-
-  it('int arg missing bytes', () => {
-    throws(
-      () => {
-        osc.messageFromBuffer(Buffer.from('2f68656c6c6f00002c690000000000', 'hex'));
-      },
-      { name: /^Error$/, message: /not enough bytes/ }
-    );
-  });
-
-  it('blob bytes too small', () => {
-    throws(
-      () => {
-        osc.messageFromBuffer(Buffer.from('2f68656c6c6f00002c62000000000004626c6f', 'hex'));
-      },
-      { name: /^Error$/, message: /not enough bytes/ }
-    );
+describe('OSC Message Decoding Throws', () => {
+  badTests.forEach((messageTest) => {
+    it(messageTest.description, () => {
+      throws(() => {
+        osc.messageFromBuffer(messageTest.bytes);
+      }, messageTest.throwsMessage);
+    });
   });
 });

packages/osc/tests/message-encode.test.js

@@ -2,93 +2,160 @@ const { deepEqual, throws } = require('assert');
 const { describe, it } = require('node:test');
 const osc = require('../dist/index');
 
-const tests = [
+const goodTests = [
   {
     description: 'simple address no args',
     message: { address: '/hello', args: [] },
-    expected: Buffer.from('2f68656c6c6f00002c000000', 'hex'),
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 0, 0, 0]),
   },
   {
     description: 'simple address string arg',
     message: { address: '/hello', args: [{ type: 's', value: 'arg1' }] },
-    expected: Buffer.from('2f68656c6c6f00002c7300006172673100000000', 'hex'),
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 115, 0, 0, 97, 114, 103, 49, 0, 0, 0, 0]),
   },
   {
     description: 'simple address integer arg',
     message: { address: '/hello', args: [{ type: 'i', value: 35 }] },
-    expected: Buffer.from('2f68656c6c6f00002c69000000000023', 'hex'),
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 105, 0, 0, 0, 0, 0, 35]),
   },
   {
     description: 'simple address float arg',
     message: { address: '/hello', args: [{ type: 'f', value: 34.5 }] },
-    expected: Buffer.from('2f68656c6c6f00002c660000420a0000', 'hex'),
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 102, 0, 0, 66, 10, 0, 0]),
   },
   {
     description: 'simple address blob arg',
-    message: { address: '/hello', args: [{ type: 'b', value: Buffer.from('blob') }] },
-    expected: Buffer.from('2f68656c6c6f00002c62000000000004626c6f62', 'hex'),
+    message: { address: '/hello', args: [{ type: 'b', value: new TextEncoder().encode('blob') }] },
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 98, 0, 0, 0, 0, 0, 4, 98, 108, 111, 98]),
   },
   {
     description: 'simple address True arg',
     message: { address: '/hello', args: [{ type: 'T', value: true }] },
-    expected: Buffer.from('2f68656c6c6f00002c540000', 'hex'),
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 84, 0, 0]),
   },
   {
     description: 'simple address False arg',
     message: { address: '/hello', args: [{ type: 'F', value: false }] },
-    expected: Buffer.from('2f68656c6c6f00002c460000', 'hex'),
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 70, 0, 0]),
+  },
+  {
+    description: 'simple address color arg',
+    message: { address: '/hello', args: [{ type: 'r', value: { r: 20, g: 21, b: 22, a: 10 } }] },
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 114, 0, 0, 20, 21, 22, 10]),
+  },
+  {
+    description: 'simple address nil arg',
+    message: { address: '/hello', args: [{ type: 'N', value: null }] },
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 78, 0, 0]),
+  },
+  {
+    description: 'simple address int64 arg',
+    message: { address: '/hello', args: [{ type: 'h', value: 281474976710655n }] },
+    expected: new Uint8Array([47, 104, 101, 108, 108, 111, 0, 0, 44, 104, 0, 0, 0, 0, 255, 255, 255, 255, 255, 255]),
+  },
+  {
+    description: 'simple address float64 arg',
+    message: { address: '/hello', args: [{ type: 'd', value: 12.7654763 }] },
+    expected: new Uint8Array([
+      47, 104, 101, 108, 108, 111, 0, 0, 44, 100, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+    ]),
+  },
+  {
+    description: 'simple address array arg',
+    message: {
+      address: '/hello',
+      args: [
+        [
+          { type: 'd', value: 12.7654763 },
+          { type: 'i', value: 1000 },
+        ],
+      ],
+    },
+    expected: new Uint8Array([
+      47, 104, 101, 108, 108, 111, 0, 0, 44, 91, 100, 105, 93, 0, 0, 0, 0x40, 0x29, 0x87, 0xec, 0x82, 0x74, 0xb9, 0xe6,
+      0, 0, 3, 232,
+    ]),
+  },
+  {
+    description: 'osc 1.0 spec example 1',
+    message: { address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] },
+    expected: new Uint8Array([
+      47, 111, 115, 99, 105, 108, 108, 97, 116, 111, 114, 47, 52, 47, 102, 114, 101, 113, 117, 101, 110, 99, 121, 0, 44,
+      102, 0, 0, 67, 220, 0, 0,
+    ]),
+  },
+  {
+    description: 'osc 1.0 spec example 2',
+    message: {
+      address: '/foo',
+      args: [
+        { type: 'i', value: 1000 },
+        { type: 'i', value: -1 },
+        { type: 's', value: 'hello' },
+        // thanks IEEE 754
+        { type: 'f', value: 1.2339999675750732421875 },
+        { type: 'f', value: 5.677999973297119140625 },
+      ],
+    },
+    expected: new Uint8Array([
+      47, 102, 111, 111, 0, 0, 0, 0, 44, 105, 105, 115, 102, 102, 0, 0, 0, 0, 3, 232, 255, 255, 255, 255, 104, 101, 108,
+      108, 111, 0, 0, 0, 63, 157, 243, 182, 64, 181, 178, 45,
+    ]),
   },
 ];
 
-describe('OSC Message Encoding', () => {
-  tests.forEach((messageTest) => {
+const badTests = [
+  {
+    description: 'bad string arg',
+    message: { address: '/address', args: [{ type: 's', value: 123 }] },
+    throwsMessage: { name: /^TypeError$/, message: /non string/ },
+  },
+
+  {
+    description: 'bad integer arg',
+    message: { address: '/address', args: [{ type: 'i', value: 'hi' }] },
+    throwsMessage: { name: /^TypeError$/, message: /non number/ },
+  },
+  {
+    description: 'bad float arg',
+    message: { address: '/address', args: [{ type: 'f', value: 'hi' }] },
+    throwsMessage: { name: /^TypeError$/, message: /non number/ },
+  },
+  {
+    description: 'bad blob arg',
+    message: { address: '/address', args: [{ type: 'b', value: 123 }] },
+    throwsMessage: { name: /^TypeError$/, message: /non Uint8Array/ },
+  },
+  {
+    description: 'unknown arg type',
+    message: { address: '/address', args: [{ type: 'z', value: 123 }] },
+    throwsMessage: { name: /^TypeError$/, message: /unknown type z/ },
+  },
+  {
+    description: 'address that does not start with / should throw',
+    message: { address: 'address', args: [] },
+    throwsMessage: {
+      name: /^Error$/,
+      message: 'osc message must start with a /',
+    },
+  },
+];
+
+describe('OSC Message Encoding Pass', () => {
+  goodTests.forEach((messageTest) => {
     it(messageTest.description, () => {
       const encoded = osc.messageToBuffer(messageTest.message);
       deepEqual(encoded, messageTest.expected);
     });
   });
-  it('bad string arg', () => {
-    throws(
-      () => {
-        osc.messageToBuffer({ address: '/address', args: [{ type: 's', value: 123 }] });
-      },
-      { name: /^TypeError$/ }
-    );
-  });
+});
 
-  it('bad integer arg', () => {
-    throws(
-      () => {
-        osc.messageToBuffer({ address: '/address', args: [{ type: 'i', value: 'hi' }] });
-      },
-      { name: /^TypeError$/ }
-    );
-  });
-
-  it('bad float arg', () => {
-    throws(
-      () => {
-        osc.messageToBuffer({ address: '/address', args: [{ type: 'f', value: 'hi' }] });
-      },
-      { name: /^TypeError$/ }
-    );
-  });
-
-  it('bad blob arg', () => {
-    throws(
-      () => {
-        osc.messageToBuffer({ address: '/address', args: [{ type: 'b', value: 123 }] });
-      },
-      { name: /^TypeError$/ }
-    );
-  });
-
-  it('unknown arg type', () => {
-    throws(
-      () => {
-        osc.messageToBuffer({ address: '/address', args: [{ type: 'z', value: 123 }] });
-      },
-      { name: /^TypeError$/ }
-    );
+describe('OSC Message Encoding Throws', () => {
+  badTests.forEach((messageTest) => {
+    it(messageTest.description, () => {
+      throws(() => {
+        osc.messageToBuffer(messageTest.message);
+      }, messageTest.throwsMessage);
+    });
   });
 });