feat: support Hapi17 #89

DominicKramer · 2018-03-27T04:41:59Z

No description provided.

src/interfaces/hapi.ts

  if (isObject(config)) {
-    service = config.getServiceContext().service;
-    version = config.getServiceContext().version;
+    service = config!.getServiceContext().service;


src/interfaces/hapi.ts

-        (server as hapi.Server).on('request-error', (req, err) => {
-          client.sendError(hapiErrorHandler(req, err, config));
+    if (server) {
+      if ((server as any).events && (server as any).events.on) {


src/interfaces/hapi.ts

-                request,
+        if (isFunction((server as hapi.Server).ext)) {
+          (server as hapi.Server).ext('onPreResponse', (request, reply) => {
+            if (isObject(request) && isObject(request.response) &&


src/request-extractors/hapi.ts

  const returnObject = new RequestInformationContainer();

-  if (!isObject(req) || !isObject(req.headers) || isFunction(req) ||
+  if (!isObject(req) || !isObject(req!.headers) || isFunction(req) ||


src/interfaces/hapi.ts

-        (server as hapi.Server).on('request-error', (req, err) => {
-          client.sendError(hapiErrorHandler(req, err, config));
+    if (server) {
+      if ((server as any).events && (server as any).events.on) {


src/interfaces/hapi.ts

 *  ErrorMessage
 */
-function hapiErrorHandler(req: hapi.Request, err: {}, config: Configuration) {
+function hapiErrorHandler(req: hapi.Request|undefined, err: {}, config?: Configuration) {


An error should only be recorded if its channel is 'error'.

src/index.ts

  event: () => ErrorMessage;
-  hapi: {register: (server: {}, options: {}, next: Function) => void};
+  hapi: {
+    register: (server: {}, options: {}, next?: Function) => void; name: string;


test/unit/interfaces/hapi.ts

+      errorsSent.length = 0;
+    });
+
+    it(`Plugin should have name and version properties`, () => {


DominicKramer requested a review from a team March 27, 2018 04:41

jinwoo reviewed Mar 27, 2018

View reviewed changes

ofrobots reviewed Mar 27, 2018

View reviewed changes

DominicKramer force-pushed the feat/support-hapi17 branch from 1298af6 to a8f355d Compare March 29, 2018 17:38

DominicKramer mentioned this pull request Mar 30, 2018

Add support for hapi@17.0.0 #62

Closed

DominicKramer force-pushed the feat/support-hapi17 branch from d9c838f to dba6935 Compare April 6, 2018 22:52

DominicKramer added 7 commits April 10, 2018 15:07

feat: support Hapi17

d4511cb

add name and version properties to the plugin

7b12c67

reorder the hapiErrorHandler args for clarity

20f17e7

set the type of server as any

01ff695

chore: update package-lock.json

d57b59f

fix type error in the hapi plugin type

0d0f2b0

chore: add install tests for hapi17

2152a4b

DominicKramer force-pushed the feat/support-hapi17 branch from dba6935 to 2152a4b Compare April 10, 2018 22:13

DominicKramer added 5 commits April 10, 2018 15:17

address compiler issues

328a1c2

fix gts check errors

b9ecb6a

add Hapi17 tests

591d73d

run gts fix

0ce047f

handle duplicate errors being reported

1b249cc

An error should only be recorded if its channel is 'error'.

jinwoo approved these changes Apr 11, 2018

View reviewed changes

use single quotes instead of backquotes

09be1dc

DominicKramer merged commit 70e1c74 into googleapis:master Apr 11, 2018

feat: support Hapi17 #89

feat: support Hapi17 #89

Uh oh!

Conversation

DominicKramer commented Mar 27, 2018

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

This comment was marked as spam.

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants