feat: mc assets --mode tree (#325)

* chore: export-asset-model

* chore:wip

* feat: asset-model export

* feat: release

* feat: release 3.20.0 🎉

* chore: fixed lgtm

Author: sn0wcat

.gitignore

@@ -108,4 +108,8 @@ mindconnect-nodejs-win.exe
 .idea
 
 # markdown-help
-markdown-help/**
+markdown-help/**
+
+## downloaded assets models
+
+*.mdsp.assetmodel/**

.npmignore

@@ -65,4 +65,8 @@ mindconnect-nodejs-win.exe
 .spelling
 
 # markdown-help
-markdown-help/**
+markdown-help/**
+
+## downloaded assets models
+
+*.mdsp.assetmodel/**

CHANGELOG.md

@@ -1,10 +1,12 @@
 # Changelog
 
-## 3.20.0 - (Spring Green Vienna) - June 2022
+## 3.20.0 - (Spring Green Vienna) - July 2022
 
-- added default value (`aggregates.mdsp.json`) for `mdsp aggregates --download` parameter
-- improved `mdsp aggregates` command. all parameters, including intervalunit and intervalvalue can be specified.
-- Created a new `mdsp timeseries` command to match the `mdsp aggregates` command. [#318](https://github.com/mindsphere/mindconnect-nodejs/issues/318)
+- SDK: added GetUserTenant() method to SDK Level read out the user tenant from the current configuration (if token manager authentication is used)
+- CLI: new mode `--mode tree` for `mdsp assets` command provides tree visualization of mindsphere assets in the tenant
+- CLI: added default value (`aggregates.mdsp.json`) for `mdsp aggregates --download` parameter
+- CLI: improved `mdsp aggregates` command. all parameters, including intervalunit and intervalvalue can be specified.
+- CLI: Created a new `mdsp timeseries` command to match the `mdsp aggregates` command. [#318](https://github.com/mindsphere/mindconnect-nodejs/issues/318)
 - Bumped most depedencies
 
 ## 3.19.0 - (Dove Vienna) - April 2022

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@mindconnect/mindconnect-nodejs",
-    "version": "3.20.0-0",
+    "version": "3.20.0",
     "description": "NodeJS Library for MindSphere Connectivity - TypeScript SDK for MindSphere - MindSphere Command Line Interface - MindSphere Development Proxy",
     "main": "./dist/src/index.js",
     "browser": "./dist/src/index.bundle.js",
@@ -59,6 +59,7 @@
         "lodash": "^4.17.21",
         "mime-types": "^2.1.35",
         "ora": "^5.4.1",
+        "performant-array-to-tree": "^1.11.0",
         "rsa-pem-to-jwk": "^1.1.3",
         "update-notifier": "^5.1.0",
         "url-search-params-polyfill": "^8.1.1",

package.json

@@ -27,6 +27,13 @@ export abstract class SdkClient {
         return this._authenticator.GetTenant();
     }
 
+    public GetUserTenant(): string | undefined {
+        if (this._authenticator instanceof TokenManagerAuth) {
+            return this._authenticator.GetUserTenant();
+        }
+        return undefined;
+    }
+
     protected _authenticator: TokenRotation;
 
     public async HttpAction({

src/api/sdk/common/sdk-client.ts

@@ -70,6 +70,27 @@ export class TokenManagerAuth extends AuthBase implements TokenRotation {
         return this._accessToken.access_token;
     }
 
+    /**
+     * User Tenant
+     *
+     * @returns {string}
+     *
+     * @memberOf TokenManagerAuth
+     */
+    public GetUserTenant(): string {
+        return this._userTenant;
+    }
+
+    /**
+     * HostTenant
+     *
+     * @returns {string}
+     *
+     * @memberOf TokenManagerAuth
+     */
+    public GetHostTenant(): string {
+        return this._hostTenant;
+    }
     /**
      * Creates an instance of TokenManagerAuth.
      * @param {string} _gateway

src/api/tokenmanager-auth.ts

@@ -2,6 +2,7 @@
 import * as crypto from "crypto";
 import * as fs from "fs";
 import * as os from "os";
+import { TreeItem } from "performant-array-to-tree";
 import { URL } from "url";
 import { TimeStampedDataPoint } from "..";
 import { IMindConnectConfiguration } from "./mindconnect-models";
@@ -326,7 +327,7 @@ export function addAndStoreConfiguration(configuration: any) {
     (!configuration || !configuration.credentials) && throwError("invalid configuration!");
     configuration.credentials.forEach((element: credentialEntry) => {
         element.gateway = isUrl(element.gateway) ? element.gateway : `https://gateway.${element.gateway}.mindsphere.io`;
-        newConfiguration.credentials.push(element.passkey ? encrypt(element) : ((element as unknown) as authJson));
+        newConfiguration.credentials.push(element.passkey ? encrypt(element) : (element as unknown as authJson));
     });
     checkList(newConfiguration.credentials);
     storeAuth(newConfiguration);
@@ -406,3 +407,13 @@ export function isGuid(x: string): boolean {
     const guidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
     return guidRegex.test(x);
 }
+
+export function printTree(treeItem: TreeItem, level: number, color: (x: string) => string) {
+    const prefix = level == 0 ? "" : "│   ".repeat(level) + "├─";
+
+    console.log(`${prefix}[${color(treeItem.data.assetId)}] ${treeItem.data.name} [${treeItem.data.typeId}]`);
+
+    treeItem.children.forEach((child: TreeItem) => {
+        printTree(child, level + 1, color);
+    });
+}