@theia/mini-browser 1.45.0 → 1.46.0-next.72

package/lib/node/mini-browser-ws-validator.js

@@ -1,70 +1,70 @@
-"use strict";
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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
-// *****************************************************************************
-var __decorate = (this && this.__decorate) || function (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);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MiniBrowserWsRequestValidator = void 0;
-const inversify_1 = require("@theia/core/shared/inversify");
-const url = require("url");
-const mini_browser_endpoint_1 = require("../common/mini-browser-endpoint");
-/**
- * Prevents explicit WebSocket connections from the mini-browser virtual host.
- */
-let MiniBrowserWsRequestValidator = class MiniBrowserWsRequestValidator {
-    constructor() {
-        this.serveSameOrigin = false;
-    }
-    init() {
-        const pattern = process.env[mini_browser_endpoint_1.MiniBrowserEndpoint.HOST_PATTERN_ENV] || mini_browser_endpoint_1.MiniBrowserEndpoint.HOST_PATTERN_DEFAULT;
-        if (pattern === '{{hostname}}') {
-            this.serveSameOrigin = true;
-        }
-        const vhostRe = pattern
-            .replace(/\./g, '\\.')
-            .replace('{{uuid}}', '.+')
-            .replace('{{hostname}}', '.+');
-        this.miniBrowserHostRe = new RegExp(vhostRe, 'i');
-    }
-    async allowWsUpgrade(request) {
-        if (request.headers.origin && !this.serveSameOrigin) {
-            const origin = url.parse(request.headers.origin);
-            if (origin.host && this.miniBrowserHostRe.test(origin.host)) {
-                // If the origin comes from the WebViews, refuse:
-                return false;
-            }
-        }
-        return true;
-    }
-};
-__decorate([
-    (0, inversify_1.postConstruct)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], MiniBrowserWsRequestValidator.prototype, "init", null);
-MiniBrowserWsRequestValidator = __decorate([
-    (0, inversify_1.injectable)()
-], MiniBrowserWsRequestValidator);
-exports.MiniBrowserWsRequestValidator = MiniBrowserWsRequestValidator;
+"use strict";
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson 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
+// *****************************************************************************
+var __decorate = (this && this.__decorate) || function (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);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MiniBrowserWsRequestValidator = void 0;
+const inversify_1 = require("@theia/core/shared/inversify");
+const url = require("url");
+const mini_browser_endpoint_1 = require("../common/mini-browser-endpoint");
+/**
+ * Prevents explicit WebSocket connections from the mini-browser virtual host.
+ */
+let MiniBrowserWsRequestValidator = class MiniBrowserWsRequestValidator {
+    constructor() {
+        this.serveSameOrigin = false;
+    }
+    init() {
+        const pattern = process.env[mini_browser_endpoint_1.MiniBrowserEndpoint.HOST_PATTERN_ENV] || mini_browser_endpoint_1.MiniBrowserEndpoint.HOST_PATTERN_DEFAULT;
+        if (pattern === '{{hostname}}') {
+            this.serveSameOrigin = true;
+        }
+        const vhostRe = pattern
+            .replace(/\./g, '\\.')
+            .replace('{{uuid}}', '.+')
+            .replace('{{hostname}}', '.+');
+        this.miniBrowserHostRe = new RegExp(vhostRe, 'i');
+    }
+    async allowWsUpgrade(request) {
+        if (request.headers.origin && !this.serveSameOrigin) {
+            const origin = url.parse(request.headers.origin);
+            if (origin.host && this.miniBrowserHostRe.test(origin.host)) {
+                // If the origin comes from the WebViews, refuse:
+                return false;
+            }
+        }
+        return true;
+    }
+};
+__decorate([
+    (0, inversify_1.postConstruct)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], MiniBrowserWsRequestValidator.prototype, "init", null);
+MiniBrowserWsRequestValidator = __decorate([
+    (0, inversify_1.injectable)()
+], MiniBrowserWsRequestValidator);
+exports.MiniBrowserWsRequestValidator = MiniBrowserWsRequestValidator;
 //# sourceMappingURL=mini-browser-ws-validator.js.map

package/lib/package.spec.js

@@ -1,19 +1,19 @@
-// *****************************************************************************
-// Copyright (C) 2018 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
-// *****************************************************************************
-describe('mini-browser package', () => {
-    it('support code coverage statistics', () => true);
-});
+// *****************************************************************************
+// Copyright (C) 2018 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
+// *****************************************************************************
+describe('mini-browser package', () => {
+    it('support code coverage statistics', () => true);
+});
 //# sourceMappingURL=package.spec.js.map

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@theia/mini-browser",
-  "version": "1.45.0",
+  "version": "1.46.0-next.72+4a275b29d",
   "description": "Theia - Mini-Browser Extension",
   "dependencies": {
-    "@theia/core": "1.45.0",
-    "@theia/filesystem": "1.45.0",
+    "@theia/core": "1.46.0-next.72+4a275b29d",
+    "@theia/filesystem": "1.46.0-next.72+4a275b29d",
     "@types/mime-types": "^2.1.0",
     "mime-types": "^2.1.18",
     "pdfobject": "^2.0.201604172",
-    "uuid": "^8.0.0",
     "vhost": "^3.0.2"
   },
   "publishConfig": {
@@ -49,10 +48,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.45.0"
+    "@theia/ext-scripts": "1.46.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "2b20a60a0f9b54b19838a0f71760989a19622495"
+  "gitHead": "4a275b29d0db6c81190488c7f76cb667da05ef19"
 }

