2.5.6

noear · Jun 18, 2024 · ed1fb5e · ed1fb5e
1 parent bfcae8a
commit ed1fb5e
Show file tree

Hide file tree

Showing 31 changed files with 48 additions and 39 deletions.
diff --git a/android/android_test/app/build.gradle.kts b/android/android_test/app/build.gradle.kts
@@ -67,10 +67,10 @@ dependencies {
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
-//    implementation("org.noear:socketd-transport-smartsocket:2.5.5")
-    implementation("org.noear:socketd-transport-java-tcp:2.5.5")
-    implementation("org.noear:socketd-transport-java-udp:2.5.5")
-    implementation("org.noear:socketd-transport-java-websocket:2.5.5")
+//    implementation("org.noear:socketd-transport-smartsocket:2.5.6")
+    implementation("org.noear:socketd-transport-java-tcp:2.5.6")
+    implementation("org.noear:socketd-transport-java-udp:2.5.6")
+    implementation("org.noear:socketd-transport-java-websocket:2.5.6")
 
     implementation("com.github.tony19:logback-android:3.0.0")
 }
diff --git a/java/LOG.md b/java/LOG.md
@@ -1,3 +1,6 @@
+### 2.5.6
+* smartsocket 升为 1.5.44
+
 ### 2.5.4
 * 添加 新的每秒帧流量控制接口 TrafficLimiter
 * 添加 Listener:onReply, onSend 方法，方便帧流量统计

diff --git a/java/socketd-examples/pom.xml b/java/socketd-examples/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-parent/pom.xml b/java/socketd-parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.noear</groupId>
     <artifactId>socketd-parent</artifactId>
-    <version>2.5.5</version>
+    <version>2.5.6</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -18,11 +18,11 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <socketd.version>2.5.5</socketd.version>
+        <socketd.version>2.5.6</socketd.version>
 
         <slf4j.version>2.0.12</slf4j.version>
         <junit5.version>5.9.1</junit5.version>
-        <smartsocket.version>1.5.43</smartsocket.version>
+        <smartsocket.version>1.5.44</smartsocket.version>
         <java-websocket.version>1.5.3</java-websocket.version>
         <netty.version>4.1.107.Final</netty.version>
         <aeron.version>1.37.0</aeron.version>

