@aebzx/slang-tool 1.0.0 → 1.0.1

package/command.ts

@@ -210,8 +210,12 @@ async function config_verify(){
 }
 async function register(username:string,email:string){
     let config=global_config()
-    await net.user.register(username,email)
-    console.log('注册成功,token已经发送到邮箱')
+    //服务端 register 在响应中返回 token(即使 SMTP 不可用也能拿到),自动写入全局配置
+    let res=await net.user.register(username,email)
+    config.username=username
+    config.token=res.token
+    write_global_config(config)
+    console.log('注册成功,token已配置到全局配置,可直接 publish')
 }
 function compiler(){
     //读取虚拟环境运行:编译器是 init 时下载到 venv/compiler.js 的 JS 文件,用 node 执行

package/dist/cli.js

@@ -15400,65 +15400,67 @@ async function download_module(name, version) {
 	})).data), "base64");
 }
 async function download_compiler(large_version, small_version) {
-	return check(await ajax.post("/api/download/compiler", {
+	return check((await ajax.post("/api/download/compiler", {
 		large_version,
 		small_version
-	}));
+	})).data);
 }
 async function list_vm() {
-	return check(await ajax.get("/api/list/vm"));
+	return check((await ajax.get("/api/list/vm")).data);
 }
 async function list_module() {
-	return check(await ajax.get("/api/list/module"));
+	return check((await ajax.get("/api/list/module")).data);
 }
 async function list_compiler() {
-	return check(await ajax.get("/api/list/compiler"));
+	return check((await ajax.get("/api/list/compiler")).data);
 }
 async function publish_vm$1(author, token, module, data) {
-	return check(await ajax.post("/api/publish/vm", {
+	return check((await ajax.post("/api/publish/vm", {
 		author,
 		token,
 		module,
 		data
-	}));
+	})).data);
 }
 async function publish_module$1(author, token, module, data) {
-	return check(await ajax.post("/api/publish/module", {
+	return check((await ajax.post("/api/publish/module", {
 		author,
 		token,
 		module,
 		data
-	}));
+	})).data);
 }
 async function publish_compiler$1(author, token, version, type, data) {
-	return check(await ajax.post("/api/publish/compiler/add", {
+	return check((await ajax.post("/api/publish/compiler/add", {
 		author,
 		token,
 		version,
 		type,
 		data
-	}));
+	})).data);
 }
 async function create_compiler$1(author, token, license, version) {
-	return check(await ajax.post("/api/publish/compiler/create", {
+	return check((await ajax.post("/api/publish/compiler/create", {
 		author,
 		token,
 		license,
 		version
-	}));
+	})).data);
 }
 async function register$1(username, email) {
-	return check(await ajax.post("/api/register", {
+	return check((await ajax.post("/api/register", {
 		username,
 		email
-	}));
+	})).data);
 }
 async function verify(username, token) {
 	if ((await ajax.get("/api/health")).data.message != "is SPM Server") return "不是SPM服务器";
-	return check(await ajax.post("/api/verify", {
+	let res = (await ajax.post("/api/verify", {
 		username,
 		token
-	})) ? "" : "用户不存在或者token配置不正确";
+	})).data;
+	if (res.code != 200 || !res.data) return "用户不存在或者token配置不正确";
+	return "";
 }
 var net_default = {
 	download: {
@@ -15693,9 +15695,12 @@ async function config_verify() {
 	if (data != "") throw new Error(data);
 }
 async function register(username, email) {
-	global_config();
-	await net_default.user.register(username, email);
-	console.log("注册成功,token已经发送到邮箱");
+	let config = global_config();
+	let res = await net_default.user.register(username, email);
+	config.username = username;
+	config.token = res.token;
+	write_global_config(config);
+	console.log("注册成功,token已配置到全局配置,可直接 publish");
 }
 function compiler() {
 	let config = project_config(process.cwd());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aebzx/slang-tool",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "",
   "main": "index.js",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "test": "vitest run",
-    "publish": "npm publish"
+    "pub": "npm publish"
   },
   "bin": {
     "slang": "dist/cli.js"

package/test/net.test.ts

@@ -0,0 +1,107 @@
+//cli net 层单元测试:验证 check() 正确处理 axios 响应
+//关键点:ajax 返回 axios 响应 {status,data:Result},check 应接收 Result 而非整个响应
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('../utils/ajax.ts', () => ({
+    default: {
+        get: vi.fn(),
+        post: vi.fn()
+    }
+}))
+
+import net from '../utils/net.ts'
+import ajax from '../utils/ajax.ts'
+
+const mockPost = ajax.post as ReturnType<typeof vi.fn>
+const mockGet = ajax.get as ReturnType<typeof vi.fn>
+
+//axios 响应形状:Result 在 .data 里
+const axiosRes = (result: any) => ({ data: result, status: result.code, statusText: '', headers: {}, config: {} })
+
+beforeEach(() => {
+    vi.clearAllMocks()
+})
+
+describe('register', () => {
+    it('服务端返回 200 时不抛错并返回 token', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Registration successful', data: { token: 'abc123' }, code: 200 }))
+        const res = await net.user.register('alice', 'alice@spm.dev')
+        expect(res).toEqual({ token: 'abc123' })
+        expect(mockPost).toHaveBeenCalledWith('/api/register', { username: 'alice', email: 'alice@spm.dev' })
+    })
+    it('服务端返回 400 时抛出服务端 message', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'User already exists', data: null, code: 400 }))
+        await expect(net.user.register('alice', 'alice@spm.dev')).rejects.toThrow('User already exists')
+    })
+})
+
+describe('verify', () => {
+    it('校验通过返回空字符串', async () => {
+        mockGet.mockResolvedValue(axiosRes({ message: 'is SPM Server', data: null, code: 200 }))
+        mockPost.mockResolvedValue(axiosRes({ message: 'Verification successful', data: true, code: 200 }))
+        await expect(net.user.verify('alice', 'tok')).resolves.toBe('')
+    })
+    it('校验失败返回错误提示', async () => {
+        mockGet.mockResolvedValue(axiosRes({ message: 'is SPM Server', data: null, code: 200 }))
+        mockPost.mockResolvedValue(axiosRes({ message: 'Invalid username or token', data: false, code: 400 }))
+        await expect(net.user.verify('alice', 'bad')).resolves.toBe('用户不存在或者token配置不正确')
+    })
+    it('非 SPM 服务器时提示', async () => {
+        mockGet.mockResolvedValue(axiosRes({ message: 'hello', data: null, code: 200 }))
+        mockPost.mockResolvedValue(axiosRes({ message: 'Verification successful', data: true, code: 200 }))
+        await expect(net.user.verify('alice', 'tok')).resolves.toBe('不是SPM服务器')
+        //health 检查失败后不应再调用 verify 端点
+        expect(mockPost).not.toHaveBeenCalled()
+    })
+})
+
+describe('list', () => {
+    it('list/vm 返回数组', async () => {
+        mockGet.mockResolvedValue(axiosRes({ message: 'Success', data: [], code: 200 }))
+        await expect(net.list.vm()).resolves.toEqual([])
+    })
+    it('list/module 返回数组', async () => {
+        mockGet.mockResolvedValue(axiosRes({ message: 'Success', data: [], code: 200 }))
+        await expect(net.list.module()).resolves.toEqual([])
+    })
+    it('list/compiler 返回数组', async () => {
+        mockGet.mockResolvedValue(axiosRes({ message: 'Success', data: [], code: 200 }))
+        await expect(net.list.compiler()).resolves.toEqual([])
+    })
+})
+
+describe('publish', () => {
+    it('publish/module 成功', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Success', data: null, code: 200 }))
+        await expect(net.publish.module('alice', 'tok', {
+            version: '1.0.0', dependencies: [], source: '', hex: 'abc'
+        }, Buffer.from('x'))).resolves.toBeNull()
+    })
+    it('publish/vm 成功', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Success', data: null, code: 200 }))
+        await expect(net.publish.vm('alice', 'tok', {
+            version: '1.0', isa: 'x64', author: 'alice', license: 'MIT', source: '', hex: 'abc'
+        }, Buffer.from('x'))).resolves.toBeNull()
+    })
+    it('publish/compiler 成功', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Success', data: null, code: 200 }))
+        await expect(net.publish.compiler('alice', 'tok', '1.0', {
+            version: '1.0.1', hex: 'abc', source: ''
+        }, 'src')).resolves.toBeNull()
+    })
+    it('create/compiler 成功', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Success', data: null, code: 200 }))
+        await expect(net.publish.compiler_create('alice', 'tok', 'MIT', '1.0')).resolves.toBeNull()
+    })
+})
+
+describe('download', () => {
+    it('download/compiler 返回字符串', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Success', data: 'compiler-js', code: 200 }))
+        await expect(net.download.compiler('1.0', '1.0.1')).resolves.toBe('compiler-js')
+    })
+    it('download/vm 返回 Buffer', async () => {
+        mockPost.mockResolvedValue(axiosRes({ message: 'Success', data: Buffer.from('bin').toString('base64'), code: 200 }))
+        await expect(net.download.vm('1.0')).resolves.toEqual(Buffer.from('bin'))
+    })
+})

