feat(cli): extract compression service (#1202)

containerbase · Jul 14, 2023 · 3fc9c29 · 3fc9c29
1 parent b11c5dd
commit 3fc9c29
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 13 deletions.
diff --git a/src/cli/services/compression.service.ts b/src/cli/services/compression.service.ts
@@ -0,0 +1,32 @@
+import { createReadStream } from 'node:fs';
+import { pipeline } from 'node:stream/promises';
+import { execa } from 'execa';
+import { injectable } from 'inversify';
+import tar from 'tar';
+
+export interface ExtractConfig {
+  file: string;
+  cwd: string;
+  strip?: number;
+
+  files?: string[];
+}
+
+@injectable()
+export class CompressionService {
+  async extract({ file, cwd, strip, files }: ExtractConfig): Promise<void> {
+    if (file.endsWith('.zip')) {
+      await execa('bsdtar', [
+        '-xf',
+        file,
+        '-C',
+        cwd,
+        ...(strip ? ['--strip', `${strip}`] : []),
+        ...(files ?? []),
+      ]);
+      return;
+    }
+
+    await pipeline(createReadStream(file), tar.x({ cwd, strip }, files));
+  }
+}
diff --git a/src/cli/services/index.ts b/src/cli/services/index.ts
@@ -1,14 +1,22 @@
 import { Container } from 'inversify';
+import { CompressionService } from './compression.service';
 import { EnvService } from './env.service';
 import { HttpService } from './http.service';
 import { PathService } from './path.service';
 import { VersionService } from './version.service';
 
-export { EnvService, PathService, VersionService, HttpService };
+export {
+  EnvService,
+  PathService,
+  VersionService,
+  HttpService,
+  CompressionService,
+};
 
 export const rootContainer = new Container();
 
 rootContainer.bind(EnvService).toSelf();
 rootContainer.bind(PathService).toSelf();
 rootContainer.bind(VersionService).toSelf();
 rootContainer.bind(HttpService).toSelf();
+rootContainer.bind(CompressionService).toSelf();
diff --git a/src/cli/tools/dart/index.ts b/src/cli/tools/dart/index.ts
@@ -5,7 +5,12 @@ import { inject, injectable } from 'inversify';
 import semver from 'semver';
 import { InstallToolBaseService } from '../../install-tool/install-tool-base.service';
 import { PrepareToolBaseService } from '../../prepare-tool/prepare-tool-base.service';
-import { EnvService, HttpService, PathService } from '../../services';
+import {
+  CompressionService,
+  EnvService,
+  HttpService,
+  PathService,
+} from '../../services';
 
 // Dart SDK sample urls
 // https://storage.googleapis.com/dart-archive/channels/stable/release/1.11.0/sdk/dartsdk-linux-x64-release.zip
@@ -60,7 +65,8 @@ export class InstallDartService extends InstallToolBaseService {
   constructor(
     @inject(EnvService) envSvc: EnvService,
     @inject(PathService) pathSvc: PathService,
-    @inject(HttpService) private http: HttpService
+    @inject(HttpService) private http: HttpService,
+    @inject(CompressionService) private compress: CompressionService
   ) {
     super(pathSvc, envSvc);
   }
@@ -91,7 +97,7 @@ export class InstallDartService extends InstallToolBaseService {
     });
 
     const path = await this.pathSvc.createVersionedToolPath(this.name, version);
-    await execa('bsdtar', ['-xf', file, '-C', path, '--strip', '1']);
+    await this.compress.extract({ file, cwd: path, strip: 1 });
   }
 
   override async link(version: string): Promise<void> {

diff --git a/src/cli/tools/docker/index.ts b/src/cli/tools/docker/index.ts
@@ -1,13 +1,15 @@
-import { createReadStream } from 'node:fs';
 import fs from 'node:fs/promises';
 import { join } from 'node:path';
-import { pipeline } from 'node:stream/promises';
 import { execa } from 'execa';
 import { inject, injectable } from 'inversify';
-import tar from 'tar';
 import { InstallToolBaseService } from '../../install-tool/install-tool-base.service';
 import { PrepareToolBaseService } from '../../prepare-tool/prepare-tool-base.service';
-import { EnvService, HttpService, PathService } from '../../services';
+import {
+  CompressionService,
+  EnvService,
+  HttpService,
+  PathService,
+} from '../../services';
 
 @injectable()
 export class PrepareDockerService extends PrepareToolBaseService {
@@ -39,7 +41,8 @@ export class InstallDockerService extends InstallToolBaseService {
   constructor(
     @inject(EnvService) envSvc: EnvService,
     @inject(PathService) pathSvc: PathService,
-    @inject(HttpService) private http: HttpService
+    @inject(HttpService) private http: HttpService,
+    @inject(CompressionService) private compress: CompressionService
   ) {
     super(pathSvc, envSvc);
   }
@@ -53,10 +56,12 @@ export class InstallDockerService extends InstallToolBaseService {
       'bin'
     );
     await fs.mkdir(path);
-    await pipeline(
-      createReadStream(file),
-      tar.x({ cwd: path, strip: 1 }, ['docker/docker'])
-    );
+    await this.compress.extract({
+      file,
+      cwd: path,
+      strip: 1,
+      files: ['docker/docker'],
+    });
   }
 
   override async link(version: string): Promise<void> {