@signalwire/sdk 2.0.0
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/.github/workflows/publish.yml +27 -0
- package/.github/workflows/test.yml +17 -0
- package/CLAUDE.md +112 -0
- package/README.md +254 -0
- package/docs/MIGRATION-2.0.md +81 -0
- package/docs/agent-guide.md +869 -0
- package/docs/agent_guide.md +1026 -0
- package/docs/api-reference.md +2420 -0
- package/docs/api_reference.md +1301 -0
- package/docs/architecture.md +843 -0
- package/docs/cli-guide.md +579 -0
- package/docs/cli_guide.md +448 -0
- package/docs/cloud_functions_guide.md +474 -0
- package/docs/configuration.md +422 -0
- package/docs/contexts-guide.md +787 -0
- package/docs/contexts_guide.md +511 -0
- package/docs/datamap-guide.md +1141 -0
- package/docs/datamap_guide.md +595 -0
- package/docs/llm_parameters.md +239 -0
- package/docs/mcp_gateway_reference.md +648 -0
- package/docs/mcp_integration.md +108 -0
- package/docs/prefabs-guide.md +800 -0
- package/docs/sdk_features.md +477 -0
- package/docs/security.md +436 -0
- package/docs/serverless-guide.md +513 -0
- package/docs/skills-guide.md +857 -0
- package/docs/skills-system.md +301 -0
- package/docs/skills_parameter_schema.md +392 -0
- package/docs/skills_system.md +467 -0
- package/docs/swaig-reference.md +1627 -0
- package/docs/swaig_reference.md +910 -0
- package/docs/swml_service_guide.md +600 -0
- package/docs/third_party_skills.md +533 -0
- package/docs/web_service.md +677 -0
- package/examples/README.md +131 -0
- package/examples/advanced-datamap.ts +100 -0
- package/examples/advanced-dynamic-config.ts +70 -0
- package/examples/auto-vivified.ts +94 -0
- package/examples/call-flow.ts +63 -0
- package/examples/comprehensive-dynamic.ts +125 -0
- package/examples/contexts-steps.ts +65 -0
- package/examples/custom-path.ts +45 -0
- package/examples/datamap-tools.ts +55 -0
- package/examples/datasphere-multi-instance.ts +63 -0
- package/examples/datasphere-serverless-env.ts +68 -0
- package/examples/datasphere-webhook-env.ts +66 -0
- package/examples/datasphere.ts +37 -0
- package/examples/declarative.ts +100 -0
- package/examples/dynamic-config.ts +54 -0
- package/examples/dynamic-info-gatherer.ts +69 -0
- package/examples/dynamic-swml-service.ts +67 -0
- package/examples/gather-info.ts +71 -0
- package/examples/gather-per-question-functions-demo.ts +140 -0
- package/examples/joke-agent.ts +34 -0
- package/examples/kubernetes-agent.ts +45 -0
- package/examples/llm-params.ts +69 -0
- package/examples/mcp-agent.ts +84 -0
- package/examples/mcp-gateway.ts +35 -0
- package/examples/multi-agent.ts +73 -0
- package/examples/multi-endpoint.ts +79 -0
- package/examples/pom-prompt.ts +71 -0
- package/examples/prefab-concierge.ts +47 -0
- package/examples/prefab-faq.ts +54 -0
- package/examples/prefab-info-gatherer.ts +33 -0
- package/examples/prefab-receptionist.ts +36 -0
- package/examples/prefab-survey.ts +68 -0
- package/examples/record-call.ts +67 -0
- package/examples/relay-demo.ts +33 -0
- package/examples/room-and-sip.ts +94 -0
- package/examples/serverless-lambda.ts +35 -0
- package/examples/session-state.ts +83 -0
- package/examples/simple-agent.ts +36 -0
- package/examples/simple-static.ts +29 -0
- package/examples/skills-demo.ts +38 -0
- package/examples/step-function-inheritance-demo.ts +124 -0
- package/examples/swaig-features.ts +187 -0
- package/examples/swml-service-routing.ts +66 -0
- package/examples/swml-service.ts +38 -0
- package/examples/tap.ts +68 -0
- package/examples/verb-methods.ts +45 -0
- package/examples/web-search-multi-instance.ts +72 -0
- package/examples/web-search.ts +38 -0
- package/examples/wikipedia.ts +36 -0
- package/livewire/README.md +140 -0
- package/livewire/docs/migration-guide.md +228 -0
- package/livewire/examples/livewire-basic-agent.ts +74 -0
- package/livewire/examples/livewire-handoff.ts +197 -0
- package/livewire/examples/livewire-multi-tool.ts +117 -0
- package/package.json +38 -0
- package/relay/README.md +70 -0
- package/relay/RELAY_IMPLEMENTATION_GUIDE.md +1257 -0
- package/relay/docs/call-methods.md +474 -0
- package/relay/docs/client-reference.md +142 -0
- package/relay/docs/events.md +134 -0
- package/relay/docs/getting-started.md +134 -0
- package/relay/docs/guide.md +306 -0
- package/relay/docs/messaging.md +182 -0
- package/relay/examples/relay-inbound.ts +66 -0
- package/relay/examples/relay-messaging.ts +71 -0
- package/relay/examples/relay-outbound.ts +76 -0
- package/rest/README.md +95 -0
- package/rest/docs/calling.md +273 -0
- package/rest/docs/client-reference.md +107 -0
- package/rest/docs/compat.md +204 -0
- package/rest/docs/fabric.md +183 -0
- package/rest/docs/getting-started.md +110 -0
- package/rest/docs/guide.md +351 -0
- package/rest/docs/namespaces.md +285 -0
- package/rest/examples/rest-10dlc-registration.ts +161 -0
- package/rest/examples/rest-calling-ivr-and-ai.ts +102 -0
- package/rest/examples/rest-calling-play-and-record.ts +91 -0
- package/rest/examples/rest-client.ts +65 -0
- package/rest/examples/rest-compat-laml.ts +210 -0
- package/rest/examples/rest-datasphere-search.ts +82 -0
- package/rest/examples/rest-fabric-conferences-and-routing.ts +144 -0
- package/rest/examples/rest-fabric-subscribers-and-sip.ts +108 -0
- package/rest/examples/rest-fabric-swml-and-callflows.ts +99 -0
- package/rest/examples/rest-manage-resources.ts +65 -0
- package/rest/examples/rest-phone-number-management.ts +197 -0
- package/rest/examples/rest-queues-mfa-and-recordings.ts +143 -0
- package/rest/examples/rest-video-rooms.ts +186 -0
- package/src/AgentBase.ts +2489 -0
- package/src/AgentServer.ts +415 -0
- package/src/AuthHandler.ts +256 -0
- package/src/ConfigLoader.ts +447 -0
- package/src/ContextBuilder.ts +1150 -0
- package/src/DataMap.ts +449 -0
- package/src/FunctionResult.ts +866 -0
- package/src/Logger.ts +337 -0
- package/src/PomBuilder.ts +439 -0
- package/src/PromptManager.ts +133 -0
- package/src/SWMLHandler.ts +298 -0
- package/src/SWMLService.ts +717 -0
- package/src/SchemaUtils.ts +361 -0
- package/src/SecurityUtils.ts +153 -0
- package/src/ServerlessAdapter.ts +221 -0
- package/src/SessionManager.ts +311 -0
- package/src/SslConfig.ts +118 -0
- package/src/SwaigFunction.ts +276 -0
- package/src/SwmlBuilder.ts +258 -0
- package/src/SwmlVerbMethods.generated.ts +234 -0
- package/src/TypeInference.ts +181 -0
- package/src/WebService.ts +619 -0
- package/src/cli/agent-loader.ts +166 -0
- package/src/cli/mock-data.ts +111 -0
- package/src/cli/swaig-test.ts +452 -0
- package/src/generateVerbTypes.ts +322 -0
- package/src/index.ts +167 -0
- package/src/livewire/index.ts +950 -0
- package/src/prefabs/ConciergeAgent.ts +287 -0
- package/src/prefabs/FAQBotAgent.ts +384 -0
- package/src/prefabs/InfoGathererAgent.ts +339 -0
- package/src/prefabs/ReceptionistAgent.ts +366 -0
- package/src/prefabs/SurveyAgent.ts +646 -0
- package/src/prefabs/index.ts +27 -0
- package/src/relay/Action.ts +314 -0
- package/src/relay/Call.ts +854 -0
- package/src/relay/Deferred.ts +71 -0
- package/src/relay/Message.ts +148 -0
- package/src/relay/RelayClient.ts +1036 -0
- package/src/relay/RelayError.ts +14 -0
- package/src/relay/RelayEvent.ts +892 -0
- package/src/relay/constants.ts +132 -0
- package/src/relay/index.ts +123 -0
- package/src/relay/types.ts +149 -0
- package/src/rest/HttpClient.ts +103 -0
- package/src/rest/RestError.ts +31 -0
- package/src/rest/base/BaseResource.ts +19 -0
- package/src/rest/base/CrudResource.ts +51 -0
- package/src/rest/base/CrudWithAddresses.ts +26 -0
- package/src/rest/index.ts +200 -0
- package/src/rest/namespaces/addresses.ts +32 -0
- package/src/rest/namespaces/calling.ts +187 -0
- package/src/rest/namespaces/chat.ts +20 -0
- package/src/rest/namespaces/compat.ts +352 -0
- package/src/rest/namespaces/datasphere.ts +45 -0
- package/src/rest/namespaces/fabric.ts +222 -0
- package/src/rest/namespaces/imported-numbers.ts +20 -0
- package/src/rest/namespaces/logs.ts +84 -0
- package/src/rest/namespaces/lookup.ts +21 -0
- package/src/rest/namespaces/mfa.ts +30 -0
- package/src/rest/namespaces/number-groups.ts +38 -0
- package/src/rest/namespaces/phone-numbers.ts +44 -0
- package/src/rest/namespaces/project.ts +36 -0
- package/src/rest/namespaces/pubsub.ts +20 -0
- package/src/rest/namespaces/queues.ts +33 -0
- package/src/rest/namespaces/recordings.ts +28 -0
- package/src/rest/namespaces/registry.ts +101 -0
- package/src/rest/namespaces/short-codes.ts +28 -0
- package/src/rest/namespaces/sip-profile.ts +25 -0
- package/src/rest/namespaces/verified-callers.ts +27 -0
- package/src/rest/namespaces/video.ts +165 -0
- package/src/rest/pagination.ts +84 -0
- package/src/rest/types.ts +61 -0
- package/src/schema.json +12250 -0
- package/src/skills/SkillBase.ts +547 -0
- package/src/skills/SkillManager.ts +415 -0
- package/src/skills/SkillRegistry.ts +367 -0
- package/src/skills/builtin/api_ninjas_trivia.ts +280 -0
- package/src/skills/builtin/ask_claude.ts +241 -0
- package/src/skills/builtin/claude_skills.ts +978 -0
- package/src/skills/builtin/custom_skills.ts +312 -0
- package/src/skills/builtin/datasphere.ts +438 -0
- package/src/skills/builtin/datasphere_serverless.ts +339 -0
- package/src/skills/builtin/datetime.ts +130 -0
- package/src/skills/builtin/google_maps.ts +651 -0
- package/src/skills/builtin/index.ts +88 -0
- package/src/skills/builtin/info_gatherer.ts +405 -0
- package/src/skills/builtin/joke.ts +191 -0
- package/src/skills/builtin/math.ts +142 -0
- package/src/skills/builtin/mcp_gateway.ts +677 -0
- package/src/skills/builtin/native_vector_search.ts +901 -0
- package/src/skills/builtin/play_background_file.ts +358 -0
- package/src/skills/builtin/spider.ts +869 -0
- package/src/skills/builtin/swml_transfer.ts +635 -0
- package/src/skills/builtin/weather_api.ts +248 -0
- package/src/skills/builtin/web_search.ts +1074 -0
- package/src/skills/builtin/wikipedia_search.ts +299 -0
- package/src/skills/index.ts +12 -0
- package/src/types.ts +132 -0
- package/tests/AgentBase.test.ts +1093 -0
- package/tests/AgentServer.test.ts +126 -0
- package/tests/AuthHandler.test.ts +133 -0
- package/tests/ConfigLoader.test.ts +151 -0
- package/tests/ContextBuilder.test.ts +108 -0
- package/tests/DataMap.test.ts +367 -0
- package/tests/EphemeralSkillCopy.test.ts +107 -0
- package/tests/FunctionResult.test.ts +298 -0
- package/tests/GracefulShutdown.test.ts +46 -0
- package/tests/Logger.test.ts +420 -0
- package/tests/PomBuilder.test.ts +228 -0
- package/tests/ProxyDetection.test.ts +228 -0
- package/tests/SWMLService.test.ts +320 -0
- package/tests/SWMLVerbHandler.test.ts +523 -0
- package/tests/SchemaUtils.test.ts +106 -0
- package/tests/SchemaUtils.verb.test.ts +206 -0
- package/tests/SecurityUtils.test.ts +192 -0
- package/tests/ServerlessAdapter.test.ts +222 -0
- package/tests/SessionManager.test.ts +257 -0
- package/tests/SkillBaseFeatures.test.ts +130 -0
- package/tests/SkillMultiInstance.test.ts +102 -0
- package/tests/SkillParameterSchemas.test.ts +134 -0
- package/tests/SkillRegistrySchema.test.ts +84 -0
- package/tests/SslConfig.test.ts +97 -0
- package/tests/SwmlBuilder.test.ts +400 -0
- package/tests/TypeInference.test.ts +165 -0
- package/tests/VerbHandlerRegistry.test.ts +128 -0
- package/tests/cli/mock-data.test.ts +113 -0
- package/tests/cli/swaig-test.test.ts +108 -0
- package/tests/examples.test.ts +194 -0
- package/tests/fixtures/scrape-parity/README.md +53 -0
- package/tests/fixtures/scrape-parity/expected/01_simple_article.json +5 -0
- package/tests/fixtures/scrape-parity/expected/02_class_based_noise.json +5 -0
- package/tests/fixtures/scrape-parity/expected/03_nested_containers.json +5 -0
- package/tests/fixtures/scrape-parity/expected/04_bare_body.json +5 -0
- package/tests/fixtures/scrape-parity/expected/05_malformed.json +5 -0
- package/tests/fixtures/scrape-parity/expected/06_multi_class.json +5 -0
- package/tests/fixtures/scrape-parity/expected/07_anchor_pattern.json +5 -0
- package/tests/fixtures/scrape-parity/expected/08_inline_script.json +5 -0
- package/tests/fixtures/scrape-parity/expected/09_whitespace_nbsp.json +5 -0
- package/tests/fixtures/scrape-parity/expected/10_entity_unicode.json +5 -0
- package/tests/fixtures/scrape-parity/expected/11_cdata_comments.json +5 -0
- package/tests/fixtures/scrape-parity/expected/12_deep_nested_removals.json +5 -0
- package/tests/fixtures/scrape-parity/html/01_simple_article.html +18 -0
- package/tests/fixtures/scrape-parity/html/02_class_based_noise.html +18 -0
- package/tests/fixtures/scrape-parity/html/03_nested_containers.html +13 -0
- package/tests/fixtures/scrape-parity/html/04_bare_body.html +9 -0
- package/tests/fixtures/scrape-parity/html/05_malformed.html +11 -0
- package/tests/fixtures/scrape-parity/html/06_multi_class.html +18 -0
- package/tests/fixtures/scrape-parity/html/07_anchor_pattern.html +12 -0
- package/tests/fixtures/scrape-parity/html/08_inline_script.html +17 -0
- package/tests/fixtures/scrape-parity/html/09_whitespace_nbsp.html +21 -0
- package/tests/fixtures/scrape-parity/html/10_entity_unicode.html +10 -0
- package/tests/fixtures/scrape-parity/html/11_cdata_comments.html +13 -0
- package/tests/fixtures/scrape-parity/html/12_deep_nested_removals.html +24 -0
- package/tests/fixtures/scrape-parity/python_extract.py +109 -0
- package/tests/livewire/livewire.test.ts +780 -0
- package/tests/mcp.test.ts +221 -0
- package/tests/prefabs/prefabs.test.ts +1093 -0
- package/tests/relay/Action.test.ts +392 -0
- package/tests/relay/Call.test.ts +535 -0
- package/tests/relay/Deferred.test.ts +71 -0
- package/tests/relay/Message.test.ts +164 -0
- package/tests/relay/RelayClient.test.ts +779 -0
- package/tests/relay/RelayEvent.test.ts +463 -0
- package/tests/relay/helpers.ts +79 -0
- package/tests/rest/HttpClient.test.ts +274 -0
- package/tests/rest/RestError.test.ts +53 -0
- package/tests/rest/calling.test.ts +156 -0
- package/tests/rest/client.test.ts +197 -0
- package/tests/rest/compat.test.ts +335 -0
- package/tests/rest/datasphere.test.ts +71 -0
- package/tests/rest/fabric.test.ts +186 -0
- package/tests/rest/helpers.ts +95 -0
- package/tests/rest/logs.test.ts +68 -0
- package/tests/rest/pagination.test.ts +133 -0
- package/tests/rest/registry.test.ts +94 -0
- package/tests/rest/relay-rest.test.ts +290 -0
- package/tests/rest/video.test.ts +173 -0
- package/tests/setup.ts +6 -0
- package/tests/skills/SkillBase.test.ts +108 -0
- package/tests/skills/SkillManager.test.ts +268 -0
- package/tests/skills/SkillRegistry.test.ts +176 -0
- package/tests/skills/builtin.test.ts +1472 -0
- package/tests/skills/claude-skills.test.ts +54 -0
- package/tests/skills/custom-skills.test.ts +53 -0
- package/tests/skills/datasphere-serverless.test.ts +70 -0
- package/tests/skills/datasphere.test.ts +107 -0
- package/tests/skills/datetime.test.ts +101 -0
- package/tests/skills/google-maps.test.ts +78 -0
- package/tests/skills/info-gatherer.test.ts +411 -0
- package/tests/skills/joke.test.ts +81 -0
- package/tests/skills/math.test.ts +68 -0
- package/tests/skills/mcp-gateway.test.ts +101 -0
- package/tests/skills/play-background.test.ts +54 -0
- package/tests/skills/spider.test.ts +108 -0
- package/tests/skills/swml-transfer.test.ts +178 -0
- package/tests/skills/trivia.test.ts +54 -0
- package/tests/skills/vector-search.test.ts +135 -0
- package/tests/skills/weather-api.test.ts +77 -0
- package/tests/skills/web-search-parity.test.ts +59 -0
- package/tests/skills/web-search.test.ts +103 -0
- package/tests/skills/wikipedia.test.ts +63 -0
- package/tsconfig.json +18 -0
- package/vitest.config.ts +9 -0
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import { HttpClient } from '../../src/rest/HttpClient.js';
|
|
2
|
+
import { VideoNamespace } from '../../src/rest/namespaces/video.js';
|
|
3
|
+
import { mockClientOptions } from './helpers.js';
|
|
4
|
+
|
|
5
|
+
describe('VideoNamespace', () => {
|
|
6
|
+
function setup(responses: any[] = [{ status: 200, body: { data: [] } }]) {
|
|
7
|
+
const { options, getRequests } = mockClientOptions(responses);
|
|
8
|
+
const http = new HttpClient(options);
|
|
9
|
+
const video = new VideoNamespace(http);
|
|
10
|
+
return { video, getRequests };
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
describe('Rooms', () => {
|
|
14
|
+
it('lists rooms', async () => {
|
|
15
|
+
const { video, getRequests } = setup();
|
|
16
|
+
await video.rooms.list();
|
|
17
|
+
expect(getRequests()[0].url).toContain('/api/video/rooms');
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it('creates a room', async () => {
|
|
21
|
+
const { video, getRequests } = setup([{ status: 200, body: { id: 'r1' } }]);
|
|
22
|
+
await video.rooms.create({ name: 'test' });
|
|
23
|
+
expect(getRequests()[0].method).toBe('POST');
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it('updates with PUT', async () => {
|
|
27
|
+
const { video, getRequests } = setup([{ status: 200, body: {} }]);
|
|
28
|
+
await video.rooms.update('r1', { name: 'updated' });
|
|
29
|
+
expect(getRequests()[0].method).toBe('PUT');
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it('lists streams for a room', async () => {
|
|
33
|
+
const { video, getRequests } = setup();
|
|
34
|
+
await video.rooms.listStreams('r1');
|
|
35
|
+
expect(getRequests()[0].url).toContain('/api/video/rooms/r1/streams');
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
it('creates a stream for a room', async () => {
|
|
39
|
+
const { video, getRequests } = setup([{ status: 200, body: {} }]);
|
|
40
|
+
await video.rooms.createStream('r1', { url: 'rtmp://...' });
|
|
41
|
+
expect(getRequests()[0].method).toBe('POST');
|
|
42
|
+
expect(getRequests()[0].url).toContain('/api/video/rooms/r1/streams');
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
describe('Room Tokens', () => {
|
|
47
|
+
it('creates a room token', async () => {
|
|
48
|
+
const { video, getRequests } = setup([{ status: 200, body: { token: 'xxx' } }]);
|
|
49
|
+
await video.roomTokens.create({ room_name: 'test' });
|
|
50
|
+
expect(getRequests()[0].url).toContain('/api/video/room_tokens');
|
|
51
|
+
expect(getRequests()[0].method).toBe('POST');
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
describe('Room Sessions', () => {
|
|
56
|
+
it('lists sessions', async () => {
|
|
57
|
+
const { video, getRequests } = setup();
|
|
58
|
+
await video.roomSessions.list();
|
|
59
|
+
expect(getRequests()[0].url).toContain('/api/video/room_sessions');
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it('gets a session', async () => {
|
|
63
|
+
const { video, getRequests } = setup([{ status: 200, body: { id: 's1' } }]);
|
|
64
|
+
await video.roomSessions.get('s1');
|
|
65
|
+
expect(getRequests()[0].url).toContain('/api/video/room_sessions/s1');
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('lists events for a session', async () => {
|
|
69
|
+
const { video, getRequests } = setup();
|
|
70
|
+
await video.roomSessions.listEvents('s1');
|
|
71
|
+
expect(getRequests()[0].url).toContain('/api/video/room_sessions/s1/events');
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
it('lists members for a session', async () => {
|
|
75
|
+
const { video, getRequests } = setup();
|
|
76
|
+
await video.roomSessions.listMembers('s1');
|
|
77
|
+
expect(getRequests()[0].url).toContain('/api/video/room_sessions/s1/members');
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it('lists recordings for a session', async () => {
|
|
81
|
+
const { video, getRequests } = setup();
|
|
82
|
+
await video.roomSessions.listRecordings('s1');
|
|
83
|
+
expect(getRequests()[0].url).toContain('/api/video/room_sessions/s1/recordings');
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
describe('Room Recordings', () => {
|
|
88
|
+
it('lists recordings', async () => {
|
|
89
|
+
const { video, getRequests } = setup();
|
|
90
|
+
await video.roomRecordings.list();
|
|
91
|
+
expect(getRequests()[0].url).toContain('/api/video/room_recordings');
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it('deletes a recording', async () => {
|
|
95
|
+
const { video, getRequests } = setup([{ status: 204 }]);
|
|
96
|
+
await video.roomRecordings.delete('rec1');
|
|
97
|
+
expect(getRequests()[0].method).toBe('DELETE');
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it('lists events for a recording', async () => {
|
|
101
|
+
const { video, getRequests } = setup();
|
|
102
|
+
await video.roomRecordings.listEvents('rec1');
|
|
103
|
+
expect(getRequests()[0].url).toContain('/api/video/room_recordings/rec1/events');
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
describe('Conferences', () => {
|
|
108
|
+
it('lists conferences', async () => {
|
|
109
|
+
const { video, getRequests } = setup();
|
|
110
|
+
await video.conferences.list();
|
|
111
|
+
expect(getRequests()[0].url).toContain('/api/video/conferences');
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
it('updates with PUT', async () => {
|
|
115
|
+
const { video, getRequests } = setup([{ status: 200, body: {} }]);
|
|
116
|
+
await video.conferences.update('c1', { name: 'updated' });
|
|
117
|
+
expect(getRequests()[0].method).toBe('PUT');
|
|
118
|
+
});
|
|
119
|
+
|
|
120
|
+
it('lists conference tokens', async () => {
|
|
121
|
+
const { video, getRequests } = setup();
|
|
122
|
+
await video.conferences.listConferenceTokens('c1');
|
|
123
|
+
expect(getRequests()[0].url).toContain('/api/video/conferences/c1/conference_tokens');
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
it('lists streams for a conference', async () => {
|
|
127
|
+
const { video, getRequests } = setup();
|
|
128
|
+
await video.conferences.listStreams('c1');
|
|
129
|
+
expect(getRequests()[0].url).toContain('/api/video/conferences/c1/streams');
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
it('creates a stream for a conference', async () => {
|
|
133
|
+
const { video, getRequests } = setup([{ status: 200, body: {} }]);
|
|
134
|
+
await video.conferences.createStream('c1', { url: 'rtmp://...' });
|
|
135
|
+
expect(getRequests()[0].method).toBe('POST');
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
describe('Conference Tokens', () => {
|
|
140
|
+
it('gets a token', async () => {
|
|
141
|
+
const { video, getRequests } = setup([{ status: 200, body: { id: 't1' } }]);
|
|
142
|
+
await video.conferenceTokens.get('t1');
|
|
143
|
+
expect(getRequests()[0].url).toContain('/api/video/conference_tokens/t1');
|
|
144
|
+
});
|
|
145
|
+
|
|
146
|
+
it('resets a token', async () => {
|
|
147
|
+
const { video, getRequests } = setup([{ status: 200, body: {} }]);
|
|
148
|
+
await video.conferenceTokens.reset('t1');
|
|
149
|
+
expect(getRequests()[0].url).toContain('/api/video/conference_tokens/t1/reset');
|
|
150
|
+
expect(getRequests()[0].method).toBe('POST');
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
describe('Streams', () => {
|
|
155
|
+
it('gets a stream', async () => {
|
|
156
|
+
const { video, getRequests } = setup([{ status: 200, body: { id: 'st1' } }]);
|
|
157
|
+
await video.streams.get('st1');
|
|
158
|
+
expect(getRequests()[0].url).toContain('/api/video/streams/st1');
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
it('updates with PUT', async () => {
|
|
162
|
+
const { video, getRequests } = setup([{ status: 200, body: {} }]);
|
|
163
|
+
await video.streams.update('st1', { name: 'updated' });
|
|
164
|
+
expect(getRequests()[0].method).toBe('PUT');
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
it('deletes a stream', async () => {
|
|
168
|
+
const { video, getRequests } = setup([{ status: 204 }]);
|
|
169
|
+
await video.streams.delete('st1');
|
|
170
|
+
expect(getRequests()[0].method).toBe('DELETE');
|
|
171
|
+
});
|
|
172
|
+
});
|
|
173
|
+
});
|
package/tests/setup.ts
ADDED
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
import { describe, it, expect } from 'vitest';
|
|
2
|
+
import { SkillBase, type SkillToolDefinition } from '../../src/skills/SkillBase.js';
|
|
3
|
+
import { FunctionResult } from '../../src/FunctionResult.js';
|
|
4
|
+
|
|
5
|
+
class TestSkill extends SkillBase {
|
|
6
|
+
static override SKILL_NAME = 'test_skill';
|
|
7
|
+
static override SKILL_DESCRIPTION = 'A test skill';
|
|
8
|
+
static override REQUIRED_ENV_VARS: readonly string[] = ['TEST_API_KEY'];
|
|
9
|
+
|
|
10
|
+
getTools(): SkillToolDefinition[] {
|
|
11
|
+
return [{
|
|
12
|
+
name: 'test_tool',
|
|
13
|
+
description: 'A test tool',
|
|
14
|
+
parameters: { query: { type: 'string' } },
|
|
15
|
+
handler: (args) => new FunctionResult(`Result: ${args['query']}`),
|
|
16
|
+
}];
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
getPromptSections() {
|
|
20
|
+
return [{ title: 'Test Section', body: 'Test body' }];
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
getHints() {
|
|
24
|
+
return ['test hint'];
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
getGlobalData() {
|
|
28
|
+
return { test_key: 'test_value' };
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
describe('SkillBase', () => {
|
|
33
|
+
it('has a skill name and instance ID', () => {
|
|
34
|
+
const skill = new TestSkill();
|
|
35
|
+
expect(skill.skillName).toBe('test_skill');
|
|
36
|
+
expect(skill.instanceId).toContain('test_skill-');
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it('returns manifest', () => {
|
|
40
|
+
const skill = new TestSkill();
|
|
41
|
+
const klass = skill.constructor as typeof SkillBase;
|
|
42
|
+
expect(klass.SKILL_NAME).toBe('test_skill');
|
|
43
|
+
expect(klass.SKILL_VERSION).toBe('1.0.0');
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it('returns tools', () => {
|
|
47
|
+
const skill = new TestSkill();
|
|
48
|
+
const tools = skill.getTools();
|
|
49
|
+
expect(tools.length).toBe(1);
|
|
50
|
+
expect(tools[0].name).toBe('test_tool');
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it('returns prompt sections', () => {
|
|
54
|
+
const skill = new TestSkill();
|
|
55
|
+
expect(skill.getPromptSections()).toHaveLength(1);
|
|
56
|
+
});
|
|
57
|
+
|
|
58
|
+
it('returns hints', () => {
|
|
59
|
+
const skill = new TestSkill();
|
|
60
|
+
expect(skill.getHints()).toEqual(['test hint']);
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it('returns global data', () => {
|
|
64
|
+
const skill = new TestSkill();
|
|
65
|
+
expect(skill.getGlobalData()).toEqual({ test_key: 'test_value' });
|
|
66
|
+
});
|
|
67
|
+
|
|
68
|
+
it('validates missing env vars', () => {
|
|
69
|
+
const saved = process.env['TEST_API_KEY'];
|
|
70
|
+
delete process.env['TEST_API_KEY'];
|
|
71
|
+
try {
|
|
72
|
+
const skill = new TestSkill();
|
|
73
|
+
const missing = skill.validateEnvVars();
|
|
74
|
+
expect(missing).toContain('TEST_API_KEY');
|
|
75
|
+
} finally {
|
|
76
|
+
if (saved) process.env['TEST_API_KEY'] = saved;
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it('validates present env vars', () => {
|
|
81
|
+
process.env['TEST_API_KEY'] = 'test-key';
|
|
82
|
+
try {
|
|
83
|
+
const skill = new TestSkill();
|
|
84
|
+
expect(skill.validateEnvVars()).toHaveLength(0);
|
|
85
|
+
} finally {
|
|
86
|
+
delete process.env['TEST_API_KEY'];
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it('initialized state', () => {
|
|
91
|
+
const skill = new TestSkill();
|
|
92
|
+
expect(skill.isInitialized()).toBe(false);
|
|
93
|
+
skill.markInitialized();
|
|
94
|
+
expect(skill.isInitialized()).toBe(true);
|
|
95
|
+
});
|
|
96
|
+
|
|
97
|
+
it('getConfig with default', () => {
|
|
98
|
+
const skill = new TestSkill({ apiUrl: 'https://example.com' });
|
|
99
|
+
expect(skill.getConfig('apiUrl')).toBe('https://example.com');
|
|
100
|
+
expect(skill.getConfig('missing', 'default')).toBe('default');
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it('setup returns true by default and cleanup is no-op', async () => {
|
|
104
|
+
const skill = new TestSkill();
|
|
105
|
+
await expect(skill.setup()).resolves.toBe(true);
|
|
106
|
+
await expect(skill.cleanup()).resolves.toBeUndefined();
|
|
107
|
+
});
|
|
108
|
+
});
|
|
@@ -0,0 +1,268 @@
|
|
|
1
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { SkillManager } from '../../src/skills/SkillManager.js';
|
|
3
|
+
import { SkillBase, type SkillToolDefinition } from '../../src/skills/SkillBase.js';
|
|
4
|
+
import { SkillRegistry } from '../../src/skills/SkillRegistry.js';
|
|
5
|
+
import { FunctionResult } from '../../src/FunctionResult.js';
|
|
6
|
+
import { suppressAllLogs } from '../../src/Logger.js';
|
|
7
|
+
|
|
8
|
+
class MockSkill extends SkillBase {
|
|
9
|
+
static override SKILL_NAME = 'mock_skill';
|
|
10
|
+
static override SKILL_DESCRIPTION = 'Mock';
|
|
11
|
+
|
|
12
|
+
setupCalled = false;
|
|
13
|
+
cleanupCalled = false;
|
|
14
|
+
|
|
15
|
+
getTools(): SkillToolDefinition[] {
|
|
16
|
+
return [{
|
|
17
|
+
name: `${this.skillName}_tool`,
|
|
18
|
+
description: 'Mock tool',
|
|
19
|
+
handler: () => new FunctionResult('mock result'),
|
|
20
|
+
}];
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
getPromptSections() {
|
|
24
|
+
return [{ title: `${this.skillName} Section`, body: 'Mock body' }];
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
getHints() {
|
|
28
|
+
return [`${this.skillName} hint`];
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
getGlobalData() {
|
|
32
|
+
return { [`${this.skillName}_data`]: true };
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
override async setup(): Promise<boolean> {
|
|
36
|
+
this.setupCalled = true;
|
|
37
|
+
return true;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
async cleanup() {
|
|
41
|
+
this.cleanupCalled = true;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Factory for naming a fresh MockSkill subclass. Needed because SKILL_NAME
|
|
47
|
+
* is now a static class attribute (Python parity) — creating two distinct
|
|
48
|
+
* "named" mocks means creating two distinct classes.
|
|
49
|
+
*/
|
|
50
|
+
function makeMockSkill(name = 'mock_skill', config?: Record<string, unknown>): MockSkill {
|
|
51
|
+
class Named extends MockSkill {
|
|
52
|
+
static override SKILL_NAME = name;
|
|
53
|
+
}
|
|
54
|
+
return new Named(config);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** Multi-instance mock skill that uses instanceId to allow duplicates. */
|
|
58
|
+
class MultiMockSkill extends MockSkill {
|
|
59
|
+
static override SKILL_NAME = 'multi_mock_skill';
|
|
60
|
+
static override SUPPORTS_MULTIPLE_INSTANCES = true;
|
|
61
|
+
|
|
62
|
+
override getInstanceKey(): string {
|
|
63
|
+
return this.instanceId; // Each instance gets a unique key
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function makeMultiMockSkill(name = 'multi_mock_skill'): MultiMockSkill {
|
|
68
|
+
class Named extends MultiMockSkill {
|
|
69
|
+
static override SKILL_NAME = name;
|
|
70
|
+
}
|
|
71
|
+
return new Named();
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
describe('SkillManager', () => {
|
|
75
|
+
let manager: SkillManager;
|
|
76
|
+
|
|
77
|
+
beforeEach(() => {
|
|
78
|
+
suppressAllLogs(true);
|
|
79
|
+
manager = new SkillManager();
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
afterEach(() => {
|
|
83
|
+
SkillRegistry.resetInstance();
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
it('adds a skill', async () => {
|
|
87
|
+
const skill = new MockSkill();
|
|
88
|
+
await manager.addSkill(skill);
|
|
89
|
+
expect(manager.size).toBe(1);
|
|
90
|
+
expect(skill.setupCalled).toBe(true);
|
|
91
|
+
expect(skill.isInitialized()).toBe(true);
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it('rejects duplicate skill instances', async () => {
|
|
95
|
+
const skill = new MockSkill();
|
|
96
|
+
await manager.addSkill(skill);
|
|
97
|
+
await expect(manager.addSkill(skill)).rejects.toThrow('already loaded');
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
it('removes a skill by instance ID', async () => {
|
|
101
|
+
const skill = new MockSkill();
|
|
102
|
+
await manager.addSkill(skill);
|
|
103
|
+
const removed = await manager.removeSkill(skill.instanceId);
|
|
104
|
+
expect(removed).toBe(true);
|
|
105
|
+
expect(skill.cleanupCalled).toBe(true);
|
|
106
|
+
expect(manager.size).toBe(0);
|
|
107
|
+
});
|
|
108
|
+
|
|
109
|
+
it('returns false when removing non-existent skill', async () => {
|
|
110
|
+
expect(await manager.removeSkill('nope')).toBe(false);
|
|
111
|
+
});
|
|
112
|
+
|
|
113
|
+
it('removes skills by name', async () => {
|
|
114
|
+
const s1 = makeMultiMockSkill('weather');
|
|
115
|
+
const s2 = makeMultiMockSkill('weather');
|
|
116
|
+
const s3 = makeMockSkill('math');
|
|
117
|
+
await manager.addSkill(s1);
|
|
118
|
+
await manager.addSkill(s2);
|
|
119
|
+
await manager.addSkill(s3);
|
|
120
|
+
const count = await manager.removeSkillByName('weather');
|
|
121
|
+
expect(count).toBe(2);
|
|
122
|
+
expect(manager.size).toBe(1);
|
|
123
|
+
});
|
|
124
|
+
|
|
125
|
+
it('hasSkill checks by name', async () => {
|
|
126
|
+
const skill = makeMockSkill('datetime');
|
|
127
|
+
await manager.addSkill(skill);
|
|
128
|
+
expect(manager.hasSkill('datetime')).toBe(true);
|
|
129
|
+
expect(manager.hasSkill('missing')).toBe(false);
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
it('getSkill by instance ID', async () => {
|
|
133
|
+
const skill = new MockSkill();
|
|
134
|
+
await manager.addSkill(skill);
|
|
135
|
+
expect(manager.getSkill(skill.instanceId)).toBe(skill);
|
|
136
|
+
expect(manager.getSkill('nope')).toBeUndefined();
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
it('listSkills returns all loaded skills', async () => {
|
|
140
|
+
await manager.addSkill(makeMockSkill('a'));
|
|
141
|
+
await manager.addSkill(makeMockSkill('b'));
|
|
142
|
+
const list = manager.listSkills();
|
|
143
|
+
expect(list).toHaveLength(2);
|
|
144
|
+
expect(list.map(s => s.name)).toContain('a');
|
|
145
|
+
expect(list.map(s => s.name)).toContain('b');
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
it('getAllTools aggregates tools from all skills', async () => {
|
|
149
|
+
await manager.addSkill(makeMockSkill('a'));
|
|
150
|
+
await manager.addSkill(makeMockSkill('b'));
|
|
151
|
+
const tools = manager.getAllTools();
|
|
152
|
+
expect(tools).toHaveLength(2);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it('getAllPromptSections aggregates sections', async () => {
|
|
156
|
+
await manager.addSkill(makeMockSkill('a'));
|
|
157
|
+
await manager.addSkill(makeMockSkill('b'));
|
|
158
|
+
expect(manager.getAllPromptSections()).toHaveLength(2);
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
it('getAllHints aggregates hints', async () => {
|
|
162
|
+
await manager.addSkill(makeMockSkill('a'));
|
|
163
|
+
await manager.addSkill(makeMockSkill('b'));
|
|
164
|
+
expect(manager.getAllHints()).toHaveLength(2);
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
it('getMergedGlobalData merges all skill data', async () => {
|
|
168
|
+
await manager.addSkill(makeMockSkill('a'));
|
|
169
|
+
await manager.addSkill(makeMockSkill('b'));
|
|
170
|
+
const data = manager.getMergedGlobalData();
|
|
171
|
+
expect(data['a_data']).toBe(true);
|
|
172
|
+
expect(data['b_data']).toBe(true);
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
it('clear removes all skills and calls cleanup', async () => {
|
|
176
|
+
const s1 = makeMockSkill('a');
|
|
177
|
+
const s2 = makeMockSkill('b');
|
|
178
|
+
await manager.addSkill(s1);
|
|
179
|
+
await manager.addSkill(s2);
|
|
180
|
+
await manager.clear();
|
|
181
|
+
expect(manager.size).toBe(0);
|
|
182
|
+
expect(s1.cleanupCalled).toBe(true);
|
|
183
|
+
expect(s2.cleanupCalled).toBe(true);
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
it('supports multi-instance of same skill', async () => {
|
|
187
|
+
const s1 = makeMultiMockSkill('weather');
|
|
188
|
+
const s2 = makeMultiMockSkill('weather');
|
|
189
|
+
await manager.addSkill(s1);
|
|
190
|
+
await manager.addSkill(s2);
|
|
191
|
+
expect(manager.size).toBe(2);
|
|
192
|
+
expect(manager.hasSkill('weather')).toBe(true);
|
|
193
|
+
});
|
|
194
|
+
|
|
195
|
+
// ── New gap-fix tests ──────────────────────────────────────────────
|
|
196
|
+
|
|
197
|
+
it('loadedSkills exposes a read-only map of loaded skills', async () => {
|
|
198
|
+
const skill = makeMockSkill('datetime');
|
|
199
|
+
await manager.addSkill(skill);
|
|
200
|
+
const map = manager.loadedSkills;
|
|
201
|
+
expect(map.size).toBe(1);
|
|
202
|
+
expect(map.get('datetime')).toBe(skill);
|
|
203
|
+
// Ensure the map is the same reference as the internal map
|
|
204
|
+
expect(map.has('datetime')).toBe(true);
|
|
205
|
+
});
|
|
206
|
+
|
|
207
|
+
it('hasSkillByKey checks by instance key (Python has_skill semantics)', async () => {
|
|
208
|
+
const skill = makeMockSkill('weather');
|
|
209
|
+
await manager.addSkill(skill);
|
|
210
|
+
// Instance key for a default MockSkill is the skillName
|
|
211
|
+
expect(manager.hasSkillByKey('weather')).toBe(true);
|
|
212
|
+
expect(manager.hasSkillByKey('nonexistent')).toBe(false);
|
|
213
|
+
// hasSkillByKey does NOT search by skillName across values — it's a direct key lookup
|
|
214
|
+
expect(manager.hasSkillByKey(skill.instanceId)).toBe(false);
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
it('listSkillKeys returns flat array of instance key strings', async () => {
|
|
218
|
+
await manager.addSkill(makeMockSkill('a'));
|
|
219
|
+
await manager.addSkill(makeMockSkill('b'));
|
|
220
|
+
const keys = manager.listSkillKeys();
|
|
221
|
+
expect(keys).toEqual(['a', 'b']);
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
it('loadSkillByName loads a skill from the registry', async () => {
|
|
225
|
+
const registry = SkillRegistry.getInstance();
|
|
226
|
+
class RegistrySkill extends MockSkill {
|
|
227
|
+
static override SKILL_NAME = 'mock_registry_skill';
|
|
228
|
+
}
|
|
229
|
+
registry.register(RegistrySkill);
|
|
230
|
+
|
|
231
|
+
const [success, errorMsg] = await manager.loadSkillByName('mock_registry_skill');
|
|
232
|
+
expect(success).toBe(true);
|
|
233
|
+
expect(errorMsg).toBe('');
|
|
234
|
+
expect(manager.size).toBe(1);
|
|
235
|
+
expect(manager.hasSkill('mock_registry_skill')).toBe(true);
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
it('loadSkillByName returns [false, error] when skill not in registry', async () => {
|
|
239
|
+
const [success, errorMsg] = await manager.loadSkillByName('nonexistent');
|
|
240
|
+
expect(success).toBe(false);
|
|
241
|
+
expect(errorMsg).toContain('not found in registry');
|
|
242
|
+
});
|
|
243
|
+
|
|
244
|
+
it('loadSkillByName returns [false, error] on duplicate skill', async () => {
|
|
245
|
+
const registry = SkillRegistry.getInstance();
|
|
246
|
+
class DupSkill extends MockSkill {
|
|
247
|
+
static override SKILL_NAME = 'dup_skill';
|
|
248
|
+
}
|
|
249
|
+
registry.register(DupSkill);
|
|
250
|
+
|
|
251
|
+
await manager.loadSkillByName('dup_skill');
|
|
252
|
+
const [success, errorMsg] = await manager.loadSkillByName('dup_skill');
|
|
253
|
+
expect(success).toBe(false);
|
|
254
|
+
expect(errorMsg).toContain('already loaded');
|
|
255
|
+
});
|
|
256
|
+
|
|
257
|
+
it('loadSkillByName passes config to the skill constructor', async () => {
|
|
258
|
+
const registry = SkillRegistry.getInstance();
|
|
259
|
+
class ConfigSkill extends MockSkill {
|
|
260
|
+
static override SKILL_NAME = 'config_skill';
|
|
261
|
+
}
|
|
262
|
+
registry.register(ConfigSkill);
|
|
263
|
+
|
|
264
|
+
await manager.loadSkillByName('config_skill', { api_key: 'test123' });
|
|
265
|
+
const skill = manager.getSkill('config_skill');
|
|
266
|
+
expect(skill?.getConfig('api_key')).toBe('test123');
|
|
267
|
+
});
|
|
268
|
+
});
|