From a81920a1a5d2619bf294c2f867957ea62bce5126 Mon Sep 17 00:00:00 2001 From: James Feng Cao Date: Sat, 15 Apr 2023 20:12:02 +0800 Subject: [PATCH 1/4] enhance redirection cookie support --- en/_posts/index.xml | 5 +++-- en/changelog/index.html | 5 +++-- en/index.xml | 9 +++++---- en/redirect/index.html | 10 ++++++---- en/sitemap.xml | 14 +++++++------- en/tags/redirection/index.xml | 5 +++-- en/topposts/index.xml | 4 ++-- sitemap.xml | 2 +- 8 files changed, 30 insertions(+), 24 deletions(-) diff --git a/en/_posts/index.xml b/en/_posts/index.xml index 52f8a9e..7fc72ba 100644 --- a/en/_posts/index.xml +++ b/en/_posts/index.xml @@ -12,8 +12,9 @@ Tue, 11 Apr 2023 00:00:00 +0000 /en/redirect/ - Redirection forwards cookies with all following three setting options enabled: "Resource redirection", "Redirect w/ cookies" and "Hide certificate errors", so use the options with care. -Global redirection Global redirection is enabled with the setting option "Resource redirection". + ⚠️Redirection forwards cookies with the setting option "Redirect cookies" enabled, so use the options with care. +Setting options: "Url redirection" vs. "Resource redirection" "Url redirection" redirects the main/page url only while "Resource redirection" is for all urls in the page. +Global redirection Global redirection is enabled with the setting option "Resource redirection" or both "Url redirection" and "Redirect cookies". When a valid global redirection url is set, the "default.redirect" has no effect, and any url resource is fetched with the new url by appending the original url to the global redirection url. diff --git a/en/changelog/index.html b/en/changelog/index.html index 645fad6..80f9a23 100644 --- a/en/changelog/index.html +++ b/en/changelog/index.html @@ -48,6 +48,7 @@

github

sourceforge

powerfolder

+

pcloud

pagure

Main features

Change logs

@@ -77,8 +78,8 @@ -

Last Modified: 14 April 2023
-add option: 'cookie forward'
+

Last Modified: 15 April 2023
+enhance redirection cookie support


 

 
diff --git a/en/index.xml b/en/index.xml
index 981ec86..1f6ef2f 100644
--- a/en/index.xml
+++ b/en/index.xml
@@ -12,8 +12,9 @@
       Tue, 11 Apr 2023 00:00:00 +0000
       
       /en/redirect/
-      Redirection forwards cookies with all following three setting options enabled: "Resource redirection", "Redirect w/ cookies" and "Hide certificate errors", so use the options with care.
-Global redirection Global redirection is enabled with the setting option "Resource redirection".
+      ⚠️Redirection forwards cookies with the setting option "Redirect cookies" enabled, so use the options with care.
+Setting options: "Url redirection" vs. "Resource redirection" "Url redirection" redirects the main/page url only while "Resource redirection" is for all urls in the page.
+Global redirection Global redirection is enabled with the setting option "Resource redirection" or both "Url redirection" and "Redirect cookies".
 When a valid global redirection url is set, the "default.redirect" has no effect, and any url resource is fetched with the new url by appending the original url to the global redirection url.
     
     
@@ -205,13 +206,13 @@ uweb, termux & history versions
 github
 sourceforge
 powerfolder
+pcloud
 pagure
 Main features Change logs 991: global url redirection support.
 988: hosts file to support response headers.
 985: Special urls to support shortcut keys such as ctrl-a to ctrl-z.
 983: support "hosts" file domain name resolving (no root needed), only single space allowed as separator for ip address and domain name.
-975: Bookmarks to support styling for markdown etc.
-971: multiple type profiles: switch any data including website logins, user configurations orthogonally.
+975: Bookmarks to support styling for markdown etc.
     
     
     
diff --git a/en/redirect/index.html b/en/redirect/index.html
index 4936ba3..40e4e13 100644
--- a/en/redirect/index.html
+++ b/en/redirect/index.html
@@ -49,9 +49,11 @@
     
  • redirection 
    • 
     
   
-  
    Redirection forwards cookies with all following three setting options enabled: "Resource redirection", "Redirect w/ cookies" and "Hide certificate errors", so use the options with care.
    
