oipage 1.6.0 → 1.7.0-alpha.1

package/nodejs/reader/index.d.ts

@@ -1,33 +1,33 @@
-/**
- * 文本分析读取器
- */
-
-export interface readerInstanceType {
-
-    /**
-     * 当前字符位置
-     */
-    index: number
-
-    /**
-     * 当前字符内容
-     */
-    value: string
-
-    /**
-     * 读取下一个字符
-     */
-    readNext(): string
-
-    /**
-     * 获取往后count个值
-     * @param count 
-     */
-    getNextN(count: number): string
-}
-
-export interface readerType {
-    (plain: string): readerInstanceType
-}
-
+/**
+ * 文本分析读取器
+ */
+
+export interface readerInstanceType {
+
+    /**
+     * 当前字符位置
+     */
+    index: number
+
+    /**
+     * 当前字符内容
+     */
+    value: string
+
+    /**
+     * 读取下一个字符
+     */
+    readNext(): string
+
+    /**
+     * 获取往后count个值
+     * @param count 
+     */
+    getNextN(count: number): string
+}
+
+export interface readerType {
+    (plain: string): readerInstanceType
+}
+
 export let reader: readerType

package/nodejs/reader/index.js

@@ -1,26 +1,26 @@
 /*!
-* reader of OIPage v1.6.0
+* reader of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-function reader(plain) {
-
-    let handler = {
-        index: -1,
-        value: null
-    };
-
-    // 读取下一个字符
-    handler.readNext = function () {
-        handler.value = handler.index++ < plain.length - 1 ? plain[handler.index] : null;
-        return handler.value;
-    };
-
-    // 获取往后num个值
-    handler.getNextN = function (num) {
-        return plain.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
-    };
-
-    return handler;
+function reader(plain) {
+
+    let handler = {
+        index: -1,
+        value: null
+    };
+
+    // 读取下一个字符
+    handler.readNext = function () {
+        handler.value = handler.index++ < plain.length - 1 ? plain[handler.index] : null;
+        return handler.value;
+    };
+
+    // 获取往后num个值
+    handler.getNextN = function (num) {
+        return plain.substring(handler.index, num + handler.index > plain.length ? plain.length : num + handler.index);
+    };
+
+    return handler;
 }
 exports.reader = reader;

package/nodejs/remote/index.d.ts

@@ -0,0 +1,32 @@
+interface resType {
+
+    /**
+     * 响应体
+     */
+    data: string
+
+    /**
+     * 响应头
+     */
+    headers: {
+        [key: string]: any
+    }
+}
+
+export interface getType {
+    (url: string, headers?: {
+        [key: string]: any
+    }): Promise<resType>
+}
+
+export let get: getType
+
+export interface postType {
+    (url: string, headers?: {
+        [key: string]: any
+    }, params?: {
+        [key: string]: any
+    }): Promise<resType>
+}
+
+export let post: postType

package/nodejs/remote/index.js

@@ -0,0 +1,71 @@
+/*!
+* remote of OIPage v1.7.0-alpha.1
+* git+https://github.com/oi-contrib/OIPage.git
+*/
+
+const https = require('https');
+const http = require('http');
+
+let doResolve = (res, resolve) => {
+    res.setEncoding('utf8');
+
+    let data = "";
+    res.on('data', (chunk) => {
+        data += chunk;
+    });
+    res.on('end', () => {
+        resolve({
+            data: data.toString('utf8'),
+            headers: res.headers
+        });
+    });
+}
+
+// GET请求
+function get(url, headers = {}) {
+    return new Promise((resolve, reject) => {
+
+        let handler = /^https/.test(url) ? https : http;
+
+        // https://nodejs.org/download/release/v16.8.0/docs/api/http.html#http_http_get_options_callback
+        handler.get(url, {
+            headers
+        }, res => {
+            doResolve(res, resolve)
+        }).on('error', (e) => {
+            reject(e);
+        });
+    });
+};
+
+// POST请求
+function post(url, headers = {}, params = {}) {
+    return new Promise((resolve, reject) => {
+
+        let handler = /^https/.test(url) ? https : http;
+
+        let execArray = /https*:\/\/([^\/]+)(.+)?/.exec(url);
+        let hostport = execArray[1].split(":");
+
+        // https://nodejs.org/download/release/v16.8.0/docs/api/http.html#http_http_request_options_callback
+        const req = handler.request({
+            hostname: hostport[0],
+            port: hostport[1] || 80,
+            path: execArray[2] || "/",
+            method: "POST",
+            headers
+        }, (res) => {
+            doResolve(res, resolve);
+        });
+
+        req.write(JSON.stringify(params));
+
+        req.on('error', (e) => {
+            reject(e);
+        });
+        req.end();
+    });
+};
+
+exports.get = get;
+exports.post = post;

