npm - @prostgles/prostgles - Versions diffs - 2.3.6-dev.1787160729 → 2.3.6-dev.1787240381 - Mend

@prostgles/prostgles 2.3.6-dev.1787160729 → 2.3.6-dev.1787240381

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 (64) hide show

package/dist/server/src/ServiceManager/ServiceManager.spec.js CHANGED Viewed

@@ -7,15 +7,47 @@ const ServiceManager_1 = require("./ServiceManager");
 const ServiceManagerTypes_1 = require("./ServiceManagerTypes");
 exports.IS_GITHUB_WORKER = process.env.CI === "true";
 void (0, node_test_1.describe)("Service manager tests", async () => {
+    await (0, node_test_1.test)("Initialises built-in and additional services without name clashes", async () => {
+        let insertedServiceNames = [];
+        const serviceManager = await ServiceManager_1.ServiceManager.create({
+            services: ServiceManagerTypes_1.prostglesServices,
+            serviceRoot: "built-in-services",
+        }, {
+            services: {
+                insertMany: (services) => {
+                    insertedServiceNames = services.map(({ name }) => name);
+                    return Promise.resolve();
+                },
+                find: () => Promise.resolve([]),
+            },
+        });
+        const extendedServiceManager = await serviceManager.addServices({
+            services: { appService: ServiceManagerTypes_1.prostglesServices.documents },
+            serviceRoot: "app-services",
+        });
+        assert_1.strict.equal(extendedServiceManager.services.appService, ServiceManagerTypes_1.prostglesServices.documents);
+        assert_1.strict.equal(extendedServiceManager.getServiceRoot("documents"), "built-in-services");
+        assert_1.strict.equal(extendedServiceManager.getServiceRoot("appService"), "app-services");
+        await assert_1.strict.rejects(() => extendedServiceManager.addServices({
+            services: { documents: ServiceManagerTypes_1.prostglesServices.documents },
+            serviceRoot: "app-services",
+        }));
+        assert_1.strict.deepEqual(insertedServiceNames.sort(), [
+            "appService",
+            "documents",
+            "speechToText",
+            "webSearchSearxng",
+        ]);
+    });
     await (0, node_test_1.test)("Enable speechToText", async () => {
         if (exports.IS_GITHUB_WORKER) {
             return;
         }
         let logText = "";
-        const serviceManager = new ServiceManager_1.ServiceManager({
+        const serviceManager = await ServiceManager_1.ServiceManager.create({
             services: ServiceManagerTypes_1.prostglesServices,
             serviceRoot: "src/ServiceManager/services",
-        });
+        }, undefined);
         const res = await serviceManager.enableService("speechToText", (logs) => {
             const lastLog = logs.at(-1)?.text;
             console.warn(lastLog);

package/dist/server/src/ServiceManager/ServiceManager.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ServiceManager.spec.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.spec.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAChC,yCAA2C;AAC3C,qDAAkD;AAClD,+DAA0D;AAE7C,QAAA,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM,CAAC;AAE1D,KAAK,IAAA,oBAAQ,EAAC,uBAAuB,EAAE,KAAK,IAAI,EAAE;IAChD,MAAM,IAAA,gBAAI,EAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;QAC3C,IAAI,wBAAgB,EAAE,CAAC;YACrB,OAAO;QACT,CAAC;QACD,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,MAAM,cAAc,GAAG,~~IAAI~~,+BAAc,CAAC;~~YACxC~~,QAAQ,EAAE,uCAAiB;YAC3B,WAAW,EAAE,6BAA6B;SAC3C,~~CAAC~~,CAAC;~~QACH~~,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACtE,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;YAClC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtB,OAAO,IAAI,OAAO,CAAC;QACrB,CAAC,CAAC,CAAC;QACH,eAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACpC,eAAM,CAAC,KAAK,CACV,OAAO,CAAC,QAAQ,CAAC,kCAAkC,CAAC,EACpD,IAAI,EACJ,iCAAiC,CAClC,CAAC;QACF,cAAc,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"ServiceManager.spec.js","sourceRoot":"","sources":["../../../../src/ServiceManager/ServiceManager.spec.ts"],"names":[],"mappings":"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"}

package/dist/server/src/ServiceManager/ServiceManagerTypes.d.ts CHANGED Viewed

@@ -15,7 +15,7 @@ export type ProstglesService = {
     env?: Record<string, string>;
     /**
      * Directory containing the Docker build context.
-     * Relative paths resolve from ServiceManager.serviceRoot.
+     * Relative paths resolve from the root used to register this service.
      * Defaults to `<serviceName>/src`.
      */
     buildContext?: string;

package/dist/server/src/ServiceManager/buildService.js CHANGED Viewed

@@ -34,7 +34,7 @@ async function buildService(serviceName, onLogs) {
     if (!service) {
         throw new Error(`Service ${serviceName} not found in service registry`);
     }
-    const serviceCwd = (0, path_1.resolve)(this.serviceRoot, service.buildContext ?? (0, path_1.join)(serviceName, "src"));
+    const serviceCwd = (0, path_1.resolve)(this.getServiceRoot(serviceName), service.buildContext ?? (0, path_1.join)(serviceName, "src"));
     const imageName = (0, exports.camelCaseToSkewerCase)(serviceName);
     const { buildArgs } = await (0, getSelectedConfigEnvs_1.getSelectedConfigEnvs)(this, serviceName);
     /** Only rebuild if hash differs */

package/dist/server/src/ServiceManager/buildService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"buildService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":";;;AAcA,oCAkHC;AAhID,+CAA6C;AAC7C,yCAA2C;AAC3C,yFAGwD;AACxD,+BAAqC;AACrC,qDAAoD;AACpD,mDAAgD;AAChD,6DAA0D;AAC1D,mEAAgE;AAIzD,KAAK,UAAU,YAAY,CAEhC,WAAmB,EACnB,MAAqB;IAErB,MAAM,cAAc,GAAkB,CAAC,IAAI,EAAE,EAAE;QAC7C,MAAM,CAAC,IAAI,CAAC,CAAC;QACb,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,eAAe,EAAE,CAAC;QACpB,IAAI,eAAe,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC1C,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,QAAQ,CAAC;YAC3C,OAAO,GAAG,CAAC,KAAK,CAAC;QACnB,CAAC;QACD,IAAI,eAAe,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YACzC,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;IAC9C,MAAM,IAAI,GAAG,GAAG,EAAE;QAChB,eAAe,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,WAAW,WAAW,gCAAgC,CAAC,CAAC;IAC1E,CAAC;IACD,MAAM,UAAU,GAAG,IAAA,cAAO,EACxB,IAAI,CAAC,WAAW,~~EAChB~~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"}
1	+ {"version":3,"file":"buildService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/buildService.ts"],"names":[],"mappings":"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"}

package/dist/server/src/ServiceManager/enableService.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import type { ProcessLog } from "../McpHub/DockerSandbox/executeDockerCommand";
-import type { ServiceManager } from "./ServiceManager";
-export declare function enableService(this: ServiceManager, serviceName: string, onLogs: (logs: ProcessLog[]) => void): Promise<import("./ServiceManagerTypes").RunningServiceInstance<import("./ServiceManagerTypes").ProstglesService>>;
+import type { ServiceManager, StringKeyof } from "./ServiceManager";
+import type { RunningServiceInstance, ServiceRegistry } from "./ServiceManagerTypes";
+export declare function enableService<Services extends ServiceRegistry, ServiceName extends StringKeyof<Services>>(this: ServiceManager<Services>, serviceName: ServiceName, onLogs: (logs: ProcessLog[]) => void): Promise<RunningServiceInstance<Services[ServiceName]>>;
 //# sourceMappingURL=enableService.d.ts.map

package/dist/server/src/ServiceManager/enableService.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"enableService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;~~AAEvD~~,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,~~EACpB~~,WAAW,EAAE,~~MAAM~~,~~EACnB~~,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,IAAI,~~qHAiCrC~~"}
1	+ {"version":3,"file":"enableService.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gDAAgD,CAAC;AACjF,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,KAAK,EACV,sBAAsB,EACtB,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAE/B,wBAAsB,aAAa,CACjC,QAAQ,SAAS,eAAe,EAChC,WAAW,SAAS,WAAW,CAAC,QAAQ,CAAC,EAEzC,IAAI,EAAE,cAAc,CAAC,QAAQ,CAAC,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,IAAI,GACnC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAgCxD"}

package/dist/server/src/ServiceManager/enableService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"enableService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":";;~~AAGA~~,~~sCAoCC~~;~~AApCM~~,KAAK,UAAU,aAAa,~~CAEjC~~,~~WAAmB~~,~~EACnB~~,MAAoC;IAEpC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3D,IAAI,aAAa,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,~~aAAa~~,CAAC;~~IACvB~~,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACjE,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,6BAA6B,WAAW,EAAE,CACjE,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,oBAAoB,EAAE,MAAM,KAAK,eAAe,EAAE,CAAC;YACrD,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAC7B,EAAE,IAAI,EAAE,WAAW,EAAE,EACrB,EAAE,UAAU,EAAE,oBAAoB,CAAC,SAAS,EAAE,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnE,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/C,OAAO,~~MAAM~~,CAAC;~~AAChB~~,CAAC"}
1	+ {"version":3,"file":"enableService.js","sourceRoot":"","sources":["../../../../src/ServiceManager/enableService.ts"],"names":[],"mappings":";;AAOA,sCAuCC;AAvCM,KAAK,UAAU,aAAa,CAKjC,WAAwB,EACxB,MAAoC;IAEpC,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC3D,IAAI,aAAa,EAAE,MAAM,KAAK,SAAS,EAAE,CAAC;QACxC,OAAO,aAA8D,CAAC;IACxE,CAAC;SAAM,CAAC;QACN,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAChC,CAAC;IACD,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACjE,IAAI,WAAW,KAAK,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,WAAW,WAAW,6BAA6B,WAAW,EAAE,CACjE,CAAC;QACJ,CAAC;QAED,MAAM,oBAAoB,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClE,IAAI,oBAAoB,EAAE,MAAM,KAAK,eAAe,EAAE,CAAC;YACrD,MAAM,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAC7B,EAAE,IAAI,EAAE,WAAW,EAAE,EACrB,EAAE,UAAU,EAAE,oBAAoB,CAAC,SAAS,EAAE,CAC/C,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACnE,OAAO,aAAa,CAAC;IACvB,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC/C,OAAO,MAAgE,CAAC;AAC1E,CAAC"}

package/dist/server/src/ServiceManager/getServiceEndpoints.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getServiceEndpoints.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/getServiceEndpoints.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,gBAAgB,EAAE,sCAI7D;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CAC1C,KAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,WAAW,~~CA0GxC~~,CAAC"}
1	+ {"version":3,"file":"getServiceEndpoints.d.ts","sourceRoot":"","sources":["../../../../src/ServiceManager/getServiceEndpoints.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,mBAAmB,GAAI,CAAC,SAAS,gBAAgB,EAAE,sCAI7D;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,gBAAgB,CAAC,WAAW,CAAC,CAAC;CAC1C,KAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,WAAW,CAkHxC,CAAC"}

package/dist/server/src/ServiceManager/getServiceEndpoints.js CHANGED Viewed

@@ -75,7 +75,15 @@ const getServiceEndpoints = ({ serviceName, endpoints, baseUrl, }) => {
                 throw new Error(`Error calling endpoint ${endpoint} of service ${serviceName}: ${response.status} ${response.statusText} ${errorText}`);
             }
             if (outputSchema) {
-                const responseData = await response.json();
+                const text = await response.text();
+                let responseData;
+                try {
+                    responseData = JSON.parse(text);
+                }
+                catch {
+                    // Allow for text output if outputSchema is not JSON
+                    responseData = text;
+                }
                 const validatedOutput = (0, prostgles_types_1.getJSONBSchemaValidationError)(outputSchema, responseData, {
                     allowExtraProperties: true,
                 });

package/dist/server/src/ServiceManager/getServiceEndpoints.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getServiceEndpoints.js","sourceRoot":"","sources":["../../../../src/ServiceManager/getServiceEndpoints.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAC3C,qDAA0E;AAMnE,MAAM,mBAAmB,GAAG,CAA6B,EAC9D,WAAW,EACX,SAAS,EACT,OAAO,GAKR,EAA0C,EAAE;IAC3C,OAAO,MAAM,CAAC,WAAW,CACvB,IAAA,kBAAU,EAAC,SAAS,CAAC,CAAC,GAAG,CACvB,CAAC,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC;QAChE,QAAQ;QACR,KAAK,EAAE,IAAa,EAAE,YAAY,EAAE,EAAE;YACpC,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE,CAAC;gBACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,cAAc,GAClB,WAAW,CAAC,CAAC;gBACX,IAAA,+CAA6B,EAAC,WAAW,EAAE,IAAI,CAAC;gBAClD,CAAC,CAAC,SAAS,CAAC;YACd,IAAI,cAAc,EAAE,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxC,MAAM,IAAI,KAAK,CACb,8BAA8B,QAAQ,eAAe,WAAW,KAAK,cAAc,CAAC,KAAK,EAAE,CAC5F,CAAC;YACJ,CAAC;YAED,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,IAAI,EAAE,CAAC;YACtC,MAAM,aAAa,GACjB,SAAS,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,KAAK,GACT,aAAa,KAAK,OAAO,IAAI,IAAI,CAAC,CAAC;gBACjC,IAAI,IAAI,eAAe,CACrB,IAA8B,CAC/B,CAAC,QAAQ,EAAE,EAAE;gBAChB,CAAC,CAAC,EAAE,CAAC;YAEP,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,EAAE;gBAC9B,IAAI,aAAa,KAAK,UAAU,EAAE,CAAC;oBACjC,IAAI,CAAC,IAAA,0BAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;wBACpB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;oBACtD,CAAC;oBACD,MAAM,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;oBAChC,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;wBACxC,MAAM,WAAW,GAAG,CAAC,KAAc,EAAE,EAAE;4BACrC,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gCAC1B,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC9B,CAAC;iCAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gCACrC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;4BAC9B,CAAC;iCAAM,CAAC;gCACN,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;4BAC9C,CAAC;wBACH,CAAC,CAAC;wBAEF,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;4BACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gCAClB,WAAW,CAAC,CAAC,CAAC,CAAC;4BACjB,CAAC,CAAC,CAAC;wBACL,CAAC;6BAAM,CAAC;4BACN,WAAW,CAAC,KAAK,CAAC,CAAC;wBACrB,CAAC;oBACH,CAAC,CAAC,CAAC;oBACH,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;gBAC5B,CAAC;gBACD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;oBAC7B,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;gBAC7B,CAAC;gBACD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;gBACxB,CAAC;gBACD,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC1B,OAAO,EAAE;wBACP,cAAc,EAAE,kBAAkB;wBAClC,MAAM,EAAE,kBAAkB;qBAC3B;iBACF,CAAC;YACJ,CAAC,CAAC,EAAE,CAAC;YACL,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,EAAE,EAAE;gBAC5D,OAAO;gBACP,GAAG,YAAY;gBACf,IAAI;gBACJ,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;gBACxD,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,eAAe,WAAW,KAAK,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,IAAI,SAAS,EAAE,CACvH,CAAC;YACJ,CAAC;YAED,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,~~YAAY~~,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;~~gBAC3C~~,MAAM,eAAe,GAAG,IAAA,+CAA6B,EACnD,YAAY,EACZ,YAAY,EACZ;oBACE,oBAAoB,EAAE,IAAI;iBAC3B,CACF,CAAC;gBACF,IAAI,eAAe,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxC,MAAM,IAAI,KAAK,CACb,gCAAgC,QAAQ,eAAe,WAAW,KAAK,eAAe,CAAC,KAAK,EAAE,CAC/F,CAAC;gBACJ,CAAC;gBACD,YAAY;gBACZ,OAAO,eAAe,CAAC,IAAe,CAAC;YACzC,CAAC;YAED,OAAO,SAAS,CAAC;QACnB,CAAC;KACF,CACF,CACwC,CAAC;AAC9C,CAAC,CAAC;~~AAlHW~~,QAAA,mBAAmB,~~uBAkH9B~~"}
1	+ {"version":3,"file":"getServiceEndpoints.js","sourceRoot":"","sources":["../../../../src/ServiceManager/getServiceEndpoints.ts"],"names":[],"mappings":"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"}