@univerjs/rpc 0.16.1 → 0.17.0

package/lib/cjs/index.js

@@ -1 +1 @@
-"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;
+"use strict";var L=Object.defineProperty;var H=(i,n,e)=>n in i?L(i,n,{enumerable:!0,configurable:!0,writable:!0,value:e}):i[n]=e;var l=(i,n,e)=>H(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"),q="rpc.main-thread.config",T={},O="rpc.worker-thread.config",D={};var A=Object.getOwnPropertyDescriptor,j=(i,n,e,t)=>{for(var s=t>1?void 0:t?A(n,e):n,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},R=(i,n)=>(e,t)=>n(e,t,i);const b="rpc.remote-sync.service",S=o.createIdentifier(b);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=j([R(0,o.ICommandService)],exports.RemoteSyncPrimaryService);const P="univer.remote-instance-service",y=o.createIdentifier(P);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=j([R(0,o.IUniverInstanceService),R(1,o.ICommandService),R(2,o.ILogService)],exports.WebWorkerRemoteInstanceService);function M(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 k(i){return new Proxy({},{get(n,e){if(e!=="dispose")return function(...t){return G(e)?i.subscribe(e,t):i.call(e,t)}}})}function G(i){return i.endsWith("$")}class N 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){return{call:(t,s)=>this._disposed?Promise.reject(new Error("[ChannelClient]: client is disposed!")):this._remoteCall(e,t,s),subscribe:(t,s)=>{if(this._disposed)throw new Error("[ChannelClient]: client is disposed!");return this._remoteSubscribe(e,t,s)}}}_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._pendingRequests;return new Promise((w,E)=>{const d={handle(U){switch(U.type){case 201:a.delete(r),w(U.data);break;case 202:a.delete(r),E(U.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 w={seq:c,type:101,channelName:e,method:t,args:s},E={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,E),this._sendRequest(w)};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 $ 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 instanceof Error?a:new Error(String(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 g=o.createIdentifier("IRPCChannelService");class W{constructor(n){l(this,"_client");l(this,"_server");this._client=new N(n),this._server=new $(n)}dispose(){this._client.dispose(),this._server.dispose()}requestChannel(n){return this._client.getChannel(n)}registerChannel(n,e){this._server.registerChannel(n,e)}}var V=Object.getOwnPropertyDescriptor,F=(i,n,e,t)=>{for(var s=t>1?void 0:t?V(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(b,M(this._remoteSyncService)),this._injector.add([y,{useFactory:()=>k(this._rpcChannelService.requestChannel(P))}]),this._remoteInstanceService=this._injector.get(y)}_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=F([p(0,o.Inject(o.Injector)),p(1,o.ICommandService),p(2,o.IUniverInstanceService),p(3,g),p(4,S)],exports.DataSyncPrimaryController);var z=Object.getOwnPropertyDescriptor,K=(i,n,e,t)=>{for(var s=t>1?void 0:t?z(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);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(P,M(this._remoteInstanceService)),this._injector.add([S,{useFactory:()=>k(this._rpcChannelService.requestChannel(b))}]),this._remoteSyncService=this._injector.get(S)}_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=K([C(0,o.Inject(o.Injector)),C(1,y),C(2,o.ICommandService),C(3,g)],exports.DataSyncReplicaController);const Y="@univerjs/rpc",B="0.17.0",I={name:Y,version:B};function J(){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 Q(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 X=Object.getOwnPropertyDescriptor,x=(i,n,e,t)=>{for(var s=t>1?void 0:t?X(n,e):n,r=i.length-1,c;r>=0;r--)(c=i[r])&&(s=c(s)||s);return s},f=(i,n)=>(e,t)=>n(e,t,i),v;exports.UniverRPCMainThreadPlugin=(v=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(q,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=Q(t);[[g,{useFactory:()=>new W(s)}],[exports.DataSyncPrimaryController],[S,{useClass:exports.RemoteSyncPrimaryService}]].forEach(c=>this._injector.add(c)),this._injector.get(exports.DataSyncPrimaryController)}},l(v,"pluginName","UNIVER_RPC_MAIN_THREAD_PLUGIN"),l(v,"packageName",I.name),l(v,"version",I.version),v);exports.UniverRPCMainThreadPlugin=x([f(1,o.Inject(o.Injector)),f(2,o.IConfigService)],exports.UniverRPCMainThreadPlugin);var m;exports.UniverRPCWorkerThreadPlugin=(m=class extends o.Plugin{constructor(n=D,e,t){super(),this._config=n,this._injector=e,this._configService=t;const{...s}=o.merge({},D,this._config);this._configService.setConfig(O,s)}onStarting(){[[exports.DataSyncReplicaController],[g,{useFactory:()=>new W(J())}],[y,{useClass:exports.WebWorkerRemoteInstanceService}]].forEach(n=>this._injector.add(n)),this._injector.get(exports.DataSyncReplicaController)}},l(m,"pluginName","UNIVER_RPC_WORKER_THREAD_PLUGIN"),l(m,"packageName",I.name),l(m,"version",I.version),m);exports.UniverRPCWorkerThreadPlugin=x([f(1,o.Inject(o.Injector)),f(2,o.IConfigService)],exports.UniverRPCWorkerThreadPlugin);exports.ChannelClient=N;exports.ChannelServer=$;exports.ChannelService=W;exports.IRPCChannelService=g;exports.IRemoteInstanceService=y;exports.IRemoteSyncService=S;exports.PLUGIN_CONFIG_KEY_MAIN_THREAD=q;exports.PLUGIN_CONFIG_KEY_WORKER_THREAD=O;exports.RemoteInstanceServiceName=P;exports.RemoteSyncServiceName=b;exports.fromModule=M;exports.toModule=k;

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 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 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--)
+var Z = Object.defineProperty;
+var ee = (s, t, e) => t in s ? Z(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
+var a = (s, t, e) => ee(s, typeof t != "symbol" ? t + "" : t, e);
+import { createIdentifier as W, UniverInstanceType as p, ICommandService as I, IUniverInstanceService as V, ILogService as te, RxDisposable as T, Inject as w, Injector as E, toDisposable as ne, CommandType as A, Disposable as se, IConfigService as z, Plugin as F, merge as G } from "@univerjs/core";
+import { takeUntil as g, filter as re, take as ie } from "rxjs/operators";
+import { BehaviorSubject as oe, firstValueFrom as ce, Observable as D, isObservable as ae, of as he, shareReplay as Y } from "rxjs";
+const le = "rpc.main-thread.config", N = {}, _e = "rpc.worker-thread.config", x = {};
+var ue = Object.getOwnPropertyDescriptor, B = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ue(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 D = "rpc.remote-sync.service", g = O(D);
-let q = class {
+}, m = (s, t) => (e, n) => t(e, n, s);
+const $ = "rpc.remote-sync.service", f = W($);
+let k = class {
   constructor(s) {
     this._commandService = s;
   }
@@ -24,11 +24,11 @@ let q = class {
     });
   }
 };
