@siemsiem/tonpleun 0.1.2 → 1.0.0

package/src/clientLib.ts

@@ -1,7 +1,10 @@
 import WebSocket from 'ws';
 import { randomUUID } from 'crypto';
-import { requestType, stringPacketOptions, type getServicePacketClient, type GetServiceResponsePacketToServer, type GetServiceResponsePacketToClient, type InitPacket, type packet, type StringPacket, type registerConfigPacket, type setConfigPacket, type fakeTypeType } from './types.js';
+import { requestType, stringPacketOptions, type getServicePacketClient, type GetServiceResponsePacketToServer, type GetServiceResponsePacketToClient, type InitPacket, type packet, type StringPacket, type registerConfigPacket, type setConfigPacket, type fakeTypeType, type namedFakeType, InitResponsePacket } from './types.js';
 import { WsSend } from './helpers.js';
+import { assert } from 'console';
+import { writeFileSync, mkdirSync } from 'fs';
+import { dirname } from 'path';
 
 const url = "ws://localhost:8765";
 export let ws: WebSocket;
@@ -9,6 +12,22 @@ const serviceCallbacks = new Map<string, (...args: any[]) => any>();
 let clinetIDStore = "error";
 const localConfigs = new Map<string, registerConfigPacket>();
 
+const VERSION = {
+    MAJOR: 1,
+    MINOR: 1,
+    PATCH: 2
+}
+export async function genHelper() {
+    console.info('genHelper called');
+    const result = await getService('genHelper', 'tonpleun', []);
+
+    const outPath = dirname('./src/GEN.ts');
+    mkdirSync(outPath, { recursive: true });
+    writeFileSync('./src/GEN.ts', result);
+    console.info('GEN.ts gegenereerd in ./src/GEN.ts');
+    return result;
+}
+
 export async function awaitServiceMessage(expectedFor: stringPacketOptions): Promise<StringPacket> {
     return new Promise<StringPacket>((resolve) => {
         const handler = (raw: Buffer) => {
@@ -48,7 +67,7 @@ export async function SetConfigItem(idthing: string, newValue: string, clientId?
     });
 }
 
-export async function registerService(ServiceId: string, args: fakeTypeType[], callback: (...args: any[]) => any) {
+export async function registerService(ServiceId: string, args: namedFakeType[], callback: (...args: any[]) => any) {
     WsSend(ws, { type: requestType.RegisterService, data: { ServiceId, args } });
     serviceCallbacks.set(ServiceId, callback);
     return new Promise<void>((resolve) => {
@@ -120,11 +139,25 @@ export async function initializeClient(ClientId: string) {
         }
     });
 
-    // Wacht tot de verbinding is geopend
-    return new Promise<void>((resolve) => {
-        awaitServiceMessage(stringPacketOptions.initSuccess).then(() => {
-            resolve();
-        });
+    return new Promise<StringPacket>((resolve) => {
+        const handler = (raw: Buffer) => {
+            const rawPacket = JSON.parse(raw.toString()) as packet;
+            if (rawPacket.type === requestType.Init) {
+                const data = rawPacket.data as InitResponsePacket;
+                assert(data.versionMajor === VERSION.MAJOR, `Major versie mismatch: Client versie is ${VERSION.MAJOR}, server versie is ${data.versionMajor}.`);
+                if (data.versionMinor !== VERSION.MINOR) {
+                    console.warn(`Waarschuwing: Minor versie mismatch: Client versie is ${VERSION.MINOR}, server versie is ${data.versionMinor}. Mogelijk zijn er incompatibiliteiten.`);
+                }
+                if (data.versionPatch !== VERSION.PATCH) {
+                    console.warn(`Waarschuwing: Patch versie mismatch: Client versie is ${VERSION.PATCH}, server versie is ${data.versionPatch}. Mogelijk zijn er bugs of ontbrekende functies.`);
+                }
+                ws.removeListener('message', handler);
+                console.info('Client geïnitialiseerd met versie:', data.versionMajor, data.versionMinor, data.versionPatch);
+                console.info('gebruik via GEN.ts is aanbevolen')
+                resolve({ for: stringPacketOptions.initSuccess, msg: 'Init succesvol' } as StringPacket);
+            }
+        };
+        ws.on('message', handler);
     });
 }
 

package/src/server.ts

@@ -1,17 +1,43 @@
 import { log, successPacketBuilder, WsSend } from './helpers.js';
 import { WebSocketServer, WebSocket } from 'ws';
-import { requestType, stringPacketOptions, type args, type getServicePacket, type getServicePacketClient, type GetServiceResponsePacketToClient, type InitPacket, type packet, type registerConfigPacket, type RegisterServicePacket, type setConfigPacket } from './types.js';
+import { InitResponsePacket, requestType, stringPacketOptions, type namedFakeType, type getServicePacket, type getServicePacketClient, type GetServiceResponsePacketToClient, type InitPacket, type packet, type registerConfigPacket, type RegisterServicePacket, type setConfigPacket } from './types.js';
 
 function mapToObject(map: Map<any, any>) {
   return Object.fromEntries([...map.entries()].map(([kMaxLength, v]): any => [kMaxLength, v instanceof Map ? mapToObject(v) : v]))
 }
 
+const VERSION = {
+  MAJOR: 1,
+  MINOR: 1,
+  PATCH: 2
+}
+
 let clients: Record<string, WebSocket> = {};
-let services = new Map<string, Map<string, args>>();
+let services = new Map<string, Map<string, namedFakeType[]>>();
 let configs = new Map<string, Map<string, registerConfigPacket>>();
 let localServices = new Map<string, (...args: any[]) => any>();
 localServices.set('getServices', (...args: any[]) => { return mapToObject(services) })
 localServices.set('getConfigs', (...args: any[]) => { return mapToObject(configs) })
+localServices.set('genHelper', (...args: any[]) => {
+  let output = '/* Dit bestand is automatisch gegenereerd door Tonpleun. Wijzigingen hierin worden overschreven. */\n\n';
+  output += `import { getService } from './clientLib.js';\n\n`;
+
+  services.forEach((serviceMap, clientId) => {
+    output += `// Services for client: ${clientId}\n`;
+    serviceMap.forEach((argTypes, serviceId) => {
+      output += `// ${serviceId}\n`;
+      output += `export async function ${serviceId}(`;
+      output += argTypes.map((type, _) => `${type.name}: ${type.type}`).join(', ');
+      output += `): Promise<any> {\n`;
+      output += `    return await getService('${serviceId}', '${clientId}', [${argTypes.map((arg, _) => `${arg.name}`).join(', ')}]);\n`;
+      output += `}\n\n`;
+    });
+  });
+
+  output += `// Tonpleun versie: ${VERSION.MAJOR}.${VERSION.MINOR}.${VERSION.PATCH}\n`;
+  output += `// Genereer dit bestand opnieuw met de genHelper service indien services zijn gewijzigd.\n`;
+  return output;
+});
 // Map a unique connectionId to the original requester WebSocket
 const connectionMap = new Map<string, WebSocket>();
 const wsServer = new WebSocketServer({ host: '0.0.0.0', port: 8765 });
@@ -31,7 +57,7 @@ wsServer.on('connection', (ws, req) => {
         // initialize per-client config store to avoid undefined access
         configs.set(id, new Map())
         log(id, 'ws init gedaan, client id gegeven. ip: ', req.socket.remoteAddress);
-        WsSend(ws, successPacketBuilder('init gedaan.', stringPacketOptions.initSuccess));
+        WsSend(ws, { type: requestType.Init, data: { versionMajor: VERSION.MAJOR, versionMinor: VERSION.MINOR, versionPatch: VERSION.MINOR } as InitResponsePacket } as packet);
         break;
       case requestType.RegisterService:
         data = jsonData.data as RegisterServicePacket;

package/src/test3.ts

@@ -0,0 +1,11 @@
+import { getService, initializeClient, SetConfigItem, genHelper } from './clientLib.js'
+import { echo } from './GEN.js';
+import assert from 'node:assert/strict';
+
+async function main() {
+    await initializeClient('Client3');
+    echo('Hello from Client3').then((result) => {
+        assert.equal(result, 'pindakaas');
+    });
+}
+main();

package/src/types.ts

@@ -10,6 +10,10 @@ export enum requestType {
 }
 export enum stringPacketOptions { Error, initSuccess, registerServiceSuccess, getServiceSuccess, registerConfigSuccess, setConfigSuccess };
 export type fakeTypeType = "string" | "number" | "bigint" | "boolean" | "symbol" | "undefined" | "object" | "function";
+export type namedFakeType = {
+    name: string,
+    type: fakeTypeType
+};
 export type packet = {
     type: requestType,
     data: any,
@@ -18,6 +22,12 @@ export type packet = {
 export type InitPacket = {
     ClientId: string,
 }
+// requestType.Init response
+export type InitResponsePacket = {
+    versionMajor: number,
+    versionMinor: number,
+    versionPatch: number,
+}
 // requestType.Success en requestType.Error
 export type StringPacket = {
     msg: string,
@@ -26,7 +36,7 @@ export type StringPacket = {
 // requestType.RegisterService
 export type RegisterServicePacket = {
     ServiceId: string,
-    args: fakeTypeType[]
+    args: namedFakeType[]
 }
 // requestType.GetService ( client1 -> server)
 export type getServicePacket = {
@@ -35,7 +45,6 @@ export type getServicePacket = {
     connectionId: string,
     args: any[],
 }
-export type args = fakeTypeType[];
 // requestType.getService (server -> client2)
 export type getServicePacketClient = {
     ServiceId: string,

package/dist/client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":""}

package/dist/client2.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client2.d.ts","sourceRoot":"","sources":["../src/client2.ts"],"names":[],"mappings":""}

package/dist/clientLib.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"clientLib.d.ts","sourceRoot":"","sources":["../src/clientLib.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAE3B,OAAO,EAAe,mBAAmB,EAA2I,KAAK,YAAY,EAAmD,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAI9R,eAAO,IAAI,EAAE,EAAE,SAAS,CAAC;AAKzB,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,mBAAmB,GAAG,OAAO,CAAC,YAAY,CAAC,CAcjG;AACD,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,iBAUzG;AACD,wBAAsB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,iBAWvF;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,iBAQ/G;AACD,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAgBjG;AAED,wBAAsB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,iBAmDtD;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,GAAG,GAAG,SAAS,CAG1D"}

package/dist/helpers.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,IAAI,CAAC;AAChC,OAAO,EAAe,mBAAmB,EAAE,KAAK,MAAM,EAAqB,MAAM,YAAY,CAAC;AAC9F,wBAAgB,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,QAGxC;AACD,wBAAgB,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,QAEjD;AACD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,mBAAmB,GACgB,MAAM,CAC7F"}

package/dist/server.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":""}

package/dist/types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACnB,IAAI,IAAA;IACJ,OAAO,IAAA;IACP,KAAK,IAAA;IACL,eAAe,IAAA;IACf,kBAAkB,IAAA;IAClB,UAAU,IAAA;IACV,cAAc,IAAA;IACd,SAAS,IAAA;CACZ;AACD,oBAAY,mBAAmB;IAAG,KAAK,IAAA;IAAE,WAAW,IAAA;IAAE,sBAAsB,IAAA;IAAE,iBAAiB,IAAA;IAAE,qBAAqB,IAAA;IAAE,gBAAgB,IAAA;CAAE;AAC1I,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,UAAU,CAAC;AACvH,MAAM,MAAM,MAAM,GAAG;IACjB,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,GAAG,CAAC;CACb,CAAA;AAED,MAAM,MAAM,UAAU,GAAG;IACrB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,mBAAmB,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,YAAY,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AACD,MAAM,MAAM,IAAI,GAAG,YAAY,EAAE,CAAC;AAElC,MAAM,MAAM,sBAAsB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACxB,CAAA;AAGD,MAAM,MAAM,gCAAgC,GAAG;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;CACxB,CAAA;AAGD,MAAM,MAAM,gCAAgC,GAAG;IAC3C,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACxB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,GAAG,CAAC;IAClB,KAAK,CAAC,EAAE,GAAG,CAAA;CACd,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,GAAG,CAAC;IACd,EAAE,EAAE,MAAM,CAAA;CACb,CAAA"}

package/dist/v1/client.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/v1/client.ts"],"names":[],"mappings":""}

package/dist/v1/lib.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/v1/lib.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,IAAI,CAAC;AAI3B,MAAM,MAAM,OAAO,GAAG;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,GAAG,CAAC;CAEf,CAAC;AAEF,oBAAY,UAAU;IAClB,GAAG,IAAA;IACH,IAAI,IAAA;IACJ,GAAG,IAAA;CACN;AAED,eAAO,IAAI,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,CAAC;AAE5C,eAAO,IAAI,EAAE,EAAE,SAAS,CAAC;AAEzB,eAAO,IAAI,cAAc,EAAE,CAAC,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,IAAW,CAAC;AAC/D,eAAO,IAAI,YAAY,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,IAAW,CAAC;AAC9D,eAAO,IAAI,YAAY,EAAE,OAAe,CAAC;AA0CzC,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,QAYhG;AACD,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAc1H;AAED,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,EAAE,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,QAaxH;AAED,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,CAenF;AAED,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAiBzH;AACD,wBAAsB,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,oBAezD;AAED,wBAAsB,gBAAgB,kBA2BrC"}

package/dist/v1/main.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/v1/main.ts"],"names":[],"mappings":""}

package/dist/v1/test2.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"test2.d.ts","sourceRoot":"","sources":["../../src/v1/test2.ts"],"names":[],"mappings":""}