@hieuzest/koishi-plugin-riichi-city 0.5.4 → 0.5.6

package/lib/api.d.ts

@@ -12,9 +12,9 @@ interface Cipher<S = any, T = any> {
     decrypt(data: T): S;
 }
 declare namespace Cipher {
-    class NoneCipher implements Cipher {
-        encrypt(data: any): any;
-        decrypt(data: string): string;
+    class NoneCipher<S> implements Cipher<S, string> {
+        encrypt(data: S): string;
+        decrypt(data: string): S;
     }
     class Aes128CbcCipher<S> implements Cipher<S, string> {
         private key;

package/lib/api.js

@@ -68,10 +68,10 @@ var Cipher;
       __name(this, "NoneCipher");
     }
     encrypt(data) {
-      return data;
+      return JSON.stringify(data);
     }
     decrypt(data) {
-      return data;
+      return JSON.parse(data);
     }
   }
   Cipher2.NoneCipher = NoneCipher;
@@ -85,7 +85,7 @@ var Cipher;
     }
     encrypt(data) {
       const cipher = crypto.createCipheriv("aes-256-cbc", this.key, this.iv);
-      return Buffer.concat([cipher.update(JSON.stringify(data)), cipher.final()]).toString("base64");
+      return Buffer.concat([cipher.update(Buffer.from(JSON.stringify(data))), cipher.final()]).toString("base64");
     }
     decrypt(data) {
       const cipher = crypto.createDecipheriv("aes-256-cbc", this.key, this.iv);
@@ -136,7 +136,7 @@ var RiichiCityApi = class _RiichiCityApi {
   cipher;
   user;
   _update() {
-    this.headers.cookies = this.config.cipherType === "none" ? JSON.stringify(this.cookie) : this.cipher.encrypt(this.cookie);
+    this.headers.cookies = this.cipher.encrypt(this.cookie);
     this.http.config.headers = this.headers;
   }
   _handleError(res) {
@@ -150,8 +150,12 @@ var RiichiCityApi = class _RiichiCityApi {
         this._update();
         path = "/";
       }
-      return await this.http.post(path, this.cipher.encrypt(data)).then((res) => {
-        res = this.cipher.decrypt(res);
+      return await this.http("POST", path, {
+        data: this.cipher.encrypt(data),
+        responseType: "text",
+        proxyAgent: void 0
+      }).then((resp) => {
+        const res = this.cipher.decrypt(resp.data);
         this._handleError(res);
         return res;
       });

package/lib/index.js

@@ -49,6 +49,7 @@ var import_api2 = require("./api");
 
 // src/dhs.ts
 var import_koishi = require("koishi");
+var import_koishi_utils = require("@hieuzest/koishi-utils");
 var import_lobby = require("./lobby");
 var RiichiCityDHS = class extends import_koishi.Service {
   constructor(ctx, config) {
@@ -241,7 +242,7 @@ ${config.extraHelp}`.trim();
       if (!contestId) return;
       if (!this.checkPermission(session)) return;
       args = import_koishi.h.unescape(args);
-      const argsList = args.split(/\s|,|，|\|\|/).filter((x) => x);
+      const argsList = (0, import_koishi_utils.splitBackslashEscapedArgs)(args);
       const players = [];
       const c = await this.getDHS(contestId);
       if (!c) return "大会室未找到";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hieuzest/koishi-plugin-riichi-city",
   "description": "",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -26,6 +26,9 @@
   "peerDependencies": {
     "koishi": "^4.17.8"
   },
+  "dependencies": {
+    "@hieuzest/koishi-utils": "^1.0.0"
+  },
   "koishi": {
     "service": {
       "implements": [