split Express and Next.js clients

Author: GyulyVGC

client_common/package-lock.json

@@ -0,0 +1,62 @@
+{
+  "version": "0.1.0",
+  "license": "AGPL-3.0-only",
+  "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "src",
+    "proto"
+  ],
+  "engines": {
+    "node": ">=9"
+  },
+  "scripts": {
+    "start": "tsdx watch",
+    "build": "tsdx build --format esm",
+    "test": "tsdx test",
+    "lint": "tsdx lint",
+    "prepare": "./proto-gen.sh & tsdx build",
+    "size": "size-limit",
+    "analyze": "size-limit --why"
+  },
+  "dependencies": {
+    "@grpc/grpc-js": "^1.3.2",
+    "@grpc/proto-loader": "^0.6.2"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "tsdx lint"
+    }
+  },
+  "prettier": {
+    "printWidth": 80,
+    "semi": true,
+    "singleQuote": true,
+    "trailingComma": "es5"
+  },
+  "name": "@nullnet/appguard-client-common",
+  "author": "Giuliano Bellini s294739",
+  "module": "dist/appguard-client-common.esm.js",
+  "size-limit": [
+    {
+      "path": "dist/appguard-client-common.cjs.production.min.js",
+      "limit": "10 KB"
+    },
+    {
+      "path": "dist/appguard-client-common.esm.js",
+      "limit": "10 KB"
+    }
+  ],
+  "devDependencies": {
+    "@size-limit/preset-small-lib": "^11.1.4",
+    "husky": "^9.1.5",
+    "size-limit": "^11.1.4",
+    "tsdx": "^0.14.1",
+    "tslib": "^2.7.0",
+    "typescript": "^5.5.4"
+  },
+  "publishConfig": {
+    "registry": "https://npm.nullnet.ai"
+  }
+}

client_common/package.json

@@ -1,3 +1,3 @@
 #!/bin/bash
 rm -rf src/proto
-./node_modules/.bin/proto-loader-gen-types --grpcLib=@grpc/grpc-js --outDir=src/proto/ ./proto/appguard.proto
+./node_modules/.bin/proto-loader-gen-types --grpcLib=@grpc/grpc-js --outDir=./src/proto/ ./proto/appguard.proto

proto-gen.sh renamed to client_common/proto-gen.sh

@@ -1,4 +1,3 @@
-import path from 'path'
 import * as grpc from '@grpc/grpc-js'
 import * as protoLoader from '@grpc/proto-loader'
 import type {ProtoGrpcType} from './proto/appguard'
@@ -13,6 +12,7 @@ import {HeartbeatResponse__Output} from "./proto/appguard/HeartbeatResponse";
 import {DeviceStatus} from "./proto/appguard/DeviceStatus";
 import {TOKEN_FILE} from "./auth";
 import {AppGuardFirewall, AppGuardFirewall__Output} from "./proto/appguard/AppGuardFirewall";
+import {FirewallPolicy} from "./proto/appguard/FirewallPolicy";
 
 const PROTO_FILE = process.cwd() + '/../proto/appguard.proto'
 const packageDef = protoLoader.loadSync(PROTO_FILE)
@@ -28,13 +28,25 @@ const grpcObj = (grpc.loadPackageDefinition(packageDef) as unknown) as ProtoGrpc
 
 // process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'
 
+export type AppGuardConfig = {
+    host: string;
+    port: number;
+    tls: boolean;
+    timeout?: number;
+    defaultPolicy: FirewallPolicy;
+    firewall: string;
+};
+
 export class AppGuardService {
     private client: AppGuardClient
-    constructor(host: string, port: number, tls: boolean){
+    private config: AppGuardConfig
+
+    constructor(config: AppGuardConfig){
         this.client = new grpcObj.appguard.AppGuard(
-            `${host}:${port}`,
-            tls ? grpc.credentials.createSsl() : grpc.credentials.createInsecure()
-        )
+            `${config.host}:${config.port}`,
+            config.tls ? grpc.credentials.createSsl() : grpc.credentials.createInsecure()
+        );
+        this.config = config;
     }
     async onModuleInit(){
         return new Promise((resolve, reject) => {
@@ -62,6 +74,7 @@ export class AppGuardService {
             })
         })
     }
+
     async handleHttpResponse(req: AppGuardHttpResponse): Promise<AppGuardResponse__Output>{
         return new Promise((resolve, reject) => {
             this.client.handleHttpResponse(req, (err, res) => {
@@ -73,6 +86,7 @@ export class AppGuardService {
             })
         })
     }
+
     async handleTcpConnection(req: AppGuardTcpConnection): Promise<AppGuardTcpResponse__Output>{
         return new Promise((resolve, reject) => {
             this.client.handleTcpConnection(req, (err, res) => {
@@ -84,6 +98,36 @@ export class AppGuardService {
             })
         })
     }
+
+    firewallPromise = (promise: Promise<AppGuardResponse__Output>): Promise<AppGuardResponse__Output> => {
+        if (this.config.timeout !== undefined) {
+            let timeoutPromise: Promise<AppGuardResponse__Output> = new Promise((resolve, _reject) => {
+                setTimeout(resolve, this.config.timeout, {
+                    policy: this.config.defaultPolicy
+                })
+            });
+            return Promise.race([promise, timeoutPromise])
+        } else {
+            return promise
+        }
+    }
+
+    connectionPromise = (connection: AppGuardTcpConnection): Promise<AppGuardTcpResponse__Output> => {
+        let promise = this.handleTcpConnection(connection);
+        if (this.config.timeout !== undefined) {
+            let timeoutPromise: Promise<AppGuardTcpResponse__Output> = new Promise((resolve, _reject) => {
+                setTimeout(resolve, this.config.timeout, {
+                    tcpInfo: {
+                        connection: connection,
+                    }
+                })
+            });
+            return Promise.race([promise, timeoutPromise])
+        } else {
+            return promise
+        }
+    }
+
     heartbeat(req: HeartbeatRequest) {
         let call = this.client.heartbeat(req);
         call.on('data', function(heartbeat: HeartbeatResponse__Output) {
@@ -108,6 +152,7 @@ export class AppGuardService {
             }, 10000);
         });
     }
+
     async updateFirewall(req: AppGuardFirewall): Promise<AppGuardFirewall__Output>{
         return new Promise((resolve, reject) => {
             this.client.updateFirewall(req, (err, res) => {

proto/appguard.proto renamed to client_common/proto/appguard.proto

@@ -1,4 +1,4 @@
-import {AppGuardService} from "./app-guard-nextjs";
+import {AppGuardService} from "./appguard";
 import {HeartbeatRequest} from "./proto/appguard/HeartbeatRequest";
 
 export const TOKEN_FILE = process.cwd() + '/../token.txt'

clients/nextjs/src/app-guard-nextjs.ts renamed to client_common/src/appguard.ts

@@ -0,0 +1,4 @@
+export {FirewallPolicy} from "./proto/appguard/FirewallPolicy";
+export {AppGuardService, AppGuardConfig} from './appguard';
+export {AuthHandler} from './auth';
+export {AppGuardTcpInfo} from './proto/appguard/AppGuardTcpInfo';