@siemsiem/tonpleun 0.1.1 → 1.0.0

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/tsconfig.json

@@ -1,39 +0,0 @@
-{
-  // Visit https://aka.ms/tsconfig to read more about this file
-  "compilerOptions": {
-    // File Layout
-    "rootDir": "./src",
-    "outDir": "./dist",
-    // Environment Settings
-    // See also https://aka.ms/tsconfig/module
-    "module": "nodenext",
-    "target": "esnext",
-    "types": [],
-    // For nodejs:
-    // "lib": ["esnext"],
-    // "types": ["node"],
-    // and npm install -D @types/node
-    // Other Outputs
-    "sourceMap": true,
-    "declaration": true,
-    "declarationMap": true,
-    // Stricter Typechecking Options
-    "noUncheckedIndexedAccess": true,
-    "exactOptionalPropertyTypes": true,
-    // Style Options
-    // "noImplicitReturns": true,
-    // "noImplicitOverride": true,
-    // "noUnusedLocals": true,
-    // "noUnusedParameters": true,
-    // "noFallthroughCasesInSwitch": true,
-    // "noPropertyAccessFromIndexSignature": true,
-    // Recommended Options
-    "strict": true,
-    "jsx": "react-jsx",
-    "verbatimModuleSyntax": true,
-    "isolatedModules": true,
-    "noUncheckedSideEffectImports": true,
-    "moduleDetection": "force",
-    "skipLibCheck": true,
-  }
-}

package/webui/clientLib.js

