iframe-bridge-kit 1.1.0 → 1.1.1

package/dist/index.mjs

@@ -1,52 +1,167 @@
 // src/index.ts
 import { WindowMessenger, connect } from "penpal";
-var defineBridge = (name, methods) => {
-  return {
-    async create(iframe, allowedOrigins = ["*"]) {
-      if (!iframe.contentWindow) {
-        throw new Error("iframe contentWindow is null");
+
+// src/callbacks.ts
+var callbackRefType = "iframe-bridge-kit.callback";
+var callbackInvokeMethod = "__iframeBridgeInvokeCallback";
+var isObject = (value) => typeof value === "object" && value !== null;
+var isPlainObject = (value) => {
+  const proto = Object.getPrototypeOf(value);
+  return proto === Object.prototype || proto === null;
+};
+var isCallbackDescriptor = (value) => {
+  return isObject(value) && value.__iframeBridgeType === callbackRefType && typeof value.id === "string";
+};
+var createCallbackBridge = (getRemote) => {
+  const localCallbacks = /* @__PURE__ */ new Map();
+  const localCallbackIds = /* @__PURE__ */ new WeakMap();
+  const remoteCallbacks = /* @__PURE__ */ new Map();
+  let nextCallbackId = 0;
+  const registerLocalCallback = (fn) => {
+    let id = localCallbackIds.get(fn);
+    if (!id) {
+      id = `${Date.now().toString(36)}-${(++nextCallbackId).toString(36)}`;
+      localCallbackIds.set(fn, id);
+    }
+    localCallbacks.set(id, fn);
+    return {
+      __iframeBridgeType: callbackRefType,
+      id
+    };
+  };
+  const serialize = (value, seen = /* @__PURE__ */ new WeakMap()) => {
+    if (typeof value === "function") {
+      return registerLocalCallback(value);
+    }
+    if (!isObject(value)) {
+      return value;
+    }
+    if (seen.has(value)) {
+      return seen.get(value);
+    }
+    if (Array.isArray(value)) {
+      const copy2 = [];
+      seen.set(value, copy2);
+      value.forEach((item, index) => {
+        copy2[index] = serialize(item, seen);
+      });
+      return copy2;
+    }
+    if (!isPlainObject(value)) {
+      return value;
+    }
+    const copy = {};
+    seen.set(value, copy);
+    Object.keys(value).forEach((key) => {
+      copy[key] = serialize(value[key], seen);
+    });
+    return copy;
+  };
+  const deserialize = (value, seen = /* @__PURE__ */ new WeakMap()) => {
+    if (!isObject(value)) {
+      return value;
+    }
+    if (isCallbackDescriptor(value)) {
+      let callback = remoteCallbacks.get(value.id);
+      if (!callback) {
+        callback = async (...args) => {
+          const remote = await getRemote();
+          const result = await remote[callbackInvokeMethod](value.id, serialize(args));
+          return deserialize(result);
+        };
+        remoteCallbacks.set(value.id, callback);
       }
-      const conn = connect({
-        messenger: new WindowMessenger({
-          remoteWindow: iframe.contentWindow,
-          allowedOrigins
-        }),
-        channel: "iframe-bridge-channel",
-        methods
+      return callback;
+    }
+    if (seen.has(value)) {
+      return seen.get(value);
+    }
+    if (Array.isArray(value)) {
+      const copy2 = [];
+      seen.set(value, copy2);
+      value.forEach((item, index) => {
+        copy2[index] = deserialize(item, seen);
       });
-      const remote = await conn.promise;
-      return {
-        emit(type, ...args) {
-          const [data] = args;
-          remote.onMessage(type, data);
-        }
-      };
+      return copy2;
+    }
+    if (!isPlainObject(value)) {
+      return value;
     }
+    const copy = {};
+    seen.set(value, copy);
+    Object.keys(value).forEach((key) => {
+      copy[key] = deserialize(value[key], seen);
+    });
+    return copy;
+  };
+  const invokeLocalCallback = async (id, args) => {
+    const callback = localCallbacks.get(id);
+    if (!callback) {
+      throw new Error(`Callback "${id}" is not available`);
+    }
+    const result = await callback(...deserialize(args));
+    return serialize(result);
+  };
+  const clearCallbacks = () => {
+    localCallbacks.clear();
+    remoteCallbacks.clear();
   };
-};
-var defineIframeBridge = (name, methods) => {
   return {
-    async connect(allowedOrigins = ["*"]) {
-      const conn = connect({
-        messenger: new WindowMessenger({
-          remoteWindow: window.parent,
-          allowedOrigins
-        }),
-        channel: "iframe-bridge-channel",
-        methods
-      });
-      const remote = await conn.promise;
-      return {
-        emit(type, ...args) {
-          const [data] = args;
-          remote.onMessage(type, data);
-        },
-        destroy: conn.destroy
-      };
+    serialize,
+    deserialize,
+    invokeLocalCallback,
+    clearCallbacks
+  };
+};
+
+// src/index.ts
+var resolveRemoteWindow = (target) => {
+  if (typeof HTMLIFrameElement !== "undefined" && target instanceof HTMLIFrameElement) {
+    if (!target.contentWindow) {
+      throw new Error("remoteWindow is null");
     }
+    return target.contentWindow;
+  }
+  return target;
+};
+var defineBridge = (name, methods) => {
+  return async (target, allowedOrigins = ["*"]) => {
+    const remoteWindow = resolveRemoteWindow(target);
+    let remotePromise;
+    const callbacks = createCallbackBridge(() => remotePromise);
+    const bridgeMethods = Object.keys(methods).reduce((wrapped, methodName) => {
+      if (methodName === callbackInvokeMethod) {
+        throw new Error(`Method name "${callbackInvokeMethod}" is reserved by iframe-bridge-kit`);
+      }
+      wrapped[methodName] = async (...args) => {
+        const result = await methods[methodName].apply(methods, callbacks.deserialize(args));
+        return callbacks.serialize(result);
+      };
+      return wrapped;
+    }, {
+      [callbackInvokeMethod]: callbacks.invokeLocalCallback
+    });
+    const conn = connect({
+      messenger: new WindowMessenger({
+        remoteWindow,
+        allowedOrigins
+      }),
+      channel: "iframe-bridge-channel",
+      methods: bridgeMethods
+    });
+    remotePromise = conn.promise;
+    const remote = await remotePromise;
+    return {
+      emit(type, data) {
+        return remote.onMessage(type, callbacks.serialize(data));
+      },
+      destroy() {
+        callbacks.clearCallbacks();
+        conn.destroy();
+      }
+    };
   };
 };
 export {
-  defineBridge,
-  defineIframeBridge
+  defineBridge
 };

package/dist/mini/core.js

@@ -1 +1 @@
-"use strict";var a=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var u=Object.getOwnPropertyNames;var w=Object.prototype.hasOwnProperty;var m=(n,e)=>{for(var t in e)a(n,t,{get:e[t],enumerable:!0})},h=(n,e,t,o)=>{if(e&&typeof e=="object"||typeof e=="function")for(let s of u(e))!w.call(n,s)&&s!==t&&a(n,s,{get:()=>e[s],enumerable:!(o=l(e,s))||o.enumerable});return n};var p=n=>h(a({},"__esModule",{value:!0}),n);var I={};m(I,{default:()=>x,isInit:()=>_,offMessage:()=>c,onInit:()=>F,onMessage:()=>M});module.exports=p(I);var i=require("penpal"),r=new Map,g=(0,i.connect)({messenger:new i.WindowMessenger({remoteWindow:window.parent,allowedOrigins:["__AllowedOrigins__"]}),channel:"iframe-bridge-channel",methods:{onMessage(n,e){let t=r.get(n);if(t)return t.forEach(o=>o(e)),!0}}}),x=new Proxy({},{get(n,e){return async(...t)=>await g.promise.then(o=>o[e](...t))}}),M=(n,e,t)=>{let o=t?(d=>{e(d),c(n,o)}):e,s=r.get(n);return s?s.add(o):r.set(n,new Set([o])),()=>c(n,o)},c=(n,e)=>{if(!e){r.delete(n);return}let t=r.get(n);t&&t.delete(e)},f=!1;g.promise.then(()=>{f=!0});var _=()=>f,F=n=>{if(f){n();return}g.promise.then(()=>{n()})};0&&(module.exports={isInit,offMessage,onInit,onMessage});
+"use strict";var m=Object.defineProperty;var _=Object.getOwnPropertyDescriptor;var x=Object.getOwnPropertyNames;var B=Object.prototype.hasOwnProperty;var E=(o,t)=>{for(var n in t)m(o,n,{get:t[n],enumerable:!0})},F=(o,t,n,i)=>{if(t&&typeof t=="object"||typeof t=="function")for(let a of x(t))!B.call(o,a)&&a!==n&&m(o,a,{get:()=>t[a],enumerable:!(i=_(t,a))||i.enumerable});return o};var A=o=>F(m({},"__esModule",{value:!0}),o);var T={};E(T,{createBridgeClient:()=>I,default:()=>W});module.exports=A(T);var h=require("penpal");var C="iframe-bridge-kit.callback",b="__iframeBridgeInvokeCallback",p=o=>typeof o=="object"&&o!==null,u=o=>{let t=Object.getPrototypeOf(o);return t===Object.prototype||t===null},j=o=>p(o)&&o.__iframeBridgeType===C&&typeof o.id=="string",R=o=>{let t=new Map,n=new WeakMap,i=new Map,a=0,d=e=>{let r=n.get(e);return r||(r=`${Date.now().toString(36)}-${(++a).toString(36)}`,n.set(e,r)),t.set(r,e),{__iframeBridgeType:C,id:r}},c=(e,r=new WeakMap)=>{if(typeof e=="function")return d(e);if(!p(e))return e;if(r.has(e))return r.get(e);if(Array.isArray(e)){let s=[];return r.set(e,s),e.forEach((g,y)=>{s[y]=c(g,r)}),s}if(!u(e))return e;let l={};return r.set(e,l),Object.keys(e).forEach(s=>{l[s]=c(e[s],r)}),l},f=(e,r=new WeakMap)=>{if(!p(e))return e;if(j(e)){let s=i.get(e.id);return s||(s=async(...g)=>{let P=await(await o())[b](e.id,c(g));return f(P)},i.set(e.id,s)),s}if(r.has(e))return r.get(e);if(Array.isArray(e)){let s=[];return r.set(e,s),e.forEach((g,y)=>{s[y]=f(g,r)}),s}if(!u(e))return e;let l={};return r.set(e,l),Object.keys(e).forEach(s=>{l[s]=f(e[s],r)}),l};return{serialize:c,deserialize:f,invokeLocalCallback:async(e,r)=>{let l=t.get(e);if(!l)throw new Error(`Callback "${e}" is not available`);let s=await l(...f(r));return c(s)},clearCallbacks:()=>{t.clear(),i.clear()}}};var O="iframe-bridge-channel",M=["__AllowedOrigins__"],w=class{msgProxy=new Map;initCallbacks=new Set;conn;remotePromise;inited=!1;connectionId=0;callbacks=R(()=>this.getRemote());api;constructor(){let t={onMessage:this.onMessage,offMessage:this.offMessage,isInit:this.isInit,onInit:this.onInit,destroy:this.destroy};this.api=new Proxy({},{get:(n,i)=>{if(i!=="then"&&typeof i=="string")return i in t?t[i]:async(...a)=>{let c=(await this.getRemote())[i];if(typeof c!="function")throw new Error(`Remote method "${String(i)}" is not available`);return this.callbacks.deserialize(await c(...this.callbacks.serialize(a)))}}})}connect=(t,n=M)=>{this.conn?.destroy(),this.inited=!1;let i=++this.connectionId;return this.conn=(0,h.connect)({messenger:new h.WindowMessenger({remoteWindow:t,allowedOrigins:n}),channel:O,methods:{onMessage:this.receiveMessage,[b]:this.callbacks.invokeLocalCallback}}),this.remotePromise=this.conn.promise.then(a=>(i===this.connectionId&&(this.inited=!0,this.notifyInit()),a)),this.remotePromise};getRemote=()=>{if(!this.remotePromise){if(typeof window>"u"||window.parent===window)throw new Error("remoteWindow is not configured. Pass a Window when creating the bridge client.");return this.connect(window.parent)}return this.remotePromise};receiveMessage=(t,n)=>{let i=this.msgProxy.get(t);if(i){let a=this.callbacks.deserialize(n);return i.forEach(d=>d(a)),!0}};notifyInit=()=>{let t=Array.from(this.initCallbacks);this.initCallbacks.clear(),t.forEach(n=>n(this.api))};onMessage=(t,n,i)=>{let a=i?(c=>{n(c),this.offMessage(t,a)}):n,d=this.msgProxy.get(t);return d?d.add(a):this.msgProxy.set(t,new Set([a])),()=>this.offMessage(t,a)};offMessage=(t,n)=>{if(!n){this.msgProxy.delete(t);return}let i=this.msgProxy.get(t);i&&i.delete(n)};isInit=()=>this.inited;onInit=t=>{if(this.inited){t(this.api);return}this.initCallbacks.add(t)};destroy=()=>{this.connectionId++,this.conn?.destroy(),this.conn=void 0,this.remotePromise=void 0,this.inited=!1,this.initCallbacks.clear(),this.callbacks.clearCallbacks()}},I=(o,t=M)=>{let n=new w;return n.connect(o,t),n.api},k,W=()=>(k||(k=I(window.parent)),k);0&&(module.exports={createBridgeClient});

package/dist/mini/core.mjs

@@ -1 +1 @@
-import{WindowMessenger as f,connect as d}from"penpal";var s=new Map,r=d({messenger:new f({remoteWindow:window.parent,allowedOrigins:["__AllowedOrigins__"]}),channel:"iframe-bridge-channel",methods:{onMessage(n,e){let t=s.get(n);if(t)return t.forEach(o=>o(e)),!0}}}),u=new Proxy({},{get(n,e){return async(...t)=>await r.promise.then(o=>o[e](...t))}}),w=(n,e,t)=>{let o=t?(g=>{e(g),c(n,o)}):e,a=s.get(n);return a?a.add(o):s.set(n,new Set([o])),()=>c(n,o)},c=(n,e)=>{if(!e){s.delete(n);return}let t=s.get(n);t&&t.delete(e)},i=!1;r.promise.then(()=>{i=!0});var m=()=>i,h=n=>{if(i){n();return}r.promise.then(()=>{n()})};export{u as default,m as isInit,c as offMessage,h as onInit,w as onMessage};
+import{WindowMessenger as I,connect as P}from"penpal";var w="iframe-bridge-kit.callback",m="__iframeBridgeInvokeCallback",h=s=>typeof s=="object"&&s!==null,k=s=>{let e=Object.getPrototypeOf(s);return e===Object.prototype||e===null},M=s=>h(s)&&s.__iframeBridgeType===w&&typeof s.id=="string",u=s=>{let e=new Map,r=new WeakMap,i=new Map,a=0,d=t=>{let n=r.get(t);return n||(n=`${Date.now().toString(36)}-${(++a).toString(36)}`,r.set(t,n)),e.set(n,t),{__iframeBridgeType:w,id:n}},c=(t,n=new WeakMap)=>{if(typeof t=="function")return d(t);if(!h(t))return t;if(n.has(t))return n.get(t);if(Array.isArray(t)){let o=[];return n.set(t,o),t.forEach((g,y)=>{o[y]=c(g,n)}),o}if(!k(t))return t;let l={};return n.set(t,l),Object.keys(t).forEach(o=>{l[o]=c(t[o],n)}),l},f=(t,n=new WeakMap)=>{if(!h(t))return t;if(M(t)){let o=i.get(t.id);return o||(o=async(...g)=>{let R=await(await s())[m](t.id,c(g));return f(R)},i.set(t.id,o)),o}if(n.has(t))return n.get(t);if(Array.isArray(t)){let o=[];return n.set(t,o),t.forEach((g,y)=>{o[y]=f(g,n)}),o}if(!k(t))return t;let l={};return n.set(t,l),Object.keys(t).forEach(o=>{l[o]=f(t[o],n)}),l};return{serialize:c,deserialize:f,invokeLocalCallback:async(t,n)=>{let l=e.get(t);if(!l)throw new Error(`Callback "${t}" is not available`);let o=await l(...f(n));return c(o)},clearCallbacks:()=>{e.clear(),i.clear()}}};var _="iframe-bridge-channel",C=["__AllowedOrigins__"],b=class{msgProxy=new Map;initCallbacks=new Set;conn;remotePromise;inited=!1;connectionId=0;callbacks=u(()=>this.getRemote());api;constructor(){let e={onMessage:this.onMessage,offMessage:this.offMessage,isInit:this.isInit,onInit:this.onInit,destroy:this.destroy};this.api=new Proxy({},{get:(r,i)=>{if(i!=="then"&&typeof i=="string")return i in e?e[i]:async(...a)=>{let c=(await this.getRemote())[i];if(typeof c!="function")throw new Error(`Remote method "${String(i)}" is not available`);return this.callbacks.deserialize(await c(...this.callbacks.serialize(a)))}}})}connect=(e,r=C)=>{this.conn?.destroy(),this.inited=!1;let i=++this.connectionId;return this.conn=P({messenger:new I({remoteWindow:e,allowedOrigins:r}),channel:_,methods:{onMessage:this.receiveMessage,[m]:this.callbacks.invokeLocalCallback}}),this.remotePromise=this.conn.promise.then(a=>(i===this.connectionId&&(this.inited=!0,this.notifyInit()),a)),this.remotePromise};getRemote=()=>{if(!this.remotePromise){if(typeof window>"u"||window.parent===window)throw new Error("remoteWindow is not configured. Pass a Window when creating the bridge client.");return this.connect(window.parent)}return this.remotePromise};receiveMessage=(e,r)=>{let i=this.msgProxy.get(e);if(i){let a=this.callbacks.deserialize(r);return i.forEach(d=>d(a)),!0}};notifyInit=()=>{let e=Array.from(this.initCallbacks);this.initCallbacks.clear(),e.forEach(r=>r(this.api))};onMessage=(e,r,i)=>{let a=i?(c=>{r(c),this.offMessage(e,a)}):r,d=this.msgProxy.get(e);return d?d.add(a):this.msgProxy.set(e,new Set([a])),()=>this.offMessage(e,a)};offMessage=(e,r)=>{if(!r){this.msgProxy.delete(e);return}let i=this.msgProxy.get(e);i&&i.delete(r)};isInit=()=>this.inited;onInit=e=>{if(this.inited){e(this.api);return}this.initCallbacks.add(e)};destroy=()=>{this.connectionId++,this.conn?.destroy(),this.conn=void 0,this.remotePromise=void 0,this.inited=!1,this.initCallbacks.clear(),this.callbacks.clearCallbacks()}},x=(s,e=C)=>{let r=new b;return r.connect(s,e),r.api},p,O=()=>(p||(p=x(window.parent)),p);export{x as createBridgeClient,O as default};

package/dist/vite.js

@@ -36,11 +36,12 @@ module.exports = __toCommonJS(vite_exports);
 var ts = __toESM(require("typescript"));
 var path = __toESM(require("path"));
 var fs = __toESM(require("fs"));
+var import_module = require("module");
 
 // package.json
 var package_default = {
   name: "iframe-bridge-kit",
-  version: "1.1.0",
+  version: "1.1.1",
   description: "A type-safe communication bridge for iframes. Define strongly typed RPC APIs for cross-window messaging with ease.",
   main: "dist/index.js",
   module: "dist/index.mjs",
@@ -100,6 +101,20 @@ var package_default = {
 
 // src/vite.ts
 var packageName = package_default.name;
+var requireFromCwd = (0, import_module.createRequire)(path.join(process.cwd(), "package.json"));
+function getCoreDirs(variant) {
+  const dirs = [];
+  try {
+    const viteEntry = requireFromCwd.resolve(`${packageName}/vite`);
+    dirs.push(path.join(path.dirname(viteEntry), variant));
+  } catch {
+  }
+  dirs.push(
+    path.resolve(process.cwd(), "node_modules", packageName, "dist", variant),
+    path.resolve(process.cwd(), "dist", variant)
+  );
+  return Array.from(new Set(dirs));
+}
 function extractScriptFromVue(code) {
   const scriptRegex = /<script(?:\s+setup)?(?:\s+lang\s*=\s*["']?(ts|typescript)["']?)?[^>]*>([\s\S]*?)<\/script>/i;
   const match = code.match(scriptRegex);
@@ -248,7 +263,7 @@ function parseBridgeFromCode(code, filePath) {
       collectTypeImports(stmt);
     }
   }
-  const bridgeFactories = /* @__PURE__ */ new Map();
+  const defineBridgeNames = /* @__PURE__ */ new Set();
   for (const stmt of sourceFile.statements) {
     if (ts.isImportDeclaration(stmt) && ts.isStringLiteral(stmt.moduleSpecifier) && stmt.moduleSpecifier.text === packageName) {
       const namedBindings = stmt.importClause?.namedBindings;
@@ -256,21 +271,17 @@ function parseBridgeFromCode(code, filePath) {
         for (const element of namedBindings.elements) {
           const originalName = element.propertyName?.text ?? element.name.text;
           if (originalName === "defineBridge") {
-            bridgeFactories.set(element.name.text, "child");
-          }
-          if (originalName === "defineIframeBridge") {
-            bridgeFactories.set(element.name.text, "parent");
+            defineBridgeNames.add(element.name.text);
           }
         }
       }
     }
   }
-  if (bridgeFactories.size === 0) {
+  if (defineBridgeNames.size === 0) {
     return { results, cleanup };
   }
   const visit = (node) => {
-    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && bridgeFactories.has(node.expression.text)) {
-      const target = bridgeFactories.get(node.expression.text);
+    if (ts.isCallExpression(node) && ts.isIdentifier(node.expression) && defineBridgeNames.has(node.expression.text)) {
       const [nameArg, methodsArg] = node.arguments;
       if (!nameArg || !ts.isStringLiteral(nameArg)) {
         return;
@@ -367,12 +378,8 @@ function parseBridgeFromCode(code, filePath) {
         }
       }
       const emitMap = [];
-      let emitTypeName;
       if (node.typeArguments && node.typeArguments.length > 0) {
         const emitTypeNode = node.typeArguments[0];
-        if (ts.isTypeReferenceNode(emitTypeNode) && ts.isIdentifier(emitTypeNode.typeName)) {
-          emitTypeName = emitTypeNode.typeName.text;
-        }
         const emitType = checker.getTypeFromTypeNode(emitTypeNode);
         emitType.getProperties().forEach((prop) => {
           const name = prop.getName();
@@ -386,13 +393,11 @@ function parseBridgeFromCode(code, filePath) {
       mergeImports(bridgeImports, typeImports);
       results.push({
         name: bridgeName,
-        target,
         methods,
         sourceFile: filePath,
         typeDeclarations,
         imports: bridgeImports,
-        emitMap,
-        emitTypeName
+        emitMap
       });
     }
     ts.forEachChild(node, visit);
@@ -564,52 +569,6 @@ function generateDtsContent(info, outDir, preserveModules = []) {
       lines.push("");
     }
   }
-  const localTypeDeclarations = info.typeDeclarations.filter(({ name }) => name !== info.emitTypeName && name !== "EmitMap");
-  if (localTypeDeclarations.length > 0) {
-    lines.push("// Local type definitions");
-    for (const { content } of localTypeDeclarations) {
-      lines.push(content);
-      lines.push("");
-    }
-  }
-  if (info.target === "parent") {
-    if (processedEmitTypes.length > 0) {
-      lines.push("export interface EmitMap {");
-      processedEmitTypes.forEach((e) => {
-        lines.push(`    "${e.name}": ${e.type};`);
-      });
-      lines.push("}");
-      lines.push("");
-    }
-    lines.push("export interface BridgeConnection {");
-    lines.push("    api: {");
-    lines.push(
-      ...processedMethods.map(
-        (m) => (m.jsdoc ? `        ${m.jsdoc}
-` : "") + `        ${m.name}: (${m.params}) => ${m.returnType},`
-      )
-    );
-    lines.push("    };");
-    if (processedEmitTypes.length > 0) {
-      lines.push("    onMessage<K extends keyof EmitMap>(type: K, cb: (data: EmitMap[K]) => void, once?: boolean): () => void;");
-      lines.push("    onMessage(type: string, cb: Function, once?: boolean): () => void;");
-      lines.push("    offMessage<K extends keyof EmitMap>(type: K, fn?: (data: EmitMap[K]) => void): void;");
-      lines.push("    offMessage(type: string, fn?: Function): void;");
-    } else {
-      lines.push("    onMessage(type: string, cb: Function, once?: boolean): () => void;");
-      lines.push("    offMessage(type: string, fn?: Function): void;");
-    }
-    lines.push("    isInit(): boolean;");
-    lines.push("    onInit(cb: Function): void;");
-    lines.push("    destroy(): void;");
-    lines.push("}");
-    lines.push("");
-    lines.push("export declare function create(iframe: HTMLIFrameElement, allowedOrigins?: string[]): BridgeConnection;");
-    lines.push("declare const bridge: { create: typeof create };");
-    lines.push("export default bridge;");
-    lines.push("");
-    return lines.join("\n");
-  }
   if (processedEmitTypes.length > 0) {
     lines.push("export interface EmitMap {");
     processedEmitTypes.forEach((e) => {
@@ -617,18 +576,10 @@ function generateDtsContent(info, outDir, preserveModules = []) {
     });
     lines.push("}");
     lines.push("");
-    lines.push("export declare function onMessage<K extends keyof EmitMap>(type: K, cb: (data: EmitMap[K]) => void, once?: boolean): () => void;");
-    lines.push("export declare function onMessage(type: string, cb: Function, once?: boolean): () => void;");
-    lines.push("export declare function offMessage<K extends keyof EmitMap>(type: K, fn?: (data: EmitMap[K]) => void): void;");
-    lines.push("export declare function offMessage(type: string, fn?: Function): void;");
-  } else {
-    lines.push("export declare function onMessage(type: string, cb: Function, once?: boolean): () => void;");
-    lines.push("export declare function offMessage(type: string, fn?: Function): void;");
   }
-  lines.push("export declare function isInit(): boolean;");
-  lines.push("export declare function onInit(cb: Function): void;");
+  lines.push("export declare function createBridgeClient(remoteWindow: Window, allowedOrigins?: string[]): BridgeClient;");
   lines.push("");
-  lines.push(`export default {} as {`);
+  lines.push(`export interface BridgeApi {`);
   lines.push(
     ...processedMethods.map(
       (m) => (m.jsdoc ? `    ${m.jsdoc}
@@ -637,6 +588,24 @@ function generateDtsContent(info, outDir, preserveModules = []) {
   );
   lines.push("}");
   lines.push("");
+  lines.push("export type BridgeClient = BridgeApi & {");
+  if (processedEmitTypes.length > 0) {
+    lines.push("    onMessage<K extends keyof EmitMap>(type: K, cb: (data: EmitMap[K]) => void, once?: boolean): () => void;");
+    lines.push("    onMessage(type: string, cb: Function, once?: boolean): () => void;");
+    lines.push("    offMessage<K extends keyof EmitMap>(type: K, fn?: (data: EmitMap[K]) => void): void;");
+    lines.push("    offMessage(type: string, fn?: Function): void;");
+  } else {
+    lines.push("    onMessage(type: string, cb: Function, once?: boolean): () => void;");
+    lines.push("    offMessage(type: string, fn?: Function): void;");
+  }
+  lines.push("    isInit(): boolean;");
+  lines.push("    onInit(cb: (api: BridgeClient) => void): void;");
+  lines.push("    destroy(): void;");
+  lines.push("}");
+  lines.push("");
+  lines.push("declare const createBridge: () => BridgeClient;");
+  lines.push("export default createBridge;");
+  lines.push("");
   return lines.join("\n");
 }
 function writeDtsFile(info, options) {
@@ -662,7 +631,7 @@ function processFile(filePath, code, options) {
     const { results: bridges, cleanup } = parseBridgeFromCode(code, filePath);
     for (const bridge of bridges) {
       writeDtsFile(bridge, options);
-      writeBridgeRuntime(bridge, options);
+      writeBridgeRuntime(bridge.name, options);
     }
     cleanup();
     return bridges;
@@ -671,19 +640,13 @@ function processFile(filePath, code, options) {
     return [];
   }
 }
-function writeBridgeRuntime(info, options) {
+function writeBridgeRuntime(bridgeName, options) {
   const isFull = options.full !== false;
   const allowedOrigins = options.allowedOrigins || ["*"];
   const outDir = options.outDir || "bridges";
   const variant = isFull ? "full" : "mini";
-  const basePaths = [
-    // 1. 假设我们在 dist 目录中运行
-    path.resolve(__dirname, variant),
-    // 2. 假设我们在 src 目录中运行
-    path.resolve(__dirname, "../dist", variant)
-  ];
   let coreDir = "";
-  for (const p of basePaths) {
+  for (const p of getCoreDirs(variant)) {
     if (fs.existsSync(p)) {
       coreDir = p;
       break;
@@ -692,15 +655,14 @@ function writeBridgeRuntime(info, options) {
   if (!coreDir) {
     return;
   }
-  const absoluteOutDir = path.resolve(process.cwd(), outDir, info.name);
+  const absoluteOutDir = path.resolve(process.cwd(), outDir, bridgeName);
   if (!fs.existsSync(absoluteOutDir)) {
     fs.mkdirSync(absoluteOutDir, { recursive: true });
   }
   const extensions = ["js", "mjs"];
   const replaceContent = JSON.stringify(allowedOrigins).slice(1, -1);
-  const runtimeName = info.target === "parent" ? "parent-core" : "core";
   for (const ext of extensions) {
-    const srcFile = path.join(coreDir, `${runtimeName}.${ext}`);
+    const srcFile = path.join(coreDir, `core.${ext}`);
     if (fs.existsSync(srcFile)) {
       try {
         let content = fs.readFileSync(srcFile, "utf-8");