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

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

@@ -4,29 +4,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+require("../src/logLevel");
 const commander_1 = require("commander");
-const list_1 = require("../src/list");
-const common_1 = require("./common");
-const package_json_1 = __importDefault(require("../package.json"));
-const program = new commander_1.Command();
-program
-    .description('fetch a list of streams that are accessible by the authenticated user')
-    .option('-s, --search [term]', 'search for term in name or description')
-    .addOption(new commander_1.Option('-o, --operation [permission]', 'filter by permission').choices(['stream_get', 'stream_subscribe', 'stream_publish', 'stream_delete', 'stream_share']).default('stream_get'))
-    .option('--public-access', 'include publicly available streams')
-    .option('--no-granted-access', 'exclude streams that user has directly granted permissions to');
-common_1.authOptions(program);
-common_1.envOptions(program)
-    .version(package_json_1.default.version)
-    .action((options) => {
+const easy_table_1 = __importDefault(require("easy-table"));
+const command_1 = require("../src/command");
+const permission_1 = require("../src/permission");
+(0, command_1.createClientCommand)(async (client, options) => {
     const query = {
-        operation: options.operation,
+        permission: permission_1.PERMISSIONS.get(options.permission),
         noConfig: true,
         publicAccess: options.publicAccess,
         search: options.search,
         grantedAccess: options.grantedAccess
     };
-    list_1.list(query, common_1.formStreamrOptionsWithEnv(options));
+    const streams = await client.listStreams(query);
+    if (streams.length > 0) {
+        console.info(easy_table_1.default.print(streams.map(({ id }) => ({
+            id
+        }))));
+    }
 })
-    .parse(process.argv);
-common_1.exitWithHelpIfArgsNotBetween(program, 0, 0);
+    .description('fetch a list of streams that are accessible by the authenticated user')
+    .option('-s, --search [term]', 'search for term in name or description')
+    .addOption(new commander_1.Option('-p, --permission <permission>', 'filter by permission')
+    .choices(Array.from(permission_1.PERMISSIONS.keys())))
+    .option('--public-access', 'include publicly available streams')
+    .option('--no-granted-access', 'exclude streams that user has directly granted permissions to')
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-list.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-list.js","sourceRoot":"","sources":["../../bin/streamr-stream-list.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,yCAAkC;AAClC,4DAAkC;AAElC,4CAAoD;AACpD,kDAA+C;AAE/C,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,OAAY,EAAE,EAAE;IAC9D,MAAM,KAAK,GAAoB;QAC3B,UAAU,EAAE,wBAAW,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC;QAC/C,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,aAAa,EAAE,OAAO,CAAC,aAAa;KACvC,CAAA;IACD,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAA;IAC/C,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,WAAW,CAAC,uEAAuE,CAAC;KACpF,MAAM,CAAC,qBAAqB,EAAE,wCAAwC,CAAC;KACvE,SAAS,CAAC,IAAI,kBAAM,CAAC,+BAA+B,EAAE,sBAAsB,CAAC;KACzE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;KAC5C,MAAM,CAAC,iBAAiB,EAAE,oCAAoC,CAAC;KAC/D,MAAM,CAAC,qBAAqB,EAAE,+DAA+D,CAAC;KAC9F,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream-publish.d.ts

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

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

@@ -4,29 +4,56 @@ 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");
+require("../src/logLevel");
+const stream_1 = require("stream");
+const streamr_test_utils_1 = require("streamr-test-utils");
 const event_stream_1 = __importDefault(require("event-stream"));
-const publish_1 = require("../src/publish");
-const common_1 = require("./common");
-const package_json_1 = __importDefault(require("../package.json"));
-const program = new commander_1.Command();
-program
-    .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');
-common_1.authOptions(program);
-common_1.envOptions(program)
-    .version(package_json_1.default.version)
-    .action((streamId, options) => {
-    const ps = publish_1.publishStream(streamId, options.partitionKey, common_1.formStreamrOptionsWithEnv(options));
-    process.stdin
-        .pipe(event_stream_1.default.split())
-        .pipe(ps)
-        .on('error', (err) => {
-        console.error(err);
-        process.exit(1);
-        // process.stdin.pipe(ps) recover pipe to continue execution
+const command_1 = require("../src/command");
+const publishStream = (stream, partitionKey, client) => {
+    const writable = new stream_1.Writable({
+        objectMode: true,
+        write: (data, _, done) => {
+            let json = null;
+            // ignore newlines, etc
+            if (!data || String(data).trim() === '') {
+                done();
+                return;
+            }
+            try {
+                json = JSON.parse(data);
+            }
+            catch (e) {
+                console.error(data.toString());
+                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));
+        }
+    });
+    return writable;
+};
+(0, command_1.createClientCommand)(async (client, streamId, options) => {
+    const ps = publishStream(streamId, options.partitionKey, client);
+    return new Promise((resolve, reject) => {
+        process.stdin
+            .pipe(event_stream_1.default.split())
+            .pipe(ps)
+            .once('finish', async () => {
+            // We need to wait some time because the client.publish() may resolve the promise
+            // before the node has propagated the message. That may happend if the node
+            // has not yet connected to Tracker when client.publish() is called. In that case
+            // the message is put to the propagation queue (activeTaskStore.add call in
+            // network Propagation.ts:59) and the client.publish() promise resolves immeditatelly.
+            // TODO Remove this wait when NET-604 has been resolved
+            await (0, streamr_test_utils_1.wait)(2000);
+            resolve(undefined);
+        })
+            .once('error', (err) => reject(err));
     });
 })
-    .parse(process.argv);
-common_1.exitWithHelpIfArgsNotBetween(program, 1, 1);
+    .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')
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-publish.js.map

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

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

package/dist/bin/streamr-stream-resend-from.d.ts

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

package/dist/bin/streamr-stream-resend-from.js

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../src/logLevel");
+const command_1 = require("../src/command");
+const resend_1 = require("../src/resend");
+(0, command_1.createClientCommand)(async (client, from, streamId, options) => {
+    const resendOptions = {
+        from: {
+            timestamp: Date.parse(from),
+            sequenceNumber: 0
+        },
+        publisherId: options.publisherId
+    };
+    await (0, resend_1.resend)(streamId, resendOptions, client, options.subscribe);
+}, {
+    clientOptionsFactory: (options) => ({
+        orderMessages: !options.disableOrdering
+    })
+})
+    .arguments('<from> <streamId>')
+    .description('request messages starting from given date-time (format: "YYYY-MM-DDTHH:mm:ss.sssZ")')
+    .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)
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-resend-from.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-resend-from.js","sourceRoot":"","sources":["../../bin/streamr-stream-resend-from.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,4CAAoD;AACpD,0CAAsC;AAEtC,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,IAAY,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAC9F,MAAM,aAAa,GAAG;QAClB,IAAI,EAAE;YACF,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,cAAc,EAAE,CAAC;SACpB;QACD,WAAW,EAAE,OAAO,CAAC,WAAW;KACnC,CAAA;IACD,MAAM,IAAA,eAAM,EAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;AACpE,CAAC,EAAE;IACC,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChC,aAAa,EAAE,CAAC,OAAO,CAAC,eAAe;KAC1C,CAAC;CACL,CAAC;KACG,SAAS,CAAC,mBAAmB,CAAC;KAC9B,WAAW,CAAC,qFAAqF,CAAC;KAClG,MAAM,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;KAChE,MAAM,CAAC,wBAAwB,EAAE,8CAA8C,EAAE,KAAK,CAAC;KACvF,MAAM,CAAC,iBAAiB,EAAE,iCAAiC,EAAE,KAAK,CAAC;KACnE,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream-resend-last.d.ts

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

package/dist/bin/streamr-stream-resend-last.js

@@ -0,0 +1,26 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../src/logLevel");
+const command_1 = require("../src/command");
+const resend_1 = require("../src/resend");
+(0, command_1.createClientCommand)(async (client, n, streamId, options) => {
+    if (isNaN(n)) {
+        console.error('argument n is not a number');
+        process.exit(1);
+    }
+    const resendOptions = {
+        last: parseInt(n)
+    };
+    await (0, resend_1.resend)(streamId, resendOptions, client, options.subscribe);
+}, {
+    clientOptionsFactory: (options) => ({
+        orderMessages: !options.disableOrdering
+    })
+})
+    .arguments('<n> <streamId>')
+    .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)
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-resend-last.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-resend-last.js","sourceRoot":"","sources":["../../bin/streamr-stream-resend-last.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,4CAAoD;AACpD,0CAAsC;AAEtC,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,CAAS,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAC3F,IAAI,KAAK,CAAC,CAAQ,CAAC,EAAE;QACjB,OAAO,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAA;QAC3C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;KAClB;IACD,MAAM,aAAa,GAAG;QAClB,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;KACpB,CAAA;IACD,MAAM,IAAA,eAAM,EAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAA;AACpE,CAAC,EAAE;IACC,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChC,aAAa,EAAE,CAAC,OAAO,CAAC,eAAe;KAC1C,CAAC;CACL,CAAC;KACG,SAAS,CAAC,gBAAgB,CAAC;KAC3B,WAAW,CAAC,yBAAyB,CAAC;KACtC,MAAM,CAAC,wBAAwB,EAAE,8CAA8C,EAAE,KAAK,CAAC;KACvF,MAAM,CAAC,iBAAiB,EAAE,iCAAiC,EAAE,KAAK,CAAC;KACnE,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream-resend-range.d.ts

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

package/dist/bin/streamr-stream-resend-range.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../src/logLevel");
+const command_1 = require("../src/command");
+const resend_1 = require("../src/resend");
+(0, command_1.createClientCommand)(async (client, from, to, streamId, options) => {
+    const resendOptions = {
+        from: {
+            timestamp: Date.parse(from),
+            sequenceNumber: 0
+        },
+        to: {
+            timestamp: Date.parse(to),
+            sequenceNumber: 0
+        },
+        publisherId: options.publisherId,
+        msgChainId: options.msgChainId
+    };
+    (0, resend_1.assertBothOrNoneDefined)('publisherId', 'msgChainId', '--publisher-id must be accompanied by option --msg-chain-id', options);
+    await (0, resend_1.resend)(streamId, resendOptions, client, false);
+}, {
+    clientOptionsFactory: (options) => ({
+        orderMessages: !options.disableOrdering
+    })
+})
+    .arguments('<from> <to> <streamId>')
+    .description('request messages between two given date-times (format: "YYYY-MM-DDTHH:mm:ss.sssZ")')
+    .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)
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-resend-range.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-resend-range.js","sourceRoot":"","sources":["../../bin/streamr-stream-resend-range.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,4CAAoD;AACpD,0CAA+D;AAE/D,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,IAAY,EAAE,EAAU,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAC1G,MAAM,aAAa,GAAG;QAClB,IAAI,EAAE;YACF,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YAC3B,cAAc,EAAE,CAAC;SACpB;QACD,EAAE,EAAE;YACA,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,cAAc,EAAE,CAAC;SACpB;QACD,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,UAAU,EAAE,OAAO,CAAC,UAAU;KACjC,CAAA;IACD,IAAA,gCAAuB,EAAC,aAAa,EAAE,YAAY,EAAE,6DAA6D,EAAE,OAAO,CAAC,CAAA;IAC5H,MAAM,IAAA,eAAM,EAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;AACxD,CAAC,EAAE;IACC,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChC,aAAa,EAAE,CAAC,OAAO,CAAC,eAAe;KAC1C,CAAC;CACL,CAAC;KACG,SAAS,CAAC,wBAAwB,CAAC;KACnC,WAAW,CAAC,oFAAoF,CAAC;KACjG,MAAM,CAAC,yBAAyB,EAAE,6BAA6B,CAAC;KAChE,MAAM,CAAC,yBAAyB,EAAE,iCAAiC,CAAC;KACpE,MAAM,CAAC,wBAAwB,EAAE,8CAA8C,EAAE,KAAK,CAAC;KACvF,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream-resend.d.ts

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

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

@@ -1,101 +1,13 @@
 #!/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 resend_1 = require("../src/resend");
-const common_1 = require("./common");
-const package_json_1 = __importDefault(require("../package.json"));
-function handlePublisherIdAndMsgChainId(commandOptions, resendOptions) {
-    if ('publisherId' in commandOptions && !('msgChainId' in commandOptions)) {
-        console.error('option --publisher-id must be accompanied by option --msg-chain-id');
-        process.exit(1);
-    }
-    if ('msgChainId' in commandOptions && !('publisherId' in commandOptions)) {
-        console.error('option --msg-chain-id must be accompanied by option --publisher-id');
-        process.exit(1);
-    }
-    if ('publisherId' in commandOptions) {
-        resendOptions.publisherId = commandOptions.publisherId;
-    }
-    if ('msgChainId' in commandOptions) {
-        resendOptions.msgChainId = commandOptions.msgChainId;
-    }
-}
-const program = new commander_1.Command();
-program
+require("../src/logLevel");
+const command_1 = require("../src/command");
+(0, command_1.createCommand)()
     .usage('<command> [<args>]')
-    .description('request resend of stream and print JSON messages to stdout line-by-line');
-program
-    .command('last <n> <streamId>')
-    .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, streamId, options, command) => {
-    // @ts-expect-error
-    if (isNaN(n)) {
-        console.error('argument n is not a number');
-        process.exit(1);
-    }
-    const resendOptions = {
-        last: parseInt(n)
-    };
-    const clientOptions = common_1.formStreamrOptionsWithEnv(command.parent.opts());
-    clientOptions.orderMessages = !options.disableOrdering;
-    clientOptions.subscribe = options.subscribe;
-    resend_1.resend(streamId, resendOptions, clientOptions);
-});
-program
-    .command('from <from> <streamId>')
-    .description('request messages starting from given date-time (format: "YYYY-MM-DDTHH:mm:ss.sssZ")')
-    .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)
-    .option('-s, --subscribe', 'subscribe in addition to resend', false)
-    .action((from, streamId, options, command) => {
-    const resendOptions = {
-        from: {
-            timestamp: Date.parse(from),
-            sequenceNumber: 0
-        }
-    };
-    handlePublisherIdAndMsgChainId(options, resendOptions);
-    const clientOptions = common_1.formStreamrOptionsWithEnv(command.parent.opts());
-    clientOptions.orderMessages = !options.disableOrdering;
-    clientOptions.subscribe = options.subscribe;
-    resend_1.resend(streamId, resendOptions, clientOptions);
-});
-program
-    .command('range <from> <to> <streamId>')
-    .description('request messages between two given date-times (format: "YYYY-MM-DDTHH:mm:ss.sssZ")')
-    .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, to, streamId, options, command) => {
-    const resendOptions = {
-        from: {
-            timestamp: Date.parse(from),
-            sequenceNumber: 0
-        },
-        to: {
-            timestamp: Date.parse(to),
-            sequenceNumber: 0
-        },
-    };
-    handlePublisherIdAndMsgChainId(options, resendOptions);
-    const clientOptions = common_1.formStreamrOptionsWithEnv(command.parent.opts());
-    clientOptions.orderMessages = !options.disableOrdering;
-    resend_1.resend(streamId, resendOptions, clientOptions);
-});
-program
-    .on('command:*', (invalidCommand) => {
-    console.error(`invalid command: ${invalidCommand}`);
-    process.exit(1);
-});
-common_1.authOptions(program);
-common_1.envOptions(program)
-    .version(package_json_1.default.version)
-    .parse(process.argv);
-common_1.exitWithHelpIfArgsNotBetween(program, 1, Number.MAX_VALUE);
+    .description('request resend of stream and print JSON messages to stdout line-by-line')
+    .command('from', 'request messages starting from given date-time')
+    .command('last', 'request last N messages')
+    .command('range', 'request messages between two given date-times')
+    .parse();
+//# sourceMappingURL=streamr-stream-resend.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-resend.js","sourceRoot":"","sources":["../../bin/streamr-stream-resend.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AACxB,4CAA8C;AAE9C,IAAA,uBAAa,GAAE;KACV,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,yEAAyE,CAAC;KACtF,OAAO,CAAC,MAAM,EAAE,gDAAgD,CAAC;KACjE,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC;KAC1C,OAAO,CAAC,OAAO,EAAE,+CAA+C,CAAC;KACjE,KAAK,EAAE,CAAA"}

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

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

