From c3fc56bff8250e183c78478c91512c5a9245e8d8 Mon Sep 17 00:00:00 2001 From: Mark Wylde Date: Wed, 2 Jun 2021 21:35:10 +1000 Subject: [PATCH] Fix ws (#58) * Fix ws get schema * 7.0.2 --- lib/actions/ws/getAll.js | 7 +- package-lock.json | 497 +++++++++++++++++++++++++++++---------- package.json | 2 +- test/ws.js | 10 +- 4 files changed, 386 insertions(+), 130 deletions(-) diff --git a/lib/actions/ws/getAll.js b/lib/actions/ws/getAll.js index 12e2be6..c310a5b 100644 --- a/lib/actions/ws/getAll.js +++ b/lib/actions/ws/getAll.js @@ -23,7 +23,7 @@ async function handleGetAll (acceptId, state, data, socket) { }); if (responses.find(response => response[STATUS] >= 500)) { - socket.send(JSON.stringify(['A', acceptId, responses])); + socket.send(JSON.stringify(['A', acceptId, responses[0]])); return; } @@ -47,7 +47,10 @@ async function handleGetAll (acceptId, state, data, socket) { }); } - socket.send(JSON.stringify(['A', acceptId, results])); + socket.send(JSON.stringify(['A', acceptId, { + [STATUS]: 200, + [DOCUMENTS]: results + }])); } module.exports = handleGetAll; diff --git a/package-lock.json b/package-lock.json index f26d4b2..f9206d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "canhazdb-server", - "version": "7.0.1", + "version": "7.0.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1469,9 +1469,9 @@ "dev": true }, "ndjson-fe": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/ndjson-fe/-/ndjson-fe-1.2.7.tgz", - "integrity": "sha512-NCzx8mqZJwvb5Jj8WZMCjHELd2MyzHd8MYHLypKQhVmblZZ77WBv7jomLoX/fbztSQKhhC0yp2FgT4+u4xhX0A==" + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/ndjson-fe/-/ndjson-fe-1.2.10.tgz", + "integrity": "sha512-KUnVQdm+kWJt/2HhiBmZ4EhzliHWXH6GglJDVZrrF8vr8ps2sBVFzijcz/jsXm7P9ji4lWWU3X1D1RZp0F6lWA==" }, "node-ejdb-lite": { "version": "3.3.3", @@ -1589,6 +1589,7 @@ "dependencies": { "@npmcli/arborist": { "version": "2.6.1", + "bundled": true, "requires": { "@npmcli/installed-package-contents": "^1.0.7", "@npmcli/map-workspaces": "^1.0.2", @@ -1620,10 +1621,12 @@ } }, "@npmcli/ci-detect": { - "version": "1.3.0" + "version": "1.3.0", + "bundled": true }, "@npmcli/config": { "version": "2.2.0", + "bundled": true, "requires": { "ini": "^2.0.0", "mkdirp-infer-owner": "^2.0.0", @@ -1634,12 +1637,14 @@ }, "@npmcli/disparity-colors": { "version": "1.0.1", + "bundled": true, "requires": { "ansi-styles": "^4.3.0" } }, "@npmcli/git": { "version": "2.0.9", + "bundled": true, "requires": { "@npmcli/promise-spawn": "^1.3.2", "lru-cache": "^6.0.0", @@ -1653,6 +1658,7 @@ }, "@npmcli/installed-package-contents": { "version": "1.0.7", + "bundled": true, "requires": { "npm-bundled": "^1.1.1", "npm-normalize-package-bin": "^1.0.1" @@ -1660,6 +1666,7 @@ }, "@npmcli/map-workspaces": { "version": "1.0.3", + "bundled": true, "requires": { "@npmcli/name-from-folder": "^1.0.1", "glob": "^7.1.6", @@ -1669,6 +1676,7 @@ }, "@npmcli/metavuln-calculator": { "version": "1.1.1", + "bundled": true, "requires": { "cacache": "^15.0.5", "pacote": "^11.1.11", @@ -1677,25 +1685,30 @@ }, "@npmcli/move-file": { "version": "1.1.2", + "bundled": true, "requires": { "mkdirp": "^1.0.4", "rimraf": "^3.0.2" } }, "@npmcli/name-from-folder": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "@npmcli/node-gyp": { - "version": "1.0.2" + "version": "1.0.2", + "bundled": true }, "@npmcli/promise-spawn": { "version": "1.3.2", + "bundled": true, "requires": { "infer-owner": "^1.0.4" } }, "@npmcli/run-script": { "version": "1.8.5", + "bundled": true, "requires": { "@npmcli/node-gyp": "^1.0.2", "@npmcli/promise-spawn": "^1.3.2", @@ -1705,19 +1718,23 @@ } }, "@tootallnate/once": { - "version": "1.1.2" + "version": "1.1.2", + "bundled": true }, "abbrev": { - "version": "1.1.1" + "version": "1.1.1", + "bundled": true }, "agent-base": { "version": "6.0.2", + "bundled": true, "requires": { "debug": "4" } }, "agentkeepalive": { "version": "4.1.4", + "bundled": true, "requires": { "debug": "^4.1.0", "depd": "^1.1.2", @@ -1726,6 +1743,7 @@ }, "aggregate-error": { "version": "3.1.0", + "bundled": true, "requires": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -1733,6 +1751,7 @@ }, "ajv": { "version": "6.12.6", + "bundled": true, "requires": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1741,65 +1760,81 @@ } }, "ansi-regex": { - "version": "2.1.1" + "version": "2.1.1", + "bundled": true }, "ansi-styles": { "version": "4.3.0", + "bundled": true, "requires": { "color-convert": "^2.0.1" } }, "ansicolors": { - "version": "0.3.2" + "version": "0.3.2", + "bundled": true }, "ansistyles": { - "version": "0.1.3" + "version": "0.1.3", + "bundled": true }, "aproba": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "archy": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "are-we-there-yet": { "version": "1.1.5", + "bundled": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" } }, "asap": { - "version": "2.0.6" + "version": "2.0.6", + "bundled": true }, "asn1": { "version": "0.2.4", + "bundled": true, "requires": { "safer-buffer": "~2.1.0" } }, "assert-plus": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "asynckit": { - "version": "0.4.0" + "version": "0.4.0", + "bundled": true }, "aws-sign2": { - "version": "0.7.0" + "version": "0.7.0", + "bundled": true }, "aws4": { - "version": "1.11.0" + "version": "1.11.0", + "bundled": true }, "balanced-match": { - "version": "1.0.2" + "version": "1.0.2", + "bundled": true }, "bcrypt-pbkdf": { "version": "1.0.2", + "bundled": true, "requires": { "tweetnacl": "^0.14.3" } }, "bin-links": { "version": "2.2.1", + "bundled": true, "requires": { "cmd-shim": "^4.0.1", "mkdirp": "^1.0.3", @@ -1810,23 +1845,28 @@ } }, "binary-extensions": { - "version": "2.2.0" + "version": "2.2.0", + "bundled": true }, "brace-expansion": { "version": "1.1.11", + "bundled": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, "builtins": { - "version": "1.0.3" + "version": "1.0.3", + "bundled": true }, "byte-size": { - "version": "7.0.1" + "version": "7.0.1", + "bundled": true }, "cacache": { "version": "15.2.0", + "bundled": true, "requires": { "@npmcli/move-file": "^1.0.1", "chownr": "^2.0.0", @@ -1848,29 +1888,35 @@ } }, "caseless": { - "version": "0.12.0" + "version": "0.12.0", + "bundled": true }, "chalk": { "version": "4.1.1", + "bundled": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } }, "chownr": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "cidr-regex": { "version": "3.1.1", + "bundled": true, "requires": { "ip-regex": "^4.1.0" } }, "clean-stack": { - "version": "2.2.0" + "version": "2.2.0", + "bundled": true }, "cli-columns": { "version": "3.1.2", + "bundled": true, "requires": { "string-width": "^2.0.0", "strip-ansi": "^3.0.1" @@ -1878,6 +1924,7 @@ }, "cli-table3": { "version": "0.6.0", + "bundled": true, "requires": { "colors": "^1.1.2", "object-assign": "^4.1.0", @@ -1885,13 +1932,16 @@ }, "dependencies": { "ansi-regex": { - "version": "5.0.0" + "version": "5.0.0", + "bundled": true }, "is-fullwidth-code-point": { - "version": "3.0.0" + "version": "3.0.0", + "bundled": true }, "string-width": { "version": "4.2.2", + "bundled": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1900,6 +1950,7 @@ }, "strip-ansi": { "version": "6.0.0", + "bundled": true, "requires": { "ansi-regex": "^5.0.0" } @@ -1907,32 +1958,39 @@ } }, "clone": { - "version": "1.0.4" + "version": "1.0.4", + "bundled": true }, "cmd-shim": { "version": "4.1.0", + "bundled": true, "requires": { "mkdirp-infer-owner": "^2.0.0" } }, "code-point-at": { - "version": "1.1.0" + "version": "1.1.0", + "bundled": true }, "color-convert": { "version": "2.0.1", + "bundled": true, "requires": { "color-name": "~1.1.4" } }, "color-name": { - "version": "1.1.4" + "version": "1.1.4", + "bundled": true }, "colors": { "version": "1.4.0", + "bundled": true, "optional": true }, "columnify": { "version": "1.5.4", + "bundled": true, "requires": { "strip-ansi": "^3.0.0", "wcwidth": "^1.0.0" @@ -1940,107 +1998,133 @@ }, "combined-stream": { "version": "1.0.8", + "bundled": true, "requires": { "delayed-stream": "~1.0.0" } }, "common-ancestor-path": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "concat-map": { - "version": "0.0.1" + "version": "0.0.1", + "bundled": true }, "console-control-strings": { - "version": "1.1.0" + "version": "1.1.0", + "bundled": true }, "core-util-is": { - "version": "1.0.2" + "version": "1.0.2", + "bundled": true }, "dashdash": { "version": "1.14.1", + "bundled": true, "requires": { "assert-plus": "^1.0.0" } }, "debug": { "version": "4.3.1", + "bundled": true, "requires": { "ms": "2.1.2" }, "dependencies": { "ms": { - "version": "2.1.2" + "version": "2.1.2", + "bundled": true } } }, "debuglog": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "defaults": { "version": "1.0.3", + "bundled": true, "requires": { "clone": "^1.0.2" } }, "delayed-stream": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "delegates": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "depd": { - "version": "1.1.2" + "version": "1.1.2", + "bundled": true }, "dezalgo": { "version": "1.0.3", + "bundled": true, "requires": { "asap": "^2.0.0", "wrappy": "1" } }, "diff": { - "version": "5.0.0" + "version": "5.0.0", + "bundled": true }, "ecc-jsbn": { "version": "0.1.2", + "bundled": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" } }, "emoji-regex": { - "version": "8.0.0" + "version": "8.0.0", + "bundled": true }, "encoding": { "version": "0.1.13", + "bundled": true, "optional": true, "requires": { "iconv-lite": "^0.6.2" } }, "env-paths": { - "version": "2.2.1" + "version": "2.2.1", + "bundled": true }, "err-code": { - "version": "2.0.3" + "version": "2.0.3", + "bundled": true }, "extend": { - "version": "3.0.2" + "version": "3.0.2", + "bundled": true }, "extsprintf": { - "version": "1.3.0" + "version": "1.3.0", + "bundled": true }, "fast-deep-equal": { - "version": "3.1.3" + "version": "3.1.3", + "bundled": true }, "fast-json-stable-stringify": { - "version": "2.1.0" + "version": "2.1.0", + "bundled": true }, "forever-agent": { - "version": "0.6.1" + "version": "0.6.1", + "bundled": true }, "form-data": { "version": "2.3.3", + "bundled": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -2049,18 +2133,22 @@ }, "fs-minipass": { "version": "2.1.0", + "bundled": true, "requires": { "minipass": "^3.0.0" } }, "fs.realpath": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "function-bind": { - "version": "1.1.1" + "version": "1.1.1", + "bundled": true }, "gauge": { "version": "2.7.4", + "bundled": true, "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -2073,16 +2161,19 @@ }, "dependencies": { "aproba": { - "version": "1.2.0" + "version": "1.2.0", + "bundled": true }, "is-fullwidth-code-point": { "version": "1.0.0", + "bundled": true, "requires": { "number-is-nan": "^1.0.0" } }, "string-width": { "version": "1.0.2", + "bundled": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -2093,12 +2184,14 @@ }, "getpass": { "version": "0.1.7", + "bundled": true, "requires": { "assert-plus": "^1.0.0" } }, "glob": { "version": "7.1.7", + "bundled": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -2109,13 +2202,16 @@ } }, "graceful-fs": { - "version": "4.2.6" + "version": "4.2.6", + "bundled": true }, "har-schema": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "har-validator": { "version": "5.1.5", + "bundled": true, "requires": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -2123,27 +2219,33 @@ }, "has": { "version": "1.0.3", + "bundled": true, "requires": { "function-bind": "^1.1.1" } }, "has-flag": { - "version": "4.0.0" + "version": "4.0.0", + "bundled": true }, "has-unicode": { - "version": "2.0.1" + "version": "2.0.1", + "bundled": true }, "hosted-git-info": { "version": "4.0.2", + "bundled": true, "requires": { "lru-cache": "^6.0.0" } }, "http-cache-semantics": { - "version": "4.1.0" + "version": "4.1.0", + "bundled": true }, "http-proxy-agent": { "version": "4.0.1", + "bundled": true, "requires": { "@tootallnate/once": "1", "agent-base": "6", @@ -2152,6 +2254,7 @@ }, "http-signature": { "version": "1.2.0", + "bundled": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -2160,6 +2263,7 @@ }, "https-proxy-agent": { "version": "5.0.0", + "bundled": true, "requires": { "agent-base": "6", "debug": "4" @@ -2167,12 +2271,14 @@ }, "humanize-ms": { "version": "1.2.1", + "bundled": true, "requires": { "ms": "^2.0.0" } }, "iconv-lite": { "version": "0.6.2", + "bundled": true, "optional": true, "requires": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -2180,34 +2286,42 @@ }, "ignore-walk": { "version": "3.0.4", + "bundled": true, "requires": { "minimatch": "^3.0.4" } }, "imurmurhash": { - "version": "0.1.4" + "version": "0.1.4", + "bundled": true }, "indent-string": { - "version": "4.0.0" + "version": "4.0.0", + "bundled": true }, "infer-owner": { - "version": "1.0.4" + "version": "1.0.4", + "bundled": true }, "inflight": { "version": "1.0.6", + "bundled": true, "requires": { "once": "^1.3.0", "wrappy": "1" } }, "inherits": { - "version": "2.0.4" + "version": "2.0.4", + "bundled": true }, "ini": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "init-package-json": { "version": "2.0.3", + "bundled": true, "requires": { "glob": "^7.1.1", "npm-package-arg": "^8.1.2", @@ -2220,64 +2334,82 @@ } }, "ip": { - "version": "1.1.5" + "version": "1.1.5", + "bundled": true }, "ip-regex": { - "version": "4.3.0" + "version": "4.3.0", + "bundled": true }, "is-cidr": { "version": "4.0.2", + "bundled": true, "requires": { "cidr-regex": "^3.1.1" } }, "is-core-module": { "version": "2.4.0", + "bundled": true, "requires": { "has": "^1.0.3" } }, "is-fullwidth-code-point": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "is-lambda": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "is-typedarray": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "isarray": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "isexe": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "isstream": { - "version": "0.1.2" + "version": "0.1.2", + "bundled": true }, "jsbn": { - "version": "0.1.1" + "version": "0.1.1", + "bundled": true }, "json-parse-even-better-errors": { - "version": "2.3.1" + "version": "2.3.1", + "bundled": true }, "json-schema": { - "version": "0.2.3" + "version": "0.2.3", + "bundled": true }, "json-schema-traverse": { - "version": "0.4.1" + "version": "0.4.1", + "bundled": true }, "json-stringify-nice": { - "version": "1.1.4" + "version": "1.1.4", + "bundled": true }, "json-stringify-safe": { - "version": "5.0.1" + "version": "5.0.1", + "bundled": true }, "jsonparse": { - "version": "1.3.1" + "version": "1.3.1", + "bundled": true }, "jsprim": { "version": "1.4.1", + "bundled": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -2286,16 +2418,20 @@ } }, "just-diff": { - "version": "3.1.1" + "version": "3.1.1", + "bundled": true }, "just-diff-apply": { - "version": "3.0.0" + "version": "3.0.0", + "bundled": true }, "leven": { - "version": "3.1.0" + "version": "3.1.0", + "bundled": true }, "libnpmaccess": { "version": "4.0.2", + "bundled": true, "requires": { "aproba": "^2.0.0", "minipass": "^3.1.1", @@ -2305,6 +2441,7 @@ }, "libnpmdiff": { "version": "2.0.4", + "bundled": true, "requires": { "@npmcli/disparity-colors": "^1.0.1", "@npmcli/installed-package-contents": "^1.0.7", @@ -2318,6 +2455,7 @@ }, "libnpmexec": { "version": "1.2.0", + "bundled": true, "requires": { "@npmcli/arborist": "^2.3.0", "@npmcli/ci-detect": "^1.3.0", @@ -2334,12 +2472,14 @@ }, "libnpmfund": { "version": "1.1.0", + "bundled": true, "requires": { "@npmcli/arborist": "^2.5.0" } }, "libnpmhook": { "version": "6.0.2", + "bundled": true, "requires": { "aproba": "^2.0.0", "npm-registry-fetch": "^10.0.0" @@ -2347,6 +2487,7 @@ }, "libnpmorg": { "version": "2.0.2", + "bundled": true, "requires": { "aproba": "^2.0.0", "npm-registry-fetch": "^10.0.0" @@ -2354,6 +2495,7 @@ }, "libnpmpack": { "version": "2.0.1", + "bundled": true, "requires": { "@npmcli/run-script": "^1.8.3", "npm-package-arg": "^8.1.0", @@ -2362,6 +2504,7 @@ }, "libnpmpublish": { "version": "4.0.1", + "bundled": true, "requires": { "normalize-package-data": "^3.0.2", "npm-package-arg": "^8.1.2", @@ -2372,12 +2515,14 @@ }, "libnpmsearch": { "version": "3.1.1", + "bundled": true, "requires": { "npm-registry-fetch": "^10.0.0" } }, "libnpmteam": { "version": "2.0.3", + "bundled": true, "requires": { "aproba": "^2.0.0", "npm-registry-fetch": "^10.0.0" @@ -2385,6 +2530,7 @@ }, "libnpmversion": { "version": "1.2.0", + "bundled": true, "requires": { "@npmcli/git": "^2.0.7", "@npmcli/run-script": "^1.8.4", @@ -2395,12 +2541,14 @@ }, "lru-cache": { "version": "6.0.0", + "bundled": true, "requires": { "yallist": "^4.0.0" } }, "make-fetch-happen": { "version": "8.0.14", + "bundled": true, "requires": { "agentkeepalive": "^4.1.3", "cacache": "^15.0.5", @@ -2420,34 +2568,40 @@ } }, "mime-db": { - "version": "1.47.0" + "version": "1.47.0", + "bundled": true }, "mime-types": { "version": "2.1.30", + "bundled": true, "requires": { "mime-db": "1.47.0" } }, "minimatch": { "version": "3.0.4", + "bundled": true, "requires": { "brace-expansion": "^1.1.7" } }, "minipass": { "version": "3.1.3", + "bundled": true, "requires": { "yallist": "^4.0.0" } }, "minipass-collect": { "version": "1.0.2", + "bundled": true, "requires": { "minipass": "^3.0.0" } }, "minipass-fetch": { "version": "1.3.3", + "bundled": true, "requires": { "encoding": "^0.1.12", "minipass": "^3.1.0", @@ -2457,12 +2611,14 @@ }, "minipass-flush": { "version": "1.0.5", + "bundled": true, "requires": { "minipass": "^3.0.0" } }, "minipass-json-stream": { "version": "1.0.1", + "bundled": true, "requires": { "jsonparse": "^1.3.1", "minipass": "^3.0.0" @@ -2470,28 +2626,33 @@ }, "minipass-pipeline": { "version": "1.2.4", + "bundled": true, "requires": { "minipass": "^3.0.0" } }, "minipass-sized": { "version": "1.0.3", + "bundled": true, "requires": { "minipass": "^3.0.0" } }, "minizlib": { "version": "2.1.2", + "bundled": true, "requires": { "minipass": "^3.0.0", "yallist": "^4.0.0" } }, "mkdirp": { - "version": "1.0.4" + "version": "1.0.4", + "bundled": true }, "mkdirp-infer-owner": { "version": "2.0.0", + "bundled": true, "requires": { "chownr": "^2.0.0", "infer-owner": "^1.0.4", @@ -2499,13 +2660,16 @@ } }, "ms": { - "version": "2.1.3" + "version": "2.1.3", + "bundled": true }, "mute-stream": { - "version": "0.0.8" + "version": "0.0.8", + "bundled": true }, "node-gyp": { "version": "7.1.2", + "bundled": true, "requires": { "env-paths": "^2.2.0", "glob": "^7.1.4", @@ -2521,12 +2685,14 @@ }, "nopt": { "version": "5.0.0", + "bundled": true, "requires": { "abbrev": "1" } }, "normalize-package-data": { "version": "3.0.2", + "bundled": true, "requires": { "hosted-git-info": "^4.0.1", "resolve": "^1.20.0", @@ -2536,27 +2702,32 @@ }, "npm-audit-report": { "version": "2.1.5", + "bundled": true, "requires": { "chalk": "^4.0.0" } }, "npm-bundled": { "version": "1.1.2", + "bundled": true, "requires": { "npm-normalize-package-bin": "^1.0.1" } }, "npm-install-checks": { "version": "4.0.0", + "bundled": true, "requires": { "semver": "^7.1.1" } }, "npm-normalize-package-bin": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "npm-package-arg": { "version": "8.1.2", + "bundled": true, "requires": { "hosted-git-info": "^4.0.1", "semver": "^7.3.4", @@ -2565,6 +2736,7 @@ }, "npm-packlist": { "version": "2.2.2", + "bundled": true, "requires": { "glob": "^7.1.6", "ignore-walk": "^3.0.3", @@ -2574,6 +2746,7 @@ }, "npm-pick-manifest": { "version": "6.1.1", + "bundled": true, "requires": { "npm-install-checks": "^4.0.0", "npm-normalize-package-bin": "^1.0.1", @@ -2583,12 +2756,14 @@ }, "npm-profile": { "version": "5.0.3", + "bundled": true, "requires": { "npm-registry-fetch": "^10.0.0" } }, "npm-registry-fetch": { "version": "10.1.2", + "bundled": true, "requires": { "lru-cache": "^6.0.0", "make-fetch-happen": "^8.0.9", @@ -2600,10 +2775,12 @@ } }, "npm-user-validate": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "npmlog": { "version": "4.1.2", + "bundled": true, "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -2612,31 +2789,38 @@ } }, "number-is-nan": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "oauth-sign": { - "version": "0.9.0" + "version": "0.9.0", + "bundled": true }, "object-assign": { - "version": "4.1.1" + "version": "4.1.1", + "bundled": true }, "once": { "version": "1.4.0", + "bundled": true, "requires": { "wrappy": "1" } }, "opener": { - "version": "1.5.2" + "version": "1.5.2", + "bundled": true }, "p-map": { "version": "4.0.0", + "bundled": true, "requires": { "aggregate-error": "^3.0.0" } }, "pacote": { "version": "11.3.3", + "bundled": true, "requires": { "@npmcli/git": "^2.0.1", "@npmcli/installed-package-contents": "^1.0.6", @@ -2661,6 +2845,7 @@ }, "parse-conflict-json": { "version": "1.1.1", + "bundled": true, "requires": { "json-parse-even-better-errors": "^2.3.0", "just-diff": "^3.0.1", @@ -2668,31 +2853,40 @@ } }, "path-is-absolute": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "path-parse": { - "version": "1.0.6" + "version": "1.0.6", + "bundled": true }, "performance-now": { - "version": "2.1.0" + "version": "2.1.0", + "bundled": true }, "proc-log": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "process-nextick-args": { - "version": "2.0.1" + "version": "2.0.1", + "bundled": true }, "promise-all-reject-late": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "promise-call-limit": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "promise-inflight": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "promise-retry": { "version": "2.0.1", + "bundled": true, "requires": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -2700,33 +2894,41 @@ }, "promzard": { "version": "0.3.0", + "bundled": true, "requires": { "read": "1" } }, "psl": { - "version": "1.8.0" + "version": "1.8.0", + "bundled": true }, "punycode": { - "version": "2.1.1" + "version": "2.1.1", + "bundled": true }, "qrcode-terminal": { - "version": "0.12.0" + "version": "0.12.0", + "bundled": true }, "qs": { - "version": "6.5.2" + "version": "6.5.2", + "bundled": true }, "read": { "version": "1.0.7", + "bundled": true, "requires": { "mute-stream": "~0.0.4" } }, "read-cmd-shim": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "read-package-json": { "version": "3.0.1", + "bundled": true, "requires": { "glob": "^7.1.1", "json-parse-even-better-errors": "^2.3.0", @@ -2736,6 +2938,7 @@ }, "read-package-json-fast": { "version": "2.0.2", + "bundled": true, "requires": { "json-parse-even-better-errors": "^2.3.0", "npm-normalize-package-bin": "^1.0.1" @@ -2743,6 +2946,7 @@ }, "readable-stream": { "version": "2.3.7", + "bundled": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -2755,6 +2959,7 @@ }, "readdir-scoped-modules": { "version": "1.1.0", + "bundled": true, "requires": { "debuglog": "^1.0.1", "dezalgo": "^1.0.0", @@ -2764,6 +2969,7 @@ }, "request": { "version": "2.88.2", + "bundled": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -2789,6 +2995,7 @@ "dependencies": { "tough-cookie": { "version": "2.5.0", + "bundled": true, "requires": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -2798,43 +3005,53 @@ }, "resolve": { "version": "1.20.0", + "bundled": true, "requires": { "is-core-module": "^2.2.0", "path-parse": "^1.0.6" } }, "retry": { - "version": "0.12.0" + "version": "0.12.0", + "bundled": true }, "rimraf": { "version": "3.0.2", + "bundled": true, "requires": { "glob": "^7.1.3" } }, "safe-buffer": { - "version": "5.1.2" + "version": "5.1.2", + "bundled": true }, "safer-buffer": { - "version": "2.1.2" + "version": "2.1.2", + "bundled": true }, "semver": { "version": "7.3.5", + "bundled": true, "requires": { "lru-cache": "^6.0.0" } }, "set-blocking": { - "version": "2.0.0" + "version": "2.0.0", + "bundled": true }, "signal-exit": { - "version": "3.0.3" + "version": "3.0.3", + "bundled": true }, "smart-buffer": { - "version": "4.1.0" + "version": "4.1.0", + "bundled": true }, "socks": { "version": "2.6.1", + "bundled": true, "requires": { "ip": "^1.1.5", "smart-buffer": "^4.1.0" @@ -2842,6 +3059,7 @@ }, "socks-proxy-agent": { "version": "5.0.0", + "bundled": true, "requires": { "agent-base": "6", "debug": "4", @@ -2850,26 +3068,31 @@ }, "spdx-correct": { "version": "3.1.1", + "bundled": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "spdx-exceptions": { - "version": "2.3.0" + "version": "2.3.0", + "bundled": true }, "spdx-expression-parse": { "version": "3.0.1", + "bundled": true, "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "spdx-license-ids": { - "version": "3.0.7" + "version": "3.0.7", + "bundled": true }, "sshpk": { "version": "1.16.1", + "bundled": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -2884,22 +3107,26 @@ }, "ssri": { "version": "8.0.1", + "bundled": true, "requires": { "minipass": "^3.1.1" } }, "string-width": { "version": "2.1.1", + "bundled": true, "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" }, "dependencies": { "ansi-regex": { - "version": "3.0.0" + "version": "3.0.0", + "bundled": true }, "strip-ansi": { "version": "4.0.0", + "bundled": true, "requires": { "ansi-regex": "^3.0.0" } @@ -2908,27 +3135,32 @@ }, "string_decoder": { "version": "1.1.1", + "bundled": true, "requires": { "safe-buffer": "~5.1.0" } }, "stringify-package": { - "version": "1.0.1" + "version": "1.0.1", + "bundled": true }, "strip-ansi": { "version": "3.0.1", + "bundled": true, "requires": { "ansi-regex": "^2.0.0" } }, "supports-color": { "version": "7.2.0", + "bundled": true, "requires": { "has-flag": "^4.0.0" } }, "tar": { "version": "6.1.0", + "bundled": true, "requires": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -2939,55 +3171,67 @@ } }, "text-table": { - "version": "0.2.0" + "version": "0.2.0", + "bundled": true }, "tiny-relative-date": { - "version": "1.3.0" + "version": "1.3.0", + "bundled": true }, "treeverse": { - "version": "1.0.4" + "version": "1.0.4", + "bundled": true }, "tunnel-agent": { "version": "0.6.0", + "bundled": true, "requires": { "safe-buffer": "^5.0.1" } }, "tweetnacl": { - "version": "0.14.5" + "version": "0.14.5", + "bundled": true }, "typedarray-to-buffer": { "version": "3.1.5", + "bundled": true, "requires": { "is-typedarray": "^1.0.0" } }, "unique-filename": { "version": "1.1.1", + "bundled": true, "requires": { "unique-slug": "^2.0.0" } }, "unique-slug": { "version": "2.0.2", + "bundled": true, "requires": { "imurmurhash": "^0.1.4" } }, "uri-js": { "version": "4.4.1", + "bundled": true, "requires": { "punycode": "^2.1.0" } }, "util-deprecate": { - "version": "1.0.2" + "version": "1.0.2", + "bundled": true }, "uuid": { - "version": "3.4.0" + "version": "3.4.0", + "bundled": true }, "validate-npm-package-license": { "version": "3.0.4", + "bundled": true, "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -2995,12 +3239,14 @@ }, "validate-npm-package-name": { "version": "3.0.0", + "bundled": true, "requires": { "builtins": "^1.0.3" } }, "verror": { "version": "1.10.0", + "bundled": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -3008,31 +3254,37 @@ } }, "walk-up-path": { - "version": "1.0.0" + "version": "1.0.0", + "bundled": true }, "wcwidth": { "version": "1.0.1", + "bundled": true, "requires": { "defaults": "^1.0.3" } }, "which": { "version": "2.0.2", + "bundled": true, "requires": { "isexe": "^2.0.0" } }, "wide-align": { "version": "1.1.3", + "bundled": true, "requires": { "string-width": "^1.0.2 || 2" } }, "wrappy": { - "version": "1.0.2" + "version": "1.0.2", + "bundled": true }, "write-file-atomic": { "version": "3.0.3", + "bundled": true, "requires": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", @@ -3041,7 +3293,8 @@ } }, "yallist": { - "version": "4.0.0" + "version": "4.0.0", + "bundled": true } } }, diff --git a/package.json b/package.json index 5ae8a71..56069f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "canhazdb-server", - "version": "7.0.1", + "version": "7.0.2", "description": "A shaded and clustered database communicated over http rest.", "main": "./lib/index.js", "bin": { diff --git a/test/ws.js b/test/ws.js index 7fb7ad9..135b9d8 100644 --- a/test/ws.js +++ b/test/ws.js @@ -9,6 +9,7 @@ const createTestCluster = require('./helpers/createTestCluster'); const { STATUS, DOCUMENT, + DOCUMENTS, QUERY, COLLECTION_ID } = require('../lib/constants'); @@ -21,7 +22,7 @@ const tls = { }; test('get: getAll some data', async t => { - t.plan(4); + t.plan(5); const cluster = await createTestCluster(3, tls); const node = cluster.getRandomNodeUrl(); @@ -51,12 +52,11 @@ test('get: getAll some data', async t => { ws.on('message', async function incoming (rawData) { const [type, acceptId, data] = JSON.parse(rawData); - console.log(rawData); - t.equal(type, 'A', 'should have correct type'); t.equal(acceptId, 1, 'should have correct acceptId'); - t.equal(data[0].id, insertResponses[0].data.id, 'had correct document id'); - t.equal(data[0].a, 1, 'should return document field'); + t.equal(data[STATUS], 200, 'should have correct status'); + t.equal(data[DOCUMENTS][0].id, insertResponses[0].data.id, 'had correct document id'); + t.equal(data[DOCUMENTS][0].a, 1, 'should return document field'); cluster.closeAll(); });