package/nodejs/throttle/index.d.ts

@@ -1,31 +1,31 @@
-export type throttleOpportunityType = "begin" | "end" | "wide"
-
-export interface throttleOptionType {
-
-    /**
-     * 节流时长
-     */
-    time?: number
-
-    /**
-     * 是否持续节流
-     */
-    keep?: boolean
-
-    /**
-     * 执行时机
-     *
-     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
-     */
-    opportunity?: throttleOpportunityType
-
-}
-
-/**
- * 节流函数
- */
-export interface throttleType {
-    (callback: Function, option?: throttleOptionType): Function
-}
-
+export type throttleOpportunityType = "begin" | "end" | "wide"
+
+export interface throttleOptionType {
+
+    /**
+     * 节流时长
+     */
+    time?: number
+
+    /**
+     * 是否持续节流
+     */
+    keep?: boolean
+
+    /**
+     * 执行时机
+     *
+     * begin（开始触发）、end（结束触发）、wide（第一次开始触发，其余结束触发）
+     */
+    opportunity?: throttleOpportunityType
+
+}
+
+/**
+ * 节流函数
+ */
+export interface throttleType {
+    (callback: Function, option?: throttleOptionType): Function
+}
+
 export let throttle: throttleType

package/nodejs/throttle/index.js

