@jayfong/x-server 1.28.1 → 1.30.0

package/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 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.0](https://github.com/jfWorks/x-server/compare/v1.29.0...v1.30.0) (2022-05-26)
+
+
+### Features
+
+* add responseDataObfuscate ([2f1a70d](https://github.com/jfWorks/x-server/commit/2f1a70dae70c4359fbb6430ce5391f9d80ec0d17))
+* client_helper ([00146d1](https://github.com/jfWorks/x-server/commit/00146d133167ba8f535bff2acef4ef33412678ba))
+
+## [1.29.0](https://github.com/jfWorks/x-server/compare/v1.28.2...v1.29.0) (2022-05-19)
+
+
+### Features
+
+* jwt sign support ttl ([2e2958f](https://github.com/jfWorks/x-server/commit/2e2958f564b779838a9ca13a1b8cebc4e2a9bb59))
+
+### [1.28.2](https://github.com/jfWorks/x-server/compare/v1.28.1...v1.28.2) (2022-05-16)
+
+
+### Bug Fixes
+
+* rhel-openssl-1.1.x ([c2a752a](https://github.com/jfWorks/x-server/commit/c2a752a2c06e8a1e37c3c72154d5f21d801de8a2))
+
 ### [1.28.1](https://github.com/jfWorks/x-server/compare/v1.28.0...v1.28.1) (2022-05-16)
 
 

package/lib/_cjs/cli/build_util.js

@@ -136,6 +136,7 @@ class BuildUtil {
 
       await _fsExtra.default.copyFile(prismaSchemaFile, distPrismaSchemaFile);
       await _fsExtra.default.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.0.x.so.node'), _nodePath.default.join(distDir, 'libquery_engine-rhel-openssl-1.0.x.so.node'));
+      await _fsExtra.default.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.1.x.so.node'), _nodePath.default.join(distDir, 'libquery_engine-rhel-openssl-1.1.x.so.node'));
     } // 写入 pkg
 
 

package/lib/_cjs/client_helper.js

@@ -0,0 +1,29 @@
+"use strict";
+
+exports.__esModule = true;
+exports.XServerClientHelper = void 0;
+
+var _vtils = require("vtils");
+
+var _shorty = require("./utils/shorty");
+
+class XServerClientHelper {
+  static processResponse(data) {
+    // 处理混淆
+    // _#
+    const shortyKey = String.fromCharCode(95) + String.fromCharCode(35);
+
+    if (data && typeof data === 'object' && data[shortyKey] != null) {
+      try {
+        data = JSON.parse(new _shorty.Shorty().decode(data[shortyKey]));
+      } catch {}
+    } // 处理数组打包
+
+
+    data = _vtils.DataPacker.unpackIfNeeded(data);
+    return data;
+  }
+
+}
+
+exports.XServerClientHelper = XServerClientHelper;

package/lib/_cjs/core/handler.js

@@ -9,6 +9,8 @@ var _dispose = require("../services/dispose");
 
 var _http_error = require("../core/http_error");
 
+var _shorty = require("../utils/shorty");
+
 var _validator = require("vtils/validator");
 
 class Handler {
@@ -52,6 +54,13 @@ class Handler {
 
       if (this.options.responseDataPack) {
         res = _vtils.DataPacker.packAsRawType(res);
+      } // 混淆返回数据
+
+
+      if (this.options.responseDataObfuscate) {
+        res = {
+          '_#': new _shorty.Shorty().encode(JSON.stringify(res))
+        };
       }
 
       return res == null ? {} : res;

package/lib/_cjs/services/jwt.js

@@ -17,9 +17,9 @@ class JwtService {
     this.serviceName = 'jwt';
   }
 
-  sign(payload) {
+  sign(payload, ttl = this.options.ttl) {
     return _jsonwebtoken.default.sign(payload, this.options.secret, {
-      expiresIn: (0, _date.ms)(this.options.ttl, true)
+      expiresIn: (0, _date.ms)(ttl, true)
     });
   }
 

package/lib/_cjs/utils/shorty.js

@@ -0,0 +1,236 @@
+"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.inflate(data);
+  }
+
+  decode(data) {
+    return this.deflate(data);
+  }
+
+}
+
+exports.Shorty = Shorty;

package/lib/cli/build_util.js

@@ -110,6 +110,7 @@ export class BuildUtil {
       const distPrismaSchemaFile = path.join(distDir, 'schema.prisma');
       await fs.copyFile(prismaSchemaFile, distPrismaSchemaFile);
       await fs.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.0.x.so.node'), path.join(distDir, 'libquery_engine-rhel-openssl-1.0.x.so.node'));
+      await fs.copyFile(require.resolve('@prisma/engines/libquery_engine-rhel-openssl-1.1.x.so.node'), path.join(distDir, 'libquery_engine-rhel-openssl-1.1.x.so.node'));
     } // 写入 pkg
 
 

package/lib/client_helper.d.ts

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

package/lib/client_helper.js

@@ -0,0 +1,20 @@
+import { DataPacker } from 'vtils';
+import { Shorty } from "./utils/shorty";
+export class XServerClientHelper {
+  static processResponse(data) {
+    // 处理混淆
+    // _#
+    const shortyKey = String.fromCharCode(95) + String.fromCharCode(35);
+
+    if (data && typeof data === 'object' && data[shortyKey] != null) {
+      try {
+        data = JSON.parse(new Shorty().decode(data[shortyKey]));
+      } catch {}
+    } // 处理数组打包
+
+
+    data = DataPacker.unpackIfNeeded(data);
+    return data;
+  }
+
+}

package/lib/core/handler.js

@@ -1,6 +1,7 @@
 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) {
@@ -43,6 +44,13 @@ export class Handler {
 
       if (this.options.responseDataPack) {
         res = DataPacker.packAsRawType(res);
+      } // 混淆返回数据
+
+
+      if (this.options.responseDataObfuscate) {
+        res = {
+          '_#': new Shorty().encode(JSON.stringify(res))
+        };
       }
 
       return res == null ? {} : res;

package/lib/core/types.d.ts

@@ -111,6 +111,12 @@ export declare namespace XHandler {
          * @default false
          */
         responseDataPack?: boolean;
+        /**
+         * 是否混淆返回数据
+         *
+         * @default false
+         */
+        responseDataObfuscate?: boolean;
         /**
          * 响应的 Content-Type 头
          */

package/lib/services/jwt.d.ts

@@ -10,7 +10,7 @@ export declare class JwtService implements BaseService {
     private options;
     serviceName: string;
     constructor(options: JwtServiceOptions);
-    sign<T extends Record<string, any>>(payload: T): string;
+    sign<T extends Record<string, any>>(payload: T, ttl?: MsValue): string;
     verify<T extends Record<string, any>>(token: string): Promise<T>;
     verifyFromHttpHeaders<T extends Record<string, any>>(headers: IncomingHttpHeaders): Promise<T>;
 }

package/lib/services/jwt.js

@@ -7,9 +7,9 @@ export class JwtService {
     this.serviceName = 'jwt';
   }
 
-  sign(payload) {
+  sign(payload, ttl = this.options.ttl) {
     return jwt.sign(payload, this.options.secret, {
-      expiresIn: ms(this.options.ttl, true)
+      expiresIn: ms(ttl, true)
     });
   }
 

package/lib/utils/shorty.d.ts

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,229 @@
+/* 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.inflate(data);
+  }
+
+  decode(data) {
+    return this.deflate(data);
+  }
+
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "1.28.1",
+  "version": "1.30.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -16,7 +16,7 @@
     "bootstrap": "tyn --frozen-lockfile",
     "build": "haoma compile",
     "dev": "rm -rf lib && tsc -w -p ./tsconfig.build.json",
-    "release": "tyn test && standard-version -a && tyn build && npm publish && git push --follow-tags origin master",
+    "release": "tyn test && standard-version -a && tyn build && npm publish && haoma run ./scripts/publish_client_helper_package.ts && git push --follow-tags origin master",
     "test": "tsc --noEmit && jest",
     "updeps": "tnpx npm-check-updates --target minor --upgrade"
   },