@symbo.ls/sdk 3.1.2 → 3.2.3

package/dist/esm/services/SocketService.js

@@ -1,3 +1,6 @@
+// src/services/SocketService.js
+import { connect, send, disconnect } from "@symbo.ls/socket/client.js";
+
 // src/services/BaseService.js
 var BaseService = class {
   constructor({ context, options } = {}) {
@@ -48,6 +51,134 @@ var BaseService = class {
 };
 
 // src/services/SocketService.js
+import * as utils from "@domql/utils";
+import { router } from "@symbo.ls/router";
+
+// src/config/environment.js
+import { isDevelopment } from "@domql/utils";
+var CONFIG = {
+  // Common defaults for all environments
+  common: {
+    // NOTE: Google client id for google auth, need to configure URLs for each environment in Google console
+    googleClientId: "686286207466-bvd2fqs31rlm64fgich7rtpnc8ns2tqg.apps.googleusercontent.com",
+    // Feature toggles that apply across all environments by default
+    features: {
+      newUserOnboarding: true,
+      betaFeatures: false
+    }
+  },
+  // Environment-specific configurations
+  local: {
+    // local
+    socketUrl: "http://localhost:8080",
+    // For socket api
+    apiUrl: "http://localhost:8080",
+    // For server api
+    basedEnv: "development",
+    // For based api
+    basedProject: "platform-v2-sm",
+    // For based api
+    basedOrg: "symbols",
+    // For based api
+    githubClientId: "Ov23liHxyWFBxS8f1gnF",
+    // For github api
+    // Environment-specific feature toggles (override common)
+    features: {
+      betaFeatures: true
+      // Enable beta features in local dev
+    }
+  },
+  development: {
+    socketUrl: "https://dev.api.symbols.app",
+    apiUrl: "https://dev.api.symbols.app",
+    githubClientId: "Ov23liHxyWFBxS8f1gnF"
+  },
+  testing: {
+    socketUrl: "https://test.api.symbols.app",
+    apiUrl: "https://test.api.symbols.app",
+    basedEnv: "testing",
+    basedProject: "platform-v2-sm",
+    basedOrg: "symbols",
+    githubClientId: "Ov23liHxyWFBxS8f1gnF"
+  },
+  upcoming: {
+    socketUrl: "https://upcoming.api.symbols.app",
+    apiUrl: "https://upcoming.api.symbols.app",
+    githubClientId: "Ov23liWF7NvdZ056RV5J"
+  },
+  staging: {
+    socketUrl: "https://staging.api.symbols.app",
+    apiUrl: "https://staging.api.symbols.app",
+    basedEnv: "staging",
+    basedProject: "platform-v2-sm",
+    basedOrg: "symbols",
+    githubClientId: "Ov23ligwZDQVD0VfuWNa"
+  },
+  production: {
+    socketUrl: "https://api.symbols.app",
+    apiUrl: "https://api.symbols.app",
+    basedEnv: "production",
+    basedProject: "platform-v2-sm",
+    basedOrg: "symbols",
+    githubClientId: "Ov23liFAlOEIXtX3dBtR"
+  }
+};
+var getEnvironment = () => {
+  const env = process.env.SYMBOLS_APP_ENV || process.env.NODE_ENV;
+  if (!CONFIG[env]) {
+    throw new Error(`Unknown environment "${env}"`);
+  }
+  return env;
+};
+var getConfig = () => {
+  try {
+    const env = getEnvironment();
+    const envConfig = { ...CONFIG.common, ...CONFIG[env] };
+    const finalConfig = {
+      ...envConfig,
+      socketUrl: process.env.SYMBOLS_APP_SOCKET_URL || envConfig.socketUrl,
+      apiUrl: process.env.SYMBOLS_APP_API_URL || envConfig.apiUrl,
+      basedEnv: process.env.SYMBOLS_APP_BASED_ENV || envConfig.basedEnv,
+      basedProject: process.env.SYMBOLS_APP_BASED_PROJECT || envConfig.basedProject,
+      basedOrg: process.env.SYMBOLS_APP_BASED_ORG || envConfig.basedOrg,
+      githubClientId: process.env.SYMBOLS_APP_GITHUB_CLIENT_ID || envConfig.githubClientId,
+      isDevelopment: isDevelopment(env),
+      isTesting: env === "testing",
+      isStaging: env === "staging",
+      isProduction: env === "production"
+      // Store all environment variables for potential future use
+    };
+    const requiredFields = [
+      "socketUrl",
+      "apiUrl",
+      "githubClientId",
+      "googleClientId"
+    ];
+    const missingFields = requiredFields.filter((field) => !finalConfig[field]);
+    if (missingFields.length > 0) {
+      console.error(
+        `Missing required configuration: ${missingFields.join(", ")}`
+      );
+    }
+    if (finalConfig.isDevelopment) {
+      console.log(
+        "environment in SDK:",
+        env || process.env.NODE_ENV || process.env.NODE_ENV
+      );
+      console.log(finalConfig);
+    }
+    return finalConfig;
+  } catch (error) {
+    console.error("Failed to load environment configuration:", error);
+    return {
+      ...CONFIG.development
+    };
+  }
+};
+var environment_default = getConfig();
+
+// src/services/SocketService.js
+var { deepStringify, deepDestringify, isString } = utils.default || utils;
 var SocketService = class extends BaseService {
   constructor(config) {
     super(config);
@@ -56,24 +187,39 @@ var SocketService = class extends BaseService {
     this._maxReconnectAttempts = (config == null ? void 0 : config.maxReconnectAttempts) || 5;
     this._reconnectDelay = (config == null ? void 0 : config.reconnectDelay) || 1e3;
     this._handlers = /* @__PURE__ */ new Map();
+    this._sessionId = Math.random();
+    this._ignoreSync = [
+      "userId",
+      "username",
+      "usersName",
+      "email",
+      "projects",
+      "feedbacks",
+      "userRoles",
+      "loading",
+      "appKey",
+      "projectName",
+      "followingUser",
+      "activeProject",
+      "user",
+      "sessionId",
+      "clients"
+    ];
   }
-  async init({ context, options }) {
+  init() {
     try {
-      this._context = context;
-      this._options = options;
-      const { authToken } = context;
-      const { socketUrl } = context.socket || {};
+      const { _context, _options } = this;
+      const socketUrl = environment_default.socketUrl || _options.socketUrl;
       if (!socketUrl) {
         throw new Error("Socket URL is required");
       }
       this._info = {
         config: {
           url: socketUrl,
-          hasToken: Boolean(authToken),
+          hasToken: Boolean(_context.authToken),
           status: "initializing"
         }
       };
-      await this.connect();
       this._setReady();
     } catch (error) {
       this._setError(error);
@@ -81,76 +227,189 @@ var SocketService = class extends BaseService {
     }
   }
   connect() {
+    var _a, _b, _c, _d, _e, _f, _g;
     try {
-      const { socketUrl, authToken } = this._context.socket || {};
-      this._socket = new window.WebSocket(socketUrl);
-      this._socket.onopen = () => {
-        this._reconnectAttempts = 0;
-        this._updateStatus("connected");
-        if (authToken) {
-          this.send("auth", { token: authToken });
-        }
-      };
-      this._socket.onclose = () => {
-        this._updateStatus("disconnected");
-        this._handleReconnect();
-      };
-      this._socket.onerror = (error) => {
-        this._updateStatus("error");
-        this._setError(error);
-      };
-      this._socket.onmessage = (event) => {
-        this._handleMessage(event.data);
+      if (this._socket && ["connected", "connecting"].includes((_b = (_a = this._info) == null ? void 0 : _a.config) == null ? void 0 : _b.status)) {
+        console.warn(
+          "Socket connection already exists:",
+          (_d = (_c = this._info) == null ? void 0 : _c.config) == null ? void 0 : _d.status
+        );
+        return true;
+      }
+      const { _context } = this;
+      if (!_context.appKey) {
+        throw new Error("App key is required");
+      }
+      this._updateStatus("connecting");
+      const config = {
+        source: "platform",
+        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,
+        route: window.location.pathname,
+        onDisconnect: this._handleDisconnect.bind(this)
       };
+      if (this._socket) {
+        this.destroy();
+      }
+      this._socket = connect(_context.appKey, config);
+      this._updateStatus("connected");
+      if (environment_default.isDevelopment) {
+        console.log("Socket connection established:", {
+          appKey: _context.appKey,
+          userId: (_g = _context.user) == null ? void 0 : _g.id,
+          sessionId: this._sessionId,
+          url: this._info.config.url
+        });
+      }
+      return true;
     } catch (error) {
+      this._updateStatus("failed");
+      console.error("Socket connection failed:", error);
       throw new Error(`Socket connection failed: ${error.message}`);
     }
   }
-  // Send message to socket server
-  send(type, data) {
+  send(type, data, opts = {}) {
+    var _a, _b;
     this._requireReady();
-    if (!this._socket || this._socket.readyState !== window.WebSocket.OPEN) {
+    if (!this._socket) {
       throw new Error("Socket is not connected");
     }
-    this._socket.send(JSON.stringify({ type, data }));
-  }
-  // Subscribe to socket events
-  subscribe(type, handler) {
-    if (!this._handlers.has(type)) {
-      this._handlers.set(type, /* @__PURE__ */ new Set());
-    }
-    this._handlers.get(type).add(handler);
-    return () => {
-      const handlers = this._handlers.get(type);
-      if (handlers) {
-        handlers.delete(handler);
-        if (handlers.size === 0) {
-          this._handlers.delete(type);
-        }
-      }
+    const payload = {
+      sessionId: this._sessionId,
+      userId: (_a = this._context.user) == null ? void 0 : _a.id,
+      usersName: (_b = this._context.user) == null ? void 0 : _b.name,
+      ...data
     };
+    send.call(
+      this._socket,
+      type,
+      opts.useDeepStringify ? deepStringify(payload) : payload
+    );
   }
-  subscribeChannel(type, handler) {
-    return this.subscribe(type, handler);
-  }
-  // Private methods
-  _handleMessage(rawData) {
+  _handleMessage(event, data) {
     try {
-      const { type, data } = JSON.parse(rawData);
-      const handlers = this._handlers.get(type);
+      const d = isString(data) ? deepDestringify(JSON.parse(data)) : data;
+      if (this._sessionId === d.sessionId) {
+        return;
+      }
+      const handlers = this._handlers.get(event);
       if (handlers) {
-        handlers.forEach((handler) => handler(data));
+        handlers.forEach((handler) => handler(d));
+      }
+      switch (event) {
+        case "change":
+          this._handleChangeEvent(d);
+          break;
+        case "clients":
+          this._handleClientsEvent(d);
+          break;
+        case "route":
+          this._handleRouteEvent(d);
+          break;
+        default:
+          break;
       }
     } catch (error) {
       this._setError(new Error(`Failed to handle message: ${error.message}`));
     }
   }
+  _handleChangeEvent(data) {
+    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 } = this._context.state;
+    root.replace(
+      { clients: data },
+      {
+        fromSocket: true,
+        preventUpdate: true
+      }
+    );
+  }
+  _handleRouteEvent(data) {
+    const { element } = this._context;
+    const { state } = this._context;
+    if (data.userId && data.type === "routeChanged") {
+      const isModalOpen = this.getWindow("modal");
+      const isFollowing = state.followingUser === data.userId;
+      const isRouteSyncEnabled = element.getUserSettings("presentMode") && data.userId === state.userId;
+      if ((isFollowing || isRouteSyncEnabled) && !isModalOpen) {
+        router(
+          data.route,
+          element.__ref.root,
+          {},
+          {
+            fromSocket: true,
+            updateStateOptions: {
+              fromSocket: true,
+              preventStateUpdateListener: 1
+              // !isModalRoute(data.route, element)
+            }
+          }
+        );
+      }
+    } else if (data.reload) {
+      window.location.reload();
+    } else if (data.route && data.type === "routeForced") {
+      router(
+        data.route,
+        element.__ref.root,
+        {},
+        {
+          fromSocket: true,
+          updateStateOptions: {
+            fromSocket: true
+          }
+        }
+      );
+    } else if (data.componentKey) {
+      if (!element.getData("components")[data.componentKey]) {
+        return;
+      }
+      element.activateSelected(data.componentKey);
+    }
+  }
+  _handleDisconnect() {
+    this._updateStatus("disconnected");
+    this._handleReconnect();
+  }
   _handleReconnect() {
     if (this._reconnectAttempts < this._maxReconnectAttempts) {
       this._reconnectAttempts++;
       this._updateStatus("reconnecting");
       setTimeout(() => {
-        this.connect();
+        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");
@@ -166,18 +425,23 @@ var SocketService = class extends BaseService {
       }
     };
   }
-  // Cleanup
   destroy() {
     if (this._socket) {
-      this._socket.close();
+      disconnect.call(this._socket);
       this._socket = null;
     }
     this._handlers.clear();
     this._setReady(false);
   }
+  reconnect() {
+    this.destroy();
+    this.connect();
+  }
   _checkRequiredContext() {
-    const { socket } = this._context;
-    return Boolean((socket == null ? void 0 : socket.socketUrl) && this._socket);
+    var _a, _b;
+    return Boolean(
+      ((_a = this._context) == null ? void 0 : _a.appKey) && ((_b = this._context) == null ? void 0 : _b.authToken) && this._socket
+    );
   }
   isReady() {
     if (this._checkRequiredContext()) {
@@ -189,3 +453,4 @@ var SocketService = class extends BaseService {
 export {
   SocketService
 };
+// @preserve-env

package/dist/esm/services/SymstoryService.js

@@ -63,12 +63,8 @@ var CONFIG = {
   // Environment-specific configurations
   local: {
     // local
-    baseUrl: "http://localhost:8080",
-    // For symstory api
     socketUrl: "http://localhost:8080",
     // For socket api
-    routerUrl: "http://localhost:8080",
-    // For router api
     apiUrl: "http://localhost:8080",
     // For server api
     basedEnv: "development",
@@ -86,29 +82,25 @@ var CONFIG = {
     }
   },
   development: {
-    baseUrl: "https://dev.api.symbols.app",
     socketUrl: "https://dev.api.symbols.app",
-    routerUrl: "https://dev.api.symbols.app",
     apiUrl: "https://dev.api.symbols.app",
-    basedEnv: "development",
-    basedProject: "platform-v2-sm",
-    basedOrg: "symbols",
     githubClientId: "Ov23liHxyWFBxS8f1gnF"
   },
   testing: {
-    baseUrl: "https://test.api.symbols.app",
     socketUrl: "https://test.api.symbols.app",
-    routerUrl: "https://test.api.symbols.app",
     apiUrl: "https://test.api.symbols.app",
     basedEnv: "testing",
     basedProject: "platform-v2-sm",
     basedOrg: "symbols",
     githubClientId: "Ov23liHxyWFBxS8f1gnF"
   },
+  upcoming: {
+    socketUrl: "https://upcoming.api.symbols.app",
+    apiUrl: "https://upcoming.api.symbols.app",
+    githubClientId: "Ov23liWF7NvdZ056RV5J"
+  },
   staging: {
-    baseUrl: "https://staging.api.symbols.app",
     socketUrl: "https://staging.api.symbols.app",
-    routerUrl: "https://staging.api.symbols.app",
     apiUrl: "https://staging.api.symbols.app",
     basedEnv: "staging",
     basedProject: "platform-v2-sm",
@@ -116,9 +108,7 @@ var CONFIG = {
     githubClientId: "Ov23ligwZDQVD0VfuWNa"
   },
   production: {
-    baseUrl: "https://api.symbols.app",
     socketUrl: "https://api.symbols.app",
-    routerUrl: "https://api.symbols.app",
     apiUrl: "https://api.symbols.app",
     basedEnv: "production",
     basedProject: "platform-v2-sm",
@@ -139,9 +129,7 @@ var getConfig = () => {
     const envConfig = { ...CONFIG.common, ...CONFIG[env] };
     const finalConfig = {
       ...envConfig,
-      baseUrl: process.env.SYMBOLS_APP_BASE_URL || envConfig.baseUrl,
       socketUrl: process.env.SYMBOLS_APP_SOCKET_URL || envConfig.socketUrl,
-      routerUrl: process.env.SYMBOLS_APP_ROUTER_URL || envConfig.routerUrl,
       apiUrl: process.env.SYMBOLS_APP_API_URL || envConfig.apiUrl,
       basedEnv: process.env.SYMBOLS_APP_BASED_ENV || envConfig.basedEnv,
       basedProject: process.env.SYMBOLS_APP_BASED_PROJECT || envConfig.basedProject,
@@ -154,12 +142,8 @@ var getConfig = () => {
       // Store all environment variables for potential future use
     };
     const requiredFields = [
-      "baseUrl",
       "socketUrl",
       "apiUrl",
-      "basedEnv",
-      "basedProject",
-      "basedOrg",
       "githubClientId",
       "googleClientId"
     ];
@@ -188,7 +172,7 @@ var environment_default = getConfig();
 
 // src/utils/symstoryClient.js
 var DEFAULT_OPTIONS = {
-  baseUrl: environment_default.baseUrl
+  apiUrl: environment_default.apiUrl
 };
 var SymstoryClient = class {
   /**
@@ -215,7 +199,7 @@ var SymstoryClient = class {
    * @returns {Promise<any>} - The response data.
    */
   async request(path = "", options = {}) {
-    const url = `${this.options.baseUrl}/symstory/${this.appKey}${path}`;
+    const url = `${this.options.apiUrl}/symstory/${this.appKey}${path}`;
     const response = await fetch(url, {
       ...options,
       headers: { ...this.headers, ...options.headers }
@@ -369,7 +353,7 @@ var SymstoryClient = class {
    * @param {string} [options.branch='main'] - The branch name. (Only if version number is provided)
    * @returns {Promise<any>} - The response data.
    */
-  publishVersion(version2, { branch = "main" } = {}) {
+  publishVersion(version2) {
     return this.request("/publish", {
       method: "POST",
       body: JSON.stringify({ version: version2 })
@@ -385,11 +369,11 @@ var SymstoryClient = class {
    */
   getChanges({ versionId, versionValue, branch } = {}) {
     return this.request(
-      "/changes?" + new URLSearchParams({
+      `/changes?${new URLSearchParams({
         ...versionId ? { versionId } : {},
         ...versionValue ? { versionValue } : {},
         ...branch ? { branch } : {}
-      }).toString(),
+      }).toString()}`,
       {}
     );
   }