bump version to v1.7.0

Bump @eslint/js from 9.34.0 to 9.35.0

.eslintrc.js

@@ -1,12 +0,0 @@
-module.exports = {
-  env: {
-    node: true,
-    commonjs: true,
-    es2021: true,
-  },
-  extends: ['airbnb', 'prettier'],
-  parserOptions: {
-    ecmaVersion: 'latest',
-  },
-  ignorePatterns: ['**/node_modules', '**/dist'],
-};

.github/dependabot.yml

@@ -4,3 +4,15 @@ updates:
     directory: '/'
     schedule:
       interval: 'weekly'
+  - package-ecosystem: 'npm'
+    directory: 'apps/makeosc'
+    schedule:
+      interval: 'weekly'
+  - package-ecosystem: 'npm'
+    directory: 'apps/readosc'
+    schedule:
+      interval: 'weekly'
+  - package-ecosystem: 'npm'
+    directory: 'apps/sendosc'
+    schedule:
+      interval: 'weekly'

.nvmrc

@@ -1 +1 @@
-v20.15.1
+v22.15.1

apps/makeosc/package.json

@@ -20,8 +20,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jwetzell/osc": "0.2.2",
-    "commander": "^12.1.0",
+    "@jwetzell/osc": "1.6.0",
+    "commander": "^14.0.0",
     "slip": "^1.0.2"
   }
 }

apps/makeosc/src/main.js

@@ -2,8 +2,8 @@
 
 const { Option, program } = require('commander');
 const slip = require('slip');
-const { argToTypedArg } = require('./utils');
 const osc = require('@jwetzell/osc');
+const { argToTypedArg } = require('./utils');
 const packageInfo = require('../package.json');
 
 program.name(packageInfo.name);

apps/readosc/package.json

@@ -20,7 +20,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jwetzell/osc": "1.0.0",
-    "commander": "^12.1.0"
+    "@jwetzell/osc": "1.6.0",
+    "commander": "^14.0.0",
+    "slip": "1.0.2"
   }
 }

apps/readosc/src/main.js

@@ -1,23 +1,37 @@
 #!/usr/bin/env node
 
-const { program } = require('commander');
+const { program, Option } = require('commander');
 const osc = require('@jwetzell/osc');
 const packageInfo = require('../package.json');
+const slip = require('slip');
 
 program.name(packageInfo.name);
 program.version(packageInfo.version);
 program.description('simple util to read osc packets from stdin');
-program.action(() => {
+program.addOption(new Option('--slip', 'slip encode message').default(false));
+program.action((options) => {
+  const slipDecoder = new slip.Decoder({
+    onMessage: (msg) =>{
+      const [message, bytesAfterMessage] = osc.messageFromBuffer(msg);
+      printOSCMessage(message)
+    },
+    maxMessageSize: 209715200,
+    bufferSize: 2048
+  });
   process.stdin.on('data', (data) => {
     try {
-      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() });
+      if (options.slip){
+        slipDecoder.decode(data)
+      } else {
+        let remainingBytes = data;
+        while (remainingBytes.length > 0) {
+          try {
+            const [message, bytesAfterMessage] = osc.messageFromBuffer(remainingBytes);
+            remainingBytes = bytesAfterMessage;
+            printOSCMessage(message)
+          } catch (error) {
+            console.error({ error: error.toString() });
+          }
         }
       }
     } catch (error) {
@@ -26,3 +40,7 @@ program.action(() => {
   });
 });
 program.parse();
+
+function printOSCMessage(oscMessage) {
+  console.log(JSON.stringify(oscMessage));
+}

apps/sendosc/package.json

@@ -20,8 +20,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@jwetzell/osc": "0.2.2",
-    "commander": "^12.1.0",
+    "@jwetzell/osc": "1.6.0",
+    "commander": "^14.0.0",
     "slip": "^1.0.2"
   }
 }

eslint.config.mjs

@@ -0,0 +1,13 @@
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import eslintPluginPrettier from 'eslint-plugin-prettier/recommended';
+
+/** @type {import('eslint').Linter.Config[]} */
+export default [
+  { ignores: ['apps/**/*', '**/*.test.js','eslint.config.mjs','**/dist/**/*'] },
+  { languageOptions: { globals: { ...globals.browser, ...globals.node } } },
+  pluginJs.configs.recommended,
+  ...tseslint.configs.recommended,
+  eslintPluginPrettier,
+];

package.json

@@ -21,9 +21,12 @@
     "packages/*"
   ],
   "devDependencies": {
-    "prettier": "3.3.3",
-    "eslint": "^8.48.0",
-    "eslint-config-airbnb": "^19.0.4",
-    "eslint-config-prettier": "^9.0.0"
+    "@eslint/js": "^9.35.0",
+    "eslint": "^9.18.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.4",
+    "globals": "^16.3.0",
+    "prettier": "3.6.2",
+    "typescript-eslint": "^8.42.0"
   }
 }

