@opensumi/ide-connection 2.24.2 → 2.24.3-next-1684292909.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/common/rpcProtocol.d.ts +0 -1
  2. package/lib/common/rpcProtocol.d.ts.map +1 -1
  3. package/lib/common/rpcProtocol.js +9 -9
  4. package/lib/common/rpcProtocol.js.map +1 -1
  5. package/package.json +4 -4
  6. package/src/common/rpcProtocol.ts +8 -9
package/lib/common/rpcProtocol.d.ts CHANGED
@@ -44,7 +44,6 @@ export interface IRPCProtocol {
44
44
  set<T>(identifier: ProxyIdentifier<T>, instance: T): T;
45
45
  get<T>(identifier: ProxyIdentifier<T>): T;
46
46
  }
47
- export declare const DEFAULT_TIMEOUT_MS = 30000;
48
47
  export declare class RPCProtocol implements IRPCProtocol {
49
48
  private readonly _protocol;
50
49
  private readonly _locals;
package/lib/common/rpcProtocol.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rpcProtocol.d.ts","sourceRoot":"","sources":["../../src/common/rpcProtocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpcProtocol.d.ts","sourceRoot":"","sources":["../../src/common/rpcProtocol.ts"],"names":[],"mappings":"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"}
package/lib/common/rpcProtocol.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.RPCProtocol = exports.DEFAULT_TIMEOUT_MS = exports.IRPCProtocol = exports.MessageIO = exports.ObjectTransfer = exports.createMainContextProxyIdentifier = exports.createExtHostContextProxyIdentifier = exports.ProxyIdentifier = exports.transformErrorForSerialization = exports.RPCProtocolEnv = void 0;
3
+ exports.RPCProtocol = exports.IRPCProtocol = exports.MessageIO = exports.ObjectTransfer = exports.createMainContextProxyIdentifier = exports.createExtHostContextProxyIdentifier = exports.ProxyIdentifier = exports.transformErrorForSerialization = exports.RPCProtocolEnv = void 0;
4
4
  const ide_core_common_1 = require("@opensumi/ide-core-common");
5
5
  // Uri: vscode 中的 uri
6
6
  // URI: 在 vscode 中的 uri 基础上包装了一些基础方法
@@ -140,8 +140,6 @@ function canceled() {
140
140
  error.name = error.message;
141
141
  return error;
142
142
  }
143
- // 默认 30s 超时
144
- exports.DEFAULT_TIMEOUT_MS = 30000;
145
143
  class RPCProtocol {
146
144
  constructor(connection, logger) {
147
145
  this._protocol = connection;
@@ -195,11 +193,13 @@ class RPCProtocol {
195
193
  this._pendingRPCReplies.set(callId, result);
196
194
  const msg = MessageIO.serializeRequest(callId, rpcId, methodName, args);
197
195
  this._protocol.send(msg);
198
- // 设置超时回调
199
- const timeoutHandle = setTimeout(() => {
200
- this._handleTimeout(callId);
201
- }, this._protocol.timeout || exports.DEFAULT_TIMEOUT_MS);
202
- this._timeoutHandles.set(callId, timeoutHandle);
196
+ // 设置超时回调, -1 即不配置超时时间
197
+ if (this._protocol.timeout && this._protocol.timeout !== -1) {
198
+ const timeoutHandle = setTimeout(() => {
199
+ this._handleTimeout(callId);
200
+ }, this._protocol.timeout);
201
+ this._timeoutHandles.set(callId, timeoutHandle);
202
+ }
203
203
  return result.promise;
204
204
  }
205
205
  _receiveOneMessage(rawmsg) {
@@ -311,7 +311,7 @@ class RPCProtocol {
311
311
  const pendingReply = this._pendingRPCReplies.get(callId);
312
312
  this._pendingRPCReplies.delete(callId);
313
313
  this._timeoutHandles.delete(callId);
314
- pendingReply.reject('RPC Timeout');
314
+ pendingReply.reject(new Error('RPC Timeout: ' + callId));
315
315
  }
316
316
  }
317
317
  exports.RPCProtocol = RPCProtocol;
package/lib/common/rpcProtocol.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"rpcProtocol.js","sourceRoot":"","sources":["../../src/common/rpcProtocol.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rpcProtocol.js","sourceRoot":"","sources":["../../src/common/rpcProtocol.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opensumi/ide-connection",
3
- "version": "2.24.2",
3
+ "version": "2.24.3-next-1684292909.0",
4
4
  "files": [
5
5
  "lib",
6
6
  "src"
@@ -17,16 +17,16 @@
17
17
  "url": "git@github.com:opensumi/core.git"
18
18
  },
19
19
  "dependencies": {
20
- "@opensumi/ide-core-common": "2.24.2",
20
+ "@opensumi/ide-core-common": "2.24.3-next-1684292909.0",
21
21
  "@opensumi/vscode-jsonrpc": "^8.0.0-next.2",
22
22
  "path-match": "^1.2.4",
23
23
  "reconnecting-websocket": "^4.2.0",
24
24
  "ws": "^8.9.0"
25
25
  },
26
26
  "devDependencies": {
27
- "@opensumi/ide-components": "2.24.2",
27
+ "@opensumi/ide-components": "2.24.3-next-1684292909.0",
28
28
  "@opensumi/ide-dev-tool": "1.3.1",
29
29
  "mock-socket": "^9.0.2"
30
30
  },
31
- "gitHead": "4e2ab44a50ca9e84c1d889f9a5369f9f7129f4d5"
31
+ "gitHead": "4efae81f31ce805f8d9c672f181085ddf70cfbeb"
32
32
  }
package/src/common/rpcProtocol.ts CHANGED
@@ -203,8 +203,6 @@ function canceled(): Error {
203
203
  error.name = error.message;
204
204
  return error;
205
205
  }
206
- // 默认 30s 超时
207
- export const DEFAULT_TIMEOUT_MS = 30000;
208
206
 
209
207
  export class RPCProtocol implements IRPCProtocol {
210
208
  private readonly _protocol: IMessagePassingProtocol;
@@ -281,12 +279,13 @@ export class RPCProtocol implements IRPCProtocol {
281
279
  const msg = MessageIO.serializeRequest(callId, rpcId, methodName, args);
282
280
 
283
281
  this._protocol.send(msg);
284
- // 设置超时回调
285
- const timeoutHandle = setTimeout(() => {
286
- this._handleTimeout(callId);
287
- }, this._protocol.timeout || DEFAULT_TIMEOUT_MS);
288
-
289
- this._timeoutHandles.set(callId, timeoutHandle);
282
+ // 设置超时回调, -1 即不配置超时时间
283
+ if (this._protocol.timeout && this._protocol.timeout !== -1) {
284
+ const timeoutHandle = setTimeout(() => {
285
+ this._handleTimeout(callId);
286
+ }, this._protocol.timeout);
287
+ this._timeoutHandles.set(callId, timeoutHandle);
288
+ }
290
289
 
291
290
  return result.promise;
292
291
  }
@@ -411,6 +410,6 @@ export class RPCProtocol implements IRPCProtocol {
411
410
  this._pendingRPCReplies.delete(callId);
412
411
  this._timeoutHandles.delete(callId);
413
412
 
414
- pendingReply.reject('RPC Timeout');
413
+ pendingReply.reject(new Error('RPC Timeout: '+ callId));
415
414
  }
416
415
  }