replaced custom fetch script (requestPro) with isomorphic-fetch

dnodemongo/initialize.sh

@@ -10,7 +10,8 @@ npm install --save-dev \
     babel-preset-env \
     nodemon \
     tape \
-    tape-promise
+    tape-promise \
+    isomorphic-fetch
 
 npm run compile
 

dnodemongo/test/service.js

@@ -2,7 +2,7 @@
 import {fork} from 'child_process';
 import tape from 'tape';
 import _test from 'tape-promise';
-import http from 'http';
+import fetch from 'isomorphic-fetch';
 
 const tapetest = _test(tape);
 
@@ -12,7 +12,8 @@ const server = fork('build/service.js'),
 tapetest('service', async function testService(assert) {
     try {
         await waitPro();
-        const data = await requestPro(connstring + '/');
+        const ret = await fetch(connstring + '/'),
+            data = await ret.text();
         console.log('data', data);
     }
     catch(e) {
@@ -33,35 +34,5 @@ function waitPro(n = 1000) {
         setTimeout(resolve, n);
     });
 }
-function requestPro(reqopts, data) {
-    return new Promise(function prot(resolve, reject) {
-        try {
-            let req = http.request(reqopts, function received(resp) {
-                let str = '';
-                resp.on('data', function p(part) {
-                    str += part;
-                });
-                resp.on('end', function done() {
-                    if( resp.statusCode >= 400 && resp.statusCode <= 599 ) {
-                        reject(str);
-                    }
-                    else {
-                        resolve(str);
-                    }
-                });
-            });
-            if( data ) {
-                req.write(data);
-            }
-            req.end();
-        }
-        catch(e) {
-            reject(e);
-        }
-    });
-}
-
-
-
 
 

elmserver/boilerplate.sh

@@ -16,6 +16,7 @@ yarn add --exact --dev \
     babel-preset-env \
     nodemon \
     tape \
-    tape-promise
+    tape-promise \
+    isomorphic-fetch
 
 

elmserver/server/test/service.js

@@ -2,7 +2,7 @@
 import {fork} from 'child_process';
 import tape from 'tape';
 import _test from 'tape-promise';
-import http from 'http';
+import fetch from 'isomorphic-fetch';
 
 const tapetest = _test(tape);
 
@@ -12,7 +12,8 @@ const server = fork('build/service.js'),
 tapetest('service', async function testService(assert) {
     try {
         await waitPro();
-        const data = await requestPro(connstring + '/');
+        const ret = await fetch(connstring + '/'),
+            data = await ret.text();
         console.log('data', data);
     }
     catch(e) {
@@ -33,35 +34,5 @@ function waitPro(n = 1000) {
         setTimeout(resolve, n);
     });
 }
-function requestPro(reqopts, data) {
-    return new Promise(function prot(resolve, reject) {
-        try {
-            let req = http.request(reqopts, function received(resp) {
-                let str = '';
-                resp.on('data', function p(part) {
-                    str += part;
-                });
-                resp.on('end', function done() {
-                    if( resp.statusCode >= 400 && resp.statusCode <= 599 ) {
-                        reject(str);
-                    }
-                    else {
-                        resolve(str);
-                    }
-                });
-            });
-            if( data ) {
-                req.write(data);
-            }
-            req.end();
-        }
-        catch(e) {
-            reject(e);
-        }
-    });
-}
-
-
-
 
 

service/boilerplate.sh

@@ -14,6 +14,7 @@ yarn add --exact --dev \
     babel-preset-env \
     nodemon \
     tape \
-    tape-promise
+    tape-promise \
+    isomorphic-fetch
 
 

service/test/service.js

@@ -2,7 +2,7 @@
 import {fork} from 'child_process';
 import tape from 'tape';
 import _test from 'tape-promise';
-import http from 'http';
+import fetch from 'isomorphic-fetch';
 
 const tapetest = _test(tape);
 
@@ -12,7 +12,8 @@ const server = fork('build/service.js'),
 tapetest('service', async function testService(assert) {
     try {
         await waitPro();
-        const data = await requestPro(connstring + '/');
+        const ret = await fetch(connstring + '/'),
+            data = await ret.text();
         console.log('data', data);
     }
     catch(e) {
@@ -33,35 +34,5 @@ function waitPro(n = 1000) {
         setTimeout(resolve, n);
     });
 }
-function requestPro(reqopts, data) {
-    return new Promise(function prot(resolve, reject) {
-        try {
-            let req = http.request(reqopts, function received(resp) {
-                let str = '';
-                resp.on('data', function p(part) {
-                    str += part;
-                });
-                resp.on('end', function done() {
-                    if( resp.statusCode >= 400 && resp.statusCode <= 599 ) {
-                        reject(str);
-                    }
-                    else {
-                        resolve(str);
-                    }
-                });
-            });
-            if( data ) {
-                req.write(data);
-            }
-            req.end();
-        }
-        catch(e) {
-            reject(e);
-        }
-    });
-}
-
-
-
 
 

socket/boilerplate.sh

@@ -16,6 +16,7 @@ yarn add --exact --dev \
     nodemon \
     tape \
     tape-promise \
-    socket.io-client
+    socket.io-client \
+    isomorphic-fetch
 
 

socket/test/server.js

@@ -2,7 +2,7 @@
 import child_process from 'child_process';
 import tape from 'tape';
 import _test from 'tape-promise';
-import http from 'http';
+import fetch from 'isomorphic-fetch';
 import socketclient from 'socket.io-client';
 
 const tapetest = _test(tape);
@@ -16,7 +16,8 @@ tapetest('test server', async function testServer(assert) {
 
     try {
         await waitPro();
-        const data = await requestPro(`http://${serverhost}:${serverport}`);
+        const ret = await fetch(`http://${serverhost}:${serverport}`),
+            data = await ret.text();
         assert.equal(data, 'working', 'received message from server');
     }
     catch(e) {
@@ -38,36 +39,6 @@ function waitPro(n = 1000) {
         setTimeout(resolve, n);
     });
 }
-function requestPro(reqopts, data) {
-    return new Promise(function prot(resolve, reject) {
-        try {
-            let req = http.request(reqopts, function received(resp) {
-                let str = '';
-                resp.on('data', function p(part) {
-                    str += part;
-                });
-                resp.on('end', function done() {
-                    if( resp.statusCode >= 400 && resp.statusCode <= 599 ) {
-                        reject(str);
-                    }
-                    else {
-                        resolve(str);
-                    }
-                });
-            });
-            req.on('error', function err(ee) {
-                reject(ee);
-            });
-            if( data ) {
-                req.write(data);
-            }
-            req.end();
-        }
-        catch(e) {
-            reject(e);
-        }
-    });
-}
 function responsePro(socket, evt, wait = 3000) {
     return new Promise(function pro(resolve, reject) {
         let to = setTimeout(reject.bind(null, 'socket event TIMEOUT ' + evt), wait);