@surph_ai/sdk 0.0.16 → 0.0.18

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surph_ai/sdk",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "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,10 +2,11 @@
   "name": "tool-template",
   "version": "0.0.0",
   "private": true,
+  "type": "module",
   "scripts": {
-    "dev": "npm run build && npm run watch && surph toolserver & surph chatserver",
+    "dev": "npm run build && concurrently \"npm run watch\" \"surph toolserver\" \"surph chatserver\"",
     "test": "",
-    "build": "rm -rf dist && tsc",
+    "build": "rimraf dist && tsc",
     "watch": "tsc -w",
     "publish": "npm run build && surph publish",
     "deploy": "npm run build && surph deploy"
@@ -14,9 +15,11 @@
     "@vinely-ai/sdk": "^0.0.6"
   },
   "devDependencies": {
-    "@surph_ai/sdk": "^0.0.13",
+    "@surph_ai/sdk": "^0.0.17",
     "@types/node": "^20.11.0",
+    "concurrently": "^10.0.5",
     "nodemon": "^2.0.2",
+    "rimraf": "^6.1.3",
     "typescript": "^5.3.3"
   }
 }

package/toolserver/routes/tool.js

@@ -1,8 +1,14 @@
 const { Router, response } = require('express')
-// const tools = require('../../../../../tools')
-const tools = require('../../../../../dist/tools')
+const path = require('path')
+const { pathToFileURL } = require('url')
 const manifest = require('../../../../../manifest.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) => {
@@ -40,11 +46,7 @@ router.get('/', async (req, res, next) => {
 
 router.get('/:tool', async (req, res, next) => {
   try {
-    // const tool = tools[req.params.tool]
-    // if (!tool) {
-    //   throw new Error(`Tool ${req.params.tool} not found.`)
-    // }
-
+    const tools = await loadTool()
     const response = await handler(req.query, tools)
     res.json({ response })
   } catch (error) {
@@ -58,18 +60,15 @@ router.get('/:tool', async (req, res, next) => {
 })
 
 router.post('/custom', async (req, res, next) => {
-  // console.log('TOOL CALL: ' + JSON.stringify(req.body))
   try {
     const { name, args, tool, user = null } = req.body;
-    // console.log('TOOL CALL: ' + name)
-    // console.log('TOOL ARGS: ' + JSON.stringify(args))
 
     if (process.env.SURPH_TOOL !== tool.slug) {
       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) {
     res.json({