@streamr/cli-tools 8.5.5 → 100.0.0-pretestnet.2

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand } from '../src/command'
 
 createClientCommand(async (client: StreamrClient, storageNodeAddress: string, streamId: string) => {

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import '../src/logLevel'
 import EasyTable from 'easy-table'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand } from '../src/command'
 
 createClientCommand((async (client: StreamrClient, storageNodeAddress: string) => {

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand } from '../src/command'
 
 createClientCommand(async (client: StreamrClient, storageNodeAddress: string, streamId: string) => {

package/bin/streamr-stream-create.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createFnParseInt } from '../src/common'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { resend } from '../src/resend'
 

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

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { resend } from '../src/resend'
 

package/bin/streamr-stream-search.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient, { SearchStreamsPermissionFilter, StreamPermission } from 'streamr-client'
+import { StreamrClient, SearchStreamsPermissionFilter, StreamPermission } from 'streamr-client'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { Option } from 'commander'
 import { getPermission, PERMISSIONS } from '../src/permission'

package/bin/streamr-stream-show.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { getPermissionId } from '../src/permission'
 

package/bin/streamr-stream-subscribe.ts

@@ -2,9 +2,10 @@
 import '../src/logLevel'
 import omit from 'lodash/omit'
 import isString from 'lodash/isString'
-import StreamrClient, { MessageMetadata } from 'streamr-client'
+import { StreamrClient, MessageMetadata } from 'streamr-client'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { createFnParseInt } from '../src/common'
+import { binaryToHex } from '@streamr/utils'
 
 interface Options extends BaseOptions {
     partition: number
@@ -14,15 +15,16 @@ interface Options extends BaseOptions {
 }
 
 createClientCommand(async (client: StreamrClient, streamId: string, options: Options) => {
+    const formContent = (content: unknown) => options.raw ? binaryToHex(content as Uint8Array) : content
     const formMessage = options.withMetadata
-        ? (message: unknown, metadata: MessageMetadata) => ({ message, metadata: omit(metadata, 'streamMessage') })
-        : (message: unknown) => message
+        ? (content: unknown, metadata: MessageMetadata) => ({ content: formContent(content), metadata: omit(metadata, 'streamMessage') })
+        : (content: unknown) => formContent(content)
     await client.subscribe({
         streamId,
         partition: options.partition,
         raw: options.raw
-    }, (message, metadata) => {
-        const output = formMessage(message, metadata)
+    }, (content, metadata) => {
+        const output = formMessage(content, metadata)
         console.info(isString(output) ? output : JSON.stringify(output))
     })
 }, {

package/bin/streamr-stream.ts

@@ -10,7 +10,7 @@ program
     .command('publish', 'publish to a stream')
     .command('search', 'search for streams')
     .command('show', 'info about a stream')
-    .command("create", "create a new stream")
+    .command('create', 'create a new stream')
     .command('resend', 'request resend of a stream')
     .command('grant-permission', 'grant permission')
     .command('revoke-permission', 'revoke permission')

package/bin/streamr-wallet-whoami.ts

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import '../src/logLevel'
-import StreamrClient from 'streamr-client'
+import { StreamrClient } from 'streamr-client'
 import { createClientCommand } from '../src/command'
 
 createClientCommand(async (client: StreamrClient) => {

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

@@ -9,16 +9,18 @@ const omit_1 = __importDefault(require("lodash/omit"));
 const isString_1 = __importDefault(require("lodash/isString"));
 const command_1 = require("../src/command");
 const common_1 = require("../src/common");
+const utils_1 = require("@streamr/utils");
 (0, command_1.createClientCommand)(async (client, streamId, options) => {
+    const formContent = (content) => options.raw ? (0, utils_1.binaryToHex)(content) : content;
     const formMessage = options.withMetadata
-        ? (message, metadata) => ({ message, metadata: (0, omit_1.default)(metadata, 'streamMessage') })
-        : (message) => message;
+        ? (content, metadata) => ({ content: formContent(content), metadata: (0, omit_1.default)(metadata, 'streamMessage') })
+        : (content) => formContent(content);
     await client.subscribe({
         streamId,
         partition: options.partition,
         raw: options.raw
-    }, (message, metadata) => {
-        const output = formMessage(message, metadata);
+    }, (content, metadata) => {
+        const output = formMessage(content, metadata);
         console.info((0, isString_1.default)(output) ? output : JSON.stringify(output));
     });
 }, {

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

@@ -1 +1 @@
-{"version":3,"file":"streamr-stream-subscribe.js","sourceRoot":"","sources":["../../bin/streamr-stream-subscribe.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,uDAA8B;AAC9B,+DAAsC;AAEtC,4CAA4E;AAC5E,0CAAgD;AAShD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAgB,EAAE,EAAE;IACpF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY;QACpC,CAAC,CAAC,CAAC,OAAgB,EAAE,QAAyB,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAA,cAAI,EAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,CAAC;QAC3G,CAAC,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAA;IACnC,MAAM,MAAM,CAAC,SAAS,CAAC;QACnB,QAAQ;QACR,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;KACnB,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QACrB,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC7C,OAAO,CAAC,IAAI,CAAC,IAAA,kBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACpE,CAAC,CAAC,CAAA;AACN,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,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,CAAC;KAC3C,MAAM,CAAC,qBAAqB,EAAE,+CAA+C,EAAE,KAAK,CAAC;KACrF,UAAU,EAAE,CAAA"}
+{"version":3,"file":"streamr-stream-subscribe.js","sourceRoot":"","sources":["../../bin/streamr-stream-subscribe.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AACxB,uDAA8B;AAC9B,+DAAsC;AAEtC,4CAA4E;AAC5E,0CAAgD;AAChD,0CAA4C;AAS5C,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAgB,EAAE,EAAE;IACpF,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,OAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IACpG,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY;QACpC,CAAC,CAAC,CAAC,OAAgB,EAAE,QAAyB,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,IAAA,cAAI,EAAC,QAAQ,EAAE,eAAe,CAAC,EAAE,CAAC;QACjI,CAAC,CAAC,CAAC,OAAgB,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;IAChD,MAAM,MAAM,CAAC,SAAS,CAAC;QACnB,QAAQ;QACR,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,GAAG,EAAE,OAAO,CAAC,GAAG;KACnB,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;QACrB,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC7C,OAAO,CAAC,IAAI,CAAC,IAAA,kBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;IACpE,CAAC,CAAC,CAAA;AACN,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,MAAM,CAAC,WAAW,EAAE,eAAe,EAAE,KAAK,CAAC;KAC3C,MAAM,CAAC,qBAAqB,EAAE,+CAA+C,EAAE,KAAK,CAAC;KACrF,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-stream.js

@@ -14,7 +14,7 @@ commander_1.program
     .command('publish', 'publish to a stream')
     .command('search', 'search for streams')
     .command('show', 'info about a stream')
-    .command("create", "create a new stream")
+    .command('create', 'create a new stream')
     .command('resend', 'request resend of a stream')
     .command('grant-permission', 'grant permission')
     .command('revoke-permission', 'revoke permission')

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/cli-tools",
-    "version": "8.5.5",
+    "version": "100.0.0-pretestnet.2",
     "description": "Command line tools for Streamr",
     "repository": {
         "type": "git",
@@ -15,7 +15,7 @@
         "check": "tsc -p ./tsconfig.json --noEmit",
         "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
         "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
-        "test": "npm run build && jest --forceExit"
+        "test": "npm run build && jest --bail --forceExit"
     },
     "keywords": [
         "streamr",
@@ -27,19 +27,19 @@
     "license": "AGPL-3.0",
     "dependencies": {
         "@ethersproject/wallet": "^5.5.0",
-        "@snapshot-labs/snapshot.js": "^0.4.102",
-        "@streamr/utils": "8.5.5",
-        "commander": "^11.0.0",
+        "@snapshot-labs/snapshot.js": "^0.7.8",
+        "@streamr/utils": "100.0.0-pretestnet.2",
+        "commander": "^11.1.0",
         "easy-table": "^1.1.1",
         "event-stream": "^4.0.1",
         "lodash": "^4.17.21",
-        "streamr-client": "8.5.5"
+        "streamr-client": "100.0.0-pretestnet.2"
     },
     "devDependencies": {
-        "@streamr/test-utils": "8.5.5",
-        "@types/event-stream": "^4.0.0",
-        "@types/lodash": "^4.14.175",
-        "@types/merge2": "^1.4.0",
+        "@streamr/test-utils": "100.0.0-pretestnet.2",
+        "@types/event-stream": "^4.0.3",
+        "@types/lodash": "^4.14.200",
+        "@types/merge2": "^1.4.3",
         "merge2": "^1.4.1"
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/cli-tools",
-  "version": "8.5.5",
+  "version": "100.0.0-pretestnet.2",
   "description": "Command line tools for Streamr",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
     "check": "tsc -p ./tsconfig.json --noEmit",
     "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
     "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
-    "test": "npm run build && jest --forceExit"
+    "test": "npm run build && jest --bail --forceExit"
   },
   "keywords": [
     "streamr",
@@ -27,19 +27,19 @@
   "license": "AGPL-3.0",
   "dependencies": {
     "@ethersproject/wallet": "^5.5.0",
-    "@snapshot-labs/snapshot.js": "^0.4.102",
-    "@streamr/utils": "8.5.5",
-    "commander": "^11.0.0",
+    "@snapshot-labs/snapshot.js": "^0.7.8",
+    "@streamr/utils": "100.0.0-pretestnet.2",
+    "commander": "^11.1.0",
     "easy-table": "^1.1.1",
     "event-stream": "^4.0.1",
     "lodash": "^4.17.21",
-    "streamr-client": "8.5.5"
+    "streamr-client": "100.0.0-pretestnet.2"
   },
   "devDependencies": {
-    "@streamr/test-utils": "8.5.5",
-    "@types/event-stream": "^4.0.0",
-    "@types/lodash": "^4.14.175",
-    "@types/merge2": "^1.4.0",
+    "@streamr/test-utils": "100.0.0-pretestnet.2",
+    "@types/event-stream": "^4.0.3",
+    "@types/lodash": "^4.14.200",
+    "@types/merge2": "^1.4.3",
     "merge2": "^1.4.1"
   }
 }

package/test/stream-publish-subscribe.test.ts

@@ -4,6 +4,8 @@ import { collect } from '@streamr/utils'
 import { StreamPermission } from 'streamr-client'
 import { createTestClient, runCommand, startCommand } from './utils'
 
+const TIMEOUT = 30 * 1000
+
 describe('publish and subscribe', () => {
 
     let publisherPrivateKey: string
@@ -21,7 +23,7 @@ describe('publish and subscribe', () => {
         })
         streamId = stream.id
         await client.destroy()
-    }, 40 * 1000)
+    }, TIMEOUT)
 
     function publishViaCliCommand() {
         setImmediate(async () => {
@@ -44,7 +46,7 @@ describe('publish and subscribe', () => {
         expect(JSON.parse(receivedMessage)).toEqual({
             foo: 123
         })
-    }, 40 * 1000)
+    }, TIMEOUT)
 
     it('raw subscription', async () => {
         const subscriberAbortController = new AbortController()
@@ -56,7 +58,7 @@ describe('publish and subscribe', () => {
         const receivedMessage = (await collect(subscriberOutputIterable, 1))[0]
         subscriberAbortController.abort()
         expect(receivedMessage).toMatch(/^[0-9a-fA-F]+$/)
-    })
+    }, TIMEOUT)
 
     it('with metadata', async () => {
         const subscriberAbortController = new AbortController()
@@ -68,7 +70,7 @@ describe('publish and subscribe', () => {
         const receivedMessage = (await collect(subscriberOutputIterable, 1))[0]
         subscriberAbortController.abort()
         expect(JSON.parse(receivedMessage)).toMatchObject({
-            message: {
+            content: {
                 foo: 123
             },
             metadata: {
@@ -76,9 +78,31 @@ describe('publish and subscribe', () => {
                 streamPartition: 0,
                 timestamp: expect.any(Number),
                 sequenceNumber: 0,
-                publisherId: expect.stringMatching(/0x[0-9a-zA-Z]+/),
+                publisherId: new Wallet(publisherPrivateKey).address.toLowerCase(),
+                msgChainId: expect.stringMatching(/[0-9a-zA-Z]+/)
+            }
+        })
+    }, TIMEOUT)
+
+    it('with metadata and raw', async () => {
+        const subscriberAbortController = new AbortController()
+        const subscriberOutputIterable = startCommand(`stream subscribe ${streamId} --with-metadata --raw`, {
+            privateKey: subscriberPrivateKey,
+            abortSignal: subscriberAbortController.signal,
+        })
+        publishViaCliCommand()
+        const receivedMessage = (await collect(subscriberOutputIterable, 1))[0]
+        subscriberAbortController.abort()
+        expect(JSON.parse(receivedMessage)).toMatchObject({
+            content: expect.stringMatching(/^[0-9a-fA-F]+$/),
+            metadata: {
+                streamId,
+                streamPartition: 0,
+                timestamp: expect.any(Number),
+                sequenceNumber: 0,
+                publisherId: new Wallet(publisherPrivateKey).address.toLowerCase(),
                 msgChainId: expect.stringMatching(/[0-9a-zA-Z]+/)
             }
         })
-    })
+    }, TIMEOUT)
 })

package/test/stream-resend.test.ts

@@ -24,9 +24,9 @@ describe('resend stream', () => {
             const msg = await stream.publish({ msgId })
             messages.push(msg)
         }
-        await wait(1000)
+        await wait(10000)
         await client.destroy()
-    }, 20 * 1000)
+    }, 30 * 1000)
 
     it('last', async () => {
         const outputLines = await runCommand(`stream resend last 3 ${stream.id}`, {

package/test/stream-search.test.ts

@@ -1,6 +1,6 @@
 import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
 import { randomString } from '@streamr/utils'
-import { createTestClient, runCommand } from './utils'
+import { createTestClient, runCommand, waitForTheGraphToHaveIndexed } from './utils'
 
 describe('search streams', () => {
 
@@ -9,6 +9,10 @@ describe('search streams', () => {
         const client = createTestClient(await fetchPrivateKeyWithGas())
         const stream1 = await client.createStream(`/${testId}-1`)
         const stream2 = await client.createStream(`/${testId}-2`)
+        await Promise.all([
+            waitForTheGraphToHaveIndexed(stream1, client),
+            waitForTheGraphToHaveIndexed(stream2, client)
+        ])
         await client.destroy()
         const outputLines = await runCommand(`stream search ${testId}`)
         expect(outputLines).toEqual([

package/test/stream-show.test.ts

@@ -1,6 +1,6 @@
 import { Wallet } from '@ethersproject/wallet'
 import { fetchPrivateKeyWithGas } from '@streamr/test-utils'
-import { createTestClient, runCommand } from './utils'
+import { createTestClient, runCommand, waitForTheGraphToHaveIndexed } from './utils'
 
 describe('show stream', () => {
 
@@ -8,6 +8,7 @@ describe('show stream', () => {
         const creatorPrivateKey = await fetchPrivateKeyWithGas()
         const client = createTestClient(creatorPrivateKey)
         const stream = await client.createStream(`/${Date.now()}`)
+        await waitForTheGraphToHaveIndexed(stream, client)
         await client.destroy()
         const outputLines = await runCommand(`stream show ${stream.id} --include-permissions`)
         const outputJson = JSON.parse(outputLines.join(''))

package/test/utils.ts

@@ -1,7 +1,7 @@
-import { collect } from '@streamr/utils'
+import { collect, waitForCondition } from '@streamr/utils'
 import { spawn } from 'child_process'
 import merge2 from 'merge2'
-import { CONFIG_TEST, StreamrClient } from 'streamr-client'
+import { CONFIG_TEST, Stream, StreamrClient } from 'streamr-client'
 
 export const DOCKER_DEV_STORAGE_NODE = '0xde1112f631486CfC759A50196853011528bC5FA0'
 
@@ -73,3 +73,13 @@ export const createTestClient = (privateKey?: string): StreamrClient => {
         auth: (privateKey !== undefined) ? { privateKey } : undefined
     })
 }
+
+export const waitForTheGraphToHaveIndexed = async (stream: Stream, client: StreamrClient): Promise<void> => {
+    await waitForCondition(async () => {
+        // eslint-disable-next-line no-underscore-dangle
+        for await (const _msg of client.searchStreams(stream.id, undefined)) {
+            return true
+        }
+        return false
+    }, 15 * 1000, 600)
+}