-q = Y([
-  p(0, b)
-], q);
-const $ = "univer.remote-instance-service", m = O($);
-let k = class {
+k = B([
+  m(0, I)
+], k);
+const j = "univer.remote-instance-service", y = W(j);
+let O = class {
   constructor(s, t, e) {
     this._univerInstanceService = s, this._commandService = t, this._logService = e;
   }
@@ -42,8 +42,8 @@ let k = class {
     this._logService.debug(`[WebWorkerRemoteInstanceService]: Creating instance with id ${s.unitID}`);
     const { type: t, snapshot: e } = s;
     try {
-      if (t === u.UNIVER_SHEET)
-        return this._univerInstanceService.createUnit(u.UNIVER_SHEET, e), !0;
+      if (t === p.UNIVER_SHEET)
+        return this._univerInstanceService.createUnit(p.UNIVER_SHEET, e), !0;
       throw new Error(
         `[WebWorkerRemoteInstanceService]: cannot create replica for document type: ${t}.`
       );
@@ -63,12 +63,12 @@ let k = class {
     });
   }
 };
-k = Y([
-  p(0, H),
-  p(1, b),
-  p(2, ee)
-], k);
-function B(s) {
+O = B([
+  m(0, V),
+  m(1, I),
+  m(2, te)
+], O);
+function K(s) {
   const t = s;
   return new class {
     call(e, n) {
@@ -83,57 +83,54 @@ function B(s) {
       const r = t[e];
       if (typeof r == "function") {
         const i = n ? r.apply(t, n) : r.call(t);
-        return ce(i) ? i : ae(i);
+        return ae(i) ? i : he(i);
       }
       throw new Error(`[RPC]: observable method not found for ${e}!`);
     }
   }();
 }
-function K(s) {
+function J(s) {
   return new Proxy({}, {
     get(t, e) {
       if (e !== "dispose")
         return function(...n) {
-          return ue(e) ? s.subscribe(e, n) : s.call(e, n);
+          return de(e) ? s.subscribe(e, n) : s.call(e, n);
         };
     }
   });
 }
-function ue(s) {
+function de(s) {
   return s.endsWith("$");
 }
-class de extends W {
+class pe extends T {
   constructor(e) {
     super();
-    a(this, "_initialized", new ie(!1));
+    a(this, "_initialized", new oe(!1));
     a(this, "_lastRequestCounter", 0);
     a(this, "_pendingRequests", /* @__PURE__ */ new Map());
     this._protocol = e, this._protocol.send({
       type: 50
       /* REQUEST_INITIALIZATION */
-    }), this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((n) => this._onMessage(n));
+    }), this._protocol.onMessage.pipe(g(this.dispose$)).subscribe((n) => this._onMessage(n));
   }
   dispose() {
     this._pendingRequests.clear();
   }
   getChannel(e) {
-    const n = this;
     return {
-      call(r, i) {
-        return n._disposed ? Promise.reject() : n._remoteCall(e, r, i);
-      },
-      subscribe(r, i) {
-        if (n._disposed)
+      call: (n, r) => this._disposed ? Promise.reject(new Error("[ChannelClient]: client is disposed!")) : this._remoteCall(e, n, r),
+      subscribe: (n, r) => {
+        if (this._disposed)
           throw new Error("[ChannelClient]: client is disposed!");
-        return n._remoteSubscribe(e, r, i);
+        return this._remoteSubscribe(e, n, r);
       }
     };
   }
   _whenReady() {
-    return oe(
+    return ce(
       this._initialized.pipe(
-        se((e) => e),
-        re(1)
+        re((e) => e),
+        ie(1)
       )
     );
   }
@@ -141,16 +138,16 @@ class de extends W {
     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 i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, c = this._pendingRequests;
+    return new Promise((U, M) => {
       const l = {
-        handle(P) {
-          switch (P.type) {
+        handle(q) {
+          switch (q.type) {
             case 201:
-              c._pendingRequests.delete(i), w(P.data);
+              c.delete(i), U(q.data);
               break;
             case 202:
-              c._pendingRequests.delete(i), E(P.data);
+              c.delete(i), M(q.data);
               break;
             default:
               throw new Error("[ChannelClient]: unknown response type!");
@@ -161,11 +158,11 @@ class de extends W {
     });
   }
   _remoteSubscribe(e, n, r) {
-    return new T((i) => {
+    return new D((i) => {
       let o = -1;
       const h = () => {
         o = ++this._lastRequestCounter;
-        const w = { seq: o, type: 101, channelName: e, method: n, args: r }, E = {
+        const U = { seq: o, type: 101, channelName: e, method: n, args: r }, M = {
           handle(l) {
             switch (l.type) {
               case 300:
@@ -182,7 +179,7 @@ class de extends W {
             }
           }
         };
-        this._pendingRequests.set(o, E), this._sendRequest(w);
+        this._pendingRequests.set(o, M), this._sendRequest(U);
       };
       return this._initialized.getValue() ? h() : this._whenReady().then(h), () => {
         if (o === -1)
@@ -219,12 +216,12 @@ class de extends W {
     }
   }
 }
-class pe extends W {
+class ve extends T {
   constructor(e) {
     super();
     a(this, "_channels", /* @__PURE__ */ new Map());
     a(this, "_subscriptions", /* @__PURE__ */ new Map());
-    this._protocol = e, this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((n) => this._onRequest(n)), this._sendInitialize();
+    this._protocol = e, this._protocol.onMessage.pipe(g(this.dispose$)).subscribe((n) => this._onRequest(n)), this._sendInitialize();
   }
   dispose() {
     super.dispose(), this._subscriptions.clear(), this._channels.clear();
@@ -263,7 +260,7 @@ class pe extends W {
         throw new Error(`[ChannelServer]: Channel ${n} not found!`);
       h = i ? o.call(r, i) : o.call(r);
     } catch (c) {
-      h = Promise.reject(c);
+      h = Promise.reject(c instanceof Error ? c : new Error(String(c)));
     }
     h.then((c) => {
       this._sendResponse({ seq: e.seq, type: 201, data: c });
@@ -308,12 +305,12 @@ class pe extends W {
     this._protocol.send(e);
   }
 }
-const I = O("IRPCChannelService");
-class J {
+const P = W("IRPCChannelService");
+class Q {
   constructor(t) {
     a(this, "_client");
     a(this, "_server");
-    this._client = new de(t), this._server = new pe(t);
+    this._client = new pe(t), this._server = new ve(t);
   }
   dispose() {
     this._client.dispose(), this._server.dispose();
@@ -325,12 +322,12 @@ class J {
     this._server.registerChannel(t, e);
   }
 }
-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, o; i >= 0; i--)
+var me = Object.getOwnPropertyDescriptor, ge = (s, t, e, n) => {
+  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;
 }, _ = (s, t) => (e, n) => t(e, n, s);
-let f = class extends W {
+let S = class extends T {
   constructor(t, e, n, r, i) {
     super();
     a(this, "_remoteInstanceService");
@@ -346,117 +343,123 @@ let f = class extends W {
    * sync other types of documents, you should manually call this method with that document's id.
    */
   syncUnit(t) {
-    return this._syncingUnits.add(t), te(() => this._syncingUnits.delete(t));
+    return this._syncingUnits.add(t), ne(() => this._syncingUnits.delete(t));
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(D, B(this._remoteSyncService)), this._injector.add([
-      m,
-      { useFactory: () => K(this._rpcChannelService.requestChannel($)) }
-    ]), this._remoteInstanceService = this._injector.get(m);
+    this._rpcChannelService.registerChannel($, K(this._remoteSyncService)), this._injector.add([
+      y,
+      // eslint-disable-next-line react/no-unnecessary-use-prefix
+      { useFactory: () => J(this._rpcChannelService.requestChannel(j)) }
+    ]), this._remoteInstanceService = this._injector.get(y);
   }
   _init() {
-    this._univerInstanceService.getTypeOfUnitAdded$(u.UNIVER_SHEET).pipe(v(this.dispose$)).subscribe((t) => {
+    this._univerInstanceService.getTypeOfUnitAdded$(p.UNIVER_SHEET).pipe(g(this.dispose$)).subscribe((t) => {
       this._syncingUnits.add(t.getUnitId()), this._remoteInstanceService.createInstance({
         unitID: t.getUnitId(),
-        type: u.UNIVER_SHEET,
+        type: p.UNIVER_SHEET,
         snapshot: t.getSnapshot()
       });
-    }), this._univerInstanceService.getTypeOfUnitDisposed$(u.UNIVER_SHEET).pipe(v(this.dispose$)).subscribe((t) => {
+    }), this._univerInstanceService.getTypeOfUnitDisposed$(p.UNIVER_SHEET).pipe(g(this.dispose$)).subscribe((t) => {
       this._syncingUnits.delete(t.getUnitId()), this._remoteInstanceService.disposeInstance({
         unitID: t.getUnitId()
       });
     }), this.disposeWithMe(this._commandService.onCommandExecuted((t, e) => {
       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
+      n === A.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);
     }));
   }
 };
-f = ge([
-  _(0, C(R)),
-  _(1, b),
-  _(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, o; i >= 0; i--)
+S = ge([
+  _(0, w(E)),
+  _(1, I),
+  _(2, V),
+  _(3, P),
+  _(4, f)
+], S);
+var fe = Object.getOwnPropertyDescriptor, ye = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? fe(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 {
+}, v = (s, t) => (e, n) => t(e, n, s);
+let C = class extends se {
   constructor(t, e, n, r) {
     super();
     a(this, "_remoteSyncService");
     this._injector = t, this._remoteInstanceService = e, this._commandService = n, this._rpcChannelService = r, this._initRPCChannels(), this._init();
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel($, B(this._remoteInstanceService)), this._injector.add([
-      g,
-      { useFactory: () => K(this._rpcChannelService.requestChannel(D)) }
-    ]), this._remoteSyncService = this._injector.get(g);
+    this._rpcChannelService.registerChannel(j, K(this._remoteInstanceService)), this._injector.add([
+      f,
+      // eslint-disable-next-line react/no-unnecessary-use-prefix
+      { useFactory: () => J(this._rpcChannelService.requestChannel($)) }
+    ]), this._remoteSyncService = this._injector.get(f);
   }
   _init() {
     this.disposeWithMe(
       // Mutations executed on the main thread should be synced to the worker thread.
       this._commandService.onCommandExecuted((t, e) => {
-        t.type === V.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
+        t.type === A.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
           mutationInfo: t
         }, e);
       })
     );
   }
 };
-y = fe([
-  d(0, C(R)),
-  d(1, m),
-  d(2, b),
-  d(3, I)
-], y);
-function ye() {
+C = ye([
+  v(0, w(E)),
+  v(1, y),
+  v(2, I),
+  v(3, P)
+], C);
+const Se = "@univerjs/rpc", Ce = "0.17.0", b = {
+  name: Se,
+  version: Ce
+};
+function be() {
   return {
     send(s) {
       postMessage(s);
     },
-    onMessage: new T((s) => {
+    onMessage: new D((s) => {
       const t = (e) => {
         s.next(e.data);
       };
       return addEventListener("message", t), () => removeEventListener("message", t);
-    }).pipe(G(1))
+    }).pipe(Y(1))
   };
 }
-function Se(s) {
+function Re(s) {
   return {
     send(t) {
       s.postMessage(t);
     },
-    onMessage: new T((t) => {
+    onMessage: new D((t) => {
       const e = (n) => {
         t.next(n.data);
       };
       return s.addEventListener("message", e), () => s.removeEventListener("message", e);
-    }).pipe(G(1))
+    }).pipe(Y(1))
   };
 }
-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--)
+var Ie = Object.getOwnPropertyDescriptor, X = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ie(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), U;
-let x = (U = class extends z {
-  constructor(t = j, e, n) {
+}, R = (s, t) => (e, n) => t(e, n, s), u;
+let L = (u = class extends F {
+  constructor(t = N, e, n) {
     super();
     a(this, "_internalWorker", null);
     this._config = t, this._injector = e, this._configService = n;
-    const { ...r } = F(
+    const { ...r } = G(
       {},
-      j,
+      N,
       this._config
     );
-    this._configService.setConfig(he, r);
+    this._configService.setConfig(le, r);
   }
   dispose() {
     super.dispose(), this._internalWorker && (this._internalWorker.terminate(), this._internalWorker = null);
@@ -467,68 +470,70 @@ let x = (U = class extends z {
       throw new Error("[UniverRPCMainThreadPlugin]: The workerURL is required for the RPC main thread plugin.");
     const e = t instanceof Worker ? t : new Worker(t);
     this._internalWorker = t instanceof Worker ? null : e;
-    const n = Se(e);
+    const n = Re(e);
     [
       [
-        I,
+        P,
         {
-          useFactory: () => new J(n)
+          // eslint-disable-next-line react/no-unnecessary-use-prefix
+          useFactory: () => new Q(n)
         }
       ],
-      [f],
-      [g, { useClass: q }]
-    ].forEach((i) => this._injector.add(i)), this._injector.get(f);
-  }
-}, a(U, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), U);
-x = Q([
-  S(1, C(R)),
-  S(2, A)
-], x);
-var M;
-let L = (M = class extends z {
-  constructor(s = N, t, e) {
+      [S],
+      [f, { useClass: k }]
+    ].forEach((i) => this._injector.add(i)), this._injector.get(S);
+  }
+}, a(u, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), a(u, "packageName", b.name), a(u, "version", b.version), u);
+L = X([
+  R(1, w(E)),
+  R(2, z)
+], L);
+var d;
+let H = (d = class extends F {
+  constructor(s = x, t, e) {
     super(), this._config = s, this._injector = t, this._configService = e;
-    const { ...n } = F(
+    const { ...n } = G(
       {},
-      N,
+      x,
       this._config
     );
-    this._configService.setConfig(le, n);
+    this._configService.setConfig(_e, n);
   }
   onStarting() {
     [
-      [y],
+      [C],
       [
-        I,
+        P,
         {
-          useFactory: () => new J(ye())
+          // eslint-disable-next-line react/no-unnecessary-use-prefix
+          useFactory: () => new Q(be())
         }
       ],
-      [m, { useClass: k }]
-    ].forEach((s) => this._injector.add(s)), this._injector.get(y);
-  }
-}, a(M, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), M);
-L = Q([
-  S(1, C(R)),
-  S(2, A)
-], L);
+      [y, { useClass: O }]
+    ].forEach((s) => this._injector.add(s)), this._injector.get(C);
+  }
+}, a(d, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), a(d, "packageName", b.name), a(d, "version", b.version), d);
+H = X([
+  R(1, w(E)),
+  R(2, z)
+], H);
 export {
-  de as ChannelClient,
-  pe as ChannelServer,
-  J as ChannelService,
-  f as DataSyncPrimaryController,
-  y as DataSyncReplicaController,
-  I as IRPCChannelService,
-  m as IRemoteInstanceService,
-  g as IRemoteSyncService,
-  he as PLUGIN_CONFIG_KEY_MAIN_THREAD,
-  le as PLUGIN_CONFIG_KEY_WORKER_THREAD,
-  $ as RemoteInstanceServiceName,
-  q as RemoteSyncPrimaryService,
-  D as RemoteSyncServiceName,
-  x as UniverRPCMainThreadPlugin,
-  L as UniverRPCWorkerThreadPlugin,
-  k as WebWorkerRemoteInstanceService,
-  B as fromModule,
-  K as toModule
+  pe as ChannelClient,
+  ve as ChannelServer,
+  Q as ChannelService,
+  S as DataSyncPrimaryController,
+  C as DataSyncReplicaController,
+  P as IRPCChannelService,
+  y as IRemoteInstanceService,
+  f as IRemoteSyncService,
+  le as PLUGIN_CONFIG_KEY_MAIN_THREAD,
+  _e as PLUGIN_CONFIG_KEY_WORKER_THREAD,
+  j as RemoteInstanceServiceName,
+  k as RemoteSyncPrimaryService,
+  $ as RemoteSyncServiceName,
+  L as UniverRPCMainThreadPlugin,
+  H as UniverRPCWorkerThreadPlugin,
+  O as WebWorkerRemoteInstanceService,
+  K as fromModule,
+  J 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 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 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--)
+var Z = Object.defineProperty;
+var ee = (s, t, e) => t in s ? Z(s, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : s[t] = e;
+var a = (s, t, e) => ee(s, typeof t != "symbol" ? t + "" : t, e);
+import { createIdentifier as W, UniverInstanceType as p, ICommandService as I, IUniverInstanceService as V, ILogService as te, RxDisposable as T, Inject as w, Injector as E, toDisposable as ne, CommandType as A, Disposable as se, IConfigService as z, Plugin as F, merge as G } from "@univerjs/core";
+import { takeUntil as g, filter as re, take as ie } from "rxjs/operators";
+import { BehaviorSubject as oe, firstValueFrom as ce, Observable as D, isObservable as ae, of as he, shareReplay as Y } from "rxjs";
+const le = "rpc.main-thread.config", N = {}, _e = "rpc.worker-thread.config", x = {};
+var ue = Object.getOwnPropertyDescriptor, B = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ue(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 D = "rpc.remote-sync.service", g = O(D);
-let q = class {
+}, m = (s, t) => (e, n) => t(e, n, s);
+const $ = "rpc.remote-sync.service", f = W($);
+let k = class {
   constructor(s) {
     this._commandService = s;
   }
@@ -24,11 +24,11 @@ let q = class {
     });
   }
 };
-q = Y([
-  p(0, b)
-], q);
-const $ = "univer.remote-instance-service", m = O($);
-let k = class {
+k = B([
+  m(0, I)
+], k);
+const j = "univer.remote-instance-service", y = W(j);
+let O = class {
   constructor(s, t, e) {
     this._univerInstanceService = s, this._commandService = t, this._logService = e;
   }
@@ -42,8 +42,8 @@ let k = class {
     this._logService.debug(`[WebWorkerRemoteInstanceService]: Creating instance with id ${s.unitID}`);
     const { type: t, snapshot: e } = s;
     try {
-      if (t === u.UNIVER_SHEET)
-        return this._univerInstanceService.createUnit(u.UNIVER_SHEET, e), !0;
+      if (t === p.UNIVER_SHEET)
+        return this._univerInstanceService.createUnit(p.UNIVER_SHEET, e), !0;
       throw new Error(
         `[WebWorkerRemoteInstanceService]: cannot create replica for document type: ${t}.`
       );
@@ -63,12 +63,12 @@ let k = class {
     });
   }
 };
-k = Y([
-  p(0, H),
-  p(1, b),
-  p(2, ee)
-], k);
-function B(s) {
+O = B([
+  m(0, V),
+  m(1, I),
+  m(2, te)
+], O);
+function K(s) {
   const t = s;
   return new class {
     call(e, n) {
@@ -83,57 +83,54 @@ function B(s) {
       const r = t[e];
       if (typeof r == "function") {
         const i = n ? r.apply(t, n) : r.call(t);
-        return ce(i) ? i : ae(i);
+        return ae(i) ? i : he(i);
       }
       throw new Error(`[RPC]: observable method not found for ${e}!`);
     }
   }();
 }
-function K(s) {
+function J(s) {
   return new Proxy({}, {
     get(t, e) {
       if (e !== "dispose")
         return function(...n) {
-          return ue(e) ? s.subscribe(e, n) : s.call(e, n);
+          return de(e) ? s.subscribe(e, n) : s.call(e, n);
         };
     }
   });
 }
-function ue(s) {
+function de(s) {
   return s.endsWith("$");
 }
-class de extends W {
+class pe extends T {
   constructor(e) {
     super();
-    a(this, "_initialized", new ie(!1));
+    a(this, "_initialized", new oe(!1));
     a(this, "_lastRequestCounter", 0);
     a(this, "_pendingRequests", /* @__PURE__ */ new Map());
     this._protocol = e, this._protocol.send({
       type: 50
       /* REQUEST_INITIALIZATION */
-    }), this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((n) => this._onMessage(n));
+    }), this._protocol.onMessage.pipe(g(this.dispose$)).subscribe((n) => this._onMessage(n));
   }
   dispose() {
     this._pendingRequests.clear();
   }
   getChannel(e) {
-    const n = this;
     return {
-      call(r, i) {
-        return n._disposed ? Promise.reject() : n._remoteCall(e, r, i);
-      },
-      subscribe(r, i) {
-        if (n._disposed)
+      call: (n, r) => this._disposed ? Promise.reject(new Error("[ChannelClient]: client is disposed!")) : this._remoteCall(e, n, r),
+      subscribe: (n, r) => {
+        if (this._disposed)
           throw new Error("[ChannelClient]: client is disposed!");
-        return n._remoteSubscribe(e, r, i);
+        return this._remoteSubscribe(e, n, r);
       }
     };
   }
   _whenReady() {
-    return oe(
+    return ce(
       this._initialized.pipe(
-        se((e) => e),
-        re(1)
+        re((e) => e),
+        ie(1)
       )
     );
   }
@@ -141,16 +138,16 @@ class de extends W {
     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 i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, c = this._pendingRequests;
+    return new Promise((U, M) => {
       const l = {
-        handle(P) {
-          switch (P.type) {
+        handle(q) {
+          switch (q.type) {
             case 201:
-              c._pendingRequests.delete(i), w(P.data);
+              c.delete(i), U(q.data);
               break;
             case 202:
-              c._pendingRequests.delete(i), E(P.data);
+              c.delete(i), M(q.data);
               break;
             default:
               throw new Error("[ChannelClient]: unknown response type!");
@@ -161,11 +158,11 @@ class de extends W {
     });
   }
   _remoteSubscribe(e, n, r) {
-    return new T((i) => {
+    return new D((i) => {
       let o = -1;
       const h = () => {
         o = ++this._lastRequestCounter;
-        const w = { seq: o, type: 101, channelName: e, method: n, args: r }, E = {
+        const U = { seq: o, type: 101, channelName: e, method: n, args: r }, M = {
           handle(l) {
             switch (l.type) {
               case 300:
@@ -182,7 +179,7 @@ class de extends W {
             }
           }
         };
-        this._pendingRequests.set(o, E), this._sendRequest(w);
+        this._pendingRequests.set(o, M), this._sendRequest(U);
       };
       return this._initialized.getValue() ? h() : this._whenReady().then(h), () => {
         if (o === -1)
@@ -219,12 +216,12 @@ class de extends W {
     }
   }
 }
-class pe extends W {
+class ve extends T {
   constructor(e) {
     super();
     a(this, "_channels", /* @__PURE__ */ new Map());
     a(this, "_subscriptions", /* @__PURE__ */ new Map());
-    this._protocol = e, this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((n) => this._onRequest(n)), this._sendInitialize();
+    this._protocol = e, this._protocol.onMessage.pipe(g(this.dispose$)).subscribe((n) => this._onRequest(n)), this._sendInitialize();
   }
   dispose() {
     super.dispose(), this._subscriptions.clear(), this._channels.clear();
@@ -263,7 +260,7 @@ class pe extends W {
         throw new Error(`[ChannelServer]: Channel ${n} not found!`);
       h = i ? o.call(r, i) : o.call(r);
     } catch (c) {
-      h = Promise.reject(c);
+      h = Promise.reject(c instanceof Error ? c : new Error(String(c)));
     }
     h.then((c) => {
       this._sendResponse({ seq: e.seq, type: 201, data: c });
@@ -308,12 +305,12 @@ class pe extends W {
     this._protocol.send(e);
   }
 }
-const I = O("IRPCChannelService");
-class J {
+const P = W("IRPCChannelService");
+class Q {
   constructor(t) {
     a(this, "_client");
     a(this, "_server");
-    this._client = new de(t), this._server = new pe(t);
+    this._client = new pe(t), this._server = new ve(t);
   }
   dispose() {
     this._client.dispose(), this._server.dispose();
@@ -325,12 +322,12 @@ class J {
     this._server.registerChannel(t, e);
   }
 }
-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, o; i >= 0; i--)
+var me = Object.getOwnPropertyDescriptor, ge = (s, t, e, n) => {
+  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;
 }, _ = (s, t) => (e, n) => t(e, n, s);
-let f = class extends W {
+let S = class extends T {
   constructor(t, e, n, r, i) {
     super();
     a(this, "_remoteInstanceService");
@@ -346,117 +343,123 @@ let f = class extends W {
    * sync other types of documents, you should manually call this method with that document's id.
    */
   syncUnit(t) {
-    return this._syncingUnits.add(t), te(() => this._syncingUnits.delete(t));
+    return this._syncingUnits.add(t), ne(() => this._syncingUnits.delete(t));
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(D, B(this._remoteSyncService)), this._injector.add([
-      m,
-      { useFactory: () => K(this._rpcChannelService.requestChannel($)) }
-    ]), this._remoteInstanceService = this._injector.get(m);
+    this._rpcChannelService.registerChannel($, K(this._remoteSyncService)), this._injector.add([
+      y,
+      // eslint-disable-next-line react/no-unnecessary-use-prefix
+      { useFactory: () => J(this._rpcChannelService.requestChannel(j)) }
+    ]), this._remoteInstanceService = this._injector.get(y);
   }
   _init() {
-    this._univerInstanceService.getTypeOfUnitAdded$(u.UNIVER_SHEET).pipe(v(this.dispose$)).subscribe((t) => {
+    this._univerInstanceService.getTypeOfUnitAdded$(p.UNIVER_SHEET).pipe(g(this.dispose$)).subscribe((t) => {
       this._syncingUnits.add(t.getUnitId()), this._remoteInstanceService.createInstance({
         unitID: t.getUnitId(),
-        type: u.UNIVER_SHEET,
+        type: p.UNIVER_SHEET,
         snapshot: t.getSnapshot()
       });
-    }), this._univerInstanceService.getTypeOfUnitDisposed$(u.UNIVER_SHEET).pipe(v(this.dispose$)).subscribe((t) => {
+    }), this._univerInstanceService.getTypeOfUnitDisposed$(p.UNIVER_SHEET).pipe(g(this.dispose$)).subscribe((t) => {
       this._syncingUnits.delete(t.getUnitId()), this._remoteInstanceService.disposeInstance({
         unitID: t.getUnitId()
       });
     }), this.disposeWithMe(this._commandService.onCommandExecuted((t, e) => {
       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
+      n === A.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);
     }));
   }
 };
-f = ge([
-  _(0, C(R)),
-  _(1, b),
-  _(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, o; i >= 0; i--)
+S = ge([
+  _(0, w(E)),
+  _(1, I),
+  _(2, V),
+  _(3, P),
+  _(4, f)
+], S);
+var fe = Object.getOwnPropertyDescriptor, ye = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? fe(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 {
+}, v = (s, t) => (e, n) => t(e, n, s);
+let C = class extends se {
   constructor(t, e, n, r) {
     super();
     a(this, "_remoteSyncService");
     this._injector = t, this._remoteInstanceService = e, this._commandService = n, this._rpcChannelService = r, this._initRPCChannels(), this._init();
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel($, B(this._remoteInstanceService)), this._injector.add([
-      g,
-      { useFactory: () => K(this._rpcChannelService.requestChannel(D)) }
-    ]), this._remoteSyncService = this._injector.get(g);
+    this._rpcChannelService.registerChannel(j, K(this._remoteInstanceService)), this._injector.add([
+      f,
+      // eslint-disable-next-line react/no-unnecessary-use-prefix
+      { useFactory: () => J(this._rpcChannelService.requestChannel($)) }
+    ]), this._remoteSyncService = this._injector.get(f);
   }
   _init() {
     this.disposeWithMe(
       // Mutations executed on the main thread should be synced to the worker thread.
       this._commandService.onCommandExecuted((t, e) => {
-        t.type === V.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
+        t.type === A.MUTATION && !(e != null && e.fromSync) && this._remoteSyncService.syncMutation({
           mutationInfo: t
         }, e);
       })
     );
   }
 };
-y = fe([
-  d(0, C(R)),
-  d(1, m),
-  d(2, b),
-  d(3, I)
-], y);
-function ye() {
+C = ye([
+  v(0, w(E)),
+  v(1, y),
+  v(2, I),
+  v(3, P)
+], C);
+const Se = "@univerjs/rpc", Ce = "0.17.0", b = {
+  name: Se,
+  version: Ce
+};
+function be() {
   return {
     send(s) {
       postMessage(s);
     },
-    onMessage: new T((s) => {
+    onMessage: new D((s) => {
       const t = (e) => {
         s.next(e.data);
       };
       return addEventListener("message", t), () => removeEventListener("message", t);
-    }).pipe(G(1))
+    }).pipe(Y(1))
   };
 }
-function Se(s) {
+function Re(s) {
   return {
     send(t) {
       s.postMessage(t);
     },
-    onMessage: new T((t) => {
+    onMessage: new D((t) => {
       const e = (n) => {
         t.next(n.data);
       };
       return s.addEventListener("message", e), () => s.removeEventListener("message", e);
-    }).pipe(G(1))
+    }).pipe(Y(1))
   };
 }
-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--)
+var Ie = Object.getOwnPropertyDescriptor, X = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? Ie(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), U;
-let x = (U = class extends z {
-  constructor(t = j, e, n) {
+}, R = (s, t) => (e, n) => t(e, n, s), u;
+let L = (u = class extends F {
+  constructor(t = N, e, n) {
     super();
     a(this, "_internalWorker", null);
     this._config = t, this._injector = e, this._configService = n;
-    const { ...r } = F(
+    const { ...r } = G(
       {},
-      j,
+      N,
       this._config
     );
-    this._configService.setConfig(he, r);
+    this._configService.setConfig(le, r);
   }
   dispose() {
     super.dispose(), this._internalWorker && (this._internalWorker.terminate(), this._internalWorker = null);
@@ -467,68 +470,70 @@ let x = (U = class extends z {
       throw new Error("[UniverRPCMainThreadPlugin]: The workerURL is required for the RPC main thread plugin.");
     const e = t instanceof Worker ? t : new Worker(t);
     this._internalWorker = t instanceof Worker ? null : e;
-    const n = Se(e);
+    const n = Re(e);
     [
       [
-        I,
+        P,
         {
-          useFactory: () => new J(n)
+          // eslint-disable-next-line react/no-unnecessary-use-prefix
+          useFactory: () => new Q(n)
         }
       ],
-      [f],
-      [g, { useClass: q }]
-    ].forEach((i) => this._injector.add(i)), this._injector.get(f);
-  }
-}, a(U, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), U);
-x = Q([
-  S(1, C(R)),
-  S(2, A)
-], x);
-var M;
-let L = (M = class extends z {
-  constructor(s = N, t, e) {
+      [S],
+      [f, { useClass: k }]
+    ].forEach((i) => this._injector.add(i)), this._injector.get(S);
+  }
+}, a(u, "pluginName", "UNIVER_RPC_MAIN_THREAD_PLUGIN"), a(u, "packageName", b.name), a(u, "version", b.version), u);
+L = X([
+  R(1, w(E)),
+  R(2, z)
+], L);
+var d;
+let H = (d = class extends F {
+  constructor(s = x, t, e) {
     super(), this._config = s, this._injector = t, this._configService = e;
-    const { ...n } = F(
+    const { ...n } = G(
       {},
-      N,
+      x,
       this._config
     );
-    this._configService.setConfig(le, n);
+    this._configService.setConfig(_e, n);
   }
   onStarting() {
     [
-      [y],
+      [C],
       [
-        I,
+        P,
         {
-          useFactory: () => new J(ye())
+          // eslint-disable-next-line react/no-unnecessary-use-prefix
+          useFactory: () => new Q(be())
         }
       ],
-      [m, { useClass: k }]
-    ].forEach((s) => this._injector.add(s)), this._injector.get(y);
-  }
-}, a(M, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), M);
-L = Q([
-  S(1, C(R)),
-  S(2, A)
-], L);
+      [y, { useClass: O }]
+    ].forEach((s) => this._injector.add(s)), this._injector.get(C);
+  }
+}, a(d, "pluginName", "UNIVER_RPC_WORKER_THREAD_PLUGIN"), a(d, "packageName", b.name), a(d, "version", b.version), d);
+H = X([
+  R(1, w(E)),
+  R(2, z)
+], H);
 export {
-  de as ChannelClient,
-  pe as ChannelServer,
-  J as ChannelService,
-  f as DataSyncPrimaryController,
-  y as DataSyncReplicaController,
-  I as IRPCChannelService,
-  m as IRemoteInstanceService,
-  g as IRemoteSyncService,
-  he as PLUGIN_CONFIG_KEY_MAIN_THREAD,
-  le as PLUGIN_CONFIG_KEY_WORKER_THREAD,
-  $ as RemoteInstanceServiceName,
-  q as RemoteSyncPrimaryService,
-  D as RemoteSyncServiceName,
-  x as UniverRPCMainThreadPlugin,
-  L as UniverRPCWorkerThreadPlugin,
-  k as WebWorkerRemoteInstanceService,
-  B as fromModule,
-  K as toModule
+  pe as ChannelClient,
+  ve as ChannelServer,
+  Q as ChannelService,
+  S as DataSyncPrimaryController,
+  C as DataSyncReplicaController,
+  P as IRPCChannelService,
+  y as IRemoteInstanceService,
+  f as IRemoteSyncService,
+  le as PLUGIN_CONFIG_KEY_MAIN_THREAD,
+  _e as PLUGIN_CONFIG_KEY_WORKER_THREAD,
+  j as RemoteInstanceServiceName,
+  k as RemoteSyncPrimaryService,
+  $ as RemoteSyncServiceName,
+  L as UniverRPCMainThreadPlugin,
+  H as UniverRPCWorkerThreadPlugin,
+  O as WebWorkerRemoteInstanceService,
+  K as fromModule,
+  J as toModule
 };

package/lib/types/index.d.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export type { IUniverRPCMainThreadConfig, IUniverRPCWorkerThreadConfig } from './controllers/config.schema';
-export { PLUGIN_CONFIG_KEY_MAIN_THREAD, PLUGIN_CONFIG_KEY_WORKER_THREAD } from './controllers/config.schema';
+export type { IUniverRPCMainThreadConfig, IUniverRPCWorkerThreadConfig } from './config/config';
+export { PLUGIN_CONFIG_KEY_MAIN_THREAD, PLUGIN_CONFIG_KEY_WORKER_THREAD } from './config/config';
 export { DataSyncPrimaryController } from './controllers/data-sync/data-sync-primary.controller';
 export { DataSyncReplicaController } from './controllers/data-sync/data-sync-replica.controller';
 export { UniverRPCMainThreadPlugin, UniverRPCWorkerThreadPlugin, } from './plugin';

package/lib/types/plugin.d.ts

@@ -1,4 +1,4 @@
-import { IUniverRPCMainThreadConfig, IUniverRPCWorkerThreadConfig } from './controllers/config.schema';
+import { IUniverRPCMainThreadConfig, IUniverRPCWorkerThreadConfig } from './config/config';
 import { IConfigService, Injector, Plugin } from '@univerjs/core';
 /**
  * This plugin is used to register the RPC services on the main thread. It
@@ -9,6 +9,8 @@ export declare class UniverRPCMainThreadPlugin extends Plugin {
     protected readonly _injector: Injector;
     private readonly _configService;
     static pluginName: string;
+    static packageName: string;
+    static version: string;
     private _internalWorker;
     constructor(_config: Partial<IUniverRPCMainThreadConfig> | undefined, _injector: Injector, _configService: IConfigService);
     dispose(): void;
@@ -22,6 +24,8 @@ export declare class UniverRPCWorkerThreadPlugin extends Plugin {
     protected readonly _injector: Injector;
     private readonly _configService;
     static pluginName: string;
+    static packageName: string;
+    static version: string;
     constructor(_config: Partial<IUniverRPCWorkerThreadConfig> | undefined, _injector: Injector, _configService: IConfigService);
     onStarting(): void;
 }

package/lib/types/services/rpc/implementations/web-worker-rpc.service.d.ts

@@ -1,11 +1,12 @@
 import { IMessageProtocol } from '../rpc.service';
 /**
  * Generate an `IMessageProtocol` on the web worker.
+ * @returns A protocol wrapper around worker global messaging APIs.
  */
 export declare function createWebWorkerMessagePortOnWorker(): IMessageProtocol;
 /**
  * Generate an `IMessageProtocol` on the main thread side.
  * @param worker The Web Worker object
- * @returns
+ * @returns A protocol wrapper around the given worker messaging APIs.
  */
 export declare function createWebWorkerMessagePortOnMain(worker: Worker): IMessageProtocol;

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

@@ -28,7 +28,7 @@ export declare function fromModule(module: unknown): IChannel;
  * request the remote server by calling the channel.
  *
  * @param channel
- * @returns
+ * @returns A proxy object that forwards calls/subscriptions to the remote channel.
  */
 export declare function toModule<T extends object>(channel: IChannel): T;
 export interface IChannelClient {

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 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"})}));
+(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 Q=Object.defineProperty;var X=(r,a,u)=>a in r?Q(r,a,{enumerable:!0,configurable:!0,writable:!0,value:u}):r[a]=u;var h=(r,a,u)=>X(r,typeof a!="symbol"?a+"":a,u);var y,g;const D="rpc.main-thread.config",q={},O="rpc.worker-thread.config",j={};var A=Object.getOwnPropertyDescriptor,N=(c,s,e,n)=>{for(var t=n>1?void 0:n?A(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},f=(c,s)=>(e,n)=>s(e,n,c);const R="rpc.remote-sync.service",v=a.createIdentifier(R);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=N([f(0,a.ICommandService)],r.RemoteSyncPrimaryService);const I="univer.remote-instance-service",m=a.createIdentifier(I);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=N([f(0,a.IUniverInstanceService),f(1,a.ICommandService),f(2,a.ILogService)],r.WebWorkerRemoteInstanceService);function E(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 U(c){return new Proxy({},{get(s,e){if(e!=="dispose")return function(...n){return G(e)?c.subscribe(e,n):c.call(e,n)}}})}function G(c){return c.endsWith("$")}class $ 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){return{call:(n,t)=>this._disposed?Promise.reject(new Error("[ChannelClient]: client is disposed!")):this._remoteCall(e,n,t),subscribe:(n,t)=>{if(this._disposed)throw new Error("[ChannelClient]: client is disposed!");return this._remoteSubscribe(e,n,t)}}}_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._pendingRequests;return new Promise((k,T)=>{const C={handle(W){switch(W.type){case 201:l.delete(i),k(W.data);break;case 202:l.delete(i),T(W.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,C),this._sendRequest(_)})}_remoteSubscribe(e,n,t){return new d.Observable(i=>{let o=-1;const _=()=>{o=++this._lastRequestCounter;const k={seq:o,type:101,channelName:e,method:n,args:t},T={handle(C){switch(C.type){case 300:i.next(C.data);break;case 301:i.error(C.data);break;case 302:i.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(o,T),this._sendRequest(k)};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 L 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 instanceof Error?l:new Error(String(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 M{constructor(s){h(this,"_client");h(this,"_server");this._client=new $(s),this._server=new L(s)}dispose(){this._client.dispose(),this._server.dispose()}requestChannel(s){return this._client.getChannel(s)}registerChannel(s,e){this._server.registerChannel(s,e)}}var V=Object.getOwnPropertyDescriptor,F=(c,s,e,n)=>{for(var t=n>1?void 0:n?V(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(R,E(this._remoteSyncService)),this._injector.add([m,{useFactory:()=>U(this._rpcChannelService.requestChannel(I))}]),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=F([S(0,a.Inject(a.Injector)),S(1,a.ICommandService),S(2,a.IUniverInstanceService),S(3,p),S(4,v)],r.DataSyncPrimaryController);var z=Object.getOwnPropertyDescriptor,K=(c,s,e,n)=>{for(var t=n>1?void 0:n?z(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},b=(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(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===a.CommandType.MUTATION&&!(n!=null&&n.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:e},n)}))}},r.DataSyncReplicaController=K([b(0,a.Inject(a.Injector)),b(1,m),b(2,a.ICommandService),b(3,p)],r.DataSyncReplicaController);const P={name:"@univerjs/rpc",version:"0.17.0"};function Y(){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 B(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 J=Object.getOwnPropertyDescriptor,H=(c,s,e,n)=>{for(var t=n>1?void 0:n?J(s,e):s,i=c.length-1,o;i>=0;i--)(o=c[i])&&(t=o(t)||t);return t},w=(c,s)=>(e,n)=>s(e,n,c);r.UniverRPCMainThreadPlugin=(y=class extends a.Plugin{constructor(e=q,n,t){super();h(this,"_internalWorker",null);this._config=e,this._injector=n,this._configService=t;const{...i}=a.merge({},q,this._config);this._configService.setConfig(D,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=B(n);[[p,{useFactory:()=>new M(t)}],[r.DataSyncPrimaryController],[v,{useClass:r.RemoteSyncPrimaryService}]].forEach(o=>this._injector.add(o)),this._injector.get(r.DataSyncPrimaryController)}},h(y,"pluginName","UNIVER_RPC_MAIN_THREAD_PLUGIN"),h(y,"packageName",P.name),h(y,"version",P.version),y),r.UniverRPCMainThreadPlugin=H([w(1,a.Inject(a.Injector)),w(2,a.IConfigService)],r.UniverRPCMainThreadPlugin),r.UniverRPCWorkerThreadPlugin=(g=class extends a.Plugin{constructor(s=j,e,n){super(),this._config=s,this._injector=e,this._configService=n;const{...t}=a.merge({},j,this._config);this._configService.setConfig(O,t)}onStarting(){[[r.DataSyncReplicaController],[p,{useFactory:()=>new M(Y())}],[m,{useClass:r.WebWorkerRemoteInstanceService}]].forEach(s=>this._injector.add(s)),this._injector.get(r.DataSyncReplicaController)}},h(g,"pluginName","UNIVER_RPC_WORKER_THREAD_PLUGIN"),h(g,"packageName",P.name),h(g,"version",P.version),g),r.UniverRPCWorkerThreadPlugin=H([w(1,a.Inject(a.Injector)),w(2,a.IConfigService)],r.UniverRPCWorkerThreadPlugin),r.ChannelClient=$,r.ChannelServer=L,r.ChannelService=M,r.IRPCChannelService=p,r.IRemoteInstanceService=m,r.IRemoteSyncService=v,r.PLUGIN_CONFIG_KEY_MAIN_THREAD=D,r.PLUGIN_CONFIG_KEY_WORKER_THREAD=O,r.RemoteInstanceServiceName=I,r.RemoteSyncServiceName=R,r.fromModule=E,r.toModule=U,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})}));

package/package.json

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