package/dist/bin/streamr-stream-revoke-permission.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+require("../src/logLevel");
+const permission_1 = require("../src/permission");
+(0, permission_1.runModifyPermissionsCommand)((stream, permission, target) => stream.revokeUserPermission(permission, target), (stream, permission) => stream.revokePublicPermission(permission), 'revoke');
+//# sourceMappingURL=streamr-stream-revoke-permission.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-revoke-permission.js","sourceRoot":"","sources":["../../bin/streamr-stream-revoke-permission.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,kDAA+D;AAE/D,IAAA,wCAA2B,EACvB,CAAC,MAAc,EAAE,UAA4B,EAAE,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,CAAC,EACjH,CAAC,MAAc,EAAE,UAA4B,EAAE,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAC3F,QAAQ,CACX,CAAA"}

package/dist/bin/streamr-stream-search.d.ts

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

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

@@ -0,0 +1,21 @@
+#!/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
+        }))));
+    }
+})
+    .arguments('<term>')
+    .description('search streams')
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-search.js.map

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

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

package/dist/bin/streamr-stream-show.d.ts

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

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

@@ -4,20 +4,21 @@ 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 show_1 = require("../src/show");
-const common_1 = require("./common");
-const package_json_1 = __importDefault(require("../package.json"));
-const program = new commander_1.Command();
-program
+require("../src/logLevel");
+const lodash_1 = __importDefault(require("lodash"));
+const command_1 = require("../src/command");
+const permission_1 = require("../src/permission");
+(0, command_1.createClientCommand)(async (client, streamId, options) => {
+    const stream = await client.getStream(streamId);
+    const obj = stream.toObject();
+    if (options.includePermissions) {
+        const permissions = await stream.getPermissions();
+        obj.permissions = lodash_1.default.mapValues(permissions, (p) => p.map(permission_1.getPermissionId));
+    }
+    console.info(JSON.stringify(obj, null, 2));
+})
     .arguments('<streamId>')
     .description('show detailed information about a stream')
