@elice/material-exercise 1.231212.0 → 1.231228.0

package/es/hooks/useExerciseFile.js

@@ -10,34 +10,32 @@ import { checkExerciseFileEditable, checkExerciseFileResettable } from '../utils
 /**
  * Check whether the exercise file is editable.
  */
-var useExerciseFileEditable = function useExerciseFileEditable(filename) {
-  var _useContext = useContext(ExerciseContext),
-    materialExerciseId = _useContext.materialExerciseId,
-    exerciseRoomId = _useContext.exerciseRoomId;
-  var exercise = useRecoilValue(exerciseState(materialExerciseId));
-  var exerciseRoom = useRecoilValue(exerciseRoomState(exerciseRoomId));
-  return useMemo(function () {
-    return checkExerciseFileEditable(filename, {
-      exercise: exercise,
-      exerciseRoom: exerciseRoom
-    });
-  }, [filename, exercise, exerciseRoom]);
+const useExerciseFileEditable = filename => {
+  const {
+    materialExerciseId,
+    exerciseRoomId
+  } = useContext(ExerciseContext);
+  const exercise = useRecoilValue(exerciseState(materialExerciseId));
+  const exerciseRoom = useRecoilValue(exerciseRoomState(exerciseRoomId));
+  return useMemo(() => checkExerciseFileEditable(filename, {
+    exercise,
+    exerciseRoom
+  }), [filename, exercise, exerciseRoom]);
 };
 /**
  * Check whether the exercise file is resettable.
  */
-var useExerciseFileResettable = function useExerciseFileResettable(filename) {
-  var _useContext2 = useContext(ExerciseContext),
-    materialExerciseId = _useContext2.materialExerciseId,
-    exerciseRoomId = _useContext2.exerciseRoomId;
-  var exercise = useRecoilValue(exerciseState(materialExerciseId));
-  var exerciseRoom = useRecoilValue(exerciseRoomState(exerciseRoomId));
-  return useMemo(function () {
-    return checkExerciseFileResettable(filename, {
-      exercise: exercise,
-      exerciseRoom: exerciseRoom
-    });
-  }, [filename, exercise, exerciseRoom]);
+const useExerciseFileResettable = filename => {
+  const {
+    materialExerciseId,
+    exerciseRoomId
+  } = useContext(ExerciseContext);
+  const exercise = useRecoilValue(exerciseState(materialExerciseId));
+  const exerciseRoom = useRecoilValue(exerciseRoomState(exerciseRoomId));
+  return useMemo(() => checkExerciseFileResettable(filename, {
+    exercise,
+    exerciseRoom
+  }), [filename, exercise, exerciseRoom]);
 };
 
 export { useExerciseFileEditable, useExerciseFileResettable };

package/es/hooks/useExericseShortcut.js

@@ -1,12 +1,10 @@
 import { useKey } from 'react-use';
 import EXERCISE_SHORTCUT_KEY_MAP from '../constants/shortcutKeyMap.js';
 
-var useExericseShortcut = function useExericseShortcut(name, fn) {
-  var keys = EXERCISE_SHORTCUT_KEY_MAP[name];
-  useKey(function (e) {
-    if (keys && keys.some(function (key) {
-      return key.key === e.key && key.metaKey === e.metaKey && key.ctrlKey === e.ctrlKey && key.shiftKey === e.shiftKey && key.altKey === e.altKey;
-    })) {
+const useExericseShortcut = (name, fn) => {
+  const keys = EXERCISE_SHORTCUT_KEY_MAP[name];
+  useKey(e => {
+    if (keys && keys.some(key => key.key === e.key && key.metaKey === e.metaKey && key.ctrlKey === e.ctrlKey && key.shiftKey === e.shiftKey && key.altKey === e.altKey)) {
       // console.log(e);
       e.preventDefault();
       e.stopPropagation();

package/es/hooks/useMaterialExerciseFileUrl.js

@@ -1,63 +1,45 @@
-import { slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../_virtual/_rollupPluginBabelHelpers.js';
 import React from 'react';
-import { getOrgMaterialExerciseExerciseRoomUserFileGet, getOrgMaterialExerciseExerciseImageExerciseFileGet } from '@elice/api-client';
+import { getOrgMaterialExerciseExerciseImageExerciseFileGet, getOrgMaterialExerciseExerciseRoomUserFileGet } from '@elice/api-client';
 
-var useMaterialExerciseFileUrl = function useMaterialExerciseFileUrl(_ref) {
-  var filename = _ref.filename,
-    exercise = _ref.exercise,
-    exerciseRoomId = _ref.exerciseRoomId,
-    onError = _ref.onError;
-  var _React$useState = React.useState(null),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    fileUrl = _React$useState2[0],
-    setFileUrl = _React$useState2[1];
+const useMaterialExerciseFileUrl = ({
+  filename,
+  exercise,
+  exerciseRoomId,
+  onError
+}) => {
+  const [fileUrl, setFileUrl] = React.useState(null);
   //
   // Fetch file url.
   //
-  React.useEffect(function () {
-    var abortCtrl = new AbortController();
-    var exerciseImage = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage;
+  React.useEffect(() => {
+    const abortCtrl = new AbortController();
+    const exerciseImage = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage;
     if (!exerciseImage || !filename) {
       return;
     }
-    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _a, exerciseImageFileList;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            exerciseImageFileList = (_a = exerciseImage.filelist) !== null && _a !== void 0 ? _a : []; // origin from exercise image
-            if (!exerciseImageFileList.includes(filename)) {
-              _context.next = 5;
-              break;
-            }
-            return _context.abrupt("return", getOrgMaterialExerciseExerciseImageExerciseFileGet({
-              exerciseImageId: exerciseImage.id,
-              filename: filename
-            }, {
-              signal: abortCtrl.signal
-            }).then(function (res) {
-              return res.exerciseFile.url;
-            }).catch(function () {
-              return null;
-            }));
-          case 5:
-            return _context.abrupt("return", getOrgMaterialExerciseExerciseRoomUserFileGet({
-              exerciseRoomId: exerciseRoomId,
-              filename: filename
-            }, {
-              signal: abortCtrl.signal
-            }).then(function (res) {
-              return res.userFile.url;
-            }).catch(function () {
-              return null;
-            }));
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }))().then(setFileUrl).catch(onError);
-    return function () {
+    (async () => {
+      var _a;
+      const exerciseImageFileList = (_a = exerciseImage.filelist) !== null && _a !== void 0 ? _a : [];
+      // origin from exercise image
+      if (exerciseImageFileList.includes(filename)) {
+        return getOrgMaterialExerciseExerciseImageExerciseFileGet({
+          exerciseImageId: exerciseImage.id,
+          filename
+        }, {
+          signal: abortCtrl.signal
+        }).then(res => res.exerciseFile.url).catch(() => null);
+      }
+      // origin from exercise room
+      else {
+        return getOrgMaterialExerciseExerciseRoomUserFileGet({
+          exerciseRoomId,
+          filename
+        }, {
+          signal: abortCtrl.signal
+        }).then(res => res.userFile.url).catch(() => null);
+      }
+    })().then(setFileUrl).catch(onError);
+    return () => {
       abortCtrl.abort();
       setFileUrl(null);
     };

package/es/hooks/useRunnerRoomWebSocket.js

@@ -1,4 +1,3 @@
-import { slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../_virtual/_rollupPluginBabelHelpers.js';
 import { useRef, useState, useCallback, useEffect } from 'react';
 import { config, postOrgRunnerRoomExerciseRoomJoin } from '@elice/api-client';
 import { useMaterialConfig, useMaterialConfigApiClientUpdate } from '@elice/material-shared-utils';
@@ -8,43 +7,36 @@ import { camelizeKeys } from 'humps';
 //
 //
 //
-var MAX_WEBSOCKET_RETRY_COUNT = 5;
+const MAX_WEBSOCKET_RETRY_COUNT = 5;
 /**
  *
  */
-var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
-  var exerciseRoomId = _ref.exerciseRoomId;
-  var _return = useRef({});
-  var _useMaterialConfig = useMaterialConfig(),
-    apiWsOriginUrl = _useMaterialConfig.apiWsOriginUrl;
-  var isReady = useMaterialConfigApiClientUpdate(config.init);
-  var websocket = useRef(null);
-  var _useState = useState(EliceWebSocket.CLOSED),
-    _useState2 = _slicedToArray(_useState, 2),
-    websocketReadyState = _useState2[0],
-    setWebSocketReadyState = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isRunning = _useState4[0],
-    setRunning = _useState4[1];
-  var _useState5 = useState(null),
-    _useState6 = _slicedToArray(_useState5, 2),
-    roomConnectionInfo = _useState6[0],
-    setRoomConnectionInfo = _useState6[1];
+const useRunnerRoomWebSocket = ({
+  exerciseRoomId
+}) => {
+  const _return = useRef({});
+  const {
+    apiWsOriginUrl
+  } = useMaterialConfig();
+  const isReady = useMaterialConfigApiClientUpdate(config.init);
+  const websocket = useRef(null);
+  const [websocketReadyState, setWebSocketReadyState] = useState(EliceWebSocket.CLOSED);
+  const [isRunning, setRunning] = useState(false);
+  const [roomConnectionInfo, setRoomConnectionInfo] = useState(null);
   //
   // =============== websocket ===============
   //
   /**
    * Reconnect websocket.
    */
-  var reconnect = useCallback(function () {
+  const reconnect = useCallback(() => {
     var _a;
     (_a = websocket.current) === null || _a === void 0 ? void 0 : _a.reconnect();
   }, []);
   /**
    * Websocket on open.
    */
-  var wsOpen = function wsOpen() {
+  const wsOpen = () => {
     if (websocket.current) {
       setWebSocketReadyState(websocket.current.readyState);
     }
@@ -52,7 +44,7 @@ var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
   /**
    * Websocket on close.
    */
-  var wsClose = function wsClose() {
+  const wsClose = () => {
     if (websocket.current) {
       setWebSocketReadyState(websocket.current.readyState);
     }
@@ -60,7 +52,7 @@ var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
   /**
    * Websocket on error.
    */
-  var wsError = function wsError() {
+  const wsError = () => {
     if (websocket.current) {
       setWebSocketReadyState(websocket.current.readyState);
     }
@@ -68,8 +60,8 @@ var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
   /**
    * Websocket on message.
    */
-  var wsMessage = function wsMessage(e) {
-    var msg = camelizeKeys(e.data);
+  const wsMessage = e => {
+    const msg = camelizeKeys(e.data);
     switch (msg.type) {
       case 'ROOM_PREPARED':
         wsMessageRoomPrepared(msg);
@@ -85,7 +77,7 @@ var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
   /**
    * Websocket on `ROOM_PREPARED` message.
    */
-  var wsMessageRoomPrepared = function wsMessageRoomPrepared(msg) {
+  const wsMessageRoomPrepared = msg => {
     setRoomConnectionInfo(Object.assign(Object.assign({}, msg.data.forwarder), {
       roomToken: msg.data.roomToken
     }));
@@ -93,41 +85,25 @@ var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
   /**
    * Websocket on `EXECUTE_CONTAINER` message.
    */
-  var wsMessageExecuteContainer = function wsMessageExecuteContainer(msg) {
+  const wsMessageExecuteContainer = msg => {
     setRunning(true);
   };
   /**
    * Websocket on `EXECUTE_DONE` message.
    */
-  var wsMessageExecuteDone = function wsMessageExecuteDone(msg) {
+  const wsMessageExecuteDone = msg => {
     setRunning(false);
   };
   /**
    * Create usercode websocket url.
    */
-  var createUsercodeUrl = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          return _context.abrupt("return", Promise.resolve("".concat(apiWsOriginUrl, "/runner_room")).then(function (url) {
-            return postOrgRunnerRoomExerciseRoomJoin({
-              exerciseRoomId: exerciseRoomId
-            }).then(function (data) {
-              return "".concat(url, "/").concat(data.roomToken);
-            }).catch(function () {
-              return "".concat(url, "/");
-            });
-          }));
-        case 1:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), [apiWsOriginUrl, exerciseRoomId]);
+  const createUsercodeUrl = useCallback(async () => Promise.resolve(`${apiWsOriginUrl}/runner_room`).then(url => postOrgRunnerRoomExerciseRoomJoin({
+    exerciseRoomId
+  }).then(data => `${url}/${data.roomToken}`).catch(() => `${url}/`)), [apiWsOriginUrl, exerciseRoomId]);
   //
   // Initialize websocket.
   //
-  useEffect(function () {
+  useEffect(() => {
     if (!isReady) {
       return;
     }
@@ -138,7 +114,7 @@ var useRunnerRoomWebSocket = function useRunnerRoomWebSocket(_ref) {
     websocket.current.onclose = wsClose;
     websocket.current.onmessage = wsMessage;
     websocket.current.onerror = wsError;
-    return function () {
+    return () => {
       if (websocket.current) {
         websocket.current.close();
       }

package/es/hooks/useStdioTextConcator.js

@@ -1,4 +1,3 @@
-import { slicedToArray as _slicedToArray } from '../_virtual/_rollupPluginBabelHelpers.js';
 import React from 'react';
 import { useRecoilValue } from 'recoil';
 import { exerciseRunnerRunningState } from '../components/material-exercise/context/recoil.js';
@@ -7,31 +6,26 @@ import '../components/material-exercise/context/recoilTypes.js';
 import '../components/material-exercise/context/subjects.js';
 import '../components/material-exercise/context/ExerciseProvider.js';
 
-var useStdioTextConcator = function useStdioTextConcator(done) {
-  var RUNNER_AND_STDIO_DELAY_SAFETY_FACTOR = 1000;
-  var _React$useState = React.useState(''),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    text = _React$useState2[0],
-    setText = _React$useState2[1];
-  var isRunning = useRecoilValue(exerciseRunnerRunningState);
-  React.useEffect(function () {
+const useStdioTextConcator = done => {
+  const RUNNER_AND_STDIO_DELAY_SAFETY_FACTOR = 1000;
+  const [text, setText] = React.useState('');
+  const isRunning = useRecoilValue(exerciseRunnerRunningState);
+  React.useEffect(() => {
     if (isRunning) {
       setText('');
     } else {
-      setTimeout(function () {
+      setTimeout(() => {
         done(text);
       }, RUNNER_AND_STDIO_DELAY_SAFETY_FACTOR);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isRunning]);
-  var updateStdioTextConcator = React.useCallback(function (text) {
-    setText(function (state) {
-      return state.concat(text);
-    });
+  const updateStdioTextConcator = React.useCallback(text => {
+    setText(state => state.concat(text));
   }, []);
   return {
-    updateStdioTextConcator: updateStdioTextConcator,
-    done: done
+    updateStdioTextConcator,
+    done
   };
 };
 

package/es/hooks/useStdioWebSocket.js

@@ -1,31 +1,27 @@
-import { slicedToArray as _slicedToArray } from '../_virtual/_rollupPluginBabelHelpers.js';
 import { useRef, useState, useCallback, useEffect } from 'react';
 import { EliceWebSocket } from '@elice/websocket';
 
 //
 //
 //
-var MAX_WEBSOCKET_RETRY_COUNT = 5;
+const MAX_WEBSOCKET_RETRY_COUNT = 5;
 /**
  *
  */
-var useStdioWebSocket = function useStdioWebSocket(_ref) {
-  var wsUri = _ref.wsUri,
-    roomToken = _ref.roomToken,
-    _ref$isTty = _ref.isTty,
-    isTty = _ref$isTty === void 0 ? false : _ref$isTty,
-    onTextReceive = _ref.onTextReceive,
-    onFileReceive = _ref.onFileReceive;
-  var _return = useRef({});
-  var websocket = useRef(null);
-  var _useState = useState(EliceWebSocket.CLOSED),
-    _useState2 = _slicedToArray(_useState, 2),
-    websocketReadyState = _useState2[0],
-    setWebSocketReadyState = _useState2[1];
+const useStdioWebSocket = ({
+  wsUri,
+  roomToken,
+  isTty = false,
+  onTextReceive,
+  onFileReceive
+}) => {
+  const _return = useRef({});
+  const websocket = useRef(null);
+  const [websocketReadyState, setWebSocketReadyState] = useState(EliceWebSocket.CLOSED);
   /**
    * Handle stdio text received.
    */
-  var handleTextReceive = function handleTextReceive(type, text) {
+  const handleTextReceive = (type, text) => {
     if (typeof onTextReceive === 'function') {
       onTextReceive(type, text);
     }
@@ -33,7 +29,7 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Handle stdio file received.
    */
-  var handleFileReceive = function handleFileReceive(file) {
+  const handleFileReceive = file => {
     if (typeof onFileReceive === 'function') {
       onFileReceive(file);
     }
@@ -41,7 +37,7 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Provide a utf-8 encoded string to `/dev/stdin` in the container.
    */
-  var sendText = useCallback(function (data) {
+  const sendText = useCallback(data => {
     var _a;
     (_a = websocket.current) === null || _a === void 0 ? void 0 : _a.sendJson({
       type: 'text',
@@ -51,28 +47,28 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Send a signal (e.g. SIGINT, SIGQUIT, etc.) to the process with PID 1 in the container.
    */
-  var sendSignal = useCallback(function (data) {
+  const sendSignal = useCallback(data => {
     var _a;
     (_a = websocket.current) === null || _a === void 0 ? void 0 : _a.sendJson({
       type: 'signal',
-      data: data
+      data
     });
   }, []);
   /**
    * Resize TTY of the container.
    */
-  var sendTtyResize = useCallback(function (data) {
+  const sendTtyResize = useCallback(data => {
     var _a;
     (_a = websocket.current) === null || _a === void 0 ? void 0 : _a.sendJson({
       type: 'tty-resize',
-      data: data
+      data
     });
   }, []);
   /**
    * Update the content of usercodes (which are edited by `usercode.edit` API)
    * and user files (which are added or deleted by `user_file.(add|delete)` API) in the container.
    */
-  var sendSync = useCallback(function () {
+  const sendSync = useCallback(() => {
     var _a;
     (_a = websocket.current) === null || _a === void 0 ? void 0 : _a.sendJson({
       type: 'sync'
@@ -84,14 +80,14 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Reconnect websocket.
    */
-  var reconnect = useCallback(function () {
+  const reconnect = useCallback(() => {
     var _a;
     (_a = websocket.current) === null || _a === void 0 ? void 0 : _a.reconnect();
   }, []);
   /**
    * Websocket on open.
    */
-  var wsOpen = function wsOpen() {
+  const wsOpen = () => {
     if (websocket.current) {
       setWebSocketReadyState(websocket.current.readyState);
     }
@@ -99,7 +95,7 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Websocket on close.
    */
-  var wsClose = function wsClose() {
+  const wsClose = () => {
     if (websocket.current) {
       setWebSocketReadyState(websocket.current.readyState);
     }
@@ -107,7 +103,7 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Websocket on error.
    */
-  var wsError = function wsError() {
+  const wsError = () => {
     if (websocket.current) {
       setWebSocketReadyState(websocket.current.readyState);
     }
@@ -115,8 +111,8 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   /**
    * Websocket on message.
    */
-  var wsMessage = function wsMessage(e) {
-    var msg = e.data;
+  const wsMessage = e => {
+    const msg = e.data;
     switch (msg.type) {
       case 'text':
         handleTextReceive(msg.type, msg.data);
@@ -152,11 +148,11 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
   //
   // Initialize websocket.
   //
-  useEffect(function () {
+  useEffect(() => {
     if (!wsUri || !roomToken) {
       return;
     }
-    websocket.current = new EliceWebSocket("".concat(wsUri, "/client/stdio/").concat(roomToken), undefined, {
+    websocket.current = new EliceWebSocket(`${wsUri}/client/stdio/${roomToken}`, undefined, {
       maxRetries: MAX_WEBSOCKET_RETRY_COUNT,
       heartAttack: true
     });
@@ -164,7 +160,7 @@ var useStdioWebSocket = function useStdioWebSocket(_ref) {
     websocket.current.onclose = wsClose;
     websocket.current.onmessage = wsMessage;
     websocket.current.onerror = wsError;
-    return function () {
+    return () => {
       if (websocket.current) {
         websocket.current.close();
       }