@lobu/gateway 3.0.9 → 3.0.13

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.
Files changed (212) hide show
  1. package/dist/api/platform.d.ts.map +1 -1
  2. package/dist/api/platform.js +7 -26
  3. package/dist/api/platform.js.map +1 -1
  4. package/dist/auth/mcp/proxy.d.ts +14 -0
  5. package/dist/auth/mcp/proxy.d.ts.map +1 -1
  6. package/dist/auth/mcp/proxy.js +149 -13
  7. package/dist/auth/mcp/proxy.js.map +1 -1
  8. package/dist/cli/gateway.d.ts.map +1 -1
  9. package/dist/cli/gateway.js +29 -0
  10. package/dist/cli/gateway.js.map +1 -1
  11. package/dist/connections/chat-instance-manager.d.ts.map +1 -1
  12. package/dist/connections/chat-instance-manager.js +2 -1
  13. package/dist/connections/chat-instance-manager.js.map +1 -1
  14. package/dist/connections/interaction-bridge.d.ts +9 -2
  15. package/dist/connections/interaction-bridge.d.ts.map +1 -1
  16. package/dist/connections/interaction-bridge.js +121 -261
  17. package/dist/connections/interaction-bridge.js.map +1 -1
  18. package/dist/gateway/index.js +1 -1
  19. package/dist/gateway/index.js.map +1 -1
  20. package/dist/interactions.d.ts +9 -43
  21. package/dist/interactions.d.ts.map +1 -1
  22. package/dist/interactions.js +10 -52
  23. package/dist/interactions.js.map +1 -1
  24. package/dist/routes/public/agent.d.ts +4 -0
  25. package/dist/routes/public/agent.d.ts.map +1 -1
  26. package/dist/routes/public/agent.js +21 -0
  27. package/dist/routes/public/agent.js.map +1 -1
  28. package/dist/services/core-services.d.ts.map +1 -1
  29. package/dist/services/core-services.js +4 -0
  30. package/dist/services/core-services.js.map +1 -1
  31. package/package.json +9 -9
  32. package/src/__tests__/agent-config-routes.test.ts +0 -254
  33. package/src/__tests__/agent-history-routes.test.ts +0 -72
  34. package/src/__tests__/agent-routes.test.ts +0 -68
  35. package/src/__tests__/agent-schedules-routes.test.ts +0 -59
  36. package/src/__tests__/agent-settings-store.test.ts +0 -323
  37. package/src/__tests__/bedrock-model-catalog.test.ts +0 -40
  38. package/src/__tests__/bedrock-openai-service.test.ts +0 -157
  39. package/src/__tests__/bedrock-provider-module.test.ts +0 -56
  40. package/src/__tests__/chat-instance-manager-slack.test.ts +0 -204
  41. package/src/__tests__/chat-response-bridge.test.ts +0 -131
  42. package/src/__tests__/config-memory-plugins.test.ts +0 -92
  43. package/src/__tests__/config-request-store.test.ts +0 -127
  44. package/src/__tests__/connection-routes.test.ts +0 -144
  45. package/src/__tests__/core-services-store-selection.test.ts +0 -92
  46. package/src/__tests__/docker-deployment.test.ts +0 -1211
  47. package/src/__tests__/embedded-deployment.test.ts +0 -342
  48. package/src/__tests__/grant-store.test.ts +0 -148
  49. package/src/__tests__/http-proxy.test.ts +0 -281
  50. package/src/__tests__/instruction-service.test.ts +0 -37
  51. package/src/__tests__/link-buttons.test.ts +0 -112
  52. package/src/__tests__/lobu.test.ts +0 -32
  53. package/src/__tests__/mcp-config-service.test.ts +0 -347
  54. package/src/__tests__/mcp-proxy.test.ts +0 -694
  55. package/src/__tests__/message-handler-bridge.test.ts +0 -17
  56. package/src/__tests__/model-selection.test.ts +0 -172
  57. package/src/__tests__/oauth-templates.test.ts +0 -39
  58. package/src/__tests__/platform-adapter-slack-send.test.ts +0 -114
  59. package/src/__tests__/platform-helpers-model-resolution.test.ts +0 -253
  60. package/src/__tests__/provider-inheritance.test.ts +0 -212
  61. package/src/__tests__/routes/cli-auth.test.ts +0 -337
  62. package/src/__tests__/routes/interactions.test.ts +0 -121
  63. package/src/__tests__/secret-proxy.test.ts +0 -85
  64. package/src/__tests__/session-manager.test.ts +0 -572
  65. package/src/__tests__/setup.ts +0 -133
  66. package/src/__tests__/skill-and-mcp-registry.test.ts +0 -203
  67. package/src/__tests__/slack-routes.test.ts +0 -161
  68. package/src/__tests__/system-config-resolver.test.ts +0 -75
  69. package/src/__tests__/system-message-limiter.test.ts +0 -89
  70. package/src/__tests__/system-skills-service.test.ts +0 -362
  71. package/src/__tests__/transcription-service.test.ts +0 -222
  72. package/src/__tests__/utils/rate-limiter.test.ts +0 -102
  73. package/src/__tests__/worker-connection-manager.test.ts +0 -497
  74. package/src/__tests__/worker-job-router.test.ts +0 -722
  75. package/src/api/index.ts +0 -1
  76. package/src/api/platform.ts +0 -292
  77. package/src/api/response-renderer.ts +0 -157
  78. package/src/auth/agent-metadata-store.ts +0 -168
  79. package/src/auth/api-auth-middleware.ts +0 -69
  80. package/src/auth/api-key-provider-module.ts +0 -213
  81. package/src/auth/base-provider-module.ts +0 -201
  82. package/src/auth/bedrock/provider-module.ts +0 -110
  83. package/src/auth/chatgpt/chatgpt-oauth-module.ts +0 -185
  84. package/src/auth/chatgpt/device-code-client.ts +0 -218
  85. package/src/auth/chatgpt/index.ts +0 -1
  86. package/src/auth/claude/oauth-module.ts +0 -280
  87. package/src/auth/cli/token-service.ts +0 -249
  88. package/src/auth/external/client.ts +0 -560
  89. package/src/auth/external/device-code-client.ts +0 -235
  90. package/src/auth/mcp/config-service.ts +0 -420
  91. package/src/auth/mcp/proxy.ts +0 -1086
  92. package/src/auth/mcp/string-substitution.ts +0 -17
  93. package/src/auth/mcp/tool-cache.ts +0 -90
  94. package/src/auth/oauth/base-client.ts +0 -267
  95. package/src/auth/oauth/client.ts +0 -153
  96. package/src/auth/oauth/credentials.ts +0 -7
  97. package/src/auth/oauth/providers.ts +0 -69
  98. package/src/auth/oauth/state-store.ts +0 -150
  99. package/src/auth/oauth-templates.ts +0 -179
  100. package/src/auth/provider-catalog.ts +0 -220
  101. package/src/auth/provider-model-options.ts +0 -41
  102. package/src/auth/settings/agent-settings-store.ts +0 -565
  103. package/src/auth/settings/auth-profiles-manager.ts +0 -216
  104. package/src/auth/settings/index.ts +0 -12
  105. package/src/auth/settings/model-preference-store.ts +0 -52
  106. package/src/auth/settings/model-selection.ts +0 -135
  107. package/src/auth/settings/resolved-settings-view.ts +0 -298
  108. package/src/auth/settings/template-utils.ts +0 -44
  109. package/src/auth/settings/token-service.ts +0 -88
  110. package/src/auth/system-env-store.ts +0 -98
  111. package/src/auth/user-agents-store.ts +0 -68
  112. package/src/channels/binding-service.ts +0 -214
  113. package/src/channels/index.ts +0 -4
  114. package/src/cli/gateway.ts +0 -1312
  115. package/src/cli/index.ts +0 -74
  116. package/src/commands/built-in-commands.ts +0 -80
  117. package/src/commands/command-dispatcher.ts +0 -94
  118. package/src/commands/command-reply-adapters.ts +0 -27
  119. package/src/config/file-loader.ts +0 -618
  120. package/src/config/index.ts +0 -588
  121. package/src/config/network-allowlist.ts +0 -71
  122. package/src/connections/chat-instance-manager.ts +0 -1284
  123. package/src/connections/chat-response-bridge.ts +0 -618
  124. package/src/connections/index.ts +0 -7
  125. package/src/connections/interaction-bridge.ts +0 -831
  126. package/src/connections/message-handler-bridge.ts +0 -440
  127. package/src/connections/platform-auth-methods.ts +0 -15
  128. package/src/connections/types.ts +0 -84
  129. package/src/gateway/connection-manager.ts +0 -291
  130. package/src/gateway/index.ts +0 -698
  131. package/src/gateway/job-router.ts +0 -201
  132. package/src/gateway-main.ts +0 -200
  133. package/src/index.ts +0 -41
  134. package/src/infrastructure/queue/index.ts +0 -12
  135. package/src/infrastructure/queue/queue-producer.ts +0 -148
  136. package/src/infrastructure/queue/redis-queue.ts +0 -361
  137. package/src/infrastructure/queue/types.ts +0 -133
  138. package/src/infrastructure/redis/system-message-limiter.ts +0 -94
  139. package/src/interactions/config-request-store.ts +0 -198
  140. package/src/interactions.ts +0 -363
  141. package/src/lobu.ts +0 -311
  142. package/src/metrics/prometheus.ts +0 -159
  143. package/src/modules/module-system.ts +0 -179
  144. package/src/orchestration/base-deployment-manager.ts +0 -900
  145. package/src/orchestration/deployment-utils.ts +0 -98
  146. package/src/orchestration/impl/docker-deployment.ts +0 -620
  147. package/src/orchestration/impl/embedded-deployment.ts +0 -268
  148. package/src/orchestration/impl/index.ts +0 -8
  149. package/src/orchestration/impl/k8s/deployment.ts +0 -1061
  150. package/src/orchestration/impl/k8s/helpers.ts +0 -610
  151. package/src/orchestration/impl/k8s/index.ts +0 -1
  152. package/src/orchestration/index.ts +0 -333
  153. package/src/orchestration/message-consumer.ts +0 -584
  154. package/src/orchestration/scheduled-wakeup.ts +0 -704
  155. package/src/permissions/approval-policy.ts +0 -36
  156. package/src/permissions/grant-store.ts +0 -219
  157. package/src/platform/file-handler.ts +0 -66
  158. package/src/platform/link-buttons.ts +0 -57
  159. package/src/platform/renderer-utils.ts +0 -44
  160. package/src/platform/response-renderer.ts +0 -84
  161. package/src/platform/unified-thread-consumer.ts +0 -194
  162. package/src/platform.ts +0 -318
  163. package/src/proxy/http-proxy.ts +0 -752
  164. package/src/proxy/proxy-manager.ts +0 -81
  165. package/src/proxy/secret-proxy.ts +0 -402
  166. package/src/proxy/token-refresh-job.ts +0 -143
  167. package/src/routes/internal/audio.ts +0 -141
  168. package/src/routes/internal/device-auth.ts +0 -652
  169. package/src/routes/internal/files.ts +0 -226
  170. package/src/routes/internal/history.ts +0 -69
  171. package/src/routes/internal/images.ts +0 -127
  172. package/src/routes/internal/interactions.ts +0 -84
  173. package/src/routes/internal/middleware.ts +0 -23
  174. package/src/routes/internal/schedule.ts +0 -226
  175. package/src/routes/internal/types.ts +0 -22
  176. package/src/routes/openapi-auto.ts +0 -239
  177. package/src/routes/public/agent-access.ts +0 -23
  178. package/src/routes/public/agent-config.ts +0 -675
  179. package/src/routes/public/agent-history.ts +0 -422
  180. package/src/routes/public/agent-schedules.ts +0 -296
  181. package/src/routes/public/agent.ts +0 -1086
  182. package/src/routes/public/agents.ts +0 -373
  183. package/src/routes/public/channels.ts +0 -191
  184. package/src/routes/public/cli-auth.ts +0 -896
  185. package/src/routes/public/connections.ts +0 -574
  186. package/src/routes/public/landing.ts +0 -16
  187. package/src/routes/public/oauth.ts +0 -147
  188. package/src/routes/public/settings-auth.ts +0 -104
  189. package/src/routes/public/slack.ts +0 -173
  190. package/src/routes/shared/agent-ownership.ts +0 -101
  191. package/src/routes/shared/token-verifier.ts +0 -34
  192. package/src/services/bedrock-model-catalog.ts +0 -217
  193. package/src/services/bedrock-openai-service.ts +0 -658
  194. package/src/services/core-services.ts +0 -1072
  195. package/src/services/image-generation-service.ts +0 -257
  196. package/src/services/instruction-service.ts +0 -318
  197. package/src/services/mcp-registry.ts +0 -94
  198. package/src/services/platform-helpers.ts +0 -287
  199. package/src/services/session-manager.ts +0 -262
  200. package/src/services/settings-resolver.ts +0 -74
  201. package/src/services/system-config-resolver.ts +0 -89
  202. package/src/services/system-skills-service.ts +0 -229
  203. package/src/services/transcription-service.ts +0 -684
  204. package/src/session.ts +0 -110
  205. package/src/spaces/index.ts +0 -1
  206. package/src/spaces/space-resolver.ts +0 -17
  207. package/src/stores/in-memory-agent-store.ts +0 -403
  208. package/src/stores/redis-agent-store.ts +0 -279
  209. package/src/utils/public-url.ts +0 -44
  210. package/src/utils/rate-limiter.ts +0 -94
  211. package/tsconfig.json +0 -33
  212. package/tsconfig.tsbuildinfo +0 -1
