@symbo.ls/sdk 3.1.1 → 3.1.2

package/dist/node/services/SocketIOService.js

@@ -34,7 +34,7 @@ class SocketService extends BaseService {
   init() {
     try {
       const { _context, _options } = this;
-      const socketUrl = environment.socketUrl || _options.socketUrl || "https://socket.symbols.app/";
+      const socketUrl = environment.socketUrl || _options.socketUrl;
       if (!socketUrl) {
         throw new Error("Socket URL is required");
       }
@@ -71,6 +71,9 @@ class SocketService extends BaseService {
         userId: (_e = _context.user) == null ? void 0 : _e.id,
         socketUrl: this._info.config.url,
         location: window.location.host,
+        // onConnect: () => {
+        //   console.log('waz')
+        // },
         onChange: this._handleMessage.bind(this),
         sessionId: this._sessionId,
         usersName: (_f = _context.user) == null ? void 0 : _f.name,
@@ -112,7 +115,7 @@ class SocketService extends BaseService {
     send.call(
       this._socket,
       type,
-      opts.preventDeepStringify ? payload : deepStringify(payload)
+      opts.useDeepStringify ? deepStringify(payload) : payload
     );
   }
   _handleMessage(event, data) {
@@ -143,38 +146,27 @@ class SocketService extends BaseService {
     }
   }
   _handleChangeEvent(data) {
-    var _a, _b, _c;
-    if (data.canvas) {
-      const { clients } = data.canvas;
-      const [firstClientKey] = Object.keys(clients);
-      const monaco = clients && clients[firstClientKey] && clients[firstClientKey].monaco;
-      if (monaco) {
-        const Canvas = this._context.element && this._context.element.getCanvas();
-        if (Canvas) {
-          Canvas.Chosen.EditorPanels.update({}, { forceMonacoUpdate: true });
-        }
-      }
-      return;
-    }
-    const componentUpdates = ((_a = data.schema) == null ? void 0 : _a.components) || ((_b = data.schema) == null ? void 0 : _b.pages);
-    if (window.location.pathname.includes("/canvas") && componentUpdates) {
-      for (const updatedComponent in componentUpdates) {
-        if (Object.hasOwn(componentUpdates, updatedComponent)) {
-          (_c = this._context.element) == null ? void 0 : _c.updateComponentOnCanvas(updatedComponent);
-        }
-      }
+    const { type, changes, version } = data;
+    if (version) this._context.state.version = version;
+    if (changes) {
+      window.requestAnimationFrame(async () => {
+        await this._context.state.setPathCollection(changes, {
+          preventReplace: type === "canvas",
+          preventUpdate: true,
+          fromSocket: true,
+          userId: data.userId,
+          changes
+        });
+      });
     }
   }
   _handleClientsEvent(data) {
-    const { root } = Object.getPrototypeOf(this._context.state);
+    const { root } = this._context.state;
     root.replace(
       { clients: data },
       {
-        fromSync: true,
-        preventUpdate: ["Iframe"],
-        preventModalUpdate: true,
-        preventStateUpdateListener: true,
-        execStateFunction: true
+        fromSocket: true,
+        preventUpdate: true
       }
     );
   }
@@ -191,9 +183,9 @@ class SocketService extends BaseService {
           element.__ref.root,
           {},
           {
-            fromSync: true,
+            fromSocket: true,
             updateStateOptions: {
-              fromSync: true,
+              fromSocket: true,
               preventStateUpdateListener: 1
               // !isModalRoute(data.route, element)
             }
@@ -208,9 +200,9 @@ class SocketService extends BaseService {
         element.__ref.root,
         {},
         {
-          fromSync: true,
+          fromSocket: true,
           updateStateOptions: {
-            fromSync: true
+            fromSocket: true
           }
         }
       );
@@ -230,11 +222,17 @@ class SocketService extends BaseService {
       this._reconnectAttempts++;
       this._updateStatus("reconnecting");
       setTimeout(() => {
-        this.connect().then(() => {
-          this._reconnectAttempts = 0;
-        }).catch(() => {
+        try {
+          const connected = this.connect();
+          if (connected) {
+            this._reconnectAttempts = 0;
+          } else {
+            this._handleReconnect();
+          }
+        } catch (error) {
+          console.error("Reconnection failed:", error);
           this._handleReconnect();
-        });
+        }
       }, this._reconnectDelay * this._reconnectAttempts);
     } else {
       this._updateStatus("failed");

package/dist/node/services/SymstoryService.js

@@ -8,7 +8,7 @@ class SymstoryService extends BaseService {
     super(config);
     this._client = null;
     this._cache = /* @__PURE__ */ new Map();
-    this._state = null;
+    this._state = {};
     this._socketService = this._context.services.socket;
     this._undoStack = [];
     this._redoStack = [];
@@ -27,7 +27,7 @@ class SymstoryService extends BaseService {
         }
       });
       this._client = symstory.client;
-      this._state = state;
+      this._state = this._isObject(state) ? state : {};
       if (socketUrl) {
         await this._socketService.init();
       }
@@ -47,6 +47,30 @@ class SymstoryService extends BaseService {
       throw error;
     }
   }
+  // publish a new version
+  async publish({ version, type = "minor" } = {}) {
+    if (version) {
+      await this._client.publishVersion(version, { type });
+    } else {
+      await this.updateData([], { type });
+    }
+  }
+  // get changes between versions
+  async getChanges({ versionId, versionValue, branch } = {}) {
+    return this._client.getChanges({ versionId, versionValue, branch });
+  }
+  safeStringify(obj) {
+    const seen = /* @__PURE__ */ new WeakSet();
+    return JSON.stringify(obj, (key, value) => {
+      if (typeof value === "object" && value !== null) {
+        if (seen.has(value)) {
+          return;
+        }
+        seen.add(value);
+      }
+      return value;
+    });
+  }
   // Update project data
   async updateData(changes, options = {}, callback) {
     var _a;
@@ -61,35 +85,33 @@ class SymstoryService extends BaseService {
       isRedo
     } = options;
     try {
-      if ("isOld" in this._context.state && this._context.state.isOld) {
+      const { state } = this._context;
+      if ("isOld" in state && state.isOld) {
         return;
       }
-      const updates = changes.map((change) => {
-        var _a2;
-        return {
-          change,
-          prev: (_a2 = this._context.state) == null ? void 0 : _a2.getByPath(change[1])
-        };
-      });
-      if (this._context.state && "setPathCollection" in this._context.state && !quietUpdate) {
-        this._context.state.setPathCollection(changes, {
+      const updates = changes.map((change) => ({
+        change,
+        prev: state == null ? void 0 : state.getByPath(change[1])
+      }));
+      if (state && "setPathCollection" in state && !quietUpdate) {
+        await state.setPathCollection(changes, {
           preventUpdate: true,
           ...options
         });
-        if ("__element" in this._state && isFunction(callback)) {
-          callback.call(this._state.__element);
-        }
-      }
-      const filteredUpdates = updates.filter(
-        ({ change, prev }) => change[3] !== void 0 || JSON.stringify(change[2]) !== JSON.stringify(prev)
-      );
-      if (!filteredUpdates.length) {
-        return;
       }
-      if (!fromSocket && !isUndo) {
-        if (!updates.length) {
-          return;
+      const filteredUpdates = updates.filter(({ change, prev }) => {
+        if (change && change.err) {
+          delete change.err;
+        }
+        if (prev && prev.err) {
+          delete prev.err;
         }
+        return (
+          // eslint-disable-next-line no-undefined
+          change[3] !== void 0 || this.safeStringify(change[2]) !== this.safeStringify(prev)
+        );
+      });
+      if (!fromSocket && !isUndo) {
         if (!isRedo) {
           this._redoStack.length = 0;
         }
@@ -106,27 +128,49 @@ class SymstoryService extends BaseService {
         if (isFunction(change)) {
           return [action, path, (change == null ? void 0 : change.toString()) ?? change];
         }
+        if (change && change.err) {
+          delete change.err;
+        }
         return [
           action,
           path,
           isObjectLike(change) ? deepStringify(change, Array.isArray(change) ? [] : {}) : change
         ];
       });
-      const res = await this._client.update(stringifiedData, {
-        type,
-        message,
-        branch
-      });
+      const res = await this._context.services.core.applyProjectChanges(
+        state.projectId,
+        stringifiedData,
+        {
+          type,
+          message,
+          branch
+        }
+      );
+      if (this._socketService._socket) {
+        this._socketService.send("change", {
+          type: "update",
+          changes: stringifiedData,
+          version: res == null ? void 0 : res.value
+        });
+      }
       if (res == null ? void 0 : res.value) {
         this._context.symstory = {
           ...this._context.symstory,
           version: res.value
         };
-        if (this._context.state && "quietUpdate" in this._context.state) {
-          this._context.state.quietUpdate({ version: res.value });
+        if (state && "quietUpdate" in state) {
+          const { isVersionsOpen } = state;
+          if (isVersionsOpen) {
+            state.quietUpdate({ version: res.value });
+          } else {
+            state.version = res.value;
+          }
         }
         this._cache.clear();
       }
+      if ("__element" in this._state && isFunction(callback)) {
+        await callback.call(this._state.__element, changes, res);
+      }
       return res;
     } catch (error) {
       if (isFunction(callback)) {
@@ -152,13 +196,12 @@ class SymstoryService extends BaseService {
       })),
       options
     });
-    return new Promise(
-      (resolve) => this.updateData(
-        changes,
-        { ...options, isUndo: true, message: `Undo: ${options.message || ""}` },
-        () => resolve(changes)
-      )
+    await this.updateData(
+      changes,
+      { ...options, isUndo: true, message: `Undo: ${options.message || ""}` },
+      () => changes
     );
+    return changes;
   }
   async redo() {
     if (!this._redoStack.length) {
@@ -170,27 +213,26 @@ class SymstoryService extends BaseService {
       change[1],
       prev
     ]);
-    return new Promise(
-      (resolve) => this.updateData(
-        changes,
-        { ...options, isRedo: true, message: `Redo: ${options.message || ""}` },
-        () => resolve(changes)
-      )
+    await this.updateData(
+      changes,
+      { ...options, isRedo: true, message: `Redo: ${options.message || ""}` },
+      () => changes
     );
+    return changes;
   }
   // Delete project data
-  async deleteData(path, options = {}) {
+  async deleteData(path, options = {}, callback) {
     this._requireReady();
     try {
       const changes = [["delete", path]];
-      return await this._client.update(changes, options);
+      return await this.updateData(changes, options, callback);
     } catch (error) {
       throw new Error(`Failed to delete data: ${error.message}`);
     }
   }
   // Get project data
   async getData(query, options = {}) {
-    var _a, _b;
+    var _a, _b, _c;
     this._requireReady();
     try {
       const {
@@ -215,7 +257,7 @@ class SymstoryService extends BaseService {
       try {
         const result = await this._client.get(query, branch, version);
         if (!bypassCache && cacheKey) {
-          this._cache.set(cacheKey, result);
+          (_c = this._cache) == null ? void 0 : _c.set(cacheKey, result);
         }
         return result;
       } finally {
@@ -228,6 +270,10 @@ class SymstoryService extends BaseService {
       throw new Error(`Failed to get data: ${error.message}`);
     }
   }
+  // Helper method to check if a variable is a valid object
+  _isObject(variable) {
+    return variable !== null && typeof variable === "object" && !Array.isArray(variable);
+  }
   // Helper method to generate cache key
   _generateCacheKey(query, branch, version) {
     if (!query) {
@@ -261,6 +307,9 @@ class SymstoryService extends BaseService {
   }
   async createBranch(branch, options = {}) {
     this._requireReady();
+    if (!branch) {
+      throw new Error("Branch name is required.");
+    }
     try {
       return await this._client.createBranch(branch, options);
     } catch (error) {
@@ -269,6 +318,9 @@ class SymstoryService extends BaseService {
   }
   async editBranch(branch, options = {}) {
     this._requireReady();
+    if (!branch) {
+      throw new Error("Branch name is required.");
+    }
     try {
       return await this._client.editBranch(branch, options);
     } catch (error) {
@@ -277,6 +329,9 @@ class SymstoryService extends BaseService {
   }
   async deleteBranch(branch) {
     this._requireReady();
+    if (!branch) {
+      throw new Error("Branch name is required.");
+    }
     try {
       return await this._client.deleteBranch(branch);
     } catch (error) {
@@ -285,6 +340,9 @@ class SymstoryService extends BaseService {
   }
   async mergeBranch(branch, options = {}) {
     this._requireReady();
+    if (!branch) {
+      throw new Error("Branch name is required.");
+    }
     try {
       return await this._client.mergeBranch(branch, options);
     } catch (error) {
@@ -325,7 +383,8 @@ class SymstoryService extends BaseService {
       return await this.updateData(
         [
           ["update", [type, data.key], value],
-          ["update", ["schema", type, data.key], schema]
+          ["update", ["schema", type, data.key], schema],
+          ...options.additionalChanges || []
         ],
         {
           message: `Created ${data.key} in ${type}`,
@@ -337,6 +396,32 @@ class SymstoryService extends BaseService {
       throw new Error(`Failed to add item: ${error.message}`);
     }
   }
+  async addMultipleItems(items, options = {}, callback) {
+    this._requireReady();
+    const updateData = [];
+    items.forEach((item) => {
+      const [type, data] = item;
+      const { value, ...schema } = data;
+      validateParams.type(type);
+      validateParams.data(data, type);
+      updateData.push(
+        ["update", [type, data.key], value],
+        ["update", ["schema", type, data.key], schema]
+      );
+    });
+    try {
+      return await this.updateData(
+        [...updateData, ...options.additionalChanges || []],
+        {
+          message: `Created ${updateData.length} items`,
+          ...options
+        },
+        isFunction(options) ? options : callback
+      );
+    } catch (error) {
+      throw new Error(`Failed to add item: ${error.message}`);
+    }
+  }
   async updateItem(type, data, options = {}, callback) {
     this._requireReady();
     try {
@@ -384,7 +469,8 @@ class SymstoryService extends BaseService {
       return await this.updateData(
         [
           ["delete", [type, key]],
-          ["delete", ["schema", type, key]]
+          ["delete", ["schema", type, key]],
+          ...options.additionalChanges || []
         ],
         {
           message: `Deleted ${key} from ${type}`,

package/dist/node/services/index.js

@@ -1,23 +1,23 @@
-import { BasedService } from "./BasedService.js";
 import { SymstoryService } from "./SymstoryService.js";
 import { AuthService } from "./AuthService.js";
 import { AIService } from "./AIService.js";
 import { SocketService } from "./SocketIOService.js";
+import { CoreService } from "./CoreService.js";
 const createService = (ServiceClass, config) => new ServiceClass(config);
-const createBasedService = (config) => createService(BasedService, config);
 const createSymstoryService = (config) => createService(SymstoryService, config);
 const createAuthService = (config) => createService(AuthService, config);
 const createAIService = (config) => createService(AIService, config);
 const createSocketService = (config) => createService(SocketService, config);
+const createCoreService = (config) => createService(CoreService, config);
 export {
   AIService,
   AuthService,
-  BasedService,
+  CoreService,
   SocketService,
   SymstoryService,
   createAIService,
   createAuthService,
-  createBasedService,
+  createCoreService,
   createSocketService,
   createSymstoryService
 };