Merge pull request #19 from ngfelixl/refactor/remove-opn

package: remove opn

Author: ngfelixl

README.md

@@ -184,14 +184,10 @@ the plots in real-time.
 [![twitter](https://img.shields.io/badge/twitter-%40ngfelixl-blue.svg?logo=twitter)](https://twitter.com/intent/follow?screen_name=ngfelixl)
 [![github](https://img.shields.io/badge/github-%40ngfelixl-blue.svg?logo=github)](https://github.com/ngfelixl)
 
-Hi, I am Felix,
-Software developer and Angular, NgRX contributor
+Hi, I am Felix,<br>
+Senior Angular developer and Angular, RxJS and NgRX contributor.
 
 ![avatar](https://avatars2.githubusercontent.com/u/24190530?s=200&v=4)
 
 If you like this library, think about giving it a star or follow me on twitter or github or check out my personal
-the [website](https://felixlemke.com).
-
-## Dependencies
-
-- [opn](https://www.npmjs.com/package/opn)
+the [website](https://felixlemke.dev).

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "nodeplotlib",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "NodeJS frontend-less plotting lib using plotly.js inspired by matplotlib",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -26,7 +26,6 @@
     "prepare": "npm run clean && npm run prepare-copy-files && npm run test && npm run build ",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
-    "precommit": "npm run format && npm run test",
     "build-copy-files": "node ./scripts/build.js",
     "prepare-copy-files": "node ./scripts/prepare.js"
   },
@@ -42,14 +41,11 @@
   ],
   "author": "Felix Lemke <[email protected]> (https://felixlemke.com)",
   "license": "MIT",
-  "dependencies": {
-    "opn": "^5.5.0"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@types/d3": "^5.7.1",
     "@types/jest": "^24.0.1",
     "@types/node": "^10.10.1",
-    "@types/opn": "^5.1.0",
     "@types/plotly.js": "^1.43.1",
     "@types/request": "^2.48.1",
     "copyfiles": "^2.1.0",

package.json

@@ -1,7 +1,8 @@
+import { exec } from 'child_process';
 import { readFile } from 'fs';
 import { createServer, IncomingMessage, Server as HttpServer, ServerResponse } from 'http';
 import { Socket } from 'net';
-import opn from 'opn';
+import { type } from 'os';
 import { join } from 'path';
 import { IPlotsContainer } from './models';
 
@@ -66,11 +67,19 @@ export class Server {
     for (const plotEntry of Object.entries(this.plotsContainer)) {
       if (!plotEntry[1].opened && !plotEntry[1].pending) {
         plotEntry[1].pending = true;
-        opn(`http://localhost:${this.port}/plots/${plotEntry[0]}/index.html`);
+        this.openWindow(`http://localhost:${this.port}/plots/${plotEntry[0]}/index.html`);
       }
     }
   }
 
+  private openWindow(location: string) {
+    switch (type()) {
+      case 'Linux': exec(`xdg-open ${location}`); break;
+      case 'Darwin': exec(`open ${location}`); break;
+      case 'Windows_NT': exec(`start ${location}`); break;
+    }
+  }
+
   /**
    * Creates the Webserver instance
    */

src/server.ts

@@ -0,0 +1,3 @@
+const plot = require('../dist/lib');
+plot.stack([{ x: [0], y: [1], type: 'line'}])
+plot.plot()

test/index.js

@@ -1,4 +1,4 @@
-import opn from 'opn';
+import { exec } from 'child_process';
 import request from 'request';
 import { Server } from '../src/server';
 
@@ -9,7 +9,7 @@ const validData = {
   plots: [{data: [{ x: [1], y: [2]}]}]
 };
 
-jest.mock('opn');
+jest.mock('child_process');
 jest.mock('fs', () => ({readFile: (path: any, options: any, callback: (err: any, data: any) => void) => {
   callback('Error', null);
 }}));
@@ -21,7 +21,6 @@ describe('Server', () => {
     server = new Server(port);
   });
 
-
   it('should instantiate', () => {
     expect(server).toBeTruthy();
   });
@@ -33,7 +32,7 @@ describe('Server', () => {
       plots: []
     }});
 
-    expect(opn).toHaveBeenCalledTimes(1);
+    expect(exec).toHaveBeenCalledTimes(1);
   });
 
   it('should serve the data', (done) => {
@@ -116,9 +115,4 @@ describe('Server', () => {
     server.clean();
     server = null;
   });
-
-  // afterAll(() => {
-  //   console.log((process as any)._getActiveRequests());
-  //   console.log((process as any)._getActiveHandles()[0]);
-  // });
 });

test/server.spec.ts

@@ -9,7 +9,7 @@ const validData = {
   plots: [{data: [{ x: [1], y: [2]}]}]
 };
 
-jest.mock('opn');
+jest.mock('child_process');
 jest.mock('fs', () => ({readFile: (path: any, options: any, callback: (err: any, data: any) => void) => {
   switch (path) {
     case join(__dirname, '..', 'www', 'index.html'): callback(null, 'index.html data'); break;