ws-process 0.3.42 → 0.3.44

package/actions.js

@@ -4,9 +4,10 @@ export const newWSInstance = (wSocket) => ({
   wSocket,
 });
 export const REMOVE_WS_INSTANCE = 'REMOVE_WS_INSTANCE';
-export const removeWSInstance = (wSocket) => ({
+export const removeWSInstance = (wSocket, doNotClose) => ({
   type: REMOVE_WS_INSTANCE,
   wSocket,
+  doNotClose,
 });
 
 export const STORE_SPLITTED_DATA = 'STORE_SPLITTED_DATA';

package/index.js

@@ -65,6 +65,10 @@ function getUSP(url) {
   return [usp, urlPath];
 }
 
+function isPreviewMode() {
+  return window.location.pathname.startsWith('/lc-ui5/preview/');
+}
+
 function getWebSocket() {
   return (dispatch) => new Promise((resolve, reject) => {
     const existWS = local.wsProcess.wSocket;
@@ -78,13 +82,34 @@ function getWebSocket() {
           }),
         );
       }
+      /*
+        현재 프리뷰 모드인데
+        이미 생성한 웹소켓이 프리뷰 모드가 아닐때 만들어진것일 경우에는
+        제거하고 다시 만들어준다. 단 close()는 하지 않는다.
+        close()하면 onmessage 이벤트핸들러가 실행중에 중단되어
+        프로그램이 정상적으로 동작하지 않는다.
+      */
+      if (isPreviewMode() && !existWS.url.endsWith('/dev')) {
+        //
+        if (existWS.readyState === existWS.OPEN) {
+          // existWS.close();
+          local.dispatch(removeWSInstance(existWS, true));
+        }
+        return resolve(
+          new Promise((resolveInner) => {
+            setTimeout(() => {
+              resolveInner(dispatch(getWebSocket()));
+            }, 500);
+          }),
+        );
+      }
       return resolve(existWS);
     }
     if (!local.wsURL) {
       console.error('URL of WebSocket is undefined');
       return reject(new Error('URL of WebSocket is undefined'));
     }
-    const newWsUrl = window.location.pathname.startsWith('/lc-ui5/preview/') ? local.wsURL.replace(/\/(prod){1}$/, '/dev') : local.wsURL;
+    const newWsUrl = isPreviewMode() ? local.wsURL.replace(/\/(prod){1}$/, '/dev') : local.wsURL;
     const wSocket = new WebSocket(newWsUrl);
 
     wSocket.onopen = (event) => {
@@ -600,7 +625,7 @@ function asyncSend(msg) {
         const headers = {};
         headers['bsg-support-process-id'] = msg.processID;
         headers['bsg-support-api-key'] = user.apiKey || undefined;
-        headers['bsg-support-stage'] = window.location.pathname.startsWith('/lc-ui5/preview/') ? 'dev' : local.stage;
+        headers['bsg-support-stage'] = isPreviewMode() ? 'dev' : local.stage;
         headers['bsg-support-token'] = user.token;
         headers['bsg-support-session'] = user.session;
         headers['bsg-support-user-id'] = user.id;
@@ -693,7 +718,7 @@ function asyncSend(msg) {
                   callback.afterFailed(newData);
                 }
                 if (callback.always) {
-                  callback.always();
+                  callback.always(newData);
                 }
               }
               if (cProcessItem.reject) {
@@ -955,7 +980,7 @@ function asyncSend(msg) {
                     callback.afterFailed(jsonResponse);
                   }
                   if (callback.always) {
-                    callback.always();
+                    callback.always(jsonResponse);
                   }
                 }
                 if (cProcessItem.reject) {
@@ -1208,7 +1233,7 @@ function runProcess(processID, data) {
               } else {
                 local.afterEachProcess(prcInner, local.wsProcess.processes);
 
-                // prcInner.reject(error);
+                prcInner.reject(error);
                 wrapClearWSProcess(error.processID);
               }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws-process",
-  "version": "0.3.42",
+  "version": "0.3.44",
   "description": "Process Management for Web Socket Client",
   "main": "index.js",
   "scripts": {

package/reducer.js

@@ -1,5 +1,6 @@
+/* eslint-disable import/no-unresolved */
 /* eslint-disable no-param-reassign */
-import { tryit } from 'ui5-lib-rc';
+import { tryit } from '@bsgp/lib-core';
 import produce from 'immer';
 import {
   ADD_WS_PROCESS,
@@ -36,7 +37,11 @@ export default function (state = initialState, action) {
               (stt) => stt === action.wSocket.readyState,
             ).length === 0
           ) {
-            action.wSocket.close();
+            if (action.doNotClose === true) {
+              // pass
+            } else {
+              action.wSocket.close();
+            }
           }
         }
         draft.wSocket = null;