@effect-app/infra 0.234.2 → 0.234.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 0.234.3
+
+### Patch Changes
+
+- 6fd8d12: improve: http handler should be uninterruptible except for the user's handler.
+
 ## 0.234.2
 
 ### Patch Changes

package/_cjs/api/routing/makeRequestHandler.cjs

@@ -52,7 +52,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
     headers: req.headers,
     cookies: {} // req.cookies
   }));
-  return _effectApp.Effect.gen(function* ($) {
+  return _effectApp.Effect.uninterruptibleMask(restore => _effectApp.Effect.gen(function* ($) {
     const req = yield* $(_http.HttpServerRequest.ServerRequest);
     const res = _http.HttpServerResponse.empty().pipe(_ => req.method === "GET" ? _http.HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _);
     const pars = yield* $(getParams);
@@ -86,7 +86,7 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
         return prev;
       }, {}))), _effectApp.Effect.flatMap(parsedReq => handle(parsedReq).pipe(_effectApp.Effect.provideService(handler.Request.Tag, parsedReq), _effectApp.Effect.flatMap(encoder), _effectApp.Effect.map(r => res.pipe(_http.HttpServerResponse.setBody(_http.HttpBody.unsafeJson(r)), _http.HttpServerResponse.setStatus(r === undefined ? 204 : 200))))));
       // Commands should not be interruptable.
-      const r = req.method !== "GET" ? _effectApp.Effect.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
+      const r = req.method !== "GET" ? _effectApp.Effect.uninterruptible(handleRequest) : restore(handleRequest); // .instrument("Performance.RequestResponse")
       const r2 = middlewareLayer ? _effectApp.Effect.provide(r, middlewareLayer)
       // PR is not relevant here
       : r;
@@ -123,6 +123,6 @@ function makeRequestHandler(handler, errorHandler, middlewareLayer) {
     return yield* $(eff);
   }).pipe(_ => (0, _setupRequest.updateRequestContext)(_, (0, _utils.copy)(_ => ({
     name: (0, _schema.NonEmptyString255)(handler.name)
-  }))));
+  })))));
 }
 //# sourceMappingURL=makeRequestHandler.cjs.map

package/_cjs/api/routing/makeRequestHandler.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","fields","encode","rt","encodedSchema","struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"makeRequestHandler.cjs","names":["_utils","require","_util","_errorReporter","_effectApp","_http","_schema","_setupRequest","_base","RequestSettings","exports","FiberRef","unsafeMake","verbose","makeRequestHandler","handler","errorHandler","middlewareLayer","Request","Response","h","handle","response","S","void","resp","encoder","fields","encode","rt","encodedSchema","struct","requestParsers","makeRequestParsers","parseRequest","parseRequestParams","getParams","Effect","map","all","rcx","HttpRouter","RouteContext","req","flatMap","HttpServerRequest","ServerRequest","json","pipe","body","headers","params","query","searchParams","cookies","uninterruptibleMask","restore","gen","$","res","HttpServerResponse","empty","_","method","setHeader","pars","settings","get","eff","logInfo","annotateLogs","path","originalUrl","reqPath","pretty","reqQuery","reqBody","reqCookies","reqHeaders","undefined","andThen","suspend","handleRequest","hn","Option","getOrUndefined","tap","parsedReq","annotateCurrentSpan","Object","entries","reduce","prev","key","value","length","substring","Array","isArray","keys","provideService","Tag","r","setBody","HttpBody","unsafeJson","setStatus","uninterruptible","r2","provide","catchAllCause","cause","sync","reportError","logError","statusCode","status","toString","resHeaders","snipString","concurrency","tapErrorCause","Console","error","updateRequestContext","copy","name","NonEmptyString255"],"sources":["../../../src/api/routing/makeRequestHandler.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/api/routing/makeRequestHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"makeRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}

package/dist/api/routing/makeRequestHandler.js

