rhine-var 0.5.2 → 0.6.2

package/README.md

@@ -152,22 +152,38 @@ Note: The returned snapshot is read-only. Please do not perform any operations o
 
 ## Server
 
-We provide a public server accessible over the internet for trying out and testing RHINE-VAR. You can connect to it via wss://rwq.rhineai.com/<room-id>.
+## Server
+
+We provide a public server on the internet for testing and trying out RHINE-VAR. You can connect to it via `wss://rvp.rhineai.com/<room-id>`.
 
-Please note that this server does not guarantee security and performance and may impose certain restrictions on users with large-scale usage.
+Note that this server does not guarantee security or performance and will impose certain restrictions on users and IPs with large-scale usage.
 
 <br/>
 
-We provide a simple server as a reference, located at `/test/server` in this project. The server is fully compatible with all Yjs websocket servers.
+We also provide a basic server example that you can deploy yourself. For more details, see: https://github.com/RhineAI-Lab/rhine-var-server
+
 ```
-git clone https://github.com/RhineAI-Lab/rhine-var.git
-cd test/server
+git clone https://github.com/RhineAI-Lab/rhine-var-server.git
 yarn install
 yarn start
 ```
 It will run on `Port 6600`, and you can connect to it via `ws://localhost:6600/<room-id>`. `<room-id>` can be any text, with each room ID corresponding to a `RhineVariable`.
 
