Merge pull request #56 from pwnsky/dev

Dev
pwnsky · Sep 22, 2024 · 3347338 · 3347338
2 parents bf95eec + 64ff5d5
commit 3347338
Show file tree

Hide file tree

Showing 63 changed files with 686 additions and 805 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -161,6 +161,7 @@ set(ProjectName "startup")
 file(GLOB soruces src/*.cc)
 file(GLOB headers src/*.h)
 file(GLOB_RECURSE proto ./src/proto/*.proto)
+file(GLOB_RECURSE pycli ./src/pycli/*.py)
 file(GLOB_RECURSE lua ./src/lua/*.lua)
 file(GLOB_RECURSE plugin ./config//plugin/*.xml)
 file(GLOB_RECURSE config ./config/node/*.json)
@@ -169,6 +170,7 @@ source_group_by_dir(proto)
 source_group_by_dir(lua)
 source_group_by_dir(plugin)
 source_group_by_dir(config)
+source_group_by_dir(pycli)
 
 add_executable(${ProjectName} ${soruces} ${headers} ${proto} ${lua} ${plugin} ${config})
 

diff --git a/config/plugin/backstage.xml b/config/plugin/backstage.xml
@@ -3,6 +3,6 @@
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/backstage/logic" />
+        <Plugin Name="node/backstage/logic" HotReload="true" />
     </Login>
 </XML>
diff --git a/config/plugin/db_proxy.xml b/config/plugin/db_proxy.xml
@@ -3,10 +3,10 @@
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/db_proxy/mysql" />
-        <Plugin Name="node/db_proxy/mongo" />
-        <Plugin Name="node/db_proxy/redis" />
-        <Plugin Name="node/db_proxy/clickhouse" />
-        <Plugin Name="node/db_proxy/logic" />
+        <Plugin Name="node/db_proxy/mysql" HotReload="true" />
+        <Plugin Name="node/db_proxy/mongo" HotReload="true" />
+        <Plugin Name="node/db_proxy/redis" HotReload="true" />
+        <Plugin Name="node/db_proxy/clickhouse" HotReload="true"/>
+        <Plugin Name="node/db_proxy/logic" HotReload="true"/>
     </DbProxy>
 </XML>
diff --git a/config/plugin/ds_mgr.xml b/config/plugin/ds_mgr.xml
@@ -3,6 +3,6 @@
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/ds_mgr/logic" />
+        <Plugin Name="node/ds_mgr/logic" HotReload="true"/>
     </GameMgr>
 </XML>
diff --git a/config/plugin/game.xml b/config/plugin/game.xml
@@ -3,6 +3,6 @@
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/game/logic" />
+        <Plugin Name="node/game/logic" HotReload="true"/>
     </Game>
 </XML>
diff --git a/config/plugin/master.xml b/config/plugin/master.xml
@@ -3,6 +3,6 @@
         <Plugin Name="core/net" />
         <Plugin Name="core/log" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/master/logic" />
+        <Plugin Name="node/master/logic" HotReload="true" />
     </Master>
 </XML>
diff --git a/config/plugin/player.xml b/config/plugin/player.xml
@@ -9,6 +9,6 @@
         <Plugin Name="core/thread" />
         <Plugin Name="core/lua" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/player/logic" />
+        <Plugin Name="node/player/logic" HotReload="true"/>
     </Player>
 </XML>
diff --git a/config/plugin/proxy.xml b/config/plugin/proxy.xml
@@ -1,11 +1,10 @@
 <XML>
 	<Proxy>
 		<Plugin Name="core/net" />
-		<Plugin Name="core/config" />
         <Plugin Name="core/log" />
 		<Plugin Name="core/utils" />
         <Plugin Name="core/node" />
 
-		<Plugin Name="node/proxy/logic" />
+		<Plugin Name="node/proxy/logic" HotReload="true" />
 	</Proxy>
 </XML>
diff --git a/config/plugin/web.xml b/config/plugin/web.xml
@@ -3,7 +3,7 @@
 		<Plugin Name="core/net" />
 		<Plugin Name="core/log" />
         <Plugin Name="core/node" />
-		<Plugin Name="node/web/logic" />
+		<Plugin Name="node/web/logic" HotReload="true"/>
 	</Login>
 
 </XML>
diff --git a/config/plugin/world.xml b/config/plugin/world.xml
@@ -8,6 +8,6 @@
         <Plugin Name="core/thread" />
         <Plugin Name="core/lua" />
         <Plugin Name="core/node" />
-        <Plugin Name="node/world/logic" />
+        <Plugin Name="node/world/logic" HotReload="true"/>
     </World>
 </XML>
diff --git a/docker/build_image.sh b/docker/build_image.sh
@@ -3,22 +3,28 @@
 cd $(dirname $0)
 source ../tools/common.sh
 
-build_type='docker'
+version=$1
+if [[ $version == "" ]];then
+    version="1.2"
+fi
+
+dockerfile=./docker/src
 is_build_third_party=0
 is_build_sqkctl=0
-src_image_tag=pwnsky/squick_src:1.1
-bin_image_tag=pwnsky/squick:1.1
+src_image_tag=pwnsky/squick_src:$version
+bin_image_tag=pwnsky/squick:$version
 build_container=squick_src_build
 
 cd $project_path
 
 echo "Build src image"
-docker build . -t $src_image_tag -f ./docker/src
+docker build . -t $src_image_tag -f $dockerfile
 check_err
 
 echo "Export binary files"
 docker run -d --name $build_container $src_image_tag
 check_err
+mkdir -p ./cache
 rm -rf ./cache/docker_deploy
 docker cp $build_container:/squick/deploy ./cache/docker_deploy
 check_err
@@ -33,5 +39,9 @@ echo "Build release image"
 docker build . -t $bin_image_tag -f ./docker/release
 check_err
 
+echo "Exporting the image"
+docker save -o ./cache/squick_$version.tar pwnsky/squick:$version
+check_err
+
 echo "Build image ok"
 print_ok
diff --git a/docker/release b/docker/release
@@ -1,18 +1,11 @@
-# cd {squick_project}
-# docker build . -t i0gan/squick_src:1.1 -f ./docker/src
-# docker run -d --name squick_src i0gan/squick_src:1.1
-# rm -rf ./cache/docker_deploy
-# docker cp squick_src:/squick/deploy ./cache/docker_deploy
-
-# docker build . -t i0gan/squick:1.1 -f ./docker/release
-# docker run -it --name squick i0gan/squick:1.1
-
 FROM ubuntu:22.04
+
 # Set env
 ARG DEBIAN_FRONTEND=noninteractive
+RUN apt update && apt install -y dos2unix vim net-tools
 
 # copy from docker builded files
 COPY ./cache/docker_deploy /squick
 WORKDIR /squick
 RUN chmod +x /squick/script/*.sh
-CMD bash /squick/script/squick.sh
+CMD bash /squick/script/squick.sh
diff --git a/docker/release_mini b/docker/release_mini
@@ -0,0 +1,18 @@
+# cd {squick_project}
+# docker build . -t i0gan/squick_src:1.1 -f ./docker/src
+# docker run -d --name squick_src i0gan/squick_src:1.1
+# rm -rf ./cache/docker_deploy
+# docker cp squick_src:/squick/deploy ./cache/docker_deploy
+
+# docker build . -t i0gan/squick:1.1 -f ./docker/release
+# docker run -it --name squick i0gan/squick:1.1
+
+FROM ubuntu:22.04
+# Set env
+ARG DEBIAN_FRONTEND=noninteractive
+
+# copy from docker builded files
+COPY ./cache/docker_deploy /squick
+WORKDIR /squick
+RUN chmod +x /squick/script/*.sh
+CMD bash /squick/script/squick.sh
diff --git a/docker/src_dep b/docker/src_dep
@@ -0,0 +1,15 @@
+FROM pwnsky/squick_src:1.1
+
+COPY . /squick_dep
+
+RUN rm -rf /squick_dep/third_party && mv /squick/third_party /squick_dep && rm -rf /squick && mv /squick_dep /squick
+
+WORKDIR /squick
+RUN cd tools && chmod +x *.sh && dos2unix *.sh
+RUN cd script && chmod +x *.sh && dos2unix *.sh
+
+RUN bash ./tools/clean_squick.sh
+RUN bash ./tools/build_sqkctl.sh
+RUN bash ./tools/build_squick.sh
+RUN bash ./tools/generate_deploy.sh
+CMD bash /squick/script/squick.sh
diff --git a/kubernetes/gen_k8s_config.sh b/kubernetes/gen_k8s_config.sh
@@ -1,6 +1,9 @@
 #! /bin/bash
 
 namespace="pwnsky"
-image="pwnsky"
+image="pwnsky/squick:1.1"
+
+rm -rf k8s_cfg
+mkdir -p k8s_cfg
 
 
diff --git a/kubernetes/tmpl/backstage.yaml b/kubernetes/tmpl/backstage.yaml
@@ -0,0 +1,39 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: backstage
+  namespace: default
+  labels:
+    app: squick
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: squick
+  template:
+    metadata:
+      labels:
+        app: squick
+    spec:
+      containers:
+        - name: squick
+          image: pwnsky/squick:1.2
+          imagePullPolicy: Never
+          command: ["/bin/bash", "-c"]
+          args:
+            - >
+              /squick/script/squick.sh type=backstage id=`expr 2500 + ${HOSTNAME##*-}` area=0 ip=$(POD_IP) port=10501 ws_port=10502 master_ip=svc-squick-master master_port=10001 logshow=0
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
diff --git a/kubernetes/node/master.yaml → kubernetes/tmpl/db_proxy.yaml b/kubernetes/node/master.yaml → kubernetes/tmpl/db_proxy.yaml
@@ -2,13 +2,12 @@
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
-  name: squick-master
+  name: db-proxy
   namespace: default
   labels:
     app: squick
 spec:
-  serviceName: "svc-squick-master"
-  replicas: 2
+  replicas: 3
   selector:
     matchLabels:
       app: squick
@@ -19,12 +18,12 @@ spec:
     spec:
       containers:
         - name: squick
-          image: pwnsky/squick:1.1
+          image: pwnsky/squick:1.2
           imagePullPolicy: Never
           command: ["/bin/bash", "-c"]
           args:
             - >
-              /squick/script/squick.sh type=master id=1000${HOSTNAME##*-} area=0 ip=$(POD_IP) port=10001 http_port=50000 logshow=0
+              /squick/script/squick.sh type=proxy id=`expr 2000 + ${HOSTNAME##*-}` area=0 ip=$(POD_IP) port=10501 ws_port=10502 master_ip=svc-squick-master master_port=10001 logshow=0
           env:
             - name: POD_NAME
               valueFrom:

diff --git a/kubernetes/tmpl/master.yaml b/kubernetes/tmpl/master.yaml
@@ -0,0 +1,53 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: squick-master
+  namespace: default
+  labels:
+    app: squick
+spec:
+  serviceName: "svc-squick-master"
+  replicas: 3
+  selector:
+    matchLabels:
+      app: squick
+  template:
+    metadata:
+      labels:
+        app: squick
+    spec:
+      containers:
+        - name: squick
+          image: pwnsky/squick:1.2
+          imagePullPolicy: Never
+          command: ["/bin/bash", "-c"]
+          args:
+            - >
+              /squick/script/squick.sh type=master id=`expr 1 + ${HOSTNAME##*-}` area=0 ip=$(POD_IP) port=10001 http_port=50000 logshow=0
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: svc-squick-master
+spec:
+  selector:
+    app: squick
+  ports:
+    - protocol: TCP
+      port: 10001
+      targetPort: 10001
+  type: ClusterIP
diff --git a/kubernetes/tmpl/player.yaml b/kubernetes/tmpl/player.yaml
@@ -0,0 +1,40 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: squick-player
+  namespace: default
+  labels:
+    app: squick
+spec:
+  #serviceName: "svc-squick-proxy"
+  replicas: 3
+  selector:
+    matchLabels:
+      app: squick
+  template:
+    metadata:
+      labels:
+        app: squick
+    spec:
+      containers:
+        - name: squick
+          image: pwnsky/squick:1.2
+          imagePullPolicy: Never
+          command: ["/bin/bash", "-c"]
+          args:
+            - >
+              /squick/script/squick.sh type=player id=`expr 1000 + ${HOSTNAME##*-}` area=0 ip=$(POD_IP) port=10401 master_ip=svc-squick-master master_port=10001 logshow=0
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace