fix: act download (#576)

* feat: add download with act test

* fix: download with act

---------

Co-authored-by: Ferenc Sárai <[email protected]>

Author: ferencsarai

src/command/download.ts

@@ -1,6 +1,7 @@
 import { MantarayNode } from '@ethersphere/bee-js'
 import fs from 'fs'
 import { Aggregation, LeafCommand } from 'furious-commander'
+import { Bytes } from '@ethersphere/bee-js'
 import { BzzAddress, makeBzzAddress } from '../utils/bzz-address'
 import { Download as ManifestDownload } from './manifest/download'
 import { RootCommand } from './root-command'
@@ -14,20 +15,10 @@ export class Download extends RootCommand implements LeafCommand {
   public manifestDownload!: ManifestDownload
 
   private address!: BzzAddress
-  private actReqHeaders: Record<string, string> = {}
 
   public async run(): Promise<void> {
     super.init()
 
-    if (this.manifestDownload.act) {
-      this.actReqHeaders = {
-        'Swarm-Act': 'true',
-        'Swarm-Act-Timestamp': this.manifestDownload.actTimestamp,
-        'Swarm-Act-History-Address': this.manifestDownload.actHistoryAddress,
-        'Swarm-Act-Publisher': this.manifestDownload.actPublisher,
-      }
-    }
-
     this.address = await makeBzzAddress(this.bee, this.manifestDownload.bzzUrl)
 
     if (await this.isManifest()) {
@@ -39,15 +30,18 @@ export class Download extends RootCommand implements LeafCommand {
   }
 
   private async downloadData(): Promise<void> {
-    const downloadOptions = this.manifestDownload.act
-      ? {
-          actPublisher: this.manifestDownload.actPublisher,
-          actHistoryAddress: this.manifestDownload.actHistoryAddress,
-          actTimestamp: this.manifestDownload.actTimestamp,
-        }
-      : undefined
+    let response: Bytes
 
-    const response = await this.bee.downloadData(this.address.hash, downloadOptions)
+    if (this.manifestDownload.act) {
+      const responseAct = await this.bee.downloadFile(this.address.hash, this.manifestDownload.destination, {
+        actPublisher: this.manifestDownload.actPublisher,
+        actHistoryAddress: this.manifestDownload.actHistoryAddress,
+        actTimestamp: this.manifestDownload.actTimestamp,
+      })
+      response = responseAct.data
+    } else {
+      response = await this.bee.downloadData(this.address.hash, undefined)
+    }
 
     if (this.manifestDownload.stdout) {
       process.stdout.write(response.toUtf8())

test/command/download.spec.ts

@@ -4,6 +4,7 @@ import { join } from 'node:path'
 import { Upload } from '../../src/command/upload'
 import { describeCommand, invokeTestCli } from '../utility'
 import { getStampOption } from '../utility/stamp'
+import { Addresses } from '../../src/command/addresses'
 
 function makeTmpDir(): string {
   return mkdtempSync(join(tmpdir(), 'swarm-cli-testrun-'))
@@ -19,6 +20,28 @@ describeCommand('Test Download command', ({ consoleMessages }) => {
     expect(consoleMessages[0]).toContain('Hello Swarm!')
   })
 
+  it('should download with act and print to stdout', async () => {
+    const addressesInvocation = await invokeTestCli(['addresses'])
+    const addressesCommand = addressesInvocation.runnable as Addresses
+    const uploadInvocation = await invokeTestCli(['upload', 'test/message.txt', '--act', ...getStampOption()])
+    const uploadCommand = uploadInvocation.runnable as Upload
+    const ref = uploadCommand.result.getOrThrow().toHex()
+    const history = uploadCommand.historyAddress.getOrThrow().toHex()
+    const publicKey = addressesCommand.nodeAddresses.publicKey.toHex()
+    consoleMessages.length = 0
+    await invokeTestCli([
+      'download',
+      ref,
+      '--act',
+      '--act-history-address',
+      history,
+      '--act-publisher',
+      publicKey,
+      '--stdout',
+    ])
+    expect(consoleMessages[0]).toContain('Hello Swarm!')
+  })
+
   it('should fall back to manifest download', async () => {
     const tmpDir = makeTmpDir()
     const invocation = await invokeTestCli(['upload', 'test/testpage', ...getStampOption()])