adaptic-backend 1.0.231 → 1.0.232

package/client.cjs

@@ -1,58 +1,38 @@
 "use strict";
+// client.ts
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.client = void 0;
-exports.createApolloClient = createApolloClient;
+exports.getApolloClient = getApolloClient;
 const client_1 = require("@apollo/client");
-const context_cjs_1 = require("@apollo/client/link/context/context.cjs");
-const getToken_1 = require("./getToken.cjs");
-const error_cjs_1 = require("@apollo/client/link/error/error.cjs");
+const context_1 = require("@apollo/client/link/context");
+const error_1 = require("@apollo/client/link/error");
 const cross_fetch_1 = __importDefault(require("cross-fetch"));
-const httpUrl = process.env.BACKEND_HTTPS_URL || process.env.NODE_ENV === "production" ? "https://api.adaptic.ai/graphql" : "http://localhost:4000/graphql";
+let apolloClient = null;
 /**
- * Function to get the authentication token using the custom getToken implementation
+ * Initializes a new Apollo Client instance.
+ * @returns ApolloClient instance.
  */
-async function getAuthToken(req) {
-    const secret = process.env.JWT_SECRET;
-    const salt = process.env.JWT_SALT;
-    const secureCookie = process.env.NODE_ENV === "production";
-    if (secret && salt && req) {
-        try {
-            const token = await (0, getToken_1.getToken)({
-                req,
-                secureCookie,
-                secret,
-                salt,
-                raw: true,
-            });
-            return token;
-        }
-        catch (error) {
-            console.error("Error retrieving token:", error);
-            return null;
-        }
-    }
-    return null;
-}
-/**
- * Function to create a new Apollo Client instance
- */
-function createApolloClient(req) {
+function initializeApollo() {
+    const isProduction = process.env.NODE_ENV === "production";
+    const httpUrl = isProduction
+        ? process.env.BACKEND_HTTPS_URL || "https://api.adaptic.ai/graphql"
+        : "http://localhost:4000/graphql";
     const httpLink = new client_1.HttpLink({ uri: httpUrl, fetch: cross_fetch_1.default });
-    const authLink = (0, context_cjs_1.setContext)(async (_, { headers }) => {
-        const token = await getAuthToken(req);
+    const authLink = (0, context_1.setContext)((_, { headers }) => {
+        // Retrieve the token from environment variables or other secure storage
+        const token = process.env.SERVER_AUTH_TOKEN || "";
         return {
             headers: {
                 ...headers,
                 authorization: token ? `Bearer ${token}` : "",
-                connection: 'close',
+                connection: "close",
             },
         };
     });
-    // Error handling link
-    const errorLink = (0, error_cjs_1.onError)(({ graphQLErrors, networkError }) => {
+    const errorLink = (0, error_1.onError)(({ graphQLErrors, networkError }) => {
         if (graphQLErrors) {
             graphQLErrors.forEach(({ message, locations, path }) => console.error(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`));
         }
@@ -65,6 +45,16 @@ function createApolloClient(req) {
         cache: new client_1.InMemoryCache(),
     });
 }
-// initialise apollo client
-exports.client = createApolloClient();
+/**
+ * Retrieves the singleton Apollo Client instance.
+ * @returns ApolloClient instance.
+ */
+function getApolloClient() {
+    if (!apolloClient) {
+        apolloClient = initializeApollo();
+    }
+    return apolloClient;
+}
+// Export the singleton instance
+exports.client = getApolloClient();
 //# sourceMappingURL=client.js.map

package/client.d.ts

@@ -1,8 +1,8 @@
 import { ApolloClient, NormalizedCacheObject } from "@apollo/client";
-export type { NormalizedCacheObject, ApolloClient };
 /**
- * Function to create a new Apollo Client instance
+ * Retrieves the singleton Apollo Client instance.
+ * @returns ApolloClient instance.
  */
-export declare function createApolloClient(req?: any): ApolloClient<NormalizedCacheObject>;
+export declare function getApolloClient(): ApolloClient<NormalizedCacheObject>;
 export declare const client: ApolloClient<NormalizedCacheObject>;
 //# sourceMappingURL=client.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adaptic-backend",
-  "version": "1.0.231",
+  "version": "1.0.232",
   "description": "Backend executable CRUD functions with dynamic variables construction, and type definitions for the Adaptic AI platform.",
   "type": "module",
   "types": "index.d.ts",

package/prismaClient.cjs

@@ -1,13 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// client with accelerate
 const edge_1 = require("@prisma/client/edge");
 const extension_accelerate_1 = require("@prisma/extension-accelerate");
+const isProduction = process.env.NODE_ENV === "production";
 let prisma;
-if (process.env.NODE_ENV === "production") {
+if (isProduction) {
+    // In production, use Prisma Data Proxy by connecting via DATABASE_URL
     prisma = new edge_1.PrismaClient().$extends((0, extension_accelerate_1.withAccelerate)());
 }
 else {
+    // In development, prevent multiple instances due to hot-reloading
     const globalWithPrisma = global;
     if (!globalWithPrisma.prisma) {
         globalWithPrisma.prisma = new edge_1.PrismaClient().$extends((0, extension_accelerate_1.withAccelerate)());

package/prismaClient.d.ts

@@ -2,7 +2,7 @@ import { PrismaClient } from "@prisma/client/edge";
 declare global {
     namespace NodeJS {
         interface Global {
-            prisma: PrismaClient;
+            prisma?: PrismaClient;
         }
     }
 }

package/server/client.d.ts

@@ -1,8 +1,8 @@
 import { ApolloClient, NormalizedCacheObject } from "@apollo/client";
-export type { NormalizedCacheObject, ApolloClient };
 /**
- * Function to create a new Apollo Client instance
+ * Retrieves the singleton Apollo Client instance.
+ * @returns ApolloClient instance.
  */
-export declare function createApolloClient(req?: any): ApolloClient<NormalizedCacheObject>;
+export declare function getApolloClient(): ApolloClient<NormalizedCacheObject>;
 export declare const client: ApolloClient<NormalizedCacheObject>;
 //# sourceMappingURL=client.d.ts.map

package/server/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAMxB,YAAY,EAAE,qBAAqB,EAAE,YAAY,EAAE,CAAC;AA8BpD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,YAAY,CAAC,qBAAqB,CAAC,CAiCjF;AAID,eAAO,MAAM,MAAM,qCAAuB,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAGZ,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAmDxB;;;GAGG;AACH,wBAAgB,eAAe,IAAI,YAAY,CAAC,qBAAqB,CAAC,CAKrE;AAGD,eAAO,MAAM,MAAM,qCAAoB,CAAC"}

package/server/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,QAAQ,GAET,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAC9D,OAAO,KAAK,MAAM,aAAa,CAAC;AAIhC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,gCAAgC,CAAC,CAAC,CAAC,+BAA+B,CAAC;AAE5J;;GAEG;AACH,KAAK,UAAU,YAAY,CAAC,GAAS;IACnC,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,UAAoB,CAAC;IAChD,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,QAAkB,CAAC;IAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IAE3D,IAAI,MAAM,IAAI,IAAI,IAAI,GAAG,EAAE,CAAC;QAC1B,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;gBAC3B,GAAG;gBACH,YAAY;gBACZ,MAAM;gBACN,IAAI;gBACJ,GAAG,EAAE,IAAI;aACV,CAAC,CAAC;YACH,OAAO,KAAsB,CAAC;QAChC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,GAAS;IAC1C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACnD,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,GAAG,CAAC,CAAC;QACtC,OAAO;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC7C,UAAU,EAAE,OAAO;aACpB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,sBAAsB;IACtB,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;QAC5D,IAAI,aAAa,EAAE,CAAC;YAClB,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CACrD,OAAO,CAAC,KAAK,CACX,6BAA6B,OAAO,eAAe,SAAS,WAAW,IAAI,EAAE,CAC9E,CACF,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,YAAY,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,KAAK,EAAE,IAAI,aAAa,EAAE;KAC3B,CAAC,CAAC;AACL,CAAC;AAED,2BAA2B;AAE3B,MAAM,CAAC,MAAM,MAAM,GAAG,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/client.ts"],"names":[],"mappings":"AAAA,YAAY;AAEZ,OAAO,EACL,YAAY,EACZ,aAAa,EACb,QAAQ,GAET,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,IAAI,YAAY,GAA+C,IAAI,CAAC;AAEpE;;;GAGG;AACH,SAAS,gBAAgB;IACvB,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;IAC3D,MAAM,OAAO,GAAG,YAAY;QAC1B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,gCAAgC;QACnE,CAAC,CAAC,+BAA+B,CAAC;IAEpC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAEvD,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,wEAAwE;QACxE,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;QAClD,OAAO;YACL,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;gBAC7C,UAAU,EAAE,OAAO;aACpB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,EAAE,aAAa,EAAE,YAAY,EAAE,EAAE,EAAE;QAC5D,IAAI,aAAa,EAAE,CAAC;YAClB,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,EAAE,CACrD,OAAO,CAAC,KAAK,CACX,6BAA6B,OAAO,eAAe,SAAS,WAAW,IAAI,EAAE,CAC9E,CACF,CAAC;QACJ,CAAC;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,YAAY,CAAC;QACtB,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjD,KAAK,EAAE,IAAI,aAAa,EAAE;KAC3B,CAAC,CAAC;AACL,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe;IAC7B,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG,gBAAgB,EAAE,CAAC;IACpC,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,gCAAgC;AAChC,MAAM,CAAC,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC"}

package/server/client.mjs

@@ -1,51 +1,31 @@
+// client.ts
 import pkg from '@apollo/client';
 const { ApolloClient, InMemoryCache, HttpLink, } = pkg;
-import { setContext } from "@apollo/client/link/context/context.cjs";
-import { getToken } from "./getToken.mjs";
-import { onError } from "@apollo/client/link/error/error.cjs";
-import fetch from 'cross-fetch';
-const httpUrl = process.env.BACKEND_HTTPS_URL || process.env.NODE_ENV === "production" ? "https://api.adaptic.ai/graphql" : "http://localhost:4000/graphql";
+import { setContext } from "@apollo/client/link/context";
+import { onError } from "@apollo/client/link/error";
+import fetch from "cross-fetch";
+let apolloClient = null;
 /**
- * Function to get the authentication token using the custom getToken implementation
+ * Initializes a new Apollo Client instance.
+ * @returns ApolloClient instance.
  */
-async function getAuthToken(req) {
-    const secret = process.env.JWT_SECRET;
-    const salt = process.env.JWT_SALT;
-    const secureCookie = process.env.NODE_ENV === "production";
-    if (secret && salt && req) {
-        try {
-            const token = await getToken({
-                req,
-                secureCookie,
-                secret,
-                salt,
-                raw: true,
-            });
-            return token;
-        }
-        catch (error) {
-            console.error("Error retrieving token:", error);
-            return null;
-        }
-    }
-    return null;
-}
-/**
- * Function to create a new Apollo Client instance
- */
-export function createApolloClient(req) {
+function initializeApollo() {
+    const isProduction = process.env.NODE_ENV === "production";
+    const httpUrl = isProduction
+        ? process.env.BACKEND_HTTPS_URL || "https://api.adaptic.ai/graphql"
+        : "http://localhost:4000/graphql";
     const httpLink = new HttpLink({ uri: httpUrl, fetch });
-    const authLink = setContext(async (_, { headers }) => {
-        const token = await getAuthToken(req);
+    const authLink = setContext((_, { headers }) => {
+        // Retrieve the token from environment variables or other secure storage
+        const token = process.env.SERVER_AUTH_TOKEN || "";
         return {
             headers: {
                 ...headers,
                 authorization: token ? `Bearer ${token}` : "",
-                connection: 'close',
+                connection: "close",
             },
         };
     });
-    // Error handling link
     const errorLink = onError(({ graphQLErrors, networkError }) => {
         if (graphQLErrors) {
             graphQLErrors.forEach(({ message, locations, path }) => console.error(`[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}`));
@@ -59,6 +39,16 @@ export function createApolloClient(req) {
         cache: new InMemoryCache(),
     });
 }
-// initialise apollo client
-export const client = createApolloClient();
+/**
+ * Retrieves the singleton Apollo Client instance.
+ * @returns ApolloClient instance.
+ */
+export function getApolloClient() {
+    if (!apolloClient) {
+        apolloClient = initializeApollo();
+    }
+    return apolloClient;
+}
+// Export the singleton instance
+export const client = getApolloClient();
 //# sourceMappingURL=client.js.map

package/server/prismaClient.d.ts

@@ -2,7 +2,7 @@ import { PrismaClient } from "@prisma/client/edge";
 declare global {
     namespace NodeJS {
         interface Global {
-            prisma: PrismaClient;
+            prisma?: PrismaClient;
         }
     }
 }

package/server/prismaClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prismaClient.d.ts","sourceRoot":"","sources":["../../src/prismaClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM,CAAC;QACf,UAAU,MAAM;YACd,MAAM,EAAE,YAAY,CAAC;SACtB;KACF;CACF;AAED,QAAA,IAAI,MAAM,EAAE,YAAY,CAAC;AAczB,eAAe,MAAM,CAAC"}
+{"version":3,"file":"prismaClient.d.ts","sourceRoot":"","sources":["../../src/prismaClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM,CAAC;QACf,UAAU,MAAM;YACd,MAAM,CAAC,EAAE,YAAY,CAAC;SACvB;KACF;CACF;AAID,QAAA,IAAI,MAAM,EAAE,YAAY,CAAC;AAgBzB,eAAe,MAAM,CAAC"}

package/server/prismaClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"prismaClient.js","sourceRoot":"","sources":["../../src/prismaClient.ts"],"names":[],"mappings":"AAAA,yBAAyB;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAU7D,IAAI,MAAoB,CAAC;AAEzB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE,CAAC;IAC1C,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,CAA4B,CAAC;AACpF,CAAC;KAAM,CAAC;IACN,MAAM,gBAAgB,GAAG,MAAuD,CAAC;IAEjF,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAC7B,gBAAgB,CAAC,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,CAA4B,CAAC;IACrG,CAAC;IAED,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;AACnC,CAAC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"prismaClient.js","sourceRoot":"","sources":["../../src/prismaClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAU9D,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC;AAE3D,IAAI,MAAoB,CAAC;AAEzB,IAAI,YAAY,EAAE,CAAC;IACjB,sEAAsE;IACtE,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,CAA4B,CAAC;AACpF,CAAC;KAAM,CAAC;IACN,kEAAkE;IAClE,MAAM,gBAAgB,GAAG,MAAuD,CAAC;IAEjF,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAC7B,gBAAgB,CAAC,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC,QAAQ,CAAC,cAAc,EAAE,CAA4B,CAAC;IACrG,CAAC;IAED,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC;AACnC,CAAC;AAED,eAAe,MAAM,CAAC"}

package/server/prismaClient.mjs

@@ -1,11 +1,13 @@
-// client with accelerate
 import { PrismaClient } from "@prisma/client/edge";
-import { withAccelerate } from '@prisma/extension-accelerate';
+import { withAccelerate } from "@prisma/extension-accelerate";
+const isProduction = process.env.NODE_ENV === "production";
 let prisma;
-if (process.env.NODE_ENV === "production") {
+if (isProduction) {
+    // In production, use Prisma Data Proxy by connecting via DATABASE_URL
     prisma = new PrismaClient().$extends(withAccelerate());
 }
 else {
+    // In development, prevent multiple instances due to hot-reloading
     const globalWithPrisma = global;
     if (!globalWithPrisma.prisma) {
         globalWithPrisma.prisma = new PrismaClient().$extends(withAccelerate());