Merge pull request #280 from skadefro/master

Prepare update for 1.5.2
open-rpa · Nov 14, 2023 · 5450e3e · 5450e3e
2 parents 42000ee + b882ba7
commit 5450e3e
Show file tree

Hide file tree

Showing 110 changed files with 1,336 additions and 3,130 deletions.
diff --git a/.devcontainer.old/Dockerfile b/.devcontainer.old/Dockerfile
diff --git a/.devcontainer.old/devcontainer.json b/.devcontainer.old/devcontainer.json
diff --git a/.devcontainer.old/docker-compose.yml b/.devcontainer.old/docker-compose.yml
diff --git a/.dockerignore b/.dockerignore
@@ -13,5 +13,5 @@ docker-package.json
 sonar-scanner.properties
 sonar-project.properties
 crash.log
-.cache-require-paths.json
-.devcontainer.old
+.devcontainer.old
+.clinic
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,6 @@ sonar-scanner.properties
 sonar-project.properties
 crash.log
 package-lock.json
-.cache-require-paths.json
 *.heapsnapshot
-/proto
+/proto
+.clinic
diff --git a/.npmignore b/.npmignore
@@ -32,8 +32,8 @@ crash.log
 .nyrc.json
 dockerignore
 register.js
-.cache-require-paths.json
 .devcontainer.old
 docker-package.json
 .dockerignore
-*.heapsnapshot
+*.heapsnapshot
+.clinic
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,15 +1,6 @@
 {
     "version": "0.2.0",
     "configurations": [
-        {
-            "type": "node",
-            "request": "attach",
-            "name": "Attach to localhost",
-            "address": "localhost",
-            "port": 5858,
-            "localRoot": "${workspaceFolder}/dist",
-            "remoteRoot": "/data"
-        },
         {
             "args": [],
             "cwd": "${workspaceRoot}",
@@ -20,20 +11,34 @@
                 "**/node_modules/@openiap/**/*",
             ],
             "outputCapture": "std",
-            "preLaunchTask": "openflow-tsc-watch",
             "program": "${workspaceRoot}/OpenFlow/src/index.ts",
             "request": "launch",
+            "preLaunchTask": "tsc: watch - OpenFlow/tsconfig.json",
             "runtimeArgs": [
+                "--inspect"
             ],
             "runtimeExecutable": null,
             "sourceMaps": true,
             "stopOnEntry": false,
             "type": "node",
+            "env": {
+                "otel_log_level": "info"
+            },
             "resolveSourceMapLocations": [
                 "${workspaceFolder}/**",
                 "!**/node_modules/**",
                 "**/node_modules/@openiap/**",
             ]
+        },
+        {
+            "type": "node",
+            "request": "attach",
+            "name": "Attach to localhost",
+            "preLaunchTask": "tsc: watch - OpenFlow/tsconfig.json",
+            "address": "localhost",
+            "port": 5858,
+            "localRoot": "${workspaceFolder}/dist",
+            "remoteRoot": "/data"
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
diff --git a/OpenFlow.code-workspace b/OpenFlow.code-workspace
diff --git a/OpenFlow/src/Audit.ts b/OpenFlow/src/Audit.ts
@@ -4,11 +4,11 @@ import { Crypt } from "./Crypt";
 import { Span } from "@opentelemetry/api";
 import { Logger } from "./Logger";
 import { DatabaseConnection } from "./DatabaseConnection";
-import { UpDownCounter } from "@opentelemetry/api-metrics";
+import { UpDownCounter } from "@opentelemetry/api";
 
 export type tokenType = "local" | "jwtsignin" | "samltoken" | "tokenissued" | "weblogin";
 export type clientType = "saml" | "google" | "openid" | "local" | "websocket";
-export type clientAgent = "node" | "browser" | "rdservice" | "nodered" | "openrpa" | "powershell" | "python" | "java" | "csharp" | "go" | "unknown";
+export type clientAgent = "node" | "browser" | "rdservice" | "nodered" | "openrpa" | "powershell" | "python" | "java" | "csharp" | "go" | "test" | "unknown";
 export class Audit {
     public static openflow_logins: UpDownCounter = null;
     public static ensure_openflow_logins() {