feat: cipher secret configurable

.gitignore

@@ -78,6 +78,7 @@ assembly/
 mocks_data/proxy/**/__*
 tms
 coverage
+.nyc_output
 
 ############################
 # visual studio code settings

.travis.yml

@@ -1,15 +1,20 @@
 language: node_js
-services:
-  - mysql
 node_js:
   - "8"
   - "9"
   - "10"
+services:
+  - mysql
+before_install:
+  - sudo mysql < ./packages/sandbox-core/test/fixtures/sql/initDB.sql 2>&1
+  - export TZ=Asia/Shanghai
 install:
   - npm i
   - npm i codecov
 before_script:
-  - lerna bootstrap --no-ci
-  - lerna run build
+  - npm run bootstrap
+  - npm run build
 script:
   - npm run cov
+after_script:
+  - codecov

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.0.1"
+  "version": "0.0.2"
 }

package.json

@@ -2,10 +2,21 @@
   "name": "sandbox",
   "private": true,
   "devDependencies": {
+    "nyc": "^11.2.1",
     "git-hooks": "^1.1.10",
     "lerna": "^3.4.0"
   },
+  "nyc": {
+    "reporter": [
+      "text",
+      "json",
+      "html",
+      "lcovonly"
+    ]
+  },
   "scripts": {
-    "build": "lerna run build"
+    "bootstrap": "lerna bootstrap --no-ci",
+    "build": "lerna run build",
+    "cov": "sh scripts/cov.sh"
   }
 }

packages/sandbox-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sandbox-core",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "dependencies": {
@@ -13,7 +13,7 @@
     "mysql2": "^1.5.3",
     "sequelize": "^4.39.0",
     "urllib": "^2.29.0",
