request-iframe 0.0.2 → 0.0.3

package/library/core/client-server.js

@@ -0,0 +1,266 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.RequestIframeClientServer = void 0;
+require("core-js/modules/es.array.iterator.js");
+require("core-js/modules/es.map.js");
+require("core-js/modules/es.string.starts-with.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/web.dom-collections.iterator.js");
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _message = require("../message");
+var _cache = require("../utils/cache");
+var _utils = require("../utils");
+var _constants = require("../constants");
+/**
+ * Stream message handler callback
+ */
+
+/**
+ * Pending acknowledgment response
+ */
+
+/**
+ * Pending request awaiting response
+ */
+
+/**
+ * ClientServer configuration options
+ */
+
+/**
+ * RequestIframeClientServer - Client-side message server
+ * Only handles responses, not requests
+ * Uses shared MessageDispatcher (backed by MessageChannel) to listen for and send messages
+ */
+class RequestIframeClientServer {
+  constructor(options, instanceId) {
+    var _options$ackTimeout, _options$versionValid;
+    /** Pending responses awaiting client acknowledgment */
+    (0, _defineProperty2.default)(this, "pendingAcks", new Map());
+    /** Pending requests awaiting response */
+    (0, _defineProperty2.default)(this, "pendingRequests", new Map());
+    /** List of unregister handler functions */
+    (0, _defineProperty2.default)(this, "unregisterFns", []);
+    /** Whether opened */
+    (0, _defineProperty2.default)(this, "_isOpen", false);
+    this.ackTimeout = (_options$ackTimeout = options === null || options === void 0 ? void 0 : options.ackTimeout) !== null && _options$ackTimeout !== void 0 ? _options$ackTimeout : _constants.DefaultTimeout.ACK;
+    this.versionValidator = (_options$versionValid = options === null || options === void 0 ? void 0 : options.versionValidator) !== null && _options$versionValid !== void 0 ? _options$versionValid : _utils.isCompatibleVersion;
+
+    // Get or create shared channel and create dispatcher
+    var channel = (0, _cache.getOrCreateMessageChannel)(options === null || options === void 0 ? void 0 : options.secretKey);
+    this.dispatcher = new _message.MessageDispatcher(channel, _constants.MessageRole.CLIENT, instanceId);
+
+    // Auto-open by default (unless explicitly set to false)
+    if ((options === null || options === void 0 ? void 0 : options.autoOpen) !== false) {
+      this.open();
+    }
+  }
+
+  /**
+   * Open message handling (register message handlers)
+   */
+  open() {
+    if (this._isOpen) return;
+    this._isOpen = true;
+    this.registerHandlers();
+  }
+
+  /**
+   * Close message handling (unregister message handlers, but don't release channel)
+   */
+  close() {
+    if (!this._isOpen) return;
+    this._isOpen = false;
+
+    // Unregister all handlers
+    this.unregisterFns.forEach(fn => fn());
+    this.unregisterFns.length = 0;
+  }
+
+  /**
+   * Whether opened
+   */
+  get isOpen() {
+    return this._isOpen;
+  }
+
+  /**
+   * Register message handlers
+   */
+  registerHandlers() {
+    var handlerOptions = {
+      versionValidator: this.versionValidator,
+      onVersionError: this.handleVersionError.bind(this)
+    };
+
+    // Handle ACK messages
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.ACK, (data, context) => this.handleClientResponse(data, context), handlerOptions));
+
+    // Handle ASYNC messages
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.ASYNC, (data, context) => this.handleClientResponse(data, context), handlerOptions));
+
+    // Handle RESPONSE messages
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.RESPONSE, (data, context) => this.handleClientResponse(data, context), handlerOptions));
+
+    // Handle ERROR messages
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.ERROR, (data, context) => this.handleClientResponse(data, context), handlerOptions));
+
+    // Handle RECEIVED messages
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.RECEIVED, data => this.handleReceived(data), handlerOptions));
+
+    // Handle PONG messages
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.PONG, (data, context) => this.handlePong(data, context), handlerOptions));
+
+    // Handle stream_start messages (route to handleClientResponse so it reaches send callback)
+    // Note: stream_start is handled in send callback, not through streamCallback
+    this.unregisterFns.push(this.dispatcher.registerHandler(_constants.MessageType.STREAM_START, (data, context) => {
+      // Route to handleClientResponse so it reaches send callback
+      this.handleClientResponse(data, context);
+      // Don't call streamCallback here - stream_start is handled in send callback
+    }, handlerOptions));
+
+    // Handle other stream messages (stream_data, stream_end, etc.)
+    this.unregisterFns.push(this.dispatcher.registerHandler(type => type.startsWith('stream_') && type !== _constants.MessageType.STREAM_START, (data, context) => {
+      var _this$streamCallback;
+      return (_this$streamCallback = this.streamCallback) === null || _this$streamCallback === void 0 ? void 0 : _this$streamCallback.call(this, data, context);
+    }, handlerOptions));
+  }
+
+  /**
+   * Handle protocol version error
+   */
+  handleVersionError(data, context, version) {
+    // For response messages, we need to notify the waiting request
+    var pending = this.pendingRequests.get(data.requestId);
+    if (pending) {
+      this.pendingRequests.delete(data.requestId);
+      pending.reject(new Error((0, _constants.formatMessage)(_constants.Messages.PROTOCOL_VERSION_TOO_LOW, version, _constants.ProtocolVersion.MIN_SUPPORTED)));
+    }
+  }
+
+  /**
+   * Handle client response
+   */
+  handleClientResponse(data, context) {
+    var pending = this.pendingRequests.get(data.requestId);
+    if (pending) {
+      // Validate origin
+      if (pending.origin && pending.origin !== '*' && context.origin !== pending.origin) {
+        return;
+      }
+      // ack, async, and stream_start don't delete pending (stream_start needs to keep pending for stream_data/stream_end)
+      if (data.type === _constants.MessageType.ACK || data.type === _constants.MessageType.ASYNC || data.type === _constants.MessageType.STREAM_START) {
+        pending.resolve(data);
+        return;
+      }
+      // response and error delete pending
+      this.pendingRequests.delete(data.requestId);
+      pending.resolve(data);
+    }
+  }
+
+  /**
+   * Handle received acknowledgment
+   */
+  handleReceived(data) {
+    var pending = this.pendingAcks.get(data.requestId);
+    if (pending) {
+      clearTimeout(pending.timeoutId);
+      this.pendingAcks.delete(data.requestId);
+      pending.resolve(true);
+    }
+  }
+
+  /**
+   * Handle pong
+   */
+  handlePong(data, context) {
+    var pending = this.pendingRequests.get(data.requestId);
+    if (pending) {
+      if (pending.origin && pending.origin !== '*' && context.origin !== pending.origin) {
+        return;
+      }
+      this.pendingRequests.delete(data.requestId);
+      pending.resolve(data);
+    }
+  }
+
+  /**
+   * Set stream message handler callback
+   */
+  setStreamCallback(callback) {
+    this.streamCallback = callback;
+  }
+
+  /** Get secretKey */
+  get secretKey() {
+    return this.dispatcher.secretKey;
+  }
+
+  /** Get the underlying MessageDispatcher */
+  get messageDispatcher() {
+    return this.dispatcher;
+  }
+
+  /**
+   * Register pending acknowledgment response
+   */
+  _registerPendingAck(requestId, resolve, reject) {
+    var timeoutId = setTimeout(() => {
+      this.pendingAcks.delete(requestId);
+      resolve(false);
+    }, this.ackTimeout);
+    this.pendingAcks.set(requestId, {
+      resolve,
+      reject,
+      timeoutId
+    });
+  }
+
+  /**
+   * Register pending request awaiting response
+   */
+  _registerPendingRequest(requestId, resolve, reject, origin) {
+    this.pendingRequests.set(requestId, {
+      resolve,
+      reject,
+      origin
+    });
+  }
+
+  /**
+   * Cancel pending response
+   */
+  _unregisterPendingRequest(requestId) {
+    this.pendingRequests.delete(requestId);
+  }
+
+  /**
+   * Send ping message
+   */
+  sendPing(targetWindow, targetOrigin, requestId) {
+    this.dispatcher.sendMessage(targetWindow, targetOrigin, _constants.MessageType.PING, requestId);
+  }
+
+  /**
+   * Destroy (close and release channel reference)
+   */
+  destroy() {
+    // Close first
+    this.close();
+
+    // Clear pending
+    this.pendingRequests.clear();
+    this.pendingAcks.forEach(pending => clearTimeout(pending.timeoutId));
+    this.pendingAcks.clear();
+
+    // Destroy dispatcher and release channel reference
+    this.dispatcher.destroy();
+    (0, _cache.releaseMessageChannel)(this.dispatcher.getChannel());
+  }
+}
+exports.RequestIframeClientServer = RequestIframeClientServer;