-    .option('--include-permissions', 'include list of permissions (requires SHARE permission)');
-common_1.authOptions(program);
-common_1.envOptions(program)
-    .version(package_json_1.default.version)
-    .action((streamId, options) => {
-    show_1.show(streamId, options.includePermissions, common_1.formStreamrOptionsWithEnv(options));
-})
-    .parse(process.argv);
-common_1.exitWithHelpIfArgsNotBetween(program, 1, 1);
+    .option('--include-permissions', 'include list of permissions')
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-show.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-show.js","sourceRoot":"","sources":["../../bin/streamr-stream-show.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,oDAAsB;AAEtB,4CAAoD;AACpD,kDAAmD;AAEnD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAChF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAQ,MAAM,CAAC,QAAQ,EAAE,CAAA;IAClC,IAAI,OAAO,CAAC,kBAAkB,EAAE;QAC5B,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,CAAA;QACjD,GAAG,CAAC,WAAW,GAAG,gBAAC,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAqB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,4BAAe,CAAC,CAAC,CAAA;KAChG;IACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AAC9C,CAAC,CAAC;KACG,SAAS,CAAC,YAAY,CAAC;KACvB,WAAW,CAAC,0CAA0C,CAAC;KACvD,MAAM,CAAC,uBAAuB,EAAE,6BAA6B,CAAC;KAC9D,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream-subscribe.d.ts

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

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