-    "ws": "^6.0.0"
+    "ws": "^1.1.5"
   },
   "devDependencies": {
     "@types/chai": "^4.1.4",
@@ -28,6 +28,8 @@
     "@types/urllib": "^2.28.0",
     "chai": "^3.5.0",
     "midway-bin": "^0.3.8",
+    "midway-mock": "^0.4.2",
+    "mm": "^2.4.1",
     "mocha": "^3.5.0",
     "nyc": "^11.2.1",
     "ts-node": "^4.1.0",
@@ -38,7 +40,8 @@
     "prepublishOnly": "npm run build",
     "lint": "tslint --fix -p .",
     "build": "npm run lint && rm -rf ./dist && tsc",
-    "test": "midway-bin test --ts"
+    "test": "midway-bin test --ts",
+    "cov": "midway-bin cov --ts"
   },
   "files": [
     "dist",

packages/sandbox-core/src/core/debugServer/cipher.ts

@@ -1,26 +1,38 @@
 import crypto = require('crypto');
-const secret = 'midway_sandbox';
+import { provide, async, scope, ScopeEnum, config } from 'midway-mirror';
 
+@scope(ScopeEnum.Singleton)
+@async()
+@provide()
 export class Cipher {
 
-  static encrypt(value: string) {
-    if ('string' !== typeof value) {
-      throw new Error('value required');
-    }
-    const cipher = crypto.createCipher('des', secret);
+  @config('cipher')
+  config;
+
+  encrypt(value: string) {
+    this.paramCheck(value);
+    const cipher = crypto.createCipher('des', this.config.secret);
     return cipher.update(value, 'utf8', 'hex') + cipher.final('hex');
   }
 
-  static decrypt(value: string) {
-    if ('string' !== typeof value) {
-      throw new Error('value required');
-    }
+  decrypt(value: string) {
+    this.paramCheck(value);
     try {
-      const decipher = crypto.createDecipher('des', secret);
+      const decipher = crypto.createDecipher('des', this.config.secret);
       return decipher.update(value, 'hex', 'utf8') + decipher.final('utf8');
     } catch (e) {
       return '';
     }
   }
 
+  private paramCheck(value: string) {
+    if ('string' !== typeof value) {
+      throw new Error('value required');
+    }
+    // 必须 在 config 中配置 cipher.secret
+    if (!this.config.secret) {
+      throw new Error('cipher secret config required');
+    }
+  }
+
 }

packages/sandbox-core/src/core/debugServer/debugServer.ts

@@ -5,16 +5,21 @@ import WebSocket = require('ws');
 import {Server as WebSocketServer} from 'ws';
 import urllib = require('urllib');
 import {Server as HTTPServer} from 'http';
+import { provide, inject, autowire } from 'midway-mirror';
 import {Cipher} from './cipher';
 
+@provide()
+@autowire(false)
 export class DebugServer extends EventEmitter {
 
+  @inject()
+  cipher: Cipher;
+
   private httpServer: HTTPServer;
   private wsServer: WebSocketServer;
   private logger = console;
 
-  public constructor (server) {
-    super();
+  public setServer(server) {
     this.httpServer = server;
   }
 
@@ -36,16 +41,16 @@ export class DebugServer extends EventEmitter {
 
     try {
 
-      const url = request.url;
+      const upgradeReq = socket.upgradeReq;
+      const url = upgradeReq.url;
       if (!url.startsWith('/remoteDebug')) {
         socket.terminate();
         return;
       }
-
       socket.pause();
       const query = QueryString.parse(Url.parse(url).query);
       const tokenRaw: string = query.token as any;
-      const info = JSON.parse(Cipher.decrypt(tokenRaw));
+      const info = JSON.parse(this.cipher.decrypt(tokenRaw));
       info.host = info.ip;
 
       this.logger.log('ws', url);

packages/sandbox-core/src/core/manager/errorManager.ts

@@ -121,6 +121,7 @@ export class ErrorManager {
       attributes: [['log_path', 'path']],
       where: { [Sequelize.Op.and]: required },
       group: ['path'],
+      raw: true,
     };
     return this.errorModel.findAll(conditions);
   }
@@ -133,20 +134,23 @@ export class ErrorManager {
       ],
       where: { [Sequelize.Op.and]: required },
       group: ['errType'],
+      raw: true,
     };
     return this.errorModel.findAll(conditions);
   }
 
   private findErrorTypeDist(required: object[]) {
+    const downSampling = Sequelize.literal('(unix_timestamp - unix_timestamp % 60)');
     const conditions: SearchCondition = {
       attributes: [
         ['error_type', 'errType'],
         [Sequelize.fn('COUNT', Sequelize.literal('*')), 'cnt'],
-        [Sequelize.literal('(unix_timestamp - unix_timestamp % 60)'), 'timestamp'],
+        [downSampling, 'timestamp'],
       ],
       where: { [Sequelize.Op.and]: required },
-      group: ['timestamp', 'errType'],
+      group: [downSampling, 'errType'],
       order: [['timestamp', 'DESC']],
+      raw: true,
     };
     return this.errorModel.findAll(conditions);
   }

packages/sandbox-core/src/core/model/dw/sandboxGalaxySlsTraces.ts

@@ -41,65 +41,39 @@ export async function factory(context: IApplicationContext) {
       type: Sequelize.TEXT,
       field: 'trace_name',
     },
+    traceSpans: {
+      type: Sequelize.TEXT,
+      field: 'trace_spans',
+    },
     traceId: {
       type: Sequelize.STRING(256),
       field: 'trace_id',
     },
-    uuid: {
-      type: Sequelize.STRING(256),
-      allowNull: false,
-    },
-    spanName: {
-      type: Sequelize.STRING(512),
-      field: 'span_name',
-    },
-    spanTimestamp: {
-      type: Sequelize.STRING(128),
-      field: 'span_timestamp',
-    },
-    spanDuration: {
+    traceDuration: {
       type: Sequelize.INTEGER,
-      field: 'span_duration',
-    },
-    spanError: {
-      type: Sequelize.INTEGER(4),
-      allowNull: true,
-      defaultValue: 0,
-      field: 'span_error',
+      field: 'trace_duration',
     },
-    spanType: {
+    traceStatus: {
       type: Sequelize.INTEGER,
-      field: 'span_type',
-    },
-    spanMethod: {
-      type: Sequelize.STRING(128),
-      field: 'span_method',
-    },
-    spanTarget: {
-      type: Sequelize.TEXT,
-      field: 'span_target',
+      field: 'trace_status',
+      defaultValue: 1,
     },
-    spanCode: {
-      type: Sequelize.STRING(128),
-      field: 'span_code',
-    },
-    spanTags: {
-      type: Sequelize.TEXT,
-      field: 'span_tags',
+    uuid: {
+      type: Sequelize.STRING(256),
+      allowNull: false,
     },
-    spanId: {
-      type: Sequelize.STRING(128),
-      field: 'span_id',
+    unixTimestamp: {
+      type: Sequelize.BIGINT,
+      field: 'unix_timestamp',
     },
-    spanRpcId: {
-      type: Sequelize.STRING(128),
-      field: 'span_rpcid',
+    version: {
+      type: Sequelize.INTEGER,
     },
   }, {
     timestamps: false,
     underscored: false,
     freezeTableName: true,
-    tableName: 'sandbox_galaxy_sls_trace_nodes',
+    tableName: 'sandbox_galaxy_sls_traces',
   });
 
   SLSTraceModel.removeAttribute('id');

packages/sandbox-core/src/core/service/remoteDebugService.ts

@@ -14,6 +14,9 @@ export class RemoteDebugService implements IRemoteDebugService {
   @inject('privilegeAdapter')
   privilegeAdapter: IPrivilegeAdapter;
 
+  @inject()
+  cipher: Cipher;
+
   async getDebuggableHost(options: HostSelector & AppSelector & UserSelector): Promise<DebuggableHost> {
     const {scope, scopeName, uid} = options;
     const hasPermission = await this.privilegeAdapter.isAppOps(scope, scopeName, uid);
@@ -22,7 +25,7 @@ export class RemoteDebugService implements IRemoteDebugService {
     }
     const debuggableProcesses = await this.pandoraAdapter.getDebuggableProcesses(options);
     for (const process of debuggableProcesses) {
-      process.token = Cipher.encrypt(JSON.stringify({
+      process.token = this.cipher.encrypt(JSON.stringify({
         debugPort: process.debugPort,
         ip: options.ip,
         webSocketDebuggerUrl: process.webSocketDebuggerUrl,