@feathersjs/koa 5.0.0-pre.9 → 5.0.1

package/lib/rest.js

@@ -1,60 +1,75 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rest = void 0;
+exports.rest = exports.formatter = void 0;
+const koa_compose_1 = __importDefault(require("koa-compose"));
 const transport_commons_1 = require("@feathersjs/transport-commons");
 const commons_1 = require("@feathersjs/commons");
 const feathers_1 = require("@feathersjs/feathers");
 const errors_1 = require("@feathersjs/errors");
-const debug = commons_1.createDebug('@feathersjs/koa:rest');
-function rest() {
-    return (ctx, next) => __awaiter(this, void 0, void 0, function* () {
-        const { app, request } = ctx;
-        const { query: koaQuery, path, body: data, method: httpMethod } = request;
-        const query = Object.assign({}, koaQuery);
-        const methodOverride = request.headers[transport_commons_1.http.METHOD_HEADER] ?
-            request.headers[transport_commons_1.http.METHOD_HEADER] : null;
-        const lookup = app.lookup(path);
-        if (lookup !== null) {
-            const { service } = lookup, _a = lookup.params, _b = _a === void 0 ? {} : _a, { __id: id = null } = _b, route = __rest(_b, ["__id"]);
-            const method = transport_commons_1.http.getServiceMethod(httpMethod, id, methodOverride);
-            const { methods } = feathers_1.getServiceOptions(service);
-            debug(`Found service for path ${path}, attempting to run '${method}' service method`);
-            if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
-                ctx.response.status = transport_commons_1.http.statusCodes.methodNotAllowed;
-                throw new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
-            }
-            const createArguments = transport_commons_1.http.argumentsFor[method] || transport_commons_1.http.argumentsFor.default;
-            const params = Object.assign(Object.assign({}, ctx.feathers), { query,
-                route });
-            const args = createArguments({ id, data, params });
-            const hookContext = feathers_1.createContext(service, method);
-            ctx.hook = hookContext;
-            const result = yield service[method](...args, hookContext);
-            ctx.response.status = transport_commons_1.http.getStatusCode(result, {});
-            ctx.body = transport_commons_1.http.getData(result);
+const authentication_1 = require("./authentication");
+const debug = (0, commons_1.createDebug)('@feathersjs/koa/rest');
+const serviceMiddleware = () => {
+    return async (ctx, next) => {
+        const { query, headers, path, body: data, method: httpMethod } = ctx.request;
+        const methodOverride = ctx.request.headers[transport_commons_1.http.METHOD_HEADER];
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const { service, params: { __id: id = null, ...route } = {} } = ctx.lookup;
+        const method = transport_commons_1.http.getServiceMethod(httpMethod, id, methodOverride);
+        const { methods } = (0, feathers_1.getServiceOptions)(service);
+        debug(`Found service for path ${path}, attempting to run '${method}' service method`);
+        if (!methods.includes(method) || feathers_1.defaultServiceMethods.includes(methodOverride)) {
+            const error = new errors_1.MethodNotAllowed(`Method \`${method}\` is not supported by this endpoint.`);
+            ctx.response.status = error.code;
+            throw error;
         }
+        const createArguments = transport_commons_1.http.argumentsFor[method] || transport_commons_1.http.argumentsFor.default;
+        const params = { query, headers, route, ...ctx.feathers };
+        const args = createArguments({ id, data, params });
+        const contextBase = (0, feathers_1.createContext)(service, method, { http: {} });
+        ctx.hook = contextBase;
+        const context = await service[method](...args, contextBase);
+        ctx.hook = context;
+        const response = transport_commons_1.http.getResponse(context);
+        ctx.status = response.status;
+        ctx.set(response.headers);
+        ctx.body = response.body;
         return next();
-    });
-}
+    };
+};
+const servicesMiddleware = () => {
+    return async (ctx, next) => {
+        const app = ctx.app;
+        const lookup = app.lookup(ctx.request.path);
+        if (!lookup) {
+            return next();
+        }
+        ctx.lookup = lookup;
+        const options = (0, feathers_1.getServiceOptions)(lookup.service);
+        const middleware = options.koa.composed;
+        return middleware(ctx, next);
+    };
+};
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const formatter = (_ctx, _next) => { };
+exports.formatter = formatter;
+const rest = (options) => {
+    options = typeof options === 'function' ? { formatter: options } : options || {};
+    const formatterMiddleware = options.formatter || exports.formatter;
+    const authenticationOptions = options.authentication;
+    return (app) => {
+        app.use((0, authentication_1.parseAuthentication)(authenticationOptions));
+        app.use(servicesMiddleware());
+        app.mixins.push((_service, _path, options) => {
+            const { koa: { before = [], after = [] } = {} } = options;
+            const middlewares = [].concat(before, serviceMiddleware(), after, formatterMiddleware);
+            const middleware = (0, koa_compose_1.default)(middlewares);
+            options.koa || (options.koa = {});
+            options.koa.composed = middleware;
+        });
+    };
+};
 exports.rest = rest;
 //# sourceMappingURL=rest.js.map

