feedme 2.0.5 → 2.0.6

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.
package/dist/feedme.d.ts CHANGED
@@ -5,6 +5,7 @@ declare class FeedMe extends Writable {
5
5
  static default: typeof FeedMe;
6
6
  private _buffer;
7
7
  private _parser;
8
+ private _prefix;
8
9
  /**
9
10
  * Creates an instance of a parser. Parser can be JSON/XML.
10
11
  *
package/dist/feedme.js CHANGED
@@ -5,6 +5,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  const node_stream_1 = require("node:stream");
6
6
  const jsonfeedparser_1 = __importDefault(require("./jsonfeedparser"));
7
7
  const xmlfeedparser_1 = __importDefault(require("./xmlfeedparser"));
8
+ const isWhitespaceByte = (byte) => byte === 0x20 || byte === 0x09 || byte === 0x0a || byte === 0x0d;
9
+ /**
10
+ * Strips leading whitespace and UTF-8 BOMs, reporting when only part of a BOM
11
+ * has arrived so detection can wait for the rest.
12
+ */
13
+ const stripLeading = (buf) => {
14
+ let i = 0;
15
+ while (i < buf.length) {
16
+ if (isWhitespaceByte(buf[i])) {
17
+ i++;
18
+ continue;
19
+ }
20
+ if (buf[i] === 0xef) {
21
+ if (buf.length - i < 3) {
22
+ return { rest: buf.subarray(i), partialBom: true };
23
+ }
24
+ if (buf[i + 1] === 0xbb && buf[i + 2] === 0xbf) {
25
+ i += 3;
26
+ continue;
27
+ }
28
+ }
29
+ break;
30
+ }
31
+ return { rest: buf.subarray(i), partialBom: false };
32
+ };
8
33
  class FeedMe extends node_stream_1.Writable {
9
34
  /**
10
35
  * Creates an instance of a parser. Parser can be JSON/XML.
@@ -14,6 +39,7 @@ class FeedMe extends node_stream_1.Writable {
14
39
  */
15
40
  constructor(buffer = false) {
16
41
  super();
42
+ this._prefix = [];
17
43
  this._buffer = buffer;
18
44
  }
19
45
  _proxyEvents() {
@@ -28,29 +54,43 @@ class FeedMe extends node_stream_1.Writable {
28
54
  this._parser.parser.on('error', this.emit.bind(this, 'error'));
29
55
  }
30
56
  _write(data, encoding, callback) {
31
- const str = data.toString();
32
- // First find out what type of feed this is.
33
- if (!this._parser) {
34
- if (/^\s*</.test(str)) {
35
- this._parser = new xmlfeedparser_1.default(this._buffer);
36
- this._proxyEvents();
37
- }
38
- else if (/^\s*[{[]/.test(str)) {
39
- this._parser = new jsonfeedparser_1.default(this._buffer);
40
- this.emit('type', 'json');
41
- this._proxyEvents();
42
- }
43
- else {
44
- callback(new Error('Not a correctly formatted feed'));
45
- return;
46
- }
57
+ if (this._parser) {
58
+ this._parser.write(data, encoding, callback);
59
+ return;
60
+ }
61
+ // The feed type may not be decidable from the first chunk, such as when
62
+ // leading whitespace or a BOM arrives on its own or is split up.
63
+ this._prefix.push(data);
64
+ const buffered = Buffer.concat(this._prefix);
65
+ const { rest, partialBom } = stripLeading(buffered);
66
+ if (partialBom || rest.length === 0) {
67
+ callback();
68
+ return;
69
+ }
70
+ if (rest[0] === 0x3c) {
71
+ // <
72
+ this._parser = new xmlfeedparser_1.default(this._buffer);
47
73
  }
48
- this._parser.write(data, encoding, callback);
74
+ else if (rest[0] === 0x7b || rest[0] === 0x5b) {
75
+ // { or [
76
+ this._parser = new jsonfeedparser_1.default(this._buffer);
77
+ this.emit('type', 'json');
78
+ }
79
+ else {
80
+ callback(new Error('Not a correctly formatted feed'));
81
+ return;
82
+ }
83
+ this._proxyEvents();
84
+ this._prefix = [];
85
+ this._parser.write(rest, encoding, callback);
49
86
  }
50
87
  _final(callback) {
51
88
  if (this._parser) {
52
89
  this._parser.end(callback);
53
90
  }
91
+ else if (Buffer.concat(this._prefix).length) {
92
+ callback(new Error('Not a correctly formatted feed'));
93
+ }
54
94
  else {
55
95
  callback(null);
56
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"feedme.js","sourceRoot":"","sources":["../src/feedme.ts"],"names":[],"mappings":";;;;AAAA,6CAAuC;AACvC,sEAA8C;AAE9C,oEAA4C;AAE5C,MAAM,MAAO,SAAQ,sBAAQ;IAO3B;;;;;OAKG;IACH,YAAY,MAAM,GAAG,KAAK;QACxB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,YAAY;QACV,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,GAAG,CACzB,KAAsB,EACtB,GAAG,IAAe,EACT,EAAE;YACX,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;YACxD,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACtB,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;YACnC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CACJ,IAAY,EACZ,QAAwB,EACxB,QAAsC;QAEtC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAE5B,4CAA4C;QAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,IAAI,CAAC,OAAO,GAAG,IAAI,uBAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC/C,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,CAAC;iBAAM,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBAChC,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;gBAC1B,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC,CAAC;gBACtD,OAAO;YACT,CAAC;QACH,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,CAAC,QAAsC;QAC3C,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC;IACH,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;IAC7B,CAAC;;AAnEM,aAAM,GAAG,MAAM,CAAC;AAChB,cAAO,GAAG,MAAM,CAAC;AA4E1B,0FAA0F;AAC1F,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;AACxB,MAAM,CAAC,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC;AAChC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;AAE/B,iBAAS,MAAM,CAAC"}
1
+ {"version":3,"file":"feedme.js","sourceRoot":"","sources":["../src/feedme.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "json",
9
9
  "parser"
10
10
  ],
11
- "version": "2.0.5",
11
+ "version": "2.0.6",
12
12
  "repository": {
13
13
  "type": "git",
14
14
  "url": "git://github.com/fent/feedme.js.git"
@@ -26,8 +26,9 @@
26
26
  "lint:fix": "biome check --write .",
27
27
  "prepare": "tsc -p tsconfig.build.json",
28
28
  "build": "tsc -p tsconfig.build.json",
29
- "test": "nyc --extension .ts --reporter=lcov --reporter=text-summary npm run test:unit",
30
- "test:unit": "mocha --require ts-node/register test/*-test.ts"
29
+ "test": "nyc --extension .ts --reporter=lcov --reporter=text-summary npm run test:unit && npm run test:package",
30
+ "test:unit": "mocha --require ts-node/register --ignore test/export-test.ts test/*-test.ts",
31
+ "test:package": "mocha --require ts-node/register test/export-test.ts"
31
32
  },
32
33
  "dependencies": {
33
34
  "clarinet": "^0.12.4",