@@ -1,25 +1,23 @@
 #!/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 subscribe_1 = require("../src/subscribe");
-const common_1 = require("./common");
-const package_json_1 = __importDefault(require("../package.json"));
-const program = new commander_1.Command();
-program
+require("../src/logLevel");
+const command_1 = require("../src/command");
+const common_1 = require("../src/common");
+(0, command_1.createClientCommand)(async (client, streamId, options) => {
+    await client.subscribe({
+        streamId,
+        partition: options.partition,
+    }, (message) => console.info(JSON.stringify(message)));
+}, {
+    autoDestroyClient: false,
+    clientOptionsFactory: (options) => ({
+        orderMessages: !options.disableOrdering
+    })
+})
     .arguments('<streamId>')
     .description('subscribe to a stream, prints JSON messages to stdout line-by-line')
-    .option('-p, --partition [partition]', 'partition', common_1.createFnParseInt('--partition'), 0)
-    .option('-d, --disable-ordering', 'disable ordering of messages by OrderingUtil', false);
-common_1.authOptions(program);
-common_1.envOptions(program)
-    .version(package_json_1.default.version)
-    .action((streamId, options) => {
-    options.orderMessages = !options.disableOrdering;
-    subscribe_1.subscribe(streamId, options.partition, common_1.formStreamrOptionsWithEnv(options));
-})
-    .parse(process.argv);
-common_1.exitWithHelpIfArgsNotBetween(program, 1, 1);
+    .option('-p, --partition [partition]', 'partition', (0, common_1.createFnParseInt)('--partition'), 0)
+    .option('-d, --disable-ordering', 'disable ordering of messages by OrderingUtil', false)
+    .parseAsync();
+//# sourceMappingURL=streamr-stream-subscribe.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-stream-subscribe.js","sourceRoot":"","sources":["../../bin/streamr-stream-subscribe.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAExB,4CAAoD;AACpD,0CAAgD;AAEhD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAY,EAAE,EAAE;IAChF,MAAM,MAAM,CAAC,SAAS,CAAC;QACnB,QAAQ;QACR,SAAS,EAAE,OAAO,CAAC,SAAS;KAC/B,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;AAC1D,CAAC,EAAE;IACC,iBAAiB,EAAE,KAAK;IACxB,oBAAoB,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChC,aAAa,EAAE,CAAC,OAAO,CAAC,eAAe;KAC1C,CAAC;CACL,CAAC;KACG,SAAS,CAAC,YAAY,CAAC;KACvB,WAAW,CAAC,oEAAoE,CAAC;KACjF,MAAM,CAAC,6BAA6B,EAAE,WAAW,EAAE,IAAA,yBAAgB,EAAC,aAAa,CAAC,EAAE,CAAC,CAAC;KACtF,MAAM,CAAC,wBAAwB,EAAE,8CAA8C,EAAE,KAAK,CAAC;KACvF,UAAU,EAAE,CAAA"}

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

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