package/lib/rest.js.map

@@ -1 +1 @@
-{"version":3,"file":"rest.js","sourceRoot":"","sources":["../src/rest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AACA,qEAAqD;AACrD,iDAAkD;AAClD,mDAA+F;AAC/F,+CAAsD;AAGtD,MAAM,KAAK,GAAG,qBAAW,CAAC,sBAAsB,CAAC,CAAC;AAElD,SAAgB,IAAI;IAClB,OAAO,CAAO,GAAuB,EAAE,IAAU,EAAE,EAAE;QACnD,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;QAC7B,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAC1E,MAAM,KAAK,qBAAQ,QAAQ,CAAE,CAAC;QAC9B,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,wBAAI,CAAC,aAAa,CAAC,CAAC,CAAC;YAC1D,OAAO,CAAC,OAAO,CAAC,wBAAI,CAAC,aAAa,CAAW,CAAC,CAAC,CAAC,IAAI,CAAC;QACvD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,OAAO,KAAiD,MAAM,EAArD,KAA+C,MAAM,OAAX,EAA1C,qBAAwC,EAAE,KAAA,EAA1C,EAAU,IAAI,EAAE,EAAE,GAAG,IAAI,OAAiB,EAAZ,KAAK,cAA3B,QAA6B,CAAgB,CAAC;YACvE,MAAM,MAAM,GAAG,wBAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,EAAE,EAAE,cAAc,CAAC,CAAC;YACrE,MAAM,EAAE,OAAO,EAAE,GAAG,4BAAiB,CAAC,OAAO,CAAC,CAAC;YAE/C,KAAK,CAAC,0BAA0B,IAAI,wBAAwB,MAAM,kBAAkB,CAAC,CAAC;YAEtF,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,gCAAqB,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;gBAC/E,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,wBAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC;gBAExD,MAAM,IAAI,yBAAgB,CAAC,YAAY,MAAM,uCAAuC,CAAC,CAAC;aACvF;YAED,MAAM,eAAe,GAAI,wBAAI,CAAC,YAAoB,CAAC,MAAM,CAAC,IAAI,wBAAI,CAAC,YAAY,CAAC,OAAO,CAAC;YACxF,MAAM,MAAM,mCACP,GAAG,CAAC,QAAQ,KACf,KAAK;gBACL,KAAK,GACN,CAAC;YACF,MAAM,IAAI,GAAG,eAAe,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;YACnD,MAAM,WAAW,GAAG,wBAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAEnD,GAAG,CAAC,IAAI,GAAG,WAAkB,CAAC;YAE9B,MAAM,MAAM,GAAG,MAAO,OAAe,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,EAAE,WAAW,CAAC,CAAC;YAEpE,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,wBAAI,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrD,GAAG,CAAC,IAAI,GAAG,wBAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SACjC;QAED,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAA,CAAC;AACJ,CAAC;AAzCD,oBAyCC"}
+{"version":3,"file":"rest.js","sourceRoot":"","sources":["../src/rest.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "@feathersjs/koa",
   "description": "Feathers KoaJS framework bindings and REST provider",
-  "version": "5.0.0-pre.9",
+  "version": "5.0.1",
   "homepage": "https://feathersjs.com",
   "main": "lib/",
+  "types": "lib/",
   "keywords": [
     "feathers",
     "koajs"
@@ -11,7 +12,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git://github.com/feathersjs/feathers.git"
+    "url": "git://github.com/feathersjs/feathers.git",
+    "directory": "packages/koa"
   },
   "author": {
     "name": "Feathers contributors",
@@ -23,7 +25,7 @@
     "url": "https://github.com/feathersjs/feathers/issues"
   },
   "engines": {
-    "node": ">= 6"
+    "node": ">= 14"
   },
   "files": [
     "CHANGELOG.md",
@@ -36,9 +38,9 @@
   ],
   "scripts": {
     "prepublish": "npm run compile",
-    "compile": "shx rm -rf lib/ && tsc",
-    "test": "npm run compile && npm run mocha",
-    "mocha": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
+    "pack": "npm pack --pack-destination ../generators/test/build",
+    "compile": "shx rm -rf lib/ && tsc && npm run pack",
+    "test": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
   },
   "directories": {
     "lib": "lib"
@@ -47,28 +49,34 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/authentication": "^5.0.0-pre.9",
-    "@feathersjs/commons": "^5.0.0-pre.9",
-    "@feathersjs/errors": "^5.0.0-pre.9",
-    "@feathersjs/transport-commons": "^5.0.0-pre.9",
-    "@types/koa": "^2.13.4",
-    "@types/koa-bodyparser": "^4.3.3",
+    "@feathersjs/authentication": "^5.0.1",
+    "@feathersjs/commons": "^5.0.1",
+    "@feathersjs/errors": "^5.0.1",
+    "@feathersjs/feathers": "^5.0.1",
+    "@feathersjs/transport-commons": "^5.0.1",
+    "@koa/cors": "^4.0.0",
+    "@types/koa": "^2.13.5",
     "@types/koa-qs": "^2.0.0",
-    "koa": "^2.13.1",
-    "koa-bodyparser": "^4.3.0",
-    "koa-qs": "^3.0.0"
+    "@types/koa-static": "^4.0.2",
+    "@types/koa__cors": "^3.3.1",
+    "koa": "^2.14.1",
+    "koa-body": "^6.0.1",
+    "koa-compose": "^4.1.0",
+    "koa-qs": "^3.0.0",
+    "koa-static": "^5.0.0"
   },
   "devDependencies": {
-    "@feathersjs/authentication-local": "^5.0.0-pre.9",
-    "@feathersjs/feathers": "^5.0.0-pre.9",
-    "@feathersjs/memory": "^5.0.0-pre.9",
-    "@feathersjs/tests": "^5.0.0-pre.9",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "^16.4.13",
-    "mocha": "^9.0.3",
-    "shx": "^0.3.3",
-    "ts-node": "^10.1.0",
-    "typescript": "^4.3.5"
+    "@feathersjs/authentication-local": "^5.0.1",
+    "@feathersjs/memory": "^5.0.1",
+    "@feathersjs/tests": "^5.0.1",
+    "@types/koa-compose": "^3.2.5",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.14.6",
+    "axios": "^1.3.4",
+    "mocha": "^10.2.0",
+    "shx": "^0.3.4",
+    "ts-node": "^10.9.1",
+    "typescript": "^4.9.5"
   },
-  "gitHead": "3d1721a7286e6a7f37bbc38695fe45084023f13b"
+  "gitHead": "18b7f4ab0a8075572a81d78956ba1205a9795c91"
 }

package/src/authentication.ts

@@ -0,0 +1,56 @@
+import { Application, HookContext } from '@feathersjs/feathers'
+import { createDebug } from '@feathersjs/commons'
+import { authenticate as AuthenticateHook } from '@feathersjs/authentication'
+
+import { Middleware } from './declarations'
+
+const debug = createDebug('@feathersjs/koa/authentication')
+
+export type AuthenticationSettings = {
+  service?: string
+  strategies?: string[]
+}
+
+export function parseAuthentication(settings: AuthenticationSettings = {}): Middleware {
+  return async (ctx, next) => {
+    const app = ctx.app
+    const service = app.defaultAuthentication?.(settings.service)
+
+    if (!service) {
+      return next()
+    }
+
+    const config = service.configuration
+    const authStrategies = settings.strategies || config.parseStrategies || config.authStrategies || []
+
+    if (authStrategies.length === 0) {
+      debug('No `authStrategies` or `parseStrategies` found in authentication configuration')
+      return next()
+    }
+
+    const authentication = await service.parse(ctx.req, ctx.res, ...authStrategies)
+
+    if (authentication) {
+      debug('Parsed authentication from HTTP header', authentication)
+      ctx.feathers = { ...ctx.feathers, authentication }
+    }
+
+    return next()
+  }
+}
+
+export function authenticate(settings: string | AuthenticationSettings, ...strategies: string[]): Middleware {
+  const hook = AuthenticateHook(settings, ...strategies)
+
+  return async (ctx, next) => {
+    const app = ctx.app as Application
+    const params = ctx.feathers
+    const context = { app, params } as HookContext
+
+    await hook(context)
+
+    ctx.feathers = context.params
+
+    return next()
+  }
+}

package/src/declarations.ts

@@ -1,15 +1,37 @@
-import Koa from 'koa';
-import { Server } from 'http';
-import { Application as FeathersApplication } from '@feathersjs/feathers';
-import '@feathersjs/authentication';
+import Koa, { Next } from 'koa'
+import { Server } from 'http'
+import { Application as FeathersApplication, HookContext, Params, RouteLookup } from '@feathersjs/feathers'
+import '@feathersjs/authentication'
 
 export type ApplicationAddons = {
-  listen (port?: number, ...args: any[]): Promise<Server>;
+  server: Server
+  listen(port?: number, ...args: any[]): Promise<Server>
 }
 
-export type Application<T = any, C = any> =
-  Omit<Koa, 'listen'> & FeathersApplication<T, C> & ApplicationAddons;
+export type Application<T = any, C = any> = Omit<Koa, 'listen'> &
+  FeathersApplication<T, C> &
+  ApplicationAddons
 
 export type FeathersKoaContext<A = Application> = Koa.Context & {
-  app: A;
-};
+  app: A
+}
+
+export type Middleware<A = Application> = (context: FeathersKoaContext<A>, next: Next) => any
+
+declare module '@feathersjs/feathers/lib/declarations' {
+  interface ServiceOptions {
+    koa?: {
+      before?: Middleware[]
+      after?: Middleware[]
+      composed?: Middleware
+    }
+  }
+}
+
+declare module 'koa' {
+  interface ExtendableContext {
+    feathers?: Partial<Params>
+    lookup?: RouteLookup
+    hook?: HookContext
+  }
+}

package/src/handlers.ts

@@ -0,0 +1,20 @@
+import { FeathersError, NotFound } from '@feathersjs/errors'
+import { FeathersKoaContext } from './declarations'
+
+export const errorHandler = () => async (ctx: FeathersKoaContext, next: () => Promise<any>) => {
+  try {
+    await next()
+
+    if (ctx.body === undefined) {
+      throw new NotFound(`Path ${ctx.path} not found`)
+    }
+  } catch (error: any) {
+    ctx.response.status = error instanceof FeathersError ? error.code : 500
+    ctx.body =
+      typeof error.toJSON === 'function'
+        ? error.toJSON()
+        : {
+            message: error.message
+          }
+  }
+}

package/src/index.ts

@@ -1,81 +1,104 @@
-import Koa from 'koa';
-import bodyParser from 'koa-bodyparser';
-import koaQs from 'koa-qs';
-import { Application as FeathersApplication } from '@feathersjs/feathers';
-import { routing } from '@feathersjs/transport-commons';
-import { createDebug } from '@feathersjs/commons';
-
-import { Application } from './declarations';
-import { errorHandler } from './error-handler';
-
-const debug = createDebug('@feathersjs/koa');
-
-export * from './declarations';
-export * from './authenticate';
-export { rest } from './rest';
-export { Koa, bodyParser, errorHandler };
-
-export function koa (_app?: FeathersApplication): Application<any> {
-  const koaApp = new Koa();
-
-  if (!_app) {
-    return koaApp as unknown as Application<any>;
+import Koa from 'koa'
+import koaQs from 'koa-qs'
+import { Application as FeathersApplication } from '@feathersjs/feathers'
+import { routing } from '@feathersjs/transport-commons'
+import { createDebug } from '@feathersjs/commons'
+import { koaBody as bodyParser } from 'koa-body'
+import cors from '@koa/cors'
+import serveStatic from 'koa-static'
+
+import { Application } from './declarations'
+
+export { Koa, bodyParser, cors, serveStatic }
+export * from './authentication'
+export * from './declarations'
+export * from './handlers'
+export * from './rest'
+
+const debug = createDebug('@feathersjs/koa')
+
+export function koa<S = any, C = any>(
+  feathersApp?: FeathersApplication<S, C>,
+  koaApp: Koa = new Koa()
+): Application<S, C> {
+  if (!feathersApp) {
+    return koaApp as any
   }
 
-  if (typeof _app.setup !== 'function') {
-    throw new Error('@feathersjs/koa requires a valid Feathers application instance');
+  if (typeof feathersApp.setup !== 'function') {
+    throw new Error('@feathersjs/koa requires a valid Feathers application instance')
   }
 
-  const app = _app as Application;
-  const { listen: koaListen, use: koaUse } = koaApp;
-  const oldUse = app.use;
+  const app = feathersApp as any as Application<S, C>
+  const { listen: koaListen, use: koaUse } = koaApp
+  const { use: feathersUse, teardown: feathersTeardown } = feathersApp
 
   Object.assign(app, {
-    use (location: string|Koa.Middleware, ...args: any[]) {
+    use(location: string | Koa.Middleware, ...args: any[]) {
       if (typeof location === 'string') {
-        return (oldUse as any).call(this, location, ...args);
+        return (feathersUse as any).call(this, location, ...args)
       }
 
-      return koaUse.call(this, location);
+      return koaUse.call(this, location)
     },
 
-    async listen (port?: number, ...args: any[]) {
-      const server = koaListen.call(this, port, ...args);
+    async listen(port?: number, ...args: any[]) {
+      const server = koaListen.call(this, port, ...args)
+
+      this.server = server
+      await this.setup(server)
+      debug('Feathers application listening')
 
-      await this.setup(server);
-      debug('Feathers application listening');
+      return server
+    },
 
-      return server;
+    async teardown(server?: any) {
+      return feathersTeardown
+        .call(this, server)
+        .then(
+          () => new Promise((resolve, reject) => this.server.close((e) => (e ? reject(e) : resolve(this))))
+        )
     }
-  } as Application);
+  } as Application)
 
-  const feathersDescriptors = {
+  const appDescriptors = {
     ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(app)),
     ...Object.getOwnPropertyDescriptors(app)
-  };
-  const koaDescriptors = {
+  }
+  const newDescriptors = {
     ...Object.getOwnPropertyDescriptors(Object.getPrototypeOf(koaApp)),
     ...Object.getOwnPropertyDescriptors(koaApp)
-  };
+  }
 
   // Copy all non-existing properties (including non-enumerables)
   // that don't already exist on the Express app
-  Object.keys(koaDescriptors).forEach(prop => {
-    const feathersProp = feathersDescriptors[prop];
-    const koaProp = koaDescriptors[prop];
+  Object.keys(newDescriptors).forEach((prop) => {
+    const appProp = appDescriptors[prop]
+    const newProp = newDescriptors[prop]
 
-    if (koaProp !== undefined && feathersProp === undefined) {
-      Object.defineProperty(app, prop, koaProp);
+    if (appProp === undefined && newProp !== undefined) {
+      Object.defineProperty(app, prop, newProp)
     }
-  });
+  })
 
-  koaQs(app as any);
-  app.configure(routing());
-  app.use((ctx, next) => {
-    ctx.feathers = { provider: 'rest' };
+  koaQs(app as any)
+
+  Object.getOwnPropertySymbols(koaApp).forEach((symbol) => {
+    const target = app as any
+    const source = koaApp as any
 
-    return next();
-  });
+    target[symbol] = source[symbol]
+  })
+
+  // This reinitializes hooks
+  app.setup = feathersApp.setup as any
+  app.teardown = feathersApp.teardown as any
+
+  app.configure(routing() as any)
+  app.use((ctx, next) => {
+    ctx.feathers = { ...ctx.feathers, provider: 'rest' }
+    return next()
+  })
 
-  return app;
+  return app
 }