@streamr/cli-tools 5.0.1 → 6.0.0-alpha.0

package/CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add permission commands: `stream grant-permission` and `stream revoke-permission`
 - Remove `typescript` and `ts-node` as run-time dependencies
 - Remove `--msg-chain-id` parameter from `stream resend from`
+- (Breaking) `streamr stream create` argument is a stream ID, not a name
+- Support path notation when defining a stream ID
 
 ## [5.0.0] - 2021-05-05
 ### Added

package/README.md

@@ -1,3 +1,9 @@
+<p align="center">
+  <a href="https://streamr.network">
+    <img alt="Streamr" src="https://raw.githubusercontent.com/streamr-dev/network-monorepo/main/packages/client/readme-header-img.png" width="1320" />
+  </a>
+</p>
+
 # @streamr/cli-tools
 
 Command line tool for interacting with [Streamr](https://streamr.network).
@@ -28,12 +34,14 @@ To get a list of all commands simply run `streamr`. To list subcommands run e.g.
 
 Run `streamr <command> <subcommand> --help` to get more information about a a command, its options, and so forth.
 
+If there is a stream parameter in a command, it can be defined as a full id (e.g. `0x1234567890123456789012345678901234567890/foo/bar`) or a path (e.g. `/foo/bar`). If path notation is used, the stream ID is made by prefixing the authenticated Ethereum address (`--private-key <key>`) to the path.
+
 ### subscribe
 Used to subscribe to a stream and output real-time JSON objects to stdout line-by-line.
 
 For example, to subscribe to a public stream such as the tram demo do
 ```
-streamr stream subscribe 7wa7APtlTq6EC5iTCBy6dw
+streamr stream subscribe streamr.eth/demos/helsinki-trams
 ```
 
 To subscribe to a private stream and authenticate with an Ethereum private key:
@@ -79,15 +87,22 @@ streamr stream show <streamId> --private-key <key>
 ### create
 Create a new stream
 ```
-streamr stream create <name> --private-key <key>
+streamr stream create <streamId> --private-key <key>
+```
+E.g.
 ```
+streamr stream create /foo/bar
+streamr stream create 0x1234567890123456789012345678901234567890/foobar
+streamr stream create yourdomain.ens/foobar
+```
+
 
 ### resend
 Request a resend of historical data printed as JSON objects to stdout line-by-line.
 
 For example, to fetch the 10 latest messages of a public stream such as the tram demo do
 ```
-streamr stream resend last 10 7wa7APtlTq6EC5iTCBy6dw
+streamr stream resend last 10 streamr.eth/demos/helsinki-trams
 ```
 
 
@@ -114,7 +129,7 @@ You can pipe the line-by-line JSON objects output by `subscribe` to
 your program written in any language. Just make the program read JSON objects
 from stdin.
 ```
-streamr stream subscribe 7wa7APtlTq6EC5iTCBy6dw | ruby calculate-average-speed.rb
+streamr stream subscribe streamr.eth/demos/helsinki-trams | ruby calculate-average-speed.rb
 ```
 
 #### Publishing to a stream from any programming language
@@ -139,12 +154,12 @@ If you have a working stream in production that you'd also like to use in your
 development environment, you can combine the `subscribe` and `publish` commands to effectively copy
 the real-time events.
 ```
-streamr stream subscribe 7wa7APtlTq6EC5iTCBy6dw | streamr stream publish --dev <streamId> --private-key <key>
+streamr stream subscribe streamr.eth/demos/helsinki-trams | streamr stream publish --dev <streamId> --private-key <key>
 ```
 
 And the same for staging environment:
 ```
-streamr stream subscribe 7wa7APtlTq6EC5iTCBy6dw | streamr stream publish --stg <streamId> --private-key <key>
+streamr stream subscribe streamr.eth/demos/helsinki-trams | streamr stream publish --stg <streamId> --private-key <key>
 ```
 
 ## Develop

package/bin/common.ts

@@ -1,16 +1,15 @@
 import * as commander from 'commander'
+import { Wallet } from 'ethers'
 import { StreamrClientOptions } from 'streamr-client'
 
 export interface EnvironmentOptions {
     dev?: boolean
     stg?: boolean
-    wsUrl?: string
-    httpUrl?: string 
+    httpUrl?: string
 }
 
 export interface AuthenticationOptions {
     privateKey?: string
-    apiKey?: string
 }
 
 export function envOptions(program: commander.Command): commander.Command {
@@ -24,7 +23,6 @@ export function envOptions(program: commander.Command): commander.Command {
 export function authOptions(program: commander.Command): commander.Command {
     return program
         .option('--private-key <key>', 'use an Ethereum private key to authenticate')
-        .option('--api-key <key>', 'use an API key to authenticate (deprecated)')
 }
 
 export function exitWithHelpIfArgsNotBetween(program: commander.Command, min: number, max: number): void {
@@ -34,7 +32,7 @@ export function exitWithHelpIfArgsNotBetween(program: commander.Command, min: nu
 }
 
 export function formStreamrOptionsWithEnv(
-    { dev, stg, wsUrl, httpUrl, privateKey, apiKey }: EnvironmentOptions & AuthenticationOptions
+    { dev, stg, httpUrl, privateKey }: EnvironmentOptions & AuthenticationOptions
 ): StreamrClientOptions {
     const options: StreamrClientOptions = {}
 
@@ -44,38 +42,24 @@ export function formStreamrOptionsWithEnv(
     }
 
     if (dev) {
-        options.url = 'ws://localhost/api/v1/ws'
         options.restUrl = 'http://localhost/api/v1'
-        options.storageNode = {
+        options.storageNodeRegistry = [{
             // "broker-node-storage-1" on Docker environment
             address: '0xde1112f631486CfC759A50196853011528bC5FA0',
             url: 'http://10.200.10.1:8891'
-        }
+        }]
     } else if (stg) {
-        options.url = 'wss://staging.streamr.com/api/v1/ws'
         options.restUrl = 'https://staging.streamr.com/api/v1/'
     }
 
-    if (wsUrl) {
-        options.url = wsUrl
-    }
     if (httpUrl) {
         options.restUrl = httpUrl
     }
 
-    if (privateKey && apiKey) {
-        console.error('flags --privateKey and --apiKey cannot be used at the same time')
-        process.exit(1)
-    }
-
     if (privateKey) {
         options.auth = {
             privateKey
         }
-    } else if (apiKey) {
-        options.auth = {
-            apiKey
-        }
     }
 
     return options
@@ -90,4 +74,21 @@ export function createFnParseInt(name: string): (s: string) => number {
         }
         return n
     }
-}
+}
+
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export const getStreamId = (streamIdOrPath: string|undefined, options: any): string|undefined => {
+    if (streamIdOrPath === undefined) {
+        return undefined
+    }
+    const PATH_PREFIX = '/'
+    if (!streamIdOrPath.startsWith(PATH_PREFIX)) {
+        return streamIdOrPath
+    }
+    const privateKey = options.privateKey
+    if (privateKey === undefined) {
+        console.error(`relative stream id ${streamIdOrPath} requires authentication`)
+        process.exit(1)
+    }
+    return new Wallet(privateKey).address.toLowerCase() + streamIdOrPath
+}

package/bin/streamr-storage-node-add-stream.ts

@@ -6,6 +6,7 @@ import {
     authOptions,
     exitWithHelpIfArgsNotBetween,
     formStreamrOptionsWithEnv,
+    getStreamId,
 } from './common'
 import pkg from '../package.json'
 
@@ -16,8 +17,9 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action((storageNodeAddress: string, streamId: string, options: any) => {
+    .action((storageNodeAddress: string, streamIdOrPath: string, options: any) => {
         const client = new StreamrClient(formStreamrOptionsWithEnv(options))
+        const streamId = getStreamId(streamIdOrPath, options)!
         client.getStream(streamId)
             .then((stream: Stream) => stream.addToStorageNode(storageNodeAddress))
             .catch((err) => {

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { Command } from 'commander'
-import { StreamrClient, StreamPart } from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import {
     envOptions,
     authOptions,
@@ -20,11 +20,11 @@ envOptions(program)
     .action((storageNodeAddress: string, options: any) => {
         const client = new StreamrClient(formStreamrOptionsWithEnv(options))
         client.getStreamPartsByStorageNode(storageNodeAddress)
-            .then((streamParts: StreamPart[]) => {
+            .then((streamParts) => {
                 if (streamParts.length > 0) {
-                    console.info(EasyTable.print(streamParts.map((streamPart: StreamPart) => ({
-                        streamId: streamPart.getStreamId(),
-                        streamPartition: streamPart.getStreamPartition()
+                    console.info(EasyTable.print(streamParts.map(({ streamId, streamPartition }) => ({
+                        streamId,
+                        streamPartition,
                     }))))
                 }
                 return true

package/bin/streamr-storage-node-list.ts

@@ -6,6 +6,7 @@ import {
     authOptions,
     exitWithHelpIfArgsNotBetween,
     formStreamrOptionsWithEnv,
+    getStreamId,
 } from './common'
 import pkg from '../package.json'
 import EasyTable from 'easy-table'
@@ -14,10 +15,11 @@ const getStorageNodes = async (streamId: string | undefined, client: StreamrClie
     if (streamId !== undefined) {
         const stream = await client.getStream(streamId)
         const storageNodes = await stream.getStorageNodes()
-        return storageNodes.map((storageNode) => storageNode.getAddress())
+        return storageNodes.map((storageNode) => storageNode.address)
     } else {
         // all storage nodes (currently there is only one)
-        return [client.options.storageNode.address]
+        const nodes = await client.getNodes()
+        return nodes.map((n) => n.address)
     }
 }
 
@@ -25,12 +27,15 @@ const program = new Command()
 program
     .description('fetch a list of storage nodes')
     .option('-s, --stream <streamId>', 'only storage nodes which store the given stream (needs authentication)')
+
 authOptions(program)
+
 envOptions(program)
     .version(pkg.version)
     .action((options: any) => {
         const client = new StreamrClient(formStreamrOptionsWithEnv(options))
-        getStorageNodes(options.stream, client).then((addresses: string[]) => {
+        const streamId = getStreamId(options.stream, options)
+        getStorageNodes(streamId, client).then((addresses: string[]) => {
             if (addresses.length > 0) {
                 console.info(EasyTable.print(addresses.map((address: string) => ({
                     address

package/bin/streamr-storage-node-remove-stream.ts

@@ -6,6 +6,7 @@ import {
     authOptions,
     exitWithHelpIfArgsNotBetween,
     formStreamrOptionsWithEnv,
+    getStreamId,
 } from './common'
 import pkg from '../package.json'
 
@@ -16,8 +17,9 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action((storageNodeAddress: string, streamId: string, options: any) => {
+    .action((storageNodeAddress: string, streamIdOrPath: string, options: any) => {
         const client = new StreamrClient(formStreamrOptionsWithEnv(options))
+        const streamId = getStreamId(streamIdOrPath, options)!
         client.getStream(streamId)
             .then((stream: Stream) => stream.removeFromStorageNode(storageNodeAddress))
             .catch((err) => {

package/bin/streamr-stream-create.ts

@@ -12,7 +12,7 @@ import pkg from '../package.json'
 
 const program = new Command()
 program
-    .arguments('<name>')
+    .arguments('<streamId>')
     .description('create a new stream')
     .option('-d, --description <description>', 'define a description')
     .option('-c, --config <config>', 'define a configuration as JSON', (s: string) => JSON.parse(s))
@@ -21,9 +21,9 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action((name: string, options: any) => {
+    .action((streamIdOrPath: string, options: any) => {
         const body: any = {
-            name,
+            id: streamIdOrPath,
             description: options.description,
             config: options.config,
             partitions: options.partitions

package/bin/streamr-stream-grant-permission.ts

@@ -3,7 +3,8 @@ import { Command } from 'commander'
 import {
     envOptions,
     authOptions,
-    formStreamrOptionsWithEnv
+    formStreamrOptionsWithEnv,
+    getStreamId
 } from './common'
 import pkg from '../package.json'
 import { AnonymousStreamPermisson, StreamOperation, StreamrClient, UserStreamPermission } from 'streamr-client'
@@ -47,10 +48,11 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action(async (streamId: string, user: string, operationIds: string[], options: any) => {
+    .action(async (streamIdOrPath: string, user: string, operationIds: string[], options: any) => {
         const operations = operationIds.map((o: string) => getOperation(o))
         const target = getTarget(user)
         const client = new StreamrClient(formStreamrOptionsWithEnv(options))
+        const streamId = getStreamId(streamIdOrPath, options)!
         const stream = await client.getStream(streamId)
         const tasks = operations.map((operation: StreamOperation) => stream.grantPermission(operation, target))
         const permissions = await Promise.all(tasks)

package/bin/streamr-stream-publish.ts

@@ -2,7 +2,7 @@
 import { Command } from 'commander'
 import es from 'event-stream'
 import { publishStream } from '../src/publish'
-import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv } from './common'
+import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv, getStreamId } from './common'
 import pkg from '../package.json'
 
 const program = new Command()
@@ -13,7 +13,8 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action((streamId: string, options: any) => {
+    .action((streamIdOrPath: string, options: any) => {
+        const streamId = getStreamId(streamIdOrPath, options)!
         const ps = publishStream(streamId, options.partitionKey, formStreamrOptionsWithEnv(options))
         process.stdin
             .pipe(es.split())

package/bin/streamr-stream-resend.ts

@@ -2,7 +2,7 @@
 import { Command } from 'commander'
 import { StreamrClientOptions } from 'streamr-client'
 import { resend } from '../src/resend'
-import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv } from './common'
+import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv, getStreamId } from './common'
 import pkg from '../package.json'
 
 function assertBothOrNoneDefined(option1: string, option2: string, errorMessage: string, commandOptions: any) {
@@ -23,7 +23,7 @@ program
     .description('request last N messages')
     .option('-d, --disable-ordering', 'disable ordering of messages by OrderingUtil', false)
     .option('-s, --subscribe', 'subscribe in addition to resend', false)
-    .action((n: string, streamId: string, options: any, command: Command) => {
+    .action((n: string, streamIdOrPath: string, options: any, command: Command) => {
         if (isNaN(n as any)) {
             console.error('argument n is not a number')
             process.exit(1)
@@ -34,6 +34,7 @@ program
         const clientOptions: StreamrClientOptions & { subscribe?: boolean } = formStreamrOptionsWithEnv(command.parent!.opts())
         clientOptions.orderMessages = !options.disableOrdering
         clientOptions.subscribe = options.subscribe
+        const streamId = getStreamId(streamIdOrPath, command.parent!.opts())!
         resend(streamId, resendOptions, clientOptions)
     })
 
@@ -43,7 +44,7 @@ program
     .option('--publisher-id <string>', 'filter results by publisher')
     .option('-d, --disable-ordering', 'disable ordering of messages by OrderingUtil', false)
     .option('-s, --subscribe', 'subscribe in addition to resend', false)
-    .action((from: string, streamId: string, options: any, command: Command) => {
+    .action((from: string, streamIdOrPath: string, options: any, command: Command) => {
         const resendOptions = {
             from: {
                 timestamp: Date.parse(from),
@@ -54,6 +55,7 @@ program
         const clientOptions: StreamrClientOptions & { subscribe?: boolean } = formStreamrOptionsWithEnv(command.parent!.opts())
         clientOptions.orderMessages = !options.disableOrdering
         clientOptions.subscribe = options.subscribe
+        const streamId = getStreamId(streamIdOrPath, command.parent!.opts())!
         resend(streamId, resendOptions, clientOptions)
     })
 
@@ -63,7 +65,7 @@ program
     .option('--publisher-id <string>', 'filter results by publisher')
     .option('--msg-chain-id <string>', 'filter results by message chain')
     .option('-d, --disable-ordering', 'disable ordering of messages by OrderingUtil', false)
-    .action((from: string, to: string, streamId: string, options: any, command: Command) => {
+    .action((from: string, to: string, streamIdOrPath: string, options: any, command: Command) => {
         const resendOptions = {
             from: {
                 timestamp: Date.parse(from),
@@ -79,6 +81,7 @@ program
         assertBothOrNoneDefined('publisherId', 'msgChainId', '--publisher-id must be accompanied by option --msg-chain-id', options)
         const clientOptions = formStreamrOptionsWithEnv(command.parent!.opts())
         clientOptions.orderMessages = !options.disableOrdering
+        const streamId = getStreamId(streamIdOrPath, command.parent!.opts())!
         resend(streamId, resendOptions, clientOptions)
     })
 

package/bin/streamr-stream-revoke-permission.ts

@@ -4,7 +4,8 @@ import {
     envOptions,
     authOptions,
     exitWithHelpIfArgsNotBetween,
-    formStreamrOptionsWithEnv
+    formStreamrOptionsWithEnv,
+    getStreamId
 } from './common'
 import pkg from '../package.json'
 import { StreamrClient } from 'streamr-client'
@@ -16,8 +17,9 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action(async (streamId: string, permissionId: number, options: any) => {
+    .action(async (streamIdOrPath: string, permissionId: number, options: any) => {
         const client = new StreamrClient(formStreamrOptionsWithEnv(options))
+        const streamId = getStreamId(streamIdOrPath, options)!
         const stream = await client.getStream(streamId)
         stream.revokePermission(permissionId)
     })

package/bin/streamr-stream-show.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander'
 import { show } from '../src/show'
-import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv } from './common'
+import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv, getStreamId } from './common'
 import pkg from '../package.json'
 
 const program = new Command()
@@ -12,7 +12,8 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action((streamId: string, options: any) => {
+    .action((streamIdOrPath: string, options: any) => {
+        const streamId = getStreamId(streamIdOrPath, options)!
         show(streamId, options.includePermissions, formStreamrOptionsWithEnv(options))
     })
     .parse(process.argv)

package/bin/streamr-stream-subscribe.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { Command } from 'commander'
 import { subscribe } from '../src/subscribe'
-import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv, createFnParseInt } from './common'
+import { envOptions, authOptions, exitWithHelpIfArgsNotBetween, formStreamrOptionsWithEnv, createFnParseInt, getStreamId } from './common'
 import pkg from '../package.json'
 
 const program = new Command()
@@ -13,8 +13,9 @@ program
 authOptions(program)
 envOptions(program)
     .version(pkg.version)
-    .action((streamId: string, options: any) => {
+    .action((streamIdOrPath: string, options: any) => {
         options.orderMessages = !options.disableOrdering
+        const streamId = getStreamId(streamIdOrPath, options)!
         subscribe(streamId, options.partition, formStreamrOptionsWithEnv(options))
     })
     .parse(process.argv)

package/dist/bin/common.d.ts

@@ -3,15 +3,14 @@ import { StreamrClientOptions } from 'streamr-client';
 export interface EnvironmentOptions {
     dev?: boolean;
     stg?: boolean;
-    wsUrl?: string;
     httpUrl?: string;
 }
 export interface AuthenticationOptions {
     privateKey?: string;
-    apiKey?: string;
 }
 export declare function envOptions(program: commander.Command): commander.Command;
 export declare function authOptions(program: commander.Command): commander.Command;
 export declare function exitWithHelpIfArgsNotBetween(program: commander.Command, min: number, max: number): void;
-export declare function formStreamrOptionsWithEnv({ dev, stg, wsUrl, httpUrl, privateKey, apiKey }: EnvironmentOptions & AuthenticationOptions): StreamrClientOptions;
+export declare function formStreamrOptionsWithEnv({ dev, stg, httpUrl, privateKey }: EnvironmentOptions & AuthenticationOptions): StreamrClientOptions;
 export declare function createFnParseInt(name: string): (s: string) => number;
+export declare const getStreamId: (streamIdOrPath: string | undefined, options: any) => string | undefined;

package/dist/bin/common.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFnParseInt = exports.formStreamrOptionsWithEnv = exports.exitWithHelpIfArgsNotBetween = exports.authOptions = exports.envOptions = void 0;
+exports.getStreamId = exports.createFnParseInt = exports.formStreamrOptionsWithEnv = exports.exitWithHelpIfArgsNotBetween = exports.authOptions = exports.envOptions = void 0;
+const ethers_1 = require("ethers");
 function envOptions(program) {
     return program
         .option('--dev', 'use pre-defined development environment')
@@ -11,8 +12,7 @@ function envOptions(program) {
 exports.envOptions = envOptions;
 function authOptions(program) {
     return program
-        .option('--private-key <key>', 'use an Ethereum private key to authenticate')
-        .option('--api-key <key>', 'use an API key to authenticate (deprecated)');
+        .option('--private-key <key>', 'use an Ethereum private key to authenticate');
 }
 exports.authOptions = authOptions;
 function exitWithHelpIfArgsNotBetween(program, min, max) {
@@ -21,45 +21,31 @@ function exitWithHelpIfArgsNotBetween(program, min, max) {
     }
 }
 exports.exitWithHelpIfArgsNotBetween = exitWithHelpIfArgsNotBetween;
-function formStreamrOptionsWithEnv({ dev, stg, wsUrl, httpUrl, privateKey, apiKey }) {
+function formStreamrOptionsWithEnv({ dev, stg, httpUrl, privateKey }) {
     const options = {};
     if (dev && stg) {
         console.error('flags --dev and --stg cannot be enabled at the same time');
         process.exit(1);
     }
     if (dev) {
-        options.url = 'ws://localhost/api/v1/ws';
         options.restUrl = 'http://localhost/api/v1';
-        options.storageNode = {
-            // "broker-node-storage-1" on Docker environment
-            address: '0xde1112f631486CfC759A50196853011528bC5FA0',
-            url: 'http://10.200.10.1:8891'
-        };
+        options.storageNodeRegistry = [{
+                // "broker-node-storage-1" on Docker environment
+                address: '0xde1112f631486CfC759A50196853011528bC5FA0',
+                url: 'http://10.200.10.1:8891'
+            }];
     }
     else if (stg) {
-        options.url = 'wss://staging.streamr.com/api/v1/ws';
         options.restUrl = 'https://staging.streamr.com/api/v1/';
     }
-    if (wsUrl) {
-        options.url = wsUrl;
-    }
     if (httpUrl) {
         options.restUrl = httpUrl;
     }
-    if (privateKey && apiKey) {
-        console.error('flags --privateKey and --apiKey cannot be used at the same time');
-        process.exit(1);
-    }
     if (privateKey) {
         options.auth = {
             privateKey
         };
     }
-    else if (apiKey) {
-        options.auth = {
-            apiKey
-        };
-    }
     return options;
 }
 exports.formStreamrOptionsWithEnv = formStreamrOptionsWithEnv;
@@ -74,4 +60,21 @@ function createFnParseInt(name) {
     };
 }
 exports.createFnParseInt = createFnParseInt;
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+const getStreamId = (streamIdOrPath, options) => {
+    if (streamIdOrPath === undefined) {
+        return undefined;
+    }
+    const PATH_PREFIX = '/';
+    if (!streamIdOrPath.startsWith(PATH_PREFIX)) {
+        return streamIdOrPath;
+    }
+    const privateKey = options.privateKey;
+    if (privateKey === undefined) {
+        console.error(`relative stream id ${streamIdOrPath} requires authentication`);
+        process.exit(1);
+    }
+    return new ethers_1.Wallet(privateKey).address.toLowerCase() + streamIdOrPath;
+};
+exports.getStreamId = getStreamId;
 //# sourceMappingURL=common.js.map

package/dist/bin/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../bin/common.ts"],"names":[],"mappings":";;;AAeA,SAAgB,UAAU,CAAC,OAA0B;IACjD,OAAO,OAAO;SACT,MAAM,CAAC,OAAO,EAAE,yCAAyC,CAAC;SAC1D,MAAM,CAAC,OAAO,EAAE,qCAAqC,CAAC;SACtD,MAAM,CAAC,gBAAgB,EAAE,kCAAkC,CAAC;SAC5D,MAAM,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAA;AAClE,CAAC;AAND,gCAMC;AAED,SAAgB,WAAW,CAAC,OAA0B;IAClD,OAAO,OAAO;SACT,MAAM,CAAC,qBAAqB,EAAE,6CAA6C,CAAC;SAC5E,MAAM,CAAC,iBAAiB,EAAE,6CAA6C,CAAC,CAAA;AACjF,CAAC;AAJD,kCAIC;AAED,SAAgB,4BAA4B,CAAC,OAA0B,EAAE,GAAW,EAAE,GAAW;IAC7F,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE;QACxD,OAAO,CAAC,IAAI,EAAE,CAAA;KACjB;AACL,CAAC;AAJD,oEAIC;AAED,SAAgB,yBAAyB,CACrC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAA8C;IAE5F,MAAM,OAAO,GAAyB,EAAE,CAAA;IAExC,IAAI,GAAG,IAAI,GAAG,EAAE;QACZ,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAA;QACzE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IAED,IAAI,GAAG,EAAE;QACL,OAAO,CAAC,GAAG,GAAG,0BAA0B,CAAA;QACxC,OAAO,CAAC,OAAO,GAAG,yBAAyB,CAAA;QAC3C,OAAO,CAAC,WAAW,GAAG;YAClB,gDAAgD;YAChD,OAAO,EAAE,4CAA4C;YACrD,GAAG,EAAE,yBAAyB;SACjC,CAAA;KACJ;SAAM,IAAI,GAAG,EAAE;QACZ,OAAO,CAAC,GAAG,GAAG,qCAAqC,CAAA;QACnD,OAAO,CAAC,OAAO,GAAG,qCAAqC,CAAA;KAC1D;IAED,IAAI,KAAK,EAAE;QACP,OAAO,CAAC,GAAG,GAAG,KAAK,CAAA;KACtB;IACD,IAAI,OAAO,EAAE;QACT,OAAO,CAAC,OAAO,GAAG,OAAO,CAAA;KAC5B;IAED,IAAI,UAAU,IAAI,MAAM,EAAE;QACtB,OAAO,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAA;QAChF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IAED,IAAI,UAAU,EAAE;QACZ,OAAO,CAAC,IAAI,GAAG;YACX,UAAU;SACb,CAAA;KACJ;SAAM,IAAI,MAAM,EAAE;QACf,OAAO,CAAC,IAAI,GAAG;YACX,MAAM;SACT,CAAA;KACJ;IAED,OAAO,OAAO,CAAA;AAClB,CAAC;AA9CD,8DA8CC;AAED,SAAgB,gBAAgB,CAAC,IAAY;IACzC,OAAO,CAAC,GAAW,EAAE,EAAE;QACnB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;QAC3B,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,6BAA6B,GAAG,IAAI,CAAC,CAAA;YAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;SAClB;QACD,OAAO,CAAC,CAAA;IACZ,CAAC,CAAA;AACL,CAAC;AATD,4CASC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../bin/common.ts"],"names":[],"mappings":"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"}

package/dist/bin/streamr-misc-get-session-token.js

@@ -11,11 +11,11 @@ const package_json_1 = __importDefault(require("../package.json"));
 const program = new commander_1.Command();
 program
     .description('get a session token for the current user');
-common_1.authOptions(program);
-common_1.envOptions(program)
+(0, common_1.authOptions)(program);
+(0, common_1.envOptions)(program)
     .version(package_json_1.default.version)
     .action(async (options) => {
-    const client = new streamr_client_1.StreamrClient(common_1.formStreamrOptionsWithEnv(options));
+    const client = new streamr_client_1.StreamrClient((0, common_1.formStreamrOptionsWithEnv)(options));
     try {
         console.info(await client.session.getSessionToken());
     }
@@ -29,5 +29,5 @@ common_1.envOptions(program)
     console.error(e);
     process.exit(1);
 });
-common_1.exitWithHelpIfArgsNotBetween(program, 0, 0);
+(0, common_1.exitWithHelpIfArgsNotBetween)(program, 0, 0);
 //# sourceMappingURL=streamr-misc-get-session-token.js.map

package/dist/bin/streamr-misc-get-session-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr-misc-get-session-token.js","sourceRoot":"","sources":["../../bin/streamr-misc-get-session-token.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mDAA8C;AAC9C,qCAKiB;AACjB,mEAAiC;AAEjC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAA;AAC7B,OAAO;KACF,WAAW,CAAC,0CAA0C,CAAC,CAAA;AAC5D,oBAAW,CAAC,OAAO,CAAC,CAAA;AACpB,mBAAU,CAAC,OAAO,CAAC;KACd,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,MAAM,CAAC,KAAK,EAAE,OAAY,EAAE,EAAE;IAC3B,MAAM,MAAM,GAAG,IAAI,8BAAa,CAAC,kCAAyB,CAAC,OAAO,CAAC,CAAC,CAAA;IACpE,IAAI;QACA,OAAO,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAA;KACvD;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC,CAAC;KACD,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;KACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAC,CAAA;AAEN,qCAA4B,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"streamr-misc-get-session-token.js","sourceRoot":"","sources":["../../bin/streamr-misc-get-session-token.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mDAA8C;AAC9C,qCAKiB;AACjB,mEAAiC;AAEjC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAA;AAC7B,OAAO;KACF,WAAW,CAAC,0CAA0C,CAAC,CAAA;AAC5D,IAAA,oBAAW,EAAC,OAAO,CAAC,CAAA;AACpB,IAAA,mBAAU,EAAC,OAAO,CAAC;KACd,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,MAAM,CAAC,KAAK,EAAE,OAAY,EAAE,EAAE;IAC3B,MAAM,MAAM,GAAG,IAAI,8BAAa,CAAC,IAAA,kCAAyB,EAAC,OAAO,CAAC,CAAC,CAAA;IACpE,IAAI;QACA,OAAO,CAAC,IAAI,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAA;KACvD;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAClB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC,CAAC;KACD,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC;KACxB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;IACT,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACnB,CAAC,CAAC,CAAA;AAEN,IAAA,qCAA4B,EAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}

package/dist/bin/streamr-mock-data-generate.js

@@ -11,11 +11,11 @@ const package_json_1 = __importDefault(require("../package.json"));
 const program = new commander_1.Command();
 program
     .description('generate and print semi-random JSON data to stdout')
-    .option('-r, --rate <n>', 'rate in milliseconds', common_1.createFnParseInt('--rate'), 500)
+    .option('-r, --rate <n>', 'rate in milliseconds', (0, common_1.createFnParseInt)('--rate'), 500)
     .version(package_json_1.default.version)
     .action((options) => {
-    generate_1.generate(options.rate);
+    (0, generate_1.generate)(options.rate);
 })
     .parse(process.argv);
-common_1.exitWithHelpIfArgsNotBetween(program, 0, 0);
+(0, common_1.exitWithHelpIfArgsNotBetween)(program, 0, 0);
 //# sourceMappingURL=streamr-mock-data-generate.js.map

package/dist/bin/streamr-mock-data-generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr-mock-data-generate.js","sourceRoot":"","sources":["../../bin/streamr-mock-data-generate.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,8CAA0C;AAC1C,qCAAyE;AACzE,mEAAiC;AAEjC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAA;AAC7B,OAAO;KACF,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,EAAE,yBAAgB,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;KACjF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,MAAM,CAAC,CAAC,OAAY,EAAE,EAAE;IACrB,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC,CAAC;KACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAExB,qCAA4B,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}
+{"version":3,"file":"streamr-mock-data-generate.js","sourceRoot":"","sources":["../../bin/streamr-mock-data-generate.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,8CAA0C;AAC1C,qCAAyE;AACzE,mEAAiC;AAEjC,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAA;AAC7B,OAAO;KACF,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,gBAAgB,EAAE,sBAAsB,EAAE,IAAA,yBAAgB,EAAC,QAAQ,CAAC,EAAE,GAAG,CAAC;KACjF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,MAAM,CAAC,CAAC,OAAY,EAAE,EAAE;IACrB,IAAA,mBAAQ,EAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAC1B,CAAC,CAAC;KACD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAExB,IAAA,qCAA4B,EAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}