@surph_ai/sdk 0.0.17 → 0.0.19

package/deploy/tool-handler.js

@@ -1,19 +1,15 @@
-const tool = require('./dist/tools')
+import tool from './dist/tools/index.js';
 
-const handler = async (event) => {
+export const handler = async (event) => {
   const { args = {} } = event;
   let payload = null;
   try {
-      payload = await tool(args);
+    payload = await tool(args);
+  } catch (error) {
+    payload = error instanceof Error ? error.message : String(error);
   }
-  catch (error) {
-      payload = error instanceof Error ? error.message : String(error);
-  }
-  const response = {
-      statusCode: 200,
-      body: JSON.stringify(payload),
+  return {
+    statusCode: 200,
+    body: JSON.stringify(payload),
   };
-  return response;
 };
-
-exports.handler = handler;

package/index.js

@@ -8,6 +8,7 @@
 
 const { Command } = require('commander')
 const path = require('path')
+const fs = require('fs')
 const dotenv = require('dotenv')
 const prompt = require('prompt')
 const shell = require('shelljs')
@@ -36,6 +37,23 @@ const ERRORS = {
   NOT_AUTHORIZED: { exitCode: 102 },
 };
 
+const surphSession = async () => {
+  try {
+    const userSessionPath = path.resolve(__dirname, '../../../.surph/session.json')
+    if (!fs.existsSync(userSessionPath)) {
+      console.log('Not logged in.')
+      return null
+    }
+    
+    const file = fs.readFileSync(userSessionPath, 'utf-8')
+    const session = JSON.parse(file)
+    return session
+  } catch (error) {
+    console.log('Not logged in.')
+    return null
+  }
+}
+
 const program = new Command()
 
 program.version(VERSION, '-v, --version', 'output the current version')
@@ -61,14 +79,24 @@ program.command('version')
 program.command('profile')
 .description('Current Surph user')
 .action(async (cmd, options) => {
-  const user = await auth.currentUser()
-  if (user === false) {
-    program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
-      ERRORS.NOT_LOGGED_IN);
-  }
-
-  const text = `${colors.cyan(`\nLogged in as: `)} ${colors.brightGreen(`${user.username}`)}\n`
-  console.log(text)
+  // const userSessionPath = path.resolve(__dirname, '../../../.surph/session.json')
+  // if (!fs.existsSync(userSessionPath)) {
+  //   console.log('SESSION NOT FOUND:')
+  //   return
+  // }
+
+  // const file = fs.readFileSync(userSessionPath, 'utf-8')
+  // const data = JSON.parse(file)
+  // console.log('SESSION FOUND:' + JSON.stringify(data))
+
+  // const user = await auth.currentUser()
+  // if (user === false) {
+  //   program.error(`${colors.cyan('\nNot logged in. To log in:')}\n\n${colors.white('$ vly login')}`,
+  //     ERRORS.NOT_LOGGED_IN);
+  // }
+
+  // const text = `${colors.cyan(`\nLogged in as: `)} ${colors.brightGreen(`${user.username}`)}\n`
+  // console.log(text)
 })
 
 /*
@@ -230,24 +258,38 @@ program.command('publish')
 .description('Publish Surph tool')
 .action(async (cmd, options) => {
   try {
-    const manifest = require('../../../tools/manifest.json')
-
-    // TODO: if not found try root directory.
+    const manifest = require('../../../manifest.json')
     if (!manifest) {
       throw new Error('manifest.json not found')
     }
 
     const keys = Object.keys(manifest)
     if (keys.length === 0) {
-      throw new Error('invalide manifest.json')
+      throw new Error('invalid manifest.json')
     }
 
-    const slug = keys[0]
+    const session = await surphSession()
+    if (!session) {
+      throw new Error('Not logged in.')
+    }
+
+    // console.log('SESSION: ' + JSON.stringify(session))
+    const userId = session?.userId
+
+    let resp = await fetch(`${SURPH_REST_URL}/rest/user/${userId}`, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        'x-surph-client': 'surph-sdk'
+      }
+    })
+
+    const { payload: user } = await resp.json()
+    // console.log('USER: ' + JSON.stringify(user))
 
-    // console.log('Publish Surph tool: ' + JSON.stringify(manifest[slug]))
 
-    const url = `${SURPH_REST_URL}/rest/tool?slug=${slug}`
-    let resp = await fetch(url, {
+    const slug = keys[0]
+    resp = await fetch(`${SURPH_REST_URL}/rest/tool?slug=${slug}`, {
       method: 'GET',
       headers: {
         Accept: 'application/json',
@@ -257,11 +299,20 @@ program.command('publish')
 
     const { payload } = await resp.json()
 
+    const toolJson = manifest[slug]
+
     // tool not registered yet, create:
     if (payload.length === 0) {
       const resp = await fetch(url, {
         method: 'POST',
-        body: JSON.stringify(manifest[slug]),
+        body: JSON.stringify({
+          ...toolJson,
+          creator: {
+            _id: user._id,
+            username: user.username,
+            avatar: user.avatar
+          }
+        }),
         headers: {
           Accept: 'application/json',
           'Content-Type': 'application/json',
@@ -276,7 +327,14 @@ program.command('publish')
 
     resp = await fetch(`${SURPH_REST_URL}/rest/tool/${payload[0]._id}`, {
       method: 'PUT',
-      body: JSON.stringify(manifest[slug]),
+      body: JSON.stringify({
+        ...toolJson,
+        creator: {
+          _id: user._id,
+          username: user.username,
+          avatar: user.avatar
+        }
+      }),
       headers: {
         Accept: 'application/json',
         'Content-Type': 'application/json',
@@ -285,11 +343,9 @@ program.command('publish')
     })
   
     const data = await resp.json()
-    console.log('\nSurph tool updated: ' + JSON.stringify(data.payload))
-
-
+    console.log('\nSurph tool updated.')
   } catch (error) {
-    
+    console.log(colors.red('\nError: '+error.message+'\n'))
   }
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/sdk",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "",
   "main": "index.js",
   "publishConfig": {

package/scaffold/index.js

@@ -119,10 +119,11 @@ module.exports = (name, type = 'app') => {
     const envStr = utils.readFile(path.join(__dirname, 'tool/env.txt'))
     utils.write('.env', envStr.replace('<SURPH_TOOL>', slug))
 
-    utils.write('tsconfig.json', JSON.stringify({
+    const tsConfig = {
       "compilerOptions": {
         "target": "ES2022",
-        "module": "commonjs",
+        "module": "Node16",
+        "moduleResolution": "Node16",
         "lib": ["ES2022"],
         "types": ["node"],
         "outDir": "./dist",
@@ -135,7 +136,9 @@ module.exports = (name, type = 'app') => {
       },
       "include": ["tools/**/*.ts"],
       "exclude": ["node_modules", "dist"]
-    }, null, 2) + '\n')
+    }
+
+    utils.write('tsconfig.json', JSON.stringify(tsConfig, null, 2) + '\n')
 
     console.log('\n- - - - - Next Steps - - - - - ')
     console.log('1. $ cd ' + name)