@@ -37,7 +37,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
         headers: req.headers,
         cookies: {} // req.cookies
     }));
-    return Effect
+    return Effect.uninterruptibleMask((restore) => Effect
         .gen(function* ($) {
         const req = yield* $(HttpServerRequest.ServerRequest);
         const res = HttpServerResponse
@@ -90,7 +90,7 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
                 .pipe(Effect.provideService(handler.Request.Tag, parsedReq), Effect.flatMap(encoder), Effect
                 .map((r) => res.pipe(HttpServerResponse.setBody(HttpBody.unsafeJson(r)), HttpServerResponse.setStatus(r === undefined ? 204 : 200))))));
             // Commands should not be interruptable.
-            const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : handleRequest; // .instrument("Performance.RequestResponse")
+            const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : restore(handleRequest); // .instrument("Performance.RequestResponse")
             const r2 = middlewareLayer
                 ? Effect.provide(r, middlewareLayer)
                 // PR is not relevant here
@@ -145,6 +145,6 @@ export function makeRequestHandler(handler, errorHandler, middlewareLayer) {
     })
         .pipe((_) => updateRequestContext(_, copy((_) => ({
         name: NonEmptyString255(handler.name)
-    }))));
+    })))));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"makeRequestHandler.js","sourceRoot":"","sources":["../../../src/api/routing/makeRequestHandler.ts"],"names":[],"mappings":"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"}

package/dist/services/Operations.d.ts

@@ -46,7 +46,7 @@ declare const Operations_base: (abstract new (service: {
         all: Effect.Effect<Operation[], never, never>;
         find: (id: StringId) => Effect.Effect<Option.Option<Operation>, never, never>;
         update: (id: StringId, progress: OperationProgress) => Effect.Effect<void, never, never>;
-    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, Operations | R_5> : Effect<X, never, Operations>;
+    }) => X) => X extends Effect<infer A_3, infer E_5, infer R_5> ? Effect<A_3, E_5, R_5 | Operations> : Effect<X, never, Operations>;
 };
 export declare class Operations extends Operations_base {
     private static readonly CleanupLive;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.234.2",
+  "version": "0.234.3",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -20,8 +20,8 @@
     "redlock": "^4.2.0",
     "@effect-app/core": "0.169.1",
     "effect-app": "0.202.1",
-    "@effect-app/infra-adapters": "0.154.7",
-    "@effect-app/schema": "0.220.4"
+    "@effect-app/schema": "0.220.4",
+    "@effect-app/infra-adapters": "0.154.7"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.1",

package/src/api/routing/makeRequestHandler.ts

@@ -164,176 +164,178 @@ export function makeRequestHandler<
     })
   )
 
