mirror of
https://github.com/CommunitySolidServer/CommunitySolidServer.git
synced 2024-10-03 14:55:10 +00:00
chore: Update dependencies
This commit is contained in:
Joachim Van Herwegen
parent
d01382d36e
commit
5edbbc1958
@ -6,6 +6,8 @@ module.exports = {
|
||||
tsconfigRootDir: __dirname,
|
||||
project: [ './tsconfig.json', './test/tsconfig.json' ],
|
||||
},
|
||||
// Ignoring js files (such as this one) since they seem to conflict with rules that require typing info
|
||||
ignorePatterns: [ '*.js' ],
|
||||
globals: {
|
||||
AsyncIterable: 'readonly',
|
||||
NodeJS: 'readonly',
|
||||
@ -49,6 +51,7 @@ module.exports = {
|
||||
'class-methods-use-this': 'off',
|
||||
'comma-dangle': [ 'error', 'always-multiline' ],
|
||||
'dot-location': [ 'error', 'property' ],
|
||||
'eslint-comments/disable-enable-pair': 'off',
|
||||
// Allow declaring overloads in TypeScript (https://eslint.org/docs/rules/func-style)
|
||||
'func-style': [ 'error', 'declaration' ],
|
||||
'generator-star-spacing': [ 'error', 'after' ],
|
||||
@ -74,7 +77,8 @@ module.exports = {
|
||||
'unicorn/catch-error-name': 'off',
|
||||
'unicorn/import-index': 'off',
|
||||
'unicorn/import-style': 'off',
|
||||
// This prevents some functional programming paradigms
|
||||
// The next 2 some functional programming paradigms
|
||||
'unicorn/no-array-callback-reference': 'off',
|
||||
'unicorn/no-fn-reference-in-iterator': 'off',
|
||||
'unicorn/no-object-as-default-parameter': 'off',
|
||||
'unicorn/numeric-separators-style': 'off',
|
||||
|
||||
6273
package-lock.json
generated
6273
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
112
package.json
112
package.json
@ -82,90 +82,90 @@
|
||||
"@types/arrayify-stream": "^1.0.0",
|
||||
"@types/async-lock": "^1.1.2",
|
||||
"@types/bcrypt": "^5.0.0",
|
||||
"@types/cors": "^2.8.9",
|
||||
"@types/cors": "^2.8.10",
|
||||
"@types/end-of-stream": "^1.4.0",
|
||||
"@types/mime-types": "^2.1.0",
|
||||
"@types/n3": "^1.4.4",
|
||||
"@types/node": "^14.10.2",
|
||||
"@types/nodemailer": "^6.4.0",
|
||||
"@types/pump": "^1.1.0",
|
||||
"@types/n3": "^1.10.0",
|
||||
"@types/node": "^15.12.5",
|
||||
"@types/nodemailer": "^6.4.2",
|
||||
"@types/pump": "^1.1.1",
|
||||
"@types/punycode": "^2.1.0",
|
||||
"@types/rdf-js": "^4.0.0",
|
||||
"@types/rdfjs__fetch": "^2.0.2",
|
||||
"@types/rdfjs__fetch-lite": "^2.0.2",
|
||||
"@types/redis": "^2.8.28",
|
||||
"@types/rdf-js": "^4.0.2",
|
||||
"@types/rdfjs__fetch": "^2.0.3",
|
||||
"@types/rdfjs__fetch-lite": "^2.0.3",
|
||||
"@types/redis": "^2.8.30",
|
||||
"@types/redlock": "^4.0.1",
|
||||
"@types/sparqljs": "^3.1.0",
|
||||
"@types/sparqljs": "^3.1.2",
|
||||
"@types/streamify-array": "^1.0.0",
|
||||
"@types/url-join": "^4.0.0",
|
||||
"@types/uuid": "^8.3.0",
|
||||
"@types/ws": "^7.4.0",
|
||||
"@types/yargs": "^16.0.0",
|
||||
"@types/ws": "^7.4.5",
|
||||
"@types/yargs": "^17.0.0",
|
||||
"arrayify-stream": "^1.0.0",
|
||||
"async-lock": "^1.2.4",
|
||||
"bcrypt": "^5.0.0",
|
||||
"componentsjs": "^4.1.0",
|
||||
"async-lock": "^1.3.0",
|
||||
"bcrypt": "^5.0.1",
|
||||
"componentsjs": "^4.3.0",
|
||||
"cors": "^2.8.5",
|
||||
"ejs": "^3.1.5",
|
||||
"ejs": "^3.1.6",
|
||||
"end-of-stream": "^1.4.4",
|
||||
"escape-string-regexp": "^4.0.0",
|
||||
"fetch-sparql-endpoint": "^2.0.0",
|
||||
"handlebars": "^4.7.6",
|
||||
"fetch-sparql-endpoint": "^2.0.1",
|
||||
"handlebars": "^4.7.7",
|
||||
"jose": "^3.11.6",
|
||||
"mime-types": "^2.1.27",
|
||||
"n3": "^1.8.0",
|
||||
"nodemailer": "^6.4.17",
|
||||
"oidc-provider": "^6.29.8",
|
||||
"mime-types": "^2.1.31",
|
||||
"n3": "^1.10.0",
|
||||
"nodemailer": "^6.6.2",
|
||||
"oidc-provider": "^6.31.1",
|
||||
"pump": "^3.0.0",
|
||||
"punycode": "^2.1.1",
|
||||
"rdf-parse": "^1.7.0",
|
||||
"rdf-parse": "^1.8.1",
|
||||
"rdf-serialize": "^1.1.0",
|
||||
"redis": "^3.0.2",
|
||||
"redis": "^3.1.2",
|
||||
"redlock": "^4.2.0",
|
||||
"sparqlalgebrajs": "^3.0.0",
|
||||
"sparqljs": "^3.1.2",
|
||||
"sparqljs": "^3.4.2",
|
||||
"streamify-array": "^1.0.1",
|
||||
"url-join": "^4.0.1",
|
||||
"uuid": "^8.3.0",
|
||||
"uuid": "^8.3.2",
|
||||
"winston": "^3.3.3",
|
||||
"winston-transport": "^4.4.0",
|
||||
"ws": "^7.4.0",
|
||||
"yargs": "^16.0.0"
|
||||
"ws": "^7.5.1",
|
||||
"yargs": "^17.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@inrupt/solid-client-authn-node": "^1.8.1",
|
||||
"@microsoft/tsdoc-config": "^0.15.0",
|
||||
"@tsconfig/node12": "^1.0.7",
|
||||
"@types/cheerio": "^0.22.27",
|
||||
"@types/ejs": "^3.0.5",
|
||||
"@types/jest": "^26.0.13",
|
||||
"@inrupt/solid-client-authn-node": "^1.9.1",
|
||||
"@microsoft/tsdoc-config": "^0.15.2",
|
||||
"@tsconfig/node12": "^1.0.9",
|
||||
"@types/cheerio": "^0.22.29",
|
||||
"@types/ejs": "^3.0.6",
|
||||
"@types/jest": "^26.0.23",
|
||||
"@types/rimraf": "^3.0.0",
|
||||
"@types/set-cookie-parser": "^2.4.0",
|
||||
"@types/supertest": "^2.0.10",
|
||||
"@typescript-eslint/eslint-plugin": "^4.1.1",
|
||||
"@typescript-eslint/parser": "^4.1.1",
|
||||
"cheerio": "^1.0.0-rc.5",
|
||||
"componentsjs-generator": "^2.1.0",
|
||||
"cross-fetch": "^3.0.6",
|
||||
"eslint": "^7.9.0",
|
||||
"@types/supertest": "^2.0.11",
|
||||
"@typescript-eslint/eslint-plugin": "^4.28.1",
|
||||
"@typescript-eslint/parser": "^4.28.1",
|
||||
"cheerio": "^1.0.0-rc.10",
|
||||
"componentsjs-generator": "^2.4.0",
|
||||
"cross-fetch": "^3.1.4",
|
||||
"eslint": "^7.29.0",
|
||||
"eslint-config-es": "^3.20.3",
|
||||
"eslint-import-resolver-typescript": "^2.3.0",
|
||||
"eslint-plugin-import": "^2.22.0",
|
||||
"eslint-plugin-jest": "^24.1.0",
|
||||
"eslint-plugin-tsdoc": "^0.2.7",
|
||||
"eslint-plugin-unused-imports": "^1.0.0",
|
||||
"husky": "^4.2.5",
|
||||
"jest": "^27.0.3",
|
||||
"jest-rdf": "^1.5.0",
|
||||
"eslint-import-resolver-typescript": "^2.4.0",
|
||||
"eslint-plugin-import": "^2.23.4",
|
||||
"eslint-plugin-jest": "^24.3.6",
|
||||
"eslint-plugin-tsdoc": "^0.2.14",
|
||||
"eslint-plugin-unused-imports": "^1.1.1",
|
||||
"husky": "^4.3.8",
|
||||
"jest": "^27.0.6",
|
||||
"jest-rdf": "^1.6.0",
|
||||
"manual-git-changelog": "^1.0.1",
|
||||
"node-mocks-http": "^1.8.1",
|
||||
"nodemon": "^2.0.4",
|
||||
"node-mocks-http": "^1.10.1",
|
||||
"nodemon": "^2.0.7",
|
||||
"rimraf": "^3.0.2",
|
||||
"set-cookie-parser": "^2.4.8",
|
||||
"stream-to-string": "^1.1.0",
|
||||
"supertest": "^6.0.0",
|
||||
"ts-jest": "^27.0.2",
|
||||
"typedoc": "^0.21.0",
|
||||
"typescript": "^4.0.2"
|
||||
"stream-to-string": "^1.2.0",
|
||||
"supertest": "^6.1.3",
|
||||
"ts-jest": "^27.0.3",
|
||||
"typedoc": "^0.21.2",
|
||||
"typescript": "^4.3.4"
|
||||
}
|
||||
}
|
||||
|
||||
@ -30,7 +30,7 @@ export class BearerWebIdExtractor extends CredentialsExtractor {
|
||||
const { headers: { authorization }} = request;
|
||||
|
||||
try {
|
||||
const { webid: webId } = await this.verify(authorization as string);
|
||||
const { webid: webId } = await this.verify(authorization!);
|
||||
this.logger.info(`Verified WebID via Bearer access token: ${webId}`);
|
||||
return { webId };
|
||||
} catch (error: unknown) {
|
||||
|
||||
@ -45,7 +45,7 @@ export class DPoPWebIdExtractor extends CredentialsExtractor {
|
||||
// and extract the WebID provided by the client
|
||||
try {
|
||||
const { webid: webId } = await this.verify(
|
||||
authorization as string,
|
||||
authorization!,
|
||||
{
|
||||
header: dpop as string,
|
||||
method: method as RequestMethod,
|
||||
|
||||
@ -18,7 +18,7 @@ export class UnsecureWebIdExtractor extends CredentialsExtractor {
|
||||
}
|
||||
|
||||
public async handle({ headers }: HttpRequest): Promise<Credentials> {
|
||||
const webId = /^WebID\s+(.*)/u.exec(headers.authorization as string)![1];
|
||||
const webId = /^WebID\s+(.*)/u.exec(headers.authorization!)![1];
|
||||
this.logger.info(`Agent unsecurely claims to be ${webId}`);
|
||||
return { webId };
|
||||
}
|
||||
|
||||
@ -46,6 +46,8 @@ export class KeyConfigurationFactory implements ConfigurationFactory {
|
||||
// If they are not, generate and save them
|
||||
const { privateKey } = await generateKeyPair('RS256');
|
||||
const jwk = await fromKeyLike(privateKey);
|
||||
// Required for Solid authn client
|
||||
jwk.alg = 'RS256';
|
||||
// In node v15.12.0 the JWKS does not get accepted because the JWK is not a plain object,
|
||||
// which is why we convert it into a plain object here.
|
||||
// Potentially this can be changed at a later point in time to `{ keys: [ jwk ]}`.
|
||||
|
||||
@ -19,6 +19,6 @@ export class SessionHttpHandler extends InteractionHttpHandler {
|
||||
if (!details.session || !details.session.accountId) {
|
||||
throw new NotImplementedHttpError('Only confirm actions with a session and accountId are supported');
|
||||
}
|
||||
await this.interactionCompleter.handleSafe({ ...input, webId: details.session.accountId });
|
||||
await this.interactionCompleter.handleSafe({ ...input, webId: details.session.accountId as any });
|
||||
}
|
||||
}
|
||||
|
||||
@ -188,16 +188,16 @@ export class RegistrationHandler extends HttpHandler {
|
||||
* Verifies that all the data combinations make sense.
|
||||
*/
|
||||
private validateInput(parsed: NodeJS.Dict<string>): ParseResult {
|
||||
const { email, password, confirmPassword, podName, webId } = parsed;
|
||||
const { email, password, confirmPassword, podName, webId, createWebId, register, createPod } = parsed;
|
||||
|
||||
assert(typeof email === 'string' && email.length > 0 && emailRegex.test(email),
|
||||
'A valid e-mail address is required');
|
||||
|
||||
const result: ParseResult = {
|
||||
email,
|
||||
createWebId: Boolean(parsed.createWebId),
|
||||
register: Boolean(parsed.register),
|
||||
createPod: Boolean(parsed.createPod),
|
||||
createWebId: Boolean(createWebId),
|
||||
register: Boolean(register),
|
||||
createPod: Boolean(createPod),
|
||||
data: parsed,
|
||||
};
|
||||
|
||||
|
||||
@ -54,7 +54,7 @@ export class ExpiringAdapter implements Adapter {
|
||||
if (payload.grantId) {
|
||||
storagePromises.push(
|
||||
(async(): Promise<void> => {
|
||||
const grantKey = this.grantKeyFor(payload.grantId as string);
|
||||
const grantKey = this.grantKeyFor(payload.grantId!);
|
||||
const grants = (await this.storage.get(grantKey) || []) as string[];
|
||||
grants.push(key);
|
||||
await this.storage.set(grantKey, grants, expires);
|
||||
|
||||
@ -200,6 +200,7 @@ export * from './server/BaseHttpServerFactory';
|
||||
export * from './server/HttpHandler';
|
||||
export * from './server/HttpRequest';
|
||||
export * from './server/HttpResponse';
|
||||
export * from './server/HttpServerFactory';
|
||||
export * from './server/WebSocketServerFactory';
|
||||
export * from './server/WebSocketHandler';
|
||||
|
||||
|
||||
@ -7,6 +7,7 @@ import yargs from 'yargs';
|
||||
import { getLoggerFor } from '../logging/LogUtil';
|
||||
import { absoluteFilePath, ensureTrailingSlash, joinFilePath } from '../util/PathUtil';
|
||||
import type { App } from './App';
|
||||
|
||||
export class AppRunner {
|
||||
private readonly logger = getLoggerFor(this);
|
||||
|
||||
@ -56,7 +57,8 @@ export class AppRunner {
|
||||
stderr?: WriteStream;
|
||||
} = {}): void {
|
||||
// Parse the command-line arguments
|
||||
const { argv: params } = yargs(argv.slice(2))
|
||||
// eslint-disable-next-line no-sync
|
||||
const params = yargs(argv.slice(2))
|
||||
.strict()
|
||||
.usage('node ./bin/server.js [args]')
|
||||
.check((args): boolean => {
|
||||
@ -84,7 +86,7 @@ export class AppRunner {
|
||||
sparqlEndpoint: { type: 'string', alias: 's', requiresArg: true },
|
||||
podConfigJson: { type: 'string', default: './pod-config.json', requiresArg: true },
|
||||
})
|
||||
.help();
|
||||
.parseSync();
|
||||
|
||||
// Gather settings for instantiating the server
|
||||
const loaderProperties: IComponentsManagerBuilderOptions<App> = {
|
||||
|
||||
@ -207,11 +207,9 @@ export class DataAccessorBasedStore implements ResourceStore {
|
||||
// if it contains no resources. If the container contains resources,
|
||||
// the server MUST respond with the 409 status code and response body describing the error."
|
||||
// https://solid.github.io/specification/protocol#deleting-resources
|
||||
if (isContainerIdentifier(identifier)) {
|
||||
// Auxiliary resources are not counted when deleting a container since they will also be deleted
|
||||
if (await this.hasProperChildren(identifier)) {
|
||||
throw new ConflictHttpError('Can only delete empty containers.');
|
||||
}
|
||||
// Auxiliary resources are not counted when deleting a container since they will also be deleted.
|
||||
if (isContainerIdentifier(identifier) && await this.hasProperChildren(identifier)) {
|
||||
throw new ConflictHttpError('Can only delete empty containers.');
|
||||
}
|
||||
// Solid, §5.4: "When a contained resource is deleted, the server MUST also delete the associated auxiliary
|
||||
// resources"
|
||||
@ -291,9 +289,8 @@ export class DataAccessorBasedStore implements ResourceStore {
|
||||
createContainers?: boolean): Promise<ResourceIdentifier[]> {
|
||||
// Make sure the metadata has the correct identifier and correct type quads
|
||||
// Need to do this before handling container data to have the correct identifier
|
||||
const { metadata } = representation;
|
||||
metadata.identifier = DataFactory.namedNode(identifier.path);
|
||||
addResourceMetadata(metadata, isContainer);
|
||||
representation.metadata.identifier = DataFactory.namedNode(identifier.path);
|
||||
addResourceMetadata(representation.metadata, isContainer);
|
||||
|
||||
// Validate container data
|
||||
if (isContainer) {
|
||||
|
||||
@ -142,8 +142,8 @@ export class ChainedConverter extends RepresentationConverter {
|
||||
return input.representation;
|
||||
}
|
||||
|
||||
const { path } = match;
|
||||
this.logger.debug(`Converting ${match.inType} -> ${[ ...path.intermediateTypes, match.outType ].join(' -> ')}.`);
|
||||
const { path, inType, outType } = match;
|
||||
this.logger.debug(`Converting ${inType} -> ${[ ...path.intermediateTypes, outType ].join(' -> ')}.`);
|
||||
|
||||
const args = { ...input };
|
||||
for (let i = 0; i < path.converters.length - 1; ++i) {
|
||||
@ -152,7 +152,7 @@ export class ChainedConverter extends RepresentationConverter {
|
||||
args.representation = await path.converters[i].handle(args);
|
||||
}
|
||||
// For the last converter we set the preferences to the best output type
|
||||
args.preferences = { type: { [match.outType]: 1 }};
|
||||
args.preferences = { type: { [outType]: 1 }};
|
||||
return path.converters.slice(-1)[0].handle(args);
|
||||
}
|
||||
|
||||
|
||||
@ -44,7 +44,7 @@ export class IfNeededConverter extends RepresentationConverter {
|
||||
const noMatchingMediaType = !matchesMediaPreferences(contentType, preferences.type);
|
||||
if (noMatchingMediaType) {
|
||||
this.logger.debug(`Conversion needed for ${identifier
|
||||
.path} from ${representation.metadata.contentType} to satisfy ${!preferences.type ?
|
||||
.path} from ${contentType} to satisfy ${!preferences.type ?
|
||||
'""' :
|
||||
Object.entries(preferences.type).map(([ value, weight ]): string => `${value};q=${weight}`).join(', ')}`);
|
||||
}
|
||||
|
||||
@ -142,6 +142,6 @@ export class SparqlUpdatePatchHandler extends ConvertingPatchHandler {
|
||||
|
||||
this.logger.debug(`${result.size} quads will be stored to ${identifier.path}.`);
|
||||
|
||||
return new BasicRepresentation(result.match() as Readable, metadata);
|
||||
return new BasicRepresentation(result.match() as unknown as Readable, metadata);
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,7 +39,7 @@ export class ConvertingRouterRule extends RouterRule {
|
||||
entry.supportChecker.supports({ identifier, representation }));
|
||||
} else {
|
||||
// No content-type given so we can only check if one of the stores has data for the identifier
|
||||
store = await this.findStore(async(entry): Promise<boolean> => entry.store.resourceExists(input.identifier));
|
||||
store = await this.findStore(async(entry): Promise<boolean> => entry.store.resourceExists(identifier));
|
||||
}
|
||||
return store;
|
||||
}
|
||||
|
||||
@ -144,7 +144,7 @@ export function isContainerIdentifier(identifier: ResourceIdentifier): boolean {
|
||||
* E.g., `http://test.com/` results in `{ scheme: 'http://', rest: 'test.com/' }`.
|
||||
* @param url - String to parse.
|
||||
*/
|
||||
export function extractScheme(url: string): { scheme: string; rest: string} {
|
||||
export function extractScheme(url: string): { scheme: string; rest: string } {
|
||||
const match = /^([^:]+:\/\/)(.*)$/u.exec(url)!;
|
||||
return { scheme: match[1], rest: match[2] };
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
/* eslint-disable @typescript-eslint/naming-convention, function-paren-newline */
|
||||
/* eslint-disable function-paren-newline */
|
||||
import { namedNode } from '@rdfjs/data-model';
|
||||
import type { NamedNode } from 'rdf-js';
|
||||
|
||||
|
||||
@ -37,7 +37,6 @@ export class IdentityTestState {
|
||||
* @param body - Body to send along.
|
||||
* @param contentType - Content-Type of the body.
|
||||
*/
|
||||
// eslint-disable-next-line default-param-last
|
||||
public async fetchIdp(url: string, method = 'GET', body?: string, contentType?: string): Promise<Response> {
|
||||
const options = { method, headers: { cookie: this.cookie }, body, redirect: 'manual' } as any;
|
||||
if (contentType) {
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
import { createResponse } from 'node-mocks-http';
|
||||
import { ConstantMetadataWriter } from '../../../../../src/ldp/http/metadata/ConstantMetadataWriter';
|
||||
import type { HttpResponse } from '../../../../../src/server/HttpResponse';
|
||||
|
||||
describe('A ConstantMetadataWriter', (): void => {
|
||||
const writer = new ConstantMetadataWriter({ 'custom-Header': 'X', other: 'Y' });
|
||||
|
||||
it('adds new headers.', async(): Promise<void> => {
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
|
||||
await expect(writer.handle({ response })).resolves.toBeUndefined();
|
||||
|
||||
@ -13,7 +14,7 @@ describe('A ConstantMetadataWriter', (): void => {
|
||||
});
|
||||
|
||||
it('extends existing headers.', async(): Promise<void> => {
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
response.setHeader('Other', 'A');
|
||||
|
||||
await expect(writer.handle({ response })).resolves.toBeUndefined();
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
import { createResponse } from 'node-mocks-http';
|
||||
import { LinkRelMetadataWriter } from '../../../../../src/ldp/http/metadata/LinkRelMetadataWriter';
|
||||
import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata';
|
||||
import type { HttpResponse } from '../../../../../src/server/HttpResponse';
|
||||
import { LDP, RDF } from '../../../../../src/util/Vocabularies';
|
||||
|
||||
describe('A LinkRelMetadataWriter', (): void => {
|
||||
const writer = new LinkRelMetadataWriter({ [RDF.type]: 'type', dummy: 'dummy' });
|
||||
|
||||
it('adds the correct link headers.', async(): Promise<void> => {
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
const metadata = new RepresentationMetadata({ [RDF.type]: LDP.terms.Resource, unused: 'text' });
|
||||
await expect(writer.handle({ response, metadata })).resolves.toBeUndefined();
|
||||
expect(response.getHeaders()).toEqual({ link: `<${LDP.Resource}>; rel="type"` });
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
import { createResponse } from 'node-mocks-http';
|
||||
import { MappedMetadataWriter } from '../../../../../src/ldp/http/metadata/MappedMetadataWriter';
|
||||
import { RepresentationMetadata } from '../../../../../src/ldp/representation/RepresentationMetadata';
|
||||
import type { HttpResponse } from '../../../../../src/server/HttpResponse';
|
||||
import { CONTENT_TYPE } from '../../../../../src/util/Vocabularies';
|
||||
|
||||
describe('A MappedMetadataWriter', (): void => {
|
||||
const writer = new MappedMetadataWriter({ [CONTENT_TYPE]: 'content-type', dummy: 'dummy' });
|
||||
|
||||
it('adds metadata to the corresponding header.', async(): Promise<void> => {
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
const metadata = new RepresentationMetadata({ [CONTENT_TYPE]: 'text/turtle', unused: 'text' });
|
||||
await expect(writer.handle({ response, metadata })).resolves.toBeUndefined();
|
||||
expect(response.getHeaders()).toEqual({ 'content-type': 'text/turtle' });
|
||||
|
||||
@ -9,7 +9,7 @@ describe('A WacAllowMetadataWriter', (): void => {
|
||||
let response: HttpResponse;
|
||||
|
||||
beforeEach(async(): Promise<void> => {
|
||||
response = createResponse();
|
||||
response = createResponse() as HttpResponse;
|
||||
});
|
||||
|
||||
it('adds no header if there is no relevant metadata.', async(): Promise<void> => {
|
||||
|
||||
@ -10,7 +10,7 @@ describe('A WwwAuthMetadataWriter', (): void => {
|
||||
let response: HttpResponse;
|
||||
|
||||
beforeEach(async(): Promise<void> => {
|
||||
response = createResponse();
|
||||
response = createResponse() as HttpResponse;
|
||||
});
|
||||
|
||||
it('adds no header if there is no relevant metadata.', async(): Promise<void> => {
|
||||
|
||||
@ -112,8 +112,8 @@ describe('A RepresentationMetadata', (): void => {
|
||||
metadata.setMetadata(other);
|
||||
|
||||
expect(metadata.identifier).toEqual(other.identifier);
|
||||
expect(metadata.quads()).toBeRdfIsomorphic(inputQuads.concat([
|
||||
quad(identifier, namedNode('test:pred'), literal('objVal')) ]));
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ ...inputQuads,
|
||||
quad(identifier, namedNode('test:pred'), literal('objVal')) ]);
|
||||
});
|
||||
|
||||
it('updates its identifier when copying metadata.', async(): Promise<void> => {
|
||||
@ -134,7 +134,7 @@ describe('A RepresentationMetadata', (): void => {
|
||||
quad(namedNode('random'), namedNode('new'), namedNode('triple')),
|
||||
];
|
||||
metadata.addQuads(newQuads);
|
||||
expect(metadata.quads()).toBeRdfIsomorphic(newQuads.concat(inputQuads));
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ ...newQuads, ...inputQuads ]);
|
||||
});
|
||||
|
||||
it('can remove quads.', async(): Promise<void> => {
|
||||
@ -145,13 +145,13 @@ describe('A RepresentationMetadata', (): void => {
|
||||
it('can add a single value for a predicate.', async(): Promise<void> => {
|
||||
const newQuad = quad(identifier, namedNode('new'), namedNode('triple'));
|
||||
metadata.add(newQuad.predicate as NamedNode, newQuad.object as NamedNode);
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ newQuad ].concat(inputQuads));
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ newQuad, ...inputQuads ]);
|
||||
});
|
||||
|
||||
it('can add single values as string.', async(): Promise<void> => {
|
||||
const newQuad = quad(identifier, namedNode('new'), literal('triple'));
|
||||
metadata.add(newQuad.predicate as NamedNode, newQuad.object.value);
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ newQuad ].concat(inputQuads));
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ newQuad, ...inputQuads ]);
|
||||
});
|
||||
|
||||
it('can add multiple values for a predicate.', async(): Promise<void> => {
|
||||
@ -160,7 +160,7 @@ describe('A RepresentationMetadata', (): void => {
|
||||
quad(identifier, namedNode('new'), namedNode('triple2')),
|
||||
];
|
||||
metadata.add(namedNode('new'), [ namedNode('triple'), namedNode('triple2') ]);
|
||||
expect(metadata.quads()).toBeRdfIsomorphic(newQuads.concat(inputQuads));
|
||||
expect(metadata.quads()).toBeRdfIsomorphic([ ...newQuads, ...inputQuads ]);
|
||||
});
|
||||
|
||||
it('can remove a single value for a predicate.', async(): Promise<void> => {
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { createRequest, createResponse } from 'node-mocks-http';
|
||||
import type { HttpResponse } from '../../../../src/server/HttpResponse';
|
||||
import { CorsHandler } from '../../../../src/server/middleware/CorsHandler';
|
||||
import { guardStream } from '../../../../src/util/GuardedStream';
|
||||
|
||||
@ -7,7 +8,7 @@ describe('a CorsHandler', (): void => {
|
||||
const handler = new CorsHandler();
|
||||
|
||||
const request = guardStream(createRequest());
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await handler.handleSafe({ request, response });
|
||||
|
||||
expect(response.getHeaders()).toEqual(expect.objectContaining({
|
||||
@ -23,7 +24,7 @@ describe('a CorsHandler', (): void => {
|
||||
origin: 'example.org',
|
||||
},
|
||||
}));
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await handler.handleSafe({ request, response });
|
||||
|
||||
expect(response.getHeaders()).toEqual(expect.objectContaining({
|
||||
@ -37,7 +38,7 @@ describe('a CorsHandler', (): void => {
|
||||
});
|
||||
|
||||
const request = guardStream(createRequest());
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await handler.handleSafe({ request, response });
|
||||
|
||||
expect(response.getHeaders()).toEqual(expect.objectContaining({
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
import { createRequest, createResponse } from 'node-mocks-http';
|
||||
import type { HttpResponse } from '../../../../src/server/HttpResponse';
|
||||
import { HeaderHandler } from '../../../../src/server/middleware/HeaderHandler';
|
||||
import { guardStream } from '../../../../src/util/GuardedStream';
|
||||
|
||||
@ -8,7 +9,7 @@ describe('a HeaderHandler', (): void => {
|
||||
const handler = new HeaderHandler(headers);
|
||||
|
||||
const request = guardStream(createRequest());
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await handler.handleSafe({ request, response });
|
||||
|
||||
expect(response.getHeaders()).toEqual(expect.objectContaining(headers));
|
||||
|
||||
@ -122,7 +122,7 @@ describe('A StaticAssetHandler', (): void => {
|
||||
it('throws a 404 when the asset does not exist.', async(): Promise<void> => {
|
||||
const request = { method: 'GET', url: '/foo/bar/main' };
|
||||
const response = createResponse({ eventEmitter: EventEmitter });
|
||||
const error = new Error() as SystemError;
|
||||
const error = new Error('no file') as SystemError;
|
||||
error.code = 'ENOENT';
|
||||
const stream = new PassThrough();
|
||||
stream._read = (): any => stream.emit('error', error);
|
||||
@ -135,7 +135,7 @@ describe('A StaticAssetHandler', (): void => {
|
||||
it('throws a 404 when the asset is folder.', async(): Promise<void> => {
|
||||
const request = { method: 'GET', url: '/foo/bar/main' };
|
||||
const response = createResponse({ eventEmitter: EventEmitter });
|
||||
const error = new Error() as SystemError;
|
||||
const error = new Error('is directory') as SystemError;
|
||||
error.code = 'EISDIR';
|
||||
const stream = new PassThrough();
|
||||
stream._read = (): any => stream.emit('error', error);
|
||||
@ -149,7 +149,7 @@ describe('A StaticAssetHandler', (): void => {
|
||||
const request = { method: 'GET', url: '/foo/bar/main' };
|
||||
const response = createResponse({ eventEmitter: EventEmitter });
|
||||
const responseEnd = new Promise((resolve): any => response.on('end', resolve));
|
||||
const error = new Error();
|
||||
const error = new Error('random error');
|
||||
const stream = new PassThrough();
|
||||
stream._read = (): any => stream.emit('error', error);
|
||||
createReadStream.mockReturnValueOnce(stream as any);
|
||||
|
||||
@ -1,31 +1,32 @@
|
||||
import { createResponse } from 'node-mocks-http';
|
||||
import type { HttpResponse } from '../../../../src/server/HttpResponse';
|
||||
import { WebSocketAdvertiser } from '../../../../src/server/middleware/WebSocketAdvertiser';
|
||||
|
||||
describe('A WebSocketAdvertiser', (): void => {
|
||||
it('writes a ws: socket when given an http: URL.', async(): Promise<void> => {
|
||||
const writer = new WebSocketAdvertiser('http://test.example/');
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await writer.handle({ response } as any);
|
||||
expect(response.getHeaders()).toEqual({ 'updates-via': 'ws://test.example/' });
|
||||
});
|
||||
|
||||
it('writes a ws: socket when given a ws: URL.', async(): Promise<void> => {
|
||||
const writer = new WebSocketAdvertiser('ws://test.example/');
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await writer.handle({ response } as any);
|
||||
expect(response.getHeaders()).toEqual({ 'updates-via': 'ws://test.example/' });
|
||||
});
|
||||
|
||||
it('writes a wss: socket when given an https: URL.', async(): Promise<void> => {
|
||||
const writer = new WebSocketAdvertiser('https://test.example/');
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await writer.handle({ response } as any);
|
||||
expect(response.getHeaders()).toEqual({ 'updates-via': 'wss://test.example/' });
|
||||
});
|
||||
|
||||
it('writes a wss: socket when given a wss: URL.', async(): Promise<void> => {
|
||||
const writer = new WebSocketAdvertiser('wss://test.example/');
|
||||
const response = createResponse();
|
||||
const response = createResponse() as HttpResponse;
|
||||
await writer.handle({ response } as any);
|
||||
expect(response.getHeaders()).toEqual({ 'updates-via': 'wss://test.example/' });
|
||||
});
|
||||
|
||||
@ -9,7 +9,7 @@ describe('RenderEjsHandler', (): void => {
|
||||
let templateFile: string;
|
||||
|
||||
beforeEach((): void => {
|
||||
response = createResponse();
|
||||
response = createResponse() as HttpResponse;
|
||||
templatePath = joinFilePath(__dirname, '../../../assets/idp');
|
||||
templateFile = 'testHtml.ejs';
|
||||
});
|
||||
|
||||
@ -15,7 +15,7 @@ describe('RouterHandler', (): void => {
|
||||
genericRequest = guardStream(createRequest({
|
||||
url: '/test',
|
||||
}));
|
||||
genericResponse = createResponse();
|
||||
genericResponse = createResponse() as HttpResponse;
|
||||
genericInput = {
|
||||
request: genericRequest,
|
||||
response: genericResponse,
|
||||
|
||||
@ -265,7 +265,7 @@ describe('A SparqlDataAccessor', (): void => {
|
||||
fetchError = 'error';
|
||||
await expect(accessor.getMetadata({ path: 'http://identifier' })).rejects.toBe(fetchError);
|
||||
|
||||
fetchError = new Error();
|
||||
fetchError = new Error('read error');
|
||||
await expect(accessor.getMetadata({ path: 'http://identifier' })).rejects.toThrow(fetchError);
|
||||
|
||||
fetchError = undefined;
|
||||
@ -278,7 +278,7 @@ describe('A SparqlDataAccessor', (): void => {
|
||||
updateError = 'error';
|
||||
await expect(accessor.writeContainer(identifier, metadata)).rejects.toBe(updateError);
|
||||
|
||||
updateError = new Error();
|
||||
updateError = new Error('write error');
|
||||
await expect(accessor.writeContainer(identifier, metadata)).rejects.toThrow(updateError);
|
||||
|
||||
updateError = undefined;
|
||||
|
||||
@ -19,7 +19,7 @@ describe('An ErrorToQuadConverter', (): void => {
|
||||
});
|
||||
|
||||
it('does not support multiple errors.', async(): Promise<void> => {
|
||||
const representation = new BasicRepresentation([ new Error(), new Error() ], 'internal/error', false);
|
||||
const representation = new BasicRepresentation([ new Error('a'), new Error('b') ], 'internal/error', false);
|
||||
const prom = converter.handle({ identifier, representation, preferences });
|
||||
await expect(prom).rejects.toThrow('Only single errors are supported.');
|
||||
await expect(prom).rejects.toThrow(InternalServerError);
|
||||
|
||||
@ -32,7 +32,7 @@ describe('An ErrorToTemplateConverter', (): void => {
|
||||
});
|
||||
|
||||
it('does not support multiple errors.', async(): Promise<void> => {
|
||||
const representation = new BasicRepresentation([ new Error(), new Error() ], 'internal/error', false);
|
||||
const representation = new BasicRepresentation([ new Error('a'), new Error('b') ], 'internal/error', false);
|
||||
const prom = converter.handle({ identifier, representation, preferences });
|
||||
await expect(prom).rejects.toThrow('Only single errors are supported.');
|
||||
await expect(prom).rejects.toThrow(InternalServerError);
|
||||
|
||||
@ -105,10 +105,10 @@ describe('A SparqlUpdatePatchHandler', (): void => {
|
||||
|
||||
it('handles INSERT DATA updates.', async(): Promise<void> => {
|
||||
await handle(fulfilledDataInsert);
|
||||
expect(await basicChecks(startQuads.concat(
|
||||
[ quad(namedNode('http://test.com/s1'), namedNode('http://test.com/p1'), namedNode('http://test.com/o1')),
|
||||
quad(namedNode('http://test.com/s2'), namedNode('http://test.com/p2'), namedNode('http://test.com/o2')) ],
|
||||
))).toBe(true);
|
||||
expect(await basicChecks([ ...startQuads,
|
||||
quad(namedNode('http://test.com/s1'), namedNode('http://test.com/p1'), namedNode('http://test.com/o1')),
|
||||
quad(namedNode('http://test.com/s2'), namedNode('http://test.com/p2'), namedNode('http://test.com/o2')),
|
||||
])).toBe(true);
|
||||
});
|
||||
|
||||
it('handles DELETE DATA updates.', async(): Promise<void> => {
|
||||
|
||||
@ -4,7 +4,6 @@ import { PassThrough } from 'stream';
|
||||
import streamifyArray from 'streamify-array';
|
||||
import type { SystemError } from '../../src/util/errors/SystemError';
|
||||
|
||||
/* eslint-disable @typescript-eslint/naming-convention */
|
||||
const portNames = [
|
||||
// Integration
|
||||
'DynamicPods',
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user