packages/osc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwetzell/osc",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -15,8 +15,8 @@
   "scripts": {
     "prebuild": "rimraf dist",
     "build": "npm run build:cjs && npm run build:esm && npm run build:types",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "build:cjs": "tsc -p tsconfig.cjs.json && echo '{\"type\": \"commonjs\"}' > dist/cjs/package.json",
+    "build:esm": "tsc -p tsconfig.esm.json && echo '{\"type\": \"module\"}' > dist/esm/package.json",
     "build:types": "tsc -p tsconfig.types.json",
     "prepublishOnly": "npm run build",
     "pretest": "npm run build",
@@ -36,8 +36,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "22.7.7",
+    "@types/node": "24.3.1",
     "rimraf": "6.0.1",
-    "typescript": "5.6.3"
+    "typescript": "5.9.2"
   }
 }

packages/osc/src/bundle.ts

@@ -1,6 +1,6 @@
-import { messageFromBuffer, messageToBuffer } from './message';
-import { OSCBundle } from './models';
-import { oscTypeConverterMap } from './osc-types';
+import { messageFromBuffer, messageToBuffer } from './message.js';
+import { OSCBundle } from './models.js';
+import { oscTypeConverterMap } from './osc-types.js';
 
 export function bundleFromBuffer(bytes: Uint8Array): [OSCBundle | undefined, Uint8Array | undefined] {
   if (bytes.length < 20) {
@@ -12,7 +12,7 @@ export function bundleFromBuffer(bytes: Uint8Array): [OSCBundle | undefined, Uin
   }
 
   const [bundleHeader, bytesAfterHeader] = oscTypeConverterMap.s.fromBuffer(bytes);
-  let [timeTag, bytesAfterTimeTag] = oscTypeConverterMap.t.fromBuffer(bytesAfterHeader);
+  const [timeTag, bytesAfterTimeTag] = oscTypeConverterMap.t.fromBuffer(bytesAfterHeader);
 
   if (!Array.isArray(timeTag)) {
     throw new Error('problem getting bundle time tag');
@@ -26,7 +26,7 @@ export function bundleFromBuffer(bytes: Uint8Array): [OSCBundle | undefined, Uin
   let remainingBytes = bytesAfterTimeTag;
 
   while (!endOfBundle) {
-    let [contentSize, bytesAfterContentSize] = oscTypeConverterMap.i.fromBuffer(remainingBytes);
+    const [contentSize, bytesAfterContentSize] = oscTypeConverterMap.i.fromBuffer(remainingBytes);
 
     if (typeof contentSize !== 'number') {
       throw new Error('problem decoding content size');

packages/osc/src/index.ts

@@ -1,17 +1,19 @@
-import { bundleFromBuffer } from './bundle';
-import { messageFromBuffer } from './message';
-import { OSCBundle, OSCMessage } from './models';
+import { bundleFromBuffer } from './bundle.js';
+import { messageFromBuffer } from './message.js';
+import { OSCBundle, OSCMessage } from './models.js';
 
-export * from './models';
-export * from './message';
-export * from './bundle';
+export * from './models.js';
+export * from './message.js';
+export * from './bundle.js';
 
 export function fromBuffer(bytes: Uint8Array): [OSCBundle | OSCMessage | undefined, Uint8Array | undefined] {
-    if (bytes[0] === 47) { // starts with '/'
-        return messageFromBuffer(bytes);
-    } else if (bytes[0] === 35) { // starts with '#'
-        return bundleFromBuffer(bytes)
-    } else {
-        throw new Error('bytes do not look like an OSC message or bundle');
-    }
-}
+  if (bytes[0] === 47) {
+    // starts with '/'
+    return messageFromBuffer(bytes);
+  } else if (bytes[0] === 35) {
+    // starts with '#'
+    return bundleFromBuffer(bytes);
+  } else {
+    throw new Error('bytes do not look like an OSC message or bundle');
+  }
+}

packages/osc/src/message.ts

@@ -1,5 +1,5 @@
-import { OSCMessage, OSCArg, OSCType } from './models';
-import { oscTypeConverterMap } from './osc-types';
+import { OSCMessage, OSCArg, OSCType } from './models.js';
+import { oscTypeConverterMap } from './osc-types.js';
 
 function argsToBuffer(args: OSCArg[]) {
   const argBuffers: Uint8Array[] = [];
@@ -87,7 +87,7 @@ export function messageFromBuffer(bytes: Uint8Array): [OSCMessage | undefined, U
       ];
     }
 
-    let [typeString, bytesAfterType] = oscTypeConverterMap.s.fromBuffer(bytesAfterAddress);
+    const [typeString, bytesAfterType] = oscTypeConverterMap.s.fromBuffer(bytesAfterAddress);
     if (typeof typeString === 'string') {
       if (!typeString.startsWith(',')) {
         throw new Error('osc type string must start with a ,');

packages/osc/src/osc-types.ts

@@ -1,4 +1,4 @@
-import { OSCTypeConverter, OSCTimeTag } from './models';
+import { OSCTypeConverter, OSCTimeTag } from './models.js';
 
 export const oscTypeConverterMap: { [key: string]: OSCTypeConverter } = {
   s: {

packages/osc/tests/decode.test.js

@@ -3,39 +3,39 @@ const { describe, it } = require('node:test');
 const osc = require('../dist/cjs/index');
 
 const tests = [
-    {
-        description: 'simple bundle',
-        expected: {
-          timeTag: [32, 0],
-          contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }],
-        },
-        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,
-          ]),
-        ]),
-      },
-      {
-        description: 'osc 1.0 spec example 1',
-        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: 'simple bundle',
+    expected: {
+      timeTag: [32, 0],
+      contents: [{ address: '/oscillator/4/frequency', args: [{ type: 'f', value: 440 }] }],
+    },
+    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,
+      ]),
+    ]),
+  },
+  {
+    description: 'osc 1.0 spec example 1',
+    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 }] },
+  },
+];
 
 describe('OSC Bytes Decoding', () => {
-    tests.forEach((bytesTest) => {
-      it(bytesTest.description, () => {
-        const [decoded, remainingBytes] = osc.fromBuffer(bytesTest.bytes);
-        deepEqual(decoded, bytesTest.expected);
-        equal(remainingBytes.length, 0)
-      });
+  tests.forEach((bytesTest) => {
+    it(bytesTest.description, () => {
+      const [decoded, remainingBytes] = osc.fromBuffer(bytesTest.bytes);
+      deepEqual(decoded, bytesTest.expected);
+      equal(remainingBytes.length, 0);
     });
-  });
+  });
+});

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

@@ -155,9 +155,7 @@ const badTests = [
   },
   {
     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,
-    ]),
+    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/ },
   },
   {
@@ -170,7 +168,6 @@ const badTests = [
     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', () => {