ive-connect 0.2.0 → 0.3.0

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();
@@ -415,7 +443,7 @@ class ButtplugDevice extends events_1.EventEmitter {
             let durationMs = 500; // Default duration if we can't determine
             if (actionIndex < this._currentScriptActions.length - 1) {
                 const prevAction = this._currentScriptActions[actionIndex - 1];
-                durationMs = action.at - prevAction.at;
+                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);
             }

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.2.0",
+  "version": "0.3.0",
   "description": "A universal haptic device control library for interactive experiences",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",