rhine-var 0.2.0 → 0.3.2

package/README.md

@@ -1,46 +1,139 @@
+<div align="center">
 
-# The most concise and rigorous strongly-typed real-time collaborative editing library.
+# RHINE-VAR: Simplest and Most Powerful Collaborative Framework
 
-Variables that support multi-user collaboration and persistence, making collaboration and variable operations as simple as possible, with strict and well-defined type hints.
+Rhine Variable — A self-synchronizing variable for collaboration.
+Developing collaborative applications has never been this easy.
+
+
+[English](README.md) &nbsp; | &nbsp; [中文](README_zh.md)
+
+<img src='./assets/images/example1.png' style="border-radius: 10px; max-width: 840px"/>
+
+</div>
+
+<br/>
+
+## Why Choose RHINE-VAR ?
+
+### Concise and Efficient Syntax Design
+RhineVar draws inspiration from the design philosophy of the Valtio state management library, significantly reducing the learning curve. Developers can easily manage collaborative data as if they were manipulating regular variables.
+
+### Comprehensive Type Support
+RhineVar offers full type hints and checks, ensuring precise code completion and static analysis during development. This not only improves the development experience but also reduces potential errors, making it especially suitable for TypeScript projects, enhancing code safety and reliability.
+
+### Distributed Real-time Collaboration Algorithm
+The underlying collaboration algorithm of RhineVar is powered by the robust Yjs library. Using the CRDT (Conflict-free Replicated Data Type) algorithm, it ensures eventual consistency even in multi-user and offline environments.
+
+### High Performance with Low Bandwidth Requirements
+The data synchronization and conflict resolution mechanism is highly efficient. Leveraging Yjs's incremental update mechanism, only necessary data changes are transmitted rather than the entire document, making it ideal for bandwidth-constrained environments and reducing unnecessary data transfers.
+
+### Strong Offline Support
+Users can continue to work even while offline. Once reconnected, all changes are automatically synchronized, ensuring no data is lost or conflicted. This is crucial for building offline-first applications.
+
+### Cross-platform and Framework Agnostic
+RhineVar can be used in various environments, including browsers, Node.js, and other JavaScript platforms. It integrates with multiple frontend frameworks and libraries such as Next.js, React, Vue.js, ProseMirror, and more.
+
+### Lightweight and Extensible
+RhineVar is a highly lightweight library, with its core package only a few KB in size, making it suitable for various frontend applications. Its modular architecture supports feature extensions, allowing developers to import or develop custom modules as needed.
+
+### Decentralized Architecture
+With a decentralized architecture, collaborative editing becomes more scalable, efficient, and fault-tolerant. Peer-to-peer data transfer is supported without relying on a central server (currently under development).
+
+### Native Yjs Support
+RhineVar offers full support for native Yjs object operations, providing lower-level, richer API support. Direct operations on Yjs objects automatically trigger updates in RhineVar.
+
+### More Friendly and Complete Event System
+RhineVar offers an extensive event subscription and listening system with intuitive data change events. It also supports deep data change monitoring within objects, catering to a wide range of use cases.
+
+<br/>
+
+## Contact Us
+Welcome to join our WeChat group for communication. We look forward to having more community members participate in the creation of rhine-var.
+
+WeChat: [FNA-04]()
+
+Email: [RhineAILab@gmail.com](rhineailab@gmail.com) & [RhineAI@163.com](RhineAI@163.com)
+
+<br/>
 
 ## Install
 ```bash
-npm i rhine-var
-```
-Or with yarn:
-```bash
 yarn add rhine-var
 ```
+If you don't have `yarn`, you can install it via `npm i rhine-var`, or install `yarn` first using `npm i -g yarn` and then use the command above to install.
 
-## Usage
+<br/>
 
+## Usage
 
 ```typescript jsx
 const defaultValue = {value: 0}
-const count = rhineProxy(defaultValue, 'RhineAI.com/ws/room-0')
-
-function EasyCounter() {
+const count = rhineProxy(defaultValue, 'localhost:6600/room-0')
 
+function Counter() {
+  
   const countSnap = useRhine(count)
-
-  return <div className='page'>
+  
+  return <div>
     <button onClick={() => count.value-- }> - 1 </button>
     <span>{countSnap.value}</span>
     <button onClick={() => count.value++ }> + 1 </button>
   </div>
 }
 ```
+### Default Value
+
+When the room does not exist on the server, a default value will be used to create the room. If not connected to the server, data from the default value will also be returned.
+
+### Room ID
+
+The `Same Room ID` manages the `Same State Variables`, and users who join will experience real-time multi-user collaboration.
+
+### rhineProxy
+
+Create a `RhineVariable` that anyone in the room can directly modify, and the value will be synchronized to everyone almost simultaneously.
+
+Its value is `at least an object` in javascript, `but` there is almost no upper limit. It can be an `extremely complex and large JSON structure` to accommodate all the data for a large project.
+
+### useRhine
+
+A hook for use with React. It creates a snapshot of a `RhineVariable`, and whenever someone modifies this value, the information will be `updated on everyone's screen` in real-time.
+
+Use snapshot only when data needs to be displayed on the React page. For other operations, such as modifying values, please use RhineVariable itself.
 
 <br/>
 
-## Develop With US
+## Server
+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.
+```
+git clone https://github.com/RhineAI-Lab/rhine-var.git
+cd test/server
+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`.
 
