@univerjs/rpc 0.15.5 → 0.16.0

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var x=Object.defineProperty;var L=(i,t,e)=>t in i?x(i,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):i[t]=e;var l=(i,t,e)=>L(i,typeof t!="symbol"?t+"":t,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("@univerjs/core"),u=require("rxjs/operators"),_=require("rxjs"),k="rpc.main-thread.config",W={},D="rpc.worker-thread.config",T={};var H=Object.getOwnPropertyDescriptor,q=(i,t,e,n)=>{for(var s=n>1?void 0:n?H(t,e):t,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},g=(i,t)=>(e,n)=>t(e,n,i);const R="rpc.remote-sync.service",v=o.createIdentifier(R);exports.RemoteSyncPrimaryService=class{constructor(t){this._commandService=t}async syncMutation(t,e){const{fromCollab:n,...s}=e||{};return this._commandService.syncExecuteCommand(t.mutationInfo.id,t.mutationInfo.params,{...s,onlyLocal:!0,fromSync:!0})}};exports.RemoteSyncPrimaryService=q([g(0,o.ICommandService)],exports.RemoteSyncPrimaryService);const I="univer.remote-instance-service",m=o.createIdentifier(I);exports.WebWorkerRemoteInstanceService=class{constructor(t,e,n){this._univerInstanceService=t,this._commandService=e,this._logService=n}whenReady(){return Promise.resolve(!0)}async syncMutation(t,e){return this._applyMutation(t.mutationInfo,e)}async createInstance(t){this._logService.debug(`[WebWorkerRemoteInstanceService]: Creating instance with id ${t.unitID}`);const{type:e,snapshot:n}=t;try{if(e===o.UniverInstanceType.UNIVER_SHEET)return this._univerInstanceService.createUnit(o.UniverInstanceType.UNIVER_SHEET,n),!0;throw new Error(`[WebWorkerRemoteInstanceService]: cannot create replica for document type: ${e}.`)}catch(s){throw s instanceof Error?s:new TypeError(`${s}`)}}async disposeInstance(t){return this._logService.debug(`[WebWorkerRemoteInstanceService]: Disposing instance with id ${t.unitID}`),this._univerInstanceService.disposeUnit(t.unitID)}_applyMutation(t,e){const{id:n,params:s}=t,{fromCollab:r,...c}=e||{};return this._commandService.syncExecuteCommand(n,s,{...c,onlyLocal:!0,fromSync:!0})}};exports.WebWorkerRemoteInstanceService=q([g(0,o.IUniverInstanceService),g(1,o.ICommandService),g(2,o.ILogService)],exports.WebWorkerRemoteInstanceService);function E(i){const t=i;return new class{call(e,n){const s=t[e];if(typeof s=="function"){let r=n?s.apply(t,n):s.call(t);return r instanceof Promise||(r=Promise.resolve(r)),r}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,n){const s=t[e];if(typeof s=="function"){const r=n?s.apply(t,n):s.call(t);return _.isObservable(r)?r:_.of(r)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function U(i){return new Proxy({},{get(t,e){if(e!=="dispose")return function(...n){return A(e)?i.subscribe(e,n):i.call(e,n)}}})}function A(i){return i.endsWith("$")}class O extends o.RxDisposable{constructor(e){super();l(this,"_initialized",new _.BehaviorSubject(!1));l(this,"_lastRequestCounter",0);l(this,"_pendingRequests",new Map);this._protocol=e,this._protocol.send({type:50}),this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(n=>this._onMessage(n))}dispose(){this._pendingRequests.clear()}getChannel(e){const n=this;return{call(s,r){return n._disposed?Promise.reject():n._remoteCall(e,s,r)},subscribe(s,r){if(n._disposed)throw new Error("[ChannelClient]: client is disposed!");return n._remoteSubscribe(e,s,r)}}}_whenReady(){return _.firstValueFrom(this._initialized.pipe(u.filter(e=>e),u.take(1)))}async _remoteCall(e,n,s){await this._whenReady();const r=++this._lastRequestCounter,h={seq:r,type:100,channelName:e,method:n,args:s},a=this;return new Promise((f,d)=>{const $={handle(b){switch(b.type){case 201:a._pendingRequests.delete(r),f(b.data);break;case 202:a._pendingRequests.delete(r),d(b.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(r,$),this._sendRequest(h)})}_remoteSubscribe(e,n,s){return new _.Observable(r=>{let c=-1;return this._whenReady().then(()=>{c=++this._lastRequestCounter;const a={seq:c,type:101,channelName:e,method:n,args:s},f={handle(d){switch(d.type){case 300:r.next(d.data);break;case 301:r.error(d.data);break;case 302:r.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(c,f),this._sendRequest(a)}),()=>{if(c===-1)return;const h={type:102,seq:c,channelName:e,method:n};this._sendRequest(h)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var r;const{type:n,seq:s}=e;switch(n){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:{const{_pendingRequests:c}=this;(r=c.get(s))==null||r.handle(e),n!==300&&c.delete(s);break}}}}class j extends o.RxDisposable{constructor(e){super();l(this,"_channels",new Map);l(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(n=>this._onRequest(n)),this._sendInitialize()}dispose(){super.dispose(),this._subscriptions.clear(),this._channels.clear()}registerChannel(e,n){this._channels.set(e,n)}_onRequest(e){switch(e.type){case 50:this._sendInitialize();break;case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_sendInitialize(){this._sendResponse({seq:-1,type:0})}_onMethodCall(e){const{channelName:n,method:s,args:r}=e,c=this._channels.get(n);let h;try{if(!c)throw new Error(`[ChannelServer]: Channel ${n} not found!`);h=r?c.call(s,r):c.call(s)}catch(a){h=Promise.reject(a)}h.then(a=>{this._sendResponse({seq:e.seq,type:201,data:a})}).catch(a=>{a instanceof Error?this._sendResponse({seq:e.seq,type:202,data:a.message}):this._sendResponse({seq:e.seq,type:202,data:String(a)})})}_onSubscribe(e){const{channelName:n,seq:s}=e,r=this._channels.get(n);try{if(!r)throw new Error(`[ChannelServer]: Channel ${n} not found!`);const h=r.subscribe(e.method,e.args).subscribe({next:a=>{this._sendResponse({seq:s,type:300,data:a})},error:a=>{this._sendResponse({seq:s,type:301,data:a.message}),this._sendResponse({seq:s,type:302})},complete:()=>{this._sendResponse({seq:s,type:302})}});this._subscriptions.set(e.seq,h)}catch(c){c instanceof Error?this._sendResponse({seq:e.seq,type:301,data:c.message}):this._sendResponse({seq:e.seq,type:301,data:String(c)})}}_onUnsubscribe(e){const n=this._subscriptions.get(e.seq);n&&(n.unsubscribe(),this._subscriptions.delete(e.seq))}_sendResponse(e){this._protocol.send(e)}}const S=o.createIdentifier("IRPCChannelService");class M{constructor(t){l(this,"_client");l(this,"_server");this._client=new O(t),this._server=new j(t)}dispose(){this._client.dispose(),this._server.dispose()}requestChannel(t){return this._client.getChannel(t)}registerChannel(t,e){this._server.registerChannel(t,e)}}var G=Object.getOwnPropertyDescriptor,F=(i,t,e,n)=>{for(var s=n>1?void 0:n?G(t,e):t,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},p=(i,t)=>(e,n)=>t(e,n,i);exports.DataSyncPrimaryController=class extends o.RxDisposable{constructor(e,n,s,r,c){super();l(this,"_remoteInstanceService");l(this,"_syncingUnits",new Set);l(this,"_syncingMutations",new Set);this._injector=e,this._commandService=n,this._univerInstanceService=s,this._rpcChannelService=r,this._remoteSyncService=c,this._initRPCChannels(),this._init()}registerSyncingMutations(e){this._syncingMutations.add(e.id)}syncUnit(e){return this._syncingUnits.add(e),o.toDisposable(()=>this._syncingUnits.delete(e))}_initRPCChannels(){this._rpcChannelService.registerChannel(R,E(this._remoteSyncService)),this._injector.add([m,{useFactory:()=>U(this._rpcChannelService.requestChannel(I))}]),this._remoteInstanceService=this._injector.get(m)}_init(){this._univerInstanceService.getTypeOfUnitAdded$(o.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.add(e.getUnitId()),this._remoteInstanceService.createInstance({unitID:e.getUnitId(),type:o.UniverInstanceType.UNIVER_SHEET,snapshot:e.getSnapshot()})}),this._univerInstanceService.getTypeOfUnitDisposed$(o.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.delete(e.getUnitId()),this._remoteInstanceService.disposeInstance({unitID:e.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((e,n)=>{const{type:s,params:r,id:c}=e,h=(r==null?void 0:r.unitId)||"";s===o.CommandType.MUTATION&&(!h||this._syncingUnits.has(h))&&!(n!=null&&n.fromSync)&&this._syncingMutations.has(c)&&this._remoteInstanceService.syncMutation({mutationInfo:e},n)}))}};exports.DataSyncPrimaryController=F([p(0,o.Inject(o.Injector)),p(1,o.ICommandService),p(2,o.IUniverInstanceService),p(3,S),p(4,v)],exports.DataSyncPrimaryController);var V=Object.getOwnPropertyDescriptor,z=(i,t,e,n)=>{for(var s=n>1?void 0:n?V(t,e):t,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},y=(i,t)=>(e,n)=>t(e,n,i);exports.DataSyncReplicaController=class extends o.Disposable{constructor(e,n,s,r){super();l(this,"_remoteSyncService");this._injector=e,this._remoteInstanceService=n,this._commandService=s,this._rpcChannelService=r,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(I,E(this._remoteInstanceService)),this._injector.add([v,{useFactory:()=>U(this._rpcChannelService.requestChannel(R))}]),this._remoteSyncService=this._injector.get(v)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((e,n)=>{e.type===o.CommandType.MUTATION&&!(n!=null&&n.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:e},n)}))}};exports.DataSyncReplicaController=z([y(0,o.Inject(o.Injector)),y(1,m),y(2,o.ICommandService),y(3,S)],exports.DataSyncReplicaController);function K(){return{send(i){postMessage(i)},onMessage:new _.Observable(i=>{const t=e=>{i.next(e.data)};return addEventListener("message",t),()=>removeEventListener("message",t)}).pipe(_.shareReplay(1))}}function Y(i){return{send(t){i.postMessage(t)},onMessage:new _.Observable(t=>{const e=n=>{t.next(n.data)};return i.addEventListener("message",e),()=>i.removeEventListener("message",e)}).pipe(_.shareReplay(1))}}var B=Object.getOwnPropertyDescriptor,N=(i,t,e,n)=>{for(var s=n>1?void 0:n?B(t,e):t,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},C=(i,t)=>(e,n)=>t(e,n,i),P;exports.UniverRPCMainThreadPlugin=(P=class extends o.Plugin{constructor(e=W,n,s){super();l(this,"_internalWorker",null);this._config=e,this._injector=n,this._configService=s;const{...r}=o.merge({},W,this._config);this._configService.setConfig(k,r)}dispose(){super.dispose(),this._internalWorker&&(this._internalWorker.terminate(),this._internalWorker=null)}onStarting(){const{workerURL:e}=this._config;if(!e)throw new Error("[UniverRPCMainThreadPlugin]: The workerURL is required for the RPC main thread plugin.");const n=e instanceof Worker?e:new Worker(e);this._internalWorker=e instanceof Worker?null:n;const s=Y(n);[[S,{useFactory:()=>new M(s)}],[exports.DataSyncPrimaryController],[v,{useClass:exports.RemoteSyncPrimaryService}]].forEach(c=>this._injector.add(c)),this._injector.get(exports.DataSyncPrimaryController)}},l(P,"pluginName","UNIVER_RPC_MAIN_THREAD_PLUGIN"),P);exports.UniverRPCMainThreadPlugin=N([C(1,o.Inject(o.Injector)),C(2,o.IConfigService)],exports.UniverRPCMainThreadPlugin);var w;exports.UniverRPCWorkerThreadPlugin=(w=class extends o.Plugin{constructor(t=T,e,n){super(),this._config=t,this._injector=e,this._configService=n;const{...s}=o.merge({},T,this._config);this._configService.setConfig(D,s)}onStarting(){[[exports.DataSyncReplicaController],[S,{useFactory:()=>new M(K())}],[m,{useClass:exports.WebWorkerRemoteInstanceService}]].forEach(t=>this._injector.add(t)),this._injector.get(exports.DataSyncReplicaController)}},l(w,"pluginName","UNIVER_RPC_WORKER_THREAD_PLUGIN"),w);exports.UniverRPCWorkerThreadPlugin=N([C(1,o.Inject(o.Injector)),C(2,o.IConfigService)],exports.UniverRPCWorkerThreadPlugin);exports.ChannelClient=O;exports.ChannelServer=j;exports.ChannelService=M;exports.IRPCChannelService=S;exports.IRemoteInstanceService=m;exports.IRemoteSyncService=v;exports.PLUGIN_CONFIG_KEY_MAIN_THREAD=k;exports.PLUGIN_CONFIG_KEY_WORKER_THREAD=D;exports.RemoteInstanceServiceName=I;exports.RemoteSyncServiceName=R;exports.fromModule=E;exports.toModule=U;
+"use strict";var x=Object.defineProperty;var L=(i,n,e)=>n in i?x(i,n,{enumerable:!0,configurable:!0,writable:!0,value:e}):i[n]=e;var l=(i,n,e)=>L(i,typeof n!="symbol"?n+"":n,e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("@univerjs/core"),u=require("rxjs/operators"),_=require("rxjs"),D="rpc.main-thread.config",T={},q="rpc.worker-thread.config",k={};var H=Object.getOwnPropertyDescriptor,O=(i,n,e,t)=>{for(var s=t>1?void 0:t?H(n,e):n,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},g=(i,n)=>(e,t)=>n(e,t,i);const R="rpc.remote-sync.service",v=o.createIdentifier(R);exports.RemoteSyncPrimaryService=class{constructor(n){this._commandService=n}async syncMutation(n,e){const{fromCollab:t,...s}=e||{};return this._commandService.syncExecuteCommand(n.mutationInfo.id,n.mutationInfo.params,{...s,onlyLocal:!0,fromSync:!0})}};exports.RemoteSyncPrimaryService=O([g(0,o.ICommandService)],exports.RemoteSyncPrimaryService);const I="univer.remote-instance-service",m=o.createIdentifier(I);exports.WebWorkerRemoteInstanceService=class{constructor(n,e,t){this._univerInstanceService=n,this._commandService=e,this._logService=t}whenReady(){return Promise.resolve(!0)}async syncMutation(n,e){return this._applyMutation(n.mutationInfo,e)}async createInstance(n){this._logService.debug(`[WebWorkerRemoteInstanceService]: Creating instance with id ${n.unitID}`);const{type:e,snapshot:t}=n;try{if(e===o.UniverInstanceType.UNIVER_SHEET)return this._univerInstanceService.createUnit(o.UniverInstanceType.UNIVER_SHEET,t),!0;throw new Error(`[WebWorkerRemoteInstanceService]: cannot create replica for document type: ${e}.`)}catch(s){throw s instanceof Error?s:new TypeError(`${s}`)}}async disposeInstance(n){return this._logService.debug(`[WebWorkerRemoteInstanceService]: Disposing instance with id ${n.unitID}`),this._univerInstanceService.disposeUnit(n.unitID)}_applyMutation(n,e){const{id:t,params:s}=n,{fromCollab:r,...c}=e||{};return this._commandService.syncExecuteCommand(t,s,{...c,onlyLocal:!0,fromSync:!0})}};exports.WebWorkerRemoteInstanceService=O([g(0,o.IUniverInstanceService),g(1,o.ICommandService),g(2,o.ILogService)],exports.WebWorkerRemoteInstanceService);function U(i){const n=i;return new class{call(e,t){const s=n[e];if(typeof s=="function"){let r=t?s.apply(n,t):s.call(n);return r instanceof Promise||(r=Promise.resolve(r)),r}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,t){const s=n[e];if(typeof s=="function"){const r=t?s.apply(n,t):s.call(n);return _.isObservable(r)?r:_.of(r)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function M(i){return new Proxy({},{get(n,e){if(e!=="dispose")return function(...t){return A(e)?i.subscribe(e,t):i.call(e,t)}}})}function A(i){return i.endsWith("$")}class j extends o.RxDisposable{constructor(e){super();l(this,"_initialized",new _.BehaviorSubject(!1));l(this,"_lastRequestCounter",0);l(this,"_pendingRequests",new Map);this._protocol=e,this._protocol.send({type:50}),this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(t=>this._onMessage(t))}dispose(){this._pendingRequests.clear()}getChannel(e){const t=this;return{call(s,r){return t._disposed?Promise.reject():t._remoteCall(e,s,r)},subscribe(s,r){if(t._disposed)throw new Error("[ChannelClient]: client is disposed!");return t._remoteSubscribe(e,s,r)}}}_whenReady(){return _.firstValueFrom(this._initialized.pipe(u.filter(e=>e),u.take(1)))}_remoteCall(e,t,s){return this._initialized.getValue()?this._doRemoteCall(e,t,s):this._whenReady().then(()=>this._doRemoteCall(e,t,s))}_doRemoteCall(e,t,s){const r=++this._lastRequestCounter,h={seq:r,type:100,channelName:e,method:t,args:s},a=this;return new Promise((f,b)=>{const d={handle(P){switch(P.type){case 201:a._pendingRequests.delete(r),f(P.data);break;case 202:a._pendingRequests.delete(r),b(P.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(r,d),this._sendRequest(h)})}_remoteSubscribe(e,t,s){return new _.Observable(r=>{let c=-1;const h=()=>{c=++this._lastRequestCounter;const f={seq:c,type:101,channelName:e,method:t,args:s},b={handle(d){switch(d.type){case 300:r.next(d.data);break;case 301:r.error(d.data);break;case 302:r.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(c,b),this._sendRequest(f)};return this._initialized.getValue()?h():this._whenReady().then(h),()=>{if(c===-1)return;const a={type:102,seq:c,channelName:e,method:t};this._sendRequest(a)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var r;const{type:t,seq:s}=e;switch(t){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:{const{_pendingRequests:c}=this;(r=c.get(s))==null||r.handle(e),t!==300&&c.delete(s);break}}}}class N extends o.RxDisposable{constructor(e){super();l(this,"_channels",new Map);l(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(t=>this._onRequest(t)),this._sendInitialize()}dispose(){super.dispose(),this._subscriptions.clear(),this._channels.clear()}registerChannel(e,t){this._channels.set(e,t)}_onRequest(e){switch(e.type){case 50:this._sendInitialize();break;case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_sendInitialize(){this._sendResponse({seq:-1,type:0})}_onMethodCall(e){const{channelName:t,method:s,args:r}=e,c=this._channels.get(t);let h;try{if(!c)throw new Error(`[ChannelServer]: Channel ${t} not found!`);h=r?c.call(s,r):c.call(s)}catch(a){h=Promise.reject(a)}h.then(a=>{this._sendResponse({seq:e.seq,type:201,data:a})}).catch(a=>{a instanceof Error?this._sendResponse({seq:e.seq,type:202,data:a.message}):this._sendResponse({seq:e.seq,type:202,data:String(a)})})}_onSubscribe(e){const{channelName:t,seq:s}=e,r=this._channels.get(t);try{if(!r)throw new Error(`[ChannelServer]: Channel ${t} not found!`);const h=r.subscribe(e.method,e.args).subscribe({next:a=>{this._sendResponse({seq:s,type:300,data:a})},error:a=>{this._sendResponse({seq:s,type:301,data:a.message}),this._sendResponse({seq:s,type:302})},complete:()=>{this._sendResponse({seq:s,type:302})}});this._subscriptions.set(e.seq,h)}catch(c){c instanceof Error?this._sendResponse({seq:e.seq,type:301,data:c.message}):this._sendResponse({seq:e.seq,type:301,data:String(c)})}}_onUnsubscribe(e){const t=this._subscriptions.get(e.seq);t&&(t.unsubscribe(),this._subscriptions.delete(e.seq))}_sendResponse(e){this._protocol.send(e)}}const S=o.createIdentifier("IRPCChannelService");class W{constructor(n){l(this,"_client");l(this,"_server");this._client=new j(n),this._server=new N(n)}dispose(){this._client.dispose(),this._server.dispose()}requestChannel(n){return this._client.getChannel(n)}registerChannel(n,e){this._server.registerChannel(n,e)}}var G=Object.getOwnPropertyDescriptor,V=(i,n,e,t)=>{for(var s=t>1?void 0:t?G(n,e):n,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},p=(i,n)=>(e,t)=>n(e,t,i);exports.DataSyncPrimaryController=class extends o.RxDisposable{constructor(e,t,s,r,c){super();l(this,"_remoteInstanceService");l(this,"_syncingUnits",new Set);l(this,"_syncingMutations",new Set);this._injector=e,this._commandService=t,this._univerInstanceService=s,this._rpcChannelService=r,this._remoteSyncService=c,this._initRPCChannels(),this._init()}registerSyncingMutations(e){this._syncingMutations.add(e.id)}syncUnit(e){return this._syncingUnits.add(e),o.toDisposable(()=>this._syncingUnits.delete(e))}_initRPCChannels(){this._rpcChannelService.registerChannel(R,U(this._remoteSyncService)),this._injector.add([m,{useFactory:()=>M(this._rpcChannelService.requestChannel(I))}]),this._remoteInstanceService=this._injector.get(m)}_init(){this._univerInstanceService.getTypeOfUnitAdded$(o.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.add(e.getUnitId()),this._remoteInstanceService.createInstance({unitID:e.getUnitId(),type:o.UniverInstanceType.UNIVER_SHEET,snapshot:e.getSnapshot()})}),this._univerInstanceService.getTypeOfUnitDisposed$(o.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.delete(e.getUnitId()),this._remoteInstanceService.disposeInstance({unitID:e.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((e,t)=>{const{type:s,params:r,id:c}=e,h=(r==null?void 0:r.unitId)||"";s===o.CommandType.MUTATION&&(!h||this._syncingUnits.has(h))&&!(t!=null&&t.fromSync)&&this._syncingMutations.has(c)&&this._remoteInstanceService.syncMutation({mutationInfo:e},t)}))}};exports.DataSyncPrimaryController=V([p(0,o.Inject(o.Injector)),p(1,o.ICommandService),p(2,o.IUniverInstanceService),p(3,S),p(4,v)],exports.DataSyncPrimaryController);var F=Object.getOwnPropertyDescriptor,z=(i,n,e,t)=>{for(var s=t>1?void 0:t?F(n,e):n,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},y=(i,n)=>(e,t)=>n(e,t,i);exports.DataSyncReplicaController=class extends o.Disposable{constructor(e,t,s,r){super();l(this,"_remoteSyncService");this._injector=e,this._remoteInstanceService=t,this._commandService=s,this._rpcChannelService=r,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(I,U(this._remoteInstanceService)),this._injector.add([v,{useFactory:()=>M(this._rpcChannelService.requestChannel(R))}]),this._remoteSyncService=this._injector.get(v)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((e,t)=>{e.type===o.CommandType.MUTATION&&!(t!=null&&t.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:e},t)}))}};exports.DataSyncReplicaController=z([y(0,o.Inject(o.Injector)),y(1,m),y(2,o.ICommandService),y(3,S)],exports.DataSyncReplicaController);function K(){return{send(i){postMessage(i)},onMessage:new _.Observable(i=>{const n=e=>{i.next(e.data)};return addEventListener("message",n),()=>removeEventListener("message",n)}).pipe(_.shareReplay(1))}}function Y(i){return{send(n){i.postMessage(n)},onMessage:new _.Observable(n=>{const e=t=>{n.next(t.data)};return i.addEventListener("message",e),()=>i.removeEventListener("message",e)}).pipe(_.shareReplay(1))}}var B=Object.getOwnPropertyDescriptor,$=(i,n,e,t)=>{for(var s=t>1?void 0:t?B(n,e):n,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},C=(i,n)=>(e,t)=>n(e,t,i),w;exports.UniverRPCMainThreadPlugin=(w=class extends o.Plugin{constructor(e=T,t,s){super();l(this,"_internalWorker",null);this._config=e,this._injector=t,this._configService=s;const{...r}=o.merge({},T,this._config);this._configService.setConfig(D,r)}dispose(){super.dispose(),this._internalWorker&&(this._internalWorker.terminate(),this._internalWorker=null)}onStarting(){const{workerURL:e}=this._config;if(!e)throw new Error("[UniverRPCMainThreadPlugin]: The workerURL is required for the RPC main thread plugin.");const t=e instanceof Worker?e:new Worker(e);this._internalWorker=e instanceof Worker?null:t;const s=Y(t);[[S,{useFactory:()=>new W(s)}],[exports.DataSyncPrimaryController],[v,{useClass:exports.RemoteSyncPrimaryService}]].forEach(c=>this._injector.add(c)),this._injector.get(exports.DataSyncPrimaryController)}},l(w,"pluginName","UNIVER_RPC_MAIN_THREAD_PLUGIN"),w);exports.UniverRPCMainThreadPlugin=$([C(1,o.Inject(o.Injector)),C(2,o.IConfigService)],exports.UniverRPCMainThreadPlugin);var E;exports.UniverRPCWorkerThreadPlugin=(E=class extends o.Plugin{constructor(n=k,e,t){super(),this._config=n,this._injector=e,this._configService=t;const{...s}=o.merge({},k,this._config);this._configService.setConfig(q,s)}onStarting(){[[exports.DataSyncReplicaController],[S,{useFactory:()=>new W(K())}],[m,{useClass:exports.WebWorkerRemoteInstanceService}]].forEach(n=>this._injector.add(n)),this._injector.get(exports.DataSyncReplicaController)}},l(E,"pluginName","UNIVER_RPC_WORKER_THREAD_PLUGIN"),E);exports.UniverRPCWorkerThreadPlugin=$([C(1,o.Inject(o.Injector)),C(2,o.IConfigService)],exports.UniverRPCWorkerThreadPlugin);exports.ChannelClient=j;exports.ChannelServer=N;exports.ChannelService=W;exports.IRPCChannelService=S;exports.IRemoteInstanceService=m;exports.IRemoteSyncService=v;exports.PLUGIN_CONFIG_KEY_MAIN_THREAD=D;exports.PLUGIN_CONFIG_KEY_WORKER_THREAD=q;exports.RemoteInstanceServiceName=I;exports.RemoteSyncServiceName=R;exports.fromModule=U;exports.toModule=M;

package/lib/es/index.js

@@ -1,17 +1,17 @@
 var X = Object.defineProperty;
 var Z = (s, t, e) => t in s ? X(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
 var a = (s, t, e) => Z(s, typeof t != "symbol" ? t + "" : t, e);
-import { createIdentifier as k, UniverInstanceType as u, ICommandService as b, IUniverInstanceService as L, ILogService as ee, RxDisposable as O, Inject as C, Injector as R, toDisposable as te, CommandType as H, Disposable as ne, IConfigService as A, Plugin as V, merge as F } from "@univerjs/core";
+import { createIdentifier as O, UniverInstanceType as u, ICommandService as b, IUniverInstanceService as H, ILogService as ee, RxDisposable as W, Inject as C, Injector as R, toDisposable as te, CommandType as V, Disposable as ne, IConfigService as A, Plugin as z, merge as F } from "@univerjs/core";
 import { takeUntil as v, filter as se, take as re } from "rxjs/operators";
-import { BehaviorSubject as ie, firstValueFrom as ce, Observable as W, isObservable as oe, of as ae, shareReplay as z } from "rxjs";
-const he = "rpc.main-thread.config", $ = {}, le = "rpc.worker-thread.config", j = {};
-var _e = Object.getOwnPropertyDescriptor, G = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? _e(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+import { BehaviorSubject as ie, firstValueFrom as oe, Observable as T, isObservable as ce, of as ae, shareReplay as G } from "rxjs";
+const he = "rpc.main-thread.config", j = {}, le = "rpc.worker-thread.config", N = {};
+var _e = Object.getOwnPropertyDescriptor, Y = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? _e(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
 }, p = (s, t) => (e, n) => t(e, n, s);
-const T = "rpc.remote-sync.service", g = k(T);
-let M = class {
+const D = "rpc.remote-sync.service", g = O(D);
+let q = class {
   constructor(s) {
     this._commandService = s;
   }
@@ -24,11 +24,11 @@ let M = class {
     });
   }
 };
-M = G([
+q = Y([
   p(0, b)
-], M);
-const D = "univer.remote-instance-service", m = k(D);
-let q = class {
+], q);
+const $ = "univer.remote-instance-service", m = O($);
+let k = class {
   constructor(s, t, e) {
     this._univerInstanceService = s, this._commandService = t, this._logService = e;
   }
@@ -63,12 +63,12 @@ let q = class {
     });
   }
 };
-q = G([
-  p(0, L),
+k = Y([
+  p(0, H),
   p(1, b),
   p(2, ee)
-], q);
-function Y(s) {
+], k);
+function B(s) {
   const t = s;
   return new class {
     call(e, n) {
@@ -83,13 +83,13 @@ function Y(s) {
       const r = t[e];
       if (typeof r == "function") {
         const i = n ? r.apply(t, n) : r.call(t);
-        return oe(i) ? i : ae(i);
+        return ce(i) ? i : ae(i);
       }
       throw new Error(`[RPC]: observable method not found for ${e}!`);
     }
   }();
 }
-function B(s) {
+function K(s) {
   return new Proxy({}, {
     get(t, e) {
       if (e !== "dispose")
@@ -102,7 +102,7 @@ function B(s) {
 function ue(s) {
   return s.endsWith("$");
 }
-class de extends O {
+class de extends W {
   constructor(e) {
     super();
     a(this, "_initialized", new ie(!1));
@@ -130,40 +130,42 @@ class de extends O {
     };
   }
   _whenReady() {
-    return ce(
+    return oe(
       this._initialized.pipe(
         se((e) => e),
         re(1)
       )
     );
   }
-  async _remoteCall(e, n, r) {
-    await this._whenReady();
-    const i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, o = this;
-    return new Promise((w, l) => {
-      const Q = {
-        handle(E) {
-          switch (E.type) {
+  _remoteCall(e, n, r) {
+    return this._initialized.getValue() ? this._doRemoteCall(e, n, r) : this._whenReady().then(() => this._doRemoteCall(e, n, r));
+  }
+  _doRemoteCall(e, n, r) {
+    const i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, c = this;
+    return new Promise((w, E) => {
+      const l = {
+        handle(P) {
+          switch (P.type) {
             case 201:
-              o._pendingRequests.delete(i), w(E.data);
+              c._pendingRequests.delete(i), w(P.data);
               break;
             case 202:
-              o._pendingRequests.delete(i), l(E.data);
+              c._pendingRequests.delete(i), E(P.data);
               break;
             default:
               throw new Error("[ChannelClient]: unknown response type!");
           }
         }
       };
-      this._pendingRequests.set(i, Q), this._sendRequest(h);
+      this._pendingRequests.set(i, l), this._sendRequest(h);
     });
   }
   _remoteSubscribe(e, n, r) {
-    return new W((i) => {
-      let c = -1;
-      return this._whenReady().then(() => {
-        c = ++this._lastRequestCounter;
-        const o = { seq: c, type: 101, channelName: e, method: n, args: r }, w = {
+    return new T((i) => {
+      let o = -1;
+      const h = () => {
+        o = ++this._lastRequestCounter;
+        const w = { seq: o, type: 101, channelName: e, method: n, args: r }, E = {
           handle(l) {
             switch (l.type) {
               case 300:
@@ -180,17 +182,18 @@ class de extends O {
             }
           }
         };
-        this._pendingRequests.set(c, w), this._sendRequest(o);
-      }), () => {
-        if (c === -1)
+        this._pendingRequests.set(o, E), this._sendRequest(w);
+      };
+      return this._initialized.getValue() ? h() : this._whenReady().then(h), () => {
+        if (o === -1)
           return;
-        const h = {
+        const c = {
           type: 102,
-          seq: c,
+          seq: o,
           channelName: e,
           method: n
         };
-        this._sendRequest(h);
+        this._sendRequest(c);
       };
     });
   }
@@ -209,14 +212,14 @@ class de extends O {
       case 300:
       case 302:
       case 301: {
-        const { _pendingRequests: c } = this;
-        (i = c.get(r)) == null || i.handle(e), n !== 300 && c.delete(r);
+        const { _pendingRequests: o } = this;
+        (i = o.get(r)) == null || i.handle(e), n !== 300 && o.delete(r);
         break;
       }
     }
   }
 }
-class pe extends O {
+class pe extends W {
   constructor(e) {
     super();
     a(this, "_channels", /* @__PURE__ */ new Map());
@@ -253,19 +256,19 @@ class pe extends O {
     });
   }
   _onMethodCall(e) {
-    const { channelName: n, method: r, args: i } = e, c = this._channels.get(n);
+    const { channelName: n, method: r, args: i } = e, o = this._channels.get(n);
     let h;
     try {
-      if (!c)
+      if (!o)
         throw new Error(`[ChannelServer]: Channel ${n} not found!`);
-      h = i ? c.call(r, i) : c.call(r);
-    } catch (o) {
-      h = Promise.reject(o);
+      h = i ? o.call(r, i) : o.call(r);
+    } catch (c) {
+      h = Promise.reject(c);
     }
-    h.then((o) => {
-      this._sendResponse({ seq: e.seq, type: 201, data: o });
-    }).catch((o) => {
-      o instanceof Error ? this._sendResponse({ seq: e.seq, type: 202, data: o.message }) : this._sendResponse({ seq: e.seq, type: 202, data: String(o) });
+    h.then((c) => {
+      this._sendResponse({ seq: e.seq, type: 201, data: c });
+    }).catch((c) => {
+      c instanceof Error ? this._sendResponse({ seq: e.seq, type: 202, data: c.message }) : this._sendResponse({ seq: e.seq, type: 202, data: String(c) });
     });
   }
   _onSubscribe(e) {
@@ -274,11 +277,11 @@ class pe extends O {
       if (!i)
         throw new Error(`[ChannelServer]: Channel ${n} not found!`);
       const h = i.subscribe(e.method, e.args).subscribe({
-        next: (o) => {
-          this._sendResponse({ seq: r, type: 300, data: o });
+        next: (c) => {
+          this._sendResponse({ seq: r, type: 300, data: c });
         },
-        error: (o) => {
-          this._sendResponse({ seq: r, type: 301, data: o.message }), this._sendResponse({
+        error: (c) => {
+          this._sendResponse({ seq: r, type: 301, data: c.message }), this._sendResponse({
             seq: r,
             type: 302
             /* SUBSCRIBE_COMPLETE */
@@ -293,8 +296,8 @@ class pe extends O {
         }
       });
       this._subscriptions.set(e.seq, h);
-    } catch (c) {
-      c instanceof Error ? this._sendResponse({ seq: e.seq, type: 301, data: c.message }) : this._sendResponse({ seq: e.seq, type: 301, data: String(c) });
+    } catch (o) {
+      o instanceof Error ? this._sendResponse({ seq: e.seq, type: 301, data: o.message }) : this._sendResponse({ seq: e.seq, type: 301, data: String(o) });
     }
   }
   _onUnsubscribe(e) {
@@ -305,8 +308,8 @@ class pe extends O {
     this._protocol.send(e);
   }
 }
-const I = k("IRPCChannelService");
-class K {
+const I = O("IRPCChannelService");
+class J {
   constructor(t) {
     a(this, "_client");
     a(this, "_server");
@@ -323,11 +326,11 @@ class K {
   }
 }
 var ve = Object.getOwnPropertyDescriptor, ge = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? ve(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+  for (var r = n > 1 ? void 0 : n ? ve(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
 }, _ = (s, t) => (e, n) => t(e, n, s);
-let f = class extends O {
+let f = class extends W {
   constructor(t, e, n, r, i) {
     super();
     a(this, "_remoteInstanceService");
@@ -346,9 +349,9 @@ let f = class extends O {
     return this._syncingUnits.add(t), te(() => this._syncingUnits.delete(t));
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(T, Y(this._remoteSyncService)), this._injector.add([
+    this._rpcChannelService.registerChannel(D, B(this._remoteSyncService)), this._injector.add([
       m,
-      { useFactory: () => B(this._rpcChannelService.requestChannel(D)) }
+      { useFactory: () => K(this._rpcChannelService.requestChannel($)) }
     ]), this._remoteInstanceService = this._injector.get(m);
   }
   _init() {
@@ -363,9 +366,9 @@ let f = class extends O {
         unitID: t.getUnitId()
       });
     }), this.disposeWithMe(this._commandService.onCommandExecuted((t, e) => {
-      const { type: n, params: r, id: i } = t, c = (r == null ? void 0 : r.unitId) || "";
-      n === H.MUTATION && // only sync mutations to the worker thread
-      (!c || this._syncingUnits.has(c)) && // do not sync mutations from the web worker back to the web worker
+      const { type: n, params: r, id: i } = t, o = (r == null ? void 0 : r.unitId) || "";
+      n === V.MUTATION && // only sync mutations to the worker thread
+      (!o || this._syncingUnits.has(o)) && // do not sync mutations from the web worker back to the web worker
       !(e != null && e.fromSync) && // do not sync mutations those are not meant to be synced
       this._syncingMutations.has(i) && this._remoteInstanceService.syncMutation({ mutationInfo: t }, e);
     }));
@@ -374,13 +377,13 @@ let f = class extends O {
 f = ge([
   _(0, C(R)),
   _(1, b),
-  _(2, L),
+  _(2, H),
   _(3, I),
   _(4, g)
 ], f);
 var me = Object.getOwnPropertyDescriptor, fe = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? me(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+  for (var r = n > 1 ? void 0 : n ? me(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
 }, d = (s, t) => (e, n) => t(e, n, s);
 let y = class extends ne {
@@ -390,16 +393,16 @@ let y = class extends ne {
     this._injector = t, this._remoteInstanceService = e, this._commandService = n, this._rpcChannelService = r, this._initRPCChannels(), this._init();
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(D, Y(this._remoteInstanceService)), this._injector.add([
+    this._rpcChannelService.registerChannel($, B(this._remoteInstanceService)), this._injector.add([
       g,
-      { useFactory: () => B(this._rpcChannelService.requestChannel(T)) }
+      { useFactory: () => K(this._rpcChannelService.requestChannel(D)) }
     ]), this._remoteSyncService = this._injector.get(g);
   }
   _init() {
     this.disposeWithMe(
       // Mutations executed on the main thread should be synced to the worker thread.
       this._commandService.onCommandExecuted((t, e) => {
-        t.type === H.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
+        t.type === V.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
           mutationInfo: t
         }, e);
       })
@@ -417,12 +420,12 @@ function ye() {
     send(s) {
       postMessage(s);
     },
-    onMessage: new W((s) => {
+    onMessage: new T((s) => {
       const t = (e) => {
         s.next(e.data);
       };
       return addEventListener("message", t), () => removeEventListener("message", t);
-    }).pipe(z(1))
+    }).pipe(G(1))
   };
 }
 function Se(s) {
@@ -430,27 +433,27 @@ function Se(s) {
     send(t) {
       s.postMessage(t);
     },
-    onMessage: new W((t) => {
+    onMessage: new T((t) => {
       const e = (n) => {
         t.next(n.data);
       };
       return s.addEventListener("message", e), () => s.removeEventListener("message", e);
-    }).pipe(z(1))
+    }).pipe(G(1))
   };
 }
-var be = Object.getOwnPropertyDescriptor, J = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? be(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+var be = Object.getOwnPropertyDescriptor, Q = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? be(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
-}, S = (s, t) => (e, n) => t(e, n, s), P;
-let N = (P = class extends V {
-  constructor(t = $, e, n) {
+}, S = (s, t) => (e, n) => t(e, n, s), U;
+let x = (U = class extends z {
+  constructor(t = j, e, n) {
     super();
     a(this, "_internalWorker", null);
     this._config = t, this._injector = e, this._configService = n;
     const { ...r } = F(
       {},
-      $,
+      j,
       this._config
     );
     this._configService.setConfig(he, r);
@@ -469,25 +472,25 @@ let N = (P = class extends V {
       [
         I,
         {
-          useFactory: () => new K(n)
+          useFactory: () => new J(n)
         }
       ],
       [f],
-      [g, { useClass: M }]
+      [g, { useClass: q }]
     ].forEach((i) => this._injector.add(i)), this._injector.get(f);
   }
-}, a(P, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), P);
-N = J([
+}, a(U, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), U);
+x = Q([
   S(1, C(R)),
   S(2, A)
-], N);
-var U;
-let x = (U = class extends V {
-  constructor(s = j, t, e) {
+], x);
+var M;
+let L = (M = class extends z {
+  constructor(s = N, t, e) {
     super(), this._config = s, this._injector = t, this._configService = e;
     const { ...n } = F(
       {},
-      j,
+      N,
       this._config
     );
     this._configService.setConfig(le, n);
@@ -498,21 +501,21 @@ let x = (U = class extends V {
       [
         I,
         {
-          useFactory: () => new K(ye())
+          useFactory: () => new J(ye())
         }
       ],
-      [m, { useClass: q }]
+      [m, { useClass: k }]
     ].forEach((s) => this._injector.add(s)), this._injector.get(y);
   }
-}, a(U, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), U);
-x = J([
+}, a(M, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), M);
+L = Q([
   S(1, C(R)),
   S(2, A)
-], x);
+], L);
 export {
   de as ChannelClient,
   pe as ChannelServer,
-  K as ChannelService,
+  J as ChannelService,
   f as DataSyncPrimaryController,
   y as DataSyncReplicaController,
   I as IRPCChannelService,
@@ -520,12 +523,12 @@ export {
   g as IRemoteSyncService,
   he as PLUGIN_CONFIG_KEY_MAIN_THREAD,
   le as PLUGIN_CONFIG_KEY_WORKER_THREAD,
-  D as RemoteInstanceServiceName,
-  M as RemoteSyncPrimaryService,
-  T as RemoteSyncServiceName,
-  N as UniverRPCMainThreadPlugin,
-  x as UniverRPCWorkerThreadPlugin,
-  q as WebWorkerRemoteInstanceService,
-  Y as fromModule,
-  B as toModule
+  $ as RemoteInstanceServiceName,
+  q as RemoteSyncPrimaryService,
+  D as RemoteSyncServiceName,
+  x as UniverRPCMainThreadPlugin,
+  L as UniverRPCWorkerThreadPlugin,
+  k as WebWorkerRemoteInstanceService,
+  B as fromModule,
+  K as toModule
 };

package/lib/index.js

@@ -1,17 +1,17 @@
 var X = Object.defineProperty;
 var Z = (s, t, e) => t in s ? X(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
 var a = (s, t, e) => Z(s, typeof t != "symbol" ? t + "" : t, e);
-import { createIdentifier as k, UniverInstanceType as u, ICommandService as b, IUniverInstanceService as L, ILogService as ee, RxDisposable as O, Inject as C, Injector as R, toDisposable as te, CommandType as H, Disposable as ne, IConfigService as A, Plugin as V, merge as F } from "@univerjs/core";
+import { createIdentifier as O, UniverInstanceType as u, ICommandService as b, IUniverInstanceService as H, ILogService as ee, RxDisposable as W, Inject as C, Injector as R, toDisposable as te, CommandType as V, Disposable as ne, IConfigService as A, Plugin as z, merge as F } from "@univerjs/core";
 import { takeUntil as v, filter as se, take as re } from "rxjs/operators";
-import { BehaviorSubject as ie, firstValueFrom as ce, Observable as W, isObservable as oe, of as ae, shareReplay as z } from "rxjs";
-const he = "rpc.main-thread.config", $ = {}, le = "rpc.worker-thread.config", j = {};
-var _e = Object.getOwnPropertyDescriptor, G = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? _e(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+import { BehaviorSubject as ie, firstValueFrom as oe, Observable as T, isObservable as ce, of as ae, shareReplay as G } from "rxjs";
+const he = "rpc.main-thread.config", j = {}, le = "rpc.worker-thread.config", N = {};
+var _e = Object.getOwnPropertyDescriptor, Y = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? _e(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
 }, p = (s, t) => (e, n) => t(e, n, s);
-const T = "rpc.remote-sync.service", g = k(T);
-let M = class {
+const D = "rpc.remote-sync.service", g = O(D);
+let q = class {
   constructor(s) {
     this._commandService = s;
   }
@@ -24,11 +24,11 @@ let M = class {
     });
   }
 };
-M = G([
+q = Y([
   p(0, b)
-], M);
-const D = "univer.remote-instance-service", m = k(D);
-let q = class {
+], q);
+const $ = "univer.remote-instance-service", m = O($);
+let k = class {
   constructor(s, t, e) {
     this._univerInstanceService = s, this._commandService = t, this._logService = e;
   }
@@ -63,12 +63,12 @@ let q = class {
     });
   }
 };
-q = G([
-  p(0, L),
+k = Y([
+  p(0, H),
   p(1, b),
   p(2, ee)
-], q);
-function Y(s) {
+], k);
+function B(s) {
   const t = s;
   return new class {
     call(e, n) {
@@ -83,13 +83,13 @@ function Y(s) {
       const r = t[e];
       if (typeof r == "function") {
         const i = n ? r.apply(t, n) : r.call(t);
-        return oe(i) ? i : ae(i);
+        return ce(i) ? i : ae(i);
       }
       throw new Error(`[RPC]: observable method not found for ${e}!`);
     }
   }();
 }
-function B(s) {
+function K(s) {
   return new Proxy({}, {
     get(t, e) {
       if (e !== "dispose")
@@ -102,7 +102,7 @@ function B(s) {
 function ue(s) {
   return s.endsWith("$");
 }
-class de extends O {
+class de extends W {
   constructor(e) {
     super();
     a(this, "_initialized", new ie(!1));
@@ -130,40 +130,42 @@ class de extends O {
     };
   }
   _whenReady() {
-    return ce(
+    return oe(
       this._initialized.pipe(
         se((e) => e),
         re(1)
       )
     );
   }
-  async _remoteCall(e, n, r) {
-    await this._whenReady();
-    const i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, o = this;
-    return new Promise((w, l) => {
-      const Q = {
-        handle(E) {
-          switch (E.type) {
+  _remoteCall(e, n, r) {
+    return this._initialized.getValue() ? this._doRemoteCall(e, n, r) : this._whenReady().then(() => this._doRemoteCall(e, n, r));
+  }
+  _doRemoteCall(e, n, r) {
+    const i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, c = this;
+    return new Promise((w, E) => {
+      const l = {
+        handle(P) {
+          switch (P.type) {
             case 201:
-              o._pendingRequests.delete(i), w(E.data);
+              c._pendingRequests.delete(i), w(P.data);
               break;
             case 202:
-              o._pendingRequests.delete(i), l(E.data);
+              c._pendingRequests.delete(i), E(P.data);
               break;
             default:
               throw new Error("[ChannelClient]: unknown response type!");
           }
         }
       };
-      this._pendingRequests.set(i, Q), this._sendRequest(h);
+      this._pendingRequests.set(i, l), this._sendRequest(h);
     });
   }
   _remoteSubscribe(e, n, r) {
-    return new W((i) => {
-      let c = -1;
-      return this._whenReady().then(() => {
-        c = ++this._lastRequestCounter;
-        const o = { seq: c, type: 101, channelName: e, method: n, args: r }, w = {
+    return new T((i) => {
+      let o = -1;
+      const h = () => {
+        o = ++this._lastRequestCounter;
+        const w = { seq: o, type: 101, channelName: e, method: n, args: r }, E = {
           handle(l) {
             switch (l.type) {
               case 300:
@@ -180,17 +182,18 @@ class de extends O {
             }
           }
         };
-        this._pendingRequests.set(c, w), this._sendRequest(o);
-      }), () => {
-        if (c === -1)
+        this._pendingRequests.set(o, E), this._sendRequest(w);
+      };
+      return this._initialized.getValue() ? h() : this._whenReady().then(h), () => {
+        if (o === -1)
           return;
-        const h = {
+        const c = {
           type: 102,
-          seq: c,
+          seq: o,
           channelName: e,
           method: n
         };
-        this._sendRequest(h);
+        this._sendRequest(c);
       };
     });
   }
@@ -209,14 +212,14 @@ class de extends O {
       case 300:
       case 302:
       case 301: {
-        const { _pendingRequests: c } = this;
-        (i = c.get(r)) == null || i.handle(e), n !== 300 && c.delete(r);
+        const { _pendingRequests: o } = this;
+        (i = o.get(r)) == null || i.handle(e), n !== 300 && o.delete(r);
         break;
       }
     }
   }
 }
-class pe extends O {
+class pe extends W {
   constructor(e) {
     super();
     a(this, "_channels", /* @__PURE__ */ new Map());
@@ -253,19 +256,19 @@ class pe extends O {
     });
   }
   _onMethodCall(e) {
-    const { channelName: n, method: r, args: i } = e, c = this._channels.get(n);
+    const { channelName: n, method: r, args: i } = e, o = this._channels.get(n);
     let h;
     try {
-      if (!c)
+      if (!o)
         throw new Error(`[ChannelServer]: Channel ${n} not found!`);
-      h = i ? c.call(r, i) : c.call(r);
-    } catch (o) {
-      h = Promise.reject(o);
+      h = i ? o.call(r, i) : o.call(r);
+    } catch (c) {
+      h = Promise.reject(c);
     }
-    h.then((o) => {
-      this._sendResponse({ seq: e.seq, type: 201, data: o });
-    }).catch((o) => {
-      o instanceof Error ? this._sendResponse({ seq: e.seq, type: 202, data: o.message }) : this._sendResponse({ seq: e.seq, type: 202, data: String(o) });
+    h.then((c) => {
+      this._sendResponse({ seq: e.seq, type: 201, data: c });
+    }).catch((c) => {
+      c instanceof Error ? this._sendResponse({ seq: e.seq, type: 202, data: c.message }) : this._sendResponse({ seq: e.seq, type: 202, data: String(c) });
     });
   }
   _onSubscribe(e) {
@@ -274,11 +277,11 @@ class pe extends O {
       if (!i)
         throw new Error(`[ChannelServer]: Channel ${n} not found!`);
       const h = i.subscribe(e.method, e.args).subscribe({
-        next: (o) => {
-          this._sendResponse({ seq: r, type: 300, data: o });
+        next: (c) => {
+          this._sendResponse({ seq: r, type: 300, data: c });
         },
-        error: (o) => {
-          this._sendResponse({ seq: r, type: 301, data: o.message }), this._sendResponse({
+        error: (c) => {
+          this._sendResponse({ seq: r, type: 301, data: c.message }), this._sendResponse({
             seq: r,
             type: 302
             /* SUBSCRIBE_COMPLETE */
@@ -293,8 +296,8 @@ class pe extends O {
         }
       });
       this._subscriptions.set(e.seq, h);
-    } catch (c) {
-      c instanceof Error ? this._sendResponse({ seq: e.seq, type: 301, data: c.message }) : this._sendResponse({ seq: e.seq, type: 301, data: String(c) });
+    } catch (o) {
+      o instanceof Error ? this._sendResponse({ seq: e.seq, type: 301, data: o.message }) : this._sendResponse({ seq: e.seq, type: 301, data: String(o) });
     }
   }
   _onUnsubscribe(e) {
@@ -305,8 +308,8 @@ class pe extends O {
     this._protocol.send(e);
   }
 }
-const I = k("IRPCChannelService");
-class K {
+const I = O("IRPCChannelService");
+class J {
   constructor(t) {
     a(this, "_client");
     a(this, "_server");
@@ -323,11 +326,11 @@ class K {
   }
 }
 var ve = Object.getOwnPropertyDescriptor, ge = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? ve(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+  for (var r = n > 1 ? void 0 : n ? ve(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
 }, _ = (s, t) => (e, n) => t(e, n, s);
-let f = class extends O {
+let f = class extends W {
   constructor(t, e, n, r, i) {
     super();
     a(this, "_remoteInstanceService");
@@ -346,9 +349,9 @@ let f = class extends O {
     return this._syncingUnits.add(t), te(() => this._syncingUnits.delete(t));
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(T, Y(this._remoteSyncService)), this._injector.add([
+    this._rpcChannelService.registerChannel(D, B(this._remoteSyncService)), this._injector.add([
       m,
-      { useFactory: () => B(this._rpcChannelService.requestChannel(D)) }
+      { useFactory: () => K(this._rpcChannelService.requestChannel($)) }
     ]), this._remoteInstanceService = this._injector.get(m);
   }
   _init() {
@@ -363,9 +366,9 @@ let f = class extends O {
         unitID: t.getUnitId()
       });
     }), this.disposeWithMe(this._commandService.onCommandExecuted((t, e) => {
-      const { type: n, params: r, id: i } = t, c = (r == null ? void 0 : r.unitId) || "";
-      n === H.MUTATION && // only sync mutations to the worker thread
-      (!c || this._syncingUnits.has(c)) && // do not sync mutations from the web worker back to the web worker
+      const { type: n, params: r, id: i } = t, o = (r == null ? void 0 : r.unitId) || "";
+      n === V.MUTATION && // only sync mutations to the worker thread
+      (!o || this._syncingUnits.has(o)) && // do not sync mutations from the web worker back to the web worker
       !(e != null && e.fromSync) && // do not sync mutations those are not meant to be synced
       this._syncingMutations.has(i) && this._remoteInstanceService.syncMutation({ mutationInfo: t }, e);
     }));
@@ -374,13 +377,13 @@ let f = class extends O {
 f = ge([
   _(0, C(R)),
   _(1, b),
-  _(2, L),
+  _(2, H),
   _(3, I),
   _(4, g)
 ], f);
 var me = Object.getOwnPropertyDescriptor, fe = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? me(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+  for (var r = n > 1 ? void 0 : n ? me(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
 }, d = (s, t) => (e, n) => t(e, n, s);
 let y = class extends ne {
@@ -390,16 +393,16 @@ let y = class extends ne {
     this._injector = t, this._remoteInstanceService = e, this._commandService = n, this._rpcChannelService = r, this._initRPCChannels(), this._init();
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(D, Y(this._remoteInstanceService)), this._injector.add([
+    this._rpcChannelService.registerChannel($, B(this._remoteInstanceService)), this._injector.add([
       g,
-      { useFactory: () => B(this._rpcChannelService.requestChannel(T)) }
+      { useFactory: () => K(this._rpcChannelService.requestChannel(D)) }
     ]), this._remoteSyncService = this._injector.get(g);
   }
   _init() {
     this.disposeWithMe(
       // Mutations executed on the main thread should be synced to the worker thread.
       this._commandService.onCommandExecuted((t, e) => {
-        t.type === H.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
+        t.type === V.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
           mutationInfo: t
         }, e);
       })
@@ -417,12 +420,12 @@ function ye() {
     send(s) {
       postMessage(s);
     },
-    onMessage: new W((s) => {
+    onMessage: new T((s) => {
       const t = (e) => {
         s.next(e.data);
       };
       return addEventListener("message", t), () => removeEventListener("message", t);
-    }).pipe(z(1))
+    }).pipe(G(1))
   };
 }
 function Se(s) {
@@ -430,27 +433,27 @@ function Se(s) {
     send(t) {
       s.postMessage(t);
     },
-    onMessage: new W((t) => {
+    onMessage: new T((t) => {
       const e = (n) => {
         t.next(n.data);
       };
       return s.addEventListener("message", e), () => s.removeEventListener("message", e);
-    }).pipe(z(1))
+    }).pipe(G(1))
   };
 }
-var be = Object.getOwnPropertyDescriptor, J = (s, t, e, n) => {
-  for (var r = n > 1 ? void 0 : n ? be(t, e) : t, i = s.length - 1, c; i >= 0; i--)
-    (c = s[i]) && (r = c(r) || r);
+var be = Object.getOwnPropertyDescriptor, Q = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? be(t, e) : t, i = s.length - 1, o; i >= 0; i--)
+    (o = s[i]) && (r = o(r) || r);
   return r;
-}, S = (s, t) => (e, n) => t(e, n, s), P;
-let N = (P = class extends V {
-  constructor(t = $, e, n) {
+}, S = (s, t) => (e, n) => t(e, n, s), U;
+let x = (U = class extends z {
+  constructor(t = j, e, n) {
     super();
     a(this, "_internalWorker", null);
     this._config = t, this._injector = e, this._configService = n;
     const { ...r } = F(
       {},
-      $,
+      j,
       this._config
     );
     this._configService.setConfig(he, r);
@@ -469,25 +472,25 @@ let N = (P = class extends V {
       [
         I,
         {
-          useFactory: () => new K(n)
+          useFactory: () => new J(n)
         }
       ],
       [f],
-      [g, { useClass: M }]
+      [g, { useClass: q }]
     ].forEach((i) => this._injector.add(i)), this._injector.get(f);
   }
-}, a(P, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), P);
-N = J([
+}, a(U, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), U);
+x = Q([
   S(1, C(R)),
   S(2, A)
-], N);
-var U;
-let x = (U = class extends V {
-  constructor(s = j, t, e) {
+], x);
+var M;
+let L = (M = class extends z {
+  constructor(s = N, t, e) {
     super(), this._config = s, this._injector = t, this._configService = e;
     const { ...n } = F(
       {},
-      j,
+      N,
       this._config
     );
     this._configService.setConfig(le, n);
@@ -498,21 +501,21 @@ let x = (U = class extends V {
       [
         I,
         {
-          useFactory: () => new K(ye())
+          useFactory: () => new J(ye())
         }
       ],
-      [m, { useClass: q }]
+      [m, { useClass: k }]
     ].forEach((s) => this._injector.add(s)), this._injector.get(y);
   }
-}, a(U, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), U);
-x = J([
+}, a(M, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), M);
+L = Q([
   S(1, C(R)),
   S(2, A)
-], x);
+], L);
 export {
   de as ChannelClient,
   pe as ChannelServer,
-  K as ChannelService,
+  J as ChannelService,
   f as DataSyncPrimaryController,
   y as DataSyncReplicaController,
   I as IRPCChannelService,
@@ -520,12 +523,12 @@ export {
   g as IRemoteSyncService,
   he as PLUGIN_CONFIG_KEY_MAIN_THREAD,
   le as PLUGIN_CONFIG_KEY_WORKER_THREAD,
-  D as RemoteInstanceServiceName,
-  M as RemoteSyncPrimaryService,
-  T as RemoteSyncServiceName,
-  N as UniverRPCMainThreadPlugin,
-  x as UniverRPCWorkerThreadPlugin,
-  q as WebWorkerRemoteInstanceService,
-  Y as fromModule,
-  B as toModule
+  $ as RemoteInstanceServiceName,
+  q as RemoteSyncPrimaryService,
+  D as RemoteSyncServiceName,
+  x as UniverRPCMainThreadPlugin,
+  L as UniverRPCWorkerThreadPlugin,
+  k as WebWorkerRemoteInstanceService,
+  B as fromModule,
+  K as toModule
 };

package/lib/types/services/rpc/rpc.service.d.ts

@@ -51,6 +51,7 @@ export declare class ChannelClient extends RxDisposable implements IChannelClien
     getChannel<T extends IChannel>(channelName: string): T;
     private _whenReady;
     private _remoteCall;
+    private _doRemoteCall;
     private _remoteSubscribe;
     private _sendRequest;
     private _onMessage;

package/lib/umd/index.js

@@ -1 +1 @@
-(function(r,a){typeof exports=="object"&&typeof module<"u"?a(exports,require("@univerjs/core"),require("rxjs/operators"),require("rxjs")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","rxjs/operators","rxjs"],a):(r=typeof globalThis<"u"?globalThis:r||self,a(r.UniverRpc={},r.UniverCore,r.rxjs.operators,r.rxjs))})(this,(function(r,a,u,d){"use strict";var J=Object.defineProperty;var Q=(r,a,u)=>a in r?J(r,a,{enumerable:!0,configurable:!0,writable:!0,value:u}):r[a]=u;var h=(r,a,u)=>Q(r,typeof a!="symbol"?a+"":a,u);var U,E;const W="rpc.main-thread.config",k={},D="rpc.worker-thread.config",q={};var L=Object.getOwnPropertyDescriptor,O=(c,t,e,n)=>{for(var s=n>1?void 0:n?L(t,e):t,i=c.length-1,o;i>=0;i--)(o=c[i])&&(s=o(s)||s);return s},g=(c,t)=>(e,n)=>t(e,n,c);const C="rpc.remote-sync.service",v=a.createIdentifier(C);r.RemoteSyncPrimaryService=class{constructor(t){this._commandService=t}async syncMutation(t,e){const{fromCollab:n,...s}=e||{};return this._commandService.syncExecuteCommand(t.mutationInfo.id,t.mutationInfo.params,{...s,onlyLocal:!0,fromSync:!0})}},r.RemoteSyncPrimaryService=O([g(0,a.ICommandService)],r.RemoteSyncPrimaryService);const f="univer.remote-instance-service",m=a.createIdentifier(f);r.WebWorkerRemoteInstanceService=class{constructor(t,e,n){this._univerInstanceService=t,this._commandService=e,this._logService=n}whenReady(){return Promise.resolve(!0)}async syncMutation(t,e){return this._applyMutation(t.mutationInfo,e)}async createInstance(t){this._logService.debug(`[WebWorkerRemoteInstanceService]: Creating instance with id ${t.unitID}`);const{type:e,snapshot:n}=t;try{if(e===a.UniverInstanceType.UNIVER_SHEET)return this._univerInstanceService.createUnit(a.UniverInstanceType.UNIVER_SHEET,n),!0;throw new Error(`[WebWorkerRemoteInstanceService]: cannot create replica for document type: ${e}.`)}catch(s){throw s instanceof Error?s:new TypeError(`${s}`)}}async disposeInstance(t){return this._logService.debug(`[WebWorkerRemoteInstanceService]: Disposing instance with id ${t.unitID}`),this._univerInstanceService.disposeUnit(t.unitID)}_applyMutation(t,e){const{id:n,params:s}=t,{fromCollab:i,...o}=e||{};return this._commandService.syncExecuteCommand(n,s,{...o,onlyLocal:!0,fromSync:!0})}},r.WebWorkerRemoteInstanceService=O([g(0,a.IUniverInstanceService),g(1,a.ICommandService),g(2,a.ILogService)],r.WebWorkerRemoteInstanceService);function b(c){const t=c;return new class{call(e,n){const s=t[e];if(typeof s=="function"){let i=n?s.apply(t,n):s.call(t);return i instanceof Promise||(i=Promise.resolve(i)),i}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,n){const s=t[e];if(typeof s=="function"){const i=n?s.apply(t,n):s.call(t);return d.isObservable(i)?i:d.of(i)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function P(c){return new Proxy({},{get(t,e){if(e!=="dispose")return function(...n){return H(e)?c.subscribe(e,n):c.call(e,n)}}})}function H(c){return c.endsWith("$")}class j extends a.RxDisposable{constructor(e){super();h(this,"_initialized",new d.BehaviorSubject(!1));h(this,"_lastRequestCounter",0);h(this,"_pendingRequests",new Map);this._protocol=e,this._protocol.send({type:50}),this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(n=>this._onMessage(n))}dispose(){this._pendingRequests.clear()}getChannel(e){const n=this;return{call(s,i){return n._disposed?Promise.reject():n._remoteCall(e,s,i)},subscribe(s,i){if(n._disposed)throw new Error("[ChannelClient]: client is disposed!");return n._remoteSubscribe(e,s,i)}}}_whenReady(){return d.firstValueFrom(this._initialized.pipe(u.filter(e=>e),u.take(1)))}async _remoteCall(e,n,s){await this._whenReady();const i=++this._lastRequestCounter,_={seq:i,type:100,channelName:e,method:n,args:s},l=this;return new Promise((M,S)=>{const B={handle(T){switch(T.type){case 201:l._pendingRequests.delete(i),M(T.data);break;case 202:l._pendingRequests.delete(i),S(T.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,B),this._sendRequest(_)})}_remoteSubscribe(e,n,s){return new d.Observable(i=>{let o=-1;return this._whenReady().then(()=>{o=++this._lastRequestCounter;const l={seq:o,type:101,channelName:e,method:n,args:s},M={handle(S){switch(S.type){case 300:i.next(S.data);break;case 301:i.error(S.data);break;case 302:i.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(o,M),this._sendRequest(l)}),()=>{if(o===-1)return;const _={type:102,seq:o,channelName:e,method:n};this._sendRequest(_)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var i;const{type:n,seq:s}=e;switch(n){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:{const{_pendingRequests:o}=this;(i=o.get(s))==null||i.handle(e),n!==300&&o.delete(s);break}}}}class N extends a.RxDisposable{constructor(e){super();h(this,"_channels",new Map);h(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(n=>this._onRequest(n)),this._sendInitialize()}dispose(){super.dispose(),this._subscriptions.clear(),this._channels.clear()}registerChannel(e,n){this._channels.set(e,n)}_onRequest(e){switch(e.type){case 50:this._sendInitialize();break;case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_sendInitialize(){this._sendResponse({seq:-1,type:0})}_onMethodCall(e){const{channelName:n,method:s,args:i}=e,o=this._channels.get(n);let _;try{if(!o)throw new Error(`[ChannelServer]: Channel ${n} not found!`);_=i?o.call(s,i):o.call(s)}catch(l){_=Promise.reject(l)}_.then(l=>{this._sendResponse({seq:e.seq,type:201,data:l})}).catch(l=>{l instanceof Error?this._sendResponse({seq:e.seq,type:202,data:l.message}):this._sendResponse({seq:e.seq,type:202,data:String(l)})})}_onSubscribe(e){const{channelName:n,seq:s}=e,i=this._channels.get(n);try{if(!i)throw new Error(`[ChannelServer]: Channel ${n} not found!`);const _=i.subscribe(e.method,e.args).subscribe({next:l=>{this._sendResponse({seq:s,type:300,data:l})},error:l=>{this._sendResponse({seq:s,type:301,data:l.message}),this._sendResponse({seq:s,type:302})},complete:()=>{this._sendResponse({seq:s,type:302})}});this._subscriptions.set(e.seq,_)}catch(o){o instanceof Error?this._sendResponse({seq:e.seq,type:301,data:o.message}):this._sendResponse({seq:e.seq,type:301,data:String(o)})}}_onUnsubscribe(e){const n=this._subscriptions.get(e.seq);n&&(n.unsubscribe(),this._subscriptions.delete(e.seq))}_sendResponse(e){this._protocol.send(e)}}const p=a.createIdentifier("IRPCChannelService");class w{constructor(t){h(this,"_client");h(this,"_server");this._client=new j(t),this._server=new N(t)}dispose(){this._client.dispose(),this._server.dispose()}requestChannel(t){return this._client.getChannel(t)}registerChannel(t,e){this._server.registerChannel(t,e)}}var A=Object.getOwnPropertyDescriptor,G=(c,t,e,n)=>{for(var s=n>1?void 0:n?A(t,e):t,i=c.length-1,o;i>=0;i--)(o=c[i])&&(s=o(s)||s);return s},y=(c,t)=>(e,n)=>t(e,n,c);r.DataSyncPrimaryController=class extends a.RxDisposable{constructor(e,n,s,i,o){super();h(this,"_remoteInstanceService");h(this,"_syncingUnits",new Set);h(this,"_syncingMutations",new Set);this._injector=e,this._commandService=n,this._univerInstanceService=s,this._rpcChannelService=i,this._remoteSyncService=o,this._initRPCChannels(),this._init()}registerSyncingMutations(e){this._syncingMutations.add(e.id)}syncUnit(e){return this._syncingUnits.add(e),a.toDisposable(()=>this._syncingUnits.delete(e))}_initRPCChannels(){this._rpcChannelService.registerChannel(C,b(this._remoteSyncService)),this._injector.add([m,{useFactory:()=>P(this._rpcChannelService.requestChannel(f))}]),this._remoteInstanceService=this._injector.get(m)}_init(){this._univerInstanceService.getTypeOfUnitAdded$(a.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.add(e.getUnitId()),this._remoteInstanceService.createInstance({unitID:e.getUnitId(),type:a.UniverInstanceType.UNIVER_SHEET,snapshot:e.getSnapshot()})}),this._univerInstanceService.getTypeOfUnitDisposed$(a.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.delete(e.getUnitId()),this._remoteInstanceService.disposeInstance({unitID:e.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((e,n)=>{const{type:s,params:i,id:o}=e,_=(i==null?void 0:i.unitId)||"";s===a.CommandType.MUTATION&&(!_||this._syncingUnits.has(_))&&!(n!=null&&n.fromSync)&&this._syncingMutations.has(o)&&this._remoteInstanceService.syncMutation({mutationInfo:e},n)}))}},r.DataSyncPrimaryController=G([y(0,a.Inject(a.Injector)),y(1,a.ICommandService),y(2,a.IUniverInstanceService),y(3,p),y(4,v)],r.DataSyncPrimaryController);var F=Object.getOwnPropertyDescriptor,V=(c,t,e,n)=>{for(var s=n>1?void 0:n?F(t,e):t,i=c.length-1,o;i>=0;i--)(o=c[i])&&(s=o(s)||s);return s},R=(c,t)=>(e,n)=>t(e,n,c);r.DataSyncReplicaController=class extends a.Disposable{constructor(e,n,s,i){super();h(this,"_remoteSyncService");this._injector=e,this._remoteInstanceService=n,this._commandService=s,this._rpcChannelService=i,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(f,b(this._remoteInstanceService)),this._injector.add([v,{useFactory:()=>P(this._rpcChannelService.requestChannel(C))}]),this._remoteSyncService=this._injector.get(v)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((e,n)=>{e.type===a.CommandType.MUTATION&&!(n!=null&&n.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:e},n)}))}},r.DataSyncReplicaController=V([R(0,a.Inject(a.Injector)),R(1,m),R(2,a.ICommandService),R(3,p)],r.DataSyncReplicaController);function z(){return{send(c){postMessage(c)},onMessage:new d.Observable(c=>{const t=e=>{c.next(e.data)};return addEventListener("message",t),()=>removeEventListener("message",t)}).pipe(d.shareReplay(1))}}function K(c){return{send(t){c.postMessage(t)},onMessage:new d.Observable(t=>{const e=n=>{t.next(n.data)};return c.addEventListener("message",e),()=>c.removeEventListener("message",e)}).pipe(d.shareReplay(1))}}var Y=Object.getOwnPropertyDescriptor,$=(c,t,e,n)=>{for(var s=n>1?void 0:n?Y(t,e):t,i=c.length-1,o;i>=0;i--)(o=c[i])&&(s=o(s)||s);return s},I=(c,t)=>(e,n)=>t(e,n,c);r.UniverRPCMainThreadPlugin=(U=class extends a.Plugin{constructor(e=k,n,s){super();h(this,"_internalWorker",null);this._config=e,this._injector=n,this._configService=s;const{...i}=a.merge({},k,this._config);this._configService.setConfig(W,i)}dispose(){super.dispose(),this._internalWorker&&(this._internalWorker.terminate(),this._internalWorker=null)}onStarting(){const{workerURL:e}=this._config;if(!e)throw new Error("[UniverRPCMainThreadPlugin]: The workerURL is required for the RPC main thread plugin.");const n=e instanceof Worker?e:new Worker(e);this._internalWorker=e instanceof Worker?null:n;const s=K(n);[[p,{useFactory:()=>new w(s)}],[r.DataSyncPrimaryController],[v,{useClass:r.RemoteSyncPrimaryService}]].forEach(o=>this._injector.add(o)),this._injector.get(r.DataSyncPrimaryController)}},h(U,"pluginName","UNIVER_RPC_MAIN_THREAD_PLUGIN"),U),r.UniverRPCMainThreadPlugin=$([I(1,a.Inject(a.Injector)),I(2,a.IConfigService)],r.UniverRPCMainThreadPlugin),r.UniverRPCWorkerThreadPlugin=(E=class extends a.Plugin{constructor(t=q,e,n){super(),this._config=t,this._injector=e,this._configService=n;const{...s}=a.merge({},q,this._config);this._configService.setConfig(D,s)}onStarting(){[[r.DataSyncReplicaController],[p,{useFactory:()=>new w(z())}],[m,{useClass:r.WebWorkerRemoteInstanceService}]].forEach(t=>this._injector.add(t)),this._injector.get(r.DataSyncReplicaController)}},h(E,"pluginName","UNIVER_RPC_WORKER_THREAD_PLUGIN"),E),r.UniverRPCWorkerThreadPlugin=$([I(1,a.Inject(a.Injector)),I(2,a.IConfigService)],r.UniverRPCWorkerThreadPlugin),r.ChannelClient=j,r.ChannelServer=N,r.ChannelService=w,r.IRPCChannelService=p,r.IRemoteInstanceService=m,r.IRemoteSyncService=v,r.PLUGIN_CONFIG_KEY_MAIN_THREAD=W,r.PLUGIN_CONFIG_KEY_WORKER_THREAD=D,r.RemoteInstanceServiceName=f,r.RemoteSyncServiceName=C,r.fromModule=b,r.toModule=P,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})}));
+(function(r,a){typeof exports=="object"&&typeof module<"u"?a(exports,require("@univerjs/core"),require("rxjs/operators"),require("rxjs")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","rxjs/operators","rxjs"],a):(r=typeof globalThis<"u"?globalThis:r||self,a(r.UniverRpc={},r.UniverCore,r.rxjs.operators,r.rxjs))})(this,(function(r,a,u,d){"use strict";var J=Object.defineProperty;var Q=(r,a,u)=>a in r?J(r,a,{enumerable:!0,configurable:!0,writable:!0,value:u}):r[a]=u;var h=(r,a,u)=>Q(r,typeof a!="symbol"?a+"":a,u);var U,E;const k="rpc.main-thread.config",D={},q="rpc.worker-thread.config",O={};var H=Object.getOwnPropertyDescriptor,j=(c,s,e,n)=>{for(var t=n>1?void 0:n?H(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},g=(c,s)=>(e,n)=>s(e,n,c);const C="rpc.remote-sync.service",v=a.createIdentifier(C);r.RemoteSyncPrimaryService=class{constructor(s){this._commandService=s}async syncMutation(s,e){const{fromCollab:n,...t}=e||{};return this._commandService.syncExecuteCommand(s.mutationInfo.id,s.mutationInfo.params,{...t,onlyLocal:!0,fromSync:!0})}},r.RemoteSyncPrimaryService=j([g(0,a.ICommandService)],r.RemoteSyncPrimaryService);const f="univer.remote-instance-service",m=a.createIdentifier(f);r.WebWorkerRemoteInstanceService=class{constructor(s,e,n){this._univerInstanceService=s,this._commandService=e,this._logService=n}whenReady(){return Promise.resolve(!0)}async syncMutation(s,e){return this._applyMutation(s.mutationInfo,e)}async createInstance(s){this._logService.debug(`[WebWorkerRemoteInstanceService]: Creating instance with id ${s.unitID}`);const{type:e,snapshot:n}=s;try{if(e===a.UniverInstanceType.UNIVER_SHEET)return this._univerInstanceService.createUnit(a.UniverInstanceType.UNIVER_SHEET,n),!0;throw new Error(`[WebWorkerRemoteInstanceService]: cannot create replica for document type: ${e}.`)}catch(t){throw t instanceof Error?t:new TypeError(`${t}`)}}async disposeInstance(s){return this._logService.debug(`[WebWorkerRemoteInstanceService]: Disposing instance with id ${s.unitID}`),this._univerInstanceService.disposeUnit(s.unitID)}_applyMutation(s,e){const{id:n,params:t}=s,{fromCollab:i,...o}=e||{};return this._commandService.syncExecuteCommand(n,t,{...o,onlyLocal:!0,fromSync:!0})}},r.WebWorkerRemoteInstanceService=j([g(0,a.IUniverInstanceService),g(1,a.ICommandService),g(2,a.ILogService)],r.WebWorkerRemoteInstanceService);function b(c){const s=c;return new class{call(e,n){const t=s[e];if(typeof t=="function"){let i=n?t.apply(s,n):t.call(s);return i instanceof Promise||(i=Promise.resolve(i)),i}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,n){const t=s[e];if(typeof t=="function"){const i=n?t.apply(s,n):t.call(s);return d.isObservable(i)?i:d.of(i)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function P(c){return new Proxy({},{get(s,e){if(e!=="dispose")return function(...n){return A(e)?c.subscribe(e,n):c.call(e,n)}}})}function A(c){return c.endsWith("$")}class N extends a.RxDisposable{constructor(e){super();h(this,"_initialized",new d.BehaviorSubject(!1));h(this,"_lastRequestCounter",0);h(this,"_pendingRequests",new Map);this._protocol=e,this._protocol.send({type:50}),this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(n=>this._onMessage(n))}dispose(){this._pendingRequests.clear()}getChannel(e){const n=this;return{call(t,i){return n._disposed?Promise.reject():n._remoteCall(e,t,i)},subscribe(t,i){if(n._disposed)throw new Error("[ChannelClient]: client is disposed!");return n._remoteSubscribe(e,t,i)}}}_whenReady(){return d.firstValueFrom(this._initialized.pipe(u.filter(e=>e),u.take(1)))}_remoteCall(e,n,t){return this._initialized.getValue()?this._doRemoteCall(e,n,t):this._whenReady().then(()=>this._doRemoteCall(e,n,t))}_doRemoteCall(e,n,t){const i=++this._lastRequestCounter,_={seq:i,type:100,channelName:e,method:n,args:t},l=this;return new Promise((M,T)=>{const y={handle(W){switch(W.type){case 201:l._pendingRequests.delete(i),M(W.data);break;case 202:l._pendingRequests.delete(i),T(W.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,y),this._sendRequest(_)})}_remoteSubscribe(e,n,t){return new d.Observable(i=>{let o=-1;const _=()=>{o=++this._lastRequestCounter;const M={seq:o,type:101,channelName:e,method:n,args:t},T={handle(y){switch(y.type){case 300:i.next(y.data);break;case 301:i.error(y.data);break;case 302:i.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(o,T),this._sendRequest(M)};return this._initialized.getValue()?_():this._whenReady().then(_),()=>{if(o===-1)return;const l={type:102,seq:o,channelName:e,method:n};this._sendRequest(l)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var i;const{type:n,seq:t}=e;switch(n){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:{const{_pendingRequests:o}=this;(i=o.get(t))==null||i.handle(e),n!==300&&o.delete(t);break}}}}class $ extends a.RxDisposable{constructor(e){super();h(this,"_channels",new Map);h(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(u.takeUntil(this.dispose$)).subscribe(n=>this._onRequest(n)),this._sendInitialize()}dispose(){super.dispose(),this._subscriptions.clear(),this._channels.clear()}registerChannel(e,n){this._channels.set(e,n)}_onRequest(e){switch(e.type){case 50:this._sendInitialize();break;case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_sendInitialize(){this._sendResponse({seq:-1,type:0})}_onMethodCall(e){const{channelName:n,method:t,args:i}=e,o=this._channels.get(n);let _;try{if(!o)throw new Error(`[ChannelServer]: Channel ${n} not found!`);_=i?o.call(t,i):o.call(t)}catch(l){_=Promise.reject(l)}_.then(l=>{this._sendResponse({seq:e.seq,type:201,data:l})}).catch(l=>{l instanceof Error?this._sendResponse({seq:e.seq,type:202,data:l.message}):this._sendResponse({seq:e.seq,type:202,data:String(l)})})}_onSubscribe(e){const{channelName:n,seq:t}=e,i=this._channels.get(n);try{if(!i)throw new Error(`[ChannelServer]: Channel ${n} not found!`);const _=i.subscribe(e.method,e.args).subscribe({next:l=>{this._sendResponse({seq:t,type:300,data:l})},error:l=>{this._sendResponse({seq:t,type:301,data:l.message}),this._sendResponse({seq:t,type:302})},complete:()=>{this._sendResponse({seq:t,type:302})}});this._subscriptions.set(e.seq,_)}catch(o){o instanceof Error?this._sendResponse({seq:e.seq,type:301,data:o.message}):this._sendResponse({seq:e.seq,type:301,data:String(o)})}}_onUnsubscribe(e){const n=this._subscriptions.get(e.seq);n&&(n.unsubscribe(),this._subscriptions.delete(e.seq))}_sendResponse(e){this._protocol.send(e)}}const p=a.createIdentifier("IRPCChannelService");class w{constructor(s){h(this,"_client");h(this,"_server");this._client=new N(s),this._server=new $(s)}dispose(){this._client.dispose(),this._server.dispose()}requestChannel(s){return this._client.getChannel(s)}registerChannel(s,e){this._server.registerChannel(s,e)}}var G=Object.getOwnPropertyDescriptor,V=(c,s,e,n)=>{for(var t=n>1?void 0:n?G(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},S=(c,s)=>(e,n)=>s(e,n,c);r.DataSyncPrimaryController=class extends a.RxDisposable{constructor(e,n,t,i,o){super();h(this,"_remoteInstanceService");h(this,"_syncingUnits",new Set);h(this,"_syncingMutations",new Set);this._injector=e,this._commandService=n,this._univerInstanceService=t,this._rpcChannelService=i,this._remoteSyncService=o,this._initRPCChannels(),this._init()}registerSyncingMutations(e){this._syncingMutations.add(e.id)}syncUnit(e){return this._syncingUnits.add(e),a.toDisposable(()=>this._syncingUnits.delete(e))}_initRPCChannels(){this._rpcChannelService.registerChannel(C,b(this._remoteSyncService)),this._injector.add([m,{useFactory:()=>P(this._rpcChannelService.requestChannel(f))}]),this._remoteInstanceService=this._injector.get(m)}_init(){this._univerInstanceService.getTypeOfUnitAdded$(a.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.add(e.getUnitId()),this._remoteInstanceService.createInstance({unitID:e.getUnitId(),type:a.UniverInstanceType.UNIVER_SHEET,snapshot:e.getSnapshot()})}),this._univerInstanceService.getTypeOfUnitDisposed$(a.UniverInstanceType.UNIVER_SHEET).pipe(u.takeUntil(this.dispose$)).subscribe(e=>{this._syncingUnits.delete(e.getUnitId()),this._remoteInstanceService.disposeInstance({unitID:e.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((e,n)=>{const{type:t,params:i,id:o}=e,_=(i==null?void 0:i.unitId)||"";t===a.CommandType.MUTATION&&(!_||this._syncingUnits.has(_))&&!(n!=null&&n.fromSync)&&this._syncingMutations.has(o)&&this._remoteInstanceService.syncMutation({mutationInfo:e},n)}))}},r.DataSyncPrimaryController=V([S(0,a.Inject(a.Injector)),S(1,a.ICommandService),S(2,a.IUniverInstanceService),S(3,p),S(4,v)],r.DataSyncPrimaryController);var F=Object.getOwnPropertyDescriptor,z=(c,s,e,n)=>{for(var t=n>1?void 0:n?F(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},R=(c,s)=>(e,n)=>s(e,n,c);r.DataSyncReplicaController=class extends a.Disposable{constructor(e,n,t,i){super();h(this,"_remoteSyncService");this._injector=e,this._remoteInstanceService=n,this._commandService=t,this._rpcChannelService=i,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(f,b(this._remoteInstanceService)),this._injector.add([v,{useFactory:()=>P(this._rpcChannelService.requestChannel(C))}]),this._remoteSyncService=this._injector.get(v)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((e,n)=>{e.type===a.CommandType.MUTATION&&!(n!=null&&n.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:e},n)}))}},r.DataSyncReplicaController=z([R(0,a.Inject(a.Injector)),R(1,m),R(2,a.ICommandService),R(3,p)],r.DataSyncReplicaController);function K(){return{send(c){postMessage(c)},onMessage:new d.Observable(c=>{const s=e=>{c.next(e.data)};return addEventListener("message",s),()=>removeEventListener("message",s)}).pipe(d.shareReplay(1))}}function Y(c){return{send(s){c.postMessage(s)},onMessage:new d.Observable(s=>{const e=n=>{s.next(n.data)};return c.addEventListener("message",e),()=>c.removeEventListener("message",e)}).pipe(d.shareReplay(1))}}var B=Object.getOwnPropertyDescriptor,L=(c,s,e,n)=>{for(var t=n>1?void 0:n?B(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},I=(c,s)=>(e,n)=>s(e,n,c);r.UniverRPCMainThreadPlugin=(U=class extends a.Plugin{constructor(e=D,n,t){super();h(this,"_internalWorker",null);this._config=e,this._injector=n,this._configService=t;const{...i}=a.merge({},D,this._config);this._configService.setConfig(k,i)}dispose(){super.dispose(),this._internalWorker&&(this._internalWorker.terminate(),this._internalWorker=null)}onStarting(){const{workerURL:e}=this._config;if(!e)throw new Error("[UniverRPCMainThreadPlugin]: The workerURL is required for the RPC main thread plugin.");const n=e instanceof Worker?e:new Worker(e);this._internalWorker=e instanceof Worker?null:n;const t=Y(n);[[p,{useFactory:()=>new w(t)}],[r.DataSyncPrimaryController],[v,{useClass:r.RemoteSyncPrimaryService}]].forEach(o=>this._injector.add(o)),this._injector.get(r.DataSyncPrimaryController)}},h(U,"pluginName","UNIVER_RPC_MAIN_THREAD_PLUGIN"),U),r.UniverRPCMainThreadPlugin=L([I(1,a.Inject(a.Injector)),I(2,a.IConfigService)],r.UniverRPCMainThreadPlugin),r.UniverRPCWorkerThreadPlugin=(E=class extends a.Plugin{constructor(s=O,e,n){super(),this._config=s,this._injector=e,this._configService=n;const{...t}=a.merge({},O,this._config);this._configService.setConfig(q,t)}onStarting(){[[r.DataSyncReplicaController],[p,{useFactory:()=>new w(K())}],[m,{useClass:r.WebWorkerRemoteInstanceService}]].forEach(s=>this._injector.add(s)),this._injector.get(r.DataSyncReplicaController)}},h(E,"pluginName","UNIVER_RPC_WORKER_THREAD_PLUGIN"),E),r.UniverRPCWorkerThreadPlugin=L([I(1,a.Inject(a.Injector)),I(2,a.IConfigService)],r.UniverRPCWorkerThreadPlugin),r.ChannelClient=N,r.ChannelServer=$,r.ChannelService=w,r.IRPCChannelService=p,r.IRemoteInstanceService=m,r.IRemoteSyncService=v,r.PLUGIN_CONFIG_KEY_MAIN_THREAD=k,r.PLUGIN_CONFIG_KEY_WORKER_THREAD=q,r.RemoteInstanceServiceName=f,r.RemoteSyncServiceName=C,r.fromModule=b,r.toModule=P,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/rpc",
-  "version": "0.15.5",
+  "version": "0.16.0",
   "private": false,
   "author": "DreamNum <developer@univer.ai>",
   "license": "Apache-2.0",
@@ -47,14 +47,14 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/core": "0.15.5"
+    "@univerjs/core": "0.16.0"
   },
   "devDependencies": {
     "rxjs": "^7.8.2",
     "typescript": "^5.9.3",
     "vite": "^7.3.1",
     "vitest": "^4.0.18",
-    "@univerjs-infra/shared": "0.15.5"
+    "@univerjs-infra/shared": "0.16.0"
   },
   "scripts": {
     "test": "vitest run",