@aloma.io/integration-sdk 3.0.0-5 → 3.0.0-6

package/build/builder/index.d.mts

@@ -1,8 +1,6 @@
 import RuntimeContext from './runtime-context.mjs';
 export declare class Builder {
     private data;
-    id(what: string): Builder;
-    version(what: string): Builder;
     config(arg: any): Builder;
     options(arg: any): Builder;
     auth(arg: any): Builder;

package/build/builder/index.mjs

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 import parseTypes from './transform/index.mjs';
 import RuntimeContext from './runtime-context.mjs';
 import { fileURLToPath } from 'node:url';
@@ -11,18 +11,11 @@ const notEmpty = (what, name) => {
 };
 export class Builder {
     data = { controller: './build/controller/.controller-for-types.mts' };
-    id(what) {
-        this.data.id = notEmpty(what, 'id');
-        return this;
-    }
-    version(what) {
-        this.data.version = notEmpty(what, 'version');
-        return this;
-    }
     config(arg) {
         return this;
     }
     options(arg) {
+        this.data.options = arg;
         return this;
     }
     auth(arg) {
@@ -30,13 +23,13 @@ export class Builder {
     }
     async build() {
         const data = this.data;
-        notEmpty(data.id, 'id');
-        notEmpty(data.version, 'version');
         await this.discoverTypes();
         // validate config
         // validate options
         // validate auth
-        console.log('dirname', __dirname);
+        const packageJson = JSON.parse(fs.readFileSync(__dirname + '/../../../../../package.json', { encoding: 'utf-8' }));
+        notEmpty(data.id = packageJson.connectorId, 'id');
+        notEmpty(data.version = packageJson.version, 'version');
         // @ts-ignore
         const Controller = (await import(__dirname + '/../../../../../build/controller/index.mjs')).default;
         return new RuntimeContext(new Controller(), this.data);

package/build/builder/runtime-context.mjs

@@ -1,3 +1,4 @@
+import { AbstractController } from '../controller/index.mjs';
 import { Connector } from '../internal/index.cjs';
 export default class RuntimeContext {
     controller;
@@ -8,13 +9,17 @@ export default class RuntimeContext {
     }
     async start() {
         const controller = this.controller;
+        if (!(controller instanceof AbstractController))
+            throw new Error('the controller needs to extend AbstractController');
+        const data = this.data;
         const connector = new Connector({
-            id: this.data.id,
-            version: this.data.version,
-            name: `${this.data.id}/${this.data.version}`,
+            id: data.id,
+            version: data.version,
+            name: `${data.id}/${data.version}`,
         });
+        const configuration = connector.configure();
         const resolvers = {};
-        const methods = [...this.data.methods, '__endpoint', '__configQuery', '__default'];
+        const methods = [...data.methods, '__endpoint', '__configQuery', '__default'];
         methods.forEach((method) => {
             resolvers[method] = async (args) => {
                 console.log('call', method, args);
@@ -23,12 +28,11 @@ export default class RuntimeContext {
                 return controller[method](args);
             };
         });
-        console.log(this.data.types);
-        connector
-            .configure()
-            .types(this.data.types)
-            .resolvers(resolvers)
-            .main(async ({ newTask, updateTask, config, oauth, getClient }) => {
+        configuration.types(data.types).resolvers(resolvers);
+        if (data.options?.endpoint) {
+            configuration.endpoint((arg) => controller.__endpoint(arg));
+        }
+        configuration.main(async ({ newTask, updateTask, config, oauth, getClient }) => {
             try {
                 await controller._doStop();
                 await controller._doStart(config, oauth, newTask, updateTask, getClient);

package/build/controller/index.mjs

@@ -22,7 +22,7 @@ export class AbstractController {
         throw new Error('not implemented');
     }
     async __endpoint(arg) {
-        return Promise.resolve(null);
+        return this.endpoint(arg);
     }
     async __configQuery(arg) {
         return this.configQuery(arg);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aloma.io/integration-sdk",
-  "version": "3.0.0-5",
+  "version": "3.0.0-6",
   "description": "",
   "author": "aloma.io",
   "license": "Apache-2.0",

package/src/builder/index.mts

@@ -1,4 +1,4 @@
-import fs from 'fs';
+import fs from 'node:fs';
 import parseTypes from './transform/index.mjs';
 import RuntimeContext from './runtime-context.mjs';
 import {fileURLToPath} from 'node:url';
@@ -15,23 +15,12 @@ const notEmpty = (what, name) => {
 export class Builder {
   private data: any = {controller: './build/controller/.controller-for-types.mts'};
 
-  id(what: string): Builder {
-    this.data.id = notEmpty(what, 'id');
-
-    return this;
-  }
-
-  version(what: string): Builder {
-    this.data.version = notEmpty(what, 'version');
-
-    return this;
-  }
-
   config(arg: any): Builder {
     return this;
   }
 
   options(arg: any): Builder {
+    this.data.options = arg;
     return this;
   }
 
@@ -42,16 +31,18 @@ export class Builder {
   async build(): Promise<RuntimeContext> {
     const data = this.data;
 
-    notEmpty(data.id, 'id');
-    notEmpty(data.version, 'version');
-
     await this.discoverTypes();
 
     // validate config
     // validate options
     // validate auth
 
-    console.log('dirname', __dirname);
+
+    const packageJson = JSON.parse(fs.readFileSync(__dirname + '/../../../../../package.json', {encoding: 'utf-8'}));
+    
+    notEmpty(data.id = packageJson.connectorId, 'id');
+    notEmpty(data.version= packageJson.version, 'version');
+    
     // @ts-ignore
     const Controller = (await import(__dirname + '/../../../../../build/controller/index.mjs')).default;
 
@@ -64,7 +55,7 @@ export class Builder {
     const content = fs.readFileSync(this.data.controller);
     const {text, methods} = parseTypes(this.data.controller);
 
-    this.data.types = text;
+    this.data.types   = text;
     this.data.methods = methods;
   }
 }

package/src/builder/runtime-context.mts

@@ -6,15 +6,20 @@ export default class RuntimeContext {
 
   async start(): Promise<void> {
     const controller = this.controller;
-
+    
+    if (!(controller instanceof AbstractController)) throw new Error('the controller needs to extend AbstractController');
+    const data:any = this.data;
+    
     const connector = new Connector({
-      id: this.data.id,
-      version: this.data.version,
-      name: `${this.data.id}/${this.data.version}`,
+      id: data.id,
+      version: data.version,
+      name: `${data.id}/${data.version}`,
     });
 
+    const configuration = connector.configure();
+
     const resolvers: any = {};
-    const methods: string[] = [...this.data.methods, '__endpoint', '__configQuery', '__default'];
+    const methods: string[] = [...data.methods, '__endpoint', '__configQuery', '__default'];
 
     methods.forEach((method) => {
       resolvers[method] = async (args) => {
@@ -24,14 +29,15 @@ export default class RuntimeContext {
         return controller[method](args);
       };
     });
-
-    console.log(this.data.types);
-
-    connector
-      .configure()
-      .types(this.data.types)
-      .resolvers(resolvers)
-      .main(async ({newTask, updateTask, config, oauth, getClient}) => {
+    
+    configuration.types(data.types).resolvers(resolvers);    
+    
+    if (data.options?.endpoint)
+    {
+      configuration.endpoint((arg) => controller.__endpoint(arg));
+    }
+      
+      configuration.main(async ({newTask, updateTask, config, oauth, getClient}) => {
         try {
           await controller._doStop();
           await controller._doStart(config, oauth, newTask, updateTask, getClient);

package/src/controller/index.mts

@@ -31,7 +31,7 @@ export abstract class AbstractController {
   }
 
   async __endpoint(arg: any): Promise<any | null> {
-    return Promise.resolve(null);
+    return this.endpoint(arg);
   }
 
   async __configQuery(arg: any): Promise<any | null> {