oipage 1.7.0-alpha.5 → 1.7.0-alpha.7

package/nodejs/format/index.js

@@ -1,5 +1,5 @@
 /*!
-* format of OIPage v1.7.0-alpha.5
+* format of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.7.0-alpha.5
+* json of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {reader} = require("../reader/index.js");

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.7.0-alpha.5
+* logform of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");

package/nodejs/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.7.0-alpha.5
+* reader of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/remote/index.d.ts

@@ -5,6 +5,8 @@ interface resType {
      */
     status: number
 
+    type: "string" | "json" | "binary"
+
     /**
      * 响应体
      */

package/nodejs/remote/index.js

@@ -1,5 +1,5 @@
 /*!
-* remote of OIPage v1.7.0-alpha.5
+* remote of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
@@ -21,17 +21,47 @@ function remote(method, url, headers, param) {
             method,
             headers
         }, (res) => {
-            res.setEncoding("utf8");
 
-            let data = "";
+            let _temp = (res.headers["content-type"] + "").split(";");
+
+            // 数据类型
+            let contentType = _temp[0];
+
+            // 数据编码
+            let contentEncoding = "";
+            if (_temp[1]) contentEncoding = _temp[1].replace("charset=", "")
+            else res.setEncoding("binary"); // 二进制
+
+            const chunks = []; // 用于存储接收到的数据块
+            let size = 0; // 用于跟踪接收到的数据总量
+
             res.on('data', (chunk) => {
-                data += chunk;
+                chunks.push(chunk); // 将接收到的数据块添加到数组中
+                size += chunk.length; // 更新已接收的数据总量
             });
+
             res.on('end', () => {
+                let data = Buffer.concat(chunks, size); // 将所有数据块合并为一个Buffer
+                let type = "binary"
+
+                // 如果有编码，认为是文本
+                if (contentEncoding) {
+                    data = data.toString('utf8');
+                    type = "string";
+                }
+
+                // JSON文件
+                if (contentType === "application/json") {
+                    try {
+                        data = JSON.parse(data);
+                        type = "json";
+                    } catch (e) { }
+                }
 
                 resolve({
                     status: res.statusCode,
-                    data: data.toString('utf8'),
+                    type,
+                    data,
                     headers: res.headers
                 });
             });

package/nodejs/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.7.0-alpha.5
+* throttle of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oipage",
-  "version": "1.7.0-alpha.5",
+  "version": "1.7.0-alpha.7",
   "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
   "typings": "./types/index.d.ts",
@@ -8,7 +8,7 @@
     "dev": "node ./bin/run run \"node ./build/index.js watch\" \"npm run serve\"",
     "build": "node ./build/index.js",
     "serve": "node ./bin/run serve --config ./oipage.config.js",
-    "dev:issue10": "node ./bin/run serve --proxy /docs http://127.0.0.1:20000 --baseUrl ./test",
+    "dev:issue10": "node ./bin/run serve --proxy /proxydemo http://127.0.0.1:8080/docs -p 20000",
     "bug:issue5": "node ./bin/run run \"node ./bin/run serve\"",
     "bug:issue4": "node ./bin/run run \"node ./test/logform/index.spec.js\""
   },

package/types/index.d.ts

@@ -17,6 +17,8 @@ import "../nodejs/remote/index";
 declare module "oipage/nodejs/remote/index.js" {}
 import "../nodejs/throttle/index";
 declare module "oipage/nodejs/throttle/index.js" {}
+import "../web/XMLHttpRequest/index";
+declare module "oipage/web/XMLHttpRequest/index.js" {}
 import "../web/animation/index";
 declare module "oipage/web/animation/index.js" {}
 import "../web/format/index";
@@ -33,5 +35,3 @@ import "../web/style/index";
 declare module "oipage/web/style/index.js" {}
 import "../web/throttle/index";
 declare module "oipage/web/throttle/index.js" {}
-import "../web/XMLHttpRequest/index";
-declare module "oipage/web/XMLHttpRequest/index.js" {}

package/web/XMLHttpRequest/index.js

@@ -1,5 +1,5 @@
 /*!
-* XMLHttpRequest of OIPage v1.7.0-alpha.5
+* XMLHttpRequest of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.7.0-alpha.5
+* animation of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/format/index.js

@@ -1,5 +1,5 @@
 /*!
-* format of OIPage v1.7.0-alpha.5
+* format of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/json/index.js

@@ -1,5 +1,5 @@
 /*!
-* json of OIPage v1.7.0-alpha.5
+* json of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 import {reader} from "../reader/index.js";

package/web/onReady/index.js

@@ -1,5 +1,5 @@
 /*!
-* onReady of OIPage v1.7.0-alpha.5
+* onReady of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/performChunk/index.js

@@ -1,5 +1,5 @@
 /*!
-* performChunk of OIPage v1.7.0-alpha.5
+* performChunk of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/reader/index.js

@@ -1,5 +1,5 @@
 /*!
-* reader of OIPage v1.7.0-alpha.5
+* reader of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/style/index.js

@@ -1,5 +1,5 @@
 /*!
-* style of OIPage v1.7.0-alpha.5
+* style of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.7.0-alpha.5
+* throttle of OIPage v1.7.0-alpha.7
 * git+https://github.com/oi-contrib/OIPage.git
 */