Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

let oryx support external redis and srs service #228

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions platform/dvr-local-disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"github.com/ossrs/go-oryx-lib/errors"
ohttp "github.com/ossrs/go-oryx-lib/http"
"github.com/ossrs/go-oryx-lib/logger"

// Use v8 because we use Go 1.16+, while v9 requires Go 1.18+
"github.com/go-redis/redis/v8"
"github.com/google/uuid"
Expand Down
5 changes: 5 additions & 0 deletions platform/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (

"github.com/ossrs/go-oryx-lib/errors"
"github.com/ossrs/go-oryx-lib/logger"

// Use v8 because we use Go 1.16+, while v9 requires Go 1.18+
"github.com/go-redis/redis/v8"
"github.com/google/uuid"
Expand Down Expand Up @@ -113,6 +114,10 @@ func doMain(ctx context.Context) error {
setEnvDefault("REDIS_PORT", "6379")
setEnvDefault("MGMT_LISTEN", "2022")

// SRS HOST
setEnvDefault("SRS_HOST", "127.0.0.1")
setEnvDefault("SRS_HTTP_STREAM_PORT", "8080")

// For HTTPS.
setEnvDefault("HTTPS_LISTEN", "2443")
setEnvDefault("AUTO_SELF_SIGNED_CERTIFICATE", "on")
Expand Down
15 changes: 9 additions & 6 deletions platform/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,23 @@ import (
"crypto/tls"
"encoding/json"
"fmt"
"github.com/joho/godotenv"
"io"
"io/ioutil"
"net/http"
"os"
"path"
"runtime"
"strconv"
"strings"
"sync"
"time"

"github.com/joho/godotenv"

"github.com/ossrs/go-oryx-lib/errors"
ohttp "github.com/ossrs/go-oryx-lib/http"
"github.com/ossrs/go-oryx-lib/logger"

// Use v8 because we use Go 1.16+, while v9 requires Go 1.18+
"github.com/go-redis/redis/v8"
)
Expand Down Expand Up @@ -288,22 +291,22 @@ func handleHTTPService(ctx context.Context, handler *http.ServeMux) error {
handleMgmtStreamsKickoff(ctx, handler)
handleMgmtUI(ctx, handler)

proxy2023, err := httpCreateProxy("http://127.0.0.1:2023")
proxy2023, err := httpCreateProxy("http://" + os.Getenv("SRS_HOST") + ":2023")
if err != nil {
return err
}

proxy1985, err := httpCreateProxy("http://127.0.0.1:1985")
proxy1985, err := httpCreateProxy("http://" + os.Getenv("SRS_HOST") + ":1985")
if err != nil {
return err
}

proxyWhxp, err := httpCreateProxy("http://127.0.0.1:1985")
proxyWhxp, err := httpCreateProxy("http://" + os.Getenv("SRS_HOST") + ":1985")
if err != nil {
return err
}

proxy8080, err := httpCreateProxy("http://127.0.0.1:8080")
proxy8080, err := httpCreateProxy("http://" + os.Getenv("SRS_HOST") + ":8080")
if err != nil {
return err
}
Expand Down Expand Up @@ -1690,7 +1693,7 @@ func handleMgmtStreamsKickoff(ctx context.Context, handler *http.ServeMux) {

// Whether client exists in SRS server.
var code int
clientURL := fmt.Sprintf("http://127.0.0.1:1985/api/v1/clients/%v", streamObject.Client)
clientURL := fmt.Sprintf("http://%v:1985/api/v1/clients/%v", os.Getenv("SRS_HOST"), streamObject.Client)
if r0, body, err := requestClient(ctx, clientURL, http.MethodGet); err != nil {
return errors.Wrapf(err, "http query client %v", clientURL)
} else if r0 != 0 && r0 != ErrorRtmpClientNotFound {
Expand Down
38 changes: 35 additions & 3 deletions platform/srs-hooks.go
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
//
// Copyright (c) 2022-2024 Winlin
//
// SPDX-License-Identifier: MIT
//
package main

import (
"context"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"math/rand"
"net/http"
"net/url"
"os"
"path/filepath"
"strconv"
"strings"
"time"

"github.com/ossrs/go-oryx-lib/errors"
ohttp "github.com/ossrs/go-oryx-lib/http"
"github.com/ossrs/go-oryx-lib/logger"

// Use v8 because we use Go 1.16+, while v9 requires Go 1.18+
"github.com/go-redis/redis/v8"
cam "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cam/v20190116"
Expand Down Expand Up @@ -728,8 +729,39 @@
if msg.Action != SrsActionOnHls {
return errors.Errorf("invalid action=%v", msg.Action)
}

if _, err := os.Stat(msg.File); err != nil {
return errors.Wrapf(err, "invalid ts file %v", msg.File)
logger.Tf(ctx, "invalid ts file %v", msg.File)

if err := os.MkdirAll(filepath.Dir(msg.File), 0755); err != nil {
Fixed Show fixed Hide fixed
return errors.Wrapf(err, "failed to create ts file directory %v", filepath.Dir(msg.File))
}

if tsFile, err := os.Create(msg.File); err != nil {
Fixed Show fixed Hide fixed
return errors.Wrapf(err, "failed to create ts file %v", msg.File)
} else {
tsUrl := "http://" + os.Getenv("SRS_HOST") + ":" + os.Getenv("SRS_HTTP_STREAM_PORT") + "/" + msg.URL
logger.Tf(ctx, "download ts from %v", tsUrl)
client := http.Client{
CheckRedirect: func(req *http.Request, via []*http.Request) error {
r.URL.Opaque = r.URL.Path
return nil
},
}

resp, err := client.Get(tsUrl)
if err != nil {
return errors.Wrapf(err, "http error to get url %v", tsUrl)
}
defer resp.Body.Close()

size, err := io.Copy(tsFile, resp.Body)
if err != nil {
return errors.Wrapf(err, "copy http resp to file %v", tsFile)
}
defer tsFile.Close()
logger.Tf(ctx, "Download ts file %s with size %d", tsUrl, size)
}
}
logger.Tf(ctx, "on_hls ok, %v", string(b))

Expand Down
8 changes: 5 additions & 3 deletions platform/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -758,10 +758,11 @@ func srsGenerateConfig(ctx context.Context) error {

// Reload SRS to apply the new config.
if true {
api := "http://127.0.0.1:1985/api/v1/raw?rpc=reload"
api := "http://" + os.Getenv("SRS_HOST") + ":1985/api/v1/raw?rpc=reload"
res, err := http.DefaultClient.Get(api)
if err != nil {
return errors.Wrapf(err, "reload srs %v", api)
logger.Tf(ctx, "srs api reload error %v", err)
return nil
}
defer res.Body.Close()

Expand All @@ -771,7 +772,8 @@ func srsGenerateConfig(ctx context.Context) error {
}

if res.StatusCode != http.StatusOK {
return errors.Errorf("reload srs %v, code=%v, body=%v", api, res.StatusCode, string(b))
logger.Tf(ctx, "reload srs %v, code=%v, body=%v", api, res.StatusCode, string(b))
return nil
}
logger.Tf(ctx, "reload submit srs ok")
}
Expand Down
Loading