-  return Effect
-    .gen(function*($) {
-      const req = yield* $(HttpServerRequest.ServerRequest)
-      const res = HttpServerResponse
-        .empty()
-        .pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _)
+  return Effect.uninterruptibleMask((restore) =>
+    Effect
+      .gen(function*($) {
+        const req = yield* $(HttpServerRequest.ServerRequest)
+        const res = HttpServerResponse
+          .empty()
+          .pipe((_) => req.method === "GET" ? HttpServerResponse.setHeader(_, "Cache-Control", "no-store") : _)
 
-      const pars = yield* $(getParams)
+        const pars = yield* $(getParams)
 
-      const settings = yield* $(FiberRef.get(RequestSettings))
+        const settings = yield* $(FiberRef.get(RequestSettings))
 
-      const eff =
-        // TODO: we don;t have access to user id here cause context is not yet created
-        Effect
-          .logInfo("Incoming request")
-          .pipe(
-            Effect.annotateLogs({
-              method: req.method,
-              path: req.originalUrl,
-              ...(settings.verbose
-                ? {
-                  reqPath: pretty(pars.params),
-                  reqQuery: pretty(pars.query),
-                  reqBody: pretty(pars.body),
-                  reqCookies: pretty(pars.cookies),
-                  reqHeaders: pretty(pars.headers)
-                }
-                : undefined)
-            }),
-            Effect
-              .andThen(
-                Effect.suspend(() => {
-                  const handleRequest = parseRequest(pars)
-                    .pipe(
-                      Effect.map(({ body, path, query }) => {
-                        const hn = {
-                          ...body.pipe(Option.getOrUndefined) ?? {},
-                          ...query.pipe(Option.getOrUndefined) ?? {},
-                          ...path.pipe(Option.getOrUndefined) ?? {}
-                        } as unknown as ReqA
-                        return hn
-                      }),
-                      Effect.tap((parsedReq) =>
-                        Effect.annotateCurrentSpan(
-                          "requestInput",
-                          Object.entries(parsedReq).reduce((prev, [key, value]: [string, unknown]) => {
-                            prev[key] = key === "password"
-                              ? "<redacted>"
-                              : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
-                              ? typeof value === "string" && value.length > 256
-                                ? (value.substring(0, 253) + "...")
-                                : value
-                              : Array.isArray(value)
-                              ? `Array[${value.length}]`
-                              : value === null || value === undefined
-                              ? `${value}`
-                              : typeof value === "object" && value
-                              ? `Object[${Object.keys(value).length}]`
-                              : typeof value
-                            return prev
-                          }, {} as Record<string, string | number | boolean>)
-                        )
-                      ),
-                      Effect.flatMap((parsedReq) =>
-                        handle(parsedReq)
-                          .pipe(
-                            Effect.provideService(handler.Request.Tag, parsedReq as any),
-                            Effect.flatMap(encoder),
-                            Effect
-                              .map((r) =>
-                                res.pipe(
-                                  HttpServerResponse.setBody(HttpBody.unsafeJson(r)),
-                                  HttpServerResponse.setStatus(r === undefined ? 204 : 200)
-                                )
-                              )
+        const eff =
+          // TODO: we don;t have access to user id here cause context is not yet created
+          Effect
+            .logInfo("Incoming request")
+            .pipe(
+              Effect.annotateLogs({
+                method: req.method,
+                path: req.originalUrl,
+                ...(settings.verbose
+                  ? {
+                    reqPath: pretty(pars.params),
+                    reqQuery: pretty(pars.query),
+                    reqBody: pretty(pars.body),
+                    reqCookies: pretty(pars.cookies),
+                    reqHeaders: pretty(pars.headers)
+                  }
+                  : undefined)
+              }),
+              Effect
+                .andThen(
+                  Effect.suspend(() => {
+                    const handleRequest = parseRequest(pars)
+                      .pipe(
+                        Effect.map(({ body, path, query }) => {
+                          const hn = {
+                            ...body.pipe(Option.getOrUndefined) ?? {},
+                            ...query.pipe(Option.getOrUndefined) ?? {},
+                            ...path.pipe(Option.getOrUndefined) ?? {}
+                          } as unknown as ReqA
+                          return hn
+                        }),
+                        Effect.tap((parsedReq) =>
+                          Effect.annotateCurrentSpan(
+                            "requestInput",
+                            Object.entries(parsedReq).reduce((prev, [key, value]: [string, unknown]) => {
+                              prev[key] = key === "password"
+                                ? "<redacted>"
+                                : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
+                                ? typeof value === "string" && value.length > 256
+                                  ? (value.substring(0, 253) + "...")
+                                  : value
+                                : Array.isArray(value)
+                                ? `Array[${value.length}]`
+                                : value === null || value === undefined
+                                ? `${value}`
+                                : typeof value === "object" && value
+                                ? `Object[${Object.keys(value).length}]`
+                                : typeof value
+                              return prev
+                            }, {} as Record<string, string | number | boolean>)
                           )
-                      )
-                    ) as Effect<
-                      HttpServerResponse.ServerResponse,
-                      ValidationError | ResE,
-                      Exclude<R, EnforceNonEmptyRecord<M>>
-                    >
+                        ),
+                        Effect.flatMap((parsedReq) =>
+                          handle(parsedReq)
+                            .pipe(
+                              Effect.provideService(handler.Request.Tag, parsedReq as any),
+                              Effect.flatMap(encoder),
+                              Effect
+                                .map((r) =>
+                                  res.pipe(
+                                    HttpServerResponse.setBody(HttpBody.unsafeJson(r)),
+                                    HttpServerResponse.setStatus(r === undefined ? 204 : 200)
+                                  )
+                                )
+                            )
+                        )
+                      ) as Effect<
+                        HttpServerResponse.ServerResponse,
+                        ValidationError | ResE,
+                        Exclude<R, EnforceNonEmptyRecord<M>>
+                      >
 
-                  // Commands should not be interruptable.
-                  const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : handleRequest // .instrument("Performance.RequestResponse")
-                  const r2 = middlewareLayer
-                    ? Effect.provide(r, middlewareLayer)
-                    // PR is not relevant here
-                    : (r as Effect<
-                      HttpServerResponse.ServerResponse,
-                      ResE | MiddlewareE | ValidationError,
-                      Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
-                    >)
-                  return errorHandler(
-                    req,
-                    res,
-                    r2
-                  )
-                })
-              ),
-            Effect
-              .catchAllCause((cause) =>
-                Effect
-                  .sync(() => HttpServerResponse.setStatus(res, 500))
-                  .pipe(Effect
-                    .tap((res) =>
-                      Effect
-                        .all([
-                          reportError("request")(cause, {
-                            path: req.originalUrl,
-                            method: req.method
-                          }),
-                          Effect.suspend(() => {
-                            const headers = res.headers
-                            return Effect
-                              .logError("Finished request", cause)
-                              .pipe(Effect.annotateLogs({
-                                method: req.method,
-                                path: req.originalUrl,
-                                statusCode: res.status.toString(),
+                    // Commands should not be interruptable.
+                    const r = req.method !== "GET" ? Effect.uninterruptible(handleRequest) : restore(handleRequest) // .instrument("Performance.RequestResponse")
+                    const r2 = middlewareLayer
+                      ? Effect.provide(r, middlewareLayer)
+                      // PR is not relevant here
+                      : (r as Effect<
+                        HttpServerResponse.ServerResponse,
+                        ResE | MiddlewareE | ValidationError,
+                        Exclude<Exclude<R, EnforceNonEmptyRecord<M>>, PR>
+                      >)
+                    return errorHandler(
+                      req,
+                      res,
+                      r2
+                    )
+                  })
+                ),
+              Effect
+                .catchAllCause((cause) =>
+                  Effect
+                    .sync(() => HttpServerResponse.setStatus(res, 500))
+                    .pipe(Effect
+                      .tap((res) =>
+                        Effect
+                          .all([
+                            reportError("request")(cause, {
+                              path: req.originalUrl,
+                              method: req.method
+                            }),
+                            Effect.suspend(() => {
+                              const headers = res.headers
+                              return Effect
+                                .logError("Finished request", cause)
+                                .pipe(Effect.annotateLogs({
+                                  method: req.method,
+                                  path: req.originalUrl,
+                                  statusCode: res.status.toString(),
 
-                                reqPath: pretty(pars.params),
-                                reqQuery: pretty(pars.query),
-                                reqBody: pretty(pars.body),
-                                reqCookies: pretty(pars.cookies),
-                                reqHeaders: pretty(pars.headers),
+                                  reqPath: pretty(pars.params),
+                                  reqQuery: pretty(pars.query),
+                                  reqBody: pretty(pars.body),
+                                  reqCookies: pretty(pars.cookies),
+                                  reqHeaders: pretty(pars.headers),
 
-                                resHeaders: pretty(
-                                  Object
-                                    .entries(headers)
-                                    .reduce((prev, [key, value]) => {
-                                      prev[key] = value && typeof value === "string" ? snipString(value) : value
-                                      return prev
-                                    }, {} as Record<string, any>)
-                                )
-                              }))
-                          })
-                        ], { concurrency: "inherit" })
-                    ))
-                  .pipe(
-                    Effect.tapErrorCause((cause) => Console.error("Error occurred while reporting error", cause))
-                  )
-              ),
-            Effect
-              .tap((res) =>
-                Effect
-                  .logInfo("Finished request")
-                  .pipe(Effect.annotateLogs({
-                    method: req.method,
-                    path: req.originalUrl,
-                    statusCode: res.status.toString(),
-                    ...(settings.verbose
-                      ? {
-                        resHeaders: pretty(res.headers)
-                      }
-                      : undefined)
-                  }))
-              )
-          )
+                                  resHeaders: pretty(
+                                    Object
+                                      .entries(headers)
+                                      .reduce((prev, [key, value]) => {
+                                        prev[key] = value && typeof value === "string" ? snipString(value) : value
+                                        return prev
+                                      }, {} as Record<string, any>)
+                                  )
+                                }))
+                            })
+                          ], { concurrency: "inherit" })
+                      ))
+                    .pipe(
+                      Effect.tapErrorCause((cause) => Console.error("Error occurred while reporting error", cause))
+                    )
+                ),
+              Effect
+                .tap((res) =>
+                  Effect
+                    .logInfo("Finished request")
+                    .pipe(Effect.annotateLogs({
+                      method: req.method,
+                      path: req.originalUrl,
+                      statusCode: res.status.toString(),
+                      ...(settings.verbose
+                        ? {
+                          resHeaders: pretty(res.headers)
+                        }
+                        : undefined)
+                    }))
+                )
+            )
 
-      return yield* $(eff)
-    })
-    .pipe((_) =>
-      updateRequestContext(
-        _,
-        copy((_) => ({
-          name: NonEmptyString255(
-            handler.name
-          )
-        }))
+        return yield* $(eff)
+      })
+      .pipe((_) =>
+        updateRequestContext(
+          _,
+          copy((_) => ({
+            name: NonEmptyString255(
+              handler.name
+            )
+          }))
+        )
       )
-    )
+  )
 }

