ive-connect 0.3.0 → 0.4.0

package/dist/core/device-interface.d.ts

@@ -85,7 +85,10 @@ export interface HapticDevice {
      * Load a script for playback
      * @param scriptData Script data to load
      */
-    loadScript(scriptData: ScriptData): Promise<boolean>;
+    loadScript(scriptData: ScriptData): Promise<{
+        success: boolean;
+        scriptContent?: ScriptData;
+    }>;
     /**
      * Play the loaded script at the specified time
      * @param timeMs Current time in milliseconds

package/dist/core/device-manager.d.ts

@@ -46,7 +46,7 @@ export declare class DeviceManager extends EventEmitter {
      * @param scriptData Script data to load
      * @returns Object with success status for each device
      */
-    loadScriptAll(scriptData: ScriptData): Promise<Record<string, boolean>>;
+    loadScriptAll(scriptData: ScriptData): Promise<Record<string, boolean | ScriptData>>;
     /**
      * Start playback on all connected devices
      * @param timeMs Current time in milliseconds

package/dist/core/device-manager.js

@@ -99,20 +99,27 @@ class DeviceManager extends events_1.EventEmitter {
         const results = {};
         this.scriptData = scriptData;
         for (const [id, device] of this.devices.entries()) {
-            if (device.isConnected) {
+            if (device.isConnected || device.id === "buttplug") {
                 try {
                     results[id] = await device.loadScript(scriptData);
                 }
                 catch (error) {
                     console.error(`Error loading script to device ${id}:`, error);
-                    results[id] = false;
+                    results[id] = { success: false };
                 }
             }
             else {
-                results[id] = false;
+                results[id] = { success: false };
             }
         }
-        return results;
+        const transformedResults = {};
+        for (const [id, result] of Object.entries(results)) {
+            if (result.scriptContent) {
+                transformedResults["script"] = result.scriptContent;
+            }
+            transformedResults[id] = result.success;
+        }
+        return transformedResults;
     }
     /**
      * Start playback on all connected devices

package/dist/devices/buttplug/buttplug-device.d.ts

@@ -53,7 +53,10 @@ export declare class ButtplugDevice extends EventEmitter implements HapticDevice
     /**
      * Load a script for playback
      */
-    loadScript(scriptData: ScriptData): Promise<boolean>;
+    loadScript(scriptData: ScriptData): Promise<{
+        success: boolean;
+        scriptContent?: any;
+    }>;
     /**
      * Play the loaded script
      */

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

@@ -195,13 +195,9 @@ class ButtplugDevice extends events_1.EventEmitter {
      */
     async loadScript(scriptData) {
         var _a, _b, _c;
-        if (!this.isConnected) {
-            this.emit("error", "Cannot load script: Not connected to a server");
-            return false;
-        }
+        // Parse script data
+        let scriptContent;
         try {
-            // Parse script data
-            let scriptContent;
             if (scriptData.content) {
                 // If content is directly provided
                 scriptContent = scriptData.content;
@@ -245,12 +241,16 @@ class ButtplugDevice extends events_1.EventEmitter {
                 }
                 catch (error) {
                     this.emit("error", `Failed to fetch script: ${error instanceof Error ? error.message : String(error)}`);
-                    return false;
+                    return { success: false };
                 }
             }
             else {
                 this.emit("error", "Invalid script data: Either URL or content must be provided");
-                return false;
+                return { success: false };
+            }
+            if (!this.isConnected) {
+                this.emit("error", "Cannot load script: Not connected to a server");
+                return { success: false, scriptContent };
             }
             // Validate script format (basic checks for funscript)
             if (!scriptContent ||
@@ -258,7 +258,7 @@ class ButtplugDevice extends events_1.EventEmitter {
                 !Array.isArray(scriptContent.actions)) {
                 this.emit("error", "Invalid script format: Missing actions array");
                 console.error("[BUTTPLUG-SCRIPT] Invalid script format:", scriptContent);
-                return false;
+                return { success: false, scriptContent };
             }
             // Sort actions by timestamp
             const actions = [...scriptContent.actions].sort((a, b) => a.at - b.at);
@@ -271,12 +271,12 @@ class ButtplugDevice extends events_1.EventEmitter {
                 name: scriptContent.name || "Unnamed Script",
                 actions: this._currentScriptActions.length,
             });
-            return true;
+            return { success: true, scriptContent };
         }
         catch (error) {
             console.error("Buttplug: Error loading script:", error);
             this.emit("error", `Script loading error: ${error instanceof Error ? error.message : String(error)}`);
-            return false;
+            return { success: false };
         }
     }
     /**

package/dist/devices/handy/handy-device.d.ts

@@ -62,7 +62,9 @@ export declare class HandyDevice extends EventEmitter implements HapticDevice {
      * Load a script for playback
      * @param scriptData Script data to load
      */
-    loadScript(scriptData: ScriptData): Promise<boolean>;
+    loadScript(scriptData: ScriptData): Promise<{
+        success: boolean;
+    }>;
     /**
      * Play the loaded script at the specified time
      * @param timeMs Current time in milliseconds

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

@@ -199,14 +199,15 @@ class HandyDevice extends events_1.EventEmitter {
     async loadScript(scriptData) {
         if (!this.isConnected) {
             this.emit("error", "Cannot load script: Device not connected");
-            return false;
+            return { success: false };
         }
         try {
             let scriptUrl;
             // Handle script data based on type
             if (scriptData.url) {
                 // If URL ends with .funscript and it's a direct URL, fetch and upload it
-                if (scriptData.url.toLowerCase().endsWith(".funscript")) {
+                if (scriptData.url.toLowerCase().endsWith(".funscript") ||
+                    scriptData.type === "funscript") {
                     try {
                         const response = await fetch(scriptData.url);
                         if (!response.ok) {
@@ -240,29 +241,29 @@ class HandyDevice extends events_1.EventEmitter {
                 const uploadedUrl = await this._api.uploadScript(blob);
                 if (!uploadedUrl) {
                     this.emit("error", "Failed to upload script");
-                    return false;
+                    return { success: false };
                 }
                 scriptUrl = uploadedUrl;
             }
             else {
                 this.emit("error", "Invalid script data: Either URL or content must be provided");
-                return false;
+                return { success: false };
             }
             // Set up the script with the device
             const success = await this._api.setupScript(scriptUrl);
             if (success) {
                 this.emit("scriptLoaded", { url: scriptUrl });
-                return true;
+                return { success: true };
             }
             else {
                 this.emit("error", "Failed to set up script with device");
-                return false;
+                return { success: false };
             }
         }
         catch (error) {
             console.error("Handy: Error loading script:", error);
             this.emit("error", `Script loading error: ${error instanceof Error ? error.message : String(error)}`);
-            return false;
+            return { success: false };
         }
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ive-connect",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "A universal haptic device control library for interactive experiences",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",