1.2.2.0

ckwLibs/hhh.aardio

@@ -0,0 +1,13 @@
+import win.ui;
+/*DSG{{*/
+var winform = win.form(text="aardio form";right=431;bottom=79)
+winform.add(
+static={cls="static";text="Static";left=0;top=0;right=432;bottom=80;transparent=1;z=1}
+)
+/*}}*/
+
+winform.static.text = ..mainForm.serverPath;
+winform.show();
+
+//Remember: No Loopmessage();
+return winform;

default.aproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.2.1.11" ProductVersion="1.2.1.11" publishDir="/dist/" dstrip="false" local="false" ignored="false">
+<project ver="10" name="ChiikawaBest" libEmbed="true" icon="res\chiikawaIcon.ico" ui="win" output="ChiikawaBest.exe" CompanyName="CarryWho" FileDescription="ChiikawaBest" LegalCopyright="Copyright (C) CarryWho 2023" ProductName="ChiikawaBest" InternalName="ChiikawaBest" FileVersion="1.2.2.1" ProductVersion="1.2.2.1" publishDir="/dist/" dstrip="false" local="false" ignored="false">
 	<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
 	<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
 		<file name="chiikawa.png" path="res\chiikawa.png" comment="res\chiikawa.png"/>

dlg/apps_setting.aardio

@@ -2,9 +2,11 @@ import win.ui;
 /*DSG{{*/
 var winform = win.form(text="应用设置";right=447;bottom=207;clipch=1)
 winform.add(
-btnRestore={cls="button";text="恢复默认链接";left=80;top=128;right=176;bottom=152;dl=1;dt=1;flat=1;z=8};
-static={cls="static";text="更新地址：";left=8;top=128;right=80;bottom=152;center=1;dl=1;dt=1;transparent=1;z=7};
-urlSetting={cls="edit";text="https://raw.githubusercontent.com/YrracOwl/ChiikawaBest/master/release/ChiikawaBest.exe";left=8;top=152;right=440;bottom=176;dl=1;dt=1;edge=1;z=6};
+btnRestore={cls="button";text="恢复默认链接";left=80;top=152;right=176;bottom=176;dl=1;dt=1;flat=1;z=8};
+localPort={cls="edit";text="9090";left=104;top=128;right=176;bottom=152;dl=1;dt=1;edge=1;z=10};
+static={cls="static";text="更新地址：";left=8;top=152;right=80;bottom=176;center=1;dl=1;dt=1;transparent=1;z=7};
+static2={cls="static";text="本地服务端口：";left=8;top=128;right=104;bottom=152;center=1;dl=1;dt=1;transparent=1;z=9};
+urlSetting={cls="edit";text="https://raw.githubusercontent.com/YrracOwl/ChiikawaBest/master/release/ChiikawaBest.exe";left=8;top=176;right=440;bottom=200;dl=1;dt=1;edge=1;z=6};
 关闭时清空记录={cls="checkbox";text="关闭时清空记录 (即时生效)";left=8;top=8;right=440;bottom=32;dl=1;dt=1;z=1};
 启动到托盘={cls="checkbox";text="启动时最小化到托盘";left=8;top=32;right=440;bottom=56;dl=1;dt=1;z=2};
 启动时检测更新={cls="checkbox";text="启动时检测更新";left=8;top=56;right=440;bottom=80;dl=1;dt=1;z=3};
@@ -22,6 +24,7 @@ winform.bindConfig( ..cfg.apps_setting,{
 	};
 	edit = {
 		["urlSetting"] = "text";
+		["localPort"] = "text";
 	}
 } );
 

dlg/publish.aardio

@@ -75,7 +75,7 @@ winform.uiWait = function(trueOrFalse){
 }
 
 winform.LANaddressReady = function(){
-	winform.LANaddress = ..wsock.tcp.simpleHttpServer.getUrl(winform.htmlPath);
+	winform.LANaddress = ..serverMain.getUrl(winform.htmlPath,true);
 	winform.uiWait(false);
 }
 

dlg/webwatcher.aardio

