@streamr/cli-tools 103.2.0-rc.0 → 103.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,30 +5,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  };
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  require("../src/logLevel");
8
- const stream_1 = require("stream");
8
+ const sdk_1 = require("@streamr/sdk");
9
9
  const utils_1 = require("@streamr/utils");
10
10
  const event_stream_1 = __importDefault(require("event-stream"));
11
+ const stream_1 = require("stream");
11
12
  const command_1 = require("../src/command");
13
+ const common_1 = require("../src/common");
12
14
  const isHexadecimal = (str) => {
13
15
  return /^[0-9a-fA-F]+$/.test(str);
14
16
  };
15
- const publishStream = (stream, partitionKeyField, client) => {
17
+ const publishStream = async (streamId, partition, partitionKeyField, raw, withMetadata, binary, client) => {
18
+ const fullStreamId = (0, utils_1.toStreamID)(streamId, (0, utils_1.toEthereumAddress)(await client.getAddress()));
16
19
  const writable = new stream_1.Writable({
17
20
  objectMode: true,
18
21
  write: (data, _, done) => {
19
- let message = null;
20
- // ignore newlines, etc
21
- if (!data || String(data).trim() === '') {
22
- done();
23
- return;
24
- }
25
- const trimmedData = String(data).trim();
26
- if (isHexadecimal(trimmedData)) {
27
- message = (0, utils_1.hexToBinary)(trimmedData);
22
+ let content;
23
+ let metadata;
24
+ let streamMessage = undefined;
25
+ if (binary) {
26
+ if (withMetadata) {
27
+ streamMessage = (0, sdk_1.convertBytesToStreamMessage)(data);
28
+ content = streamMessage.content;
29
+ metadata = {
30
+ timestamp: streamMessage.getTimestamp(),
31
+ msgChainId: streamMessage.getMsgChainId()
32
+ };
33
+ }
34
+ else {
35
+ content = data;
36
+ metadata = {};
37
+ }
28
38
  }
29
39
  else {
40
+ // ignore newlines, etc
41
+ if (!data || String(data).trim() === '') {
42
+ done();
43
+ return;
44
+ }
45
+ const trimmedData = String(data).trim();
30
46
  try {
31
- message = JSON.parse(trimmedData);
47
+ if (withMetadata) {
48
+ const payload = JSON.parse(trimmedData);
49
+ if (payload.content === undefined) {
50
+ throw new Error('invalid input: no content');
51
+ }
52
+ content = isHexadecimal(payload.content) ? (0, utils_1.hexToBinary)(payload.content) : payload.content;
53
+ metadata = payload.metadata ?? {};
54
+ }
55
+ else {
56
+ content = isHexadecimal(trimmedData) ? (0, utils_1.hexToBinary)(trimmedData) : JSON.parse(trimmedData);
57
+ metadata = {};
58
+ }
32
59
  }
33
60
  catch (e) {
34
61
  console.error(data.toString());
@@ -36,17 +63,41 @@ const publishStream = (stream, partitionKeyField, client) => {
36
63
  return;
37
64
  }
38
65
  }
39
- const partitionKey = (partitionKeyField !== undefined && typeof message === 'object') ? message[partitionKeyField] : undefined;
40
- client.publish(stream, message, { partitionKey }).then(() => done(), (err) => done(err));
66
+ if (raw) {
67
+ if (streamMessage.getStreamId() !== fullStreamId) {
68
+ throw new Error(`invalid input: stream IDs don't match: expected=${fullStreamId}, actual=${streamMessage.getStreamId()}`);
69
+ }
70
+ client.publishRaw(streamMessage).then(() => done(), (err) => done(err));
71
+ }
72
+ else {
73
+ const partitionKey = (partitionKeyField !== undefined && typeof content === 'object') ? content[partitionKeyField] : undefined;
74
+ client.publish({ streamId, partition }, content, (0, utils_1.merge)(metadata, { partitionKey })).then(() => done(), (err) => done(err));
75
+ }
41
76
  }
42
77
  });
43
78
  return writable;
44
79
  };
45
80
  (0, command_1.createClientCommand)(async (client, streamId, options) => {
46
- const ps = publishStream(streamId, options.partitionKeyField, client);
81
+ if ((options.partition !== undefined) && (options.partitionKeyField !== undefined)) {
82
+ console.error('Invalid combination of "partition" and "partition-key-field"');
83
+ process.exit(1);
84
+ }
85
+ if (options.raw) {
86
+ if (!options.binary || !options.withMetadata) {
87
+ console.error('raw publish not supported when publishing without metadata and binary');
88
+ process.exit(1);
89
+ }
90
+ if (options.partitionKeyField !== undefined) {
91
+ console.error('partition key field not supported when publishing raw');
92
+ process.exit(1);
93
+ }
94
+ }
95
+ const ps = await publishStream(streamId, options.partition, options.partitionKeyField, options.raw, options.withMetadata, options.binary, client);
47
96
  return new Promise((resolve, reject) => {
48
- process.stdin
49
- .pipe(event_stream_1.default.split())
97
+ const inputStream = options.binary
98
+ ? process.stdin.pipe(new utils_1.LengthPrefixedFrameDecoder())
99
+ : process.stdin.pipe(event_stream_1.default.split());
100
+ inputStream
50
101
  .pipe(ps)
51
102
  .once('finish', async () => {
52
103
  // We need to wait some time because the client.publish() may resolve the promise
@@ -64,7 +115,11 @@ const publishStream = (stream, partitionKeyField, client) => {
64
115
  })
65
116
  .arguments('<streamId>')
66
117
  .description('publish to a stream by reading JSON messages from stdin line-by-line or hexadecimal strings for binary data')
118
+ .option('-p, --partition <partition>', 'partition', (0, common_1.createFnParseInt)('--partition'))
67
119
  // eslint-disable-next-line max-len
68
120
  .option('-k, --partition-key-field <string>', 'field name in each message to use for assigning the message to a stream partition (only for JSON data)')
121
+ .option('-r, --raw', 'publish raw', false)
122
+ .option('-m, --with-metadata', 'each input contains both the content and the metadata', false)
123
+ .option('-b, --binary', 'binary input using length-prefixed frames', false)
69
124
  .parseAsync();
70
125
  //# sourceMappingURL=streamr-stream-publish.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"streamr-stream-publish.js","sourceRoot":"","sources":["../../bin/streamr-stream-publish.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"streamr-stream-publish.js","sourceRoot":"","sources":["../../bin/streamr-stream-publish.ts"],"names":[],"mappings":"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"}
@@ -5,31 +5,43 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  };
6
6
  Object.defineProperty(exports, "__esModule", { value: true });
7
7
  require("../src/logLevel");
8
- const omit_1 = __importDefault(require("lodash/omit"));
9
- const isString_1 = __importDefault(require("lodash/isString"));
8
+ const sdk_1 = require("@streamr/sdk");
9
+ const utils_1 = require("@streamr/utils");
10
10
  const mapValues_1 = __importDefault(require("lodash/mapValues"));
11
+ const isString_1 = __importDefault(require("lodash/isString"));
12
+ const omit_1 = __importDefault(require("lodash/omit"));
11
13
  const command_1 = require("../src/command");
12
14
  const common_1 = require("../src/common");
13
- const utils_1 = require("@streamr/utils");
14
15
  const withBinaryFieldsAsHex = (metadata) => {
15
16
  return (0, mapValues_1.default)(metadata, (value) => value instanceof Uint8Array ? (0, utils_1.binaryToHex)(value) : value);
16
17
  };
17
18
  (0, command_1.createClientCommand)(async (client, streamId, options) => {
18
- const formContent = (content) => content instanceof Uint8Array ? (0, utils_1.binaryToHex)(content) : content;
19
- const formMessage = options.withMetadata
20
- ? (content, metadata) => ({
21
- content: formContent(content),
22
- metadata: withBinaryFieldsAsHex((0, omit_1.default)(metadata, 'streamMessage'))
23
- })
24
- : (content) => formContent(content);
25
- await client.subscribe({
19
+ const sub = await client.subscribe({
26
20
  streamId,
27
21
  partition: options.partition,
28
22
  raw: options.raw
29
- }, (content, metadata) => {
30
- const output = formMessage(content, metadata);
31
- console.info((0, isString_1.default)(output) ? output : JSON.stringify(output));
32
23
  });
24
+ for await (const msg of sub) {
25
+ if (options.binary) {
26
+ // @ts-expect-error private field
27
+ const streamMessage = msg.streamMessage;
28
+ const binaryData = options.withMetadata
29
+ ? (0, sdk_1.convertStreamMessageToBytes)(streamMessage)
30
+ : streamMessage.content;
31
+ process.stdout.write((0, utils_1.toLengthPrefixedFrame)(binaryData));
32
+ }
33
+ else {
34
+ const formContent = (content) => content instanceof Uint8Array ? (0, utils_1.binaryToHex)(content) : content;
35
+ const formMessage = options.withMetadata
36
+ ? (content, metadata) => ({
37
+ content: formContent(content),
38
+ metadata: withBinaryFieldsAsHex((0, omit_1.default)(metadata, 'streamMessage'))
39
+ })
40
+ : (content) => formContent(content);
41
+ const output = formMessage(msg.content, (0, omit_1.default)(msg, 'content'));
42
+ console.info((0, isString_1.default)(output) ? output : JSON.stringify(output));
43
+ }
44
+ }
33
45
  }, {
34
46
  autoDestroyClient: false,
35
47
  clientOptionsFactory: (options) => ({
@@ -38,9 +50,10 @@ const withBinaryFieldsAsHex = (metadata) => {
38
50
  })
39
51
  .arguments('<streamId>')
40
52
  .description('subscribe to a stream, prints JSON messages to stdout line-by-line')
41
- .option('-p, --partition [partition]', 'partition', (0, common_1.createFnParseInt)('--partition'), 0)
53
+ .option('-p, --partition <partition>', 'partition', (0, common_1.createFnParseInt)('--partition'), 0)
42
54
  .option('-d, --disable-ordering', 'disable ordering of messages by OrderingUtil', false)
43
55
  .option('-r, --raw', 'subscribe raw', false)
44
56
  .option('-m, --with-metadata', 'print each message with its metadata included', false)
57
+ .option('-b, --binary', 'binary output using length-prefixed frames', false)
45
58
  .parseAsync();
46
59
  //# sourceMappingURL=streamr-stream-subscribe.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"streamr-stream-subscribe.js","sourceRoot":"","sources":["../../bin/streamr-stream-subscribe.ts"],"names":[],"mappings":";;;;;;AACA,2BAAwB;AAExB,uDAA8B;AAC9B,+DAAsC;AACtC,iEAAwC;AAExC,4CAA4E;AAC5E,0CAAgD;AAChD,0CAA4C;AAS5C,MAAM,qBAAqB,GAAG,CAAC,QAA6B,EAAE,EAAE;IAC5D,OAAO,IAAA,mBAAS,EAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;AACnG,CAAC,CAAA;AAED,IAAA,6BAAmB,EAAC,KAAK,EAAE,MAAqB,EAAE,QAAgB,EAAE,OAAgB,EAAE,EAAE;IACpF,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,YAAY,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;IACxG,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY;QACpC,CAAC,CAAC,CAAC,OAAgB,EAAE,QAAyB,EAAE,EAAE,CAAC,CAAC;YAChD,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC;YAC7B,QAAQ,EAAE,qBAAqB,CAAC,IAAA,cAAI,EAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;SACnE,CAAC;QACF,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"}
1
+ {"version":3,"file":"streamr-stream-subscribe.js","sourceRoot":"","sources":["../../bin/streamr-stream-subscribe.ts"],"names":[],"mappings":"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"}
package/dist/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@streamr/cli-tools",
3
- "version": "103.2.0-rc.0",
3
+ "version": "103.2.0",
4
4
  "description": "Command line tools for Streamr",
5
5
  "repository": {
6
6
  "type": "git",
@@ -17,8 +17,8 @@
17
17
  "streamr": "dist/bin/streamr.js"
18
18
  },
19
19
  "scripts": {
20
- "build": "tsc -b tsconfig.node.json",
21
- "check": "tsc -p ./tsconfig.jest.json",
20
+ "build": "tsc -b",
21
+ "check": "tsc -p tsconfig.jest.json",
22
22
  "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
23
23
  "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
24
24
  "test": "npm run build && jest --bail --forceExit"
@@ -33,11 +33,11 @@
33
33
  "license": "AGPL-3.0",
34
34
  "dependencies": {
35
35
  "@streamr/config": "^5.9.2",
36
- "@streamr/dht": "103.2.0-rc.0",
36
+ "@streamr/dht": "103.2.0",
37
37
  "@streamr/network-contracts": "^9.1.0",
38
- "@streamr/sdk": "103.2.0-rc.0",
39
- "@streamr/trackerless-network": "103.2.0-rc.0",
40
- "@streamr/utils": "103.2.0-rc.0",
38
+ "@streamr/sdk": "103.2.0",
39
+ "@streamr/trackerless-network": "103.2.0",
40
+ "@streamr/utils": "103.2.0",
41
41
  "commander": "^14.0.2",
42
42
  "easy-table": "^1.1.1",
43
43
  "ethers": "^6.13.0",
@@ -46,7 +46,7 @@
46
46
  "semver": "^7.7.3"
47
47
  },
48
48
  "devDependencies": {
49
- "@streamr/test-utils": "103.2.0-rc.0",
49
+ "@streamr/test-utils": "103.2.0",
50
50
  "@types/event-stream": "^4.0.6",
51
51
  "@types/lodash": "^4.17.21",
52
52
  "@types/merge2": "^1.4.4",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@streamr/cli-tools",
3
- "version": "103.2.0-rc.0",
3
+ "version": "103.2.0",
4
4
  "description": "Command line tools for Streamr",
5
5
  "repository": {
6
6
  "type": "git",
@@ -17,8 +17,8 @@
17
17
  "streamr": "dist/bin/streamr.js"
18
18
  },
19
19
  "scripts": {
20
- "build": "tsc -b tsconfig.node.json",
21
- "check": "tsc -p ./tsconfig.jest.json",
20
+ "build": "tsc -b",
21
+ "check": "tsc -p tsconfig.jest.json",
22
22
  "clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
23
23
  "eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
24
24
  "test": "npm run build && jest --bail --forceExit"
@@ -33,11 +33,11 @@
33
33
  "license": "AGPL-3.0",
34
34
  "dependencies": {
35
35
  "@streamr/config": "^5.9.2",
36
- "@streamr/dht": "103.2.0-rc.0",
36
+ "@streamr/dht": "103.2.0",
37
37
  "@streamr/network-contracts": "^9.1.0",
38
- "@streamr/sdk": "103.2.0-rc.0",
39
- "@streamr/trackerless-network": "103.2.0-rc.0",
40
- "@streamr/utils": "103.2.0-rc.0",
38
+ "@streamr/sdk": "103.2.0",
39
+ "@streamr/trackerless-network": "103.2.0",
40
+ "@streamr/utils": "103.2.0",
41
41
  "commander": "^14.0.2",
42
42
  "easy-table": "^1.1.1",
43
43
  "ethers": "^6.13.0",
@@ -46,7 +46,7 @@
46
46
  "semver": "^7.7.3"
47
47
  },
48
48
  "devDependencies": {
49
- "@streamr/test-utils": "103.2.0-rc.0",
49
+ "@streamr/test-utils": "103.2.0",
50
50
  "@types/event-stream": "^4.0.6",
51
51
  "@types/lodash": "^4.17.21",
52
52
  "@types/merge2": "^1.4.4",