refactor: update stream pipeline

Author: zdm

lib/commands/generate/ssh/decrypt.js

@@ -1,5 +1,5 @@
+import { pipeline } from "node:stream/promises";
 import { decryptSsh } from "#core/crypto";
-import { pipeline } from "#core/stream";
 import Command from "#lib/command";
 
 export default class extends Command {
@@ -34,14 +34,8 @@ export default class extends Command {
             "outputEncoding": process.cli.options[ "output-encoding" ],
         } );
 
-        return new Promise( resolve =>
-            pipeline( stream, process.stdout, e => {
-                if ( e ) {
-                    resolve( result.catch( e, { "log": false } ) );
-                }
-                else {
-                    resolve( result( 200 ) );
-                }
-            } ) );
+        return pipeline( stream, process.stdout )
+            .then( () => result( 200 ) )
+            .catch( e => result.catch( e, { "log": false } ) );
     }
 }

lib/commands/generate/ssh/encrypt.js

@@ -1,5 +1,5 @@
+import { pipeline } from "node:stream/promises";
 import { encryptSsh } from "#core/crypto";
-import { pipeline } from "#core/stream";
 import Command from "#lib/command";
 
 export default class extends Command {
@@ -34,14 +34,8 @@ export default class extends Command {
             "outputEncoding": process.cli.options[ "output-encoding" ],
         } );
 
-        return new Promise( resolve =>
-            pipeline( stream, process.stdout, e => {
-                if ( e ) {
-                    resolve( result.catch( e, { "log": false } ) );
-                }
-                else {
-                    resolve( result( 200 ) );
-                }
-            } ) );
+        return pipeline( stream, process.stdout )
+            .then( () => result( 200 ) )
+            .catch( e => result.catch( e, { "log": false } ) );
     }
 }

lib/debian-repository.js

@@ -2,7 +2,7 @@ import "#core/result";
 import childProcess from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
-import { pipeline } from "node:stream";
+import { pipeline } from "node:stream/promises";
 import { fileURLToPath } from "node:url";
 import zlib from "node:zlib";
 import Ajv from "#core/ajv";
@@ -206,16 +206,13 @@ export default class DebianRepository {
             fs.writeFileSync( this.root + `/dists/${ codename }/${ this.config.component }/binary-all/Packages`, res.data.stdout );
 
             // make "Packages.gz"
-            await new Promise( resolve => {
-                pipeline(
-                    fs.createReadStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-all/Packages` ),
-                    zlib.createGzip( {
-                        "level": 9,
-                    } ),
-                    fs.createWriteStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-all/Packages.gz` ),
-                    e => {}
-                ).on( "close", resolve );
-            } );
+            await pipeline(
+                fs.createReadStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-all/Packages` ),
+                zlib.createGzip( {
+                    "level": 9,
+                } ),
+                fs.createWriteStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-all/Packages.gz` )
+            );
 
             const architectures = (
                 await glob( "binary-*", {
@@ -247,16 +244,13 @@ export default class DebianRepository {
                 fs.writeFileSync( this.root + `/dists/${ codename }/${ this.config.component }/binary-${ architecture }/Packages`, res.data.stdout );
 
                 // make "Packages.gz"
-                await new Promise( resolve => {
-                    pipeline(
-                        fs.createReadStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-${ architecture }/Packages` ),
-                        zlib.createGzip( {
-                            "level": 9,
-                        } ),
-                        fs.createWriteStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-${ architecture }/Packages.gz` ),
-                        e => {}
-                    ).on( "close", resolve );
-                } );
+                await pipeline(
+                    fs.createReadStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-${ architecture }/Packages` ),
+                    zlib.createGzip( {
+                        "level": 9,
+                    } ),
+                    fs.createWriteStream( this.root + `/dists/${ codename }/${ this.config.component }/binary-${ architecture }/Packages.gz` )
+                );
             }
 
             fs.writeFileSync(