package/dist/bin/streamr-stream.js

@@ -16,4 +16,7 @@ commander_1.program
     .command('show', 'info about a stream')
     .command("create", "create a new stream")
     .command('resend', 'request resend of a stream')
-    .parse(process.argv);
+    .command('grant-permission', 'grant permission')
+    .command('revoke-permission', 'revoke permission')
+    .parse();
+//# sourceMappingURL=streamr-stream.js.map

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

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

package/dist/bin/streamr.d.ts

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

package/dist/bin/streamr.js

@@ -13,4 +13,5 @@ commander_1.program
     .command('stream', 'stream subcommands')
     .command('storage-node', 'storage node subcommands')
     .command('mock-data', 'mock data subcommands')
-    .parse(process.argv);
+    .parse();
+//# sourceMappingURL=streamr.js.map

package/dist/bin/streamr.js.map

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

package/dist/package.json

@@ -1,18 +1,20 @@
 {
     "name": "@streamr/cli-tools",
-    "version": "5.0.0",
+    "version": "6.0.0-alpha.2",
     "description": "Command line tools for Streamr.",
     "bin": {
         "streamr": "dist/bin/streamr.js"
     },
     "scripts": {
-        "prepare": "tsc",
-        "build": "tsc",
+        "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"
     },
     "repository": {
         "type": "git",
-        "url": "git@github.com:streamr-dev/cli-tools.git"
+        "url": "git+https://github.com/streamr-dev/network-monorepo.git",
+        "directory": "packages/cli-tools"
     },
     "keywords": [
         "streamr",
@@ -27,16 +29,25 @@
     },
     "homepage": "https://github.com/streamr-dev/cli-tools#readme",
     "dependencies": {
-        "commander": "^7.2.0",
+        "commander": "^8.3.0",
         "easy-table": "^1.1.1",
         "event-stream": "^4.0.1",
-        "streamr-client": "^5.3.0-beta.0",
-        "ts-node": "^9.1.1",
-        "typescript": "^4.2.3"
+        "lodash": "^4.17.21",
+        "streamr-client": "^6.0.0-alpha.24",
+        "streamr-client-protocol": "^11.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/node": "^14.14.37"
+        "@types/jest": "^27.0.2",
+        "@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"
     }
 }