@ethersphere/bee-js 9.7.1 → 9.8.1

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.
@@ -1,9 +1,14 @@
1
1
  "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
2
5
  Object.defineProperty(exports, "__esModule", { value: true });
3
6
  exports.MantarayNode = exports.Fork = void 0;
4
7
  const cafe_utility_1 = require("cafe-utility");
8
+ const debug_1 = __importDefault(require("debug"));
5
9
  const __1 = require("..");
6
10
  const typed_bytes_1 = require("../utils/typed-bytes");
11
+ const debug = (0, debug_1.default)('bee-js:manifest');
7
12
  const ENCODER = new TextEncoder();
8
13
  const DECODER = new TextDecoder();
9
14
  const TYPE_VALUE = 2;
@@ -61,6 +66,11 @@ class Fork {
61
66
  data.push(new Uint8Array(30 - this.prefix.length));
62
67
  }
63
68
  data.push(this.node.selfAddress);
69
+ debug('marshalling fork', {
70
+ prefixLength: this.prefix.length,
71
+ prefix: DECODER.decode(this.prefix),
72
+ address: cafe_utility_1.Binary.uint8ArrayToHex(this.node.selfAddress),
73
+ });
64
74
  if (this.node.metadata) {
65
75
  const metadataBytes = cafe_utility_1.Binary.padEndToMultiple(new Uint8Array([0x00, 0x00, ...ENCODER.encode(JSON.stringify(this.node.metadata))]), 32, 0x0a);
66
76
  const metadataLengthBytes = cafe_utility_1.Binary.numberToUint16(metadataBytes.length - 2, 'BE');
@@ -73,8 +83,17 @@ class Fork {
73
83
  const type = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
74
84
  const prefixLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
75
85
  const prefix = reader.read(prefixLength);
76
- reader.read(30 - prefixLength);
86
+ if (prefixLength < 30) {
87
+ reader.read(30 - prefixLength);
88
+ }
77
89
  const selfAddress = reader.read(addressLength);
90
+ debug('unmarshalling fork', {
91
+ type,
92
+ prefixLength,
93
+ prefix: DECODER.decode(prefix),
94
+ addressLength,
95
+ address: cafe_utility_1.Binary.uint8ArrayToHex(selfAddress),
96
+ });
78
97
  let metadata = undefined;
79
98
  if (isType(type, TYPE_WITH_METADATA)) {
80
99
  const metadataLength = cafe_utility_1.Binary.uint16ToNumber(reader.read(2), 'BE');
@@ -209,12 +228,12 @@ class MantarayNode {
209
228
  throw new Error('MantarayNode#unmarshal invalid version hash');
210
229
  }
211
230
  const targetAddressLength = cafe_utility_1.Binary.uint8ToNumber(reader.read(1));
212
- const targetAddress = targetAddressLength === 0 ? __1.NULL_ADDRESS : reader.read(targetAddressLength);
231
+ const targetAddress = targetAddressLength ? reader.read(targetAddressLength) : __1.NULL_ADDRESS;
213
232
  const node = new MantarayNode({ selfAddress, targetAddress, obfuscationKey });
214
233
  const forkBitmap = reader.read(32);
215
234
  for (let i = 0; i < 256; i++) {
216
235
  if (cafe_utility_1.Binary.getBit(forkBitmap, i, 'LE')) {
217
- const newFork = Fork.unmarshal(reader, targetAddressLength);
236
+ const newFork = Fork.unmarshal(reader, selfAddress.length);
218
237
  node.forks.set(i, newFork);
219
238
  newFork.node.parent = node;
220
239
  }
@@ -227,6 +246,7 @@ class MantarayNode {
227
246
  addFork(path, reference, metadata) {
228
247
  this.selfAddress = null;
229
248
  path = path instanceof Uint8Array ? path : ENCODER.encode(path);
249
+ debug('adding fork', { path: DECODER.decode(path), reference: new typed_bytes_1.Reference(reference).represent() });
230
250
  // TODO: this should not be ignored
231
251
  // eslint-disable-next-line @typescript-eslint/no-this-alias
232
252
  let tip = this;
@@ -6,7 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.http = exports.DEFAULT_HTTP_CONFIG = void 0;
7
7
  const axios_1 = __importDefault(require("axios"));
8
8
  const cafe_utility_1 = require("cafe-utility");
9
+ const debug_1 = __importDefault(require("debug"));
9
10
  const index_1 = require("../index");
11
+ const debug = (0, debug_1.default)('bee-js:http');
10
12
  const { AxiosError } = axios_1.default;
11
13
  const MAX_FAILED_ATTEMPTS = 100000;
12
14
  const DELAY_FAST = 200;
@@ -41,6 +43,10 @@ async function http(options, config) {
41
43
  let failedAttempts = 0;
42
44
  while (failedAttempts < MAX_FAILED_ATTEMPTS) {
43
45
  try {
46
+ debug(`${requestConfig.method || 'get'} ${cafe_utility_1.Strings.joinUrl([
47
+ requestConfig.baseURL,
48
+ requestConfig.url,
49
+ ])}`, { headers: { ...requestConfig.headers }, params: requestConfig.params });
44
50
  maybeRunOnRequestHook(options, requestConfig);
45
51
  const response = await (0, axios_1.default)(requestConfig);
46
52
  return response;