@streamr/cli-tools 6.0.2 → 7.0.0-beta.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@streamr/cli-tools",
-  "version": "6.0.2",
+  "version": "7.0.0-beta.0",
   "description": "Command line tools for Streamr.",
   "bin": {
     "streamr": "dist/bin/streamr.js"
   },
   "scripts": {
     "check": "tsc -p ./tsconfig.json --noEmit",
+    "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
-    "prepare": "npm run eslint && npm run build",
     "build": "tsc -b tsconfig.json",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -30,24 +30,16 @@
   },
   "homepage": "https://github.com/streamr-dev/cli-tools#readme",
   "dependencies": {
+    "@streamr/utils": "^1.0.0",
     "commander": "^8.3.0",
     "easy-table": "^1.1.1",
     "event-stream": "^4.0.1",
     "lodash": "^4.17.21",
-    "streamr-client": "^6.0.5",
-    "streamr-client-protocol": "^12.0.0",
-    "streamr-test-utils": "^2.0.0"
+    "streamr-client": "7.0.0-beta.0"
   },
   "devDependencies": {
-    "@streamr/dev-config": "^1.0.0",
     "@types/easy-table": "0.0.32",
     "@types/event-stream": "^3.3.34",
-    "@types/lodash": "^4.14.175",
-    "@typescript-eslint/eslint-plugin": "^5.0.0",
-    "@typescript-eslint/parser": "^5.0.0",
-    "eslint": "^7.32.0",
-    "eslint-config-streamr-ts": "^4.0.1",
-    "eslint-plugin-promise": "^5.1.0",
-    "typescript": "^4.5.2"
+    "@types/lodash": "^4.14.175"
   }
 }

package/src/client.ts

@@ -1,9 +1,9 @@
 import { merge, omit } from 'lodash'
-import { BrubeckClientConfig, StreamrClient, ConfigTest } from 'streamr-client'
+import { StreamrClientConfig, StreamrClient, ConfigTest } from 'streamr-client'
 import { GlobalCommandLineArgs } from './common'
 import { getConfig } from './config'
 
-const getClientConfig = (commandLineArgs: GlobalCommandLineArgs, overridenOptions: BrubeckClientConfig) => {
+const getClientConfig = (commandLineArgs: GlobalCommandLineArgs, overridenOptions: StreamrClientConfig) => {
     const environmentOptions = (commandLineArgs.dev !== undefined) ? omit(ConfigTest, 'auth') : undefined
     const configFileJson = getConfig(commandLineArgs.config)?.client
     const authenticationOptions = (commandLineArgs.privateKey !== undefined) ? { auth: { privateKey: commandLineArgs.privateKey } } : undefined
@@ -19,14 +19,16 @@ const addInterruptHandler = (client: StreamrClient) => {
     process.on('SIGINT', async () => {
         try {
             await client.destroy()
-        } catch {}
+        } catch {
+            // no-op
+        }
         process.exit()
     })
 }
 
-export const createClient = (commandLineArgs: GlobalCommandLineArgs, overridenOptions: BrubeckClientConfig = {}): StreamrClient => {
+export const createClient = (commandLineArgs: GlobalCommandLineArgs, overridenOptions: StreamrClientConfig = {}): StreamrClient => {
     const config = getClientConfig(commandLineArgs, overridenOptions)
     const client = new StreamrClient(config)
     addInterruptHandler(client)
     return client
-}
+}

package/src/command.ts

@@ -1,5 +1,5 @@
 import commander, { Command } from 'commander'
-import { BrubeckClientConfig } from 'streamr-client'
+import { StreamrClientConfig } from 'streamr-client'
 import pkg from '../package.json'
 import { createClient } from './client'
 
@@ -12,7 +12,7 @@ export const createCommand = (): commander.Command => {
 
 export interface CommandOpts {
     autoDestroyClient?: boolean
-    clientOptionsFactory?: (options: any) => BrubeckClientConfig
+    clientOptionsFactory?: (options: any) => StreamrClientConfig
 }
 
 export const createClientCommand = (
@@ -42,4 +42,4 @@ export const createClientCommand = (
                 process.exit(1)
             }
         })
-}
+}

package/src/common.ts

@@ -28,4 +28,4 @@ export function createFnParseInt(name: string): (s: string) => number {
         }
         return n
     }
-}
+}

package/src/config.ts

@@ -1,10 +1,10 @@
 import path from 'path'
 import os from 'os'
 import { readFileSync } from 'fs'
-import { BrubeckClientConfig } from 'streamr-client'
+import { StreamrClientConfig } from 'streamr-client'
 
 interface Config {
-    client: BrubeckClientConfig
+    client: StreamrClientConfig
 }
 
 /*
@@ -23,7 +23,7 @@ const validateConfig = (config: any, fileName: string): void | never => {
     }
 }
 
-const tryReadConfigFile = (fileName: string): Config|undefined|never => {
+const tryReadConfigFile = (fileName: string): Config | undefined | never => {
     let content
     try {
         content = readFileSync(fileName, 'utf8')
@@ -35,7 +35,7 @@ const tryReadConfigFile = (fileName: string): Config|undefined|never => {
     return json
 }
 
-export const getConfig = (id?: string): Config|undefined => {
+export const getConfig = (id?: string): Config | undefined => {
     const CONFIG_DIRECTORY = path.join(os.homedir(), '.streamr', 'config')
     if (id !== undefined) {
         const fileNames = [
@@ -53,4 +53,4 @@ export const getConfig = (id?: string): Config|undefined => {
         const fileName = path.join(CONFIG_DIRECTORY, `default.json`)
         return tryReadConfigFile(fileName)
     }
-}
+}

package/src/logLevel.ts

@@ -6,4 +6,4 @@
  * the files which call createClientCommand()).
  */
 
