@hautechai/sdk 0.0.14 → 0.0.16

package/dist/sdk/index.d.ts

@@ -163,18 +163,37 @@ export declare const createSDK: (options: SDKOptions) => {
         }) => Promise<import("../types").OperationEntity>;
     };
     pipelines: {
+        constructTemplate: (consructPipeline: (pipeline: import("@hautechai/pipelines").Pipeline<{
+            collections: {
+                create: (params: import("../autogenerated").CreateCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
+                get: (params: import("../autogenerated").GetCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
+            };
+            stacks: {
+                create: (params: import("../autogenerated").CreateStackParamsDto) => Promise<import("../types").StackEntity>;
+                get: (params: import("../autogenerated").ListStacksParamsDto) => Promise<import("../types").StackEntity>;
+            };
+        }>) => import("@hautechai/pipelines").Pipeline<{
+            collections: {
+                create: (params: import("../autogenerated").CreateCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
+                get: (params: import("../autogenerated").GetCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
+            };
+            stacks: {
+                create: (params: import("../autogenerated").CreateStackParamsDto) => Promise<import("../types").StackEntity>;
+                get: (params: import("../autogenerated").ListStacksParamsDto) => Promise<import("../types").StackEntity>;
+            };
+        }>) => import("@hautechai/pipelines").Pipeline<{
+            collections: {
+                create: (params: import("../autogenerated").CreateCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
+                get: (params: import("../autogenerated").GetCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
+            };
+            stacks: {
+                create: (params: import("../autogenerated").CreateStackParamsDto) => Promise<import("../types").StackEntity>;
+                get: (params: import("../autogenerated").ListStacksParamsDto) => Promise<import("../types").StackEntity>;
+            };
+        }>;
         create: (props: {
             metadata?: any;
-            tasks: (pipeline: ReturnType<() => import("@hautechai/pipelines").Pipeline<{
-                collections: {
-                    create: (params: import("../autogenerated").CreateCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
-                    get: (params: import("../autogenerated").GetCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
-                };
-                stacks: {
-                    create: (params: import("../autogenerated").CreateStackParamsDto) => Promise<import("../types").StackEntity>;
-                    get: (params: import("../autogenerated").ListStacksParamsDto) => Promise<import("../types").StackEntity>;
-                };
-            }>>) => ReturnType<() => import("@hautechai/pipelines").Pipeline<{
+            template: import("@hautechai/pipelines").Pipeline<{
                 collections: {
                     create: (params: import("../autogenerated").CreateCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
                     get: (params: import("../autogenerated").GetCollectionParamsDto) => Promise<import("../types").CollectionEntity>;
@@ -183,7 +202,7 @@ export declare const createSDK: (options: SDKOptions) => {
                     create: (params: import("../autogenerated").CreateStackParamsDto) => Promise<import("../types").StackEntity>;
                     get: (params: import("../autogenerated").ListStacksParamsDto) => Promise<import("../types").StackEntity>;
                 };
-            }>>;
+            }>;
         }) => Promise<import("../types").PipelineEntity>;
         get: (props: {
             id: string;

package/dist/sdk/index.js

@@ -3,7 +3,7 @@ import balances from './balances';
 import collections from './collections';
 import groups from './groups';
 import images from './images';
-import { jwtDecode } from 'jwt-decode';
+import { decodeJwt } from 'jose';
 import operations from './operations';
 import pipelines from './pipelines';
 import stacks from './stacks';
@@ -13,7 +13,7 @@ export const createSDK = (options) => {
     let token = undefined;
     const authToken = async () => {
         if (token) {
-            const decoded = jwtDecode(token);
+            const decoded = decodeJwt(token);
             const currentTime = Math.floor(Date.now() / 1000);
             if (decoded.exp && decoded.exp > currentTime)
                 return token;

package/dist/sdk/pipelines/index.d.ts

@@ -2,9 +2,37 @@ import { CollectionEntity, CreateCollectionParamsDto, CreateStackParamsDto, GetC
 import { SDKOptions } from '../../types';
 import { Pipeline } from '@hautechai/pipelines';
 declare const pipelines: (options: SDKOptions) => {
+    constructTemplate: (consructPipeline: (pipeline: Pipeline<{
+        collections: {
+            create: (params: CreateCollectionParamsDto) => Promise<CollectionEntity>;
+            get: (params: GetCollectionParamsDto) => Promise<CollectionEntity>;
+        };
+        stacks: {
+            create: (params: CreateStackParamsDto) => Promise<StackEntity>;
+            get: (params: ListStacksParamsDto) => Promise<StackEntity>;
+        };
+    }>) => Pipeline<{
+        collections: {
+            create: (params: CreateCollectionParamsDto) => Promise<CollectionEntity>;
+            get: (params: GetCollectionParamsDto) => Promise<CollectionEntity>;
+        };
+        stacks: {
+            create: (params: CreateStackParamsDto) => Promise<StackEntity>;
+            get: (params: ListStacksParamsDto) => Promise<StackEntity>;
+        };
+    }>) => Pipeline<{
+        collections: {
+            create: (params: CreateCollectionParamsDto) => Promise<CollectionEntity>;
+            get: (params: GetCollectionParamsDto) => Promise<CollectionEntity>;
+        };
+        stacks: {
+            create: (params: CreateStackParamsDto) => Promise<StackEntity>;
+            get: (params: ListStacksParamsDto) => Promise<StackEntity>;
+        };
+    }>;
     create: (props: {
         metadata?: any;
-        tasks: (pipeline: ReturnType<() => Pipeline<{
+        template: Pipeline<{
             collections: {
                 create: (params: CreateCollectionParamsDto) => Promise<CollectionEntity>;
                 get: (params: GetCollectionParamsDto) => Promise<CollectionEntity>;
@@ -13,16 +41,7 @@ declare const pipelines: (options: SDKOptions) => {
                 create: (params: CreateStackParamsDto) => Promise<StackEntity>;
                 get: (params: ListStacksParamsDto) => Promise<StackEntity>;
             };
-        }>>) => ReturnType<() => Pipeline<{
-            collections: {
-                create: (params: CreateCollectionParamsDto) => Promise<CollectionEntity>;
-                get: (params: GetCollectionParamsDto) => Promise<CollectionEntity>;
-            };
-            stacks: {
-                create: (params: CreateStackParamsDto) => Promise<StackEntity>;
-                get: (params: ListStacksParamsDto) => Promise<StackEntity>;
-            };
-        }>>;
+        }>;
     }) => Promise<PipelineEntity>;
     get: (props: {
         id: string;

package/dist/sdk/pipelines/index.js

@@ -23,10 +23,11 @@ const pipelines = (options) => {
         },
     });
     return {
+        constructTemplate: (consructPipeline) => consructPipeline(createPipeline()),
         create: async (props) => api.call({
             run: (methods) => methods.pipelinesControllerCreatePipelineV1({
                 metadata: props.metadata,
-                tasks: props.tasks(createPipeline()).tasks,
+                tasks: props.template.tasks,
             }),
         }),
         get: async (props) => api.callWithReturningUndefinedOn404({

package/dist/token/index.d.ts

@@ -8,8 +8,8 @@ export declare const createTokenSigner: (options: {
         accountId: string;
         expiresInSeconds: number;
         permissions?: Partial<MethodsPermissions>;
-    }) => any;
+    }) => Promise<string>;
     createRootToken: (props: {
         expiresInSeconds: number;
-    }) => any;
+    }) => Promise<string>;
 };

package/dist/token/index.js

@@ -1,4 +1,5 @@
-import { defaultPermissions, defaultRootPermissions } from './permissions';
+import { defaultPermissions } from './permissions';
+import * as jose from 'jose';
 const createPrivateKey = (key) => {
     const header = `-----BEGIN PRIVATE KEY-----\n`;
     const footer = `\n-----END PRIVATE KEY-----`;
@@ -6,15 +7,15 @@ const createPrivateKey = (key) => {
     const keyBody = key.match(/.{1,64}/g).join('\n');
     return header + keyBody + footer;
 };
-// This function will not work in the browser
-const createToken = (props) => {
-    const jwt = require('jsonwebtoken');
-    const privateKey = createPrivateKey(props.appKeySecret);
-    return jwt.sign(props.payload, privateKey, {
-        algorithm: 'RS256',
-        expiresIn: props.expiresInSeconds,
-        keyid: props.appKeyId,
-    });
+const createToken = async (props) => {
+    const alg = 'RS256';
+    const pkcs8 = createPrivateKey(props.appKeySecret);
+    const privateKey = await jose.importPKCS8(pkcs8, alg);
+    return await new jose.SignJWT(props.payload)
+        .setIssuedAt()
+        .setExpirationTime(`${props.expiresInSeconds}s`)
+        .setProtectedHeader({ alg, kid: props.appKeyId })
+        .sign(privateKey);
 };
 const serializePermissions = (permissions) => {
     const result = [];
@@ -32,7 +33,7 @@ const serializePermissions = (permissions) => {
     return result;
 };
 export const createTokenSigner = (options) => ({
-    createAccountToken: (props) => createToken({
+    createAccountToken: async (props) => createToken({
         appKeyId: options.appKeyId,
         appKeySecret: options.appKeySecret,
         expiresInSeconds: props.expiresInSeconds,
@@ -42,13 +43,13 @@ export const createTokenSigner = (options) => ({
             sub: props.accountId,
         },
     }),
-    createRootToken: (props) => createToken({
+    createRootToken: async (props) => createToken({
         appKeyId: options.appKeyId,
         appKeySecret: options.appKeySecret,
         expiresInSeconds: props.expiresInSeconds ?? 3600,
         payload: {
             iss: options.appId,
-            permissions: serializePermissions(defaultRootPermissions),
+            permissions: ['*'],
         },
     }),
 });

package/dist/token/permissions.d.ts

@@ -1,3 +1,2 @@
 import { MethodsPermissions } from '../autogenerated/permissions';
 export declare const defaultPermissions: MethodsPermissions;
-export declare const defaultRootPermissions: MethodsPermissions;

package/dist/token/permissions.js

@@ -16,21 +16,3 @@ export const defaultPermissions = {
     stacks: { create: true, items: { add: true, remove: true }, read: true, metadata: { update: true } },
     storage: { create: true, delete: true, read: true, update: true },
 };
-export const defaultRootPermissions = {
-    access: { add: true, read: true, remove: true },
-    accounts: { create: true, read: true },
-    balances: { read: true, self: { read: true, update: true }, update: true },
-    collections: {
-        create: true,
-        items: { add: true, read: true, remove: true },
-        read: true,
-        update: true,
-    },
-    groups: { accounts: { add: true, read: true, remove: true }, create: true, delete: true, read: true },
-    images: { create: true, read: true },
-    operations: { create: true, read: true, metadata: { update: true } },
-    pipelines: { create: true, read: true, update: true },
-    poses: { create: true, read: true },
-    stacks: { create: true, items: { add: true, remove: true }, read: true, metadata: { update: true } },
-    storage: { create: true, delete: true, read: true, update: true },
-};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hautechai/sdk",
-    "version": "0.0.14",
+    "version": "0.0.16",
     "license": "MIT",
     "keywords": [],
     "repository": {
@@ -19,8 +19,7 @@
     "dependencies": {
         "@hautechai/pipelines": "0.1.0",
         "axios": "1.6.1",
-        "jsonwebtoken": "8.5.1",
-        "jwt-decode": "4.0.0",
+        "jose": "5.9.6",
         "pusher-js": "8.4.0-rc2"
     },
     "devDependencies": {

package/jest.setup.js

@@ -1,5 +0,0 @@
-const originalError = console.error;
-
-console.error = (...args) => {
-    originalError(...args);
-};