feat: support output vendor archive in server

api/rockamalg.proto

@@ -24,4 +24,5 @@ message AmalgRequest {
 
 message AmalgResponse {
     bytes lua = 1;
+    bytes vendor = 2;
 }

internal/archive/zip.go

@@ -86,6 +86,14 @@ func UnzipFileToFilesMap(zipFile string) (map[string][]byte, error) {
 	return unzipToFilesMap(&archive.Reader)
 }
 
+func UnzipBytesToFilesMap(data []byte) (map[string][]byte, error) {
+	r, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
+	if err != nil {
+		return nil, fmt.Errorf("create zip reader: %w", err)
+	}
+	return unzipToFilesMap(r)
+}
+
 func unzipToFilesMap(archive *zip.Reader) (map[string][]byte, error) {
 	files := make(map[string][]byte, len(archive.File))
 	for _, f := range archive.File {

internal/server/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -57,6 +58,7 @@ func (s *Server) Amalg(
 
 	amalgParams := rockamalg.AmalgParams{
 		Output:       filepath.Join(amalgDir, "out.lua"),
+		Vendor:       filepath.Join(amalgDir, "vendor.zip"),
 		Isolate:      req.GetIsolate(),
 		DisableDebug: req.GetDisableDebug(),
 		AllowDevDeps: req.GetAllowDevDependencies(),
@@ -95,7 +97,14 @@ func (s *Server) Amalg(
 		return nil, status.Errorf(codes.Internal, "reading result output: %v", err)
 	}
 
-	return &rockamalgrpc.AmalgResponse{Lua: out}, nil
+	vendor, err := os.ReadFile(amalgParams.Vendor)
+	if err != nil {
+		if !errors.Is(err, os.ErrNotExist) {
+			return nil, status.Errorf(codes.Internal, "reading result vendor: %v", err)
+		}
+	}
+
+	return &rockamalgrpc.AmalgResponse{Lua: out, Vendor: vendor}, nil
 }
 
 func (s *Server) writeDependenciesFile(deps []string, path string) error {

tests/integration/amalg_test.go

@@ -319,6 +319,31 @@ func checkExpectedDirWithZippedFile(t *testing.T, expectedDirName, actualZipFile
 	}
 }
 
+func checkExpectedDirWithZippedBytes(t *testing.T, expectedDirName string, zipBytes []byte) {
+	t.Helper()
+
+	if update {
+		require.NoError(t, os.RemoveAll(expectedDirName))
+		if len(zipBytes) != 0 {
+			require.NoError(t, archive.UnzipBytesToDir(zipBytes, expectedDirName))
+		}
+	} else {
+		if len(zipBytes) == 0 {
+			require.False(t, isExist(t, expectedDirName), "empty vendor, but expected")
+			return
+		}
+
+		expected := dirToFilesMap(t, expectedDirName)
+		actual, err := archive.UnzipBytesToFilesMap(zipBytes)
+		require.NoError(t, err)
+
+		require.Equal(t, expected, actual)
+		if !reflect.DeepEqual(expected, actual) {
+			require.Fail(t, "vendor differs — run test with update to see differences")
+		}
+	}
+}
+
 func checkExpectedWithFile(t *testing.T, exepctedFileName, actualFileName string) {
 	t.Helper()
 

tests/integration/server_test.go

@@ -102,6 +102,7 @@ func testServer(t *testing.T, testdataDir string, port int, rt rockstype) {
 			require.NoError(t, err)
 
 			checkExpectedWithBytes(t, testOpts.expectedLua, resp.GetLua())
+			checkExpectedDirWithZippedBytes(t, testOpts.expectedVendor, resp.GetVendor())
 
 			stdoutBytes := execDockerCommand(t, testOpts.luaExecArgs...)
 			checkExpectedWithBytes(t, testOpts.expectedLuaExec, stdoutBytes)