package/utils/net.ts

@@ -21,35 +21,38 @@ async function download_module(name:string,version:string){
     return Buffer.from(check((await ajax.post('/api/download/module',{name,version})).data) as string,'base64')
 }
 async function download_compiler(large_version:string,small_version:string){
-    return check<string>(await ajax.post('/api/download/compiler',{large_version,small_version}))
+    return check<string>((await ajax.post('/api/download/compiler',{large_version,small_version})).data)
 }
 async function list_vm(){
-    return check<VMConfig>(await ajax.get('/api/list/vm'))
+    return check<VMConfig>((await ajax.get('/api/list/vm')).data)
 }
 async function list_module(){
-    return check<ModuleConfig>(await ajax.get('/api/list/module'))
+    return check<ModuleConfig>((await ajax.get('/api/list/module')).data)
 }
 async function list_compiler(){
-    return check<CompilerConfig>(await ajax.get('/api/list/compiler'))
+    return check<CompilerConfig>((await ajax.get('/api/list/compiler')).data)
 }
 async function publish_vm(author:string,token:string,module:VM,data:Buffer){
-    return check<void>(await ajax.post('/api/publish/vm',{author,token,module,data}))
+    return check<void>((await ajax.post('/api/publish/vm',{author,token,module,data})).data)
 }
 async function publish_module(author:string,token:string,module:ModuleVersion,data:Buffer){
-    return check<void>(await ajax.post('/api/publish/module',{author,token,module,data}))
+    return check<void>((await ajax.post('/api/publish/module',{author,token,module,data})).data)
 }
 async function publish_compiler(author:string,token:string,version:string,type:CompilerChild,data:string){
-    return check<void>(await ajax.post('/api/publish/compiler/add',{author,token,version,type,data}))
+    return check<void>((await ajax.post('/api/publish/compiler/add',{author,token,version,type,data})).data)
 }
 async function create_compiler(author:string,token:string,license:string,version:string){
-    return check<void>(await ajax.post('/api/publish/compiler/create',{author,token,license,version}))
+    return check<void>((await ajax.post('/api/publish/compiler/create',{author,token,license,version})).data)
 }
 async function register(username:string,email:string){
-    return check<void>(await ajax.post('/api/register',{username,email}))
+    return check<{token:string}>((await ajax.post('/api/register',{username,email})).data)
 }
 async function verify(username:string,token:string){
-    if(((await ajax.get('/api/health')).data as Result<void>).message!='is SPM Server')return '不是SPM服务器'
-    return check<boolean>(await ajax.post('/api/verify',{username,token}))?'':'用户不存在或者token配置不正确'
+    let health=(await ajax.get('/api/health')).data as Result<void>
+    if(health.message!='is SPM Server')return '不是SPM服务器'
+    let res=(await ajax.post('/api/verify',{username,token})).data as Result<boolean>
+    if(res.code!=200||!res.data)return '用户不存在或者token配置不正确'
+    return ''
 }
 export default {
     download:{