Upgrade to new-api; add support for embedded audio

config/config.go

@@ -31,6 +31,11 @@ type PreFinishCommand struct {
 	RejectOnNoneZeroExit bool
 }
 
+type FileTypes struct {
+	Allowed    []string
+	Disallowed []string
+}
+
 type Config struct {
 	Server struct {
 		ListenAddress             string
@@ -54,6 +59,7 @@ type Config struct {
 		IdentifiedMaxAge duration
 		CheckInterval    duration
 	}
+	FileTypes          FileTypes
 	PreFinishCommands  []PreFinishCommand
 	JwtSecretsByIssuer map[string]string
 	Loggers            []LoggerConfig
@@ -135,7 +141,7 @@ func CreateMultiLogger(loggerConfigs []LoggerConfig) (*zerolog.Logger, error) {
 		url := loggerCfg.Output.URL
 		switch url.Scheme {
 		case "file":
-			file, err := os.OpenFile(url.Path + url.Opaque, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0640)
+			file, err := os.OpenFile(url.Path+url.Opaque, os.O_CREATE|os.O_APPEND|os.O_RDWR, 0640)
 			if err != nil {
 				return nil, err
 			}

config/default-config.go

@@ -66,6 +66,14 @@ CheckInterval = "5m"
 # "example.com" = "examplesecret"
 # "169.254.0.0" = "anothersecret"
 
+[FileTypes]
+Allowed = [
+	# "image/*"
+]
+Disallowed = [
+	# "image/*"
+]
+
 # PreFinishCommands allows system commands to be run based on minetype once the file is fully uploaded
 # but before it is hashed and moved from incomplete so the file can be rejected using RejectOnNoneZeroExit
 # %FILE% will be replace with the full path to the file within [Storage.Path]/incomplete/

db/db.go

@@ -1,8 +1,10 @@
 package db
 
 import (
+	"database/sql"
 	"fmt"
 	"strings"
+	"sync"
 
 	"github.com/jmoiron/sqlx"
 
@@ -15,7 +17,8 @@ type DBConfig struct {
 }
 
 type DatabaseConnection struct {
-	DB *sqlx.DB
+	DB     *sqlx.DB
+	DBLock sync.RWMutex
 	DBConfig
 }
 
@@ -24,7 +27,7 @@ func ConnectToDB(log *zerolog.Logger, dbConfig DBConfig) *DatabaseConnection {
 		// Add the default connection options if none are given
 		switch dbConfig.DriverName {
 		case "sqlite3":
-			dbConfig.DSN += "?_busy_timeout=5000&cache=shared"
+			dbConfig.DSN += "?_busy_timeout=5000"
 		case "mysql":
 			dbConfig.DSN += "?parseTime=true"
 		}
@@ -35,6 +38,10 @@ func ConnectToDB(log *zerolog.Logger, dbConfig DBConfig) *DatabaseConnection {
 		log.Fatal().Err(err).Msg("Could not open database")
 	}
 
+	// if dbConfig.DriverName == "sqlite3" {
+	// 	db.SetMaxOpenConns(1)
+	// }
+
 	// note that we don't do db.SetMaxOpenConns(1), as we don't want to limit
 	// read concurrency unnecessarily. sqlite will handle write locking on its
 	// own, even across multiple processes accessing the same database file.
@@ -44,14 +51,19 @@ func ConnectToDB(log *zerolog.Logger, dbConfig DBConfig) *DatabaseConnection {
 	// networked filesystem
 
 	return &DatabaseConnection{
-		db,
-		dbConfig,
+		DB:       db,
+		DBConfig: dbConfig,
 	}
 }
 
 // UpdateRow wraps db.Exec and ensures that exactly one row was affected
-func UpdateRow(db *sqlx.DB, query string, args ...interface{}) (err error) {
-	res, err := db.Exec(query, args...)
+func UpdateRow(DBConn *DatabaseConnection, query string, args ...any) (err error) {
+	if DBConn.DBConfig.DriverName == "sqlite3" {
+		DBConn.DBLock.Lock()
+		defer DBConn.DBLock.Unlock()
+	}
+
+	res, err := DBConn.DB.Exec(query, args...)
 	if err != nil {
 		return
 	}
@@ -65,3 +77,21 @@ func UpdateRow(db *sqlx.DB, query string, args ...interface{}) (err error) {
 	}
 	return
 }
+
+func QueryRow(DBConn *DatabaseConnection, query string, args ...any) *sql.Row {
+	if DBConn.DBConfig.DriverName == "sqlite3" {
+		DBConn.DBLock.RLock()
+		defer DBConn.DBLock.RUnlock()
+	}
+
+	return DBConn.DB.QueryRow(query, args...)
+}
+
+func Select(DBConn *DatabaseConnection, dest any, query string, args ...any) (err error) {
+	if DBConn.DBConfig.DriverName == "sqlite3" {
+		DBConn.DBLock.RLock()
+		defer DBConn.DBLock.RUnlock()
+	}
+
+	return DBConn.DB.Select(dest, query, args...)
+}

events/tus-events.go

@@ -5,14 +5,13 @@ import (
 
 	"github.com/tus/tusd/cmd/tusd/cli/hooks"
 	"github.com/tus/tusd/pkg/handler"
-	tusd "github.com/tus/tusd/pkg/handler"
 )
 
 // how many events can be unread by a listener before everything starts to block
 const bufferSize = 16
 
 type TusEvent struct {
-	Info tusd.FileInfo
+	Info handler.FileInfo
 	Type hooks.HookType
 }
 
@@ -22,7 +21,7 @@ type TusEventBroadcaster struct {
 	quitChan  chan struct{} // closes to signal quitting
 }
 
-func NewTusEventBroadcaster(handler *tusd.UnroutedHandler) *TusEventBroadcaster {
+func NewTusEventBroadcaster(handler *handler.UnroutedHandler) *TusEventBroadcaster {
 	broadcaster := &TusEventBroadcaster{
 		quitChan: make(chan struct{}),
 	}
@@ -58,7 +57,7 @@ func (b *TusEventBroadcaster) Unlisten(listener chan *TusEvent) {
 	b.listeners = b.listeners[:kept]
 }
 
-func (b *TusEventBroadcaster) readLoop(handler *tusd.UnroutedHandler) {
+func (b *TusEventBroadcaster) readLoop(handler *handler.UnroutedHandler) {
 	for {
 		select {
 		case info := <-handler.CompleteUploads:

expirer/expirer.go

@@ -3,6 +3,7 @@ package expirer
 import (
 	"time"
 
+	"github.com/kiwiirc/plugin-fileuploader/db"
 	"github.com/kiwiirc/plugin-fileuploader/shardedfilestore"
 	"github.com/rs/zerolog"
 )
@@ -55,7 +56,7 @@ func (expirer *Expirer) gc(t time.Time) {
 		Msg("Filestore GC tick")
 
 	var expiredIds []string
-	err := expirer.store.DBConn.DB.Select(&expiredIds, `
+	err := db.Select(expirer.store.DBConn, &expiredIds, `
 		SELECT id
 		FROM uploads
 		WHERE deleted = 0 AND (

fileuploader-kiwiirc-plugin/.eslintignore

@@ -1,2 +1,2 @@
-dist/
-tests/unit/coverage/
+/node_modules/
+/dist/