xshell 0.0.29 → 0.0.32

package/i18n/scanner/parser.js

@@ -2,17 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mix_parse_trans_from_string_by_babel = void 0;
 const tslib_1 = require("tslib");
-const lodash_1 = require("lodash");
-const traverse_1 = (0, tslib_1.__importDefault)(require("@babel/traverse"));
+const castArray_js_1 = tslib_1.__importDefault(require("lodash/castArray.js"));
+const trim_js_1 = tslib_1.__importDefault(require("lodash/trim.js"));
+const get_js_1 = tslib_1.__importDefault(require("lodash/get.js"));
+const traverse_1 = tslib_1.__importDefault(require("@babel/traverse"));
 const parser_1 = require("@babel/parser");
-const t = (0, tslib_1.__importStar)(require("@babel/types"));
+const t = tslib_1.__importStar(require("@babel/types"));
 require("../../prototype.js");
 // import { Checker } from './checker'
 /** file:///D:/0/i18next-scanner/src/parser.js */
 function mix_parse_trans_from_string_by_babel(parser) {
-    parser.parseTransFromStringByBabel = function (code, options = {}, customHandler = null, onError = () => { }) {
-        if ((0, lodash_1.isFunction)(options)) {
-            customHandler = options;
+    parser.parseTransFromStringByBabel = function parse_trans_from_string_by_babel(code, options = {}, custom_handler = null, on_error = () => { }) {
+        if (typeof options === 'function') {
+            custom_handler = options;
             options = {};
         }
         const { transformOptions = {}, // object
@@ -32,7 +34,7 @@ function mix_parse_trans_from_string_by_babel(parser) {
                     return literal.quasis.map(element => element.value.cooked).join("");
                 return literal.value;
             };
-            const attr = (0, lodash_1.castArray)(node.openingElement.attributes).reduce((acc, attribute) => {
+            const attr = (0, castArray_js_1.default)(node.openingElement.attributes).reduce((acc, attribute) => {
                 if (!t.isJSXAttribute(attribute) ||
                     !t.isJSXIdentifier(attribute.name))
                     return acc;
@@ -47,7 +49,7 @@ function mix_parse_trans_from_string_by_babel(parser) {
                     else if (t.isLiteral(expression))
                         acc[name] = getLiteralValue(expression);
                     else if (t.isObjectExpression(expression)) {
-                        const properties = (0, lodash_1.castArray)(expression.properties);
+                        const properties = (0, castArray_js_1.default)(expression.properties);
                         acc[name] = properties.reduce((obj, property) => {
                             if (!t.isObjectProperty(property))
                                 return obj;
@@ -71,7 +73,7 @@ function mix_parse_trans_from_string_by_babel(parser) {
                 }
                 return acc;
             }, {});
-            const transKey = (0, lodash_1.trim)(attr[i18nKey]);
+            const transKey = (0, trim_js_1.default)(attr[i18nKey]);
             const defaultsString = attr[defaultsKey] || "";
             if (typeof defaultsString !== "string")
                 this.log(`defaults value must be a static string, saw ${defaultsString.yellow}`);
@@ -79,7 +81,7 @@ function mix_parse_trans_from_string_by_babel(parser) {
             const tOptions = attr.tOptions;
             const options = {
                 ...tOptions,
-                defaultValue: defaultsString || nodes_to_string(node.children, filepath, onError),
+                defaultValue: defaultsString || nodes_to_string(node.children, filepath, on_error),
                 fallbackKey,
             };
             if (Object.prototype.hasOwnProperty.call(attr, "count"))
@@ -89,8 +91,8 @@ function mix_parse_trans_from_string_by_babel(parser) {
                     this.log(`The ns attribute must be a string, saw ${attr.ns?.yellow}`);
                 options.ns = attr.ns;
             }
-            if (customHandler) {
-                customHandler(transKey, options);
+            if (custom_handler) {
+                custom_handler(transKey, options);
                 return;
             }
             this.set(transKey, options);
@@ -101,7 +103,7 @@ function mix_parse_trans_from_string_by_babel(parser) {
             // traverse(ast, Checker({ filepath }))
         }
         catch (err) {
-            onError(() => {
+            on_error(() => {
                 console.error('');
                 const { line, column } = (err && err.loc) || { line: 1, column: 1 };
                 console.error([filepath, line, column].join(":").yellow);
@@ -117,7 +119,7 @@ function mix_parse_trans_from_string_by_babel(parser) {
 exports.mix_parse_trans_from_string_by_babel = mix_parse_trans_from_string_by_babel;
 function nodes_to_string(nodes, filepath, onError) {
     let memo = '';
-    let nodeIndex = 0;
+    let node_index = 0;
     nodes.forEach((node, i) => {
         if (t.isJSXText(node) || t.isStringLiteral(node)) {
             const value = node.value
@@ -135,7 +137,7 @@ function nodes_to_string(nodes, filepath, onError) {
             if (t.isStringLiteral(expression))
                 memo += expression.value;
             else if (t.isObjectExpression(expression) &&
-                t.isObjectProperty((0, lodash_1.get)(expression, 'properties[0]')))
+                t.isObjectProperty((0, get_js_1.default)(expression, 'properties[0]')))
                 memo += '{{' + expression.properties[0].key.name + '}}';
             else
                 onError(() => {
@@ -146,8 +148,8 @@ function nodes_to_string(nodes, filepath, onError) {
                 });
         }
         else if (node.children)
-            memo += `<${nodeIndex}>${nodes_to_string(node.children, filepath, onError)}</${nodeIndex}>`;
-        nodeIndex++;
+            memo += `<${node_index}>${nodes_to_string(node.children, filepath, onError)}</${node_index}>`;
+        node_index++;
     });
     return memo;
 }

package/i18n/scanner/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["parser.ts"],"names":[],"mappings":"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","sourcesContent":["import { isFunction, castArray, trim, get as _get } from 'lodash'\nimport traverse from '@babel/traverse'\nimport { parse } from '@babel/parser'\nimport * as t from '@babel/types'\n\nimport '../../prototype.js'\n\n// import { Checker } from './checker'\n\n/** file:///D:/0/i18next-scanner/src/parser.js */\nexport function mix_parse_trans_from_string_by_babel (parser) {\n    parser.parseTransFromStringByBabel = function(code: string, options = { }, customHandler = null, onError: (callback: Function) => void = () => { } ) {\n        if (isFunction(options)) {\n            customHandler = options\n            options = { }\n        }\n        \n        const {\n            transformOptions = { }, // object\n            component = this.options.trans.component, // string\n            i18nKey = this.options.trans.i18nKey, // string\n            defaultsKey = this.options.trans.defaultsKey, // string\n            fallbackKey = this.options.trans.fallbackKey, // boolean|function\n            babylon: babylon_options = this.options.trans.babylon, // object\n            filepath,\n        } = options as any\n        \n        const parseJSXElement = ({ node }) => {\n            if (!node) return\n            \n            if (node.openingElement.name.name !== component) return\n            \n            \n            const getLiteralValue = literal => {\n                if (t.isTemplateLiteral(literal))\n                    return literal.quasis.map(element => element.value.cooked).join(\"\")\n                \n                return literal.value\n            }\n            \n            const attr = castArray(node.openingElement.attributes).reduce(\n                (acc, attribute) => {\n                    if (\n                        !t.isJSXAttribute(attribute) ||\n                        !t.isJSXIdentifier(attribute.name)\n                    ) return acc\n                    \n                    const { name } = attribute.name\n                    const value = attribute.value\n                    if (t.isLiteral(value))\n                        acc[name] = getLiteralValue(value)\n                    else if (t.isJSXExpressionContainer(value)) {\n                        const expression = value.expression\n                        if (t.isIdentifier(expression))\n                            acc[name] = expression.name\n                        else if (t.isLiteral(expression))\n                            acc[name] = getLiteralValue(expression)\n                        else if (t.isObjectExpression(expression)) {\n                            const properties = castArray(expression.properties)\n                            acc[name] = properties.reduce((obj, property) => {\n                                if (!t.isObjectProperty(property)) return obj\n                                if (t.isLiteral(property.value))\n                                    obj[(property.key as any).name] = getLiteralValue(property.value)\n                                else // Unable to get value of the property\n                                    obj[(property.key as any).name] = \"\"\n                                return obj\n                            }, { })\n                            /**\n                            * 防止 count 被忽略，如\n                            * ```jsx\n                            * <Trans count={arr.length}>\n                            *  一二三{{ count: arr.length }}\n                            * </Trans>\n                            * ```\n                            */\n                        } else if (name === \"count\")\n                            acc[name] = 0\n                    }\n                    return acc\n                },\n                { }\n            )\n            const transKey = trim(attr[i18nKey])\n            \n            const defaultsString = attr[defaultsKey] || \"\"\n            if (typeof defaultsString !== \"string\")\n                this.log(`defaults value must be a static string, saw ${defaultsString.yellow}`)\n            \n            \n            // https://www.i18next.com/translation-function/essentials#overview-options\n            const tOptions = attr.tOptions\n            const options = {\n                ...tOptions,\n                defaultValue: defaultsString || nodes_to_string(node.children, filepath, onError),\n                fallbackKey,\n            }\n            \n            if (Object.prototype.hasOwnProperty.call(attr, \"count\"))\n                options.count = Number(attr.count) || 0\n            \n            \n            if (Object.prototype.hasOwnProperty.call(attr, \"ns\")) {\n                if (typeof options.ns !== \"string\")\n                    this.log(`The ns attribute must be a string, saw ${attr.ns?.yellow}`)\n                    \n                options.ns = attr.ns\n            }\n            \n            if (customHandler) {\n                customHandler(transKey, options)\n                return\n            }\n            \n            this.set(transKey, options)\n        }\n        \n        try {\n            const ast = parse(code, { ...babylon_options })\n            traverse(ast, { JSXElement: parseJSXElement, })\n            // traverse(ast, Checker({ filepath }))\n        } catch (err) {\n            onError(() => {\n                console.error('')\n                const { line, column } = (err && err.loc) || { line: 1, column: 1 }\n                console.error([filepath, line, column].join(\":\").yellow)\n                console.error(`Unable to parse ${component?.blue} component.\\n`.red)\n                if (!filepath)\n                    console.error(String(code).red)\n                console.error((\"    \" + err.message).red)\n            })\n        }\n        \n        return this\n    }\n}\n\n\nfunction nodes_to_string (nodes, filepath, onError) {\n    let memo = ''\n    let nodeIndex = 0\n    nodes.forEach((node, i) => {\n        if (t.isJSXText(node) || t.isStringLiteral(node)) {\n            const value = node.value\n                .replace(/^[\\r\\n]+\\s*/g, \"\") // remove leading spaces containing a leading newline character\n                .replace(/[\\r\\n]+\\s*$/g, \"\") // remove trailing spaces containing a leading newline character\n                .replace(/[\\r\\n]+\\s*/g, \" \") // replace spaces containing a leading newline character with a single space character\n                \n            if (!value) return\n            \n            memo += value\n        } else if (t.isJSXExpressionContainer(node)) {\n            const { expression = { } } = node\n            \n            if (t.isNumericLiteral(expression))  // Numeric literal is ignored in react-i18next\n                memo += ''\n            if (t.isStringLiteral(expression))\n                memo += expression.value\n            else if (\n                t.isObjectExpression(expression) &&\n                t.isObjectProperty(_get(expression, 'properties[0]'))\n            )\n                memo += '{{' + (expression.properties[0] as any).key.name + '}}'\n            else\n                onError(() => {\n                    const { line, column } = (node.expression && node.expression.loc.start) || { line: 1, column: 1 }\n                    console.error('')\n                    console.error([filepath, line, column].join(\":\").yellow)\n                    console.error('Unsupported JSX expression. Only static values or {{interpolation}} blocks are supported.'.red)\n                })\n            \n        } else if (node.children)\n            memo += `<${nodeIndex}>${nodes_to_string(node.children, filepath, onError)}</${nodeIndex}>`\n        \n        \n        nodeIndex++\n    })\n    \n    return memo\n}\n\n"]}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["parser.ts"],"names":[],"mappings":"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","sourcesContent":["import castArray from 'lodash/castArray.js'\nimport trim from 'lodash/trim.js'\nimport _get from 'lodash/get.js'\n\nimport traverse from '@babel/traverse'\nimport { parse } from '@babel/parser'\nimport * as t from '@babel/types'\n\nimport '../../prototype.js'\n\n\n// import { Checker } from './checker'\n\n/** file:///D:/0/i18next-scanner/src/parser.js */\nexport function mix_parse_trans_from_string_by_babel (parser) {\n    parser.parseTransFromStringByBabel = function parse_trans_from_string_by_babel (\n        code: string, \n        options = { }, \n        custom_handler = null,\n        on_error: (callback: Function) => void \n            = () => { }\n    ) {\n        if (typeof options === 'function') {\n            custom_handler = options\n            options = { }\n        }\n        \n        const {\n            transformOptions = { }, // object\n            component = this.options.trans.component, // string\n            i18nKey = this.options.trans.i18nKey, // string\n            defaultsKey = this.options.trans.defaultsKey, // string\n            fallbackKey = this.options.trans.fallbackKey, // boolean|function\n            babylon: babylon_options = this.options.trans.babylon, // object\n            filepath,\n        } = options as any\n        \n        const parseJSXElement = ({ node }) => {\n            if (!node) return\n            \n            if (node.openingElement.name.name !== component) return\n            \n            \n            const getLiteralValue = literal => {\n                if (t.isTemplateLiteral(literal))\n                    return literal.quasis.map(element => element.value.cooked).join(\"\")\n                \n                return literal.value\n            }\n            \n            const attr = castArray(node.openingElement.attributes).reduce(\n                (acc, attribute) => {\n                    if (\n                        !t.isJSXAttribute(attribute) ||\n                        !t.isJSXIdentifier(attribute.name)\n                    ) return acc\n                    \n                    const { name } = attribute.name\n                    const value = attribute.value\n                    if (t.isLiteral(value))\n                        acc[name] = getLiteralValue(value)\n                    else if (t.isJSXExpressionContainer(value)) {\n                        const expression = value.expression\n                        if (t.isIdentifier(expression))\n                            acc[name] = expression.name\n                        else if (t.isLiteral(expression))\n                            acc[name] = getLiteralValue(expression)\n                        else if (t.isObjectExpression(expression)) {\n                            const properties = castArray(expression.properties)\n                            acc[name] = properties.reduce((obj, property) => {\n                                if (!t.isObjectProperty(property)) return obj\n                                if (t.isLiteral(property.value))\n                                    obj[(property.key as any).name] = getLiteralValue(property.value)\n                                else // Unable to get value of the property\n                                    obj[(property.key as any).name] = \"\"\n                                return obj\n                            }, { })\n                            /**\n                            * 防止 count 被忽略，如\n                            * ```jsx\n                            * <Trans count={arr.length}>\n                            *  一二三{{ count: arr.length }}\n                            * </Trans>\n                            * ```\n                            */\n                        } else if (name === \"count\")\n                            acc[name] = 0\n                    }\n                    return acc\n                },\n                { }\n            )\n            const transKey = trim(attr[i18nKey])\n            \n            const defaultsString = attr[defaultsKey] || \"\"\n            if (typeof defaultsString !== \"string\")\n                this.log(`defaults value must be a static string, saw ${defaultsString.yellow}`)\n            \n            \n            // https://www.i18next.com/translation-function/essentials#overview-options\n            const tOptions = attr.tOptions\n            const options = {\n                ...tOptions,\n                defaultValue: defaultsString || nodes_to_string(node.children, filepath, on_error),\n                fallbackKey,\n            }\n            \n            if (Object.prototype.hasOwnProperty.call(attr, \"count\"))\n                options.count = Number(attr.count) || 0\n            \n            \n            if (Object.prototype.hasOwnProperty.call(attr, \"ns\")) {\n                if (typeof options.ns !== \"string\")\n                    this.log(`The ns attribute must be a string, saw ${attr.ns?.yellow}`)\n                    \n                options.ns = attr.ns\n            }\n            \n            if (custom_handler) {\n                custom_handler(transKey, options)\n                return\n            }\n            \n            this.set(transKey, options)\n        }\n        \n        try {\n            const ast = parse(code, { ...babylon_options })\n            traverse(ast, { JSXElement: parseJSXElement, })\n            // traverse(ast, Checker({ filepath }))\n        } catch (err) {\n            on_error(() => {\n                console.error('')\n                const { line, column } = (err && err.loc) || { line: 1, column: 1 }\n                console.error([filepath, line, column].join(\":\").yellow)\n                console.error(`Unable to parse ${component?.blue} component.\\n`.red)\n                if (!filepath)\n                    console.error(String(code).red)\n                console.error((\"    \" + err.message).red)\n            })\n        }\n        \n        return this\n    }\n}\n\n\nfunction nodes_to_string (nodes, filepath, onError) {\n    let memo = ''\n    let node_index = 0\n    nodes.forEach((node, i) => {\n        if (t.isJSXText(node) || t.isStringLiteral(node)) {\n            const value = node.value\n                .replace(/^[\\r\\n]+\\s*/g, \"\") // remove leading spaces containing a leading newline character\n                .replace(/[\\r\\n]+\\s*$/g, \"\") // remove trailing spaces containing a leading newline character\n                .replace(/[\\r\\n]+\\s*/g, \" \") // replace spaces containing a leading newline character with a single space character\n                \n            if (!value) return\n            \n            memo += value\n        } else if (t.isJSXExpressionContainer(node)) {\n            const { expression = { } } = node\n            \n            if (t.isNumericLiteral(expression))  // Numeric literal is ignored in react-i18next\n                memo += ''\n            if (t.isStringLiteral(expression))\n                memo += expression.value\n            else if (\n                t.isObjectExpression(expression) &&\n                t.isObjectProperty(_get(expression, 'properties[0]'))\n            )\n                memo += '{{' + (expression.properties[0] as any).key.name + '}}'\n            else\n                onError(() => {\n                    const { line, column } = (node.expression && node.expression.loc.start) || { line: 1, column: 1 }\n                    console.error('')\n                    console.error([filepath, line, column].join(\":\").yellow)\n                    console.error('Unsupported JSX expression. Only static values or {{interpolation}} blocks are supported.'.red)\n                })\n            \n        } else if (node.children)\n            memo += `<${node_index}>${nodes_to_string(node.children, filepath, onError)}</${node_index}>`\n        \n        \n        node_index++\n    })\n    \n    return memo\n}\n\n"]}

package/i18n/utils.d.ts

@@ -1 +1 @@
-export declare function try_require(modpath: string): any;
+export declare function try_load_dict(fp_dict: string): Promise<any>;

package/i18n/utils.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.try_require = void 0;
-function try_require(modpath) {
+exports.try_load_dict = void 0;
+const file_js_1 = require("../file.js");
+async function try_load_dict(fp_dict) {
     try {
-        return require(modpath);
+        return await (0, file_js_1.fread_json)(fp_dict, { print: false });
     }
     catch {
         // console.error('未找到或解析错误，跳过加载：' + modpath)
         return {};
     }
 }
-exports.try_require = try_require;
+exports.try_load_dict = try_load_dict;
 //# sourceMappingURL=utils.js.map

package/i18n/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CAAE,OAAe;IACxC,IAAI;QACA,OAAO,OAAO,CAAC,OAAO,CAAC,CAAA;KAC1B;IAAC,MAAM;QACJ,4CAA4C;QAC5C,OAAO,EAAG,CAAA;KACb;AACL,CAAC;AAPD,kCAOC","sourcesContent":["export function try_require (modpath: string) {\n    try {\n        return require(modpath)\n    } catch {\n        // console.error('未找到或解析错误，跳过加载：' + modpath)\n        return { }\n    }\n}\n"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["utils.ts"],"names":[],"mappings":";;;AAAA,wCAAuC;AAEhC,KAAK,UAAU,aAAa,CAAE,OAAe;IAChD,IAAI;QACA,OAAO,MAAM,IAAA,oBAAU,EAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAA;KACrD;IAAC,MAAM;QACJ,4CAA4C;QAC5C,OAAO,EAAG,CAAA;KACb;AACL,CAAC;AAPD,sCAOC","sourcesContent":["import { fread_json } from '../file.js'\n\nexport async function try_load_dict (fp_dict: string) {\n    try {\n        return await fread_json(fp_dict, { print: false })\n    } catch {\n        // console.error('未找到或解析错误，跳过加载：' + modpath)\n        return { }\n    }\n}\n"]}

package/index.d.ts

@@ -1,5 +1,5 @@
-export * from './prototype';
-export * from './utils';
-export * from './file';
-export * from './process';
-export * from './net';
+export * from './prototype.js';
+export * from './utils.js';
+export * from './file.js';
+export * from './process.js';
+export * from './net.js';

package/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-(0, tslib_1.__exportStar)(require("./prototype"), exports);
-(0, tslib_1.__exportStar)(require("./utils"), exports);
-(0, tslib_1.__exportStar)(require("./file"), exports);
-(0, tslib_1.__exportStar)(require("./process"), exports);
-(0, tslib_1.__exportStar)(require("./net"), exports);
+tslib_1.__exportStar(require("./prototype.js"), exports);
+tslib_1.__exportStar(require("./utils.js"), exports);
+tslib_1.__exportStar(require("./file.js"), exports);
+tslib_1.__exportStar(require("./process.js"), exports);
+tslib_1.__exportStar(require("./net.js"), exports);
 //# sourceMappingURL=index.js.map

package/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,2DAA2B;AAC3B,uDAAuB;AACvB,sDAAsB;AACtB,yDAAyB;AACzB,qDAAqB","sourcesContent":["export * from './prototype'\nexport * from './utils'\nexport * from './file'\nexport * from './process'\nexport * from './net'\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;AAAA,yDAA8B;AAC9B,qDAA0B;AAC1B,oDAAyB;AACzB,uDAA4B;AAC5B,mDAAwB","sourcesContent":["export * from './prototype.js'\nexport * from './utils.js'\nexport * from './file.js'\nexport * from './process.js'\nexport * from './net.js'\n"]}

package/net.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rpc_curl = exports.rpc = exports.to_curl = exports.request_page = exports.parse_html = exports.request_json = exports.request = exports.request_retry = exports._request = exports.Cookie = exports.cookies = exports.MyProxy = void 0;
 const tslib_1 = require("tslib");
-const request_promise_native_1 = (0, tslib_1.__importDefault)(require("request-promise-native"));
+const request_promise_native_1 = tslib_1.__importDefault(require("request-promise-native"));
 const errors_js_1 = require("request-promise-native/errors.js");
-const promise_retry_1 = (0, tslib_1.__importDefault)(require("promise-retry"));
-const iconv_lite_1 = (0, tslib_1.__importDefault)(require("iconv-lite"));
-const cheerio_1 = (0, tslib_1.__importDefault)(require("cheerio"));
-const qs_1 = (0, tslib_1.__importDefault)(require("qs"));
+const promise_retry_1 = tslib_1.__importDefault(require("promise-retry"));
+const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
+const cheerio_1 = tslib_1.__importDefault(require("cheerio"));
+const qs_1 = tslib_1.__importDefault(require("qs"));
 const tough_cookie_1 = require("tough-cookie");
 Object.defineProperty(exports, "Cookie", { enumerable: true, get: function () { return tough_cookie_1.Cookie; } });
 require("./prototype.js");
@@ -38,8 +38,7 @@ exports.cookies = {
     },
 };
 exports._request = request_promise_native_1.default.defaults({
-    rejectUnauthorized: false,
-    gzip: true,
+    // rejectUnauthorized: false,
     /** prevent 302 redirect cause error, which is a boolean to set whether status codes other than 2xx should also reject the promise */
     simple: false,
     jar: exports.cookies.jar
@@ -66,8 +65,6 @@ async function request_retry(retries, request_options) {
 exports.request_retry = request_retry;
 async function request(url, { queries, body, type = 'application/json', proxy, method, headers, encoding, raw = false, retries, timeout = 20 * 1000, auth, gzip, cookies, } = {}) {
     url = url.toString();
-    if (!url.startsWith('http'))
-        url = 'http://' + url;
     const _body = body; // for error log
     if (body && !method)
         method = 'post';
@@ -92,7 +89,7 @@ async function request(url, { queries, body, type = 'application/json', proxy, m
         resolveWithFullResponse: true,
         headers: {
             'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',
-            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Safari/537.36',
+            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.82 Safari/537.36',
             ...body ? { 'content-type': type } : {},
             ...cookies ? {
                 cookie: Object.entries(cookies)
@@ -136,7 +133,7 @@ async function request(url, { queries, body, type = 'application/json', proxy, m
                     (0, utils_js_1.inspect)(qs) + '\n';
             if (_body)
                 s += `\n${'request.body:'.blue}\n` +
-                    (0, utils_js_1.inspect)(body) + '\n';
+                    (0, utils_js_1.inspect)(_body) + '\n';
             if (name === 'StatusCodeError')
                 s += `\n${'response.status:'.yellow} ${String(error.statusCode).red}\n`;
             else if (error instanceof errors_js_1.RequestError)
@@ -230,7 +227,7 @@ function to_curl(url, { queries, headers, method, body, proxy, exe = true } = {}
         //     ( proxy  ?  ' --proxy ' + proxy.quote()  :  ' --noproxy ' + '*'.quote())
         // ) +
         (proxy ? ` --proxy ${proxy.quote()}` : '') +
-        (method && method !== 'get' ? ` -X ${method}` : '') +
+        (method && method !== 'get' ? ` -X ${method.toUpperCase()}` : '') +
         (headers ? Object.entries(headers).map(([key, value]) => ' -H ' + `${key}: ${value}`.quote()).join('') : '') +
         (body ? ' -H ' + 'content-type: application/json'.quote() : '') +
         (body ? ' --data ' + JSON.stringify(body).quote() : '');

package/net.js.map

@@ -1 +1 @@
-{"version":3,"file":"net.js","sourceRoot":"","sources":["net.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    default as request_lib,\n    type OptionsWithUri,\n    type OptionsWithUrl\n} from 'request'\n\nimport {\n    default as request_promise,\n    type FullResponse,\n} from 'request-promise-native'\nimport { RequestError, StatusCodeError } from 'request-promise-native/errors.js'\n\nimport promise_retry from 'promise-retry'\n\nimport iconv from 'iconv-lite'\nimport cheerio from 'cheerio'\nimport qs from 'qs'\nimport { Cookie, MemoryCookieStore } from 'tough-cookie'\n\ndeclare module 'tough-cookie' {\n    interface MemoryCookieStore {\n        idx: Record<string, any>\n    }\n}\n\n\nimport './prototype.js'\nimport type { Encoding } from './file.js'\nimport { inspect, output_width } from './utils.js'\n\nexport enum MyProxy {\n    socks5 = 'http://localhost:10080',\n    whistle = 'http://localhost:8899',\n}\n\n\n// ------------------------------------ Fetch, Request\nconst cookie_store = new MemoryCookieStore()\n\nexport const cookies = {\n    store: cookie_store,\n    \n    jar: request_promise.jar(cookie_store),\n    \n    get (domain_or_url: string, str = false) {\n        if (domain_or_url.startsWith('http'))\n            if (str)\n                return this.jar.getCookieString(domain_or_url)\n            else\n                return this.jar.getCookies(domain_or_url)\n        \n        let cookies: Cookie[]\n        this.store.findCookies(domain_or_url, null, true, (error, _cookies) => {\n            if (error) throw error\n            cookies = _cookies\n        })\n        return cookies\n    },\n}\n\nexport { Cookie }\n\n\nexport const _request = request_promise.defaults({\n    rejectUnauthorized: false,\n    gzip: true,\n    /** prevent 302 redirect cause error, which is a boolean to set whether status codes other than 2xx should also reject the promise */\n    simple: false,\n    \n    jar: cookies.jar\n})\n\n\nexport async function request_retry (retries: number, request_options: request_promise.OptionsWithUrl) {\n    return promise_retry<FullResponse>({\n        retries,\n        minTimeout: 1000,\n        maxTimeout: Infinity,\n        factor: 2\n    }, async (retry, count) => {\n        try {\n            return await _request(request_options)\n        } catch (error) {\n            if (!['ECONNRESET', 'ETIMEDOUT', 'ESOCKETTIMEDOUT'].includes(error.cause?.code)) throw error\n            if (count <= retries)\n                console.log(`${`retry (${count}) …`.yellow} ${request_options.url.toString().blue.underline}`)\n            return retry(error)\n        }\n    })\n}\n\n\nexport interface RequestOptions {\n    method?: 'get' | 'post' | 'put' | 'head' | 'delete' | 'patch'\n    \n    queries?: Record<string, any>\n    \n    headers?: Record<string, string>\n    \n    body?: string | Record<string, any>\n    \n    type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data'\n    \n    \n    proxy?: boolean | MyProxy | string\n    \n    encoding?: Encoding\n    \n    retries?: true | number\n    \n    timeout?: number\n    \n    auth?: {\n        username: string\n        password: string\n    }\n    \n    gzip?: boolean\n    \n    cookies?: Record<string, string>\n}\n\nexport interface RequestRawOptions extends RequestOptions {\n    raw: true\n}\n\n/** \n    - url: must be full url\n    - options:\n        - raw: `false` 传入后返回整个 response\n        - encoding: `(response content-type: charset=gb18030) || 'utf-8'` when 'binary' then return buffer\n        - type: `'application/json'` request content-type header (if has body)\n        - proxy: `false` proxy === true then use MyProxy.whistle\n        - retries: `false` could be true (default 3 times) or retry times\n        - timeout: `20 * 1000`\n        - gzip: `raw -> false; else -> true`\n*/\nexport async function request (url: string | URL): Promise<string>\nexport async function request (url: string | URL, options: RequestRawOptions): Promise<request_lib.Response>\nexport async function request (url: string | URL, options: RequestOptions & { encoding: 'binary' }): Promise<Buffer>\nexport async function request (url: string | URL, options: RequestOptions): Promise<string>\nexport async function request (url: string | URL, {\n    queries,\n    \n    body,\n    \n    type = 'application/json',\n    \n    proxy,\n    \n    method,\n    \n    headers,\n    \n    encoding,\n    \n    raw = false,\n    \n    retries,\n    \n    timeout = 20 * 1000,\n    \n    auth,\n    \n    gzip,\n    \n    cookies,\n    \n}: RequestOptions & { raw?: boolean } = { }) {\n    url = url.toString()\n    \n    if (!url.startsWith('http'))\n        url = 'http://' + url\n    \n    const _body = body  // for error log\n    \n    if (body && !method)\n        method = 'post'\n    \n    if (type === 'application/json' && typeof body !== 'undefined' && (typeof body !== 'string' && !Buffer.isBuffer(body)))\n        body = JSON.stringify(body)\n    \n    // --- proxy\n    if (proxy) {\n        if (proxy === true)\n            proxy = MyProxy.whistle\n    } else\n        proxy = false\n    \n    // --- gzip\n    if (gzip === undefined)\n        gzip = !raw\n    \n    \n    const options: request_lib.Options & { resolveWithFullResponse: boolean } = {\n        url,\n        \n        ... method ? { method: method.toUpperCase() } : { },\n        \n        proxy,\n        \n        gzip,\n        \n        encoding: null,\n        \n        resolveWithFullResponse: true,\n        \n        headers: {\n            'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',\n            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Safari/537.36',\n            ... body ? { 'content-type': type } : { }, \n            ... cookies ? {\n                cookie: Object.entries(cookies)\n                    .map(([key, value]) => \n                        `${encodeURIComponent(key)}=${encodeURIComponent(value)}`\n                    ).join('; ')\n            } : { },\n            ... headers\n        },\n        \n        ... queries ? { qs: queries } : { },\n        \n        // --- body\n        ... (() => {\n            if (!body) return { }\n            if (type === 'application/x-www-form-urlencoded') return { form: body }\n            if (type === 'multipart/form-data') return { formData: body as Record<string, any> }\n            return { body }\n        })(),\n        \n        ... timeout ? { timeout } : { },\n        \n        ... auth ? { auth } : { },\n    }\n    \n    let resp: request_lib.Response\n    \n    try {\n        if (retries) {\n            if (retries === true)\n                retries = 3\n            \n            resp = await request_retry(retries, options)\n        } else\n            resp = await _request(options)\n        \n        if (!(200 <= resp.statusCode && resp.statusCode <= 299))\n            throw new StatusCodeError(resp.statusCode, resp.body, options, resp)\n        \n    } catch (error) {\n        const {\n            name, \n            options: { method, url, uri, qs }, \n            response,\n        }: {\n            options: OptionsWithUri & OptionsWithUrl\n            response: FullResponse\n        } & Error = error\n        \n        error[inspect.custom] = () => {\n            let s = '─'.repeat(output_width / 2) + '\\n' +\n                `${(method || 'get').toLowerCase().red} ${String(url || uri).blue.underline}\\n`\n            \n            if (qs)\n                s += `\\n${'request.query:'.blue}\\n` +\n                    inspect(qs) + '\\n'\n            \n            if (_body)\n                s += `\\n${'request.body:'.blue}\\n` +\n                    inspect(body) + '\\n'\n            \n            if (name === 'StatusCodeError')\n                s += `\\n${'response.status:'.yellow} ${String(error.statusCode).red}\\n`\n            else if (error instanceof RequestError)\n                s += `\\n${'response.cause:'.yellow}\\n` +\n                    `${inspect(error.cause)}\\n`\n            else\n                s += `\\n${inspect(error)}\\n`\n                \n            if (response) {\n                s += `\\n${'response.headers:'.yellow}\\n` + \n                    `${inspect(response.headers)}\\n`\n                \n                if (response.body)\n                    s += `\\n${'response.body:'.yellow}\\n` +\n                        `${inspect(response.body.toString())}\\n`\n            }\n            \n            s += `\\n${'stack:'.yellow}\\n` +\n                `${new Error().stack}\\n` +\n                '─'.repeat(output_width / 2)\n            \n            return s\n        }\n        \n        throw error\n    }\n    \n    if (raw)\n        return resp\n    \n    if (!resp.body)\n        return resp.body\n    \n    // --- decode body\n    if (encoding === 'binary')\n        return resp.body\n        \n    encoding ||= /charset=(.*)/.exec(resp.headers['content-type'])?.[1] as Encoding || 'utf-8'\n    \n    if (/utf-?8/i.test(encoding))\n        return (resp.body as Buffer).toString('utf-8')\n    \n    return iconv.decode((resp.body as Buffer), encoding)\n}\n\n\n/** make http request and parse body as json */\nexport async function request_json <T = any> (url: string | URL, options?: RequestOptions): Promise<T> {\n    const resp = await request(url, options)\n    if (!resp) return\n    try {\n        return JSON.parse(resp)\n    } catch (error) {\n        console.log(resp)\n        throw error\n    }\n}\n\n\n/** use $.html(cheerio_element) to get outer html */\nexport function parse_html (html: string) {\n    let $ = cheerio.load(html, { decodeEntities: false })\n    \n    Object.defineProperty($, inspect.custom, {\n        configurable: true,\n        enumerable: false,\n        value () {\n            return this.html()\n        }\n    })\n    \n    Object.defineProperty($.prototype, inspect.custom, {\n        configurable: true,\n        enumerable: false,\n        value (this: cheerio.Cheerio) {\n            if (this.length > 1)\n                return this.map((index, element) => {\n                    if (typeof element === 'string') return element\n                    return $.html(element)\n                }).get().join_lines()\n            \n            return this.toString()\n        }\n    })\n    \n    return $\n}\n\n\n/** use $.html(cheerio_element) to get outer html */\nexport async function request_page (url: string | URL, options?: RequestOptions) {\n    return parse_html(\n        await request(url, options)\n    )\n}\n\n\nexport function to_curl (url: string | URL, { queries, headers, method, body, proxy, exe = true }: RequestOptions & { exe?: boolean } = { }) {\n    if (proxy === true)\n        proxy = process.env.http_proxy\n    \n    url = url.toString()\n    \n    if (!url.startsWith('http'))\n        url = `http://${url}`\n    \n    return (exe ? 'curl.exe' : 'curl') + \n        ' ' + ( url + (queries ? '?' : '') + qs.stringify(queries) ).quote() +\n        // ( typeof proxy === 'undefined' ?\n        //     ''\n        //     :\n        //     ( proxy  ?  ' --proxy ' + proxy.quote()  :  ' --noproxy ' + '*'.quote())\n        // ) +\n        ( proxy  ?  ` --proxy ${proxy.quote()}`  :  '' ) +\n        ( method && method !== 'get'  ?  ` -X ${method}`  :  '' ) +\n        ( headers  ?  Object.entries(headers).map( ([key, value]) => ' -H ' + `${key}: ${value}`.quote() ).join('') : '' ) +\n        ( body  ?  ' -H ' + 'content-type: application/json'.quote()  :  '') +\n        ( body  ?  ' --data ' + JSON.stringify(body).quote()  :  '')\n}\n\n\n\n\n// ------------------------------------ rpc client\n/** post json to http://localhost:8421/api/rpc\n    - func: function name\n    - args?: argument array\n    - options?:\n        - ignore?: `false` wait for execution but do not serialize result to response\n        - async?: `false` do not wait for exec\n*/\nexport async function rpc (\n    func: string, \n    args?: any[], \n    { url = 'http://localhost:8421/api/rpc', async: _async = false, ignore = false }: { url?: string, async?: boolean, ignore?: boolean } = { }\n) {\n    if (!func) throw new Error('rpc argument error: no func')\n    \n    return request_json(url, {\n        body: {\n            func,\n            args,\n            async: _async,\n            ignore,\n        }\n    })\n}\n\n\nexport function rpc_curl (func: string, args: any[]) {\n    const cmd = args.find( arg => typeof arg === 'object') ?\n            to_curl('http://localhost:8421/api/rpc', { body: { func, args } })\n        :\n            to_curl('http://localhost:8421/api/rpc', { queries: { func, args } })\n    return cmd\n}\n\n"]}
+{"version":3,"file":"net.js","sourceRoot":"","sources":["net.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n    default as request_lib,\n    type OptionsWithUri,\n    type OptionsWithUrl\n} from 'request'\n\nimport {\n    default as request_promise,\n    type FullResponse,\n} from 'request-promise-native'\nimport { RequestError, StatusCodeError } from 'request-promise-native/errors.js'\n\nimport promise_retry from 'promise-retry'\n\nimport iconv from 'iconv-lite'\nimport cheerio from 'cheerio'\nimport qs from 'qs'\nimport { Cookie, MemoryCookieStore } from 'tough-cookie'\n\ndeclare module 'tough-cookie' {\n    interface MemoryCookieStore {\n        idx: Record<string, any>\n    }\n}\n\n\nimport './prototype.js'\nimport type { Encoding } from './file.js'\nimport { inspect, output_width } from './utils.js'\n\nexport enum MyProxy {\n    socks5  = 'http://localhost:10080',\n    whistle = 'http://localhost:8899',\n}\n\n\n// ------------------------------------ Fetch, Request\nconst cookie_store = new MemoryCookieStore()\n\nexport const cookies = {\n    store: cookie_store,\n    \n    jar: request_promise.jar(cookie_store),\n    \n    get (domain_or_url: string, str = false) {\n        if (domain_or_url.startsWith('http'))\n            if (str)\n                return this.jar.getCookieString(domain_or_url)\n            else\n                return this.jar.getCookies(domain_or_url)\n        \n        let cookies: Cookie[]\n        this.store.findCookies(domain_or_url, null, true, (error, _cookies) => {\n            if (error) throw error\n            cookies = _cookies\n        })\n        return cookies\n    },\n}\n\nexport { Cookie }\n\n\nexport const _request = request_promise.defaults({\n    // rejectUnauthorized: false,\n    \n    /** prevent 302 redirect cause error, which is a boolean to set whether status codes other than 2xx should also reject the promise */\n    simple: false,\n    \n    jar: cookies.jar\n})\n\n\nexport async function request_retry (retries: number, request_options: request_promise.OptionsWithUrl) {\n    return promise_retry<FullResponse>({\n        retries,\n        minTimeout: 1000,\n        maxTimeout: Infinity,\n        factor: 2\n    }, async (retry, count) => {\n        try {\n            return await _request(request_options)\n        } catch (error) {\n            if (!['ECONNRESET', 'ETIMEDOUT', 'ESOCKETTIMEDOUT'].includes(error.cause?.code)) throw error\n            if (count <= retries)\n                console.log(`${`retry (${count}) …`.yellow} ${request_options.url.toString().blue.underline}`)\n            return retry(error)\n        }\n    })\n}\n\n\nexport interface RequestOptions {\n    method?: 'get' | 'post' | 'put' | 'head' | 'delete' | 'patch'\n    \n    queries?: Record<string, any>\n    \n    headers?: Record<string, string>\n    \n    body?: string | Record<string, any>\n    \n    type?: 'application/json' | 'application/x-www-form-urlencoded' | 'multipart/form-data'\n    \n    \n    proxy?: boolean | MyProxy | string\n    \n    encoding?: Encoding\n    \n    retries?: true | number\n    \n    timeout?: number\n    \n    auth?: {\n        username: string\n        password: string\n    }\n    \n    gzip?: boolean\n    \n    cookies?: Record<string, string>\n}\n\nexport interface RequestRawOptions extends RequestOptions {\n    raw: true\n}\n\n/** \n    - url: must be full url\n    - options:\n        - raw: `false` 传入后返回整个 response\n        - encoding: `(response content-type: charset=gb18030) || 'utf-8'` when 'binary' then return buffer\n        - type: `'application/json'` request content-type header (if has body)\n        - proxy: `false` proxy === true then use MyProxy.whistle\n        - retries: `false` could be true (default 3 times) or retry times\n        - timeout: `20 * 1000`\n        - gzip: `raw -> false; else -> true`\n*/\nexport async function request (url: string | URL): Promise<string>\nexport async function request (url: string | URL, options: RequestRawOptions): Promise<request_lib.Response>\nexport async function request (url: string | URL, options: RequestOptions & { encoding: 'binary' }): Promise<Buffer>\nexport async function request (url: string | URL, options: RequestOptions): Promise<string>\nexport async function request (url: string | URL, {\n    queries,\n    \n    body,\n    \n    type = 'application/json',\n    \n    proxy,\n    \n    method,\n    \n    headers,\n    \n    encoding,\n    \n    raw = false,\n    \n    retries,\n    \n    timeout = 20 * 1000,\n    \n    auth,\n    \n    gzip,\n    \n    cookies,\n    \n}: RequestOptions & { raw?: boolean } = { }) {\n    url = url.toString()\n    \n    const _body = body  // for error log\n    \n    if (body && !method)\n        method = 'post'\n    \n    if (type === 'application/json' && typeof body !== 'undefined' && (typeof body !== 'string' && !Buffer.isBuffer(body)))\n        body = JSON.stringify(body)\n    \n    // --- proxy\n    if (proxy) {\n        if (proxy === true)\n            proxy = MyProxy.whistle\n    } else\n        proxy = false\n    \n    // --- gzip\n    if (gzip === undefined)\n        gzip = !raw\n    \n    \n    const options: request_lib.Options & { resolveWithFullResponse: boolean } = {\n        url,\n        \n        ... method ? { method: method.toUpperCase() } : { },\n        \n        proxy,\n        \n        gzip,\n        \n        encoding: null,\n        \n        resolveWithFullResponse: true,\n        \n        headers: {\n            'accept-language': 'zh-CN,zh;q=0.9,en-US;q=0.8,en;q=0.7,ja-JP;q=0.6,ja;q=0.5',\n            'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.82 Safari/537.36',\n            ... body ? { 'content-type': type } : { }, \n            ... cookies ? {\n                cookie: Object.entries(cookies)\n                    .map(([key, value]) => \n                        `${encodeURIComponent(key)}=${encodeURIComponent(value)}`\n                    ).join('; ')\n            } : { },\n            ... headers\n        },\n        \n        ... queries ? { qs: queries } : { },\n        \n        // --- body\n        ... (() => {\n            if (!body) return { }\n            if (type === 'application/x-www-form-urlencoded') return { form: body }\n            if (type === 'multipart/form-data') return { formData: body as Record<string, any> }\n            return { body }\n        })(),\n        \n        ... timeout ? { timeout } : { },\n        \n        ... auth ? { auth } : { },\n    }\n    \n    let resp: request_lib.Response\n    \n    try {\n        if (retries) {\n            if (retries === true)\n                retries = 3\n            \n            resp = await request_retry(retries, options)\n        } else\n            resp = await _request(options)\n        \n        if (!(200 <= resp.statusCode && resp.statusCode <= 299))\n            throw new StatusCodeError(resp.statusCode, resp.body, options, resp)\n        \n    } catch (error) {\n        const {\n            name, \n            options: { method, url, uri, qs }, \n            response,\n        }: {\n            options: OptionsWithUri & OptionsWithUrl\n            response: FullResponse\n        } & Error = error\n        \n        error[inspect.custom] = () => {\n            let s = '─'.repeat(output_width / 2) + '\\n' +\n                `${(method || 'get').toLowerCase().red} ${String(url || uri).blue.underline}\\n`\n            \n            if (qs)\n                s += `\\n${'request.query:'.blue}\\n` +\n                    inspect(qs) + '\\n'\n            \n            if (_body)\n                s += `\\n${'request.body:'.blue}\\n` +\n                    inspect(_body) + '\\n'\n            \n            if (name === 'StatusCodeError')\n                s += `\\n${'response.status:'.yellow} ${String(error.statusCode).red}\\n`\n            else if (error instanceof RequestError)\n                s += `\\n${'response.cause:'.yellow}\\n` +\n                    `${inspect(error.cause)}\\n`\n            else\n                s += `\\n${inspect(error)}\\n`\n                \n            if (response) {\n                s += `\\n${'response.headers:'.yellow}\\n` + \n                    `${inspect(response.headers)}\\n`\n                \n                if (response.body)\n                    s += `\\n${'response.body:'.yellow}\\n` +\n                        `${inspect(response.body.toString())}\\n`\n            }\n            \n            s += `\\n${'stack:'.yellow}\\n` +\n                `${new Error().stack}\\n` +\n                '─'.repeat(output_width / 2)\n            \n            return s\n        }\n        \n        throw error\n    }\n    \n    if (raw)\n        return resp\n    \n    if (!resp.body)\n        return resp.body\n    \n    // --- decode body\n    if (encoding === 'binary')\n        return resp.body\n        \n    encoding ||= /charset=(.*)/.exec(resp.headers['content-type'])?.[1] as Encoding || 'utf-8'\n    \n    if (/utf-?8/i.test(encoding))\n        return (resp.body as Buffer).toString('utf-8')\n    \n    return iconv.decode((resp.body as Buffer), encoding)\n}\n\n\n/** make http request and parse body as json */\nexport async function request_json <T = any> (url: string | URL, options?: RequestOptions): Promise<T> {\n    const resp = await request(url, options)\n    if (!resp) return\n    try {\n        return JSON.parse(resp)\n    } catch (error) {\n        console.log(resp)\n        throw error\n    }\n}\n\n\n/** use $.html(cheerio_element) to get outer html */\nexport function parse_html (html: string) {\n    let $ = cheerio.load(html, { decodeEntities: false })\n    \n    Object.defineProperty($, inspect.custom, {\n        configurable: true,\n        enumerable: false,\n        value () {\n            return this.html()\n        }\n    })\n    \n    Object.defineProperty($.prototype, inspect.custom, {\n        configurable: true,\n        enumerable: false,\n        value (this: cheerio.Cheerio) {\n            if (this.length > 1)\n                return this.map((index, element) => {\n                    if (typeof element === 'string') return element\n                    return $.html(element)\n                }).get().join_lines()\n            \n            return this.toString()\n        }\n    })\n    \n    return $\n}\n\n\n/** use $.html(cheerio_element) to get outer html */\nexport async function request_page (url: string | URL, options?: RequestOptions) {\n    return parse_html(\n        await request(url, options)\n    )\n}\n\n\nexport function to_curl (url: string | URL, { queries, headers, method, body, proxy, exe = true }: RequestOptions & { exe?: boolean } = { }) {\n    if (proxy === true)\n        proxy = process.env.http_proxy\n    \n    url = url.toString()\n    \n    if (!url.startsWith('http'))\n        url = `http://${url}`\n    \n    return (exe ? 'curl.exe' : 'curl') + \n        ' ' + ( url + (queries ? '?' : '') + qs.stringify(queries) ).quote() +\n        // ( typeof proxy === 'undefined' ?\n        //     ''\n        //     :\n        //     ( proxy  ?  ' --proxy ' + proxy.quote()  :  ' --noproxy ' + '*'.quote())\n        // ) +\n        ( proxy  ?  ` --proxy ${proxy.quote()}`  :  '' ) +\n        ( method && method !== 'get'  ?  ` -X ${method.toUpperCase()}`  :  '' ) +\n        ( headers  ?  Object.entries(headers).map( ([key, value]) => ' -H ' + `${key}: ${value}`.quote() ).join('') : '' ) +\n        ( body  ?  ' -H ' + 'content-type: application/json'.quote()  :  '') +\n        ( body  ?  ' --data ' + JSON.stringify(body).quote()  :  '')\n}\n\n\n\n\n// ------------------------------------ rpc client\n/** post json to http://localhost:8421/api/rpc\n    - func: function name\n    - args?: argument array\n    - options?:\n        - ignore?: `false` wait for execution but do not serialize result to response\n        - async?: `false` do not wait for exec\n*/\nexport async function rpc (\n    func: string, \n    args?: any[], \n    { url = 'http://localhost:8421/api/rpc', async: _async = false, ignore = false }: { url?: string, async?: boolean, ignore?: boolean } = { }\n) {\n    if (!func) throw new Error('rpc argument error: no func')\n    \n    return request_json(url, {\n        body: {\n            func,\n            args,\n            async: _async,\n            ignore,\n        }\n    })\n}\n\n\nexport function rpc_curl (func: string, args: any[]) {\n    const cmd = args.find( arg => typeof arg === 'object') ?\n            to_curl('http://localhost:8421/api/rpc', { body: { func, args } })\n        :\n            to_curl('http://localhost:8421/api/rpc', { queries: { func, args } })\n    return cmd\n}\n\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xshell",
-    "version": "0.0.29",
+    "version": "0.0.32",
     "main": "./index.js",
     "bin": {
         "xshell": "./xshell.js",
@@ -16,8 +16,8 @@
     ],
     "type": "commonjs",
     "engines": {
-        "node": ">=17.1.0",
-        "vscode": "^1.63.1"
+        "node": ">=17.4.0",
+        "vscode": ">=1.64.0"
     },
     "scripts": {
         "start": "node --title=xshell --inspect=0.0.0.0:8420 ./xshell.js",
@@ -37,7 +37,7 @@
     "homepage": "https://github.com/ShenHongFei/xshell",
     "repository": {
         "type": "git",
-        "url": "https://github.com/ShenHongFei/xshell"
+        "url": "https://github.com/ShenHongFei/xshell.git"
     },
     "bugs": {
         "url": "https://github.com/ShenHongFei/xshell/issues"
@@ -65,25 +65,25 @@
         ]
     },
     "dependencies": {
-        "@babel/core": "^7.16.7",
-        "@babel/parser": "^7.16.7",
-        "@babel/traverse": "^7.16.7",
+        "@babel/core": "^7.17.5",
+        "@babel/parser": "^7.17.3",
+        "@babel/traverse": "^7.17.3",
         "@koa/cors": "^3.1.0",
         "byte-size": "^8.1.0",
         "chalk": "^4.1.2",
         "chardet": "^1.4.0",
         "cheerio": "^1.0.0-rc.10",
-        "cli-table3": "^0.6.0",
+        "cli-table3": "^0.6.1",
         "cli-truncate": "=2.1.0",
         "colors": "^1.4.0",
         "commander": "^8.3.0",
         "ejs": "^3.1.6",
         "emoji-regex": "^10.0.0",
-        "fs-extra": "^10.0.0",
+        "fs-extra": "^10.0.1",
         "fs-monkey": "^1.0.3",
         "gulp-sort": "^2.0.0",
         "hash-string": "^1.0.0",
-        "i18next": "^21.6.5",
+        "i18next": "^21.6.12",
         "i18next-scanner": "^3.1.0",
         "iconv-lite": "^0.6.3",
         "js-cookie": "^3.0.1",
@@ -95,9 +95,9 @@
         "memfs": "^3.4.1",
         "ora": "=5.4.1",
         "promise-retry": "^2.0.1",
-        "qs": "^6.10.2",
+        "qs": "^6.10.3",
         "react": "^17.0.2",
-        "react-i18next": "^11.15.3",
+        "react-i18next": "^11.15.5",
         "readdir-enhanced": "^6.0.4",
         "request": "^2.88.2",
         "request-promise-native": "^1.0.9",
@@ -107,16 +107,17 @@
         "strip-ansi": "=6.0.0",
         "tough-cookie": "^4.0.0",
         "tslib": "^2.3.1",
-        "typescript": "^4.5.4",
+        "typescript": "^4.6.2",
         "upath": "^2.0.1",
         "vinyl": "^2.2.1",
         "vinyl-fs": "^3.0.3"
     },
     "devDependencies": {
-        "@babel/types": "^7.16.7",
+        "@babel/types": "^7.17.0",
         "@types/babel__traverse": "^7.14.2",
+        "@types/byte-size": "^8.1.0",
         "@types/chardet": "^0.8.1",
-        "@types/cheerio": "^0.22.30",
+        "@types/cheerio": "^0.22.31",
         "@types/ejs": "^3.1.0",
         "@types/express": "^4.17.13",
         "@types/fs-extra": "^9.0.13",
@@ -124,18 +125,18 @@
         "@types/js-cookie": "^3.0.1",
         "@types/koa": "^2.13.4",
         "@types/koa-compress": "^4.0.3",
-        "@types/lodash": "^4.14.178",
-        "@types/node": "^17.0.8",
+        "@types/lodash": "^4.14.179",
+        "@types/node": "^17.0.21",
         "@types/promise-retry": "^1.1.3",
         "@types/qs": "^6.9.7",
-        "@types/react": "^17.0.38",
+        "@types/react": "^17.0.39",
         "@types/request": "^2.48.8",
         "@types/request-promise-native": "^1.0.18",
         "@types/rimraf": "^3.0.2",
         "@types/stream-buffers": "^3.0.4",
         "@types/tampermonkey": "^4.0.5",
         "@types/vinyl-fs": "^2.4.12",
-        "@types/vscode": "^1.63.1",
+        "@types/vscode": "^1.64.0",
         "source-map-loader": "^3.0.1",
         "ts-loader": "^9.2.6"
     }

package/process.d.ts

@@ -38,8 +38,8 @@ interface StartOptions {
 */
 export declare function start(exe: string, args?: string[], { cwd, encoding, print, stdio, detached, env, }?: StartOptions): ChildProcess;
 export interface CallOptions extends StartOptions {
-    /** `true` whether to throw Error when code is not 0 */
     throw_code?: boolean;
+    input?: string;
 }
 export interface CallResult<T = string> {
     pid: number;
@@ -53,12 +53,13 @@ export interface CallResult<T = string> {
 /** call process for result
     - exe: .exe path or filename (full path is recommanded to skip path searching for better perf)
     - args: `[]` arguments list
-    - options
+    - options?:
         - cwd?: `'d:/'`
         - env?: `process.env` overwrite/add to process.env
         - encoding?: `'utf-8'` child output encoding
         - print?: `true` print option (with details)
         - stdio?: `'pipe'` when 'ignore' then ignore stdio processing
+        - input?: string
         - detached?: `false` whether to break the connection with child (ignore stdio, unref)
         - throw_code?: `true` whether to throw Error when code is not 0
 */

package/process.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call_node = exports.call = exports.start = exports.exe_node = exports.fp_root = void 0;
 const tslib_1 = require("tslib");
 const child_process_1 = require("child_process");
-const iconv_lite_1 = (0, tslib_1.__importDefault)(require("iconv-lite"));
+const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
 require("./prototype.js");
 const utils_js_1 = require("./utils.js");
 exports.fp_root = `${__dirname}/`.to_slash();
@@ -67,7 +67,7 @@ function start(exe, args = [], { cwd = exports.fp_root, encoding = 'utf-8', prin
 }
 exports.start = start;
 async function call(exe, args = [], options = {}) {
-    const { encoding = 'utf-8', print = true, throw_code = true, } = options;
+    const { encoding = 'utf-8', print = true, throw_code = true, input } = options;
     const print_options = typeof print === 'boolean' ?
         {
             command: print,
@@ -83,6 +83,8 @@ async function call(exe, args = [], options = {}) {
         console.log(cmd.blue);
     options.print = false;
     let child = start(exe, args, options);
+    if (input)
+        child.stdin.write(input);
     // --- collect output
     let stdouts = [];
     let stderrs = [];