webview.io 1.0.4 → 1.0.6

package/dist/index.d.ts

@@ -78,6 +78,9 @@ export default class WIO {
     initiate(webViewRef: RefObject<WebView>, origin: string): this;
     /**
      * Listening to connection from the WebView host
+     *
+     * NOTE: This is called manually from page code,
+     * not auto-initialized
      */
     listen(hostOrigin?: string): this;
     /**
@@ -115,6 +118,7 @@ export default class WIO {
     /**
      * Get injected JavaScript for WebView
      * Sets up the EMBEDDED side of the bridge
+     * NOTE: Does not auto-initialize - page must call window._wio.listen()
      */
     getInjectedJavaScript(): string;
 }

package/dist/index.js

@@ -143,13 +143,9 @@ var WIO = /** @class */ (function () {
             _this.connectionAttempts = 0;
             _this.connectionToken = generateToken();
             // Re-initiate connection for WEBVIEW type
-            if (_this.peer.type === 'WEBVIEW') {
-                _this.startConnectionAttempt();
-            }
+            _this.peer.type === 'WEBVIEW' && _this.startConnectionAttempt();
             // For EMBEDDED type, announce readiness
-            if (_this.peer.type === 'EMBEDDED') {
-                _this.announceEmbeddedReady();
-            }
+            _this.peer.type === 'EMBEDDED' && _this.announceEmbeddedReady();
             // Set timeout for this reconnection attempt
             setTimeout(function () {
                 if (_this.peer.connected)
@@ -181,9 +177,8 @@ var WIO = /** @class */ (function () {
                 _this.debug("[".concat(_this.peer.type, "] Connection attempt ").concat(_this.connectionAttempts, "/").concat(_this.options.maxConnectionAttempts));
                 _this.emit('ping', { token: _this.connectionToken });
             }
-            else {
+            else
                 _this.stopConnectionAttempt();
-            }
         }, this.options.connectionPingInterval);
         // Set overall timeout
         this.connectionAttemptTimer = setTimeout(function () {
@@ -225,16 +220,15 @@ var WIO = /** @class */ (function () {
                 _this.debug("[".concat(_this.peer.type, "] Ready announcement attempt ").concat(attempts, "/").concat(maxAttempts));
                 _this.emit('__embedded_ready');
             }
-            else {
+            else
                 _this.stopEmbeddedReadyAnnouncement();
-            }
         }, this.options.connectionPingInterval);
     };
     WIO.prototype.stopEmbeddedReadyAnnouncement = function () {
-        if (this.embeddedReadyCheckInterval) {
-            clearInterval(this.embeddedReadyCheckInterval);
-            this.embeddedReadyCheckInterval = undefined;
-        }
+        if (!this.embeddedReadyCheckInterval)
+            return;
+        clearInterval(this.embeddedReadyCheckInterval);
+        this.embeddedReadyCheckInterval = undefined;
     };
     // Message rate limiting
     WIO.prototype.checkRateLimit = function () {
@@ -257,8 +251,8 @@ var WIO = /** @class */ (function () {
     };
     // Queue messages when not connected
     WIO.prototype.queueMessage = function (_event, payload, fn) {
+        // Remove oldest message
         if (this.messageQueue.length >= this.options.messageQueueSize) {
-            // Remove oldest message
             var removed = this.messageQueue.shift();
             this.debug("[".concat(this.peer.type, "] Message queue full, removed oldest message:"), removed === null || removed === void 0 ? void 0 : removed._event);
         }
@@ -311,6 +305,9 @@ var WIO = /** @class */ (function () {
     };
     /**
      * Listening to connection from the WebView host
+     *
+     * NOTE: This is called manually from page code,
+     * not auto-initialized
      */
     WIO.prototype.listen = function (hostOrigin) {
         var _this = this;
@@ -320,9 +317,7 @@ var WIO = /** @class */ (function () {
         this.reconnectAttempts = 0;
         this.debug("[".concat(this.peer.type, "] Listening to connect").concat(hostOrigin ? ": Host <".concat(hostOrigin, ">") : ''));
         // Start announcing readiness
-        setTimeout(function () {
-            _this.announceEmbeddedReady();
-        }, 100);
+        setTimeout(function () { return _this.announceEmbeddedReady(); }, 100);
         return this;
     };
     /**
@@ -359,9 +354,9 @@ var WIO = /** @class */ (function () {
                 this.peer.embeddedReady = true;
                 this.debug("[".concat(this.peer.type, "] Embedded peer ready"));
                 // If we're WEBVIEW and not connected, send ping
-                if (this.peer.type === 'WEBVIEW' && !this.peer.connected) {
-                    this.emit('ping', { token: this.connectionToken });
-                }
+                this.peer.type === 'WEBVIEW'
+                    && !this.peer.connected
+                    && this.emit('ping', { token: this.connectionToken });
                 return;
             }
             // Handle webview ready signal
@@ -583,9 +578,7 @@ var WIO = /** @class */ (function () {
         var _this = this;
         if (timeout === void 0) { timeout = 5000; }
         return new Promise(function (resolve, reject) {
-            var timeoutId = setTimeout(function () {
-                reject(new Error("Event '".concat(_event, "' acknowledgment timeout after ").concat(timeout, "ms")));
-            }, timeout);
+            var timeoutId = setTimeout(function () { return reject(new Error("Event '".concat(_event, "' acknowledgment timeout after ").concat(timeout, "ms"))); }, timeout);
             try {
                 _this.emit(_event, payload, function (error) {
                     var args = [];
@@ -677,9 +670,10 @@ var WIO = /** @class */ (function () {
     /**
      * Get injected JavaScript for WebView
      * Sets up the EMBEDDED side of the bridge
+     * NOTE: Does not auto-initialize - page must call window._wio.listen()
      */
     WIO.prototype.getInjectedJavaScript = function () {
-        return "\n      (function() {\n        try {\n          console.log('[EMBEDDED] Initializing WIO bridge...')\n          \n          const RESERVED_EVENTS = [\n            'ping',\n            'pong',\n            '__heartbeat',\n            '__heartbeat_response',\n            '__embedded_ready',\n            '__connection_ack',\n            '__webview_ready'\n          ]\n          \n          // Use closure variable to avoid 'this' binding issues\n          window._wio = {\n            type: 'EMBEDDED',\n            connected: false,\n            Events: {},\n            messageQueue: [],\n            connectionToken: null,\n            setupComplete: false,\n\n            listen: function(){\n              console.log('[EMBEDDED] Setting up message listeners...')\n\n              // Listen to messages from React Native\n              window.addEventListener('message', function( event ){\n                try {\n                  const message = typeof event.data === 'string' ? JSON.parse( event.data ) : event.data\n                  window._wio.handleMessage( message )  // Use window._wio instead of this\n                }\n                catch( error ){ console.error('[EMBEDDED] Parse error:', error ) }\n              })\n              \n              // Android support\n              if( typeof document !== 'undefined' ){\n                document.addEventListener('message', function( event ){\n                  try {\n                    const message = typeof event.data === 'string' ? JSON.parse( event.data ) : event.data\n                    window._wio.handleMessage( message )  // Use window._wio instead of this\n                  }\n                  catch( error ){ console.error('[EMBEDDED] Parse error:', error ) }\n                })\n              }\n\n              window._wio.setupComplete = true  // Use window._wio instead of this\n              console.log('[EMBEDDED] Setup complete')\n\n              return window._wio\n            },\n            \n            ackId: function(){\n              const\n              rmin = 100000,\n              rmax = 999999,\n              timestamp = Date.now(),\n              random = Math.floor( Math.random() * ( rmax - rmin + 1 ) + rmin )\n\n              return timestamp + '_' + random\n            },\n            \n            fire: function( _event, payload, cid ){\n              if( !window._wio.Events[_event] && !window._wio.Events[_event + '--@once'] ){\n                console.log('[EMBEDDED] No listener for:', _event)\n                return\n              }\n              \n              const ackFn = cid\n                ? ( error, ...args ) => window._wio.emit( _event + '--' + cid + '--@ack', { error: error || false, args } )\n                : undefined\n              \n              let listeners = []\n              if( window._wio.Events[_event + '--@once'] ){\n                _event += '--@once'\n                listeners = window._wio.Events[_event]\n\n                delete window._wio.Events[_event]\n              }\n              else listeners = window._wio.Events[_event] || []\n              \n              listeners.forEach( fn => {\n                try { payload !== undefined ? fn( payload, ackFn ) : fn( ackFn ) }\n                catch( error ){ console.error('[EMBEDDED] Listener error:', error ) }\n              })\n            },\n            \n            emit: function( _event, payload, fn ){\n              if( typeof payload === 'function' ){\n                fn = payload\n                payload = undefined\n              }\n              \n              if( !window._wio.connected && !RESERVED_EVENTS.includes(_event) ){\n                window._wio.messageQueue.push({ _event, payload, fn, timestamp: Date.now() })\n                console.log('[EMBEDDED] Queued message:', _event)\n                return\n              }\n              \n              try {\n                let cid\n                if( typeof fn === 'function' ){\n                  cid = window._wio.ackId()\n                  window._wio.once( _event + '--' + cid + '--@ack', ({ error, args }) => fn( error, ...args ) )\n                }\n                \n                const messageData = {\n                  _event,\n                  payload,\n                  cid,\n                  timestamp: Date.now(),\n                  token: RESERVED_EVENTS.includes(_event) ? window._wio.connectionToken : undefined\n                }\n                \n                if( typeof window.ReactNativeWebView !== 'undefined' )\n                  window.ReactNativeWebView.postMessage( JSON.stringify( messageData ) )\n                else console.error('[EMBEDDED] ReactNativeWebView not available')\n              }\n              catch( error ){\n                console.error('[EMBEDDED] Emit error:', error )\n                typeof fn === 'function' && fn( String(error) )\n              }\n            },\n            \n            on: function( _event, fn ){\n              if( !window._wio.Events[_event] ) window._wio.Events[_event] = []\n              window._wio.Events[_event].push( fn )\n\n              return window._wio\n            },\n            \n            once: function( _event, fn ){\n              _event += '--@once'\n              if( !window._wio.Events[_event] ) window._wio.Events[_event] = []\n\n              window._wio.Events[_event].push( fn )\n\n              return window._wio\n            },\n            \n            off: function( _event, fn ){\n              if( fn && window._wio.Events[_event] ){\n                const index = window._wio.Events[_event].indexOf( fn )\n                if( index > -1 ){\n                  window._wio.Events[_event].splice( index, 1 )\n                  if( window._wio.Events[_event].length === 0 ) delete window._wio.Events[_event]\n                }\n              }\n              else delete window._wio.Events[_event]\n\n              return window._wio\n            },\n            \n            processMessageQueue: function(){\n              if( !window._wio.connected || window._wio.messageQueue.length === 0 ) return\n              \n              console.log('[EMBEDDED] Processing', window._wio.messageQueue.length, 'queued messages')\n              const queue = [ ...window._wio.messageQueue ]\n              window._wio.messageQueue = []\n              \n              queue.forEach( msg => {\n                try { window._wio.emit( msg._event, msg.payload, msg.fn ) }\n                catch( error ){ console.error('[EMBEDDED] Queue process error:', error ) }\n              })\n            },\n            \n            handleMessage: function( data ){\n              if( !data || !data._event ) return\n              \n              const { _event, payload, cid, token } = data\n              \n              console.log('[EMBEDDED] Received:', _event )\n              \n              // Handle heartbeat response\n              if( _event === '__heartbeat_response' )\n                return\n              \n              // Handle heartbeat request\n              if( _event === '__heartbeat' ){\n                window._wio.emit('__heartbeat_response', { timestamp: Date.now() })\n                return\n              }\n              \n              // Handle webview ready signal\n              if( _event === '__webview_ready' ){\n                console.log('[EMBEDDED] WebView ready signal received')\n                return\n              }\n              \n              // Handle ping from WEBVIEW\n              if( _event === 'ping' ){\n                console.log('[EMBEDDED] Received ping, sending pong')\n                window._wio.connectionToken = token\n\n                window._wio.emit('pong', { token: window._wio.connectionToken })\n                return\n              }\n              \n              // Handle connection acknowledgment\n              if( _event === '__connection_ack' ){\n                if( token && token !== window._wio.connectionToken ){\n                  console.error('[EMBEDDED] Invalid connection token in ack')\n                  return\n                }\n                \n                console.log('[EMBEDDED] Connection established (received ack)')\n\n                window._wio.connected = true\n                window._wio.processMessageQueue()\n                window._wio.fire('connect')\n\n                return\n              }\n              \n              // Fire event listeners\n              window._wio.fire( _event, payload, cid )\n            },\n            \n            announceReady: function(){\n              let attempts = 0\n              const maxAttempts = 5\n              const interval = 2000\n              \n              console.log('[EMBEDDED] Starting ready announcements')\n              \n              const announce = () => {\n                if( window._wio.connected ){\n                  console.log('[EMBEDDED] Connected, stopping announcements')\n                  return\n                }\n                \n                attempts++\n                if( attempts > maxAttempts ){\n                  console.log('[EMBEDDED] Max announcement attempts reached')\n                  return\n                }\n                \n                console.log('[EMBEDDED] Announcing ready (attempt', attempts + '/' + maxAttempts + ')')\n                window._wio.emit('__embedded_ready')\n                \n                setTimeout( announce, interval )\n              }\n              \n              announce()\n            }\n          }\n\n          // Initialize\n          wio.listen()\n          // Start announcing readiness after a short delay\n          setTimeout(() => wio.announceReady(), 100)\n          \n          console.log('[EMBEDDED] WIO bridge initialized successfully')\n        }\n        catch( error ){\n          console.error('[EMBEDDED] Setup failed:', error )\n          \n          // Create minimal fallback\n          window._wio = {\n            error: error.toString(),\n            emit: function(){ console.error('[EMBEDDED] WIO failed to initialize') },\n            on: function(){},\n            once: function(){},\n            off: function(){}\n          }\n        }\n\n        true\n      })()\n    ";
+        return "\n      (function() {\n        try {\n          console.log('[EMBEDDED] Initializing WIO bridge...')\n          \n          const RESERVED_EVENTS = [\n            'ping',\n            'pong',\n            '__heartbeat',\n            '__heartbeat_response',\n            '__embedded_ready',\n            '__connection_ack',\n            '__webview_ready'\n          ]\n          \n          // Use closure variable to avoid 'this' binding issues\n          window._wio = {\n            type: 'EMBEDDED',\n            connected: false,\n            Events: {},\n            messageQueue: [],\n            connectionToken: null,\n            setupComplete: false,\n\n            listen: function(){\n              if( this.setupComplete ){\n                console.warn('[EMBEDDED] Already listening')\n                return this\n              }\n\n              console.log('[EMBEDDED] Setting up message listeners...')\n\n              // Listen to messages from React Native\n              window.addEventListener('message', function( event ){\n                try {\n                  const message = typeof event.data === 'string' ? JSON.parse( event.data ) : event.data\n                  window._wio.handleMessage( message )\n                }\n                catch( error ){ console.error('[EMBEDDED] Parse error:', error ) }\n              })\n              \n              // Android support\n              if( typeof document !== 'undefined' ){\n                document.addEventListener('message', function( event ){\n                  try {\n                    const message = typeof event.data === 'string' ? JSON.parse( event.data ) : event.data\n                    window._wio.handleMessage( message )\n                  }\n                  catch( error ){ console.error('[EMBEDDED] Parse error:', error ) }\n                })\n              }\n\n              this.setupComplete = true\n              console.log('[EMBEDDED] Setup complete, starting ready announcements')\n\n              // Start announcing readiness\n              this.announceReady()\n\n              return this\n            },\n            \n            ackId: function(){\n              const\n              rmin = 100000,\n              rmax = 999999,\n              timestamp = Date.now(),\n              random = Math.floor( Math.random() * ( rmax - rmin + 1 ) + rmin )\n\n              return timestamp + '_' + random\n            },\n            \n            fire: function( _event, payload, cid ){\n              if( !window._wio.Events[_event] && !window._wio.Events[_event + '--@once'] ){\n                console.log('[EMBEDDED] No listener for:', _event)\n                return\n              }\n              \n              const ackFn = cid\n                ? ( error, ...args ) => window._wio.emit( _event + '--' + cid + '--@ack', { error: error || false, args } )\n                : undefined\n              \n              let listeners = []\n              if( window._wio.Events[_event + '--@once'] ){\n                _event += '--@once'\n                listeners = window._wio.Events[_event]\n\n                delete window._wio.Events[_event]\n              }\n              else listeners = window._wio.Events[_event] || []\n              \n              listeners.forEach( fn => {\n                try { payload !== undefined ? fn( payload, ackFn ) : fn( ackFn ) }\n                catch( error ){ console.error('[EMBEDDED] Listener error:', error ) }\n              })\n            },\n            \n            emit: function( _event, payload, fn ){\n              if( typeof payload === 'function' ){\n                fn = payload\n                payload = undefined\n              }\n              \n              if( !window._wio.connected && !RESERVED_EVENTS.includes(_event) ){\n                window._wio.messageQueue.push({ _event, payload, fn, timestamp: Date.now() })\n                console.log('[EMBEDDED] Queued message:', _event)\n                return\n              }\n              \n              try {\n                let cid\n                if( typeof fn === 'function' ){\n                  cid = window._wio.ackId()\n                  window._wio.once( _event + '--' + cid + '--@ack', ({ error, args }) => fn( error, ...args ) )\n                }\n                \n                const messageData = {\n                  _event,\n                  payload,\n                  cid,\n                  timestamp: Date.now(),\n                  token: RESERVED_EVENTS.includes(_event) ? window._wio.connectionToken : undefined\n                }\n                \n                if( typeof window.ReactNativeWebView !== 'undefined' )\n                  window.ReactNativeWebView.postMessage( JSON.stringify( messageData ) )\n                else console.error('[EMBEDDED] ReactNativeWebView not available')\n              }\n              catch( error ){\n                console.error('[EMBEDDED] Emit error:', error )\n                typeof fn === 'function' && fn( String(error) )\n              }\n            },\n            \n            on: function( _event, fn ){\n              if( !window._wio.Events[_event] ) window._wio.Events[_event] = []\n              window._wio.Events[_event].push( fn )\n\n              return window._wio\n            },\n            \n            once: function( _event, fn ){\n              _event += '--@once'\n              if( !window._wio.Events[_event] ) window._wio.Events[_event] = []\n\n              window._wio.Events[_event].push( fn )\n\n              return window._wio\n            },\n            \n            off: function( _event, fn ){\n              if( fn && window._wio.Events[_event] ){\n                const index = window._wio.Events[_event].indexOf( fn )\n                if( index > -1 ){\n                  window._wio.Events[_event].splice( index, 1 )\n                  if( window._wio.Events[_event].length === 0 ) delete window._wio.Events[_event]\n                }\n              }\n              else delete window._wio.Events[_event]\n\n              return window._wio\n            },\n            \n            processMessageQueue: function(){\n              if( !window._wio.connected || window._wio.messageQueue.length === 0 ) return\n              \n              console.log('[EMBEDDED] Processing', window._wio.messageQueue.length, 'queued messages')\n              const queue = [ ...window._wio.messageQueue ]\n              window._wio.messageQueue = []\n              \n              queue.forEach( msg => {\n                try { window._wio.emit( msg._event, msg.payload, msg.fn ) }\n                catch( error ){ console.error('[EMBEDDED] Queue process error:', error ) }\n              })\n            },\n            \n            handleMessage: function( data ){\n              if( !data || !data._event ) return\n              \n              const { _event, payload, cid, token } = data\n              \n              console.log('[EMBEDDED] Received:', _event )\n              \n              // Handle heartbeat response\n              if( _event === '__heartbeat_response' )\n                return\n              \n              // Handle heartbeat request\n              if( _event === '__heartbeat' ){\n                window._wio.emit('__heartbeat_response', { timestamp: Date.now() })\n                return\n              }\n              \n              // Handle webview ready signal\n              if( _event === '__webview_ready' ){\n                console.log('[EMBEDDED] WebView ready signal received')\n                return\n              }\n              \n              // Handle ping from WEBVIEW\n              if( _event === 'ping' ){\n                console.log('[EMBEDDED] Received ping, sending pong')\n                window._wio.connectionToken = token\n\n                window._wio.emit('pong', { token: window._wio.connectionToken })\n                return\n              }\n              \n              // Handle connection acknowledgment\n              if( _event === '__connection_ack' ){\n                if( token && token !== window._wio.connectionToken ){\n                  console.error('[EMBEDDED] Invalid connection token in ack')\n                  return\n                }\n                \n                console.log('[EMBEDDED] Connection established (received ack)')\n\n                window._wio.connected = true\n                window._wio.processMessageQueue()\n                window._wio.fire('connect')\n\n                return\n              }\n              \n              // Fire event listeners\n              window._wio.fire( _event, payload, cid )\n            },\n            \n            announceReady: function(){\n              let attempts = 0\n              const maxAttempts = 10\n              const interval = 1000\n              \n              console.log('[EMBEDDED] Starting ready announcements')\n              \n              const announce = () => {\n                if( window._wio.connected ){\n                  console.log('[EMBEDDED] Connected, stopping announcements')\n                  return\n                }\n                \n                attempts++\n                if( attempts > maxAttempts ){\n                  console.log('[EMBEDDED] Max announcement attempts reached')\n                  return\n                }\n                \n                console.log('[EMBEDDED] Announcing ready (attempt', attempts + '/' + maxAttempts + ')')\n                window._wio.emit('__embedded_ready')\n                \n                setTimeout( announce, interval )\n              }\n              \n              announce()\n            }\n          }\n\n          console.log('[EMBEDDED] WIO bridge ready. Call window._wio.listen() to connect.')\n        }\n        catch( error ){\n          console.error('[EMBEDDED] Setup failed:', error )\n          \n          // Create minimal fallback\n          window._wio = {\n            error: error.toString(),\n            listen: function(){ console.error('[EMBEDDED] WIO failed to initialize') },\n            emit: function(){ console.error('[EMBEDDED] WIO failed to initialize') },\n            on: function(){},\n            once: function(){},\n            off: function(){}\n          }\n        }\n\n        true\n      })()\n    ";
     };
     return WIO;
 }());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webview.io",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Easy and friendly API to connect and interact between React Native and WebView with enhanced security, reliability, and modern async/await support.",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/index.ts

@@ -131,8 +131,7 @@ export default class WIO {
     this.Events = {}
     this.peer = { type: 'WEBVIEW', connected: false, embeddedReady: false }
 
-    if( options.type )
-      this.peer.type = options.type
+    if( options.type ) this.peer.type = options.type
   }
 
   debug( ...args: any[] ){
@@ -211,24 +210,19 @@ export default class WIO {
       this.connectionToken = generateToken()
 
       // Re-initiate connection for WEBVIEW type
-      if( this.peer.type === 'WEBVIEW' ){
-        this.startConnectionAttempt()
-      }
-
+      this.peer.type === 'WEBVIEW' && this.startConnectionAttempt()
       // For EMBEDDED type, announce readiness
-      if( this.peer.type === 'EMBEDDED' ){
-        this.announceEmbeddedReady()
-      }
+      this.peer.type === 'EMBEDDED' && this.announceEmbeddedReady()
 
       // Set timeout for this reconnection attempt
-      setTimeout(() => {
+      setTimeout( () => {
         if( this.peer.connected ) return
 
         this.reconnectAttempts < this.maxReconnectAttempts
             ? this.attemptReconnection()
             : this.fire('reconnection_failed', { attempts: this.reconnectAttempts })
-      }, this.options.connectionTimeout!)
-    }, delay)
+      }, this.options.connectionTimeout! )
+    }, delay )
   }
 
   // Start connection attempt with timeout and retries
@@ -257,10 +251,8 @@ export default class WIO {
         this.debug(`[${this.peer.type}] Connection attempt ${this.connectionAttempts}/${this.options.maxConnectionAttempts}`)
         this.emit('ping', { token: this.connectionToken })
       }
-      else {
-        this.stopConnectionAttempt()
-      }
-    }, this.options.connectionPingInterval!)
+      else this.stopConnectionAttempt()
+    }, this.options.connectionPingInterval! )
 
     // Set overall timeout
     this.connectionAttemptTimer = setTimeout(() => {
@@ -310,17 +302,15 @@ export default class WIO {
         this.debug(`[${this.peer.type}] Ready announcement attempt ${attempts}/${maxAttempts}`)
         this.emit('__embedded_ready')
       }
-      else {
-        this.stopEmbeddedReadyAnnouncement()
-      }
+      else this.stopEmbeddedReadyAnnouncement()
     }, this.options.connectionPingInterval!)
   }
 
   private stopEmbeddedReadyAnnouncement(){
-    if( this.embeddedReadyCheckInterval ){
-      clearInterval( this.embeddedReadyCheckInterval )
-      this.embeddedReadyCheckInterval = undefined
-    }
+    if( !this.embeddedReadyCheckInterval ) return
+
+    clearInterval( this.embeddedReadyCheckInterval )
+    this.embeddedReadyCheckInterval = undefined
   }
 
   // Message rate limiting
@@ -351,8 +341,8 @@ export default class WIO {
 
   // Queue messages when not connected
   private queueMessage( _event: string, payload?: any, fn?: AckFunction ){
+    // Remove oldest message
     if( this.messageQueue.length >= this.options.messageQueueSize! ){
-      // Remove oldest message
       const removed = this.messageQueue.shift()
       this.debug(`[${this.peer.type}] Message queue full, removed oldest message:`, removed?._event)
     }
@@ -413,6 +403,9 @@ export default class WIO {
 
   /**
    * Listening to connection from the WebView host
+   * 
+   * NOTE: This is called manually from page code, 
+   * not auto-initialized
    */
   listen( hostOrigin?: string ){
     this.peer.type = 'EMBEDDED'
@@ -423,9 +416,7 @@ export default class WIO {
     this.debug(`[${this.peer.type}] Listening to connect${hostOrigin ? `: Host <${hostOrigin}>` : ''}`)
 
     // Start announcing readiness
-    setTimeout(() => {
-      this.announceEmbeddedReady()
-    }, 100)
+    setTimeout( () => this.announceEmbeddedReady(), 100 )
 
     return this
   }
@@ -436,9 +427,9 @@ export default class WIO {
   handleMessage( event: { nativeEvent: { data: string } } ){
     try {
       const data = JSON.parse( event.nativeEvent.data )
-
       // Enhanced security: check valid message structure
-      if( typeof data !== 'object' || !data.hasOwnProperty('_event') ) return
+      if( typeof data !== 'object' || !data.hasOwnProperty('_event') )
+        return
 
       const { _event, payload, cid, timestamp, token } = data as MessageData
 
@@ -470,9 +461,10 @@ export default class WIO {
         this.debug(`[${this.peer.type}] Embedded peer ready`)
         
         // If we're WEBVIEW and not connected, send ping
-        if( this.peer.type === 'WEBVIEW' && !this.peer.connected ){
-          this.emit('ping', { token: this.connectionToken })
-        }
+        this.peer.type === 'WEBVIEW'
+        && !this.peer.connected
+        && this.emit('ping', { token: this.connectionToken })
+        
         return
       }
 
@@ -494,6 +486,7 @@ export default class WIO {
           // Don't set fully connected yet - wait for ack
           this.debug(`[${this.peer.type}] Received ping, sent pong`)
         }
+
         return
       }
 
@@ -522,6 +515,7 @@ export default class WIO {
           
           this.debug(`[${this.peer.type}] Connected (3-way handshake complete)`)
         }
+
         return
       }
 
@@ -546,6 +540,7 @@ export default class WIO {
           
           this.debug(`[${this.peer.type}] Connected (received ack)`)
         }
+
         return
       }
 
@@ -569,11 +564,11 @@ export default class WIO {
     }
 
     const ackFn = cid
-      ? ( error: boolean | string, ...args: any[] ): void => {
-          this.emit(`${_event}--${cid}--@ack`, { error: error || false, args })
-          return
-        }
-      : undefined
+                ? ( error: boolean | string, ...args: any[] ): void => {
+                    this.emit(`${_event}--${cid}--@ack`, { error: error || false, args })
+                    return
+                  }
+                : undefined
     let listeners: Listener[] = []
 
     if( this.Events[_event + '--@once'] ){
@@ -717,9 +712,7 @@ export default class WIO {
 
   emitAsync<T = any, R = any>( _event: string, payload?: T, timeout: number = 5000 ): Promise<R> {
     return new Promise(( resolve, reject ) => {
-      const timeoutId = setTimeout(() => {
-        reject( new Error(`Event '${_event}' acknowledgment timeout after ${timeout}ms`) )
-      }, timeout )
+      const timeoutId = setTimeout(() => reject( new Error(`Event '${_event}' acknowledgment timeout after ${timeout}ms`) ), timeout )
 
       try {
         this.emit( _event, payload, ( error, ...args ) => {
@@ -745,17 +738,17 @@ export default class WIO {
     return new Promise(( resolve, reject ) => {
       if( this.isConnected() ) return resolve()
 
-      const timeoutId = setTimeout(() => {
-        this.off('connect', connectHandler)
+      const timeoutId = setTimeout( () => {
+        this.off('connect', connectHandler )
         reject( new Error('Connection timeout') )
-      }, timeout || this.options.connectionTimeout)
+      }, timeout || this.options.connectionTimeout )
 
       const connectHandler = () => {
         clearTimeout( timeoutId )
         resolve()
       }
 
-      this.once('connect', connectHandler)
+      this.once('connect', connectHandler )
     })
   }
 
@@ -822,6 +815,7 @@ export default class WIO {
   /**
    * Get injected JavaScript for WebView
    * Sets up the EMBEDDED side of the bridge
+   * NOTE: Does not auto-initialize - page must call window._wio.listen()
    */
   getInjectedJavaScript(): string {
     return `
@@ -849,13 +843,18 @@ export default class WIO {
             setupComplete: false,
 
             listen: function(){
+              if( this.setupComplete ){
+                console.warn('[EMBEDDED] Already listening')
+                return this
+              }
+
               console.log('[EMBEDDED] Setting up message listeners...')
 
               // Listen to messages from React Native
               window.addEventListener('message', function( event ){
                 try {
                   const message = typeof event.data === 'string' ? JSON.parse( event.data ) : event.data
-                  window._wio.handleMessage( message )  // Use window._wio instead of this
+                  window._wio.handleMessage( message )
                 }
                 catch( error ){ console.error('[EMBEDDED] Parse error:', error ) }
               })
@@ -865,16 +864,19 @@ export default class WIO {
                 document.addEventListener('message', function( event ){
                   try {
                     const message = typeof event.data === 'string' ? JSON.parse( event.data ) : event.data
-                    window._wio.handleMessage( message )  // Use window._wio instead of this
+                    window._wio.handleMessage( message )
                   }
                   catch( error ){ console.error('[EMBEDDED] Parse error:', error ) }
                 })
               }
 
-              window._wio.setupComplete = true  // Use window._wio instead of this
-              console.log('[EMBEDDED] Setup complete')
+              this.setupComplete = true
+              console.log('[EMBEDDED] Setup complete, starting ready announcements')
 
-              return window._wio
+              // Start announcing readiness
+              this.announceReady()
+
+              return this
             },
             
             ackId: function(){
@@ -1045,8 +1047,8 @@ export default class WIO {
             
             announceReady: function(){
               let attempts = 0
-              const maxAttempts = 5
-              const interval = 2000
+              const maxAttempts = 10
+              const interval = 1000
               
               console.log('[EMBEDDED] Starting ready announcements')
               
@@ -1072,12 +1074,7 @@ export default class WIO {
             }
           }
 
-          // Initialize
-          wio.listen()
-          // Start announcing readiness after a short delay
-          setTimeout(() => wio.announceReady(), 100)
-          
-          console.log('[EMBEDDED] WIO bridge initialized successfully')
+          console.log('[EMBEDDED] WIO bridge ready. Call window._wio.listen() to connect.')
         }
         catch( error ){
           console.error('[EMBEDDED] Setup failed:', error )
@@ -1085,6 +1082,7 @@ export default class WIO {
           // Create minimal fallback
           window._wio = {
             error: error.toString(),
+            listen: function(){ console.error('[EMBEDDED] WIO failed to initialize') },
             emit: function(){ console.error('[EMBEDDED] WIO failed to initialize') },
             on: function(){},
             once: function(){},