@theia/core 1.48.1 → 1.48.3

package/src/browser/endpoint.spec.ts

@@ -1,148 +1,148 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import * as chai from 'chai';
-import { Endpoint } from './endpoint';
-
-const expect = chai.expect;
-
-describe('Endpoint', () => {
-
-    describe('01 #getWebSocketUrl', () => {
-
-        it('Should correctly join root pathname', () => {
-            expectWsUri(
-                {
-                    httpScheme: 'ws',
-                    path: '/miau/'
-                },
-                {
-                    host: 'example.org',
-                    pathname: '/',
-                    search: '',
-                    protocol: ''
-                }, 'ws://example.org/miau/');
-        });
-
-        it('Should correctly join pathname and path', () => {
-            expectWsUri(
-                {
-                    httpScheme: 'ws',
-                    path: '/miau/'
-                },
-                {
-                    host: 'example.org',
-                    pathname: '/mainresource',
-                    search: '',
-                    protocol: ''
-                }, 'ws://example.org/mainresource/miau/');
-        });
-
-        it('Should correctly join pathname and path, ignoring double slash in between', () => {
-            expectWsUri(
-                {
-                    httpScheme: 'ws',
-                    path: '/miau/'
-                },
-                {
-                    host: 'example.org',
-                    pathname: '/mainresource/',
-                    search: '',
-                    protocol: ''
-                }, 'ws://example.org/mainresource/miau/');
-        });
-
-        it('Should correctly join pathname and path, without trailing slash', () => {
-            expectWsUri(
-                {
-                    httpScheme: 'ws',
-                    path: '/miau'
-                },
-                {
-                    host: 'example.org',
-                    pathname: '/mainresource',
-                    search: '',
-                    protocol: ''
-                }, 'ws://example.org/mainresource/miau');
-        });
-    });
-
-    describe('02 #httpScheme', () => {
-
-        it('Should choose https:// if location protocol is https://', () => {
-            expectRestUri(
-                {
-                    path: '/'
-                },
-                {
-                    host: 'example.org',
-                    pathname: '/',
-                    search: '',
-                    protocol: 'https:'
-                }, 'https://example.org/');
-        });
-
-        it("should return with the 'options.httpScheme' if defined", () => {
-            expect(new Endpoint({ httpScheme: 'foo:' }, {
-                host: 'example.org',
-                pathname: '/',
-                search: '',
-                protocol: 'https:'
-            }).httpScheme).to.be.equal('foo:');
-        });
-
-        it('should return with the HTTP if the protocol is HTTP.', () => {
-            expect(new Endpoint({}, {
-                host: 'example.org',
-                pathname: '/',
-                search: '',
-                protocol: 'http:'
-            }).httpScheme).to.be.equal('http:');
-        });
-
-        it('should return with the HTTPS if the protocol is HTTPS.', () => {
-            expect(new Endpoint({}, {
-                host: 'example.org',
-                pathname: '/',
-                search: '',
-                protocol: 'https:'
-            }).httpScheme).to.be.equal('https:');
-        });
-
-        it('should return with the HTTP if the protocol is *not* HTTP or HTTPS.', () => {
-            expect(new Endpoint({}, {
-                host: 'example.org',
-                pathname: '/',
-                search: '',
-                protocol: 'file:'
-            }).httpScheme).to.be.equal('http:');
-        });
-
-    });
-
-});
-
-function expectWsUri(options: Endpoint.Options, mockLocation: Endpoint.Location, expectedUri: string): void {
-    const cut = new Endpoint(options, mockLocation);
-    const uri = cut.getWebSocketUrl();
-    expect(uri.toString()).to.eq(expectedUri);
-}
-
-function expectRestUri(options: Endpoint.Options, mockLocation: Endpoint.Location, expectedUri: string): void {
-    const cut = new Endpoint(options, mockLocation);
-    const uri = cut.getRestUrl();
-    expect(uri.toString()).to.eq(expectedUri);
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as chai from 'chai';
+import { Endpoint } from './endpoint';
+
+const expect = chai.expect;
+
+describe('Endpoint', () => {
+
+    describe('01 #getWebSocketUrl', () => {
+
+        it('Should correctly join root pathname', () => {
+            expectWsUri(
+                {
+                    httpScheme: 'ws',
+                    path: '/miau/'
+                },
+                {
+                    host: 'example.org',
+                    pathname: '/',
+                    search: '',
+                    protocol: ''
+                }, 'ws://example.org/miau/');
+        });
+
+        it('Should correctly join pathname and path', () => {
+            expectWsUri(
+                {
+                    httpScheme: 'ws',
+                    path: '/miau/'
+                },
+                {
+                    host: 'example.org',
+                    pathname: '/mainresource',
+                    search: '',
+                    protocol: ''
+                }, 'ws://example.org/mainresource/miau/');
+        });
+
+        it('Should correctly join pathname and path, ignoring double slash in between', () => {
+            expectWsUri(
+                {
+                    httpScheme: 'ws',
+                    path: '/miau/'
+                },
+                {
+                    host: 'example.org',
+                    pathname: '/mainresource/',
+                    search: '',
+                    protocol: ''
+                }, 'ws://example.org/mainresource/miau/');
+        });
+
+        it('Should correctly join pathname and path, without trailing slash', () => {
+            expectWsUri(
+                {
+                    httpScheme: 'ws',
+                    path: '/miau'
+                },
+                {
+                    host: 'example.org',
+                    pathname: '/mainresource',
+                    search: '',
+                    protocol: ''
+                }, 'ws://example.org/mainresource/miau');
+        });
+    });
+
+    describe('02 #httpScheme', () => {
+
+        it('Should choose https:// if location protocol is https://', () => {
+            expectRestUri(
+                {
+                    path: '/'
+                },
+                {
+                    host: 'example.org',
+                    pathname: '/',
+                    search: '',
+                    protocol: 'https:'
+                }, 'https://example.org/');
+        });
+
+        it("should return with the 'options.httpScheme' if defined", () => {
+            expect(new Endpoint({ httpScheme: 'foo:' }, {
+                host: 'example.org',
+                pathname: '/',
+                search: '',
+                protocol: 'https:'
+            }).httpScheme).to.be.equal('foo:');
+        });
+
+        it('should return with the HTTP if the protocol is HTTP.', () => {
+            expect(new Endpoint({}, {
+                host: 'example.org',
+                pathname: '/',
+                search: '',
+                protocol: 'http:'
+            }).httpScheme).to.be.equal('http:');
+        });
+
+        it('should return with the HTTPS if the protocol is HTTPS.', () => {
+            expect(new Endpoint({}, {
+                host: 'example.org',
+                pathname: '/',
+                search: '',
+                protocol: 'https:'
+            }).httpScheme).to.be.equal('https:');
+        });
+
+        it('should return with the HTTP if the protocol is *not* HTTP or HTTPS.', () => {
+            expect(new Endpoint({}, {
+                host: 'example.org',
+                pathname: '/',
+                search: '',
+                protocol: 'file:'
+            }).httpScheme).to.be.equal('http:');
+        });
+
+    });
+
+});
+
+function expectWsUri(options: Endpoint.Options, mockLocation: Endpoint.Location, expectedUri: string): void {
+    const cut = new Endpoint(options, mockLocation);
+    const uri = cut.getWebSocketUrl();
+    expect(uri.toString()).to.eq(expectedUri);
+}
+
+function expectRestUri(options: Endpoint.Options, mockLocation: Endpoint.Location, expectedUri: string): void {
+    const cut = new Endpoint(options, mockLocation);
+    const uri = cut.getRestUrl();
+    expect(uri.toString()).to.eq(expectedUri);
+}

package/src/browser/endpoint.ts

@@ -1,136 +1,136 @@
-// *****************************************************************************
-// Copyright (C) 2017 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
-// *****************************************************************************
-
-import URI from '../common/uri';
-
-/**
- * An endpoint provides URLs for http and ws, based on configuration and defaults.
- */
-export class Endpoint {
-    static readonly PROTO_HTTPS: string = 'https:';
-    static readonly PROTO_HTTP: string = 'http:';
-    static readonly PROTO_WS: string = 'ws:';
-    static readonly PROTO_WSS: string = 'wss:';
-    static readonly PROTO_FILE: string = 'file:';
-
-    constructor(
-        protected readonly options: Endpoint.Options = {},
-        protected readonly location: Endpoint.Location = self.location
-    ) { }
-
-    getWebSocketUrl(): URI {
-        return new URI(`${this.wsScheme}//${this.host}${this.pathname}${this.path}`);
-    }
-
-    getRestUrl(): URI {
-        return new URI(`${this.httpScheme}//${this.host}${this.pathname}${this.path}`);
-    }
-
-    protected get pathname(): string {
-        if (this.location.protocol === Endpoint.PROTO_FILE) {
-            return '';
-        }
-        if (this.location.pathname === '/') {
-            return '';
-        }
-        if (this.location.pathname.endsWith('/')) {
-            return this.location.pathname.substring(0, this.location.pathname.length - 1);
-        }
-        return this.location.pathname;
-    }
-
-    get host(): string {
-        if (this.options.host) {
-            return this.options.host;
-        }
-        if (this.location.host) {
-            return this.location.host;
-        }
-        return 'localhost:' + this.port;
-    }
-
-    get origin(): string {
-        return `${this.httpScheme}//${this.host}`;
-    }
-
-    protected get port(): string {
-        return this.getSearchParam('port', '3000');
-    }
-
-    protected getSearchParam(name: string, defaultValue: string): string {
-        const search = this.location.search;
-        if (!search) {
-            return defaultValue;
-        }
-        return search.substring(1).split('&')
-            .filter(value => value.startsWith(name + '='))
-            .map(value => {
-                const encoded = value.substring(name.length + 1);
-                return decodeURIComponent(encoded);
-            })[0] || defaultValue;
-    }
-
-    protected get wsScheme(): string {
-        if (this.options.wsScheme) {
-            return this.options.wsScheme;
-        }
-        return this.httpScheme === Endpoint.PROTO_HTTPS ? Endpoint.PROTO_WSS : Endpoint.PROTO_WS;
-    }
-
-    /**
-     * The HTTP/HTTPS scheme of the endpoint, or the user defined one.
-     * See: `Endpoint.Options.httpScheme`.
-     */
-    get httpScheme(): string {
-        if (this.options.httpScheme) {
-            return this.options.httpScheme;
-        }
-        if (this.location.protocol === Endpoint.PROTO_HTTP ||
-            this.location.protocol === Endpoint.PROTO_HTTPS) {
-            return this.location.protocol;
-        }
-        return Endpoint.PROTO_HTTP;
-    }
-
-    protected get path(): string {
-        if (this.options.path) {
-            if (this.options.path.startsWith('/')) {
-                return this.options.path;
-            } else {
-                return '/' + this.options.path;
-            }
-        }
-        return '';
-    }
-}
-
-export namespace Endpoint {
-    export class Options {
-        host?: string;
-        wsScheme?: string;
-        httpScheme?: string;
-        path?: string;
-    }
-
-    // Necessary for running tests with dependency on TS lib on node
-    // FIXME figure out how to mock with ts-node
-    export class Location {
-        host: string;
-        pathname: string;
-        search: string;
-        protocol: string;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2017 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import URI from '../common/uri';
+
+/**
+ * An endpoint provides URLs for http and ws, based on configuration and defaults.
+ */
+export class Endpoint {
+    static readonly PROTO_HTTPS: string = 'https:';
+    static readonly PROTO_HTTP: string = 'http:';
+    static readonly PROTO_WS: string = 'ws:';
+    static readonly PROTO_WSS: string = 'wss:';
+    static readonly PROTO_FILE: string = 'file:';
+
+    constructor(
+        protected readonly options: Endpoint.Options = {},
+        protected readonly location: Endpoint.Location = self.location
+    ) { }
+
+    getWebSocketUrl(): URI {
+        return new URI(`${this.wsScheme}//${this.host}${this.pathname}${this.path}`);
+    }
+
+    getRestUrl(): URI {
+        return new URI(`${this.httpScheme}//${this.host}${this.pathname}${this.path}`);
+    }
+
+    protected get pathname(): string {
+        if (this.location.protocol === Endpoint.PROTO_FILE) {
+            return '';
+        }
+        if (this.location.pathname === '/') {
+            return '';
+        }
+        if (this.location.pathname.endsWith('/')) {
+            return this.location.pathname.substring(0, this.location.pathname.length - 1);
+        }
+        return this.location.pathname;
+    }
+
+    get host(): string {
+        if (this.options.host) {
+            return this.options.host;
+        }
+        if (this.location.host) {
+            return this.location.host;
+        }
+        return 'localhost:' + this.port;
+    }
+
+    get origin(): string {
+        return `${this.httpScheme}//${this.host}`;
+    }
+
+    protected get port(): string {
+        return this.getSearchParam('port', '3000');
+    }
+
+    protected getSearchParam(name: string, defaultValue: string): string {
+        const search = this.location.search;
+        if (!search) {
+            return defaultValue;
+        }
+        return search.substring(1).split('&')
+            .filter(value => value.startsWith(name + '='))
+            .map(value => {
+                const encoded = value.substring(name.length + 1);
+                return decodeURIComponent(encoded);
+            })[0] || defaultValue;
+    }
+
+    protected get wsScheme(): string {
+        if (this.options.wsScheme) {
+            return this.options.wsScheme;
+        }
+        return this.httpScheme === Endpoint.PROTO_HTTPS ? Endpoint.PROTO_WSS : Endpoint.PROTO_WS;
+    }
+
+    /**
+     * The HTTP/HTTPS scheme of the endpoint, or the user defined one.
+     * See: `Endpoint.Options.httpScheme`.
+     */
+    get httpScheme(): string {
+        if (this.options.httpScheme) {
+            return this.options.httpScheme;
+        }
+        if (this.location.protocol === Endpoint.PROTO_HTTP ||
+            this.location.protocol === Endpoint.PROTO_HTTPS) {
+            return this.location.protocol;
+        }
+        return Endpoint.PROTO_HTTP;
+    }
+
+    protected get path(): string {
+        if (this.options.path) {
+            if (this.options.path.startsWith('/')) {
+                return this.options.path;
+            } else {
+                return '/' + this.options.path;
+            }
+        }
+        return '';
+    }
+}
+
+export namespace Endpoint {
+    export class Options {
+        host?: string;
+        wsScheme?: string;
+        httpScheme?: string;
+        path?: string;
+    }
+
+    // Necessary for running tests with dependency on TS lib on node
+    // FIXME figure out how to mock with ts-node
+    export class Location {
+        host: string;
+        pathname: string;
+        search: string;
+        protocol: string;
+    }
+}