@jayfong/x-server 1.30.1 → 1.30.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.30.2](https://github.com/jfWorks/x-server/compare/v1.30.1...v1.30.2) (2022-05-26)
+
+
+### Bug Fixes
+
+* use lz-string ([bf0e9af](https://github.com/jfWorks/x-server/commit/bf0e9af411c86ebd2b6527fc75be1476559c25fa))
+
 ### [1.30.1](https://github.com/jfWorks/x-server/compare/v1.30.0...v1.30.1) (2022-05-26)
 
 

package/lib/_cjs/client_helper.js

@@ -1,29 +1,26 @@
 "use strict";
 
-exports.__esModule = true;
-exports.XServerClientHelper = void 0;
-
-var _vtils = require("vtils");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 
-var _shorty = require("./utils/shorty");
+exports.__esModule = true;
+exports.processXServerResponse = processXServerResponse;
 
-class XServerClientHelper {
-  static processResponse(data) {
-    // 处理混淆
-    // _#
-    const shortyKey = String.fromCharCode(95) + String.fromCharCode(35);
+var _lzString = _interopRequireDefault(require("lz-string"));
 
-    if (data && typeof data === 'object' && data[shortyKey] != null) {
-      try {
-        data = JSON.parse(new _shorty.Shorty().decode(data[shortyKey]));
-      } catch {}
-    } // 处理数组打包
+var _vtils = require("vtils");
 
+// _#
+const obfuscateKey = [90, 30].map(v => String.fromCharCode(v + 5)).join('');
 
-    data = _vtils.DataPacker.unpackIfNeeded(data);
-    return data;
-  }
+function processXServerResponse(data) {
+  // 处理混淆
+  if (data && typeof data === 'object' && data[obfuscateKey] != null) {
+    try {
+      data = JSON.parse(_lzString.default.decompress(data[obfuscateKey]));
+    } catch {}
+  } // 处理数组打包
 
-}
 
-exports.XServerClientHelper = XServerClientHelper;
+  data = _vtils.DataPacker.unpackIfNeeded(data);
+  return data;
+}

package/lib/_cjs/core/handler.js

@@ -1,16 +1,18 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 exports.__esModule = true;
 exports.Handler = void 0;
 
+var _lzString = _interopRequireDefault(require("lz-string"));
+
 var _vtils = require("vtils");
 
 var _dispose = require("../services/dispose");
 
 var _http_error = require("../core/http_error");
 
-var _shorty = require("../utils/shorty");
-
 var _validator = require("vtils/validator");
 
 class Handler {
@@ -59,7 +61,7 @@ class Handler {
 
       if (this.options.responseDataObfuscate) {
         res = {
-          '_#': new _shorty.Shorty().encode(JSON.stringify(res))
+          '_#': _lzString.default.compress(JSON.stringify(res))
         };
       }
 

package/lib/client_helper.d.ts

@@ -1,3 +1 @@
-export declare class XServerClientHelper {
-    static processResponse<T>(data: any): T;
-}
+export declare function processXServerResponse<T>(data: any): T;

package/lib/client_helper.js

@@ -1,20 +1,16 @@
-import { DataPacker } from 'vtils';
-import { Shorty } from "./utils/shorty";
-export class XServerClientHelper {
-  static processResponse(data) {
-    // 处理混淆
-    // _#
-    const shortyKey = String.fromCharCode(95) + String.fromCharCode(35);
+import LZString from 'lz-string';
+import { DataPacker } from 'vtils'; // _#
 
-    if (data && typeof data === 'object' && data[shortyKey] != null) {
-      try {
-        data = JSON.parse(new Shorty().decode(data[shortyKey]));
-      } catch {}
-    } // 处理数组打包
+const obfuscateKey = [90, 30].map(v => String.fromCharCode(v + 5)).join('');
+export function processXServerResponse(data) {
+  // 处理混淆
+  if (data && typeof data === 'object' && data[obfuscateKey] != null) {
+    try {
+      data = JSON.parse(LZString.decompress(data[obfuscateKey]));
+    } catch {}
+  } // 处理数组打包
 
 
-    data = DataPacker.unpackIfNeeded(data);
-    return data;
-  }
-
+  data = DataPacker.unpackIfNeeded(data);
+  return data;
 }

package/lib/core/handler.js

@@ -1,7 +1,7 @@
+import LZString from 'lz-string';
 import { DataPacker } from 'vtils';
 import { DisposeService } from "../services/dispose";
 import { HttpError } from "../core/http_error";
-import { Shorty } from "../utils/shorty";
 import { yup } from 'vtils/validator';
 export class Handler {
   constructor(options) {
@@ -49,7 +49,7 @@ export class Handler {
 
       if (this.options.responseDataObfuscate) {
         res = {
-          '_#': new Shorty().encode(JSON.stringify(res))
+          '_#': LZString.compress(JSON.stringify(res))
         };
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.30.1",
+  "version": "1.30.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -56,6 +56,7 @@
     "http-errors": "^1.8.1",
     "ioredis": "^4.28.5",
     "jsonwebtoken": "^8.5.1",
+    "lz-string": "^1.4.4",
     "mini-svg-data-uri": "^1.4.4",
     "mint-filter": "^3.0.1",
     "node-ssh": "^12.0.4",
@@ -76,6 +77,7 @@
     "@types/fs-extra": "^9.0.13",
     "@types/ioredis": "^4.28.10",
     "@types/json-schema": "^7.0.11",
+    "@types/lz-string": "^1.3.34",
     "eslint": "^7.32.0",
     "haoma": "^3.6.4",
     "husky": "^4.3.8",

package/lib/_cjs/utils/shorty.js

@@ -1,236 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.Shorty = void 0;
-
-/* eslint-disable */
-// @ts-nocheck
-// https://github.com/enkimute/shorty.js
-function ShortyRaw(tokensize) {
-  this.tokensize = tokensize || 10;
-  this.reset(true);
-}
-
-ShortyRaw.prototype.reset = function (full) {
-  if (full === true) {
-    this.nodes = [{
-      up: 0,
-      weight: 0
-    }];
-    this.nyt = 0;
-    this.nodecount = 0;
-  }
-
-  this.data = '';
-  this.curpos = 0;
-  this.bitCount = 7;
-  this.bitChar = 0;
-};
-
-ShortyRaw.prototype.findNode = function (x) {
-  for (let i = this.nodes.length - 1; i > 0; i--) if (typeof this.nodes[i].symbol != 'undefined' && this.nodes[i].symbol == x) return i;
-
-  return 0;
-};
-
-ShortyRaw.prototype.addNode = function (token) {
-  if (this.nodecount >= 2046) return 0;
-  this.nodes[++this.nodecount] = {
-    up: this.nyt,
-    symbol: token,
-    weight: 1
-  };
-  this.nodes[++this.nodecount] = {
-    up: this.nyt,
-    weight: 0
-  };
-  this.nodes[this.nyt].weight += 1;
-  this.nyt = this.nodecount;
-  if (this.nodes[this.nodecount - 2].up != this.nodecount - 2) this.balanceNode(this.nodes[this.nodecount - 2].up);
-  return this.nodecount - 2;
-};
-
-ShortyRaw.prototype.swapNode = function (a, b) {
-  const t = this.nodes[a].symbol;
-  const u = this.nodes[b].symbol;
-  const v = this.nodes[a].weight;
-  this.nodes[a].symbol = u;
-  this.nodes[b].symbol = t;
-  this.nodes[a].weight = this.nodes[b].weight;
-  this.nodes[b].weight = v;
-
-  for (let n = this.nodes.length - 1; n > 0; n--) if (this.nodes[n].up == a) this.nodes[n].up = b;else if (this.nodes[n].up == b) this.nodes[n].up = a;
-};
-
-ShortyRaw.prototype.balanceNode = function (node) {
-  while (true) {
-    let minnr = node;
-    const weight = this.nodes[node].weight;
-
-    while (minnr > 1 && this.nodes[minnr - 1].weight == weight) minnr--;
-
-    if (minnr != node && minnr != this.nodes[node].up) {
-      this.swapNode(minnr, node);
-      node = minnr;
-    }
-
-    this.nodes[node].weight++;
-    if (this.nodes[node].up == node) return;
-    node = this.nodes[node].up;
-  }
-};
-
-ShortyRaw.prototype.emitNode = function (node) {
-  const emit = [];
-
-  while (node != 0) {
-    emit.unshift(node % 2);
-    node = this.nodes[node].up;
-  }
-
-  for (let e = 0; e < emit.length; e++) this.emitBit(emit[e]);
-};
-
-ShortyRaw.prototype.emitNyt = function (token) {
-  this.emitNode(this.nyt);
-  const ll = token.length - 1;
-  if (this.tokensize > 8) this.emitBit(ll & 8);
-  if (this.tokensize > 4) this.emitBit(ll & 4);
-  if (this.tokensize > 2) this.emitBit(ll & 2);
-  if (this.tokensize > 1) this.emitBit(ll & 1);
-
-  for (let cc = 0; cc < token.length; cc++) this.emitByte(token.charCodeAt(cc));
-
-  return this.nyt;
-};
-
-ShortyRaw.prototype.readNode = function () {
-  if (this.nyt == 0) {
-    var len = (this.tokensize > 8 ? this.readBit() * 8 : 0) + (this.tokensize > 4 ? this.readBit() * 4 : 0) + (this.tokensize > 2 ? this.readBit() * 2 : 0) + (this.tokensize > 1 ? this.readBit() : 0) + 1;
-    var stream = '';
-
-    while (len--) stream += this.readByte();
-
-    return stream;
-  }
-
-  let node = 0;
-
-  while (true) {
-    const bit = this.readBit();
-    if (this.nodes[node].symbol == undefined) for (let m = 0;; m++) if (this.nodes[m].up == node && m != node && m % 2 == bit) {
-      node = m;
-      break;
-    }
-
-    if (this.nodes[node].symbol != undefined || this.nodes[node].weight == 0) {
-      if (this.nodes[node].weight) return this.nodes[node].symbol;
-      var len = (this.tokensize > 8 ? this.readBit() * 8 : 0) + (this.tokensize > 4 ? this.readBit() * 4 : 0) + (this.tokensize > 2 ? this.readBit() * 2 : 0) + (this.tokensize > 1 ? this.readBit() : 0) + 1;
-      var stream = '';
-
-      while (len--) stream += this.readByte();
-
-      return stream;
-    }
-  }
-};
-
-ShortyRaw.prototype.emitBit = function (bit) {
-  if (bit) this.bitChar += 1 << this.bitCount;
-
-  if (--this.bitCount < 0) {
-    this.data += String.fromCharCode(this.bitChar);
-    this.bitCount = 7;
-    this.bitChar = 0;
-  }
-};
-
-ShortyRaw.prototype.emitByte = function (byte) {
-  for (let i = 7; i >= 0; i--) {
-    this.emitBit(byte >> i & 1);
-  }
-};
-
-ShortyRaw.prototype.readBit = function () {
-  if (this.curpos == this.data.length * 8) throw 'done';
-  const bit = this.data.charCodeAt(this.curpos >> 3) >> (7 - this.curpos & 7) & 1;
-  this.curpos++;
-  return bit;
-};
-
-ShortyRaw.prototype.readByte = function () {
-  res = 0;
-
-  for (let i = 0; i < 8; i++) res += (128 >> i) * this.readBit();
-
-  return String.fromCharCode(res);
-};
-
-ShortyRaw.prototype.deflate = function (data) {
-  let token,
-      l = data.length,
-      i,
-      x;
-  this.reset();
-
-  for (i = 0; i < l; i++) {
-    token = data[i];
-
-    if (this.tokensize > 1) {
-      if (/[a-zA-Z]/.test(token)) while (i + 1 < l && token.length < this.tokensize && /[a-zA-Z]/.test(data[i + 1])) {
-        token += data[++i];
-      } else if (/[=\[\],\.:\"'\{\}]/.test(token)) while (i + 1 < l && token.length < this.tokensize && /[=\[\],\.:\"'\{\}]/.test(data[i + 1])) {
-        i++;
-        token += data[i];
-      } //joe hl patch "
-    }
-
-    x = this.findNode(token);
-
-    if (!x) {
-      this.emitNyt(token);
-      x = this.addNode(token);
-    } else {
-      this.emitNode(x);
-      this.balanceNode(x);
-    }
-  }
-
-  if (this.bitCount != 7) {
-    const oldlength = this.data.length;
-    this.emitNode(this.nyt);
-    if (oldlength == this.data.length) this.emitByte(0);
-  }
-
-  return this.data;
-};
-
-ShortyRaw.prototype.inflate = function (data) {
-  this.reset();
-  this.data = data;
-  let output = '';
-
-  try {
-    for (let i = 0; i >= 0; i++) {
-      const token = this.readNode();
-      output += token;
-      const node = this.findNode(token);
-      if (!node) this.addNode(token);else this.balanceNode(node);
-    }
-  } catch (e) {}
-
-  return output;
-};
-
-class Shorty extends ShortyRaw {
-  encode(data) {
-    return this.deflate(data);
-  }
-
-  decode(data) {
-    return this.inflate(data);
-  }
-
-}
-
-exports.Shorty = Shorty;

package/lib/utils/shorty.d.ts

@@ -1,6 +0,0 @@
-declare function ShortyRaw(tokensize: any): void;
-export declare class Shorty extends ShortyRaw {
-    encode(data: string): string;
-    decode(data: string): string;
-}
-export {};

package/lib/utils/shorty.js

@@ -1,229 +0,0 @@
-/* eslint-disable */
-// @ts-nocheck
-// https://github.com/enkimute/shorty.js
-function ShortyRaw(tokensize) {
-  this.tokensize = tokensize || 10;
-  this.reset(true);
-}
-
-ShortyRaw.prototype.reset = function (full) {
-  if (full === true) {
-    this.nodes = [{
-      up: 0,
-      weight: 0
-    }];
-    this.nyt = 0;
-    this.nodecount = 0;
-  }
-
-  this.data = '';
-  this.curpos = 0;
-  this.bitCount = 7;
-  this.bitChar = 0;
-};
-
-ShortyRaw.prototype.findNode = function (x) {
-  for (let i = this.nodes.length - 1; i > 0; i--) if (typeof this.nodes[i].symbol != 'undefined' && this.nodes[i].symbol == x) return i;
-
-  return 0;
-};
-
-ShortyRaw.prototype.addNode = function (token) {
-  if (this.nodecount >= 2046) return 0;
-  this.nodes[++this.nodecount] = {
-    up: this.nyt,
-    symbol: token,
-    weight: 1
-  };
-  this.nodes[++this.nodecount] = {
-    up: this.nyt,
-    weight: 0
-  };
-  this.nodes[this.nyt].weight += 1;
-  this.nyt = this.nodecount;
-  if (this.nodes[this.nodecount - 2].up != this.nodecount - 2) this.balanceNode(this.nodes[this.nodecount - 2].up);
-  return this.nodecount - 2;
-};
-
-ShortyRaw.prototype.swapNode = function (a, b) {
-  const t = this.nodes[a].symbol;
-  const u = this.nodes[b].symbol;
-  const v = this.nodes[a].weight;
-  this.nodes[a].symbol = u;
-  this.nodes[b].symbol = t;
-  this.nodes[a].weight = this.nodes[b].weight;
-  this.nodes[b].weight = v;
-
-  for (let n = this.nodes.length - 1; n > 0; n--) if (this.nodes[n].up == a) this.nodes[n].up = b;else if (this.nodes[n].up == b) this.nodes[n].up = a;
-};
-
-ShortyRaw.prototype.balanceNode = function (node) {
-  while (true) {
-    let minnr = node;
-    const weight = this.nodes[node].weight;
-
-    while (minnr > 1 && this.nodes[minnr - 1].weight == weight) minnr--;
-
-    if (minnr != node && minnr != this.nodes[node].up) {
-      this.swapNode(minnr, node);
-      node = minnr;
-    }
-
-    this.nodes[node].weight++;
-    if (this.nodes[node].up == node) return;
-    node = this.nodes[node].up;
-  }
-};
-
-ShortyRaw.prototype.emitNode = function (node) {
-  const emit = [];
-
-  while (node != 0) {
-    emit.unshift(node % 2);
-    node = this.nodes[node].up;
-  }
-
-  for (let e = 0; e < emit.length; e++) this.emitBit(emit[e]);
-};
-
-ShortyRaw.prototype.emitNyt = function (token) {
-  this.emitNode(this.nyt);
-  const ll = token.length - 1;
-  if (this.tokensize > 8) this.emitBit(ll & 8);
-  if (this.tokensize > 4) this.emitBit(ll & 4);
-  if (this.tokensize > 2) this.emitBit(ll & 2);
-  if (this.tokensize > 1) this.emitBit(ll & 1);
-
-  for (let cc = 0; cc < token.length; cc++) this.emitByte(token.charCodeAt(cc));
-
-  return this.nyt;
-};
-
-ShortyRaw.prototype.readNode = function () {
-  if (this.nyt == 0) {
-    var len = (this.tokensize > 8 ? this.readBit() * 8 : 0) + (this.tokensize > 4 ? this.readBit() * 4 : 0) + (this.tokensize > 2 ? this.readBit() * 2 : 0) + (this.tokensize > 1 ? this.readBit() : 0) + 1;
-    var stream = '';
-
-    while (len--) stream += this.readByte();
-
-    return stream;
-  }
-
-  let node = 0;
-
-  while (true) {
-    const bit = this.readBit();
-    if (this.nodes[node].symbol == undefined) for (let m = 0;; m++) if (this.nodes[m].up == node && m != node && m % 2 == bit) {
-      node = m;
-      break;
-    }
-
-    if (this.nodes[node].symbol != undefined || this.nodes[node].weight == 0) {
-      if (this.nodes[node].weight) return this.nodes[node].symbol;
-      var len = (this.tokensize > 8 ? this.readBit() * 8 : 0) + (this.tokensize > 4 ? this.readBit() * 4 : 0) + (this.tokensize > 2 ? this.readBit() * 2 : 0) + (this.tokensize > 1 ? this.readBit() : 0) + 1;
-      var stream = '';
-
-      while (len--) stream += this.readByte();
-
-      return stream;
-    }
-  }
-};
-
-ShortyRaw.prototype.emitBit = function (bit) {
-  if (bit) this.bitChar += 1 << this.bitCount;
-
-  if (--this.bitCount < 0) {
-    this.data += String.fromCharCode(this.bitChar);
-    this.bitCount = 7;
-    this.bitChar = 0;
-  }
-};
-
-ShortyRaw.prototype.emitByte = function (byte) {
-  for (let i = 7; i >= 0; i--) {
-    this.emitBit(byte >> i & 1);
-  }
-};
-
-ShortyRaw.prototype.readBit = function () {
-  if (this.curpos == this.data.length * 8) throw 'done';
-  const bit = this.data.charCodeAt(this.curpos >> 3) >> (7 - this.curpos & 7) & 1;
-  this.curpos++;
-  return bit;
-};
-
-ShortyRaw.prototype.readByte = function () {
-  res = 0;
-
-  for (let i = 0; i < 8; i++) res += (128 >> i) * this.readBit();
-
-  return String.fromCharCode(res);
-};
-
-ShortyRaw.prototype.deflate = function (data) {
-  let token,
-      l = data.length,
-      i,
-      x;
-  this.reset();
-
-  for (i = 0; i < l; i++) {
-    token = data[i];
-
-    if (this.tokensize > 1) {
-      if (/[a-zA-Z]/.test(token)) while (i + 1 < l && token.length < this.tokensize && /[a-zA-Z]/.test(data[i + 1])) {
-        token += data[++i];
-      } else if (/[=\[\],\.:\"'\{\}]/.test(token)) while (i + 1 < l && token.length < this.tokensize && /[=\[\],\.:\"'\{\}]/.test(data[i + 1])) {
-        i++;
-        token += data[i];
-      } //joe hl patch "
-    }
-
-    x = this.findNode(token);
-
-    if (!x) {
-      this.emitNyt(token);
-      x = this.addNode(token);
-    } else {
-      this.emitNode(x);
-      this.balanceNode(x);
-    }
-  }
-
-  if (this.bitCount != 7) {
-    const oldlength = this.data.length;
-    this.emitNode(this.nyt);
-    if (oldlength == this.data.length) this.emitByte(0);
-  }
-
-  return this.data;
-};
-
-ShortyRaw.prototype.inflate = function (data) {
-  this.reset();
-  this.data = data;
-  let output = '';
-
-  try {
-    for (let i = 0; i >= 0; i++) {
-      const token = this.readNode();
-      output += token;
-      const node = this.findNode(token);
-      if (!node) this.addNode(token);else this.balanceNode(node);
-    }
-  } catch (e) {}
-
-  return output;
-};
-
-export class Shorty extends ShortyRaw {
-  encode(data) {
-    return this.deflate(data);
-  }
-
-  decode(data) {
-    return this.inflate(data);
-  }
-
-}