@theia/plugin-ext 1.46.1 → 1.47.0

package/src/main/browser/text-editors-main.ts

@@ -14,7 +14,6 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { URI } from '@theia/core/shared/vscode-uri';
 import {
     TextEditorsMain,
     MAIN_RPC_CONTEXT,
@@ -40,12 +39,14 @@ import { TextEditorMain } from './text-editor-main';
 import { disposed } from '../../common/errors';
 import { toMonacoWorkspaceEdit } from './languages-main';
 import { MonacoBulkEditService } from '@theia/monaco/lib/browser/monaco-bulk-edit-service';
-import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
-import { theiaUritoUriComponents, UriComponents } from '../../common/uri-components';
+import { UriComponents } from '../../common/uri-components';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import * as monaco from '@theia/monaco-editor-core';
 import { ResourceEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
 import { IDecorationRenderOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/editorCommon';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
+import { URI } from '@theia/core';
 
 export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
@@ -59,7 +60,6 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         private readonly documents: DocumentsMain,
         rpc: RPCProtocol,
         private readonly bulkEditService: MonacoBulkEditService,
-        private readonly monacoEditorService: MonacoEditorService,
     ) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.TEXT_EDITORS_EXT);
         this.toDispose.push(editorsAndDocuments);
@@ -131,8 +131,8 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         const workspaceEdit = toMonacoWorkspaceEdit(dto);
         try {
             const edits = ResourceEdit.convert(workspaceEdit);
-            const { success } = await this.bulkEditService.apply(edits, { respectAutoSaveConfig: metadata?.isRefactoring });
-            return success;
+            const { isApplied } = await this.bulkEditService.apply(edits, { respectAutoSaveConfig: metadata?.isRefactoring });
+            return isApplied;
         } catch {
             return false;
         }
@@ -145,9 +145,9 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         return Promise.resolve(this.editorsAndDocuments.getEditor(id)!.insertSnippet(template, ranges, opts));
     }
 
