Thumbnail service, image upload fixes (#119)

image/handler/image.go

@@ -47,8 +47,9 @@ func (e *Image) Upload(ctx context.Context, req *img.UploadRequest, rsp *img.Upl
 	}
 	var srcImage image.Image
 	var err error
+	var ext string
 	if len(req.Base64) > 0 {
-		srcImage, _, err = base64ToImage(req.Base64)
+		srcImage, ext, err = base64ToImage(req.Base64)
 		if err != nil {
 			return err
 		}
@@ -68,8 +69,18 @@ func (e *Image) Upload(ctx context.Context, req *img.UploadRequest, rsp *img.Upl
 		}
 		defer response.Body.Close()
 	}
+
 	buf := new(bytes.Buffer)
-	err = jpeg.Encode(buf, srcImage, nil)
+
+	switch {
+	case strings.HasSuffix(req.ImageID, ".png") || ext == "png":
+		err = png.Encode(buf, srcImage)
+	case strings.HasSuffix(req.ImageID, ".jpg") || strings.HasSuffix(req.Url, ".jpeg") || ext == "jpg":
+		err = jpeg.Encode(buf, srcImage, nil)
+	default:
+		return errors.New("could not determine extension")
+	}
+
 	if err != nil {
 		return err
 	}

thumbnail/.gitignore

@@ -0,0 +1,2 @@
+
+thumbnail

thumbnail/Dockerfile

@@ -0,0 +1,3 @@
+FROM alpine
+ADD thumbnail /thumbnail
+ENTRYPOINT [ "/thumbnail" ]

thumbnail/Makefile

@@ -0,0 +1,22 @@
+
+GOPATH:=$(shell go env GOPATH)
+.PHONY: init
+init:
+	go get -u github.com/golang/protobuf/proto
+	go get -u github.com/golang/protobuf/protoc-gen-go
+	go get github.com/micro/micro/v3/cmd/protoc-gen-micro
+.PHONY: proto
+proto:
+	protoc --proto_path=. --micro_out=. --go_out=:. proto/thumbnail.proto
+	
+.PHONY: build
+build:
+	go build -o thumbnail *.go
+
+.PHONY: test
+test:
+	go test -v ./... -cover
+
+.PHONY: docker
+docker:
+	docker build . -t thumbnail:latest

thumbnail/README.md

@@ -0,0 +1,23 @@
+# Thumbnail Service
+
+This is the Thumbnail service
+
+Generated with
+
+```
+micro new thumbnail
+```
+
+## Usage
+
+Generate the proto code
+
+```
+make proto
+```
+
+Run the service
+
+```
+micro run .
+```

thumbnail/docker-image/Dockerfile

@@ -0,0 +1,42 @@
+FROM micro/cells:v3 as builder
+
+#
+# headless chrome
+# taken from https://github.com/Zenika/alpine-chrome/blob/master/Dockerfile
+#
+
+# Installs latest Chromium package.
+RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" > /etc/apk/repositories \
+    && echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+    && echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+    && echo "http://dl-cdn.alpinelinux.org/alpine/v3.12/main" >> /etc/apk/repositories \
+    && apk upgrade -U -a \
+    && apk add \
+    libstdc++ \
+    chromium \
+    harfbuzz \
+    nss \
+    freetype \
+    ttf-freefont \
+    font-noto-emoji \
+    wqy-zenhei \
+    && rm -rf /var/cache/* \
+    && mkdir /var/cache/apk
+
+COPY local.conf /etc/fonts/local.conf
+
+# Add Chrome as a user
+RUN mkdir -p /usr/src/app \
+    && adduser -D chrome \
+    && chown -R chrome:chrome /usr/src/app
+# Run Chrome as non-privileged
+#USER chrome
+#WORKDIR /usr/src/app
+
+ENV CHROME_BIN=/usr/bin/chromium-browser \
+    CHROME_PATH=/usr/lib/chromium/
+
+RUN apk add libstdc++@edge
+#
+# / headless chrome
+#

thumbnail/docker-image/local.conf

@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+ <alias>
+   <family>sans-serif</family>
+   <prefer>
+     <family>Main sans-serif font name goes here</family>
+     <family>Noto Color Emoji</family>
+     <family>Noto Emoji</family>
+   </prefer>
+ </alias>
+
+ <alias>
+   <family>serif</family>
+   <prefer>
+     <family>Main serif font name goes here</family>
+     <family>Noto Color Emoji</family>
+     <family>Noto Emoji</family>
+   </prefer>
+ </alias>
+
+ <alias>
+  <family>monospace</family>
+  <prefer>
+    <family>Main monospace font name goes here</family>
+    <family>Noto Color Emoji</family>
+    <family>Noto Emoji</family>
+   </prefer>
+ </alias>
+</fontconfig>

thumbnail/generate.go

@@ -0,0 +1,2 @@
+package main
+//go:generate make proto

thumbnail/handler/thumbnail.go

@@ -0,0 +1,63 @@
+package handler
+
+import (
+	"context"
+	"encoding/base64"
+	"fmt"
+	"io/ioutil"
+	"os/exec"
+	"path/filepath"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/micro/micro/v3/service/client"
+	"github.com/micro/micro/v3/service/logger"
+	iproto "github.com/micro/services/image/proto"
+	thumbnail "github.com/micro/services/thumbnail/proto"
+)
+
+const screenshotPath = "/usr/src/app"
+
+type Thumbnail struct {
+	imageService iproto.ImageService
+}
+
+func NewThumbnail(imageService iproto.ImageService) *Thumbnail {
+	return &Thumbnail{
+		imageService: imageService,
+	}
+}
+
+func (e *Thumbnail) Screenshot(ctx context.Context, req *thumbnail.ScreenshotRequest, rsp *thumbnail.ScreenshotResponse) error {
+	imageName := uuid.New().String() + ".png"
+	imagePath := filepath.Join(screenshotPath, imageName)
+	width := "800"
+	height := "600"
+	if req.Width != 0 {
+		width = fmt.Sprintf("%v", req.Width)
+	}
+	if req.Height != 0 {
+		height = fmt.Sprintf("%v", req.Height)
+	}
+
+	outp, err := exec.Command("/usr/bin/chromium-browser", "--headless", "--window-size="+width+","+height, "--no-sandbox", "--screenshot="+imagePath, "--hide-scrollbars", req.Url).CombinedOutput()
+	logger.Info(string(outp))
+	if err != nil {
+		logger.Error(string(outp) + err.Error())
+		return err
+	}
+	file, err := ioutil.ReadFile(imagePath)
+	if err != nil {
+		return err
+	}
+	base := base64.StdEncoding.EncodeToString(file)
+	resp, err := e.imageService.Upload(ctx, &iproto.UploadRequest{
+		Base64:  "data:image/png;base64, " + base,
+		ImageID: imageName,
+	}, client.WithDialTimeout(20*time.Second), client.WithRequestTimeout(20*time.Second))
+	if err != nil {
+		return err
+	}
+	rsp.ImageURL = resp.Url
+	return nil
+}

thumbnail/main.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	iproto "github.com/micro/services/image/proto"
+	"github.com/micro/services/thumbnail/handler"
+	pb "github.com/micro/services/thumbnail/proto"
+
+	"github.com/micro/micro/v3/service"
+	"github.com/micro/micro/v3/service/logger"
+)
+
+func main() {
+	// Create service
+	srv := service.New(
+		service.Name("thumbnail"),
+		service.Version("latest"),
+	)
+
+	// Register handler
+	pb.RegisterThumbnailHandler(srv.Server(), handler.NewThumbnail(iproto.NewImageService("image", srv.Client())))
+
+	// Run service
+	if err := srv.Run(); err != nil {
+		logger.Fatal(err)
+	}
+}

thumbnail/micro.mu

@@ -0,0 +1 @@
+service thumbnail

thumbnail/proto/thumbnail.pb.go

@@ -0,0 +1,236 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.26.0
+// 	protoc        v3.6.1
+// source: proto/thumbnail.proto
+
+package thumbnail
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+type ScreenshotRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Url string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
+	// width of the browser window. optional
+	Width int32 `protobuf:"varint,2,opt,name=width,proto3" json:"width,omitempty"`
+	// height of the browser window, optional
+	Height int32 `protobuf:"varint,3,opt,name=height,proto3" json:"height,omitempty"`
+}
+
+func (x *ScreenshotRequest) Reset() {
+	*x = ScreenshotRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_thumbnail_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ScreenshotRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ScreenshotRequest) ProtoMessage() {}
+
+func (x *ScreenshotRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_thumbnail_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ScreenshotRequest.ProtoReflect.Descriptor instead.
+func (*ScreenshotRequest) Descriptor() ([]byte, []int) {
+	return file_proto_thumbnail_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *ScreenshotRequest) GetUrl() string {
+	if x != nil {
+		return x.Url
+	}
+	return ""
+}
+
+func (x *ScreenshotRequest) GetWidth() int32 {
+	if x != nil {
+		return x.Width
+	}
+	return 0
+}
+
+func (x *ScreenshotRequest) GetHeight() int32 {
+	if x != nil {
+		return x.Height
+	}
+	return 0
+}
+
+type ScreenshotResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ImageURL string `protobuf:"bytes,1,opt,name=imageURL,proto3" json:"imageURL,omitempty"`
+}
+
+func (x *ScreenshotResponse) Reset() {
+	*x = ScreenshotResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_thumbnail_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ScreenshotResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ScreenshotResponse) ProtoMessage() {}
+
+func (x *ScreenshotResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_thumbnail_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ScreenshotResponse.ProtoReflect.Descriptor instead.
+func (*ScreenshotResponse) Descriptor() ([]byte, []int) {
+	return file_proto_thumbnail_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *ScreenshotResponse) GetImageURL() string {
+	if x != nil {
+		return x.ImageURL
+	}
+	return ""
+}
+
+var File_proto_thumbnail_proto protoreflect.FileDescriptor
+
+var file_proto_thumbnail_proto_rawDesc = []byte{
+	0x0a, 0x15, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69,
+	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61,
+	0x69, 0x6c, 0x22, 0x53, 0x0a, 0x11, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x73, 0x68, 0x6f, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x77, 0x69, 0x64,
+	0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x12,
+	0x16, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x22, 0x30, 0x0a, 0x12, 0x53, 0x63, 0x72, 0x65, 0x65,
+	0x6e, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a,
+	0x08, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x52, 0x4c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x69, 0x6d, 0x61, 0x67, 0x65, 0x55, 0x52, 0x4c, 0x32, 0x58, 0x0a, 0x09, 0x54, 0x68, 0x75,
+	0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x12, 0x4b, 0x0a, 0x0a, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e,
+	0x73, 0x68, 0x6f, 0x74, 0x12, 0x1c, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c,
+	0x2e, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x2e, 0x53,
+	0x63, 0x72, 0x65, 0x65, 0x6e, 0x73, 0x68, 0x6f, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f,
+	0x6d, 0x2f, 0x6d, 0x69, 0x63, 0x72, 0x6f, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
+	0x2f, 0x75, 0x72, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x3b, 0x74, 0x68, 0x75, 0x6d, 0x62,
+	0x6e, 0x61, 0x69, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_proto_thumbnail_proto_rawDescOnce sync.Once
+	file_proto_thumbnail_proto_rawDescData = file_proto_thumbnail_proto_rawDesc
+)
+
+func file_proto_thumbnail_proto_rawDescGZIP() []byte {
+	file_proto_thumbnail_proto_rawDescOnce.Do(func() {
+		file_proto_thumbnail_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_thumbnail_proto_rawDescData)
+	})
+	return file_proto_thumbnail_proto_rawDescData
+}
+
+var file_proto_thumbnail_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_proto_thumbnail_proto_goTypes = []interface{}{
+	(*ScreenshotRequest)(nil),  // 0: thumbnail.ScreenshotRequest
+	(*ScreenshotResponse)(nil), // 1: thumbnail.ScreenshotResponse
+}
+var file_proto_thumbnail_proto_depIdxs = []int32{
+	0, // 0: thumbnail.Thumbnail.Screenshot:input_type -> thumbnail.ScreenshotRequest
+	1, // 1: thumbnail.Thumbnail.Screenshot:output_type -> thumbnail.ScreenshotResponse
+	1, // [1:2] is the sub-list for method output_type
+	0, // [0:1] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_proto_thumbnail_proto_init() }
+func file_proto_thumbnail_proto_init() {
+	if File_proto_thumbnail_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_thumbnail_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ScreenshotRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_thumbnail_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ScreenshotResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_thumbnail_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_proto_thumbnail_proto_goTypes,
+		DependencyIndexes: file_proto_thumbnail_proto_depIdxs,
+		MessageInfos:      file_proto_thumbnail_proto_msgTypes,
+	}.Build()
+	File_proto_thumbnail_proto = out.File
+	file_proto_thumbnail_proto_rawDesc = nil
+	file_proto_thumbnail_proto_goTypes = nil
+	file_proto_thumbnail_proto_depIdxs = nil
+}

thumbnail/proto/thumbnail.pb.micro.go

@@ -0,0 +1,93 @@
+// Code generated by protoc-gen-micro. DO NOT EDIT.
+// source: proto/thumbnail.proto
+
+package thumbnail
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+import (
+	context "context"
+	api "github.com/micro/micro/v3/service/api"
+	client "github.com/micro/micro/v3/service/client"
+	server "github.com/micro/micro/v3/service/server"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ api.Endpoint
+var _ context.Context
+var _ client.Option
+var _ server.Option
+
+// Api Endpoints for Thumbnail service
+
+func NewThumbnailEndpoints() []*api.Endpoint {
+	return []*api.Endpoint{}
+}
+
+// Client API for Thumbnail service
+
+type ThumbnailService interface {
+	Screenshot(ctx context.Context, in *ScreenshotRequest, opts ...client.CallOption) (*ScreenshotResponse, error)
+}
+
+type thumbnailService struct {
+	c    client.Client
+	name string
+}
+
+func NewThumbnailService(name string, c client.Client) ThumbnailService {
+	return &thumbnailService{
+		c:    c,
+		name: name,
+	}
+}
+
+func (c *thumbnailService) Screenshot(ctx context.Context, in *ScreenshotRequest, opts ...client.CallOption) (*ScreenshotResponse, error) {
+	req := c.c.NewRequest(c.name, "Thumbnail.Screenshot", in)
+	out := new(ScreenshotResponse)
+	err := c.c.Call(ctx, req, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+// Server API for Thumbnail service
+
+type ThumbnailHandler interface {
+	Screenshot(context.Context, *ScreenshotRequest, *ScreenshotResponse) error
+}
+
+func RegisterThumbnailHandler(s server.Server, hdlr ThumbnailHandler, opts ...server.HandlerOption) error {
+	type thumbnail interface {
+		Screenshot(ctx context.Context, in *ScreenshotRequest, out *ScreenshotResponse) error
+	}
+	type Thumbnail struct {
+		thumbnail
+	}
+	h := &thumbnailHandler{hdlr}
+	return s.Handle(s.NewHandler(&Thumbnail{h}, opts...))
+}
+
+type thumbnailHandler struct {
+	ThumbnailHandler
+}
+
+func (h *thumbnailHandler) Screenshot(ctx context.Context, in *ScreenshotRequest, out *ScreenshotResponse) error {
+	return h.ThumbnailHandler.Screenshot(ctx, in, out)
+}

thumbnail/proto/thumbnail.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+
+package thumbnail;
+
+option go_package = "github.com/micro/services/url/proto;thumbnail";
+
+service Thumbnail {
+	rpc Screenshot(ScreenshotRequest) returns (ScreenshotResponse) {}
+
+}
+
+message ScreenshotRequest {
+	string url = 1;
+	// width of the browser window. optional
+	int32 width = 2;
+	// height of the browser window, optional
+	int32 height = 3;
+}
+
+message ScreenshotResponse {
+	string imageURL = 1;
+}