Plugins: Remove stream handler from plugins DTO (#63812)

remove stream handler from DTO
This commit is contained in:
Will Browne
2023-02-27 18:48:18 +00:00
committed by GitHub
parent 25b3abece9
commit 32aa0ad272
3 changed files with 23 additions and 25 deletions

View File

@ -55,8 +55,9 @@ type Plugin struct {
type PluginDTO struct {
JSONData
logger log.Logger
pluginDir string
logger log.Logger
pluginDir string
supportsStreaming bool
Class Class
@ -74,13 +75,10 @@ type PluginDTO struct {
// SystemJS fields
Module string
BaseURL string
// temporary
backend.StreamHandler
}
func (p PluginDTO) SupportsStreaming() bool {
return p.StreamHandler != nil
return p.supportsStreaming
}
func (p PluginDTO) IsApp() bool {
@ -367,23 +365,21 @@ type PluginClient interface {
}
func (p *Plugin) ToDTO() PluginDTO {
c, _ := p.Client()
return PluginDTO{
logger: p.Logger(),
pluginDir: p.PluginDir,
JSONData: p.JSONData,
Class: p.Class,
IncludedInAppID: p.IncludedInAppID,
DefaultNavURL: p.DefaultNavURL,
Pinned: p.Pinned,
Signature: p.Signature,
SignatureType: p.SignatureType,
SignatureOrg: p.SignatureOrg,
SignatureError: p.SignatureError,
Module: p.Module,
BaseURL: p.BaseURL,
StreamHandler: c,
logger: p.Logger(),
pluginDir: p.PluginDir,
JSONData: p.JSONData,
Class: p.Class,
IncludedInAppID: p.IncludedInAppID,
DefaultNavURL: p.DefaultNavURL,
Pinned: p.Pinned,
Signature: p.Signature,
SignatureType: p.SignatureType,
SignatureOrg: p.SignatureOrg,
SignatureError: p.SignatureError,
Module: p.Module,
BaseURL: p.BaseURL,
supportsStreaming: p.client != nil && p.client.(backend.StreamHandler) != nil,
}
}