@smythos/sre 1.5.9 → 1.5.11

package/dist/types/subsystems/IO/Storage.service/SmythFS.class.d.ts

@@ -1,5 +1,5 @@
 import { IAccessCandidate } from '@sre/types/ACL.types';
-import { StorageMetadata } from '@sre/types/Storage.types';
+import { StorageData, StorageMetadata } from '@sre/types/Storage.types';
 import { StorageConnector } from './StorageConnector';
 import { CacheConnector } from '@sre/MemoryManager/Cache.service/CacheConnector';
 export type TSmythFSURI = {
@@ -24,7 +24,8 @@ export declare class SmythFS {
      * @returns
      */
     read(uri: string, candidate?: IAccessCandidate): Promise<Buffer>;
-    write(uri: string, data: any, candidate?: IAccessCandidate, metadata?: StorageMetadata, ttl?: number): Promise<void>;
+    getMetadata(uri: string, candidate?: IAccessCandidate): Promise<Record<string, any>>;
+    write(uri: string, data: StorageData, candidate?: IAccessCandidate, metadata?: StorageMetadata, ttl?: number): Promise<void>;
     delete(uri: string, candidate?: IAccessCandidate): Promise<void>;
     exists(uri: string, candidate?: IAccessCandidate): Promise<boolean>;
     genTempUrl(uri: string, candidate?: IAccessCandidate, ttlSeconds?: number): Promise<string>;

package/dist/types/subsystems/IO/Storage.service/connectors/S3Storage.class.d.ts

@@ -1,10 +1,12 @@
 import { StorageConnector } from '@sre/IO/Storage.service/StorageConnector';
 import { ACL } from '@sre/Security/AccessControl/ACL.class';
 import { IAccessCandidate, IACL } from '@sre/types/ACL.types';
-import { AWSRegionConfig, AWSCredentials } from '@sre/types/AWS.types';
 import { StorageData, StorageMetadata } from '@sre/types/Storage.types';
 import { AccessRequest } from '@sre/Security/AccessControl/AccessRequest.class';
-export type S3Config = AWSCredentials & AWSRegionConfig & {
+export type S3Config = {
+    region: string;
+    accessKeyId: string;
+    secretAccessKey: string;
     bucket: string;
 };
 export declare class S3Storage extends StorageConnector {

package/dist/types/subsystems/Security/AccessControl/AccessCandidate.class.d.ts

@@ -4,6 +4,7 @@ export declare class AccessCandidate implements IAccessCandidate {
     role: TAccessRole;
     id: string;
     constructor(candidate?: IAccessCandidate);
+    private _validateId;
     toString(): string;
     get request(): AccessRequest;
     get readRequest(): AccessRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smythos/sre",
-  "version": "1.5.9",
+  "version": "1.5.11",
   "description": "Smyth Runtime Environment",
   "author": "Alaa-eddine KADDOURI",
   "license": "MIT",

package/src/subsystems/AgentManager/Agent.class.ts

@@ -17,6 +17,7 @@ import { AccessCandidate } from '@sre/Security/AccessControl/AccessCandidate.cla
 
 const console = Logger('Agent');
 const idPromise = (id) => id;
+const MAX_LATENCY = 50;
 
 export class Agent implements IAgent {
     public name: any;
@@ -302,9 +303,9 @@ export class Agent implements IAgent {
             step = await this.agentRuntime.runCycle();
 
             //adjust latency based on cpu load
-            const qosLatency = Math.floor(OSResourceMonitor.cpu.load * this.planInfo?.maxLatency || 0);
+            const qosLatency = Math.floor(OSResourceMonitor.cpu.load * MAX_LATENCY || 0);
 
-            await delay(30 + qosLatency);
+            await delay(10 + qosLatency);
         } while (!step?.finalResult && !this._kill);
 
         if (this._kill) {

package/src/subsystems/IO/Storage.service/SmythFS.class.ts

@@ -113,7 +113,24 @@ export class SmythFS {
         return data ? this.toBuffer(data) : null;
     }
 
-    public async write(uri: string, data: any, candidate?: IAccessCandidate, metadata?: StorageMetadata, ttl?: number) {
+
+    public async getMetadata(uri: string, candidate?: IAccessCandidate) {
+        const smythURI = await this.URIParser(uri);
+        if (!smythURI) throw new Error('Invalid Resource URI');
+        candidate = candidate || smythURI.defaultCandidate; //fallback to default candidate if not provided
+
+        const accountConnector = ConnectorService.getAccountConnector();
+        const isMember = await accountConnector.isTeamMember(smythURI.team, candidate);
+        if (!isMember) throw new Error('Access Denied');
+
+        const resourceId = `teams/${smythURI.team}${smythURI.path}`;
+
+        const _candidate = candidate instanceof AccessCandidate ? candidate : new AccessCandidate(candidate);
+
+        return await this.storage.requester(_candidate).getMetadata(resourceId);
+    }
+
+    public async write(uri: string, data: StorageData, candidate?: IAccessCandidate, metadata?: StorageMetadata, ttl?: number) {
         const smythURI = await this.URIParser(uri);
         if (!smythURI) throw new Error('Invalid Resource URI');
         candidate = candidate || smythURI.defaultCandidate; //fallback to default candidate if not provided
@@ -380,10 +397,10 @@ export class SmythFS {
             let candidate: IAccessCandidate;
             if (user) {
                 candidate = AccessCandidate.user(user);
-                basePath = '/' + user;
+                basePath = '.user/' + user;
             } else if (agent) {
                 candidate = AccessCandidate.agent(agent);
-                basePath = '/' + agent;
+                basePath = '.agent/' + agent;
             }
 
             if (candidate) {

package/src/subsystems/IO/Storage.service/connectors/LocalStorage.class.ts

@@ -25,6 +25,8 @@ export type LocalStorageConfig = {
     folder?: string;
 };
 
+//TODO : detect and store ContentType metadata when saving
+
 export class LocalStorage extends StorageConnector {
     public name = 'LocalStorage';
     private folder: string;

package/src/subsystems/IO/Storage.service/connectors/S3Storage.class.ts

@@ -43,7 +43,15 @@ import { ConnectorService } from '@sre/Core/ConnectorsService';
 
 const console = Logger('S3Storage');
 
-export type S3Config = AWSCredentials & AWSRegionConfig & { bucket: string };
+//export type S3Config = AWSCredentials & AWSRegionConfig & { bucket: string };
+
+//We need to flatten the S3Config type in order to make it work with the SDK
+export type S3Config = {
+    region: string;
+    accessKeyId: string;
+    secretAccessKey: string;
+    bucket: string;
+};
 
 export class S3Storage extends StorageConnector {
     public name = 'S3Storage';

package/src/subsystems/Security/AccessControl/AccessCandidate.class.ts

@@ -9,7 +9,13 @@ export class AccessCandidate implements IAccessCandidate {
         //this._candidate = candidate || { role: TAccessRole.Public, id: '' };
 
         this.role = candidate ? candidate.role : TAccessRole.Public;
-        this.id = candidate ? candidate.id : '';
+        this.id = candidate ? this._validateId(candidate.id) : '';
+    }
+
+    private _validateId(id: string) {
+        if (/[^a-zA-Z0-9-]/.test(id))
+            throw new Error('Access Candidate ID can only contain alphanumeric characters and hyphens');
+        return id;
     }
 
     public toString(): string {