@opra/core 0.23.2 → 0.24.1

package/cjs/adapter/{operation-context.js → endpoint-context.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OperationContext = void 0;
-var OperationContext;
-(function (OperationContext) {
+exports.EndpointContext = void 0;
+var EndpointContext;
+(function (EndpointContext) {
     function from(executionContext, request, response) {
         const out = {
             request,
@@ -12,5 +12,5 @@ var OperationContext;
         Object.setPrototypeOf(out, executionContext);
         return out;
     }
-    OperationContext.from = from;
-})(OperationContext || (exports.OperationContext = OperationContext = {}));
+    EndpointContext.from = from;
+})(EndpointContext || (exports.EndpointContext = EndpointContext = {}));

package/cjs/adapter/http/http-adapter-base.js

@@ -53,9 +53,7 @@ class HttpAdapterBase extends platform_adapter_host_js_1.PlatformAdapterHost {
     async processRequest(context) {
         try {
             const { incoming, outgoing } = context.switchToHttp();
-            if (incoming.method === 'GET' &&
-                incoming.parsedUrl.path.length &&
-                incoming.parsedUrl.path[0].resource === '$metadata') {
+            if (incoming.method === 'GET' && !incoming.parsedUrl.path.length) {
                 outgoing.setHeader('content-type', 'application/json');
                 outgoing.end(JSON.stringify(this.api.exportSchema({ webSafe: true })));
                 return;
@@ -115,7 +113,7 @@ class HttpAdapterBase extends platform_adapter_host_js_1.PlatformAdapterHost {
         const body = {
             errors: wrappedErrors.map(x => this._i18n.deep(x.toJSON()))
         };
-        outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
+        outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
         outgoing.setHeader(common_1.HttpHeaderCodes.Cache_Control, 'no-cache');
         outgoing.setHeader(common_1.HttpHeaderCodes.Pragma, 'no-cache');
         outgoing.setHeader(common_1.HttpHeaderCodes.Expires, '-1');

package/cjs/adapter/http/request-handlers/entity-request-handler.js

@@ -6,7 +6,7 @@ const body_parser_1 = tslib_1.__importDefault(require("body-parser"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 const valgen = tslib_1.__importStar(require("valgen"));
 const common_1 = require("@opra/common");
-const operation_context_js_1 = require("../../operation-context.js");
+const endpoint_context_js_1 = require("../../endpoint-context.js");
 const request_host_js_1 = require("../../request.host.js");
 const response_host_js_1 = require("../../response.host.js");
 const query_parsers_js_1 = require("../helpers/query-parsers.js");
@@ -27,9 +27,8 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
         if (!request)
             return;
         const response = new response_host_js_1.ResponseHost({ http: outgoing });
-        const context = operation_context_js_1.OperationContext.from(executionContext, request, response);
-        // Execute operation
-        await this.executeOperation(context);
+        const context = endpoint_context_js_1.EndpointContext.from(executionContext, request, response);
+        await this.callEndpoint(context);
         if (response.errors.length) {
             context.errors.push(...response.errors);
             return;
@@ -52,7 +51,15 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
     }
     async parseRequest(incoming) {
         const p = incoming.parsedUrl.path[0];
-        const resource = this.adapter.api.getResource(p.resource);
+        const resource = this.adapter.api.getResource(p.resource, true);
+        if (!resource)
+            throw new common_1.BadRequestError({
+                message: (0, common_1.translate)('error:SOURCE_NOT_FOUND,', 'Resource not found'),
+                code: 'SOURCE_NOT_FOUND',
+                details: {
+                    path: incoming.parsedUrl.address
+                }
+            });
         try {
             if (resource instanceof common_1.Collection)
                 return await this.parseCollectionRequest(resource, incoming);
@@ -72,18 +79,18 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
             throw new common_1.BadRequestError(e);
         }
     }
-    async executeOperation(context) {
+    async callEndpoint(context) {
         const request = context.request;
         const { response } = context;
         const resource = request.resource;
-        // Call operation handler method
+        // Call endpoint handler method
         let value;
         try {
-            value = await request.controller[request.operation].call(request.controller, context);
+            value = await request.controller[request.endpoint].call(request.controller, context);
             if (value == null)
                 value = response.value;
-            const { operation } = request;
-            if (operation === 'delete' || operation === 'deleteMany' || operation === 'updateMany') {
+            const { endpoint } = request;
+            if (endpoint === 'delete' || endpoint === 'deleteMany' || endpoint === 'updateMany') {
                 let affected = 0;
                 if (typeof value === 'number')
                     affected = value;
@@ -91,15 +98,15 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                     affected = value ? 1 : 0;
                 if (typeof value === 'object')
                     affected = value.affected || value.affectedRows ||
-                        (operation === 'updateMany' ? value.updated : value.deleted);
+                        (endpoint === 'updateMany' ? value.updated : value.deleted);
                 response.value = affected;
             }
             else {
-                // "get" and "update" operations must return the entity instance, otherwise it means resource not found
-                if (value == null && (request.operation === 'get' || request.operation === 'update'))
+                // "get" and "update" endpoints must return the entity instance, otherwise it means resource not found
+                if (value == null && (request.endpoint === 'get' || request.endpoint === 'update'))
                     throw new common_1.ResourceNotFoundError(resource.name, request.key);
-                // "findMany" operation should return array of entity instances
-                if (request.operation === 'findMany')
+                // "findMany" endpoint should return array of entity instances
+                if (request.endpoint === 'findMany')
                     value = value == null ? [] : Array.isArray(value) ? value : [value];
                 else
                     value = value == null ? {} : Array.isArray(value) ? value[0] : value;
@@ -115,33 +122,40 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
         const resource = request.resource;
         const outgoing = response.switchToHttp();
         let responseObject;
-        if (request.operation === 'delete' || request.operation === 'deleteMany' || request.operation === 'updateMany') {
+        if (request.endpoint === 'delete' || request.endpoint === 'deleteMany') {
+            responseObject = {
+                resource: resource.name,
+                operation: 'delete',
+                affected: response.value
+            };
+        }
+        else if (request.endpoint === 'updateMany') {
             responseObject = {
                 resource: resource.name,
-                operation: request.operation,
+                operation: 'update',
                 affected: response.value
             };
         }
         else {
             if (!response.value)
-                throw new common_1.InternalServerError(`"${request.operation}" operation should return value`);
-            const encode = resource.getEncoder(request.operation);
+                throw new common_1.InternalServerError(`"${request.endpoint}" endpoint should return value`);
+            const encode = resource.getEncoder(request.endpoint);
             const data = encode(response.value, { coerce: true });
-            if (request.operation === 'create')
+            if (request.endpoint === 'create')
                 outgoing.statusCode = 201;
             responseObject = {
                 resource: resource.name,
-                operation: request.operation,
+                endpoint: request.endpoint,
                 data
             };
-            if (request.operation === 'create' || request.operation === 'update')
+            if (request.endpoint === 'create' || request.endpoint === 'update')
                 responseObject.affected = 1;
-            if (request.operation === 'findMany' && response.count != null && response.count >= 0)
+            if (request.endpoint === 'findMany' && response.count != null && response.count >= 0)
                 responseObject.totalCount = response.count;
         }
         outgoing.statusCode = outgoing.statusCode || common_1.HttpStatusCodes.OK;
         const body = this.adapter._i18n.deep(responseObject);
-        outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
+        outgoing.setHeader(common_1.HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
         outgoing.send(JSON.stringify(body));
         outgoing.end();
     }
@@ -155,8 +169,8 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
         switch (incoming.method) {
             case 'POST': {
                 if (p.key == null) {
-                    const operationMeta = await this.assertOperation(resource, 'create');
-                    const jsonReader = this.getBodyLoader(operationMeta);
+                    const endpointMeta = await this.assertEndpoint(resource, 'create');
+                    const jsonReader = this.getBodyLoader(endpointMeta);
                     const decode = resource.getDecoder('create');
                     let data = await jsonReader(incoming);
                     data = decode(data, { coerce: true });
@@ -164,11 +178,11 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                     const omit = (0, query_parsers_js_1.parseArrayParam)(params.get('$omit'));
                     const include = (0, query_parsers_js_1.parseArrayParam)(params.get('$include'));
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         contentId,
                         resource,
-                        operation: 'create',
+                        endpoint: 'create',
                         data,
                         params: {
                             pick: pick && resource.normalizeFieldPath(pick),
@@ -181,24 +195,24 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
             }
             case 'DELETE': {
                 if (p.key != null) {
-                    const operationMeta = await this.assertOperation(resource, 'delete');
+                    const endpointMeta = await this.assertEndpoint(resource, 'delete');
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         contentId,
                         resource,
-                        operation: 'delete',
+                        endpoint: 'delete',
                         key: resource.parseKeyValue(p.key)
                     });
                 }
-                const operationMeta = await this.assertOperation(resource, 'deleteMany');
+                const endpointMeta = await this.assertEndpoint(resource, 'deleteMany');
                 const filter = resource.normalizeFilter(params.get('$filter'));
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'deleteMany',
+                    endpoint: 'deleteMany',
                     params: {
                         filter
                     }
@@ -209,13 +223,13 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                 const omit = (0, query_parsers_js_1.parseArrayParam)(params.get('$omit'));
                 const include = (0, query_parsers_js_1.parseArrayParam)(params.get('$include'));
                 if (p.key != null) {
-                    const operationMeta = await this.assertOperation(resource, 'get');
+                    const endpointMeta = await this.assertEndpoint(resource, 'get');
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         contentId,
                         resource,
-                        operation: 'get',
+                        endpoint: 'get',
                         key: resource.parseKeyValue(p.key),
                         params: {
                             pick: pick && resource.normalizeFieldPath(pick),
@@ -224,15 +238,15 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                         }
                     });
                 }
-                const operationMeta = await this.assertOperation(resource, 'findMany');
+                const endpointMeta = await this.assertEndpoint(resource, 'findMany');
                 const filter = resource.normalizeFilter(params.get('$filter'));
                 const sort = (0, query_parsers_js_1.parseArrayParam)(params.get('$sort'));
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'findMany',
+                    endpoint: 'findMany',
                     params: {
                         pick: pick && resource.normalizeFieldPath(pick),
                         omit: omit && resource.normalizeFieldPath(omit),
@@ -248,8 +262,8 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
             }
             case 'PATCH': {
                 if (p.key != null) {
-                    const operationMeta = await this.assertOperation(resource, 'update');
-                    const jsonReader = this.getBodyLoader(operationMeta);
+                    const endpointMeta = await this.assertEndpoint(resource, 'update');
+                    const jsonReader = this.getBodyLoader(endpointMeta);
                     const decode = resource.getDecoder('update');
                     let data = await jsonReader(incoming);
                     data = decode(data, { coerce: true });
@@ -257,11 +271,11 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                     const omit = (0, query_parsers_js_1.parseArrayParam)(params.get('$omit'));
                     const include = (0, query_parsers_js_1.parseArrayParam)(params.get('$include'));
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         contentId,
                         resource,
-                        operation: 'update',
+                        endpoint: 'update',
                         key: resource.parseKeyValue(p.key),
                         data,
                         params: {
@@ -271,18 +285,18 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                         }
                     });
                 }
-                const operationMeta = await this.assertOperation(resource, 'updateMany');
-                const jsonReader = this.getBodyLoader(operationMeta);
+                const endpointMeta = await this.assertEndpoint(resource, 'updateMany');
+                const jsonReader = this.getBodyLoader(endpointMeta);
                 const decode = resource.getDecoder('updateMany');
                 let data = await jsonReader(incoming);
                 data = decode(data, { coerce: true });
                 const filter = resource.normalizeFilter(params.get('$filter'));
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'updateMany',
+                    endpoint: 'updateMany',
                     data,
                     params: {
                         filter,
@@ -291,7 +305,7 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
             }
         }
         throw new common_1.MethodNotAllowedError({
-            message: `Collection resources do not accept http "${incoming.method}" method`
+            message: `Collection resource do not accept http "${incoming.method}" method`
         });
     }
     async parseSingletonRequest(resource, incoming) {
@@ -302,8 +316,8 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
         const params = incoming.parsedUrl.searchParams;
         switch (incoming.method) {
             case 'POST': {
-                const operationMeta = await this.assertOperation(resource, 'create');
-                const jsonReader = this.getBodyLoader(operationMeta);
+                const endpointMeta = await this.assertEndpoint(resource, 'create');
+                const jsonReader = this.getBodyLoader(endpointMeta);
                 const decode = resource.getDecoder('create');
                 let data = await jsonReader(incoming);
                 data = decode(data, { coerce: true });
@@ -311,11 +325,11 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                 const omit = (0, query_parsers_js_1.parseArrayParam)(params.get('$omit'));
                 const include = (0, query_parsers_js_1.parseArrayParam)(params.get('$include'));
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'create',
+                    endpoint: 'create',
                     data,
                     params: {
                         pick: pick && resource.normalizeFieldPath(pick),
@@ -325,26 +339,26 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                 });
             }
             case 'DELETE': {
-                const operationMeta = await this.assertOperation(resource, 'delete');
+                const endpointMeta = await this.assertEndpoint(resource, 'delete');
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'delete',
+                    endpoint: 'delete',
                 });
             }
             case 'GET': {
-                const operationMeta = await this.assertOperation(resource, 'get');
+                const endpointMeta = await this.assertEndpoint(resource, 'get');
                 const pick = (0, query_parsers_js_1.parseArrayParam)(params.get('$pick'));
                 const omit = (0, query_parsers_js_1.parseArrayParam)(params.get('$omit'));
                 const include = (0, query_parsers_js_1.parseArrayParam)(params.get('$include'));
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'get',
+                    endpoint: 'get',
                     params: {
                         pick: pick && resource.normalizeFieldPath(pick),
                         omit: omit && resource.normalizeFieldPath(omit),
@@ -353,8 +367,8 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                 });
             }
             case 'PATCH': {
-                const operationMeta = await this.assertOperation(resource, 'update');
-                const jsonReader = this.getBodyLoader(operationMeta);
+                const endpointMeta = await this.assertEndpoint(resource, 'update');
+                const jsonReader = this.getBodyLoader(endpointMeta);
                 const decode = resource.getDecoder('update');
                 let data = await jsonReader(incoming);
                 data = decode(data, { coerce: true });
@@ -362,11 +376,11 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                 const omit = (0, query_parsers_js_1.parseArrayParam)(params.get('$omit'));
                 const include = (0, query_parsers_js_1.parseArrayParam)(params.get('$include'));
                 return new request_host_js_1.RequestHost({
-                    controller: operationMeta.controller,
+                    controller: endpointMeta.controller,
                     http: incoming,
                     contentId,
                     resource,
-                    operation: 'update',
+                    endpoint: 'update',
                     data,
                     params: {
                         pick: pick && resource.normalizeFieldPath(pick),
@@ -377,14 +391,14 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
             }
         }
         throw new common_1.MethodNotAllowedError({
-            message: `Singleton resources do not accept http "${incoming.method}" method`
+            message: `Singleton resource do not accept http "${incoming.method}" method`
         });
     }
-    getBodyLoader(operation) {
-        let bodyLoader = this.bodyLoaders.get(operation);
+    getBodyLoader(endpoint) {
+        let bodyLoader = this.bodyLoaders.get(endpoint);
         if (!bodyLoader) {
             const parser = body_parser_1.default.json({
-                limit: operation.input?.maxContentSize,
+                limit: endpoint.input?.maxContentSize,
                 type: 'json'
             });
             bodyLoader = (incoming) => {
@@ -397,7 +411,7 @@ class EntityRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                     parser(incoming, {}, next);
                 });
             };
-            this.bodyLoaders.set(operation, bodyLoader);
+            this.bodyLoaders.set(endpoint, bodyLoader);
         }
         return bodyLoader;
     }

package/cjs/adapter/http/request-handlers/request-handler-base.js

@@ -9,16 +9,16 @@ class RequestHandlerBase {
     constructor(adapter) {
         this.adapter = adapter;
     }
-    async assertOperation(resource, operation) {
+    async assertEndpoint(resource, endpoint) {
         const controller = await this.adapter.getController(resource);
-        const operationMeta = (typeof controller?.[operation] === 'function') && resource.operations[operation];
-        if (operationMeta)
+        const endpointMeta = (typeof controller?.[endpoint] === 'function') && resource.operations[endpoint];
+        if (endpointMeta)
             return {
-                ...operationMeta,
+                ...endpointMeta,
                 controller
             };
         throw new common_1.ForbiddenError({
-            message: (0, common_1.translate)('RESOLVER_FORBIDDEN', { resource: resource.name, operation }, `'{{resource}}' endpoint does not accept '{{operation}}' operations`),
+            message: (0, common_1.translate)('RESOLVER_FORBIDDEN', { resource: resource.name, endpoint }, `'{{resource}}' endpoint does not accept '{{endpoint}}' operations`),
             severity: 'error',
             code: 'RESOLVER_FORBIDDEN'
         });

package/cjs/adapter/http/request-handlers/storage-request-handler.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 const promises_1 = tslib_1.__importDefault(require("fs/promises"));
 const os_1 = tslib_1.__importDefault(require("os"));
 const common_1 = require("@opra/common");
-const operation_context_js_1 = require("../../operation-context.js");
+const endpoint_context_js_1 = require("../../endpoint-context.js");
 const request_host_js_1 = require("../../request.host.js");
 const response_host_js_1 = require("../../response.host.js");
 const multipart_helper_js_1 = require("../helpers/multipart-helper.js");
@@ -26,9 +26,8 @@ class StorageRequestHandler extends request_handler_base_js_1.RequestHandlerBase
         if (!request)
             return;
         const response = new response_host_js_1.ResponseHost({ http: outgoing });
-        const context = operation_context_js_1.OperationContext.from(executionContext, request, response);
-        // Execute operation
-        await this.executeOperation(context);
+        const context = endpoint_context_js_1.EndpointContext.from(executionContext, request, response);
+        await this.callEndpoint(context);
         if (response.errors.length) {
             context.errors.push(...response.errors);
             return;
@@ -44,30 +43,30 @@ class StorageRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                 return;
             switch (incoming.method) {
                 case 'GET': {
-                    const operationMeta = await this.assertOperation(resource, 'get');
+                    const endpointMeta = await this.assertEndpoint(resource, 'get');
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         resource,
-                        operation: 'get',
+                        endpoint: 'get',
                         contentId
                     });
                 }
                 case 'DELETE': {
-                    const operationMeta = await this.assertOperation(resource, 'delete');
+                    const endpointMeta = await this.assertEndpoint(resource, 'delete');
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         resource,
-                        operation: 'delete',
+                        endpoint: 'delete',
                         contentId
                     });
                 }
                 case 'POST': {
-                    const operationMeta = await this.assertOperation(resource, 'post');
+                    const endpointMeta = await this.assertEndpoint(resource, 'post');
                     await promises_1.default.mkdir(this._uploadDir, { recursive: true });
                     const multipartIterator = new multipart_helper_js_1.MultipartIterator(incoming, {
-                        ...operationMeta,
+                        ...endpointMeta,
                         filename: () => this.adapter.serviceName + '_p' + process.pid +
                             't' + String(Date.now()).substring(8) + 'r' + (0, common_1.uid)(12)
                     });
@@ -78,10 +77,10 @@ class StorageRequestHandler extends request_handler_base_js_1.RequestHandlerBase
                         await multipartIterator.deleteFiles().catch(() => void 0);
                     });
                     return new request_host_js_1.RequestHost({
-                        controller: operationMeta.controller,
+                        controller: endpointMeta.controller,
                         http: incoming,
                         resource,
-                        operation: 'post',
+                        endpoint: 'post',
                         contentId,
                         parts: multipartIterator
                     });
@@ -94,13 +93,13 @@ class StorageRequestHandler extends request_handler_base_js_1.RequestHandlerBase
             throw new common_1.BadRequestError(e);
         }
     }
-    async executeOperation(context) {
+    async callEndpoint(context) {
         const request = context.request;
         const { response } = context;
-        // Call operation handler method
+        // Call endpoint handler method
         let value;
         try {
-            value = await request.controller[request.operation].call(request.controller, context);
+            value = await request.controller[request.endpoint].call(request.controller, context);
             if (response.value == null)
                 response.value = value;
         }

package/cjs/adapter/platform-adapter.host.js

@@ -67,7 +67,7 @@ class PlatformAdapterHost extends strict_typed_events_1.AsyncEventEmitter {
         this._i18n = this._i18n || common_1.I18n.defaultInstance;
         if (!this._i18n.isInitialized)
             await this._i18n.init();
-        // Initialize all controllers
+        // Initialize all resources
         for (const resource of this.api.resources.values()) {
             await this.getController(resource);
         }

package/cjs/augmentation/resource.augmentation.js

@@ -12,15 +12,15 @@ common_1.Resource.prototype._construct = function (init) {
 };
 common_1.Collection.OnInit = common_1.Singleton.OnInit = function () {
     return (target, propertyKey) => {
-        const resourceMetadata = (Reflect.getOwnMetadata(common_1.METADATA_KEY, target.constructor) || {});
-        resourceMetadata.onInit = target[propertyKey];
-        Reflect.defineMetadata(common_1.METADATA_KEY, target.constructor, resourceMetadata);
+        const sourceMetadata = (Reflect.getOwnMetadata(common_1.RESOURCE_METADATA, target.constructor) || {});
+        sourceMetadata.onInit = target[propertyKey];
+        Reflect.defineMetadata(common_1.RESOURCE_METADATA, target.constructor, sourceMetadata);
     };
 };
 common_1.Collection.OnShutdown = common_1.Singleton.OnShutdown = function () {
     return (target, propertyKey) => {
-        const resourceMetadata = (Reflect.getOwnMetadata(common_1.METADATA_KEY, target.constructor) || {});
-        resourceMetadata.onShutdown = target[propertyKey];
-        Reflect.defineMetadata(common_1.METADATA_KEY, target.constructor, resourceMetadata);
+        const sourceMetadata = (Reflect.getOwnMetadata(common_1.RESOURCE_METADATA, target.constructor) || {});
+        sourceMetadata.onShutdown = target[propertyKey];
+        Reflect.defineMetadata(common_1.RESOURCE_METADATA, target.constructor, sourceMetadata);
     };
 };

package/cjs/index.js

@@ -8,7 +8,7 @@ require("./augmentation/singleton.augmentation.js");
 require("./augmentation/storage.augmentation.js");
 tslib_1.__exportStar(require("./types.js"), exports);
 tslib_1.__exportStar(require("./adapter/execution-context.js"), exports);
-tslib_1.__exportStar(require("./adapter/operation-context.js"), exports);
+tslib_1.__exportStar(require("./adapter/endpoint-context.js"), exports);
 tslib_1.__exportStar(require("./adapter/platform-adapter.js"), exports);
 tslib_1.__exportStar(require("./adapter/request.js"), exports);
 tslib_1.__exportStar(require("./adapter/response.js"), exports);

package/esm/adapter/{operation-context.js → endpoint-context.js}

@@ -1,5 +1,5 @@
-export var OperationContext;
-(function (OperationContext) {
+export var EndpointContext;
+(function (EndpointContext) {
     function from(executionContext, request, response) {
         const out = {
             request,
@@ -9,5 +9,5 @@ export var OperationContext;
         Object.setPrototypeOf(out, executionContext);
         return out;
     }
-    OperationContext.from = from;
-})(OperationContext || (OperationContext = {}));
+    EndpointContext.from = from;
+})(EndpointContext || (EndpointContext = {}));

package/esm/adapter/http/http-adapter-base.js

@@ -50,9 +50,7 @@ export class HttpAdapterBase extends PlatformAdapterHost {
     async processRequest(context) {
         try {
             const { incoming, outgoing } = context.switchToHttp();
-            if (incoming.method === 'GET' &&
-                incoming.parsedUrl.path.length &&
-                incoming.parsedUrl.path[0].resource === '$metadata') {
+            if (incoming.method === 'GET' && !incoming.parsedUrl.path.length) {
                 outgoing.setHeader('content-type', 'application/json');
                 outgoing.end(JSON.stringify(this.api.exportSchema({ webSafe: true })));
                 return;
@@ -112,7 +110,7 @@ export class HttpAdapterBase extends PlatformAdapterHost {
         const body = {
             errors: wrappedErrors.map(x => this._i18n.deep(x.toJSON()))
         };
-        outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/json; charset=utf-8');
+        outgoing.setHeader(HttpHeaderCodes.Content_Type, 'application/opra+json; charset=utf-8');
         outgoing.setHeader(HttpHeaderCodes.Cache_Control, 'no-cache');
         outgoing.setHeader(HttpHeaderCodes.Pragma, 'no-cache');
         outgoing.setHeader(HttpHeaderCodes.Expires, '-1');