1.2.4

noear · Mar 1, 2024 · 94446e4 · 94446e4
1 parent c7241be
commit 94446e4
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 19 deletions.
diff --git a/LOG.md b/LOG.md
@@ -1,3 +1,6 @@
+### 1.2.4
+* 添加 folkmq-server 对 ws 输传协议的支持
+
 ### 1.2.3
 * 添加 rpc 异常传导机制
 * 完成 javascript 语言客户端实现

diff --git a/folkmq-lang-java/folkmq-broker/pom.xml b/folkmq-lang-java/folkmq-broker/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-broker/src/main/java/org/noear/folkmq/broker/App.java b/folkmq-lang-java/folkmq-broker/src/main/java/org/noear/folkmq/broker/App.java
@@ -1,5 +1,9 @@
 package org.noear.folkmq.broker;
 
+import org.noear.socketd.SocketD;
+import org.noear.socketd.transport.java_websocket.WsNioProvider;
+import org.noear.socketd.transport.netty.tcp.TcpNioProvider;
+import org.noear.socketd.transport.netty.udp.UdpNioProvider;
 import org.noear.solon.Solon;
 import org.noear.solon.validation.ValidatorException;
 
@@ -10,6 +14,14 @@
 public class App {
     public static void main(String[] args) {
         Solon.start(App.class, args, app -> {
+            //手动注册（避免 spi 失效）
+            SocketD.registerServerProvider(new WsNioProvider());
+            SocketD.registerClientProvider(new WsNioProvider());
+            SocketD.registerServerProvider(new TcpNioProvider());
+            SocketD.registerClientProvider(new TcpNioProvider());
+            SocketD.registerServerProvider(new UdpNioProvider());
+            SocketD.registerClientProvider(new UdpNioProvider());
+
             //启用安全停止
             app.cfg().stopSafe(true);
 

diff --git a/folkmq-lang-java/folkmq-parent/pom.xml b/folkmq-lang-java/folkmq-parent/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.noear</groupId>
     <artifactId>folkmq-parent</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -18,8 +18,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <folkmq.version>1.2.3</folkmq.version>
-        <socketd.version>2.4.5</socketd.version>
+        <folkmq.version>1.2.4</folkmq.version>
+        <socketd.version>2.4.6</socketd.version>
         <snack3.version>3.2.88</snack3.version>
         <solon.version>2.7.1</solon.version>
 

diff --git a/folkmq-lang-java/folkmq-pro/pom.xml b/folkmq-lang-java/folkmq-pro/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-server/pom.xml b/folkmq-lang-java/folkmq-server/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-server/src/main/java/org/noear/folkmq/server/pro/App.java b/folkmq-lang-java/folkmq-server/src/main/java/org/noear/folkmq/server/pro/App.java
@@ -1,5 +1,9 @@
 package org.noear.folkmq.server.pro;
 
+import org.noear.socketd.SocketD;
+import org.noear.socketd.transport.java_websocket.WsNioProvider;
+import org.noear.socketd.transport.netty.tcp.TcpNioProvider;
+import org.noear.socketd.transport.netty.udp.UdpNioProvider;
 import org.noear.solon.Solon;
 import org.noear.solon.validation.ValidatorException;
 
@@ -10,6 +14,14 @@
 public class App {
     public static void main(String[] args) {
         Solon.start(App.class, args, app -> {
+            //手动注册（避免 spi 失效）
+            SocketD.registerServerProvider(new WsNioProvider());
+            SocketD.registerClientProvider(new WsNioProvider());
+            SocketD.registerServerProvider(new TcpNioProvider());
+            SocketD.registerClientProvider(new TcpNioProvider());
+            SocketD.registerServerProvider(new UdpNioProvider());
+            SocketD.registerClientProvider(new UdpNioProvider());
+
             //启用安全停止
             app.cfg().stopSafe(true);
 

diff --git a/folkmq-lang-java/folkmq-solon/pom.xml b/folkmq-lang-java/folkmq-solon/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-test/pom.xml b/folkmq-lang-java/folkmq-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-transport-java-tcp/pom.xml b/folkmq-lang-java/folkmq-transport-java-tcp/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-transport-java-websocket/pom.xml b/folkmq-lang-java/folkmq-transport-java-websocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-transport-netty/pom.xml b/folkmq-lang-java/folkmq-transport-netty/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq-transport-smartsocket/pom.xml b/folkmq-lang-java/folkmq-transport-smartsocket/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq/pom.xml b/folkmq-lang-java/folkmq/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>folkmq-parent</artifactId>
-        <version>1.2.3</version>
+        <version>1.2.4</version>
         <relativePath>../folkmq-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/folkmq-lang-java/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java b/folkmq-lang-java/folkmq/src/main/java/org/noear/folkmq/FolkMQ.java
@@ -28,7 +28,7 @@ public static String versionCodeAsString() {
      * 获取版本名称
      */
     public static String versionName() {
-        return "1.2.3";
+        return "1.2.4";
     }
 
     /**

diff --git a/folkmq-lang-js/folkmq-test/demo02-node-ws/package.json b/folkmq-lang-js/folkmq-test/demo02-node-ws/package.json
@@ -3,8 +3,6 @@
   "description": "FolkMQ Node Test Project",
   "author": "noear",
   "dependencies": {
-    "@noear/socket.d": "2.4.5",
-    "@noear/folkmq": "1.2.3",
-    "ws": "^8.16.0"
+    "@noear/folkmq": "1.2.4"
   }
 }
diff --git a/folkmq-lang-js/folkmq/package.json b/folkmq-lang-js/folkmq/package.json
@@ -12,6 +12,6 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
-    "@noear/socket.d": "2.4.5"
+    "@noear/socket.d": "2.4.6"
   }
 }
diff --git a/folkmq-lang-js/folkmq/src/FolkMQ.ts b/folkmq-lang-js/folkmq/src/FolkMQ.ts
@@ -25,7 +25,7 @@ export class FolkMQ {
      * 获取版本
      */
     static versionName(): string {
-        return "1.2.3";
+        return "1.2.4";
     }
 
     /**

diff --git a/folkmq-lang-js/folkmq/webpack.md b/folkmq-lang-js/folkmq/webpack.md
@@ -0,0 +1,47 @@
+
+### 1、打包流程
+
+* 完成 ts 编译（多个文件）
+* 通过 webpack (mode=production)打包成一个 js 文件（socket.d.js）
+* 发布到 npm
+
+压缩工具(production 后，不需要了)
+
+https://www.wetools.com/js-compress/iYZtYekyTx3sWeGAA6jFE4GjKKnBBzNt
+
+发布说明
+
+https://www.jb51.net/article/278264.htm
+
+### 2、webpack 安装参考
+
+* 全局安装
+
+```
+cnpm i -g webpack
+cnpm i -g webpack-cli
+```
+
+* 项目安装
+
+```
+cnpm i -D webpack
+cnpm i -D webpack-cli
+```
+
+* 发包
+
+```
+npm publish
+```
+
+
+```javascript
+
+/*!
+ * FolkMQ v1.2.4
+ * (c) 2023-2024 noear.org
+ * Released under the LGPL-2.1 License.
+ */
+
+```
diff --git a/folkmq-lang-js/release/folkmq.js b/folkmq-lang-js/release/folkmq.js