@polyvharmony/live-scenes-foundation 1.2.0-rc.1 → 1.3.0-rc.1

package/src/main/ets/modules/socket/PLVSocketIO.js

@@ -1,44 +1,51 @@
 import { client_socket } from 'socket';
+import PLVCommonConstants from '../../common/PLVCommonConstants';
 import PLVLogger from '../log/PLVLogger';
 const TAG = '[PLVSocketIO]';
 export class PLVSocketIO {
     constructor() {
         this.client = new client_socket();
         this.socketIOStatus = PLVSocketIOStatus.IDLE;
+        this.isTokenExpired = false;
     }
-    set_open_listener(g9) {
-        this.client.set_open_listener(g9);
+    set_open_listener(i8) {
+        this.client.set_open_listener(i8);
     }
-    set_fail_listener(f9) {
-        this.client.set_fail_listener(f9);
+    set_fail_listener(h8) {
+        this.client.set_fail_listener(h8);
     }
-    set_reconnecting_listener(e9) {
-        this.client.set_reconnecting_listener(e9);
+    set_reconnecting_listener(g8) {
+        this.client.set_reconnecting_listener(g8);
     }
-    set_reconnect_listener(d9) {
-        this.client.set_reconnect_listener(d9);
+    set_reconnect_listener(f8) {
+        this.client.set_reconnect_listener(f8);
     }
-    set_close_listener(c9) {
-        this.client.set_close_listener(c9);
+    set_close_listener(e8) {
+        this.client.set_close_listener(e8);
     }
-    set_socket_open_listener(b9) {
-        this.client.set_socket_open_listener(b9);
+    set_socket_open_listener(d8) {
+        this.client.set_socket_open_listener(d8);
     }
-    set_socket_close_listener(a9) {
-        this.client.set_socket_close_listener(a9);
+    set_socket_close_listener(c8) {
+        this.client.set_socket_close_listener(c8);
     }
     connect(uri) {
         this.connectWithQuery(uri, '', '');
     }
-    connectWithQuery(uri, query, v8) {
+    connectWithQuery(uri, query, b8) {
+        this.isTokenExpired = false;
         if (this.socketIOStatus == PLVSocketIOStatus.IDLE || this.socketIOStatus == PLVSocketIOStatus.SOCKET_CLOSE) {
             this.socketIOStatus = PLVSocketIOStatus.CONNECT;
             this.onSocketIOStatusListener?.(this.socketIOStatus);
         }
         this.set_open_listener(() => {
-            PLVLogger.info(TAG, 'call socket open');
-            this.socketIOStatus = this.socketIOStatus == PLVSocketIOStatus.RECONNECT ? PLVSocketIOStatus.RECONNECT_SUCCESS : PLVSocketIOStatus.OPEN;
-            this.onSocketIOStatusListener?.(this.socketIOStatus);
+            PLVLogger.info(TAG, `call socket open, isTokenExpired=${this.isTokenExpired}`);
+            setTimeout(() => {
+                if (!this.isTokenExpired) {
+                    this.socketIOStatus = this.socketIOStatus == PLVSocketIOStatus.RECONNECT ? PLVSocketIOStatus.RECONNECT_SUCCESS : PLVSocketIOStatus.OPEN;
+                    this.onSocketIOStatusListener?.(this.socketIOStatus);
+                }
+            }, this.isTokenExpired ? 0 : PLVCommonConstants.DELAY_TIME_S);
         });
         this.set_reconnect_listener(() => {
             PLVLogger.info(TAG, 'call socket reconnect');
@@ -46,26 +53,31 @@ export class PLVSocketIO {
             this.onSocketIOStatusListener?.(this.socketIOStatus);
         });
         this.set_socket_close_listener(() => {
-            PLVLogger.info(TAG, 'call socket close');
+            PLVLogger.info(TAG, `call socket close, isTokenExpired=${this.isTokenExpired}`);
             this.socketIOStatus = PLVSocketIOStatus.SOCKET_CLOSE;
             this.onSocketIOStatusListener?.(this.socketIOStatus);
+            setTimeout(() => {
+                if (!this.isTokenExpired) {
+                    this.close();
+                }
+            }, this.isTokenExpired ? 0 : PLVCommonConstants.DELAY_TIME_S);
         });
         this.set_close_listener(() => {
             PLVLogger.info(TAG, 'call close');
         });
-        this.client.connectWithQuery(uri, query, v8);
+        this.client.connectWithQuery(uri, query, b8);
     }
     connected() {
         return this.opened() && this.socketIOStatus != PLVSocketIOStatus.SOCKET_CLOSE;
     }
-    disconnect(u8) {
-        if (this.socketIOStatus != PLVSocketIOStatus.SOCKET_CLOSE && !u8) {
+    disconnect(a8) {
+        if (this.socketIOStatus != PLVSocketIOStatus.SOCKET_CLOSE && !a8) {
             this.socket_close();
         }
         this.close();
     }
-    destroy(t8) {
-        this.disconnect(t8);
+    destroy(z7) {
+        this.disconnect(z7);
         this.clear_con_listeners();
         this.clear_socket_listeners();
     }
@@ -75,14 +87,14 @@ export class PLVSocketIO {
     clear_socket_listeners() {
         this.client.clear_socket_listeners();
     }
-    set_reconnect_attempts(s8) {
-        this.client.set_reconnect_attempts(s8);
+    set_reconnect_attempts(y7) {
+        this.client.set_reconnect_attempts(y7);
     }
-    set_reconnect_delay(r8) {
-        this.client.set_reconnect_delay(r8);
+    set_reconnect_delay(x7) {
+        this.client.set_reconnect_delay(x7);
     }
-    set_reconnect_delay_max(q8) {
-        this.client.set_reconnect_delay_max(q8);
+    set_reconnect_delay_max(w7) {
+        this.client.set_reconnect_delay_max(w7);
     }
     set_logs_default() {
         this.client.set_logs_default();
@@ -108,19 +120,19 @@ export class PLVSocketIO {
     get_sessionid() {
         return this.client.get_sessionid();
     }
-    set_nsp(p8) {
-        this.client.set_nsp(p8);
+    set_nsp(v7) {
+        this.client.set_nsp(v7);
     }
-    on(m8, n8) {
-        this.client.on(m8, (json) => {
-            n8(this.replaceJson(json));
+    on(t7, u7) {
+        this.client.on(t7, (json) => {
+            u7(this.replaceJson(json));
         });
     }
-    once(k8, l8) {
-        this.client.once(k8, l8);
+    once(r7, s7) {
+        this.client.once(r7, s7);
     }
-    off(j8) {
-        this.client.off(j8);
+    off(q7) {
+        this.client.off(q7);
     }
     off_all() {
         this.client.off_all();
@@ -128,37 +140,42 @@ export class PLVSocketIO {
     socket_close() {
         this.client.socket_close();
     }
-    on_error(i8) {
-        this.client.on_error(i8);
+    on_error(p7) {
+        this.client.on_error(p7);
     }
     off_error() {
         this.client.off_error();
     }
-    emitSkipCheck(name, message, g8) {
+    emitSkipCheck(name, message, o7) {
         this.client.emit(name, message, (json) => {
-            g8?.(this.replaceJson(json));
+            o7?.(this.replaceJson(json));
         });
     }
-    emit(name, message, e8) {
+    emit(name, message, n7) {
         PLVLogger.info(TAG, `emit: ${message}, name: ${name}, connected: ${this.connected()}`);
         if (this.connected()) {
             this.client.emit(name, message, (json) => {
-                e8?.(this.replaceJson(json));
+                n7?.(this.replaceJson(json));
             });
             return true;
         }
         return false;
     }
     replaceJson(json) {
-        return json.replace(/"{/g, '{').replace(/}"/g, '}');
+        json = json.replace(/^"{/, '{').replace(/}"$/, '}').replace(/"{/, '{');
+        const m7 = json.lastIndexOf('}"');
+        if (m7 !== -1) {
+            json = json.substring(0, m7) + '}' + json.substring(m7 + 2);
+        }
+        return json;
     }
 }
 export var PLVSocketIOStatus;
-(function (d8) {
-    d8[d8["IDLE"] = 0] = "IDLE";
-    d8[d8["CONNECT"] = 1] = "CONNECT";
-    d8[d8["OPEN"] = 2] = "OPEN";
-    d8[d8["RECONNECT"] = 3] = "RECONNECT";
-    d8[d8["RECONNECT_SUCCESS"] = 4] = "RECONNECT_SUCCESS";
-    d8[d8["SOCKET_CLOSE"] = 5] = "SOCKET_CLOSE";
+(function (l7) {
+    l7[l7["IDLE"] = 0] = "IDLE";
+    l7[l7["CONNECT"] = 1] = "CONNECT";
+    l7[l7["OPEN"] = 2] = "OPEN";
+    l7[l7["RECONNECT"] = 3] = "RECONNECT";
+    l7[l7["RECONNECT_SUCCESS"] = 4] = "RECONNECT_SUCCESS";
+    l7[l7["SOCKET_CLOSE"] = 5] = "SOCKET_CLOSE";
 })(PLVSocketIOStatus || (PLVSocketIOStatus = {}));

package/src/main/ets/modules/web/PLVSimpleWeb.js

@@ -109,16 +109,16 @@ export class PLVSimpleWeb extends ViewPU {
                 if (this.controller._onWindowNew?.(event)) {
                     return;
                 }
-                this.controller.handleWindowNew(event, (z10) => {
+                this.controller.handleWindowNew(event, (j8) => {
                     return new CustomDialogController({
                         builder: () => {
-                            let jsDialog = new PLVNewWindowLayout(this, { webviewController: z10 }, undefined, -1, () => {
+                            let jsDialog = new PLVNewWindowLayout(this, { webviewController: j8 }, undefined, -1, () => {
                             }, { page: "foundation/src/main/ets/modules/web/PLVSimpleWeb.ets", line: 72, b2: 24 });
                             jsDialog.setController();
                             ViewPU.create(jsDialog);
                             let paramsLambda = () => {
                                 return {
-                                    webviewController: z10
+                                    webviewController: j8
                                 };
                             };
                             jsDialog.paramsGenerator_ = paramsLambda;

package/src/main/ets/modules/web/PLVWebController.d.ets

@@ -52,6 +52,8 @@ export declare class PLVWebController extends webview.WebviewController {
     multiWindowAccess(multiWindowAccess: boolean): PLVWebController;
     allowWindowOpenMethod(allowWindowOpenMethod: boolean): PLVWebController;
     javaScriptAccess(javaScriptAccess: boolean): PLVWebController;
+    mixMode(mixedMode: MixedMode): PLVWebController;
+    cacheMode(cacheMode: CacheMode): PLVWebController;
     onControllerAttached(callback: PLVCallback<void, void>): PLVWebController;
     addOnControllerAttached(callback: PLVCallback<void, void>): PLVWebController;
     onInterceptRequest(callback: PLVCallback<WebResourceRequest, WebResourceResponse>): PLVWebController;
@@ -67,12 +69,12 @@ export declare class PLVWebController extends webview.WebviewController {
     onErrorReceive(callback: PLVCallback<OnErrorReceiveEvent, void>): PLVWebController;
     backgroundColor(backgroundColor: ResourceColor): this;
     verticalScrollBarAccess(verticalScrollBarAccess: boolean): this;
-    nestedScrollOptions(w11: NestedScrollOptions): this;
+    nestedScrollOptions(t8: NestedScrollOptions): this;
     overScrollMode(overScrollMode: OverScrollMode): void;
     userAgent(userAgent?: string): this;
     addOnReloaded(callback: PLVCallback): this;
-    registerHandler(v11: string, handle: PLVCallback2<string, PLVCallback<string>>): this;
-    callHandle(t11: string, data: string, u11: PLVCallback<string>): this;
+    registerHandler(s8: string, handle: PLVCallback2<string, PLVCallback<string>>): this;
+    callHandle(q8: string, data: string, r8: PLVCallback<string>): this;
     loadHtmlData(data?: string): this;
     loadUrlCatch(url: string | Resource): void;
     handleControllerAttached(): void;

package/src/main/ets/modules/web/PLVWebController.js

@@ -3,7 +3,7 @@ import { PLVJsBridge } from 'jsbridge';
 import { PLVFullScreenStatus, PLVWebpageStatus } from '../../common/PLVCommonEnums';
 import PLVUtils from '../../common/PLVUtils';
 import PLVLogger from '../log/PLVLogger';
-const d11 = 100;
+const k8 = 100;
 const TAG = "[PLVWebController]";
 export class PLVWebController extends webview.WebviewController {
     constructor(webTag) {
@@ -22,7 +22,7 @@ export class PLVWebController extends webview.WebviewController {
         this._allowWindowOpenMethod = true;
         this._javaScriptAccess = true;
         this._mixedMode = MixedMode.All;
-        this._cacheMode = CacheMode.None;
+        this._cacheMode = CacheMode.Online;
         this._addOnControllerAttached = [];
         this._addOnPageEnd = [];
         this._backgroundColor = Color.Transparent;
@@ -90,6 +90,14 @@ export class PLVWebController extends webview.WebviewController {
         this._javaScriptAccess = javaScriptAccess;
         return this;
     }
+    mixMode(mixedMode) {
+        this._mixedMode = mixedMode;
+        return this;
+    }
+    cacheMode(cacheMode) {
+        this._cacheMode = cacheMode;
+        return this;
+    }
     onControllerAttached(callback) {
         this._onControllerAttached = callback;
         return this;
@@ -150,8 +158,8 @@ export class PLVWebController extends webview.WebviewController {
         this._verticalScrollBarAccess = verticalScrollBarAccess;
         return this;
     }
-    nestedScrollOptions(w11) {
-        this._nestedScrollOptions = w11;
+    nestedScrollOptions(t8) {
+        this._nestedScrollOptions = t8;
         return this;
     }
     overScrollMode(overScrollMode) {
@@ -165,12 +173,12 @@ export class PLVWebController extends webview.WebviewController {
         this._addOnReloaded.push(callback);
         return this;
     }
-    registerHandler(v11, handle) {
-        this.jsBridge.registerHandler(v11, handle);
+    registerHandler(s8, handle) {
+        this.jsBridge.registerHandler(s8, handle);
         return this;
     }
-    callHandle(t11, data, u11) {
-        this.jsBridge.callHandle(t11, data, u11);
+    callHandle(q8, data, r8) {
+        this.jsBridge.callHandle(q8, data, r8);
         return this;
     }
     loadHtmlData(data) {
@@ -212,16 +220,16 @@ export class PLVWebController extends webview.WebviewController {
         }
     }
     handleFullScreenEnter() {
-        this.getVideoWHEnterFullScreen(d11, d11, d11 * 10);
+        this.getVideoWHEnterFullScreen(k8, k8, k8 * 10);
     }
     handleWindowNew(event, builder) {
         if (this.dialogController) {
             this.dialogController.close();
         }
-        let q11 = new webview.WebviewController();
-        this.dialogController = builder(q11);
+        let p8 = new webview.WebviewController();
+        this.dialogController = builder(p8);
         this.dialogController.open();
-        event.handler.setWebController(q11);
+        event.handler.setWebController(p8);
     }
     handleIsLoadIntercept(intercept) {
         try {
@@ -252,21 +260,21 @@ export class PLVWebController extends webview.WebviewController {
     handleErrorReceive() {
         this._webStatus = PLVWebpageStatus.FINISHED;
     }
-    getVideoWHEnterFullScreen(delayTime, e11, f11) {
-        if (delayTime > f11) {
+    getVideoWHEnterFullScreen(delayTime, l8, m8) {
+        if (delayTime > m8) {
             return;
         }
         setTimeout(() => {
             this.runJavaScript(PLVUtils.getVideoRectJS(true)).then((value) => {
-                let i11 = JSON.parse(value);
-                if (i11.width === 0 && i11.height === 0) {
-                    this.getVideoWHEnterFullScreen(delayTime + e11, e11, f11);
+                let n8 = JSON.parse(value);
+                if (n8.width === 0 && n8.height === 0) {
+                    this.getVideoWHEnterFullScreen(delayTime + l8, l8, m8);
                 }
-                else if (i11.width > i11.height) {
+                else if (n8.width > n8.height) {
                     PLVUtils.changeOrientation(true);
-                    PLVUtils.setWindowFullScreen(true, true).then((k11) => {
-                        this._originalIsLayoutFullScreen = k11[0];
-                        this._originalIsFullScreen = k11[1];
+                    PLVUtils.setWindowFullScreen(true, true).then((o8) => {
+                        this._originalIsLayoutFullScreen = o8[0];
+                        this._originalIsFullScreen = o8[1];
                     });
                 }
             });

package/src/main/module.json

@@ -1,28 +1 @@
-{
-	"app": {
-		"bundleName": "net.plv.livescenes.demo",
-		"versionCode": 1020000,
-		"versionName": "1.2.0",
-		"minAPIVersion": 50000012,
-		"targetAPIVersion": 50000012,
-		"apiReleaseType": "Release",
-		"compileSdkVersion": "5.0.0.71",
-		"compileSdkType": "HarmonyOS",
-		"appEnvironments": [],
-		"bundleType": "app"
-	},
-	"module": {
-		"name": "foundation",
-		"type": "har",
-		"deviceTypes": [
-			"default",
-			"tablet",
-			"2in1"
-		],
-		"packageName": "@polyvharmony/live-scenes-foundation",
-		"installationFree": false,
-		"virtualMachine": "ark12.0.2.0",
-		"compileMode": "esmodule",
-		"dependencies": []
-	}
-}
+{"app":{"bundleName":"net.plv.livescenes.demo","debug":false,"versionCode":1030000,"versionName":"1.3.0","minAPIVersion":50000012,"targetAPIVersion":50004016,"apiReleaseType":"Release","compileSdkVersion":"5.0.4.150","compileSdkType":"HarmonyOS","appEnvironments":[],"bundleType":"app","buildMode":"release"},"module":{"name":"foundation","type":"har","deviceTypes":["default","tablet","2in1"],"packageName":"@polyvharmony/live-scenes-foundation","installationFree":false,"virtualMachine":"ark12.0.2.0","compileMode":"esmodule","dependencies":[]}}