cgserver 7.0.567 → 7.1.648

package/dist/lib/Config/FrameworkConfig.js

@@ -58,7 +58,6 @@ class FrameworkConfig extends Config_1.Config {
                 filename: "./logs/log_date/date",
                 alwaysIncludePattern: true,
                 pattern: "yyyy-MM-dd-hh.log",
-                daysToKeep: 7
             },
             client_log_file: {
                 category: "log_file",

package/dist/lib/Service/MongoCacheService.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GMongoCacheSer = exports.MongoCacheModel = void 0;
+const cgserver_1 = require("../cgserver");
 const MongoBaseService_1 = require("../Database/MongoBaseService");
 const MongoManager_1 = require("../Database/MongoManager");
 //暂时就用这个了，反正没啥用户
@@ -14,14 +15,28 @@ exports.GMongoCacheSer = null;
 class MongoCacheService extends MongoBaseService_1.MongoBaseService {
     constructor() {
         super("cache", MongoCacheModel);
-        this.createIndex({ "expireAt": 1 }, { expireAfterSeconds: 0 });
+        cgserver_1.GCgServer.addListener("start", () => {
+            this.createIndex({ key: 1 });
+            this.createIndex({ "expireAt": 1 }, { expireAfterSeconds: 0 });
+        });
     }
     async getData(key) {
-        let cm = await exports.GMongoCacheSer.get(null, { key: key });
+        let cm = await this.get(null, { key: key });
         if (!cm) {
             return null;
         }
         return cm.data;
     }
+    async addData(key, data, expireAt = Date.now() + 365 * 24 * 60 * 60 * 1000) {
+        let mcm = new MongoCacheModel();
+        mcm.key = key;
+        mcm.data = data;
+        mcm.expireAt = expireAt;
+        let rs = await this.updateOne(mcm, { key: mcm.key }, true);
+        if (rs.rs.upsertedCount <= 0) {
+            return null;
+        }
+        return mcm;
+    }
 }
 exports.GMongoCacheSer = new MongoCacheService();

package/dist/lib/WebServer/Decorator/SyncCall.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncCall = void 0;
+const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param target
+ * @param propertyName
+ * @param descriptor
+ */
+function SyncCall(target, propertyName, descriptor) {
+    let method = descriptor.value;
+    descriptor.value = function () {
+        let self = this;
+        let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+            return await method.apply(self, arguments);
+        });
+        return ret;
+    };
+}
+exports.SyncCall = SyncCall;

package/dist/lib/WebServer/Decorator/SyncCallServer.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SyncCallServer = void 0;
+const Core_1 = require("../../Core/Core");
+const SyncQueueTool_1 = require("../../Logic/SyncQueueTool");
+const MongoCacheService_1 = require("../../Service/MongoCacheService");
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+let SyncCallServer = function () {
+    return function (target, propertyName, descriptor) {
+        let method = descriptor.value;
+        descriptor.value = async () => {
+            let key = "sync_" + method.name;
+            let func = async () => {
+                let item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                let ret = null;
+                while (item) {
+                    await Core_1.core.sleep(200);
+                    item = await MongoCacheService_1.GMongoCacheSer.getData(key);
+                }
+                //10秒后过期，避免卡死
+                let mcm = await MongoCacheService_1.GMongoCacheSer.addData(key, true, Date.now() + 10 * 1000);
+                if (!mcm) {
+                    await func();
+                }
+                return;
+            };
+            await func();
+            let ret = SyncQueueTool_1.GSyncQueueTool.add(method.name, async () => {
+                return await method.apply(self, arguments);
+            });
+            await MongoCacheService_1.GMongoCacheSer.deleteOne({ key });
+            return ret;
+        };
+    };
+};
+exports.SyncCallServer = SyncCallServer;

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

@@ -78,6 +78,12 @@ class Engine {
         let req = new Request_1.Request(_req, this._cfg);
         let res = new Response_1.Response(_res, this._cfg);
         if (req.fileUrl) {
+            let fileUrl = req.fileUrl;
+            fileUrl = fileUrl.toLocaleLowerCase();
+            if (fileUrl.startsWith("data") || fileUrl.startsWith("/data")) {
+                res.render404();
+                return;
+            }
             res.renderFile(this._root_path + req.fileUrl);
             return;
         }

package/dist/types/Config/FrameworkConfig.d.ts

@@ -62,7 +62,6 @@ export declare class FrameworkConfig extends Config {
                 filename: string;
                 alwaysIncludePattern: boolean;
                 pattern: string;
-                daysToKeep: number;
             };
             client_log_file: {
                 category: string;

package/dist/types/Service/MongoCacheService.d.ts

@@ -9,5 +9,6 @@ export declare let GMongoCacheSer: MongoCacheService;
 declare class MongoCacheService extends MongoBaseService<MongoCacheModel> {
     constructor();
     getData(key: string): Promise<any>;
+    addData(key: string, data: any, expireAt?: number): Promise<MongoCacheModel>;
 }
 export {};

package/dist/types/WebServer/Decorator/SyncCall.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 异步函数变为同步函数，当前进程有效
+ * @param target
+ * @param propertyName
+ * @param descriptor
+ */
+export declare function SyncCall(target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>): void;

package/dist/types/WebServer/Decorator/SyncCallServer.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 异步函数变为同步函数
+ * 服务器间的异步，效率低
+ * 只支持mongo模式
+ * @returns
+ */
+export declare let SyncCallServer: () => (target: any, propertyName: string, descriptor: TypedPropertyDescriptor<Function>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cgserver",
-  "version": "7.0.567",
+  "version": "7.1.648",
   "author": "trojan",
   "type": "commonjs",
   "description": "free for all.Websocket or Http",