@schematichq/schematic-js 0.1.10 → 0.1.12

package/dist/schematic.browser.js

@@ -1,2 +1,2 @@
-"use strict";(()=>{var l,f=new Uint8Array(16);function u(){if(!l&&(l=typeof crypto<"u"&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto),!l))throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return l(f)}var s=[];for(let n=0;n<256;++n)s.push((n+256).toString(16).slice(1));function v(n,e=0){return s[n[e+0]]+s[n[e+1]]+s[n[e+2]]+s[n[e+3]]+"-"+s[n[e+4]]+s[n[e+5]]+"-"+s[n[e+6]]+s[n[e+7]]+"-"+s[n[e+8]]+s[n[e+9]]+"-"+s[n[e+10]]+s[n[e+11]]+s[n[e+12]]+s[n[e+13]]+s[n[e+14]]+s[n[e+15]]}var m=typeof crypto<"u"&&crypto.randomUUID&&crypto.randomUUID.bind(crypto),y={randomUUID:m};function k(n,e,t){if(y.randomUUID&&!e&&!n)return y.randomUUID();n=n||{};let r=n.random||(n.rng||u)();if(r[6]=r[6]&15|64,r[8]=r[8]&63|128,e){t=t||0;for(let o=0;o<16;++o)e[t+o]=r[o];return e}return v(r)}var h=k;var g="schematicId";var p=class{apiKey;apiUrl="https://api.schematichq.com";webSocketUrl="wss://api.schematichq.com";eventUrl="https://c.schematichq.com";conn=null;context={};eventQueue;storage;useWebSocket=!1;values={};flagListener;constructor(e,t){this.apiKey=e,this.eventQueue=[],this.useWebSocket=t?.useWebSocket??!1,this.flagListener=t?.flagListener,t?.storage?this.storage=t.storage:typeof localStorage<"u"&&(this.storage=localStorage),t?.apiUrl!==void 0&&(this.apiUrl=t.apiUrl),t?.eventUrl!==void 0&&(this.eventUrl=t.eventUrl),t?.webSocketUrl!==void 0&&(this.webSocketUrl=t.webSocketUrl),window?.addEventListener&&window.addEventListener("beforeunload",()=>{this.flushEventQueue()})}async checkFlag(e){let{fallback:t=!1,key:r}=e,o=e.context||this.context;if(this.useWebSocket){let i=this.values[c(o)]??{};return typeof i[r]>"u"?t:i[r]}let a=`${this.apiUrl}/flags/${r}/check`;return fetch(a,{method:"POST",headers:{"X-Schematic-Api-Key":this.apiKey,"Content-Type":"application/json;charset=UTF-8"},body:JSON.stringify(o)}).then(i=>{if(!i.ok)throw new Error("Network response was not ok");return i.json()}).then(i=>i.data.value).catch(i=>(console.error("There was a problem with the fetch operation:",i),t))}checkFlags=async e=>{e=e||this.context;let t=`${this.apiUrl}/flags/check`,r=JSON.stringify(e);return fetch(t,{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8","X-Schematic-Api-Key":this.apiKey},body:r}).then(o=>{if(!o.ok)throw new Error("Network response was not ok");return o.json()}).then(o=>(o?.data?.flags??[]).reduce((a,i)=>(a[i.flag]=i.value,a),{})).catch(o=>(console.error("There was a problem with the fetch operation:",o),!1))};cleanup=()=>{this.conn&&this.conn.close()};identify=e=>{this.handleEvent("identify",e)};setContext=e=>this.useWebSocket?new Promise(t=>{this.wsConnect().then(()=>{this.wsSendMessage(e),t()})}):(this.context=e,Promise.resolve());track=e=>{this.handleEvent("track",e)};flushEventQueue=()=>{for(;this.eventQueue.length>0;){let e=this.eventQueue.shift();e&&this.sendEvent(e)}};getAnonymousId=()=>{if(!this.storage)return h();let e=this.storage.getItem(g);if(typeof e<"u")return e;let t=h();return this.storage.setItem(g,t),t};handleEvent=(e,t)=>{let r={api_key:this.apiKey,body:t,sent_at:new Date().toISOString(),tracker_event_id:h(),tracker_user_id:this.getAnonymousId(),type:e};document?.hidden?this.storeEvent(r):this.sendEvent(r)};sendEvent=e=>{let t=`${this.eventUrl}/e`,r=JSON.stringify(e);fetch(t,{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},body:r}).then(o=>{if(!o.ok)throw new Error(`Network response was not ok: ${o.statusText}`)}).catch(o=>{console.error("There was a problem with the fetch operation:",o)})};storeEvent=e=>{this.eventQueue.push(e)};wsConnect=()=>new Promise(e=>{this.conn&&e();let t=`${this.webSocketUrl}/flags/bootstrap`,r=new WebSocket(t);this.conn=r,r.onopen=()=>{e()},r.onclose=()=>{this.conn=null}});wsSendMessage=e=>new Promise((t,r)=>{if(c(e)==c(this.context)){t();return}if(this.context=e,!this.conn){r("Not connected");return}if(this.conn.readyState===WebSocket.OPEN){let o=!1;this.conn.onmessage=a=>{let i=JSON.parse(a.data);c(e)in this.values||(this.values[c(e)]={}),(i.flags??[]).forEach(d=>{this.values[c(e)][d.flag]=d.value}),this.flagListener&&this.flagListener(this.values[c(e)]),o||(o=!0,t())},this.conn.onerror=a=>{console.error("Schematic websocket error: ",a)},this.conn.send(JSON.stringify({apiKey:this.apiKey,data:e}))}else this.conn.readyState===WebSocket.CONNECTING?this.conn.onopen=()=>{this.wsSendMessage(e)}:r("Not connected")})};function c(n){let e=Object.keys(n).reduce((t,r)=>{let a=Object.keys(n[r]||{}).sort().reduce((i,d)=>(i[d]=n[r][d],i),{});return t[r]=a,t},{});return JSON.stringify(e)}window.Schematic=p;})();
+"use strict";(()=>{var l,k=new Uint8Array(16);function p(){if(!l&&(l=typeof crypto<"u"&&crypto.getRandomValues&&crypto.getRandomValues.bind(crypto),!l))throw new Error("crypto.getRandomValues() not supported. See https://github.com/uuidjs/uuid#getrandomvalues-not-supported");return l(k)}var i=[];for(let r=0;r<256;++r)i.push((r+256).toString(16).slice(1));function m(r,e=0){return i[r[e+0]]+i[r[e+1]]+i[r[e+2]]+i[r[e+3]]+"-"+i[r[e+4]]+i[r[e+5]]+"-"+i[r[e+6]]+i[r[e+7]]+"-"+i[r[e+8]]+i[r[e+9]]+"-"+i[r[e+10]]+i[r[e+11]]+i[r[e+12]]+i[r[e+13]]+i[r[e+14]]+i[r[e+15]]}var x=typeof crypto<"u"&&crypto.randomUUID&&crypto.randomUUID.bind(crypto),y={randomUUID:x};function b(r,e,t){if(y.randomUUID&&!e&&!r)return y.randomUUID();r=r||{};let n=r.random||(r.rng||p)();if(n[6]=n[6]&15|64,n[8]=n[8]&63|128,e){t=t||0;for(let s=0;s<16;++s)e[t+s]=n[s];return e}return m(n)}var u=b;var g="schematicId";var h=class{apiKey;apiUrl="https://api.schematichq.com";webSocketUrl="wss://api.schematichq.com";eventUrl="https://c.schematichq.com";conn=null;context={};eventQueue;storage;useWebSocket=!1;values={};flagListener;constructor(e,t){this.apiKey=e,this.eventQueue=[],this.useWebSocket=t?.useWebSocket??!1,this.flagListener=t?.flagListener,t?.storage?this.storage=t.storage:typeof localStorage<"u"&&(this.storage=localStorage),t?.apiUrl!==void 0&&(this.apiUrl=t.apiUrl),t?.eventUrl!==void 0&&(this.eventUrl=t.eventUrl),t?.webSocketUrl!==void 0&&(this.webSocketUrl=t.webSocketUrl),window?.addEventListener&&window.addEventListener("beforeunload",()=>{this.flushEventQueue()})}async checkFlag(e){let{fallback:t=!1,key:n}=e,s=e.context||this.context;if(this.useWebSocket){let o=this.values[c(s)]??{};return typeof o[n]>"u"?t:o[n]}let a=`${this.apiUrl}/flags/${n}/check`;return fetch(a,{method:"POST",headers:{"X-Schematic-Api-Key":this.apiKey,"Content-Type":"application/json;charset=UTF-8"},body:JSON.stringify(s)}).then(o=>{if(!o.ok)throw new Error("Network response was not ok");return o.json()}).then(o=>o.data.value).catch(o=>(console.error("There was a problem with the fetch operation:",o),t))}checkFlags=async e=>{e=e||this.context;let t=`${this.apiUrl}/flags/check`,n=JSON.stringify(e);return fetch(t,{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8","X-Schematic-Api-Key":this.apiKey},body:n}).then(s=>{if(!s.ok)throw new Error("Network response was not ok");return s.json()}).then(s=>(s?.data?.flags??[]).reduce((a,o)=>(a[o.flag]=o.value,a),{})).catch(s=>(console.error("There was a problem with the fetch operation:",s),!1))};cleanup=async()=>{if(this.conn)try{(await this.conn).close()}catch(e){console.error("Error during cleanup:",e)}finally{this.conn=null}};identify=e=>(this.setContext({company:e.company?.keys,user:e.keys}),this.handleEvent("identify",e));setContext=async e=>this.useWebSocket?(this.conn||(this.conn=this.wsConnect()),this.conn.then(t=>this.wsSendMessage(t,e))):(this.context=e,Promise.resolve());track=e=>{let{company:t,user:n,event:s,traits:a}=e;return this.handleEvent("track",{company:t??this.context.company,event:s,traits:a??{},user:n??this.context.user})};flushEventQueue=()=>{for(;this.eventQueue.length>0;){let e=this.eventQueue.shift();e&&this.sendEvent(e)}};getAnonymousId=()=>{if(!this.storage)return u();let e=this.storage.getItem(g);if(typeof e<"u")return e;let t=u();return this.storage.setItem(g,t),t};handleEvent=(e,t)=>{let n={api_key:this.apiKey,body:t,sent_at:new Date().toISOString(),tracker_event_id:u(),tracker_user_id:this.getAnonymousId(),type:e};return document?.hidden?this.storeEvent(n):this.sendEvent(n)};sendEvent=async e=>{let t=`${this.eventUrl}/e`,n=JSON.stringify(e);try{await fetch(t,{method:"POST",headers:{"Content-Type":"application/json;charset=UTF-8"},body:n})}catch(s){console.error("Error sending Schematic event: ",s)}return Promise.resolve()};storeEvent=e=>(this.eventQueue.push(e),Promise.resolve());wsConnect=()=>new Promise((e,t)=>{let n=`${this.webSocketUrl}/flags/bootstrap`,s=new WebSocket(n);s.onopen=()=>{e(s)},s.onerror=a=>{t(a)},s.onclose=()=>{this.conn=null}});wsSendMessage=(e,t)=>new Promise((n,s)=>{if(c(t)==c(this.context)){n();return}this.context=t;let a=()=>{let o=!1,d=f=>{let S=JSON.parse(f.data);c(t)in this.values||(this.values[c(t)]={}),(S.flags??[]).forEach(v=>{this.values[c(t)][v.flag]=v.value}),this.flagListener&&this.flagListener(this.values[c(t)]),o||(o=!0,n()),e.removeEventListener("message",d)};e.addEventListener("message",d),e.send(JSON.stringify({apiKey:this.apiKey,data:t}))};e.readyState===WebSocket.OPEN?a():e.readyState===WebSocket.CONNECTING?e.addEventListener("open",a):s("WebSocket is not open or connecting")})};function c(r){let e=Object.keys(r).reduce((t,n)=>{let a=Object.keys(r[n]||{}).sort().reduce((o,d)=>(o[d]=r[n][d],o),{});return t[n]=a,t},{});return JSON.stringify(e)}window.Schematic=h;})();
 /* @preserve */

package/dist/schematic.cjs.js

@@ -168,34 +168,51 @@ var Schematic = class {
       return false;
     });
   };
-  cleanup = () => {
+  cleanup = async () => {
     if (this.conn) {
-      this.conn.close();
+      try {
+        const socket = await this.conn;
+        socket.close();
+      } catch (error) {
+        console.error("Error during cleanup:", error);
+      } finally {
+        this.conn = null;
+      }
     }
   };
   // Send an identify event
   identify = (body) => {
-    this.handleEvent("identify", body);
+    this.setContext({
+      company: body.company?.keys,
+      user: body.keys
+    });
+    return this.handleEvent("identify", body);
   };
   // Set the flag evaluation context; if the context has changed,
   // this will open a websocket connection (if not already open)
   // and submit this context. The promise will resolve when the
   // websocket sends back an initial set of flag values.
-  setContext = (context) => {
+  setContext = async (context) => {
     if (!this.useWebSocket) {
       this.context = context;
       return Promise.resolve();
     }
-    return new Promise((resolve) => {
-      this.wsConnect().then(() => {
-        this.wsSendMessage(context);
-        resolve();
-      });
+    if (!this.conn) {
+      this.conn = this.wsConnect();
+    }
+    return this.conn.then((socket) => {
+      return this.wsSendMessage(socket, context);
     });
   };
   // Send track event
   track = (body) => {
-    this.handleEvent("track", body);
+    const { company, user, event, traits } = body;
+    return this.handleEvent("track", {
+      company: company ?? this.context.company,
+      event,
+      traits: traits ?? {},
+      user: user ?? this.context.user
+    });
   };
   flushEventQueue = () => {
     while (this.eventQueue.length > 0) {
@@ -227,64 +244,56 @@ var Schematic = class {
       type: eventType
     };
     if (document?.hidden) {
-      this.storeEvent(event);
+      return this.storeEvent(event);
     } else {
-      this.sendEvent(event);
+      return this.sendEvent(event);
     }
   };
-  sendEvent = (event) => {
+  sendEvent = async (event) => {
     const captureUrl = `${this.eventUrl}/e`;
     const payload = JSON.stringify(event);
-    fetch(captureUrl, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json;charset=UTF-8"
-      },
-      body: payload
-    }).then((response) => {
-      if (!response.ok) {
-        throw new Error(
-          `Network response was not ok: ${response.statusText}`
-        );
-      }
-    }).catch((error) => {
-      console.error("There was a problem with the fetch operation:", error);
-    });
+    try {
+      await fetch(captureUrl, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8"
+        },
+        body: payload
+      });
+    } catch (error) {
+      console.error("Error sending Schematic event: ", error);
+    }
+    return Promise.resolve();
   };
   storeEvent = (event) => {
     this.eventQueue.push(event);
+    return Promise.resolve();
   };
   wsConnect = () => {
-    return new Promise((resolve) => {
-      if (this.conn) {
-        resolve();
-      }
+    return new Promise((resolve, reject) => {
       const wsUrl = `${this.webSocketUrl}/flags/bootstrap`;
       const webSocket = new WebSocket(wsUrl);
-      this.conn = webSocket;
       webSocket.onopen = () => {
-        resolve();
+        resolve(webSocket);
+      };
+      webSocket.onerror = (error) => {
+        reject(error);
       };
       webSocket.onclose = () => {
         this.conn = null;
       };
     });
   };
-  // Sends a message with a new context over the websocket connection
-  wsSendMessage = (context) => {
+  wsSendMessage = (socket, context) => {
     return new Promise((resolve, reject) => {
       if (contextString(context) == contextString(this.context)) {
         resolve();
         return;
       }
       this.context = context;
-      if (!this.conn) {
-        reject("Not connected");
-        return;
-      }
-      if (this.conn.readyState === WebSocket.OPEN) {
+      const sendMessage = () => {
         let resolved = false;
-        this.conn.onmessage = (event) => {
+        const messageHandler = (event) => {
           const message = JSON.parse(event.data);
           if (!(contextString(context) in this.values)) {
             this.values[contextString(context)] = {};
@@ -301,22 +310,22 @@ var Schematic = class {
             resolved = true;
             resolve();
           }
+          socket.removeEventListener("message", messageHandler);
         };
-        this.conn.onerror = (error) => {
-          console.error("Schematic websocket error: ", error);
-        };
-        this.conn.send(
+        socket.addEventListener("message", messageHandler);
+        socket.send(
           JSON.stringify({
             apiKey: this.apiKey,
             data: context
           })
         );
-      } else if (this.conn.readyState === WebSocket.CONNECTING) {
-        this.conn.onopen = () => {
-          this.wsSendMessage(context);
-        };
+      };
+      if (socket.readyState === WebSocket.OPEN) {
+        sendMessage();
+      } else if (socket.readyState === WebSocket.CONNECTING) {
+        socket.addEventListener("open", sendMessage);
       } else {
-        reject("Not connected");
+        reject("WebSocket is not open or connecting");
       }
     });
   };

package/dist/schematic.d.ts

@@ -16,22 +16,20 @@ export { Event_2 as Event }
 
 export declare type EventBody = EventBodyIdentify | EventBodyTrack;
 
-export declare type EventBodyCompany = {
-    keys: Keys;
-    name?: string;
-    traits: Traits;
-};
-
 export declare type EventBodyIdentify = {
-    company?: EventBodyCompany;
-    keys: Keys;
+    company?: {
+        keys?: Keys;
+        name?: string;
+        traits?: Traits;
+    };
+    keys?: Keys;
     name?: string;
-    traits: Traits;
+    traits?: Traits;
 };
 
 export declare type EventBodyTrack = SchematicContext & {
     event: string;
-    traits: Traits;
+    traits?: Traits;
 };
 
 export declare type EventType = "identify" | "track";
@@ -66,10 +64,10 @@ export declare class Schematic {
     constructor(apiKey: string, options?: SchematicOptions);
     checkFlag(options: CheckOptions): Promise<boolean>;
     checkFlags: (context?: SchematicContext) => Promise<Record<string, boolean>>;
-    cleanup: () => void;
-    identify: (body: EventBodyIdentify) => void;
+    cleanup: () => Promise<void>;
+    identify: (body: EventBodyIdentify) => Promise<void>;
     setContext: (context: SchematicContext) => Promise<void>;
-    track: (body: EventBodyTrack) => void;
+    track: (body: EventBodyTrack) => Promise<void>;
     private flushEventQueue;
     private getAnonymousId;
     private handleEvent;

package/dist/schematic.esm.js

@@ -142,34 +142,51 @@ var Schematic = class {
       return false;
     });
   };
-  cleanup = () => {
+  cleanup = async () => {
     if (this.conn) {
-      this.conn.close();
+      try {
+        const socket = await this.conn;
+        socket.close();
+      } catch (error) {
+        console.error("Error during cleanup:", error);
+      } finally {
+        this.conn = null;
+      }
     }
   };
   // Send an identify event
   identify = (body) => {
-    this.handleEvent("identify", body);
+    this.setContext({
+      company: body.company?.keys,
+      user: body.keys
+    });
+    return this.handleEvent("identify", body);
   };
   // Set the flag evaluation context; if the context has changed,
   // this will open a websocket connection (if not already open)
   // and submit this context. The promise will resolve when the
   // websocket sends back an initial set of flag values.
-  setContext = (context) => {
+  setContext = async (context) => {
     if (!this.useWebSocket) {
       this.context = context;
       return Promise.resolve();
     }
-    return new Promise((resolve) => {
-      this.wsConnect().then(() => {
-        this.wsSendMessage(context);
-        resolve();
-      });
+    if (!this.conn) {
+      this.conn = this.wsConnect();
+    }
+    return this.conn.then((socket) => {
+      return this.wsSendMessage(socket, context);
     });
   };
   // Send track event
   track = (body) => {
-    this.handleEvent("track", body);
+    const { company, user, event, traits } = body;
+    return this.handleEvent("track", {
+      company: company ?? this.context.company,
+      event,
+      traits: traits ?? {},
+      user: user ?? this.context.user
+    });
   };
   flushEventQueue = () => {
     while (this.eventQueue.length > 0) {
@@ -201,64 +218,56 @@ var Schematic = class {
       type: eventType
     };
     if (document?.hidden) {
-      this.storeEvent(event);
+      return this.storeEvent(event);
     } else {
-      this.sendEvent(event);
+      return this.sendEvent(event);
     }
   };
-  sendEvent = (event) => {
+  sendEvent = async (event) => {
     const captureUrl = `${this.eventUrl}/e`;
     const payload = JSON.stringify(event);
-    fetch(captureUrl, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json;charset=UTF-8"
-      },
-      body: payload
-    }).then((response) => {
-      if (!response.ok) {
-        throw new Error(
-          `Network response was not ok: ${response.statusText}`
-        );
-      }
-    }).catch((error) => {
-      console.error("There was a problem with the fetch operation:", error);
-    });
+    try {
+      await fetch(captureUrl, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json;charset=UTF-8"
+        },
+        body: payload
+      });
+    } catch (error) {
+      console.error("Error sending Schematic event: ", error);
+    }
+    return Promise.resolve();
   };
   storeEvent = (event) => {
     this.eventQueue.push(event);
+    return Promise.resolve();
   };
   wsConnect = () => {
-    return new Promise((resolve) => {
-      if (this.conn) {
-        resolve();
-      }
+    return new Promise((resolve, reject) => {
       const wsUrl = `${this.webSocketUrl}/flags/bootstrap`;
       const webSocket = new WebSocket(wsUrl);
-      this.conn = webSocket;
       webSocket.onopen = () => {
-        resolve();
+        resolve(webSocket);
+      };
+      webSocket.onerror = (error) => {
+        reject(error);
       };
       webSocket.onclose = () => {
         this.conn = null;
       };
     });
   };
-  // Sends a message with a new context over the websocket connection
-  wsSendMessage = (context) => {
+  wsSendMessage = (socket, context) => {
     return new Promise((resolve, reject) => {
       if (contextString(context) == contextString(this.context)) {
         resolve();
         return;
       }
       this.context = context;
-      if (!this.conn) {
-        reject("Not connected");
-        return;
-      }
-      if (this.conn.readyState === WebSocket.OPEN) {
+      const sendMessage = () => {
         let resolved = false;
-        this.conn.onmessage = (event) => {
+        const messageHandler = (event) => {
           const message = JSON.parse(event.data);
           if (!(contextString(context) in this.values)) {
             this.values[contextString(context)] = {};
@@ -275,22 +284,22 @@ var Schematic = class {
             resolved = true;
             resolve();
           }
+          socket.removeEventListener("message", messageHandler);
         };
-        this.conn.onerror = (error) => {
-          console.error("Schematic websocket error: ", error);
-        };
-        this.conn.send(
+        socket.addEventListener("message", messageHandler);
+        socket.send(
           JSON.stringify({
             apiKey: this.apiKey,
             data: context
           })
         );
-      } else if (this.conn.readyState === WebSocket.CONNECTING) {
-        this.conn.onopen = () => {
-          this.wsSendMessage(context);
-        };
+      };
+      if (socket.readyState === WebSocket.OPEN) {
+        sendMessage();
+      } else if (socket.readyState === WebSocket.CONNECTING) {
+        socket.addEventListener("open", sendMessage);
       } else {
-        reject("Not connected");
+        reject("WebSocket is not open or connecting");
       }
     });
   };

package/package.json

@@ -46,5 +46,5 @@
     "test": "jest --config jest.config.js"
   },
   "types": "dist/schematic.d.ts",
-  "version": "0.1.10"
+  "version": "0.1.12"
 }