chore: remove rust-utils package (#29)

integration-os · Aug 21, 2024 · a6ac2e3 · a6ac2e3
1 parent 8eba440
commit a6ac2e3
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 97 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,7 +15,7 @@ WORKDIR /app
 COPY . .
 
 # Install dependencies
-RUN --mount=type=secret,id=NPM_TOKEN NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN) npm i --ignore-scripts && npm i @integrationos/rust-utils
+RUN --mount=type=secret,id=NPM_TOKEN NPM_TOKEN=$(cat /run/secrets/NPM_TOKEN) npm i --ignore-scripts
 
 # Build
 RUN npm run build

diff --git a/libs-private/service-logic/generators/embedTokens.ts b/libs-private/service-logic/generators/embedTokens.ts
@@ -2,16 +2,18 @@ import {
   EmbedTokenRecord,
   EmbedTokensPayload,
 } from '@event-inc/types/embed-tokens';
-import { generateId } from '@integrationos/rust-utils';
+import { generateId } from '../service-helper';
 
-export const generateEmbedTokensRecord = ({
+export const generateEmbedTokensRecord = async ({
   label,
   group,
   ttl,
   linkSettings,
   environment,
   features,
-}: EmbedTokensPayload): EmbedTokenRecord => {
+}: EmbedTokensPayload): Promise<EmbedTokenRecord> => {
+  const sessionId = await generateId('session_id');
+
   return {
     label,
     group,
@@ -20,7 +22,7 @@ export const generateEmbedTokensRecord = ({
     createdDate: new Date(),
     expiresAt: new Date().getTime() + ttl,
     environment,
-    sessionId: generateId('session_id'),
+    sessionId,
     features,
   };
 };
diff --git a/libs-private/service-logic/generators/events/eventLink.ts b/libs-private/service-logic/generators/events/eventLink.ts
@@ -1,8 +1,8 @@
 import { CreateEventLinkPayload, EventLink } from '@event-inc/types';
 import { Ownership } from '@event-inc/types/generic';
-import { generateId } from '@integrationos/rust-utils';
+import { generateId } from '@libs-private/utils';
 
-export const generateEventLinkRecord = ({
+export const generateEventLinkRecord = async ({
   version = '1.0.0_04.44_18-04-2023T10-33-00',
   label,
   group,
@@ -12,14 +12,16 @@ export const generateEventLinkRecord = ({
   usageSource,
 }: CreateEventLinkPayload & {
   ownership: Ownership;
-}): EventLink => {
+}): Promise<EventLink> => {
+  const tokenId = await generateId('ln_tk');
+
   return {
     _type: 'event-link',
     version,
     ownership,
     label,
     group,
-    token: generateId('ln_tk'),
+    token: tokenId,
     createdAt: Date.now(),
     createdDate: new Date(),
     expiresAt: new Date().getTime() + ttl,

diff --git a/libs-private/service-logic/generators/events/externalEvents.ts b/libs-private/service-logic/generators/events/externalEvents.ts
@@ -1,11 +1,11 @@
 import { Event, EventCreateInitialPayload } from '@libs-private/data-models';
 import { getTopicDetails } from '../../../utils/events';
 import {
+  generateId,
   generatePrivateKey,
   getWalletFromPrivateKey,
   hashMessage,
 } from '../../service-helper';
-import { generateId } from '@integrationos/rust-utils';
 
 export const generateExternalEvent = async ({
   environment,
@@ -30,9 +30,12 @@ export const generateExternalEvent = async ({
     body: _body,
   });
 
+  const eventId = await generateId('evt');
+  const eventKeyId = await generateId('evt_k');
+
   const event: Event = {
-    _id: generateId('evt'),
-    key: generateId('evt_k'),
+    _id: eventId,
+    key: eventKeyId,
     topic,
     environment,
     body: _body,

diff --git a/libs-private/service-logic/services/authkit-demo/logic/link.api.ts b/libs-private/service-logic/services/authkit-demo/logic/link.api.ts
@@ -10,7 +10,7 @@ import {
 } from '@event-inc/utils';
 import { identity } from 'ramda';
 import { EmbedTokenRecord } from '@event-inc/types/embed-tokens';
-import { generateId } from '@integrationos/rust-utils';
+import { generateId } from '@libs-private/utils';
 
 export const createEventLinkTokenApi = async (
   headers: Record<string, string>,
@@ -75,6 +75,8 @@ export const createEventLinkTokenApi = async (
         : platform?.environment === 'test' || !platform?.environment
   );
 
+  const sessionId = await generateId('session_id');
+
   const tokenPayload = {
     linkSettings: {
       connectedPlatforms: connectedPlatformsFiltered ?? [],
@@ -84,7 +86,7 @@ export const createEventLinkTokenApi = async (
     label: linkData?.label,
     environment: isLiveSecret ? 'live' : 'test',
     expiresAt: new Date().getTime() + 5 * 1000 * 60,
-    sessionId: generateId('session_id'),
+    sessionId,
     features: data?.features
   };
 

diff --git a/libs-private/service-logic/services/event-links/useEventLinksService.ts b/libs-private/service-logic/services/event-links/useEventLinksService.ts
@@ -27,7 +27,7 @@ import { useEventAccessService } from '../events/useEventAccessService';
 import _ from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 import { generateEmbedTokensRecord } from '@libs-private/service-logic/generators/embedTokens';
-import { generateId } from '@integrationos/rust-utils';
+import { generateId } from '@libs-private/utils';
 
 const GET_EVENT_ACCESS_RECORD_URL = process.env.CONNECTIONS_API_BASE_URL + 'v1/event-access';
 const CREATE_CONNECTION_URL = process.env.CONNECTIONS_API_BASE_URL + 'v1/connections';
@@ -55,7 +55,7 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
     }: CreateEventLinkPayload): Promise<
       BResult<EventLink, 'service', unknown>
     > {
-      const link = generateEventLinkRecord({
+      const link = await generateEventLinkRecord({
         label,
         group,
         ttl,
@@ -310,7 +310,7 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
       );
 
       // Generate a link record
-      const link = generateEventLinkRecord({
+      const link = await generateEventLinkRecord({
         label: 'My Connection',
         group: `connection-${uuidv4().replace(/-/g, '').substring(0, 10)}`,
         ttl: 2 * 1000 * 60 * 60,
@@ -358,6 +358,8 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
         }
       );
 
+      const sessionId = await generateId('session_id');
+
       const tokenPayload = {
         linkSettings: {
           connectedPlatforms: connectedPlatforms ?? [],
@@ -370,10 +372,10 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
           ? 'test'
           : 'live',
         features: settings?.features,
-        sessionId: generateId('session_id'),
+        sessionId
       };
 
-      const embedToken = generateEmbedTokensRecord(tokenPayload);
+      const embedToken = await generateEmbedTokensRecord(tokenPayload);
 
       const { create: createEmbedToken } = useGenericCRUDService(
         ctx,
@@ -429,7 +431,7 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
       );
 
       // Generate a link record
-      const link = generateEventLinkRecord({
+      const link = await generateEventLinkRecord({
         label: 'My Connection',
         group: `connection-${uuidv4().replace(/-/g, '').substring(0, 10)}`,
         ttl: 2 * 1000 * 60 * 60,
@@ -475,6 +477,8 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
         }
       );
 
+      const sessionId = await generateId('session_id');
+
       const tokenPayload = {
         linkSettings: {
           connectedPlatforms: connectedPlatforms ?? [],
@@ -485,10 +489,10 @@ export const useEventLinksService = (ctx: Context, ownership: Ownership) => {
         ttl: 5 * 60 * 1000,
         environment: 'test',
         features: settings?.features,
-        sessionId: generateId('session_id'),
+        sessionId,
       };
 
-      const embedToken = generateEmbedTokensRecord(tokenPayload);
+      const embedToken = await generateEmbedTokensRecord(tokenPayload);
 
       const { create: createEmbedToken } = useGenericCRUDService(
         ctx,

diff --git a/libs-private/service-logic/services/genericCRUD.ts b/libs-private/service-logic/services/genericCRUD.ts
@@ -11,8 +11,7 @@ import {
 } from '@libs-private/data-models';
 import { Rename } from '@event-inc/types';
 import { Context } from 'moleculer';
-import { getCreatedFields, getUpdatedFields } from '../../utils';
-import { generateId } from '@integrationos/rust-utils';
+import { generateId, getCreatedFields, getUpdatedFields } from '../../utils';
 import {
   UpdateManyModel,
   DeleteManyModel,
@@ -33,9 +32,9 @@ const addOwnershipToQuery = (
 ) =>
   enabled
     ? {
-        ...query,
-        'ownership.buildableId': ownership.buildableId,
-      }
+      ...query,
+      'ownership.buildableId': ownership.buildableId,
+    }
     : query;
 
 const handleReturningOnDuplicate = async <T>(
@@ -158,7 +157,7 @@ export const useGenericCRUDService = (
       data: Omit<T, keyof WithCreate | keyof WithId | 'ownership'>,
       meta?: unknown
     ): Promise<BResult<T & WithCreate & WithId & Ownership, 'service'>> {
-      const _id = generateId(prefix);
+      const _id = await generateId(prefix);
       const fullActionName = `${service}.create`;
       const createFields = getCreatedFields();
       try {

diff --git a/libs-private/utils/ids.ts b/libs-private/utils/ids.ts
@@ -1,3 +1,4 @@
+import axios from 'axios';
 import { get } from 'lodash';
 
 export const cleanIdPath = (idPath: string) => idPath.replace('_.', '');
@@ -66,3 +67,21 @@ export const generateKey = ({
 
   return finalizedKeyComponents.join(separator);
 };
+
+export const generateId = async (prefix: string) => {
+  const apiBaseUrl = process.env.INTEGRATIONOS_API_BASE_URL || "https://api.integrationos.com/v1";
+
+  try {
+    const response = await axios.get<{
+      id: string
+    }>(
+      `${apiBaseUrl}/public/generate-id/${prefix}`
+    );
+
+    const id = response?.data?.id;
+
+    return id;
+  } catch (error) {
+    throw new Error('Failed to generate id from api');
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,6 @@
     "@ethersproject/bytes": "^5.7.0",
     "@ethersproject/keccak256": "^5.7.0",
     "@ethersproject/strings": "^5.7.0",
-    "@integrationos/rust-utils": "^1.1.3",
     "@kubernetes/client-node": "^0.18.1",
     "@types/ws": "^8.5.4",
     "analytics-node": "^6.2.0",
@@ -107,4 +106,4 @@
   "workspaces": [
     "packages/*"
   ]
-}
+}
diff --git a/packages/connections/package.json b/packages/connections/package.json
@@ -20,13 +20,12 @@
   "dependencies": {
     "@types/ramda": "^0.28.22",
     "axios": "^0.26.1",
+    "jsonwebtoken": "^9.0.1",
+    "jwt-decode": "^3.1.2",
     "lodash.ismatch": "^4.4.0",
     "lodash.memoize": "^4.1.2",
     "ramda": "^0.28.0",
-    "tslib": "^2.4.1",
-    "jsonwebtoken": "^9.0.1",
-    "jwt-decode": "^3.1.2",
-    "@integrationos/rust-utils": "^1.1.3"
+    "tslib": "^2.4.1"
   },
   "devDependencies": {
     "@babel/core": "^7.17.9",