cgserver 8.9.9 → 8.9.11

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

@@ -331,12 +331,28 @@ class core {
         newStr += last;
         return newStr;
     }
-    static md5(str) {
-        let md5_str = crypto.createHash('md5').update(str).digest('hex');
+    static md5(str, inputEncoding = null, encoding = "hex") {
+        let _md5 = crypto.createHash('md5');
+        let hash = null;
+        if (inputEncoding) {
+            hash = _md5.update(str, inputEncoding);
+        }
+        else {
+            hash = _md5.update(str);
+        }
+        let md5_str = hash.digest(encoding);
         return md5_str;
     }
-    static sha1(str) {
-        let sha1_str = crypto.createHash('sha1').update(str).digest('hex');
+    static sha1(str, inputEncoding = null, encoding = "hex") {
+        let _sha1 = crypto.createHash('sha1');
+        let hash = null;
+        if (inputEncoding) {
+            hash = _sha1.update(str, inputEncoding);
+        }
+        else {
+            hash = _sha1.update(str);
+        }
+        let sha1_str = hash.digest(encoding);
         return sha1_str;
     }
     static getLocalIP = function () {

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

@@ -64,7 +64,7 @@ class Engine {
             }
             this._app.use(cors({
                 origin: origin,
-                methods: this._cfg.cors.methods || 'GET,HEAD,PUT,PATCH,POST,DELETE',
+                methods: this._cfg.cors.methods || 'GET,HEAD,PUT,PATCH,POST,DELETE,OPTIONS',
                 allowedHeaders: this._cfg.cors.allowedHeaders || ['Content-Type'],
                 credentials: this._cfg.cors.credentials || false
             }));
@@ -87,11 +87,12 @@ class Engine {
         let req = new Request_1.Request(_req, this._cfg);
         let res = new Response_1.Response(_res, this._cfg);
         let method = req.method.toLowerCase();
+        if (method == "options") {
+            _res.sendStatus(200);
+            return;
+        }
         if (method == "head") {
-            _res.status(200).send("");
-            Log_1.GLog.info(_req.headers);
-            Log_1.GLog.info(_req.rawHeaders);
-            Log_1.GLog.info(_req.body);
+            _res.sendStatus(200);
             return;
         }
         if (method != "get" && method != "post") {

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

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import * as crypto from "crypto";
 /**
  * 常用的工具函数类
  */
@@ -39,8 +41,8 @@ export declare class core {
      * @param str
      */
     static fuzzy(str: string): string;
-    static md5(str: string): string;
-    static sha1(str: string): string;
+    static md5(str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
+    static sha1(str: string, inputEncoding?: crypto.Encoding, encoding?: crypto.BinaryToTextEncoding): string;
     static getLocalIP: () => any;
     static getIP: () => Promise<string>;
     /**

package/package.json

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