node-osc 9.0.0 → 9.0.2

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

@@ -33,7 +33,7 @@ jobs:
     # run that runs on: tag. (Using the GitHub token would
     # not run the workflow to prevent infinite recursion.)
     - name: Check out source
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ssh-key: ${{ secrets.DEPLOY_KEY }}
 
@@ -54,7 +54,7 @@ jobs:
         git config user.signingKey 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFtQmrz647zOGumjiqGirj1G9brj/QbwJQ5S3gHRmcfl myles.borins@gmail.com'
 
     - name: bump version
-      run: npm version ${{ github.event.inputs.version }}
+      run: npm version ${{ github.event.inputs.version }} --sign-git-tag
 
     - name: Push latest version
       run: git push origin main --follow-tags

package/dist/lib/Server.js

@@ -2,7 +2,7 @@
 
 var node_dgram = require('node:dgram');
 var node_events = require('node:events');
-var decode = require('./internal/decode.js');
+var decode = require('#decode');
 
 class Server extends node_events.EventEmitter {
   constructor(port, host='127.0.0.1', cb) {

package/dist/lib/internal/decode.js

@@ -27,6 +27,9 @@ function decode(data) {
   else if (decoded.oscType === 'message') {
     return sanitizeMessage(decoded);
   }
+  else {
+    throw new Error ('Malformed Packet');
+  }
 }
 
 module.exports = decode;

package/dist/test/{test/test-decode.js → test-decode.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var tap = require('tap');
-var decode = require('../lib/internal/decode.js');
+var decode = require('#decode');
 
 tap.test('decode: valid', (t) => {
   const buf = Buffer.from('/test\0\0\0,s\0,testing\0');
@@ -15,6 +15,14 @@ tap.test('decode: valid', (t) => {
   t.end();
 });
 
+tap.test('decode: malformed packet', (t) => {
+  t.throws(() => {
+    const buf = Buffer.from('/test\0\0');
+    decode(buf);
+  }, /Malformed Packet/);
+  t.end();
+});
+
 tap.test('decode: invalid typetags', (t) => {
   t.throws(() => {
     const buf = Buffer.from('/test\0\0\0,R\0');

package/lib/Server.mjs

@@ -1,7 +1,7 @@
 import { createSocket } from 'node:dgram';
 import { EventEmitter } from 'node:events';
 
-import decode from './internal/decode.mjs';
+import decode from '#decode';
 
 class Server extends EventEmitter {
   constructor(port, host='127.0.0.1', cb) {

package/lib/internal/decode.mjs

@@ -25,6 +25,9 @@ function decode(data) {
   else if (decoded.oscType === 'message') {
     return sanitizeMessage(decoded);
   }
+  else {
+    throw new Error ('Malformed Packet');
+  }
 }
 
 export default decode;

package/package.json

@@ -1,11 +1,17 @@
 {
   "name": "node-osc",
   "description": "pyOSC inspired library for sending and receiving OSC messages",
-  "version": "9.0.0",
+  "version": "9.0.2",
   "exports": {
     "require": "./dist/lib/index.js",
     "default": "./lib/index.mjs"
   },
+  "imports": {
+    "#decode": {
+      "require": "./dist/lib/internal/decode.js",
+      "default": "./lib/internal/decode.mjs"
+    }
+  },
   "author": {
     "name": "Myles Borins",
     "email": "myles.borins@gmail.com"

package/rollup.config.mjs

@@ -1,4 +1,5 @@
 import { readdirSync as readdir, statSync as stat } from 'fs';
+import { join } from 'path';
 
 // Borrowed from the rollup docs
 // https://github.com/rollup/rollup/blob/d0db53459be43c5cc806cb91f14e82217950ba42/docs/05-plugin-development.md#renderdynamicimport
@@ -30,8 +31,8 @@ function walk(root, result=[]) {
     }
     else {
       result.push({
-        input: `${root}${path}`,
-        dir: `dist/${root}`
+        input: join(root, path),
+        dir: join('dist/', root)
       });
     }
   }
@@ -54,7 +55,8 @@ function walkLib(config) {
         'node:dgram',
         'node:events',
         'osc-min',
-        'jspack'
+        'jspack',
+        '#decode'
       ]
     });
   });
@@ -62,6 +64,7 @@ function walkLib(config) {
 
 function walkTest(config) {
   const tests = walk('./test/');
+  console.log(tests)
   tests.forEach(({input, dir}) => {
     config.push({
       input,
@@ -78,7 +81,8 @@ function walkTest(config) {
         'get-port',
         'node-osc',
         'osc-min',
-        'tap'
+        'tap',
+        '#decode'
       ]
     })
   });

package/test/test-decode.mjs

@@ -1,6 +1,6 @@
 import { test } from 'tap';
 
-import decode from '../lib/internal/decode.mjs';
+import decode from '#decode';
 
 test('decode: valid', (t) => {
   const buf = Buffer.from('/test\0\0\0,s\0,testing\0');
@@ -14,6 +14,14 @@ test('decode: valid', (t) => {
   t.end();
 });
 
+test('decode: malformed packet', (t) => {
+  t.throws(() => {
+    const buf = Buffer.from('/test\0\0');
+    decode(buf);
+  }, /Malformed Packet/);
+  t.end();
+});
+
 test('decode: invalid typetags', (t) => {
   t.throws(() => {
     const buf = Buffer.from('/test\0\0\0,R\0');

package/dist/test/lib/internal/decode.js

@@ -1,32 +0,0 @@
-'use strict';
-
-var oscMin = require('osc-min');
-
-function sanitizeMessage(decoded) {
-  const message = [];
-  message.push(decoded.address);
-  decoded.args.forEach(arg => {
-    message.push(arg.value);
-  });
-  return message;
-}
-
-function sanitizeBundle(decoded) {
-  decoded.elements = decoded.elements.map(element => {
-    if (element.oscType === 'bundle') return sanitizeBundle(element);
-    else if (element.oscType === 'message') return sanitizeMessage(element);
-  });
-  return decoded;
-}
-
-function decode(data) {
-  const decoded = oscMin.fromBuffer(data);
-  if (decoded.oscType === 'bundle') {
-    return sanitizeBundle(decoded);
-  }
-  else if (decoded.oscType === 'message') {
-    return sanitizeMessage(decoded);
-  }
-}
-
-module.exports = decode;