@elice/material-exercise 1.250521.0 → 1.250529.1

package/es/hooks/useUsercodeEditWebSocket.d.ts

@@ -1,3 +1,4 @@
+import type { WebsocketUsercodeMessageWriteSucceed as WSUsercodeMessageWriteSucceed } from '@elice/types';
 import type { TextOp } from 'ot-text-unicode';
 interface CursorRange {
     from: number;
@@ -17,6 +18,10 @@ export type UseUsercodeEditWebSocketPropOnInit = (doc: string) => void;
  * Event handler for `WRITE_NOTI` event.
  */
 export type UseUsercodeEditWebSocketPropOnWriteNoti = (ots: TextOp, isFromServer: boolean) => void;
+/**
+ * Event handler for `WRITE_SUCCEED` event.
+ */
+export type UseUsercodeEditWebSocketPropOnWriteSucceed = (msg: WSUsercodeMessageWriteSucceed, requestId: number) => void;
 /**
  * Props of `useUsercodeEditWebSocket`.
  */
@@ -25,6 +30,7 @@ interface UseUsercodeEditWebSocketProps {
     filename: string | null;
     onInit: UseUsercodeEditWebSocketPropOnInit;
     onWriteNoti: UseUsercodeEditWebSocketPropOnWriteNoti;
+    onWriteSucceed: UseUsercodeEditWebSocketPropOnWriteSucceed;
 }
 /**
  *
@@ -33,7 +39,9 @@ export type UseUsercodeEditWebSocketReturnSendCursor = (range: CursorRange) => v
 /**
  * Event handler for websocket message.
  */
-export type UseUsercodeEditWebSocketReturnSendOTs = (ots: TextOp) => void;
+export type UseUsercodeEditWebSocketReturnSendOTs = (ots: TextOp) => {
+    requestId: number;
+};
 /**
  * Return type of `useUsercodeEditWebSocket`.
  */

package/es/hooks/useUsercodeEditWebSocket.js

@@ -21,7 +21,8 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
   var exerciseRoomId = _ref.exerciseRoomId,
     filename = _ref.filename,
     onInit = _ref.onInit,
-    onWriteNoti = _ref.onWriteNoti;
+    onWriteNoti = _ref.onWriteNoti,
+    onWriteSucceed = _ref.onWriteSucceed;
   var _return = useRef({});
   var _useMaterialConfig = useMaterialConfig(),
     apiWsOriginUrl = _useMaterialConfig.apiWsOriginUrl;
@@ -255,6 +256,10 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
     _doc.current = type.apply(_doc.current, ots);
     otsBuffer.current.push(ots);
     sendWrite();
+    return {
+      // Use next doc. version as id for matching request-response.
+      requestId: version.current + 1
+    };
   }, [sendWrite]);
   //
   // =============== usercode ===============
@@ -419,6 +424,7 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
     writeIndex.current = 0;
     writeFailCount.current = 0;
     updateCursorFromOts(msg.ots);
+    onWriteSucceed(msg, version.current);
   };
   /**
    * Websocket on `WRITE_NOTI` message.
@@ -483,7 +489,9 @@ var useUsercodeEditWebSocket = function useUsercodeEditWebSocket(_ref) {
     if (!isReady) {
       return;
     }
-    websocket.current = new EliceWebSocket(createUsercodeUrl);
+    websocket.current = new EliceWebSocket(createUsercodeUrl, undefined, {
+      maxPingQueueTolerance: 1
+    });
     websocket.current.onopen = wsOpen;
     websocket.current.onclose = wsClose;
     websocket.current.onmessage = wsMessage;

package/es/utils/async.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @file Collection of utils for async. logics.
+ */
+export declare function withTimeout<T>(promise: Promise<T>, timeout: number, timeoutMessage?: string): Promise<T>;

package/es/utils/async.js

@@ -0,0 +1,13 @@
+/**
+ * @file Collection of utils for async. logics.
+ */
+function withTimeout(promise, timeout, timeoutMessage) {
+  var timeoutPromise = new Promise(function (_, reject) {
+    setTimeout(function () {
+      reject(new Error(timeoutMessage !== null && timeoutMessage !== void 0 ? timeoutMessage : "Operation timeout (".concat(timeout, "ms)")));
+    }, timeout);
+  });
+  return Promise.race([promise, timeoutPromise]);
+}
+
+export { withTimeout };

package/es/utils/index.d.ts

@@ -1,2 +1,3 @@
+export * from './async';
 export * from './exerciseFile';
 export * from './runner';

package/es/utils/index.js

@@ -1,2 +1,3 @@
+export { withTimeout } from './async.js';
 export { checkExerciseFileEditable, checkExerciseFileResettable } from './exerciseFile.js';
 export { getProgrammingErrorResult } from './runner.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-exercise",
-  "version": "1.250521.0",
+  "version": "1.250529.1",
   "description": "User view and editing components of Elice material exercise",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -83,8 +83,8 @@
     "@elice/icons": "^1.230814.0",
     "@elice/intl": "0.241127.0",
     "@elice/markdown": "1.241015.0",
-    "@elice/material-shared-types": "1.250521.0",
-    "@elice/material-shared-utils": "1.250521.0",
+    "@elice/material-shared-types": "1.250529.1",
+    "@elice/material-shared-utils": "1.250529.1",
     "@elice/mui-elements": "^5.250108.0-controllabel.0",
     "@elice/mui-system": "^5.250108.0-controllabel.0",
     "@elice/types": "1.241220.0",