package/src/browser/environment/mini-browser-environment-module.ts

@@ -1,24 +1,24 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { ContainerModule } from '@theia/core/shared/inversify';
-import { MiniBrowserEnvironment } from './mini-browser-environment';
-
-export default new ContainerModule(bind => {
-    bind(MiniBrowserEnvironment).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(MiniBrowserEnvironment);
-});
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson 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 { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { ContainerModule } from '@theia/core/shared/inversify';
+import { MiniBrowserEnvironment } from './mini-browser-environment';
+
+export default new ContainerModule(bind => {
+    bind(MiniBrowserEnvironment).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(MiniBrowserEnvironment);
+});

package/src/browser/environment/mini-browser-environment.ts

@@ -1,87 +1,87 @@
-// *****************************************************************************
-// Copyright (C) 2020 Ericsson 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 { Endpoint, FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
-import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { v4 } from 'uuid';
-import { MiniBrowserEndpoint } from '../../common/mini-browser-endpoint';
-
-/**
- * Fetch values from the backend's environment and caches them locally.
- * Helps with deploying various mini-browser endpoints.
- */
-@injectable()
-export class MiniBrowserEnvironment implements FrontendApplicationContribution {
-
-    protected _hostPatternPromise: Promise<string>;
-    protected _hostPattern?: string;
-
-    @inject(EnvVariablesServer)
-    protected environment: EnvVariablesServer;
-
-    @postConstruct()
-    protected init(): void {
-        this._hostPatternPromise = this.getHostPattern()
-            .then(pattern => this._hostPattern = pattern);
-    }
-
-    get hostPatternPromise(): Promise<string> {
-        return this._hostPatternPromise;
-    }
-
-    get hostPattern(): string | undefined {
-        return this._hostPattern;
-    }
-
-    async onStart(): Promise<void> {
-        await this._hostPatternPromise;
-    }
-
-    /**
-     * Throws if `hostPatternPromise` is not yet resolved.
-     */
-    getEndpoint(uuid: string, hostname?: string): Endpoint {
-        if (this._hostPattern === undefined) {
-            throw new Error('MiniBrowserEnvironment is not finished initializing');
-        }
-        return new Endpoint({
-            path: MiniBrowserEndpoint.PATH,
-            host: this._hostPattern
-                .replace('{{uuid}}', uuid)
-                .replace('{{hostname}}', hostname || this.getDefaultHostname()),
-        });
-    }
-
-    /**
-     * Throws if `hostPatternPromise` is not yet resolved.
-     */
-    getRandomEndpoint(): Endpoint {
-        return this.getEndpoint(v4());
-    }
-
-    protected async getHostPattern(): Promise<string> {
-        return environment.electron.is()
-            ? MiniBrowserEndpoint.HOST_PATTERN_DEFAULT
-            : this.environment.getValue(MiniBrowserEndpoint.HOST_PATTERN_ENV)
-                .then(envVar => envVar?.value || MiniBrowserEndpoint.HOST_PATTERN_DEFAULT);
-    }
-
-    protected getDefaultHostname(): string {
-        return self.location.host;
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Ericsson 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 { Endpoint, FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
+import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
+import { generateUuid } from '@theia/core/lib/common/uuid';
+import { MiniBrowserEndpoint } from '../../common/mini-browser-endpoint';
+
+/**
+ * Fetch values from the backend's environment and caches them locally.
+ * Helps with deploying various mini-browser endpoints.
+ */
+@injectable()
+export class MiniBrowserEnvironment implements FrontendApplicationContribution {
+
+    protected _hostPatternPromise: Promise<string>;
+    protected _hostPattern?: string;
+
+    @inject(EnvVariablesServer)
+    protected environment: EnvVariablesServer;
+
+    @postConstruct()
+    protected init(): void {
+        this._hostPatternPromise = this.getHostPattern()
+            .then(pattern => this._hostPattern = pattern);
+    }
+
+    get hostPatternPromise(): Promise<string> {
+        return this._hostPatternPromise;
+    }
+
+    get hostPattern(): string | undefined {
+        return this._hostPattern;
+    }
+
+    async onStart(): Promise<void> {
+        await this._hostPatternPromise;
+    }
+
+    /**
+     * Throws if `hostPatternPromise` is not yet resolved.
+     */
+    getEndpoint(uuid: string, hostname?: string): Endpoint {
+        if (this._hostPattern === undefined) {
+            throw new Error('MiniBrowserEnvironment is not finished initializing');
+        }
+        return new Endpoint({
+            path: MiniBrowserEndpoint.PATH,
+            host: this._hostPattern
+                .replace('{{uuid}}', uuid)
+                .replace('{{hostname}}', hostname || this.getDefaultHostname()),
+        });
+    }
+
+    /**
+     * Throws if `hostPatternPromise` is not yet resolved.
+     */
+    getRandomEndpoint(): Endpoint {
+        return this.getEndpoint(generateUuid());
+    }
+
+    protected async getHostPattern(): Promise<string> {
+        return environment.electron.is()
+            ? MiniBrowserEndpoint.HOST_PATTERN_DEFAULT
+            : this.environment.getValue(MiniBrowserEndpoint.HOST_PATTERN_ENV)
+                .then(envVar => envVar?.value || MiniBrowserEndpoint.HOST_PATTERN_DEFAULT);
+    }
+
+    protected getDefaultHostname(): string {
+        return self.location.host;
+    }
+}