@lsby/net-core 0.7.6 → 0.7.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/cjs/index.cjs +15 -15
  2. package/dist/cjs/plugin/extend/web-socket.cjs +7 -7
  3. package/dist/cjs/server/server.cjs +8 -8
  4. package/dist/esm/{chunk-55V3RIEA.js → chunk-DAQJSWM3.js} +7 -7
  5. package/dist/esm/{chunk-J3SZOWVX.js → chunk-GMWVTFTC.js} +11 -11
  6. package/dist/esm/index.js +3 -3
  7. package/dist/esm/plugin/extend/web-socket.js +1 -1
  8. package/dist/esm/server/server.js +2 -2
  9. package/package.json +1 -1
package/dist/cjs/index.cjs CHANGED
@@ -446,7 +446,6 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
446
446
  async (req, _res, \u9644\u52A0\u53C2\u6570) => {
447
447
  let log = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
448
448
  let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
449
- let ws\u53E5\u67C4 = null;
450
449
  let wsId = req.headers["ws-client-id"];
451
450
  await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
452
451
  if (typeof wsId !== "string") {
@@ -454,15 +453,16 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
454
453
  return { ws\u64CD\u4F5C: null };
455
454
  }
456
455
  await log.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
457
- await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
458
- ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
459
- if (ws\u53E5\u67C4 === null) {
460
- await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
461
- return { ws\u64CD\u4F5C: null };
462
- }
463
456
  return {
464
457
  ws\u64CD\u4F5C: {
465
458
  async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
459
+ let ws\u53E5\u67C4 = null;
460
+ await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
461
+ ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
462
+ if (ws\u53E5\u67C4 === null) {
463
+ await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
464
+ return;
465
+ }
466
466
  if (ws\u53E5\u67C4.readyState !== import_ws.WebSocket.OPEN) {
467
467
  await log.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
468
468
  return;
@@ -577,6 +577,14 @@ var \u670D\u52A1\u5668 = class {
577
577
  async \u521D\u59CB\u5316WebSocket(server) {
578
578
  let wss = new import_ws2.WebSocketServer({ server });
579
579
  let logBase = await this.log;
580
+ wss.on("listening", async () => {
581
+ let log = logBase;
582
+ await log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
583
+ });
584
+ wss.on("error", async (err) => {
585
+ let log = logBase;
586
+ await log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
587
+ });
580
588
  wss.on("connection", async (ws, req) => {
581
589
  let log = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
582
590
  await log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
@@ -602,14 +610,6 @@ var \u670D\u52A1\u5668 = class {
602
610
  await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
603
611
  await WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
604
612
  });
605
- wss.on("listening", async () => {
606
- let log2 = logBase;
607
- await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
608
- });
609
- wss.on("error", async (err) => {
610
- let log2 = logBase;
611
- await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
612
- });
613
613
  });
614
614
  }
615
615
  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
package/dist/cjs/plugin/extend/web-socket.cjs CHANGED
@@ -108,7 +108,6 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
108
108
  async (req, _res, \u9644\u52A0\u53C2\u6570) => {
109
109
  let log = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
110
110
  let WebSocket\u7BA1\u7406\u56682 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
111
- let ws\u53E5\u67C4 = null;
112
111
  let wsId = req.headers["ws-client-id"];
113
112
  await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
114
113
  if (typeof wsId !== "string") {
@@ -116,15 +115,16 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
116
115
  return { ws\u64CD\u4F5C: null };
117
116
  }
118
117
  await log.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
119
- await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
120
- ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
121
- if (ws\u53E5\u67C4 === null) {
122
- await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
123
- return { ws\u64CD\u4F5C: null };
124
- }
125
118
  return {
126
119
  ws\u64CD\u4F5C: {
127
120
  async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
121
+ let ws\u53E5\u67C4 = null;
122
+ await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
123
+ ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u56682.\u83B7\u5F97\u53E5\u67C4(wsId);
124
+ if (ws\u53E5\u67C4 === null) {
125
+ await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
126
+ return;
127
+ }
128
128
  if (ws\u53E5\u67C4.readyState !== import_ws.WebSocket.OPEN) {
129
129
  await log.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
130
130
  return;
package/dist/cjs/server/server.cjs CHANGED
@@ -193,6 +193,14 @@ var \u670D\u52A1\u5668 = class {
193
193
  async \u521D\u59CB\u5316WebSocket(server) {
194
194
  let wss = new import_ws.WebSocketServer({ server });
195
195
  let logBase = await this.log;
196
+ wss.on("listening", async () => {
197
+ let log = logBase;
198
+ await log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
199
+ });
200
+ wss.on("error", async (err) => {
201
+ let log = logBase;
202
+ await log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
203
+ });
196
204
  wss.on("connection", async (ws, req) => {
197
205
  let log = logBase.extend((0, import_short_uuid.default)().new()).extend("WebSocket");
198
206
  await log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
@@ -218,14 +226,6 @@ var \u670D\u52A1\u5668 = class {
218
226
  await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
219
227
  await WebSocket\u7BA1\u7406\u56682.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
220
228
  });
221
- wss.on("listening", async () => {
222
- let log2 = logBase;
223
- await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
224
- });
225
- wss.on("error", async (err) => {
226
- let log2 = logBase;
227
- await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
228
- });
229
229
  });
230
230
  }
231
231
  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
package/dist/esm/{chunk-55V3RIEA.js → chunk-DAQJSWM3.js} RENAMED
@@ -22,7 +22,6 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
22
22
  async (req, _res, \u9644\u52A0\u53C2\u6570) => {
23
23
  let log = \u9644\u52A0\u53C2\u6570.log.extend("webSocket\u63D2\u4EF6");
24
24
  let WebSocket\u7BA1\u7406\u5668 = await Global.getItem("WebSocket\u7BA1\u7406\u5668");
25
- let ws\u53E5\u67C4 = null;
26
25
  let wsId = req.headers["ws-client-id"];
27
26
  await log.debug("\u68C0\u67E5 ws-client-id \u5934\u4FE1\u606F", { wsId });
28
27
  if (typeof wsId !== "string") {
@@ -30,15 +29,16 @@ var WebSocket\u63D2\u4EF6 = class extends \u63D2\u4EF6 {
30
29
  return { ws\u64CD\u4F5C: null };
31
30
  }
32
31
  await log.debug("\u5DF2\u83B7\u5F97 WebSocket Id: %o", wsId);
33
- await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
34
- ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u5668.\u83B7\u5F97\u53E5\u67C4(wsId);
35
- if (ws\u53E5\u67C4 === null) {
36
- await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
37
- return { ws\u64CD\u4F5C: null };
38
- }
39
32
  return {
40
33
  ws\u64CD\u4F5C: {
41
34
  async \u53D1\u9001ws\u4FE1\u606F(\u4FE1\u606F) {
35
+ let ws\u53E5\u67C4 = null;
36
+ await log.debug("\u5C1D\u8BD5\u83B7\u53D6 WebSocket \u53E5\u67C4");
37
+ ws\u53E5\u67C4 = await WebSocket\u7BA1\u7406\u5668.\u83B7\u5F97\u53E5\u67C4(wsId);
38
+ if (ws\u53E5\u67C4 === null) {
39
+ await log.error("\u672A\u80FD\u83B7\u53D6\u5230\u6709\u6548\u7684 WebSocket \u53E5\u67C4");
40
+ return;
41
+ }
42
42
  if (ws\u53E5\u67C4.readyState !== WebSocket.OPEN) {
43
43
  await log.warn("WebSocket \u672A\u6253\u5F00\uFF0C\u65E0\u6CD5\u53D1\u9001\u6D88\u606F", { wsId });
44
44
  return;
package/dist/esm/{chunk-J3SZOWVX.js → chunk-GMWVTFTC.js} RENAMED
@@ -1,9 +1,9 @@
1
- import {
2
- 递归截断字符串
3
- } from "./chunk-NMG5C5AS.js";
4
1
  import {
5
2
  Global
6
3
  } from "./chunk-AB3GCWSG.js";
4
+ import {
5
+ 递归截断字符串
6
+ } from "./chunk-NMG5C5AS.js";
7
7
 
8
8
  // src/server/server.ts
9
9
  import express from "express";
@@ -88,6 +88,14 @@ var \u670D\u52A1\u5668 = class {
88
88
  async \u521D\u59CB\u5316WebSocket(server) {
89
89
  let wss = new WebSocketServer({ server });
90
90
  let logBase = await this.log;
91
+ wss.on("listening", async () => {
92
+ let log = logBase;
93
+ await log.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
94
+ });
95
+ wss.on("error", async (err) => {
96
+ let log = logBase;
97
+ await log.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
98
+ });
91
99
  wss.on("connection", async (ws, req) => {
92
100
  let log = logBase.extend(short().new()).extend("WebSocket");
93
101
  await log.debug("\u6536\u5230 WebSocket \u8FDE\u63A5\u8BF7\u6C42: %o", req.url);
@@ -113,14 +121,6 @@ var \u670D\u52A1\u5668 = class {
113
121
  await log.error("WebSocket \u51FA\u73B0\u9519\u8BEF, \u5BA2\u6237\u7AEF ID: %s, \u9519\u8BEF: %o", \u5BA2\u6237\u7AEFid, err);
114
122
  await WebSocket\u7BA1\u7406\u5668.\u5220\u9664\u8FDE\u63A5(\u5BA2\u6237\u7AEFid);
115
123
  });
116
- wss.on("listening", async () => {
117
- let log2 = logBase;
118
- await log2.info("WebSocket \u670D\u52A1\u5668\u5DF2\u542F\u52A8\u5E76\u76D1\u542C");
119
- });
120
- wss.on("error", async (err) => {
121
- let log2 = logBase;
122
- await log2.error("WebSocket \u670D\u52A1\u5668\u53D1\u751F\u9519\u8BEF: %o", err);
123
- });
124
124
  });
125
125
  }
126
126
  async \u5173\u95EDWebSocket\u8FDE\u63A5(ws, log, code, reason) {
package/dist/esm/index.js CHANGED
@@ -21,7 +21,7 @@ import {
21
21
  } from "./chunk-G6IT6LW7.js";
22
22
  import {
23
23
  WebSocket插件
24
- } from "./chunk-55V3RIEA.js";
24
+ } from "./chunk-DAQJSWM3.js";
25
25
  import {
26
26
  接口测试
27
27
  } from "./chunk-N7TPWCQ5.js";
@@ -30,7 +30,7 @@ import {
30
30
  } from "./chunk-43GZE5YL.js";
31
31
  import {
32
32
  服务器
33
- } from "./chunk-J3SZOWVX.js";
33
+ } from "./chunk-GMWVTFTC.js";
34
34
  import {
35
35
  EXPORT_TYPE
36
36
  } from "./chunk-ZF7EC2OM.js";
@@ -46,12 +46,12 @@ import {
46
46
  常用形式转换器,
47
47
  接口结果转换器
48
48
  } from "./chunk-AEG7V7QY.js";
49
+ import "./chunk-AB3GCWSG.js";
49
50
  import {
50
51
  构造元组,
51
52
  构造对象
52
53
  } from "./chunk-YMH6HJJF.js";
53
54
  import "./chunk-NMG5C5AS.js";
54
- import "./chunk-AB3GCWSG.js";
55
55
  import {
56
56
  接口
57
57
  } from "./chunk-JMR7QAHO.js";
package/dist/esm/plugin/extend/web-socket.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  WebSocket插件
3
- } from "../../chunk-55V3RIEA.js";
3
+ } from "../../chunk-DAQJSWM3.js";
4
4
  import "../../chunk-43GZE5YL.js";
5
5
  import "../../chunk-AB3GCWSG.js";
6
6
  export {
package/dist/esm/server/server.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import {
2
2
  服务器
3
- } from "../chunk-J3SZOWVX.js";
4
- import "../chunk-NMG5C5AS.js";
3
+ } from "../chunk-GMWVTFTC.js";
5
4
  import "../chunk-AB3GCWSG.js";
5
+ import "../chunk-NMG5C5AS.js";
6
6
  export {
7
7
  \u670D\u52A1\u5668
8
8
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@lsby/net-core",
3
- "version": "0.7.6",
3
+ "version": "0.7.8",
4
4
  "type": "module",
5
5
  "exports": {
6
6
  "require": "./dist/cjs/index.cjs",