@vida-global/core 1.4.5 → 1.4.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +13 -0
- package/lib/logger/README.md +33 -2
- package/lib/logger/index.js +99 -20
- package/lib/logger/serverMiddleware.js +39 -0
- package/lib/server/server.js +8 -62
- package/lib/server/serverController.js +129 -7
- package/package.json +5 -5
- package/test/activeRecord/db/schema.test.js +217 -0
- package/test/activeRecord/utils.test.js +72 -0
- package/test/logger/serverMiddleware.test.js +73 -0
- package/test/server/apiDocsGenerator.test.js +38 -0
- package/test/server/server.test.js +186 -4
- package/test/server/serverController.test.js +237 -5
|
@@ -5,7 +5,11 @@ const Errors = require('../../lib/server/errors');
|
|
|
5
5
|
const { logger } = require('../../lib/logger');
|
|
6
6
|
const { randomPayload } = require('./helpers/serverController');
|
|
7
7
|
const TestHelpers = require('@vida-global/test-helpers');
|
|
8
|
-
const {
|
|
8
|
+
const {
|
|
9
|
+
NoActiveStreamError,
|
|
10
|
+
StreamInProgressError,
|
|
11
|
+
VidaServerController
|
|
12
|
+
} = require('../../lib/server/serverController');
|
|
9
13
|
|
|
10
14
|
describe('VidaServerController', () => {
|
|
11
15
|
describe('.actionNames', () => {
|
|
@@ -444,6 +448,35 @@ describe('VidaServerController', () => {
|
|
|
444
448
|
});
|
|
445
449
|
|
|
446
450
|
|
|
451
|
+
describe('.validateIsBoolean', () => {
|
|
452
|
+
const controller = new FooController({}, {});
|
|
453
|
+
it ('returns undefined when passed a matching boolean', () => {
|
|
454
|
+
const result1 = controller.validateIsBoolean(true, true);
|
|
455
|
+
const result2 = controller.validateIsBoolean(false, false);
|
|
456
|
+
expect(result1).toBe(undefined);
|
|
457
|
+
expect(result2).toBe(undefined);
|
|
458
|
+
});
|
|
459
|
+
|
|
460
|
+
it ('returns an error when passed an non matching boolean', () => {
|
|
461
|
+
const result1 = controller.validateIsBoolean(true, false);
|
|
462
|
+
const result2 = controller.validateIsBoolean(false, true);
|
|
463
|
+
expect(result1).toBe('must be false');
|
|
464
|
+
expect(result2).toBe('must be true');
|
|
465
|
+
});
|
|
466
|
+
|
|
467
|
+
it ('returns an error when passed an non boolean', () => {
|
|
468
|
+
const result1 = controller.validateIsBoolean('', false);
|
|
469
|
+
const result2 = controller.validateIsBoolean(0, false);
|
|
470
|
+
const result3 = controller.validateIsBoolean('foo', true);
|
|
471
|
+
const result4 = controller.validateIsBoolean(1, true);
|
|
472
|
+
expect(result1).toBe('must be false');
|
|
473
|
+
expect(result2).toBe('must be false');
|
|
474
|
+
expect(result3).toBe('must be true');
|
|
475
|
+
expect(result4).toBe('must be true');
|
|
476
|
+
});
|
|
477
|
+
});
|
|
478
|
+
|
|
479
|
+
|
|
447
480
|
describe('.validateFunction', () => {
|
|
448
481
|
const controller = new FooController({}, {});
|
|
449
482
|
const correctValue = Math.random();
|
|
@@ -494,8 +527,6 @@ describe('VidaServerController', () => {
|
|
|
494
527
|
const body = {[key]: value};
|
|
495
528
|
const message = TestHelpers.Faker.Text.randomString();
|
|
496
529
|
|
|
497
|
-
if (!Errors[errorClsName]) console.log(errorClsName);
|
|
498
|
-
|
|
499
530
|
const error = new Errors[errorClsName](message, body);
|
|
500
531
|
if (handlerName == 'renderErrors') error.errors = randomPayload();
|
|
501
532
|
|
|
@@ -708,8 +739,17 @@ describe('VidaServerController', () => {
|
|
|
708
739
|
|
|
709
740
|
|
|
710
741
|
describe('#logger', () => {
|
|
711
|
-
it ('uses the
|
|
712
|
-
expect(controller.logger).toBe(
|
|
742
|
+
it ('uses the a logger with http scope', () => {
|
|
743
|
+
expect(controller.logger.scope).toBe('http');
|
|
744
|
+
});
|
|
745
|
+
|
|
746
|
+
it ('uses the request id', () => {
|
|
747
|
+
const id1 = TestHelpers.Faker.Text.randomString();
|
|
748
|
+
const id2 = TestHelpers.Faker.Text.randomString();
|
|
749
|
+
const controller1 = new FooController({ id: id1 }, response);
|
|
750
|
+
const controller2 = new FooController({ id: id2 }, response);
|
|
751
|
+
expect(controller1.logger.id).toBe(id1);
|
|
752
|
+
expect(controller2.logger.id).toBe(id2);
|
|
713
753
|
});
|
|
714
754
|
});
|
|
715
755
|
|
|
@@ -762,4 +802,196 @@ describe('VidaServerController', () => {
|
|
|
762
802
|
|
|
763
803
|
describe('Request Properties', () => {
|
|
764
804
|
});
|
|
805
|
+
|
|
806
|
+
|
|
807
|
+
describe('#statusText', () => {
|
|
808
|
+
const cases = [
|
|
809
|
+
[200, 'ok'],
|
|
810
|
+
[201, 'created'],
|
|
811
|
+
[202, 'accepted'],
|
|
812
|
+
[204, 'no content'],
|
|
813
|
+
[301, 'moved permanently'],
|
|
814
|
+
[302, 'found'],
|
|
815
|
+
[304, 'not modified'],
|
|
816
|
+
[307, 'temporary redirect'],
|
|
817
|
+
[308, 'permanent redirect'],
|
|
818
|
+
[400, 'bad request'],
|
|
819
|
+
[401, 'unauthorized'],
|
|
820
|
+
[402, 'payment required'],
|
|
821
|
+
[403, 'forbidden'],
|
|
822
|
+
[404, 'not found'],
|
|
823
|
+
[405, 'method not allowed'],
|
|
824
|
+
[408, 'request timeout'],
|
|
825
|
+
[409, 'conflict'],
|
|
826
|
+
[410, 'gone'],
|
|
827
|
+
[413, 'content too large'],
|
|
828
|
+
[415, 'unsupported media type'],
|
|
829
|
+
[422, 'unprocessable content'],
|
|
830
|
+
[423, 'locked'],
|
|
831
|
+
[429, 'too many requests'],
|
|
832
|
+
[500, 'server error'],
|
|
833
|
+
[501, 'not implemented'],
|
|
834
|
+
[502, 'bad gateway'],
|
|
835
|
+
[503, 'service unavailable'],
|
|
836
|
+
[504, 'gateway timeout'],
|
|
837
|
+
];
|
|
838
|
+
|
|
839
|
+
it.each(cases)('returns "%s" text for status %s', (statusCode, expected) => {
|
|
840
|
+
const controller = new FooController({}, { statusCode });
|
|
841
|
+
expect(controller.statusText).toEqual(expected);
|
|
842
|
+
});
|
|
843
|
+
|
|
844
|
+
it ('returns undefined for an unmapped status code', () => {
|
|
845
|
+
const controller = new FooController({}, { statusCode: 418 });
|
|
846
|
+
expect(controller.statusText).toBeUndefined();
|
|
847
|
+
});
|
|
848
|
+
});
|
|
849
|
+
|
|
850
|
+
|
|
851
|
+
describe('#streamSseResponse', () => {
|
|
852
|
+
let controller;
|
|
853
|
+
let response;
|
|
854
|
+
let request;
|
|
855
|
+
let setHeaderSpy;
|
|
856
|
+
|
|
857
|
+
beforeEach(() => {
|
|
858
|
+
request = { on: jest.fn(), off: jest.fn() };
|
|
859
|
+
response = {
|
|
860
|
+
setHeader: jest.fn(),
|
|
861
|
+
flushHeaders: jest.fn(),
|
|
862
|
+
write: jest.fn(),
|
|
863
|
+
end: jest.fn(),
|
|
864
|
+
writableEnded: false
|
|
865
|
+
};
|
|
866
|
+
controller = new FooController(request, response);
|
|
867
|
+
setHeaderSpy = response.setHeader;
|
|
868
|
+
});
|
|
869
|
+
|
|
870
|
+
it ('sets SSE headers, flushes them, and marks rendered before invoking handler', async () => {
|
|
871
|
+
const handler = jest.fn(async function () {
|
|
872
|
+
expect(this).toBe(controller);
|
|
873
|
+
expect(controller.rendered).toBe(true);
|
|
874
|
+
expect(setHeaderSpy).toHaveBeenCalledWith('Content-Type', 'text/event-stream; charset=utf-8');
|
|
875
|
+
expect(setHeaderSpy).toHaveBeenCalledWith('Cache-Control', 'no-cache');
|
|
876
|
+
expect(setHeaderSpy).toHaveBeenCalledWith('Connection', 'keep-alive');
|
|
877
|
+
expect(setHeaderSpy).toHaveBeenCalledWith('X-Accel-Buffering', 'no');
|
|
878
|
+
expect(response.flushHeaders).toHaveBeenCalledTimes(1);
|
|
879
|
+
expect(controller.statusCode).toBe(200);
|
|
880
|
+
});
|
|
881
|
+
await controller.streamSseResponse(handler, jest.fn());
|
|
882
|
+
expect(handler).toHaveBeenCalledTimes(1);
|
|
883
|
+
});
|
|
884
|
+
|
|
885
|
+
it ('writes [DONE] and ends the response in the finally block', async () => {
|
|
886
|
+
await controller.streamSseResponse(jest.fn(), jest.fn());
|
|
887
|
+
expect(response.write).toHaveBeenLastCalledWith('data: [DONE]\n\n');
|
|
888
|
+
expect(response.end).toHaveBeenCalledTimes(1);
|
|
889
|
+
});
|
|
890
|
+
|
|
891
|
+
it ('throws StreamInProgressError when called while already streaming', async () => {
|
|
892
|
+
await controller.streamSseResponse(async () => {
|
|
893
|
+
await expect(controller.streamSseResponse(jest.fn(), jest.fn()))
|
|
894
|
+
.rejects.toBeInstanceOf(StreamInProgressError);
|
|
895
|
+
}, jest.fn());
|
|
896
|
+
});
|
|
897
|
+
|
|
898
|
+
it ('invokes errorHandler and rethrows when handler throws', async () => {
|
|
899
|
+
const err = new Error('boom');
|
|
900
|
+
const handler = jest.fn(async () => { throw err; });
|
|
901
|
+
const errorHandler = jest.fn();
|
|
902
|
+
await expect(controller.streamSseResponse(handler, errorHandler)).rejects.toThrow('boom');
|
|
903
|
+
expect(errorHandler).toHaveBeenCalledWith(err);
|
|
904
|
+
});
|
|
905
|
+
|
|
906
|
+
it ('still ends the response when handler throws', async () => {
|
|
907
|
+
const errorHandler = jest.fn();
|
|
908
|
+
await expect(controller.streamSseResponse(
|
|
909
|
+
async () => { throw new Error('boom'); },
|
|
910
|
+
errorHandler
|
|
911
|
+
)).rejects.toThrow();
|
|
912
|
+
expect(response.end).toHaveBeenCalledTimes(1);
|
|
913
|
+
});
|
|
914
|
+
|
|
915
|
+
it ('wires close listener to abortController when one is provided', async () => {
|
|
916
|
+
const abortController = { abort: jest.fn() };
|
|
917
|
+
await controller.streamSseResponse(jest.fn(), jest.fn(), abortController);
|
|
918
|
+
expect(request.on).toHaveBeenCalledWith('close', expect.any(Function));
|
|
919
|
+
expect(request.off).toHaveBeenCalledWith('close', expect.any(Function));
|
|
920
|
+
// The handler registered on 'close' should call abort.
|
|
921
|
+
const closeHandler = request.on.mock.calls.find(c => c[0] === 'close')[1];
|
|
922
|
+
closeHandler();
|
|
923
|
+
expect(abortController.abort).toHaveBeenCalledTimes(1);
|
|
924
|
+
});
|
|
925
|
+
|
|
926
|
+
it ('does not register a close listener when no abortController is provided', async () => {
|
|
927
|
+
await controller.streamSseResponse(jest.fn(), jest.fn());
|
|
928
|
+
expect(request.on).not.toHaveBeenCalled();
|
|
929
|
+
expect(request.off).not.toHaveBeenCalled();
|
|
930
|
+
});
|
|
931
|
+
|
|
932
|
+
it ('resets streaming state after completion so a new stream can start', async () => {
|
|
933
|
+
await controller.streamSseResponse(jest.fn(), jest.fn());
|
|
934
|
+
// Second call should not throw StreamInProgressError.
|
|
935
|
+
await expect(controller.streamSseResponse(jest.fn(), jest.fn())).resolves.toBeUndefined();
|
|
936
|
+
});
|
|
937
|
+
});
|
|
938
|
+
|
|
939
|
+
|
|
940
|
+
describe('#writeStreamEvent', () => {
|
|
941
|
+
let controller;
|
|
942
|
+
let response;
|
|
943
|
+
|
|
944
|
+
beforeEach(() => {
|
|
945
|
+
response = {
|
|
946
|
+
setHeader: jest.fn(),
|
|
947
|
+
flushHeaders: jest.fn(),
|
|
948
|
+
write: jest.fn(),
|
|
949
|
+
end: jest.fn(),
|
|
950
|
+
writableEnded: false
|
|
951
|
+
};
|
|
952
|
+
controller = new FooController({ on: jest.fn(), off: jest.fn() }, response);
|
|
953
|
+
});
|
|
954
|
+
|
|
955
|
+
it ('throws NoActiveStreamError when called outside a stream', () => {
|
|
956
|
+
expect(() => controller.writeStreamEvent('msg', 'hello'))
|
|
957
|
+
.toThrow(NoActiveStreamError);
|
|
958
|
+
});
|
|
959
|
+
|
|
960
|
+
it ('writes both event and data lines when an event name is provided', async () => {
|
|
961
|
+
await controller.streamSseResponse(async () => {
|
|
962
|
+
response.write.mockClear();
|
|
963
|
+
controller.writeStreamEvent('progress', 'halfway');
|
|
964
|
+
expect(response.write).toHaveBeenNthCalledWith(1, 'event: progress\n');
|
|
965
|
+
expect(response.write).toHaveBeenNthCalledWith(2, 'data: halfway\n\n');
|
|
966
|
+
}, jest.fn());
|
|
967
|
+
});
|
|
968
|
+
|
|
969
|
+
it ('writes only the data line when no event name is provided', async () => {
|
|
970
|
+
await controller.streamSseResponse(async () => {
|
|
971
|
+
response.write.mockClear();
|
|
972
|
+
controller.writeStreamEvent(null, 'plain');
|
|
973
|
+
expect(response.write).toHaveBeenCalledTimes(1);
|
|
974
|
+
expect(response.write).toHaveBeenCalledWith('data: plain\n\n');
|
|
975
|
+
}, jest.fn());
|
|
976
|
+
});
|
|
977
|
+
|
|
978
|
+
it ('is a no-op when the response is already ended', async () => {
|
|
979
|
+
await controller.streamSseResponse(async () => {
|
|
980
|
+
response.writableEnded = true;
|
|
981
|
+
response.write.mockClear();
|
|
982
|
+
controller.writeStreamEvent(null, 'ignored');
|
|
983
|
+
expect(response.write).not.toHaveBeenCalled();
|
|
984
|
+
}, jest.fn());
|
|
985
|
+
});
|
|
986
|
+
|
|
987
|
+
it ('is a no-op when the abort signal is aborted', async () => {
|
|
988
|
+
const abortController = { abort: jest.fn(), signal: { aborted: false } };
|
|
989
|
+
await controller.streamSseResponse(async () => {
|
|
990
|
+
abortController.signal.aborted = true;
|
|
991
|
+
response.write.mockClear();
|
|
992
|
+
controller.writeStreamEvent(null, 'ignored');
|
|
993
|
+
expect(response.write).not.toHaveBeenCalled();
|
|
994
|
+
}, jest.fn(), abortController);
|
|
995
|
+
});
|
|
996
|
+
});
|
|
765
997
|
});
|