@ninetailed/experience.js-next-esr 2.2.11 → 3.0.0-beta.11

package/index.esm.js

@@ -1,6 +1,6 @@
 import { v4 } from 'uuid';
-import { buildPageEvent, buildEmptyCache } from '@ninetailed/experience.js-shared';
-import { NINETAILED_PROFILE_CACHE_COOKIE } from '@ninetailed/experience.js-plugin-ssr';
+import { NinetailedApiClient, buildPageEvent } from '@ninetailed/experience.js-shared';
+import { NINETAILED_ANONYMOUS_ID_COOKIE } from '@ninetailed/experience.js-plugin-ssr';
 
 function absoluteUrl(req, localhostAddress = 'localhost:3000') {
   const hostHeader = req.headers.get('host');
@@ -67,22 +67,6 @@ function __awaiter(thisArg, _arguments, P, generator) {
     });
 }
 
-const BASE_URL = 'https://api.ninetailed.co';
-
-const getProfileCache = cookies => {
-  const cacheString = cookies[NINETAILED_PROFILE_CACHE_COOKIE];
-
-  if (cacheString) {
-    try {
-      return JSON.parse(decodeURIComponent(cacheString));
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  return buildEmptyCache();
-};
-
 const fetchEdgeProfile = ({
   ctx,
   cookies,
@@ -92,49 +76,24 @@ const fetchEdgeProfile = ({
   ip,
   location
 }) => __awaiter(void 0, void 0, void 0, function* () {
-  const cacheFromCookie = getProfileCache(cookies);
-  const anonymousId = cacheFromCookie.id;
+  const anonymousId = cookies[NINETAILED_ANONYMOUS_ID_COOKIE];
+  const apiClient = new NinetailedApiClient({
+    clientId,
+    environment,
+    url
+  });
   const pageEvent = buildPageEvent({
     ctx,
-    anonymousId,
     messageId: v4(),
     timestamp: Date.now(),
-    properties: {}
+    properties: {},
+    location
   });
-  const request = yield fetch(`${url || BASE_URL}/v1/organizations/${clientId}/environments/${environment || 'main'}/profiles/${anonymousId}/events`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify(Object.assign(Object.assign(Object.assign({
-      events: [pageEvent]
-    }, cacheFromCookie), {
-      ip
-    }), {
-      location
-    }))
+  const profile = yield apiClient.upsertProfile([pageEvent], anonymousId, {
+    ip,
+    preflight: true
   });
-  const {
-    data: {
-      profile,
-      traitsUpdatedAt,
-      signals
-    }
-  } = yield request.json();
-  return {
-    profile,
-    cache: {
-      id: profile.id,
-      random: profile.random,
-      audiences: profile.audiences,
-      location: profile.location,
-      session: profile.session,
-      traitsUpdatedAt,
-      traits: profile.traits,
-      signals,
-      sessions: cacheFromCookie.sessions
-    }
-  };
+  return profile;
 });
 
 export { buildNinetailedEdgeRequestContext, fetchEdgeProfile };

package/index.umd.js

@@ -62,17 +62,6 @@
   PERFORMANCE OF THIS SOFTWARE.
   ***************************************************************************** */
 
-  var __assign = function() {
-      __assign = Object.assign || function __assign(t) {
-          for (var s, i = 1, n = arguments.length; i < n; i++) {
-              s = arguments[i];
-              for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-          }
-          return t;
-      };
-      return __assign.apply(this, arguments);
-  };
-
   function __awaiter(thisArg, _arguments, P, generator) {
       function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
       return new (P || (P = Promise))(function (resolve, reject) {
@@ -111,22 +100,6 @@
       }
   }
 
-  var BASE_URL = 'https://api.ninetailed.co';
-
-  var getProfileCache = function (cookies) {
-    var cacheString = cookies[experience_jsPluginSsr.NINETAILED_PROFILE_CACHE_COOKIE];
-
-    if (cacheString) {
-      try {
-        return JSON.parse(decodeURIComponent(cacheString));
-      } catch (error) {
-        console.error(error);
-      }
-    }
-
-    return experience_jsShared.buildEmptyCache();
-  };
-
   var fetchEdgeProfile = function (_a) {
     var ctx = _a.ctx,
         cookies = _a.cookies,
@@ -136,60 +109,35 @@
         ip = _a.ip,
         location = _a.location;
     return __awaiter(void 0, void 0, void 0, function () {
-      var cacheFromCookie, anonymousId, pageEvent, request, _b, profile, traitsUpdatedAt, signals;
-
-      return __generator(this, function (_c) {
-        switch (_c.label) {
+      var anonymousId, apiClient, pageEvent, profile;
+      return __generator(this, function (_b) {
+        switch (_b.label) {
           case 0:
-            cacheFromCookie = getProfileCache(cookies);
-            anonymousId = cacheFromCookie.id;
+            anonymousId = cookies[experience_jsPluginSsr.NINETAILED_ANONYMOUS_ID_COOKIE];
+            apiClient = new experience_jsShared.NinetailedApiClient({
+              clientId: clientId,
+              environment: environment,
+              url: url
+            });
             pageEvent = experience_jsShared.buildPageEvent({
               ctx: ctx,
-              anonymousId: anonymousId,
               messageId: uuid.v4(),
               timestamp: Date.now(),
-              properties: {}
+              properties: {},
+              location: location
             });
             return [4
             /*yield*/
-            , fetch("".concat(url || BASE_URL, "/v1/organizations/").concat(clientId, "/environments/").concat(environment || 'main', "/profiles/").concat(anonymousId, "/events"), {
-              method: 'POST',
-              headers: {
-                'Content-Type': 'application/json'
-              },
-              body: JSON.stringify(__assign(__assign(__assign({
-                events: [pageEvent]
-              }, cacheFromCookie), {
-                ip: ip
-              }), {
-                location: location
-              }))
+            , apiClient.upsertProfile([pageEvent], anonymousId, {
+              ip: ip,
+              preflight: true
             })];
 
           case 1:
-            request = _c.sent();
-            return [4
-            /*yield*/
-            , request.json()];
-
-          case 2:
-            _b = _c.sent().data, profile = _b.profile, traitsUpdatedAt = _b.traitsUpdatedAt, signals = _b.signals;
+            profile = _b.sent();
             return [2
             /*return*/
-            , {
-              profile: profile,
-              cache: {
-                id: profile.id,
-                random: profile.random,
-                audiences: profile.audiences,
-                location: profile.location,
-                session: profile.session,
-                traitsUpdatedAt: traitsUpdatedAt,
-                traits: profile.traits,
-                signals: signals,
-                sessions: cacheFromCookie.sessions
-              }
-            }];
+            , profile];
         }
       });
     });

package/lib/fetchEdgeProfile.d.ts

@@ -1,4 +1,4 @@
-import { Profile, GeoLocation, NinetailedRequestContext, Cache } from '@ninetailed/experience.js-shared';
+import { Profile, GeoLocation, NinetailedRequestContext } from '@ninetailed/experience.js-shared';
 declare type Cookies = {
     [key: string]: string;
 };
@@ -11,8 +11,5 @@ declare type GetServerSideProfileOptions = {
     ip?: string;
     location?: GeoLocation;
 };
-export declare const fetchEdgeProfile: ({ ctx, cookies, clientId, environment, url, ip, location, }: GetServerSideProfileOptions) => Promise<{
-    profile: Profile;
-    cache: Cache;
-}>;
+export declare const fetchEdgeProfile: ({ ctx, cookies, clientId, environment, url, ip, location, }: GetServerSideProfileOptions) => Promise<Profile>;
 export {};

package/lib/selector.d.ts

@@ -1,6 +1,37 @@
-import { Profile } from '@ninetailed/experience.js-shared';
 declare type SelectNinetailedProfileOptions = {
     ninetailed: string;
 };
-export declare const selectNinetailedProfile: ({ ninetailed, }: SelectNinetailedProfileOptions) => Profile | null;
+export declare const selectNinetailedProfile: ({ ninetailed, }: SelectNinetailedProfileOptions) => {
+    id: string;
+    random: number;
+    audiences: string[];
+    traits: import("@ninetailed/experience.js-shared").Traits;
+    location: {
+        coordinates?: {
+            latitude: number;
+            longitude: number;
+        } | undefined;
+        city?: string | undefined;
+        postalCode?: string | undefined;
+        region?: string | undefined;
+        regionCode?: string | undefined;
+        country?: string | undefined;
+        countryCode?: string | undefined;
+        continent?: string | undefined;
+        timezone?: string | undefined;
+    };
+    session: {
+        isReturningVisitor: boolean;
+        landingPage: {
+            path: string;
+            url: string;
+            query: Record<string, string>;
+            referrer: string;
+            search: string;
+        };
+        count: number;
+        activeSessionLength: number;
+        averageSessionLength: number;
+    };
+} | null;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ninetailed/experience.js-next-esr",
-  "version": "2.2.11",
+  "version": "3.0.0-beta.11",
   "dependencies": {
     "next": "12.1.0"
   },
@@ -8,18 +8,18 @@
   "module": "./index.esm.js",
   "typings": "./index.d.ts",
   "peerDependencies": {
-    "@ninetailed/experience.js-shared": "2.2.11",
-    "uuid": "^8.3.2",
+    "@ninetailed/experience.js-shared": "3.0.0-beta.11",
     "ts-toolbelt": "^9.6.0",
+    "diary": "^0.3.1",
+    "zod": "^3.18.0",
     "locale-enum": "^1.1.1",
     "i18n-iso-countries": "^7.3.0",
-    "@ninetailed/experience.js-plugin-ssr": "2.2.11",
-    "node-fetch": "^3.2.3",
+    "uuid": "^8.3.2",
+    "@ninetailed/experience.js-plugin-ssr": "3.0.0-beta.11",
     "analytics": "^0.8.0",
     "js-cookie": "^3.0.1",
-    "@ninetailed/experience.js": "2.2.11",
+    "@ninetailed/experience.js": "3.0.0-beta.11",
     "lodash": "^4.17.21",
-    "murmurhash-js": "^1.0.0",
-    "diary": "^0.3.1"
+    "murmurhash-js": "^1.0.0"
   }
 }