Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5c18138dd2 | |||
| 9f2d72c3a0 | |||
| dddb352457 | |||
| 3fe3dc96da | |||
| e953466786 | |||
| c43c37ce34 | |||
| 13900343a3 | |||
| cc54ef85e1 | |||
| 67f05af7a5 | |||
| 37f6d50034 | |||
| a1f80d38f2 | |||
| 7b659b1ef5 | |||
| 3261cc1830 | |||
| a76bb15fc9 | |||
| 47cd88f72b | |||
| 6a98ef4bed |
+32
-31
@@ -33,6 +33,8 @@ this will check the health, and if not setup, it will prompt you to set up the C
|
||||
- `shsf get namespace <id>`: Get details of a specific namespace by its ID
|
||||
- `shsf get trigger <functionId> <triggerId>`: Get details of a specific trigger from a function.
|
||||
|
||||
- `shsf function execute --id <id> [--payload <json>] [--no-stream]`: Execute a function and stream the output (debug/internal).
|
||||
|
||||
- `shsf storage create --name <name> --purpose <purpose>`: Create a new storage.
|
||||
- `shsf storage delete --name <name>`: Delete a storage.
|
||||
- `shsf storage list`: List all storages.
|
||||
@@ -45,14 +47,40 @@ this will check the health, and if not setup, it will prompt you to set up the C
|
||||
- `shsf update namespace <id>`: Update a specific namespace by its ID. (use `shsf update namespace -h` first)
|
||||
- `shsf update trigger <functionId> <triggerId>`: Update a specific trigger from a function. (use `shsf update trigger -h` first)
|
||||
|
||||
- `shsf file create`: Create a file in a storage. (use `shsf file create -h` first)
|
||||
- `shsf file overwrite`: Overwrite an existing file in a storage. (use `shsf file overwrite -h` first)
|
||||
- `shsf file delete`: Delete a file from a storage. (use `shsf file delete -h` first)
|
||||
- `shsf file list`: List files in a storage. (use `shsf file list -h` first)
|
||||
- `shsf file create`: Create/update a file in a function. (use `shsf file create -h` first)
|
||||
- `shsf file list`: List files in a function. (use `shsf file list -h` first)
|
||||
- `shsf file rename`: Rename a file in a function. (use `shsf file rename -h` first)
|
||||
- `shsf file delete`: Delete a file from a function. (use `shsf file delete -h` first)
|
||||
|
||||
- `shsf env add --id <id> --name <name> --value <value>`: Adds or updates an environment variable for a function.
|
||||
- `shsf env remove --id <id> --name <name>`: Removes a specific environment variable from a function.
|
||||
- `shsf env list --id <id>`: Lists all environment variables for a function.
|
||||
- `shsf env flush --id <id>`: Removes ALL environment variables from a function.
|
||||
|
||||
- `shsf remote pull --id <id> --into <path> [--force]`: Pull files from a function into a local directory.
|
||||
- `shsf remote push --id <id> --from <path> [--force]`: Push files from a local directory to a function.
|
||||
|
||||
- `shsf req add <package> --id <functionid>`: Add a package to the requirements.txt of a function.
|
||||
- `shsf req remove <package> --id <functionid>`: Remove a package from the requirements.txt of a function.
|
||||
|
||||
|
||||
### Ignore & Mapping files
|
||||
|
||||
`shsf remote push` supports a `.shsfignore` file (gitignore-like) placed in the source directory or repository root. Lines are treated like gitignore patterns and will prevent matching files from being pushed.
|
||||
|
||||
You can also create a `.shsf.json` mapping file in the repository root so you don't need to pass `--id` and `--from` every time. Example `.shsf.json`:
|
||||
|
||||
```json
|
||||
{
|
||||
"default": {
|
||||
"id": "my-function-id",
|
||||
"from": "src/functions/my-fn"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Command-line flags take precedence over values in `.shsf.json`.
|
||||
|
||||
## Instructions
|
||||
Use these commands for when you need to interact with shsf from the command line. Its faster than using the ui for almost all ops.
|
||||
|
||||
@@ -62,33 +90,6 @@ Get the ui url with:
|
||||
shsf uiurl
|
||||
```
|
||||
|
||||
## Available UI Routes
|
||||
|
||||
Below are the main routes you can use in the SHSF web UI. These are not clickable links, but you can navigate to them in your browser.
|
||||
|
||||
**General**
|
||||
- `/`: Home Page
|
||||
|
||||
**Documentation**
|
||||
- `/docs`: Documentation
|
||||
|
||||
**Account**
|
||||
- `/account`: Account Settings
|
||||
- `/login`: Login
|
||||
- `/register`: Register
|
||||
|
||||
**Functions**
|
||||
- `/functions`: Shows your functions, grouped by their respective namespaces (requires auth).
|
||||
- `/functions/:id`: View details for a specific function (requires auth).
|
||||
|
||||
**Other**
|
||||
- `/admin`: Admin dashboard (admin only, requires authentication)
|
||||
- `/storage`: Storage management (requires auth)
|
||||
- `/cron-jobs`: Cron job management (requires auth)
|
||||
- `/access-tokens`: Access token management (requires auth)
|
||||
- `/guest-users`: Guest user management (requires auth)
|
||||
- `/guest-access`: Guest access portal
|
||||
|
||||
### Example
|
||||
After creating a function and receiving an ID (for example, 81), you can share the following URL with your human so they can view the function in the UI:
|
||||
```
|
||||
|
||||
@@ -5,7 +5,6 @@ A powerful command-line interface for managing and interacting with your SHSF in
|
||||
[](https://pnpm.io/)
|
||||
[](https://www.typescriptlang.org/)
|
||||
|
||||
|
||||
## 🚦 Getting Started
|
||||
|
||||
### 📋 Prerequisites
|
||||
@@ -20,10 +19,13 @@ To install **SHSF CLI** globally on your system:
|
||||
```bash
|
||||
pnpm add -g shsf-cli
|
||||
```
|
||||
or
|
||||
|
||||
or
|
||||
|
||||
```bash
|
||||
npm install -g shsf-cli
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
Once installed, simply type:
|
||||
@@ -31,22 +33,25 @@ Once installed, simply type:
|
||||
```bash
|
||||
shsf health
|
||||
```
|
||||
and it will ask you for your SHSF instance URL and API token to perform a health check.
|
||||
|
||||
and it will ask you for your SHSF instance URL and API token to perform a health check.
|
||||
|
||||
## 🛠️ Usage & Commands
|
||||
|
||||
### 🩺 Health Check
|
||||
|
||||
Quickly see if the system is up and running:
|
||||
|
||||
```bash
|
||||
shsf health
|
||||
```
|
||||
|
||||
|
||||
### 🏗️ Local Development
|
||||
|
||||
If you're contributing or running from source:
|
||||
|
||||
1. **Setup**:
|
||||
|
||||
```bash
|
||||
git clone https://github.com/Space-Banane/shsf-cli.git
|
||||
cd shsf-cli
|
||||
@@ -59,6 +64,31 @@ If you're contributing or running from source:
|
||||
pnpm start [cmd] # Run a command directly
|
||||
```
|
||||
|
||||
## Ignore & Mapping files
|
||||
|
||||
You can control what files `shsf remote push` ignores using a `.shsfignore` file (gitignore-style).
|
||||
|
||||
Place `.shsfignore` in the source directory you're pushing or in the repository root. Examples:
|
||||
|
||||
```
|
||||
# ignore logs and secrets
|
||||
*.log
|
||||
secret.txt
|
||||
node_modules
|
||||
```
|
||||
|
||||
You can also create a `.shsf.json` mapping file at the repository root to avoid passing `--id` and `--from` every time. Example:
|
||||
|
||||
```json
|
||||
{
|
||||
"default": {
|
||||
"id": "my-function-id",
|
||||
"from": "src/functions/my-fn"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
Command-line options always override values from `.shsf.json`.
|
||||
|
||||
## 🤝 Contributing
|
||||
|
||||
@@ -80,4 +110,3 @@ We love builders! To add a new command:
|
||||
## 📄 License
|
||||
|
||||
Licensed under the **MIT-0 License**. Happy coding! 🍌
|
||||
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "shsf-cli",
|
||||
"version": "2.1.7",
|
||||
"version": "2.2.7",
|
||||
"description": "",
|
||||
"type": "module",
|
||||
"files": [
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
import { describe, it, expect, afterEach } from 'vitest';
|
||||
import fs from 'fs';
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
import { readIgnoreFile, matchesAnyPattern, readMappingFile, defaultUnpushableFiles } from '../utils/push_helpers.js';
|
||||
|
||||
const tmpDirs: string[] = [];
|
||||
|
||||
afterEach(() => {
|
||||
for (const d of tmpDirs) {
|
||||
try {
|
||||
fs.rmSync(d, { recursive: true, force: true });
|
||||
} catch (_e) {
|
||||
// ignore cleanup errors
|
||||
}
|
||||
}
|
||||
tmpDirs.length = 0;
|
||||
});
|
||||
|
||||
describe('push_helpers', () => {
|
||||
it('readIgnoreFile should read patterns from provided dir', () => {
|
||||
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'shsf-test-'));
|
||||
tmpDirs.push(tmp);
|
||||
const ignorePath = path.join(tmp, '.shsfignore');
|
||||
fs.writeFileSync(ignorePath, '# comment\nsecret.txt\n*.log\n');
|
||||
|
||||
const patterns = readIgnoreFile(tmp);
|
||||
expect(patterns).toContain('secret.txt');
|
||||
expect(patterns).toContain('*.log');
|
||||
});
|
||||
|
||||
it('matchesAnyPattern should match suffix and glob patterns', () => {
|
||||
const patterns = ['.secret', '*.log', 'dockerfile'];
|
||||
expect(matchesAnyPattern('foo.secret', patterns)).toBe(true);
|
||||
expect(matchesAnyPattern('bar.log', patterns)).toBe(true);
|
||||
expect(matchesAnyPattern('Dockerfile', patterns)).toBe(true);
|
||||
expect(matchesAnyPattern('notmatched.txt', patterns)).toBe(false);
|
||||
});
|
||||
|
||||
it('defaultUnpushableFiles contains common suffix', () => {
|
||||
expect(defaultUnpushableFiles).toContain('.png');
|
||||
});
|
||||
|
||||
it('readMappingFile should read mapping from cwd when present', () => {
|
||||
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'shsf-map-'));
|
||||
tmpDirs.push(tmp);
|
||||
const mapPath = path.join(tmp, '.shsf.json');
|
||||
fs.writeFileSync(mapPath, JSON.stringify({ default: { id: 'abc', from: 'src' } }));
|
||||
|
||||
const mapping = readMappingFile(tmp);
|
||||
expect(mapping).toBeTruthy();
|
||||
expect(mapping?.id).toBe('abc');
|
||||
expect(mapping?.from).toBe('src');
|
||||
});
|
||||
|
||||
it('readMappingFile should return null when file is missing', () => {
|
||||
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'shsf-map-missing-'));
|
||||
tmpDirs.push(tmp);
|
||||
|
||||
const mapping = readMappingFile(tmp);
|
||||
expect(mapping).toBeNull();
|
||||
});
|
||||
|
||||
it('readMappingFile should return null for malformed json', () => {
|
||||
const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'shsf-map-bad-'));
|
||||
tmpDirs.push(tmp);
|
||||
const mapPath = path.join(tmp, '.shsf.json');
|
||||
fs.writeFileSync(mapPath, '{ this is : not valid json }');
|
||||
|
||||
const mapping = readMappingFile(tmp);
|
||||
expect(mapping).toBeNull();
|
||||
});
|
||||
});
|
||||
Vendored
+96
@@ -0,0 +1,96 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
export const updateFunctionDefinition = {
|
||||
name: "add",
|
||||
description:
|
||||
"Adds or updates environment variables for a serverless function.",
|
||||
options: [
|
||||
{ name: "--id <id>", description: "Function ID", required: true },
|
||||
{
|
||||
name: "--name <name>",
|
||||
description: "Environment variable name",
|
||||
required: true,
|
||||
},
|
||||
{
|
||||
name: "--value <value>",
|
||||
description: "Environment variable value",
|
||||
required: true,
|
||||
},
|
||||
],
|
||||
action: async (options: any) => {
|
||||
if (!options.id || !options.name || !options.value) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Error: Missing required options (--id, --name, --value)`,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const client = await getApiClient();
|
||||
let existingEnv: { name: string; value: string }[] = [];
|
||||
|
||||
try {
|
||||
const response = await client.get(`/api/function/${options.id}`);
|
||||
const functionData = response.data.data || response.data;
|
||||
existingEnv = functionData.env || [];
|
||||
|
||||
if (typeof existingEnv === 'string') {
|
||||
try {
|
||||
existingEnv = JSON.parse(existingEnv);
|
||||
} catch (e: any) {
|
||||
existingEnv = [];
|
||||
}
|
||||
}
|
||||
if (!Array.isArray(existingEnv)) {
|
||||
existingEnv = [];
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Error fetching function data: ${error.message}`,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
const newEnv = [...existingEnv];
|
||||
const existingIndex = newEnv.findIndex((env) => env.name === options.name);
|
||||
const isUpdate = existingIndex !== -1;
|
||||
|
||||
if (isUpdate) {
|
||||
newEnv[existingIndex].value = options.value;
|
||||
} else {
|
||||
newEnv.push({ name: options.name, value: options.value });
|
||||
}
|
||||
|
||||
const totalCount = newEnv.length;
|
||||
|
||||
try {
|
||||
const response = await client.patch(`/api/function/${options.id}`, {
|
||||
environment: newEnv,
|
||||
});
|
||||
|
||||
if (response.status === 200) {
|
||||
const actionText = isUpdate ? "updated" : "added";
|
||||
console.log(
|
||||
`${chalk.green("✓")} Environment variable ${chalk.cyan(options.name)} ${actionText} successfully for function ${chalk.cyan(options.id)}.`,
|
||||
);
|
||||
console.log(
|
||||
`${chalk.blue("ℹ")} Total environment variables: ${totalCount}`,
|
||||
);
|
||||
} else {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Unexpected response from server: ${response.status}`,
|
||||
);
|
||||
}
|
||||
} catch (error: any) {
|
||||
if (error.response?.status === 404) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Function with ID ${chalk.yellow(options.id)} not found.`,
|
||||
);
|
||||
} else {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to update: ${chalk.yellow(error.response?.data?.message || error.message)}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
Vendored
+33
@@ -0,0 +1,33 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
export const flushFunctionDefinition = {
|
||||
name: "flush",
|
||||
description: "Removes ALL environment variables from a serverless function.",
|
||||
options: [
|
||||
{ name: "--id <id>", description: "Function ID", required: true },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
if (!options.id) {
|
||||
console.error(`${chalk.red("✗")} Error: --id is required`);
|
||||
return;
|
||||
}
|
||||
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
const response = await client.patch(`/api/function/${options.id}`, {
|
||||
environment: [],
|
||||
});
|
||||
|
||||
if (response.status === 200) {
|
||||
console.log(
|
||||
`${chalk.green("✓")} All environment variables flushed for function ${chalk.cyan(options.id)}.`
|
||||
);
|
||||
console.log(`${chalk.blue("ℹ")} Total environment variables: 0`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.response?.data?.message || error.message}`);
|
||||
}
|
||||
},
|
||||
};
|
||||
Vendored
+53
@@ -0,0 +1,53 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
export const listEnvDefinition = {
|
||||
name: "list",
|
||||
description: "Lists all environment variables for a serverless function.",
|
||||
options: [
|
||||
{ name: "--id <id>", description: "Function ID", required: true },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
if (!options.id) {
|
||||
console.error(`${chalk.red("✗")} Error: --id is required`);
|
||||
return;
|
||||
}
|
||||
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
const response = await client.get(`/api/function/${options.id}`);
|
||||
|
||||
const functionData = response.data.data || response.data;
|
||||
let env = functionData.env;
|
||||
|
||||
if (typeof env === 'string' && env.length > 0) {
|
||||
try {
|
||||
env = JSON.parse(env);
|
||||
} catch (e: any) {
|
||||
console.error(`${chalk.red("✗")} Error parsing env string: ${e.message}`);
|
||||
env = [];
|
||||
}
|
||||
}
|
||||
|
||||
const envList: { name: string; value: string }[] = Array.isArray(env) ? env : [];
|
||||
|
||||
if (envList.length === 0) {
|
||||
console.log(`${chalk.yellow("!")} No environment variables found for function ${chalk.cyan(options.id)}.`);
|
||||
return;
|
||||
}
|
||||
|
||||
console.log(`${chalk.blue("ℹ")} Environment variables for function ${chalk.cyan(options.id)}:`);
|
||||
envList.forEach((item) => {
|
||||
console.log(`${chalk.green("•")} ${chalk.cyan(item.name)}=${chalk.white(item.value)}`);
|
||||
});
|
||||
console.log(`${chalk.blue("ℹ")} Total: ${envList.length}`);
|
||||
} catch (error: any) {
|
||||
if (error.response?.status === 404) {
|
||||
console.error(`${chalk.red("✗")} Function with ID ${chalk.yellow(options.id)} not found.`);
|
||||
} else {
|
||||
console.error(`${chalk.red("✗")} Error fetching environment variables: ${chalk.yellow(error.response?.data?.message || error.message)}`);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
Vendored
+62
@@ -0,0 +1,62 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
export const removeFunctionDefinition = {
|
||||
name: "remove",
|
||||
description: "Removes a specific environment variable from a serverless function.",
|
||||
options: [
|
||||
{ name: "--id <id>", description: "Function ID", required: true },
|
||||
{
|
||||
name: "--name <name>",
|
||||
description: "Environment variable name to remove",
|
||||
required: true,
|
||||
},
|
||||
],
|
||||
action: async (options: any) => {
|
||||
if (!options.id || !options.name) {
|
||||
console.error(`${chalk.red("✗")} Error: --id and --name are required`);
|
||||
return;
|
||||
}
|
||||
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
const response = await client.get(`/api/function/${options.id}`);
|
||||
const functionData = response.data.data || response.data;
|
||||
let existingEnv: { name: string; value: string }[] = functionData.env || [];
|
||||
|
||||
if (typeof existingEnv === 'string') {
|
||||
try {
|
||||
existingEnv = JSON.parse(existingEnv);
|
||||
} catch (e: any) {
|
||||
existingEnv = [];
|
||||
}
|
||||
}
|
||||
|
||||
if (!Array.isArray(existingEnv)) {
|
||||
existingEnv = [];
|
||||
}
|
||||
|
||||
const initialCount = existingEnv.length;
|
||||
const filteredEnv = existingEnv.filter((env) => env.name !== options.name);
|
||||
|
||||
if (filteredEnv.length === initialCount) {
|
||||
console.warn(`${chalk.yellow("!")} Variable ${chalk.cyan(options.name)} not found. No changes made.`);
|
||||
return;
|
||||
}
|
||||
|
||||
const patchResponse = await client.patch(`/api/function/${options.id}`, {
|
||||
environment: filteredEnv,
|
||||
});
|
||||
|
||||
if (patchResponse.status === 200) {
|
||||
console.log(
|
||||
`${chalk.green("✓")} Variable ${chalk.cyan(options.name)} removed successfully from function ${chalk.cyan(options.id)}.`
|
||||
);
|
||||
console.log(`${chalk.blue("ℹ")} Remaining environment variables: ${filteredEnv.length}`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.response?.data?.message || error.message}`);
|
||||
}
|
||||
},
|
||||
};
|
||||
@@ -4,10 +4,10 @@ import { getApiClient } from "../../api.js";
|
||||
|
||||
export const fileCreateDefinition = {
|
||||
name: "create",
|
||||
description: "Create a file in a storage.",
|
||||
description: "Create or update a file in a function.",
|
||||
options: [
|
||||
{ name: "--storage-id <id>", description: "Storage ID", required: true },
|
||||
{ name: "--path <path>", description: "Remote file path", required: true },
|
||||
{ name: "--function-id <id>", description: "Function ID", required: true },
|
||||
{ name: "--filename <name>", description: "Remote filename", required: true },
|
||||
{ name: "--content <content>", description: "Inline file content" },
|
||||
{ name: "--source <source>", description: "Local source file path" },
|
||||
],
|
||||
@@ -34,16 +34,16 @@ export const fileCreateDefinition = {
|
||||
|
||||
const client = await getApiClient();
|
||||
const payload = {
|
||||
path: options.path,
|
||||
content,
|
||||
filename: options.filename,
|
||||
code: content,
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await client.post(`/api/storage/${options.storageId}/files`, payload);
|
||||
const response = await client.put(`/api/function/${options.functionId}/file`, payload);
|
||||
|
||||
if (response.status === 200 || response.status === 201) {
|
||||
console.log(
|
||||
`${chalk.green("✓")} File ${chalk.cyan(options.path)} created successfully in storage ${chalk.cyan(options.storageId)}.`,
|
||||
`${chalk.green("✓")} File ${chalk.cyan(options.filename)} created/updated successfully in function ${chalk.cyan(options.functionId)}.`,
|
||||
);
|
||||
} else {
|
||||
console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
|
||||
@@ -51,7 +51,7 @@ export const fileCreateDefinition = {
|
||||
} catch (error: any) {
|
||||
if (error.response) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to create file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
|
||||
`${chalk.red("✗")} Failed to create/update file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
|
||||
);
|
||||
} else if (error.request) {
|
||||
console.error(`${chalk.red("✗")} No response received from server.`);
|
||||
|
||||
@@ -3,22 +3,20 @@ import { getApiClient } from "../../api.js";
|
||||
|
||||
export const fileDeleteDefinition = {
|
||||
name: "delete",
|
||||
description: "Delete a file from a storage.",
|
||||
description: "Delete a file from a function.",
|
||||
options: [
|
||||
{ name: "--storage-id <id>", description: "Storage ID", required: true },
|
||||
{ name: "--path <path>", description: "Remote file path", required: true },
|
||||
{ name: "--function-id <id>", description: "Function ID", required: true },
|
||||
{ name: "--file-id <id>", description: "File ID (from 'file list')", required: true },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
const response = await client.delete(`/api/storage/${options.storageId}/files`, {
|
||||
data: { path: options.path },
|
||||
});
|
||||
const response = await client.delete(`/api/function/${options.functionId}/file/${options.fileId}`);
|
||||
|
||||
if (response.status === 200) {
|
||||
console.log(
|
||||
`${chalk.green("✓")} File ${chalk.cyan(options.path)} deleted from storage ${chalk.cyan(options.storageId)}.`,
|
||||
`${chalk.green("✓")} File ${chalk.cyan(options.fileId)} deleted from function ${chalk.cyan(options.functionId)}.`,
|
||||
);
|
||||
} else {
|
||||
console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
|
||||
@@ -26,7 +24,7 @@ export const fileDeleteDefinition = {
|
||||
} catch (error: any) {
|
||||
if (error.response) {
|
||||
if (error.response.status === 404) {
|
||||
console.error(`${chalk.red("✗")} File ${chalk.yellow(options.path)} not found.`);
|
||||
console.error(`${chalk.red("✗")} File or Function not found.`);
|
||||
} else {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to delete file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
|
||||
|
||||
@@ -3,18 +3,15 @@ import { getApiClient } from "../../api.js";
|
||||
|
||||
export const fileListDefinition = {
|
||||
name: "list",
|
||||
description: "List files in a storage.",
|
||||
description: "List files in a function.",
|
||||
options: [
|
||||
{ name: "--storage-id <id>", description: "Storage ID", required: true },
|
||||
{ name: "--prefix <prefix>", description: "Optional path prefix filter" },
|
||||
{ name: "--function-id <id>", description: "Function ID", required: true },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
const response = await client.get(`/api/storage/${options.storageId}/files`, {
|
||||
params: options.prefix ? { prefix: options.prefix } : undefined,
|
||||
});
|
||||
const response = await client.get(`/api/function/${options.functionId}/files`);
|
||||
|
||||
if (response.status === 200 && response.data.data) {
|
||||
const files = response.data.data;
|
||||
@@ -25,9 +22,9 @@ export const fileListDefinition = {
|
||||
}
|
||||
|
||||
console.log(chalk.blue("Files:"));
|
||||
console.log(chalk.gray(`${"ID".padEnd(25)} ${"Filename"}`));
|
||||
files.forEach((file: any) => {
|
||||
const path = file.path || file.name || "(unknown)";
|
||||
console.log(`- ${chalk.cyan(path)}`);
|
||||
console.log(`${chalk.cyan(file.id.padEnd(25))} ${chalk.white(file.filename)}`);
|
||||
});
|
||||
console.log(`\n${chalk.green("✓")} Found ${chalk.bgGreen.black(` ${files.length} `)} files.`);
|
||||
} else {
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
import chalk from "chalk";
|
||||
import fs from "fs/promises";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
export const fileOverwriteDefinition = {
|
||||
name: "overwrite",
|
||||
description: "Overwrite an existing file in a storage.",
|
||||
options: [
|
||||
{ name: "--storage-id <id>", description: "Storage ID", required: true },
|
||||
{ name: "--path <path>", description: "Remote file path", required: true },
|
||||
{ name: "--content <content>", description: "Inline file content" },
|
||||
{ name: "--source <source>", description: "Local source file path" },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
if (!options.content && !options.source) {
|
||||
console.error(`${chalk.red("✗")} You must provide either --content or --source.`);
|
||||
return;
|
||||
}
|
||||
|
||||
if (options.content && options.source) {
|
||||
console.error(`${chalk.red("✗")} Please provide only one of --content or --source.`);
|
||||
return;
|
||||
}
|
||||
|
||||
let content = options.content;
|
||||
if (options.source) {
|
||||
try {
|
||||
content = await fs.readFile(options.source, "utf8");
|
||||
} catch (error: any) {
|
||||
console.error(`${chalk.red("✗")} Failed to read source file: ${chalk.yellow(error.message)}`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const client = await getApiClient();
|
||||
const payload = {
|
||||
path: options.path,
|
||||
content,
|
||||
};
|
||||
|
||||
try {
|
||||
const response = await client.put(`/api/storage/${options.storageId}/files`, payload);
|
||||
|
||||
if (response.status === 200) {
|
||||
console.log(
|
||||
`${chalk.green("✓")} File ${chalk.cyan(options.path)} overwritten successfully in storage ${chalk.cyan(options.storageId)}.`,
|
||||
);
|
||||
} else {
|
||||
console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
if (error.response) {
|
||||
if (error.response.status === 404) {
|
||||
console.error(`${chalk.red("✗")} File ${chalk.yellow(options.path)} not found.`);
|
||||
} else {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to overwrite file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
|
||||
);
|
||||
}
|
||||
} else if (error.request) {
|
||||
console.error(`${chalk.red("✗")} No response received from server.`);
|
||||
} else {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.message}`);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,39 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
export const fileRenameDefinition = {
|
||||
name: "rename",
|
||||
description: "Rename a file in a function.",
|
||||
options: [
|
||||
{ name: "--function-id <id>", description: "Function ID", required: true },
|
||||
{ name: "--file-id <id>", description: "File ID", required: true },
|
||||
{ name: "--new-filename <name>", description: "New filename", required: true },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
const response = await client.patch(`/api/function/${options.functionId}/file/${options.fileId}/rename`, {
|
||||
newFilename: options.newFilename,
|
||||
});
|
||||
|
||||
if (response.status === 200) {
|
||||
console.log(
|
||||
`${chalk.green("✓")} File ${chalk.cyan(options.fileId)} renamed to ${chalk.cyan(options.newFilename)} successfully.`,
|
||||
);
|
||||
} else {
|
||||
console.log(`${chalk.yellow("!")} Unexpected response from server: ${response.status}`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
if (error.response) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to rename file: ${chalk.yellow(error.response.data?.message || "Unknown error")}`,
|
||||
);
|
||||
} else if (error.request) {
|
||||
console.error(`${chalk.red("✗")} No response received from server.`);
|
||||
} else {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.message}`);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
@@ -0,0 +1,152 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
import { AxiosResponse } from "axios";
|
||||
|
||||
export const functionExecuteDefinition = {
|
||||
name: "execute",
|
||||
description: "Execute a function and stream the output (debug/internal).",
|
||||
options: [
|
||||
{ name: "--id <id>", description: "Function ID", required: true },
|
||||
{ name: "--payload <json>", description: "JSON payload for execution", required: false },
|
||||
{ name: "--no-stream", description: "Disable streaming and get final result only", required: false, default: false },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
const client = await getApiClient();
|
||||
|
||||
// Explicitly check for noStream from commander
|
||||
// Commander uses camelsCase for options, so --no-stream becomes stream: false
|
||||
// but we use --no-stream which commander natively handles as a boolean toggle
|
||||
const useStream = options.stream !== false;
|
||||
|
||||
let payload = {};
|
||||
if (options.payload) {
|
||||
try {
|
||||
payload = JSON.parse(options.payload);
|
||||
} catch (error: any) {
|
||||
console.error(`${chalk.red("✗")} Invalid JSON payload: ${chalk.yellow(error.message)}`);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
const handleJsonChunk = (chunk: string) => {
|
||||
const trimmed = chunk.trim();
|
||||
if (!trimmed) return;
|
||||
|
||||
try {
|
||||
const obj = JSON.parse(trimmed);
|
||||
if (obj.type === "output" && obj.content) {
|
||||
process.stdout.write(obj.content);
|
||||
} else if (obj.type === "end") {
|
||||
if (obj.exitCode !== 0 && obj.exitCode !== undefined) {
|
||||
console.error(`\n${chalk.red("✗")} Execution failed with exit code ${obj.exitCode}`);
|
||||
} else {
|
||||
console.log(`\n${chalk.green("✓")} Execution completed.`);
|
||||
}
|
||||
if (obj.result !== undefined) {
|
||||
console.log(chalk.blue("Result:"), typeof obj.result === 'object' ? JSON.stringify(obj.result, null, 2) : obj.result);
|
||||
}
|
||||
if (obj.took) {
|
||||
const total = obj.took.find((t: any) => t.description === "Total");
|
||||
if (total) {
|
||||
console.log(chalk.gray(`Total time: ${total.value}s`));
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e) {
|
||||
// If it's not JSON, it might be raw output from a non-stream response
|
||||
// that got into the stream handler mistakenly or just raw noise
|
||||
if (trimmed.length > 0) {
|
||||
process.stdout.write(chunk);
|
||||
}
|
||||
// Not a full JSON object yet or invalid JSON
|
||||
}
|
||||
};
|
||||
|
||||
console.log(`${chalk.blue("ℹ")} Executing function ${chalk.cyan(options.id)} (stream: ${useStream})...`);
|
||||
|
||||
try {
|
||||
const response = await client.post(`/api/function/${options.id}/execute`,
|
||||
{ run: payload },
|
||||
{
|
||||
params: { stream: useStream ? "true" : "false" },
|
||||
responseType: useStream ? "stream" : "json"
|
||||
}
|
||||
);
|
||||
|
||||
if (useStream) {
|
||||
const stream = (response as AxiosResponse).data;
|
||||
let buffer = "";
|
||||
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
stream.on("data", (chunk: any) => {
|
||||
const str = chunk.toString();
|
||||
buffer += str;
|
||||
|
||||
// Try to split by potential JSON boundaries
|
||||
// Matches cases like ...}{...
|
||||
const pattern = /\}\s*\{/g;
|
||||
let lastIndex = 0;
|
||||
let match;
|
||||
|
||||
while ((match = pattern.exec(buffer)) !== null) {
|
||||
const part = buffer.slice(lastIndex, match.index + 1);
|
||||
handleJsonChunk(part);
|
||||
lastIndex = match.index + match[0].indexOf('{');
|
||||
}
|
||||
|
||||
buffer = buffer.slice(lastIndex);
|
||||
|
||||
// Attempt to parse the remaining buffer if it looks like a complete object
|
||||
try {
|
||||
if (buffer.trim().startsWith('{') && buffer.trim().endsWith('}')) {
|
||||
handleJsonChunk(buffer);
|
||||
buffer = "";
|
||||
}
|
||||
} catch (e) {
|
||||
// Wait for more data
|
||||
}
|
||||
});
|
||||
|
||||
stream.on("end", () => {
|
||||
if (buffer.trim()) {
|
||||
handleJsonChunk(buffer);
|
||||
}
|
||||
resolve();
|
||||
});
|
||||
|
||||
stream.on("error", (err: Error) => {
|
||||
console.error(`\n${chalk.red("✗")} Stream error: ${err.message}`);
|
||||
reject(err);
|
||||
});
|
||||
});
|
||||
} else {
|
||||
// Non-stream returns just the output content or the body
|
||||
const result = response.data;
|
||||
if (typeof result === 'string') {
|
||||
process.stdout.write(result);
|
||||
} else if (result && result.data && typeof result.data === 'string') {
|
||||
process.stdout.write(result.data);
|
||||
} else if (result && typeof result.output === 'string') {
|
||||
process.stdout.write(result.output);
|
||||
} else if (result && typeof result.result === 'string') {
|
||||
process.stdout.write(result.result);
|
||||
} else if (result && result.data && result.data.output) {
|
||||
process.stdout.write(result.data.output);
|
||||
} else {
|
||||
process.stdout.write(JSON.stringify(result, null, 2));
|
||||
}
|
||||
console.log(`\n${chalk.green("✓")} Execution completed.`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
if (error.response) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Execution failed: ${chalk.yellow(error.response.data?.message || error.response.statusText || "Unknown error")}`,
|
||||
);
|
||||
} else if (error.request) {
|
||||
console.error(`${chalk.red("✗")} No response received from server.`);
|
||||
} else {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.message}`);
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
@@ -26,6 +26,8 @@ export const pullDefinition = {
|
||||
}
|
||||
for (const file of files) {
|
||||
fs.writeFileSync(path.join(options.into, file.name), file.content);
|
||||
const byteSize = Buffer.byteLength(file.content, 'utf8');
|
||||
console.log(chalk.green(`Pulled ${file.name} (${byteSize} bytes)`));
|
||||
}
|
||||
console.log(chalk.green(`Successfully pulled ${files.length} files into ${options.into}`));
|
||||
} catch (error: any) {
|
||||
|
||||
+89
-17
@@ -2,8 +2,16 @@ import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
import fs from "fs";
|
||||
import path from "path";
|
||||
import {
|
||||
defaultUnpushableFiles,
|
||||
readIgnoreFile,
|
||||
matchesAnyPattern,
|
||||
readMappingFile,
|
||||
} from "../../utils/push_helpers.js";
|
||||
import { createHash } from "crypto";
|
||||
|
||||
|
||||
|
||||
async function deleteNonexistentFiles(
|
||||
currentFiles: any[],
|
||||
files: any[],
|
||||
@@ -14,12 +22,13 @@ async function deleteNonexistentFiles(
|
||||
for (const currentFile of currentFiles) {
|
||||
if (!files.some((f: any) => f.filename === currentFile.name)) {
|
||||
try {
|
||||
await client.delete(
|
||||
`/api/function/${options.id}/file/${currentFile.id}`,
|
||||
{
|
||||
data: { filename: currentFile.name },
|
||||
},
|
||||
);} catch (error: any) {
|
||||
await client.delete(
|
||||
`/api/function/${options.id}/file/${currentFile.id}`,
|
||||
{
|
||||
data: { filename: currentFile.name },
|
||||
},
|
||||
);
|
||||
} catch (error: any) {
|
||||
throw error;
|
||||
}
|
||||
console.log(
|
||||
@@ -35,18 +44,35 @@ export const pushDefinition = {
|
||||
name: "push",
|
||||
description: "Push files to a remote function.",
|
||||
options: [
|
||||
{ name: "--id <id>", description: "Function ID", required: true },
|
||||
{ name: "--from <path>", description: "Source directory", required: true },
|
||||
{ name: "--id <id>", description: "Function ID" },
|
||||
{ name: "--from <path>", description: "Source directory" },
|
||||
{ name: "--force", description: "Force overwrite" },
|
||||
],
|
||||
action: async (options: any) => {
|
||||
const client = await getApiClient();
|
||||
|
||||
// Load mapping if options are missing
|
||||
const mapping = readMappingFile();
|
||||
if (!options.id && mapping?.id) {
|
||||
options.id = mapping.id;
|
||||
console.log(chalk.blue(`Using mapped id ${options.id} from .shsf.json`));
|
||||
}
|
||||
if (!options.from && mapping?.from) {
|
||||
options.from = mapping.from;
|
||||
console.log(chalk.blue(`Using mapped from ${options.from} from .shsf.json`));
|
||||
}
|
||||
|
||||
const hadMapping = !!mapping;
|
||||
|
||||
if (!options.from) {
|
||||
console.error(chalk.red("Source path not provided."));
|
||||
return;
|
||||
}
|
||||
|
||||
if (!fs.existsSync(options.from)) {
|
||||
console.error(chalk.red(`Source ${options.from} does not exist.`));
|
||||
return;
|
||||
}
|
||||
|
||||
let didDeletion = false; // Track if any deletions were made
|
||||
|
||||
const currentFilesResponse = await client.get(
|
||||
@@ -54,10 +80,23 @@ export const pushDefinition = {
|
||||
);
|
||||
const currentFiles = currentFilesResponse.data.data; // Expecting { name: string, id: string [...] }[]
|
||||
|
||||
const files = fs.readdirSync(options.from).map((file) => ({
|
||||
filename: file,
|
||||
content: fs.readFileSync(path.join(options.from, file), "utf-8"),
|
||||
}));
|
||||
// Read ignore patterns from .shsfignore (in source dir or cwd) and merge with defaults
|
||||
const customPatterns = readIgnoreFile(options.from);
|
||||
const combinedPatterns = [...defaultUnpushableFiles, ...customPatterns];
|
||||
|
||||
// Read local files and filter to only include files (exclude directories)
|
||||
const files = fs
|
||||
.readdirSync(options.from)
|
||||
.map((file) => {
|
||||
const filePath = path.join(options.from, file);
|
||||
return { filename: file, filePath };
|
||||
})
|
||||
.filter(({ filePath }) => fs.statSync(filePath).isFile())
|
||||
.filter(({ filename }) => !matchesAnyPattern(filename, combinedPatterns))
|
||||
.map(({ filename, filePath }) => ({
|
||||
filename,
|
||||
content: fs.readFileSync(filePath, "utf-8"),
|
||||
}));
|
||||
|
||||
if (!options.force && files.length > 5) {
|
||||
console.log(
|
||||
@@ -76,9 +115,6 @@ export const pushDefinition = {
|
||||
(f: any) => f.name === file.filename,
|
||||
);
|
||||
if (currentFile) {
|
||||
// If the file content exists in the response, we can hash it.
|
||||
// Note: currentFiles from /api/function/:id/files might not have content by default depending on API,
|
||||
// but the original code assumes it does.
|
||||
const currentFileHash = createHash("md5")
|
||||
.update(currentFile.content || "")
|
||||
.digest("hex");
|
||||
@@ -92,13 +128,27 @@ export const pushDefinition = {
|
||||
}
|
||||
}
|
||||
|
||||
const filenameLower = file.filename.toLowerCase();
|
||||
// Unpushable file check (also check custom patterns)
|
||||
if (matchesAnyPattern(filenameLower, combinedPatterns)) {
|
||||
console.log(
|
||||
chalk.yellow(
|
||||
`Skipping ${file.filename}, it matches unpushable patterns for function ${options.id}`,
|
||||
),
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
await client.put(`/api/function/${options.id}/file`, {
|
||||
filename: file.filename,
|
||||
code: file.content,
|
||||
});
|
||||
|
||||
const byteSize = Buffer.byteLength(file.content, "utf8");
|
||||
console.log(
|
||||
chalk.green(`Pushed ${file.filename} to function ${options.id}`),
|
||||
chalk.green(
|
||||
`Pushed ${file.filename} (${byteSize} bytes) to function ${options.id}`,
|
||||
),
|
||||
);
|
||||
pushedFilesCount++;
|
||||
}
|
||||
@@ -133,6 +183,28 @@ export const pushDefinition = {
|
||||
),
|
||||
);
|
||||
|
||||
// If there was no mapping file and the user provided --id and --from, create a .shsf.json
|
||||
if (!hadMapping && options.id && options.from) {
|
||||
try {
|
||||
const mapPath = path.join(process.cwd(), ".shsf.json");
|
||||
if (!fs.existsSync(mapPath)) {
|
||||
const data = { default: { id: options.id, from: options.from } };
|
||||
fs.writeFileSync(mapPath, JSON.stringify(data, null, 2), { encoding: "utf-8" });
|
||||
console.log("");
|
||||
console.log(
|
||||
chalk.green(`Wrote .shsf.json mapping to ${mapPath}`),
|
||||
);
|
||||
console.log(
|
||||
chalk.blue(
|
||||
`Tip: Next time you can omit --id and --from — the CLI will use values from .shsf.json`,
|
||||
),
|
||||
);
|
||||
}
|
||||
} catch (err: any) {
|
||||
console.error(chalk.yellow(`Could not write .shsf.json: ${err?.message || err}`));
|
||||
}
|
||||
}
|
||||
|
||||
if (didDeletion) {
|
||||
console.log("");
|
||||
console.log(
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
interface ShsfFile {
|
||||
name: string;
|
||||
content: string;
|
||||
}
|
||||
|
||||
export const reqAddDefinition = {
|
||||
name: "add <package>",
|
||||
description: "Add a package to the requirements.txt of a function.",
|
||||
options: [
|
||||
{ name: "--to <id>", description: "The ID of the function (deprecated alias for --id)." },
|
||||
{ name: "--id <id>", description: "The ID of the function.", required: true },
|
||||
],
|
||||
action: async (pkg: string, options: { to?: string; id?: string }) => {
|
||||
const functionId = options.id ?? options.to;
|
||||
if (!functionId) {
|
||||
console.error(`${chalk.red("✗")} Error: Function ID is required. Use ${chalk.cyan("--id <id>")}.`);
|
||||
return;
|
||||
}
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
// 1. Get current files of the function
|
||||
const response = await client.get(`/api/function/${functionId}/files`);
|
||||
let files: ShsfFile[] = response.data.data;
|
||||
if (!Array.isArray(files)) files = [];
|
||||
|
||||
let requirementsFile = files.find(f => f.name === "requirements.txt");
|
||||
let content = requirementsFile ? requirementsFile.content : "";
|
||||
|
||||
// 2. Add the package
|
||||
const lines = content.split("\n");
|
||||
|
||||
// Robust package name extraction
|
||||
const getPkgName = (line: string) => {
|
||||
const withoutComment = line.trim().split("#", 1)[0];
|
||||
const basePart = withoutComment.split(";", 1)[0].trim();
|
||||
if (!basePart) return null;
|
||||
return basePart.split(/[!=>~<]/)[0].trim().toLowerCase();
|
||||
};
|
||||
|
||||
const pkgToAddName = getPkgName(pkg);
|
||||
if (!pkgToAddName) {
|
||||
console.error(`${chalk.red("✗")} Invalid package format.`);
|
||||
return;
|
||||
}
|
||||
|
||||
const exists = lines.some(line => {
|
||||
const lineName = getPkgName(line);
|
||||
return lineName === pkgToAddName;
|
||||
});
|
||||
|
||||
if (exists) {
|
||||
console.log(`${chalk.yellow("!")} Package ${chalk.cyan(pkgToAddName)} is already in requirements.txt.`);
|
||||
return;
|
||||
}
|
||||
|
||||
// Preserve existing content structure
|
||||
if (content && !content.endsWith("\n")) {
|
||||
content += "\n";
|
||||
}
|
||||
content += pkg + "\n";
|
||||
|
||||
// 3. Overwrite/Create requirements.txt using function-based API
|
||||
await client.put(`/api/function/${functionId}/file`, {
|
||||
filename: "requirements.txt",
|
||||
code: content,
|
||||
});
|
||||
|
||||
console.log(`${chalk.green("✓")} Added ${chalk.cyan(pkg)} to requirements.txt for function ${chalk.yellow(functionId)}.`);
|
||||
} catch (error: any) {
|
||||
handleError(error, "add package");
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
function handleError(error: any, task: string) {
|
||||
if (error.response) {
|
||||
console.error(`${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(error.response.data?.message || (error.response.data ? JSON.stringify(error.response.data) : error.message))}`);
|
||||
} else if (error.request) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(
|
||||
"No response received from server. Please check your network connection and try again."
|
||||
)}`
|
||||
);
|
||||
} else {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.message}`);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
import chalk from "chalk";
|
||||
import { getApiClient } from "../../api.js";
|
||||
|
||||
interface ShsfFile {
|
||||
name: string;
|
||||
content: string;
|
||||
}
|
||||
|
||||
export const reqRemoveDefinition = {
|
||||
name: "remove <package>",
|
||||
description: "Remove a package from the requirements.txt of a function.",
|
||||
options: [
|
||||
{ name: "--from <id>", description: "The ID of the function (deprecated alias for --id)." },
|
||||
{ name: "--id <id>", description: "The ID of the function.", required: true },
|
||||
],
|
||||
action: async (pkgToRemove: string, options: { from?: string; id?: string }) => {
|
||||
const functionId = options.id ?? options.from;
|
||||
if (!functionId) {
|
||||
console.error(`${chalk.red("✗")} Error: Function ID is required. Use ${chalk.cyan("--id <id>")}.`);
|
||||
return;
|
||||
}
|
||||
const client = await getApiClient();
|
||||
|
||||
try {
|
||||
// 1. Get current files of the function
|
||||
const response = await client.get(`/api/function/${functionId}/files`);
|
||||
let files: ShsfFile[] = response.data.data;
|
||||
if (!Array.isArray(files)) files = [];
|
||||
|
||||
const requirementsFile = files.find(f => f.name === "requirements.txt");
|
||||
if (!requirementsFile) {
|
||||
console.log(`${chalk.yellow("!")} No requirements.txt found for function ${chalk.yellow(functionId)}.`);
|
||||
return;
|
||||
}
|
||||
|
||||
const content = requirementsFile.content;
|
||||
const lines = content.split("\n");
|
||||
|
||||
const targetPkgName = pkgToRemove.trim().toLowerCase();
|
||||
let removed = false;
|
||||
|
||||
const newLines = lines.filter(line => {
|
||||
const trimmedLine = line.trim();
|
||||
// Preserve empty/whitespace-only lines
|
||||
if (!trimmedLine) return true;
|
||||
|
||||
// Strip inline comments and environment markers for matching purposes
|
||||
const withoutComment = trimmedLine.split("#", 1)[0];
|
||||
const basePart = withoutComment.split(";", 1)[0].trim();
|
||||
|
||||
// If there's no actual requirement (e.g., comment-only line), keep the line
|
||||
if (!basePart) return true;
|
||||
|
||||
// Robust extraction (handles != <= >= ~= == and < >)
|
||||
const currentPkgName = basePart.split(/[!=>~<]/)[0].trim().toLowerCase();
|
||||
|
||||
if (currentPkgName === targetPkgName) {
|
||||
removed = true;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
});
|
||||
|
||||
if (!removed) {
|
||||
console.log(`${chalk.yellow("!")} Package ${chalk.cyan(pkgToRemove)} was not found in requirements.txt.`);
|
||||
return;
|
||||
}
|
||||
|
||||
const newContent = newLines.join("\n");
|
||||
|
||||
// 2. Overwrite requirements.txt using function-based API
|
||||
await client.put(`/api/function/${functionId}/file`, {
|
||||
filename: "requirements.txt",
|
||||
code: newContent,
|
||||
});
|
||||
|
||||
console.log(`${chalk.green("✓")} Removed ${chalk.cyan(pkgToRemove)} from requirements.txt for function ${chalk.yellow(functionId)}.`);
|
||||
} catch (error: any) {
|
||||
handleError(error, "remove package");
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
function handleError(error: any, task: string) {
|
||||
if (error.response) {
|
||||
console.error(`${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(error.response.data?.message || (error.response.data ? JSON.stringify(error.response.data) : error.message))}`);
|
||||
} else if (error.request) {
|
||||
console.error(
|
||||
`${chalk.red("✗")} Failed to ${task}: ${chalk.yellow(
|
||||
"No response received from server. Please check your network connection and try again."
|
||||
)}`
|
||||
);
|
||||
} else {
|
||||
console.error(`${chalk.red("✗")} Error: ${error.message}`);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
import fs from "fs";
|
||||
import path from "path";
|
||||
|
||||
export const defaultUnpushableFiles = [
|
||||
".png",
|
||||
".jpg",
|
||||
".jpeg",
|
||||
".gif",
|
||||
".bmp",
|
||||
".ico",
|
||||
".zip",
|
||||
".tar",
|
||||
".gz",
|
||||
".7z",
|
||||
".pdf",
|
||||
".doc",
|
||||
".docx",
|
||||
".xls",
|
||||
".xlsx",
|
||||
".ppt",
|
||||
".pptx",
|
||||
".exe",
|
||||
".dll",
|
||||
".so",
|
||||
".dylib",
|
||||
"docker-compose.yml",
|
||||
"docker-compose.yaml",
|
||||
"compose.yaml",
|
||||
"compose.yml",
|
||||
"dockerfile",
|
||||
"dockerfile.dev",
|
||||
"dockerfile.prod",
|
||||
".gitignore",
|
||||
".env",
|
||||
".gitkeep",
|
||||
".md",
|
||||
];
|
||||
|
||||
export function readIgnoreFile(dir: string): string[] {
|
||||
const candidates = [path.join(dir, ".shsfignore"), path.join(process.cwd(), ".shsfignore")];
|
||||
for (const p of candidates) {
|
||||
if (fs.existsSync(p)) {
|
||||
try {
|
||||
return fs
|
||||
.readFileSync(p, "utf-8")
|
||||
.split(/\r?\n/)
|
||||
.map((l) => l.trim())
|
||||
.filter((l) => l && !l.startsWith("#"));
|
||||
} catch (_err) {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
function globToRegExp(pattern: string): RegExp {
|
||||
let p = pattern.trim();
|
||||
if (!p.includes("*")) {
|
||||
if (!p.startsWith("/")) {
|
||||
p = `*${p}`;
|
||||
}
|
||||
}
|
||||
// Escape regex special chars, then replace * with .*
|
||||
const escaped = p.replace(/[-\/\\^$+?.()|[\]{}]/g, "\\$&").replace(/\*/g, ".*");
|
||||
return new RegExp(`^${escaped}$`, "i");
|
||||
}
|
||||
|
||||
export function matchesAnyPattern(filename: string, patterns: string[]): boolean {
|
||||
const name = filename.replace(/\\/g, "/");
|
||||
for (const pat of patterns) {
|
||||
try {
|
||||
const re = globToRegExp(pat);
|
||||
if (re.test(name)) return true;
|
||||
} catch (_e) {
|
||||
if (name.toLowerCase().endsWith(pat.toLowerCase())) return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
export function readMappingFile(cwd?: string): { id?: string; from?: string } | null {
|
||||
const base = cwd || process.cwd();
|
||||
const p = path.join(base, ".shsf.json");
|
||||
if (!fs.existsSync(p)) return null;
|
||||
try {
|
||||
const raw = fs.readFileSync(p, "utf-8");
|
||||
const json = JSON.parse(raw);
|
||||
if (json && typeof json === "object") {
|
||||
return (json.default || json) as { id?: string; from?: string };
|
||||
}
|
||||
} catch (_e) {
|
||||
// ignore
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
export default null;
|
||||
Reference in New Issue
Block a user