auto update support

README.md

@@ -5,7 +5,7 @@
 
 下载链接：
 ==========
-https://codeload.github.com/XX-net/XX-Net/zip/1.3.1
+https://codeload.github.com/XX-net/XX-Net/zip/1.3.2
 
 版本历史： https://github.com/XX-net/XX-Net/releases
 

data/launcher/config.yaml

@@ -1,5 +1,5 @@
 modules:
   goagent: {auto_start: 1, current_version: 3.1.38, ignore_version: 3.1.38}
   launcher: {current_version: 1.0.5, ignore_version: 1.0.5}
-update: {check_update: 1, last_path: /, node_id: '0',
-  uuid: 0}
+update: {check_update: 1, last_path: /media/release/XX-Net/launcher/1.0.5, node_id: !!python/long '8796754053427',
+  uuid: f4f82660-3426-4785-a9d3-cb82fe9a7d88}

goagent/3.1.38/local/proxy.ini → goagent/3.1.39/local/proxy.ini

@@ -81,6 +81,8 @@ enable = 0
 type = HTTP
 host = 127.0.0.1
 port = 8888
+user =
+passwd =
 
 [control]
 enable = 1

goagent/3.1.38/web_ui/deploy.html → goagent/3.1.39/web_ui/deploy.html

@@ -5,7 +5,7 @@
 
 <h2>部署GAE服务端</h2>
 <form id="form-goagent-deploy">
-    <input type="text" class="input-small" placeholder="appids" id="gae_appid">
+    <input type="text" class="input-large" placeholder="appids" id="gae_appid">
     <input type="text" class="input-middle" placeholder="E-mail" id="gae_email" >
     <input type="password" class="input-small" placeholder="password" id="gae_passwd">
     <br>

launcher/1.0.6/setup.py

