chore: move weshd and weshnet codegen into this repo

Signed-off-by: Norman Meier <norman@berty.tech>

.gitignore

@@ -72,3 +72,7 @@ buck-out/
 .expo/
 
 # @end expo-cli
+
+
+# codegen
+/.weshgen/

Makefile

@@ -31,14 +31,22 @@ node_modules: package.json yarn.lock
 	touch $@
 
 .PHONY: generate
-generate: generate.protobuf generate.graphql generate.contracts-clients generate.go-networks networks.json
+generate: generate.protobuf generate.weshnet generate.graphql generate.contracts-clients generate.go-networks networks.json
 
 .PHONY: generate.protobuf
 generate.protobuf: node_modules
 	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
 	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
 	buf generate api
 
+.PHONY: generate.weshnet
+generate.weshnet: node_modules
+	go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
+	buf generate buf.build/berty/weshnet -o .weshgen
+	cp -r .weshgen/packages/api/ packages/weshnet/
+	rm -fr .weshgen
+
 .PHONY: generate.graphql
 generate.graphql:
 	go run github.com/Khan/genqlient@85e2e8dffd211c83a2be626474993ef68e44a242 go/pkg/holagql/genqlient.yaml

buf.lock

@@ -0,0 +1,13 @@
+# Generated by buf. DO NOT EDIT.
+version: v1
+deps:
+  - remote: buf.build
+    owner: berty
+    repository: weshnet
+    commit: c7889cd7301e48d0a88b5cbd269e6add
+    digest: shake256:70bacd1ec307a8ffaab85c8fd6afe1641d2301ee5a23f34a015838d2aa6ab0e8d375a81b6b8ed5a440039b36de7c5eb51357eb0ef994c4bd6c1a184910159ce7
+  - remote: buf.build
+    owner: gogo
+    repository: protobuf
+    commit: 5461a3dfa9d941da82028ab185dc2a0e
+    digest: shake256:37c7c75224982038cb1abf45b481ef06716c1f806ffaa162018d0df092bd11a2a9b62c2d0dc0a2ae43beff86b6014fc0eb8c594ffd84d52ade4b08fca901eadc

buf.yaml

@@ -7,3 +7,5 @@ lint:
     - DEFAULT
   ignore:
     - node_modules
+deps:
+  - buf.build/berty/weshnet:c7889cd7301e48d0a88b5cbd269e6add

go/cmd/weshd/main.go

@@ -0,0 +1,57 @@
+package main
+
+import (
+	"fmt"
+	"log"
+	"net/http"
+	"os"
+
+	"berty.tech/weshnet"
+	"berty.tech/weshnet/pkg/protocoltypes"
+	"go.uber.org/zap"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/grpclog"
+
+	"github.com/improbable-eng/grpc-web/go/grpcweb"
+	"github.com/pkg/errors"
+)
+
+func main() {
+	logger, err := zap.NewDevelopment()
+	if err != nil {
+		panic(errors.Wrap(err, "failed to create logger"))
+	}
+
+	logger.Info("weshd")
+
+	port := 4242
+
+	grpcServer := grpc.NewServer()
+
+	svc, err := weshnet.NewService(weshnet.Opts{Logger: logger})
+	if err != nil {
+		panic(errors.Wrap(err, "failed to create weshnet server"))
+	}
+	// FIXME: svc.Close?
+
+	protocoltypes.RegisterProtocolServiceServer(grpcServer, svc)
+
+	grpclog.SetLogger(log.New(os.Stdout, "exampleserver: ", log.LstdFlags)) // FIXME: adapt
+
+	wrappedServer := grpcweb.WrapServer(grpcServer)
+	handler := func(resp http.ResponseWriter, req *http.Request) {
+		resp.Header().Set("Access-Control-Allow-Origin", "*")
+		resp.Header().Set("Access-Control-Allow-Headers", "*")
+		logger.Debug(fmt.Sprintf("Request: %v", req))
+		wrappedServer.ServeHTTP(resp, req)
+	}
+
+	httpServer := http.Server{
+		Addr:    fmt.Sprintf(":%d", port),
+		Handler: http.HandlerFunc(handler),
+	}
+
+	if err := httpServer.ListenAndServe(); err != nil {
+		panic(errors.Wrap(err, "failed to start http server"))
+	}
+}

packages/screens/Chat/ChatScreen.tsx

@@ -8,8 +8,7 @@ import { createWeshClient } from "../../weshnet";
 
 /*
   To test this:
-  - clone this branch https://github.com/TERITORI/weshnet/tree/first-contact
-  - run `go run ./cmd/weshd` at weshnet root
+  - run `go run ./go/cmd/weshd` at root
   - navigate to `/chat` in teritori ui
   - click `Test` button
 */

packages/weshnet/errcode/errcode.ts

@@ -695,34 +695,26 @@ export const ErrDetails = {
   },
 
   decode(input: _m0.Reader | Uint8Array, length?: number): ErrDetails {
-    const reader = input instanceof _m0.Reader ? input : _m0.Reader.create(input);
+    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
     let end = length === undefined ? reader.len : reader.pos + length;
     const message = createBaseErrDetails();
     while (reader.pos < end) {
       const tag = reader.uint32();
       switch (tag >>> 3) {
         case 1:
-          if (tag === 8) {
-            message.codes.push(reader.int32() as any);
-
-            continue;
-          }
-
-          if (tag === 10) {
+          if ((tag & 7) === 2) {
             const end2 = reader.uint32() + reader.pos;
             while (reader.pos < end2) {
               message.codes.push(reader.int32() as any);
             }
-
-            continue;
+          } else {
+            message.codes.push(reader.int32() as any);
           }
-
+          break;
+        default:
+          reader.skipType(tag & 7);
           break;
       }
-      if ((tag & 7) === 4 || tag === 0) {
-        break;
-      }
-      reader.skipType(tag & 7);
     }
     return message;
   },
@@ -741,10 +733,6 @@ export const ErrDetails = {
     return obj;
   },
 
-  create<I extends Exact<DeepPartial<ErrDetails>, I>>(base?: I): ErrDetails {
-    return ErrDetails.fromPartial(base ?? {});
-  },
-
   fromPartial<I extends Exact<DeepPartial<ErrDetails>, I>>(object: I): ErrDetails {
     const message = createBaseErrDetails();
     message.codes = object.codes?.map((e) => e) || [];