diff --git a/java/socketd-transport-test/pom.xml b/java/socketd-transport-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-aeron/pom.xml b/java/socketd-transport/socketd-transport-aeron/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-kcp/pom.xml b/java/socketd-transport/socketd-transport-java-kcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-tcp/pom.xml b/java/socketd-transport/socketd-transport-java-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/...d-transport-java-tcp/src/main/java/org/noear/socketd/transport/java_tcp/TcpBioServer.java b/...d-transport-java-tcp/src/main/java/org/noear/socketd/transport/java_tcp/TcpBioServer.java
@@ -70,6 +70,7 @@ public Server start() throws IOException {
 
         serverExecutor = Executors.newFixedThreadPool(getConfig().getWorkThreads());
         server = createServer();
+        server.setReuseAddress(true);
 
         serverExecutor.submit(this::accept);
 

diff --git a/java/socketd-transport/socketd-transport-java-udp/pom.xml b/java/socketd-transport/socketd-transport-java-udp/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-java-websocket/pom.xml b/java/socketd-transport/socketd-transport-java-websocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-neta/pom.xml b/java/socketd-transport/socketd-transport-neta/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-netty/pom.xml b/java/socketd-transport/socketd-transport-netty/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-smartsocket/pom.xml b/java/socketd-transport/socketd-transport-smartsocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd-transport/socketd-transport-spring-websocket/pom.xml b/java/socketd-transport/socketd-transport-spring-websocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd/pom.xml b/java/socketd/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>socketd-parent</artifactId>
-        <version>2.5.5</version>
+        <version>2.5.6</version>
         <relativePath>../socketd-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/java/socketd/src/main/java/org/noear/socketd/SocketD.java b/java/socketd/src/main/java/org/noear/socketd/SocketD.java
@@ -24,7 +24,7 @@ public class SocketD {
      * 框架版本号
      */
     public static String version() {
-        return "2.5.5";
+        return "2.5.6";
     }
 
     /**

diff --git a/javascript/ LOG.md b/javascript/ LOG.md
@@ -1,3 +1,7 @@
+### 2.5.6
+* 强化 EntityDefault::dataSet 方法，支持 Buffer 传入
+* 强化 Session::sendAlarm 支持 Entity 传入
+
 ### 2.5.5
 * 修复 wechat 的环境识别问题
 

diff --git a/javascript/release/socket.d.esm.js b/javascript/release/socket.d.esm.js
diff --git a/javascript/release/socket.d.js b/javascript/release/socket.d.js
diff --git a/javascript/socketd-examples/demo01-js-ws/js/socket.d.esm.js b/javascript/socketd-examples/demo01-js-ws/js/socket.d.esm.js
diff --git a/javascript/socketd-examples/demo01-js-ws/js/socket.d.js b/javascript/socketd-examples/demo01-js-ws/js/socket.d.js
diff --git a/javascript/socketd-examples/demo02-node-ws/package.json b/javascript/socketd-examples/demo02-node-ws/package.json
@@ -3,7 +3,7 @@
   "description": "SocketD Node Test Project",
   "author": "aoshiguchen",
   "dependencies": {
-    "@noear/socket.d": "2.5.5",
+    "@noear/socket.d": "2.5.6",
     "ws": "^8.16.0"
   }
 }
diff --git a/javascript/socketd-examples/demo03-uniapp-ws/package.json b/javascript/socketd-examples/demo03-uniapp-ws/package.json
@@ -3,6 +3,6 @@
   "description": "SocketD Uniapp Test Project",
   "author": "ZhangQi",
   "dependencies": {
-    "@noear/socket.d": "2.5.5"
+    "@noear/socket.d": "2.5.6"
   }
 }
diff --git a/javascript/socketd-examples/demo06-im/index.html b/javascript/socketd-examples/demo06-im/index.html
@@ -4,7 +4,7 @@
     <title>Socket.D-im demo</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8 " />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=yes" />
-    <script src="https://cdn.jsdelivr.net/gh/noear/[email protected].5/javascript/release/socket.d.js"></script>
+    <script src="https://cdn.jsdelivr.net/gh/noear/[email protected].6/javascript/release/socket.d.js"></script>
     <style>
         body{max-width: 900px; margin: auto;}
         table th {  text-align: right; }

diff --git a/javascript/socketd/src/socketd/SocketD.ts b/javascript/socketd/src/socketd/SocketD.ts
@@ -54,7 +54,7 @@ export class SocketD {
      * 框架版本号
      */
     static version(): string {
-        return "2.5.5";
+        return "2.5.6";
     }
 
     /**

diff --git a/javascript/socketd/webpack.config.js b/javascript/socketd/webpack.config.js
@@ -8,9 +8,9 @@ module.exports = {
     },
     output: {
         // 把所有依赖的模块合并输出到一个 bundle.js 文件
-        filename: 'socket.d.esm.js', // module->socket.d.esm.js //window -> socket.d.js
+        filename: 'socket.d.js', //window -> socket.d.js // module->socket.d.esm.js (要去掉最后的 r as __esModule)
         // 输出文件都放到 dist 目录下
         path: path.resolve(__dirname, './dist/release'),
-        libraryTarget: 'module'//'commonjs2' //module //window //global//this(更通用)
+        libraryTarget: 'window'//'commonjs2' //module //window //global//this(更通用)
     }
 }
diff --git a/javascript/socketd/webpack.md b/javascript/socketd/webpack.md
@@ -39,11 +39,9 @@ npm publish
 ```javascript
 
 /*!
- * Socket.D v2.5.5
+ * Socket.D v2.5.6
  * (c) 2023-2024 noear.org
  * Released under the Apache-2.0 License.
  */
 
-//module -> socket.d.esm.js //去掉最后的 r as __esModule
-//window -> socket.d.js
 ```
diff --git a/python/LOG.md b/python/LOG.md
@@ -1,3 +1,6 @@
+### 2.5.6
+* 优化 Session::send_alarm 申明，支持 alarm: str|Entity
+
 ### 2.5.4
 * 添加 Listener:onReply, onSend 方法，方便帧流量统计
 * 添加 FrameIoHandler 接口，强化 Processor 的帧输入输出强控地位

diff --git a/python/socketd/setup.py b/python/socketd/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='socket.d',
-    version='2.5.5',
+    version='2.5.6',
     description='@noear/socket.d python project',
     author='noear,bai',
     url='https://socketd.noear.org/',

diff --git a/python/socketd/socketd/SocketD.py b/python/socketd/socketd/SocketD.py
@@ -14,7 +14,7 @@
 
 
 def version() -> str:
-    return "2.5.5"
+    return "2.5.6"
 
 def protocol_name() -> str:
     return "Socket.D"