55
66import { Promises } from 'vs/base/common/async' ;
77import { getErrorMessage } from 'vs/base/common/errors' ;
8- import { Disposable } from 'vs/base/common/lifecycle' ;
8+ import { Disposable , IDisposable } from 'vs/base/common/lifecycle' ;
99import { isWindows } from 'vs/base/common/platform' ;
1010import { joinPath } from 'vs/base/common/resources' ;
1111import * as semver from 'vs/base/common/semver/semver' ;
@@ -18,12 +18,19 @@ import { ExtensionKey, groupByExtension } from 'vs/platform/extensionManagement/
1818import { IFileService , IFileStatWithMetadata } from 'vs/platform/files/common/files' ;
1919import { ILogService } from 'vs/platform/log/common/log' ;
2020
21- export class ExtensionsDownloader extends Disposable {
21+ export interface IExtensionsDownloader extends IDisposable {
22+ delete ( location : URI ) : Promise < void > ;
23+ downloadExtension ( extension : IGalleryExtension , operation : InstallOperation ) : Promise < { extensionLocation : URI ; signatureArchiveLocation ?: URI } > ;
24+ }
25+
26+ export class ExtensionsDownloader extends Disposable implements IExtensionsDownloader {
2227
2328 readonly extensionsDownloadDir : URI ;
2429 private readonly cache : number ;
2530 private readonly cleanUpPromise : Promise < void > ;
2631
32+ private static readonly SignatureArchiveExtension = '.sigzip' ;
33+
2734 constructor (
2835 @INativeEnvironmentService environmentService : INativeEnvironmentService ,
2936 @IFileService private readonly fileService : IFileService ,
@@ -32,21 +39,33 @@ export class ExtensionsDownloader extends Disposable {
3239 ) {
3340 super ( ) ;
3441 this . extensionsDownloadDir = URI . file ( environmentService . extensionsDownloadPath ) ;
35- this . cache = 20 ; // Cache 20 downloads
42+ this . cache = 20 ; // Cache 20 downloaded VSIX files
3643 this . cleanUpPromise = this . cleanUp ( ) ;
3744 }
3845
39- async downloadExtension ( extension : IGalleryExtension , operation : InstallOperation ) : Promise < URI > {
46+ async downloadExtension ( extension : IGalleryExtension , operation : InstallOperation ) : Promise < { extensionLocation : URI ; signatureArchiveLocation ?: URI } > {
4047 await this . cleanUpPromise ;
4148 const vsixName = this . getName ( extension ) ;
42- const location = joinPath ( this . extensionsDownloadDir , vsixName ) ;
49+ const extensionLocation = joinPath ( this . extensionsDownloadDir , vsixName ) ;
50+ let signatureArchiveLocation : URI | undefined ;
51+
52+ await this . downloadFile ( extensionLocation , extension , operation , 'vsix' , this . extensionGalleryService . download ) ;
53+
54+ if ( extension . assets . signature ) {
55+ signatureArchiveLocation = ExtensionsDownloader . getSignatureArchiveLocation ( extensionLocation ) ;
56+
57+ await this . downloadFile ( signatureArchiveLocation , extension , operation , 'signature archive' , this . extensionGalleryService . downloadSignatureArchive ) ;
58+ }
4359
44- // Download only if vsix does not exist
60+ return { extensionLocation, signatureArchiveLocation } ;
61+ }
62+
63+ private async downloadFile ( location : URI , extension : IGalleryExtension , operation : InstallOperation , fileType : string , download : ( extension : IGalleryExtension , location : URI , operation : InstallOperation ) => Promise < void > ) {
4564 if ( ! await this . fileService . exists ( location ) ) {
46- // Download to temporary location first only if vsix does not exist
65+ // Download to temporary location first only if file does not exist
4766 const tempLocation = joinPath ( this . extensionsDownloadDir , `.${ generateUuid ( ) } ) ;
4867 if ( ! await this . fileService . exists ( tempLocation ) ) {
49- await this . extensionGalleryService . download ( extension , tempLocation , operation ) ;
68+ await download ( extension , tempLocation , operation ) ;
5069 }
5170
5271 try {
@@ -57,16 +76,13 @@ export class ExtensionsDownloader extends Disposable {
5776 await this . fileService . del ( tempLocation ) ;
5877 } catch ( e ) { /* ignore */ }
5978 if ( error . code === 'ENOTEMPTY' ) {
60- this . logService . info ( `Rename failed because vsix was downloaded by another source. So ignoring renaming.` , extension . identifier . id ) ;
79+ this . logService . info ( `Rename failed because ${ fileType } , extension . identifier . id ) ;
6180 } else {
62- this . logService . info ( `Rename failed because of ${ getErrorMessage ( error ) } vsix from downloaded location` , tempLocation . path ) ;
81+ this . logService . info ( `Rename failed because of ${ getErrorMessage ( error ) } ${ fileType } , tempLocation . path ) ;
6382 throw error ;
6483 }
6584 }
66-
6785 }
68-
69- return location ;
7086 }
7187
7288 async delete ( location : URI ) : Promise < void > {
@@ -89,15 +105,25 @@ export class ExtensionsDownloader extends Disposable {
89105 private async cleanUp ( ) : Promise < void > {
90106 try {
91107 if ( ! ( await this . fileService . exists ( this . extensionsDownloadDir ) ) ) {
92- this . logService . trace ( 'Extension VSIX downlads cache dir does not exist' ) ;
108+ this . logService . trace ( 'Extension VSIX downloads cache dir does not exist' ) ;
93109 return ;
94110 }
95111 const folderStat = await this . fileService . resolve ( this . extensionsDownloadDir , { resolveMetadata : true } ) ;
96112 if ( folderStat . children ) {
97113 const toDelete : URI [ ] = [ ] ;
98114 const all : [ ExtensionKey , IFileStatWithMetadata ] [ ] = [ ] ;
115+ const signatureArchives = new Set < string > ( ) ;
116+
99117 for ( const stat of folderStat . children ) {
100- const extension = ExtensionKey . parse ( stat . name ) ;
118+ const name = stat . name ;
119+
120+ if ( ExtensionsDownloader . isSignatureArchive ( name ) ) {
121+ const extensionPath = ExtensionsDownloader . getExtensionPath ( name ) ;
122+ signatureArchives . add ( extensionPath ) ;
123+ continue ;
124+ }
125+
126+ const extension = ExtensionKey . parse ( name ) ;
101127 if ( extension ) {
102128 all . push ( [ extension , stat ] ) ;
103129 }
@@ -111,16 +137,40 @@ export class ExtensionsDownloader extends Disposable {
111137 }
112138 distinct . sort ( ( a , b ) => a . mtime - b . mtime ) ; // sort by modified time
113139 toDelete . push ( ...distinct . slice ( 0 , Math . max ( 0 , distinct . length - this . cache ) ) . map ( s => s . resource ) ) ; // Retain minimum cacheSize and delete the rest
140+
114141 await Promises . settled ( toDelete . map ( resource => {
115142 this . logService . trace ( 'Deleting vsix from cache' , resource . path ) ;
116- return this . fileService . del ( resource ) ;
143+
144+ let promise = Promise . resolve ( ) ;
145+
146+ if ( signatureArchives . has ( resource . fsPath ) ) {
147+ const signatureArchiveLocation = ExtensionsDownloader . getSignatureArchiveLocation ( resource ) ;
148+
149+ promise = promise . then ( ( ) => this . fileService . del ( signatureArchiveLocation ) ) ;
150+ }
151+
152+ promise = promise . then ( ( ) => this . fileService . del ( resource ) ) ;
153+
154+ return promise ;
117155 } ) ) ;
118156 }
119157 } catch ( e ) {
120158 this . logService . error ( e ) ;
121159 }
122160 }
123161
162+ private static getExtensionPath ( signatureArchivePath : string ) : string {
163+ return signatureArchivePath . substring ( 0 , signatureArchivePath . length - ExtensionsDownloader . SignatureArchiveExtension . length ) ;
164+ }
165+
166+ private static getSignatureArchiveLocation ( extensionLocation : URI ) : URI {
167+ return URI . file ( extensionLocation . fsPath + ExtensionsDownloader . SignatureArchiveExtension ) ;
168+ }
169+
170+ private static isSignatureArchive ( name : string ) : boolean {
171+ return name . endsWith ( ExtensionsDownloader . SignatureArchiveExtension ) ;
172+ }
173+
124174 private getName ( extension : IGalleryExtension ) : string {
125175 return this . cache ? ExtensionKey . create ( extension ) . toString ( ) . toLowerCase ( ) : generateUuid ( ) ;
126176 }
0 commit comments