lz-nframe 1.0.1 → 1.0.2

package/lib/NApp.d.ts

@@ -5,7 +5,6 @@
 描述:
     应用基类
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'events';
 export default abstract class NApp extends EventEmitter {
     protected appName: string;

package/lib/NConfigsMgr.d.ts

@@ -11,7 +11,7 @@
 
     获取配置时的顺序：【动态配置】->【本地配置】->【默认配置】
 *******************************************************************************/
-import { NestedKeyOf, ValueAtPath } from './NType';
+import { NestedKeyOf, ValueAtPath } from './NType.js';
 export default class NConfigsMgr<T extends object> {
     get configs(): T;
     private defaultConfigs;

package/lib/NHttpClient.d.ts

@@ -7,7 +7,6 @@
     - 支持自动处理中文 URL 编码
     - 支持泛型与类型安全
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
 import * as http from 'http';
 /**
  * 请求配置接口

package/lib/NHttpClient.js

@@ -126,10 +126,10 @@ export default class NHttpClient {
         // 依次检查各代理 header
         const candidates = [
             getHeader('x-real-ip'),
-            getHeader('cf-connecting-ip'),
-            getHeader('true-client-ip'),
+            getHeader('cf-connecting-ip'), // Cloudflare
+            getHeader('true-client-ip'), // Akamai / Cloudflare Enterprise
             getHeader('x-client-ip'),
-            getHeader('x-forwarded-for'),
+            getHeader('x-forwarded-for'), // 通用代理，可能含多个 IP
             getHeader('proxy-client-ip'),
             getHeader('wl-proxy-client-ip'),
         ];

package/lib/NSimpleHttpServer.d.ts

@@ -21,7 +21,6 @@
         }, {contentType: ContentType.TextPlain})
         .start(3000);
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
 import * as http from 'http';
 export default class NSimpleHttpServer {
     private server;

package/lib/NSimpleHttpServer.js

@@ -219,4 +219,4 @@ export var ContentType;
     ContentType["TextHtml"] = "Content-Type: text/html; charset=utf-8;";
     ContentType["TextPlain"] = "Content-Type: text/plain; charset=utf-8;";
     ContentType["ApplicationJson"] = "Content-Type: application/json; charset=utf-8;";
-})(ContentType = ContentType || (ContentType = {}));
+})(ContentType || (ContentType = {}));

package/lib/NWSClient.d.ts

@@ -11,8 +11,6 @@ websocket事件：
     ✦onclose websocket关闭时触发该事件
     ✦onmessage 接收到消息
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'events';
 export default class NWSClient extends EventEmitter {
     static EventError: string;

package/lib/NWSClient.js

@@ -22,7 +22,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { EventEmitter } from 'events';
 import WebSocket from 'ws';
-import { NWSSocket } from './NWSSocket';
+import { NWSSocket } from './NWSSocket.js';
 class NWSClient extends EventEmitter {
     get connected() {
         return this._connected;

package/lib/NWSServer.d.ts

@@ -11,10 +11,8 @@ websocket事件：
     ✦onclose websocket关闭时触发该事件
     ✦onmessage 接收到消息
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'events';
-import { NWSSocket } from './NWSSocket';
+import { NWSSocket } from './NWSSocket.js';
 export default class NWSServer extends EventEmitter {
     static EventError: string;
     static EventServiceStarted: string;

package/lib/NWSServer.js

@@ -12,9 +12,9 @@ websocket事件：
     ✦onmessage 接收到消息
 *******************************************************************************/
 import { EventEmitter } from 'events';
-import WebSocket from 'ws'; // 1. 替换导入
-import { NWSSocket } from './NWSSocket';
-import NHttpClient from './NHttpClient';
+import WebSocket, { WebSocketServer } from 'ws';
+import { NWSSocket } from './NWSSocket.js';
+import NHttpClient from './NHttpClient.js';
 class NWSServer extends EventEmitter {
     constructor(params) {
         super();
@@ -28,7 +28,7 @@ class NWSServer extends EventEmitter {
             this.wsServer.close();
             this.wsServer = null;
         }
-        this.wsServer = new WebSocket.Server({
+        this.wsServer = new WebSocketServer({
             port,
             host,
             WebSocket: NWSSocket,

package/lib/NWSServiceHub.d.ts

@@ -73,7 +73,6 @@
 TODO:
     1.路由
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'events';
 /**
  * 协议名说明（PacketType）：

package/lib/NWSServiceHub.js

@@ -83,8 +83,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { EventEmitter } from 'events';
-import NWSClient from './NWSClient';
-import NWSServer from './NWSServer';
+import NWSClient from './NWSClient.js';
+import NWSServer from './NWSServer.js';
 class NWSServiceHub extends EventEmitter {
     constructor(options) {
         super();

package/lib/NWSUserClientJ.d.ts

@@ -14,7 +14,6 @@
     ✦_si_  服务端下发 resign 时须回传登录载荷；服务端下发 ok 表示登录完成
     ✦_hb_  心跳，收到后原样应答
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'events';
 /** 与 NWSUserMgrJ 配套的 JSON WebSocket 客户端 */
 export default class NWSUserClientJ extends EventEmitter {

package/lib/NWSUserClientJ.js

@@ -24,7 +24,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { EventEmitter } from 'events';
-import NWSClient from './NWSClient';
+import NWSClient from './NWSClient.js';
 /** 与 NWSUserMgrJ 配套的 JSON WebSocket 客户端 */
 class NWSUserClientJ extends EventEmitter {
     /** 是否已与服务器建立 WebSocket（不代表已完成 _si_ 验证） */

package/lib/NWSUserMgrJ.d.ts

@@ -26,9 +26,8 @@
 
 TODO 复用http服务端口，https://blog.csdn.net/qq_44856695/article/details/120250286
 *******************************************************************************/
-/// <reference types="node" resolution-mode="require"/>
 import { EventEmitter } from 'events';
-import NWSServer from './NWSServer';
+import NWSServer from './NWSServer.js';
 /** 基于NWSServer的实时联网用户管理，通信格式使用json */
 export default class NWSUserMgrJ extends EventEmitter {
     /** 用户掉线，已考虑超时问题，如果设置超时非0，则socket掉线会等候用户重连，重连成功不认定掉线 */

package/lib/NWSUserMgrJ.js

@@ -27,7 +27,7 @@
 TODO 复用http服务端口，https://blog.csdn.net/qq_44856695/article/details/120250286
 *******************************************************************************/
 import { EventEmitter } from 'events';
-import NWSServer from './NWSServer';
+import NWSServer from './NWSServer.js';
 import NUtils from 'lz-nutils';
 /** 基于NWSServer的实时联网用户管理，通信格式使用json */
 class NWSUserMgrJ extends EventEmitter {

package/lib/index.d.ts

@@ -0,0 +1,22 @@
+/*******************************************************************************
+文件: index.ts
+描述:
+    包聚合导出：发布后可通过 import from 'lz-nframe' 引用下列公开 API；
+    仍支持子路径 import 'lz-nframe/lib/xxx.js'（见 package.json exports）。
+*******************************************************************************/
+export { default as NApp } from './NApp.js';
+export { default as NConfigsMgr } from './NConfigsMgr.js';
+export { default as NHttpClient } from './NHttpClient.js';
+export type { ApiResult } from './NHttpClient.js';
+export { default as NSimpleHttpServer, ContentType } from './NSimpleHttpServer.js';
+export type { SimplePage } from './NSimpleHttpServer.js';
+export { NWSSocket } from './NWSSocket.js';
+export { default as NWSClient } from './NWSClient.js';
+export { default as NWSServer } from './NWSServer.js';
+export { default as NWSServiceHub } from './NWSServiceHub.js';
+export type { NWSServiceHubOptions, NWSServicePeerConfig } from './NWSServiceHub.js';
+export { default as NWSUserClientJ } from './NWSUserClientJ.js';
+export { default as NWSUserMgrJ } from './NWSUserMgrJ.js';
+export type { NestedKeyOf, PlainType, PlainValue, ValueAtPath } from './NType.js';
+/** 与旧版 main 指向 NApp.js 一致：默认导出仍为 NApp */
+export { default } from './NApp.js';

package/lib/index.js

@@ -0,0 +1,18 @@
+/*******************************************************************************
+文件: index.ts
+描述:
+    包聚合导出：发布后可通过 import from 'lz-nframe' 引用下列公开 API；
+    仍支持子路径 import 'lz-nframe/lib/xxx.js'（见 package.json exports）。
+*******************************************************************************/
+export { default as NApp } from './NApp.js';
+export { default as NConfigsMgr } from './NConfigsMgr.js';
+export { default as NHttpClient } from './NHttpClient.js';
+export { default as NSimpleHttpServer, ContentType } from './NSimpleHttpServer.js';
+export { NWSSocket } from './NWSSocket.js';
+export { default as NWSClient } from './NWSClient.js';
+export { default as NWSServer } from './NWSServer.js';
+export { default as NWSServiceHub } from './NWSServiceHub.js';
+export { default as NWSUserClientJ } from './NWSUserClientJ.js';
+export { default as NWSUserMgrJ } from './NWSUserMgrJ.js';
+/** 与旧版 main 指向 NApp.js 一致：默认导出仍为 NApp */
+export { default } from './NApp.js';

package/package.json

@@ -1,9 +1,18 @@
 {
   "name": "lz-nframe",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "type": "module",
-  "main": "./lib/NApp.js",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "import": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./lib/*": "./lib/*"
+  },
   "scripts": {
     "build": "tsc",
     "test": "node --import tsx --test test/NConfigsMgr.test.ts test/NHttpClient.test.ts test/NWSClient.test.ts test/NWSUserClientJ.test.ts test/NWSServiceHub.test.ts",