增加脚本相关配置和RPC接口

pkg/nodeconfigs/node_config.go

@@ -65,6 +65,9 @@ type NodeConfig struct {
 	// 自动白名单
 	AllowedIPs []string `yaml:"allowedIPs" json:"allowedIPs"`
 
+	// 脚本
+	CommonScripts []*serverconfigs.CommonScript `yaml:"commonScripts" json:"commonScripts"`
+
 	paddedId string
 
 	// firewall

pkg/rpc/pb/model_script.pb.go

@@ -0,0 +1,203 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.25.0
+// 	protoc        v3.19.4
+// source: models/model_script.proto
+
+package pb
+
+import (
+	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
+
+type Script struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Id        int64  `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"`
+	UserId    int64  `protobuf:"varint,2,opt,name=userId,proto3" json:"userId,omitempty"`
+	IsOn      bool   `protobuf:"varint,3,opt,name=isOn,proto3" json:"isOn,omitempty"`
+	Name      string `protobuf:"bytes,4,opt,name=name,proto3" json:"name,omitempty"`
+	Filename  string `protobuf:"bytes,5,opt,name=filename,proto3" json:"filename,omitempty"`
+	Code      string `protobuf:"bytes,6,opt,name=code,proto3" json:"code,omitempty"`
+	UpdatedAt int64  `protobuf:"varint,7,opt,name=updatedAt,proto3" json:"updatedAt,omitempty"`
+}
+
+func (x *Script) Reset() {
+	*x = Script{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_models_model_script_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Script) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Script) ProtoMessage() {}
+
+func (x *Script) ProtoReflect() protoreflect.Message {
+	mi := &file_models_model_script_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Script.ProtoReflect.Descriptor instead.
+func (*Script) Descriptor() ([]byte, []int) {
+	return file_models_model_script_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *Script) GetId() int64 {
+	if x != nil {
+		return x.Id
+	}
+	return 0
+}
+
+func (x *Script) GetUserId() int64 {
+	if x != nil {
+		return x.UserId
+	}
+	return 0
+}
+
+func (x *Script) GetIsOn() bool {
+	if x != nil {
+		return x.IsOn
+	}
+	return false
+}
+
+func (x *Script) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *Script) GetFilename() string {
+	if x != nil {
+		return x.Filename
+	}
+	return ""
+}
+
+func (x *Script) GetCode() string {
+	if x != nil {
+		return x.Code
+	}
+	return ""
+}
+
+func (x *Script) GetUpdatedAt() int64 {
+	if x != nil {
+		return x.UpdatedAt
+	}
+	return 0
+}
+
+var File_models_model_script_proto protoreflect.FileDescriptor
+
+var file_models_model_script_proto_rawDesc = []byte{
+	0x0a, 0x19, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2f, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x5f, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x02, 0x70, 0x62, 0x22,
+	0xa6, 0x01, 0x0a, 0x06, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73,
+	0x65, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72,
+	0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x04, 0x69, 0x73, 0x4f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69,
+	0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69,
+	0x6c, 0x65, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x2f, 0x70, 0x62,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_models_model_script_proto_rawDescOnce sync.Once
+	file_models_model_script_proto_rawDescData = file_models_model_script_proto_rawDesc
+)
+
+func file_models_model_script_proto_rawDescGZIP() []byte {
+	file_models_model_script_proto_rawDescOnce.Do(func() {
+		file_models_model_script_proto_rawDescData = protoimpl.X.CompressGZIP(file_models_model_script_proto_rawDescData)
+	})
+	return file_models_model_script_proto_rawDescData
+}
+
+var file_models_model_script_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_models_model_script_proto_goTypes = []interface{}{
+	(*Script)(nil), // 0: pb.Script
+}
+var file_models_model_script_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_models_model_script_proto_init() }
+func file_models_model_script_proto_init() {
+	if File_models_model_script_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_models_model_script_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Script); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_models_model_script_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_models_model_script_proto_goTypes,
+		DependencyIndexes: file_models_model_script_proto_depIdxs,
+		MessageInfos:      file_models_model_script_proto_msgTypes,
+	}.Build()
+	File_models_model_script_proto = out.File
+	file_models_model_script_proto_rawDesc = nil
+	file_models_model_script_proto_goTypes = nil
+	file_models_model_script_proto_depIdxs = nil
+}

