@theia/filesystem 1.65.0-next.55 → 1.65.0

package/package.json

@@ -1,20 +1,24 @@
 {
   "name": "@theia/filesystem",
-  "version": "1.65.0-next.55+d141c3601",
+  "version": "1.65.0",
   "description": "Theia - FileSystem Extension",
   "dependencies": {
-    "@theia/core": "1.65.0-next.55+d141c3601",
+    "@theia/core": "1.65.0",
     "@types/body-parser": "^1.17.0",
     "@types/multer": "^1.4.7",
     "@types/tar-fs": "^1.16.1",
+    "@types/tar-stream": "^3.1.4",
     "async-mutex": "^0.3.1",
     "body-parser": "^1.18.3",
     "http-status-codes": "^1.3.0",
-    "minimatch": "^5.1.0",
+    "ignore": "^6.0.0",
+    "minimatch": "^10.0.3",
     "multer": "^2.0.1",
+    "opfs-worker": "1.3.1",
     "rimraf": "^5.0.0",
     "stat-mode": "^1.0.0",
     "tar-fs": "^3.0.9",
+    "tar-stream": "^3.1.7",
     "trash": "^7.2.0",
     "tslib": "^2.6.2",
     "vscode-languageserver-textdocument": "^1.0.1"
@@ -37,6 +41,7 @@
     },
     {
       "frontend": "lib/browser/download/file-download-frontend-module",
+      "frontendOnly": "lib/browser-only/download/file-download-frontend-module",
       "backend": "lib/node/download/file-download-backend-module"
     },
     {
@@ -72,10 +77,10 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.64.0"
+    "@theia/ext-scripts": "1.65.0"
   },
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "d141c3601e8c3d9cd254468790fed3566aa23305"
+  "gitHead": "500dfc80cee94fd2a623b5fb59b22d5a575247c2"
 }

package/src/browser/download/file-download-command-contribution.ts

