mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-13 07:12:00 +01:00
## Thinking Path > - Paperclip manages work for AI-agent companies. > - Chat connections deliver provider messages and user answers. > - Slack requires a response within its original three-second deadline. > - Forms and their delivery receipts must survive retries and tenant restarts. > - This change uses the existing connector queue and durable form owners. > - Current authorization, exact receipt checks and normal ACK rules stay in force. > - The tenant can settle useful work while keeping the connection enabled. ## Linked Issues or Issue Description Refs #19019 and #19348. Companion Cloud PR: paperclipai/paperclip-cloud#1250. ## What Changed - Preserve form grants, sessions, encrypted evidence, terminal receipts and company-authorized Retry. - Check initial form enrollment before the provider send. Keep a typed preparation wait only while an exact current enrollment obligation exists. - Refund the attempt only when the claimed attempt and credential lease still match and provider invocation has not started. Possible or accepted sends retain uncertain-delivery custody. An ordinary error with the same text still uses the normal five-attempt limit. - Notify the existing publication worker when normal enrollment commits. Reconstruct pending work from durable state after a lost reply or owner restart. - Page settled history before proving idle safety. Keep unfinished, malformed and foreign receipts visible beyond the first 1,000 rows. - Keep Slack callback, answer, receipt and ACK rules in their provider owners. Support body-bound Cloud idle capabilities when a complete catalog exceeds the header budget. - Add focused regression coverage, an enabled quiet/reactivation recipe and explicit fixture port checks. - Keep SDK evidence tests tied to a normally built reviewed reference, with a separate strict refusal for actual unreviewed CI outputs. ## Verification App head: `6284d6881b5dc38a9ee149bcbde35e69a67dd8ca`, including actual master `dff8bed007e01c32f3826144b893ec80603d1335`. Companion Cloud head: `f83b38187dc7e6b2e219fe865dc16d268cc66fdb`, including actual Cloud master `b1dcc3421a91efffee631a61536cf48f357c22fc`. Cloud #1250 is merged at `1d07d81f23d4627ab7b6dcf49176b4128a2f8f9b` after exact-head passing checks and complete Greptile 5/5. Current exact-head CI typecheck, build, tests and aggregate verification are green; the complete edited Greptile review is 5/5 and all 13 review threads and nested comment pages are resolved. - Both latest enrollment findings were reproduced against the preceding product. The pure readiness control returned no wait for the first enrollment. The real-PostgreSQL control observed a provider call while that enrollment was still staged. - The repaired source passes three whole files: 21 readiness controls, 80 real-PostgreSQL milestone controls and 37 tenant-actor middleware controls. All 138 pass with zero excluded or TODO cases. The SQL case reconstructs the worker through seven waits, preserves the attempt budget, recovers a controlled lost enrollment reply, and commits one provider-port call and one exact grant. Replaying the selected attempt does not duplicate them. Authorization, SDK and enrollment-response ports are controlled in that SQL case. - The same files cover ordinary five-attempt exhaustion, accepted and possible sends, stale ownership, malformed bindings, attention states and current actor restrictions. One synthetic mismatched-binding parameter uses generation 2 against current generation 1; it is not evidence for an older-generation control. - The normal server-package typecheck passes at the measured source. It runs the normal Runner TypeScript, protocol, SDK and declaration prerequisites and all seven main App programs. The separate declaration configuration is also recorded. A worker union-narrowing error was found, fixed with an explicit callable/null branch, and verified by that normal compiler. No cast or test relaxation was used. - The normal merge of current master preserves all 78 owned paths and 15,783 unrelated master entries and modes. The three measured test files and their changed feature paths are unchanged. New upstream DB code adds only the normal nonunique concurrent native-session index and its migration classification. Shared and adapter-utils changes alter unrelated prompt or denial wording. The 138-case proof carries for those unchanged behaviors; it is not reported as a rerun after the merge. The normal Shared/SDK ensure, DB build, adapter-utils build and complete server-package check also pass at the current merged head. Their fresh inventory contains 8,143 outputs; canonical SQL and journal copies match. This build did not apply the new index migration. - Earlier real-PostgreSQL retained-history coverage reproduced the missing proof with 1,005 settled rows. Its repair retains the existing two-second/64-query inspection budget, current endpoint bound and exact owner snapshot. The 46 source-bound controls cover unfinished and invalid tails, exact cross-page action references, Retry, rollback and lost receipt responses. - Earlier enabled quiet/reactivation coverage produced ordinary useful work, kept configuration enabled, accepted fresh signed work plus a duplicate, and produced exactly one second useful reply. Its two App-worker windows lasted at least 30 seconds with zero measured PG writes, connection or outbound activity after settlement. That evidence stays tied to its measured revision. A missing worker EXIT marker limits that earlier proof; parent evidence does not replace it. - Earlier three-second callback, terminal ACK, current-question race and complete body-size controls remain source-bound. The 500-owner/1,000-binding body measured 313,875 bytes with a 618-byte JWT; signature tampering failed closed. - Final managed-provider acceptance now passes all five fresh Node boots: A/A, A/AB, B/A rejection, B/AB recovery, B/B final. Two independently configured, challenged, verified, linked and enrolled Slack identities exercise ACK and retirement debt separately. Normal provider factory/materialization delivers the configuration through a controlled external stack-provider boundary. The registered opening returns HTTP 200 in 21 ms within the original 3-second deadline. Two answers persist, normal ACK is accepted, exact retirement and lost acceptance/GC replies recover, and the original canonical snapshot remains unchanged without duplicate provider sends or submissions. - The separate complete committed-preflight case passes. A committed `update_attempted` response is lost before SDK entry; normal service-owner reconstruction after the original lease/deadline recovers the same useful update and one answer without a second trigger. This reconstructs service owners within one App process; the separate five fresh Node boots cover process restart and managed signing-key rotation. - Assertion-time PG socket reports balance 15 opens/15 closes across the five boots and 5/5 in preflight, peak 2 and zero live sockets or unexpected attempts. Worker terminal EXIT markers were missing and are not replaced by parent EXIT markers. These are domain/recovery and assertion-time connection proofs, not a new whole-worker terminal quiet measurement. All known owners/groups closed; independent SQL audits were empty; only successful fixture databases were removed. Earlier failed fixture databases/logs remain retained. No product guard, deadline or assertion was weakened. Exact runtime source and normal outputs are unchanged by the three test files in the current follow-up, so these source-bound proofs carry without repeating those journeys. - The preceding App CI ran 11,312 support cases: 11,289 passed, three SDK-evidence cases failed, and 20 external cases skipped. Normal CI dependency setup resolved six stale Slack patch-hash references and produced an unreviewed lock. The public SDK proof correctly refused that lock; the tests incorrectly assumed the CI output was a reviewed reference. The three-file test repair keeps the protected lock policy, source/compiler/parser/Zod pins, scanner and redaction rules unchanged. It builds an owned reviewed reference using the existing normal Shared/SDK producers for the positive seal test, while a separate negative requires actual unreviewed-build privacy refusal and no retained SDK bytes. It does not relabel the CI build as certified or admit a new lock hash. - All four whole SDK support files pass locally: public type 30, evidence 16, public-input synchronizer 8 and lock preparation 10, totaling 64 with zero excluded/TODO cases in 28.73 seconds. The genuine fresh reference build/positive seal and separate invalidated-reference privacy refusal passed within their original 120-second bounds. Original installed dependencies, SDK outputs/cache and runtime source stayed unchanged; normal global setup produced only its own Runner JavaScript outputs. PostgreSQL was denied throughout, all four worker markers were observed, and the owned process group/private test root closed. The local canonical-lock negative mutates only its own reference; fresh remote CI also passes the actual resolved-CI-lock branch: all 16 evidence and 30 public-type tests pass, including the genuine reviewed-reference positive and the strict actual-unreviewed-build refusal. The upstream synchronizer file runs its current 10 cases in CI. - The first complete CI attempt on this head also exposed two separate 30-second timeouts: one real reporter-artifact test and the `agent-test-environment` module-loading hook. Full original logs remain preserved. Their exact test, sanitizer and evidence source blobs are unchanged from the preceding head; inspection found no deterministic setup cause. After the original run finished, one retry of only the failed jobs passed on the same synthetic merge `168851e210671ebe97e7a778e8cf891807e80502`: Runner support reports 11,304 passes and 20 external skips; serialized shard 6 reports all 395 passes, including all 67 route bodies. No source, timeout or assertion changed. This proves recovery; the original causes remain unexplained. - The final pre-merge tree audit uses actual master `17136a6c25ef6cb7c816a29140a4c48c2c75fb31` (refreshed after the earlier `85dec046` audit). The expected normal squash preserves all 81 owned paths and 15,816 unrelated master entries and modes. Only OpenAPI has edits from both sides, and its complete content composition preserves the new project route and token help alongside this PR's API entries. The shared inbound selection changes preserve the same candidate set; new concurrent indexes, Native/workspace behavior and shutdown changes remain upstream behavior. The scoped form proof uses process agents and does not qualify the new Native/sandbox branches. The latest question-schema change still accepts the explicit version-1 payload exercised here. The last master delta also changes managed AI/Native credential refresh and writeback; those branches are outside the measured process-agent form paths. Existing 8,143 local outputs remain tied to their measured revision; no new whole-tree output equality or deployed suspension is claimed. - Reproduce the public path with `doc/testing/slack-cloud-qualification.md`, the companion Cloud checkout, Node 24/22 and fresh owned fixture databases. Aggregate local `pnpm -r typecheck`, `pnpm test:run` and `pnpm build` were not rerun as one command set. Current exact-head required CI and the complete Greptile 5/5 review now pass; the full edited summaries and all paginated threads were read. Local worker quiet does not prove deployed host or Neon suspension. Photon and Discord remain separate work; this PR completes the described Slack slice. ## Risks Use compatible App and Cloud readers before transferring custody. Signatures prove authenticity; current authorization and exact ownership still control execution. Preserve old targets, secrets and terminal facts until their normal owners release them. Keep the managed seal identity stable while custody remains. The required Slack adapter patch remains pinned. Upstream's concurrent index uses the normal top-level migration path. ## Model Used OpenAI `gpt-6.1-sol` implemented and tested the changes. A GPT-6-based Codex managing agent reviewed and integrated them. The host does not expose the managing agent's exact model ID or context-window sizes. The agents used code execution and test tools. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used, its version and tool capabilities - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have linked public related issues or PRs - [x] I have not referenced internal or instance-local Paperclip issues or links - [x] My branch name describes the change and contains no internal Paperclip ticket id - [x] I have run the local tests listed above and they pass - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation - [x] I have considered and documented risks - [x] All Paperclip CI gates are green for the current head - [x] Greptile is 5/5 with no open findings for the current head - [x] I will address all reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
157 lines
12 KiB
TypeScript
157 lines
12 KiB
TypeScript
import { createHash } from "node:crypto";
|
|
import { copyFile, mkdir, mkdtemp, readFile, realpath, rm, symlink, writeFile } from "node:fs/promises";
|
|
import path from "node:path";
|
|
import os from "node:os";
|
|
import { beforeAll, afterAll, expect, it } from "vitest";
|
|
import { prepareReviewedSdkReference } from "./source-sdk-reviewed-fixture.js";
|
|
import pins from "./source-sdk-public-inputs.json" with { type: "json" };
|
|
import { createSdkArtifactScanner, sdkPublicTypeSyntax, verifySdkPublicSource } from "./source-sdk-public-type.js";
|
|
import { findSecretLeakMatch, normalizedSecrets } from "./redaction.js";
|
|
import { diagnosticSecrets } from "./private-diagnostics.js";
|
|
const hash = (v: string | Buffer) => createHash("sha256").update(v).digest("hex");
|
|
const blob = (v: string | Buffer) => createHash("sha1").update(`blob ${Buffer.byteLength(v)}\0`).update(v).digest("hex");
|
|
const originalRoot = path.resolve(import.meta.dirname, "../.."), file = "packages/shared/dist/validators/synthetic-unit.d.ts", inputFile = file.replace("/dist/", "/src/").replace(/\.d\.ts$/, ".ts");
|
|
const source = 'import {z} from "zod";export const schema=z.object({daytona_api_key:z.string().min(1)});';
|
|
const declaration = 'import {z} from "zod";export declare const schema:{daytona_api_key:z.ZodOptional<z.ZodString>};';
|
|
let root: string; let reviewedRoot: string; let fixtureLockSha256: string;
|
|
const fixtureInputs: Record<string, string> = {};
|
|
beforeAll(async () => {
|
|
root = await realpath(await mkdtemp(path.join(os.tmpdir(), "sdk-public-type-synthetic-")));
|
|
await prepareReviewedSdkReference(originalRoot,root);
|
|
reviewedRoot=await realpath(await mkdtemp(path.join(os.tmpdir(),"sdk-public-reviewed-reference-")));
|
|
await prepareReviewedSdkReference(originalRoot,reviewedRoot);
|
|
for(const relative of Object.keys(pins.inputs))fixtureInputs[relative]=blob(await readFile(path.join(root,relative)));
|
|
fixtureLockSha256=hash(await readFile(path.join(root,"pnpm-lock.yaml")));
|
|
|
|
});
|
|
afterAll(async () => { for(const directory of [root,reviewedRoot])if(directory)await rm(directory,{recursive:true,force:true}); });
|
|
async function fixture(sourceText = source) {
|
|
await mkdir(path.dirname(path.join(root, inputFile)), { recursive: true }); await writeFile(path.join(root, inputFile), sourceText);
|
|
return { ...pins, lockSha256: fixtureLockSha256, inputs: { ...fixtureInputs, [inputFile]: blob(sourceText) } };
|
|
}
|
|
it("default public proof accepts the reviewed build lock and still rejects a changed lock", async () => {
|
|
const directory = await realpath(await mkdtemp(path.join(os.tmpdir(), "sdk-reviewed-runtime-")));
|
|
try {
|
|
await prepareReviewedSdkReference(originalRoot,directory);
|
|
const reviewed = JSON.parse(await readFile(path.join(originalRoot, "tests/runner-e2e/report-lock.json"), "utf8"));
|
|
const lock = await readFile(path.join(directory, "pnpm-lock.yaml"));
|
|
expect(hash(lock)).toBe(reviewed.outputSha256);
|
|
// Use the real default registry, without injecting alternate expected pins.
|
|
const proof = await verifySdkPublicSource(directory);
|
|
expect(proof.identity.lockSha256).toBe(hash(lock));
|
|
await writeFile(path.join(directory, "pnpm-lock.yaml"), Buffer.concat([lock, Buffer.from("\n# changed owning runtime input\n")]));
|
|
await expect(verifySdkPublicSource(directory)).rejects.toThrow("SDK public source proof unavailable");
|
|
} finally { await rm(directory, { recursive: true, force: true }); }
|
|
});
|
|
it("classifies varied genuinely public schema types while retaining the raw observation", async () => {
|
|
for (const text of [declaration, declaration.replaceAll("z.", "schemaLibrary.").replace("{z}", "{z as schemaLibrary}"), declaration.replace("ZodString", "ZodNumber")]) {
|
|
const scanner = createSdkArtifactScanner(root, [], await fixture()); expect(await scanner.scan(file, Buffer.from(text))).toBe(true);
|
|
const audit = await scanner.audit(); expect(audit.suppressedFindings).toBe(0); expect(audit.observations).toHaveLength(1); expect(audit.observations[0]!.classification).toBe("public_schema_type");
|
|
}
|
|
});
|
|
it("classifies the shipped agent env schema declaration and keeps a literal at that position strict", async () => {
|
|
// Plugin cells retain packages/shared/dist/validators/agent.d.ts, whose
|
|
// `OPENROUTER_API_KEY: z.ZodOptional<z.ZodString>` matches the OpenRouter key
|
|
// shape. Stale default pins left it unresolved and blocked web-server startup.
|
|
const repository = reviewedRoot, agentFile = "packages/shared/dist/validators/agent.d.ts";
|
|
const shipped = 'import { z } from "zod";\nexport declare const env: z.ZodObject<{\n OPENROUTER_API_KEY: z.ZodOptional<z.ZodString>;\n}>;\n';
|
|
const scanner = createSdkArtifactScanner(repository, []); expect(await scanner.scan(agentFile, Buffer.from(shipped))).toBe(true);
|
|
expect((await scanner.audit()).observations.map(row => row.classification)).toEqual(["public_schema_type"]);
|
|
for (const value of ['"syntheticCredentialValue123456789"', "syntheticCredentialValue123456789", 'z.ZodOptional<z.ZodString> | "syntheticCredential1"']) {
|
|
const strict = createSdkArtifactScanner(repository, []);
|
|
expect(await strict.scan(agentFile, Buffer.from(shipped.replace("z.ZodOptional<z.ZodString>", value)))).toBe(false);
|
|
expect((await strict.audit()).observations.map(row => row.classification)).toContain("unresolved_context");
|
|
}
|
|
});
|
|
it("protects an exact private value even when equal to a public schema symbol", async () => {
|
|
const scanner = createSdkArtifactScanner(root, ["ZodString"], await fixture()); expect(await scanner.scan(file, Buffer.from(declaration))).toBe(false);
|
|
expect((await scanner.audit()).observations[0]!.classification).toBe("private_exact");
|
|
});
|
|
it("keeps direct token shapes unconditional inside declarations", async () => {
|
|
const scanner = createSdkArtifactScanner(root, [], await fixture()); expect(await scanner.scan(file, Buffer.from(declaration+'declare const privateValue:"sk-ABCDEFGHIJKLMNOPQRSTUVWX123456789";'))).toBe(false);
|
|
expect((await scanner.audit()).observations.some(row => row.classification === "direct_token")).toBe(true);
|
|
});
|
|
it.each([
|
|
declaration.replace("z.ZodOptional<z.ZodString>", '"syntheticCredentialValue123456789"'),
|
|
declaration.replace("z.ZodString", '"syntheticCredentialValue123456789"'),
|
|
declaration.replace('from "zod"', 'from "unverified-library"'),
|
|
declaration.replace("z.ZodString", "UnboundPrivateType"),
|
|
declaration.replace("z.ZodString", "typeof privateValue"),
|
|
declaration+'declare namespace z {}',
|
|
declaration.replace("<z.ZodString>", "</* synthetic context */z.ZodString>"),
|
|
'const daytona_api_key="syntheticCredentialValue123456789";',
|
|
'// daytona_api_key: syntheticCredentialValue123456789',
|
|
declaration.slice(0, -2),
|
|
])("keeps unknown/literal/initializer/comment/shadow/parse evidence strict", async text => {
|
|
const scanner = createSdkArtifactScanner(root, [], await fixture()); expect(await scanner.scan(file, Buffer.from(text))).toBe(false);
|
|
});
|
|
it("does not classify unproven files or a forged proof object", async () => {
|
|
const expectations = await fixture(), scanner = createSdkArtifactScanner(root, [], expectations);
|
|
expect(await scanner.scan("arbitrary/credential.d.ts", Buffer.from(declaration))).toBe(false);
|
|
expect(await sdkPublicTypeSyntax({} as never, file, declaration, { start: 0, end: 1 })).toBe(false);
|
|
});
|
|
it("preserves unknown credential roots/private enum-equal leaves and their encoded values", async () => {
|
|
const raw = JSON.stringify({ unknown: { kind: "identity" }, token: "synthetic-private-value-71983521" });
|
|
const scanner = createSdkArtifactScanner(root, normalizedSecrets([raw]), await fixture());
|
|
for (const text of [declaration+'type PublicKind="identity";', declaration+'type Value="synthetic-private-value-71983521";']) expect(await scanner.scan(file, Buffer.from(text))).toBe(false);
|
|
});
|
|
it.each(["lockSha256", "compilerPackageSha256", "parserPackageSha256", "parserEntrySha256", "zodPackageSha256", "zodEntrySha256"] as const)("rejects mismatched %s without classifying syntax", async field => {
|
|
const expectations = await fixture(), scanner = createSdkArtifactScanner(root, [], { ...expectations, [field]: "0".repeat(64) });
|
|
expect(await scanner.scan(file, Buffer.from(declaration))).toBe(false); expect((await scanner.audit()).publicSource).toBeNull();
|
|
});
|
|
it("rejects changed source and unknown source initializers", async () => {
|
|
const expectations = await fixture(); await writeFile(path.join(root, inputFile), source+'\n');
|
|
const scanner = createSdkArtifactScanner(root, [], expectations); expect(await scanner.scan(file, Buffer.from(declaration))).toBe(false);
|
|
const other = createSdkArtifactScanner(root, [], await fixture(source.replace("z.string().min(1)", "privateFactory()"))); expect(await other.scan(file, Buffer.from(declaration))).toBe(false);
|
|
});
|
|
it("keeps stale, missing and extra source graph inputs ineligible after pin synchronization", async () => {
|
|
const expectations = await fixture();
|
|
const missing = { ...expectations.inputs }; delete missing[inputFile];
|
|
for (const inputs of [{ ...expectations.inputs, [inputFile]: "0".repeat(40) }, missing]) {
|
|
const scanner = createSdkArtifactScanner(root, [], { ...expectations, inputs });
|
|
expect(await scanner.scan(file, Buffer.from(declaration))).toBe(false);
|
|
expect((await scanner.audit()).publicSource).toBeNull();
|
|
}
|
|
const extra = path.join(root, "packages/shared/src/unpinned-synthetic.ts");
|
|
try {
|
|
await writeFile(extra, "export const synthetic = true;");
|
|
const scanner = createSdkArtifactScanner(root, [], expectations);
|
|
expect(await scanner.scan(file, Buffer.from(declaration))).toBe(false);
|
|
expect((await scanner.audit()).publicSource).toBeNull();
|
|
} finally { await rm(extra, { force: true }); }
|
|
const scanner = createSdkArtifactScanner(root, [], expectations);
|
|
expect(await scanner.scan(file, Buffer.from(declaration))).toBe(true);
|
|
});
|
|
it("keeps shape overflow blocked with bounded retained observations", async () => {
|
|
const scanner = createSdkArtifactScanner(root, [], await fixture()); expect(await scanner.scan(file, Buffer.from((declaration+'\n').repeat(40)))).toBe(false);
|
|
const audit = await scanner.audit(); expect(audit.bounded).toBe(false); expect(audit.observations).toHaveLength(32);
|
|
});
|
|
|
|
it("requires the authenticated public type export graph", async () => {
|
|
const expected = await fixture();
|
|
const scanner = createSdkArtifactScanner(root, [], { ...expected, zodTypeFiles: { ...expected.zodTypeFiles, "v4/classic/schemas.d.cts": "0".repeat(64) } });
|
|
expect(await scanner.scan(file, Buffer.from(declaration))).toBe(false);
|
|
expect((await scanner.audit()).publicSource).toBeNull();
|
|
});
|
|
it("rejects non-exported source factories and declaration constructors independently", async () => {
|
|
const unknownFactory = createSdkArtifactScanner(root, [], await fixture(source.replace("z.string()", "z.syntheticUnknownFactory()")));
|
|
expect(await unknownFactory.scan(file, Buffer.from(declaration))).toBe(false);
|
|
const unknownType = createSdkArtifactScanner(root, [], await fixture());
|
|
expect(await unknownType.scan(file, Buffer.from(declaration.replace("ZodString", "syntheticUnknownType")))).toBe(false);
|
|
});
|
|
it("does not apply typed syntax classification to API, stream, JavaScript or ZIP-shaped content", async () => {
|
|
for (const untyped of ["api-state.json", "persisted-run.ndjson", "entry.js", "blob.zip"]) {
|
|
const scanner = createSdkArtifactScanner(root, [], await fixture());
|
|
expect(await scanner.scan(untyped, Buffer.from(declaration))).toBe(false);
|
|
}
|
|
expect(findSecretLeakMatch(declaration, [])).toBeTruthy();
|
|
});
|
|
it("keeps raw and encoded credential leaves protected during a synthetic scan roundtrip", async () => {
|
|
const roots = diagnosticSecrets([JSON.stringify({ private: { kind: "identity", value: "synthetic-private-value-71983521" } })]).values;
|
|
for (const value of ["identity", "synthetic-private-value-71983521", Buffer.from("synthetic-private-value-71983521").toString("base64"), encodeURIComponent("synthetic-private-value-71983521")]) {
|
|
const scanner = createSdkArtifactScanner(root, roots, await fixture());
|
|
const bytes = Buffer.from(declaration+'type SyntheticPrivateValue="'+value+'";');
|
|
expect(await scanner.scan(file, bytes)).toBe(false);
|
|
}
|
|
});
|