@univerjs/rpc 1.0.0-rc.0 → 1.0.1

package/lib/cjs/index.js

@@ -27,7 +27,7 @@ const configSymbolWorkerThread = Symbol(PLUGIN_CONFIG_KEY_WORKER_THREAD);
 const defaultPluginWorkerThreadConfig = {};
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -35,7 +35,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -128,7 +128,7 @@ WebWorkerRemoteInstanceService = __decorate([
 ], WebWorkerRemoteInstanceService);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -139,7 +139,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -152,14 +152,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -222,6 +222,13 @@ function toModule(channel) {
 function propertyIsEventSource(name) {
 	return name.endsWith("$");
 }
+const CHANNEL_CLIENT_DISPOSED_ERROR_MESSAGE = "[ChannelClient]: client is disposed!";
+var ChannelClientDisposedError = class extends Error {
+	constructor() {
+		super(CHANNEL_CLIENT_DISPOSED_ERROR_MESSAGE);
+		this.name = "ChannelClientDisposedError";
+	}
+};
 /**
 * This method provides implementation for `IChannel` and is responsible for
 * transforming a local calling to a RPC calling.
@@ -238,7 +245,7 @@ var ChannelClient = class extends _univerjs_core.RxDisposable {
 	}
 	dispose() {
 		if (this._disposed) return;
-		const error = /* @__PURE__ */ new Error("[ChannelClient]: client is disposed!");
+		const error = new ChannelClientDisposedError();
 		this._initialized.error(error);
 		for (const responseHandler of this._pendingRequests.values()) responseHandler.dispose(error);
 		this._pendingRequests.clear();
@@ -247,11 +254,11 @@ var ChannelClient = class extends _univerjs_core.RxDisposable {
 	getChannel(channelName) {
 		return {
 			call: (method, args) => {
-				if (this._disposed) return Promise.reject(/* @__PURE__ */ new Error("[ChannelClient]: client is disposed!"));
+				if (this._disposed) return Promise.reject(new ChannelClientDisposedError());
 				return this._remoteCall(channelName, method, args);
 			},
 			subscribe: (eventMethod, args) => {
-				if (this._disposed) throw new Error("[ChannelClient]: client is disposed!");
+				if (this._disposed) throw new ChannelClientDisposedError();
 				return this._remoteSubscribe(channelName, eventMethod, args);
 			}
 		};
@@ -394,10 +401,7 @@ var ChannelServer = class extends _univerjs_core.RxDisposable {
 			case 101:
 				this._onSubscribe(request);
 				break;
-			case 102:
-				this._onUnsubscribe(request);
-				break;
-			default: break;
+			case 102: this._onUnsubscribe(request);
 		}
 	}
 	_sendInitialize() {
@@ -520,13 +524,14 @@ var ChannelService = class {
 //#endregion
 //#region src/controllers/data-sync/data-sync-primary.controller.ts
 let DataSyncPrimaryController = class DataSyncPrimaryController extends _univerjs_core.RxDisposable {
-	constructor(_injector, _commandService, _univerInstanceService, _rpcChannelService, _remoteSyncService) {
+	constructor(_injector, _commandService, _univerInstanceService, _rpcChannelService, _remoteSyncService, _logService) {
 		super();
 		this._injector = _injector;
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
 		this._rpcChannelService = _rpcChannelService;
 		this._remoteSyncService = _remoteSyncService;
+		this._logService = _logService;
 		_defineProperty(this, "_remoteInstanceService", void 0);
 		_defineProperty(this, "_syncingUnits", /* @__PURE__ */ new Set());
 		_defineProperty(this, "_syncingMutations", /* @__PURE__ */ new Set());
@@ -546,14 +551,14 @@ let DataSyncPrimaryController = class DataSyncPrimaryController extends _univerj
 		const alreadySyncing = this._syncingUnits.has(unitId);
 		this._syncingUnits.add(unitId);
 		const unit = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET) ?? this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_BASE);
-		if (!alreadySyncing && unit) this._remoteInstanceService.createInstance({
+		if (!alreadySyncing && unit) this._handleRemoteRequest(this._remoteInstanceService.createInstance({
 			unitID: unit.getUnitId(),
 			type: unit.type,
 			snapshot: unit.getSnapshot()
-		});
+		}), "create the remote unit");
 		return (0, _univerjs_core.toDisposable)(() => {
 			if (!alreadySyncing) this._syncingUnits.delete(unitId);
-			if (!alreadySyncing && unit) this._remoteInstanceService.disposeInstance({ unitID: unit.getUnitId() });
+			if (!alreadySyncing && unit) this._handleRemoteRequest(this._remoteInstanceService.disposeInstance({ unitID: unit.getUnitId() }), "dispose the remote unit");
 		});
 	}
 	/** Sync registered mutations for a unit without creating a replica unit. */
@@ -578,34 +583,42 @@ let DataSyncPrimaryController = class DataSyncPrimaryController extends _univerj
 		this._injector.add([IRemoteInstanceService, { useFactory: () => toModule(this._rpcChannelService.requestChannel(RemoteInstanceServiceName)) }]);
 		this._remoteInstanceService = this._injector.get(IRemoteInstanceService);
 		this._remoteReady = this._remoteInstanceService.whenReady();
+		this._handleRemoteRequest(this._remoteReady, "initialize the remote instance service");
 	}
 	_init() {
 		this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.takeUntil)(this.dispose$)).subscribe((event) => {
 			const { unit: sheet } = event;
 			this._syncingUnits.add(sheet.getUnitId());
-			this._remoteInstanceService.createInstance({
+			this._handleRemoteRequest(this._remoteInstanceService.createInstance({
 				unitID: sheet.getUnitId(),
 				type: _univerjs_core.UniverInstanceType.UNIVER_SHEET,
 				snapshot: sheet.getSnapshot()
-			});
+			}), "create the remote workbook");
 		});
 		this._univerInstanceService.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.takeUntil)(this.dispose$)).subscribe((workbook) => {
 			this._syncingUnits.delete(workbook.getUnitId());
-			this._remoteInstanceService.disposeInstance({ unitID: workbook.getUnitId() });
+			this._handleRemoteRequest(this._remoteInstanceService.disposeInstance({ unitID: workbook.getUnitId() }), "dispose the remote workbook");
 		});
 		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo, options) => {
 			const { type, params, id } = commandInfo;
 			const unitId = (params === null || params === void 0 ? void 0 : params.unitId) || "";
-			if (type === _univerjs_core.CommandType.MUTATION && (!unitId || this._syncingUnits.has(unitId)) && !(options === null || options === void 0 ? void 0 : options.fromSync) && this._syncingMutations.has(id)) this.syncMutation(commandInfo, options);
+			if (type === _univerjs_core.CommandType.MUTATION && (!unitId || this._syncingUnits.has(unitId)) && !(options === null || options === void 0 ? void 0 : options.fromSync) && this._syncingMutations.has(id)) this._handleRemoteRequest(this.syncMutation(commandInfo, options), `sync mutation ${id}`);
 		}));
 	}
