cgserver 14.0.1 → 14.0.3

package/dist/lib/Framework/Core/Core.js

@@ -37,14 +37,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.core = void 0;
-let os = require('os');
-let request = require('request');
+let os = require("os");
 const _ = __importStar(require("underscore"));
 const crypto = __importStar(require("crypto"));
 const CryptoJS = __importStar(require("crypto-js"));
 const ec_key_1 = __importDefault(require("ec-key"));
-const uuid_1 = require("uuid");
 const Log_1 = require("../Logic/Log");
+const axios_1 = __importDefault(require("axios"));
 /**
  * 一些通用的常用函数，
  * 比如格式化字符串，常用加解密，
@@ -381,32 +380,30 @@ class core {
         let hash_str = hash.digest(encoding);
         return hash_str;
     }
-    static getLocalIP = function () {
+    static getLocalIP() {
         let iptable = {};
         let ifaces = os.networkInterfaces();
         for (let dev in ifaces) {
             ifaces[dev].forEach(function (details, alias) {
-                if ((details.family == 'IPv4') && (details.internal == false)) {
+                let fa = details.family || "";
+                if ((fa.toLowerCase() == 'ipv4') && (details.internal == false)) {
                     iptable['localIP'] = details.address;
                 }
             });
         }
         return iptable['localIP'];
-    };
-    static getIP = async function () {
+    }
+    static async getIP() {
         return new Promise((resolve, reject) => {
-            request('http://ip.chinaz.com/getip.aspx', function (error, response, body) {
-                if (!error && response.statusCode == 200) {
-                    body = eval('(' + body + ')');
-                    resolve(body.ip);
-                }
-                else {
-                    console.error("can not get correct ip!");
-                    resolve(null);
-                }
+            axios_1.default.get('http://ip.chinaz.com/getip.aspx').then(response => {
+                let body = response.data;
+                resolve(body.ip);
+            }).catch(error => {
+                console.error("can not get correct ip!");
+                resolve(null);
             });
         });
-    };
+    }
     /**
      * 判断是否是手机号
      * @param phone 手机号
@@ -685,7 +682,14 @@ class core {
         return dtext;
     }
     static getUuid() {
-        let id = (0, uuid_1.v4)();
+        // 16 字节 = 128 位随机数
+        const bytes = crypto.getRandomValues(new Uint8Array(16));
+        // 设置版本与变体位：第6字节的高4位为0100（版本4），第8字节的高2位为10（变体RFC4122）
+        bytes[6] = (bytes[6] & 0x0f) | 0x40; // version 4
+        bytes[8] = (bytes[8] & 0x3f) | 0x80; // variant RFC4122
+        // 转十六进制并按 8-4-4-4-12 输出
+        const hex = [...bytes].map(b => b.toString(16).padStart(2, '0')).join('');
+        const id = `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
         return id;
     }
     static signatureBase64(private_key, rsa_name, payload) {

package/dist/lib/Framework/Server/WebServer/Engine/Engine.js

@@ -129,7 +129,7 @@ class Engine {
                 credentials: this._cfg.cors.credentials || false
             }));
         }
-        this._app.all("/*", (req, res) => {
+        this._app.all("*", (req, res) => {
             let time = Date.now();
             this._onall(req, res).then(() => {
                 if (this._cfg.debug) {

package/dist/lib/Framework/Server/WebServer/Engine/Response.js

@@ -32,10 +32,13 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Response = void 0;
 const fs = __importStar(require("fs"));
-const mime = __importStar(require("mime"));
+const mime_1 = __importDefault(require("mime"));
 const Log_1 = require("../../../Logic/Log");
 class Response {
     _res = null;
@@ -103,7 +106,7 @@ class Response {
             let size = stats.size;
             var f = fs.createReadStream(fullPath);
             this._res.writeHead(200, {
-                'Content-Type': mime.default.getType(fullPath) || 'application/octet-stream',
+                'Content-Type': mime_1.default.getType(fullPath) || 'application/octet-stream',
                 'Content-Disposition': 'attachment; filename=' + fileName,
                 'Content-Length': size
             });

package/dist/lib/Framework/ThirdParty/AppleTool.js

@@ -38,12 +38,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gAppleTool = exports.AppleTool = exports.NotificationBody = exports.NotificationType = exports.ResponseBody = void 0;
 const ec_key_1 = __importDefault(require("ec-key"));
-const uuid_1 = require("uuid");
 const fs = __importStar(require("fs"));
 const Config_1 = require("../Config/Config");
 const Log_1 = require("../Logic/Log");
 const HttpTool_1 = require("../Logic/HttpTool");
 const IServerConfig_1 = require("../Config/IServerConfig");
+const index_export_1 = require("../index_export_");
 //developer.apple.com/documentation/appstorereceipts/responsebody
 class ReceiptInfo {
     cancellation_date = "";
@@ -224,7 +224,7 @@ class AppleTool {
             keyIdentifier = k;
             break;
         }
-        var nonce = (0, uuid_1.v4)();
+        var nonce = index_export_1.core.getUuid();
         var payload = appBundleID + '\u2063' +
             keyIdentifier + '\u2063' +
             productIdentifier + '\u2063' +

package/dist/lib/Framework/index_export_.js

@@ -1,7 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IServerWebSocket = exports.JsonProtoFilter = exports.GoogleProtoFilter = exports.EProtoType = exports.RedisManager = exports.MysqlConfig = exports.MongoConfig = exports.MSSqlConfig = exports.DbConfig = exports.MongoCacheService = exports.MysqlUserModel = exports.MongoUserService = exports.MysqlUserService = exports.MongoAccountService = exports.MysqlAccountService = exports.EAccountFrom = exports.EUserState = exports.SqlReturns = exports.SqlReturn = exports.MysqlBaseService = exports.MongoExt = exports.MongoManager = exports.MysqlBaseModel = exports.MongoBaseService = exports.EPropertyType = exports.Type = exports.Table = exports.Property = exports.PrimaryKey = exports.NotNull = exports.AutoIncrement = exports.Timer = exports.core = exports.IServerConfig = exports.FrameworkConfig = exports.Config = exports.FrameworkErrorCode = exports.Trigger = exports.Point = exports.Entity = exports.BehaviorAI = exports.AStar = exports.AiObject = exports.CgRankRankData = exports.CgRankRankItem = exports.CgRankCommandItem = exports.CgRankTool = exports.AliSmsConfig = exports.AlipaySdk = exports.EAlipayExecType = void 0;
-exports.global = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.PacketParser = exports.SocketServerConfig = exports.ISocketServer = exports.ISocket = exports.IServerSocket = exports.IClientSocket = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonAuthorityValidate = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseController = exports.IWebServer = exports.BaseMsg = exports.IWebSocket = exports.WebSocketServerConfig = exports.IWebSocketServer = exports.IClientWebSocket = void 0;
+exports.global = exports.mongoose = exports.SyncCallServer2 = exports.SyncCallServer = exports.SyncCall2 = exports.SyncCall = exports.IRpcClientWebSocket = exports.IRpcServerWebSocket = exports.RpcConfig = exports.CgMq = exports.Rpc = exports.RpcBaseMsg = exports.PacketParser = exports.SocketServerConfig = exports.ISocketServer = exports.ISocket = exports.IServerSocket = exports.IClientSocket = exports.EAccountState = exports.WebServerConfig = exports.Response = exports.Request = exports.RazorJs = exports.Engine = exports.JsonAuthorityValidate = exports.MysqlAccountModel = exports.MongoBaseUserController = exports.BaseController = exports.IWebServer = exports.BaseMsg = exports.IWebSocket = exports.WebSocketServerConfig = exports.IWebSocketServer = exports.IClientWebSocket = void 0;
 var AlipayTool_1 = require("./ThirdParty/AlipayTool");
 Object.defineProperty(exports, "EAlipayExecType", { enumerable: true, get: function () { return AlipayTool_1.EAlipayExecType; } });
 var alipay_sdk_1 = require("alipay-sdk");
@@ -156,5 +159,7 @@ Object.defineProperty(exports, "SyncCall2", { enumerable: true, get: function ()
 var SyncCallServer_1 = require("./Decorator/SyncCallServer");
 Object.defineProperty(exports, "SyncCallServer", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer; } });
 Object.defineProperty(exports, "SyncCallServer2", { enumerable: true, get: function () { return SyncCallServer_1.SyncCallServer2; } });
+const mongoose_1 = __importDefault(require("mongoose"));
+exports.mongoose = mongoose_1.default;
 var global_1 = require("./global");
 Object.defineProperty(exports, "global", { enumerable: true, get: function () { return global_1.global; } });

package/dist/types/Framework/Core/Core.d.ts

@@ -43,8 +43,8 @@ export declare class core {
      */
     static fuzzy(str: string): string;
     static hash(algorithm: string, str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
-    static getLocalIP: () => any;
-    static getIP: () => Promise<string>;
+    static getLocalIP(): any;
+    static getIP(): Promise<string>;
     /**
      * 判断是否是手机号
      * @param phone 手机号

package/dist/types/Framework/index_export_.d.ts

@@ -70,4 +70,6 @@ export { IRpcServerWebSocket } from './Server/RpcWebSocketServer/IRpcServerWebSo
 export { IRpcClientWebSocket } from './Server/RpcWebSocketServer/IRpcClientWebSocket';
 export { SyncCall, SyncCall2 } from './Decorator/SyncCall';
 export { SyncCallServer, SyncCallServer2 } from './Decorator/SyncCallServer';
+import mongoose from 'mongoose';
+export { mongoose };
 export { global } from "./global";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "14.0.1",
+  "version": "14.0.3",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",
@@ -34,7 +34,7 @@
     "@types/cookie-parser": "^1.4.10",
     "@types/cors": "^2.8.19",
     "@types/crypto-js": "^4.2.2",
-    "@types/express": "^5.0.5",
+    "@types/express": "^4.17.21",
     "@types/formidable": "^3.4.6",
     "@types/heapdump": "^0.3.4",
     "@types/minimist": "^1.2.5",
@@ -50,14 +50,14 @@
     "cors": "^2.8.5",
     "crypto-js": "^4.2.0",
     "ec-key": "0.0.6",
-    "express": "^5.1.0",
+    "express": "^4.21.2",
     "fast-xml-parser": "^5.3.2",
     "formidable": "^3.5.4",
     "heapdump": "^0.3.15",
     "https": "^1.0.0",
     "jsonc": "^2.0.0",
     "log4js": "^6.9.1",
-    "mime": "^4.1.0",
+    "mime": "^3.0.0",
     "minimist": "^1.2.8",
     "mongoose": "^9.0.0",
     "mssql": "^12.1.1",
@@ -69,7 +69,6 @@
     "reflect-metadata": "^0.2.2",
     "underscore": "^1.13.7",
     "urlencode": "^2.0.0",
-    "uuid": "^13.0.0",
     "websocket": "^1.0.35"
   },
   "devDependencies": {