-More information about server develop: [https://docs.yjs.dev/ecosystem/connection-provider/y-websocket](https://docs.yjs.dev/ecosystem/connection-provider/y-websocket)
+<br/>
+
+The server is currently fully compatible with all Yjs WebSocket servers.
+
+In the future, more communication protocols will be supported. You can also develop your own `Connector` object to adapt to your custom communication protocol.
+
+For more information on server development, refer to: [https://docs.yjs.dev/ecosystem/connection-provider/y-websocket](https://docs.yjs.dev/ecosystem/connection-provider/y-websocket)
+
+When using your own server, disable RhineVar's default handshake verification unless your server supports it.
+
+```typescript
+import {enableRhineVarSyncHandshakeCheck} from 'rhine-var'
+
+enableRhineVarSyncHandshakeCheck(false)
+```
 
 <br/>
 

package/README_zh.md

@@ -167,23 +167,38 @@ function Counter() {
 
 ## Server
 
-我们提供了一个位于公网的公共服务器，可以用于试用和测试 RHINE-VAR。你可以通过 `wss://rwq.rhineai.com/<room-id>` 连接它。
+我们提供了一个位于公网的公共服务器，可以用于试用和测试 RHINE-VAR。你可以通过 `wss://rvp.rhineai.com/<room-id>` 连接它。
 
-注意，该服务器无法保证安全和性能，并会对大规模使用的用户做出一定限制。
+注意，该服务器无法保证安全和性能，并会对大规模使用的用户和IP做出一定限制。
 
 <br/>
 
-本仓库中提供了一个简单的服务器例子，位于本项目中的 `/test/server` 处。 服务端完全兼容所有的 Yjs 的 Websocket 服务器，将来会支持更多。
+我们提供了一个基本的服务器例子，您可以自己部署，详情请见: https://github.com/RhineAI-Lab/rhine-var-server 
+
 ```
-git clone https://github.com/RhineAI-Lab/rhine-var.git
-cd test/server
+git clone https://github.com/RhineAI-Lab/rhine-var-server.git
 yarn install
 yarn start
 ```
+
 默认运行在 `端口 6600`, 你可以通过连接 `ws://localhost:6600/<room-id>` 连接它，`<room-id>` 可以是任意文本，一个房间号对应一个 `RhineVar 对象`。
 
+<br/>
+
+服务端目前完全兼容所有的 Yjs 的 Websocket 服务器。
+
+将来会支持更多通信协议，现在您也可以自己开发 `Connector` 对象，以适配自己的通信协议。
+
 更多服务端开发信息请参考: [https://docs.yjs.dev/ecosystem/connection-provider/y-websocket](https://docs.yjs.dev/ecosystem/connection-provider/y-websocket)
 
+当你使用自己开发的服务器时，请关闭 RhineVar 默认的二次握手校验连接，除非你的服务器支持了他。
+
+```typescript
+import {enableRhineVarSyncHandshakeCheck} from 'rhine-var'
+
+enableRhineVarSyncHandshakeCheck(false)
+```
+
 <br/>
 
 ## Develop

package/dist/config/config.d.ts

@@ -0,0 +1,8 @@
+export default class RhineVarConfig {
+    static ENABLE_LOG: boolean;
+    static ENABLE_SYNC_HANDSHAKE_CHECK: boolean;
+}
+export declare function enableRhineVarLog(value: boolean): void;
+export declare function enableRhineVarSyncHandshakeCheck(value: boolean): void;
+export declare function getRhineVarConfig(): typeof RhineVarConfig;
+//# sourceMappingURL=config.d.ts.map

package/dist/config/config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,OAAO,cAAc;IAEjC,MAAM,CAAC,UAAU,UAAQ;IACzB,MAAM,CAAC,2BAA2B,UAAO;CAE1C;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,QAE/C;AAED,wBAAgB,gCAAgC,CAAC,KAAK,EAAE,OAAO,QAE9D;AAED,wBAAgB,iBAAiB,0BAEhC"}

package/dist/config/config.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.enableRhineVarLog = enableRhineVarLog;
+exports.enableRhineVarSyncHandshakeCheck = enableRhineVarSyncHandshakeCheck;
+exports.getRhineVarConfig = getRhineVarConfig;
+class RhineVarConfig {
+}
+RhineVarConfig.ENABLE_LOG = false;
+RhineVarConfig.ENABLE_SYNC_HANDSHAKE_CHECK = true;
+exports.default = RhineVarConfig;
+function enableRhineVarLog(value) {
+    RhineVarConfig.ENABLE_LOG = Boolean(value);
+}
+function enableRhineVarSyncHandshakeCheck(value) {
+    RhineVarConfig.ENABLE_SYNC_HANDSHAKE_CHECK = Boolean(value);
+}
+function getRhineVarConfig() {
+    return RhineVarConfig;
+}

package/dist/core/connector/SyncHandshakeCheck.d.ts

@@ -0,0 +1,5 @@
+import { Map as YMap } from "yjs";
+export default class SyncHandshakeCheck {
+    static wait(baseMap: YMap<any>): Promise<void>;
+}
+//# sourceMappingURL=SyncHandshakeCheck.d.ts.map

package/dist/core/connector/SyncHandshakeCheck.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SyncHandshakeCheck.d.ts","sourceRoot":"","sources":["../../../src/core/connector/SyncHandshakeCheck.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,IAAI,IAAI,EAAC,MAAM,KAAK,CAAC;AAGhC,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAErC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC;CAoC/B"}

package/dist/core/connector/SyncHandshakeCheck.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const logger_1 = require("../../utils/logger");
+class SyncHandshakeCheck {
+    static wait(baseMap) {
+        return new Promise((resolve) => {
+            const waitSync = (syncMap) => {
+                syncMap.set('role', 'client');
+                syncMap.set('timestamp', Date.now());
+                (0, logger_1.log)('Sync handshake start', syncMap.toJSON());
+                setTimeout(() => {
+                    const syncObserver = () => {
+                        var _a;
+                        if (syncMap.get('role') === 'server') {
+                            (0, logger_1.log)('Sync handshake successfully', syncMap.toJSON());
+                            syncMap.unobserve(syncObserver);
+                            (0, logger_1.log)('Sync State:', (_a = baseMap.get('state')) === null || _a === void 0 ? void 0 : _a.toJSON());
+                            resolve();
+                        }
+                    };
+                    syncMap.observe(syncObserver);
+                    syncObserver();
+                }, 1);
+            };
+            if (baseMap.has('sync')) {
+                waitSync(baseMap.get('sync'));
+            }
+            else {
+                (0, logger_1.log)('Sync handshake waiting...');
+                const mapObserver = () => {
+                    console.log(baseMap.toJSON());
+                    if (baseMap.has('sync')) {
+                        baseMap.unobserve(mapObserver);
+                        waitSync(baseMap.get('sync'));
+                    }
+                };
+                baseMap.observe(mapObserver);
+            }
+        });
+    }
+}
+exports.default = SyncHandshakeCheck;

package/dist/core/connector/WebsocketConnector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WebsocketConnector.d.ts","sourceRoot":"","sources":["../../../src/core/connector/WebsocketConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,EAAC,MAAM,KAAK,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,0BAAyC;AAEjE,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAC5C,OAAO,EAAC,cAAc,EAAC,0BAA8B;AAErD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAErC,MAAM,CAAC,SAAS,SAAU;IAE1B,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IACnB,GAAG,EAAE,MAAM,CAAK;IAEhB,QAAQ,SAAK;IACb,MAAM,UAAQ;IAEd,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAO;IACzC,eAAe,EAAE,eAAe,CAA+B;IAG/D,OAAO,CAAC,iBAAiB,CAAuB;IAChD,eAAe,CAAC,QAAQ,EAAE,cAAc;IAIxC,iBAAiB,CAAC,QAAQ,EAAE,cAAc;IAG1C,oBAAoB;IAGpB,UAAU,CAAC,MAAM,EAAE,OAAO;IAI1B,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI;IAahC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;gBAOf,GAAG,SAAK;IAMpB,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe;IAc/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CnC,UAAU;CAYjB;AAGD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,sBAMhD"}
+{"version":3,"file":"WebsocketConnector.d.ts","sourceRoot":"","sources":["../../../src/core/connector/WebsocketConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,IAAI,IAAI,EAAE,GAAG,IAAI,IAAI,EAAC,MAAM,KAAK,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,0BAAyC;AAEjE,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAC5C,OAAO,EAAC,cAAc,EAAC,0BAA8B;AAIrD,MAAM,CAAC,OAAO,OAAO,kBAAkB;IAErC,MAAM,CAAC,SAAS,SAAU;IAE1B,IAAI,EAAE,IAAI,CAAA;IACV,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;IACnB,GAAG,EAAE,MAAM,CAAK;IAEhB,QAAQ,SAAK;IACb,MAAM,UAAQ;IAEd,QAAQ,EAAE,iBAAiB,GAAG,IAAI,CAAO;IACzC,eAAe,EAAE,eAAe,CAA+B;IAG/D,OAAO,CAAC,iBAAiB,CAAuB;IAChD,eAAe,CAAC,QAAQ,EAAE,cAAc;IAIxC,iBAAiB,CAAC,QAAQ,EAAE,cAAc;IAG1C,oBAAoB;IAGpB,UAAU,CAAC,MAAM,EAAE,OAAO;IAI1B,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI;IAahC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;gBAOf,GAAG,SAAK;IAMpB,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe;IAc/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA+CnC,UAAU;CAYjB;AAGD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,sBAMhD"}

package/dist/core/connector/WebsocketConnector.js

@@ -1,10 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.websocketRhineConnect = websocketRhineConnect;
 const yjs_1 = require("yjs");
 const y_websocket_1 = require("y-websocket");
 const ConnectorStatus_1 = require("./ConnectorStatus");
-const Logger_1 = require("../utils/Logger");
+const logger_1 = require("../../utils/logger");
+const config_1 = __importDefault(require("../../config/config"));
+const SyncHandshakeCheck_1 = __importDefault(require("./SyncHandshakeCheck"));
 class WebsocketConnector {
     subscribeSynced(callback) {
         this.syncedSubscribers.push(callback);
@@ -75,11 +80,14 @@ class WebsocketConnector {
             this.provider.shouldConnect = true;
             this.provider.on('status', (event) => {
                 this.websocketStatus = event.status;
-                (0, Logger_1.log)('WebsocketRhineConnector.event status:', event.status);
+                (0, logger_1.log)('WebsocketRhineConnector.event status:', event.status);
             });
-            this.provider.on('sync', (synced) => {
-                (0, Logger_1.log)('WebsocketRhineConnector.event sync:', synced);
+            this.provider.on('sync', async (synced) => {
                 if (synced) {
+                    if (config_1.default.ENABLE_SYNC_HANDSHAKE_CHECK) {
+                        await SyncHandshakeCheck_1.default.wait(this.yBaseMap);
+                    }
+                    (0, logger_1.log)('WebsocketRhineConnector.event sync:', synced);
                     this.synced = true;
                     this.clientId = this.yDoc.clientID;
                     this.emitSynced(synced);
@@ -88,11 +96,11 @@ class WebsocketConnector {
             });
             this.provider.on('connection-close', (e) => {
                 this.websocketStatus = ConnectorStatus_1.ConnectorStatus.DISCONNECTED;
-                (0, Logger_1.log)('WebsocketRhineConnector.event connection-close:', e);
+                (0, logger_1.log)('WebsocketRhineConnector.event connection-close:', e);
             });
             this.provider.on('connection-error', (error) => {
                 this.websocketStatus = ConnectorStatus_1.ConnectorStatus.DISCONNECTED;
-                (0, Logger_1.log)('WebsocketRhineConnector.event connection-error:', error);
+                (0, logger_1.log)('WebsocketRhineConnector.event connection-error:', error);
             });
         });
     }

package/dist/core/proxy/Proxy.d.ts

@@ -4,7 +4,7 @@ import { ProxiedRhineVar, ProxiedRhineVarItem } from "./ProxiedRhineVar";
 import { Native } from "../native/Native";
 import RhineVar from "./RhineVar";
 export declare const PROTOCOL_LIST: string[];
-export declare const DEFAULT_PUBLIC_URL = "wss://rpw.rhineai.com/";
+export declare const DEFAULT_PUBLIC_URL = "wss://rvp.rhineai.com/";
 export declare function rhineProxy<T extends object>(defaultValue: T | Native, connector: WebsocketConnector | string | number, overwrite?: boolean | number): ProxiedRhineVar<T>;
 export declare function rhineProxyItem<T extends object>(data: T | Native, parent?: RhineVar<any> | RhineVarItem<any> | null): ProxiedRhineVarItem<T> | ProxiedRhineVar<T>;
 //# sourceMappingURL=Proxy.d.ts.map

package/dist/core/proxy/Proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Proxy.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/Proxy.ts"],"names":[],"mappings":"AACA,OAAO,kBAA2C,wCAA4C;AAC9F,OAAO,YAA+C,uBAAkC;AAIxF,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,0BAAqC;AAClF,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAS5C,OAAO,QAAQ,mBAA8B;AAG7C,eAAO,MAAM,aAAa,UAAsB,CAAA;AAChD,eAAO,MAAM,kBAAkB,2BAA2B,CAAA;AAG1D,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,YAAY,EAAE,CAAC,GAAG,MAAM,EACxB,SAAS,EAAE,kBAAkB,GAAG,MAAM,GAAG,MAAM,EAC/C,SAAS,GAAE,OAAO,GAAG,MAAc,GAClC,eAAe,CAAC,CAAC,CAAC,CA+CpB;AAGD,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,IAAI,EAAE,CAAC,GAAG,MAAM,EAChB,MAAM,GAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,IAAW,GACtD,mBAAmB,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CA2F7C"}
+{"version":3,"file":"Proxy.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/Proxy.ts"],"names":[],"mappings":"AACA,OAAO,kBAA2C,wCAA4C;AAC9F,OAAO,YAA+C,uBAAkC;AAIxF,OAAO,EAAC,eAAe,EAAE,mBAAmB,EAAC,0BAAqC;AAClF,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAQ5C,OAAO,QAAQ,mBAA8B;AAG7C,eAAO,MAAM,aAAa,UAAsB,CAAA;AAChD,eAAO,MAAM,kBAAkB,2BAA2B,CAAA;AAG1D,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,YAAY,EAAE,CAAC,GAAG,MAAM,EACxB,SAAS,EAAE,kBAAkB,GAAG,MAAM,GAAG,MAAM,EAC/C,SAAS,GAAE,OAAO,GAAG,MAAc,GAClC,eAAe,CAAC,CAAC,CAAC,CA+CpB;AAGD,wBAAgB,cAAc,CAAC,CAAC,SAAS,MAAM,EAC7C,IAAI,EAAE,CAAC,GAAG,MAAM,EAChB,MAAM,GAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,IAAW,GACtD,mBAAmB,CAAC,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC,CA2F7C"}

package/dist/core/proxy/Proxy.js

@@ -33,12 +33,12 @@ const yjs_1 = require("yjs");
 const WebsocketConnector_1 = __importStar(require("../connector/WebsocketConnector"));
 const RhineVarItem_1 = __importStar(require("./RhineVarItem"));
 const DataUtils_1 = require("../utils/DataUtils");
-const Logger_1 = require("../utils/Logger");
+const logger_1 = require("../../utils/logger");
 const ConvertProperty_1 = require("../utils/ConvertProperty");
 const NativeUtils_1 = require("../native/NativeUtils");
 const RhineVar_1 = __importDefault(require("./RhineVar"));
 exports.PROTOCOL_LIST = ['ws://', "wss://"];
-exports.DEFAULT_PUBLIC_URL = 'wss://rpw.rhineai.com/';
+exports.DEFAULT_PUBLIC_URL = 'wss://rvp.rhineai.com/';
 function rhineProxy(defaultValue, connector, overwrite = false) {
     let target = (0, DataUtils_1.ensureNative)(defaultValue);
     if (connector) {
@@ -65,7 +65,7 @@ function rhineProxy(defaultValue, connector, overwrite = false) {
                     Reflect.get(object, 'unobserve').call(object);
                     object.native = syncedValue;
                     Reflect.get(object, 'observe').call(object);
-                    (0, Logger_1.log)('Proxy.synced: Update synced native');
+                    (0, logger_1.log)('Proxy.synced: Update synced native');
                     syncedValue.forEach((value, key) => {
                         if ((0, NativeUtils_1.isNative)(value)) {
                             Reflect.set(object.origin, key, rhineProxyItem(value, object));
@@ -97,7 +97,7 @@ function rhineProxyItem(data, parent = null) {
         }
     });
     const proxyGetOwnPropertyDescriptor = (proxy, p) => {
-        (0, Logger_1.log)('Proxy.handler.getOwnPropertyDescriptor:', p, '  ', object);
+        (0, logger_1.log)('Proxy.handler.getOwnPropertyDescriptor:', p, '  ', object);
         if (p === Symbol.iterator) {
             return {
                 value: function* () {
@@ -122,7 +122,7 @@ function rhineProxyItem(data, parent = null) {
         get(proxy, p, receiver) {
             if (RhineVarItem_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
                 return Reflect.get(object, p, receiver);
-            (0, Logger_1.log)('Proxy.handler.get:', p, '  ', object, receiver);
+            (0, logger_1.log)('Proxy.handler.get:', p, '  ', object, receiver);
             if (p in object)
                 return Reflect.get(object, p, receiver);
             const descriptor = proxyGetOwnPropertyDescriptor(proxy, p);
@@ -140,7 +140,7 @@ function rhineProxyItem(data, parent = null) {
         set(proxy, p, value, receiver) {
             if (RhineVarItem_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
                 return Reflect.set(object, p, value, receiver);
-            (0, Logger_1.log)('Proxy.handler.set:', p, 'to', value, '  ', object, receiver);
+            (0, logger_1.log)('Proxy.handler.set:', p, 'to', value, '  ', object, receiver);
             value = (0, DataUtils_1.ensureRhineVar)(value, object);
             let result = (0, NativeUtils_1.nativeSet)(object.native, p, value);
             if (!result)
@@ -150,7 +150,7 @@ function rhineProxyItem(data, parent = null) {
         deleteProperty(proxy, p) {
             if (RhineVarItem_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
                 return false;
-            (0, Logger_1.log)('Proxy.handler.deleteProperty:', p);
+            (0, logger_1.log)('Proxy.handler.deleteProperty:', p);
             let result = (0, NativeUtils_1.nativeDelete)(object.native, p);
             if (!result)
                 console.error('Failed to delete value');

package/dist/core/proxy/RhineVarItem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RhineVarItem.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/RhineVarItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAItF,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,yBAA6B;AACnD,OAAO,EAAC,UAAU,EAAC,4BAAgC;AACnD,OAAO,EAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAC,0BAA8B;AAC7E,OAAO,EAAC,kBAAkB,EAAC,0BAAqC;AAChE,OAAO,QAAQ,mBAA8B;AAC7C,OAAO,kBAAkB,wCAA4C;AAGrE,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,CAAC;IAGxB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI;IAChD,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;gBAF7B,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,IAAW,EACvD,MAAM,GAAE,kBAAkB,CAAC,CAAC,CAAe;IAGpD,MAAM,IAAI,OAAO;IAIjB,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC;IAIrB,YAAY,IAAI,kBAAkB,GAAG,IAAI;IAKzC,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI;IAO1B,UAAU;IAOhB,IAAI,IAAI,CAAC;IAIT,UAAU,IAAI,CAAC;IAwCf,MAAM,CAAC,MAAM,SAAI;IAIjB,OAAO,CAAC,iBAAiB,CAAuB;IAChD,eAAe,CAAC,QAAQ,EAAE,cAAc;IAIxC,iBAAiB,CAAC,QAAQ,EAAE,cAAc;IAG1C,oBAAoB;IAIpB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,WAAW,CAAoB;IACvC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAI5C,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAGjC,cAAc;IAId,OAAO,CAAC,cAAc,CAAyC;IAC/D,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAO7D,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAKpC,iBAAiB;IAIjB,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,eAAe,CAAwB;IAC/C,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAIpD,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAGzC,kBAAkB;IAIlB,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW;IAejJ,OAAO,CAAC,QAAQ,CAA6E;IAC7F,OAAO,CAAC,cAAc,CAA0C;IAGhE,OAAO,CAAC,OAAO;IA2Ff,OAAO,CAAC,SAAS;CAQlB;AAGD,eAAO,MAAM,+BAA+B,sBA0C1C,CAAA"}
+{"version":3,"file":"RhineVarItem.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/RhineVarItem.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAItF,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,yBAA6B;AACnD,OAAO,EAAC,UAAU,EAAC,4BAAgC;AACnD,OAAO,EAAC,QAAQ,EAAE,YAAY,EAAE,cAAc,EAAC,0BAA8B;AAC7E,OAAO,EAAC,kBAAkB,EAAC,0BAAqC;AAChE,OAAO,QAAQ,mBAA8B;AAC7C,OAAO,kBAAkB,wCAA4C;AAGrE,MAAM,CAAC,OAAO,OAAO,YAAY,CAAC,CAAC;IAGxB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,IAAI;IAChD,MAAM,EAAE,kBAAkB,CAAC,CAAC,CAAC;gBAF7B,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,GAAG,IAAW,EACvD,MAAM,GAAE,kBAAkB,CAAC,CAAC,CAAe;IAGpD,MAAM,IAAI,OAAO;IAIjB,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC;IAIrB,YAAY,IAAI,kBAAkB,GAAG,IAAI;IAKzC,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI;IAO1B,UAAU;IAOhB,IAAI,IAAI,CAAC;IAIT,UAAU,IAAI,CAAC;IAwCf,MAAM,CAAC,MAAM,SAAI;IAIjB,OAAO,CAAC,iBAAiB,CAAuB;IAChD,eAAe,CAAC,QAAQ,EAAE,cAAc;IAIxC,iBAAiB,CAAC,QAAQ,EAAE,cAAc;IAG1C,oBAAoB;IAIpB,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,WAAW,CAAoB;IACvC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAI5C,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAGjC,cAAc;IAId,OAAO,CAAC,cAAc,CAAyC;IAC/D,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAO7D,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAKpC,iBAAiB;IAIjB,OAAO,CAAC,IAAI;IAQZ,OAAO,CAAC,eAAe,CAAwB;IAC/C,aAAa,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAIpD,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAGzC,kBAAkB;IAIlB,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW;IAejJ,OAAO,CAAC,QAAQ,CAA6E;IAC7F,OAAO,CAAC,cAAc,CAA0C;IAEhE,OAAO,CAAC,OAAO;IA+Ff,OAAO,CAAC,SAAS;CAQlB;AAGD,eAAO,MAAM,+BAA+B,sBA0C1C,CAAA"}

package/dist/core/proxy/RhineVarItem.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RHINE_VAR_PREDEFINED_PROPERTIES = void 0;
 const yjs_1 = require("yjs");
 const Proxy_1 = require("./Proxy");
-const Logger_1 = require("../utils/Logger");
+const logger_1 = require("../../utils/logger");
 const DataUtils_1 = require("../utils/DataUtils");
 const ChangeType_1 = require("../event/ChangeType");
 class RhineVarItem {
@@ -156,13 +156,15 @@ class RhineVarItem {
             }
         }
     }
-    // 开始观察当前Native的内容变化
     observe() {
-        var _a;
-        this.syncedObserver = (synced) => {
-            this.emitSynced(synced);
-        };
-        (_a = this.getConnector()) === null || _a === void 0 ? void 0 : _a.subscribeSynced(this.syncedObserver);
+        const connector = this.getConnector();
+        if (connector) {
+            this.syncedObserver = (synced) => {
+                this.emitSynced(synced);
+            };
+            connector.subscribeSynced(this.syncedObserver);
+            this.emitSynced(connector.synced);
+        }
         const target = this.native;
         if (target instanceof yjs_1.Map) {
             this.observer = (event, transaction) => {
@@ -187,7 +189,7 @@ class RhineVarItem {
                         Reflect.deleteProperty(this.origin, key);
                     }
                     const newValue = key in this ? Reflect.get(this, key) : value;
-                    (0, Logger_1.log)('Proxy.event: Map', action, key + ':', oldValue, '->', newValue);
+                    (0, logger_1.log)('Proxy.event: Map', action, key + ':', oldValue, '->', newValue);
                     this.emit(key, newValue, oldValue, action, event, transaction);
                     this.emitDeep([key], newValue, oldValue, action, event, transaction);
                 });
@@ -213,7 +215,7 @@ class RhineVarItem {
                                 Reflect.set(this.origin, k - 1, value);
                                 Reflect.deleteProperty(this.origin, k);
                             }
-                            (0, Logger_1.log)('Proxy.event: Array delete', i + ':', oldValue, '->', undefined);
+                            (0, logger_1.log)('Proxy.event: Array delete', i + ':', oldValue, '->', undefined);
                             this.emit(i, undefined, oldValue, ChangeType_1.ChangeType.Delete, event, transaction);
                             this.emitDeep([i], undefined, oldValue, ChangeType_1.ChangeType.Delete, event, transaction);
                         }
@@ -232,7 +234,7 @@ class RhineVarItem {
                                 Reflect.set(this.origin, i, value);
                             }
                             const newValue = i in this ? Reflect.get(this, i) : target.get(i);
-                            (0, Logger_1.log)('Proxy.event: Array add', i, ':', undefined, '->', newValue);
+                            (0, logger_1.log)('Proxy.event: Array add', i, ':', undefined, '->', newValue);
                             this.emit(i, newValue, undefined, ChangeType_1.ChangeType.Add, event, transaction);
                             this.emitDeep([i], newValue, undefined, ChangeType_1.ChangeType.Add, event, transaction);
                         });

package/dist/core/utils/DataUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataUtils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/DataUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,iCAAqC;AAEhE,OAAO,YAAY,8BAAkC;AAErD,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAG5C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,WAElC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,kBAEjC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,WAEzC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,GAAG,CAU3G;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,CAWjF"}
+{"version":3,"file":"DataUtils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/DataUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,iCAAqC;AAEhE,OAAO,YAAY,8BAAkC;AAErD,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAE5C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,WAElC;AAED,wBAAgB,OAAO,CAAC,KAAK,EAAE,GAAG,kBAEjC;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,WAEzC;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,YAAY,CAAC,GAAG,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,GAAG,CAU3G;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,GAAG,CAWjF"}

package/dist/index.d.ts

@@ -5,5 +5,6 @@ import WebsocketConnector from "./core/connector/WebsocketConnector";
 import useRhine from "./react/hooks/useRhine";
 import useSynced from "./react/hooks/useSynced";
 import { Native, YPath } from "./core/native/Native";
-export { WebsocketConnector, rhineProxy, rhineProxyItem, RhineVarItem, StoredRhineVarItem, ProxiedRhineVarItem, RecursiveCrossRhineVarItem, StoredRhineVar, ProxiedRhineVar, RecursiveCrossRhineVar, YPath, Native, useRhine, useSynced, };
+import { getRhineVarConfig, enableRhineVarLog, enableRhineVarSyncHandshakeCheck } from "./config/config";
+export { WebsocketConnector, rhineProxy, rhineProxyItem, RhineVarItem, StoredRhineVarItem, ProxiedRhineVarItem, RecursiveCrossRhineVarItem, StoredRhineVar, ProxiedRhineVar, RecursiveCrossRhineVar, YPath, Native, enableRhineVarLog, enableRhineVarSyncHandshakeCheck, getRhineVarConfig, useRhine, useSynced, };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,2BAA2B;AAC9D,OAAO,YAAY,kCAAkC;AACrD,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,0BAA0B,EAC1B,cAAc,EACd,eAAe,EACf,sBAAsB,EACvB,qCAAqC;AACtC,OAAO,kBAAkB,4CAA4C;AACrE,OAAO,QAAQ,+BAA8B;AAC7C,OAAO,SAAS,gCAA+B;AAC/C,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,6BAA6B;AAEnD,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACnB,0BAA0B,EAC1B,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,KAAK,EACL,MAAM,EACN,QAAQ,EACR,SAAS,GACV,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAC,2BAA2B;AAC9D,OAAO,YAAY,kCAAkC;AACrD,OAAO,EACL,kBAAkB,EAClB,mBAAmB,EACnB,0BAA0B,EAC1B,cAAc,EACd,eAAe,EACf,sBAAsB,EACvB,qCAAqC;AACtC,OAAO,kBAAkB,4CAA4C;AACrE,OAAO,QAAQ,+BAA8B;AAC7C,OAAO,SAAS,gCAA+B;AAC/C,OAAO,EAAC,MAAM,EAAE,KAAK,EAAC,6BAA6B;AACnD,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,gCAAgC,EAAE,MAAM,iBAAiB,CAAC;AAEzG,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,cAAc,EACd,YAAY,EACZ,kBAAkB,EAClB,mBAAmB,EACnB,0BAA0B,EAC1B,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,KAAK,EACL,MAAM,EACN,iBAAiB,EACjB,gCAAgC,EAChC,iBAAiB,EACjB,QAAQ,EACR,SAAS,GACV,CAAA"}

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSynced = exports.useRhine = exports.RhineVarItem = exports.rhineProxyItem = exports.rhineProxy = exports.WebsocketConnector = void 0;
+exports.useSynced = exports.useRhine = exports.getRhineVarConfig = exports.enableRhineVarSyncHandshakeCheck = exports.enableRhineVarLog = exports.RhineVarItem = exports.rhineProxyItem = exports.rhineProxy = exports.WebsocketConnector = void 0;
 const Proxy_1 = require("./core/proxy/Proxy");
 Object.defineProperty(exports, "rhineProxy", { enumerable: true, get: function () { return Proxy_1.rhineProxy; } });
 Object.defineProperty(exports, "rhineProxyItem", { enumerable: true, get: function () { return Proxy_1.rhineProxyItem; } });
@@ -15,3 +15,7 @@ const useRhine_1 = __importDefault(require("./react/hooks/useRhine"));
 exports.useRhine = useRhine_1.default;
 const useSynced_1 = __importDefault(require("./react/hooks/useSynced"));
 exports.useSynced = useSynced_1.default;
+const config_1 = require("./config/config");
+Object.defineProperty(exports, "getRhineVarConfig", { enumerable: true, get: function () { return config_1.getRhineVarConfig; } });
+Object.defineProperty(exports, "enableRhineVarLog", { enumerable: true, get: function () { return config_1.enableRhineVarLog; } });
+Object.defineProperty(exports, "enableRhineVarSyncHandshakeCheck", { enumerable: true, get: function () { return config_1.enableRhineVarSyncHandshakeCheck; } });

package/dist/utils/logger.d.ts

@@ -0,0 +1,3 @@
+export declare function log(...items: any[]): void;
+export declare function nativeLog(...items: any[]): void;
+//# sourceMappingURL=logger.d.ts.map

package/dist/utils/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"AAEA,wBAAgB,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE,QAIlC;AAED,wBAAgB,SAAS,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE,QAExC"}

package/dist/utils/logger.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.log = log;
+exports.nativeLog = nativeLog;
+const config_1 = __importDefault(require("../config/config"));
+function log(...items) {
+    if (config_1.default.ENABLE_LOG) {
+        nativeLog(...items);
+    }
+}
+function nativeLog(...items) {
+    console.log('%cRhineVar', 'color: #b6ff00', ...items);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhine-var",
-  "version": "0.5.2",
+  "version": "0.6.2",
   "description": "Variables that support multi-user collaboration and persistence, making collaboration and variable operations as simple as possible, with strict and well-defined type hints.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/core/utils/Logger.d.ts

@@ -1,2 +0,0 @@
-export declare function log(...items: any[]): void;
-//# sourceMappingURL=Logger.d.ts.map

package/dist/core/utils/Logger.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../src/core/utils/Logger.ts"],"names":[],"mappings":"AAGA,wBAAgB,GAAG,CAAC,GAAG,KAAK,EAAE,GAAG,EAAE,QAIlC"}

package/dist/core/utils/Logger.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = log;
-const ENABLE_LOG = true;
-function log(...items) {
-    if (ENABLE_LOG) {
-        console.log('%cRhineVar', 'color: #b6ff00', ...items);
-    }
-}