Browse Source

test for log

gemercheung 3 years ago
parent
commit
b6a12f91f8
4 changed files with 119 additions and 110 deletions
  1. 102 102
      package.json
  2. 5 5
      src/logConfig.ts
  3. 4 3
      src/meta.gateway.ts
  4. 8 0
      src/scene/scene.service.ts

+ 102 - 102
package.json

@@ -1,102 +1,102 @@
-{
-  "name": "meta-server",
-  "version": "0.0.1",
-  "description": "",
-  "author": "",
-  "private": true,
-  "license": "UNLICENSED",
-  "scripts": {
-    "prebuild": "rimraf dist",
-    "build": "cross-env NODE_ENV=production nest build",
-    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"libs/**/*.ts\"",
-    "start": "cross-env NODE_ENV=development nest start",
-    "start:dev": "cross-env NODE_ENV=development nest start --watch",
-    "start:debug": "cross-env NODE_ENV=development nest start --debug 0.0.0.0:9229 --watch",
-    "start:prod": "cross-env NODE_ENV=production node dist/main",
-    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:cov": "jest --coverage",
-    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
-    "test:e2e": "jest --config ./test/jest-e2e.json"
-  },
-  "dependencies": {
-    "@grpc/grpc-js": "^1.6.7",
-    "@grpc/proto-loader": "^0.6.12",
-    "@nestjs/bull": "^0.5.5",
-    "@nestjs/common": "^8.0.0",
-    "@nestjs/config": "^2.0.0",
-    "@nestjs/core": "^8.0.0",
-    "@nestjs/microservices": "^8.4.4",
-    "@nestjs/platform-express": "^8.0.0",
-    "@nestjs/platform-socket.io": "^8.4.4",
-    "@nestjs/platform-ws": "^8.4.4",
-    "@nestjs/websockets": "^8.4.4",
-    "ajv": "^8.11.0",
-    "buffer": "^6.0.3",
-    "bull": "^4.8.3",
-    "js-yaml": "^4.1.0",
-    "multistream": "^4.1.0",
-    "nest-winston": "^1.6.2",
-    "nestjs-redis": "git+https://github.com/GyanendroKh/nestjs-redis.git#nest8-fix",
-    "node-datachannel": "^0.3.2",
-    "redis": "^4",
-    "reflect-metadata": "^0.1.13",
-    "rimraf": "^3.0.2",
-    "rx-queue": "^1.0.5",
-    "rxjs": "^7.2.0",
-    "stream-buffers": "^3.0.2",
-    "winston": "^3.7.2"
-  },
-  "devDependencies": {
-    "@nestjs/cli": "^8.0.0",
-    "@nestjs/schematics": "^8.0.0",
-    "@nestjs/testing": "^8.0.0",
-    "@types/bull": "^3.15.8",
-    "@types/express": "^4.17.13",
-    "@types/jest": "27.4.1",
-    "@types/js-yaml": "^4.0.5",
-    "@types/node": "^16.0.0",
-    "@types/supertest": "^2.0.11",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "cross-env": "^7.0.3",
-    "eslint": "^8.0.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^4.0.0",
-    "jest": "^27.2.5",
-    "prettier": "^2.3.2",
-    "rollup-plugin-string": "^3.0.0",
-    "source-map-support": "^0.5.20",
-    "supertest": "^6.1.3",
-    "ts-jest": "^27.0.3",
-    "ts-loader": "^9.2.3",
-    "ts-node": "^10.0.0",
-    "tsconfig-paths": "^3.10.1",
-    "typescript": "^4.3.5"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "json",
-      "ts"
-    ],
-    "rootDir": ".",
-    "testRegex": ".*\\.spec\\.ts$",
-    "transform": {
-      "^.+\\.(t|j)s$": "ts-jest"
-    },
-    "collectCoverageFrom": [
-      "**/*.(t|j)s"
-    ],
-    "coverageDirectory": "./coverage",
-    "testEnvironment": "node",
-    "roots": [
-      "<rootDir>/src/",
-      "<rootDir>/libs/"
-    ],
-    "moduleNameMapper": {
-      "^@app/utils(|/.*)$": "<rootDir>/libs/utils/src/$1"
-    }
-  }
-}
+{
+  "name": "meta-server",
+  "version": "0.0.1",
+  "description": "",
+  "author": "",
+  "private": true,
+  "license": "UNLICENSED",
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "cross-env NODE_ENV=production nest build",
+    "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\" \"libs/**/*.ts\"",
+    "start": "cross-env NODE_ENV=development nest start",
+    "start:dev": "cross-env NODE_ENV=development nest start --watch",
+    "start:debug": "cross-env NODE_ENV=development nest start --debug 0.0.0.0:9229 --watch",
+    "start:prod": "cross-env NODE_ENV=production node dist/main",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:cov": "jest --coverage",
+    "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
+    "test:e2e": "jest --config ./test/jest-e2e.json"
+  },
+  "dependencies": {
+    "@grpc/grpc-js": "^1.6.7",
+    "@grpc/proto-loader": "^0.6.12",
+    "@nestjs/bull": "^0.5.5",
+    "@nestjs/common": "^8.0.0",
+    "@nestjs/config": "^2.0.0",
+    "@nestjs/core": "^8.0.0",
+    "@nestjs/microservices": "^8.4.4",
+    "@nestjs/platform-express": "^8.0.0",
+    "@nestjs/platform-socket.io": "^8.4.4",
+    "@nestjs/platform-ws": "^8.4.4",
+    "@nestjs/websockets": "^8.4.4",
+    "ajv": "^8.11.0",
+    "buffer": "^6.0.3",
+    "bull": "^4.8.3",
+    "js-yaml": "^4.1.0",
+    "multistream": "^4.1.0",
+    "nest-winston": "^1.6.2",
+    "nestjs-redis": "git+https://github.com/GyanendroKh/nestjs-redis.git#nest8-fix",
+    "node-datachannel": "^0.3.4",
+    "redis": "^4",
+    "reflect-metadata": "^0.1.13",
+    "rimraf": "^3.0.2",
+    "rx-queue": "^1.0.5",
+    "rxjs": "^7.2.0",
+    "stream-buffers": "^3.0.2",
+    "winston": "^3.7.2"
+  },
+  "devDependencies": {
+    "@nestjs/cli": "^8.0.0",
+    "@nestjs/schematics": "^8.0.0",
+    "@nestjs/testing": "^8.0.0",
+    "@types/bull": "^3.15.8",
+    "@types/express": "^4.17.13",
+    "@types/jest": "27.4.1",
+    "@types/js-yaml": "^4.0.5",
+    "@types/node": "^16.0.0",
+    "@types/supertest": "^2.0.11",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
+    "@typescript-eslint/parser": "^5.0.0",
+    "cross-env": "^7.0.3",
+    "eslint": "^8.0.1",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "^27.2.5",
+    "prettier": "^2.3.2",
+    "rollup-plugin-string": "^3.0.0",
+    "source-map-support": "^0.5.20",
+    "supertest": "^6.1.3",
+    "ts-jest": "^27.0.3",
+    "ts-loader": "^9.2.3",
+    "ts-node": "^10.0.0",
+    "tsconfig-paths": "^3.10.1",
+    "typescript": "^4.3.5"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "js",
+      "json",
+      "ts"
+    ],
+    "rootDir": ".",
+    "testRegex": ".*\\.spec\\.ts$",
+    "transform": {
+      "^.+\\.(t|j)s$": "ts-jest"
+    },
+    "collectCoverageFrom": [
+      "**/*.(t|j)s"
+    ],
+    "coverageDirectory": "./coverage",
+    "testEnvironment": "node",
+    "roots": [
+      "<rootDir>/src/",
+      "<rootDir>/libs/"
+    ],
+    "moduleNameMapper": {
+      "^@app/utils(|/.*)$": "<rootDir>/libs/utils/src/$1"
+    }
+  }
+}

