1.0.27

.gitlab-ci.yml

@@ -19,23 +19,35 @@ 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
+
+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 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,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": "@apiglobal/test-sdk",
-  "version": "1.0.10",
+  "version": "1.0.27",
   "private": false,
   "description": "an sdk for testing ag handlers",
   "main": "dist_ts/index.js",
@@ -12,19 +12,20 @@
     "build": "(tsbuild --web)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.0.22",
+    "@gitzone/tsbuild": "^2.1.25",
-    "@gitzone/tstest": "^1.0.15",
+    "@gitzone/tstest": "^1.0.52",
-    "@pushrocks/tapbundle": "^3.0.7",
+    "@pushrocks/tapbundle": "^3.2.9",
-    "@types/node": "^14.0.14",
+    "@types/node": "^14.14.0",
-    "tslint": "^6.1.2",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "dependencies": {
-    "@apiglobal/sdk": "^1.0.9",
+    "@apiglobal/sdk": "^1.0.18",
-    "@apiglobal/typedrequest": "^1.0.40",
+    "@apiglobal/typedrequest": "^1.0.54",
     "@apiglobal/typedrequest-interfaces": "^1.0.15",
-    "@pushrocks/smartexpress": "^3.0.73",
+    "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/smartobject": "^1.0.3"
+    "@pushrocks/smartexpress": "^3.0.81",
+    "@pushrocks/smartobject": "^1.0.4"
   },
   "files": [
     "ts/**/*",
@@ -37,5 +38,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
 }

ts/index.ts

@@ -1,13 +1,24 @@
 import * as plugins from './test-sdk.plugins';
 import { AgTestServer } from './test-sdk.classes.testserver';
+import { AAgHandler } from '@apiglobal/sdk';
 
-export {
+export { AgTestServer };
-  AgTestServer
-};
 
 let testServer: AgTestServer;
-export const createTestServer = async (handlerArg: plugins.agSdk.AAgHandler<any>) => {
+let handler: AAgHandler<any>;
-  testServer = new AgTestServer(handlerArg);
+export const createTestServer = async (handlerArg: {
+  new (envManagerArg: plugins.agSdk.AgEnvironment): plugins.agSdk.AAgHandler<any>;
+}) => {
+  class AgEnvironement extends plugins.agSdk.AgEnvironment {
+    public qenv = new plugins.qenv.Qenv('./', './.nogit');
+    public async getEnvVar(nameArg: string) {
+      return this.qenv.getEnvVarOnDemand(nameArg);
+    }
+  }
+  handler = new handlerArg(new AgEnvironement());
+  console.log(`now checking requirements for handler with slug ${handler.slug}...`);
+  await handler.checkRequirements();
+  testServer = new AgTestServer(handler);
   await testServer.start();
   return testServer;
 };
@@ -16,7 +27,7 @@ export const testFire = <
   A extends plugins.agSdk.AAgHandler<any>,
   T extends plugins.typedrequestInterfaces.ITypedRequest
 >(
-  slug: A['slug'],
+  slugArg: A['slug'],
   methodArg: T['method'],
   requestArg: T['request']
 ) => {
@@ -27,18 +38,27 @@ export const testFire = <
     throw new Error('you need to start the testServer first!');
   }
   const typedRequest = new plugins.typedrequest.TypedRequest<T>(
-    `https://localhost:${testServer.server.options.port}`,
+    `http://localhost:${testServer.server.options.port}/${slugArg}`,
     methodArg
   );
   const responsePromise = typedRequest.fire(requestArg);
   const expect = async (expectedResponseArg: T['response']) => {
     const actualResponse = await responsePromise;
-    const comparisonResult = plugins.smartobject.compareObjects(expectedResponseArg, actualResponse);
+    const comparisonResult = plugins.smartobject.compareObjects(
+      expectedResponseArg,
+      actualResponse
+    );
     let throwErrorBool = false;
     if (comparisonResult.divergingProperties.length > 0) {
       console.log(`The following properties diverged:`);
       console.log(comparisonResult.divergingProperties);
-      throwErrorBool = true;
+      for (const divProperty of comparisonResult.divergingProperties) {
+        if (expectedResponseArg[divProperty] !== 'maydiverge') {
+          throwErrorBool = true;
+        } else {
+          console.log(`${divProperty} may diverge, not throwing for this one`);
+        }
+      }
     }
     if (comparisonResult.missingProperties.length > 0) {
       console.log(`The following properties diverged:`);
@@ -46,16 +66,23 @@ export const testFire = <
       throwErrorBool = true;
     }
     if (throwErrorBool) {
+      console.log('Result: response did not comply');
+      console.log('-> expected:');
+      console.log(expectedResponseArg);
+      console.log('-> but actually received:');
+      console.log(actualResponse);
       throw new Error('response did not comply');
     }
+    return actualResponse;
   };
   return {
-    expect
+    expect,
   };
 };
 
 export const stopTestServer = async () => {
   if (testServer) {
     await testServer.stop();
+    await handler.stop();
   }
 };

ts/test-sdk.classes.testserver.ts

@@ -6,29 +6,37 @@ export class AgTestServer {
 
   constructor(handlerArg?: plugins.agSdk.AAgHandler<any>) {
     if (handlerArg) {
-      this.handlers.push(handlerArg);
+      this.addAgHandler(handlerArg);
     }
   }
 
   public async addAgHandler(handlerArg: plugins.agSdk.AAgHandler<any>) {
     this.handlers.push(handlerArg);
-    await this.stop();
+    console.log(`added handler with slug ${handlerArg.slug}`);
-    await this.start();
+    if (this.server && this.server.serverStatus === 'running') {
+      await this.stop();
+      await this.start();
+    }
   }
 
   public async start() {
     this.server = new plugins.smartexpress.Server({
       cors: true,
+      forceSsl: false,
       defaultAnswer: async () => 'apiglobal testserver',
       domain: 'localhost',
       port: 3000,
-      forceSsl: false,
     });
     for (const handlerArg of this.handlers) {
+      console.log(`found handler with slug ${handlerArg.slug}`);
+      await handlerArg.start();
+      console.log(`started handler with slug ${handlerArg.slug}`);
+      const slugroute = `/${handlerArg.slug}`;
       this.server.addRoute(
-        `/${handlerArg.slug}`,
+        slugroute,
         new plugins.smartexpress.HandlerTypedRouter(handlerArg.typedrouter)
       );
+      console.log(`added slugroute ${slugroute}`);
     }
     await this.server.start();
   }

ts/test-sdk.plugins.ts

@@ -6,7 +6,8 @@ import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
 export { agSdk, typedrequest, typedrequestInterfaces };
 
 // pushrocks scope
+import * as qenv from '@pushrocks/qenv';
 import * as smartexpress from '@pushrocks/smartexpress';
 import * as smartobject from '@pushrocks/smartobject';
 
-export { smartexpress, smartobject };
+export { qenv, smartexpress, smartobject };