-    $registerTextEditorDecorationType(key: string, options: DecorationRenderOptions | IDecorationRenderOptions): void {
+    $registerTextEditorDecorationType(key: string, options: DecorationRenderOptions): void {
         this.injectRemoteUris(options);
-        this.monacoEditorService.registerDecorationType('Plugin decoration', key, options as IDecorationRenderOptions);
+        StandaloneServices.get(ICodeEditorService).registerDecorationType('Plugin decoration', key, options as IDecorationRenderOptions);
         this.toDispose.push(Disposable.create(() => this.$removeTextEditorDecorationType(key)));
     }
 
@@ -171,13 +171,13 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
 
     protected toRemoteUri(uri?: UriComponents): UriComponents | undefined {
         if (uri && uri.scheme === 'file') {
-            return theiaUritoUriComponents(this.fileEndpoint.withQuery(URI.revive(uri).toString()));
+            return this.fileEndpoint.withQuery(URI.fromComponents(uri).toString()).toComponents();
         }
         return uri;
     }
 
     $removeTextEditorDecorationType(key: string): void {
-        this.monacoEditorService.removeDecorationType(key);
+        StandaloneServices.get(ICodeEditorService).removeDecorationType(key);
     }
 
     $tryHideEditor(id: string): Promise<void> {
@@ -200,6 +200,14 @@ export class TextEditorsMainImpl implements TextEditorsMain, Disposable {
         return Promise.resolve();
     }
 
+    $save(uri: UriComponents): PromiseLike<UriComponents | undefined> {
+        return this.editorsAndDocuments.save(URI.fromComponents(uri)).then(u => u?.toComponents());
+    }
+
+    $saveAs(uri: UriComponents): PromiseLike<UriComponents | undefined> {
+        return this.editorsAndDocuments.saveAs(URI.fromComponents(uri)).then(u => u?.toComponents());
+    }
+
     $saveAll(includeUntitled?: boolean): Promise<boolean> {
         return this.editorsAndDocuments.saveAll(includeUntitled);
     }

package/src/main/browser/theme-icon-override.ts

@@ -14,7 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { getIconRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/iconRegistry';
 
 // @monaco-uplift
 // Keep this up-to-date with the table at https://code.visualstudio.com/api/references/icons-in-labels#icon-listing
@@ -27,11 +27,12 @@ const codeIconMap: Record<string, string> = {
     'callhierarchy-outgoing': 'call-outgoing',
     'callstack-view-icon': 'debug-alt',
     'callstack-view-session': 'bug',
+    'chat-editor-label-icon': 'comment-discussion',
     'comments-view-icon': 'comment-discussion',
     'debug-breakpoint': 'debug-breakpoint',
     'debug-breakpoint-conditional': 'debug-breakpoint-conditional',
     'debug-breakpoint-conditional-disabled': 'debug-breakpoint-conditional-disabled',
-    'debug-breakpoint-conditional-verified': 'debug-breakpoint-conditional-unverified',
+    'debug-breakpoint-conditional-unverified': 'debug-breakpoint-conditional-unverified',
     'debug-breakpoint-data': 'debug-breakpoint-data',
     'debug-breakpoint-data-disabled': 'debug-breakpoint-data-disabled',
     'debug-breakpoint-data-unverified': 'debug-breakpoint-data-unverified',
@@ -173,9 +174,11 @@ const codeIconMap: Record<string, string> = {
     'remote-explorer-view-icon': 'remote-explorer',
     'review-comment-collapse': 'chevron-up',
     'run-view-icon': 'debug-alt',
+    'runtime-extensions-editor-label-icon': ' extensions',
     'search-clear-results': 'clear-all',
     'search-collapse-results': 'collapse-all',
     'search-details': 'ellipsis',
+    'search-editor-label-icon': 'search',
     'search-expand-results': 'expand-all',
     'search-hide-replace': 'chevron-right',
     'search-new-editor': 'new-file',
@@ -190,6 +193,7 @@ const codeIconMap: Record<string, string> = {
     'settings-add': 'add',
     'settings-discard': 'discard',
     'settings-edit': 'edit',
+    'settings-editor-label-icon': 'settings',
     'settings-folder-dropdown': 'triangle-down',
     'settings-group-collapsed': 'chevron-right',
     'settings-group-expanded': 'chevron-down',
@@ -229,24 +233,14 @@ const codeIconMap: Record<string, string> = {
     'watch-expressions-add-function-breakpoint': 'add',
     'watch-expressions-remove-all': 'close-all',
     'watch-view-icon': 'debug-alt',
-    'widget-close': 'close'
+    'widget-close': 'close',
+    'workspace-trust-editor-label-icon': ' shield'
 };
 
-const originalAsCSSSelector = ThemeIcon.asCSSSelector;
-const originalAsClassName = ThemeIcon.asClassName;
-const originalAsClassNameArray = ThemeIcon.asClassNameArray;
+const registry = getIconRegistry();
 
-function buildMappedIcon(icon: ThemeIcon): ThemeIcon {
-    const id = codeIconMap[icon.id] ?? icon.id;
-    const newIcon: ThemeIcon = {
-        ...icon,
-        id
-    };
-    return newIcon;
+for (const key in codeIconMap) {
+    if (codeIconMap.hasOwnProperty(key)) {
+        registry.registerIcon(key, { id: codeIconMap[key] }, key);
+    }
 }
-
-Object.assign(ThemeIcon, {
-    asCSSSelector: (icon: ThemeIcon) => originalAsCSSSelector(buildMappedIcon(icon)),
-    asClassName: (icon: ThemeIcon) => originalAsClassName(buildMappedIcon(icon)),
-    asClassNameArray: (icon: ThemeIcon) => originalAsClassNameArray(buildMappedIcon(icon))
-});

package/src/main/browser/view/plugin-tree-view-node-label-provider.ts

@@ -20,7 +20,7 @@ import { LabelProviderContribution, LabelProvider, URIIconReference } from '@the
 import { TreeLabelProvider } from '@theia/core/lib/browser/tree/tree-label-provider';
 import { TreeViewNode } from './tree-view-widget';
 import { TreeNode } from '@theia/core/lib/browser/tree/tree';
-import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 @injectable()
 export class PluginTreeViewNodeLabelProvider implements LabelProviderContribution {

package/src/main/browser/view/plugin-view-registry.ts

@@ -40,14 +40,14 @@ import { DebugConsoleContribution } from '@theia/debug/lib/browser/console/debug
 import { TreeViewWidget } from './tree-view-widget';
 import { SEARCH_VIEW_CONTAINER_ID } from '@theia/search-in-workspace/lib/browser/search-in-workspace-factory';
 import { TEST_VIEW_CONTAINER_ID } from '@theia/test/lib/browser/view/test-view-contribution';
-import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/themeService';
 import { WebviewView, WebviewViewResolver } from '../webview-views/webview-views';
 import { WebviewWidget, WebviewWidgetIdentifier } from '../webview/webview';
 import { CancellationToken } from '@theia/core/lib/common/cancellation';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { nls } from '@theia/core';
 import { TheiaDockPanel } from '@theia/core/lib/browser/shell/theia-dock-panel';
 import { Deferred } from '@theia/core/lib/common/promise-util';
+import { ThemeIcon } from '@theia/monaco-editor-core/esm/vs/base/common/themables';
 
 export const PLUGIN_VIEW_FACTORY_ID = 'plugin-view';
 export const PLUGIN_VIEW_CONTAINER_FACTORY_ID = 'plugin-view-container';
@@ -109,6 +109,16 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
 
     private readonly webviewViewRevivals = new Map<string, { readonly webview: WebviewView; readonly revival: Deferred<void> }>();
 
+    private nextViewContainerId = 0;
+
+    private static readonly BUILTIN_VIEW_CONTAINERS = new Set<string>([
+        'explorer',
+        'scm',
+        'search',
+        'test',
+        'debug'
+    ]);
+
     private static readonly ID_MAPPINGS: Map<string, string> = new Map([
         // VS Code Viewlets
         [EXPLORER_VIEW_CONTAINER_ID, 'workbench.view.explorer'],
@@ -266,14 +276,15 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     }
 
     registerViewContainer(location: string, viewContainer: ViewContainer): Disposable {
-        if (this.viewContainers.has(viewContainer.id)) {
+        const containerId = `workbench.view.extension.${viewContainer.id}`;
+        if (this.viewContainers.has(containerId)) {
             console.warn('view container such id already registered: ', JSON.stringify(viewContainer));
             return Disposable.NULL;
         }
         const toDispose = new DisposableCollection();
         const containerClass = 'theia-plugin-view-container';
         let themeIconClass = '';
-        const iconClass = 'plugin-view-container-icon-' + viewContainer.id;
+        const iconClass = 'plugin-view-container-icon-' + this.nextViewContainerId++; // having dots in class would not work for css, so we need to generate an id.
 
         if (viewContainer.themeIcon) {
             const icon = ThemeIcon.fromString(viewContainer.themeIcon);
@@ -290,7 +301,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
             `));
         }
 
-        toDispose.push(this.doRegisterViewContainer(viewContainer.id, location, {
+        toDispose.push(this.doRegisterViewContainer(containerId, location, {
             label: viewContainer.title,
             // The container class automatically sets a mask; if we're using a theme icon, we don't want one.
             iconClass: (themeIconClass || containerClass) + ' ' + iconClass,
@@ -349,6 +360,10 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     }
 
     registerView(viewContainerId: string, view: View): Disposable {
+        if (!PluginViewRegistry.BUILTIN_VIEW_CONTAINERS.has(viewContainerId)) {
+            // if it's not a built-in view container, it must be a contributed view container, see https://github.com/eclipse-theia/theia/issues/13249
+            viewContainerId = `workbench.view.extension.${viewContainerId}`;
+        }
         if (this.views.has(view.id)) {
             console.warn('view with such id already registered: ', JSON.stringify(view));
             return Disposable.NULL;
@@ -425,7 +440,7 @@ export class PluginViewRegistry implements FrontendApplicationContribution {
     protected async createNewWebviewView(viewId: string): Promise<WebviewView> {
         const webview = await this.widgetManager.getOrCreateWidget<WebviewWidget>(
             WebviewWidget.FACTORY_ID, <WebviewWidgetIdentifier>{
-                id: v4(),
+                id: generateUuid(),
                 viewId,
             });
         webview.setContentOptions({ allowScripts: true });

package/src/main/browser/view/plugin-view-widget.ts

@@ -75,7 +75,6 @@ export class PluginViewWidget extends Panel implements StatefulWidget, Descripti
         this.id = this.options.id;
         const localContext = this.contextKeyService.createScoped(this.node);
         localContext.setContext('view', this.options.viewId);
-        this.toDispose.push(localContext);
     }
 
     get onDidChangeDescription(): Event<void> {

package/src/main/browser/view/tree-view-widget.tsx

@@ -669,7 +669,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
 
         this.model.proxy!.$dragStarted(this.options.id, selectedNodes.map(selected => selected.id), CancellationToken.None).then(maybeUris => {
             if (maybeUris) {
-                this.applicationShell.addAdditionalDraggedEditorUris(maybeUris.map(URI.fromComponents));
+                this.applicationShell.addAdditionalDraggedEditorUris(maybeUris.map(uri => URI.fromComponents(uri)));
             }
         });
     }
@@ -921,8 +921,7 @@ export class TreeViewWidget extends TreeViewWelcomeWidget {
                     menuPath: contextMenuPath,
                     anchor: { x, y },
                     args,
-                    contextKeyService,
-                    onHide: () => contextKeyService.dispose(),
+                    contextKeyService
                 }), 10);
             }
         }

package/src/main/node/errors.spec.ts

@@ -17,13 +17,13 @@
 import { rejects } from 'assert';
 import { strictEqual } from 'assert/strict';
 import { promises as fs } from 'fs';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { isENOENT } from '../../common/errors';
 
 describe('errors', () => {
     describe('errno-exception', () => {
         it('should be ENOENT error', async () => {
-            await rejects(fs.readFile(v4()), reason => isENOENT(reason));
+            await rejects(fs.readFile(generateUuid()), reason => isENOENT(reason));
         });
 
         it('should not be ENOENT error (no code)', () => {

package/src/plugin/custom-editors.ts

@@ -129,7 +129,7 @@ export class CustomEditorsExtImpl implements CustomEditorsExt {
         if (!entry) {
             throw new Error(`No provider found for '${viewType}'`);
         }
-        const panel = this.webviewExt.createWebviewPanel(viewType, title, {}, options, entry.plugin, handler);
+        const panel = this.webviewExt.createWebviewPanel(viewType, title, {}, options, entry.plugin, handler, false);
         const webviewOptions = WebviewImpl.toWebviewOptions(options, this.workspace, entry.plugin);
         await this.proxy.$createCustomEditorPanel(handler, title, widgetOpenerOptions, webviewOptions);
 

package/src/plugin/debug/debug-ext.ts

@@ -28,7 +28,7 @@ import { DEBUG_SCHEME, SCHEME_PATTERN } from '@theia/debug/lib/common/debug-uri-
 import { Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range, URI as URIImpl } from '../types-impl';
 import { PluginDebugAdapterSession } from './plugin-debug-adapter-session';
 import { PluginDebugAdapterTracker } from './plugin-debug-adapter-tracker';
-import uuid = require('uuid');
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import { DebugAdapter } from '@theia/debug/lib/common/debug-model';
 import { PluginDebugAdapterCreator } from './plugin-debug-adapter-creator';
 import { NodeDebugAdapterCreator } from '../node/debug/plugin-node-debug-adapter-creator';
@@ -345,7 +345,7 @@ export class DebugExtImpl implements DebugExt {
     }
 
     async $createDebugSession(debugConfiguration: DebugConfiguration, workspaceFolderUri: string | undefined): Promise<string> {
-        const sessionId = uuid.v4();
+        const sessionId = generateUuid();
 
         const parentSession = debugConfiguration.parentSessionId ? this.sessions.get(debugConfiguration.parentSessionId) : undefined;
         const theiaSession: theia.DebugSession = {

package/src/plugin/env.ts

@@ -19,7 +19,7 @@ import * as theia from '@theia/plugin';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { EnvMain, PLUGIN_RPC_CONTEXT } from '../common/plugin-api-rpc';
 import { QueryParameters } from '../common/env';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 
 @injectable()
 export abstract class EnvExtImpl {
@@ -38,8 +38,8 @@ export abstract class EnvExtImpl {
     private _remoteName: string | undefined;
 
     constructor() {
-        this.envSessionId = v4();
-        this.envMachineId = v4();
+        this.envSessionId = generateUuid();
+        this.envMachineId = generateUuid();
         this._remoteName = undefined;
     }
 

package/src/plugin/file-system-ext-impl.ts

@@ -41,6 +41,7 @@ import { commonPrefixLength } from '@theia/core/lib/common/strings';
 import { CharCode } from '@theia/core/lib/common/char-code';
 import { BinaryBuffer } from '@theia/core/lib/common/buffer';
 import { Emitter } from '@theia/core/shared/vscode-languageserver-protocol';
+import { MarkdownString } from '../common/plugin-api-rpc-model';
 
 type IDisposable = vscode.Disposable;
 
@@ -223,7 +224,7 @@ export class FileSystemExtImpl implements FileSystemExt {
         this.onWillRegisterFileSystemProviderEmitter.dispose();
     }
 
-    registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, options: { isCaseSensitive?: boolean, isReadonly?: boolean } = {}) {
+    registerFileSystemProvider(scheme: string, provider: vscode.FileSystemProvider, options: { isCaseSensitive?: boolean, isReadonly?: boolean | MarkdownString } = {}) {
 
         if (this._usedSchemes.has(scheme)) {
             throw new Error(`a provider for the scheme '${scheme}' is already registered`);
@@ -252,7 +253,19 @@ export class FileSystemExtImpl implements FileSystemExt {
             capabilities += files.FileSystemProviderCapabilities.FileOpenReadWriteClose;
         }
 
-        this._proxy.$registerFileSystemProvider(handle, scheme, capabilities);
+        let readonlyMessage: MarkdownString | undefined;
+        if (options.isReadonly && MarkdownString.is(options.isReadonly)) {
+            readonlyMessage = {
+                value: options.isReadonly.value,
+                isTrusted: options.isReadonly.isTrusted,
+                supportThemeIcons: options.isReadonly.supportThemeIcons,
+                supportHtml: options.isReadonly.supportHtml,
+                baseUri: options.isReadonly.baseUri,
+                uris: options.isReadonly.uris
+            };
+        }
+
+        this._proxy.$registerFileSystemProvider(handle, scheme, capabilities, readonlyMessage);
 
         const subscription = provider.onDidChangeFile(event => {
             const mapped: IFileChangeDto[] = [];

package/src/plugin/known-commands.ts

@@ -261,6 +261,7 @@ export namespace KnownCommands {
     mappings['closeReferenceSearch'] = ['closeReferenceSearch', CONVERT_VSCODE_TO_MONACO];
     mappings['goToNextReference'] = ['goToNextReference', CONVERT_VSCODE_TO_MONACO];
     mappings['goToPreviousReference'] = ['goToPreviousReference', CONVERT_VSCODE_TO_MONACO];
+    mappings['setContext'] = ['_setContext', CONVERT_VSCODE_TO_MONACO];
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const CONVERT_MONACO_TO_VSCODE = (args: any | undefined) => {

package/src/plugin/languages/diagnostics.ts

@@ -22,7 +22,7 @@ import { MarkerData } from '../../common/plugin-api-rpc-model';
 import { RPCProtocol } from '../../common/rpc-protocol';
 import { PLUGIN_RPC_CONTEXT, LanguagesMain } from '../../common/plugin-api-rpc';
 import { URI } from '@theia/core/shared/vscode-uri';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 
 export class DiagnosticCollection implements theia.DiagnosticCollection {
     private static DIAGNOSTICS_PRIORITY = [
@@ -288,7 +288,7 @@ export class Diagnostics {
     }
 
     private getNextId(): string {
-        return v4();
+        return generateUuid();
     }
 
     private getAllDiagnosticsForResource(uri: URI): theia.Diagnostic[] {

package/src/plugin/languages/link-provider.ts

@@ -33,7 +33,9 @@ export class LinkProviderAdapter {
     provideLinks(resource: URI, token: theia.CancellationToken): Promise<DocumentLink[] | undefined> {
         const document = this.documents.getDocumentData(resource);
         if (!document) {
-            return Promise.reject(new Error(`There is no document for ${resource}`));
+            // not all documents are replicated to the plugin host (e.g. breakpoint input)
+            console.warn(`There is no document for ${resource}`);
+            return Promise.resolve(undefined);
         }
 
         const doc = document.document;

package/src/plugin/markdown-string.ts

@@ -15,7 +15,7 @@
 // *****************************************************************************
 
 import { Mutable } from '@theia/core';
-import { MarkdownStringImpl as BaseMarkdownString, MarkdownString as MarkdownStringInterface } from '@theia/core/lib/common/markdown-rendering';
+import { MarkdownStringImpl as BaseMarkdownString, MarkdownString as MarkdownStringInterface, MarkdownStringTrustedOptions } from '@theia/core/lib/common/markdown-rendering';
 import * as pluginAPI from '@theia/plugin';
 import { es5ClassCompat } from '../common/types';
 import { URI } from './types-impl';
@@ -49,11 +49,11 @@ export class MarkdownString implements pluginAPI.MarkdownString {
         this.#delegate.value = value;
     }
 
-    get isTrusted(): boolean | undefined {
+    get isTrusted(): boolean | MarkdownStringTrustedOptions | undefined {
         return this.#delegate.isTrusted;
     }
 
-    set isTrusted(value: boolean | undefined) {
+    set isTrusted(value: boolean | MarkdownStringTrustedOptions | undefined) {
         this.#delegate.isTrusted = value;
     }
 

package/src/plugin/node/env-node-ext.ts

@@ -18,7 +18,7 @@ import { injectable } from '@theia/core/shared/inversify';
 import * as mac from 'macaddress';
 import { EnvExtImpl } from '../env';
 import { createHash } from 'crypto';
-import { v4 } from 'uuid';
+import { generateUuid } from '@theia/core/lib/common/uuid';
 import fs = require('fs');
 
 /**
@@ -36,7 +36,7 @@ export class EnvNodeExtImpl extends EnvExtImpl {
 
         mac.one((err, macAddress) => {
             if (err) {
-                this.macMachineId = v4();
+                this.macMachineId = generateUuid();
             } else {
                 this.macMachineId = createHash('sha256').update(macAddress, 'utf8').digest('hex');
             }