+  
    ⚠️Redirection forwards cookies with the setting option "Redirect cookies" enabled, so use the options with care.
    
+
    Setting options: "Url redirection" vs. "Resource redirection"
    
+
    "Url redirection" redirects the main/page url only while "Resource redirection" is for all urls in the page.
    
 
    Global redirection
    
-
    Global redirection is enabled with the setting option "Resource redirection".
    
+
    Global redirection is enabled with the setting option "Resource redirection" or both "Url redirection" and "Redirect cookies".
    
 
    When a valid global redirection url is set, the "default.redirect" has no effect, and any url resource is fetched with the new url by appending the original url to the global redirection url.
    
 
    "default.redirect" (valid only without global redirection url)
    
 
    Click the following links to append mirrors to the file "default.redirect":
    
@@ -67,8 +69,8 @@
 
 
 
-
    Last Modified: 14 April 2023
    
-add option: 'cookie forward'
    
+
    Last Modified: 15 April 2023
    
+enhance redirection cookie support
    
 
    
 
    
 
diff --git a/en/sitemap.xml b/en/sitemap.xml
index 66223af..00b9eb9 100644
--- a/en/sitemap.xml
+++ b/en/sitemap.xml
@@ -3,7 +3,7 @@
   xmlns:xhtml="http://www.w3.org/1999/xhtml">
   
     /en/_posts/
-    2023-04-14T16:04:50+08:00
+    2023-04-15T18:08:03+08:00
     
   
     /en/tags/redirection/
-    2023-04-14T16:04:50+08:00
+    2023-04-15T18:08:03+08:00
   
     /en/redirect/
-    2023-04-14T16:04:50+08:00
+    2023-04-15T18:08:03+08:00
     
   
     /en/tags/
-    2023-04-14T16:04:50+08:00
+    2023-04-15T18:08:03+08:00
     
   
     /en/
-    2023-04-14T16:04:50+08:00
+    2023-04-15T18:08:03+08:00
     
   
     /en/topposts/
-    2023-04-14T10:37:49+08:00
+    2023-04-15T14:17:21+08:00
     
   
     /en/changelog/
-    2023-04-14T10:37:49+08:00
+    2023-04-15T14:17:21+08:00
   
     /en/sitemap/
     2023-02-01T09:52:11+08:00
diff --git a/en/tags/redirection/index.xml b/en/tags/redirection/index.xml
index c96f36e..243d9da 100644
--- a/en/tags/redirection/index.xml
+++ b/en/tags/redirection/index.xml
@@ -12,8 +12,9 @@
       Tue, 11 Apr 2023 00:00:00 +0000
       
       /en/redirect/
-      Redirection forwards cookies with all following three setting options enabled: "Resource redirection", "Redirect w/ cookies" and "Hide certificate errors", so use the options with care.
-Global redirection Global redirection is enabled with the setting option "Resource redirection".
+      ⚠️Redirection forwards cookies with the setting option "Redirect cookies" enabled, so use the options with care.
+Setting options: "Url redirection" vs. "Resource redirection" "Url redirection" redirects the main/page url only while "Resource redirection" is for all urls in the page.
+Global redirection Global redirection is enabled with the setting option "Resource redirection" or both "Url redirection" and "Redirect cookies".
 When a valid global redirection url is set, the "default.redirect" has no effect, and any url resource is fetched with the new url by appending the original url to the global redirection url.
         
     
diff --git a/en/topposts/index.xml b/en/topposts/index.xml
index 047b119..dbb7c6d 100644
--- a/en/topposts/index.xml
+++ b/en/topposts/index.xml
@@ -63,13 +63,13 @@ uweb, termux & history versions
 github
 sourceforge
 powerfolder
+pcloud
 pagure
 Main features Change logs 991: global url redirection support.
 988: hosts file to support response headers.
 985: Special urls to support shortcut keys such as ctrl-a to ctrl-z.
 983: support "hosts" file domain name resolving (no root needed), only single space allowed as separator for ip address and domain name.
-975: Bookmarks to support styling for markdown etc.
-971: multiple type profiles: switch any data including website logins, user configurations orthogonally.
+975: Bookmarks to support styling for markdown etc.
     
     
     
