2.0.5

.gitignore

@@ -1,6 +1,22 @@
 .nogit/
-node_modules/
+
+# artifacts
 coverage/
 public/
 pages/
+
+# installs
+node_modules/
+
+# caches
 .yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
-image: hosttoday/ht-docker-node:npmci
+# gitzone ci_default
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -38,19 +38,7 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
-  stage: test
-  script:
-  - npmci npm prepare
-  - npmci node install lts
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-    
-testSTABLE:
+testStable:
   stage: test
   script:
   - npmci npm prepare
@@ -60,6 +48,18 @@ testSTABLE:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
+  - priv
+
+testBuild:
+  stage: test
+  script:
+  - npmci npm prepare
+  - npmci node install stable
+  - npmci npm install
+  - npmci command npm run build
+  coverage: /\d+.?\d+?\%\s*coverage/
+  tags:
+  - docker
   - notpriv
 
 release:
@@ -78,19 +78,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run
-        --env SOURCE_CODE="$PWD"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
+    - npmci command npm install -g tslint typescript
+    - npmci npm install
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
   tags:
   - docker
   - priv
@@ -106,13 +98,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:stable-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

.vscode/launch.json

@@ -0,0 +1,29 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "current file",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "${relativeFile}"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    },
+    {
+      "name": "test.ts",
+      "type": "node",
+      "request": "launch",
+      "args": [
+        "test/test.ts"
+      ],
+      "runtimeArgs": ["-r", "@gitzone/tsrun"],
+      "cwd": "${workspaceRoot}",
+      "protocol": "inspector",
+      "internalConsoleOptions": "openOnSessionStart"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+  "json.schemas": [
+    {
+      "fileMatch": ["/npmextra.json"],
+      "schema": {
+        "type": "object",
+        "properties": {
+          "npmci": {
+            "type": "object",
+            "description": "settings for npmci"
+          },
+          "gitzone": {
+            "type": "object",
+            "description": "settings for gitzone"
+          }
+        }
+      }
+    }
+  ]
+}

npmextra.json

@@ -2,5 +2,15 @@
   "npmci": {
     "npmGlobalTools": [],
     "npmAccessLevel": "public"
+  },
+  "gitzone": {
+    "module": {
+      "githost": "gitlab.com",
+      "gitscope": "pushrocks",
+      "gitrepo": "webrequest",
+      "shortDescription": "securely request from browsers",
+      "npmPackagename": "@pushrocks/webrequest",
+      "license": "MIT"
+    }
   }
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/webrequest",
-  "version": "1.0.7",
+  "version": "2.0.5",
   "private": false,
   "description": "securely request from browsers",
   "main": "dist/index.js",
@@ -13,16 +13,27 @@
     "format": "(gitzone format)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.3",
-    "@gitzone/tstest": "^1.0.17",
-    "@pushrocks/smartexpress": "^2.0.4",
-    "@pushrocks/tapbundle": "^3.0.7",
-    "@types/node": "^10.12.12",
-    "node-fetch": "^2.3.0",
-    "tslint": "^5.11.0",
-    "tslint-config-prettier": "^1.15.0"
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/smartexpress": "^3.0.40",
+    "@pushrocks/tapbundle": "^3.0.13",
+    "@types/node": "^12.7.8",
+    "node-fetch": "^2.6.0",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@pushrocks/smartdelay": "^2.0.2"
-  }
+    "@pushrocks/smartdelay": "^2.0.3"
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

readme.md