-Start Debug Mode
+More information about server develop: [https://docs.yjs.dev/ecosystem/connection-provider/y-websocket](https://docs.yjs.dev/ecosystem/connection-provider/y-websocket)
+
+<br/>
+
+## Develop
 
 ```bash
-npm run watch
+# start watch and build by typescript
+yarn run watch
+
+# start a easy websocket server
+cd test/server
+yarn install
+yarn start
+
+# start a nextjs playground for develop debug
 cd test/debug/next-app
-npm run dev
+yarn install
+yarn start
+# Open http://localhost:3000 in browser
 ```
 
 <br/>

package/README_zh.md

@@ -0,0 +1,130 @@
+<div align="center">
+
+# 最简单且强大的多人协同框架 RHINE-VAR
+
+莱茵变量 —— 会自己与他人协同的变量 &nbsp; 多人协同应用开发从未如此简单 
+
+[English](README.md) &nbsp; | &nbsp; [中文](README_zh.md)
+
+<img src='./assets/images/example1.png' style="border-radius: 10px; max-width: 840px"/>
+
+</div>
+
+<br/>
+
+## 为什么选择 RHINE-VAR ?
+
+**简洁高效的语法设计:** &nbsp; RhineVar 借鉴了 Valtio 状态管理库的设计理念，极大地降低了学习成本。开发者可以像操作普通变量一样轻松操控协同数据。
+
+**完备的类型支持:** &nbsp; RhineVar 提供全面的类型提示和类型检查，确保在开发过程中能够获得精确的代码补全和静态分析。这不仅改善了开发体验，还有效降低了潜在的错误风险，特别适用于 TypeScript 项目，提升了代码的安全性和可靠性。
+
+**分布式实时协作算法:** &nbsp; RhineVar 的底层协同算法基于强大的 Yjs 库。通过 CRDT (Conflict-free Replicated Data Type，无冲突复制数据类型) 算法，确保多用户同时使用，甚至离线下使用的最终一致性。
+
+**高性能和低带宽需求:** &nbsp; 数据同步和冲突解决机制非常高效，通过 Yjs 的增量更新机制，仅传输必要的数据更改，而非整个文档。这使得它在网络带宽受限的环境中表现良好，减少了不必要的数据传输。
+
+**强大的离线支持:** &nbsp; 即使在离线状态下，用户仍然可以继续使用应用。当重新联机时，所有更改将自动同步，确保数据不会出现丢失或冲突。这对于构建离线优先的应用至关重要。
+
+**跨平台和框架无关:** &nbsp; RhineVar 支持在多种环境中使用，包括浏览器、Node.js 和其他 JavaScript 环境。此外，它可以与多个前端框架和库 (如 NextJs、React、Vue.js、ProseMirror 等) 集成。
+
+**轻量级且可扩展:** &nbsp; RhineVar 是一个非常轻量的库，核心包仅几 KB，适合各种前端应用。其模块化架构也支持扩展特性，开发者可以根据需要引入或开发自定义模块。
+
+**去中心化架构:** &nbsp; 通过去中心化架构，使得协作编辑更具扩展性、更高效且更具容错能力。可通过 P2P 进行数据传输，无需依赖中央服务器（开发中）。
+
+**原生Yjs支持:** &nbsp; RhineVar 提供完好的Yjs原生对象操作支持，更底层更丰富的API支持。直接对Yjs的对象进行操作，也将自动触发 RhineVar 的更新。
+
+**更友好且完善的事件体系:** &nbsp; RhineVar 提供了丰富的事件订阅监听方式，直观的数据变更事件，更好的支持数据变更的监听和处理。以及提供了对内部深层数据变化的监听，以适用更多场景。
+
+<br/>
+
+## Contact Us
+
+欢迎加入我们的微信群一起讨论交流，我们期待更多的社区成员能加入到 RHINE-VAR 的创造中来！
+
+微信: [FNA-04]() (请备注来源)
+
+邮箱: [RhineAILab@gmail.com](rhineailab@gmail.com) & [RhineAI@163.com](RhineAI@163.com)
+
+<br/>
+
+## Install
+```bash
+yarn add rhine-var
+```
+如果你的电脑未安装`yarn`, 也可通过 `npm i rhine-var` 安装。或先用 `npm i -g yarn` 安装`yarn`，然后再用上方命令进行安装。
+
+<br/>
+
+## Usage
+
+```typescript jsx
+const defaultValue = {value: 0}
+const count = rhineProxy(defaultValue, 'localhost:6600/room-0')
+
+function Counter() {
+  
+  const countSnap = useRhine(count)
+  
+  return <div>
+    <button onClick={() => count.value-- }> - 1 </button>
+    <span>{countSnap.value}</span>
+    <button onClick={() => count.value++ }> + 1 </button>
+  </div>
+}
+```
+### Default Value
+
+当服务端无信息时，将使用 DefaultValue 作为默认内容。未连接到服务器时，也将根据默认值进行返回。
+
+### Room ID
+
+一个房间号对应一个状态变量, 加入到一个房间中的用户会参与到多人协同中。
+
+### rhineProxy
+
+用于创建一个 `RhineVariable` 他的值会和房间中的其他人共享并同步。
+
+你可以像操作 JavaScript 中的普通变量一样直接随意操作他。
+
+值的类型至少是 JavaScript 中的 object，但没有上限。它可以是一个非常复杂和庞大的 JSON 结构，以容纳大型项目的所有数据。
+
+### useRhine
+
+一个 `React` 的 `Hook` 函数. 他将为 `RhineVariable` 创建一个快照, 用于自动热重载更新页面。当任何人对值做出修改时，他会把最新的值立刻更新到所有人的屏幕上。
+
+只有页面需要数据的时候使用 `useRhine` 创造的快照。在其他操作，例如赋值时，请操作原来的 `RhineVariable`。
+
+<br/>
+
+## Server
+我们提供了一个简单的服务器例子，位于本项目中的 `/test/server` 处。 服务端完全兼容所有的 Yjs 的 Websocket 服务器，将来会支持更多。
+```
+git clone https://github.com/RhineAI-Lab/rhine-var.git
+cd test/server
+yarn install
+yarn start
+```
+默认运行在 `端口 6600`, 你可以通过连接 `ws://localhost:6600/<room-id>` 连接他，`<room-id>` 可以是任意文本，一个房间号对应一个 `RhineVariable`。
+
+更多服务端开发信息请参考: [https://docs.yjs.dev/ecosystem/connection-provider/y-websocket](https://docs.yjs.dev/ecosystem/connection-provider/y-websocket)
+
+<br/>
+
+## Develop
+
+```bash
+# 开始 typescript 自动构建更新
+yarn run watch
+
+# 开启临时服务端
+cd test/server
+yarn install
+yarn start
+
+# 开始 NextJS 的热环境调试测试项目
+cd test/debug/next-app
+yarn install
+yarn start
+# 浏览器访问 http://localhost:3000
+```
+
+<br/>

package/dist/core/class/array/RhineArray.d.ts

@@ -1,3 +1,4 @@
-export default class RhineArray<T> {
+import RhineVar from "../../proxy/RhineVar";
+export default class RhineArray<T> extends Array<T | RhineVar<T[]>> {
 }
 //# sourceMappingURL=RhineArray.d.ts.map

package/dist/core/class/array/RhineArray.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RhineArray.d.ts","sourceRoot":"","sources":["../../../../src/core/class/array/RhineArray.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC;CAEhC"}
+{"version":3,"file":"RhineArray.d.ts","sourceRoot":"","sources":["../../../../src/core/class/array/RhineArray.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,6BAA8B;AAE7C,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;CAElE"}

package/dist/core/class/array/RhineArray.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-class RhineArray {
+class RhineArray extends Array {
 }
 exports.default = RhineArray;

package/dist/core/class/array/RhineVarArray.d.ts

@@ -0,0 +1,4 @@
+import RhineVar from "../../proxy/RhineVar";
+export default class RhineVarArray<T> extends Array<T | RhineVar<T[]>> {
+}
+//# sourceMappingURL=RhineVarArray.d.ts.map

package/dist/core/class/array/RhineVarArray.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"RhineVarArray.d.ts","sourceRoot":"","sources":["../../../../src/core/class/array/RhineVarArray.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,6BAA8B;AAE7C,MAAM,CAAC,OAAO,OAAO,aAAa,CAAC,CAAC,CAAE,SAAQ,KAAK,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;CAErE"}

package/dist/core/class/array/RhineVarArray.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+class RhineVarArray extends Array {
+}
+exports.default = RhineVarArray;

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

@@ -16,6 +16,7 @@ export default class WebsocketRhineConnector {
     addSyncedListener(listener: SyncedListener): void;
     removeSyncedListener(listener: SyncedListener): void;
     emitSynced(synced: boolean): void;
+    afterSynced(callback: () => void): void;
     waitSynced(): Promise<void>;
     constructor(url?: string);
     bind(defaultValue: Native, overwrite?: boolean): any;

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

@@ -1 +1 @@
-{"version":3,"file":"WebsocketRhineConnector.d.ts","sourceRoot":"","sources":["../../../src/core/connector/WebsocketRhineConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,IAAI,IAAI,EAAmB,GAAG,IAAI,IAAI,EAAC,MAAM,KAAK,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,0BAAyC;AAEjE,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAE5C,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;AAEtD,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAE1C,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,eAAe,EAAE,cAAc,EAAE,CAAK;IACtC,iBAAiB,CAAC,QAAQ,EAAE,cAAc;IAG1C,oBAAoB,CAAC,QAAQ,EAAE,cAAc;IAG7C,UAAU,CAAC,MAAM,EAAE,OAAO;IAI1B,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;gBAcf,GAAG,SAAK;IAMpB,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,GAAE,OAAe;IAc/C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA4C1C;AAGD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,2BAMhD"}
+{"version":3,"file":"WebsocketRhineConnector.d.ts","sourceRoot":"","sources":["../../../src/core/connector/WebsocketRhineConnector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,IAAI,IAAI,EAAmB,GAAG,IAAI,IAAI,EAAC,MAAM,KAAK,CAAC;AAC9D,OAAO,EAAC,iBAAiB,EAAC,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAC,eAAe,EAAC,0BAAyC;AAEjE,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAE5C,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;AAEtD,MAAM,CAAC,OAAO,OAAO,uBAAuB;IAE1C,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,eAAe,EAAE,cAAc,EAAE,CAAK;IACtC,iBAAiB,CAAC,QAAQ,EAAE,cAAc;IAG1C,oBAAoB,CAAC,QAAQ,EAAE,cAAc;IAG7C,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;CA4C1C;AAGD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,2BAMhD"}

package/dist/core/connector/WebsocketRhineConnector.js

@@ -15,17 +15,23 @@ class WebsocketRhineConnector {
     emitSynced(synced) {
         this.syncedListeners.forEach(listener => listener(synced));
     }
-    waitSynced() {
-        return new Promise((resolve) => {
-            if (this.synced)
-                return true;
+    afterSynced(callback) {
+        if (this.synced) {
+            callback();
+        }
+        else {
             const listener = (synced) => {
                 if (synced) {
                     this.removeSyncedListener(listener);
-                    resolve();
+                    callback();
                 }
             };
             this.addSyncedListener(listener);
+        }
+    }
+    waitSynced() {
+        return new Promise((resolve) => {
+            this.afterSynced(resolve);
         });
     }
     constructor(url = '') {

package/dist/core/event/Callback.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Callback.d.ts","sourceRoot":"","sources":["../../../src/core/event/Callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,qBAAgC;AACnD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAExD,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CACxB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACjB,GAAG,EAAE,MAAM,CAAC,EACZ,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACpB,IAAI,EAAE,UAAU,EAChB,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAC9C,iBAAiB,EAAE,WAAW,KAC3B,IAAI,CAAA"}
+{"version":3,"file":"Callback.d.ts","sourceRoot":"","sources":["../../../src/core/event/Callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,qBAAgC;AACnD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAGxD,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CACxB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACjB,GAAG,EAAE,MAAM,CAAC,EACZ,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EACpB,IAAI,EAAE,UAAU,EAChB,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAC9C,iBAAiB,EAAE,WAAW,KAC3B,IAAI,CAAA"}

package/dist/core/native/NativeUtils.d.ts

@@ -1,6 +1,8 @@
 import { Native } from "./Native";
 export declare function isNative(value: any): boolean;
 export declare function nativeSet(target: Native, key: string | symbol, value: any): boolean;
+export declare function nativeHas(target: Native, key: string | symbol): boolean;
+export declare function nativeOwnKeys(target: Native): string[];
 export declare function nativeDelete(target: Native, key: string | symbol): boolean;
 export declare function nativeGet(target: Native, key: string | symbol): any | undefined;
 export declare function jsonToNative(data: any): Native | any;

package/dist/core/native/NativeUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeUtils.d.ts","sourceRoot":"","sources":["../../../src/core/native/NativeUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,iBAA6B;AAI5C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE5C;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAuBnF;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAwB1E;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,GAAG,SAAS,CAgB/E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,GAAG,CAgBpD"}
+{"version":3,"file":"NativeUtils.d.ts","sourceRoot":"","sources":["../../../src/core/native/NativeUtils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAC,iBAA6B;AAI5C,wBAAgB,QAAQ,CAAC,KAAK,EAAE,GAAG,GAAG,OAAO,CAE5C;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAuBnF;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAkBvE;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAYtD;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAwB1E;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,GAAG,SAAS,CAgB/E;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,GAAG,GAAG,CAgBpD"}

package/dist/core/native/NativeUtils.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNative = isNative;
 exports.nativeSet = nativeSet;
+exports.nativeHas = nativeHas;
+exports.nativeOwnKeys = nativeOwnKeys;
 exports.nativeDelete = nativeDelete;
 exports.nativeGet = nativeGet;
 exports.jsonToNative = jsonToNative;
@@ -35,6 +37,40 @@ function nativeSet(target, key, value) {
     }
     return false;
 }
+function nativeHas(target, key) {
+    if (typeof key !== 'string') {
+        return false;
+    }
+    try {
+        if (target instanceof yjs_1.Map) {
+            return target.has(key);
+        }
+        else if (target instanceof yjs_1.Array) {
+            const index = parseInt(key);
+            if (!isNaN(index)) {
+                return index < target.length && index >= 0;
+            }
+        }
+    }
+    catch (e) {
+        console.error('RhineVar nativeHas.error:', e);
+    }
+    return false;
+}
+function nativeOwnKeys(target) {
+    let keys = [];
+    if (target instanceof yjs_1.Map) {
+        target.forEach((value, key) => {
+            keys.push(key);
+        });
+    }
+    else if (target instanceof yjs_1.Array) {
+        for (let i = 0; i < target.length; i++) {
+            keys.push(String(i));
+        }
+    }
+    return keys;
+}
 function nativeDelete(target, key) {
     if (typeof key !== 'string') {
         return false;

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

@@ -2,5 +2,6 @@ import RhineVar from "./RhineVar";
 export type RecursiveCrossRhineVar<T> = {
     [K in keyof T]: T[K] extends object ? RecursiveCrossRhineVar<T[K]> & RhineVar<T[K]> : T[K];
 };
-export type ProxiedRhineVar<T> = T & RecursiveCrossRhineVar<T> & RhineVar<T>;
+export type StoredRhineVar<T> = T & RecursiveCrossRhineVar<T> & RhineVar<T>;
+export type ProxiedRhineVar<T> = StoredRhineVar<T>;
 //# sourceMappingURL=ProxiedRhineVar.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ProxiedRhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/ProxiedRhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,mBAA8B;AAE7C,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACrC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3F,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA"}
+{"version":3,"file":"ProxiedRhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/ProxiedRhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,mBAA8B;AAE7C,MAAM,MAAM,sBAAsB,CAAC,CAAC,IAAI;KACrC,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAC3F,CAAA;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;AAE3E,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAA"}

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

@@ -1,6 +1,8 @@
 import WebsocketRhineConnector from "../connector/WebsocketRhineConnector";
 import { ProxiedRhineVar } from "./ProxiedRhineVar";
 import { Native } from "../native/Native";
-export declare function rhineProxy<T extends object>(data: T, connector?: WebsocketRhineConnector | string | null, overwrite?: boolean): ProxiedRhineVar<T>;
+export declare const PROTOCOL_LIST: string[];
+export declare const DEFAULT_PROTOCOL_LIST: string;
+export declare function rhineProxy<T extends object>(data: T, connector?: WebsocketRhineConnector | string | null, overwrite?: boolean | number): ProxiedRhineVar<T>;
 export declare function rhineProxyNative<T extends object>(target: Native): 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,uBAAgD,6CAAiD;AAKxG,OAAO,EAAC,eAAe,EAAC,0BAAqC;AAC7D,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAM5C,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,IAAI,EAAE,CAAC,EACP,SAAS,GAAE,uBAAuB,GAAG,MAAM,GAAG,IAAW,EACzD,SAAS,GAAE,OAAe,GACzB,eAAe,CAAC,CAAC,CAAC,CA6CpB;AAGD,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CA8DrF"}
+{"version":3,"file":"Proxy.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/Proxy.ts"],"names":[],"mappings":"AACA,OAAO,uBAAgD,6CAAiD;AAKxG,OAAO,EAAC,eAAe,EAAC,0BAAqC;AAC7D,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAY5C,eAAO,MAAM,aAAa,UAAsB,CAAA;AAChD,eAAO,MAAM,qBAAqB,QAAmB,CAAA;AAGrD,wBAAgB,UAAU,CAAC,CAAC,SAAS,MAAM,EACzC,IAAI,EAAE,CAAC,EACP,SAAS,GAAE,uBAAuB,GAAG,MAAM,GAAG,IAAW,EACzD,SAAS,GAAE,OAAO,GAAG,MAAc,GAClC,eAAe,CAAC,CAAC,CAAC,CA6CpB;AAGD,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,CAoErF"}

package/dist/core/proxy/Proxy.js

@@ -23,6 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_PROTOCOL_LIST = exports.PROTOCOL_LIST = void 0;
 exports.rhineProxy = rhineProxy;
 exports.rhineProxyNative = rhineProxyNative;
 const yjs_1 = require("yjs");
@@ -32,17 +33,18 @@ const DataUtils_1 = require("../utils/DataUtils");
 const Logger_1 = require("../utils/Logger");
 const ConvertProperty_1 = require("../utils/ConvertProperty");
 const NativeUtils_1 = require("../native/NativeUtils");
-const DirectKey_1 = require("./DirectKey");
+exports.PROTOCOL_LIST = ['ws://', "wss://"];
+exports.DEFAULT_PROTOCOL_LIST = exports.PROTOCOL_LIST[0];
 function rhineProxy(data, connector = null, overwrite = false) {
     let target = (0, NativeUtils_1.jsonToNative)(data);
     if (connector) {
         if (typeof connector === 'string') {
-            if (!connector.startsWith('ws://') && !connector.startsWith('wss://')) {
-                connector = 'wss://' + connector;
+            if (exports.PROTOCOL_LIST.every(protocol => !connector.startsWith(protocol))) {
+                connector = exports.DEFAULT_PROTOCOL_LIST + connector;
             }
             connector = (0, WebsocketRhineConnector_1.websocketRhineConnect)(connector);
         }
-        target = connector.bind(target, overwrite);
+        target = connector.bind(target, Boolean(overwrite));
     }
     connector = connector;
     const object = rhineProxyNative(target);
@@ -54,7 +56,7 @@ function rhineProxy(data, connector = null, overwrite = false) {
                 if (!overwrite && connector.yBaseMap.has(WebsocketRhineConnector_1.default.STATE_KEY)) {
                     syncedValue = connector.yBaseMap.get(WebsocketRhineConnector_1.default.STATE_KEY);
                     object.native.forEach((value, key) => {
-                        Reflect.deleteProperty(object, (0, DirectKey_1.directKey)(key));
+                        Reflect.deleteProperty(object.origin, key);
                     });
                     object.unobserve();
                     object.native = syncedValue;
@@ -62,7 +64,7 @@ function rhineProxy(data, connector = null, overwrite = false) {
                     (0, Logger_1.log)('Proxy.synced: Update synced native');
                     syncedValue.forEach((value, key) => {
                         if ((0, NativeUtils_1.isNative)(value)) {
-                            Reflect.set(object, (0, DirectKey_1.directKey)(key), rhineProxyNative(value));
+                            Reflect.set(object.origin, key, rhineProxyNative(value));
                         }
                     });
                 }
@@ -85,9 +87,7 @@ function rhineProxyNative(target) {
     });
     const handler = {
         get(proxy, p, receiver) {
-            if ((0, DirectKey_1.isDirectKey)(p))
-                return Reflect.get(object, (0, DirectKey_1.originKey)(p), receiver);
-            if (RhineVar_1.RHINE_VAR_KEYS.has(p))
+            if (RhineVar_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
                 return Reflect.get(object, p, receiver);
             (0, Logger_1.log)('Proxy.handler.get:', p, '\n', object, receiver);
             if (p in object)
@@ -97,7 +97,7 @@ function rhineProxyNative(target) {
                 return result;
             if (object.native instanceof yjs_1.Array) {
                 if (typeof p === 'string') {
-                    const f = (0, ConvertProperty_1.convertArrayProperty)(object.native, p, object);
+                    const f = (0, ConvertProperty_1.convertArrayProperty)(p, object.native, object);
                     if (f)
                         return f;
                 }
@@ -105,9 +105,7 @@ function rhineProxyNative(target) {
             return undefined;
         },
         set(proxy, p, value, receiver) {
-            if ((0, DirectKey_1.isDirectKey)(p))
-                return Reflect.set(object, (0, DirectKey_1.originKey)(p), value.data, receiver);
-            if (RhineVar_1.RHINE_VAR_KEYS.has(p))
+            if (RhineVar_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
                 return Reflect.set(object, p, value, receiver);
             (0, Logger_1.log)('Proxy.handler.set:', p, 'to', value, '\n', object, receiver);
             value = (0, DataUtils_1.ensureRhineVar)(value);
@@ -123,16 +121,22 @@ function rhineProxyNative(target) {
             return result;
         },
         deleteProperty(proxy, p) {
-            if ((0, DirectKey_1.isDirectKey)(p))
-                return Reflect.deleteProperty(object, (0, DirectKey_1.originKey)(p));
-            if (RhineVar_1.RHINE_VAR_KEYS.has(p))
+            if (RhineVar_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
                 return false;
             (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');
             return result;
-        }
+        },
+        has(proxy, p) {
+            if (RhineVar_1.RHINE_VAR_PREDEFINED_PROPERTIES.has(p))
+                return false;
+            return (0, NativeUtils_1.nativeHas)(object.native, p);
+        },
+        ownKeys(proxy) {
+            return (0, NativeUtils_1.nativeOwnKeys)(object.native);
+        },
     };
     object.observe();
     return new Proxy(object, handler);

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

@@ -3,21 +3,28 @@ import WebsocketRhineConnector from "../connector/WebsocketRhineConnector";
 import { Native } from "../native/Native";
 import { ChangeType } from "../event/ChangeType";
 import { Callback } from "../event/Callback";
+import { StoredRhineVar } from "./ProxiedRhineVar";
 export default class RhineVar<T> {
     native: Native;
-    constructor(native: Native);
+    origin: StoredRhineVar<T>;
+    constructor(native: Native, origin?: StoredRhineVar<T>);
     connector: WebsocketRhineConnector | null;
     json(): T;
+    toString(): string;
+    afterSynced(callback: () => void): void;
+    waitSynced(): Promise<void>;
     private listeners;
     subscribe(callback: Callback<T>): () => void;
     unsubscribe(callback: Callback<T>): void;
+    unsubscribeAll(): void;
     private keyListeners;
     subscribeKey(key: keyof T, callback: Callback<T>): () => void;
     unsubscribeKey(callback: Callback<T>): void;
+    unsubscribeAllKey(): void;
     emit(value: T[keyof T], key: keyof T, oldValue: T[keyof T], type: ChangeType, nativeEvent: YMapEvent<any> | YArrayEvent<any>, nativeTransaction: Transaction): void;
     observer: (event: YMapEvent<any> | YArrayEvent<any>, transaction: Transaction) => void;
     observe(): void;
     unobserve(): void;
 }
-export declare const RHINE_VAR_KEYS: Set<string | symbol>;
+export declare const RHINE_VAR_PREDEFINED_PROPERTIES: Set<string | symbol>;
 //# sourceMappingURL=RhineVar.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"RhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/RhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAEtF,OAAO,uBAAuB,6CAAiD;AAG/E,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAC5C,OAAO,EAAC,UAAU,EAAC,4BAAgC;AACnD,OAAO,EAAC,QAAQ,EAAC,0BAA8B;AAG/C,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC;IAGpB,MAAM,EAAE,MAAM;gBAAd,MAAM,EAAE,MAAM;IAGvB,SAAS,EAAE,uBAAuB,GAAG,IAAI,CAAO;IAEzC,IAAI,IAAI,CAAC;IAIhB,OAAO,CAAC,SAAS,CAAoB;IACrC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,IAAI;IAI5C,WAAW,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAIjC,OAAO,CAAC,YAAY,CAAyC;IAC7D,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;IAMpC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW;IAO5J,QAAQ,UAAW,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,WAAW,UAAO;IAGrF,OAAO;IA+BP,SAAS;CAMV;AAED,eAAO,MAAM,cAAc,sBAczB,CAAA"}
+{"version":3,"file":"RhineVar.d.ts","sourceRoot":"","sources":["../../../src/core/proxy/RhineVar.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,WAAW,EAAE,WAAW,EAAE,SAAS,EAAC,MAAM,KAAK,CAAC;AAEtF,OAAO,uBAAuB,6CAAiD;AAG/E,OAAO,EAAC,MAAM,EAAC,yBAA6B;AAC5C,OAAO,EAAC,UAAU,EAAC,4BAAgC;AACnD,OAAO,EAAC,QAAQ,EAAC,0BAA8B;AAC/C,OAAO,EAAC,cAAc,EAAC,0BAAqC;AAG5D,MAAM,CAAC,OAAO,OAAO,QAAQ,CAAC,CAAC;IAGpB,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;gBADzB,MAAM,EAAE,MAAM,EACd,MAAM,GAAE,cAAc,CAAC,CAAC,CAAe;IAGhD,SAAS,EAAE,uBAAuB,GAAG,IAAI,CAAO;IAEhD,IAAI,IAAI,CAAC;IAIT,QAAQ;IAIR,WAAW,CAAC,QAAQ,EAAE,MAAM,IAAI;IAK1B,UAAU;IAMhB,OAAO,CAAC,SAAS,CAAoB;IACrC,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,YAAY,CAAyC;IAC7D,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,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,EAAE,iBAAiB,EAAE,WAAW;IAO5J,QAAQ,UAAW,SAAS,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,WAAW,UAAO;IAGrF,OAAO;IA+BP,SAAS;CAKV;AAED,eAAO,MAAM,+BAA+B,sBAuB1C,CAAA"}

package/dist/core/proxy/RhineVar.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RHINE_VAR_KEYS = void 0;
+exports.RHINE_VAR_PREDEFINED_PROPERTIES = void 0;
 const yjs_1 = require("yjs");
 const Proxy_1 = require("./Proxy");
 const Logger_1 = require("../utils/Logger");
 const DataUtils_1 = require("../utils/DataUtils");
 const ChangeType_1 = require("../event/ChangeType");
 class RhineVar {
-    constructor(native) {
+    constructor(native, origin = this) {
         this.native = native;
+        this.origin = origin;
         this.connector = null;
         this.listeners = [];
         this.keyListeners = new Map();
@@ -17,6 +18,19 @@ class RhineVar {
     json() {
         return this.native.toJSON();
     }
+    toString() {
+        return String(this.json());
+    }
+    afterSynced(callback) {
+        if (this.connector) {
+            this.connector.afterSynced(callback);
+        }
+    }
+    async waitSynced() {
+        if (this.connector) {
+            await this.connector.waitSynced();
+        }
+    }
     subscribe(callback) {
         this.listeners.push(callback);
         return () => this.unsubscribe(callback);
@@ -24,6 +38,9 @@ class RhineVar {
     unsubscribe(callback) {
         this.listeners = this.listeners.filter(listener => listener !== callback);
     }
+    unsubscribeAll() {
+        this.listeners = [];
+    }
     subscribeKey(key, callback) {
         if (!this.keyListeners.has(key)) {
             this.keyListeners.set(key, []);
@@ -36,6 +53,9 @@ class RhineVar {
             this.keyListeners.set(key, listeners.filter(listener => listener !== callback));
         });
     }
+    unsubscribeAllKey() {
+        this.keyListeners = new Map();
+    }
     emit(value, key, oldValue, type, nativeEvent, nativeTransaction) {
         this.listeners.forEach(listener => listener(value, key, oldValue, type, nativeEvent, nativeTransaction));
         if (this.keyListeners.has(key)) {
@@ -81,18 +101,24 @@ class RhineVar {
     }
 }
 exports.default = RhineVar;
-exports.RHINE_VAR_KEYS = new Set([
+exports.RHINE_VAR_PREDEFINED_PROPERTIES = new Set([
+    'origin',
     'native',
+    'connector',
     'json',
+    'toString',
+    'afterSynced',
+    'waitSynced',
     'listeners',
     'subscribe',
     'unsubscribe',
+    'unsubscribeAll',
     'keyListeners',
     'subscribeKey',
     'unsubscribeKey',
+    'unsubscribeAllKey',
     'emit',
     'observer',
     'observe',
     'unobserve',
-    'connector',
 ]);

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

@@ -1,4 +1,21 @@
 import { Array as YArray } from "yjs";
 import RhineVar from "../proxy/RhineVar";
-export declare function convertArrayProperty<T>(target: YArray<T>, name: string, object: RhineVar<T>): number | ((item: T | RhineVar<T>) => void) | ((...items: T[]) => number) | ((start: number, deleteCount: number, ...items: T[]) => T[]) | ((callback: (value: T, index: number, arr: YArray<any>) => void) => void) | ((item: T) => boolean) | undefined;
+/**
+ * 提供类似于JS原生Array的函数 通过函数名 返回同时用于操作YArray和RhineVar的模拟函数
+ *
+ * @param name 函数名/属性名
+ * @param target 目标YArray
+ * @param object 目标RhineVar
+ *
+ *
+ * 添加元素类型: push
+ * 若输入元素未经过代理将自动代理 若输入元素为Native类型将Native代理
+ *
+ * 删除元素并返回类型: pop shift
+ * 从Native和RhineVar中删除对应元素 返回该元素 因该元素已不存在于RhineVar中 所以会自动转为json
+ *
+ */
+export declare function convertArrayProperty<T>(name: string, target: YArray<any>, object: RhineVar<T>): number | ((...items: (T[keyof T] | RhineVar<T[keyof T]>)[]) => number) | ((start: number, deleteCount: number, ...items: (T[keyof T] | RhineVar<T[keyof T]>)[]) => any[]) | ((callback: (value: T[keyof T], index: number, arr: YArray<any>) => void) => void) | (<R>(callback: (value: T, index: number, arr: YArray<any>) => R) => R[]) | ((item: T[keyof T]) => number) | ((item: T[keyof T]) => boolean) | ((i: number) => T[keyof T]) | ((i: number, value: T[keyof T]) => RhineVar<T>) | ((str?: string) => string) | ((callback: (item: T[keyof T]) => boolean) => T[keyof T][]) | ((callback: (item: T[keyof T]) => boolean) => boolean) | ((callback: (item: T[keyof T]) => boolean) => T[keyof T] | undefined) | ((callback: (item: T[keyof T]) => boolean) => number) | undefined;
+export declare const RHINE_VAR_ARRAY_SUPPORTED_PROPERTIES: Set<string | symbol>;
+export declare const RHINE_VAR_ARRAY_UNSUPPORTED_PROPERTIES: Set<string | symbol>;
 //# sourceMappingURL=ConvertProperty.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"ConvertProperty.d.ts","sourceRoot":"","sources":["../../../src/core/utils/ConvertProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,IAAI,MAAM,EAAC,MAAM,KAAK,CAAC;AACpC,OAAO,QAAQ,0BAA8B;AAK7C,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,oBAI1E,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAG,IAAI,gBAyBlB,CAAC,EAAE,wBASN,MAAM,eAAe,MAAM,YAAY,CAAC,EAAE,wBASvC,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,qBAevD,CAAC,0BAOlB"}
+{"version":3,"file":"ConvertProperty.d.ts","sourceRoot":"","sources":["../../../src/core/utils/ConvertProperty.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,IAAI,MAAM,EAAC,MAAM,KAAK,CAAC;AACpC,OAAO,QAAQ,0BAA8B;AAK7C;;;;;;;;;;;;;;GAcG;AAEH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,wBAaxE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,KAAG,MAAM,aAmDjD,MAAM,eAAe,MAAM,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,0BAgBzE,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,eAMtE,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,oBAQvD,CAAC,CAAC,MAAM,CAAC,CAAC,uBAOV,CAAC,CAAC,MAAM,CAAC,CAAC,qBAOb,MAAM,KAAG,CAAC,CAAC,MAAM,CAAC,CAAC,SAMnB,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,KAAG,QAAQ,CAAC,CAAC,CAAC,YAMrC,MAAM,KAAS,MAAM,gBAchB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,OAAO,KAAG,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,gBAS5C,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,OAAO,KAAG,OAAO,gBAcvC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,OAAO,KAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,gBAQtD,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,OAAO,KAAG,MAAM,cA0E3D;AAED,eAAO,MAAM,oCAAoC,sBAyB/C,CAAA;AAEF,eAAO,MAAM,sCAAsC,sBAYjD,CAAA"}

package/dist/core/utils/ConvertProperty.js

@@ -1,29 +1,49 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RHINE_VAR_ARRAY_UNSUPPORTED_PROPERTIES = exports.RHINE_VAR_ARRAY_SUPPORTED_PROPERTIES = void 0;
 exports.convertArrayProperty = convertArrayProperty;
-const RhineVar_1 = __importDefault(require("../proxy/RhineVar"));
 const DataUtils_1 = require("./DataUtils");
 const NativeUtils_1 = require("../native/NativeUtils");
-function convertArrayProperty(target, name, object) {
+/**
+ * 提供类似于JS原生Array的函数 通过函数名 返回同时用于操作YArray和RhineVar的模拟函数
+ *
+ * @param name 函数名/属性名
+ * @param target 目标YArray
+ * @param object 目标RhineVar
+ *
+ *
+ * 添加元素类型: push
+ * 若输入元素未经过代理将自动代理 若输入元素为Native类型将Native代理
+ *
+ * 删除元素并返回类型: pop shift
+ * 从Native和RhineVar中删除对应元素 返回该元素 因该元素已不存在于RhineVar中 所以会自动转为json
+ *
+ */
+function convertArrayProperty(name, target, object) {
+    const get = (i) => {
+        if (i in object) {
+            return Reflect.get(object, i);
+        }
+        else {
+            return target.get(i);
+        }
+    };
     if (name === 'length') {
         return target.length;
     }
     if (name === 'push') {
-        return (item) => {
-            item = (0, DataUtils_1.ensureRhineVar)(item);
-            if (item instanceof RhineVar_1.default) {
-                target.push([item.native]);
-            }
-            else {
-                target.push([item]);
+        return (...items) => {
+            for (let i = 0; i < items.length; i++) {
+                items[i] = (0, DataUtils_1.ensureNative)(items[i]);
             }
+            target.push(items);
+            return target.length;
         };
     }
     else if (name === 'pop') {
         return () => {
+            if (target.length === 0)
+                return undefined;
             let key = target.length - 1;
             let item = target.get(key);
             target.delete(key);
@@ -33,29 +53,59 @@ function convertArrayProperty(target, name, object) {
             return item;
         };
     }
-    else if (name === 'shift') {
-        return () => {
-            let item = target.get(0);
-            target.delete(0);
-            return item;
-        };
-    }
     else if (name === 'unshift') {
         return (...items) => {
+            for (let i = 0; i < items.length; i++) {
+                items[i] = (0, DataUtils_1.ensureNative)(items[i]);
+            }
             target.unshift(items);
             return target.length;
         };
     }
+    else if (name === 'shift') {
+        return () => {
+            if (target.length === 0)
+                return undefined;
+            let key = 0;
+            let item = target.get(key);
+            target.delete(key);
+            if ((0, NativeUtils_1.isNative)(item)) {
+                return item.toJSON();
+            }
+            return item;
+        };
+    }
     else if (name === 'slice') {
         return (start, end) => {
-            return target.slice(start, end);
+            if (end === undefined)
+                end = target.length;
+            if (start < 0)
+                start = target.length + start;
+            if (end < 0)
+                end = target.length + end;
+            if (start < 0)
+                start = 0;
+            if (end > target.length)
+                end = target.length;
+            let result = [];
+            for (let i = start; i < end; i++) {
+                result.push(get(i));
+            }
+            return result;
         };
     }
     else if (name === 'splice') {
         return (start, deleteCount, ...items) => {
-            const removed = target.slice(start, start + deleteCount);
+            const removed = [];
+            for (let i = start; i < start + deleteCount; i++) {
+                let item = target.get(i);
+                removed.push((0, NativeUtils_1.isNative)(item) ? item.toJSON() : item);
+            }
             target.delete(start, deleteCount);
             if (items.length > 0) {
+                for (let i = 0; i < items.length; i++) {
+                    items[i] = (0, DataUtils_1.ensureNative)(items[i]);
+                }
                 target.insert(start, items);
             }
             return removed;
@@ -63,18 +113,24 @@ function convertArrayProperty(target, name, object) {
     }
     else if (name === 'forEach') {
         return (callback) => {
-            return target.forEach(callback);
+            return target.forEach((yValue, yIndex, yArray) => {
+                callback(get(yIndex), yIndex, yArray);
+            });
         };
     }
     else if (name === 'map') {
         return (callback) => {
-            return target.map(callback);
+            const result = [];
+            target.forEach((yValue, yIndex, yArray) => {
+                result.push(callback(get(yIndex), yIndex, yArray));
+            });
+            return result;
         };
     }
     else if (name === 'indexOf') {
         return (item) => {
             for (let i = 0; i < target.length; i++) {
-                if (target.get(i) === item)
+                if (get(i) === item)
                     return i;
             }
             return -1;
@@ -83,10 +139,210 @@ function convertArrayProperty(target, name, object) {
     else if (name === 'includes') {
         return (item) => {
             for (let i = 0; i < target.length; i++) {
-                if (target.get(i) === item)
+                if (get(i) === item)
                     return true;
             }
             return false;
         };
     }
+    else if (name === 'at') {
+        return (i) => {
+            if (i < 0)
+                i = target.length + i;
+            if (i < 0 || i >= target.length)
+                return undefined;
+            return get(i);
+        };
+    }
+    else if (name === 'with') {
+        return (i, value) => {
+            if (i < 0)
+                i = target.length + i;
+            if (i < 0 || i >= target.length)
+                throw 'RangeError: Unexpect index ' + i + ' in RhineVarArray(' + target.length + ')';
+            return object;
+        };
+    }
+    else if (name === 'join') {
+        return (str = ',') => {
+            let result = '';
+            for (let i = 0; i < target.length; i++) {
+                if (i > 0)
+                    result += str;
+                let item = target.get(i);
+                if ((0, NativeUtils_1.isNative)(item)) {
+                    result += item.toJSON();
+                }
+                else {
+                    result += item;
+                }
+            }
+            return result;
+        };
+    }
+    else if (name === 'filter') {
+        return (callback) => {
+            let result = [];
+            for (let i = 0; i < target.length; i++) {
+                let item = get(i);
+                if (callback(item))
+                    result.push(item);
+            }
+            return result;
+        };
+    }
+    else if (name === 'some') {
+        return (callback) => {
+            for (let i = 0; i < target.length; i++) {
+                if (callback(get(i)))
+                    return true;
+            }
+            return false;
+        };
+    }
+    else if (name === 'every') {
+        return (callback) => {
+            for (let i = 0; i < target.length; i++) {
+                if (!callback(get(i)))
+                    return false;
+            }
+            return true;
+        };
+    }
+    else if (name === 'find') {
+        return (callback) => {
+            for (let i = 0; i < target.length; i++) {
+                let item = get(i);
+                if (callback(item))
+                    return item;
+            }
+            return undefined;
+        };
+    }
+    else if (name === 'findIndex') {
+        return (callback) => {
+            for (let i = 0; i < target.length; i++) {
+                if (callback(get(i)))
+                    return i;
+            }
+            return -1;
+        };
+    }
+    else if (name === 'findLast') {
+        return (callback) => {
+            for (let i = target.length - 1; i >= 0; i--) {
+                let item = get(i);
+                if (callback(item))
+                    return item;
+            }
+            return undefined;
+        };
+    }
+    else if (name === 'findLastIndex') {
+        return (callback) => {
+            for (let i = target.length - 1; i >= 0; i--) {
+                if (callback(get(i)))
+                    return i;
+            }
+            return -1;
+        };
+    }
+    else if (name === 'entries') {
+        return () => {
+            let i = 0;
+            return {
+                next() {
+                    if (i < target.length) {
+                        return { value: [i, get(i++)], done: false };
+                    }
+                    else {
+                        return { value: undefined, done: true };
+                    }
+                },
+                [Symbol.iterator]() {
+                    return this;
+                }
+            };
+        };
+    }
+    else if (name === 'keys') {
+        return () => {
+            let i = 0;
+            return {
+                next() {
+                    if (i < target.length) {
+                        return { value: i++, done: false };
+                    }
+                    else {
+                        return { value: undefined, done: true };
+                    }
+                },
+                [Symbol.iterator]() {
+                    return this;
+                },
+            };
+        };
+    }
+    else if (name === 'values') {
+        return () => {
+            let i = 0;
+            return {
+                next() {
+                    if (i < target.length) {
+                        return { value: get(i++), done: false };
+                    }
+                    else {
+                        return { value: undefined, done: true };
+                    }
+                },
+                [Symbol.iterator]() {
+                    return this;
+                },
+            };
+        };
+    }
+    else if (exports.RHINE_VAR_ARRAY_UNSUPPORTED_PROPERTIES.has(name)) {
+        return () => {
+            console.error('Unsupported method "' + name + '" in RhineVarArray. Please call json() to convert to a native JS Array object before proceeding.');
+        };
+    }
 }
+exports.RHINE_VAR_ARRAY_SUPPORTED_PROPERTIES = new Set([
+    'length',
+    'push',
+    'pop',
+    'unshift',
+    'shift',
+    'slice',
+    'splice',
+    'forEach',
+    'map',
+    'indexOf',
+    'includes',
+    'at',
+    'with',
+    'join',
+    'filter',
+    'some',
+    'every',
+    'find',
+    'findIndex',
+    'findLast',
+    'findLastIndex',
+    'entries',
+    'keys',
+    'values',
+]);
+exports.RHINE_VAR_ARRAY_UNSUPPORTED_PROPERTIES = new Set([
+    'contact',
+    'copyWithin',
+    'flat',
+    'flatMap',
+    'reduce',
+    'reduceRight',
+    'reverse',
+    'sort',
+    'toReversed',
+    'toSorted',
+    'toSpliced',
+]);

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

@@ -1,7 +1,9 @@
-import { ProxiedRhineVar } from "../proxy/ProxiedRhineVar";
+import { StoredRhineVar } from "../proxy/ProxiedRhineVar";
+import RhineVar from "../proxy/RhineVar";
 import { Native } from "../native/Native";
 export declare function isObject(value: any): boolean;
 export declare function isArray(value: any): value is any[];
 export declare function isObjectOrArray(value: any): boolean;
-export declare function ensureRhineVar<T>(value: T | Native): ProxiedRhineVar<T> | any;
+export declare function ensureRhineVar<T>(value: T | Native): StoredRhineVar<T> | any;
+export declare function ensureNative<T>(value: T | RhineVar<T>): Native | any;
 //# sourceMappingURL=DataUtils.d.ts.map

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,eAAe,EAAC,iCAAqC;AAI7D,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,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,GAAG,CAU7E"}
+{"version":3,"file":"DataUtils.d.ts","sourceRoot":"","sources":["../../../src/core/utils/DataUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,iCAAqC;AAE5D,OAAO,QAAQ,0BAA8B;AAE7C,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,GAAG,cAAc,CAAC,CAAC,CAAC,GAAG,GAAG,CAU5E;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,GAAG,CAQpE"}

package/dist/core/utils/DataUtils.js

@@ -7,6 +7,7 @@ exports.isObject = isObject;
 exports.isArray = isArray;
 exports.isObjectOrArray = isObjectOrArray;
 exports.ensureRhineVar = ensureRhineVar;
+exports.ensureNative = ensureNative;
 const NativeUtils_1 = require("../native/NativeUtils");
 const RhineVar_1 = __importDefault(require("../proxy/RhineVar"));
 const Proxy_1 = require("../proxy/Proxy");
@@ -30,3 +31,12 @@ function ensureRhineVar(value) {
     }
     return value;
 }
+function ensureNative(value) {
+    if (value instanceof RhineVar_1.default) {
+        return value.native;
+    }
+    if (isObjectOrArray(value)) {
+        return (0, NativeUtils_1.jsonToNative)(value);
+    }
+    return value;
+}

package/dist/index.d.ts

@@ -1,9 +1,8 @@
 import { rhineProxy, rhineProxyNative } from "./core/proxy/Proxy";
 import RhineVar from "./core/proxy/RhineVar";
-import { ProxiedRhineVar, RecursiveCrossRhineVar } from "./core/proxy/ProxiedRhineVar";
-import DirectPackage from "./core/proxy/DirectKey";
+import { StoredRhineVar, ProxiedRhineVar, RecursiveCrossRhineVar } from "./core/proxy/ProxiedRhineVar";
 import WebsocketRhineConnector from "./core/connector/WebsocketRhineConnector";
 import useRhine from "./react/hooks/useRhine";
 import useSynced from "./react/hooks/useSynced";
-export { WebsocketRhineConnector, rhineProxy, rhineProxyNative, RhineVar, ProxiedRhineVar, RecursiveCrossRhineVar, DirectPackage, useRhine, useSynced, };
+export { WebsocketRhineConnector, rhineProxy, rhineProxyNative, RhineVar, StoredRhineVar, ProxiedRhineVar, RecursiveCrossRhineVar, 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,gBAAgB,EAAC,2BAA2B;AAChE,OAAO,QAAQ,8BAA8B;AAC7C,OAAO,EAAC,eAAe,EAAE,sBAAsB,EAAC,qCAAqC;AACrF,OAAO,aAAa,+BAA+B;AACnD,OAAO,uBAAuB,iDAAiD;AAC/E,OAAO,QAAQ,+BAA8B;AAC7C,OAAO,SAAS,gCAA+B;AAE/C,OAAO,EACL,uBAAuB,EACvB,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,sBAAsB,EACtB,aAAa,EACb,QAAQ,EACR,SAAS,GACV,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,gBAAgB,EAAC,2BAA2B;AAChE,OAAO,QAAQ,8BAA8B;AAC7C,OAAO,EAAC,cAAc,EAAE,eAAe,EAAE,sBAAsB,EAAC,qCAAqC;AACrG,OAAO,uBAAuB,iDAAiD;AAC/E,OAAO,QAAQ,+BAA8B;AAC7C,OAAO,SAAS,gCAA+B;AAE/C,OAAO,EACL,uBAAuB,EACvB,UAAU,EACV,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACd,eAAe,EACf,sBAAsB,EACtB,QAAQ,EACR,SAAS,GACV,CAAA"}

package/dist/index.js

@@ -3,14 +3,12 @@ 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.DirectPackage = exports.RhineVar = exports.rhineProxyNative = exports.rhineProxy = exports.WebsocketRhineConnector = void 0;
+exports.useSynced = exports.useRhine = exports.RhineVar = exports.rhineProxyNative = exports.rhineProxy = exports.WebsocketRhineConnector = void 0;
 const Proxy_1 = require("./core/proxy/Proxy");
 Object.defineProperty(exports, "rhineProxy", { enumerable: true, get: function () { return Proxy_1.rhineProxy; } });
 Object.defineProperty(exports, "rhineProxyNative", { enumerable: true, get: function () { return Proxy_1.rhineProxyNative; } });
 const RhineVar_1 = __importDefault(require("./core/proxy/RhineVar"));
 exports.RhineVar = RhineVar_1.default;
-const DirectKey_1 = __importDefault(require("./core/proxy/DirectKey"));
-exports.DirectPackage = DirectKey_1.default;
 const WebsocketRhineConnector_1 = __importDefault(require("./core/connector/WebsocketRhineConnector"));
 exports.WebsocketRhineConnector = WebsocketRhineConnector_1.default;
 const useRhine_1 = __importDefault(require("./react/hooks/useRhine"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rhine-var",
-  "version": "0.2.0",
+  "version": "0.3.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",