+ 5 - 5
src/logConfig.ts

@@ -23,11 +23,11 @@ export const LoggerConfig = {
   ),
   transports: [
     new winston.transports.Console(),
-    new winston.transports.File({
-      dirname: logDir, //path to where save loggin result
-      filename: 'combine.log', //name of file where will be saved logging result
-      level: 'debug',
-    }),
+    // new winston.transports.File({
+    //   dirname: logDir, //path to where save loggin result
+    //   filename: 'combine.log', //name of file where will be saved logging result
+    //   level: 'debug',
+    // }),
     // new winston.transports.File({
     //   dirname: logDir, //path to where save loggin result
     //   filename: 'combine.log', //name of file where will be saved logging result

+ 4 - 3
src/meta.gateway.ts

@@ -88,17 +88,18 @@ export class MetaGateway
 
   @SubscribeMessage('init_webrtc')
   handleInitWebRtc(client: any, payload: any): void {
-    cleanup();
+    // TODO 可能会中断连接
+    // cleanup();
     this.logger.log('action::handleInitWebRtc', JSON.stringify(payload));
     const stun_server = this.configService.get('stun.server');
     const portRangeBegin = this.configService.get('stun.portRangeBegin');
     const portRangeEnd = this.configService.get('stun.portRangeEnd');
 
-    this.peer = new PeerConnection('roomTest', {
+    this.peer = new PeerConnection('roomRtc', {
       portRangeBegin: portRangeBegin,
       portRangeEnd: portRangeEnd,
       iceServers: stun_server,
-      // enableIceTcp: true,
+      enableIceTcp: true,
     });
 
     this.peer.onLocalDescription((sdp, type) => {

+ 8 - 0
src/scene/scene.service.ts

@@ -295,6 +295,14 @@ export class SceneService implements OnModuleInit, OnModuleDestroy {
       if (this.onMoving.value && this._rotateCount > 5) {
         const lastStreamFrame = this.lastMoveStreamFrame.getValue();
         const lastMoveStreamFrameBk = this.lastMoveStreamFrameBk;
+        //TODO对比
+
+        this.logger.info('lastStreamFrame', JSON.stringify(lastStreamFrame));
+        this.logger.info(
+          'lastMoveStreamFrameBk',
+          JSON.stringify(lastMoveStreamFrameBk),
+        );
+
         const metaData: StreamReplyType = JSON.parse(
           lastStreamFrame.metaData,
         ) as any as StreamReplyType;