@streamr/cli-tools 6.0.0-alpha.2 → 6.0.0-alpha.6

package/CHANGELOG.md

@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Add new command `stream wallet whoami` to display Ethereum address
 - Add permission commands: `stream grant-permission` and `stream revoke-permission`
 - Remove `typescript` and `ts-node` as run-time dependencies
 - (Breaking) Remove `--msg-chain-id` parameter from `stream resend from`
@@ -23,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - (Breaking) Rename `--config` argument to `--stream-config` in `stream create`
 - (Breaking) Remove `stream list` command
 - Add `stream search` command
+- (Breaking) Rename `--partition-key` argument to `--partition-key-field` in `stream publish`
 - Bump dependency streamr-client to 6.1.0
 - Bump dependency commander to 8.3.0
 

package/README.md

@@ -67,12 +67,44 @@ Useful for generating test data to be published to a stream with `publish`, e.g.
 streamr mock-data generate | streamr stream publish <streamId> --private-key <key>
 ```
 
-### list
-Fetch a list of streams that are accessible to the user authenticated by the private key
+### search
+Query a list of streams by a search term and/or permissions. E.g.:
 ```
-streamr stream list --private-key <key>
+streamr stream search foobar --user 0x1234567890123456789012345678901234567890
 ```
 
+#### Search term
+A search term query searchers over the stream id field. E.g:
+```
+streamr stream search foobar
+```
+It could find these streams:
+```
+0x1234567890123456789012345678901234567890/abc/foobar/1
+foobar.eth/lorem-ipsum
+```
+
+#### Permission
+A permission query searches over stream permissions. You can either query by direct permissions (which are explicitly granted to a user), or by all permissions (including public permissions, which apply to all users).
+
+E.g. all streams where a user has some direct permission:
+```
+streamr stream search --user 0x1234567890123456789012345678901234567890
+```
+All streams accessible by a user:
+```
+streamr stream search --user 0x1234567890123456789012345678901234567890 --public
+```
+
+The argument of the `--user` option can be omitted. In that case, it defaults to the authenticated user (specified by `--private-key`).
+
+It is also possible to filter by specific permissions by using `--all` and `--any`. E.g. if you want to find the streams you can subscribe to:
+```
+streamr stream search --user --public --all subscribe --private-key <key>
+```
+
+If more than one permission is needed, specify the permissions in a comma-separated list (e.g. `--all subscribe,publish`). It returns streams where _all_ listed permissions are granted. If just _any_ of the permissions is required, use `--any` instead of `--all`. Please prefer `--all` to `--any` when possible as it has better query performance.
+
 ### show
 Show detailed information about a specific stream
 ```