@@ -0,0 +1,175 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+current_path = os.path.dirname(os.path.abspath(__file__))
+python_path = os.path.abspath( os.path.join(current_path, os.pardir, os.pardir, 'python27', '1.0'))
+noarch_lib = os.path.abspath( os.path.join(python_path, 'lib', 'noarch'))
+sys.path.append(noarch_lib)
+
+import urllib2
+import time
+import subprocess
+import logging
+import re
+import zipfile
+import config
+import shutil
+
+opener = urllib2.build_opener()
+
+root_path = os.path.abspath( os.path.join(current_path, os.pardir, os.pardir))
+download_path = os.path.abspath( os.path.join(root_path, 'data', 'downloads'))
+
+xxnet_unzip_path = ""
+
+
+def get_XXNet():
+    global xxnet_unzip_path
+    def download_file(url, file):
+        try:
+            logging.info("download %s to %s", url, file)
+            req = opener.open(url)
+            CHUNK = 16 * 1024
+            with open(file, 'wb') as fp:
+                while True:
+                    chunk = req.read(CHUNK)
+                    if not chunk: break
+                    fp.write(chunk)
+            return True
+        except:
+            logging.info("download %s to %s fail", url, file)
+            return False
+
+    def get_xxnet_url_version(readme_file):
+
+        try:
+            fd = open(readme_file, "r")
+            lines = fd.readlines()
+            p = re.compile(r'https://codeload.github.com/XX-net/XX-Net/zip/([0-9]+)\.([0-9]+)\.([0-9]+)') 
+            for line in lines:
+                m = p.match(line)
+                if m:
+                    version = m.group(1) + "." + m.group(2) + "." + m.group(3)
+                    return m.group(0), version
+        except Exception as e:
+            logging.exception("xxnet_version fail:%s", e)
+        raise "get_version_fail:" % readme_file
+
+    readme_url = "https://raw.githubusercontent.com/XX-net/XX-Net/master/README.md"
+    readme_targe = os.path.join(download_path, "README.md")
+    if not os.path.isdir(download_path):
+        os.mkdir(download_path)
+    if not download_file(readme_url, readme_targe):
+        raise "get README fail:" % readme_url
+    xxnet_url, xxnet_version = get_xxnet_url_version(readme_targe)
+    xxnet_unzip_path = os.path.join(download_path, "XX-Net-%s" % xxnet_version)
+    xxnet_zip_file = os.path.join(download_path, "XX-Net-%s.zip" % xxnet_version)
+
+
+    if not download_file(xxnet_url, xxnet_zip_file):
+        raise "download xxnet zip fail:" % download_path
+
+    with zipfile.ZipFile(xxnet_zip_file, "r") as dz:
+        dz.extractall(download_path)
+        dz.close()
+
+
+
+def get_new_new_config():
+    global xxnet_unzip_path
+    import yaml
+    data_path = os.path.abspath( os.path.join(xxnet_unzip_path, 'data', 'launcher', 'config.yaml'))
+    try:
+        new_config = yaml.load(file(data_path, 'r'))
+        return new_config
+    except yaml.YAMLError, exc:
+        print "Error in configuration file:", exc
+
+def process_data_files():
+    new_config = get_new_new_config()
+    config.load()
+    config.config["modules"]["goagent"]["current_version"] = new_config["modules"]["goagent"]["current_version"]
+    config.config["modules"]["launcher"]["current_version"] = new_config["modules"]["launcher"]["current_version"]
+    config.save()
+
+def install_xxnet_files():
+
+    def sha1_file(filename):
+        import hashlib
+
+        BLOCKSIZE = 65536
+        hasher = hashlib.sha1()
+        try:
+            with open(filename, 'rb') as afile:
+                buf = afile.read(BLOCKSIZE)
+                while len(buf) > 0:
+                    hasher.update(buf)
+                    buf = afile.read(BLOCKSIZE)
+            return hasher.hexdigest()
+        except:
+            return False
+        pass
+
+    for root, subdirs, files in os.walk(xxnet_unzip_path):
+        #print "root:", root
+        relate_path = root[len(xxnet_unzip_path)+1:]
+        for subdir in subdirs:
+
+            target_path = os.path.join(root_path, relate_path, subdir)
+            if not os.path.isdir(target_path):
+                logging.info("mkdir %s", target_path)
+                os.mkdir(target_path)
+
+        for filename in files:
+            if relate_path == os.path.join("data", "goagent") and filename == "config.ini":
+                continue
+            if relate_path == os.path.join("data", "launcher") and filename == "config.yaml":
+                continue
+            src_file = os.path.join(root, filename)
+            dst_file = os.path.join(root_path, relate_path, filename)
+            if not os.path.isfile(dst_file) or sha1_file(src_file) != sha1_file(dst_file):
+                shutil.copy(src_file, dst_file)
+                logging.info("copy %s => %s", src_file, dst_file)
+
+
+def update_environment():
+    get_XXNet()
+    process_data_files()
+    install_xxnet_files()
+
+def wait_xxnet_exit():
+
+    def http_request(url, method="GET"):
+        proxy_handler = urllib2.ProxyHandler({})
+        opener = urllib2.build_opener(proxy_handler)
+        try:
+            req = opener.open(url)
+            return req
+        except Exception as e:
+            #logging.exception("web_control http_request:%s fail:%s", url, e)
+            return False
+
+    for i in range(20):
+        if http_request("http://127.0.0.1:8085/quit") == False:
+            return True
+        time.sleep(1)
+    return False
+
+def run_new_start_script():
+
+    current_path = os.path.dirname(os.path.abspath(__file__))
+    start_sript = os.path.abspath( os.path.join(current_path, os.pardir, "start.py"))
+    subprocess.Popen([sys.executable, start_sript], shell=False)
+
+def main():
+    wait_xxnet_exit()
+    update_environment()
+
+    time.sleep(2)
+    logging.info("setup start run new launcher")
+    run_new_start_script()
+
+if __name__ == "__main__":
+    main()

launcher/1.0.5/web_ui/config.html → launcher/1.0.6/web_ui/config.html

@@ -1,6 +1,6 @@
 
 <br><br>
-    <h4 >登录后启动:
+    <h4 >开机自动启动:
         <div class="pull-right">
             <input id="auto_start" type="checkbox" checked>
         </div>