2.3.3

.gitignore

@@ -16,6 +16,7 @@ target/
 *.ipr
 *.log
 *.flattened-pom.xml
+*/package-lock.json
 
 ### NetBeans ###
 nbproject/private/
@@ -27,6 +28,7 @@ nbdist/
 obj/
 bin/
 node_modules/
+.hbuilderx/
 
 ### Mac files ###
 *.DS_Store

android/android_test/app/build.gradle.kts

@@ -41,9 +41,9 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.8.0")
 
-    implementation("org.noear:socketd-transport-java-tcp:2.3.2")
-    implementation("org.noear:socketd-transport-java-udp:2.3.2")
-    implementation("org.noear:socketd-transport-java-websocket:2.3.2")
+    implementation("org.noear:socketd-transport-java-tcp:2.3.3")
+    implementation("org.noear:socketd-transport-java-udp:2.3.3")
+    implementation("org.noear:socketd-transport-java-websocket:2.3.3")
 
     implementation("com.github.tony19:logback-android:3.0.0")
 

java/socketd-examples/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-parent/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.noear</groupId>
     <artifactId>socketd-parent</artifactId>
-    <version>2.3.2</version>
+    <version>2.3.3</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -18,7 +18,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <socketd.version>2.3.2</socketd.version>
+        <socketd.version>2.3.3</socketd.version>
 
         <slf4j.version>2.0.9</slf4j.version>
         <junit5.version>5.9.1</junit5.version>

java/socketd-transport-test/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-aeron/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-java-kcp/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-java-tcp/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-java-udp/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-java-websocket/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-netty/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd-transport/socketd-transport-smartsocket/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.3.2</version>
+        <version>2.3.3</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

java/socketd/src/main/java/org/noear/socketd/SocketD.java

@@ -24,7 +24,7 @@ public class SocketD {
      * 框架版本号
      */
     public static String version() {
-        return "2.3.2";
+        return "2.3.3";
     }
 
     /**

javascript/ LOG.md

@@ -1,3 +1,7 @@
+### 2.3.3
+
+* 完成 uniapp（h5,android,ios）, node.js 兼容测试
+
 ### 2.3.1
 * 添加 range 元信息快捷方式
 

javascript/socketd-examples/demo02-node-ws/package.json

@@ -3,6 +3,6 @@
   "description": "SocketD Node Test Project",
   "author": "aoshiguchen",
   "dependencies": {
-    "@noear/socket.d": "2.3.2"
+    "@noear/socket.d": "2.3.3"
   }
 }

javascript/socketd-examples/demo03-uniapp-ws/manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "test-socktd",
+    "name" : "demo03-uniapp-ws",
     "appid" : "",
     "description" : "",
     "versionName" : "1.0.0",

javascript/socketd-examples/demo03-uniapp-ws/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "demo03-uniapp-ws",
+  "description": "SocketD Uniapp Test Project",
+  "author": "ZhangQi",
+  "dependencies": {
+    "@noear/socket.d": "2.3.3"
+  }
+}

javascript/socketd-examples/demo03-uniapp-ws/pages/index/index.vue

@@ -3,7 +3,7 @@
 		<!-- Table 1 -->
 
 		<view style="text-align: center">
-			<h2>socket.d uniapp demo</h2>
+			<h2>socket.d js uniapp demo</h2>
 		</view>
 		<hr />
 		<form class="form">
@@ -44,7 +44,7 @@
 				<button class="btn" @click="unpush">取消推送</button>
 				<!-- <button class="btn" @click="uploadFile">上传文件</button> -->
 				<button class="btn" @click="downloadFile">下载文件</button>
-				<button class="btn" @click="uploadData">提交大文件</button>
+				<button class="btn" @click="uploadData">提交大文本</button>
 			</view>
 		</form>
 	</div>
@@ -88,7 +88,7 @@ export default {
 				.config((c) => c.fragmentSize(1024 * 1024))
 				.listen(
 					SocketD.newEventListener().doOnMessage((s, m) => {
-						appendToMessageList('收到推送', m.dataAsString());
+						this.appendToMessageList('收到推送', m.dataAsString());
 					})
 				)
 				.open();
@@ -160,8 +160,6 @@ export default {
 				});
 			} else {
 				this.open(() => {
-					debugger
-
 					this.openBtnText = '关闭';
 					this.isOpen = true;
 				});
@@ -218,7 +216,7 @@ export default {
 			}
 		},
 		downloadFile() {
-			if (isOpen) {
+			if (this.isOpen) {
 				this.appendToMessageList('下载文件', '...');
 				this.clientSession
 					.sendAndRequest('/download', SocketD.newEntity())
@@ -254,7 +252,7 @@ export default {
 			}
 		},
 		uploadData() {
-			if (isOpen) {
+			if (this.isOpen) {
 				const strSize = 1024 * 1024 * 10;
 				let str = '';
 				while (str.length < strSize) {
@@ -341,11 +339,9 @@ export default {
 
 .btn {
 	/* width: 200upx; */
-	width: 23%;
-	margin: 0 0.5%;
-	/* height: 200px; */
-	/* background-color: red; */
-	margin-bottom: 20px;
+	width: 46%;
+	margin: 0 2%;
+	margin-bottom: 10px;
 }
 
 .content {

javascript/socketd/src/socketd/SocketD.ts

@@ -35,7 +35,7 @@ export class SocketD {
      * 框架版本号
      */
     static version(): string {
-        return "2.3.2";
+        return "2.3.3";
     }
 
     /**

javascript/socketd/src/socketd/transport/core/Entity.ts

@@ -184,7 +184,15 @@ export class EntityDefault implements Entity {
      * 获取元信息字符串（queryString style）
      */
     metaString(): string {
-        return this.metaMap().toString();
+        let str = "";
+        this.metaMap().forEach((val, key,p) => {
+            str += `${key}=${val}&`;
+        });
+        if (str.length > 0) {
+            return str.substring(0, str.length - 1);
+        } else {
+            return str;
+        }
     }
 
     /**

javascript/socketd/webpack.md

@@ -33,4 +33,15 @@ cnpm i -D webpack-cli
 
 ```
 npm publish
+```
+
+
+```javascript
+
+/*!
+ * Socket.D v2.3.3
+ * (c) 2023-2024 noear.org and other contributors
+ * Released under the Apache-2.0 License.
+ */
+
 ```