diff --git a/sitemap.xml b/sitemap.xml
index 191ebab..a9857f6 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -4,7 +4,7 @@
   
     en/sitemap.xml
     
-      2023-04-14T16:04:50+08:00
+      2023-04-15T18:08:03+08:00
     
   
   

From 577cf5c6f68aa4223f280e3184d30ea971474ed9 Mon Sep 17 00:00:00 2001
From: James Feng Cao 
Date: Sat, 15 Apr 2023 20:50:39 +0800
Subject: [PATCH 2/4] sync bingAI

---
 en/searchurl/bingAI/js/bingChatHub.js |  91 +-----------------
 en/searchurl/bingAI/js/optionsSets.js | 129 ++++++++++++++++++++------
 2 files changed, 107 insertions(+), 113 deletions(-)

diff --git a/en/searchurl/bingAI/js/bingChatHub.js b/en/searchurl/bingAI/js/bingChatHub.js
index eb391f4..a0a1c8d 100644
--- a/en/searchurl/bingAI/js/bingChatHub.js
+++ b/en/searchurl/bingAI/js/bingChatHub.js
@@ -1,30 +1,12 @@
 var expUrl = new RegExp('^(https?://)([-a-zA-z0-9]+\\.)+([-a-zA-z0-9]+)+\\S*$');
-function timeString() {
-	var d = new Date();
-	var year = d.getFullYear();
-	var month = (d.getMonth() + 1).toString().padStart(2, "0");
-	var date = d.getDate().toString().padStart(2, "0");
-	var hour = d.getHours().toString().padStart(2, "0");
-	var minute = d.getMinutes().toString().padStart(2, "0");
-	var second = d.getSeconds().toString().padStart(2, "0");
-	var offset = "+08:00"; // 你可以根据需要修改这个值
-	var s = year + "-" + month + "-" + date + "T" + hour + ":" + minute + ":" + second + offset;
-	return s;
-}
-
 function getUuidNojian() {
 	return URL.createObjectURL(new Blob()).split('/')[3].replace(/-/g, '');
 }
 