package/library/core/client.d.ts

@@ -1,17 +1,20 @@
-import { RequestOptions, Response, RequestIframeClient, RequestDefaults } from '../types';
+import { RequestOptions, Response, RequestIframeClient, RequestDefaults, HeadersConfig } from '../types';
 import { RequestInterceptorManager, ResponseInterceptorManager } from '../interceptors';
-import { RequestIframeClientServer } from './server-client';
+import { RequestIframeClientServer } from './client-server';
 import { StreamMessageHandler, StreamMessageData } from '../stream';
 /**
  * Client configuration options
  */
 export interface ClientOptions extends RequestDefaults {
     secretKey?: string;
+    headers?: HeadersConfig;
 }
 /**
  * RequestIframeClient implementation (only responsible for initiating requests, reuses server's listener)
  */
 export declare class RequestIframeClientImpl implements RequestIframeClient, StreamMessageHandler {
+    /** Unique instance ID */
+    readonly id: string;
     interceptors: {
         request: RequestInterceptorManager;
         response: ResponseInterceptorManager;
@@ -24,6 +27,8 @@ export declare class RequestIframeClientImpl implements RequestIframeClient, Str
     private readonly defaultAckTimeout;
     private readonly defaultTimeout;
     private readonly defaultAsyncTimeout;
+    /** Initial headers configuration */
+    private readonly initialHeaders?;
     /**
      * Internal cookies storage
      * - Automatically includes cookies matching the path when sending requests
@@ -36,7 +41,12 @@ export declare class RequestIframeClientImpl implements RequestIframeClient, Str
      * value: stream message handler function
      */
     private readonly streamHandlers;
-    constructor(targetWindow: Window, targetOrigin: string, server: RequestIframeClientServer, options?: ClientOptions);
+    /**
+     * Target server ID (remembered from responses)
+     * When a response is received, we remember the server's creatorId as the targetId for future requests
+     */
+    private _targetServerId?;
+    constructor(targetWindow: Window, targetOrigin: string, server: RequestIframeClientServer, options?: ClientOptions, instanceId?: string);
     /**
      * Register stream message handler (StreamMessageHandler interface implementation)
      */
@@ -45,14 +55,20 @@ export declare class RequestIframeClientImpl implements RequestIframeClient, Str
      * Unregister stream message handler (StreamMessageHandler interface implementation)
      */
     unregisterStreamHandler(streamId: string): void;
-    /**
-     * Send message (StreamMessageHandler interface implementation)
-     */
     postMessage(message: any): void;
     /**
      * Dispatch stream message to corresponding handler
      */
     private dispatchStreamMessage;
+    /**
+     * Resolve header value (handle function type headers)
+     */
+    private resolveHeaderValue;
+    /**
+     * Merge and resolve headers (initial headers + request headers)
+     * Request headers take precedence over initial headers
+     */
+    private mergeHeaders;
     /**
      * Check if server is reachable
      */

package/library/core/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["client.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,cAAc,EACd,QAAQ,EAGR,mBAAmB,EACnB,eAAe,EAChB,MAAM,UAAU,CAAC;AAKlB,OAAO,EACL,yBAAyB,EACzB,0BAA0B,EAG3B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAY5D,OAAO,EAGL,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,WAAW,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,eAAe;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB,EAAE,oBAAoB;IAChF,YAAY;;;MAGjB;IAEF,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA4B;IACnD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAS;IAEpC,oCAAoC;IACpC,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAS;IAE7C;;;;OAIG;IACH,OAAO,CAAC,YAAY,CAAkC;IAEtD;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAwD;gBAGrF,YAAY,EAAE,MAAM,EACpB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,yBAAyB,EACjC,OAAO,CAAC,EAAE,aAAa;IAkBzB;;OAEG;IACI,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,GAAG,IAAI;IAIhG;;OAEG;IACI,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAItD;;OAEG;IACI,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,IAAI;IAItC;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAY7B;;OAEG;IACI,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IA+CvB,IAAI,CAAC,CAAC,GAAG,GAAG,EACvB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAmQvB,OAAO,CAAC,UAAU;IAIlB;;OAEG;IACI,SAAS,IAAI,yBAAyB;IAI7C;;OAEG;IACH,IAAW,MAAM,IAAI,OAAO,CAE3B;IAED;;OAEG;IACI,IAAI,IAAI,IAAI;IAInB;;OAEG;IACI,KAAK,IAAI,IAAI;IAIpB;;OAEG;IACI,OAAO,IAAI,IAAI;IAetB;;;OAGG;IACI,UAAU,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAOxD;;;;OAIG;IACI,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAIjE;;;;;OAKG;IACI,SAAS,CACd,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,IAAI,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC3D,IAAI;IAgBP;;;;OAIG;IACI,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI;IAItD;;OAEG;IACI,YAAY,IAAI,IAAI;CAG5B"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/core/client.ts"],"names":[],"mappings":"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"}

package/library/core/client.js

@@ -6,7 +6,6 @@ require("core-js/modules/es.array.from.js");
 require("core-js/modules/es.array.slice.js");
 require("core-js/modules/es.object.get-own-property-descriptors.js");
 require("core-js/modules/es.regexp.to-string.js");
-require("core-js/modules/web.dom-collections.for-each.js");
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -15,12 +14,16 @@ exports.RequestIframeClientImpl = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 require("core-js/modules/es.array.iterator.js");
 require("core-js/modules/es.map.js");
+require("core-js/modules/es.object.entries.js");
 require("core-js/modules/es.promise.js");
 require("core-js/modules/es.regexp.exec.js");
+require("core-js/modules/es.string.match.js");
 require("core-js/modules/es.string.replace.js");
 require("core-js/modules/es.string.starts-with.js");
+require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/web.dom-collections.iterator.js");
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _utils = require("../utils");
 var _interceptors = require("../interceptors");
@@ -39,8 +42,14 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * RequestIframeClient implementation (only responsible for initiating requests, reuses server's listener)
  */
 class RequestIframeClientImpl {
-  constructor(targetWindow, targetOrigin, server, options) {
+  /** 
+   * Target server ID (remembered from responses)
+   * When a response is received, we remember the server's creatorId as the targetId for future requests
+   */
+
+  constructor(targetWindow, targetOrigin, server, options, instanceId) {
     var _options$ackTimeout, _options$timeout, _options$asyncTimeout;
+    /** Unique instance ID */
     (0, _defineProperty2.default)(this, "interceptors", {
       request: new _interceptors.RequestInterceptorManager(),
       response: new _interceptors.ResponseInterceptorManager()
@@ -57,6 +66,7 @@ class RequestIframeClientImpl {
      * value: stream message handler function
      */
     (0, _defineProperty2.default)(this, "streamHandlers", new Map());
+    this.id = instanceId || (0, _utils.generateInstanceId)();
     this.targetWindow = targetWindow;
     this.targetOrigin = targetOrigin;
     this.server = server;
@@ -67,6 +77,9 @@ class RequestIframeClientImpl {
     this.defaultTimeout = (_options$timeout = options === null || options === void 0 ? void 0 : options.timeout) !== null && _options$timeout !== void 0 ? _options$timeout : _constants.DefaultTimeout.REQUEST;
     this.defaultAsyncTimeout = (_options$asyncTimeout = options === null || options === void 0 ? void 0 : options.asyncTimeout) !== null && _options$asyncTimeout !== void 0 ? _options$asyncTimeout : _constants.DefaultTimeout.ASYNC;
 
+    // Save initial headers configuration
+    this.initialHeaders = options === null || options === void 0 ? void 0 : options.headers;
+
     // Register stream message processing callback
     this.server.setStreamCallback(data => {
       this.dispatchStreamMessage(data);
@@ -87,8 +100,8 @@ class RequestIframeClientImpl {
     this.streamHandlers.delete(streamId);
   }
 
-  /**
-   * Send message (StreamMessageHandler interface implementation)
+  /*
+   Send message (StreamMessageHandler interface implementation)
    */
   postMessage(message) {
     this.server.messageDispatcher.send(this.targetWindow, message, this.targetOrigin);
@@ -110,6 +123,45 @@ class RequestIframeClientImpl {
     }
   }
 
+  /**
+   * Resolve header value (handle function type headers)
+   */
+  resolveHeaderValue(value, config) {
+    if (typeof value === 'function') {
+      return value(config);
+    }
+    return value;
+  }
+
+  /**
+   * Merge and resolve headers (initial headers + request headers)
+   * Request headers take precedence over initial headers
+   */
+  mergeHeaders(config) {
+    var resolvedHeaders = {};
+
+    // First, resolve initial headers
+    if (this.initialHeaders) {
+      for (var _i = 0, _Object$entries = Object.entries(this.initialHeaders); _i < _Object$entries.length; _i++) {
+        var _Object$entries$_i = (0, _slicedToArray2.default)(_Object$entries[_i], 2),
+          key = _Object$entries$_i[0],
+          value = _Object$entries$_i[1];
+        resolvedHeaders[key] = this.resolveHeaderValue(value, config);
+      }
+    }
+
+    // Then, merge request headers (request headers take precedence)
+    if (config.headers) {
+      for (var _i2 = 0, _Object$entries2 = Object.entries(config.headers); _i2 < _Object$entries2.length; _i2++) {
+        var _Object$entries2$_i = (0, _slicedToArray2.default)(_Object$entries2[_i2], 2),
+          _key = _Object$entries2$_i[0],
+          _value = _Object$entries2$_i[1];
+        resolvedHeaders[_key] = this.resolveHeaderValue(_value, config);
+      }
+    }
+    return resolvedHeaders;
+  }
+
   /**
    * Check if server is reachable
    */
@@ -149,7 +201,7 @@ class RequestIframeClientImpl {
   send(path, body, options) {
     var _this = this;
     return (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var config, processedConfig, processedPath, processedBody, processedHeaders, processedCookies, _processedConfig$ackT, ackTimeout, _processedConfig$time, timeout, _processedConfig$asyn, asyncTimeout, _processedConfig$requ, requestId;
+      var config, processedConfig, mergedHeaders, processedPath, processedBody, processedCookies, userTargetId, _processedConfig$ackT, ackTimeout, _processedConfig$time, timeout, _processedConfig$asyn, asyncTimeout, _processedConfig$requ, requestId, targetId;
       return _regenerator.default.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -161,7 +213,10 @@ class RequestIframeClientImpl {
             return (0, _interceptors.runRequestInterceptors)(_this.interceptors.request, config);
           case 1:
             processedConfig = _context.sent;
-            processedPath = processedConfig.path, processedBody = processedConfig.body, processedHeaders = processedConfig.headers, processedCookies = processedConfig.cookies, _processedConfig$ackT = processedConfig.ackTimeout, ackTimeout = _processedConfig$ackT === void 0 ? _this.defaultAckTimeout : _processedConfig$ackT, _processedConfig$time = processedConfig.timeout, timeout = _processedConfig$time === void 0 ? _this.defaultTimeout : _processedConfig$time, _processedConfig$asyn = processedConfig.asyncTimeout, asyncTimeout = _processedConfig$asyn === void 0 ? _this.defaultAsyncTimeout : _processedConfig$asyn, _processedConfig$requ = processedConfig.requestId, requestId = _processedConfig$requ === void 0 ? (0, _utils.generateRequestId)() : _processedConfig$requ;
+            // Merge and resolve headers (initial headers + request headers)
+            mergedHeaders = _this.mergeHeaders(processedConfig);
+            processedPath = processedConfig.path, processedBody = processedConfig.body, processedCookies = processedConfig.cookies, userTargetId = processedConfig.targetId, _processedConfig$ackT = processedConfig.ackTimeout, ackTimeout = _processedConfig$ackT === void 0 ? _this.defaultAckTimeout : _processedConfig$ackT, _processedConfig$time = processedConfig.timeout, timeout = _processedConfig$time === void 0 ? _this.defaultTimeout : _processedConfig$time, _processedConfig$asyn = processedConfig.asyncTimeout, asyncTimeout = _processedConfig$asyn === void 0 ? _this.defaultAsyncTimeout : _processedConfig$asyn, _processedConfig$requ = processedConfig.requestId, requestId = _processedConfig$requ === void 0 ? (0, _utils.generateRequestId)() : _processedConfig$requ; // Use user-specified targetId, or remembered target server ID, or undefined
+            targetId = userTargetId || _this._targetServerId;
             return _context.abrupt("return", new Promise((resolve, reject) => {
               var prefixedPath = _this.prefixPath(processedPath);
               var done = false;
@@ -174,7 +229,23 @@ class RequestIframeClientImpl {
                 if (done) return;
                 done = true;
                 cleanup();
-                reject(error);
+                // Run response interceptors to allow error logging
+                Promise.reject(error).catch(err => {
+                  // Run through response interceptors' rejected callbacks
+                  var promise = Promise.reject(err);
+                  _this.interceptors.response.forEach(interceptor => {
+                    promise = promise.catch(e => {
+                      if (interceptor.rejected) {
+                        return interceptor.rejected(e);
+                      }
+                      return Promise.reject(e);
+                    });
+                  });
+                  return promise;
+                }).catch(() => {
+                  // After interceptors, reject with original error
+                  reject(error);
+                });
               };
               var setAckTimeout = () => {
                 if (timeoutId) clearTimeout(timeoutId);
@@ -216,6 +287,10 @@ class RequestIframeClientImpl {
 
                 // Received ACK: server has received request
                 if (data.type === _constants.MessageType.ACK) {
+                  // Remember server's creatorId as target server ID for future requests
+                  if (data.creatorId && !_this._targetServerId) {
+                    _this._targetServerId = data.creatorId;
+                  }
                   // Switch to request timeout
                   setRequestTimeout();
                   return;
@@ -223,6 +298,10 @@ class RequestIframeClientImpl {
 
                 // Received ASYNC notification: this is an async task
                 if (data.type === _constants.MessageType.ASYNC) {
+                  // Remember server's creatorId as target server ID for future requests
+                  if (data.creatorId && !_this._targetServerId) {
+                    _this._targetServerId = data.creatorId;
+                  }
                   // Switch to async timeout
                   setAsyncTimeout();
                   return;
@@ -230,7 +309,7 @@ class RequestIframeClientImpl {
 
                 // Received stream start message
                 if (data.type === _constants.MessageType.STREAM_START) {
-                  var _streamBody$chunked;
+                  var _streamBody$chunked, _streamBody$autoResol;
                   done = true;
                   cleanup();
                   var streamBody = data.body;
@@ -238,24 +317,68 @@ class RequestIframeClientImpl {
                   var streamType = streamBody.type || _constants.StreamType.DATA;
                   var streamChunked = (_streamBody$chunked = streamBody.chunked) !== null && _streamBody$chunked !== void 0 ? _streamBody$chunked : true;
                   var streamMetadata = streamBody.metadata;
+                  var autoResolve = (_streamBody$autoResol = streamBody.autoResolve) !== null && _streamBody$autoResol !== void 0 ? _streamBody$autoResol : false;
 
                   // Create corresponding readable stream based on stream type
-                  var readableStream;
                   if (streamType === _constants.StreamType.FILE) {
-                    readableStream = new _stream.IframeFileReadableStream(streamId, requestId, _this, {
+                    var _readableStream = new _stream.IframeFileReadableStream(streamId, requestId, _this, {
                       chunked: streamChunked,
                       metadata: streamMetadata,
                       filename: streamMetadata === null || streamMetadata === void 0 ? void 0 : streamMetadata.filename,
                       mimeType: streamMetadata === null || streamMetadata === void 0 ? void 0 : streamMetadata.mimeType,
                       size: streamMetadata === null || streamMetadata === void 0 ? void 0 : streamMetadata.size
                     });
-                  } else {
-                    readableStream = new _stream.IframeReadableStream(streamId, requestId, _this, {
-                      type: streamType,
-                      chunked: streamChunked,
-                      metadata: streamMetadata
-                    });
+
+                    // If autoResolve is enabled, automatically read and convert to File/Blob
+                    if (autoResolve) {
+                      var _data$headers;
+                      // Extract fileName from headers if available
+                      var contentDisposition = (_data$headers = data.headers) === null || _data$headers === void 0 ? void 0 : _data$headers[_constants.HttpHeader.CONTENT_DISPOSITION];
+                      var fileName;
+                      if (contentDisposition) {
+                        var disposition = typeof contentDisposition === 'string' ? contentDisposition : contentDisposition[0];
+                        var filenameMatch = disposition.match(/filename="?([^"]+)"?/i);
+                        if (filenameMatch) {
+                          fileName = filenameMatch[1];
+                        }
+                      }
+                      // Fallback to stream metadata if not found in headers
+                      fileName = fileName || (streamMetadata === null || streamMetadata === void 0 ? void 0 : streamMetadata.filename) || _readableStream.filename;
+
+                      // Use stream's readAsFile or readAsBlob method
+                      var fileDataPromise = fileName ? _readableStream.readAsFile(fileName) : _readableStream.readAsBlob();
+                      fileDataPromise.then(fileData => {
+                        var resp = {
+                          data: fileData,
+                          status: data.status || _constants.HttpStatus.OK,
+                          statusText: data.statusText || _constants.HttpStatusText[_constants.HttpStatus.OK],
+                          requestId,
+                          headers: data.headers
+                        };
+                        return (0, _interceptors.runResponseInterceptors)(_this.interceptors.response, resp);
+                      }).then(resolve).catch(reject);
+                      return;
+                    }
+
+                    // Non-autoResolve: return file stream directly
+                    var _resp = {
+                      data: undefined,
+                      status: data.status || _constants.HttpStatus.OK,
+                      statusText: data.statusText || _constants.HttpStatusText[_constants.HttpStatus.OK],
+                      requestId,
+                      headers: data.headers,
+                      stream: _readableStream
+                    };
+                    (0, _interceptors.runResponseInterceptors)(_this.interceptors.response, _resp).then(resolve).catch(reject);
+                    return;
                   }
+
+                  // Non-file stream: create regular readable stream
+                  var readableStream = new _stream.IframeReadableStream(streamId, requestId, _this, {
+                    type: streamType,
+                    chunked: streamChunked,
+                    metadata: streamMetadata
+                  });
                   var resp = {
                     data: undefined,
                     status: data.status || _constants.HttpStatus.OK,
@@ -279,10 +402,16 @@ class RequestIframeClientImpl {
                   done = true;
                   cleanup();
 
+                  // Remember server's creatorId as target server ID for future requests
+                  if (data.creatorId && !_this._targetServerId) {
+                    _this._targetServerId = data.creatorId;
+                  }
+
                   // If server requires acknowledgment, send received message
                   if (data.requireAck) {
                     _this.server.messageDispatcher.sendMessage(_this.targetWindow, _this.targetOrigin, _constants.MessageType.RECEIVED, requestId, {
-                      path: prefixedPath
+                      path: prefixedPath,
+                      targetId: data.creatorId
                     });
                   }
 
@@ -303,25 +432,30 @@ class RequestIframeClientImpl {
                       _iterator.f();
                     }
                   }
-                  var _resp = {
+                  var _resp2 = {
                     data: data.data,
                     status: data.status || _constants.HttpStatus.OK,
                     statusText: data.statusText || _constants.HttpStatusText[_constants.HttpStatus.OK],
                     requestId,
-                    headers: data.headers,
-                    fileData: data.fileData
+                    headers: data.headers
                   };
-                  (0, _interceptors.runResponseInterceptors)(_this.interceptors.response, _resp).then(resolve).catch(reject);
+                  (0, _interceptors.runResponseInterceptors)(_this.interceptors.response, _resp2).then(resolve).catch(reject);
                   return;
                 }
 
                 // Received error
                 if (data.type === _constants.MessageType.ERROR) {
                   var _data$error, _data$error2;
+                  // Remember server's creatorId as target server ID for future requests
+                  if (data.creatorId && !_this._targetServerId) {
+                    _this._targetServerId = data.creatorId;
+                  }
+
                   // If server requires acknowledgment, send received message
                   if (data.requireAck) {
                     _this.server.messageDispatcher.sendMessage(_this.targetWindow, _this.targetOrigin, _constants.MessageType.RECEIVED, requestId, {
-                      path: prefixedPath
+                      path: prefixedPath,
+                      targetId: data.creatorId
                     });
                   }
                   var err = {
@@ -357,8 +491,9 @@ class RequestIframeClientImpl {
               _this.server.messageDispatcher.sendMessage(_this.targetWindow, _this.targetOrigin, _constants.MessageType.REQUEST, requestId, {
                 path: prefixedPath,
                 body: processedBody,
-                headers: processedHeaders,
-                cookies: mergedCookies
+                headers: mergedHeaders,
+                cookies: mergedCookies,
+                targetId
               });
             }));
           case 2: