fishpi 0.0.3 → 0.0.7

package/lib/src/utils.js

@@ -27,61 +27,106 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBrowse = exports.toMetal = exports.domain = exports.request = void 0;
-const axios_1 = __importDefault(require("axios"));
-const https = __importStar(require("https"));
-const domain = 'fishpi.cn/';
+exports.isBrowse = exports.analyzeMetalAttr = exports.toMetal = exports.domain = exports.request = void 0;
+var axios_1 = __importDefault(require("axios"));
+var https = __importStar(require("https"));
+var domain = 'fishpi.cn/';
 exports.domain = domain;
 function request(opt) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let { url, method = 'get', headers = {}, data } = opt;
-        if (!isBrowse) {
-            headers['User-Agent'] = `Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36`;
-            headers['Referer'] = `https://${domain}`;
-        }
-        let options = {
-            method, headers,
-            httpsAgent: new https.Agent({
-                keepAlive: true,
-                rejectUnauthorized: false,
-            }),
-            data
-        };
-        let rsp;
-        try {
-            rsp = yield (0, axios_1.default)(`https://${domain}${url}`, options);
-            return rsp;
-        }
-        catch (err) {
-            if (err.response.status === 401) {
-                return err.response;
+    return __awaiter(this, void 0, void 0, function () {
+        var url, _a, method, _b, headers, data, options, rsp, err_1;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    url = opt.url, _a = opt.method, method = _a === void 0 ? 'get' : _a, _b = opt.headers, headers = _b === void 0 ? {} : _b, data = opt.data;
+                    if (!isBrowse) {
+                        headers['User-Agent'] = "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36";
+                        headers['Referer'] = "https://".concat(domain);
+                    }
+                    options = {
+                        method: method,
+                        headers: headers,
+                        httpsAgent: new https.Agent({
+                            keepAlive: true,
+                            rejectUnauthorized: false,
+                        }),
+                        data: data
+                    };
+                    _c.label = 1;
+                case 1:
+                    _c.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, (0, axios_1.default)("https://".concat(domain).concat(url), options)];
+                case 2:
+                    rsp = _c.sent();
+                    return [2 /*return*/, rsp];
+                case 3:
+                    err_1 = _c.sent();
+                    if (err_1.response.status === 401) {
+                        return [2 /*return*/, err_1.response];
+                    }
+                    throw (err_1);
+                case 4: return [2 /*return*/];
             }
-            throw (err);
-        }
+        });
     });
 }
 exports.request = request;
+function analyzeMetalAttr(m) {
+    if (!m)
+        return m;
+    if (typeof m.attr != 'string')
+        return m;
+    var attr = m.attr.split('&');
+    m.attr = {};
+    attr.forEach(function (a) { return m.attr[a.split('=')[0]] = a.split('=')[1]; });
+    m.url = "https://fishpi.cn/gen?txt=".concat(m.description, "&").concat(m.attr.url);
+    m.icon = "https://fishpi.cn/gen?txt=&".concat(m.attr.url);
+    return m;
+}
+exports.analyzeMetalAttr = analyzeMetalAttr;
 function toMetal(sysMetal) {
     try {
-        let metal = JSON.parse(sysMetal);
-        metal.list.forEach((m, i, list) => {
-            let attr = m.attr.split('&');
-            m.attr = {};
-            attr.forEach((a) => m.attr[a.split('=')[0]] = a.split('=')[1]);
-            list[i] = m;
+        var metal = JSON.parse(sysMetal);
+        metal.list.forEach(function (m, i, list) {
+            list[i] = analyzeMetalAttr(m);
         });
-        return metal;
+        return metal.list;
     }
     catch (error) {
-        return {
-            list: []
-        };
+        return [];
     }
 }
 exports.toMetal = toMetal;
-const isBrowse = typeof window !== 'undefined';
+var isBrowse = typeof window !== 'undefined';
 exports.isBrowse = isBrowse;

package/package.json

@@ -1,48 +1,48 @@
-{
-  "name": "fishpi",
-  "version": "0.0.3",
-  "description": "A Package to use API of fishpi.",
-  "main": "./lib/src/index.js",
-  "files": [
-    "lib/**/*"
-  ],
-  "scripts": {
-    "prebuild": "rm -rf lib",
-    "build": "tsc"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/imlinhanchao/fishpi-api-package.git"
-  },
-  "license": "MIT",
-  "author": {
-    "name": "Hancel.Lin",
-    "email": "imlinhanchao@foxmail.com",
-    "url": "https://github.com/imlinhanchao"
-  },
-  "engines": {
-    "node": ">=12.0"
-  },
-  "keywords": [],
-  "bugs": {
-    "url": "https://github.com/imlinhanchao/fishpi-api-package/issues"
-  },
-  "homepage": "https://github.com/imlinhanchao/fishpi-api-package#readme",
-  "dependencies": {
-    "axios": "^0.25.0",
-    "form-data": "^4.0.0",
-    "reconnecting-websocket": "^4.4.0",
-    "ws": "^8.4.2"
-  },
-  "devDependencies": {
-    "@types/node": "^12.20.11",
-    "@types/ws": "^8.2.2",
-    "ts-node": "^10.2.1",
-    "typescript": "^4.2.4"
-  },
-  "release": {
-    "branches": [
-      "master"
-    ]
-  }
-}
+{
+  "name": "fishpi",
+  "version": "0.0.7",
+  "description": "A Package to use API of fishpi.",
+  "main": "./lib/src/index.js",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "prebuild": "rm -rf lib",
+    "build": "tsc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/imlinhanchao/fishpi-api-package.git"
+  },
+  "license": "MIT",
+  "author": {
+    "name": "Hancel.Lin",
+    "email": "imlinhanchao@foxmail.com",
+    "url": "https://github.com/imlinhanchao"
+  },
+  "engines": {
+    "node": ">=12.0"
+  },
+  "keywords": [],
+  "bugs": {
+    "url": "https://github.com/imlinhanchao/fishpi-api-package/issues"
+  },
+  "homepage": "https://github.com/imlinhanchao/fishpi-api-package#readme",
+  "dependencies": {
+    "axios": "^0.25.0",
+    "form-data": "^4.0.0",
+    "reconnecting-websocket": "^4.4.0",
+    "ws": "^8.4.2"
+  },
+  "devDependencies": {
+    "@types/node": "^12.20.11",
+    "@types/ws": "^8.2.2",
+    "ts-node": "^10.2.1",
+    "typescript": "^4.2.4"
+  },
+  "release": {
+    "branches": [
+      "master"
+    ]
+  }
+}

package/lib/test/index.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/test/index.js

@@ -1,27 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = __importDefault(require("../src"));
-function test(account) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let fish = new src_1.default();
-        console.dir(yield fish.login(account));
-        console.dir(yield fish.info());
-        fish.chatroom.addListener((ev) => console.dir(ev));
-    });
-}
-test({
-    username: '',
-    passwd: ''
-});