organize monorepo

Author: Troublor

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "packages/darcher-go-ethereum"]
+	path = packages/darcher-go-ethereum
+	url = https://github.com/Troublor/darcher-go-ethereum.git

lerna.json

@@ -0,0 +1,7 @@
+{
+  "lerna": "3.22.1",
+  "packages": ["packages/*"],
+  "version": "1.0.0",
+  "npmClient": "yarn",
+  "useWorkspaces": true
+}

package-lock.json

@@ -7,33 +7,31 @@
   },
   "author": "Troublor",
   "license": "ISC",
-  "main": "darcher-analyzer/src/index.js",
   "private": true,
   "workspaces": [
-    "darcher-analyzer",
-    "darcher-dbmonitor-browser",
-    "darcher-rpc",
-    "darcher-go-ethereum",
-    "darcher-config"
+    "packages/*"
   ],
   "scripts": {
-    "test": "mocha -r ts-node/register darcher-analyzer/test/**/*.test.ts",
-    "coverage": "nyc -r lcov -e .ts -x \"*.test.ts\" npm run test",
-    "build:proto": "./scripts/compile_pb.sh",
+    "build:config": "yarn workspace @darcher/config build",
+    "build:proto": "yarn workspace @darcher/rpc build",
     "build:ethmonitor": "cd packages/darcher-go-ethereum && make ethmonitor",
     "build:geth": "cd packages/darcher-go-ethereum && make geth",
-    "build:dbmonitor-browser": "yarn workspace packages/darcher-dbmonitor-browser build",
+    "build:dbmonitor-browser": "yarn workspace @darcher/dbmonitor-browser build",
     "build": "npm-run-all build:*",
-    "watch:dbmonitor-browser": "yarn workspace packages/darcher-dbmonitor-browser watch",
-    "start:darcher": "yarn workspace darcher-analyzer start:darcher",
+    "watch:dbmonitor-browser": "yarn workspace @darcher/dbmonitor-browser watch",
+    "start:darcher": "yarn workspace @darcher/analyzer start:darcher",
     "start:ethmonitor": "cd packages/darcher-go-ethereum && go run cmd/ethmonitor/main.go --controller darcher --port 8989"
   },
   "dependencies": {
-    "@types/chrome": "^0.0.117",
-    "google-protobuf": "^3.12.2",
-    "grpc": "^1.24.3",
-    "grpc-tools": "^1.9.0",
-    "grpc_tools_node_protoc_ts": "^4.1.0",
-    "npm-run-all": "^4.1.5"
+    "lerna": "^3.22.1",
+    "npm-run-all": "^4.1.5",
+    "ts-node": "^8.10.2",
+    "typescript": "^3.9.6"
+  },
+  "devDependencies": {
+    "@types/chai": "^4.2.11",
+    "@types/mocha": "^7.0.2",
+    "chai": "^4.2.0",
+    "mocha": "^8.0.1"
   }
 }

package.json