@@ -1,333 +0,0 @@
1
- export * from "./base-deployment-manager";
2
- export * from "./deployment-utils";
3
- export * from "./impl";
4
-
5
- import { createLogger, moduleRegistry } from "@lobu/core";
6
- import type Redis from "ioredis";
7
- import type { ProviderCatalogService } from "../auth/provider-catalog";
8
- import {
9
- getModelProviderModules,
10
- type ModelProviderModule,
11
- } from "../modules/module-system";
12
- import type { GrantStore } from "../permissions/grant-store";
13
- import type {
14
- BaseDeploymentManager,
15
- OrchestratorConfig,
16
- } from "./base-deployment-manager";
17
- import { buildModuleEnvVars } from "./deployment-utils";
18
- import {
19
- DockerDeploymentManager,
20
- EmbeddedDeploymentManager,
21
- K8sDeploymentManager,
22
- } from "./impl";
23
- import { MessageConsumer } from "./message-consumer";
24
-
25
- const logger = createLogger("orchestrator");
26
-
27
- export class Orchestrator {
28
- private config: OrchestratorConfig;
29
- private deploymentManager: BaseDeploymentManager;
30
- private queueConsumer: MessageConsumer;
31
- private isRunning = false;
32
- private shuttingDown = false;
33
- private cleanupInterval?: NodeJS.Timeout;
34
- private activeReconciliation: Promise<void> | null = null;
35
- private isReconciling = false;
36
-
37
- constructor(config: OrchestratorConfig) {
38
- this.config = config;
39
- this.deploymentManager = this.createDeploymentManager(config);
40
- this.queueConsumer = new MessageConsumer(config, this.deploymentManager);
41
- }
42
-
43
- /**
44
- * Inject core services into the orchestrator after gateway initialization.
45
- * Provider modules in the registry carry their own credential stores,
46
- * so only the Redis client is needed for secret placeholder generation.
47
- */
48
- async injectCoreServices(
49
- redisClient?: Redis,
50
- providerCatalogService?: ProviderCatalogService,
51
- grantStore?: GrantStore
52
- ): Promise<void> {
53
- // Inject Redis client into deployment manager for secret placeholder generation
54
- if (redisClient) {
55
- this.deploymentManager.setRedisClient(redisClient);
56
- }
57
-
58
- // Inject grant store for auto-adding domain grants at deployment time
59
- if (grantStore) {
60
- this.deploymentManager.setGrantStore(grantStore);
61
- }
62
-
63
- // Inject provider catalog service for per-agent provider resolution
64
- if (providerCatalogService) {
65
- this.deploymentManager.setProviderCatalogService(providerCatalogService);
66
- }
67
-
68
- // Refresh provider modules after gateway/core services have registered them.
69
- const providerModules = getModelProviderModules();
70
- this.deploymentManager.setProviderModules(providerModules);
71
- logger.debug(
72
- `Provider modules injected into orchestrator (${providerModules.length})`
73
- );
74
- }
75
-
76
- private createDeploymentManager(
77
- config: OrchestratorConfig
78
- ): BaseDeploymentManager {
79
- const deploymentMode = config.deploymentMode || process.env.DEPLOYMENT_MODE;
80
- const providerModules: ModelProviderModule[] = getModelProviderModules();
81
-
82
- if (deploymentMode === "docker") {
83
- if (!this.isDockerAvailable()) {
84
- logger.error("DEPLOYMENT_MODE=docker but Docker is not available");
85
- throw new Error("DEPLOYMENT_MODE=docker but Docker is not available");
86
- }
87
- return new DockerDeploymentManager(
88
- config,
89
- buildModuleEnvVars,
90
- providerModules
91
- );
92
- }
93
-
94
- if (deploymentMode === "kubernetes" || deploymentMode === "k8s") {
95
- if (!this.isKubernetesAvailable()) {
96
- logger.error(
97
- "DEPLOYMENT_MODE=kubernetes but Kubernetes is not available"
98
- );
99
- throw new Error(
100
- "DEPLOYMENT_MODE=kubernetes but Kubernetes is not available"
101
- );
102
- }
103
- return new K8sDeploymentManager(
104
- config,
105
- buildModuleEnvVars,
106
- providerModules
107
- );
108
- }
109
-
110
- if (deploymentMode === "embedded") {
111
- logger.debug("Using embedded deployment mode (in-process workers)");
112
- return new EmbeddedDeploymentManager(
113
- config,
114
- buildModuleEnvVars,
115
- providerModules
116
- );
117
- }
118
-
119
- // Auto-detect deployment mode
120
- if (this.isKubernetesAvailable()) {
121
- logger.info("🎯 Auto-detected Kubernetes, using K8s deployment mode");
122
- return new K8sDeploymentManager(
123
- config,
124
- buildModuleEnvVars,
125
- providerModules
126
- );
127
- }
128
-
129
- if (this.isDockerAvailable()) {
130
- logger.info("🐳 Auto-detected Docker, using Docker deployment mode");
131
- return new DockerDeploymentManager(
132
- config,
133
- buildModuleEnvVars,
134
- providerModules
135
- );
136
- }
137
-
138
- // Fall back to docker but it will likely fail in validateWorkerImage
139
- logger.info(
140
- "🐳 No container runtime detected, falling back to Docker deployment mode"
141
- );
142
- return new DockerDeploymentManager(
143
- config,
144
- buildModuleEnvVars,
145
- providerModules
146
- );
147
- }
148
-
149
- private isKubernetesAvailable(): boolean {
150
- try {
151
- if (process.env.KUBERNETES_SERVICE_HOST) {
152
- return true;
153
- }
154
-
155
- const fs = require("node:fs");
156
- const os = require("node:os");
157
- const path = require("node:path");
158
-
159
- const kubeconfigPaths = [
160
- process.env.KUBECONFIG,
161
- path.join(os.homedir(), ".kube", "config"),
162
- ].filter(Boolean);
163
-
164
- return kubeconfigPaths.some((configPath) => {
165
- try {
166
- return fs.existsSync(configPath) && fs.statSync(configPath).isFile();
167
- } catch {
168
- return false;
169
- }
170
- });
171
- } catch {
172
- return false;
173
- }
174
- }
175
-
176
- private isDockerAvailable(): boolean {
177
- try {
178
- const { execSync } = require("node:child_process");
179
- execSync("docker version", {
180
- stdio: "ignore",
181
- timeout: 5000,
182
- env: { PATH: process.env.PATH, DOCKER_HOST: process.env.DOCKER_HOST },
183
- });
184
- return true;
185
- } catch {
186
- return false;
187
- }
188
- }
189
-
190
- async start(): Promise<void> {
191
- try {
192
- // Initialize modules
193
- await moduleRegistry.initAll();
194
- // Module registration can happen during initAll(); refresh providers
195
- // so deployment/message processing uses the latest auth modules.
196
- const providerModules = getModelProviderModules();
197
- this.deploymentManager.setProviderModules(providerModules);
198
-
199
- // Validate configured worker runtime/image before consuming messages.
200
- await this.deploymentManager.validateWorkerImage();
201
-
202
- // Start K8s informer for watch-based reconciliation and reconcile stale worker templates
203
- if (this.deploymentManager instanceof K8sDeploymentManager) {
204
- await this.deploymentManager.startInformer();
205
- await this.deploymentManager.reconcileWorkerDeploymentImages();
206
- }
207
-
208
- // Start queue consumer
209
- await this.queueConsumer.start();
210
-
211
- // Setup periodic cleanup (reduced interval when informer is active)
212
- this.setupIdleCleanup();
213
-
214
- this.isRunning = true;
215
- logger.debug("Orchestrator started");
216
- } catch (error) {
217
- logger.error("❌ Failed to start orchestrator:", error);
218
- throw error;
219
- }
220
- }
221
-
222
- async stop(): Promise<void> {
223
- if (!this.isRunning) return;
224
-
225
- this.isRunning = false;
226
- this.shuttingDown = true;
227
-
228
- try {
229
- // Stop scheduling new reconciliation cycles
230
- if (this.cleanupInterval) {
231
- clearInterval(this.cleanupInterval);
232
- this.cleanupInterval = undefined;
233
- }
234
-
235
- // Wait for in-flight reconciliation to finish (with 10s timeout)
236
- if (this.activeReconciliation) {
237
- logger.info("Waiting for in-flight reconciliation to complete...");
238
- const safeReconciliation = this.activeReconciliation.catch((error) => {
239
- logger.error(
240
- "In-flight reconciliation failed during shutdown:",
241
- error
242
- );
243
- });
244
- await Promise.race([
245
- safeReconciliation,
246
- new Promise<void>((resolve) => setTimeout(resolve, 10_000)),
247
- ]);
248
- this.activeReconciliation = null;
249
- }
250
-
251
- await this.queueConsumer.stop();
252
-
253
- // Stop K8s informer
254
- if (this.deploymentManager instanceof K8sDeploymentManager) {
255
- await this.deploymentManager.stopInformer();
256
- }
257
-
258
- logger.info("✅ Orchestrator stopped");
259
- } catch (error) {
260
- logger.error("❌ Error stopping orchestrator:", error);
261
- }
262
- }
263
-
264
- private setupIdleCleanup(): void {
265
- setTimeout(() => {
266
- if (this.shuttingDown) return;
267
- const p = this.deploymentManager.reconcileDeployments().catch((error) => {
268
- logger.error("❌ Initial deployment reconciliation failed:", error);
269
- });
270
- this.activeReconciliation = p;
271
- p.finally(() => {
272
- if (this.activeReconciliation === p) this.activeReconciliation = null;
273
- });
274
- }, this.config.cleanup.initialDelayMs);
275
-
276
- // When informer is active, reduce polling to 5min safety-net interval
277
- const hasInformer =
278
- this.deploymentManager instanceof K8sDeploymentManager &&
279
- this.deploymentManager.isInformerActive();
280
- const intervalMs = hasInformer
281
- ? Math.max(this.config.cleanup.intervalMs, 5 * 60 * 1000)
282
- : this.config.cleanup.intervalMs;
283
-
284
- if (hasInformer) {
285
- logger.info(
286
- `Informer active, reconciliation interval set to ${intervalMs / 1000}s (safety net)`
287
- );
288
- }
289
-
290
- this.cleanupInterval = setInterval(async () => {
291
- if (this.shuttingDown) return;
292
- if (this.isReconciling) {
293
- logger.debug(
294
- "Skipping reconciliation interval: previous run still in progress"
295
- );
296
- return;
297
- }
298
- this.isReconciling = true;
299
- try {
300
- const p = this.deploymentManager.reconcileDeployments();
301
- this.activeReconciliation = p;
302
- await p;
303
- } catch (error) {
304
- logger.error(
305
- "Error during deployment reconciliation:",
306
- error instanceof Error ? error.message : String(error)
307
- );
308
- } finally {
309
- this.activeReconciliation = null;
310
- this.isReconciling = false;
311
- }
312
- }, intervalMs);
313
- }
314
-
315
- getStatus() {
316
- return {
317
- isRunning: this.isRunning,
318
- config: {
319
- kubernetes: {
320
- namespace: this.config.kubernetes.namespace,
321
- },
322
- queues: {
323
- retryLimit: this.config.queues.retryLimit,
324
- expireInSeconds: this.config.queues.expireInSeconds,
325
- },
326
- },
327
- };
328
- }
329
-
330
- async getQueueStats() {
331
- return this.queueConsumer.getQueueStats();
332
- }
333
- }