+	_handleRemoteRequest(request, operation) {
+		request.catch((error) => {
+			if (error instanceof ChannelClientDisposedError) return;
+			this._logService.error(`[DataSyncPrimaryController]: Failed to ${operation}.`, error);
+		});
+	}
 };
 DataSyncPrimaryController = __decorate([
 	__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(1, _univerjs_core.ICommandService),
 	__decorateParam(2, _univerjs_core.IUniverInstanceService),
 	__decorateParam(3, IRPCChannelService),
-	__decorateParam(4, IRemoteSyncService)
+	__decorateParam(4, IRemoteSyncService),
+	__decorateParam(5, _univerjs_core.ILogService)
 ], DataSyncPrimaryController);
 
 //#endregion
@@ -642,7 +655,7 @@ DataSyncReplicaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/rpc";
-var version = "1.0.0-rc.0";
+var version = "1.0.1";
 
 //#endregion
 //#region src/services/rpc/implementations/web-worker-rpc.service.ts

package/lib/es/index.js

@@ -26,7 +26,7 @@ const configSymbolWorkerThread = Symbol(PLUGIN_CONFIG_KEY_WORKER_THREAD);
 const defaultPluginWorkerThreadConfig = {};
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -34,7 +34,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -127,7 +127,7 @@ WebWorkerRemoteInstanceService = __decorate([
 ], WebWorkerRemoteInstanceService);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -138,7 +138,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -151,14 +151,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -221,6 +221,13 @@ function toModule(channel) {
 function propertyIsEventSource(name) {
 	return name.endsWith("$");
 }
+const CHANNEL_CLIENT_DISPOSED_ERROR_MESSAGE = "[ChannelClient]: client is disposed!";
+var ChannelClientDisposedError = class extends Error {
+	constructor() {
+		super(CHANNEL_CLIENT_DISPOSED_ERROR_MESSAGE);
+		this.name = "ChannelClientDisposedError";
+	}
+};
 /**
 * This method provides implementation for `IChannel` and is responsible for
 * transforming a local calling to a RPC calling.
@@ -237,7 +244,7 @@ var ChannelClient = class extends RxDisposable {
 	}
 	dispose() {
 		if (this._disposed) return;
-		const error = /* @__PURE__ */ new Error("[ChannelClient]: client is disposed!");
+		const error = new ChannelClientDisposedError();
 		this._initialized.error(error);
 		for (const responseHandler of this._pendingRequests.values()) responseHandler.dispose(error);
 		this._pendingRequests.clear();
@@ -246,11 +253,11 @@ var ChannelClient = class extends RxDisposable {
 	getChannel(channelName) {
 		return {
 			call: (method, args) => {
-				if (this._disposed) return Promise.reject(/* @__PURE__ */ new Error("[ChannelClient]: client is disposed!"));
+				if (this._disposed) return Promise.reject(new ChannelClientDisposedError());
 				return this._remoteCall(channelName, method, args);
 			},
 			subscribe: (eventMethod, args) => {
-				if (this._disposed) throw new Error("[ChannelClient]: client is disposed!");
+				if (this._disposed) throw new ChannelClientDisposedError();
 				return this._remoteSubscribe(channelName, eventMethod, args);
 			}
 		};
@@ -393,10 +400,7 @@ var ChannelServer = class extends RxDisposable {
 			case 101:
 				this._onSubscribe(request);
 				break;
-			case 102:
-				this._onUnsubscribe(request);
-				break;
-			default: break;
+			case 102: this._onUnsubscribe(request);
 		}
 	}
 	_sendInitialize() {
@@ -519,13 +523,14 @@ var ChannelService = class {
 //#endregion
 //#region src/controllers/data-sync/data-sync-primary.controller.ts
 let DataSyncPrimaryController = class DataSyncPrimaryController extends RxDisposable {
-	constructor(_injector, _commandService, _univerInstanceService, _rpcChannelService, _remoteSyncService) {
+	constructor(_injector, _commandService, _univerInstanceService, _rpcChannelService, _remoteSyncService, _logService) {
 		super();
 		this._injector = _injector;
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
 		this._rpcChannelService = _rpcChannelService;
 		this._remoteSyncService = _remoteSyncService;
+		this._logService = _logService;
 		_defineProperty(this, "_remoteInstanceService", void 0);
 		_defineProperty(this, "_syncingUnits", /* @__PURE__ */ new Set());
 		_defineProperty(this, "_syncingMutations", /* @__PURE__ */ new Set());
@@ -545,14 +550,14 @@ let DataSyncPrimaryController = class DataSyncPrimaryController extends RxDispos
 		const alreadySyncing = this._syncingUnits.has(unitId);
 		this._syncingUnits.add(unitId);
 		const unit = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET) ?? this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE);
-		if (!alreadySyncing && unit) this._remoteInstanceService.createInstance({
+		if (!alreadySyncing && unit) this._handleRemoteRequest(this._remoteInstanceService.createInstance({
 			unitID: unit.getUnitId(),
 			type: unit.type,
 			snapshot: unit.getSnapshot()
-		});
+		}), "create the remote unit");
 		return toDisposable(() => {
 			if (!alreadySyncing) this._syncingUnits.delete(unitId);
-			if (!alreadySyncing && unit) this._remoteInstanceService.disposeInstance({ unitID: unit.getUnitId() });
+			if (!alreadySyncing && unit) this._handleRemoteRequest(this._remoteInstanceService.disposeInstance({ unitID: unit.getUnitId() }), "dispose the remote unit");
 		});
 	}
 	/** Sync registered mutations for a unit without creating a replica unit. */
@@ -577,34 +582,42 @@ let DataSyncPrimaryController = class DataSyncPrimaryController extends RxDispos
 		this._injector.add([IRemoteInstanceService, { useFactory: () => toModule(this._rpcChannelService.requestChannel(RemoteInstanceServiceName)) }]);
 		this._remoteInstanceService = this._injector.get(IRemoteInstanceService);
 		this._remoteReady = this._remoteInstanceService.whenReady();
+		this._handleRemoteRequest(this._remoteReady, "initialize the remote instance service");
 	}
 	_init() {
 		this._univerInstanceService.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((event) => {
 			const { unit: sheet } = event;
 			this._syncingUnits.add(sheet.getUnitId());
-			this._remoteInstanceService.createInstance({
+			this._handleRemoteRequest(this._remoteInstanceService.createInstance({
 				unitID: sheet.getUnitId(),
 				type: UniverInstanceType.UNIVER_SHEET,
 				snapshot: sheet.getSnapshot()
-			});
+			}), "create the remote workbook");
 		});
 		this._univerInstanceService.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {
 			this._syncingUnits.delete(workbook.getUnitId());
-			this._remoteInstanceService.disposeInstance({ unitID: workbook.getUnitId() });
+			this._handleRemoteRequest(this._remoteInstanceService.disposeInstance({ unitID: workbook.getUnitId() }), "dispose the remote workbook");
 		});
 		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo, options) => {
 			const { type, params, id } = commandInfo;
 			const unitId = (params === null || params === void 0 ? void 0 : params.unitId) || "";
-			if (type === CommandType.MUTATION && (!unitId || this._syncingUnits.has(unitId)) && !(options === null || options === void 0 ? void 0 : options.fromSync) && this._syncingMutations.has(id)) this.syncMutation(commandInfo, options);
+			if (type === CommandType.MUTATION && (!unitId || this._syncingUnits.has(unitId)) && !(options === null || options === void 0 ? void 0 : options.fromSync) && this._syncingMutations.has(id)) this._handleRemoteRequest(this.syncMutation(commandInfo, options), `sync mutation ${id}`);
 		}));
 	}