package/scaffold/tool/package.json

@@ -2,6 +2,7 @@
   "name": "tool-template",
   "version": "0.0.0",
   "private": true,
+  "type": "module",
   "scripts": {
     "dev": "npm run build && concurrently \"npm run watch\" \"surph toolserver\" \"surph chatserver\"",
     "test": "",
@@ -14,7 +15,7 @@
     "@vinely-ai/sdk": "^0.0.6"
   },
   "devDependencies": {
-    "@surph_ai/sdk": "^0.0.16",
+    "@surph_ai/sdk": "^0.0.17",
     "@types/node": "^20.11.0",
     "concurrently": "^10.0.5",
     "nodemon": "^2.0.2",

package/toolserver/app.js

@@ -8,6 +8,14 @@ vinely.configureApp(app, {
   static: 'public',
 })
 
+app.use((req, res, next) => {
+  res.setHeader('Access-Control-Allow-Origin', '*')
+  res.header('Access-Control-Allow-Headers', 'x-surph-user, Content-Type');
+  res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+  if (req.method === 'OPTIONS') return res.sendStatus(204);
+  next()
+})
+
 const index = require('./routes/index')
 const tool = require('./routes/tool')
 

package/toolserver/routes/tool.js

@@ -1,11 +1,23 @@
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
 const { Router, response } = require('express')
-// const tools = require('../../../../../tools')
-const tools = require('../../../../../dist/tools')
+const { pathToFileURL } = require('url')
 const manifest = require('../../../../../manifest.json')
 
+const SESSION_DIR = path.resolve(__dirname, '../../../../../.surph')
+const SESSION_FILE = path.join(SESSION_DIR, 'session.json')
+
+const toolsPath = pathToFileURL(
+  path.resolve(__dirname, '../../../../../dist/tools/index.js')
+).href
+
+const loadTool = () => import(toolsPath).then((mod) => mod.default)
+
 const router = Router()
 
 const handler = async (args, tool) => {
+  console.log('HANDLER: ' + JSON.stringify(Object.keys(tool)))
   let payload = null
   let errorMsg = null
   try {
@@ -26,6 +38,24 @@ const handler = async (args, tool) => {
 }
 
 router.get('/', async (req, res, next) => {
+  const surphUser = req.headers['x-surph-user']
+  if (surphUser) {
+    try {
+      // console.log('SAVE SURPH USER: ' + surphUser)
+      fs.mkdirSync(SESSION_DIR, { recursive: true, mode: 0o700 })
+      fs.writeFileSync(
+        SESSION_FILE,
+        JSON.stringify({
+          userId: surphUser,
+          updatedAt: new Date().toISOString()
+        }, null, 2),
+        { mode: 0o600 }
+      )
+    } catch (error) {
+      console.warn('[sdk] session write failed:', error.message)
+    }  
+  }
+
   try {
     res.json({ response: manifest })
   } catch (error) {
@@ -38,13 +68,13 @@ router.get('/', async (req, res, next) => {
   }
 })
 
-router.get('/:tool', async (req, res, next) => {
+router.get('/test', async (req, res, next) => {
   try {
-    // const tool = tools[req.params.tool]
-    // if (!tool) {
-    //   throw new Error(`Tool ${req.params.tool} not found.`)
-    // }
+    if (Object.keys(req.query).length === 0) {
+      throw new Error('No arguments provided.')
+    }
 
+    const tools = await loadTool()
     const response = await handler(req.query, tools)
     res.json({ response })
   } catch (error) {
@@ -68,10 +98,12 @@ router.post('/custom', async (req, res, next) => {
       throw new Error(`Invalid tool ${tool.slug}. Check .env file.`)
     }
 
+    const tools = await loadTool()
     const response = await handler(args, tools)
     // console.log('TOOL RESP: ' + JSON.stringify(response))
     res.json({ response })
   } catch (error) {
+    // console.log('TOOL ERR: ' + error.message)
     res.json({
       response: {
         success: false,