fix: using ws instead of websocket (#93)

midwayjs · Mar 19, 2020 · 01c0b38 · 01c0b38
1 parent 1416f97
commit 01c0b38
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 69 deletions.
diff --git a/packages/faas-cli-command-core/benchmark/core.js b/packages/faas-cli-command-core/benchmark/core.js
@@ -72,9 +72,8 @@ const CorefuncTestInvoke = async () => {
   await core.invoke('invoke');
 };
 const contenders = {
-  'core help no plugin': Corefunc,
-  'core help test plugin': CorefuncTest,
-  'core invoke test plugin': CorefuncTestInvoke,
+  'pure core': Corefunc,
+  'core help': CorefuncTest,
 };
 
 console.log('\nBenchmark:');

diff --git a/packages/serverless-invoke/package.json b/packages/serverless-invoke/package.json
@@ -16,9 +16,8 @@
     "@midwayjs/serverless-spec-builder": "^0.2.49",
     "fs-extra": "^8.1.0",
     "globby": "^10.0.1",
-    "ts-node": "^8.5.2",
     "urllib": "^2.34.1",
-    "websocket": "^1.0.30"
+    "ws": "^7.2.3"
   },
   "devDependencies": {
     "@midwayjs/faas": "^0.2.49",

diff --git a/packages/serverless-invoke/src/core.ts b/packages/serverless-invoke/src/core.ts
@@ -7,7 +7,13 @@
 */
 import { FaaSStarterClass, cleanTarget } from './utils';
 import { join, resolve, relative } from 'path';
-import { existsSync, move, writeFileSync, ensureFileSync } from 'fs-extra';
+import {
+  existsSync,
+  move,
+  writeFileSync,
+  ensureFileSync,
+  remove,
+} from 'fs-extra';
 import { loadSpec, getSpecFile } from '@midwayjs/fcli-command-core';
 import { writeWrapper } from '@midwayjs/serverless-spec-builder';
 import { AnalyzeResult, Locator } from '@midwayjs/locate';
@@ -148,30 +154,36 @@ export abstract class InvokeCore implements IInvoke {
       await cleanTarget(this.buildDir);
     }
     const opts = this.options.incremental ? { overwrite: true } : {};
-    if (this.codeAnalyzeResult.integrationProject) {
-      // 一体化调整目录
-      await tsIntegrationProjectCompile(baseDir, {
-        buildRoot: this.buildDir,
-        tsCodeRoot: this.codeAnalyzeResult.tsCodeRoot,
-        incremental: this.options.incremental,
-        tsConfig: {
-          compilerOptions: {
-            sourceRoot: this.codeAnalyzeResult.tsCodeRoot, // for sourceMap
+    try {
+      if (this.codeAnalyzeResult.integrationProject) {
+        // 一体化调整目录
+        await tsIntegrationProjectCompile(baseDir, {
+          buildRoot: this.buildDir,
+          tsCodeRoot: this.codeAnalyzeResult.tsCodeRoot,
+          incremental: this.options.incremental,
+          tsConfig: {
+            compilerOptions: {
+              sourceRoot: this.codeAnalyzeResult.tsCodeRoot, // for sourceMap
+            },
           },
-        },
-        clean: this.options.clean,
-      });
-    } else {
-      await tsCompile(baseDir, {
-        tsConfigName: 'tsconfig.json',
-        tsConfig: {
-          compilerOptions: {
-            sourceRoot: resolve(baseDir, 'src'), // for sourceMap
+          clean: this.options.clean,
+        });
+      } else {
+        await tsCompile(baseDir, {
+          tsConfigName: 'tsconfig.json',
+          tsConfig: {
+            compilerOptions: {
+              sourceRoot: resolve(baseDir, 'src'), // for sourceMap
+            },
           },
-        },
-        clean: this.options.clean,
-      });
-      await move(join(baseDir, 'dist'), join(this.buildDir, 'dist'), opts);
+          clean: this.options.clean,
+        });
+        await move(join(baseDir, 'dist'), join(this.buildDir, 'dist'), opts);
+      }
+    } catch (e) {
+      await remove(buildLogPath);
+      lockMap[buildLogPath] = false;
+      throw new Error(`Typescript Build Error, Please Check Your FaaS Code!`);
     }
     lockMap[buildLogPath] = true;
     // 针对多次调用清理缓存

diff --git a/packages/serverless-invoke/src/utils.ts b/packages/serverless-invoke/src/utils.ts
@@ -1,5 +1,5 @@
 const urllib = require('urllib');
-const WebSocketClient = require('websocket').client;
+const WebSocket = require('ws');
 import { tmpdir } from 'os';
 import {
   existsSync,
@@ -72,53 +72,16 @@ export function getWssUrl(port, type?: string, isThrowErr?: boolean) {
           );
         }
       });
-    }, 300);
+    }, 100);
   });
 }
 
 function debugWs(addr) {
-  let currentId = 0;
-  const cbMap = {};
   return new Promise(resolve => {
-    const client = new WebSocketClient();
-    client.on('connect', function(connection) {
-      connection.on('message', message => {
-        if (message.utf8Data) {
-          const data = JSON.parse(message.utf8Data);
-          if (data.id) {
-            if (data.id > currentId) {
-              currentId = data.id - 0;
-            }
-            if (cbMap[data.id]) {
-              cbMap[data.id](data);
-            }
-          }
-        }
-      });
-
-      const send = (method, params?) => {
-        return new Promise(resolve => {
-          const curId = currentId + 1;
-          currentId = curId;
-          cbMap[curId] = data => {
-            resolve(data);
-          };
-
-          const param: any = { id: curId, method };
-          if (params) {
-            param.params = params;
-          }
-          connection.sendUTF(JSON.stringify(param));
-        });
-      };
-
-      send('Profiler.enable');
-      send('Runtime.enable');
-      send('Debugger.enable', { maxScriptsCacheSize: 10000000 });
-      send('Debugger.setBlackboxPatterns', { patterns: ['internal'] });
+    const ws = new WebSocket(addr);
+    ws.on('open', () => {
       resolve(send);
     });
-    client.connect(addr);
   });
 }