jwetzell/osc-js
1
0
Fork 0
mirror of https://github.com/jwetzell/osc-js.git synced 2026-08-21 06:49:02 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

add T and F osc types

Browse Source
This commit is contained in:
Joel Wetzell
2024-10-02 21:33:33 -05:00
parent f8d0d6b827
commit a5e6a08961
2 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/models.ts
+4 -4
View File
@@ -1,7 +1,7 @@
export type OSCType = 's' | 'i' | 'f' | 'b'; export type OSCType = 's' | 'i' | 'f' | 'b' | 'T' | 'F';
export type OSCArg = { export type OSCArg = {
type: OSCType; type: OSCType;
value: string | number | Buffer; value: string | number | Buffer | boolean;
}; };
export type OSCMessage = { export type OSCMessage = {
@@ -10,6 +10,6 @@ export type OSCMessage = {
}; };
export type OSCTypeConverter = { export type OSCTypeConverter = {
toBuffer: (value: number | string | Buffer) => Buffer | undefined; toBuffer: (value: string | number | Buffer | boolean) => Buffer | undefined;
fromString: (string: string) => number | string | Buffer; fromString: (string: string) => string | number | Buffer | boolean;
}; };
src/osc.ts
+19 -24
View File
@@ -1,4 +1,4 @@
import { OSCType, OSCArg, OSCMessage, OSCTypeConverter } from './models'; import { OSCType, OSCArg, OSCMessage, OSCTypeConverter, OSCPacket } from './models';
const oscTypeConverterMap: { [key in OSCType]: OSCTypeConverter } = { const oscTypeConverterMap: { [key in OSCType]: OSCTypeConverter } = {
s: { s: {
@@ -51,6 +51,18 @@ const oscTypeConverterMap: { [key in OSCType]: OSCTypeConverter } = {
}, },
fromString: (string: string) => Buffer.from(string, 'hex'), fromString: (string: string) => Buffer.from(string, 'hex'),
}, },
T: {
toBuffer: () => {
return Buffer.alloc(0)
},
fromString: (string: string) => true
},
F: {
toBuffer: () => {
return Buffer.alloc(0)
},
fromString: (string: string) => false
}
}; };
function argsToBuffer(args: OSCArg[]) { function argsToBuffer(args: OSCArg[]) {
@@ -75,35 +87,18 @@ function argsToBuffer(args: OSCArg[]) {
return Buffer.concat(argBuffers); return Buffer.concat(argBuffers);
} }
function toBuffer({ address, args }: OSCMessage) { export function messageToBuffer(message: OSCMessage) {
const addressBuffer = oscTypeConverterMap.s.toBuffer(address);
const addressBuffer = oscTypeConverterMap.s.toBuffer(message.address);
if (addressBuffer === undefined) { if (addressBuffer === undefined) {
throw new Error('problem encoding address'); throw new Error('problem encoding address');
} }
const typeString = args.map((arg) => arg.type).join(''); const typeString = message.args.map((arg) => arg.type).join('');
const typesBuffer = oscTypeConverterMap.s.toBuffer(`,${typeString}`); const typesBuffer = oscTypeConverterMap.s.toBuffer(`,${typeString}`);
if (typesBuffer === undefined) { if (typesBuffer === undefined) {
throw new Error('problem encoding types'); throw new Error('problem encoding types');
} }
const argsBuffer = argsToBuffer(args); const argsBuffer = argsToBuffer(message.args);
return Buffer.concat([addressBuffer, typesBuffer, argsBuffer]); return Buffer.concat([addressBuffer, typesBuffer, argsBuffer]);
} }
function stringArgToTypedArg(rawArg: string, type: OSCType = 's') {
const typeConverter = oscTypeConverterMap[type];
if (typeConverter === undefined) {
throw new Error('osc type error: unknown type '.concat(type));
}
if (typeConverter.fromString === undefined) {
throw new Error('osc type error: no string converter for type '.concat(type));
}
return typeConverter.fromString(rawArg);
}
export default {
toBuffer,
stringArgToTypedArg,
};