-function getUuid() {
-	return URL.createObjectURL(new Blob()).split('/')[3];
-}
-
 class SendMessageManager {
 	//(会话id，客户端id，签名id，是否是开始)
 	//(string,string,string,boolena)
 	constructor(conversationId, clientId, conversationSignature,invocationId) {
-		this.startTime = timeString();
 		this.invocationId = invocationId==undefined?1:invocationId;
 		this.conversationId = conversationId;
 		this.clientId = clientId;
@@ -53,80 +35,18 @@ class SendMessageManager {
 	}
 	//获取用于发送的聊天数据
 	//(WebSocket,sreing)
-	sendChatMessage(chatWebSocket, chat) {
-	  let pos = ['','','']; //initial 3 suggestions
-		let previousMessages = [{
-			"text": '',
-			"author": "bot",
-			"adaptiveCards": [],
-			"suggestedResponses": [{
-				"text": pos[0],
-				"contentOrigin": "DeepLeo",
-				"messageType": "Suggestion",
-				"messageId": getUuid(),
-				"offense": "Unknown"
-			}, {
-				"text": pos[1],
-				"contentOrigin": "DeepLeo",
-				"messageType": "Suggestion",
-				"messageId": getUuid(),
-				"offense": "Unknown"
-			}, {
-				"text": pos[2],
-				"contentOrigin": "DeepLeo",
-				"messageType": "Suggestion",
-				"messageId": getUuid(),
-				"offense": "Unknown"
-			}],
-			"messageId": getUuid(),
-			"messageType": "Chat"
-		}];
+  async sendChatMessage(chatWebSocket, chat) {
+    let optionsSets = chatTypes[this.optionsSets];
 		let json = {
 			"arguments": [{
-				"source": "cib",
-				"optionsSets": this.optionsSets,
+				"source": source,
+				"optionsSets": optionsSets,
 				"allowedMessageTypes": allowedMessageTypes,
 				"sliceIds": sliceIds,
 				"verbosity": "verbose",
 				"traceId": getUuidNojian(),
 				"isStartOfSession": (this.invocationId <= 1) ? true : false,
-				"message": {
-					"locale": "zh-CN",
-					"market": "zh-CN",
-					"region": "US",
-					"location": "lat:47.639557;long:-122.128159;re=1000m;",
-					"locationHints": [
-						{
-							"Center": {
-								"Latitude": 30.474109798833613,
-								"Longitude": 114.39626256171093
-							},
-							"RegionType": 2,
-							"SourceType": 11
-						},
-						{
-							"country": "United States",
-							"state": "California",
-							"city": "Los Angeles",
-							"zipcode": "90060",
-							"timezoneoffset": -8,
-							"dma": 803,
-							"countryConfidence": 8,
-							"cityConfidence": 5,
-							"Center": {
-								"Latitude": 33.9757,
-								"Longitude": -118.2564
-							},
-							"RegionType": 2,
-							"SourceType": 1
-						}
-					],
-					"timestamp": this.startTime,
-					"author": "user",
-					"inputMethod": "Keyboard",
-					"text": chat,
-					"messageType": "Chat"
-				},
+				"message": await generateMessages(this,chat),
 				"conversationSignature": this.conversationSignature,
 				"participant": {
 					"id": this.clientId
@@ -140,7 +60,6 @@ class SendMessageManager {
 		};
 		this.sendJson(chatWebSocket, json);
 		this.invocationId++;
-		setLastInvocationId(this.invocationId);
 	}
 }
 
diff --git a/en/searchurl/bingAI/js/optionsSets.js b/en/searchurl/bingAI/js/optionsSets.js
index fbd6119..d9934a5 100644
--- a/en/searchurl/bingAI/js/optionsSets.js
+++ b/en/searchurl/bingAI/js/optionsSets.js
@@ -8,10 +8,11 @@ let chatTypes = {
 		"responsible_ai_policy_235",
 		"enablemm",
 		"h3imaginative",
-		"jbf101",
+		"responseos",
 		"cachewriteext",
 		"e2ecachewrite",
 		"nodlcpcwrite",
+		"travelansgnd",
 		"dv3sugg",
 		"clgalileo",
 		"gencontentv3"
@@ -24,31 +25,39 @@ let chatTypes = {
 		"responsible_ai_policy_235",
 		"enablemm",
 		"galileo",
-		"jbf101",
+		"responseos",
 		"cachewriteext",
 		"e2ecachewrite",
 		"nodlcpcwrite",
-		"dv3sugg",
-		"dlwebtrunc",
-		"glpromptv6"
+		"travelansgnd",
+		"dv3sugg"
 	],
 	//精准选项
 	accurate: [
-		"nlu_direct_response_filter",
-		"deepleo",
-		"disable_emoji_spoken_text",
-		"responsible_ai_policy_235",
-		"enablemm",
-		"h3precise",
-		"clgalileo",
-		"jbf101",
-		"cachewriteext",
-		"e2ecachewrite",
-		"nodlcpcwrite",
-		"dv3sugg"
+		"chk1cf",
+		"nopreloadsscf",
+		"winlongmsg2tf",
+		"perfimpcomb",
+		"sugdivdis",
+		"sydnoinputt",
+		"wpcssopt",
+		"wintone2tf",
+		"0404sydicnbs0",
+		"405suggbs0",
+		"scctl",
+		"330uaugs0",
+		"0329resp",
+		"udscahrfon",
+		"udstrblm5",
+		"404e2ewrt",
+		"408nodedups0",
+		"403tvlansgnd"
 	]
 }
 
+//消息来源
+let source = "cib";
+
 //接收消息类型
 let allowedMessageTypes = [
 	"Chat",
@@ -65,21 +74,87 @@ let allowedMessageTypes = [
 
 //切片id，也不知道是啥意思，反正官网的更新了
 let sliceIds = [
-	"audseq",
-	"chk1cln",
-	"nofbkcf",
-	"nosharepre",
-	"fixsacodecf",
+	"chk1cf",
+	"nopreloadsscf",
+	"winlongmsg2tf",
+	"perfimpcomb",
+	"sugdivdis",
+	"sydnoinputt",
+	"wpcssopt",
+	"wintone2tf",
+	"0404sydicnbs0",
 	"405suggbs0",
 	"scctl",
-	"403jbf101",
-	"udstrclm8cmp",
-	"udstrclm8",
-	"329v6webtrunc",
-	"404e2ewrt"
+	"330uaugs0",
+	"0329resp",
+	"udscahrfon",
+	"udstrblm5",
+	"404e2ewrt",
+	"408nodedups0",
+	"403tvlansgnd"
 ]
 
 
+
+
+//生成消息对象
+async function generateMessages(sendMessageManager/*消息管理器*/,chatMessageText/*要发送的消息文本*/){
+	function timeString() {
+		var d = new Date();
+		var year = d.getFullYear();
+		var month = (d.getMonth() + 1).toString().padStart(2, "0");
+		var date = d.getDate().toString().padStart(2, "0");
+		var hour = d.getHours().toString().padStart(2, "0");
+		var minute = d.getMinutes().toString().padStart(2, "0");
+		var second = d.getSeconds().toString().padStart(2, "0");
+		var offset = "+08:00"; // 你可以根据需要修改这个值
+		var s = year + "-" + month + "-" + date + "T" + hour + ":" + minute + ":" + second + offset;
+		return s;
+	}
+	
+	if(!sendMessageManager.startTime){
+		sendMessageManager.startTime = timeString();
+	}
+	return {
+		"locale": "zh-CN",
+		"market": "zh-CN",
+		"region": "US",
+		"location": "lat:47.639557;long:-122.128159;re=1000m;",
+		"locationHints": [
+			{
+				"Center": {
+					"Latitude": 30.474109798833613,
+					"Longitude": 114.39626256171093
+				},
+				"RegionType": 2,
+				"SourceType": 11
+			},
+			{
+				"country": "United States",
+				"state": "California",
+				"city": "Los Angeles",
+				"zipcode": "90060",
+				"timezoneoffset": -8,
+				"dma": 803,
+				"countryConfidence": 8,
+				"cityConfidence": 5,
+				"Center": {
+					"Latitude": 33.9757,
+					"Longitude": -118.2564
+				},
+				"RegionType": 2,
+				"SourceType": 1
+			}
+		],
+		"timestamp": sendMessageManager.startTime,
+		"author": "user",
+		"inputMethod": "Keyboard",
+		"text": chatMessageText,
+		"messageType": "Chat"
+	}
+	
+}
+
 async function getPreviousMessages(){
 	function getUuid() {
 		return URL.createObjectURL(new Blob()).split('/')[3];

From 8ea7d1e5a9082c6873f035a68e912fb269f2e06c Mon Sep 17 00:00:00 2001
From: James Feng Cao 
Date: Sat, 15 Apr 2023 21:43:30 +0800
Subject: [PATCH 3/4] sync bingAI

---
 en/searchurl/bingAI/js/bingChatHub.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/en/searchurl/bingAI/js/bingChatHub.js b/en/searchurl/bingAI/js/bingChatHub.js
index a0a1c8d..89a90ef 100644
--- a/en/searchurl/bingAI/js/bingChatHub.js
+++ b/en/searchurl/bingAI/js/bingChatHub.js
@@ -52,7 +52,7 @@ class SendMessageManager {
 					"id": this.clientId
 				},
 				"conversationId": this.conversationId,
-				"previousMessages": (this.invocationId <= 1) ? previousMessages : undefined
+				"previousMessages": (this.invocationId <= 1) ? await getPreviousMessages() : undefined
 			}],
 			"invocationId": this.invocationId.toString(),
 			"target": "chat",

From 6f832ad3d97ad19c0027faa06a30647ba5478e24 Mon Sep 17 00:00:00 2001
From: James Feng Cao 
Date: Sat, 15 Apr 2023 22:05:31 +0800
Subject: [PATCH 4/4] sync bingAI

---
 en/searchurl/bingAI/bing.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/en/searchurl/bingAI/bing.html b/en/searchurl/bingAI/bing.html
index 8c32424..42b16b5 100644
--- a/en/searchurl/bingAI/bing.html
+++ b/en/searchurl/bingAI/bing.html
@@ -79,6 +79,8 @@
         if(v && v.startsWith("http")) return v;
         return "https://mybing2.xn--xyza.top/";
       }
+      function getStartProposes(){return ["","",""];}
+      function getStartMessage(){return "";}