package/vitest.config.ts.timestamp-1711744615239-dcf257a844e01.mjs

@@ -0,0 +1,37 @@
+// packages/infra/vitest.config.ts
+import { defineConfig } from "file:///Users/patrickroza/pj/effect-app/libs/node_modules/.pnpm/vite@5.2.6_@types+node@20.11.30/node_modules/vite/dist/node/index.js";
+
+// vite.config.base.ts
+import path from "path";
+import fs from "fs";
+var __vite_injected_original_dirname = "/Users/patrickroza/pj/effect-app/libs";
+function makeConfig(dirName) {
+  const prefix = path.resolve(__vite_injected_original_dirname, "packages");
+  const packages = fs.readdirSync(prefix).map((f) => prefix + "/" + f).filter((f) => fs.lstatSync(f).isDirectory());
+  const cfg = {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    //plugins: [autoImport],
+    test: {
+      include: ["./test/**/*.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+      reporters: "verbose",
+      globals: true
+    },
+    resolve: {
+      alias: packages.reduce((acc, cur) => {
+        acc[JSON.parse(fs.readFileSync(cur + "/package.json", "utf-8")).name] = path.resolve(cur, cur.endsWith("core") ? "dist" : "src");
+        return acc;
+      }, {})
+      // "@effect-app/core/Prelude": path.join(__dirname, "packages/core/src/Prelude.code.ts")
+    }
+  };
+  console.log(cfg);
+  return cfg;
+}
+
+// packages/infra/vitest.config.ts
+var __vite_injected_original_dirname2 = "/Users/patrickroza/pj/effect-app/libs/packages/infra";
+var vitest_config_default = defineConfig(makeConfig(__vite_injected_original_dirname2));
+export {
+  vitest_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsicGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50cyIsICJ2aXRlLmNvbmZpZy5iYXNlLnRzIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYVwiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy9wYWNrYWdlcy9pbmZyYS92aXRlc3QuY29uZmlnLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvcGFja2FnZXMvaW5mcmEvdml0ZXN0LmNvbmZpZy50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gXCJ2aXRlXCJcbmltcG9ydCBtYWtlQ29uZmlnIGZyb20gXCIuLi8uLi92aXRlLmNvbmZpZy5iYXNlXCJcblxuZXhwb3J0IGRlZmF1bHQgZGVmaW5lQ29uZmlnKG1ha2VDb25maWcoX19kaXJuYW1lKSlcbiIsICJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlic1wiO2NvbnN0IF9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9maWxlbmFtZSA9IFwiL1VzZXJzL3BhdHJpY2tyb3phL3BqL2VmZmVjdC1hcHAvbGlicy92aXRlLmNvbmZpZy5iYXNlLnRzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9wYXRyaWNrcm96YS9wai9lZmZlY3QtYXBwL2xpYnMvdml0ZS5jb25maWcuYmFzZS50c1wiOy8vLyA8cmVmZXJlbmNlIHR5cGVzPVwidml0ZXN0XCIgLz5cbmltcG9ydCBwYXRoIGZyb20gXCJwYXRoXCJcbmltcG9ydCBmcyBmcm9tIFwiZnNcIlxuaW1wb3J0IEF1dG9JbXBvcnQgZnJvbSBcInVucGx1Z2luLWF1dG8taW1wb3J0L3ZpdGVcIlxuaW1wb3J0IHsgZGVmaW5lQ29uZmlnIH0gZnJvbSBcInZpdGVzdC9jb25maWdcIlxuXG4vLyBjb25zdCBhdXRvSW1wb3J0ID0gQXV0b0ltcG9ydCh7XG4vLyAgIGR0czogXCIuL3Rlc3QvYXV0by1pbXBvcnRzLmQudHNcIixcbi8vICAgLy8gaW5jbHVkZTogW1xuLy8gICAvLyAgIC9cXC50ZXN0XFwuW3RqXXN4PyQvIC8vIC50cywgLnRzeCwgLmpzLCAuanN4XG4vLyAgIC8vIF0sXG4vLyAgIGltcG9ydHM6IFtcbi8vICAgICBcInZpdGVzdFwiXG4vLyAgIF1cbi8vIH0pXG5cbmV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIG1ha2VDb25maWcoZGlyTmFtZT86IHN0cmluZykge1xuICBjb25zdCBwcmVmaXggPSBwYXRoLnJlc29sdmUoX19kaXJuYW1lLCBcInBhY2thZ2VzXCIpXG4gIGNvbnN0IHBhY2thZ2VzID0gZnMucmVhZGRpclN5bmMocHJlZml4KS5tYXAoZiA9PiBwcmVmaXggKyBcIi9cIiArIGYpLmZpbHRlcihmID0+IGZzLmxzdGF0U3luYyhmKS5pc0RpcmVjdG9yeSgpIClcbiAgY29uc3QgY2ZnID0ge1xuICAgIC8vIGVzbGludC1kaXNhYmxlLW5leHQtbGluZSBAdHlwZXNjcmlwdC1lc2xpbnQvbm8tdmFyLXJlcXVpcmVzXG4gICAgLy9wbHVnaW5zOiBbYXV0b0ltcG9ydF0sXG4gICAgdGVzdDoge1xuICAgICAgaW5jbHVkZTogIFtcIi4vdGVzdC8qKi8qLnRlc3Que2pzLG1qcyxjanMsdHMsbXRzLGN0cyxqc3gsdHN4fVwiXSxcbiAgICAgIHJlcG9ydGVyczogXCJ2ZXJib3NlXCIsXG4gICAgICBnbG9iYWxzOiB0cnVlXG4gICAgfSxcbiAgICByZXNvbHZlOiB7XG4gICAgICBhbGlhczogcGFja2FnZXMucmVkdWNlKChhY2MsIGN1cikgPT4geyAvLyB3b3JrYXJvdW5kIGZvciAvUHJlbHVkZSBpc3N1ZVxuICAgICAgYWNjW0pTT04ucGFyc2UoZnMucmVhZEZpbGVTeW5jKGN1ciArIFwiL3BhY2thZ2UuanNvblwiLCBcInV0Zi04XCIpKS5uYW1lXSA9IHBhdGgucmVzb2x2ZShjdXIsIGN1ci5lbmRzV2l0aChcImNvcmVcIikgPyBcImRpc3RcIiA6IFwic3JjXCIpXG4gICAgICByZXR1cm4gYWNjXG4gICAgfSwgeyB9KSAvLyBcIkBlZmZlY3QtYXBwL2NvcmUvUHJlbHVkZVwiOiBwYXRoLmpvaW4oX19kaXJuYW1lLCBcInBhY2thZ2VzL2NvcmUvc3JjL1ByZWx1ZGUuY29kZS50c1wiKVxuICB9XG4gIH1cbiAgY29uc29sZS5sb2coY2ZnKVxuICByZXR1cm4gY2ZnXG59XG4iXSwKICAibWFwcGluZ3MiOiAiO0FBQ0EsU0FBUyxvQkFBb0I7OztBQ0E3QixPQUFPLFVBQVU7QUFDakIsT0FBTyxRQUFRO0FBRmYsSUFBTSxtQ0FBbUM7QUFnQjFCLFNBQVIsV0FBNEIsU0FBa0I7QUFDbkQsUUFBTSxTQUFTLEtBQUssUUFBUSxrQ0FBVyxVQUFVO0FBQ2pELFFBQU0sV0FBVyxHQUFHLFlBQVksTUFBTSxFQUFFLElBQUksT0FBSyxTQUFTLE1BQU0sQ0FBQyxFQUFFLE9BQU8sT0FBSyxHQUFHLFVBQVUsQ0FBQyxFQUFFLFlBQVksQ0FBRTtBQUM3RyxRQUFNLE1BQU07QUFBQTtBQUFBO0FBQUEsSUFHVixNQUFNO0FBQUEsTUFDSixTQUFVLENBQUMsa0RBQWtEO0FBQUEsTUFDN0QsV0FBVztBQUFBLE1BQ1gsU0FBUztBQUFBLElBQ1g7QUFBQSxJQUNBLFNBQVM7QUFBQSxNQUNQLE9BQU8sU0FBUyxPQUFPLENBQUMsS0FBSyxRQUFRO0FBQ3JDLFlBQUksS0FBSyxNQUFNLEdBQUcsYUFBYSxNQUFNLGlCQUFpQixPQUFPLENBQUMsRUFBRSxJQUFJLElBQUksS0FBSyxRQUFRLEtBQUssSUFBSSxTQUFTLE1BQU0sSUFBSSxTQUFTLEtBQUs7QUFDL0gsZUFBTztBQUFBLE1BQ1QsR0FBRyxDQUFFLENBQUM7QUFBQTtBQUFBLElBQ1I7QUFBQSxFQUNBO0FBQ0EsVUFBUSxJQUFJLEdBQUc7QUFDZixTQUFPO0FBQ1Q7OztBRHBDQSxJQUFNQSxvQ0FBbUM7QUFJekMsSUFBTyx3QkFBUSxhQUFhLFdBQVdDLGlDQUFTLENBQUM7IiwKICAibmFtZXMiOiBbIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIiwgIl9fdml0ZV9pbmplY3RlZF9vcmlnaW5hbF9kaXJuYW1lIl0KfQo=