+	_handleRemoteRequest(request, operation) {
+		request.catch((error) => {
+			if (error instanceof ChannelClientDisposedError) return;
+			this._logService.error(`[DataSyncPrimaryController]: Failed to ${operation}.`, error);
+		});
+	}
 };
 DataSyncPrimaryController = __decorate([
 	__decorateParam(0, Inject(Injector)),
 	__decorateParam(1, ICommandService),
 	__decorateParam(2, IUniverInstanceService),
 	__decorateParam(3, IRPCChannelService),
-	__decorateParam(4, IRemoteSyncService)
+	__decorateParam(4, IRemoteSyncService),
+	__decorateParam(5, ILogService)
 ], DataSyncPrimaryController);
 
 //#endregion
@@ -641,7 +654,7 @@ DataSyncReplicaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/rpc";
-var version = "1.0.0-rc.0";
+var version = "1.0.1";
 
 //#endregion
 //#region src/services/rpc/implementations/web-worker-rpc.service.ts

package/lib/index.js

@@ -26,7 +26,7 @@ const configSymbolWorkerThread = Symbol(PLUGIN_CONFIG_KEY_WORKER_THREAD);
 const defaultPluginWorkerThreadConfig = {};
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -34,7 +34,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -127,7 +127,7 @@ WebWorkerRemoteInstanceService = __decorate([
 ], WebWorkerRemoteInstanceService);
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -138,7 +138,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -151,14 +151,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -221,6 +221,13 @@ function toModule(channel) {
 function propertyIsEventSource(name) {
 	return name.endsWith("$");
 }
+const CHANNEL_CLIENT_DISPOSED_ERROR_MESSAGE = "[ChannelClient]: client is disposed!";
+var ChannelClientDisposedError = class extends Error {
+	constructor() {
+		super(CHANNEL_CLIENT_DISPOSED_ERROR_MESSAGE);
+		this.name = "ChannelClientDisposedError";
+	}
+};
 /**
 * This method provides implementation for `IChannel` and is responsible for
 * transforming a local calling to a RPC calling.
@@ -237,7 +244,7 @@ var ChannelClient = class extends RxDisposable {
 	}
 	dispose() {
 		if (this._disposed) return;
-		const error = /* @__PURE__ */ new Error("[ChannelClient]: client is disposed!");
+		const error = new ChannelClientDisposedError();
 		this._initialized.error(error);
 		for (const responseHandler of this._pendingRequests.values()) responseHandler.dispose(error);
 		this._pendingRequests.clear();
@@ -246,11 +253,11 @@ var ChannelClient = class extends RxDisposable {
 	getChannel(channelName) {
 		return {
 			call: (method, args) => {
-				if (this._disposed) return Promise.reject(/* @__PURE__ */ new Error("[ChannelClient]: client is disposed!"));
+				if (this._disposed) return Promise.reject(new ChannelClientDisposedError());
 				return this._remoteCall(channelName, method, args);
 			},
 			subscribe: (eventMethod, args) => {
-				if (this._disposed) throw new Error("[ChannelClient]: client is disposed!");
+				if (this._disposed) throw new ChannelClientDisposedError();
 				return this._remoteSubscribe(channelName, eventMethod, args);
 			}
 		};
@@ -393,10 +400,7 @@ var ChannelServer = class extends RxDisposable {
 			case 101:
 				this._onSubscribe(request);
 				break;
-			case 102:
-				this._onUnsubscribe(request);
-				break;
-			default: break;
+			case 102: this._onUnsubscribe(request);
 		}
 	}
 	_sendInitialize() {
@@ -519,13 +523,14 @@ var ChannelService = class {
 //#endregion
 //#region src/controllers/data-sync/data-sync-primary.controller.ts
 let DataSyncPrimaryController = class DataSyncPrimaryController extends RxDisposable {
-	constructor(_injector, _commandService, _univerInstanceService, _rpcChannelService, _remoteSyncService) {
+	constructor(_injector, _commandService, _univerInstanceService, _rpcChannelService, _remoteSyncService, _logService) {
 		super();
 		this._injector = _injector;
 		this._commandService = _commandService;
 		this._univerInstanceService = _univerInstanceService;
 		this._rpcChannelService = _rpcChannelService;
 		this._remoteSyncService = _remoteSyncService;
+		this._logService = _logService;
 		_defineProperty(this, "_remoteInstanceService", void 0);
 		_defineProperty(this, "_syncingUnits", /* @__PURE__ */ new Set());
 		_defineProperty(this, "_syncingMutations", /* @__PURE__ */ new Set());
@@ -545,14 +550,14 @@ let DataSyncPrimaryController = class DataSyncPrimaryController extends RxDispos
 		const alreadySyncing = this._syncingUnits.has(unitId);
 		this._syncingUnits.add(unitId);
 		const unit = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_SHEET) ?? this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_BASE);
-		if (!alreadySyncing && unit) this._remoteInstanceService.createInstance({
+		if (!alreadySyncing && unit) this._handleRemoteRequest(this._remoteInstanceService.createInstance({
 			unitID: unit.getUnitId(),
 			type: unit.type,
 			snapshot: unit.getSnapshot()
-		});
+		}), "create the remote unit");
 		return toDisposable(() => {
 			if (!alreadySyncing) this._syncingUnits.delete(unitId);
-			if (!alreadySyncing && unit) this._remoteInstanceService.disposeInstance({ unitID: unit.getUnitId() });
+			if (!alreadySyncing && unit) this._handleRemoteRequest(this._remoteInstanceService.disposeInstance({ unitID: unit.getUnitId() }), "dispose the remote unit");
 		});
 	}
 	/** Sync registered mutations for a unit without creating a replica unit. */
@@ -577,34 +582,42 @@ let DataSyncPrimaryController = class DataSyncPrimaryController extends RxDispos
 		this._injector.add([IRemoteInstanceService, { useFactory: () => toModule(this._rpcChannelService.requestChannel(RemoteInstanceServiceName)) }]);
 		this._remoteInstanceService = this._injector.get(IRemoteInstanceService);
 		this._remoteReady = this._remoteInstanceService.whenReady();
+		this._handleRemoteRequest(this._remoteReady, "initialize the remote instance service");
 	}
 	_init() {
 		this._univerInstanceService.getTypeOfUnitAdded$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((event) => {
 			const { unit: sheet } = event;
 			this._syncingUnits.add(sheet.getUnitId());
-			this._remoteInstanceService.createInstance({
+			this._handleRemoteRequest(this._remoteInstanceService.createInstance({
 				unitID: sheet.getUnitId(),
 				type: UniverInstanceType.UNIVER_SHEET,
 				snapshot: sheet.getSnapshot()
-			});
+			}), "create the remote workbook");
 		});
 		this._univerInstanceService.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {
 			this._syncingUnits.delete(workbook.getUnitId());
-			this._remoteInstanceService.disposeInstance({ unitID: workbook.getUnitId() });
+			this._handleRemoteRequest(this._remoteInstanceService.disposeInstance({ unitID: workbook.getUnitId() }), "dispose the remote workbook");
 		});
 		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo, options) => {
 			const { type, params, id } = commandInfo;
 			const unitId = (params === null || params === void 0 ? void 0 : params.unitId) || "";
-			if (type === CommandType.MUTATION && (!unitId || this._syncingUnits.has(unitId)) && !(options === null || options === void 0 ? void 0 : options.fromSync) && this._syncingMutations.has(id)) this.syncMutation(commandInfo, options);
+			if (type === CommandType.MUTATION && (!unitId || this._syncingUnits.has(unitId)) && !(options === null || options === void 0 ? void 0 : options.fromSync) && this._syncingMutations.has(id)) this._handleRemoteRequest(this.syncMutation(commandInfo, options), `sync mutation ${id}`);
 		}));
 	}
