@theia/core 1.18.0-next.143 → 1.18.0-next.148
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.
- package/lib/browser/keyboard/browser-keyboard-layout-provider.spec.js +6 -4
- package/lib/browser/keyboard/browser-keyboard-layout-provider.spec.js.map +1 -1
- package/lib/browser/messaging/ws-connection-provider.d.ts +3 -3
- package/lib/browser/messaging/ws-connection-provider.d.ts.map +1 -1
- package/lib/browser/messaging/ws-connection-provider.js +9 -3
- package/lib/browser/messaging/ws-connection-provider.js.map +1 -1
- package/lib/browser/storage-service.spec.js +1 -1
- package/lib/browser/storage-service.spec.js.map +1 -1
- package/lib/common/messaging/abstract-connection-provider.d.ts +1 -1
- package/lib/common/messaging/abstract-connection-provider.d.ts.map +1 -1
- package/lib/common/messaging/abstract-connection-provider.js +3 -1
- package/lib/common/messaging/abstract-connection-provider.js.map +1 -1
- package/package.json +3 -3
- package/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts +10 -4
- package/src/browser/messaging/ws-connection-provider.ts +9 -3
- package/src/browser/storage-service.spec.ts +1 -1
- package/src/common/messaging/abstract-connection-provider.ts +3 -1
|
@@ -21,6 +21,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
21
21
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
22
22
|
};
|
|
23
23
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
24
|
+
const jsdom_1 = require("../test/jsdom");
|
|
25
|
+
let disableJSDOM = jsdom_1.enableJSDOM();
|
|
24
26
|
const inversify_1 = require("inversify");
|
|
25
27
|
const chai = require("chai");
|
|
26
28
|
const sinon = require("sinon");
|
|
@@ -31,10 +33,12 @@ const message_service_1 = require("../../common/message-service");
|
|
|
31
33
|
const window_service_1 = require("../window/window-service");
|
|
32
34
|
const browser_keyboard_layout_provider_1 = require("./browser-keyboard-layout-provider");
|
|
33
35
|
const keys_1 = require("./keys");
|
|
36
|
+
disableJSDOM();
|
|
34
37
|
describe('browser keyboard layout provider', function () {
|
|
35
38
|
let stubOSX;
|
|
36
39
|
let stubWindows;
|
|
37
|
-
|
|
40
|
+
before(() => disableJSDOM = jsdom_1.enableJSDOM());
|
|
41
|
+
after(() => disableJSDOM());
|
|
38
42
|
const setup = (system) => {
|
|
39
43
|
switch (system) {
|
|
40
44
|
case 'mac':
|
|
@@ -50,7 +54,6 @@ describe('browser keyboard layout provider', function () {
|
|
|
50
54
|
stubWindows = sinon.stub(os, 'isWindows').value(false);
|
|
51
55
|
}
|
|
52
56
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
53
|
-
stubNavigator = sinon.stub(global, 'navigator').value({});
|
|
54
57
|
const container = new inversify_1.Container();
|
|
55
58
|
container.bind(browser_keyboard_layout_provider_1.BrowserKeyboardLayoutProvider).toSelf();
|
|
56
59
|
container.bind(logger_1.ILogger).to(MockLogger);
|
|
@@ -63,7 +66,6 @@ describe('browser keyboard layout provider', function () {
|
|
|
63
66
|
afterEach(() => {
|
|
64
67
|
stubOSX.restore();
|
|
65
68
|
stubWindows.restore();
|
|
66
|
-
stubNavigator.restore();
|
|
67
69
|
});
|
|
68
70
|
it('detects German Mac layout', async () => {
|
|
69
71
|
const { service } = setup('mac');
|
|
@@ -81,7 +83,7 @@ describe('browser keyboard layout provider', function () {
|
|
|
81
83
|
service.onDidChangeNativeLayout(l => {
|
|
82
84
|
currentLayout = l;
|
|
83
85
|
});
|
|
84
|
-
chai.expect(currentLayout.info.id).to.equal('com.apple.keylayout.
|
|
86
|
+
chai.expect(currentLayout.info.id).to.equal('com.apple.keylayout.German');
|
|
85
87
|
service.validateKey({ code: keys_1.Key.SEMICOLON.code, character: 'm' });
|
|
86
88
|
chai.expect(currentLayout.info.id).to.equal('com.apple.keylayout.French');
|
|
87
89
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser-keyboard-layout-provider.spec.js","sourceRoot":"","sources":["../../../src/browser/keyboard/browser-keyboard-layout-provider.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;AAElF,yCAAkD;AAElD,6BAA6B;AAC7B,+BAA+B;AAC/B,sCAAsC;AACtC,gDAAwD;AACxD,wDAAyD;AACzD,kEAA8D;AAC9D,6DAAyD;AACzD,yFAAmF;AACnF,iCAA6B;AAE7B,QAAQ,CAAC,kCAAkC,EAAE;IAEzC,IAAI,OAAwB,CAAC;IAC7B,IAAI,WAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"browser-keyboard-layout-provider.spec.js","sourceRoot":"","sources":["../../../src/browser/keyboard/browser-keyboard-layout-provider.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,11 +40,11 @@ export interface HttpFallbackOptions {
|
|
|
40
40
|
export declare const DEFAULT_HTTP_FALLBACK_OPTIONS: HttpFallbackOptions;
|
|
41
41
|
export declare class WebSocketConnectionProvider extends AbstractConnectionProvider<WebSocketOptions> {
|
|
42
42
|
protected readonly onSocketDidOpenEmitter: Emitter<void>;
|
|
43
|
-
|
|
43
|
+
get onSocketDidOpen(): Event<void>;
|
|
44
44
|
protected readonly onSocketDidCloseEmitter: Emitter<void>;
|
|
45
|
-
|
|
45
|
+
get onSocketDidClose(): Event<void>;
|
|
46
46
|
protected readonly onHttpFallbackDidActivateEmitter: Emitter<void>;
|
|
47
|
-
|
|
47
|
+
get onHttpFallbackDidActivate(): Event<void>;
|
|
48
48
|
static createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): JsonRpcProxy<T>;
|
|
49
49
|
protected readonly messageService: () => MessageService;
|
|
50
50
|
protected readonly httpFallbackOptions: HttpFallbackOptions | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAc,UAAU,EAAyC,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAuB,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAyB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,qBAAqB,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AAMjG,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAChC,qFAAqF;IACrF,OAAO,EAAE,OAAO,CAAC;IACjB,qGAAqG;IACrG,WAAW,EAAE,MAAM,CAAC;IACpB,iGAAiG;IACjG,cAAc,EAAE,MAAM,CAAC;IACvB,qGAAqG;IACrG,YAAY,EAAE,MAAM,CAAC;IACrB,oFAAoF;IACpF,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,6BAA6B,EAAE,mBAM3C,CAAC;AAEF,qBACa,2BAA4B,SAAQ,0BAA0B,CAAC,gBAAgB,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,
|
|
1
|
+
{"version":3,"file":"ws-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAc,UAAU,EAAyC,MAAM,WAAW,CAAC;AAC1F,OAAO,EAAuB,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,cAAc,EAAyB,MAAM,cAAc,CAAC;AACxH,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,qBAAqB,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,qDAAqD,CAAC;AAMjG,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AAEjE,MAAM,WAAW,mBAAmB;IAChC,qFAAqF;IACrF,OAAO,EAAE,OAAO,CAAC;IACjB,qGAAqG;IACrG,WAAW,EAAE,MAAM,CAAC;IACpB,iGAAiG;IACjG,cAAc,EAAE,MAAM,CAAC;IACvB,qGAAqG;IACrG,YAAY,EAAE,MAAM,CAAC;IACrB,oFAAoF;IACpF,cAAc,EAAE,MAAM,CAAC;CAC1B;AAED,eAAO,MAAM,6BAA6B,EAAE,mBAM3C,CAAC;AAEF,qBACa,2BAA4B,SAAQ,0BAA0B,CAAC,gBAAgB,CAAC;IAEzF,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACzE,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IAC1E,IAAI,gBAAgB,IAAI,KAAK,CAAC,IAAI,CAAC,CAElC;IAED,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;IAED,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC;IAKlH,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,MAAM,cAAc,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAExE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,qBAAqB,CAAC;IACjD,SAAS,CAAC,eAAe,UAAS;IAClC,SAAS,CAAC,qBAAqB,SAAK;IACpC,SAAS,CAAC,cAAc,SAAU;IAClC,SAAS,CAAC,wBAAwB,UAAQ;;IAyB1C,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAejC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuC/C,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,IAAI;IAazG,SAAS,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB;IAiBrD;;OAEG;IACH,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAKlD,SAAS,CAAC,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAKtD;;OAEG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,qBAAqB;IAW7D,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAInC,SAAS,CAAC,kBAAkB,IAAI,IAAI;IAIpC,SAAS,CAAC,YAAY,IAAI,IAAI;CAMjC"}
|
|
@@ -47,11 +47,8 @@ let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocke
|
|
|
47
47
|
constructor() {
|
|
48
48
|
super();
|
|
49
49
|
this.onSocketDidOpenEmitter = new common_1.Emitter();
|
|
50
|
-
this.onSocketDidOpen = this.onSocketDidOpenEmitter.event;
|
|
51
50
|
this.onSocketDidCloseEmitter = new common_1.Emitter();
|
|
52
|
-
this.onSocketDidClose = this.onSocketDidCloseEmitter.event;
|
|
53
51
|
this.onHttpFallbackDidActivateEmitter = new common_1.Emitter();
|
|
54
|
-
this.onHttpFallbackDidActivate = this.onHttpFallbackDidActivateEmitter.event;
|
|
55
52
|
this.useHttpFallback = false;
|
|
56
53
|
this.websocketErrorCounter = 0;
|
|
57
54
|
this.httpFallbackId = uuid_1.v4();
|
|
@@ -76,6 +73,15 @@ let WebSocketConnectionProvider = WebSocketConnectionProvider_1 = class WebSocke
|
|
|
76
73
|
window.addEventListener('offline', () => this.tryReconnect());
|
|
77
74
|
window.addEventListener('online', () => this.tryReconnect());
|
|
78
75
|
}
|
|
76
|
+
get onSocketDidOpen() {
|
|
77
|
+
return this.onSocketDidOpenEmitter.event;
|
|
78
|
+
}
|
|
79
|
+
get onSocketDidClose() {
|
|
80
|
+
return this.onSocketDidCloseEmitter.event;
|
|
81
|
+
}
|
|
82
|
+
get onHttpFallbackDidActivate() {
|
|
83
|
+
return this.onHttpFallbackDidActivateEmitter.event;
|
|
84
|
+
}
|
|
79
85
|
static createProxy(container, path, arg) {
|
|
80
86
|
return container.get(WebSocketConnectionProvider_1).createProxy(path, arg);
|
|
81
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;;;;;AAElF,yCAA0F;AAC1F,yCAAwH;AACxH,kFAA6E;AAC7E,0CAAuC;AACvC,mEAA2D;AAC3D,sGAAiG;AACjG,+BAAkC;AAElC,oBAAQ,CAAC,sBAAU,EAAE,EAAE,4BAAmB,CAAC,CAAC;AAC5C,oBAAQ,CAAC,qBAAS,EAAE,EAAE,4BAAmB,EAAE,CAAC,CAAC,CAAC;AASjC,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAepD,QAAA,6BAA6B,GAAwB;IAC9D,OAAO,EAAE,IAAI;IACb,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,IAAI;IAClB,cAAc,EAAE,IAAI;IACpB,cAAc,EAAE,CAAC;CACpB,CAAC;AAGF,IAAa,2BAA2B,mCAAxC,MAAa,2BAA4B,SAAQ,yDAA4C;
|
|
1
|
+
{"version":3,"file":"ws-connection-provider.js","sourceRoot":"","sources":["../../../src/browser/messaging/ws-connection-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ before(() => {
|
|
|
33
33
|
MockLogger since it does what we need but this is there as a demo of
|
|
34
34
|
sinon for other uses-cases. We can remove this once this technique is
|
|
35
35
|
more generally used. */
|
|
36
|
-
sinon.stub(logger, 'warn').callsFake(() => { });
|
|
36
|
+
sinon.stub(logger, 'warn').callsFake(async () => { });
|
|
37
37
|
return logger;
|
|
38
38
|
});
|
|
39
39
|
testContainer.bind(storage_service_1.StorageService).to(storage_service_1.LocalStorageService).inSingletonScope();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage-service.spec.js","sourceRoot":"","sources":["../../src/browser/storage-service.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,yCAAsC;AACtC,4DAAwD;AACxD,2EAAsE;AACtE,uDAAwE;AACxE,+BAA8B;AAC9B,6CAA2C;AAC3C,4DAAwD;AACxD,+BAA+B;AAC/B,uCAA2D;AAE3D,IAAI,cAA8B,CAAC;AAEnC,MAAM,CAAC,GAAG,EAAE;IACR,MAAM,aAAa,GAAG,IAAI,qBAAS,EAAE,CAAC;IACtC,aAAa,CAAC,IAAI,CAAC,gBAAO,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC7C,MAAM,MAAM,GAAG,IAAI,wBAAU,EAAE,CAAC;QAChC;;;+BAGuB;QACvB,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"storage-service.spec.js","sourceRoot":"","sources":["../../src/browser/storage-service.spec.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;AAElF,yCAAsC;AACtC,4DAAwD;AACxD,2EAAsE;AACtE,uDAAwE;AACxE,+BAA8B;AAC9B,6CAA2C;AAC3C,4DAAwD;AACxD,+BAA+B;AAC/B,uCAA2D;AAE3D,IAAI,cAA8B,CAAC;AAEnC,MAAM,CAAC,GAAG,EAAE;IACR,MAAM,aAAa,GAAG,IAAI,qBAAS,EAAE,CAAC;IACtC,aAAa,CAAC,IAAI,CAAC,gBAAO,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;QAC7C,MAAM,MAAM,GAAG,IAAI,wBAAU,EAAE,CAAC;QAChC;;;+BAGuB;QACvB,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QACtD,OAAO,MAAM,CAAC;IAClB,CAAC,CAAC,CAAC;IACH,aAAa,CAAC,IAAI,CAAC,gCAAc,CAAC,CAAC,EAAE,CAAC,qCAAmB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9E,aAAa,CAAC,IAAI,CAAC,8BAAa,CAAC,CAAC,EAAE,CAAC,uCAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC3E,aAAa,CAAC,IAAI,CAAC,qCAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEpE,aAAa,CAAC,IAAI,CAAC,sBAAa,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,aAAa,CAAC,IAAI,CAAC,uBAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE/D,cAAc,GAAG,aAAa,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAE7B,EAAE,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE;QACzB,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;YAC1B,IAAI,EAAE,KAAK;SACd,CAAC,CAAC;QACH,aAAM,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACjE,aAAM,CAAC,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;YACxC,IAAI,EAAE,KAAK;SACd,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,EAAE;QAC1B,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;YAC1B,IAAI,EAAE,KAAK;SACd,CAAC,CAAC;QACH,aAAM,CAAC,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;YACxC,IAAI,EAAE,KAAK;SACd,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAExB,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QACzC,aAAM,CAAC,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE;YACxC,IAAI,EAAE,KAAK;SACd,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC"}
|
|
@@ -33,7 +33,7 @@ export declare abstract class AbstractConnectionProvider<AbstractOptions extends
|
|
|
33
33
|
protected channelIdSeq: number;
|
|
34
34
|
protected readonly channels: Map<number, WebSocketChannel>;
|
|
35
35
|
protected readonly onIncomingMessageActivityEmitter: Emitter<void>;
|
|
36
|
-
onIncomingMessageActivity: Event<void>;
|
|
36
|
+
get onIncomingMessageActivity(): Event<void>;
|
|
37
37
|
/**
|
|
38
38
|
* Create a proxy object to remote interface of T type
|
|
39
39
|
* over a web socket connection for the given path and proxy factory.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/abstract-connection-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAA4C,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;GAIG;AACH,8BACsB,0BAA0B,CAAC,eAAe,SAAS,MAAM;IAE3E;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAYrI,SAAS,CAAC,YAAY,SAAK;IAC3B,SAAS,CAAC,QAAQ,CAAC,QAAQ,gCAAuC;IAElE,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;
|
|
1
|
+
{"version":3,"file":"abstract-connection-provider.d.ts","sourceRoot":"","sources":["../../../src/common/messaging/abstract-connection-provider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAc,UAAU,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAA4C,MAAM,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;GAIG;AACH,8BACsB,0BAA0B,CAAC,eAAe,SAAS,MAAM;IAE3E;;;OAGG;IACH,MAAM,CAAC,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAYrI,SAAS,CAAC,YAAY,SAAK;IAC3B,SAAS,CAAC,QAAQ,CAAC,QAAQ,gCAAuC;IAElE,SAAS,CAAC,QAAQ,CAAC,gCAAgC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAiB;IACnF,IAAI,yBAAyB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;IAED;;;OAGG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC;IAC7F;;;;;;OAMG;IACH,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC;IAU7E;;OAEG;IACH,MAAM,CAAC,OAAO,EAAE,iBAAiB,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAQnE,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,IAAI,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,IAAI;IAkBxG,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB;IAE9D,SAAS,CAAC,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAWtD,SAAS,CAAC,YAAY,IAAI,MAAM;CAInC"}
|
|
@@ -36,7 +36,6 @@ let AbstractConnectionProvider = class AbstractConnectionProvider {
|
|
|
36
36
|
this.channelIdSeq = 0;
|
|
37
37
|
this.channels = new Map();
|
|
38
38
|
this.onIncomingMessageActivityEmitter = new event_1.Emitter();
|
|
39
|
-
this.onIncomingMessageActivity = this.onIncomingMessageActivityEmitter.event;
|
|
40
39
|
}
|
|
41
40
|
/**
|
|
42
41
|
* Create a proxy object to remote interface of T type
|
|
@@ -48,6 +47,9 @@ let AbstractConnectionProvider = class AbstractConnectionProvider {
|
|
|
48
47
|
static createProxy(container, path, target) {
|
|
49
48
|
throw new Error('abstract');
|
|
50
49
|
}
|
|
50
|
+
get onIncomingMessageActivity() {
|
|
51
|
+
return this.onIncomingMessageActivityEmitter.event;
|
|
52
|
+
}
|
|
51
53
|
createProxy(path, arg) {
|
|
52
54
|
const factory = arg instanceof proxy_factory_1.JsonRpcProxyFactory ? arg : new proxy_factory_1.JsonRpcProxyFactory(arg);
|
|
53
55
|
this.listen({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-connection-provider.js","sourceRoot":"","sources":["../../../src/common/messaging/abstract-connection-provider.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;;;;;;AAElF,yCAAmD;AACnD,yDAAqF;AACrF,oCAA0C;AAE1C,mDAAoE;AAGpE;;;;GAIG;AAEH,IAAsB,0BAA0B,GAAhD,MAAsB,0BAA0B;IAAhD;QAkBc,iBAAY,GAAG,CAAC,CAAC;QACR,aAAQ,GAAG,IAAI,GAAG,EAA4B,CAAC;QAE/C,qCAAgC,GAAkB,IAAI,eAAO,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"abstract-connection-provider.js","sourceRoot":"","sources":["../../../src/common/messaging/abstract-connection-provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.18.0-next.
|
|
3
|
+
"version": "1.18.0-next.148+9ce6feb1e83",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
19
|
"@primer/octicons-react": "^9.0.0",
|
|
20
|
-
"@theia/application-package": "1.18.0-next.
|
|
20
|
+
"@theia/application-package": "1.18.0-next.148+9ce6feb1e83",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -177,5 +177,5 @@
|
|
|
177
177
|
"nyc": {
|
|
178
178
|
"extends": "../../configs/nyc.json"
|
|
179
179
|
},
|
|
180
|
-
"gitHead": "
|
|
180
|
+
"gitHead": "9ce6feb1e83dd92def73efbea08e7f5aae5e78e2"
|
|
181
181
|
}
|
|
@@ -14,6 +14,10 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
+
import { enableJSDOM } from '../test/jsdom';
|
|
18
|
+
|
|
19
|
+
let disableJSDOM = enableJSDOM();
|
|
20
|
+
|
|
17
21
|
import { Container, injectable } from 'inversify';
|
|
18
22
|
import type { IMacKeyboardLayoutInfo } from 'native-keymap';
|
|
19
23
|
import * as chai from 'chai';
|
|
@@ -26,11 +30,15 @@ import { WindowService } from '../window/window-service';
|
|
|
26
30
|
import { BrowserKeyboardLayoutProvider } from './browser-keyboard-layout-provider';
|
|
27
31
|
import { Key } from './keys';
|
|
28
32
|
|
|
33
|
+
disableJSDOM();
|
|
34
|
+
|
|
29
35
|
describe('browser keyboard layout provider', function (): void {
|
|
30
36
|
|
|
31
37
|
let stubOSX: sinon.SinonStub;
|
|
32
38
|
let stubWindows: sinon.SinonStub;
|
|
33
|
-
|
|
39
|
+
|
|
40
|
+
before(() => disableJSDOM = enableJSDOM());
|
|
41
|
+
after(() => disableJSDOM());
|
|
34
42
|
|
|
35
43
|
const setup = (system: 'mac' | 'win' | 'linux') => {
|
|
36
44
|
switch (system) {
|
|
@@ -47,7 +55,6 @@ describe('browser keyboard layout provider', function (): void {
|
|
|
47
55
|
stubWindows = sinon.stub(os, 'isWindows').value(false);
|
|
48
56
|
}
|
|
49
57
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
50
|
-
stubNavigator = sinon.stub(global, 'navigator' as any).value({});
|
|
51
58
|
const container = new Container();
|
|
52
59
|
container.bind(BrowserKeyboardLayoutProvider).toSelf();
|
|
53
60
|
container.bind(ILogger).to(MockLogger);
|
|
@@ -61,7 +68,6 @@ describe('browser keyboard layout provider', function (): void {
|
|
|
61
68
|
afterEach(() => {
|
|
62
69
|
stubOSX.restore();
|
|
63
70
|
stubWindows.restore();
|
|
64
|
-
stubNavigator.restore();
|
|
65
71
|
});
|
|
66
72
|
|
|
67
73
|
it('detects German Mac layout', async () => {
|
|
@@ -83,7 +89,7 @@ describe('browser keyboard layout provider', function (): void {
|
|
|
83
89
|
currentLayout = l;
|
|
84
90
|
});
|
|
85
91
|
|
|
86
|
-
chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.
|
|
92
|
+
chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.German');
|
|
87
93
|
service.validateKey({ code: Key.SEMICOLON.code, character: 'm' });
|
|
88
94
|
chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.French');
|
|
89
95
|
});
|
|
@@ -59,13 +59,19 @@ export const DEFAULT_HTTP_FALLBACK_OPTIONS: HttpFallbackOptions = {
|
|
|
59
59
|
export class WebSocketConnectionProvider extends AbstractConnectionProvider<WebSocketOptions> {
|
|
60
60
|
|
|
61
61
|
protected readonly onSocketDidOpenEmitter: Emitter<void> = new Emitter();
|
|
62
|
-
|
|
62
|
+
get onSocketDidOpen(): Event<void> {
|
|
63
|
+
return this.onSocketDidOpenEmitter.event;
|
|
64
|
+
}
|
|
63
65
|
|
|
64
66
|
protected readonly onSocketDidCloseEmitter: Emitter<void> = new Emitter();
|
|
65
|
-
|
|
67
|
+
get onSocketDidClose(): Event<void> {
|
|
68
|
+
return this.onSocketDidCloseEmitter.event;
|
|
69
|
+
}
|
|
66
70
|
|
|
67
71
|
protected readonly onHttpFallbackDidActivateEmitter: Emitter<void> = new Emitter();
|
|
68
|
-
|
|
72
|
+
get onHttpFallbackDidActivate(): Event<void> {
|
|
73
|
+
return this.onHttpFallbackDidActivateEmitter.event;
|
|
74
|
+
}
|
|
69
75
|
|
|
70
76
|
static createProxy<T extends object>(container: interfaces.Container, path: string, arg?: object): JsonRpcProxy<T> {
|
|
71
77
|
return container.get(WebSocketConnectionProvider).createProxy<T>(path, arg);
|
|
@@ -34,7 +34,7 @@ before(() => {
|
|
|
34
34
|
MockLogger since it does what we need but this is there as a demo of
|
|
35
35
|
sinon for other uses-cases. We can remove this once this technique is
|
|
36
36
|
more generally used. */
|
|
37
|
-
sinon.stub(logger, 'warn').callsFake(() => { });
|
|
37
|
+
sinon.stub(logger, 'warn').callsFake(async () => { });
|
|
38
38
|
return logger;
|
|
39
39
|
});
|
|
40
40
|
testContainer.bind(StorageService).to(LocalStorageService).inSingletonScope();
|
|
@@ -49,7 +49,9 @@ export abstract class AbstractConnectionProvider<AbstractOptions extends object>
|
|
|
49
49
|
protected readonly channels = new Map<number, WebSocketChannel>();
|
|
50
50
|
|
|
51
51
|
protected readonly onIncomingMessageActivityEmitter: Emitter<void> = new Emitter();
|
|
52
|
-
|
|
52
|
+
get onIncomingMessageActivity(): Event<void> {
|
|
53
|
+
return this.onIncomingMessageActivityEmitter.event;
|
|
54
|
+
}
|
|
53
55
|
|
|
54
56
|
/**
|
|
55
57
|
* Create a proxy object to remote interface of T type
|