ive-connect 0.1.2 → 0.3.0

package/README.md

@@ -1,109 +1,109 @@
-# ive-connect
-
-A universal haptic device control library that provides a consistent interface for managing various haptic devices (Handy, Buttplug, etc.).
-
-## Features
-
-- Unified device control interface
-- Support for multiple device types
-- Event-based state management
-- TypeScript support
-
-## Installation
-
-```bash
-npm install ive-connect
-```
-
-## Quick Start
-
-```typescript
-import { DeviceManager, HandyDevice } from "ive-connect";
-
-// Create a device manager
-const manager = new DeviceManager();
-
-// Create and register a Handy device
-const handyDevice = new HandyDevice({
-  connectionKey: "your-connection-key",
-});
-manager.registerDevice(handyDevice);
-
-// Connect to the device
-await handyDevice.connect();
-
-// Load a script
-await handyDevice.loadScript({
-  type: "funscript",
-  url: "https://example.com/script.funscript",
-});
-
-// Start playback
-await handyDevice.play(0, 1.0, false);
-
-// Later, stop playback
-await handyDevice.stop();
-
-// Disconnect when done
-await handyDevice.disconnect();
-```
-
-## Supported Devices
-
-### Handy
-
-```typescript
-import { HandyDevice } from "ive-connect";
-
-const handy = new HandyDevice({
-  connectionKey: "your-connection-key",
-  // Optional custom configuration
-  baseV3Url: "https://www.handyfeeling.com/api/v3",
-  baseV2Url: "https://www.handyfeeling.com/api/v2",
-  applicationId: "YourAppName",
-});
-
-// Connect to the device
-await handy.connect();
-
-// Update configuration
-await handy.updateConfig({
-  offset: -200, // Timing offset in milliseconds
-  stroke: {
-    min: 0.1, // Min stroke position (0.0 to 1.0)
-    max: 0.9, // Max stroke position (0.0 to 1.0)
-  },
-});
-
-// Listen for events
-handy.on("connected", (deviceInfo) => {
-  console.log("Connected to Handy:", deviceInfo);
-});
-
-handy.on("playbackStateChanged", (state) => {
-  console.log("Playback state changed:", state.isPlaying);
-});
-```
-
-### Using the Device Manager
-
-```typescript
-import { DeviceManager, HandyDevice } from "ive-connect";
-
-// Create a device manager
-const manager = new DeviceManager();
-
-// Register devices
-const handy = new HandyDevice({
-  connectionKey: "your-connection-key",
-});
-manager.registerDevice(handy);
-```
-
-## License
-
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
-
-## Acknowledgments
-
-This project uses [buttplug.io](https://buttplug.io) (BSD 3-Clause License) for device communication.
+# ive-connect
+
+A universal haptic device control library that provides a consistent interface for managing various haptic devices (Handy, Buttplug, etc.).
+
+## Features
+
+- Unified device control interface
+- Support for multiple device types
+- Event-based state management
+- TypeScript support
+
+## Installation
+
+```bash
+npm install ive-connect
+```
+
+## Quick Start
+
+```typescript
+import { DeviceManager, HandyDevice } from "ive-connect";
+
+// Create a device manager
+const manager = new DeviceManager();
+
+// Create and register a Handy device
+const handyDevice = new HandyDevice({
+  connectionKey: "your-connection-key",
+});
+manager.registerDevice(handyDevice);
+
+// Connect to the device
+await handyDevice.connect();
+
+// Load a script
+await handyDevice.loadScript({
+  type: "funscript",
+  url: "https://example.com/script.funscript",
+});
+
+// Start playback
+await handyDevice.play(0, 1.0, false);
+
+// Later, stop playback
+await handyDevice.stop();
+
+// Disconnect when done
+await handyDevice.disconnect();
+```
+
+## Supported Devices
+
+### Handy
+
+```typescript
+import { HandyDevice } from "ive-connect";
+
+const handy = new HandyDevice({
+  connectionKey: "your-connection-key",
+  // Optional custom configuration
+  baseV3Url: "https://www.handyfeeling.com/api/v3",
+  baseV2Url: "https://www.handyfeeling.com/api/v2",
+  applicationId: "YourAppName",
+});
+
+// Connect to the device
+await handy.connect();
+
+// Update configuration
+await handy.updateConfig({
+  offset: -200, // Timing offset in milliseconds
+  stroke: {
+    min: 0.1, // Min stroke position (0.0 to 1.0)
+    max: 0.9, // Max stroke position (0.0 to 1.0)
+  },
+});
+
+// Listen for events
+handy.on("connected", (deviceInfo) => {
+  console.log("Connected to Handy:", deviceInfo);
+});
+
+handy.on("playbackStateChanged", (state) => {
+  console.log("Playback state changed:", state.isPlaying);
+});
+```
+
+### Using the Device Manager
+
+```typescript
+import { DeviceManager, HandyDevice } from "ive-connect";
+
+// Create a device manager
+const manager = new DeviceManager();
+
+// Register devices
+const handy = new HandyDevice({
+  connectionKey: "your-connection-key",
+});
+manager.registerDevice(handy);
+```
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+
+## Acknowledgments
+
+This project uses [buttplug.io](https://buttplug.io) (BSD 3-Clause License) for device communication.

package/dist/devices/buttplug/buttplug-api.js

@@ -43,7 +43,7 @@ const buttplug_1 = require("buttplug");
 const buttplug_2 = require("buttplug");
 const events_1 = require("../../core/events");
 const types_1 = require("./types");
-const DEBUG_WEBSOCKET = true;
+const DEBUG_WEBSOCKET = false;
 class ButtplugApi extends events_1.EventEmitter {
     constructor(clientName = "IVE-Connect") {
         super();

package/dist/devices/buttplug/buttplug-device.js

@@ -12,6 +12,7 @@ const buttplug_api_1 = require("./buttplug-api");
 const types_1 = require("./types");
 const buttplug_server_1 = require("./buttplug-server");
 const command_helpers_1 = require("./command-helpers");
+const parseCSVToFunscript_1 = require("../../utils/parseCSVToFunscript");
 /**
  * Default Buttplug configuration
  */
@@ -193,7 +194,7 @@ class ButtplugDevice extends events_1.EventEmitter {
      * Load a script for playback
      */
     async loadScript(scriptData) {
-        var _a;
+        var _a, _b, _c;
         if (!this.isConnected) {
             this.emit("error", "Cannot load script: Not connected to a server");
             return false;
@@ -213,8 +214,34 @@ class ButtplugDevice extends events_1.EventEmitter {
                     if (!response.ok) {
                         throw new Error(`Failed to fetch script: ${response.status} ${response.statusText}`);
                     }
-                    scriptContent = await response.json();
-                    console.log(`[BUTTPLUG-SCRIPT] Script loaded successfully, actions:`, (_a = scriptContent.actions) === null || _a === void 0 ? void 0 : _a.length);
+                    // Determine if it's a CSV or JSON (funscript) based on file extension
+                    const fileExtension = scriptData.url.toLowerCase().split(".").pop();
+                    if (fileExtension === "csv") {
+                        // Handle CSV file
+                        const csvText = await response.text();
+                        scriptContent = (0, parseCSVToFunscript_1.parseCSVToFunscript)(csvText);
+                        console.log(`[BUTTPLUG-SCRIPT] CSV loaded and converted to funscript format, actions:`, (_a = scriptContent.actions) === null || _a === void 0 ? void 0 : _a.length);
+                    }
+                    else {
+                        // Handle JSON file (funscript)
+                        try {
+                            scriptContent = await response.json();
+                            console.log(`[BUTTPLUG-SCRIPT] Script loaded successfully, actions:`, (_b = scriptContent.actions) === null || _b === void 0 ? void 0 : _b.length);
+                        }
+                        catch (parseError) {
+                            // If JSON parsing fails, try as CSV
+                            const text = await response.text();
+                            try {
+                                // First try to parse as JSON again with some cleanup
+                                scriptContent = JSON.parse(text.trim());
+                            }
+                            catch (_d) {
+                                // If that fails, try CSV parsing
+                                scriptContent = (0, parseCSVToFunscript_1.parseCSVToFunscript)(text);
+                            }
+                            console.log(`[BUTTPLUG-SCRIPT] File loaded and parsed as CSV, actions:`, (_c = scriptContent.actions) === null || _c === void 0 ? void 0 : _c.length);
+                        }
+                    }
                 }
                 catch (error) {
                     this.emit("error", `Failed to fetch script: ${error instanceof Error ? error.message : String(error)}`);
@@ -382,6 +409,7 @@ class ButtplugDevice extends events_1.EventEmitter {
      * Process script actions based on current time
      */
     _processActions(executor) {
+        var _a;
         if (!this._isPlaying || !this._currentScriptActions.length) {
             return;
         }
@@ -392,7 +420,7 @@ class ButtplugDevice extends events_1.EventEmitter {
         const actionIndex = this._findActionIndexForTime(elapsedMs);
         // If we reached the end of the script
         if (actionIndex === this._currentScriptActions.length - 1 &&
-            elapsedMs > this._currentScriptActions[actionIndex].at + 1000) {
+            elapsedMs > ((_a = this._currentScriptActions[actionIndex]) === null || _a === void 0 ? void 0 : _a.at) + 1000) {
             if (this._loopPlayback) {
                 // Reset for loop playback
                 this._playbackStartTime = Date.now();
@@ -411,11 +439,11 @@ class ButtplugDevice extends events_1.EventEmitter {
             const prevAction = actionIndex > 0
                 ? this._currentScriptActions[actionIndex - 1]
                 : { pos: 0 };
-            // Calculate duration for linear movement based on time to next action
+            // Calculate duration for linear movement based on time with previous action
             let durationMs = 500; // Default duration if we can't determine
             if (actionIndex < this._currentScriptActions.length - 1) {
-                const nextAction = this._currentScriptActions[actionIndex + 1];
-                durationMs = nextAction.at - action.at;
+                const prevAction = this._currentScriptActions[actionIndex - 1];
+                durationMs = (action === null || action === void 0 ? void 0 : action.at) - (prevAction === null || prevAction === void 0 ? void 0 : prevAction.at);
                 // Enforce a minimum duration to prevent erratic movement
                 durationMs = Math.max(100, durationMs);
             }
@@ -458,7 +486,12 @@ class ButtplugDevice extends events_1.EventEmitter {
                 high = mid - 1;
             }
         }
-        return bestIndex;
+        // When returning bestIndex, we're always getting
+        // the last action that has a timestamp <= timeMs
+        // Let's return the next action instead
+        return bestIndex < this._currentScriptActions.length - 1
+            ? bestIndex + 1
+            : bestIndex;
     }
     /**
      * Set up event handlers for the Buttplug API

package/dist/devices/handy/handy-api.js

@@ -166,7 +166,7 @@ class HandyApi {
             const response = await this.request("/hssp/play", {
                 method: "PUT",
                 body: JSON.stringify({
-                    start_time: Math.round(videoTime * 1000),
+                    start_time: Math.round(videoTime),
                     server_time: this.estimateServerTime(),
                     playback_rate: playbackRate,
                     loop,
@@ -203,7 +203,7 @@ class HandyApi {
             const response = await this.request("/hssp/synctime", {
                 method: "PUT",
                 body: JSON.stringify({
-                    current_time: Math.round(videoTime * 1000),
+                    current_time: Math.round(videoTime),
                     server_time: this.estimateServerTime(),
                     filter,
                 }),

package/dist/devices/handy/handy-device.js

@@ -205,8 +205,32 @@ class HandyDevice extends events_1.EventEmitter {
             let scriptUrl;
             // Handle script data based on type
             if (scriptData.url) {
-                // If URL is provided, use it directly
-                scriptUrl = scriptData.url;
+                // If URL ends with .funscript and it's a direct URL, fetch and upload it
+                if (scriptData.url.toLowerCase().endsWith(".funscript")) {
+                    try {
+                        const response = await fetch(scriptData.url);
+                        if (!response.ok) {
+                            throw new Error(`Failed to fetch funscript: ${response.status}`);
+                        }
+                        const funscriptContent = await response.json();
+                        const blob = new Blob([JSON.stringify(funscriptContent)], {
+                            type: "application/json",
+                        });
+                        const uploadedUrl = await this._api.uploadScript(blob);
+                        if (!uploadedUrl) {
+                            throw new Error("Failed to upload funscript");
+                        }
+                        scriptUrl = uploadedUrl;
+                    }
+                    catch (error) {
+                        console.error("Error processing funscript URL:", error);
+                        // Fall back to using the original URL
+                        scriptUrl = scriptData.url;
+                    }
+                }
+                else {
+                    scriptUrl = scriptData.url;
+                }
             }
             else if (scriptData.content) {
                 // If content is provided, upload it

package/dist/utils/parseCSVToFunscript.d.ts

@@ -0,0 +1,7 @@
+export declare const parseCSVToFunscript: (csvText: string) => {
+    actions: {
+        at: number;
+        pos: number;
+    }[];
+    name: string;
+};

package/dist/utils/parseCSVToFunscript.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseCSVToFunscript = void 0;
+const parseCSVToFunscript = (csvText) => {
+    try {
+        // Split the CSV by lines and filter out empty lines
+        const lines = csvText
+            .split(/\r?\n/)
+            .filter((line) => line.trim().length > 0);
+        const actions = [];
+        // Check if there's a header line (contains non-numeric characters in first column)
+        let startIndex = 0;
+        if (isNaN(parseFloat(lines[0].split(",")[0]))) {
+            startIndex = 1;
+        }
+        // Parse each line
+        for (let i = startIndex; i < lines.length; i++) {
+            const line = lines[i].trim();
+            if (!line)
+                continue;
+            const columns = line.split(",");
+            actions.push({
+                at: Math.round(parseFloat(columns[0].trim())),
+                pos: Math.min(100, Math.max(0, Math.round(parseFloat(columns[1].trim())))),
+            });
+        }
+        return {
+            actions: actions,
+            name: "Converted from CSV",
+        };
+    }
+    catch (error) {
+        console.error("Error parsing CSV:", error);
+        throw new Error("Failed to parse CSV file");
+    }
+};
+exports.parseCSVToFunscript = parseCSVToFunscript;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ive-connect",
-  "version": "0.1.2",
+  "version": "0.3.0",
   "description": "A universal haptic device control library for interactive experiences",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,7 +10,8 @@
     "prebuild": "npm run clean",
     "prepare": "npm run build",
     "test": "jest",
-    "lint": "eslint src --ext .ts"
+    "lint": "eslint src --ext .ts",
+    "release": "release-it"
   },
   "keywords": [
     "haptic",
@@ -37,6 +38,7 @@
     "@typescript-eslint/parser": "^8.31.0",
     "eslint": "^9.25.1",
     "jest": "^29.7.0",
+    "release-it": "^19.0.2",
     "rimraf": "^6.0.1"
   },
   "engines": {