@theia/core 1.34.0-next.7 → 1.34.1

package/src/electron-node/token/electron-token-validator.ts

@@ -18,7 +18,7 @@ import * as http from 'http';
 import * as cookie from 'cookie';
 import * as crypto from 'crypto';
 import { injectable, postConstruct } from 'inversify';
-import { MaybePromise } from '../../common';
+import { isObject, isString, MaybePromise } from '../../common';
 import { ElectronSecurityToken } from '../../electron-common/electron-token';
 import { WsRequestValidatorContribution } from '../../node/ws-request-validators';
 
@@ -44,9 +44,9 @@ export class ElectronTokenValidator implements WsRequestValidatorContribution {
      */
     allowRequest(request: http.IncomingMessage): boolean {
         const cookieHeader = request.headers.cookie;
-        if (typeof cookieHeader === 'string') {
+        if (isString(cookieHeader)) {
             const token = cookie.parse(cookieHeader)[ElectronSecurityToken];
-            if (typeof token === 'string') {
+            if (isString(token)) {
                 return this.isTokenValid(JSON.parse(token));
             }
         }
@@ -60,10 +60,8 @@ export class ElectronTokenValidator implements WsRequestValidatorContribution {
      *
      * @param token Parsed object sent by the client as the token.
      */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    isTokenValid(token: any): boolean {
-        // eslint-disable-next-line no-null/no-null
-        if (typeof token === 'object' && token !== null && typeof token.value === 'string') {
+    isTokenValid(token: unknown): boolean {
+        if (isObject(token) && isString(token.value)) {
             try {
                 const received = Buffer.from(token.value, 'utf8');
                 const expected = Buffer.from(this.electronSecurityToken!.value, 'utf8');

package/src/node/backend-application.ts

@@ -159,12 +159,7 @@ export class BackendApplication {
         protected readonly contributionsProvider: ContributionProvider<BackendApplicationContribution>,
         @inject(BackendApplicationCliContribution) protected readonly cliParams: BackendApplicationCliContribution) {
         process.on('uncaughtException', error => {
-            if (error) {
-                console.error('Uncaught Exception: ', error.toString());
-                if (error.stack) {
-                    console.error(error.stack);
-                }
-            }
+            this.handleUncaughtError(error);
         });
 
         // Workaround for Electron not installing a handler to ignore SIGPIPE error
@@ -335,4 +330,13 @@ export class BackendApplication {
         return this.stopwatch.startAsync(name, `Backend ${name}`, fn, { thresholdMillis: TIMER_WARNING_THRESHOLD });
     }
 
+    protected handleUncaughtError(error: Error): void {
+        if (error) {
+            console.error('Uncaught Exception: ', error.toString());
+            if (error.stack) {
+                console.error(error.stack);
+            }
+        }
+    }
+
 }

package/src/node/i18n/localization-contribution.ts

@@ -16,7 +16,7 @@
 
 import * as fs from 'fs-extra';
 import { inject, injectable, named } from 'inversify';
-import { ContributionProvider } from '../../common';
+import { ContributionProvider, isObject } from '../../common';
 import { LanguageInfo, Localization } from '../../common/i18n/localization';
 import { LocalizationProvider } from './localization-provider';
 
@@ -79,12 +79,12 @@ export class LocalizationRegistry {
     }
 
     protected flattenTranslations(localization: unknown): Record<string, string> {
-        if (typeof localization === 'object' && localization) {
+        if (isObject(localization)) {
             const record: Record<string, string> = {};
             for (const [key, value] of Object.entries(localization)) {
                 if (typeof value === 'string') {
                     record[key] = value;
-                } else if (value && typeof value === 'object') {
+                } else if (isObject(value)) {
                     const flattened = this.flattenTranslations(value);
                     for (const [flatKey, flatValue] of Object.entries(flattened)) {
                         record[`${key}/${flatKey}`] = flatValue;