@univerjs/rpc 0.1.0-alpha.3 → 0.1.0-beta.0

package/lib/cjs/index.js

@@ -1 +1 @@
-"use strict";var A=Object.defineProperty;var F=(s,t,e)=>t in s?A(s,t,{enumerable:!0,configurable:!0,writable:!0,value:e}):s[t]=e;var h=(s,t,e)=>(F(s,typeof t!="symbol"?t+"":t,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@univerjs/core"),l=require("@wendellhu/redi"),p=require("rxjs/operators"),_=require("rxjs");var H=Object.defineProperty,k=Object.getOwnPropertyDescriptor,j=(s,t,e,n)=>{for(var r=n>1?void 0:n?k(t,e):t,i=s.length-1,c;i>=0;i--)(c=s[i])&&(r=(n?c(t,e,r):c(r))||r);return n&&r&&H(t,e,r),r},w=(s,t)=>(e,n)=>t(e,n,s);const E="univer.remote-sync-service",b=l.createIdentifier(E);let M=class{constructor(s){this._commandService=s}async syncMutation(s){return this._commandService.syncExecuteCommand(s.mutationInfo.id,s.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}};M=j([w(0,a.ICommandService)],M);const O="univer.remote-instance-service",C=l.createIdentifier(O);let q=class{constructor(s,t){this._univerInstanceService=s,this._commandService=t}async syncMutation(s){return this._commandService.syncExecuteCommand(s.mutationInfo.id,s.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}async createInstance(s){const{type:t,snapshot:e}=s;try{switch(t){case a.DocumentType.SHEET:return!!this._univerInstanceService.createSheet(e);default:throw new Error(`[RemoteInstanceReplicaService]: cannot create replica for document type: ${t}.`)}}catch(n){throw n instanceof Error?n:new Error(`${n}`)}}async disposeInstance(s){return this._univerInstanceService.disposeDocument(s.unitID)}};q=j([w(0,a.IUniverInstanceService),w(1,a.ICommandService)],q);function U(s){const t=s;return new class{call(e,n){const r=t[e];if(typeof r=="function"){let i=r.apply(t,[n]);return i instanceof Promise||(i=Promise.resolve(i)),i}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,n){const r=t[e];if(typeof r=="function"){const i=r.apply(t,n);return _.isObservable(i)?i:_.of(i)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function $(s){return new Proxy({},{get(t,e){return function(...n){return z(e)?s.subscribe(e,n[0]):s.call(e,n[0])}}})}function z(s){return s.endsWith("$")}class D extends a.RxDisposable{constructor(e){super();h(this,"_initialized",new _.BehaviorSubject(!1));h(this,"_lastRequestCounter",0);h(this,"_pendingRequests",new Map);h(this,"_pendingSubscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(p.takeUntil(this.dispose$)).subscribe(n=>this._onMessage(n))}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)throw new Error("[ChannelClient]: client is disposed!");return n._remoteSubscribe(e,r,i)}}}_whenReady(){return _.firstValueFrom(this._initialized.pipe(p.filter(e=>e),p.take(1)))}async _remoteCall(e,n,r){await this._whenReady();const i=++this._lastRequestCounter,u={seq:i,type:100,channelName:e,method:n,args:r},o=this;return new Promise((g,d)=>{const N={handle(R){switch(R.type){case 201:o._pendingRequests.delete(i),g(R.data);break;case 202:o._pendingRequests.delete(i),d(R.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,N),this._sendRequest(u)})}_remoteSubscribe(e,n,r){return new _.Observable(i=>{let c=-1;return this._whenReady().then(()=>{c=++this._lastRequestCounter;const o={seq:c,type:101,channelName:e,method:n,args:r},g={handle(d){switch(d.type){case 300:i.next(d.data);break;case 301:i.error(d.data);break;case 302:i.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(c,g),this._sendRequest(o)}),()=>{if(c===-1)return;const u={type:102,seq:c,channelName:e,method:n};this._sendRequest(u)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var n;switch(e.type){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:(n=this._pendingRequests.get(e.seq))==null||n.handle(e);break}}}class T extends a.RxDisposable{constructor(e){super();h(this,"_channels",new Map);h(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(p.takeUntil(this.dispose$)).subscribe(n=>this._onRequest(n)),this._sendResponse({seq:-1,type:0})}registerChannel(e,n){this._channels.set(e,n)}_onRequest(e){switch(e.type){case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_onMethodCall(e){const{channelName:n,method:r,args:i}=e,c=this._channels.get(n);let u;try{if(!c)throw new Error(`[ChannelServer]: Channel ${n} not found!`);u=c.call(r,i)}catch(o){u=Promise.reject(o)}u.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)})})}_onSubscribe(e){const{channelName:n,seq:r}=e,i=this._channels.get(n);try{if(!i)throw new Error(`[ChannelServer]: Channel ${n} not found!`);const u=i.subscribe(e.method,e.args).subscribe({next:o=>{this._sendResponse({seq:r,type:300,data:o})},error:o=>{this._sendResponse({seq:r,type:301,data:o.message}),this._sendResponse({seq:r,type:302})},complete:()=>{this._sendResponse({seq:r,type:302})}});this._subscriptions.set(e.seq,u)}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=l.createIdentifier("IRPChannelService");class x{constructor(t){h(this,"_client");h(this,"_server");this._client=new D(t),this._server=new T(t)}requestChannel(t){return this._client.getChannel(t)}registerChannel(t,e){this._server.registerChannel(t,e)}}var V=Object.defineProperty,G=Object.getOwnPropertyDescriptor,B=(s,t,e,n)=>{for(var r=n>1?void 0:n?G(t,e):t,i=s.length-1,c;i>=0;i--)(c=s[i])&&(r=(n?c(t,e,r):c(r))||r);return n&&r&&V(t,e,r),r},v=(s,t)=>(e,n)=>t(e,n,s);let m=class extends a.RxDisposable{constructor(t,e,n,r,i,c){super();h(this,"_remoteInstanceService");this._unsyncMutations=t,this._injector=e,this._commandService=n,this._univerInstanceService=r,this._rpcChannelService=i,this._remoteSyncService=c,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(E,U(this._remoteSyncService)),this._injector.add([C,{useFactory:()=>$(this._rpcChannelService.requestChannel(O))}]),this._remoteInstanceService=this._injector.get(C)}_init(){this._univerInstanceService.sheetAdded$.pipe(p.takeUntil(this.dispose$)).subscribe(t=>{this._remoteInstanceService.createInstance({unitID:t.getUnitId(),type:a.DocumentType.SHEET,snapshot:t.getSnapshot()})}),this._univerInstanceService.sheetDisposed$.pipe(p.takeUntil(this.dispose$)).subscribe(t=>{this._remoteInstanceService.disposeInstance({unitID:t.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((t,e)=>{t.type===a.CommandType.MUTATION&&!(e!=null&&e.fromSync)&&!this._unsyncMutations.has(t.id)&&this._remoteInstanceService.syncMutation({mutationInfo:t})}))}};m=B([a.OnLifecycle(a.LifecycleStages.Starting,m),v(1,l.Inject(l.Injector)),v(2,a.ICommandService),v(3,a.IUniverInstanceService),v(4,S),v(5,b)],m);var J=Object.defineProperty,Q=Object.getOwnPropertyDescriptor,X=(s,t,e,n)=>{for(var r=n>1?void 0:n?Q(t,e):t,i=s.length-1,c;i>=0;i--)(c=s[i])&&(r=(n?c(t,e,r):c(r))||r);return n&&r&&J(t,e,r),r},f=(s,t)=>(e,n)=>t(e,n,s);let y=class extends a.Disposable{constructor(t,e,n,r){super();h(this,"_remoteSyncService");this._injector=t,this._remoteInstanceService=e,this._commandService=n,this._rpcChannelService=r,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(O,U(this._remoteInstanceService)),this._injector.add([b,{useFactory:()=>$(this._rpcChannelService.requestChannel(E))}]),this._remoteSyncService=this._injector.get(b)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((t,e)=>{t.type===a.CommandType.MUTATION&&!(e!=null&&e.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:t})}))}};y=X([a.OnLifecycle(a.LifecycleStages.Starting,y),f(0,l.Inject(l.Injector)),f(1,C),f(2,a.ICommandService),f(3,S)],y);function Y(){return{send(s){postMessage(s)},onMessage:new _.Observable(s=>{const t=e=>{s.next(e.data)};return addEventListener("message",t),()=>removeEventListener("message",t)}).pipe(_.shareReplay(1))}}function Z(s){return{send(t){s.postMessage(t)},onMessage:new _.Observable(t=>{const e=n=>{t.next(n.data)};return s.addEventListener("message",e),()=>s.removeEventListener("message",e)}).pipe(_.shareReplay(1))}}var K=Object.defineProperty,ee=Object.getOwnPropertyDescriptor,W=(s,t,e,n)=>{for(var r=n>1?void 0:n?ee(t,e):t,i=s.length-1,c;i>=0;i--)(c=s[i])&&(r=(n?c(t,e,r):c(r))||r);return n&&r&&K(t,e,r),r},L=(s,t)=>(e,n)=>t(e,n,s),P;exports.UniverRPCMainThreadPlugin=(P=class extends a.Plugin{constructor(t,e){super("UNIVER_RPC_MAIN_THREAD_PLUGIN"),this._config=t,this._injector=e}async onStarting(t){const e=new Worker(this._config.workerURL),n=Z(e);[[S,{useFactory:()=>new x(n)}],[m,{useFactory:()=>{var i;return t.createInstance(m,((i=this._config)==null?void 0:i.unsyncMutations)??new Set)}}],[b,{useClass:M}]].forEach(i=>t.add(i))}},h(P,"type",a.PluginType.Univer),P);exports.UniverRPCMainThreadPlugin=W([L(1,l.Inject(l.Injector))],exports.UniverRPCMainThreadPlugin);var I;exports.UniverRPCWorkerThreadPlugin=(I=class extends a.Plugin{constructor(t,e){super("UNIVER_RPC_WORKER_THREAD_PLUGIN"),this._config=t,this._injector=e}onStarting(t){[[y],[S,{useFactory:()=>new x(Y())}],[C,{useClass:q}]].forEach(e=>t.add(e)),t.get(y)}},h(I,"type",a.PluginType.Univer),I);exports.UniverRPCWorkerThreadPlugin=W([L(1,l.Inject(l.Injector))],exports.UniverRPCWorkerThreadPlugin);exports.ChannelClient=D;exports.ChannelServer=T;exports.IRPChannelService=S;
+"use strict";var A=Object.defineProperty;var H=(r,n,e)=>n in r?A(r,n,{enumerable:!0,configurable:!0,writable:!0,value:e}):r[n]=e;var h=(r,n,e)=>(H(r,typeof n!="symbol"?n+"":n,e),e);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("@univerjs/core"),l=require("@wendellhu/redi"),d=require("rxjs/operators"),_=require("rxjs");var F=Object.defineProperty,k=Object.getOwnPropertyDescriptor,O=(r,n,e,t)=>{for(var s=t>1?void 0:t?k(n,e):n,i=r.length-1,c;i>=0;i--)(c=r[i])&&(s=(t?c(n,e,s):c(s))||s);return t&&s&&F(n,e,s),s},w=(r,n)=>(e,t)=>n(e,t,r);const E="univer.remote-sync-service",C=l.createIdentifier(E);let U=class{constructor(r){this._commandService=r}async syncMutation(r){return this._commandService.syncExecuteCommand(r.mutationInfo.id,r.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}};U=O([w(0,a.ICommandService)],U);const M="univer.remote-instance-service",S=l.createIdentifier(M);let q=class{constructor(r,n){this._univerInstanceService=r,this._commandService=n}whenReady(){return Promise.resolve(!0)}async syncMutation(r){return this._commandService.syncExecuteCommand(r.mutationInfo.id,r.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}async createInstance(r){const{type:n,snapshot:e}=r;try{switch(n){case a.UniverInstanceType.SHEET:return!!this._univerInstanceService.createSheet(e);default:throw new Error(`[RemoteInstanceReplicaService]: cannot create replica for document type: ${n}.`)}}catch(t){throw t instanceof Error?t:new Error(`${t}`)}}async disposeInstance(r){return this._univerInstanceService.disposeDocument(r.unitID)}};q=O([w(0,a.IUniverInstanceService),w(1,a.ICommandService)],q);function j(r){const n=r;return new class{call(e,t){const s=n[e];if(typeof s=="function"){let i=s.apply(n,[t]);return i instanceof Promise||(i=Promise.resolve(i)),i}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,t){const s=n[e];if(typeof s=="function"){const i=s.apply(n,t);return _.isObservable(i)?i:_.of(i)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function $(r){return new Proxy({},{get(n,e){return function(...t){return z(e)?r.subscribe(e,t[0]):r.call(e,t[0])}}})}function z(r){return r.endsWith("$")}class T extends a.RxDisposable{constructor(e){super();h(this,"_initialized",new _.BehaviorSubject(!1));h(this,"_lastRequestCounter",0);h(this,"_pendingRequests",new Map);h(this,"_pendingSubscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(d.takeUntil(this.dispose$)).subscribe(t=>this._onMessage(t))}getChannel(e){const t=this;return{call(s,i){return t._disposed?Promise.reject():t._remoteCall(e,s,i)},subscribe(s,i){if(t._disposed)throw new Error("[ChannelClient]: client is disposed!");return t._remoteSubscribe(e,s,i)}}}_whenReady(){return _.firstValueFrom(this._initialized.pipe(d.filter(e=>e),d.take(1)))}async _remoteCall(e,t,s){await this._whenReady();const i=++this._lastRequestCounter,u={seq:i,type:100,channelName:e,method:t,args:s},o=this;return new Promise((g,p)=>{const N={handle(R){switch(R.type){case 201:o._pendingRequests.delete(i),g(R.data);break;case 202:o._pendingRequests.delete(i),p(R.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,N),this._sendRequest(u)})}_remoteSubscribe(e,t,s){return new _.Observable(i=>{let c=-1;return this._whenReady().then(()=>{c=++this._lastRequestCounter;const o={seq:c,type:101,channelName:e,method:t,args:s},g={handle(p){switch(p.type){case 300:i.next(p.data);break;case 301:i.error(p.data);break;case 302:i.complete();break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(c,g),this._sendRequest(o)}),()=>{if(c===-1)return;const u={type:102,seq:c,channelName:e,method:t};this._sendRequest(u)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var t;switch(e.type){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:(t=this._pendingRequests.get(e.seq))==null||t.handle(e);break}}}class D extends a.RxDisposable{constructor(e){super();h(this,"_channels",new Map);h(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(d.takeUntil(this.dispose$)).subscribe(t=>this._onRequest(t)),this._sendResponse({seq:-1,type:0})}registerChannel(e,t){this._channels.set(e,t)}_onRequest(e){switch(e.type){case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_onMethodCall(e){const{channelName:t,method:s,args:i}=e,c=this._channels.get(t);let u;try{if(!c)throw new Error(`[ChannelServer]: Channel ${t} not found!`);u=c.call(s,i)}catch(o){u=Promise.reject(o)}u.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)})})}_onSubscribe(e){const{channelName:t,seq:s}=e,i=this._channels.get(t);try{if(!i)throw new Error(`[ChannelServer]: Channel ${t} not found!`);const u=i.subscribe(e.method,e.args).subscribe({next:o=>{this._sendResponse({seq:s,type:300,data:o})},error:o=>{this._sendResponse({seq:s,type:301,data:o.message}),this._sendResponse({seq:s,type:302})},complete:()=>{this._sendResponse({seq:s,type:302})}});this._subscriptions.set(e.seq,u)}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 f=l.createIdentifier("IRPChannelService");class x{constructor(n){h(this,"_client");h(this,"_server");this._client=new T(n),this._server=new D(n)}requestChannel(n){return this._client.getChannel(n)}registerChannel(n,e){this._server.registerChannel(n,e)}}var V=Object.defineProperty,G=Object.getOwnPropertyDescriptor,B=(r,n,e,t)=>{for(var s=t>1?void 0:t?G(n,e):n,i=r.length-1,c;i>=0;i--)(c=r[i])&&(s=(t?c(n,e,s):c(s))||s);return t&&s&&V(n,e,s),s},v=(r,n)=>(e,t)=>n(e,t,r);let m=class extends a.RxDisposable{constructor(n,e,t,s,i){super();h(this,"_remoteInstanceService");h(this,"_syncingUnits",new Set);this._injector=n,this._commandService=e,this._univerInstanceService=t,this._rpcChannelService=s,this._remoteSyncService=i,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(E,j(this._remoteSyncService)),this._injector.add([S,{useFactory:()=>$(this._rpcChannelService.requestChannel(M))}]),this._remoteInstanceService=this._injector.get(S)}_init(){this._univerInstanceService.sheetAdded$.pipe(d.takeUntil(this.dispose$)).subscribe(n=>{this._syncingUnits.add(n.getUnitId()),this._remoteInstanceService.createInstance({unitID:n.getUnitId(),type:a.UniverInstanceType.SHEET,snapshot:n.getSnapshot()})}),this._univerInstanceService.sheetDisposed$.pipe(d.takeUntil(this.dispose$)).subscribe(n=>{this._syncingUnits.delete(n.getUnitId()),this._remoteInstanceService.disposeInstance({unitID:n.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((n,e)=>{const{type:t,params:s}=n,i=(s==null?void 0:s.unitId)||"";t===a.CommandType.MUTATION&&(!i||this._syncingUnits.has(i))&&!(e!=null&&e.fromSync)&&this._remoteInstanceService.syncMutation({mutationInfo:n})}))}};m=B([a.OnLifecycle(a.LifecycleStages.Starting,m),v(0,l.Inject(l.Injector)),v(1,a.ICommandService),v(2,a.IUniverInstanceService),v(3,f),v(4,C)],m);var J=Object.defineProperty,Q=Object.getOwnPropertyDescriptor,X=(r,n,e,t)=>{for(var s=t>1?void 0:t?Q(n,e):n,i=r.length-1,c;i>=0;i--)(c=r[i])&&(s=(t?c(n,e,s):c(s))||s);return t&&s&&J(n,e,s),s},b=(r,n)=>(e,t)=>n(e,t,r);let y=class extends a.Disposable{constructor(n,e,t,s){super();h(this,"_remoteSyncService");this._injector=n,this._remoteInstanceService=e,this._commandService=t,this._rpcChannelService=s,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(M,j(this._remoteInstanceService)),this._injector.add([C,{useFactory:()=>$(this._rpcChannelService.requestChannel(E))}]),this._remoteSyncService=this._injector.get(C)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((n,e)=>{n.type===a.CommandType.MUTATION&&!(e!=null&&e.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:n})}))}};y=X([a.OnLifecycle(a.LifecycleStages.Starting,y),b(0,l.Inject(l.Injector)),b(1,S),b(2,a.ICommandService),b(3,f)],y);function Y(){return{send(r){postMessage(r)},onMessage:new _.Observable(r=>{const n=e=>{r.next(e.data)};return addEventListener("message",n),()=>removeEventListener("message",n)}).pipe(_.shareReplay(1))}}function Z(r){return{send(n){r.postMessage(n)},onMessage:new _.Observable(n=>{const e=t=>{n.next(t.data)};return r.addEventListener("message",e),()=>r.removeEventListener("message",e)}).pipe(_.shareReplay(1))}}var K=Object.defineProperty,ee=Object.getOwnPropertyDescriptor,W=(r,n,e,t)=>{for(var s=t>1?void 0:t?ee(n,e):n,i=r.length-1,c;i>=0;i--)(c=r[i])&&(s=(t?c(n,e,s):c(s))||s);return t&&s&&K(n,e,s),s},L=(r,n)=>(e,t)=>n(e,t,r),I;exports.UniverRPCMainThreadPlugin=(I=class extends a.Plugin{constructor(n,e){super("UNIVER_RPC_MAIN_THREAD_PLUGIN"),this._config=n,this._injector=e}async onStarting(n){const e=new Worker(this._config.workerURL),t=Z(e);[[f,{useFactory:()=>new x(t)}],[m],[C,{useClass:U}]].forEach(i=>n.add(i)),n.get(m)}},h(I,"type",a.PluginType.Univer),I);exports.UniverRPCMainThreadPlugin=W([L(1,l.Inject(l.Injector))],exports.UniverRPCMainThreadPlugin);var P;exports.UniverRPCWorkerThreadPlugin=(P=class extends a.Plugin{constructor(n,e){super("UNIVER_RPC_WORKER_THREAD_PLUGIN"),this._config=n,this._injector=e}onStarting(n){[[y],[f,{useFactory:()=>new x(Y())}],[S,{useClass:q}]].forEach(e=>n.add(e)),n.get(y)}},h(P,"type",a.PluginType.Univer),P);exports.UniverRPCWorkerThreadPlugin=W([L(1,l.Inject(l.Injector))],exports.UniverRPCWorkerThreadPlugin);exports.ChannelClient=T;exports.ChannelServer=D;exports.IRPChannelService=f;exports.IRemoteInstanceService=S;

package/lib/es/index.js

@@ -1,22 +1,22 @@
 var Z = Object.defineProperty;
-var k = (n, t, e) => t in n ? Z(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var o = (n, t, e) => (k(n, typeof t != "symbol" ? t + "" : t, e), e);
-import { DocumentType as T, ICommandService as y, IUniverInstanceService as L, RxDisposable as q, OnLifecycle as W, LifecycleStages as N, CommandType as A, Disposable as K, Plugin as F, PluginType as H } from "@univerjs/core";
+var K = (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) => (K(s, typeof t != "symbol" ? t + "" : t, e), e);
+import { UniverInstanceType as T, ICommandService as y, IUniverInstanceService as L, RxDisposable as M, OnLifecycle as W, LifecycleStages as N, CommandType as A, Disposable as k, Plugin as H, PluginType as F } from "@univerjs/core";
 import { createIdentifier as O, Inject as S, Injector as b } from "@wendellhu/redi";
 import { takeUntil as v, filter as ee, take as te } from "rxjs/operators";
-import { BehaviorSubject as se, firstValueFrom as ne, Observable as $, isObservable as re, of as ie, shareReplay as z } from "rxjs";
-var ce = Object.defineProperty, ae = Object.getOwnPropertyDescriptor, V = (n, t, e, s) => {
-  for (var r = s > 1 ? void 0 : s ? ae(t, e) : t, i = n.length - 1, c; i >= 0; i--)
-    (c = n[i]) && (r = (s ? c(t, e, r) : c(r)) || r);
-  return s && r && ce(t, e, r), r;
-}, P = (n, t) => (e, s) => t(e, s, n);
-const D = "univer.remote-sync-service", m = O(D);
+import { BehaviorSubject as ne, firstValueFrom as se, Observable as $, isObservable as re, of as ie, shareReplay as z } from "rxjs";
+var ce = Object.defineProperty, oe = Object.getOwnPropertyDescriptor, V = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? oe(t, e) : t, i = s.length - 1, c; i >= 0; i--)
+    (c = s[i]) && (r = (n ? c(t, e, r) : c(r)) || r);
+  return n && r && ce(t, e, r), r;
+}, P = (s, t) => (e, n) => t(e, n, s);
+const U = "univer.remote-sync-service", m = O(U);
 let E = class {
-  constructor(n) {
-    this._commandService = n;
+  constructor(s) {
+    this._commandService = s;
   }
-  async syncMutation(n) {
-    return this._commandService.syncExecuteCommand(n.mutationInfo.id, n.mutationInfo.params, {
+  async syncMutation(s) {
+    return this._commandService.syncExecuteCommand(s.mutationInfo.id, s.mutationInfo.params, {
       onlyLocal: !0,
       fromSync: !0
     });
@@ -25,19 +25,22 @@ let E = class {
 E = V([
   P(0, y)
 ], E);
-const j = "univer.remote-instance-service", f = O(j);
-let M = class {
-  constructor(n, t) {
-    this._univerInstanceService = n, this._commandService = t;
+const D = "univer.remote-instance-service", f = O(D);
+let q = class {
+  constructor(s, t) {
+    this._univerInstanceService = s, this._commandService = t;
   }
-  async syncMutation(n) {
-    return this._commandService.syncExecuteCommand(n.mutationInfo.id, n.mutationInfo.params, {
+  whenReady() {
+    return Promise.resolve(!0);
+  }
+  async syncMutation(s) {
+    return this._commandService.syncExecuteCommand(s.mutationInfo.id, s.mutationInfo.params, {
       onlyLocal: !0,
       fromSync: !0
     });
   }
-  async createInstance(n) {
-    const { type: t, snapshot: e } = n;
+  async createInstance(s) {
+    const { type: t, snapshot: e } = s;
     try {
       switch (t) {
         case T.SHEET:
@@ -47,93 +50,93 @@ let M = class {
             `[RemoteInstanceReplicaService]: cannot create replica for document type: ${t}.`
           );
       }
-    } catch (s) {
-      throw s instanceof Error ? s : new Error(`${s}`);
+    } catch (n) {
+      throw n instanceof Error ? n : new Error(`${n}`);
     }
   }
-  async disposeInstance(n) {
-    return this._univerInstanceService.disposeDocument(n.unitID);
+  async disposeInstance(s) {
+    return this._univerInstanceService.disposeDocument(s.unitID);
   }
 };
-M = V([
+q = V([
   P(0, L),
   P(1, y)
-], M);
-function G(n) {
-  const t = n;
+], q);
+function G(s) {
+  const t = s;
   return new class {
-    call(e, s) {
+    call(e, n) {
       const r = t[e];
       if (typeof r == "function") {
-        let i = r.apply(t, [s]);
+        let i = r.apply(t, [n]);
         return i instanceof Promise || (i = Promise.resolve(i)), i;
       }
       throw new Error(`[RPC]: method not found for ${e}!`);
     }
-    subscribe(e, s) {
+    subscribe(e, n) {
       const r = t[e];
       if (typeof r == "function") {
-        const i = r.apply(t, s);
+        const i = r.apply(t, n);
         return re(i) ? i : ie(i);
       }
       throw new Error(`[RPC]: observable method not found for ${e}!`);
     }
   }();
 }
-function B(n) {
+function B(s) {
   return new Proxy({}, {
     get(t, e) {
-      return function(...s) {
-        return oe(e) ? n.subscribe(e, s[0]) : n.call(e, s[0]);
+      return function(...n) {
+        return ae(e) ? s.subscribe(e, n[0]) : s.call(e, n[0]);
       };
     }
   });
 }
-function oe(n) {
-  return n.endsWith("$");
+function ae(s) {
+  return s.endsWith("$");
 }
-class he extends q {
+class he extends M {
   constructor(e) {
     super();
-    o(this, "_initialized", new se(!1));
-    o(this, "_lastRequestCounter", 0);
-    o(this, "_pendingRequests", /* @__PURE__ */ new Map());
-    o(this, "_pendingSubscriptions", /* @__PURE__ */ new Map());
-    this._protocol = e, this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((s) => this._onMessage(s));
+    a(this, "_initialized", new ne(!1));
+    a(this, "_lastRequestCounter", 0);
+    a(this, "_pendingRequests", /* @__PURE__ */ new Map());
+    a(this, "_pendingSubscriptions", /* @__PURE__ */ new Map());
+    this._protocol = e, this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((n) => this._onMessage(n));
   }
   getChannel(e) {
-    const s = this;
+    const n = this;
     return {
       call(r, i) {
-        return s._disposed ? Promise.reject() : s._remoteCall(e, r, i);
+        return n._disposed ? Promise.reject() : n._remoteCall(e, r, i);
       },
       subscribe(r, i) {
-        if (s._disposed)
+        if (n._disposed)
           throw new Error("[ChannelClient]: client is disposed!");
-        return s._remoteSubscribe(e, r, i);
+        return n._remoteSubscribe(e, r, i);
       }
     };
   }
   _whenReady() {
-    return ne(
+    return se(
       this._initialized.pipe(
         ee((e) => e),
         te(1)
       )
     );
   }
-  async _remoteCall(e, s, r) {
+  async _remoteCall(e, n, r) {
     await this._whenReady();
-    const i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: s, args: r }, a = this;
-    return new Promise((R, l) => {
+    const i = ++this._lastRequestCounter, h = { seq: i, type: 100, channelName: e, method: n, args: r }, o = this;
+    return new Promise((g, l) => {
       const Y = {
-        handle(g) {
-          switch (g.type) {
+        handle(R) {
+          switch (R.type) {
             case 201:
-              a._pendingRequests.delete(i), R(g.data);
+              o._pendingRequests.delete(i), g(R.data);
               break;
             case 202:
-              a._pendingRequests.delete(i), l(g.data);
+              o._pendingRequests.delete(i), l(R.data);
               break;
             default:
               throw new Error("[ChannelClient]: unknown response type!");
@@ -143,12 +146,12 @@ class he extends q {
       this._pendingRequests.set(i, Y), this._sendRequest(h);
     });
   }
-  _remoteSubscribe(e, s, r) {
+  _remoteSubscribe(e, n, r) {
     return new $((i) => {
       let c = -1;
       return this._whenReady().then(() => {
         c = ++this._lastRequestCounter;
-        const a = { seq: c, type: 101, channelName: e, method: s, args: r }, R = {
+        const o = { seq: c, type: 101, channelName: e, method: n, args: r }, g = {
           handle(l) {
             switch (l.type) {
               case 300:
@@ -165,7 +168,7 @@ class he extends q {
             }
           }
         };
-        this._pendingRequests.set(c, R), this._sendRequest(a);
+        this._pendingRequests.set(c, g), this._sendRequest(o);
       }), () => {
         if (c === -1)
           return;
@@ -173,7 +176,7 @@ class he extends q {
           type: 102,
           seq: c,
           channelName: e,
-          method: s
+          method: n
         };
         this._sendRequest(h);
       };
@@ -183,7 +186,7 @@ class he extends q {
     this._protocol.send(e);
   }
   _onMessage(e) {
-    var s;
+    var n;
     switch (e.type) {
       case 0:
         this._initialized.next(!0);
@@ -193,24 +196,24 @@ class he extends q {
       case 300:
       case 302:
       case 301:
-        (s = this._pendingRequests.get(e.seq)) == null || s.handle(e);
+        (n = this._pendingRequests.get(e.seq)) == null || n.handle(e);
         break;
     }
   }
 }
-class le extends q {
+class le extends M {
   constructor(e) {
     super();
-    o(this, "_channels", /* @__PURE__ */ new Map());
-    o(this, "_subscriptions", /* @__PURE__ */ new Map());
-    this._protocol = e, this._protocol.onMessage.pipe(v(this.dispose$)).subscribe((s) => this._onRequest(s)), this._sendResponse({
+    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._sendResponse({
       seq: -1,
       type: 0
       /* INITIALIZE */
     });
   }
-  registerChannel(e, s) {
-    this._channels.set(e, s);
+  registerChannel(e, n) {
+    this._channels.set(e, n);
   }
   _onRequest(e) {
     switch (e.type) {
@@ -226,32 +229,32 @@ class le extends q {
     }
   }
   _onMethodCall(e) {
-    const { channelName: s, method: r, args: i } = e, c = this._channels.get(s);
+    const { channelName: n, method: r, args: i } = e, c = this._channels.get(n);
     let h;
     try {
       if (!c)
-        throw new Error(`[ChannelServer]: Channel ${s} not found!`);
+        throw new Error(`[ChannelServer]: Channel ${n} not found!`);
       h = c.call(r, i);
-    } catch (a) {
-      h = Promise.reject(a);
+    } catch (o) {
+      h = Promise.reject(o);
     }
-    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) });
+    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) });
     });
   }
   _onSubscribe(e) {
-    const { channelName: s, seq: r } = e, i = this._channels.get(s);
+    const { channelName: n, seq: r } = e, i = this._channels.get(n);
     try {
       if (!i)
-        throw new Error(`[ChannelServer]: Channel ${s} not found!`);
+        throw new Error(`[ChannelServer]: Channel ${n} not found!`);
       const h = i.subscribe(e.method, e.args).subscribe({
-        next: (a) => {
-          this._sendResponse({ seq: r, type: 300, data: a });
+        next: (o) => {
+          this._sendResponse({ seq: r, type: 300, data: o });
         },
-        error: (a) => {
-          this._sendResponse({ seq: r, type: 301, data: a.message }), this._sendResponse({
+        error: (o) => {
+          this._sendResponse({ seq: r, type: 301, data: o.message }), this._sendResponse({
             seq: r,
             type: 302
             /* SUBSCRIBE_COMPLETE */
@@ -271,8 +274,8 @@ class le extends q {
     }
   }
   _onUnsubscribe(e) {
-    const s = this._subscriptions.get(e.seq);
-    s && (s.unsubscribe(), this._subscriptions.delete(e.seq));
+    const n = this._subscriptions.get(e.seq);
+    n && (n.unsubscribe(), this._subscriptions.delete(e.seq));
   }
   _sendResponse(e) {
     this._protocol.send(e);
@@ -281,8 +284,8 @@ class le extends q {
 const C = O("IRPChannelService");
 class J {
   constructor(t) {
-    o(this, "_client");
-    o(this, "_server");
+    a(this, "_client");
+    a(this, "_server");
     this._client = new he(t), this._server = new le(t);
   }
   requestChannel(t) {
@@ -292,70 +295,72 @@ class J {
     this._server.registerChannel(t, e);
   }
 }
-var _e = Object.defineProperty, ue = Object.getOwnPropertyDescriptor, pe = (n, t, e, s) => {
-  for (var r = s > 1 ? void 0 : s ? ue(t, e) : t, i = n.length - 1, c; i >= 0; i--)
-    (c = n[i]) && (r = (s ? c(t, e, r) : c(r)) || r);
-  return s && r && _e(t, e, r), r;
-}, _ = (n, t) => (e, s) => t(e, s, n);
-let u = class extends q {
-  constructor(t, e, s, r, i, c) {
+var _e = Object.defineProperty, ue = Object.getOwnPropertyDescriptor, pe = (s, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? ue(t, e) : t, i = s.length - 1, c; i >= 0; i--)
+    (c = s[i]) && (r = (n ? c(t, e, r) : c(r)) || r);
+  return n && r && _e(t, e, r), r;
+}, _ = (s, t) => (e, n) => t(e, n, s);
+let u = class extends M {
+  constructor(t, e, n, r, i) {
     super();
-    o(this, "_remoteInstanceService");
-    this._unsyncMutations = t, this._injector = e, this._commandService = s, this._univerInstanceService = r, this._rpcChannelService = i, this._remoteSyncService = c, this._initRPCChannels(), this._init();
+    a(this, "_remoteInstanceService");
+    a(this, "_syncingUnits", /* @__PURE__ */ new Set());
+    this._injector = t, this._commandService = e, this._univerInstanceService = n, this._rpcChannelService = r, this._remoteSyncService = i, this._initRPCChannels(), this._init();
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(D, G(this._remoteSyncService)), this._injector.add([
+    this._rpcChannelService.registerChannel(U, G(this._remoteSyncService)), this._injector.add([
       f,
       {
-        useFactory: () => B(this._rpcChannelService.requestChannel(j))
+        useFactory: () => B(this._rpcChannelService.requestChannel(D))
       }
     ]), this._remoteInstanceService = this._injector.get(f);
   }
   _init() {
     this._univerInstanceService.sheetAdded$.pipe(v(this.dispose$)).subscribe((t) => {
-      this._remoteInstanceService.createInstance({
+      this._syncingUnits.add(t.getUnitId()), this._remoteInstanceService.createInstance({
         unitID: t.getUnitId(),
         type: T.SHEET,
         snapshot: t.getSnapshot()
       });
     }), this._univerInstanceService.sheetDisposed$.pipe(v(this.dispose$)).subscribe((t) => {
-      this._remoteInstanceService.disposeInstance({
+      this._syncingUnits.delete(t.getUnitId()), this._remoteInstanceService.disposeInstance({
         unitID: t.getUnitId()
       });
     }), this.disposeWithMe(
       // Mutations executed on the main thread should be synced to the worker thread.
       this._commandService.onCommandExecuted((t, e) => {
-        t.type === A.MUTATION && !(e != null && e.fromSync) && !this._unsyncMutations.has(t.id) && this._remoteInstanceService.syncMutation({
-          mutationInfo: t
-        });
+        const { type: n, params: r } = t, i = (r == null ? void 0 : r.unitId) || "";
+        // only sync mutations to the worker thread
+        n === A.MUTATION && (!i || this._syncingUnits.has(i)) && // do not sync mutations from the web worker back to the web worker
+        !(e != null && e.fromSync) && this._remoteInstanceService.syncMutation({ mutationInfo: t });
       })
     );
   }
 };
 u = pe([
   W(N.Starting, u),
-  _(1, S(b)),
-  _(2, y),
-  _(3, L),
-  _(4, C),
-  _(5, m)
+  _(0, S(b)),
+  _(1, y),
+  _(2, L),
+  _(3, C),
+  _(4, m)
 ], u);
-var de = Object.defineProperty, ve = Object.getOwnPropertyDescriptor, me = (n, t, e, s) => {
-  for (var r = s > 1 ? void 0 : s ? ve(t, e) : t, i = n.length - 1, c; i >= 0; i--)
-    (c = n[i]) && (r = (s ? c(t, e, r) : c(r)) || r);
-  return s && r && de(t, e, r), r;
-}, d = (n, t) => (e, s) => t(e, s, n);
-let p = class extends K {
-  constructor(t, e, s, r) {
+var de = Object.defineProperty, ve = Object.getOwnPropertyDescriptor, me = (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 = (n ? c(t, e, r) : c(r)) || r);
+  return n && r && de(t, e, r), r;
+}, d = (s, t) => (e, n) => t(e, n, s);
+let p = class extends k {
+  constructor(t, e, n, r) {
     super();
-    o(this, "_remoteSyncService");
-    this._injector = t, this._remoteInstanceService = e, this._commandService = s, this._rpcChannelService = r, this._initRPCChannels(), this._init();
+    a(this, "_remoteSyncService");
+    this._injector = t, this._remoteInstanceService = e, this._commandService = n, this._rpcChannelService = r, this._initRPCChannels(), this._init();
   }
   _initRPCChannels() {
-    this._rpcChannelService.registerChannel(j, G(this._remoteInstanceService)), this._injector.add([
+    this._rpcChannelService.registerChannel(D, G(this._remoteInstanceService)), this._injector.add([
       m,
       {
-        useFactory: () => B(this._rpcChannelService.requestChannel(D))
+        useFactory: () => B(this._rpcChannelService.requestChannel(U))
       }
     ]), this._remoteSyncService = this._injector.get(m);
   }
@@ -379,40 +384,40 @@ p = me([
 ], p);
 function fe() {
   return {
-    send(n) {
-      postMessage(n);
+    send(s) {
+      postMessage(s);
     },
-    onMessage: new $((n) => {
+    onMessage: new $((s) => {
       const t = (e) => {
-        n.next(e.data);
+        s.next(e.data);
       };
       return addEventListener("message", t), () => removeEventListener("message", t);
     }).pipe(z(1))
   };
 }
-function ye(n) {
+function ye(s) {
   return {
     send(t) {
-      n.postMessage(t);
+      s.postMessage(t);
     },
     onMessage: new $((t) => {
-      const e = (s) => {
-        t.next(s.data);
+      const e = (n) => {
+        t.next(n.data);
       };
-      return n.addEventListener("message", e), () => n.removeEventListener("message", e);
+      return s.addEventListener("message", e), () => s.removeEventListener("message", e);
     }).pipe(z(1))
   };
 }
-var Se = Object.defineProperty, be = Object.getOwnPropertyDescriptor, Q = (n, t, e, s) => {
-  for (var r = s > 1 ? void 0 : s ? be(t, e) : t, i = n.length - 1, c; i >= 0; i--)
-    (c = n[i]) && (r = (s ? c(t, e, r) : c(r)) || r);
-  return s && r && Se(t, e, r), r;
-}, X = (n, t) => (e, s) => t(e, s, n), w;
-let x = (w = class extends F {
-  constructor(n, t) {
-    super("UNIVER_RPC_MAIN_THREAD_PLUGIN"), this._config = n, this._injector = t;
-  }
-  async onStarting(n) {
+var Se = Object.defineProperty, be = Object.getOwnPropertyDescriptor, Q = (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 = (n ? c(t, e, r) : c(r)) || r);
+  return n && r && Se(t, e, r), r;
+}, X = (s, t) => (e, n) => t(e, n, s), w;
+let j = (w = class extends H {
+  constructor(s, t) {
+    super("UNIVER_RPC_MAIN_THREAD_PLUGIN"), this._config = s, this._injector = t;
+  }
+  async onStarting(s) {
     const t = new Worker(this._config.workerURL), e = ye(t);
     [
       [
@@ -421,28 +426,20 @@ let x = (w = class extends F {
           useFactory: () => new J(e)
         }
       ],
-      [
-        u,
-        {
-          useFactory: () => {
-            var r;
-            return n.createInstance(u, ((r = this._config) == null ? void 0 : r.unsyncMutations) ?? /* @__PURE__ */ new Set());
-          }
-        }
-      ],
+      [u],
       [m, { useClass: E }]
-    ].forEach((r) => n.add(r));
+    ].forEach((r) => s.add(r)), s.get(u);
   }
-}, o(w, "type", H.Univer), w);
-x = Q([
+}, a(w, "type", F.Univer), w);
+j = Q([
   X(1, S(b))
-], x);
+], j);
 var I;
-let U = (I = class extends F {
-  constructor(n, t) {
-    super("UNIVER_RPC_WORKER_THREAD_PLUGIN"), this._config = n, this._injector = t;
+let x = (I = class extends H {
+  constructor(s, t) {
+    super("UNIVER_RPC_WORKER_THREAD_PLUGIN"), this._config = s, this._injector = t;
   }
-  onStarting(n) {
+  onStarting(s) {
     [
       [p],
       [
@@ -451,17 +448,18 @@ let U = (I = class extends F {
           useFactory: () => new J(fe())
         }
       ],
-      [f, { useClass: M }]
-    ].forEach((t) => n.add(t)), n.get(p);
+      [f, { useClass: q }]
+    ].forEach((t) => s.add(t)), s.get(p);
   }
-}, o(I, "type", H.Univer), I);
-U = Q([
+}, a(I, "type", F.Univer), I);
+x = Q([
   X(1, S(b))
-], U);
+], x);
 export {
   he as ChannelClient,
   le as ChannelServer,
   C as IRPChannelService,
-  x as UniverRPCMainThreadPlugin,
-  U as UniverRPCWorkerThreadPlugin
+  f as IRemoteInstanceService,
+  j as UniverRPCMainThreadPlugin,
+  x as UniverRPCWorkerThreadPlugin
 };

package/lib/types/controllers/data-sync/data-sync-primary.controller.d.ts

@@ -22,14 +22,14 @@ import { IRPChannelService } from '../../services/rpc/channel.service';
  * the worker thread.
  */
 export declare class DataSyncPrimaryController extends RxDisposable {
-    private readonly _unsyncMutations;
     private readonly _injector;
     private readonly _commandService;
     private readonly _univerInstanceService;
     private readonly _rpcChannelService;
     private readonly _remoteSyncService;
     private _remoteInstanceService;
-    constructor(_unsyncMutations: Set<string>, _injector: Injector, _commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _rpcChannelService: IRPChannelService, _remoteSyncService: IRemoteSyncService);
+    private readonly _syncingUnits;
+    constructor(_injector: Injector, _commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _rpcChannelService: IRPChannelService, _remoteSyncService: IRemoteSyncService);
     private _initRPCChannels;
     private _init;
 }

package/lib/types/index.d.ts

@@ -14,5 +14,6 @@
  * limitations under the License.
  */
 export { type IUniverRPCMainThreadConfig, type IUniverRPCWorkerThreadPluginConfig, UniverRPCMainThreadPlugin, UniverRPCWorkerThreadPlugin, } from './plugin';
+export { IRemoteInstanceService } from './services/remote-instance/remote-instance.service';
 export { IRPChannelService } from './services/rpc/channel.service';
 export { ChannelClient, ChannelServer, type IMessageProtocol } from './services/rpc/rpc.service';

package/lib/types/plugin.d.ts

@@ -17,7 +17,6 @@ import { Plugin, PluginType } from '@univerjs/core';
 import { Injector } from '@wendellhu/redi';
 export interface IUniverRPCMainThreadConfig {
     workerURL: string | URL;
-    unsyncMutations?: Set<string>;
 }
 /**
  * This plugin is used to register the RPC services on the main thread. It

package/lib/types/services/remote-instance/remote-instance.service.d.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 import type { IExecutionOptions, IMutationInfo, IWorkbookData } from '@univerjs/core';
-import { DocumentType, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { ICommandService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
 export interface IRemoteSyncMutationOptions extends IExecutionOptions {
     /** If this mutation is executed after it was sent from the peer univer instance (e.g. in a web worker). */
     fromSync?: boolean;
@@ -47,9 +47,11 @@ export declare const RemoteInstanceServiceName = "univer.remote-instance-service
  */
 export declare const IRemoteInstanceService: import("@wendellhu/redi").IdentifierDecorator<IRemoteInstanceService>;
 export interface IRemoteInstanceService {
+    /** Tell other modules if the `IRemoteInstanceService` is ready to load files. */
+    whenReady(): Promise<true>;
     createInstance(params: {
         unitID: string;
-        type: DocumentType;
+        type: UniverInstanceType;
         snapshot: IWorkbookData;
     }): Promise<boolean>;
     disposeInstance(params: {
@@ -63,12 +65,13 @@ export declare class RemoteInstanceReplicaService implements IRemoteInstanceServ
     private readonly _univerInstanceService;
     private readonly _commandService;
     constructor(_univerInstanceService: IUniverInstanceService, _commandService: ICommandService);
+    whenReady(): Promise<true>;
     syncMutation(params: {
         mutationInfo: IMutationInfo;
     }): Promise<boolean>;
     createInstance(params: {
         unitID: string;
-        type: DocumentType;
+        type: UniverInstanceType;
         snapshot: IWorkbookData;
     }): Promise<boolean>;
     disposeInstance(params: {

package/lib/umd/index.js

@@ -1 +1 @@
-(function(o,c){typeof exports=="object"&&typeof module<"u"?c(exports,require("@univerjs/core"),require("@wendellhu/redi"),require("rxjs/operators"),require("rxjs")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@wendellhu/redi","rxjs/operators","rxjs"],c):(o=typeof globalThis<"u"?globalThis:o||self,c(o.UniverRpc={},o.UniverCore,o["@wendellhu/redi"],o.rxjs.operators,o.rxjs))})(this,function(o,c,h,p,d){"use strict";var ee=Object.defineProperty;var ne=(o,c,h)=>c in o?ee(o,c,{enumerable:!0,configurable:!0,writable:!0,value:h}):o[c]=h;var u=(o,c,h)=>(ne(o,typeof c!="symbol"?c+"":c,h),h);var q,E;var A=Object.defineProperty,F=Object.getOwnPropertyDescriptor,j=(r,n,e,t)=>{for(var s=t>1?void 0:t?F(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&A(n,e,s),s},g=(r,n)=>(e,t)=>n(e,t,r);const P="univer.remote-sync-service",b=h.createIdentifier(P);let I=class{constructor(r){this._commandService=r}async syncMutation(r){return this._commandService.syncExecuteCommand(r.mutationInfo.id,r.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}};I=j([g(0,c.ICommandService)],I);const w="univer.remote-instance-service",C=h.createIdentifier(w);let M=class{constructor(r,n){this._univerInstanceService=r,this._commandService=n}async syncMutation(r){return this._commandService.syncExecuteCommand(r.mutationInfo.id,r.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}async createInstance(r){const{type:n,snapshot:e}=r;try{switch(n){case c.DocumentType.SHEET:return!!this._univerInstanceService.createSheet(e);default:throw new Error(`[RemoteInstanceReplicaService]: cannot create replica for document type: ${n}.`)}}catch(t){throw t instanceof Error?t:new Error(`${t}`)}}async disposeInstance(r){return this._univerInstanceService.disposeDocument(r.unitID)}};M=j([g(0,c.IUniverInstanceService),g(1,c.ICommandService)],M);function T(r){const n=r;return new class{call(e,t){const s=n[e];if(typeof s=="function"){let i=s.apply(n,[t]);return i instanceof Promise||(i=Promise.resolve(i)),i}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,t){const s=n[e];if(typeof s=="function"){const i=s.apply(n,t);return d.isObservable(i)?i:d.of(i)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function $(r){return new Proxy({},{get(n,e){return function(...t){return H(e)?r.subscribe(e,t[0]):r.call(e,t[0])}}})}function H(r){return r.endsWith("$")}class D extends c.RxDisposable{constructor(e){super();u(this,"_initialized",new d.BehaviorSubject(!1));u(this,"_lastRequestCounter",0);u(this,"_pendingRequests",new Map);u(this,"_pendingSubscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(p.takeUntil(this.dispose$)).subscribe(t=>this._onMessage(t))}getChannel(e){const t=this;return{call(s,i){return t._disposed?Promise.reject():t._remoteCall(e,s,i)},subscribe(s,i){if(t._disposed)throw new Error("[ChannelClient]: client is disposed!");return t._remoteSubscribe(e,s,i)}}}_whenReady(){return d.firstValueFrom(this._initialized.pipe(p.filter(e=>e),p.take(1)))}async _remoteCall(e,t,s){await this._whenReady();const i=++this._lastRequestCounter,_={seq:i,type:100,channelName:e,method:t,args:s},l=this;return new Promise((O,S)=>{const K={handle(U){switch(U.type){case 201:l._pendingRequests.delete(i),O(U.data);break;case 202:l._pendingRequests.delete(i),S(U.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,K),this._sendRequest(_)})}_remoteSubscribe(e,t,s){return new d.Observable(i=>{let a=-1;return this._whenReady().then(()=>{a=++this._lastRequestCounter;const l={seq:a,type:101,channelName:e,method:t,args:s},O={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(a,O),this._sendRequest(l)}),()=>{if(a===-1)return;const _={type:102,seq:a,channelName:e,method:t};this._sendRequest(_)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var t;switch(e.type){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:(t=this._pendingRequests.get(e.seq))==null||t.handle(e);break}}}class W extends c.RxDisposable{constructor(e){super();u(this,"_channels",new Map);u(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(p.takeUntil(this.dispose$)).subscribe(t=>this._onRequest(t)),this._sendResponse({seq:-1,type:0})}registerChannel(e,t){this._channels.set(e,t)}_onRequest(e){switch(e.type){case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_onMethodCall(e){const{channelName:t,method:s,args:i}=e,a=this._channels.get(t);let _;try{if(!a)throw new Error(`[ChannelServer]: Channel ${t} not found!`);_=a.call(s,i)}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:t,seq:s}=e,i=this._channels.get(t);try{if(!i)throw new Error(`[ChannelServer]: Channel ${t} 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(a){a instanceof Error?this._sendResponse({seq:e.seq,type:301,data:a.message}):this._sendResponse({seq:e.seq,type:301,data:String(a)})}}_onUnsubscribe(e){const t=this._subscriptions.get(e.seq);t&&(t.unsubscribe(),this._subscriptions.delete(e.seq))}_sendResponse(e){this._protocol.send(e)}}const v=h.createIdentifier("IRPChannelService");class L{constructor(n){u(this,"_client");u(this,"_server");this._client=new D(n),this._server=new W(n)}requestChannel(n){return this._client.getChannel(n)}registerChannel(n,e){this._server.registerChannel(n,e)}}var k=Object.defineProperty,z=Object.getOwnPropertyDescriptor,V=(r,n,e,t)=>{for(var s=t>1?void 0:t?z(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&k(n,e,s),s},m=(r,n)=>(e,t)=>n(e,t,r);let f=class extends c.RxDisposable{constructor(n,e,t,s,i,a){super();u(this,"_remoteInstanceService");this._unsyncMutations=n,this._injector=e,this._commandService=t,this._univerInstanceService=s,this._rpcChannelService=i,this._remoteSyncService=a,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(P,T(this._remoteSyncService)),this._injector.add([C,{useFactory:()=>$(this._rpcChannelService.requestChannel(w))}]),this._remoteInstanceService=this._injector.get(C)}_init(){this._univerInstanceService.sheetAdded$.pipe(p.takeUntil(this.dispose$)).subscribe(n=>{this._remoteInstanceService.createInstance({unitID:n.getUnitId(),type:c.DocumentType.SHEET,snapshot:n.getSnapshot()})}),this._univerInstanceService.sheetDisposed$.pipe(p.takeUntil(this.dispose$)).subscribe(n=>{this._remoteInstanceService.disposeInstance({unitID:n.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((n,e)=>{n.type===c.CommandType.MUTATION&&!(e!=null&&e.fromSync)&&!this._unsyncMutations.has(n.id)&&this._remoteInstanceService.syncMutation({mutationInfo:n})}))}};f=V([c.OnLifecycle(c.LifecycleStages.Starting,f),m(1,h.Inject(h.Injector)),m(2,c.ICommandService),m(3,c.IUniverInstanceService),m(4,v),m(5,b)],f);var G=Object.defineProperty,B=Object.getOwnPropertyDescriptor,J=(r,n,e,t)=>{for(var s=t>1?void 0:t?B(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&G(n,e,s),s},R=(r,n)=>(e,t)=>n(e,t,r);let y=class extends c.Disposable{constructor(n,e,t,s){super();u(this,"_remoteSyncService");this._injector=n,this._remoteInstanceService=e,this._commandService=t,this._rpcChannelService=s,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(w,T(this._remoteInstanceService)),this._injector.add([b,{useFactory:()=>$(this._rpcChannelService.requestChannel(P))}]),this._remoteSyncService=this._injector.get(b)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((n,e)=>{n.type===c.CommandType.MUTATION&&!(e!=null&&e.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:n})}))}};y=J([c.OnLifecycle(c.LifecycleStages.Starting,y),R(0,h.Inject(h.Injector)),R(1,C),R(2,c.ICommandService),R(3,v)],y);function Q(){return{send(r){postMessage(r)},onMessage:new d.Observable(r=>{const n=e=>{r.next(e.data)};return addEventListener("message",n),()=>removeEventListener("message",n)}).pipe(d.shareReplay(1))}}function X(r){return{send(n){r.postMessage(n)},onMessage:new d.Observable(n=>{const e=t=>{n.next(t.data)};return r.addEventListener("message",e),()=>r.removeEventListener("message",e)}).pipe(d.shareReplay(1))}}var Y=Object.defineProperty,Z=Object.getOwnPropertyDescriptor,x=(r,n,e,t)=>{for(var s=t>1?void 0:t?Z(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&Y(n,e,s),s},N=(r,n)=>(e,t)=>n(e,t,r);o.UniverRPCMainThreadPlugin=(q=class extends c.Plugin{constructor(n,e){super("UNIVER_RPC_MAIN_THREAD_PLUGIN"),this._config=n,this._injector=e}async onStarting(n){const e=new Worker(this._config.workerURL),t=X(e);[[v,{useFactory:()=>new L(t)}],[f,{useFactory:()=>{var i;return n.createInstance(f,((i=this._config)==null?void 0:i.unsyncMutations)??new Set)}}],[b,{useClass:I}]].forEach(i=>n.add(i))}},u(q,"type",c.PluginType.Univer),q),o.UniverRPCMainThreadPlugin=x([N(1,h.Inject(h.Injector))],o.UniverRPCMainThreadPlugin),o.UniverRPCWorkerThreadPlugin=(E=class extends c.Plugin{constructor(n,e){super("UNIVER_RPC_WORKER_THREAD_PLUGIN"),this._config=n,this._injector=e}onStarting(n){[[y],[v,{useFactory:()=>new L(Q())}],[C,{useClass:M}]].forEach(e=>n.add(e)),n.get(y)}},u(E,"type",c.PluginType.Univer),E),o.UniverRPCWorkerThreadPlugin=x([N(1,h.Inject(h.Injector))],o.UniverRPCWorkerThreadPlugin),o.ChannelClient=D,o.ChannelServer=W,o.IRPChannelService=v,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});
+(function(o,c){typeof exports=="object"&&typeof module<"u"?c(exports,require("@univerjs/core"),require("@wendellhu/redi"),require("rxjs/operators"),require("rxjs")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@wendellhu/redi","rxjs/operators","rxjs"],c):(o=typeof globalThis<"u"?globalThis:o||self,c(o.UniverRpc={},o.UniverCore,o["@wendellhu/redi"],o.rxjs.operators,o.rxjs))})(this,function(o,c,h,p,d){"use strict";var ee=Object.defineProperty;var ne=(o,c,h)=>c in o?ee(o,c,{enumerable:!0,configurable:!0,writable:!0,value:h}):o[c]=h;var u=(o,c,h)=>(ne(o,typeof c!="symbol"?c+"":c,h),h);var q,E;var A=Object.defineProperty,H=Object.getOwnPropertyDescriptor,j=(r,n,e,t)=>{for(var s=t>1?void 0:t?H(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&A(n,e,s),s},g=(r,n)=>(e,t)=>n(e,t,r);const I="univer.remote-sync-service",b=h.createIdentifier(I);let P=class{constructor(r){this._commandService=r}async syncMutation(r){return this._commandService.syncExecuteCommand(r.mutationInfo.id,r.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}};P=j([g(0,c.ICommandService)],P);const w="univer.remote-instance-service",v=h.createIdentifier(w);let U=class{constructor(r,n){this._univerInstanceService=r,this._commandService=n}whenReady(){return Promise.resolve(!0)}async syncMutation(r){return this._commandService.syncExecuteCommand(r.mutationInfo.id,r.mutationInfo.params,{onlyLocal:!0,fromSync:!0})}async createInstance(r){const{type:n,snapshot:e}=r;try{switch(n){case c.UniverInstanceType.SHEET:return!!this._univerInstanceService.createSheet(e);default:throw new Error(`[RemoteInstanceReplicaService]: cannot create replica for document type: ${n}.`)}}catch(t){throw t instanceof Error?t:new Error(`${t}`)}}async disposeInstance(r){return this._univerInstanceService.disposeDocument(r.unitID)}};U=j([g(0,c.IUniverInstanceService),g(1,c.ICommandService)],U);function T(r){const n=r;return new class{call(e,t){const s=n[e];if(typeof s=="function"){let i=s.apply(n,[t]);return i instanceof Promise||(i=Promise.resolve(i)),i}throw new Error(`[RPC]: method not found for ${e}!`)}subscribe(e,t){const s=n[e];if(typeof s=="function"){const i=s.apply(n,t);return d.isObservable(i)?i:d.of(i)}throw new Error(`[RPC]: observable method not found for ${e}!`)}}}function $(r){return new Proxy({},{get(n,e){return function(...t){return F(e)?r.subscribe(e,t[0]):r.call(e,t[0])}}})}function F(r){return r.endsWith("$")}class D extends c.RxDisposable{constructor(e){super();u(this,"_initialized",new d.BehaviorSubject(!1));u(this,"_lastRequestCounter",0);u(this,"_pendingRequests",new Map);u(this,"_pendingSubscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(p.takeUntil(this.dispose$)).subscribe(t=>this._onMessage(t))}getChannel(e){const t=this;return{call(s,i){return t._disposed?Promise.reject():t._remoteCall(e,s,i)},subscribe(s,i){if(t._disposed)throw new Error("[ChannelClient]: client is disposed!");return t._remoteSubscribe(e,s,i)}}}_whenReady(){return d.firstValueFrom(this._initialized.pipe(p.filter(e=>e),p.take(1)))}async _remoteCall(e,t,s){await this._whenReady();const i=++this._lastRequestCounter,_={seq:i,type:100,channelName:e,method:t,args:s},l=this;return new Promise((M,C)=>{const K={handle(O){switch(O.type){case 201:l._pendingRequests.delete(i),M(O.data);break;case 202:l._pendingRequests.delete(i),C(O.data);break;default:throw new Error("[ChannelClient]: unknown response type!")}}};this._pendingRequests.set(i,K),this._sendRequest(_)})}_remoteSubscribe(e,t,s){return new d.Observable(i=>{let a=-1;return this._whenReady().then(()=>{a=++this._lastRequestCounter;const l={seq:a,type:101,channelName:e,method:t,args:s},M={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(a,M),this._sendRequest(l)}),()=>{if(a===-1)return;const _={type:102,seq:a,channelName:e,method:t};this._sendRequest(_)}})}_sendRequest(e){this._protocol.send(e)}_onMessage(e){var t;switch(e.type){case 0:this._initialized.next(!0);break;case 201:case 202:case 300:case 302:case 301:(t=this._pendingRequests.get(e.seq))==null||t.handle(e);break}}}class W extends c.RxDisposable{constructor(e){super();u(this,"_channels",new Map);u(this,"_subscriptions",new Map);this._protocol=e,this._protocol.onMessage.pipe(p.takeUntil(this.dispose$)).subscribe(t=>this._onRequest(t)),this._sendResponse({seq:-1,type:0})}registerChannel(e,t){this._channels.set(e,t)}_onRequest(e){switch(e.type){case 100:this._onMethodCall(e);break;case 101:this._onSubscribe(e);break;case 102:this._onUnsubscribe(e);break}}_onMethodCall(e){const{channelName:t,method:s,args:i}=e,a=this._channels.get(t);let _;try{if(!a)throw new Error(`[ChannelServer]: Channel ${t} not found!`);_=a.call(s,i)}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:t,seq:s}=e,i=this._channels.get(t);try{if(!i)throw new Error(`[ChannelServer]: Channel ${t} 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(a){a instanceof Error?this._sendResponse({seq:e.seq,type:301,data:a.message}):this._sendResponse({seq:e.seq,type:301,data:String(a)})}}_onUnsubscribe(e){const t=this._subscriptions.get(e.seq);t&&(t.unsubscribe(),this._subscriptions.delete(e.seq))}_sendResponse(e){this._protocol.send(e)}}const m=h.createIdentifier("IRPChannelService");class L{constructor(n){u(this,"_client");u(this,"_server");this._client=new D(n),this._server=new W(n)}requestChannel(n){return this._client.getChannel(n)}registerChannel(n,e){this._server.registerChannel(n,e)}}var k=Object.defineProperty,z=Object.getOwnPropertyDescriptor,V=(r,n,e,t)=>{for(var s=t>1?void 0:t?z(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&k(n,e,s),s},f=(r,n)=>(e,t)=>n(e,t,r);let y=class extends c.RxDisposable{constructor(n,e,t,s,i){super();u(this,"_remoteInstanceService");u(this,"_syncingUnits",new Set);this._injector=n,this._commandService=e,this._univerInstanceService=t,this._rpcChannelService=s,this._remoteSyncService=i,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(I,T(this._remoteSyncService)),this._injector.add([v,{useFactory:()=>$(this._rpcChannelService.requestChannel(w))}]),this._remoteInstanceService=this._injector.get(v)}_init(){this._univerInstanceService.sheetAdded$.pipe(p.takeUntil(this.dispose$)).subscribe(n=>{this._syncingUnits.add(n.getUnitId()),this._remoteInstanceService.createInstance({unitID:n.getUnitId(),type:c.UniverInstanceType.SHEET,snapshot:n.getSnapshot()})}),this._univerInstanceService.sheetDisposed$.pipe(p.takeUntil(this.dispose$)).subscribe(n=>{this._syncingUnits.delete(n.getUnitId()),this._remoteInstanceService.disposeInstance({unitID:n.getUnitId()})}),this.disposeWithMe(this._commandService.onCommandExecuted((n,e)=>{const{type:t,params:s}=n,i=(s==null?void 0:s.unitId)||"";t===c.CommandType.MUTATION&&(!i||this._syncingUnits.has(i))&&!(e!=null&&e.fromSync)&&this._remoteInstanceService.syncMutation({mutationInfo:n})}))}};y=V([c.OnLifecycle(c.LifecycleStages.Starting,y),f(0,h.Inject(h.Injector)),f(1,c.ICommandService),f(2,c.IUniverInstanceService),f(3,m),f(4,b)],y);var G=Object.defineProperty,B=Object.getOwnPropertyDescriptor,J=(r,n,e,t)=>{for(var s=t>1?void 0:t?B(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&G(n,e,s),s},R=(r,n)=>(e,t)=>n(e,t,r);let S=class extends c.Disposable{constructor(n,e,t,s){super();u(this,"_remoteSyncService");this._injector=n,this._remoteInstanceService=e,this._commandService=t,this._rpcChannelService=s,this._initRPCChannels(),this._init()}_initRPCChannels(){this._rpcChannelService.registerChannel(w,T(this._remoteInstanceService)),this._injector.add([b,{useFactory:()=>$(this._rpcChannelService.requestChannel(I))}]),this._remoteSyncService=this._injector.get(b)}_init(){this.disposeWithMe(this._commandService.onCommandExecuted((n,e)=>{n.type===c.CommandType.MUTATION&&!(e!=null&&e.fromSync)&&this._remoteSyncService.syncMutation({mutationInfo:n})}))}};S=J([c.OnLifecycle(c.LifecycleStages.Starting,S),R(0,h.Inject(h.Injector)),R(1,v),R(2,c.ICommandService),R(3,m)],S);function Q(){return{send(r){postMessage(r)},onMessage:new d.Observable(r=>{const n=e=>{r.next(e.data)};return addEventListener("message",n),()=>removeEventListener("message",n)}).pipe(d.shareReplay(1))}}function X(r){return{send(n){r.postMessage(n)},onMessage:new d.Observable(n=>{const e=t=>{n.next(t.data)};return r.addEventListener("message",e),()=>r.removeEventListener("message",e)}).pipe(d.shareReplay(1))}}var Y=Object.defineProperty,Z=Object.getOwnPropertyDescriptor,x=(r,n,e,t)=>{for(var s=t>1?void 0:t?Z(n,e):n,i=r.length-1,a;i>=0;i--)(a=r[i])&&(s=(t?a(n,e,s):a(s))||s);return t&&s&&Y(n,e,s),s},N=(r,n)=>(e,t)=>n(e,t,r);o.UniverRPCMainThreadPlugin=(q=class extends c.Plugin{constructor(n,e){super("UNIVER_RPC_MAIN_THREAD_PLUGIN"),this._config=n,this._injector=e}async onStarting(n){const e=new Worker(this._config.workerURL),t=X(e);[[m,{useFactory:()=>new L(t)}],[y],[b,{useClass:P}]].forEach(i=>n.add(i)),n.get(y)}},u(q,"type",c.PluginType.Univer),q),o.UniverRPCMainThreadPlugin=x([N(1,h.Inject(h.Injector))],o.UniverRPCMainThreadPlugin),o.UniverRPCWorkerThreadPlugin=(E=class extends c.Plugin{constructor(n,e){super("UNIVER_RPC_WORKER_THREAD_PLUGIN"),this._config=n,this._injector=e}onStarting(n){[[S],[m,{useFactory:()=>new L(Q())}],[v,{useClass:U}]].forEach(e=>n.add(e)),n.get(S)}},u(E,"type",c.PluginType.Univer),E),o.UniverRPCWorkerThreadPlugin=x([N(1,h.Inject(h.Injector))],o.UniverRPCWorkerThreadPlugin),o.ChannelClient=D,o.ChannelServer=W,o.IRPChannelService=m,o.IRemoteInstanceService=v,Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/rpc",
-  "version": "0.1.0-alpha.3",
+  "version": "0.1.0-beta.0",
   "keywords": [],
   "author": "DreamNum <developer@univer.ai>",
   "license": "Apache-2.0",
@@ -39,12 +39,12 @@
     "vite-plugin-dts": "^3.6.4",
     "vite-plugin-externals": "^0.6.2",
     "vitest": "^1.0.4",
-    "@univerjs/core": "0.1.0-alpha.3"
+    "@univerjs/core": "0.1.0-beta.0"
   },
   "peerDependencies": {
     "@wendellhu/redi": ">=0.12.12",
     "rxjs": ">=7.0.0",
-    "@univerjs/core": "0.1.0-alpha.3"
+    "@univerjs/core": "0.1.0-beta.0"
   },
   "scripts": {
     "build": "tsc && vite build"