@@ -1,56 +1,56 @@
 /*!
-* throttle of OIPage v1.6.0
+* throttle of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-function throttle(callback, _option) {
-
-    // 缺省值
-    var option = {
-        time: 200,
-        keep: false,
-        opportunity: "end"
-    };
-    
-    // 校对
-    if (_option) {
-        for (var key in _option) {
-            option[key] = _option[key];
-        }
-    }
-
-    var hadInterval = false, hadClick = false, oneClick = false, arg;
-    return function () {
-        const _this = this;
-        arg = arguments;
-
-        // 如果前置任务都完成了
-        if (!hadInterval) {
-            if (option.opportunity != 'end') {
-                callback.apply(_this, arg);
-            }
-            hadInterval = true;
-
-            var interval = setInterval(() => {
-                if (hadClick) {
-                    if (!option.keep) {
-                        callback.apply(_this, arg);
-                    }
-                } else {
-                    if (option.opportunity != 'begin') {
-                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
-                    }
-                    hadInterval = false;
-                    oneClick = false;
-                    clearInterval(interval);
-                }
-                hadClick = false;
-            }, option.time);
-        } else {
-            hadClick = true;
-            oneClick = true;
-        }
-
-    };
+function throttle(callback, _option) {
+
+    // 缺省值
+    var option = {
+        time: 200,
+        keep: false,
+        opportunity: "end"
+    };
+    
+    // 校对
+    if (_option) {
+        for (var key in _option) {
+            option[key] = _option[key];
+        }
+    }
+
+    var hadInterval = false, hadClick = false, oneClick = false, arg;
+    return function () {
+        const _this = this;
+        arg = arguments;
+
+        // 如果前置任务都完成了
+        if (!hadInterval) {
+            if (option.opportunity != 'end') {
+                callback.apply(_this, arg);
+            }
+            hadInterval = true;
+
+            var interval = setInterval(() => {
+                if (hadClick) {
+                    if (!option.keep) {
+                        callback.apply(_this, arg);
+                    }
+                } else {
+                    if (option.opportunity != 'begin') {
+                        if (oneClick || option.opportunity == 'end') callback.apply(_this, arg);
+                    }
+                    hadInterval = false;
+                    oneClick = false;
+                    clearInterval(interval);
+                }
+                hadClick = false;
+            }, option.time);
+        } else {
+            hadClick = true;
+            oneClick = true;
+        }
+
+    };
 }
 exports.throttle = throttle;

package/package.json

@@ -1,44 +1,44 @@
-{
-  "name": "oipage",
-  "version": "1.6.0",
-  "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
-  "sideEffects": false,
-  "scripts": {
-    "dev": "node ./build/index.js watch",
-    "build": "node ./build/index.js",
-    "serve": "node ./bin/run serve --config ./oipage.config.js",
-    "bug:issue5": "node ./bin/run run \"node ./bin/run serve\"",
-    "bug:issue4": "node ./bin/run run \"node ./test/logform/index.spec.js\""
-  },
-  "bin": {
-    "oipage-cli": "bin/run"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/oi-contrib/OIPage.git"
-  },
-  "keywords": [
-    "dev",
-    "server",
-    "style",
-    "css",
-    "nodejs",
-    "core",
-    "oipage",
-    "browser"
-  ],
-  "author": {
-    "name": "zxl20070701",
-    "url": "https://zxl20070701.github.io/notebook/home.html"
-  },
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/oi-contrib/OIPage/issues"
-  },
-  "homepage": "https://oi-contrib.github.io/OIPage",
-  "dependencies": {
-    "vislite": "^1.5.0",
-    "xhtml-to-json": "^0.1.0",
-    "zipaper": "^0.2.0"
-  }
+{
+  "name": "oipage",
+  "version": "1.7.0-alpha.1",
+  "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
+  "sideEffects": false,
+  "scripts": {
+    "dev": "node ./build/index.js watch",
+    "build": "node ./build/index.js",
+    "serve": "node ./bin/run serve --config ./oipage.config.js",
+    "bug:issue5": "node ./bin/run run \"node ./bin/run serve\"",
+    "bug:issue4": "node ./bin/run run \"node ./test/logform/index.spec.js\""
+  },
+  "bin": {
+    "oipage-cli": "bin/run"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/oi-contrib/OIPage.git"
+  },
+  "keywords": [
+    "dev",
+    "server",
+    "style",
+    "css",
+    "nodejs",
+    "core",
+    "oipage",
+    "browser"
+  ],
+  "author": {
+    "name": "zxl20070701",
+    "url": "https://zxl20070701.github.io/notebook/home.html"
+  },
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/oi-contrib/OIPage/issues"
+  },
+  "homepage": "https://oi-contrib.github.io/OIPage",
+  "dependencies": {
+    "vislite": "^1.5.0",
+    "xhtml-to-json": "^0.1.0",
+    "zipaper": "^0.2.0"
+  }
 }

package/web/XMLHttpRequest/index.d.ts

@@ -1,18 +1,18 @@
-export interface callbackType {
-    (type: "send" | "send@error" | "open" | "error" | "timeout" | "end", params: {
-        [key: string]: any
-    }): void
-}
-
-export interface callbackFactoryType {
-    (): callbackType
-}
-
-/**
- * XHR拦截
- */
-export interface XHRInterceptType {
-    (callbackFactory: callbackFactoryType): void
-}
-
+export interface callbackType {
+    (type: "send" | "send@error" | "open" | "error" | "timeout" | "end", params: {
+        [key: string]: any
+    }): void
+}
+
+export interface callbackFactoryType {
+    (): callbackType
+}
+
+/**
+ * XHR拦截
+ */
+export interface XHRInterceptType {
+    (callbackFactory: callbackFactoryType): void
+}
+
 export let XHRIntercept: XHRInterceptType

package/web/XMLHttpRequest/index.js

