Compare commits
40 Commits
feat/preve
...
fix/decima
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2a6596cc5 | ||
|
|
37208ce97e | ||
|
|
bf4042926d | ||
|
|
3ccc1c16ac | ||
|
|
135f0c91a1 | ||
|
|
8f5786e242 | ||
|
|
810eb4ca27 | ||
|
|
e6574f9f12 | ||
|
|
1a6726fabf | ||
|
|
89f8671217 | ||
|
|
fb5259221b | ||
|
|
fd17f59616 | ||
|
|
91bbc7ea61 | ||
|
|
783d832c6d | ||
|
|
698ca376e7 | ||
|
|
bfd9e21ab8 | ||
|
|
e46411f245 | ||
|
|
08447c6b29 | ||
|
|
9216cc6bf7 | ||
|
|
5108b08e39 | ||
|
|
6c46a4f809 | ||
|
|
0ea88f0d32 | ||
|
|
4c2e1f36f3 | ||
|
|
fa5315fc0e | ||
|
|
eda8b1550c | ||
|
|
742b11374f | ||
|
|
d16e83dcfa | ||
|
|
155aa57784 | ||
|
|
b88b6da7d9 | ||
|
|
fa13f7e282 | ||
|
|
f1a43ef758 | ||
|
|
4217813fd7 | ||
|
|
c588f7b1f3 | ||
|
|
985e8ee820 | ||
|
|
8832e76a0a | ||
|
|
9777f1dbd1 | ||
|
|
213d468aab | ||
|
|
46becb0e7b | ||
|
|
fad6bd100a | ||
|
|
5a11f83fea |
@@ -1,4 +1,5 @@
|
||||
NEXTAUTH_URL=https://example.com
|
||||
NEXTAUTH_SECRET="1234"
|
||||
GITHUB_SECRET=""
|
||||
GITHUB_ID=""
|
||||
NEXT_PUBLIC_COMPILE_API_ENDPOINT="http://localhost:9000/api/build"
|
||||
|
||||
@@ -108,3 +108,5 @@ To learn more about Next.js, take a look at the following resources:
|
||||
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
|
||||
|
||||
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome!
|
||||
|
||||
|
||||
|
||||
@@ -512,6 +512,7 @@ const ImportAccountDialog = () => {
|
||||
<Input
|
||||
name="secret"
|
||||
type="password"
|
||||
autoComplete="new-password"
|
||||
value={value}
|
||||
onChange={(e) => setValue(e.target.value)}
|
||||
/>
|
||||
|
||||
@@ -34,7 +34,9 @@ const DeployEditor = () => {
|
||||
|
||||
const [showContent, setShowContent] = useState(false);
|
||||
|
||||
const activeFile = snap.files[snap.active];
|
||||
const activeFile = snap.files[snap.active]?.compiledContent
|
||||
? snap.files[snap.active]
|
||||
: snap.files.filter((file) => file.compiledContent)[0];
|
||||
const compiledSize = activeFile?.compiledContent?.byteLength || 0;
|
||||
const color =
|
||||
compiledSize > FILESIZE_BREAKPOINTS[1]
|
||||
@@ -60,12 +62,21 @@ const DeployEditor = () => {
|
||||
{activeFile?.lastCompiled && (
|
||||
<ReactTimeAgo date={activeFile.lastCompiled} locale="en-US" />
|
||||
)}
|
||||
|
||||
{activeFile.compiledContent?.byteLength && (
|
||||
<Text css={{ ml: "$2", color }}>
|
||||
({filesize(activeFile.compiledContent.byteLength)})
|
||||
</Text>
|
||||
)}
|
||||
</Flex>
|
||||
{activeFile.compiledContent?.byteLength &&
|
||||
activeFile.compiledContent?.byteLength >= 64000 && (
|
||||
<Flex css={{ flexDirection: "column", py: "$3", pb: "$1" }}>
|
||||
<Text css={{ ml: "$2", color: "$error" }}>
|
||||
File size is larger than 64kB, cannot set hook!
|
||||
</Text>
|
||||
</Flex>
|
||||
)}
|
||||
<Button variant="link" onClick={() => setShowContent(true)}>
|
||||
View as WAT-file
|
||||
</Button>
|
||||
@@ -119,8 +130,8 @@ const DeployEditor = () => {
|
||||
className="hooks-editor"
|
||||
defaultLanguage={"wat"}
|
||||
language={"wat"}
|
||||
path={`file://tmp/c/${snap.files?.[snap.active]?.name}.wat`}
|
||||
value={snap.files?.[snap.active]?.compiledWatContent || ""}
|
||||
path={`file://tmp/c/${activeFile?.name}.wat`}
|
||||
value={activeFile?.compiledWatContent || ""}
|
||||
beforeMount={(monaco) => {
|
||||
monaco.languages.register({ id: "wat" });
|
||||
monaco.languages.setLanguageConfiguration("wat", wat.config);
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
import React, { useRef, useLayoutEffect } from "react";
|
||||
import { useSnapshot } from "valtio";
|
||||
import { Play, Prohibit } from "phosphor-react";
|
||||
import useStayScrolled from "react-stay-scrolled";
|
||||
|
||||
import Container from "./Container";
|
||||
import Box from "./Box";
|
||||
import LogText from "./LogText";
|
||||
import { compileCode } from "../state/actions";
|
||||
import state from "../state";
|
||||
import Button from "./Button";
|
||||
import Heading from "./Heading";
|
||||
|
||||
const Footer = () => {
|
||||
const snap = useSnapshot(state);
|
||||
const logRef = useRef<HTMLPreElement>(null);
|
||||
const { stayScrolled /*, scrollBottom*/ } = useStayScrolled(logRef);
|
||||
|
||||
useLayoutEffect(() => {
|
||||
stayScrolled();
|
||||
}, [snap.logs, stayScrolled]);
|
||||
|
||||
return (
|
||||
<Box
|
||||
as="footer"
|
||||
css={{
|
||||
display: "flex",
|
||||
borderTop: "1px solid $mauve6",
|
||||
background: "$mauve1",
|
||||
position: "relative",
|
||||
}}
|
||||
>
|
||||
<Container css={{ py: "$3", flexShrink: 1 }}>
|
||||
<Heading
|
||||
as="h3"
|
||||
css={{ fontWeight: 300, m: 0, fontSize: "11px", color: "$mauve9" }}
|
||||
>
|
||||
DEVELOPMENT LOG
|
||||
</Heading>
|
||||
<Button
|
||||
ghost
|
||||
size="xs"
|
||||
css={{
|
||||
position: "absolute",
|
||||
right: "$3",
|
||||
top: "$2",
|
||||
color: "$mauve10",
|
||||
}}
|
||||
onClick={() => {
|
||||
state.logs = [];
|
||||
}}
|
||||
>
|
||||
<Prohibit size="14px" />
|
||||
</Button>
|
||||
<Box
|
||||
as="pre"
|
||||
ref={logRef}
|
||||
css={{
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
width: "100%",
|
||||
height: "160px",
|
||||
fontSize: "13px",
|
||||
fontWeight: "$body",
|
||||
fontFamily: "$monospace",
|
||||
overflowY: "auto",
|
||||
wordWrap: "break-word",
|
||||
py: 3,
|
||||
}}
|
||||
>
|
||||
{snap.logs?.map((log, index) => (
|
||||
<Box as="span" key={log.type + index}>
|
||||
<LogText capitalize variant={log.type}>
|
||||
{log.type}:{" "}
|
||||
</LogText>
|
||||
<LogText>{log.message}</LogText>
|
||||
</Box>
|
||||
))}
|
||||
</Box>
|
||||
<Button
|
||||
variant="primary"
|
||||
uppercase
|
||||
disabled={!snap.files.length}
|
||||
isLoading={snap.compiling}
|
||||
onClick={() => compileCode(snap.active)}
|
||||
css={{
|
||||
position: "absolute",
|
||||
bottom: "$4",
|
||||
left: "$4",
|
||||
alignItems: "center",
|
||||
display: "flex",
|
||||
cursor: "pointer",
|
||||
}}
|
||||
>
|
||||
<Play weight="bold" size="16px" />
|
||||
Compile to Wasm
|
||||
</Button>
|
||||
</Container>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
||||
export default Footer;
|
||||
@@ -1,6 +1,6 @@
|
||||
import React, { useEffect, useRef } from "react";
|
||||
import { useSnapshot, ref } from "valtio";
|
||||
import Editor, { loader } from "@monaco-editor/react";
|
||||
import Editor from "@monaco-editor/react";
|
||||
import type monaco from "monaco-editor";
|
||||
import { ArrowBendLeftUp } from "phosphor-react";
|
||||
import { useTheme } from "next-themes";
|
||||
@@ -23,12 +23,6 @@ import ReconnectingWebSocket from "reconnecting-websocket";
|
||||
|
||||
import docs from "../xrpl-hooks-docs/docs";
|
||||
|
||||
loader.config({
|
||||
paths: {
|
||||
vs: "https://cdn.jsdelivr.net/npm/monaco-editor@0.30.1/min/vs",
|
||||
},
|
||||
});
|
||||
|
||||
const validateWritability = (editor: monaco.editor.IStandaloneCodeEditor) => {
|
||||
const currPath = editor.getModel()?.uri.path;
|
||||
if (apiHeaderFiles.find((h) => currPath?.endsWith(h))) {
|
||||
@@ -170,15 +164,21 @@ const HooksEditor = () => {
|
||||
onConnection: (connection) => {
|
||||
// create and start the language client
|
||||
const languageClient = createLanguageClient(connection);
|
||||
const disposable = languageClient.start();
|
||||
connection.onClose(() => {
|
||||
try {
|
||||
// disposable.stop();
|
||||
disposable.dispose();
|
||||
} catch (err) {
|
||||
console.log("err", err);
|
||||
}
|
||||
});
|
||||
languageClient.start();
|
||||
// connection.onDispose((d) => {
|
||||
// console.log("disposed: ", d);
|
||||
// });
|
||||
// connection.onError((ee) => {
|
||||
// console.log(ee =)
|
||||
// })
|
||||
// connection.onClose(() => {
|
||||
// try {
|
||||
// // disposable.stop();
|
||||
// disposable.dispose();
|
||||
// } catch (err) {
|
||||
// console.log("err", err);
|
||||
// }
|
||||
// });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
234
components/LogBoxForScripts.tsx
Normal file
234
components/LogBoxForScripts.tsx
Normal file
@@ -0,0 +1,234 @@
|
||||
import {
|
||||
useRef,
|
||||
useLayoutEffect,
|
||||
ReactNode,
|
||||
FC,
|
||||
useState,
|
||||
useCallback,
|
||||
} from "react";
|
||||
import { FileJs, Prohibit } from "phosphor-react";
|
||||
import useStayScrolled from "react-stay-scrolled";
|
||||
import NextLink from "next/link";
|
||||
|
||||
import Container from "./Container";
|
||||
import LogText from "./LogText";
|
||||
import state, { ILog } from "../state";
|
||||
import { Pre, Link, Heading, Button, Text, Flex, Box } from ".";
|
||||
import regexifyString from "regexify-string";
|
||||
import { useSnapshot } from "valtio";
|
||||
import { AccountDialog } from "./Accounts";
|
||||
import RunScript from "./RunScript";
|
||||
|
||||
interface ILogBox {
|
||||
title: string;
|
||||
clearLog?: () => void;
|
||||
logs: ILog[];
|
||||
renderNav?: () => ReactNode;
|
||||
enhanced?: boolean;
|
||||
showButtons?: boolean;
|
||||
}
|
||||
|
||||
const LogBox: FC<ILogBox> = ({
|
||||
title,
|
||||
clearLog,
|
||||
logs,
|
||||
children,
|
||||
renderNav,
|
||||
enhanced,
|
||||
showButtons = true,
|
||||
}) => {
|
||||
const logRef = useRef<HTMLPreElement>(null);
|
||||
const { stayScrolled /*, scrollBottom*/ } = useStayScrolled(logRef);
|
||||
const snap = useSnapshot(state);
|
||||
useLayoutEffect(() => {
|
||||
stayScrolled();
|
||||
}, [stayScrolled, logs]);
|
||||
|
||||
return (
|
||||
<Flex
|
||||
as="div"
|
||||
css={{
|
||||
display: "flex",
|
||||
borderTop: "1px solid $mauve6",
|
||||
background: "$mauve1",
|
||||
position: "relative",
|
||||
flex: 1,
|
||||
height: "100%",
|
||||
}}
|
||||
>
|
||||
<Container
|
||||
css={{
|
||||
px: 0,
|
||||
height: "100%",
|
||||
}}
|
||||
>
|
||||
<Flex
|
||||
fluid
|
||||
css={{
|
||||
height: "48px",
|
||||
alignItems: "center",
|
||||
fontSize: "$sm",
|
||||
fontWeight: 300,
|
||||
}}
|
||||
>
|
||||
<Heading
|
||||
as="h3"
|
||||
css={{
|
||||
fontWeight: 300,
|
||||
m: 0,
|
||||
fontSize: "11px",
|
||||
color: "$mauve12",
|
||||
px: "$3",
|
||||
textTransform: "uppercase",
|
||||
alignItems: "center",
|
||||
display: "inline-flex",
|
||||
gap: "$3",
|
||||
mr: "$3",
|
||||
}}
|
||||
>
|
||||
<FileJs size="15px" /> <Text css={{ lineHeight: 1 }}>{title}</Text>
|
||||
</Heading>
|
||||
{showButtons && (
|
||||
<Flex css={{ gap: "$3" }}>
|
||||
{snap.files
|
||||
.filter((f) => f.name.endsWith(".js"))
|
||||
.map((file) => (
|
||||
<RunScript file={file} key={file.name} />
|
||||
))}
|
||||
</Flex>
|
||||
)}
|
||||
<Flex css={{ ml: "auto", gap: "$3", marginRight: "$3" }}>
|
||||
{clearLog && (
|
||||
<Button ghost size="xs" onClick={clearLog}>
|
||||
<Prohibit size="14px" />
|
||||
</Button>
|
||||
)}
|
||||
</Flex>
|
||||
</Flex>
|
||||
<Box
|
||||
as="pre"
|
||||
ref={logRef}
|
||||
css={{
|
||||
margin: 0,
|
||||
// display: "inline-block",
|
||||
display: "flex",
|
||||
flexDirection: "column",
|
||||
width: "100%",
|
||||
height: "calc(100% - 48px)", // 100% minus the logbox header height
|
||||
overflowY: "auto",
|
||||
fontSize: "13px",
|
||||
fontWeight: "$body",
|
||||
fontFamily: "$monospace",
|
||||
px: "$3",
|
||||
pb: "$2",
|
||||
whiteSpace: "normal",
|
||||
}}
|
||||
>
|
||||
{logs?.map((log, index) => (
|
||||
<Box
|
||||
as="span"
|
||||
key={log.type + index}
|
||||
css={{
|
||||
"@hover": {
|
||||
"&:hover": {
|
||||
backgroundColor: enhanced ? "$backgroundAlt" : undefined,
|
||||
},
|
||||
},
|
||||
p: enhanced ? "$1" : undefined,
|
||||
my: enhanced ? "$1" : undefined,
|
||||
}}
|
||||
>
|
||||
<Log {...log} />
|
||||
</Box>
|
||||
))}
|
||||
{children}
|
||||
</Box>
|
||||
</Container>
|
||||
</Flex>
|
||||
);
|
||||
};
|
||||
|
||||
export const Log: FC<ILog> = ({
|
||||
type,
|
||||
timestring,
|
||||
message: _message,
|
||||
link,
|
||||
linkText,
|
||||
defaultCollapsed,
|
||||
jsonData: _jsonData,
|
||||
}) => {
|
||||
const [expanded, setExpanded] = useState(!defaultCollapsed);
|
||||
const { accounts } = useSnapshot(state);
|
||||
const [dialogAccount, setDialogAccount] = useState<string | null>(null);
|
||||
|
||||
const enrichAccounts = useCallback(
|
||||
(str?: string): ReactNode => {
|
||||
if (!str || !accounts.length) return null;
|
||||
|
||||
const pattern = `(${accounts.map((acc) => acc.address).join("|")})`;
|
||||
const res = regexifyString({
|
||||
pattern: new RegExp(pattern, "gim"),
|
||||
decorator: (match, idx) => {
|
||||
const name = accounts.find((acc) => acc.address === match)?.name;
|
||||
return (
|
||||
<Link
|
||||
key={match + idx}
|
||||
as="a"
|
||||
onClick={() => setDialogAccount(match)}
|
||||
title={match}
|
||||
highlighted
|
||||
>
|
||||
{name || match}
|
||||
</Link>
|
||||
);
|
||||
},
|
||||
input: str,
|
||||
});
|
||||
|
||||
return <>{res}</>;
|
||||
},
|
||||
[accounts]
|
||||
);
|
||||
|
||||
let message: ReactNode;
|
||||
|
||||
if (typeof _message === "string") {
|
||||
_message = _message.trim().replace(/\n /gi, "\n");
|
||||
message = enrichAccounts(_message);
|
||||
} else {
|
||||
message = _message;
|
||||
}
|
||||
|
||||
const jsonData = enrichAccounts(_jsonData);
|
||||
|
||||
return (
|
||||
<>
|
||||
<AccountDialog
|
||||
setActiveAccountAddress={setDialogAccount}
|
||||
activeAccountAddress={dialogAccount}
|
||||
/>
|
||||
<LogText variant={type}>
|
||||
{timestring && (
|
||||
<Text muted monospace>
|
||||
{timestring}{" "}
|
||||
</Text>
|
||||
)}
|
||||
<Pre>{message} </Pre>
|
||||
{link && (
|
||||
<NextLink href={link} shallow passHref>
|
||||
<Link as="a">{linkText}</Link>
|
||||
</NextLink>
|
||||
)}
|
||||
{jsonData && (
|
||||
<Link onClick={() => setExpanded(!expanded)} as="a">
|
||||
{expanded ? "Collapse" : "Expand"}
|
||||
</Link>
|
||||
)}
|
||||
{expanded && jsonData && <Pre block>{jsonData}</Pre>}
|
||||
</LogText>
|
||||
<br />
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default LogBox;
|
||||
314
components/RunScript/index.tsx
Normal file
314
components/RunScript/index.tsx
Normal file
@@ -0,0 +1,314 @@
|
||||
import * as Handlebars from "handlebars";
|
||||
import { Play, X } from "phosphor-react";
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import state, { IFile, ILog } from "../../state";
|
||||
import Button from "../Button";
|
||||
import Box from "../Box";
|
||||
import Input from "../Input";
|
||||
import Stack from "../Stack";
|
||||
import {
|
||||
Dialog,
|
||||
DialogTrigger,
|
||||
DialogContent,
|
||||
DialogTitle,
|
||||
DialogDescription,
|
||||
DialogClose,
|
||||
} from "../Dialog";
|
||||
import Flex from "../Flex";
|
||||
import { useSnapshot } from "valtio";
|
||||
import Select from "../Select";
|
||||
import { saveFile } from "../../state/actions/saveFile";
|
||||
|
||||
Handlebars.registerHelper(
|
||||
"customize_input",
|
||||
function (/* dynamic arguments */) {
|
||||
return new Handlebars.SafeString(arguments[0]);
|
||||
}
|
||||
);
|
||||
|
||||
const generateHtmlTemplate = (code: string) => {
|
||||
return `
|
||||
<html>
|
||||
<head>
|
||||
<script>
|
||||
var log = console.log;
|
||||
var errorLog = console.error;
|
||||
var infoLog = console.info;
|
||||
var warnLog = console.warn
|
||||
console.log = function(){
|
||||
var args = Array.from(arguments);
|
||||
parent.window.postMessage({ type: 'log', args: args || [] }, '*');
|
||||
log.apply(console, args);
|
||||
}
|
||||
console.error = function(){
|
||||
var args = Array.from(arguments);
|
||||
parent.window.postMessage({ type: 'error', args: args || [] }, '*');
|
||||
errorLog.apply(console, args);
|
||||
}
|
||||
console.info = function(){
|
||||
var args = Array.from(arguments);
|
||||
parent.window.postMessage({ type: 'info', args: args || [] }, '*');
|
||||
infoLog.apply(console, args);
|
||||
}
|
||||
console.warn = function(){
|
||||
var args = Array.from(arguments);
|
||||
parent.window.postMessage({ type: 'warning', args: args || [] }, '*');
|
||||
warnLog.apply(console, args);
|
||||
}
|
||||
</script>
|
||||
<script type="module">
|
||||
${code}
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
</body>
|
||||
</html>
|
||||
`;
|
||||
};
|
||||
|
||||
type Fields = Record<
|
||||
string,
|
||||
{
|
||||
key: string;
|
||||
value: string;
|
||||
label?: string;
|
||||
type?: string;
|
||||
attach?: "account_secret" | "account_address" | string;
|
||||
}
|
||||
>;
|
||||
|
||||
const RunScript: React.FC<{ file: IFile }> = ({ file: { content, name } }) => {
|
||||
const snap = useSnapshot(state);
|
||||
const [templateError, setTemplateError] = useState("");
|
||||
const getFieldValues = useCallback(() => {
|
||||
try {
|
||||
const parsed = Handlebars.parse(content);
|
||||
const names = parsed.body
|
||||
.filter((i) => i.type === "MustacheStatement")
|
||||
.map((block) => {
|
||||
// @ts-expect-error
|
||||
const type = block.hash?.pairs?.find((i) => i.key == "type");
|
||||
// @ts-expect-error
|
||||
const attach = block.hash?.pairs?.find((i) => i.key == "attach");
|
||||
// @ts-expect-error
|
||||
const label = block.hash?.pairs?.find((i) => i.key == "label");
|
||||
const key =
|
||||
// @ts-expect-error
|
||||
block?.path?.original === "customize_input"
|
||||
? // @ts-expect-error
|
||||
block?.params?.[0].original
|
||||
: // @ts-expect-error
|
||||
block?.path?.original;
|
||||
return {
|
||||
key,
|
||||
label: label?.value?.original || key,
|
||||
attach: attach?.value?.original,
|
||||
type: type?.value?.original,
|
||||
value: "",
|
||||
};
|
||||
});
|
||||
const defaultState: Fields = {};
|
||||
|
||||
if (names) {
|
||||
names.forEach((field) => (defaultState[field.key] = field));
|
||||
}
|
||||
setTemplateError("");
|
||||
return defaultState;
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
setTemplateError("Could not parse template");
|
||||
return undefined;
|
||||
}
|
||||
}, [content]);
|
||||
|
||||
// const defaultFieldValues = getFieldValues();
|
||||
|
||||
const [fields, setFields] = useState<Fields>({});
|
||||
const [iFrameCode, setIframeCode] = useState("");
|
||||
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
||||
const runScript = () => {
|
||||
const fieldsToSend: Record<string, string> = {};
|
||||
Object.entries(fields).map(([key, obj]) => {
|
||||
fieldsToSend[key] = obj.value;
|
||||
});
|
||||
const template = Handlebars.compile(content, { strict: false });
|
||||
try {
|
||||
const code = template(fieldsToSend);
|
||||
setIframeCode(generateHtmlTemplate(code));
|
||||
state.scriptLogs = [
|
||||
...snap.scriptLogs,
|
||||
{ type: "success", message: "Started running..." },
|
||||
];
|
||||
} catch (err) {
|
||||
state.scriptLogs = [
|
||||
...snap.scriptLogs,
|
||||
// @ts-expect-error
|
||||
{ type: "error", message: err?.message || "Could not parse template" },
|
||||
];
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
const handleEvent = (e: any) => {
|
||||
if (e.data.type === "log" || e.data.type === "error") {
|
||||
const data: ILog[] = e.data.args.map((msg: any) => ({
|
||||
type: e.data.type,
|
||||
message: typeof msg === "string" ? msg : JSON.stringify(msg, null, 2),
|
||||
}));
|
||||
state.scriptLogs = [...snap.scriptLogs, ...data];
|
||||
}
|
||||
};
|
||||
window.addEventListener("message", handleEvent);
|
||||
return () => window.removeEventListener("message", handleEvent);
|
||||
}, [snap.scriptLogs]);
|
||||
|
||||
useEffect(() => {
|
||||
const newDefaultState = getFieldValues();
|
||||
setFields(newDefaultState || {});
|
||||
}, [content, setFields, getFieldValues]);
|
||||
|
||||
const options = snap.accounts?.map((acc) => ({
|
||||
label: acc.name,
|
||||
secret: acc.secret,
|
||||
address: acc.address,
|
||||
value: acc.address,
|
||||
}));
|
||||
|
||||
return (
|
||||
<>
|
||||
<Dialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
|
||||
<DialogTrigger asChild>
|
||||
<Button
|
||||
variant="primary"
|
||||
onClick={() => {
|
||||
saveFile(false);
|
||||
setIframeCode("");
|
||||
}}
|
||||
>
|
||||
<Play weight="bold" size="16px" /> {name}
|
||||
</Button>
|
||||
</DialogTrigger>
|
||||
<DialogContent>
|
||||
<DialogTitle>Run {name} script</DialogTitle>
|
||||
<DialogDescription>
|
||||
You are about to run scripts provided by the developer of the hook,
|
||||
make sure you know what you are doing.
|
||||
<br />
|
||||
{templateError && (
|
||||
<Box
|
||||
as="span"
|
||||
css={{ display: "block", color: "$error", mt: "$3" }}
|
||||
>
|
||||
Error occured while parsing template, modify script and try
|
||||
again!
|
||||
</Box>
|
||||
)}
|
||||
<br />
|
||||
{Object.keys(fields).length > 0
|
||||
? `You also need to fill in following parameters to run the script`
|
||||
: ""}
|
||||
</DialogDescription>
|
||||
<Stack css={{ width: "100%" }}>
|
||||
{Object.keys(fields).map((key) => (
|
||||
<Box key={key} css={{ width: "100%" }}>
|
||||
<label>
|
||||
{fields[key]?.label || key}{" "}
|
||||
{fields[key].attach === "account_secret" &&
|
||||
`(Script uses account secret)`}
|
||||
</label>
|
||||
{fields[key].attach === "account_secret" ||
|
||||
fields[key].attach === "account_address" ? (
|
||||
<Select
|
||||
css={{ mt: "$1" }}
|
||||
options={options}
|
||||
onChange={(val: any) => {
|
||||
setFields({
|
||||
...fields,
|
||||
[key]: {
|
||||
...fields[key],
|
||||
value:
|
||||
fields[key].attach === "account_secret"
|
||||
? val.secret
|
||||
: val.address,
|
||||
},
|
||||
});
|
||||
}}
|
||||
value={options.find(
|
||||
(opt) =>
|
||||
opt.address === fields[key].value ||
|
||||
opt.secret === fields[key].value
|
||||
)}
|
||||
/>
|
||||
) : (
|
||||
<Input
|
||||
type={fields[key].type || "text"}
|
||||
value={
|
||||
typeof fields[key].value !== "string"
|
||||
? // @ts-expect-error
|
||||
fields[key].value.value
|
||||
: fields[key].value
|
||||
}
|
||||
css={{ mt: "$1" }}
|
||||
onChange={(e) => {
|
||||
setFields({
|
||||
...fields,
|
||||
[key]: { ...fields[key], value: e.target.value },
|
||||
});
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
</Box>
|
||||
))}
|
||||
<Flex
|
||||
css={{ justifyContent: "flex-end", width: "100%", gap: "$3" }}
|
||||
>
|
||||
<DialogClose asChild>
|
||||
<Button outline>Cancel</Button>
|
||||
</DialogClose>
|
||||
<Button
|
||||
variant="primary"
|
||||
isDisabled={
|
||||
(Object.entries(fields).length > 0 &&
|
||||
Object.entries(fields).some(([key, obj]) => !obj.value)) ||
|
||||
Boolean(templateError)
|
||||
}
|
||||
onClick={() => {
|
||||
state.scriptLogs = [];
|
||||
runScript();
|
||||
setIsDialogOpen(false);
|
||||
}}
|
||||
>
|
||||
Run script
|
||||
</Button>
|
||||
</Flex>
|
||||
</Stack>
|
||||
<DialogClose asChild>
|
||||
<Box
|
||||
css={{
|
||||
position: "absolute",
|
||||
top: "$1",
|
||||
right: "$1",
|
||||
cursor: "pointer",
|
||||
background: "$mauve1",
|
||||
display: "flex",
|
||||
borderRadius: "$full",
|
||||
p: "$1",
|
||||
}}
|
||||
>
|
||||
<X size="20px" />
|
||||
</Box>
|
||||
</DialogClose>
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
{iFrameCode && (
|
||||
<iframe
|
||||
style={{ display: "none" }}
|
||||
srcDoc={iFrameCode}
|
||||
sandbox="allow-scripts"
|
||||
/>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default RunScript;
|
||||
@@ -140,6 +140,16 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
||||
return null;
|
||||
}
|
||||
|
||||
const tooLargeFile = () => {
|
||||
const activeFile = snap.files[snap.active].compiledContent
|
||||
? snap.files[snap.active]
|
||||
: snap.files.filter((file) => file.compiledContent)[0];
|
||||
return Boolean(
|
||||
activeFile?.compiledContent?.byteLength &&
|
||||
activeFile?.compiledContent?.byteLength >= 64000
|
||||
);
|
||||
};
|
||||
|
||||
const onSubmit: SubmitHandler<SetHookData> = async (data) => {
|
||||
const currAccount = state.accounts.find(
|
||||
(acc) => acc.address === account.address
|
||||
@@ -164,7 +174,8 @@ export const SetHookDialog: React.FC<{ accountAddress: string }> = React.memo(
|
||||
variant={"secondary"}
|
||||
disabled={
|
||||
account.isLoading ||
|
||||
!snap.files.filter((file) => file.compiledWatContent).length
|
||||
!snap.files.filter((file) => file.compiledWatContent).length ||
|
||||
tooLargeFile()
|
||||
}
|
||||
>
|
||||
Set Hook
|
||||
|
||||
115
components/Textarea.tsx
Normal file
115
components/Textarea.tsx
Normal file
@@ -0,0 +1,115 @@
|
||||
import { styled } from "../stitches.config";
|
||||
|
||||
export const Textarea = styled("textarea", {
|
||||
// Reset
|
||||
appearance: "none",
|
||||
borderWidth: "0",
|
||||
boxSizing: "border-box",
|
||||
fontFamily: "inherit",
|
||||
outline: "none",
|
||||
width: "100%",
|
||||
flex: "1",
|
||||
backgroundColor: "$mauve4",
|
||||
display: "inline-flex",
|
||||
alignItems: "center",
|
||||
justifyContent: "center",
|
||||
borderRadius: "$sm",
|
||||
p: "$2",
|
||||
fontSize: "$md",
|
||||
lineHeight: 1,
|
||||
color: "$mauve12",
|
||||
boxShadow: `0 0 0 1px $colors$mauve8`,
|
||||
WebkitTapHighlightColor: "rgba(0,0,0,0)",
|
||||
"&::before": {
|
||||
boxSizing: "border-box",
|
||||
},
|
||||
"&::after": {
|
||||
boxSizing: "border-box",
|
||||
},
|
||||
fontVariantNumeric: "tabular-nums",
|
||||
|
||||
"&:-webkit-autofill": {
|
||||
boxShadow: "inset 0 0 0 1px $colors$blue6, inset 0 0 0 100px $colors$blue3",
|
||||
},
|
||||
|
||||
"&:-webkit-autofill::first-line": {
|
||||
fontFamily: "$untitled",
|
||||
color: "$mauve12",
|
||||
},
|
||||
|
||||
"&:focus": {
|
||||
boxShadow: `0 0 0 1px $colors$mauve10`,
|
||||
"&:-webkit-autofill": {
|
||||
boxShadow: `0 0 0 1px $colors$mauve10`,
|
||||
},
|
||||
},
|
||||
"&::placeholder": {
|
||||
color: "$mauve9",
|
||||
},
|
||||
"&:disabled": {
|
||||
pointerEvents: "none",
|
||||
backgroundColor: "$mauve2",
|
||||
color: "$mauve8",
|
||||
cursor: "not-allowed",
|
||||
"&::placeholder": {
|
||||
color: "$mauve7",
|
||||
},
|
||||
},
|
||||
|
||||
variants: {
|
||||
variant: {
|
||||
ghost: {
|
||||
boxShadow: "none",
|
||||
backgroundColor: "transparent",
|
||||
"@hover": {
|
||||
"&:hover": {
|
||||
boxShadow: "inset 0 0 0 1px $colors$mauve7",
|
||||
},
|
||||
},
|
||||
"&:focus": {
|
||||
backgroundColor: "$loContrast",
|
||||
boxShadow: `0 0 0 1px $colors$mauve10`,
|
||||
},
|
||||
"&:disabled": {
|
||||
backgroundColor: "transparent",
|
||||
},
|
||||
"&:read-only": {
|
||||
backgroundColor: "transparent",
|
||||
},
|
||||
},
|
||||
deep: {
|
||||
backgroundColor: "$deep",
|
||||
boxShadow: "none",
|
||||
},
|
||||
},
|
||||
state: {
|
||||
invalid: {
|
||||
boxShadow: "inset 0 0 0 1px $colors$crimson7",
|
||||
"&:focus": {
|
||||
boxShadow:
|
||||
"inset 0px 0px 0px 1px $colors$crimson8, 0px 0px 0px 1px $colors$crimson8",
|
||||
},
|
||||
},
|
||||
valid: {
|
||||
boxShadow: "inset 0 0 0 1px $colors$grass7",
|
||||
"&:focus": {
|
||||
boxShadow:
|
||||
"inset 0px 0px 0px 1px $colors$grass8, 0px 0px 0px 1px $colors$grass8",
|
||||
},
|
||||
},
|
||||
},
|
||||
cursor: {
|
||||
default: {
|
||||
cursor: "default",
|
||||
"&:focus": {
|
||||
cursor: "text",
|
||||
},
|
||||
},
|
||||
text: {
|
||||
cursor: "text",
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
export default Textarea;
|
||||
@@ -1,4 +1,4 @@
|
||||
import { FC, useCallback, useState } from "react";
|
||||
import { FC, useCallback, useEffect, useState } from "react";
|
||||
import Container from "../Container";
|
||||
import Flex from "../Flex";
|
||||
import Input from "../Input";
|
||||
@@ -15,6 +15,7 @@ import { useSnapshot } from "valtio";
|
||||
import state from "../../state";
|
||||
import { streamState } from "../DebugStream";
|
||||
import { Button } from "..";
|
||||
import Textarea from "../Textarea";
|
||||
|
||||
interface UIProps {
|
||||
setState: (
|
||||
@@ -110,6 +111,19 @@ export const TxUI: FC<UIProps> = ({
|
||||
(k) => !specialFields.includes(k)
|
||||
) as [keyof TxFields];
|
||||
|
||||
const switchToJson = () =>
|
||||
setState({ editorSavedValue: null, viewType: "json" });
|
||||
|
||||
useEffect(() => {
|
||||
const defaultOption = transactionsOptions.find(
|
||||
(tt) => tt.value === "Payment"
|
||||
);
|
||||
if (defaultOption) {
|
||||
handleChangeTxType(defaultOption);
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<Container
|
||||
css={{
|
||||
@@ -196,7 +210,7 @@ export const TxUI: FC<UIProps> = ({
|
||||
let value: string | undefined;
|
||||
if (typeof _value === "object") {
|
||||
if (_value.$type === "json" && typeof _value.$value === "object") {
|
||||
value = JSON.stringify(_value.$value);
|
||||
value = JSON.stringify(_value.$value, null, 2);
|
||||
} else {
|
||||
value = _value.$value.toString();
|
||||
}
|
||||
@@ -204,9 +218,13 @@ export const TxUI: FC<UIProps> = ({
|
||||
value = _value?.toString();
|
||||
}
|
||||
|
||||
let isXrp = typeof _value === "object" && _value.$type === "xrp";
|
||||
|
||||
const isXrp = typeof _value === "object" && _value.$type === "xrp";
|
||||
const isJson = typeof _value === "object" && _value.$type === "json";
|
||||
const isFee = field === "Fee";
|
||||
let rows = isJson
|
||||
? (value?.match(/\n/gm)?.length || 0) + 1
|
||||
: undefined;
|
||||
if (rows && rows > 5) rows = 5;
|
||||
return (
|
||||
<Flex column key={field} css={{ mb: "$2", pr: "1px" }}>
|
||||
<Flex
|
||||
@@ -221,18 +239,56 @@ export const TxUI: FC<UIProps> = ({
|
||||
<Text muted css={{ mr: "$3" }}>
|
||||
{field + (isXrp ? " (XRP)" : "")}:{" "}
|
||||
</Text>
|
||||
<Input
|
||||
value={value}
|
||||
onChange={(e) => {
|
||||
let value = e.target.value;
|
||||
if (value && (value.includes(".") || value.includes(","))) {
|
||||
value = value.replaceAll(".", "").replaceAll(",", "");
|
||||
{isJson ? (
|
||||
<Textarea
|
||||
rows={rows}
|
||||
value={value}
|
||||
spellCheck={false}
|
||||
onChange={switchToJson}
|
||||
css={{
|
||||
width: "70%",
|
||||
flex: "inherit",
|
||||
resize: "vertical",
|
||||
}}
|
||||
/>
|
||||
) : (
|
||||
<Input
|
||||
type={isFee ? "number" : "text"}
|
||||
value={value}
|
||||
onChange={(e) => {
|
||||
if (isFee) {
|
||||
const val = e.target.value
|
||||
.replaceAll(".", "")
|
||||
.replaceAll(",", "");
|
||||
handleSetField(field, val);
|
||||
} else {
|
||||
handleSetField(field, e.target.value);
|
||||
}
|
||||
}}
|
||||
onKeyPress={
|
||||
isFee
|
||||
? (e) => {
|
||||
if (e.key === "." || e.key === ",") {
|
||||
e.preventDefault();
|
||||
}
|
||||
}
|
||||
: undefined
|
||||
}
|
||||
|
||||
handleSetField(field, value);
|
||||
}}
|
||||
css={{ width: "70%", flex: "inherit" }}
|
||||
/>
|
||||
css={{
|
||||
width: "70%",
|
||||
flex: "inherit",
|
||||
"-moz-appearance": "textfield",
|
||||
"&::-webkit-outer-spin-button": {
|
||||
"-webkit-appearance": "none",
|
||||
margin: 0,
|
||||
},
|
||||
"&::-webkit-inner-spin-button ": {
|
||||
"-webkit-appearance": "none",
|
||||
margin: 0,
|
||||
},
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
{isFee && (
|
||||
<Button
|
||||
size="xs"
|
||||
|
||||
@@ -12,6 +12,5 @@ export { default as Box } from "./Box";
|
||||
export { default as Button } from "./Button";
|
||||
export { default as Pre } from "./Pre";
|
||||
export { default as ButtonGroup } from "./ButtonGroup";
|
||||
export { default as DeployFooter } from "./DeployFooter";
|
||||
export * from "./Dialog";
|
||||
export * from "./DropdownMenu";
|
||||
|
||||
@@ -8,6 +8,9 @@ module.exports = {
|
||||
config.resolve.alias["vscode"] = require.resolve(
|
||||
"@codingame/monaco-languageclient/lib/vscode-compatibility"
|
||||
);
|
||||
config.resolve.alias["handlebars"] = require.resolve(
|
||||
"handlebars/dist/handlebars.js"
|
||||
);
|
||||
if (!isServer) {
|
||||
config.resolve.fallback.fs = false;
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
"dependencies": {
|
||||
"@codingame/monaco-jsonrpc": "^0.3.1",
|
||||
"@codingame/monaco-languageclient": "^0.17.0",
|
||||
"@monaco-editor/react": "^4.4.1",
|
||||
"@monaco-editor/react": "^4.4.5",
|
||||
"@octokit/core": "^3.5.1",
|
||||
"@radix-ui/colors": "^0.1.7",
|
||||
"@radix-ui/react-alert-dialog": "^0.1.1",
|
||||
@@ -23,11 +23,12 @@
|
||||
"@radix-ui/react-popover": "^0.1.6",
|
||||
"@radix-ui/react-switch": "^0.1.5",
|
||||
"@radix-ui/react-tooltip": "^0.1.7",
|
||||
"@stitches/react": "^1.2.6-0",
|
||||
"@stitches/react": "^1.2.8",
|
||||
"base64-js": "^1.5.1",
|
||||
"dinero.js": "^1.9.1",
|
||||
"file-saver": "^2.0.5",
|
||||
"filesize": "^8.0.7",
|
||||
"handlebars": "^4.7.7",
|
||||
"javascript-time-ago": "^2.3.11",
|
||||
"jszip": "^3.7.1",
|
||||
"lodash.uniqby": "^4.7.0",
|
||||
|
||||
@@ -8,7 +8,9 @@ import { useSnapshot } from "valtio";
|
||||
import { ButtonGroup, Flex } from "../../components";
|
||||
import Box from "../../components/Box";
|
||||
import Button from "../../components/Button";
|
||||
import LogBoxForScripts from "../../components/LogBoxForScripts";
|
||||
import Popover from "../../components/Popover";
|
||||
import RunScript from "../../components/RunScript";
|
||||
import state from "../../state";
|
||||
import { compileCode } from "../../state/actions";
|
||||
import { getSplit, saveSplit } from "../../state/actions/persistSplits";
|
||||
@@ -196,20 +198,61 @@ const Home: NextPage = () => {
|
||||
</Flex>
|
||||
</Hotkeys>
|
||||
)}
|
||||
{snap.files[snap.active]?.name?.split(".")?.[1]?.toLowerCase() ===
|
||||
"js" && (
|
||||
<Hotkeys
|
||||
keyName="command+b,ctrl+b"
|
||||
onKeyDown={() =>
|
||||
!snap.compiling && snap.files.length && compileCode(snap.active)
|
||||
}
|
||||
>
|
||||
<Flex
|
||||
css={{
|
||||
position: "absolute",
|
||||
bottom: "$4",
|
||||
left: "$4",
|
||||
alignItems: "center",
|
||||
display: "flex",
|
||||
cursor: "pointer",
|
||||
gap: "$2",
|
||||
}}
|
||||
>
|
||||
<RunScript file={snap.files[snap.active]} />
|
||||
</Flex>
|
||||
</Hotkeys>
|
||||
)}
|
||||
</main>
|
||||
<Box
|
||||
css={{
|
||||
display: "flex",
|
||||
background: "$mauve1",
|
||||
position: "relative",
|
||||
}}
|
||||
>
|
||||
<LogBox
|
||||
title="Development Log"
|
||||
clearLog={() => (state.logs = [])}
|
||||
logs={snap.logs}
|
||||
/>
|
||||
</Box>
|
||||
<Flex css={{ width: "100%" }}>
|
||||
<Flex
|
||||
css={{
|
||||
flex: 1,
|
||||
background: "$mauve1",
|
||||
position: "relative",
|
||||
borderRight: "1px solid $mauve8",
|
||||
}}
|
||||
>
|
||||
<LogBox
|
||||
title="Development Log"
|
||||
clearLog={() => (state.logs = [])}
|
||||
logs={snap.logs}
|
||||
/>
|
||||
</Flex>
|
||||
{snap.files[snap.active]?.name?.split(".")?.[1]?.toLowerCase() ===
|
||||
"js" && (
|
||||
<Flex
|
||||
css={{
|
||||
flex: 1,
|
||||
}}
|
||||
>
|
||||
<LogBoxForScripts
|
||||
showButtons={false}
|
||||
title="Script Log"
|
||||
logs={snap.scriptLogs}
|
||||
clearLog={() => (state.scriptLogs = [])}
|
||||
/>
|
||||
</Flex>
|
||||
)}
|
||||
</Flex>
|
||||
</Split>
|
||||
);
|
||||
};
|
||||
|
||||
@@ -6,6 +6,8 @@ import Transaction from "../../components/Transaction";
|
||||
import state from "../../state";
|
||||
import { getSplit, saveSplit } from "../../state/actions/persistSplits";
|
||||
import { transactionsState, modifyTransaction } from "../../state";
|
||||
import LogBoxForScripts from "../../components/LogBoxForScripts";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
const DebugStream = dynamic(() => import("../../components/DebugStream"), {
|
||||
ssr: false,
|
||||
@@ -19,18 +21,30 @@ const Accounts = dynamic(() => import("../../components/Accounts"), {
|
||||
});
|
||||
|
||||
const Test = () => {
|
||||
// This and useEffect is here to prevent useLayoutEffect warnings from react-split
|
||||
const [showComponent, setShowComponent] = useState(false);
|
||||
const { transactionLogs } = useSnapshot(state);
|
||||
const { transactions, activeHeader } = useSnapshot(transactionsState);
|
||||
|
||||
const snap = useSnapshot(state);
|
||||
useEffect(() => {
|
||||
setShowComponent(true);
|
||||
}, []);
|
||||
if (!showComponent) {
|
||||
return null;
|
||||
}
|
||||
const hasScripts =
|
||||
snap.files.filter((f) => f.name.endsWith(".js")).length > 0;
|
||||
return (
|
||||
<Container css={{ px: 0 }}>
|
||||
<Split
|
||||
direction="vertical"
|
||||
sizes={getSplit("testVertical") || [50, 50]}
|
||||
sizes={
|
||||
getSplit("testVertical") || (hasScripts ? [50, 20, 30] : [50, 50])
|
||||
}
|
||||
gutterSize={4}
|
||||
gutterAlign="center"
|
||||
style={{ height: "calc(100vh - 60px)" }}
|
||||
onDragEnd={e => saveSplit("testVertical", e)}
|
||||
onDragEnd={(e) => saveSplit("testVertical", e)}
|
||||
>
|
||||
<Flex
|
||||
row
|
||||
@@ -52,7 +66,7 @@ const Test = () => {
|
||||
width: "100%",
|
||||
height: "100%",
|
||||
}}
|
||||
onDragEnd={e => saveSplit("testHorizontal", e)}
|
||||
onDragEnd={(e) => saveSplit("testHorizontal", e)}
|
||||
>
|
||||
<Box css={{ width: "55%", px: "$2" }}>
|
||||
<Tabs
|
||||
@@ -64,17 +78,14 @@ const Test = () => {
|
||||
keepAllAlive
|
||||
forceDefaultExtension
|
||||
defaultExtension=".json"
|
||||
onCreateNewTab={header => modifyTransaction(header, {})}
|
||||
onCreateNewTab={(header) => modifyTransaction(header, {})}
|
||||
onCloseTab={(idx, header) =>
|
||||
header && modifyTransaction(header, undefined)
|
||||
}
|
||||
>
|
||||
{transactions.map(({ header, state }) => (
|
||||
<Tab key={header} header={header}>
|
||||
<Transaction
|
||||
state={state}
|
||||
header={header}
|
||||
/>
|
||||
<Transaction state={state} header={header} />
|
||||
</Tab>
|
||||
))}
|
||||
</Tabs>
|
||||
@@ -84,8 +95,23 @@ const Test = () => {
|
||||
</Box>
|
||||
</Split>
|
||||
</Flex>
|
||||
|
||||
<Flex row fluid>
|
||||
{hasScripts && (
|
||||
<Flex
|
||||
as="div"
|
||||
css={{
|
||||
borderTop: "1px solid $mauve6",
|
||||
background: "$mauve1",
|
||||
flexDirection: "column",
|
||||
}}
|
||||
>
|
||||
<LogBoxForScripts
|
||||
title="Helper scripts"
|
||||
logs={snap.scriptLogs}
|
||||
clearLog={() => (state.scriptLogs = [])}
|
||||
/>
|
||||
</Flex>
|
||||
)}
|
||||
<Flex>
|
||||
<Split
|
||||
direction="horizontal"
|
||||
sizes={[50, 50]}
|
||||
|
||||
@@ -39,7 +39,7 @@ export const compileCode = async (activeId: number) => {
|
||||
files: [
|
||||
{
|
||||
type: "c",
|
||||
options: state.compileOptions.optimizationLevel || '-O0',
|
||||
options: state.compileOptions.optimizationLevel || '-O2',
|
||||
name: state.files[activeId].name,
|
||||
src: state.files[activeId].content,
|
||||
},
|
||||
|
||||
@@ -54,15 +54,15 @@ export const prepareDeployHookTx = async (
|
||||
account: IAccount & { name?: string },
|
||||
data: SetHookData
|
||||
) => {
|
||||
if (
|
||||
!state.files ||
|
||||
state.files.length === 0 ||
|
||||
!state.files?.[state.active]?.compiledContent
|
||||
) {
|
||||
const activeFile = state.files[state.active]?.compiledContent
|
||||
? state.files[state.active]
|
||||
: state.files.filter((file) => file.compiledContent)[0];
|
||||
|
||||
if (!state.files || state.files.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!state.files?.[state.active]?.compiledContent) {
|
||||
if (!activeFile?.compiledContent) {
|
||||
return;
|
||||
}
|
||||
if (!state.client) {
|
||||
@@ -99,7 +99,7 @@ export const prepareDeployHookTx = async (
|
||||
{
|
||||
Hook: {
|
||||
CreateCode: arrayBufferToHex(
|
||||
state.files?.[state.active]?.compiledContent
|
||||
activeFile?.compiledContent
|
||||
).toUpperCase(),
|
||||
HookOn: calculateHookOn(hookOnValues),
|
||||
HookNamespace,
|
||||
|
||||
@@ -8,7 +8,8 @@ export const downloadAsZip = async () => {
|
||||
state.zipLoading = true
|
||||
// TODO do something about file/gist loading state
|
||||
const files = state.files.map(({ name, content }) => ({ name, content }));
|
||||
const zipped = await createZip(files);
|
||||
const wasmFiles = state.files.filter(i => i.compiledContent).map(({ name, compiledContent }) => ({ name: `${name}.wasm`, content: compiledContent }));
|
||||
const zipped = await createZip([...files, ...wasmFiles]);
|
||||
const zipFileName = guessZipFileName(files);
|
||||
zipped.saveFile(zipFileName);
|
||||
} catch (error) {
|
||||
|
||||
@@ -23,16 +23,18 @@ export const fetchFiles = (gistId: string) => {
|
||||
return res
|
||||
}
|
||||
// in case of templates, fetch header file(s) and append to res
|
||||
let resHeaderJson;
|
||||
try {
|
||||
const resHeader = await fetch(`${process.env.NEXT_PUBLIC_COMPILE_API_BASE_URL}/api/header-files`);
|
||||
if (resHeader.ok) {
|
||||
resHeaderJson = await resHeader.json();
|
||||
const resHeaderJson = await resHeader.json()
|
||||
const headerFiles: Record<string, { filename: string; content: string; language: string }> = {};
|
||||
Object.entries(resHeaderJson).forEach(([key, value]) => {
|
||||
const fname = `${key}.h`;
|
||||
headerFiles[fname] = { filename: fname, content: value as string, language: 'C' }
|
||||
})
|
||||
const files = {
|
||||
...res.data.files,
|
||||
'hookapi.h': res.data.files?.['hookapi.h'] || { filename: 'hookapi.h', content: resHeaderJson.hookapi, language: 'C' },
|
||||
'hookmacro.h': res.data.files?.['hookmacro.h'] || { filename: 'hookmacro.h', content: resHeaderJson.hookmacro, language: 'C' },
|
||||
'sfcodes.h': res.data.files?.['sfcodes.h'] || { filename: 'sfcodes.h', content: resHeaderJson.sfcodes, language: 'C' },
|
||||
...headerFiles
|
||||
};
|
||||
res.data.files = files;
|
||||
}
|
||||
@@ -112,4 +114,4 @@ export const fetchFiles = (gistId: string) => {
|
||||
return;
|
||||
}
|
||||
state.loading = false;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -66,6 +66,7 @@ export interface IState {
|
||||
logs: ILog[];
|
||||
deployLogs: ILog[];
|
||||
transactionLogs: ILog[];
|
||||
scriptLogs: ILog[];
|
||||
editorCtx?: typeof monaco.editor;
|
||||
editorSettings: {
|
||||
tabSize: number;
|
||||
@@ -96,6 +97,7 @@ let initialState: IState = {
|
||||
logs: [],
|
||||
deployLogs: [],
|
||||
transactionLogs: [],
|
||||
scriptLogs: [],
|
||||
editorCtx: undefined,
|
||||
gistId: undefined,
|
||||
gistOwner: undefined,
|
||||
@@ -112,7 +114,7 @@ let initialState: IState = {
|
||||
mainModalShowed: false,
|
||||
accounts: [],
|
||||
compileOptions: {
|
||||
optimizationLevel: '-O0',
|
||||
optimizationLevel: '-O2',
|
||||
strip: true
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { MessageConnection } from "@codingame/monaco-jsonrpc";
|
||||
import { MonacoLanguageClient, ErrorAction, CloseAction, createConnection } from "@codingame/monaco-languageclient";
|
||||
import Router from "next/router";
|
||||
import normalizeUrl from "normalize-url";
|
||||
import ReconnectingWebSocket from "reconnecting-websocket";
|
||||
|
||||
@@ -14,11 +13,7 @@ export function createLanguageClient(connection: MessageConnection): MonacoLangu
|
||||
errorHandler: {
|
||||
error: () => ErrorAction.Continue,
|
||||
closed: () => {
|
||||
if (Router.pathname.includes('/develop')) {
|
||||
return CloseAction.Restart
|
||||
} else {
|
||||
return CloseAction.DoNotRestart
|
||||
}
|
||||
return CloseAction.DoNotRestart
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
58
yarn.lock
58
yarn.lock
@@ -202,19 +202,19 @@
|
||||
resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
|
||||
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
|
||||
|
||||
"@monaco-editor/loader@^1.3.0":
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.3.0.tgz#659fbaf1d612ea67b2a0519a18612d1c4813e444"
|
||||
integrity sha512-N3mGq1ktC3zh7WUx3NGO+PSDdNq9Vspk/41rEmRdrCqV9vNbBTRzAOplmUpNQsi+hmTs++ERMBobMERb8Kb+3g==
|
||||
"@monaco-editor/loader@^1.3.2":
|
||||
version "1.3.2"
|
||||
resolved "https://registry.yarnpkg.com/@monaco-editor/loader/-/loader-1.3.2.tgz#04effbb87052d19cd7d3c9d81c0635490f9bb6d8"
|
||||
integrity sha512-BTDbpHl3e47r3AAtpfVFTlAi7WXv4UQ/xZmz8atKl4q7epQV5e7+JbigFDViWF71VBi4IIBdcWP57Hj+OWuc9g==
|
||||
dependencies:
|
||||
state-local "^1.0.6"
|
||||
|
||||
"@monaco-editor/react@^4.4.1":
|
||||
version "4.4.1"
|
||||
resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.1.tgz#2e2b9b369f3082b0e14f47cdbe35658fd56c7c7d"
|
||||
integrity sha512-95E/XPC4dbm/7qdkhSsU/a1kRgcn2PYhRTVIc+/cixWCZrwRURW1DRPaIZ2lOawBJ6kAOLywxuD4A4UmbT0ZIw==
|
||||
"@monaco-editor/react@^4.4.5":
|
||||
version "4.4.5"
|
||||
resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.5.tgz#beabe491efeb2457441a00d1c7651c653697f65b"
|
||||
integrity sha512-IImtzU7sRc66OOaQVCG+5PFHkSWnnhrUWGBuH6zNmH2h0YgmAhcjHZQc/6MY9JWEbUtVF1WPBMJ9u1XuFbRrVA==
|
||||
dependencies:
|
||||
"@monaco-editor/loader" "^1.3.0"
|
||||
"@monaco-editor/loader" "^1.3.2"
|
||||
prop-types "^15.7.2"
|
||||
|
||||
"@next/env@12.1.0":
|
||||
@@ -917,10 +917,10 @@
|
||||
resolved "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.1.0.tgz"
|
||||
integrity sha512-JLo+Y592QzIE+q7Dl2pMUtt4q8SKYI5jDrZxrozEQxnGVOyYE+GWK9eLkwTaeN9DDctlaRAQ3TBmzZ1qdLE30A==
|
||||
|
||||
"@stitches/react@^1.2.6-0":
|
||||
version "1.2.7"
|
||||
resolved "https://registry.npmjs.org/@stitches/react/-/react-1.2.7.tgz"
|
||||
integrity sha512-6AxpUag7OW55ANzRnuy7R15FEyQeZ66fytVo3BBilFIU0mfo3t49CAMcEAL/A1SbhSj/FCdWkn/XrbjGBTJTzg==
|
||||
"@stitches/react@^1.2.8":
|
||||
version "1.2.8"
|
||||
resolved "https://registry.yarnpkg.com/@stitches/react/-/react-1.2.8.tgz#954f8008be8d9c65c4e58efa0937f32388ce3a38"
|
||||
integrity sha512-9g9dWI4gsSVe8bNLlb+lMkBYsnIKCZTmvqvDG+Avnn69XfmHZKiaMrx7cgTaddq7aTPPmXiTsbFcUy0xgI4+wA==
|
||||
|
||||
"@types/aws-lambda@^8.10.83":
|
||||
version "8.10.93"
|
||||
@@ -2281,6 +2281,18 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
|
||||
resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"
|
||||
integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
|
||||
|
||||
handlebars@^4.7.7:
|
||||
version "4.7.7"
|
||||
resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
|
||||
integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
|
||||
dependencies:
|
||||
minimist "^1.2.5"
|
||||
neo-async "^2.6.0"
|
||||
source-map "^0.6.1"
|
||||
wordwrap "^1.0.0"
|
||||
optionalDependencies:
|
||||
uglify-js "^3.1.4"
|
||||
|
||||
has-bigints@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz"
|
||||
@@ -2949,6 +2961,11 @@ natural-compare@^1.4.0:
|
||||
resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
|
||||
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
|
||||
|
||||
neo-async@^2.6.0:
|
||||
version "2.6.2"
|
||||
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
|
||||
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
|
||||
|
||||
next-auth@^4.0.0-beta.5:
|
||||
version "4.2.1"
|
||||
resolved "https://registry.npmjs.org/next-auth/-/next-auth-4.2.1.tgz"
|
||||
@@ -3858,6 +3875,11 @@ source-map@^0.5.7:
|
||||
resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
|
||||
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
|
||||
|
||||
source-map@^0.6.1:
|
||||
version "0.6.1"
|
||||
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
|
||||
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
|
||||
|
||||
split.js@^1.6.0:
|
||||
version "1.6.5"
|
||||
resolved "https://registry.npmjs.org/split.js/-/split.js-1.6.5.tgz"
|
||||
@@ -4089,6 +4111,11 @@ typescript@4.4.4:
|
||||
resolved "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz"
|
||||
integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
|
||||
|
||||
uglify-js@^3.1.4:
|
||||
version "3.16.0"
|
||||
resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.16.0.tgz#b778ba0831ca102c1d8ecbdec2d2bdfcc7353190"
|
||||
integrity sha512-FEikl6bR30n0T3amyBh3LoiBdqHRy/f4H80+My34HOesOKyHfOsxAPAxOoqC0JUnC1amnO0IwkYC3sko51caSw==
|
||||
|
||||
unbox-primitive@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz"
|
||||
@@ -4308,6 +4335,11 @@ word-wrap@^1.2.3:
|
||||
resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
|
||||
integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
|
||||
|
||||
wordwrap@^1.0.0:
|
||||
version "1.0.0"
|
||||
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
|
||||
integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
|
||||
|
||||
wrappy@1:
|
||||
version "1.0.2"
|
||||
resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
|
||||
|
||||
Reference in New Issue
Block a user