-process.env.LOG_LEVEL = process.env.LOG_LEVEL ?? 'error'
+process.env.LOG_LEVEL = process.env.LOG_LEVEL ?? 'error'

package/src/permission.ts

@@ -4,7 +4,7 @@ import { createClientCommand } from './command'
 
 const PUBLIC_USER_ID = 'public'
 
-export const PERMISSIONS = new Map<string,StreamPermission>([
+export const PERMISSIONS = new Map<string, StreamPermission>([
     ['subscribe', StreamPermission.SUBSCRIBE],
     ['publish', StreamPermission.PUBLISH],
     ['edit', StreamPermission.EDIT],
@@ -50,4 +50,4 @@ export const runModifyPermissionsCommand = (
         .addArgument(new Argument('<permissions...>').choices(Array.from(PERMISSIONS.keys())))
         .description(`${modification} permission: use keyword "public" as a user to ${modification} a public permission`)
         .parseAsync(process.argv)
-}
+}

package/src/resend.ts

@@ -34,4 +34,4 @@ export const resend = async (
         console.error(err.message ? err.message : err)
         process.exit(1)
     }
-}
+}

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
-    "extends": "@streamr/dev-config/ts/tsconfig.node.json",
+    "extends": "../../tsconfig.node.json",
     "compilerOptions": {
         "composite": true,
         "outDir": "dist"
@@ -10,6 +10,7 @@
         "bin/**/*"
     ],
     "references": [
+        { "path": "../utils/tsconfig.node.json" },
         { "path": "../client/tsconfig.node.json" }
     ]
 }

package/dist/bin/streamr-storage-node-list-stream-parts.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import '../src/logLevel';

package/dist/bin/streamr-storage-node-list-stream-parts.js

@@ -1,26 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-require("../src/logLevel");
-const easy_table_1 = __importDefault(require("easy-table"));
-const command_1 = require("../src/command");
-const streamr_client_protocol_1 = require("streamr-client-protocol");
-(0, command_1.createClientCommand)((async (client, storageNodeAddress) => {
-    const streamParts = await client.getStreamPartsByStorageNode(storageNodeAddress);
-    if (streamParts.length > 0) {
-        console.info(easy_table_1.default.print(streamParts.map((streamPartId) => {
-            const [streamId, streamPartition] = streamr_client_protocol_1.StreamPartIDUtils.getStreamIDAndPartition(streamPartId);
-            return {
-                streamId,
-                streamPartition
-            };
-        })));
-    }
-}))
-    .arguments('<storageNodeAddress>')
-    .description('list stream parts in a storage node')
-    .parseAsync();
-//# sourceMappingURL=streamr-storage-node-list-stream-parts.js.map

package/dist/bin/streamr-storage-node-list-stream-parts.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"streamr-storage-node-list-stream-parts.js","sourceRoot":"","sources":["../../bin/streamr-storage-node-list-stream-parts.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,4DAAkC;AAElC,4CAAoD;AACpD,qEAA2D;AAE3D,IAAA,6BAAmB,EAAC,CAAC,KAAK,EAAE,MAAqB,EAAE,kBAA0B,EAAE,EAAE;IAC7E,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,kBAAkB,CAAC,CAAA;IAChF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,OAAO,CAAC,IAAI,CAAC,oBAAS,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;YAC1D,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,GAAG,2CAAiB,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;YAC3F,OAAO;gBACH,QAAQ;gBACR,eAAe;aAClB,CAAA;QACL,CAAC,CAAC,CAAC,CAAC,CAAA;KACP;AACL,CAAC,CAAC,CAAC;KACE,SAAS,CAAC,sBAAsB,CAAC;KACjC,WAAW,CAAC,qCAAqC,CAAC;KAClD,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-whoami.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import '../src/logLevel';

package/dist/bin/streamr-whoami.js

@@ -1,11 +0,0 @@
-#!/usr/bin/env node
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-require("../src/logLevel");
-const command_1 = require("../src/command");
-(0, command_1.createClientCommand)(async (client) => {
-    console.info(await client.getAddress());
-})
-    .description('displays your public address')
-    .parseAsync();
-//# sourceMappingURL=streamr-whoami.js.map

package/dist/bin/streamr-whoami.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"streamr-whoami.js","sourceRoot":"","sources":["../../bin/streamr-whoami.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,4CAAoD;AAEpD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,EAAE;IAChD,OAAO,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE,CAAC,CAAA;AAC3C,CAAC,CAAC;KACG,WAAW,CAAC,8BAA8B,CAAC;KAC3C,UAAU,EAAE,CAAA"}