@@ -128,8 +160,7 @@ The configuration file is a JSON. It has one root-level property `client`, which
     "client": {
         "auth": {
             "privateKey": ...
-        },
-        "publishWithSignature": "always"
+        }
     }
 }
 ```

package/bin/streamr-stream-publish.ts

@@ -8,7 +8,7 @@ import { createClientCommand } from '../src/command'
 
 const publishStream = (
     stream: string,
-    partitionKey: string | undefined,
+    partitionKeyField: string | undefined,
     client: StreamrClient
 ): Writable => {
     const writable = new Writable({
@@ -27,8 +27,8 @@ const publishStream = (
                 done(e)
                 return
             }
-            // @ts-expect-error TODO: the last argument here looks wrong, should be just `partitionKey`?
-            client.publish(stream, json, Date.now(), json[partitionKey]).then(
+            const partitionKey = (partitionKeyField !== undefined) ? json[partitionKeyField] : undefined
+            client.publish(stream, json, Date.now(), partitionKey).then(
                 () => done(),
                 (err) => done(err)
             )
@@ -38,7 +38,7 @@ const publishStream = (
 }
 
 createClientCommand(async (client: StreamrClient, streamId: string, options: any) => {
-    const ps = publishStream(streamId, options.partitionKey, client)
+    const ps = publishStream(streamId, options.partitionKeyField, client)
     return new Promise((resolve, reject) => {
         process.stdin
             .pipe(es.split())
@@ -58,5 +58,5 @@ createClientCommand(async (client: StreamrClient, streamId: string, options: any
 })
     .arguments('<streamId>')
     .description('publish to a stream by reading JSON messages from stdin line-by-line')
-    .option('-k, --partition-key <string>', 'field name in each message to use for assigning the message to a stream partition')
+    .option('-k, --partition-key-field <string>', 'field name in each message to use for assigning the message to a stream partition')
     .parseAsync()

package/bin/streamr-stream-search.ts

@@ -1,17 +1,54 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import EasyTable from 'easy-table'
-import StreamrClient from 'streamr-client'
+import StreamrClient, { SearchStreamsPermissionFilter, StreamPermission } from 'streamr-client'
 import { createClientCommand } from '../src/command'
+import { Option } from 'commander'
+import { getPermission, PERMISSIONS } from '../src/permission'
+import { getOptionType, OptionType } from '../src/common'
 
-createClientCommand(async (client: StreamrClient, term: string) => {
-    const streams = await client.searchStreams(term)
-    if (streams.length > 0) {
-        console.info(EasyTable.print(streams.map(({id}) => ({
-            id
-        }))))
+const createPermissionFilter = async (
+    user: string | boolean | undefined,
+    allowPublic: boolean | undefined,
+    allOf: StreamPermission[] | undefined,
+    anyOf: StreamPermission[] | undefined,
+    client: StreamrClient
+): Promise<SearchStreamsPermissionFilter| undefined> => {
+    if (user !== undefined) {
+        return {
+            user: (getOptionType(user) === OptionType.ARGUMENT) ? user as string : await client.getAddress(),
+            allowPublic: allowPublic ?? false,
+            allOf,
+            anyOf
+        }
+    } else if ((allowPublic !== undefined) || (allOf !== undefined) || (anyOf !== undefined)) {
+        console.error('specify a user with "--user" when using "--public", "--all" or "--any"')
+        process.exit(1)
+    }
+}
+
+const createPermissionListOption = (id: string) => {
+    return new Option(`--${id} <permissions>`, 'comma-separated list of permissions')
+        .choices(Array.from(PERMISSIONS.keys()))
+        .argParser((value: string) => value.split(',').map((id) => getPermission(id)))
+}
+
+createClientCommand(async (client: StreamrClient, term: string | undefined, options: any ) => {
+    const permissionFilter = await createPermissionFilter(
+        options.user,
+        options.public,
+        options.all,
+        options.any,
+        client
+    )
+    const streams = client.searchStreams(term, permissionFilter)
+    for await (const stream of streams) {
+        console.log(stream.id)
     }
 })
-    .arguments('<term>')
+    .arguments('[term]')
     .description('search streams')
+    .option('--user [user]', 'a stream must have permissions for the given user, defaults to the authenticated user')
+    .option('--public', 'the permission can be implicit (a public permission to the stream)')
+    .addOption(createPermissionListOption('all'))
+    .addOption(createPermissionListOption('any'))
     .parseAsync()

package/bin/streamr-stream.ts

@@ -8,7 +8,7 @@ program
     .description('stream subcommands')
     .command('subscribe', 'subscribe to a stream')
     .command('publish', 'publish to a stream')
-    .command('list', 'fetch a list of streams')
+    .command('search', 'search for streams')
     .command('show', 'info about a stream')
     .command("create", "create a new stream")
     .command('resend', 'request resend of a stream')

package/bin/streamr-wallet-whoami.ts

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+import '../src/logLevel'
+import StreamrClient from 'streamr-client'
+import { createClientCommand } from '../src/command'
+
+createClientCommand(async (client: StreamrClient) => {
+    console.info(await client.getAddress())
+})
+    .description('displays your public address')
+    .parseAsync()

package/bin/streamr-wallet.ts

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+import { program } from 'commander'
+import pkg from '../package.json'
+
+program
+    .version(pkg.version)
+    .usage('<command> [<args>]')
+    .description('wallet subcommands')
+    .command('whoami', 'subscribe to a stream')
+    .parse()

package/bin/streamr.ts

@@ -9,4 +9,5 @@ program
     .command('stream', 'stream subcommands')
     .command('storage-node', 'storage node subcommands')
     .command('mock-data', 'mock data subcommands')
+    .command('wallet', 'displays your public address')
     .parse()

package/dist/bin/streamr-stream-publish.js

@@ -9,7 +9,7 @@ const stream_1 = require("stream");
 const streamr_test_utils_1 = require("streamr-test-utils");
 const event_stream_1 = __importDefault(require("event-stream"));
 const command_1 = require("../src/command");
-const publishStream = (stream, partitionKey, client) => {
+const publishStream = (stream, partitionKeyField, client) => {
     const writable = new stream_1.Writable({
         objectMode: true,
         write: (data, _, done) => {
@@ -27,14 +27,14 @@ const publishStream = (stream, partitionKey, client) => {
                 done(e);
                 return;
             }
-            // @ts-expect-error TODO: the last argument here looks wrong, should be just `partitionKey`?
-            client.publish(stream, json, Date.now(), json[partitionKey]).then(() => done(), (err) => done(err));
+            const partitionKey = (partitionKeyField !== undefined) ? json[partitionKeyField] : undefined;
+            client.publish(stream, json, Date.now(), partitionKey).then(() => done(), (err) => done(err));
         }
     });
     return writable;
 };
 (0, command_1.createClientCommand)(async (client, streamId, options) => {
-    const ps = publishStream(streamId, options.partitionKey, client);
+    const ps = publishStream(streamId, options.partitionKeyField, client);
     return new Promise((resolve, reject) => {
         process.stdin
             .pipe(event_stream_1.default.split())
@@ -54,6 +54,6 @@ const publishStream = (stream, partitionKey, client) => {
 })
     .arguments('<streamId>')
     .description('publish to a stream by reading JSON messages from stdin line-by-line')
-    .option('-k, --partition-key <string>', 'field name in each message to use for assigning the message to a stream partition')
+    .option('-k, --partition-key-field <string>', 'field name in each message to use for assigning the message to a stream partition')
     .parseAsync();
 //# sourceMappingURL=streamr-stream-publish.js.map

package/dist/bin/streamr-stream-publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr-stream-publish.js","sourceRoot":"","sources":["../../bin/streamr-stream-publish.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,mCAAiC;AAEjC,2DAAyC;AACzC,gEAA6B;AAC7B,4CAAoD;AAEpD,MAAM,aAAa,GAAG,CAClB,MAAc,EACd,YAAgC,EAChC,MAAqB,EACb,EAAE;IACV,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC;QAC1B,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,CAAC,IAAS,EAAE,CAAM,EAAE,IAAS,EAAE,EAAE;YACpC,IAAI,IAAI,GAAG,IAAI,CAAA;YACf,uBAAuB;YACvB,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBACrC,IAAI,EAAE,CAAA;gBACN,OAAM;aACT;YACD,IAAI;gBACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;aAC1B;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC9B,IAAI,CAAC,CAAC,CAAC,CAAA;gBACP,OAAM;aACT;YACD,4FAA4F;YAC5F,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAC7D,GAAG,EAAE,CAAC,IAAI,EAAE,EACZ,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CACrB,CAAA;QACL,CAAC;KACJ,CAAC,CAAA;IACF,OAAO,QAAQ,CAAA;AACnB,CAAC,CAAA;AAED,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAChF,MAAM,EAAE,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;IAChE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,OAAO,CAAC,KAAK;aACR,IAAI,CAAC,sBAAE,CAAC,KAAK,EAAE,CAAC;aAChB,IAAI,CAAC,EAAE,CAAC;aACR,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YACvB,iFAAiF;YACjF,2EAA2E;YAC3E,iFAAiF;YACjF,2EAA2E;YAC3E,sFAAsF;YACtF,uDAAuD;YACvD,MAAM,IAAA,yBAAI,EAAC,IAAI,CAAC,CAAA;YAChB,OAAO,CAAC,SAAS,CAAC,CAAA;QACtB,CAAC,CAAC;aACD,IAAI,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAE,CAAA;IAClD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC;KACG,SAAS,CAAC,YAAY,CAAC;KACvB,WAAW,CAAC,sEAAsE,CAAC;KACnF,MAAM,CAAC,8BAA8B,EAAE,mFAAmF,CAAC;KAC3H,UAAU,EAAE,CAAA"}
+{"version":3,"file":"streamr-stream-publish.js","sourceRoot":"","sources":["../../bin/streamr-stream-publish.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,mCAAiC;AAEjC,2DAAyC;AACzC,gEAA6B;AAC7B,4CAAoD;AAEpD,MAAM,aAAa,GAAG,CAClB,MAAc,EACd,iBAAqC,EACrC,MAAqB,EACb,EAAE;IACV,MAAM,QAAQ,GAAG,IAAI,iBAAQ,CAAC;QAC1B,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,CAAC,IAAS,EAAE,CAAM,EAAE,IAAS,EAAE,EAAE;YACpC,IAAI,IAAI,GAAG,IAAI,CAAA;YACf,uBAAuB;YACvB,IAAI,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;gBACrC,IAAI,EAAE,CAAA;gBACN,OAAM;aACT;YACD,IAAI;gBACA,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;aAC1B;YAAC,OAAO,CAAC,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAA;gBAC9B,IAAI,CAAC,CAAC,CAAC,CAAA;gBACP,OAAM;aACT;YACD,MAAM,YAAY,GAAG,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAC5F,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,YAAY,CAAC,CAAC,IAAI,CACvD,GAAG,EAAE,CAAC,IAAI,EAAE,EACZ,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CACrB,CAAA;QACL,CAAC;KACJ,CAAC,CAAA;IACF,OAAO,QAAQ,CAAA;AACnB,CAAC,CAAA;AAED,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAChF,MAAM,EAAE,GAAG,aAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;IACrE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,OAAO,CAAC,KAAK;aACR,IAAI,CAAC,sBAAE,CAAC,KAAK,EAAE,CAAC;aAChB,IAAI,CAAC,EAAE,CAAC;aACR,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE;YACvB,iFAAiF;YACjF,2EAA2E;YAC3E,iFAAiF;YACjF,2EAA2E;YAC3E,sFAAsF;YACtF,uDAAuD;YACvD,MAAM,IAAA,yBAAI,EAAC,IAAI,CAAC,CAAA;YAChB,OAAO,CAAC,SAAS,CAAC,CAAA;QACtB,CAAC,CAAC;aACD,IAAI,CAAC,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAE,CAAA;IAClD,CAAC,CAAC,CAAA;AACN,CAAC,CAAC;KACG,SAAS,CAAC,YAAY,CAAC;KACvB,WAAW,CAAC,sEAAsE,CAAC;KACnF,MAAM,CAAC,oCAAoC,EAAE,mFAAmF,CAAC;KACjI,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream-search.js

@@ -1,21 +1,42 @@
 #!/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");
-(0, command_1.createClientCommand)(async (client, term) => {
-    const streams = await client.searchStreams(term);
-    if (streams.length > 0) {
-        console.info(easy_table_1.default.print(streams.map(({ id }) => ({
-            id
-        }))));
+const commander_1 = require("commander");
+const permission_1 = require("../src/permission");
+const common_1 = require("../src/common");
+const createPermissionFilter = async (user, allowPublic, allOf, anyOf, client) => {
+    if (user !== undefined) {
+        return {
+            user: ((0, common_1.getOptionType)(user) === common_1.OptionType.ARGUMENT) ? user : await client.getAddress(),
+            allowPublic: allowPublic !== null && allowPublic !== void 0 ? allowPublic : false,
+            allOf,
+            anyOf
+        };
+    }
+    else if ((allowPublic !== undefined) || (allOf !== undefined) || (anyOf !== undefined)) {
+        console.error('specify a user with "--user" when using "--public", "--all" or "--any"');
+        process.exit(1);
+    }
+};
+const createPermissionListOption = (id) => {
+    return new commander_1.Option(`--${id} <permissions>`, 'comma-separated list of permissions')
+        .choices(Array.from(permission_1.PERMISSIONS.keys()))
+        .argParser((value) => value.split(',').map((id) => (0, permission_1.getPermission)(id)));
+};
+(0, command_1.createClientCommand)(async (client, term, options) => {
+    const permissionFilter = await createPermissionFilter(options.user, options.public, options.all, options.any, client);
+    const streams = client.searchStreams(term, permissionFilter);
+    for await (const stream of streams) {
+        console.log(stream.id);
     }
 })
-    .arguments('<term>')
+    .arguments('[term]')
     .description('search streams')
+    .option('--user [user]', 'a stream must have permissions for the given user, defaults to the authenticated user')
+    .option('--public', 'the permission can be implicit (a public permission to the stream)')
+    .addOption(createPermissionListOption('all'))
+    .addOption(createPermissionListOption('any'))
     .parseAsync();
 //# sourceMappingURL=streamr-stream-search.js.map

package/dist/bin/streamr-stream-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr-stream-search.js","sourceRoot":"","sources":["../../bin/streamr-stream-search.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,4DAAkC;AAElC,4CAAoD;AAEpD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,IAAY,EAAE,EAAE;IAC9D,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;IAChD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QACpB,OAAO,CAAC,IAAI,CAAC,oBAAS,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAC,EAAE,EAAC,EAAE,EAAE,CAAC,CAAC;YAChD,EAAE;SACL,CAAC,CAAC,CAAC,CAAC,CAAA;KACR;AACL,CAAC,CAAC;KACG,SAAS,CAAC,QAAQ,CAAC;KACnB,WAAW,CAAC,gBAAgB,CAAC;KAC7B,UAAU,EAAE,CAAA"}
+{"version":3,"file":"streamr-stream-search.js","sourceRoot":"","sources":["../../bin/streamr-stream-search.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,4CAAoD;AACpD,yCAAkC;AAClC,kDAA8D;AAC9D,0CAAyD;AAEzD,MAAM,sBAAsB,GAAG,KAAK,EAChC,IAAkC,EAClC,WAAgC,EAChC,KAAqC,EACrC,KAAqC,EACrC,MAAqB,EAC4B,EAAE;IACnD,IAAI,IAAI,KAAK,SAAS,EAAE;QACpB,OAAO;YACH,IAAI,EAAE,CAAC,IAAA,sBAAa,EAAC,IAAI,CAAC,KAAK,mBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAc,CAAC,CAAC,CAAC,MAAM,MAAM,CAAC,UAAU,EAAE;YAChG,WAAW,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,KAAK;YACjC,KAAK;YACL,KAAK;SACR,CAAA;KACJ;SAAM,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,EAAE;QACtF,OAAO,CAAC,KAAK,CAAC,wEAAwE,CAAC,CAAA;QACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;AACL,CAAC,CAAA;AAED,MAAM,0BAA0B,GAAG,CAAC,EAAU,EAAE,EAAE;IAC9C,OAAO,IAAI,kBAAM,CAAC,KAAK,EAAE,gBAAgB,EAAE,qCAAqC,CAAC;SAC5E,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAW,CAAC,IAAI,EAAE,CAAC,CAAC;SACvC,SAAS,CAAC,CAAC,KAAa,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,0BAAa,EAAC,EAAE,CAAC,CAAC,CAAC,CAAA;AACtF,CAAC,CAAA;AAED,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,IAAwB,EAAE,OAAY,EAAG,EAAE;IACzF,MAAM,gBAAgB,GAAG,MAAM,sBAAsB,CACjD,OAAO,CAAC,IAAI,EACZ,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,GAAG,EACX,OAAO,CAAC,GAAG,EACX,MAAM,CACT,CAAA;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAA;IAC5D,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,OAAO,EAAE;QAChC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;KACzB;AACL,CAAC,CAAC;KACG,SAAS,CAAC,QAAQ,CAAC;KACnB,WAAW,CAAC,gBAAgB,CAAC;KAC7B,MAAM,CAAC,eAAe,EAAE,uFAAuF,CAAC;KAChH,MAAM,CAAC,UAAU,EAAE,oEAAoE,CAAC;KACxF,SAAS,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;KAC5C,SAAS,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC;KAC5C,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream.js

@@ -12,7 +12,7 @@ commander_1.program
     .description('stream subcommands')
     .command('subscribe', 'subscribe to a stream')
     .command('publish', 'publish to a stream')
-    .command('list', 'fetch a list of streams')
+    .command('search', 'search for streams')
     .command('show', 'info about a stream')
     .command("create", "create a new stream")
     .command('resend', 'request resend of a stream')

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

@@ -1 +1 @@
-{"version":3,"file":"streamr-stream.js","sourceRoot":"","sources":["../../bin/streamr-stream.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,oBAAoB,CAAC;KACjC,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC;KAC7C,OAAO,CAAC,SAAS,EAAE,qBAAqB,CAAC;KACzC,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC;KAC1C,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC;KACtC,OAAO,CAAC,QAAQ,EAAE,qBAAqB,CAAC;KACxC,OAAO,CAAC,QAAQ,EAAE,4BAA4B,CAAC;KAC/C,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;KAC/C,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;KACjD,KAAK,EAAE,CAAA"}
+{"version":3,"file":"streamr-stream.js","sourceRoot":"","sources":["../../bin/streamr-stream.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,oBAAoB,CAAC;KACjC,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC;KAC7C,OAAO,CAAC,SAAS,EAAE,qBAAqB,CAAC;KACzC,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC;KACvC,OAAO,CAAC,MAAM,EAAE,qBAAqB,CAAC;KACtC,OAAO,CAAC,QAAQ,EAAE,qBAAqB,CAAC;KACxC,OAAO,CAAC,QAAQ,EAAE,4BAA4B,CAAC;KAC/C,OAAO,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;KAC/C,OAAO,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;KACjD,KAAK,EAAE,CAAA"}

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

@@ -0,0 +1,11 @@
+#!/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-wallet-whoami.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-wallet-whoami.js","sourceRoot":"","sources":["../../bin/streamr-wallet-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"}

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

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/bin/streamr-wallet.js

@@ -0,0 +1,15 @@
+#!/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 });
+const commander_1 = require("commander");
+const package_json_1 = __importDefault(require("../package.json"));
+commander_1.program
+    .version(package_json_1.default.version)
+    .usage('<command> [<args>]')
+    .description('wallet subcommands')
+    .command('whoami', 'subscribe to a stream')
+    .parse();
+//# sourceMappingURL=streamr-wallet.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-wallet.js","sourceRoot":"","sources":["../../bin/streamr-wallet.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,oBAAoB,CAAC;KACjC,OAAO,CAAC,QAAQ,EAAE,uBAAuB,CAAC;KAC1C,KAAK,EAAE,CAAA"}

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

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

package/dist/bin/streamr-whoami.js

@@ -0,0 +1,11 @@
+#!/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

@@ -0,0 +1 @@
+{"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"}

package/dist/bin/streamr.js

@@ -13,5 +13,6 @@ commander_1.program
     .command('stream', 'stream subcommands')
     .command('storage-node', 'storage node subcommands')
     .command('mock-data', 'mock data subcommands')
+    .command('wallet', 'displays your public address')
     .parse();
 //# sourceMappingURL=streamr.js.map

package/dist/bin/streamr.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr.js","sourceRoot":"","sources":["../../bin/streamr.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,iCAAiC,CAAC;KACxC,WAAW,CAAC,yEAAyE,CAAC;KACtF,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC;KACvC,OAAO,CAAC,cAAc,EAAE,0BAA0B,CAAC;KACnD,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC;KAC7C,KAAK,EAAE,CAAA"}
+{"version":3,"file":"streamr.js","sourceRoot":"","sources":["../../bin/streamr.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,iCAAiC,CAAC;KACxC,WAAW,CAAC,yEAAyE,CAAC;KACtF,OAAO,CAAC,QAAQ,EAAE,oBAAoB,CAAC;KACvC,OAAO,CAAC,cAAc,EAAE,0BAA0B,CAAC;KACnD,OAAO,CAAC,WAAW,EAAE,uBAAuB,CAAC;KAC7C,OAAO,CAAC,QAAQ,EAAE,8BAA8B,CAAC;KACjD,KAAK,EAAE,CAAA"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/cli-tools",
-    "version": "6.0.0-alpha.2",
+    "version": "6.0.0-alpha.6",
     "description": "Command line tools for Streamr.",
     "bin": {
         "streamr": "dist/bin/streamr.js"
@@ -33,15 +33,14 @@
         "easy-table": "^1.1.1",
         "event-stream": "^4.0.1",
         "lodash": "^4.17.21",
-        "streamr-client": "^6.0.0-alpha.24",
-        "streamr-client-protocol": "^11.0.0",
+        "streamr-client": "^6.0.0-alpha.32",
+        "streamr-client-protocol": "^12.0.0",
         "streamr-test-utils": "^2.0.0"
     },
     "devDependencies": {
         "@streamr/dev-config": "^1.0.0",
         "@types/easy-table": "0.0.32",
         "@types/event-stream": "^3.3.34",
-        "@types/jest": "^27.0.2",
         "@types/lodash": "^4.14.175",
         "@typescript-eslint/eslint-plugin": "^5.0.0",
         "@typescript-eslint/parser": "^5.0.0",

package/dist/src/common.d.ts

@@ -3,4 +3,9 @@ export interface GlobalCommandLineArgs {
     config?: string;
     privateKey?: string;
 }
+export declare enum OptionType {
+    FLAG = 0,
+    ARGUMENT = 1
+}
+export declare const getOptionType: (value: string | boolean) => OptionType | never;
 export declare function createFnParseInt(name: string): (s: string) => number;

package/dist/src/common.js

@@ -1,6 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createFnParseInt = void 0;
+exports.createFnParseInt = exports.getOptionType = exports.OptionType = void 0;
+var OptionType;
+(function (OptionType) {
+    OptionType[OptionType["FLAG"] = 0] = "FLAG";
+    OptionType[OptionType["ARGUMENT"] = 1] = "ARGUMENT"; // e.g. "--private-key 0x1234"
+})(OptionType = exports.OptionType || (exports.OptionType = {}));
+const getOptionType = (value) => {
+    if (typeof value === 'boolean') {
+        return OptionType.FLAG;
+    }
+    else if (typeof value === 'string') {
+        return OptionType.ARGUMENT;
+    }
+    else {
+        throw new Error(`unknown option type (value: ${value})`);
+    }
+};
+exports.getOptionType = getOptionType;
 function createFnParseInt(name) {
     return (str) => {
         const n = parseInt(str, 10);

package/dist/src/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/common.ts"],"names":[],"mappings":";;;AAMA,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":["../../src/common.ts"],"names":[],"mappings":";;;AAMA,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,2CAAI,CAAA;IACJ,mDAAQ,CAAA,CAAE,8BAA8B;AAC5C,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAEM,MAAM,aAAa,GAAG,CAAC,KAAuB,EAAsB,EAAE;IACzE,IAAI,OAAO,KAAK,KAAK,SAAS,EAAE;QAC5B,OAAO,UAAU,CAAC,IAAI,CAAA;KACzB;SAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QAClC,OAAO,UAAU,CAAC,QAAQ,CAAA;KAC7B;SAAM;QACH,MAAM,IAAI,KAAK,CAAC,+BAA+B,KAAK,GAAG,CAAC,CAAA;KAC3D;AACL,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB;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"}

package/dist/src/permission.d.ts

@@ -1,4 +1,5 @@
 import { Stream, StreamPermission } from 'streamr-client';
 export declare const PERMISSIONS: Map<string, StreamPermission>;
+export declare const getPermission: (id: string) => StreamPermission | never;
 export declare const getPermissionId: (permission: StreamPermission) => string;
 export declare const runModifyPermissionsCommand: (modifyUserPermission: (stream: Stream, permission: StreamPermission, target: string) => Promise<void>, modifyPublicPermission: (stream: Stream, permission: StreamPermission) => Promise<void>, modification: string) => void;

package/dist/src/permission.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runModifyPermissionsCommand = exports.getPermissionId = exports.PERMISSIONS = void 0;
+exports.runModifyPermissionsCommand = exports.getPermissionId = exports.getPermission = exports.PERMISSIONS = void 0;
 const commander_1 = require("commander");
 const streamr_client_1 = require("streamr-client");
 const command_1 = require("./command");
@@ -20,6 +20,14 @@ exports.PERMISSIONS = new Map([
     ['delete', streamr_client_1.StreamPermission.DELETE],
     ['grant', streamr_client_1.StreamPermission.GRANT]
 ]);
+const getPermission = (id) => {
+    const result = exports.PERMISSIONS.get(id);
+    if (result === undefined) {
+        throw new Error(`unknown permission: ${id}`);
+    }
+    return result;
+};
+exports.getPermission = getPermission;
 const getPermissionId = (permission) => {
     return Array.from(exports.PERMISSIONS.entries()).find(([_id, p]) => p === permission)[0];
 };

package/dist/src/permission.js.map

@@ -1 +1 @@
-{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/permission.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,mDAAwE;AACxE,uCAA+C;AAE/C,MAAM,cAAc,GAAG,QAAQ,CAAA;AAE/B,MAAM,SAAS,GAAG,CAAC,IAAY,EAAoB,EAAE;IACjD,IAAI,IAAI,KAAK,cAAc,EAAE;QACzB,OAAO,SAAS,CAAA;KACnB;SAAM;QACH,OAAO,IAAI,CAAA;KACd;AACL,CAAC,CAAA;AAEY,QAAA,WAAW,GAAG,IAAI,GAAG,CAA0B;IACxD,CAAC,WAAW,EAAE,iCAAgB,CAAC,SAAS,CAAC;IACzC,CAAC,SAAS,EAAE,iCAAgB,CAAC,OAAO,CAAC;IACrC,CAAC,MAAM,EAAE,iCAAgB,CAAC,IAAI,CAAC;IAC/B,CAAC,QAAQ,EAAE,iCAAgB,CAAC,MAAM,CAAC;IACnC,CAAC,OAAO,EAAE,iCAAgB,CAAC,KAAK,CAAC;CACpC,CAAC,CAAA;AAEK,MAAM,eAAe,GAAG,CAAC,UAA4B,EAAU,EAAE;IACpE,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,UAAU,CAAE,CAAC,CAAC,CAAC,CAAA;AACrF,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,2BAA2B,GAAG,CACvC,oBAAqG,EACrG,sBAAuF,EACvF,YAAoB,EAChB,EAAE;IACN,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,IAAY,EAAE,aAAuB,EAAE,EAAE;QACzG,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAC9B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,KAAK,EAAE,MAAM,YAAY,IAAI,aAAa,EAAE;YAC5C,MAAM,UAAU,GAAG,mBAAW,CAAC,GAAG,CAAC,YAAY,CAAE,CAAA;YACjD,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,MAAM,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;aACzD;iBAAM;gBACH,MAAM,sBAAsB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;aACnD;SACJ;IACL,CAAC,CAAC;SACG,WAAW,CAAC,IAAI,oBAAQ,CAAC,YAAY,CAAC,CAAC;SACvC,WAAW,CAAC,IAAI,oBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC,WAAW,CAAC,IAAI,oBAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACrF,WAAW,CAAC,GAAG,YAAY,kDAAkD,YAAY,sBAAsB,CAAC;SAChH,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACjC,CAAC,CAAA;AAtBY,QAAA,2BAA2B,+BAsBvC"}
+{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/permission.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AACpC,mDAAwE;AACxE,uCAA+C;AAE/C,MAAM,cAAc,GAAG,QAAQ,CAAA;AAE/B,MAAM,SAAS,GAAG,CAAC,IAAY,EAAoB,EAAE;IACjD,IAAI,IAAI,KAAK,cAAc,EAAE;QACzB,OAAO,SAAS,CAAA;KACnB;SAAM;QACH,OAAO,IAAI,CAAA;KACd;AACL,CAAC,CAAA;AAEY,QAAA,WAAW,GAAG,IAAI,GAAG,CAA0B;IACxD,CAAC,WAAW,EAAE,iCAAgB,CAAC,SAAS,CAAC;IACzC,CAAC,SAAS,EAAE,iCAAgB,CAAC,OAAO,CAAC;IACrC,CAAC,MAAM,EAAE,iCAAgB,CAAC,IAAI,CAAC;IAC/B,CAAC,QAAQ,EAAE,iCAAgB,CAAC,MAAM,CAAC;IACnC,CAAC,OAAO,EAAE,iCAAgB,CAAC,KAAK,CAAC;CACpC,CAAC,CAAA;AAEK,MAAM,aAAa,GAAG,CAAC,EAAU,EAA4B,EAAE;IAClE,MAAM,MAAM,GAAG,mBAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IAClC,IAAI,MAAM,KAAK,SAAS,EAAE;QACtB,MAAM,IAAI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAA;KAC/C;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AANY,QAAA,aAAa,iBAMzB;AAEM,MAAM,eAAe,GAAG,CAAC,UAA4B,EAAU,EAAE;IACpE,OAAO,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,UAAU,CAAE,CAAC,CAAC,CAAC,CAAA;AACrF,CAAC,CAAA;AAFY,QAAA,eAAe,mBAE3B;AAEM,MAAM,2BAA2B,GAAG,CACvC,oBAAqG,EACrG,sBAAuF,EACvF,YAAoB,EAChB,EAAE;IACN,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,IAAY,EAAE,aAAuB,EAAE,EAAE;QACzG,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,CAAA;QAC9B,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QAC/C,IAAI,KAAK,EAAE,MAAM,YAAY,IAAI,aAAa,EAAE;YAC5C,MAAM,UAAU,GAAG,mBAAW,CAAC,GAAG,CAAC,YAAY,CAAE,CAAA;YACjD,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,MAAM,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;aACzD;iBAAM;gBACH,MAAM,sBAAsB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;aACnD;SACJ;IACL,CAAC,CAAC;SACG,WAAW,CAAC,IAAI,oBAAQ,CAAC,YAAY,CAAC,CAAC;SACvC,WAAW,CAAC,IAAI,oBAAQ,CAAC,QAAQ,CAAC,CAAC;SACnC,WAAW,CAAC,IAAI,oBAAQ,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACrF,WAAW,CAAC,GAAG,YAAY,kDAAkD,YAAY,sBAAsB,CAAC;SAChH,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AACjC,CAAC,CAAA;AAtBY,QAAA,2BAA2B,+BAsBvC"}