Merge pull request #471 from Half-Shot/hs/nyc

Replace istanbul with nyc

.nycrc

+{
+    "extends": "@istanbuljs/nyc-config-typescript",
+    "reporter": ["text", "text-summary", "lcov"],
+    "all": true
+}

.travis.yml

+dist: xenial
 language: node_js
-install: npm install && npm run build
-node_js:
-    - "10"
-    - "12"
+install: npm install
+
+cache:
+  directories:
+    - node_modules
 
 jobs:
-    - script: npm run test
-      name: "Unit - Node 10"
-      node_js: "10"
-    - script: npm run test
-      name: "Unit - Node 12"
+  include:
+      # Lint doesn't need to build
+    - stage: lint
+      script: npm run lint
       node_js: "12"
-    - script: npm run lint
-      name: "Linting"
-      node_js: "12"
-    - script: npm run coverage
-      name: "Coverage"
+    - stage: unit tests
+      # Test already builds
+      script: npm run test
+      node_js: "10"
+    - node_js: "12"
+    - stage: coverage
+      # Coverage does NOT build
+      script: npm run build && npm run coverage
       node_js: "12"
 
-notifications:
-    webhooks:
-        urls:
-            - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MEhhbGYtU2hvdCUzQWhhbGYtc2hvdC51ay8lMjFxUE5PblVzTnNaclRvRlpxeEIlM0FoYWxmLXNob3QudWs"
-        on_success: change  # always|never|change
-        on_failure: always
-        on_start: never
+# NOTE: This is unused atm
+# notifications:
+#    webhooks:
+#        urls:
+#            - "https://scalar.vector.im/api/neb/services/hooks/dHJhdmlzLWNpLyU0MEhhbGYtU2hvdCUzQWhhbGYtc2hvdC51ay8lMjFxUE5PblVzTnNaclRvRlpxeEIlM0FoYWxmLXNob3QudWs"
+#        on_success: change  # always|never|change
+#        on_failure: always
+#        on_start: never

package.json

@@ -4,9 +4,9 @@
   "description": "A bridge between Matrix and Discord",
   "main": "discordas.js",
   "scripts": {
-    "test": "npm run-script build && mocha --opts test/mocha.opts build/test/config.js build/test",
+    "test": "npm run-script build && mocha --opts test/mocha.opts",
     "lint": "tslint --project ./tsconfig.json -t stylish",
-    "coverage": "istanbul --include-all-sources cover -x build/src/discordas.js _mocha -- build/test/ -R spec",
+    "coverage": "tsc && nyc mocha",
     "build": "tsc",
     "start": "npm run-script build && node ./build/src/discordas.js -p 9005 -c config.yaml",
     "addbot": "node ./build/tools/addbot.js",
@@ -55,6 +55,7 @@
     "winston-daily-rotate-file": "^3.3.0"
   },
   "devDependencies": {
+    "@istanbuljs/nyc-config-typescript": "^0.1.3",
     "@types/chai": "^3.4.35",
     "@types/mocha": "^5.2.5",
     "@types/node": "^10.12.0",
@@ -63,8 +64,10 @@
     "eslint": "^3.8.1",
     "istanbul": "^0.4.5",
     "mocha": "^5.2.0",
+    "nyc": "^14.1.1",
     "proxyquire": "^1.7.11",
-    "source-map-support": "^0.5.9",
+    "source-map-support": "^0.5.12",
+    "ts-node": "^8.1.0",
     "why-is-node-running": "^2.0.3"
   }
 }

src/workers/WorkerCom.ts

-// import { Worker } from "worker_threads";
-// import { DiscordBot } from "../bot";
-// import { Bridge } from "matrix-appservice-bridge";
-// import { Log } from "../log";
-
-// const log = new Log("WorkerCom");
-
-// export interface IWorkerCmd {
-//     type: string;
-//     id: string;
-// }
-
-// export interface IWorkerResult extends IWorkerCmd {
-//     type: "res";
-//     error: any|null;
-//     result: any|null;
-// }
-
-// export interface IWorkerCmdClose extends IWorkerCmd {
-//     type: "close";
-//     reason: string;
-//     error: string|undefined;
-// }
-
-// export interface IWorkerIntentAction extends IWorkerCmd {
-//     type: "intent_action";
-//     useClient: boolean;
-//     matrixId: string|undefined;
-//     discordId: string|undefined;
-//     function: string;
-//     args: any[];
-// }
-
-// export abstract class WorkerCom {
-//     constructor(protected worker: Worker, protected discordBot: DiscordBot|null = null, protected bridge: Bridge|null = null) {
-//         worker.on("message", (value: IWorkerCmd) => {
-//             this.onMessage(value).then((result) => {
-//                 this.worker.postMessage({
-//                     id: value.id,
-//                     result,
-//                     error: null,
-//                 } as IWorkerResult);
-//             }).catch((ex) => {
-//                 this.worker.postMessage({
-//                     id: value.id,
-//                     result: null,
-//                     error: ex,
-//                 } as IWorkerResult);
-//             })
-//         });
-//         worker.on("error", this.onError.bind(this));
-
-//     }
-
-//     protected async onMessage(value: IWorkerCmd) {
-//         if (value.type === "close") {
-//             const close = value as IWorkerCmdClose;
-//             log.warn(`Worker is closing: ${close.reason} ${close.error}`);
-//         } else if (value.type === "intent_action") {
-//             const intentAction = value as IWorkerIntentAction;
-//             let intent;
-//             if (intentAction.matrixId) {
-//                 intent = this.bridge!.getIntent(intentAction.matrixId);
-//             } else if (intentAction.discordId) {
-//                 intent = this.discordBot!.GetIntentFromDiscordMember(intentAction.discordId);
-//             } else {
-//                 log.warn("Tried to do an intent_action but no IDs were defined");
-//                 return;
-//             }
-//             if (intentAction.useClient) {
-//                 intent = intent.getClient();
-//             }
-//             const func: () => any = intent[intentAction.function];
-//             if (!func) {
-//                 log.warn(`Tried to do an intent_action but ${func} is not a valid function`);
-//                 return;
-//             }
-//             return await func.call(intent, intentAction.args);
-//         }
-//     }
-
-//     protected onError(exitCode: number) {
-
-//     }
-// }
\ No newline at end of file

test/mocha.opts

 --reporter list
 --ui bdd
+--require ts-node/register
+--require source-map-support/register
 --recursive
+build/test/config.js
+build/test