pkg/rpc/protos/models/model_script.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+message Script {
+	int64 id = 1;
+	int64 userId = 2;
+	bool isOn = 3;
+	string name = 4;
+	string filename = 5;
+	string code = 6;
+	int64 updatedAt = 7;
+}

pkg/rpc/protos/service_script.proto

@@ -0,0 +1,111 @@
+syntax = "proto3";
+option go_package = "./pb";
+
+package pb;
+
+import "models/model_script.proto";
+import "models/rpc_messages.proto";
+
+// 脚本相关服务
+service ScriptService {
+	// 添加脚本
+	rpc createScript(CreateScriptRequest) returns (CreateScriptResponse);
+
+	// 删除脚本
+	rpc deleteScript(DeleteScriptRequest) returns (RPCSuccess);
+
+	// 计算脚本数量
+	rpc countAllEnabledScripts(CountAllEnabledScriptsRequest) returns (RPCCountResponse);
+
+	// 列出单页脚本
+	rpc listEnabledScripts(ListEnabledScriptsRequest) returns (ListEnabledScriptsResponse);
+
+	// 发布脚本
+	rpc publishScripts(PublishScriptsRequest) returns (RPCSuccess);
+
+	// 检查脚本是否需要有更新
+	rpc checkScriptUpdates(CheckScriptUpdatesRequest) returns (CheckScriptUpdatesResponse);
+
+	// 查找单个脚本
+	rpc findEnabledScript(FindEnabledScriptRequest) returns (FindEnabledScriptResponse);
+
+	// 修改脚本
+	rpc updateScript(UpdateScriptRequest) returns (RPCSuccess);
+
+	// 组合脚本配置
+	rpc composeScriptConfigs(ComposeScriptConfigsRequest) returns (ComposeScriptConfigsResponse);
+}
+
+// 添加脚本
+message CreateScriptRequest {
+	string name = 1;
+	string filename = 2;
+	string code = 3;
+}
+
+message CreateScriptResponse {
+	int64 scriptId = 1;
+}
+
+// 删除脚本
+message DeleteScriptRequest {
+	int64 scriptId = 1;
+}
+
+// 计算脚本数量
+message CountAllEnabledScriptsRequest {
+	int64 userId = 1;
+}
+
+// 列出单页脚本
+message ListEnabledScriptsRequest {
+	int64 userId = 1;
+	int64 offset = 2;
+	int64 size = 3;
+}
+
+message ListEnabledScriptsResponse {
+	repeated Script scripts = 1;
+}
+
+// 发布脚本
+message PublishScriptsRequest {
+	int64  userId = 1;
+}
+
+// 检查脚本是否需要有更新
+message CheckScriptUpdatesRequest {
+	int64  userId = 1;
+}
+
+message CheckScriptUpdatesResponse {
+	bool hasUpdates = 1;
+	int64 version = 2;
+}
+
+// 查找单个脚本
+message FindEnabledScriptRequest {
+	int64 scriptId = 1;
+}
+
+message FindEnabledScriptResponse {
+	Script script = 1;
+}
+
+// 修改脚本
+message UpdateScriptRequest {
+	int64 scriptId = 1;
+	string name = 2;
+	string filename = 3;
+	string code = 4;
+	bool isOn = 5;
+}
+
+// 组合脚本配置
+message ComposeScriptConfigsRequest {
+
+}
+
+message ComposeScriptConfigsResponse {
+	bytes scriptConfigsJSON = 1;
+}

pkg/serverconfigs/script_common.go

@@ -0,0 +1,11 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package serverconfigs
+
+// CommonScript 公共脚本
+type CommonScript struct {
+	Id       int64  `yaml:"id" json:"id"`
+	IsOn     bool   `yaml:"isOn" json:"isOn"`
+	Filename string `yaml:"filename" json:"filename"`
+	Code     string `yaml:"code" json:"code"`
+}