dx-server 0.13.0 → 0.14.0-alpha.2

package/lib/vendors/mimeScore.js

@@ -1,20 +1,20 @@
 // 'mime-score' back-ported to CommonJS
 // Score RFC facets (see https://tools.ietf.org/html/rfc6838#section-3)
-const FACET_SCORES = {
+const facetScores = {
     'prs.': 100,
     'x-': 200,
     'x.': 300,
     'vnd.': 400,
-    default: 900
+    default: 900,
 };
 // Score mime source (Logic originally from `jshttp/mime-types` module)
-const SOURCE_SCORES = {
+const sourceScores = {
     nginx: 10,
     apache: 20,
     iana: 40,
-    default: 30 // definitions added by `jshttp/mime-db` project?
+    default: 30, // definitions added by `jshttp/mime-db` project?
 };
-const TYPE_SCORES = {
+const typeScores = {
     // prefer application/xml over text/xml
     // prefer application/rtf over text/rtf
     application: 1,
@@ -24,21 +24,20 @@ const TYPE_SCORES = {
     // See https://www.rfc-editor.org/rfc/rfc4337.html#section-2
     audio: 2,
     video: 3,
-    default: 0
+    default: 0,
 };
 /**
  * Get each component of the score for a mime type.  The sum of these is the
  * total score.  The higher the score, the more "official" the type.
  */
 export function mimeScore(mimeType, source = 'default') {
-    if (mimeType === 'application/octet-stream') {
+    if (mimeType === 'application/octet-stream')
         return 0;
-    }
     const [type, subtype] = mimeType.split('/');
     const facet = subtype.replace(/(\.|x-).*/, '$1');
-    const facetScore = FACET_SCORES[facet] || FACET_SCORES.default;
-    const sourceScore = SOURCE_SCORES[source] || SOURCE_SCORES.default;
-    const typeScore = TYPE_SCORES[type] || TYPE_SCORES.default;
+    const facetScore = facetScores[facet] || facetScores.default;
+    const sourceScore = sourceScores[source] || sourceScores.default;
+    const typeScore = typeScores[type] || typeScores.default;
     // All else being equal prefer shorter types
     const lengthScore = 1 - mimeType.length / 100;
     return facetScore + sourceScore + typeScore + lengthScore;

package/lib/vendors/mimeScore.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mimeScore.js","sourceRoot":"","sources":["../../src/vendors/mimeScore.ts"],"names":[],"mappings":"AAAA,uCAAuC;AAEvC,uEAAuE;AACvE,MAAM,WAAW,GAAG;IACnB,MAAM,EAAE,GAAG;IACX,IAAI,EAAE,GAAG;IACT,IAAI,EAAE,GAAG;IACT,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;CACZ,CAAA;AAED,uEAAuE;AACvE,MAAM,YAAY,GAAG;IACpB,KAAK,EAAE,EAAE;IACT,MAAM,EAAE,EAAE;IACV,IAAI,EAAE,EAAE;IACR,OAAO,EAAE,EAAE,EAAE,iDAAiD;CAC9D,CAAA;AAED,MAAM,UAAU,GAAG;IAClB,uCAAuC;IACvC,uCAAuC;IACvC,WAAW,EAAE,CAAC;IAEd,8CAA8C;IAC9C,IAAI,EAAE,CAAC;IAEP,uDAAuD;IACvD,4DAA4D;IAC5D,KAAK,EAAE,CAAC;IACR,KAAK,EAAE,CAAC;IAER,OAAO,EAAE,CAAC;CACV,CAAA;AAED;;;GAGG;AACH,MAAM,UAAU,SAAS,CAAC,QAAgB,EAAE,MAAM,GAAG,SAAS;IAC7D,IAAI,QAAQ,KAAK,0BAA0B;QAAE,OAAO,CAAC,CAAA;IAErD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAE3C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAA;IAEhD,MAAM,UAAU,GAAG,WAAW,CAAC,KAAiC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAA;IACxF,MAAM,WAAW,GAAG,YAAY,CAAC,MAAmC,CAAC,IAAI,YAAY,CAAC,OAAO,CAAA;IAC7F,MAAM,SAAS,GAAG,UAAU,CAAC,IAA+B,CAAC,IAAI,UAAU,CAAC,OAAO,CAAA;IAEnF,4CAA4C;IAC5C,MAAM,WAAW,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,GAAG,CAAA;IAE7C,OAAO,UAAU,GAAG,WAAW,GAAG,SAAS,GAAG,WAAW,CAAA;AAC1D,CAAC","sourcesContent":["// 'mime-score' back-ported to CommonJS\n\n// Score RFC facets (see https://tools.ietf.org/html/rfc6838#section-3)\nconst facetScores = {\n\t'prs.': 100,\n\t'x-': 200,\n\t'x.': 300,\n\t'vnd.': 400,\n\tdefault: 900,\n}\n\n// Score mime source (Logic originally from `jshttp/mime-types` module)\nconst sourceScores = {\n\tnginx: 10,\n\tapache: 20,\n\tiana: 40,\n\tdefault: 30, // definitions added by `jshttp/mime-db` project?\n}\n\nconst typeScores = {\n\t// prefer application/xml over text/xml\n\t// prefer application/rtf over text/rtf\n\tapplication: 1,\n\n\t// prefer font/woff over application/font-woff\n\tfont: 2,\n\n\t// prefer video/mp4 over audio/mp4 over application/mp4\n\t// See https://www.rfc-editor.org/rfc/rfc4337.html#section-2\n\taudio: 2,\n\tvideo: 3,\n\n\tdefault: 0,\n}\n\n/**\n * Get each component of the score for a mime type.  The sum of these is the\n * total score.  The higher the score, the more \"official\" the type.\n */\nexport function mimeScore(mimeType: string, source = 'default') {\n\tif (mimeType === 'application/octet-stream') return 0\n\n\tconst [type, subtype] = mimeType.split('/')\n\n\tconst facet = subtype.replace(/(\\.|x-).*/, '$1')\n\n\tconst facetScore = facetScores[facet as keyof typeof facetScores] || facetScores.default\n\tconst sourceScore = sourceScores[source as keyof typeof sourceScores] || sourceScores.default\n\tconst typeScore = typeScores[type as keyof typeof typeScores] || typeScores.default\n\n\t// All else being equal prefer shorter types\n\tconst lengthScore = 1 - mimeType.length / 100\n\n\treturn facetScore + sourceScore + typeScore + lengthScore\n}\n"]}

package/lib/vendors/rangeParser.d.ts

@@ -1,12 +1,3 @@
-/**
- * Parse "Range" header `str` relative to the given file `size`.
- *
- * @param {Number} size
- * @param {String} str
- * @param {Object} [options]
- * @return {Array}
- * @public
- */
 interface Range {
     start: number;
     end: number;
@@ -14,7 +5,8 @@ interface Range {
 export type Ranges = Range[] & {
     type: string;
 };
-export declare function parseRange(size: number, str: string | undefined, options?: {
+export declare function parseRange(size: number, str: string | undefined, { combine, maxRanges }?: {
     combine?: boolean;
+    maxRanges?: number;
 }): Ranges | -1 | -2;
 export {};

package/lib/vendors/rangeParser.js

@@ -1,22 +1,15 @@
-/**
- * Parse "Range" header `str` relative to the given file `size`.
- *
- * @param {Number} size
- * @param {String} str
- * @param {Object} [options]
- * @return {Array}
- * @public
- */
-export function parseRange(size, str, options) {
-    if (typeof str !== 'string') {
+export function parseRange(size, str, { combine, maxRanges = 100 } = {}) {
+    if (typeof str !== 'string')
         throw new TypeError('argument str must be a string');
-    }
     const index = str.indexOf('=');
-    if (index === -1) {
+    if (index === -1)
         return -2;
-    }
     // split the range string
     const arr = str.slice(index + 1).split(',');
+    // bound the number of ranges: each costs a parseInt and combineRanges sorts O(n log n),
+    // so an attacker could amplify CPU with a header full of tiny ranges
+    if (arr.length > maxRanges)
+        return -1;
     const ranges = [];
     // add ranges type
     ranges.type = str.slice(0, index);
@@ -31,30 +24,24 @@ export function parseRange(size, str, options) {
             end = size - 1;
             // nnn-
         }
-        else if (isNaN(end)) {
+        else if (isNaN(end))
             end = size - 1;
-        }
         // limit last-byte-pos to current length
-        if (end > size - 1) {
+        if (end > size - 1)
             end = size - 1;
-        }
         // invalid or unsatisifiable
-        if (isNaN(start) || isNaN(end) || start > end || start < 0) {
+        if (isNaN(start) || isNaN(end) || start > end || start < 0)
             continue;
-        }
         // add range
         ranges.push({
             start: start,
-            end: end
+            end: end,
         });
     }
-    if (ranges.length < 1) {
-        // unsatisifiable
+    // unsatisifiable
+    if (ranges.length < 1)
         return -1;
-    }
-    return options && options.combine
-        ? combineRanges(ranges)
-        : ranges;
+    return combine ? combineRanges(ranges) : ranges;
 }
 /**
  * Combine overlapping & adjacent ranges.
@@ -92,7 +79,7 @@ function mapWithIndex(range, index) {
     return {
         start: range.start,
         end: range.end,
-        index: index
+        index: index,
     };
 }
 /**
@@ -102,7 +89,7 @@ function mapWithIndex(range, index) {
 function mapWithoutIndex(range) {
     return {
         start: range.start,
-        end: range.end
+        end: range.end,
     };
 }
 /**

package/lib/vendors/rangeParser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rangeParser.js","sourceRoot":"","sources":["../../src/vendors/rangeParser.ts"],"names":[],"mappings":"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","sourcesContent":["interface Range {\n\tstart: number\n\tend: number\n}\ninterface IndexedRange extends Range {\n\tindex: number\n}\nexport type Ranges = Range[] & {type: string}\n\nexport function parseRange(\n\tsize: number,\n\tstr: string | undefined,\n\t{combine, maxRanges = 100}: {combine?: boolean; maxRanges?: number} = {},\n): Ranges | -1 | -2 {\n\tif (typeof str !== 'string') throw new TypeError('argument str must be a string')\n\n\tconst index = str.indexOf('=')\n\n\tif (index === -1) return -2\n\n\t// split the range string\n\tconst arr = str.slice(index + 1).split(',')\n\n\t// bound the number of ranges: each costs a parseInt and combineRanges sorts O(n log n),\n\t// so an attacker could amplify CPU with a header full of tiny ranges\n\tif (arr.length > maxRanges) return -1\n\n\tconst ranges = [] as unknown as Ranges\n\n\t// add ranges type\n\tranges.type = str.slice(0, index)\n\n\t// parse all ranges\n\tfor (let i = 0; i < arr.length; i++) {\n\t\tconst range = arr[i].split('-')\n\t\tlet start = parseInt(range[0], 10)\n\t\tlet end = parseInt(range[1], 10)\n\n\t\t// -nnn\n\t\tif (isNaN(start)) {\n\t\t\tstart = size - end\n\t\t\tend = size - 1\n\t\t\t// nnn-\n\t\t} else if (isNaN(end)) end = size - 1\n\n\t\t// limit last-byte-pos to current length\n\t\tif (end > size - 1) end = size - 1\n\n\t\t// invalid or unsatisifiable\n\t\tif (isNaN(start) || isNaN(end) || start > end || start < 0) continue\n\n\t\t// add range\n\t\tranges.push({\n\t\t\tstart: start,\n\t\t\tend: end,\n\t\t})\n\t}\n\n\t// unsatisifiable\n\tif (ranges.length < 1) return -1\n\n\treturn combine ? combineRanges(ranges) : ranges\n}\n\n/**\n * Combine overlapping & adjacent ranges.\n * @private\n */\n\nfunction combineRanges(ranges: Ranges) {\n\tconst ordered = ranges.map(mapWithIndex).sort(sortByRangeStart)\n\n\tlet j = 0\n\tfor (let i = 1; i < ordered.length; i++) {\n\t\tconst range = ordered[i]\n\t\tconst current = ordered[j]\n\n\t\tif (range.start > current.end + 1) {\n\t\t\t// next range\n\t\t\tordered[++j] = range\n\t\t} else if (range.end > current.end) {\n\t\t\t// extend range\n\t\t\tcurrent.end = range.end\n\t\t\tcurrent.index = Math.min(current.index, range.index)\n\t\t}\n\t}\n\n\t// trim ordered array\n\tordered.length = j + 1\n\n\t// generate combined range\n\tconst combined = ordered.sort(sortByRangeIndex).map(mapWithoutIndex) as unknown as Ranges\n\n\t// copy ranges type\n\tcombined.type = ranges.type\n\n\treturn combined\n}\n\n/**\n * Map function to add index value to ranges.\n * @private\n */\n\nfunction mapWithIndex(range: Range, index: number) {\n\treturn {\n\t\tstart: range.start,\n\t\tend: range.end,\n\t\tindex: index,\n\t}\n}\n\n/**\n * Map function to remove index value from ranges.\n * @private\n */\n\nfunction mapWithoutIndex(range: IndexedRange) {\n\treturn {\n\t\tstart: range.start,\n\t\tend: range.end,\n\t}\n}\n\n/**\n * Sort function to sort ranges by index.\n * @private\n */\n\nfunction sortByRangeIndex(a: IndexedRange, b: IndexedRange) {\n\treturn a.index - b.index\n}\n\n/**\n * Sort function to sort ranges by start position.\n * @private\n */\n\nfunction sortByRangeStart(a: IndexedRange, b: IndexedRange) {\n\treturn a.start - b.start\n}\n"]}

package/package.json

@@ -1,29 +1,34 @@
 {
-  "name": "dx-server",
-  "version": "0.13.0",
-  "main": "./lib/index.js",
-  "repository": "https://github.com/tranvansang/dx-server",
-  "author": "Sang Tran <t@sang.jp>",
-  "files": [
-    "lib"
-  ],
-  "exports": {
-    ".": {
-      "default": "./lib/index.js",
-      "types": "./lib/index.d.ts"
-    },
-    "./helpers": {
-      "default": "./lib/helpers.js",
-      "types": "./lib/helpers.d.ts"
-    }
-  },
-  "type": "module",
-  "scripts": {
-    "prepublishOnly": "tsc"
-  },
-  "license": "MIT",
-  "devDependencies": {
-    "@types/node": "^25.6.0",
-    "typescript": "^6.0.2"
-  }
+	"name": "dx-server",
+	"version": "0.14.0-alpha.2",
+	"main": "./lib/index.js",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/tranvansang/dx-server.git"
+	},
+	"author": "Sang Tran <t@sang.jp>",
+	"files": [
+		"lib"
+	],
+	"exports": {
+		".": {
+			"default": "./lib/index.js",
+			"types": "./lib/index.d.ts"
+		},
+		"./helpers": {
+			"default": "./lib/helpers.js",
+			"types": "./lib/helpers.d.ts"
+		}
+	},
+	"type": "module",
+	"scripts": {
+		"prepublishOnly": "tsc",
+		"test": "tsc && node --test test/*.test.ts",
+		"coverage": "tsc && node --test --experimental-test-coverage --test-coverage-include='lib/**' --test-coverage-exclude='lib/vendors/mimeDb.js' --test-coverage-exclude='test/**' test/*.test.ts"
+	},
+	"license": "MIT",
+	"devDependencies": {
+		"@types/node": "^25.6.0",
+		"typescript": "^6.0.2"
+	}
 }