1.0.22

.gitlab-ci.yml

@@ -36,6 +36,7 @@ auditProductionDependencies:
     - 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

package.json

@@ -1,28 +1,29 @@
 {
   "name": "@designestate/dees-comms",
-  "version": "1.0.5",
+  "version": "1.0.22",
   "private": false,
   "description": "a comms module for communicating within the DOM",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "author": "Lossless GmbH",
   "license": "MIT",
   "scripts": {
     "test": "(tstest test/ --web)",
-    "build": "(tsbuild --web)"
+    "build": "(tsbuild --web --allowimplicitany && tsbundle npm)"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tsbuild": "^2.1.61",
-    "@gitzone/tsbundle": "^1.0.78",
+    "@gitzone/tsbundle": "^1.0.102",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tstest": "^1.0.70",
-    "@pushrocks/tapbundle": "^3.2.9",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/node": "^14.11.5",
+    "@types/node": "^17.0.23"
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.15.0"
   },
   "dependencies": {
-    "@apiglobal/typedrequest": "^1.0.50",
+    "@apiglobal/typedrequest": "^2.0.3",
-    "@apiglobal/typedrequest-interfaces": "^1.0.15"
+    "@apiglobal/typedrequest-interfaces": "^1.0.15",
+    "@pushrocks/smartdelay": "^2.0.13",
+    "broadcast-channel": "^3.7.0"
   },
   "files": [
     "ts/**/*",

test/test.both.ts

@@ -0,0 +1,38 @@
+import { expect, tap } from '@pushrocks/tapbundle';
+import * as deesComms from '../ts/index.js';
+
+let deesCommsTest: deesComms.DeesComms;
+let deesCommsTest2: deesComms.DeesComms;
+
+tap.test('first test', async (tools) => {
+  deesCommsTest = new deesComms.DeesComms();
+  deesCommsTest2 = new deesComms.DeesComms();
+  let counter = 1;
+  deesCommsTest2.createTypedHandler<any>('test', async (requestData) => {
+    console.log(`got the request ${counter++}`);
+    return { hitheretoo: `greetings to ${requestData.hithere}` };
+  });
+
+  // lets fire a request
+  const typedrequest = deesCommsTest.createTypedRequest<any>('test');
+  const result = await typedrequest.fire({
+    hithere: 'hello',
+  });
+  console.log(JSON.stringify(result));
+
+  // lets fire a request
+  const typedrequest2 = deesCommsTest.createTypedRequest<any>('test2');
+  // TODO: return response after timeout
+  /* const result2 = await typedrequest2.fire({
+    hithere: 'hello',
+  });
+  console.log(JSON.stringify(result2)); */
+});
+
+tap.test('should end on nodejs', async (toolsArg) => {
+  if (globalThis.process) {
+    toolsArg.delayFor(2000).then(() => globalThis.process.exit(0));
+  }
+})
+
+tap.start();

test/test.browser.ts

@@ -1,22 +0,0 @@
-import { expect, tap } from '@pushrocks/tapbundle';
-import * as deesComms from '../ts/index';
-
-let deesCommsTest: deesComms.DeesComms;
-
-tap.test('first test', async (tools) => {
-  deesCommsTest = new deesComms.DeesComms();
-  deesCommsTest.createTypedHandler<any>('test', async (requestData) => {
-    return {};
-  });
-
-  // lets fire a request
-  const typedrequest = deesCommsTest.createTypedRequest<any>('test');
-  const resultPromise = typedrequest.fire({
-    method: 'test',
-    request: {},
-    response: {}
-  });
-  await tools.delayFor(2000);
-});
-
-tap.start();

ts/dees-comms.classes.deescomms.ts

@@ -1,21 +1,37 @@
 import { TypedRequest } from '@apiglobal/typedrequest';
-import * as plugins from './dees-comms.plugins';
+import * as plugins from './dees-comms.plugins.js';
+
+let BroadcastChannel = globalThis.BroadcastChannel;
+if (!BroadcastChannel) {
+  BroadcastChannel = plugins.BroadCastChannelPolyfill as any;
+}
 
 /**
  * a comm class for client side communication between workers and tabs.
  */
 export class DeesComms {
+  private broadcastChannel = new BroadcastChannel('dees-comms');
+  
   // sending messages
-  private postChannel = new BroadcastChannel('dees-comms');
   public typedrouter = new plugins.typedrequest.TypedRouter();
+  public typedtarget = new plugins.typedrequest.TypedTarget({
+    postMethodWithTypedRouter: async (messageArg) => {
+      this.postMessage(messageArg);
+    },
+    typedRouterRef: this.typedrouter,
+  });
 
-  private subscriptionChannel = new BroadcastChannel('dees-comms');
+  // receiving messages
-
   constructor() {
-    this.subscriptionChannel.onmessage = (eventArg) => {
+    this.broadcastChannel.onmessage = async (eventArg) => {
-      const message = eventArg.data;
+      const message = (eventArg as any).method ? eventArg : eventArg.data;
       console.log(JSON.stringify(message));
-      this.typedrouter.routeAndAddResponse(message);
+      const response = await this.typedrouter.routeAndAddResponse(message);
+      if (response && !response.error) {
+        this.postMessage(response);
+      } else {
+        // console.log(response);
+      }
     };
   }
 
@@ -25,13 +41,7 @@ export class DeesComms {
   public createTypedRequest<T extends plugins.typedrequestInterfaces.ITypedRequest>(
     methodName: T['method']
   ): TypedRequest<T> {
-    const typedrequest = new plugins.typedrequest.TypedRequest(
+    const typedrequest = new plugins.typedrequest.TypedRequest(this.typedtarget, methodName);
-      async (messageArg) => {
-        this.postMessage(messageArg);
-      },
-      methodName,
-      this.typedrouter
-    );
     return typedrequest;
   }
 
@@ -41,7 +51,7 @@ export class DeesComms {
   public async postMessage<T = plugins.typedrequestInterfaces.ITypedRequest>(
     messageArg: T
   ): Promise<void> {
-    this.postChannel.postMessage(messageArg);
+    this.broadcastChannel.postMessage(messageArg);
   }
 
   /**
@@ -51,6 +61,8 @@ export class DeesComms {
     methodArg: T['method'],
     handlerFunction: plugins.typedrequest.THandlerFunction<T>
   ) {
-    this.typedrouter.addTypedHandler(new plugins.typedrequest.TypedHandler<T>(methodArg, handlerFunction));
+    this.typedrouter.addTypedHandler(
+      new plugins.typedrequest.TypedHandler<T>(methodArg, handlerFunction)
+    );
   }
 }

ts/dees-comms.deescommsmessage.ts

@@ -1,4 +1,4 @@
-import * as plugins from './dees-comms.plugins';
+import * as plugins from './dees-comms.plugins.js';
 
 /**
  * a message that can be sent

ts/dees-comms.plugins.ts

@@ -1,5 +1,13 @@
 // pushrocks scope
+import * as smartdelay from '@pushrocks/smartdelay';
 import * as typedrequestInterfaces from '@apiglobal/typedrequest-interfaces';
 import * as typedrequest from '@apiglobal/typedrequest';
 
-export { typedrequestInterfaces, typedrequest };
+export { smartdelay, typedrequestInterfaces, typedrequest };
+
+// third party scope
+import { BroadcastChannel as BroadCastChannelPolyfill } from 'broadcast-channel';
+
+export {
+  BroadCastChannelPolyfill
+}

ts/index.ts

@@ -1 +1 @@
-export * from './dees-comms.classes.deescomms';
+export * from './dees-comms.classes.deescomms.js';

tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
+  }
+}

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}