Import transcode code. Reorganize code. (#4639)

AudiusProject · Jan 20, 2023 · 311b88b · 311b88b
1 parent 9dc5c49
commit 311b88b
Show file tree

Hide file tree

Showing 97 changed files with 5,686 additions and 821 deletions.
diff --git a/comms/.vscode/settings.json b/comms/.vscode/settings.json
diff --git a/comms/Dockerfile b/comms/Dockerfile
@@ -2,6 +2,8 @@
 
 FROM golang:latest
 
+RUN apt update && apt install -y ffmpeg 
+
 # install in-container tools: dbmate, nats cli
 RUN cd /tmp && \
   curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/releases/latest/download/dbmate-linux-amd64 && \

diff --git a/comms/DockerfileFast b/comms/DockerfileFast
@@ -2,6 +2,8 @@
 
 FROM golang:1.19
 
+RUN apt update && apt install -y ffmpeg 
+
 # install in-container tools: dbmate, nats cli
 RUN cd /tmp && \
   curl -fsSL -o /usr/local/bin/dbmate https://github.com/amacneil/dbmate/releases/latest/download/dbmate-linux-amd64 && \
@@ -14,7 +16,7 @@ WORKDIR /app
 
 
 COPY build/comms-linux-amd64 /comms-linux
-COPY db/migrations ./db/migrations
+COPY discovery/db/migrations ./discovery/db/migrations
 
 EXPOSE 8925
 

diff --git a/comms/Makefile b/comms/Makefile
@@ -1,16 +1,19 @@
 
-server::
+dev.discovery::
 	@	audius_discprov_env='standalone' \
 		audius_delegate_private_key='293589cdf207ed2f2253bb72b17bb7f2cfe399cdc34712b1d32908d969682238' \
 		audius_db_url='postgresql://postgres:postgres@localhost:5454/audius_discovery?sslmode=disable' \
-		go run main.go
+		go run main.go discovery
 
+dev.storage::
+	@	audius_discprov_env='standalone' \
+		go run main.go storage
 
 reset::
 	docker compose down --volumes
-	docker compose up comdb -d
+	docker compose up comdb comnats -d
 	DATABASE_URL="postgresql://postgres:postgres@localhost:5454/audius_discovery?sslmode=disable" \
-		dbmate --wait up
+		dbmate --wait --migrations-dir ./discovery/db/migrations up
 	docker exec -it comdb psql -U postgres -c "create database comtest WITH TEMPLATE audius_discovery"
 
 psql::
@@ -55,8 +58,8 @@ build::
 # also... this is pretty much identical to doing a docker "multi-stage" build, but way simpler.
 build.fast::
 	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/comms-linux-amd64
-	DOCKER_DEFAULT_PLATFORM=linux/amd64 docker build . -f ./DockerfileFast -t audius/wip-comms:latest
-	docker push audius/wip-comms:latest
+	DOCKER_DEFAULT_PLATFORM=linux/amd64 docker build . -f ./DockerfileFast -t audius/wip-comms:a1
+	docker push audius/wip-comms:a1
 
 
 tools::
@@ -68,5 +71,5 @@ sqlc:: reset
 	sqlc generate
 
 quicktype::
-	cp ../libs/src/sdk/api/chats/serverTypes.ts schema/schema.ts
-	npx quicktype --package schema --out schema/schema.go --just-types-and-package schema/*.ts
+	cp ../libs/src/sdk/api/chats/serverTypes.ts discovery/schema/schema.ts
+	npx quicktype --package schema --out discovery/schema/schema.go --just-types-and-package discovery/schema/*.ts
diff --git a/comms/config/config.go → comms/discovery/config/config.go b/comms/config/config.go → comms/discovery/config/config.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/inconshreveable/log15"
@@ -30,7 +31,8 @@ var (
 	NatsUseNkeys        = true
 	NatsReplicaCount    = 3
 
-	IsStaging = Env == "stage"
+	IsStaging     = Env == "stage"
+	IsCreatorNode = false
 )
 
 func init() {
@@ -40,14 +42,23 @@ func init() {
 func Init() {
 	var err error
 
+	// todo: hack for creator node config
+	if strings.Contains(os.Getenv("creatorNodeEndpoint"), "staging") {
+		Env = "stage"
+		IsStaging = true
+	}
+	if os.Getenv("delegateOwnerWallet") != "" {
+		IsCreatorNode = true
+	}
+
 	switch Env {
 	case "standalone":
 		envStandalone()
 	default:
 		Logger.Info("no env defaults for: " + Env)
 	}
 
-	privateKeyHex := os.Getenv("audius_delegate_private_key")
+	privateKeyHex := mgetenv("audius_delegate_private_key", "delegatePrivateKey")
 	if privateKeyHex == "" {
 		privateKeyHex = generatePrivateKeyHex()
 		Logger.Warn("audius_delegate_private_key not provided. Using randomly generated private key.")
@@ -104,7 +115,23 @@ func Init() {
 	NatsClusterUsername = signedHex[0:10]
 	NatsClusterPassword = signedHex[10:20]
 
-	Logger.Info("config", "wallet", WalletAddress, "nkey", NkeyPublic, "ip", IP, "nu", NatsClusterUsername, "np", NatsClusterPassword)
+	Logger.Info("config",
+		"env", Env,
+		"wallet", WalletAddress,
+		"nkey", NkeyPublic,
+		"ip", IP,
+		"nu", NatsClusterUsername,
+		"np", NatsClusterPassword)
+}
+
+func mgetenv(keys ...string) string {
+	for _, k := range keys {
+		v := os.Getenv(k)
+		if v != "" {
+			return v
+		}
+	}
+	return ""
 }
 
 func dieOnErr(err error) {

diff --git a/comms/config/constants.go → comms/discovery/config/constants.go b/comms/config/constants.go → comms/discovery/config/constants.go
diff --git a/comms/config/env_staging.go → comms/discovery/config/env_staging.go b/comms/config/env_staging.go → comms/discovery/config/env_staging.go
diff --git a/comms/config/env_standalone.go → comms/discovery/config/env_standalone.go b/comms/config/env_standalone.go → comms/discovery/config/env_standalone.go
diff --git a/comms/config/get_ip.go → comms/discovery/config/get_ip.go b/comms/config/get_ip.go → comms/discovery/config/get_ip.go
diff --git a/comms/db/conn.go → comms/discovery/db/conn.go b/comms/db/conn.go → comms/discovery/db/conn.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"comms.audius.co/config"
+	"comms.audius.co/discovery/config"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
 )

diff --git a/comms/db/db.go → comms/discovery/db/db.go b/comms/db/db.go → comms/discovery/db/db.go
diff --git a/comms/db/docker-initdb/00_schema.sql → .../discovery/db/docker-initdb/00_schema.sql b/comms/db/docker-initdb/00_schema.sql → .../discovery/db/docker-initdb/00_schema.sql
diff --git a/comms/db/docker-initdb/01_changes.sql → ...discovery/db/docker-initdb/01_changes.sql b/comms/db/docker-initdb/01_changes.sql → ...discovery/db/docker-initdb/01_changes.sql
diff --git a/comms/db/docker-initdb/02_dbs.sql → comms/discovery/db/docker-initdb/02_dbs.sql b/comms/db/docker-initdb/02_dbs.sql → comms/discovery/db/docker-initdb/02_dbs.sql
diff --git a/...s/20221128164712_create_rpc_log_table.sql → ...s/20221128164712_create_rpc_log_table.sql b/...s/20221128164712_create_rpc_log_table.sql → ...s/20221128164712_create_rpc_log_table.sql
diff --git a/...ns/20221130042018_create_pubkey_table.sql → ...ns/20221130042018_create_pubkey_table.sql b/...ns/20221130042018_create_pubkey_table.sql → ...ns/20221130042018_create_pubkey_table.sql
diff --git a/...ions/20221130171438_drop_pubkey_table.sql → ...ions/20221130171438_drop_pubkey_table.sql b/...ions/20221130171438_drop_pubkey_table.sql → ...ions/20221130171438_drop_pubkey_table.sql
diff --git a/...migrations/20221202144236_create_chat.sql → ...migrations/20221202144236_create_chat.sql b/...migrations/20221202144236_create_chat.sql → ...migrations/20221202144236_create_chat.sql
diff --git a/...0221210021301_create_chat_permissions.sql → ...0221210021301_create_chat_permissions.sql b/...0221210021301_create_chat_permissions.sql → ...0221210021301_create_chat_permissions.sql
diff --git a/...21212074228_create_chat_blocked_users.sql → ...21212074228_create_chat_blocked_users.sql b/...21212074228_create_chat_blocked_users.sql → ...21212074228_create_chat_blocked_users.sql
diff --git a/...2081249_create_chat_message_reactions.sql → ...2081249_create_chat_message_reactions.sql b/...2081249_create_chat_message_reactions.sql → ...2081249_create_chat_message_reactions.sql
diff --git a/...rations/20221222050259_add_rpc_log_pk.sql → ...rations/20221222050259_add_rpc_log_pk.sql b/...rations/20221222050259_add_rpc_log_pk.sql → ...rations/20221222050259_add_rpc_log_pk.sql
diff --git a/.../20230117200411_add_chat_last_message.sql → .../20230117200411_add_chat_last_message.sql b/.../20230117200411_add_chat_last_message.sql → .../20230117200411_add_chat_last_message.sql
diff --git a/comms/db/models.go → comms/discovery/db/models.go b/comms/db/models.go → comms/discovery/db/models.go
diff --git a/comms/db/queries/get_chat_blocked_users.go → ...very/db/queries/get_chat_blocked_users.go b/comms/db/queries/get_chat_blocked_users.go → ...very/db/queries/get_chat_blocked_users.go
@@ -3,7 +3,7 @@ package queries
 import (
 	"context"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 const chatBlock = `

diff --git a/comms/db/queries/get_chat_members.go → .../discovery/db/queries/get_chat_members.go b/comms/db/queries/get_chat_members.go → .../discovery/db/queries/get_chat_members.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"database/sql"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 type ChatMembershipParams struct {

diff --git a/comms/db/queries/get_chat_messages.go → ...discovery/db/queries/get_chat_messages.go b/comms/db/queries/get_chat_messages.go → ...discovery/db/queries/get_chat_messages.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"time"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 // Get a chat message

diff --git a/comms/db/queries/get_chat_permissions.go → ...covery/db/queries/get_chat_permissions.go b/comms/db/queries/get_chat_permissions.go → ...covery/db/queries/get_chat_permissions.go
@@ -3,8 +3,8 @@ package queries
 import (
 	"context"
 
-	"comms.audius.co/db"
-	"comms.audius.co/schema"
+	"comms.audius.co/discovery/db"
+	"comms.audius.co/discovery/schema"
 )
 
 const getChatPermissions = `

diff --git a/comms/db/queries/get_chats.go → comms/discovery/db/queries/get_chats.go b/comms/db/queries/get_chats.go → comms/discovery/db/queries/get_chats.go
@@ -5,7 +5,7 @@ import (
 	"database/sql"
 	"time"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 	"github.com/jmoiron/sqlx"
 )
 

diff --git a/comms/db/queries/get_follows.go → comms/discovery/db/queries/get_follows.go b/comms/db/queries/get_follows.go → comms/discovery/db/queries/get_follows.go
@@ -3,7 +3,7 @@ package queries
 import (
 	"context"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 const countFollows = `

diff --git a/comms/db/queries/get_summaries.go → comms/discovery/db/queries/get_summaries.go b/comms/db/queries/get_summaries.go → comms/discovery/db/queries/get_summaries.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"time"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 type SummaryRow struct {

diff --git a/comms/db/queries/get_user_tips.go → comms/discovery/db/queries/get_user_tips.go b/comms/db/queries/get_user_tips.go → comms/discovery/db/queries/get_user_tips.go
@@ -3,7 +3,7 @@ package queries
 import (
 	"context"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 const countTips = `

diff --git a/comms/db/queries/get_users.go → comms/discovery/db/queries/get_users.go b/comms/db/queries/get_users.go → comms/discovery/db/queries/get_users.go
@@ -3,7 +3,7 @@ package queries
 import (
 	"context"
 
-	"comms.audius.co/db"
+	"comms.audius.co/discovery/db"
 )
 
 const getUserIDFromWallet = `

diff --git a/comms/db/query.sql → comms/discovery/db/query.sql b/comms/db/query.sql → comms/discovery/db/query.sql
diff --git a/comms/db/query.sql.go → comms/discovery/db/query.sql.go b/comms/db/query.sql.go → comms/discovery/db/query.sql.go
diff --git a/comms/discovery/db/run_migrations.go b/comms/discovery/db/run_migrations.go
@@ -0,0 +1,17 @@
+package db
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+)
+
+func RunMigrations() error {
+	out, err := exec.Command("dbmate",
+		"--no-dump-schema",
+		"--migrations-dir", "./discovery/db/migrations",
+		"--url", os.Getenv("audius_db_url"),
+		"up").CombinedOutput()
+	fmt.Println("dbmate: ", string(out))
+	return err
+}