@@ -0,0 +1,26 @@
+# @pushrocks/webrequest
+securely request from browsers
+
+## Availabililty and Links
+* [npmjs.org (npm package)](https://www.npmjs.com/package/@pushrocks/webrequest)
+* [gitlab.com (source)](https://gitlab.com/pushrocks/webrequest)
+* [github.com (source mirror)](https://github.com/pushrocks/webrequest)
+* [docs (typedoc)](https://pushrocks.gitlab.io/webrequest/)
+
+## Status for master
+[![build status](https://gitlab.com/pushrocks/webrequest/badges/master/build.svg)](https://gitlab.com/pushrocks/webrequest/commits/master)
+[![coverage report](https://gitlab.com/pushrocks/webrequest/badges/master/coverage.svg)](https://gitlab.com/pushrocks/webrequest/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/@pushrocks/webrequest.svg)](https://www.npmjs.com/package/@pushrocks/webrequest)
+[![Known Vulnerabilities](https://snyk.io/test/npm/@pushrocks/webrequest/badge.svg)](https://snyk.io/test/npm/@pushrocks/webrequest)
+[![TypeScript](https://img.shields.io/badge/TypeScript->=%203.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%2010.x.x-blue.svg)](https://nodejs.org/dist/latest-v10.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-prettier-ff69b4.svg)](https://prettier.io/)
+
+## Usage
+
+For further information read the linked docs at the top of this readme.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
+
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

test/test.ts

@@ -5,13 +5,12 @@ import * as fetch from 'node-fetch';
 declare global {
   namespace NodeJS {
     interface Global {
-        fetch: any;
+      fetch: any;
     }
   }
 }
 global.fetch = fetch;
 
-
 // test dependencies
 import * as smartexpress from '@pushrocks/smartexpress';
 
@@ -24,43 +23,58 @@ tap.test('setup test server', async () => {
     port: 2345
   });
 
-  testServer.addRoute('/apiroute1', new smartexpress.Handler("GET", (req, res) => {
-    res.status(429);
-    res.end();
-  }));
+  testServer.addRoute(
+    '/apiroute1',
+    new smartexpress.Handler('GET', (req, res) => {
+      res.status(429);
+      res.end();
+    })
+  );
 
-  testServer.addRoute('/apiroute2', new smartexpress.Handler("GET", (req, res) => {
-    res.status(500);
-    res.end();
-  }));
+  testServer.addRoute(
+    '/apiroute2',
+    new smartexpress.Handler('GET', (req, res) => {
+      res.status(500);
+      res.end();
+    })
+  );
 
-  testServer.addRoute('/apiroute3', new smartexpress.Handler("GET", (req, res) => {
-    res.status(200);
-    res.send({
-      hithere: 'hi'
-    });
-  }));
+  testServer.addRoute(
+    '/apiroute3',
+    new smartexpress.Handler('GET', (req, res) => {
+      res.status(200);
+      res.send({
+        hithere: 'hi'
+      });
+    })
+  );
 
-  await testServer.start()
-})
+  await testServer.start();
+});
 
-tap.test('first test', async (tools) => {
-  const response = await (new webrequest.WebRequest()).request([
+tap.test('first test', async tools => {
+  const response = await new webrequest.WebRequest().getJson([
     'http://localhost:2345/apiroute1',
     'http://localhost:2345/apiroute2',
     'http://localhost:2345/apiroute4',
     'http://localhost:2345/apiroute3'
-  ], {
-    method: 'GET'
-  })
+  ]);
+
+  const response2 = await new webrequest.WebRequest().getJson('http://localhost:2345/apiroute3');
 
   console.log(response);
+  console.log(response2)
 
-  expect(response).property('hithere').to.equal('hi');
-})
+  expect(response)
+    .property('hithere')
+    .to.equal('hi');
+  expect(response2)
+    .property('hithere')
+    .to.equal('hi');
+});
 
 tap.test('tear down server', async () => {
   testServer.stop();
-})
+});
 
-tap.start()
+tap.start();

ts/index.ts

@@ -4,31 +4,55 @@ import * as plugins from './webrequest.plugins';
  * web request
  */
 export class WebRequest {
-  /**
-   * gets json
-   */
-  async getJson(url: string | string[]) {}
+  public async getJson(urlArg: string | string[]) {
+    const response: Response = await this.request(urlArg, {
+      method: 'GET'
+    });
+    return response.json();
+  }
 
   /**
    * postJson
    */
-  postJson() {}
+  public async postJson(urlArg: string, requestBody?: any) {
+    const response: Response = await this.request(urlArg, {
+      body: requestBody,
+      method: 'POST'
+    });
+    return response.json();
+  }
 
   /**
    * put js
    */
-  putJson() {}
+  public async putJson(urlArg: string, requestBody?: any) {
+    const response: Response = await this.request(urlArg, {
+      body: requestBody,
+      method: 'PUT'
+    });
+    return response.json();
+  }
 
   /**
-   *
+   * put js
    */
-  async request(
+  public async deleteJson(urlArg: string) {
+    const response: Response = await this.request(urlArg, {
+      method: 'GET'
+    });
+    return response.json();
+  }
+
+  /**
+   * a fault tolerant request
+   */
+  public async request(
     urlArg: string | string[],
     optionsArg: {
       method: 'GET' | 'POST' | 'PUT' | 'DELETE';
       body?: any;
     }
-  ) {
+  ): Promise<Response> {
     let allUrls: string[];
     let usedUrlIndex = 0;
 
@@ -41,22 +65,21 @@ export class WebRequest {
 
     const requestHistory: string[] = []; // keep track of the request history
 
-    const doHistoryCheck = async ( // check history for a 
+    const doHistoryCheck = async (
+      // check history for a
       historyEntryTypeArg: string
     ) => {
       requestHistory.push(historyEntryTypeArg);
       if (historyEntryTypeArg === '429') {
-        console.log('got 429, so waiting a little bit.')
-        await plugins.smartdelay.delayFor(
-          Math.floor(Math.random() * (2000 - 1000 +1)) + 1000
-        ); // wait between 1 and 10 seconds
+        console.log('got 429, so waiting a little bit.');
+        await plugins.smartdelay.delayFor(Math.floor(Math.random() * (2000 - 1000 + 1)) + 1000); // wait between 1 and 10 seconds
       }
 
       let numOfHistoryType = 0;
       for (const entry of requestHistory) {
         if (entry === historyEntryTypeArg) numOfHistoryType++;
       }
-      if (numOfHistoryType > (2 * allUrls.length * usedUrlIndex)) {
+      if (numOfHistoryType > 2 * allUrls.length * usedUrlIndex) {
         usedUrlIndex++;
       }
     };
@@ -66,7 +89,7 @@ export class WebRequest {
       if (!urlToUse) {
         throw new Error('request failed permanently');
       }
-      
+
       const response = await fetch(urlToUse, {
         method: optionsArg.method,
         headers: {
@@ -80,12 +103,13 @@ export class WebRequest {
         return response;
       } else {
         await doHistoryCheck(response.status.toString());
+        // tslint:disable-next-line: no-return-await
         return await doRequest(allUrls[usedUrlIndex]);
       }
     };
 
-    const finalResponse: Response = await doRequest(urlArg[usedUrlIndex]);
-    console.log(finalResponse)
-    return JSON.parse(await finalResponse.text());
+    const finalResponse: Response = await doRequest(allUrls[usedUrlIndex]);
+    console.log(finalResponse);
+    return finalResponse;
   }
 }

ts/webrequest.plugins.ts

@@ -1,5 +1,3 @@
 import * as smartdelay from '@pushrocks/smartdelay';
 
-export {
-  smartdelay
-}
+export { smartdelay };