fix grpc proto load path

Author: GyulyVGC

client_common/package-lock.json

@@ -22,7 +22,8 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.3.2",
-    "@grpc/proto-loader": "^0.6.2"
+    "@grpc/proto-loader": "^0.6.2",
+    "dotenv": "^16.5.0"
   },
   "husky": {
     "hooks": {

client_common/package.json

@@ -14,8 +14,11 @@ 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)
+const opts = {includeDirs: [
+    'node_modules/@nullnet/appguard-express/node_modules/appguard-client-common/proto/',
+    'node_modules/@nullnet/appguard-nextjs/node_modules/appguard-client-common/proto/',
+    ]};
+const packageDef = protoLoader.loadSync('appguard.proto', opts);
 const grpcObj = (grpc.loadPackageDefinition(packageDef) as unknown) as ProtoGrpcType
 
 // it doesn't work with .cer files, convert them to .pem with the following command:

client_common/src/appguard.ts

@@ -23,7 +23,6 @@
   "dependencies": {
     "appguard-client-common": "file:../../client_common",
     "body-parser": "^1.20.2",
-    "dotenv": "^16.5.0",
     "express": "^4.19.2",
     "nodemon": "^3.1.2"
   },
@@ -33,16 +32,16 @@
     "singleQuote": true,
     "trailingComma": "es5"
   },
-  "name": "@nullnet/app-guard-express",
+  "name": "@nullnet/appguard-express",
   "author": "Giuliano Bellini s294739",
-  "module": "dist/app-guard-express.esm.js",
+  "module": "dist/appguard-express.esm.js",
   "size-limit": [
     {
-      "path": "dist/app-guard-express.cjs.production.min.js",
+      "path": "dist/appguard-express.cjs.production.min.js",
       "limit": "10 KB"
     },
     {
-      "path": "dist/app-guard-express.esm.js",
+      "path": "dist/appguard-express.esm.js",
       "limit": "10 KB"
     }
   ],

clients/express/package-lock.json

@@ -10,7 +10,7 @@
   "author": "bon",
   "license": "AGPL-3.0-only",
   "dependencies": {
-    "@nullnet/app-guard-express": "file:../",
+    "@nullnet/appguard-express": "file:../",
     "express": "^4.19.2"
   },
   "devDependencies": {

clients/express/package.json

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const express_1 = __importDefault(require("express"));
-const app_guard_1 = __importDefault(require("./modules/app-guard"));
+const app_guard_1 = __importDefault(require("./modules/appguard"));
 const app = (0, express_1.default)();
 // AC #1:
 // Able to use as direct express module

clients/express/sample/package-lock.json

@@ -1,5 +1,5 @@
 import express from 'express'
-import {AppGuardConfig, createAppGuardMiddleware, FirewallPolicy} from '@nullnet/app-guard-express'
+import {AppGuardConfig, createAppGuardMiddleware, FirewallPolicy} from '@nullnet/appguard-express'
 
 const app = express()
 
@@ -21,16 +21,19 @@ const appGuardMiddleware = createAppGuardMiddleware(appGuardConfig)
 
 // AC #2: 
 // Able to use as middleware to specific route
+// @ts-ignore
 app.get('/some-route', appGuardMiddleware, async (req, res) => {
     res.json({message: 'Hello World'})
 })
 
+// @ts-ignore
 app.get('/index' , appGuardMiddleware, async (req, res) => {
     res.json({message: 'Hello World'})
 })
 
 // AC #3:
 // Able to uses a default route controller
+// @ts-ignore
 app.get('*' , appGuardMiddleware, async (req, res) => {
     res.json({message: 'Hello World'})
 })

clients/express/sample/package.json

@@ -142,7 +142,7 @@ export const createAppGuardMiddleware = (config: AppGuardConfig) => {
       console.error(error);
       // @ts-ignore
       res.status(500).send({
-        module: 'app-guard',
+        module: 'appguard',
         message: 'Internal server error',
       });
     }