+	_handleRemoteRequest(request, operation) {
+		request.catch((error) => {
+			if (error instanceof ChannelClientDisposedError) return;
+			this._logService.error(`[DataSyncPrimaryController]: Failed to ${operation}.`, error);
+		});
+	}
 };
 DataSyncPrimaryController = __decorate([
 	__decorateParam(0, Inject(Injector)),
 	__decorateParam(1, ICommandService),
 	__decorateParam(2, IUniverInstanceService),
 	__decorateParam(3, IRPCChannelService),
-	__decorateParam(4, IRemoteSyncService)
+	__decorateParam(4, IRemoteSyncService),
+	__decorateParam(5, ILogService)
 ], DataSyncPrimaryController);
 
 //#endregion
@@ -641,7 +654,7 @@ DataSyncReplicaController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/rpc";
-var version = "1.0.0-rc.0";
+var version = "1.0.1";
 
 //#endregion
 //#region src/services/rpc/implementations/web-worker-rpc.service.ts

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

@@ -15,7 +15,7 @@
  */
 import type { IDisposable, IMutation, IMutationInfo } from '@univerjs/core';
 import type { IRemoteSyncMutationOptions } from '../../services/remote-instance/remote-instance.service';
-import { ICommandService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
+import { ICommandService, ILogService, Injector, IUniverInstanceService, RxDisposable } from '@univerjs/core';
 import { IRemoteSyncService } from '../../services/remote-instance/remote-instance.service';
 import { IRPCChannelService } from '../../services/rpc/channel.service';
 /**
@@ -30,12 +30,13 @@ export declare class DataSyncPrimaryController extends RxDisposable {
     private readonly _univerInstanceService;
     private readonly _rpcChannelService;
     private readonly _remoteSyncService;
+    private readonly _logService;
     private _remoteInstanceService;
     private readonly _syncingUnits;
     private readonly _syncingMutations;
     private _syncMutationQueue;
     private _remoteReady;
-    constructor(_injector: Injector, _commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _rpcChannelService: IRPCChannelService, _remoteSyncService: IRemoteSyncService);
+    constructor(_injector: Injector, _commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _rpcChannelService: IRPCChannelService, _remoteSyncService: IRemoteSyncService, _logService: ILogService);
     registerSyncingMutations(mutation: IMutation<object>): void;
     /**
      * Only spreadsheets would be synced to the web worker in normal situations. If you would like to
@@ -48,4 +49,5 @@ export declare class DataSyncPrimaryController extends RxDisposable {
     waitForPendingMutations(): Promise<void>;
     private _initRPCChannels;
     private _init;
+    private _handleRemoteRequest;
 }

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

@@ -52,6 +52,9 @@ export interface IChannelClient {
 export interface IChannelServer {
     registerChannel<T extends IChannel>(channelName: string, channel: T): void;
 }
+export declare class ChannelClientDisposedError extends Error {
+    constructor();
+}
 /**
  * This method provides implementation for `IChannel` and is responsible for
  * transforming a local calling to a RPC calling.

package/lib/umd/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/rpc",
-  "version": "1.0.0-rc.0",
+  "version": "1.0.1",
   "private": false,
   "description": "Browser RPC layer for Univer main-thread and worker communication.",
   "author": "DreamNum Co., Ltd. <developer@univer.ai>",
@@ -52,13 +52,13 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/core": "1.0.0-rc.0"
+    "@univerjs/core": "1.0.1"
   },
   "devDependencies": {
+    "@univerjs-infra/shared": "1.0.1",
     "rxjs": "^7.8.2",
     "typescript": "^6.0.3",
-    "vitest": "^5.0.0",
-    "@univerjs-infra/shared": "1.0.0-rc.0"
+    "vitest": "^5.0.0"
   },
   "scripts": {
     "test": "vitest run",