@@ -1,186 +0,0 @@
-// Browser versie
-
-var requestType;
-(function (requestType) {
-    requestType[requestType["Init"] = 0] = "Init";
-    requestType[requestType["Success"] = 1] = "Success";
-    requestType[requestType["Error"] = 2] = "Error";
-    requestType[requestType["RegisterService"] = 3] = "RegisterService";
-    requestType[requestType["GetServiceResponse"] = 4] = "GetServiceResponse";
-    requestType[requestType["GetService"] = 5] = "GetService";
-    requestType[requestType["RegisterConifg"] = 6] = "RegisterConifg";
-    requestType[requestType["SetConfig"] = 7] = "SetConfig";
-})(requestType || (requestType = {}));
-
-var stringPacketOptions;
-(function (stringPacketOptions) {
-    stringPacketOptions[stringPacketOptions["Error"] = 0] = "Error";
-    stringPacketOptions[stringPacketOptions["initSuccess"] = 1] = "initSuccess";
-    stringPacketOptions[stringPacketOptions["registerServiceSuccess"] = 2] = "registerServiceSuccess";
-    stringPacketOptions[stringPacketOptions["getServiceSuccess"] = 3] = "getServiceSuccess";
-    stringPacketOptions[stringPacketOptions["registerConfigSuccess"] = 4] = "registerConfigSuccess";
-    stringPacketOptions[stringPacketOptions["setConfigSuccess"] = 5] = "setConfigSuccess";
-})(stringPacketOptions || (stringPacketOptions = {}));
-
-const url = "ws://localhost:8765";
-export let ws;
-const serviceCallbacks = new Map();
-const localConfigs = new Map();
-
-export async function awaitServiceMessage(expectedFor) {
-    return new Promise((resolve) => {
-        const handler = (event) => {
-            try {
-                const rawPacket = JSON.parse(event.data);
-                if (rawPacket.type === requestType.Success) {
-                    const data = rawPacket.data;
-                    if (data.for === expectedFor) {
-                        ws.removeEventListener('message', handler);
-                        resolve(data);
-                    }
-                }
-            } catch (e) {
-                // ignore malformed packets
-            }
-        };
-        ws.addEventListener('message', handler);
-    });
-}
-
-function WsSend(ws, data) {
-    if (ws && ws.readyState === WebSocket.OPEN) {
-        ws.send(JSON.stringify(data));
-    }
-}
-
-export async function registerService(ServiceId, args, callback) {
-    WsSend(ws, { type: requestType.RegisterService, data: { ServiceId, args } });
-    serviceCallbacks.set(ServiceId, callback);
-    return await awaitServiceMessage(stringPacketOptions.registerServiceSuccess);
-}
-
-export async function registerConfigItem(name, description, value, idthing) {
-    WsSend(ws, {
-        type: requestType.RegisterConifg,
-        data: {
-            name: name,
-            description: description,
-            defaultValue: value,
-            type: typeof value,
-            id: idthing
-        }
-    });
-    return await awaitServiceMessage(stringPacketOptions.registerConfigSuccess).then((msg) => {
-        localConfigs.set(idthing, {
-            name,
-            id: idthing,
-            description,
-            type: typeof value,
-            defaultValue: value
-        });
-        return msg;
-    });
-}
-
-export async function SetConfigItem(idthing, newValue, clientId) {
-    WsSend(ws, {
-        type: requestType.SetConfig,
-        data: {
-            ClientId: clientId,
-            id: idthing,
-            newValue: newValue
-        }
-    });
-    return await awaitServiceMessage(stringPacketOptions.setConfigSuccess).then((msg) => {
-        const existing = localConfigs.get(idthing);
-        if (existing) {
-            localConfigs.set(idthing, { ...existing, value: newValue });
-        }
-        return msg;
-    });
-}
-
-export async function getService(ServiceId, ClientId, inputs) {
-    const connectionId =
-        (typeof crypto !== 'undefined' && crypto.randomUUID)
-            ? crypto.randomUUID()
-            : `${Date.now()}-${Math.random().toString(16).slice(2)}`;
-
-    WsSend(ws, { type: requestType.GetService, data: { ClientId, ServiceId, args: inputs, connectionId } });
-
-    return new Promise((resolve) => {
-        const handler = (event) => {
-            try {
-                const rawPacket = JSON.parse(event.data);
-                if (rawPacket.type === requestType.GetServiceResponse) {
-                    const data = rawPacket.data;
-                    if (data.serviceId === ServiceId && data.connectionId === connectionId) {
-                        ws.removeEventListener('message', handler);
-                        resolve(data.result);
-                    }
-                }
-            } catch (e) {
-                // ignore malformed packets
-            }
-        };
-        ws.addEventListener('message', handler);
-    });
-}
-
-export async function initializeClient(ClientId) {
-    ws = new WebSocket(url);
-
-    ws.addEventListener('open', () => {
-        console.log('Verbonden met tonpleun server.');
-        WsSend(ws, { type: requestType.Init, data: { ClientId } });
-    });
-
-    ws.addEventListener('close', () => {
-        console.log('Verbinding met tonpleun server gesloten.');
-    });
-
-    ws.addEventListener('error', (event) => {
-        console.error('Fout opgetreden:', event);
-        try { ws.close(); } catch { }
-    });
-
-    ws.addEventListener('message', async (event) => {
-        try {
-            const rawPacket = JSON.parse(event.data);
-            if (rawPacket.type === requestType.GetService) {
-                const serviceData = rawPacket.data;
-                const callback = serviceCallbacks.get(serviceData.ServiceId);
-                if (callback) {
-                    try {
-                        const result = await Promise.resolve(callback(...serviceData.args));
-                        WsSend(ws, {
-                            type: requestType.GetServiceResponse,
-                            data: {
-                                result,
-                                ServiceId: serviceData.ServiceId,
-                                connectionId: serviceData.connectionId,
-                            }
-                        });
-                    } catch (error) {
-                        console.error(`Fout bij uitvoeren van service ${serviceData.ServiceId}:`, error);
-                    }
-                }
-            } else if (rawPacket.type === requestType.SetConfig) {
-                const cfg = rawPacket.data;
-                const existing = localConfigs.get(cfg.id);
-                if (existing) {
-                    localConfigs.set(cfg.id, { ...existing, value: cfg.newValue });
-                }
-            }
-        } catch (e) {
-            // ignore malformed packets
-        }
-    });
-
-    return await awaitServiceMessage(stringPacketOptions.initSuccess);
-}
-
-export function getConfigValue(id) {
-    const item = localConfigs.get(id);
-    return item ? (item.value ?? item.defaultValue) : undefined;
-}

package/webui/index.html

@@ -1,22 +0,0 @@
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Tonpleun webui</title>
-    <script type="module" src="main.js"></script>
-</head>
-
-<body id="out">
-    <div id="buttonList">
-    </div>
-    <div id="container"></div>
-    <script>function onchangeOfthing(newValue) {
-            const container = document.getElementById('container');
-            const localdata = window.dataMap.get(newValue);
-            container.innerText = JSON.stringify(localdata);
-        }</script>
-
-</body>
-
-</html>

package/webui/main.js

@@ -1,22 +0,0 @@
-import { getService, initializeClient } from "./clientLib.js";
-async function main() {
-    await initializeClient('webUI');
-    getData();
-    setInterval(getData, 1000);
-}
-async function getData() {
-    const data = await getService('getConfigs', 'tonpleun', []);
-    console.log('data update')
-    window.tonpleunData = data;
-    update(window.tonpleunData);
-
-}
-function update(data) {
-    window.dataMap = new Map(Object.entries(data));
-    document.getElementById('buttonList').innerHTML = '';
-    window.dataMap.forEach((dinges, name) => {
-        console.log(name, dinges);
-        document.getElementById('buttonList').innerHTML += '<button onclick="onchangeOfthing(\'' + name + '\')">' + name + '</button>';
-    });
-}
-main();