@@ -1,13 +1,15 @@
 {
-  "name": "darcher-analyzer",
+  "name": "@darcher/analyzer",
   "version": "1.0.0",
   "repository": {
     "url": "https://github.com/Troublor/darcher"
   },
   "author": "Troublor",
   "license": "ISC",
   "scripts": {
-    "start:darcher": "ts-node src/index.ts"
+    "build": "tsc",
+    "start:darcher": "ts-node src/index.ts",
+    "test": "mocha --require ts-node/register test/*.test.ts"
   },
   "dependencies": {
     "@babel/polyfill": "^7.8.3",
@@ -20,22 +22,21 @@
     "jayson": "^3.2.0",
     "lodash": "^4.17.15",
     "log4js": "^6.2.1",
-    "mocha": "^7.0.0",
     "request": "^2.88.2",
     "ts-enum-util": "^4.0.2",
-    "ts-node": "^8.6.2",
-    "typescript": "^3.7.4",
     "ws": "^7.3.0"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.7",
+    "@types/chai": "^4.2.11",
     "@types/es6-promise": "^3.3.0",
     "@types/lodash": "^4.14.155",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^7.0.2",
     "@types/node": "^13.13.11",
     "@types/shelljs": "^0.8.6",
     "@types/ws": "^7.2.6",
+    "chai": "^4.2.0",
     "express": "^4.17.1",
+    "mocha": "^8.0.1",
     "shelljs": "^0.8.3",
     "ts-protoc-gen": "^0.12.0"
   }

packages/darcher-analyzer/package.json

@@ -1,6 +1,6 @@
 import {CRUDOperation, DAppStateChangeMsg, isDeepEqual, isNullOrUndefined} from "../common";
 import * as fs from "fs";
-import {TxState} from "../rpc/common_pb";
+import {TxState} from "@darcher/rpc";
 
 type StateChange = DAppStateChangeMsg;
 

packages/darcher-analyzer/src/analysis/analysis.ts

@@ -3,7 +3,7 @@ import {EthMonitorController, EventNames, Server} from "../downstream";
 import {DAppStateChangeMsg, isNullOrUndefined, logger, sleep} from "../common";
 import * as readline from "readline";
 import {EventEmitter} from "events";
-import {TxState} from "../rpc/common_pb";
+import {TxState} from "@darcher/rpc";
 
 export class DArcher {
 

packages/darcher-analyzer/src/analysis/dArcher.ts

@@ -1,14 +1,15 @@
-import {TxState} from "./rpc/common_pb";
+import {TxState} from "@darcher/rpc";
 import {
     TxFinishedMsg,
     TxStateChangeMsg,
     TxStateControlMsg,
     TxTraverseStartMsg
-} from "./rpc/darcher_controller_service_pb";
+} from "@darcher/rpc";
 import {logger, prettifyHash} from "./common";
 import {EventEmitter} from "events";
 import {$enum} from "ts-enum-util";
 import {DBMonitorService} from "./service/dbmonitorService";
+import config from "@darcher/config";
 
 /**
  * Extend TxState to introduce logical tx state (reverted, re-executed)
@@ -92,7 +93,7 @@ export class Analyzer {
         logger.info("Wait for 500 ms")
         setTimeout(async () => {
             try {
-                let data = await this.dbMonitorService.GetAllData();
+                let data = await this.dbMonitorService.getAllData(config.dapp.address, config.dapp.dbName);
                 console.log(data);
             } catch (e) {
                 logger.error("Get all data error", e);

packages/darcher-analyzer/src/analyzer.ts

@@ -1,6 +1,3 @@
-export const grpcPort = 1236;
-export const websocketPort = 1237;
-
 export interface Reply {
     Err: string
 }

packages/darcher-analyzer/src/common/defines.ts

@@ -1,6 +1,4 @@
 import {Reply} from "./index";
-import {start} from "repl";
-import removeTree = chrome.bookmarks.removeTree;
 
 export const genEmptyReply = (): Reply => {
     return <Reply>{Err: null};

packages/darcher-analyzer/src/common/helpers.ts

@@ -2,9 +2,10 @@
  * Darcher listen for new txs and start a analyzer for each tx
  */
 import {DarcherController, DarcherServer} from "./service";
-import {SelectTxControlMsg, TxReceivedMsg} from "./rpc/darcher_controller_service_pb";
+import {SelectTxControlMsg, TxReceivedMsg} from "@darcher/rpc";
 import {Analyzer} from "./analyzer";
-import {grpcPort, logger, websocketPort} from "./common";
+import {logger} from "./common";
+import config from "@darcher/config";
 
 export class Darcher {
     private readonly server: DarcherServer;
@@ -14,7 +15,7 @@ export class Darcher {
     private readonly darcherController: DarcherController;
 
     constructor() {
-        this.server = new DarcherServer(grpcPort, websocketPort);
+        this.server = new DarcherServer(config.rpcPort["darcher-ethmonitor"], config.rpcPort["darcher-dbmonitor"].ws);
         this.analyzers = {};
         this.darcherController = <DarcherController>{
             onTxReceived: this.onTxReceived.bind(this),