@@ -1,65 +1,65 @@
 /*!
-* XMLHttpRequest of OIPage v1.6.0
+* XMLHttpRequest of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-export function XHRIntercept(callbackFactory) {
-
-    // 原生的请求方法
-    var { open, send } = window.XMLHttpRequest.prototype;
-
-    window.XMLHttpRequest.prototype.open = function (method, url) {
-        this.callback = callbackFactory();
-
-        // 响应
-        let { ontimeout, onerror, onloadend } = this;
-
-        this.onloadend = function () {
-            if (onloadend) { onloadend.apply(this, arguments); }
-
-
-            if (this.readyState == 4) {
-                let response = "";
-                try { response = JSON.parse(this.response); } catch (e) { response = this.response; }
-
-                this.callback("end", {
-                    url: this.responseURL,
-                    status: this.status,
-                    statusText: this.statusText,
-                    response: response,
-                    responseText: this.responseText
-                });
-            }
-        };
-
-        this.ontimeout = function () {
-            if (ontimeout) { ontimeout.apply(this, arguments); }
-            this.callback("timeout", {});
-        };
-
-        this.onerror = function () {
-            if (onerror) { onerror.apply(this, arguments); }
-            this.callback("error", {});
-        };
-
-        open.apply(this, arguments);
-        this.callback("open", {
-            method: method,
-            url: url
-        });
-    };
-
-    // 拦截发送
-    window.XMLHttpRequest.prototype.send = function (data) {
-        try {
-            send.apply(this, arguments);
-            this.callback("send", {
-                data: data
-            });
-        } catch (error) {
-            this.callback("send@error", {
-                error: error
-            });
-        }
-    }
+export function XHRIntercept(callbackFactory) {
+
+    // 原生的请求方法
+    var { open, send } = window.XMLHttpRequest.prototype;
+
+    window.XMLHttpRequest.prototype.open = function (method, url) {
+        this.callback = callbackFactory();
+
+        // 响应
+        let { ontimeout, onerror, onloadend } = this;
+
+        this.onloadend = function () {
+            if (onloadend) { onloadend.apply(this, arguments); }
+
+
+            if (this.readyState == 4) {
+                let response = "";
+                try { response = JSON.parse(this.response); } catch (e) { response = this.response; }
+
+                this.callback("end", {
+                    url: this.responseURL,
+                    status: this.status,
+                    statusText: this.statusText,
+                    response: response,
+                    responseText: this.responseText
+                });
+            }
+        };
+
+        this.ontimeout = function () {
+            if (ontimeout) { ontimeout.apply(this, arguments); }
+            this.callback("timeout", {});
+        };
+
+        this.onerror = function () {
+            if (onerror) { onerror.apply(this, arguments); }
+            this.callback("error", {});
+        };
+
+        open.apply(this, arguments);
+        this.callback("open", {
+            method: method,
+            url: url
+        });
+    };
+
+    // 拦截发送
+    window.XMLHttpRequest.prototype.send = function (data) {
+        try {
+            send.apply(this, arguments);
+            this.callback("send", {
+                data: data
+            });
+        } catch (error) {
+            this.callback("send@error", {
+                error: error
+            });
+        }
+    }
 }

package/web/animation/index.d.ts

@@ -1,20 +1,20 @@
-interface animationResult {
-
-    /**
-     * 一个函数，调用该函数，可以提前结束动画
-     */
-    stop(): void
-}
-
-interface animationFun {
-    (deep: number): void
-}
-
-/**
- * 轮询动画
- */
-export interface animationType {
-    (doback: animationFun, duration?: number, callback?: animationFun): animationResult
-}
-
+interface animationResult {
+
+    /**
+     * 一个函数，调用该函数，可以提前结束动画
+     */
+    stop(): void
+}
+
+interface animationFun {
+    (deep: number): void
+}
+
+/**
+ * 轮询动画
+ */
+export interface animationType {
+    (doback: animationFun, duration?: number, callback?: animationFun): animationResult
+}
+
 export let animation: animationType