@streamr/cli-tools 102.0.0 → 102.2.0-rc.0

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

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+import '../src/logLevel'
+
+import { StreamrClient } from '@streamr/sdk'
+import { createClientCommand } from '../src/command'
+
+createClientCommand(async (client: StreamrClient, urls: string) => {
+    await client.setStorageNodeMetadata({
+        urls: urls.split(',')
+    })
+})
+    .arguments('<urls>')
+    .description('register the current wallet as a storage node with the provided metadata URLs (comma-separated)')
+    .parseAsync()

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

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+import '../src/logLevel'
+
+import { StreamrClient } from '@streamr/sdk'
+import { createClientCommand } from '../src/command'
+
+createClientCommand(async (client: StreamrClient, storageNodeAddress: string) => {
+    const metadata = await client.getStorageNodeMetadata(storageNodeAddress)
+    console.info(JSON.stringify(metadata, null, 2))
+})
+    .arguments('<storageNodeAddress>')
+    .description('show information about a storage node')
+    .parseAsync()

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

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+import '../src/logLevel'
+
+import { StreamrClient } from '@streamr/sdk'
+import { createClientCommand } from '../src/command'
+
+createClientCommand(async (client: StreamrClient) => {
+    await client.setStorageNodeMetadata(undefined)
+})
+    .description('unregister the current wallet as a storage node')
+    .parseAsync()

package/bin/streamr-storage-node.ts

@@ -7,6 +7,9 @@ program
     .usage('<command> [<args>]')
     .description('storage node subcommands')
     .command('list', 'list storage nodes')
+    .command('show', 'show information about a storage node')
+    .command('register', 'register a storage node')
+    .command('unregister', 'unregister a storage node')
     .command('add-stream', 'add stream')
     .command('remove-stream', 'remove stream')
     .command('list-streams', 'list stream in a storage node')

package/bin/streamr-stream-show.ts

@@ -4,7 +4,7 @@ import '../src/logLevel'
 import { StreamrClient } from '@streamr/sdk'
 import { createClientCommand, Options as BaseOptions } from '../src/command'
 import { getPermissionId } from '../src/permission'
-import { omit } from 'lodash'
+import omit from 'lodash/omit'
 
 interface Options extends BaseOptions {
     includePermissions: boolean

package/dist/bin/streamr-storage-node-register.d.ts

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

package/dist/bin/streamr-storage-node-register.js

@@ -0,0 +1,14 @@
+#!/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, urls) => {
+    await client.setStorageNodeMetadata({
+        urls: urls.split(',')
+    });
+})
+    .arguments('<urls>')
+    .description('register the current wallet as a storage node with the provided metadata URLs (comma-separated)')
+    .parseAsync();
+//# sourceMappingURL=streamr-storage-node-register.js.map

package/dist/bin/streamr-storage-node-register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-storage-node-register.js","sourceRoot":"","sources":["../../bin/streamr-storage-node-register.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAGxB,4CAAoD;AAEpD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,IAAY,EAAE,EAAE;IAC9D,MAAM,MAAM,CAAC,sBAAsB,CAAC;QAChC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;KACxB,CAAC,CAAA;AACN,CAAC,CAAC;KACG,SAAS,CAAC,QAAQ,CAAC;KACnB,WAAW,CAAC,iGAAiG,CAAC;KAC9G,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-storage-node-show.d.ts

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

package/dist/bin/streamr-storage-node-show.js

@@ -0,0 +1,13 @@
+#!/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, storageNodeAddress) => {
+    const metadata = await client.getStorageNodeMetadata(storageNodeAddress);
+    console.info(JSON.stringify(metadata, null, 2));
+})
+    .arguments('<storageNodeAddress>')
+    .description('show information about a storage node')
+    .parseAsync();
+//# sourceMappingURL=streamr-storage-node-show.js.map

package/dist/bin/streamr-storage-node-show.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-storage-node-show.js","sourceRoot":"","sources":["../../bin/streamr-storage-node-show.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAGxB,4CAAoD;AAEpD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,kBAA0B,EAAE,EAAE;IAC5E,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,CAAA;IACxE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;AACnD,CAAC,CAAC;KACG,SAAS,CAAC,sBAAsB,CAAC;KACjC,WAAW,CAAC,uCAAuC,CAAC;KACpD,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-storage-node-unregister.d.ts

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

package/dist/bin/streamr-storage-node-unregister.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) => {
+    await client.setStorageNodeMetadata(undefined);
+})
+    .description('unregister the current wallet as a storage node')
+    .parseAsync();
+//# sourceMappingURL=streamr-storage-node-unregister.js.map

package/dist/bin/streamr-storage-node-unregister.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"streamr-storage-node-unregister.js","sourceRoot":"","sources":["../../bin/streamr-storage-node-unregister.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAGxB,4CAAoD;AAEpD,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,EAAE;IAChD,MAAM,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAA;AAClD,CAAC,CAAC;KACG,WAAW,CAAC,iDAAiD,CAAC;KAC9D,UAAU,EAAE,CAAA"}