@@ -21,7 +21,7 @@ import { environment } from '@theia/core/shared/@theia/application-package/lib/e
 import { SelectionService } from '@theia/core/lib/common/selection-service';
 import { Command, CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
 import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
-import { FileDownloadService } from './file-download-service';
+import { FileDownloadService } from '../../common/download/file-download';
 import { CommonCommands } from '@theia/core/lib/browser';
 
 @injectable()

package/src/browser/download/file-download-frontend-module.ts

@@ -16,10 +16,11 @@
 
 import { ContainerModule } from '@theia/core/shared/inversify';
 import { CommandContribution } from '@theia/core/lib/common/command';
-import { FileDownloadService } from './file-download-service';
+import { FileDownloadService } from '../../common/download/file-download';
+import { FileDownloadServiceImpl } from './file-download-service';
 import { FileDownloadCommandContribution } from './file-download-command-contribution';
 
 export default new ContainerModule(bind => {
-    bind(FileDownloadService).toSelf().inSingletonScope();
+    bind(FileDownloadService).to(FileDownloadServiceImpl).inSingletonScope();
     bind(CommandContribution).to(FileDownloadCommandContribution).inSingletonScope();
 });

package/src/browser/download/file-download-service.ts

@@ -14,22 +14,23 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
-import { FileDownloadData } from '../../common/download/file-download-data';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { addClipboardListener } from '@theia/core/lib/browser/widgets';
 import { nls } from '@theia/core';
+import type { FileDownloadData, FileDownloadService } from '../../common/download/file-download';
 
 @injectable()
-export class FileDownloadService {
+export class FileDownloadServiceImpl implements FileDownloadService {
 
     protected anchor: HTMLAnchorElement | undefined;
     protected downloadCounter: number = 0;
 
     @inject(ILogger)
+    @named('file-download')
     protected readonly logger: ILogger;
 
     @inject(MessageService)
@@ -49,10 +50,13 @@ export class FileDownloadService {
 
     async download(uris: URI[], options?: FileDownloadService.DownloadOptions): Promise<void> {
         let cancel = false;
+
         if (uris.length === 0) {
             return;
         }
+
         const copyLink = options && options.copyLink ? true : false;
+
         try {
             const text: string = copyLink ?
                 nls.localize('theia/filesystem/prepareDownloadLink', 'Preparing download link...') :
@@ -168,12 +172,3 @@ export class FileDownloadService {
     }
 
 }
-
-export namespace FileDownloadService {
-    export interface DownloadOptions {
-        /**
-         * `true` if the download link has to be copied to the clipboard. This will not trigger the actual download. Defaults to `false`.
-         */
-        readonly copyLink?: boolean;
-    }
-}

package/src/browser/file-tree/file-tree-widget.tsx

@@ -21,13 +21,13 @@ import URI from '@theia/core/lib/common/uri';
 import { UriSelection } from '@theia/core/lib/common/selection';
 import { isCancelled } from '@theia/core/lib/common/cancellation';
 import { ContextMenuRenderer, NodeProps, TreeProps, TreeNode, CompositeTreeNode, CompressedTreeWidget, CompressedNodeProps } from '@theia/core/lib/browser';
-import { FileUploadService } from '../file-upload-service';
 import { DirNode, FileStatNode, FileStatNodeData } from './file-tree';
 import { FileTreeModel } from './file-tree-model';
 import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
 import { ApplicationShell } from '@theia/core/lib/browser/shell';
 import { FileStat, FileType } from '../../common/files';
 import { isOSX } from '@theia/core';
+import { FileUploadService } from '../../common/upload/file-upload';
 
 export const FILE_TREE_CLASS = 'theia-FileTree';
 export const FILE_STAT_NODE_CLASS = 'theia-FileStatNode';

package/src/browser/filesystem-frontend-contribution.ts

@@ -41,8 +41,8 @@ import { FileChangeType, FileChangesEvent, FileOperation } from '../common/files
 import { FileDialogService, SaveFileDialogProps } from './file-dialog';
 import { FileSelection } from './file-selection';
 import { FileService, UserFileOperationEvent } from './file-service';
-import { FileUploadResult, FileUploadService } from './file-upload-service';
 import { FileSystemPreferences } from '../common/filesystem-preferences';
+import { FileUploadService } from '../common/upload/file-upload';
 
 export namespace FileSystemCommands {
 
@@ -161,7 +161,7 @@ export class FileSystemFrontendContribution implements FrontendApplicationContri
         });
     }
 
-    protected async upload(selection: FileSelection): Promise<FileUploadResult | undefined> {
+    protected async upload(selection: FileSelection): Promise<FileUploadService.UploadResult | undefined> {
         try {
             const source = TreeWidgetSelection.getSource(this.selectionService.selection);
             const fileUploadResult = await this.uploadService.upload(selection.fileStat.isDirectory ? selection.fileStat.resource : selection.fileStat.resource.parent);

package/src/browser/filesystem-frontend-module.ts

@@ -22,7 +22,6 @@ import { WebSocketConnectionProvider, FrontendApplicationContribution, LabelProv
 import { FileResourceResolver } from './file-resource';
 import { bindFileSystemPreferences } from '../common/filesystem-preferences';
 import { FileSystemFrontendContribution } from './filesystem-frontend-contribution';
-import { FileUploadService } from './file-upload-service';
 import { FileTreeDecoratorAdapter, FileTreeLabelProvider } from './file-tree';
 import { FileService, FileServiceContribution } from './file-service';
 import { RemoteFileSystemProvider, RemoteFileSystemServer, remoteFileSystemPath, RemoteFileSystemProxyFactory } from '../common/remote-file-system-provider';
@@ -34,6 +33,8 @@ import { BreadcrumbsFileTreeWidget, createFileTreeBreadcrumbsWidget } from './br
 import { FilesystemSaveableService } from './filesystem-saveable-service';
 import { SaveableService } from '@theia/core/lib/browser/saveable-service';
 import { VSCodeFileServiceContribution, VSCodeFileSystemProvider } from './vscode-file-service-contribution';
+import { FileUploadService } from '../common/upload/file-upload';
+import { FileUploadServiceImpl } from './upload/file-upload-service-impl';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bindFileSystemPreferences(bind);
@@ -55,7 +56,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
     bindFileResource(bind);
 
-    bind(FileUploadService).toSelf().inSingletonScope();
+    bind(FileUploadService).to(FileUploadServiceImpl).inSingletonScope();
 
     bind(FileSystemFrontendContribution).toSelf().inSingletonScope();
     bind(CommandContribution).toService(FileSystemFrontendContribution);

package/src/browser/{file-upload-service.ts → upload/file-upload-service-impl.ts}

@@ -24,41 +24,27 @@ import { MessageService } from '@theia/core/lib/common/message-service';
 import { Progress } from '@theia/core/lib/common/message-service-protocol';
 import { Endpoint } from '@theia/core/lib/browser/endpoint';
 import throttle = require('@theia/core/shared/lodash.throttle');
-import { HTTP_FILE_UPLOAD_PATH } from '../common/file-upload';
+import { HTTP_FILE_UPLOAD_PATH } from '../../common/file-upload';
 import { Semaphore } from 'async-mutex';
-import { FileSystemPreferences } from '../common/filesystem-preferences';
-import { FileService } from './file-service';
+import { FileSystemPreferences } from '../../common/filesystem-preferences';
+import { FileService } from '../file-service';
 import { ConfirmDialog, Dialog } from '@theia/core/lib/browser';
 import { nls } from '@theia/core/lib/common/nls';
 import { Emitter, Event } from '@theia/core/lib/common/event';
-
-export const HTTP_UPLOAD_URL: string = new Endpoint({ path: HTTP_FILE_UPLOAD_PATH }).getRestUrl().toString(true);
-
-export type CustomDataTransfer = Iterable<readonly [string, CustomDataTransferItem]>;
-
-export interface CustomDataTransferItem {
-    asFile(): {
-        readonly id: string;
-        readonly name: string;
-        data(): Promise<Uint8Array>;
-    } | undefined
-}
-export interface FileUploadParams {
-    source?: DataTransfer | CustomDataTransfer
-    progress?: FileUploadProgressParams
-    onDidUpload?: (uri: string) => void;
-    leaveInTemp?: boolean // dont move file out of the initial tmp directory
-}
-export interface FileUploadProgressParams {
-    text: string
+import type { CustomDataTransfer, FileUploadService } from '../../common/upload/file-upload';
+
+interface UploadFilesParams {
+    source: FileUploadService.Source,
+    progress: Progress,
+    token: CancellationToken,
+    leaveInTemp?: boolean,
+    onDidUpload?: (uri: string) => void,
 }
 
-export interface FileUploadResult {
-    uploaded: string[]
-}
+export const HTTP_UPLOAD_URL: string = new Endpoint({ path: HTTP_FILE_UPLOAD_PATH }).getRestUrl().toString(true);
 
 @injectable()
-export class FileUploadService {
+export class FileUploadServiceImpl implements FileUploadService {
 
     static TARGET = 'target';
     static UPLOAD = 'upload';
@@ -70,7 +56,7 @@ export class FileUploadService {
     }
 
     protected uploadForm: FileUploadService.Form;
-    protected deferredUpload?: Deferred<FileUploadResult>;
+    protected deferredUpload?: Deferred<FileUploadService.UploadResult>;
 
     @inject(MessageService)
     protected readonly messageService: MessageService;
@@ -95,13 +81,13 @@ export class FileUploadService {
         const targetInput = document.createElement('input');
         targetInput.type = 'text';
         targetInput.spellcheck = false;
-        targetInput.name = FileUploadService.TARGET;
+        targetInput.name = FileUploadServiceImpl.TARGET;
         targetInput.classList.add('theia-input');
 
         const fileInput = document.createElement('input');
         fileInput.type = 'file';
         fileInput.classList.add('theia-input');
-        fileInput.name = FileUploadService.UPLOAD;
+        fileInput.name = FileUploadServiceImpl.UPLOAD;
         fileInput.multiple = true;
 
         const form = document.createElement('form');
@@ -117,34 +103,32 @@ export class FileUploadService {
                 const source: FileUploadService.Source = new FormData(form);
                 // clean up to allow upload to the same folder twice
                 fileInput.value = '';
-                const targetUri = new URI(<string>source.get(FileUploadService.TARGET));
+                const targetUri = new URI(<string>source.get(FileUploadServiceImpl.TARGET));
                 const { resolve, reject } = this.deferredUpload;
                 this.deferredUpload = undefined;
                 const { onDidUpload } = this.uploadForm;
                 this.withProgress(
-                    (progress, token) => this.uploadAll(targetUri, { source, progress, token, onDidUpload }),
-                    this.uploadForm.progress
+                    (progress, token) => this.uploadAll(targetUri, { source, progress, token, onDidUpload })
                 ).then(resolve, reject);
             }
         });
         return { targetInput, fileInput };
     }
 
-    async upload(targetUri: string | URI, params: FileUploadParams = {}): Promise<FileUploadResult> {
-        const { source, onDidUpload, leaveInTemp } = params;
+    async upload(targetUri: string | URI, params: FileUploadService.UploadParams): Promise<FileUploadService.UploadResult> {
+        const { source, onDidUpload, leaveInTemp } = params || {};
+
         if (source) {
             return this.withProgress(
                 (progress, token) => this.uploadAll(
                     typeof targetUri === 'string' ? new URI(targetUri) : targetUri,
                     { source, progress, token, leaveInTemp, onDidUpload }
-                ),
-                params.progress,
+                )
             );
         }
-        this.deferredUpload = new Deferred<FileUploadResult>();
+        this.deferredUpload = new Deferred<FileUploadService.UploadResult>();
         this.uploadForm.targetInput.value = String(targetUri);
         this.uploadForm.fileInput.click();
-        this.uploadForm.progress = params.progress;
         this.uploadForm.onDidUpload = params.onDidUpload;
         return this.deferredUpload.promise;
     }
@@ -153,14 +137,14 @@ export class FileUploadService {
         return HTTP_UPLOAD_URL;
     }
 
-    protected async uploadAll(targetUri: URI, params: FileUploadService.UploadParams): Promise<FileUploadResult> {
+    protected async uploadAll(targetUri: URI, params: UploadFilesParams): Promise<FileUploadService.UploadResult> {
         const responses: Promise<void>[] = [];
         const status = new Map<File, {
             total: number
             done: number
             uploaded?: boolean
         }>();
-        const result: FileUploadResult = {
+        const result: FileUploadService.UploadResult = {
             uploaded: []
         };
         /**
@@ -351,7 +335,7 @@ export class FileUploadService {
                         resolve();
                     } else if (xhr.status === 500 && xhr.statusText !== xhr.response) {
                         // internal error with cause message
-                        // see packages/filesystem/src/node/node-file-upload-service.ts
+                        // see packages/filesystem/src/node/upload/node-file-upload-service.ts
                         reject(new Error(`Internal server error: ${xhr.response}`));
                     } else {
                         reject(new Error(`POST request failed: ${xhr.status} ${xhr.statusText}`));
@@ -387,11 +371,11 @@ export class FileUploadService {
     }
 
     protected async withProgress<T>(
-        cb: (progress: Progress, token: CancellationToken) => Promise<T>,
-        { text }: FileUploadProgressParams = { text: nls.localize('theia/filesystem/uploadFiles', 'Uploading Files') }
+        cb: (progress: Progress, token: CancellationToken) => Promise<T>
     ): Promise<T> {
         const cancellationSource = new CancellationTokenSource();
         const { token } = cancellationSource;
+        const text = nls.localize('theia/filesystem/uploadFiles', 'Uploading Files');
         const progress = await this.messageService.showProgress(
             { text, options: { cancelable: true } },
             () => cancellationSource.cancel()
@@ -414,7 +398,7 @@ export class FileUploadService {
     }
 
     protected async indexFormData(targetUri: URI, formData: FormData, context: FileUploadService.Context): Promise<void> {
-        for (const entry of formData.getAll(FileUploadService.UPLOAD)) {
+        for (const entry of formData.getAll(FileUploadServiceImpl.UPLOAD)) {
             if (entry instanceof File) {
                 await this.indexFile(targetUri, entry, context);
             }
@@ -433,8 +417,9 @@ export class FileUploadService {
     protected async indexCustomDataTransfer(targetUri: URI, dataTransfer: CustomDataTransfer, context: FileUploadService.Context): Promise<void> {
         for (const [_, item] of dataTransfer) {
             const fileInfo = item.asFile();
+
             if (fileInfo) {
-                await this.indexFile(targetUri, new File([await fileInfo.data()], fileInfo.id), context);
+                await this.indexFile(targetUri, new File([await fileInfo.data() as BlobPart], fileInfo.id), context);
             }
         }
     }
@@ -524,29 +509,3 @@ export class FileUploadService {
     }
 
 }
-
-export namespace FileUploadService {
-    export type Source = FormData | DataTransfer | CustomDataTransfer;
-    export interface UploadEntry {
-        file: File
-        uri: URI
-    }
-    export interface Context {
-        progress: Progress
-        token: CancellationToken
-        accept: (entry: UploadEntry) => Promise<void>
-    }
-    export interface Form {
-        targetInput: HTMLInputElement
-        fileInput: HTMLInputElement
-        progress?: FileUploadProgressParams
-        onDidUpload?: (uri: string) => void
-    }
-    export interface UploadParams {
-        source: FileUploadService.Source,
-        progress: Progress,
-        token: CancellationToken,
-        onDidUpload?: (uri: string) => void,
-        leaveInTemp?: boolean
-    }
-}

package/src/browser-only/browser-only-filesystem-frontend-module.ts

@@ -20,16 +20,26 @@ import { OPFSFileSystemProvider } from './opfs-filesystem-provider';
 import { RemoteFileSystemProvider, RemoteFileSystemServer } from '../common/remote-file-system-provider';
 import { OPFSInitialization, DefaultOPFSInitialization } from './opfs-filesystem-initialization';
 import { BrowserOnlyFileSystemProviderServer } from './browser-only-filesystem-provider-server';
+import { FileUploadService } from '../common/upload/file-upload';
+import { FileUploadServiceImpl } from './upload/file-upload-service-impl';
 
 export default new ContainerModule((bind, _unbind, isBound, rebind) => {
     bind(DefaultOPFSInitialization).toSelf();
     bind(OPFSFileSystemProvider).toSelf();
     bind(OPFSInitialization).toService(DefaultOPFSInitialization);
+
+    if (isBound(FileUploadService)) {
+        rebind(FileUploadService).to(FileUploadServiceImpl).inSingletonScope();
+    } else {
+        bind(FileUploadService).to(FileUploadServiceImpl).inSingletonScope();
+    }
+
     if (isBound(FileSystemProvider)) {
         rebind(FileSystemProvider).to(OPFSFileSystemProvider).inSingletonScope();
     } else {
         bind(FileSystemProvider).to(OPFSFileSystemProvider).inSingletonScope();
     }
+
     if (isBound(RemoteFileSystemProvider)) {
         rebind(RemoteFileSystemServer).to(BrowserOnlyFileSystemProviderServer).inSingletonScope();
     } else {

package/src/browser-only/download/file-download-command-contribution.ts

@@ -0,0 +1,56 @@
+// *****************************************************************************
+// Copyright (C) 2025 Maksim Kachurin 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 { inject, injectable } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { SelectionService } from '@theia/core/lib/common/selection-service';
+import { CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
+import { UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
+import { FileDownloadService } from '../../common/download/file-download';
+import { FileDownloadCommands } from '../../browser/download/file-download-command-contribution';
+
+@injectable()
+export class FileDownloadCommandContribution implements CommandContribution {
+
+    @inject(FileDownloadService)
+    protected readonly downloadService: FileDownloadService;
+
+    @inject(SelectionService)
+    protected readonly selectionService: SelectionService;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(
+            FileDownloadCommands.DOWNLOAD,
+            UriAwareCommandHandler.MultiSelect(this.selectionService, {
+                execute: uris => this.executeDownload(uris),
+                isEnabled: uris => this.isDownloadEnabled(uris),
+                isVisible: uris => this.isDownloadVisible(uris),
+            })
+        );
+    }
+
+    protected async executeDownload(uris: URI[], options?: { copyLink?: boolean }): Promise<void> {
+        this.downloadService.download(uris, options);
+    }
+
+    protected isDownloadEnabled(uris: URI[]): boolean {
+        return uris.length > 0 && uris.every(u => u.scheme === 'file');
+    }
+
+    protected isDownloadVisible(uris: URI[]): boolean {
+        return this.isDownloadEnabled(uris);
+    }
+}

package/src/browser-only/download/file-download-frontend-module.ts

@@ -0,0 +1,26 @@
+// *****************************************************************************
+// Copyright (C) 2025 Maksim Kachurin 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 { ContainerModule } from '@theia/core/shared/inversify';
+import { FileDownloadService } from '../../common/download/file-download';
+import { FileDownloadServiceImpl } from './file-download-service';
+import { CommandContribution } from '@theia/core/lib/common';
+import { FileDownloadCommandContribution } from './file-download-command-contribution';
+
+export default new ContainerModule(bind => {
+    bind(FileDownloadService).to(FileDownloadServiceImpl).inSingletonScope();
+    bind(CommandContribution).to(FileDownloadCommandContribution).inSingletonScope();
+});