1.0.18

.gitlab-ci.yml

@@ -19,23 +19,36 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+  allow_failure: true
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +63,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +74,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +94,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/webstore",
-  "version": "1.0.13",
+  "version": "1.0.18",
   "private": false,
   "description": "high performance storage in the browser using indexed db",
   "main": "dist_ts/index.js",
@@ -12,16 +12,20 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.29",
-    "@gitzone/tstest": "^1.0.44",
+    "@gitzone/tstest": "^1.0.60",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^4.0.0",
-    "@types/node": "^14.11.1",
+    "@types/node": "^17.0.10",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@pushrocks/smartpromise": "^3.0.6",
+    "@apiglobal/typedrequest-interfaces": "^1.0.15",
-    "idb": "^5.0.6"
+    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/smartjson": "^4.0.6",
+    "@pushrocks/smartpromise": "^3.1.6",
+    "@pushrocks/smartrx": "^2.0.20",
+    "idb": "^7.0.0"
   },
   "browserslist": [
     "last 1 chrome versions"

test/test.typedrequestcache.browser.ts

@@ -0,0 +1,11 @@
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as webstore from '../ts/index';
+
+let testTypedrequestcache: webstore.TypedrequestCache;
+
+tap.test('first test', async () => {
+  testTypedrequestcache = new webstore.TypedrequestCache('https://test.lossless.com/typedrequest')
+  expect(testTypedrequestcache).toBeInstanceOf(webstore.TypedrequestCache);
+});
+
+tap.start();

test/test.webstore.browser.ts

@@ -8,16 +8,12 @@ tap.test('first test', async () => {
     dbName: 'mytest-db',
     storeName: 'mytest-store',
   });
-  expect(testWebstore).to.be.instanceOf(webstore.WebStore);
+  expect(testWebstore).toBeInstanceOf(webstore.WebStore);
-});
-
-tap.test('should init the database', async () => {
-  await testWebstore.init();
 });
 
 tap.test('should allow storing a string', async () => {
   await testWebstore.set('mystring', 'heythere');
-  expect(await testWebstore.get('mystring')).to.equal('heythere');
+  expect(await testWebstore.get('mystring')).toEqual('heythere');
 });
 
 tap.test('should allow storing an object', async () => {
@@ -37,8 +33,8 @@ tap.test('should overwrite a value', async () => {
 tap.test('should correctly check the existence of keys', async () => {
   const resultNotThere = await testWebstore.check('notThere');
   const resultThere = await testWebstore.check('testProp1');
-  expect(resultNotThere).to.be.false;
+  expect(resultNotThere).toBeFalse();
-  expect(resultThere).to.be.true;
+  expect(resultThere).toBeTrue();
 });
 
 tap.start();

ts/index.ts

@@ -1 +1,2 @@
+export * from './webstore.classes.typedrequestcache';
 export * from './webstore.classes.webstore';

ts/webstore.classes.typedrequestcache.ts

@@ -0,0 +1,47 @@
+import { WebStore } from './webstore.classes.webstore';
+import * as plugins from './webstore.plugins';
+
+/**
+ * a cache that can be used to store and retrieve typedrequests
+ */
+export class TypedrequestCache {
+  private webstore: WebStore;
+
+  constructor(domainArg = 'default') {
+    this.webstore = new WebStore<plugins.typedrequestInterfaces.ITypedRequest>({
+      dbName: 'trStore',
+      storeName: `trStore-${domainArg}`,
+    });
+  }
+
+  private buildKey(requestArg: plugins.typedrequestInterfaces.ITypedRequest) {
+    return plugins.smartjson.stringify({
+      method: requestArg.method,
+      request: requestArg.request,
+    });
+  }
+
+  /**
+   * stores by request
+   * @param typedrequestarg
+   */
+  public async setByRequest(
+    typedrequestArg: plugins.typedrequestInterfaces.ITypedRequest
+  ): Promise<void> {
+    if (!typedrequestArg.response) {
+      throw new Error('You cannot store requests without a response present');
+    }
+    await this.webstore.set(this.buildKey(typedrequestArg), typedrequestArg);
+  }
+
+  /**
+   * get by full tyoedrequest by partial typedrequest
+   * @param typedrequestarg
+   */
+  public async getByRequest(
+    typedrequestArg: plugins.typedrequestInterfaces.ITypedRequest
+  ): Promise<plugins.typedrequestInterfaces.ITypedRequest> {
+    const result = await this.webstore.get(this.buildKey(typedrequestArg));
+    return result;
+  }
+}

ts/webstore.classes.webstore.ts

@@ -18,7 +18,8 @@ export class WebStore<T = any> {
 
   public async init() {
     if (this.initCalled) {
-      return this.readyDeferred.promise;
+      await this.readyDeferred.promise;
+      return;
     }
     this.initCalled = true;
     this.db = await plugins.idb.openDB(this.options.dbName, 1, {
@@ -27,6 +28,7 @@ export class WebStore<T = any> {
       },
     });
     this.readyDeferred.resolve();
+    return;
   }
 
   async get(key: string): Promise<T> {
@@ -41,6 +43,7 @@ export class WebStore<T = any> {
   }
 
   async set(key: string, val: T) {
+    await this.init();
     return this.db.put(this.options.storeName, val, key);
   }
 

ts/webstore.plugins.ts

@@ -1,9 +1,15 @@
 // pushrocks scope
+import * as lik from '@pushrocks/lik';
+import * as smartjson from '@pushrocks/smartjson';
 import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartrx from '@pushrocks/smartrx';
 
-export {
+export { lik, smartjson, smartpromise, smartrx };
-  smartpromise
+
-};
+// apiglobal scope
+import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
+
+export { typedrequestInterfaces };
 
 // thirdparty scope
 import * as idb from 'idb';