@@ -70,7 +70,7 @@ document.addEventListener('mousedown', function (event) {
 window.open =  function(url){ window.location.href = url; };
 
 `)
-var url_loading = ..wsock.tcp.simpleHttpServer.getUrl("\res\loading.html"); 
+var url_loading = ..serverMain.getUrl("\res\loading.html"); 
 
 //复用代码，已经加入到"winform.配置选择.onOk()"中了
 //因此需要在onOk()函数之后再调用
@@ -103,7 +103,7 @@ winform.返回.oncommand = function(id,event){
 }
 
 winform.首页.oncommand = function(id,event){
-	var url_crwaler = ..wsock.tcp.simpleHttpServer.getUrl(init_thrdTable.path_html_crawler); 
+	var url_crwaler = ..serverMain.getUrl(init_thrdTable.path_html_crawler); 
 	ww_webview.go(url_crwaler);
 	if(url_crwaler != url_loading){
 		init_thrdTable.g_wb_location = ww_webview.location;

main.aardio

@@ -142,15 +142,21 @@ namespace wsock.tcp.simpleHttpServer{
 }
 
 serverMain = wsock.tcp.simpleHttpServer.mainThread();
-serverMain.start("0.0.0.0",40315);
 
-import console;console.dump(serverMain.getLocalIp())
+mainForm.serverPath = "";
+mainForm.serverPort = 9090;
+
+if(cfg.apps_setting.localPort){
+	mainForm.serverPort = tonumber(cfg.apps_setting.localPort);
+}
+
+serverMain.start("0.0.0.0",mainForm.serverPort);
+
 if(serverMain.getLocalIp() == null){
 	serverMain.start("0.0.0.0",0);
-	console.dump(serverMain.getLocalIp())
 }
 
-//defaulUrl = wsock.tcp.simpleHttpServer.startUrl("/res/loading.html");//参数支持 aardio 工程嵌入资源目录路径
+mainForm.serverPath = serverMain.getUrl("",true);
 
 //设置：网站根目录
 siteBaseDir = "/home/";
@@ -421,7 +427,10 @@ mainForm.trayCreate = function(){
 
 	mainForm.popmenu.add();//分隔线
 	mainForm.popmenu.add('退出',function(id){
-		serverMain.stop();
+		if(serverMain){
+			serverMain.stop();
+			serverMain = null;
+		}
 		mainForm.onClose = null;
 		mainForm.onClose = function(hwnd,message,wParam,lParam){
 			if(webwatcher != "notExist"){
@@ -431,6 +440,7 @@ mainForm.trayCreate = function(){
 			cleanHistory();
     		fadeHide();	
 		}
+		mainForm.releaseAddOns();
 		mainForm.close();
 	})
 	mainForm.popmenu.popup();
@@ -468,7 +478,11 @@ mainForm.onClose = function(hwnd,message,wParam,lParam){
 }
 
 mainForm.onDestroy = function(){
-	serverMain.stop();
+	if(serverMain){
+		serverMain.stop();
+		serverMain = null;
+	}
+	mainForm.releaseAddOns();
 }
 
 var minimize_1st_show = true; 
@@ -516,8 +530,14 @@ mainForm.updateStart = function(){
 	if(confirmed){
 		updateBox.download(mainForm.updateUrl,updateFilePath,,,inet_launch_params)
 		mainForm.msgbox("下载已完成，即将重启","即将重启",,1600);
-		serverMain.stop();
+
+		if(serverMain){
+			serverMain.stop();
+			serverMain = null;
+		}
 		mainForm.onClose = null;
+		mainForm.releaseAddOns();
+
 		var currentPath = io._exepath;
 		process.execute(updateFilePath+"ChiikawaBest.exe",'operation=update;path='+currentPath);
 		mainForm.close();
@@ -837,6 +857,17 @@ mainForm.loadAddOns = function(dirPath){
 
 }
 
+mainForm.releaseAddOns = function(){
+	for(k,v in mainForm.varAddOns){
+		mainForm.varAddOns[k] = null;
+	}
+	mainForm.varAddOns = {};
+}
+
+
+logWarn("服务器地址：", mainForm.serverPath);
+logWarn("服务器ID：",serverMain.serverId);
+
 //////////////////////////////////////////////////////////////////////
 //创建托盘图标
 //////////////////////////////////////////////////////////////////////

release/1.2.2.0

@@ -0,0 +1 @@
+1.2.2.0