@bleedingdev/modern-js-runtime-extensions 3.9.0-ultramodern.3 → 3.9.0-ultramodern.5
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/dist/cjs/buildIdentity.js +73 -0
- package/dist/cjs/contextExtensions.js +74 -0
- package/dist/cjs/headRuntime.js +91 -0
- package/dist/cjs/helmetContext.js +54 -0
- package/dist/cjs/index.js +18 -4
- package/dist/cjs/localisedLoaderIdentity.js +51 -0
- package/dist/cjs/prefetchPolicy.js +52 -0
- package/dist/cjs/reactContext.js +45 -0
- package/dist/cjs/request-policy/browser.js +139 -0
- package/dist/cjs/request-policy/client.js +234 -0
- package/dist/cjs/request-policy/node.js +149 -0
- package/dist/cjs/request-policy/policyCore.js +266 -0
- package/dist/cjs/request-policy/requestContext.js +137 -0
- package/dist/cjs/request-policy/traceparent.js +56 -0
- package/dist/cjs/request-policy/transport.js +234 -0
- package/dist/cjs/request-policy/types.js +57 -0
- package/dist/cjs/routeHydration.js +127 -0
- package/dist/cjs/routerPrefetchPolicy.js +153 -0
- package/dist/cjs/routerProvider.js +170 -0
- package/dist/cjs/routerState.js +167 -0
- package/dist/cjs/routerStatePlugin.js +86 -0
- package/dist/cjs/routerStateTypes.js +18 -0
- package/dist/cjs/rsc-disabled/rscDisabledClientBrowserRuntime.js +69 -0
- package/dist/cjs/rsc-disabled/rscDisabledClientEdgeRuntime.js +61 -0
- package/dist/cjs/rsc-disabled/rscDisabledClientNodeRuntime.js +65 -0
- package/dist/cjs/rsc-disabled/rscDisabledRuntimeError.js +42 -0
- package/dist/cjs/rsc-disabled/rscDisabledServerEdgeRuntime.js +93 -0
- package/dist/cjs/rsc-disabled/rscDisabledServerNodeRuntime.js +101 -0
- package/dist/cjs/runtimeContextProjection.js +112 -0
- package/dist/cjs/server-config/bffRuntime.js +18 -0
- package/dist/cjs/server-config/index.js +18 -0
- package/dist/cjs/server-config/serverTelemetry.js +18 -0
- package/dist/cjs/shellStream.js +34 -2
- package/dist/cjs/workspaceEvents.js +159 -0
- package/dist/esm/buildIdentity.mjs +35 -0
- package/dist/esm/contextExtensions.mjs +33 -0
- package/dist/esm/headRuntime.mjs +43 -0
- package/dist/esm/helmetContext.mjs +13 -0
- package/dist/esm/index.mjs +2 -0
- package/dist/esm/localisedLoaderIdentity.mjs +13 -0
- package/dist/esm/prefetchPolicy.mjs +11 -0
- package/dist/esm/reactContext.mjs +7 -0
- package/dist/esm/request-policy/browser.mjs +11 -0
- package/dist/esm/request-policy/client.mjs +195 -0
- package/dist/esm/request-policy/policyCore.mjs +171 -0
- package/dist/esm/request-policy/requestContext.mjs +75 -0
- package/dist/esm/request-policy/traceparent.mjs +18 -0
- package/dist/esm/request-policy/transport.mjs +196 -0
- package/dist/esm/request-policy/types.mjs +10 -0
- package/dist/esm/routeHydration.mjs +77 -0
- package/dist/esm/routerPrefetchPolicy.mjs +115 -0
- package/dist/esm/routerProvider.mjs +117 -0
- package/dist/esm/routerState.mjs +105 -0
- package/dist/esm/routerStatePlugin.mjs +48 -0
- package/dist/esm/routerStateTypes.mjs +0 -0
- package/dist/esm/rsc-disabled/rscDisabledClientBrowserRuntime.mjs +10 -0
- package/dist/esm/rsc-disabled/rscDisabledClientEdgeRuntime.mjs +8 -0
- package/dist/esm/rsc-disabled/rscDisabledClientNodeRuntime.mjs +9 -0
- package/dist/esm/rsc-disabled/rscDisabledRuntimeError.mjs +4 -0
- package/dist/esm/rsc-disabled/rscDisabledServerEdgeRuntime.mjs +16 -0
- package/dist/esm/rsc-disabled/rscDisabledServerNodeRuntime.mjs +18 -0
- package/dist/esm/runtimeContextProjection.mjs +74 -0
- package/dist/esm/server-config/bffRuntime.mjs +0 -0
- package/dist/esm/server-config/index.mjs +0 -0
- package/dist/esm/server-config/serverTelemetry.mjs +0 -0
- package/dist/esm/shellStream.mjs +34 -2
- package/dist/esm/workspaceEvents.mjs +66 -0
- package/dist/esm-node/buildIdentity.mjs +36 -0
- package/dist/esm-node/contextExtensions.mjs +34 -0
- package/dist/esm-node/headRuntime.mjs +44 -0
- package/dist/esm-node/helmetContext.mjs +14 -0
- package/dist/esm-node/index.mjs +2 -0
- package/dist/esm-node/localisedLoaderIdentity.mjs +14 -0
- package/dist/esm-node/prefetchPolicy.mjs +12 -0
- package/dist/esm-node/reactContext.mjs +8 -0
- package/dist/esm-node/request-policy/browser.mjs +12 -0
- package/dist/esm-node/request-policy/client.mjs +196 -0
- package/dist/esm-node/request-policy/node.mjs +22 -0
- package/dist/esm-node/request-policy/policyCore.mjs +172 -0
- package/dist/esm-node/request-policy/requestContext.mjs +76 -0
- package/dist/esm-node/request-policy/traceparent.mjs +19 -0
- package/dist/esm-node/request-policy/transport.mjs +197 -0
- package/dist/esm-node/request-policy/types.mjs +11 -0
- package/dist/esm-node/routeHydration.mjs +78 -0
- package/dist/esm-node/routerPrefetchPolicy.mjs +116 -0
- package/dist/esm-node/routerProvider.mjs +118 -0
- package/dist/esm-node/routerState.mjs +106 -0
- package/dist/esm-node/routerStatePlugin.mjs +49 -0
- package/dist/esm-node/routerStateTypes.mjs +1 -0
- package/dist/esm-node/rsc-disabled/rscDisabledClientBrowserRuntime.mjs +11 -0
- package/dist/esm-node/rsc-disabled/rscDisabledClientEdgeRuntime.mjs +9 -0
- package/dist/esm-node/rsc-disabled/rscDisabledClientNodeRuntime.mjs +10 -0
- package/dist/esm-node/rsc-disabled/rscDisabledRuntimeError.mjs +5 -0
- package/dist/esm-node/rsc-disabled/rscDisabledServerEdgeRuntime.mjs +17 -0
- package/dist/esm-node/rsc-disabled/rscDisabledServerNodeRuntime.mjs +19 -0
- package/dist/esm-node/runtimeContextProjection.mjs +75 -0
- package/dist/esm-node/server-config/bffRuntime.mjs +1 -0
- package/dist/esm-node/server-config/index.mjs +1 -0
- package/dist/esm-node/server-config/serverTelemetry.mjs +1 -0
- package/dist/esm-node/shellStream.mjs +34 -2
- package/dist/esm-node/workspaceEvents.mjs +67 -0
- package/dist/types/buildIdentity.d.ts +37 -0
- package/dist/types/contextExtensions.d.ts +34 -0
- package/dist/types/headRuntime.d.ts +12 -0
- package/dist/types/helmetContext.d.ts +10 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/localisedLoaderIdentity.d.ts +10 -0
- package/dist/types/prefetchPolicy.d.ts +4 -0
- package/dist/types/reactContext.d.ts +6 -0
- package/dist/types/request-policy/browser.d.ts +10 -0
- package/dist/types/request-policy/client.d.ts +14 -0
- package/dist/types/request-policy/node.d.ts +10 -0
- package/dist/types/request-policy/policyCore.d.ts +107 -0
- package/dist/types/request-policy/requestContext.d.ts +22 -0
- package/dist/types/request-policy/traceparent.d.ts +10 -0
- package/dist/types/request-policy/transport.d.ts +12 -0
- package/dist/types/request-policy/types.d.ts +144 -0
- package/dist/types/routeHydration.d.ts +24 -0
- package/dist/types/routerPrefetchPolicy.d.ts +28 -0
- package/dist/types/routerProvider.d.ts +77 -0
- package/dist/types/routerState.d.ts +12 -0
- package/dist/types/routerStatePlugin.d.ts +19 -0
- package/dist/types/routerStateTypes.d.ts +40 -0
- package/dist/types/rsc-disabled/rscDisabledClientBrowserRuntime.d.ts +9 -0
- package/dist/types/rsc-disabled/rscDisabledClientEdgeRuntime.d.ts +7 -0
- package/dist/types/rsc-disabled/rscDisabledClientNodeRuntime.d.ts +8 -0
- package/dist/types/rsc-disabled/rscDisabledRuntimeError.d.ts +1 -0
- package/dist/types/rsc-disabled/rscDisabledServerEdgeRuntime.d.ts +15 -0
- package/dist/types/rsc-disabled/rscDisabledServerNodeRuntime.d.ts +17 -0
- package/dist/types/runtimeContextProjection.d.ts +30 -0
- package/dist/types/server-config/bffRuntime.d.ts +122 -0
- package/dist/types/server-config/index.d.ts +2 -0
- package/dist/types/server-config/serverTelemetry.d.ts +322 -0
- package/dist/types/workspaceEvents.d.ts +62 -0
- package/package.json +238 -13
- package/rslib.config.mts +17 -2
- package/rstest.config.mts +33 -2
- package/src/buildIdentity.ts +61 -0
- package/src/contextExtensions.ts +81 -0
- package/src/headRuntime.tsx +77 -0
- package/src/helmetContext.ts +31 -0
- package/src/index.ts +2 -0
- package/src/localisedLoaderIdentity.ts +30 -0
- package/src/prefetchPolicy.ts +33 -0
- package/src/reactContext.ts +16 -0
- package/src/request-policy/browser.ts +22 -0
- package/src/request-policy/client.ts +404 -0
- package/src/request-policy/node.ts +41 -0
- package/src/request-policy/policyCore.ts +424 -0
- package/src/request-policy/requestContext.ts +149 -0
- package/src/request-policy/traceparent.ts +43 -0
- package/src/request-policy/transport.ts +349 -0
- package/src/request-policy/types.ts +229 -0
- package/src/routeHydration.ts +208 -0
- package/src/routerPrefetchPolicy.ts +195 -0
- package/src/routerProvider.ts +340 -0
- package/src/routerState.ts +208 -0
- package/src/routerStatePlugin.ts +86 -0
- package/src/routerStateTypes.ts +46 -0
- package/src/rsc-disabled/rscDisabledClientBrowserRuntime.ts +10 -0
- package/src/rsc-disabled/rscDisabledClientEdgeRuntime.ts +8 -0
- package/src/rsc-disabled/rscDisabledClientNodeRuntime.ts +9 -0
- package/src/rsc-disabled/rscDisabledRuntimeError.ts +3 -0
- package/src/rsc-disabled/rscDisabledServerEdgeRuntime.ts +16 -0
- package/src/rsc-disabled/rscDisabledServerNodeRuntime.ts +18 -0
- package/src/runtimeContextProjection.ts +105 -0
- package/src/server-config/bffRuntime.ts +136 -0
- package/src/server-config/index.ts +2 -0
- package/src/server-config/serverTelemetry.ts +337 -0
- package/src/shellStream.ts +55 -25
- package/src/workspaceEvents.ts +324 -0
- package/tests/buildIdentity.test.ts +70 -0
- package/tests/contextExtensions.test.ts +71 -0
- package/tests/headRuntime.test.tsx +369 -0
- package/tests/nativeSafeFailureCompatibility.test.ts +117 -0
- package/tests/prefetchPolicy.test.ts +51 -0
- package/tests/rendererHead.test.ts +1 -72
- package/tests/request-policy/browser-policy.test.ts +608 -0
- package/tests/request-policy/client-isolation.test.ts +149 -0
- package/tests/request-policy/identityBinding.test.ts +75 -0
- package/tests/request-policy/node-policy.test.ts +741 -0
- package/tests/request-policy/policyCore.test.ts +250 -0
- package/tests/request-policy/requestContext.test.ts +80 -0
- package/tests/request-policy/requestFactory.outbound-contract.test.ts +691 -0
- package/tests/request-policy/traceparent.test.ts +55 -0
- package/tests/request-policy/transport-retry.test.ts +370 -0
- package/tests/routeHydration.test.ts +180 -0
- package/tests/routerPrefetchPolicy.test.ts +102 -0
- package/tests/routerProvider.test.ts +38 -0
- package/tests/routerState.test.ts +157 -0
- package/tests/routerStatePlugin.test.ts +108 -0
- package/tests/runtimeContextProjection.test.ts +135 -0
- package/tests/shellStream.test.ts +37 -0
- package/tests/workspaceEvents.test.ts +391 -0
- package/dist/cjs/rscHtmlStream.js +0 -128
- package/dist/esm/rscHtmlStream.mjs +0 -86
- package/dist/esm-node/rscHtmlStream.mjs +0 -87
- package/dist/types/rscHtmlStream.d.ts +0 -4
- package/src/rscHtmlStream.ts +0 -142
- package/tests/rscHtmlStream.test.ts +0 -153
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
import { createClient as createNativeClient } from '@modern-js/create-request/server';
|
|
2
|
+
import * as context from '@modern-js/runtime-extensions/request-context';
|
|
3
|
+
import * as canonical from '@modern-js/runtime-extensions/request-policy';
|
|
4
|
+
import * as server from '@modern-js/runtime-extensions/request-policy/server';
|
|
5
|
+
|
|
6
|
+
const options = {
|
|
7
|
+
path: '/api',
|
|
8
|
+
method: 'GET',
|
|
9
|
+
port: 8080,
|
|
10
|
+
requestId: 'shared-producer',
|
|
11
|
+
};
|
|
12
|
+
|
|
13
|
+
describe('isolated producer policy clients', () => {
|
|
14
|
+
test('does not share producer initialization or request configuration between instances', async () => {
|
|
15
|
+
const first = server.createClient();
|
|
16
|
+
const second = server.createClient();
|
|
17
|
+
const firstRequest = rs.fn(async () => new Response('first'));
|
|
18
|
+
const secondRequest = rs.fn(async () => new Response('second'));
|
|
19
|
+
first.configure({
|
|
20
|
+
requestId: options.requestId,
|
|
21
|
+
request: firstRequest,
|
|
22
|
+
setDomain: () => 'https://first.example',
|
|
23
|
+
operationContract: { enabled: false },
|
|
24
|
+
});
|
|
25
|
+
expect(() => second.createRequest(options)()).toThrow(
|
|
26
|
+
server.ProducerClientNotInitializedError,
|
|
27
|
+
);
|
|
28
|
+
second.configure({
|
|
29
|
+
requestId: options.requestId,
|
|
30
|
+
request: secondRequest,
|
|
31
|
+
setDomain: () => 'https://second.example',
|
|
32
|
+
operationContract: { enabled: false },
|
|
33
|
+
});
|
|
34
|
+
expect(await (await first.createRequest(options)()).text()).toBe('first');
|
|
35
|
+
expect(await (await second.createRequest(options)()).text()).toBe('second');
|
|
36
|
+
expect(firstRequest).toHaveBeenCalledWith(
|
|
37
|
+
'https://first.example/api',
|
|
38
|
+
expect.any(Object),
|
|
39
|
+
);
|
|
40
|
+
expect(secondRequest).toHaveBeenCalledWith(
|
|
41
|
+
'https://second.example/api',
|
|
42
|
+
expect.any(Object),
|
|
43
|
+
);
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
test('does not initialize producer policy by configuring a separate native client', () => {
|
|
47
|
+
createNativeClient().configure({
|
|
48
|
+
requestId: options.requestId,
|
|
49
|
+
request: rs.fn(),
|
|
50
|
+
});
|
|
51
|
+
const producer = server.createClient();
|
|
52
|
+
expect(() => producer.createRequest(options)()).toThrow(
|
|
53
|
+
server.ProducerClientNotInitializedError,
|
|
54
|
+
);
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
test('retains secured behavior for an explicitly empty requestId', () => {
|
|
58
|
+
const client = server.createClient();
|
|
59
|
+
const request = rs.fn();
|
|
60
|
+
client.configure({
|
|
61
|
+
requestId: '',
|
|
62
|
+
request,
|
|
63
|
+
setDomain: () => 'https://producer.example',
|
|
64
|
+
});
|
|
65
|
+
expect(() => client.createRequest({ ...options, requestId: '' })()).toThrow(
|
|
66
|
+
server.OperationContractViolationError,
|
|
67
|
+
);
|
|
68
|
+
expect(request).not.toHaveBeenCalled();
|
|
69
|
+
});
|
|
70
|
+
|
|
71
|
+
test('calls setDomain once after interceptor and keeps native and policy state on rejection', async () => {
|
|
72
|
+
const client = server.createClient();
|
|
73
|
+
const order: string[] = [];
|
|
74
|
+
const request = rs.fn(async () => new Response('original'));
|
|
75
|
+
const setDomain = rs.fn(() => {
|
|
76
|
+
order.push('domain');
|
|
77
|
+
return 'https://original.example';
|
|
78
|
+
});
|
|
79
|
+
client.configure({
|
|
80
|
+
requestId: options.requestId,
|
|
81
|
+
interceptor: () => {
|
|
82
|
+
order.push('interceptor');
|
|
83
|
+
return request;
|
|
84
|
+
},
|
|
85
|
+
setDomain,
|
|
86
|
+
requireEnvelope: false,
|
|
87
|
+
operationContract: { enabled: false },
|
|
88
|
+
});
|
|
89
|
+
const replacement = rs.fn();
|
|
90
|
+
expect(() =>
|
|
91
|
+
client.configure({
|
|
92
|
+
requestId: options.requestId,
|
|
93
|
+
request: replacement,
|
|
94
|
+
setDomain: () => '',
|
|
95
|
+
}),
|
|
96
|
+
).toThrow(server.ProducerDomainNotConfiguredError);
|
|
97
|
+
const response = await client.createRequest(options)();
|
|
98
|
+
expect(await response.text()).toBe('original');
|
|
99
|
+
expect(order).toEqual(['interceptor', 'domain']);
|
|
100
|
+
expect(setDomain).toHaveBeenCalledTimes(1);
|
|
101
|
+
expect(request).toHaveBeenCalledWith(
|
|
102
|
+
'https://original.example/api',
|
|
103
|
+
expect.objectContaining({
|
|
104
|
+
headers: expect.not.objectContaining({
|
|
105
|
+
'x-modernjs-bff-envelope': expect.anything(),
|
|
106
|
+
}),
|
|
107
|
+
}),
|
|
108
|
+
);
|
|
109
|
+
expect(replacement).not.toHaveBeenCalled();
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
test('shares source configure across canonical require/import and explicit server', async () => {
|
|
113
|
+
const required: typeof canonical = require('@modern-js/runtime-extensions/request-policy');
|
|
114
|
+
expect(required.configure).toBe(canonical.configure);
|
|
115
|
+
expect(server.configure).toBe(canonical.configure);
|
|
116
|
+
const request = rs.fn(async () => new Response('shared'));
|
|
117
|
+
required.configure({
|
|
118
|
+
requestId: options.requestId,
|
|
119
|
+
request,
|
|
120
|
+
setDomain: () => 'https://shared.example',
|
|
121
|
+
operationContract: { enabled: false },
|
|
122
|
+
});
|
|
123
|
+
expect(await (await canonical.createRequest(options)()).text()).toBe(
|
|
124
|
+
'shared',
|
|
125
|
+
);
|
|
126
|
+
canonical.configure({
|
|
127
|
+
requestId: options.requestId,
|
|
128
|
+
request,
|
|
129
|
+
setDomain: () => 'https://updated.example',
|
|
130
|
+
operationContract: { enabled: false },
|
|
131
|
+
});
|
|
132
|
+
await required.createRequest(options)();
|
|
133
|
+
expect(request).toHaveBeenLastCalledWith(
|
|
134
|
+
'https://updated.example/api',
|
|
135
|
+
expect.any(Object),
|
|
136
|
+
);
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
test('exports universal context helpers without a request client', () => {
|
|
140
|
+
expect(context.createRequestContextHeaders).toBe(
|
|
141
|
+
canonical.createRequestContextHeaders,
|
|
142
|
+
);
|
|
143
|
+
expect(context.parseTraceparent).toBe(canonical.parseTraceparent);
|
|
144
|
+
expect(context).not.toHaveProperty('configure');
|
|
145
|
+
expect(context).not.toHaveProperty('createClient');
|
|
146
|
+
expect(context).not.toHaveProperty('createRequest');
|
|
147
|
+
expect(context).not.toHaveProperty('createUploader');
|
|
148
|
+
});
|
|
149
|
+
});
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import {
|
|
2
|
+
configure,
|
|
3
|
+
createRequest,
|
|
4
|
+
} from '@modern-js/runtime-extensions/request-policy/server';
|
|
5
|
+
import { storage } from '@modern-js/runtime-utils/node';
|
|
6
|
+
import nock from 'nock';
|
|
7
|
+
|
|
8
|
+
describe('identity binding headers', () => {
|
|
9
|
+
const path = '/api';
|
|
10
|
+
const method = 'GET';
|
|
11
|
+
const response = {
|
|
12
|
+
code: 200,
|
|
13
|
+
data: {
|
|
14
|
+
message: 'hello Modernjs',
|
|
15
|
+
},
|
|
16
|
+
};
|
|
17
|
+
|
|
18
|
+
const run = (
|
|
19
|
+
headers: Record<string, string>,
|
|
20
|
+
callback: () => Promise<void> | void,
|
|
21
|
+
) =>
|
|
22
|
+
storage.run(
|
|
23
|
+
{
|
|
24
|
+
headers,
|
|
25
|
+
monitors: {} as any,
|
|
26
|
+
},
|
|
27
|
+
callback,
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
test('should not forward case-variant protected identity headers beside server-derived binding', async () => {
|
|
31
|
+
const producer = 'producer-identity-case-collision';
|
|
32
|
+
const producerUrl = 'http://127.0.0.1:9088';
|
|
33
|
+
|
|
34
|
+
await run({}, async () => {
|
|
35
|
+
nock(producerUrl).get(path).reply(200, response);
|
|
36
|
+
const customRequest = rs.fn((requestPath: any, init: any) =>
|
|
37
|
+
fetch(requestPath, init),
|
|
38
|
+
);
|
|
39
|
+
|
|
40
|
+
configure({
|
|
41
|
+
request: customRequest as unknown as typeof fetch,
|
|
42
|
+
requestId: producer,
|
|
43
|
+
allowedHeaders: ['X-Tenant-Id'],
|
|
44
|
+
resolveHeaders: () => ({
|
|
45
|
+
'X-Tenant-Id': 'tenant-resolved',
|
|
46
|
+
}),
|
|
47
|
+
operationContract: {
|
|
48
|
+
enabled: false,
|
|
49
|
+
},
|
|
50
|
+
identityBinding: {
|
|
51
|
+
deriveHeaders: () => ({
|
|
52
|
+
'x-tenant-id': 'tenant-bound',
|
|
53
|
+
}),
|
|
54
|
+
strict: false,
|
|
55
|
+
},
|
|
56
|
+
setDomain: () => producerUrl,
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
const request = createRequest(
|
|
60
|
+
path,
|
|
61
|
+
method,
|
|
62
|
+
8080,
|
|
63
|
+
undefined,
|
|
64
|
+
undefined,
|
|
65
|
+
producer,
|
|
66
|
+
);
|
|
67
|
+
|
|
68
|
+
await request();
|
|
69
|
+
const headers = customRequest.mock.calls[0]?.[1]?.headers;
|
|
70
|
+
|
|
71
|
+
expect(headers['X-Tenant-Id']).toBeUndefined();
|
|
72
|
+
expect(headers['x-tenant-id']).toBe('tenant-resolved');
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
});
|