package/dist/bin/streamr-storage-node.js

@@ -11,6 +11,9 @@ commander_1.program
     .usage('<command> [<args>]')
     .description('storage node subcommands')
     .command('list', 'list storage nodes')
+    .command('show', 'show information about a storage node')
+    .command('register', 'register a storage node')
+    .command('unregister', 'unregister a storage node')
     .command('add-stream', 'add stream')
     .command('remove-stream', 'remove stream')
     .command('list-streams', 'list stream in a storage node')

package/dist/bin/streamr-storage-node.js.map

@@ -1 +1 @@
-{"version":3,"file":"streamr-storage-node.js","sourceRoot":"","sources":["../../bin/streamr-storage-node.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,0BAA0B,CAAC;KACvC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC;KACrC,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC;KACnC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC;KACzC,OAAO,CAAC,cAAc,EAAE,+BAA+B,CAAC;KACxD,KAAK,EAAE,CAAA"}
+{"version":3,"file":"streamr-storage-node.js","sourceRoot":"","sources":["../../bin/streamr-storage-node.ts"],"names":[],"mappings":";;;;;;AACA,yCAAmC;AACnC,mEAAiC;AAEjC,mBAAO;KACF,OAAO,CAAC,sBAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,oBAAoB,CAAC;KAC3B,WAAW,CAAC,0BAA0B,CAAC;KACvC,OAAO,CAAC,MAAM,EAAE,oBAAoB,CAAC;KACrC,OAAO,CAAC,MAAM,EAAE,uCAAuC,CAAC;KACxD,OAAO,CAAC,UAAU,EAAE,yBAAyB,CAAC;KAC9C,OAAO,CAAC,YAAY,EAAE,2BAA2B,CAAC;KAClD,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC;KACnC,OAAO,CAAC,eAAe,EAAE,eAAe,CAAC;KACzC,OAAO,CAAC,cAAc,EAAE,+BAA+B,CAAC;KACxD,KAAK,EAAE,CAAA"}

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

@@ -1,13 +1,16 @@
 #!/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 command_1 = require("../src/command");
 const permission_1 = require("../src/permission");
-const lodash_1 = require("lodash");
+const omit_1 = __importDefault(require("lodash/omit"));
 const withRenamedField = (obj, from, to) => {
     return {
-        ...(0, lodash_1.omit)(obj, from),
+        ...(0, omit_1.default)(obj, from),
         [to]: obj[from]
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"streamr-stream-show.js","sourceRoot":"","sources":["../../bin/streamr-stream-show.ts"],"names":[],"mappings":";;;AACA,2BAAwB;AAGxB,4CAA4E;AAC5E,kDAAmD;AACnD,mCAA6B;AAM7B,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE;IAC5D,OAAO;QACH,GAAG,IAAA,aAAI,EAAC,GAAG,EAAE,IAAI,CAAC;QAClB,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC;KAClB,CAAA;AACL,CAAC,CAAA;AAED,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAgB,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,EAAE,CAAA;IACjE,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,CAAA;QAChD,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5C,OAAO;gBACH,GAAG,gBAAgB,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC;gBACjD,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,4BAAe,CAAC;aAC3D,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;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,EAAE,KAAK,CAAC;KACrE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"streamr-stream-show.js","sourceRoot":"","sources":["../../bin/streamr-stream-show.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AAGxB,4CAA4E;AAC5E,kDAAmD;AACnD,uDAA8B;AAM9B,MAAM,gBAAgB,GAAG,CAAC,GAAQ,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE;IAC5D,OAAO;QACH,GAAG,IAAA,cAAI,EAAC,GAAG,EAAE,IAAI,CAAC;QAClB,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC;KAClB,CAAA;AACL,CAAC,CAAA;AAED,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAgB,EAAE,EAAE;IACpF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAQ,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,EAAE,CAAA;IACjE,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC7B,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,EAAE,CAAA;QAChD,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAC5C,OAAO;gBACH,GAAG,gBAAgB,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC;gBACjD,WAAW,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,4BAAe,CAAC;aAC3D,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;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,EAAE,KAAK,CAAC;KACrE,UAAU,EAAE,CAAA"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@streamr/cli-tools",
-    "version": "102.0.0",
+    "version": "102.2.0-rc.0",
     "description": "Command line tools for Streamr",
     "repository": {
         "type": "git",
@@ -26,21 +26,21 @@
     "author": "Streamr Network AG <contact@streamr.com>",
     "license": "AGPL-3.0",
     "dependencies": {
-        "@streamr/dht": "102.0.0",
-        "@streamr/sdk": "102.0.0",
-        "@streamr/trackerless-network": "102.0.0",
-        "@streamr/utils": "102.0.0",
+        "@streamr/dht": "102.2.0-rc.0",
+        "@streamr/sdk": "102.2.0-rc.0",
+        "@streamr/trackerless-network": "102.2.0-rc.0",
+        "@streamr/utils": "102.2.0-rc.0",
         "commander": "^13.1.0",
         "easy-table": "^1.1.1",
         "ethers": "^6.13.0",
         "event-stream": "^4.0.1",
         "lodash": "^4.17.21",
-        "semver": "^7.6.3"
+        "semver": "^7.7.1"
     },
     "devDependencies": {
-        "@streamr/test-utils": "102.0.0",
+        "@streamr/test-utils": "102.2.0-rc.0",
         "@types/event-stream": "^4.0.5",
-        "@types/lodash": "^4.17.14",
+        "@types/lodash": "^4.17.15",
         "@types/merge2": "^1.4.4",
         "@types/semver": "^7.5.8",
         "merge2": "^1.4.1"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamr/cli-tools",
-  "version": "102.0.0",
+  "version": "102.2.0-rc.0",
   "description": "Command line tools for Streamr",
   "repository": {
     "type": "git",
@@ -26,21 +26,21 @@
   "author": "Streamr Network AG <contact@streamr.com>",
   "license": "AGPL-3.0",
   "dependencies": {
-    "@streamr/dht": "102.0.0",
-    "@streamr/sdk": "102.0.0",
-    "@streamr/trackerless-network": "102.0.0",
-    "@streamr/utils": "102.0.0",
+    "@streamr/dht": "102.2.0-rc.0",
+    "@streamr/sdk": "102.2.0-rc.0",
+    "@streamr/trackerless-network": "102.2.0-rc.0",
+    "@streamr/utils": "102.2.0-rc.0",
     "commander": "^13.1.0",
     "easy-table": "^1.1.1",
     "ethers": "^6.13.0",
     "event-stream": "^4.0.1",
     "lodash": "^4.17.21",
-    "semver": "^7.6.3"
+    "semver": "^7.7.1"
   },
   "devDependencies": {
-    "@streamr/test-utils": "102.0.0",
+    "@streamr/test-utils": "102.2.0-rc.0",
     "@types/event-stream": "^4.0.5",
-    "@types/lodash": "^4.17.14",
+    "@types/lodash": "^4.17.15",
     "@types/merge2": "^1.4.4",
     "@types/semver": "^7.5.8",
     "merge2": "^1.4.1"

package/test/storage-node.test.ts

@@ -1,5 +1,5 @@
 import { StreamID } from '@streamr/sdk'
-import { createTestPrivateKey } from '@streamr/test-utils'
+import { createTestPrivateKey, createTestWallet } from '@streamr/test-utils'
 import { until } from '@streamr/utils'
 import 'jest-extended'
 import { DOCKER_DEV_STORAGE_NODE, createTestClient, runCommand } from './utils'
@@ -30,4 +30,33 @@ describe('storage node', () => {
         const outputLines = await runCommand('storage-node list')
         expect(outputLines.join()).toMatch(DOCKER_DEV_STORAGE_NODE.toLowerCase())
     })
+
+    it('register storage node, show info, and finally unregister', async () => {
+        const { privateKey, address } = await createTestWallet({ gas: true })
+
+        const urls = 'http://foobar.com,http://foobar.org'
+        await runCommand(`storage-node register ${urls}`, {
+            privateKey
+        })
+
+        // account for The Graph delay
+        await until(async () => {
+            const outputLines = await runCommand('storage-node list')
+            return outputLines.join().includes(address.toLowerCase())
+        }, 10 * 1000, 500)
+
+        const outputLines = await runCommand(`storage-node show ${address}`)
+        expect(outputLines.join()).toContain('http://foobar.com')
+        expect(outputLines.join()).toContain('http://foobar.org')
+
+        await runCommand('storage-node unregister', {
+            privateKey
+        })
+
+        // account for The Graph delay
+        await until(async () => {
+            const outputLines = await runCommand('storage-node list')
+            return !outputLines.join().includes(address.toLowerCase())
+        }, 10 * 1000, 500)
+    }, 80 * 1000)
 })

package/test/utils.ts

@@ -18,7 +18,8 @@ export const runCommand = async (commandLine: string, opts?: StartCommandOptions
 }
 
 export async function* startCommand(commandLine: string, opts?: StartCommandOptions): AsyncGenerator<string> {
-    const args: string[] = ['dist/bin/streamr.js']
+    // TODO: --no-deprecation needed to get around deprecation warning for "punycode" in Node.js 22, remove when warning has gone away (NET-1409)
+    const args: string[] = ['--no-deprecation', 'dist/bin/streamr.js']
     args.push(...commandLine.split(' '))
     if (opts?.privateKey !== undefined) {
         args.push('--private-key', opts.privateKey)