@wakeshift/openclaw 0.0.0-stage → 1.4.24

package/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/README.md

@@ -1,3 +1,56 @@
-# Temporary Holding Version
+# Wakeshift for OpenClaw
 
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.
+Wakeshift's plugin for OpenClaw (2026.10.4 and later). It wakes an OpenClaw session when an app the session watches through [Wakeshift](https://wakeshift.ai) sends something, even while the session is idle, as long as the gateway runs. Messages arrive as outside information, never as the user.
+
+## Install
+
+Install it where the OpenClaw gateway runs (in its container, if it's in one). The agent offers this when an app's watch result asks, and runs it after your yes:
+
+```sh
+openclaw plugins install npm:@wakeshift/openclaw --force --accept-capabilities && openclaw plugins enable wakeshift --accept-capabilities
+```
+
+(The agent's command names the version, `npm:@wakeshift/openclaw@<version>`.)
+
+`--force` is what OpenClaw asks for to install a plugin from npm rather than ClawHub, and `--accept-capabilities` accepts the plugin's tool-result filter (it takes Wakeshift's beacon out of what the model sees) where nothing can prompt. There's nothing to approve afterwards and no restart: the plugin starts with the next turn.
+
+The plugin trusts Wakeshift's own service, `https://app.wakeshift.ai`. For another Wakeshift, set it first, before the install:
+
+```sh
+openclaw config set plugins.entries.wakeshift.config.issuer '"https://your-wakeshift.example"' --strict-json
+```
+
+The package is published from [github.com/wakeshift/connectors](https://github.com/wakeshift/connectors) by GitHub Actions with npm provenance, so npm can show which commit and workflow built it.
+
+To update, run the install command again (it also replaces a plugin installed by Wakeshift's earlier `openclaw.sh` installer).
+
+## Remove
+
+```sh
+openclaw wakeshift reset && openclaw plugins uninstall wakeshift --force
+```
+
+`openclaw wakeshift reset` undoes what the plugin turned on (below): it puts OpenClaw's hooks settings back as the plugin found them, apart from what you changed since, removes `allowNetworkHooks`, and deletes `~/.openclaw/wakeshift`. OpenClaw's uninstall then removes the plugin and its settings. OpenClaw has no uninstall hook, so `openclaw plugins uninstall` on its own leaves the hooks settings as the plugin left them.
+
+## How it wakes a session
+
+The plugin starts a turn with OpenClaw's own hooks endpoint, `POST <hooks.path>/agent` on the gateway's listener, in the session's own context (`sessionMode: "persistent"`). OpenClaw wraps the message as outside content. The turn's reply goes to the channel the session last spoke on, or stays in its transcript when it has none. A message is acknowledged to Wakeshift once the turn it started has finished.
+
+When it first connects a session, the plugin turns on OpenClaw's hooks:
+
+- `hooks.enabled`, with a random token of its own in `hooks.token`;
+- `hooks.allowRequestSessionKey`, with `hooks.defaultSessionKey: "hook:wakeshift"`;
+- `hooks.allowedSessionKeyPrefixes` and `hooks.allowedAgentIds`, allowing only the sessions and agents that connect through Wakeshift, each removed again when its session's subscription ends.
+
+If OpenClaw's hooks are on already, the plugin only adds the session and its agent, and only if your settings already let a caller name the session from a restricted prefix list; otherwise it changes nothing and tells the agent what it would need. Everything it changes is recorded in `~/.openclaw/wakeshift/hooks.json`, which `openclaw wakeshift reset` uses to put your settings back.
+
+The hooks endpoint shares the gateway's listener. On a gateway that listens beyond this computer (its bind isn't `loopback`), the endpoint is reachable there too, guarded by the token, so the plugin turns nothing on there until you agree: the agent asks first, and after your yes its command starts with `openclaw config set plugins.entries.wakeshift.config.allowNetworkHooks true --strict-json`. Block `/hooks/` from other machines with a firewall or proxy rule.
+
+## Settings
+
+- `plugins.entries.wakeshift.config.issuer`: the Wakeshift whose beacons the plugin trusts (unset: `https://app.wakeshift.ai`).
+- `plugins.entries.wakeshift.config.allowNetworkHooks`: you agreed to the hooks endpoint on a gateway that listens beyond this computer.
+
+## Development
+
+`npm test` runs the tests; `npm run pack` builds `wakeshift-openclaw.tgz`, which Wakeshift's earlier `/install/openclaw.sh` installs. Each release of github.com/wakeshift/connectors carries the npm package at the release's version, and its `npm.yml` publishes it with provenance. The design and what was verified are in `docs/harnesses.md` (OpenClaw) in Wakeshift's main repository.

package/dist/beacon.js

@@ -0,0 +1,287 @@
+// The connector beacon (internal/beacon): a compact JWS (EdDSA) a Wakeshift
+// tool result carries in _meta["wakeshift/connector"], holding a one-time
+// ticket that's redeemed for the conversation's own stream link. The plugin
+// trusts a beacon only if it's signed by the Wakeshift pinned at install
+// (keys from <issuer>/oauth/jwks) and is for this conversation
+// (VerifyBound), and it never trusts anything it can't verify.
+import { createPublicKey, verify as edVerify } from "node:crypto";
+export const META_KEY = "wakeshift/connector";
+export const TYPE = "wakeshift-connector+jwt";
+export const AUDIENCE = "wakeshift-connector";
+export class BeaconError extends Error {
+}
+export const UNTRUSTED = "beacon: not signed by a trusted Wakeshift";
+export const INVALID = "beacon: invalid";
+const b64 = (s) => Buffer.from(s, "base64url");
+const TOKEN = /^[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+$/;
+/** A beacon's issuer, unchecked (to find its keys). */
+export function issuerOf(token) {
+    if (!TOKEN.test(token))
+        return "";
+    try {
+        const c = JSON.parse(b64(token.split(".")[1]).toString("utf8"));
+        return typeof c?.iss === "string" ? c.iss : "";
+    }
+    catch {
+        return "";
+    }
+}
+/** An Ed25519 public key from a JWK ({kty: OKP, crv: Ed25519, x}). */
+export function jwkKey(k) {
+    if (k.kty !== "OKP" || k.crv !== "Ed25519" || typeof k.x !== "string" || b64(k.x).length !== 32)
+        return undefined;
+    try {
+        return createPublicKey({ key: { kty: "OKP", crv: "Ed25519", x: k.x }, format: "jwk" });
+    }
+    catch {
+        return undefined;
+    }
+}
+/** beacon.VerifyBound: signed by a trusted issuer, for this binding, unexpired, redeemable. */
+export function verifyBound(token, b, issuers, keyFor, now = Date.now()) {
+    if (!b.conversation)
+        throw new BeaconError(INVALID);
+    if (!issuers.includes(issuerOf(token)))
+        throw new BeaconError(UNTRUSTED);
+    const [h, c, s] = token.split(".");
+    let header;
+    try {
+        header = JSON.parse(b64(h).toString("utf8"));
+    }
+    catch {
+        throw new BeaconError(UNTRUSTED);
+    }
+    if (header.alg !== "EdDSA" || header.typ !== TYPE)
+        throw new BeaconError(UNTRUSTED);
+    const key = keyFor(header.kid ?? "");
+    if (!key || !edVerify(null, Buffer.from(h + "." + c), key, b64(s)))
+        throw new BeaconError(UNTRUSTED);
+    let claims;
+    try {
+        claims = JSON.parse(b64(c).toString("utf8"));
+    }
+    catch {
+        throw new BeaconError(UNTRUSTED);
+    }
+    if (!issuers.includes(claims.iss) ||
+        claims.aud !== AUDIENCE ||
+        Math.floor(now / 1000) > claims.exp ||
+        !claims.ticket ||
+        typeof claims.app !== "string" ||
+        !claims.app ||
+        !redeemable(claims.redeem, claims.iss))
+        throw new BeaconError(INVALID);
+    if (claims.thread) {
+        if (claims.thread !== b.conversation)
+            throw new BeaconError(INVALID);
+    }
+    else if (claims.call) {
+        if (claims.call !== b.call)
+            throw new BeaconError(INVALID);
+    }
+    else if (!b.unbound) {
+        throw new BeaconError(INVALID);
+    }
+    return claims;
+}
+/** On the issuer's own origin (the ticket and the earlier link go there), over https, or plain http on loopback (development). */
+export function redeemable(raw, issuer) {
+    if (typeof raw !== "string" || typeof issuer !== "string")
+        return false;
+    let u, i;
+    try {
+        u = new URL(raw);
+        i = new URL(issuer);
+    }
+    catch {
+        return false;
+    }
+    if (!u.host || u.username || u.password)
+        return false;
+    if (u.protocol !== i.protocol || u.host.toLowerCase() !== i.host.toLowerCase())
+        return false;
+    if (u.protocol === "https:")
+        return true;
+    return u.protocol === "http:" && isLoopback(u.hostname);
+}
+export function isLoopback(host) {
+    host = host.replace(/^\[|\]$/g, "");
+    return host === "localhost" || /^127\.\d+\.\d+\.\d+$/.test(host) || host === "::1";
+}
+/**
+ * A beacon in an MCP tool result: its _meta (at the top or a few levels
+ * down: harnesses wrap results differently), or else a beacon.Text line.
+ */
+export function beaconIn(result) {
+    let v = result;
+    if (typeof v === "string") {
+        try {
+            v = JSON.parse(v);
+        }
+        catch {
+            return inText(v);
+        }
+    }
+    let raw;
+    try {
+        raw = typeof result === "string" ? result : (JSON.stringify(result) ?? "");
+    }
+    catch {
+        raw = "";
+    }
+    return metaIn(v, 0) || inText(raw);
+}
+function metaIn(result, depth) {
+    if (depth > 4 || result === null || typeof result !== "object")
+        return "";
+    const meta = result._meta;
+    if (meta && typeof meta === "object") {
+        const t = meta[META_KEY];
+        if (typeof t === "string" && TOKEN.test(t))
+            return t;
+    }
+    for (const v of Array.isArray(result) ? result : Object.values(result)) {
+        if (v && typeof v === "object") {
+            const t = metaIn(v, depth + 1);
+            if (t)
+                return t;
+        }
+    }
+    return "";
+}
+/**
+ * The MCP server an OpenClaw tool name names: <server>__<tool> (its own
+ * runtime) or mcp__<server>__<tool> (Codex's). "" for a tool that isn't an
+ * MCP server's (exec, web fetch…), whose results never connect anything.
+ */
+export function mcpServer(tool) {
+    if (typeof tool !== "string")
+        return "";
+    const rest = tool.startsWith("mcp__") ? tool.slice(5) : tool;
+    const i = rest.indexOf("__");
+    return i > 0 && i + 2 < rest.length ? rest.slice(0, i) : "";
+}
+/**
+ * The MCP tool an OpenClaw tool name names (what follows its server's
+ * "__", as mcpServer splits it), "" for a tool that isn't an MCP server's.
+ */
+export function mcpTool(tool) {
+    const server = mcpServer(tool);
+    if (!server)
+        return "";
+    const name = tool;
+    const rest = name.startsWith("mcp__") ? name.slice(5) : name;
+    return rest.slice(server.length + 2);
+}
+/** A tool name with every character but ASCII letters, digits, _ and - turned into _ (beacon.NormalTool). */
+export function normalTool(s) {
+    return s.replace(/[^A-Za-z0-9_-]/g, "_");
+}
+/** Whether a beacon's tool claim names tool, the bare MCP tool that produced the result (beacon.ToolMatches). */
+export function toolMatches(claim, tool) {
+    return typeof claim === "string" && claim !== "" && tool !== "" && normalTool(claim) === normalTool(tool);
+}
+const TRAILER_RE = /(?:^|\n)\(For Wakeshift's hook on this computer, not for you: wakeshift-beacon: ([A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,})\)$/;
+/**
+ * The beacon on the last line of a result's text (beacon.Trailer): the
+ * SDKs put Wakeshift's text after the app's own, so a beacon the result
+ * was given ends it; one inside what the app wrote (a message it relays,
+ * JSON it returns) doesn't.
+ */
+export function trailer(s) {
+    return TRAILER_RE.exec(s.replace(/[ \t\r\n]+$/, ""))?.[1] ?? "";
+}
+/** A result's text: itself if a string, else its last text content item's (a result as JSON text too). */
+export function resultText(result, depth = 0) {
+    if (depth > 2)
+        return "";
+    if (typeof result === "string") {
+        const t = result.trim();
+        if (t.startsWith("{")) {
+            try {
+                const inner = resultText(JSON.parse(t), depth + 1);
+                if (inner)
+                    return inner;
+            }
+            catch {
+                /* text */
+            }
+        }
+        return result;
+    }
+    const content = result && typeof result === "object" ? result.content : undefined;
+    if (!Array.isArray(content))
+        return "";
+    for (let i = content.length - 1; i >= 0; i--) {
+        const c = content[i];
+        if (c && c.type === "text" && typeof c.text === "string")
+            return c.text;
+    }
+    return "";
+}
+function ownMeta(v) {
+    if (!v || typeof v !== "object")
+        return "";
+    const meta = v._meta;
+    if (meta && typeof meta === "object") {
+        const t = meta[META_KEY];
+        if (typeof t === "string" && TOKEN.test(t))
+            return t;
+    }
+    return "";
+}
+/**
+ * The beacon a result carries, and where (connector.FindBeacon): its own
+ * _meta (or, in Codex's runtime, the MCP result's _meta that OpenClaw keeps
+ * in details), a _meta further down, or the trailer of its text.
+ */
+export function findBeacon(result) {
+    let v = result;
+    if (typeof v === "string") {
+        try {
+            v = JSON.parse(v);
+        }
+        catch {
+            /* text */
+        }
+    }
+    // A result that came as text is the tool's words: a _meta in it (a chat
+    // message a read tool relays as its whole text), at the top or further
+    // in, isn't the result's, so only the line ending the text counts
+    // (connector.TextOnlyFormat; security review, October 28, 2026).
+    if (typeof result === "string") {
+        const t = trailer(resultText(result));
+        return t ? { token: t, carried: "text" } : { token: "", carried: "" };
+    }
+    const own = ownMeta(v) || (v && typeof v === "object" ? ownMeta(v.details) : "");
+    if (own)
+        return { token: own, carried: "meta" };
+    // The text's last line before a _meta further in: a document a tool
+    // returned can hold one, and mustn't hide the result's own beacon.
+    const t = trailer(resultText(result));
+    if (t)
+        return { token: t, carried: "text" };
+    const nested = metaIn(v, 0);
+    return nested ? { token: nested, carried: "nested" } : { token: "", carried: "" };
+}
+/**
+ * Whether a verified beacon may connect from where it was found, in the
+ * result of tool (the bare MCP tool; connector.acceptable): only from the
+ * tool it names, and one naming no tool (an app on an older SDK) only from
+ * the result's own _meta, which no text a tool relays can set.
+ */
+export function acceptable(c, carried, tool) {
+    if (!carried)
+        return false;
+    // A _meta inside the result (a document or message a tool returned)
+    // carries only a beacon bound to a call (connector.acceptable).
+    if (carried === "nested" && !c.call)
+        return false;
+    if (!c.tool)
+        return carried === "meta";
+    return toolMatches(c.tool, tool);
+}
+const TEXT_RE = /wakeshift-beacon: ?([A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,}\.[A-Za-z0-9_-]{8,})/;
+export function inText(s) {
+    return TEXT_RE.exec(s)?.[1] ?? "";
+}