Merge remote-tracking branch 'upstream/main'

Author: FGadvancer

pkg/db/db_init.go

@@ -26,7 +26,6 @@ import (
 
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/constant"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct"
-	"github.com/openimsdk/openim-sdk-core/v3/pkg/utils"
 	"github.com/openimsdk/openim-sdk-core/v3/version"
 
 	"gorm.io/driver/sqlite"
@@ -38,23 +37,19 @@ import (
 )
 
 type TableChecker struct {
-	db         *gorm.DB
 	tableCache map[string]bool
 	mu         sync.RWMutex
 }
 
-func NewTableChecker(db *gorm.DB) *TableChecker {
+func NewTableChecker(tables []string) *TableChecker {
 	tc := &TableChecker{
-		db:         db,
 		tableCache: make(map[string]bool),
 	}
-	tc.InitTableCache()
+	tc.InitTableCache(tables)
 	return tc
 }
 
-func (tc *TableChecker) InitTableCache() {
-	var tables []string
-	tc.db.Raw("SELECT name FROM sqlite_master WHERE type='table'").Scan(&tables)
+func (tc *TableChecker) InitTableCache(tables []string) {
 	tc.mu.Lock()
 	defer tc.mu.Unlock()
 	for _, table := range tables {
@@ -126,8 +121,14 @@ func NewDataBase(ctx context.Context, loginUserID string, dbDir string, logLevel
 	dataBase := &DataBase{loginUserID: loginUserID, dbDir: dbDir}
 	err := dataBase.initDB(ctx, logLevel)
 	if err != nil {
-		return dataBase, utils.Wrap(err, "initDB failed "+dbDir)
+		return dataBase, errs.WrapMsg(err, "initDB failed "+dbDir)
 	}
+	tables, err := dataBase.GetExistTables(ctx)
+	if err != nil {
+		return dataBase, errs.Wrap(err)
+	}
+	dataBase.tableChecker = NewTableChecker(tables)
+
 	return dataBase, nil
 }
 
@@ -154,12 +155,12 @@ func (d *DataBase) initDB(ctx context.Context, logLevel int) error {
 	}
 	db, err := gorm.Open(sqlite.Open(dbFileName), &gorm.Config{Logger: log.NewSqlLogger(zLogLevel, false, time.Millisecond*200)})
 	if err != nil {
-		return utils.Wrap(err, "open db failed "+dbFileName)
+		return errs.WrapMsg(err, "open db failed "+dbFileName)
 	}
 	log.ZDebug(ctx, "open db success", "db", db, "dbFileName", dbFileName)
 	sqlDB, err := db.DB()
 	if err != nil {
-		return utils.Wrap(err, "get sql db failed")
+		return errs.WrapMsg(err, "get sql db failed")
 	}
 
 	sqlDB.SetConnMaxLifetime(time.Hour * 1)
@@ -180,7 +181,7 @@ func (d *DataBase) initDB(ctx context.Context, logLevel int) error {
 	//if err := db.Table(constant.SuperGroupTableName).AutoMigrate(superGroup); err != nil {
 	//	return err
 	//}
-	d.tableChecker = NewTableChecker(db)
+
 	return nil
 }
 

pkg/db/db_interface/databse.go

@@ -243,6 +243,9 @@ type AppSDKVersion interface {
 	SetAppSDKVersion(ctx context.Context, version *model_struct.LocalAppSDKVersion) error
 }
 
+type TableMaster interface {
+	GetExistTables(ctx context.Context) ([]string, error)
+}
 type DataBase interface {
 	Close(ctx context.Context) error
 	InitDB(ctx context.Context, userID string, dataDir string) error
@@ -256,4 +259,5 @@ type DataBase interface {
 	SendingMessagesModel
 	VersionSyncModel
 	AppSDKVersion
+	TableMaster
 }

pkg/db/db_js.go

@@ -46,6 +46,7 @@ type IndexDB struct {
 	*indexdb.LocalUserCommand
 	*indexdb.LocalVersionSync
 	*indexdb.LocalAppSDKVersion
+	*indexdb.LocalTableMaster
 	loginUserID string
 }
 
@@ -81,6 +82,7 @@ func NewDataBase(ctx context.Context, loginUserID string, dbDir string, logLevel
 		LocalUserCommand:                indexdb.NewLocalUserCommand(),
 		LocalVersionSync:                indexdb.NewLocalVersionSync(),
 		LocalAppSDKVersion:              indexdb.NewLocalAppSDKVersion(),
+		LocalTableMaster:                indexdb.NewLocalTableMaster(),
 		loginUserID:                     loginUserID,
 	}
 	err := i.InitDB(ctx, loginUserID, dbDir)

pkg/db/table_master.go

@@ -0,0 +1,16 @@
+//go:build !js
+// +build !js
+
+package db
+
+import (
+	"context"
+
+	"github.com/openimsdk/tools/errs"
+)
+
+func (d *DataBase) GetExistTables(ctx context.Context) ([]string, error) {
+	var tables []string
+	return tables, errs.Wrap(d.conn.WithContext(ctx).Raw("SELECT name FROM sqlite_master WHERE type='table'").Scan(&tables).Error)
+
+}

wasm/indexdb/conversation_model.go

@@ -19,6 +19,7 @@ package indexdb
 
 import (
 	"context"
+
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/db/model_struct"
 	"github.com/openimsdk/openim-sdk-core/v3/pkg/utils"
 	"github.com/openimsdk/openim-sdk-core/v3/wasm/exec"
@@ -173,6 +174,11 @@ func (i *LocalConversations) DeleteConversation(ctx context.Context, conversatio
 	return err
 }
 
+func (i *LocalConversations) DeleteAllConversation(ctx context.Context) error {
+	_, err := exec.Exec()
+	return err
+}
+
 func (i *LocalConversations) UpdateConversation(ctx context.Context, c *model_struct.LocalConversation) error {
 	if c.ConversationID == "" {
 		return exec.PrimaryKeyNull

wasm/indexdb/table_master.go

@@ -0,0 +1,35 @@
+//go:build js && wasm
+// +build js,wasm
+
+package indexdb
+
+import (
+	"context"
+
+	"github.com/openimsdk/openim-sdk-core/v3/pkg/utils"
+	"github.com/openimsdk/openim-sdk-core/v3/wasm/exec"
+)
+
+type LocalTableMaster struct {
+}
+
+func NewLocalTableMaster() *LocalTableMaster {
+	return &LocalTableMaster{}
+}
+
+func (i *LocalTableMaster) GetExistTables(ctx context.Context) (result []string, err error) {
+	nameList, err := exec.Exec()
+	if err != nil {
+		return nil, err
+	} else {
+		if v, ok := nameList.(string); ok {
+			err := utils.JsonStringToStruct(v, &result)
+			if err != nil {
+				return nil, err
+			}
+			return result, err
+		} else {
+			return nil, exec.ErrType
+		}
+	}
+}