@geek-fun/serverlessinsight 0.2.1 → 0.3.1

package/dist/src/validator/eventSchema.js

@@ -19,20 +19,16 @@ exports.eventSchema = {
                         required: ['method', 'path', 'backend'],
                     },
                 },
-                custom_domain: {
+                domain: {
                     type: 'object',
+                    additionalProperties: false,
+                    required: ['domain_name'],
                     properties: {
                         domain_name: { type: 'string' },
                         certificate_name: { type: 'string' },
                         certificate_body: { type: 'string' },
                         certificate_private_key: { type: 'string' },
                     },
-                    required: [
-                        'domain_name',
-                        'certificate_name',
-                        'certificate_body',
-                        'certificate_private_key',
-                    ],
                 },
             },
             required: ['name', 'type', 'triggers'],

package/dist/src/validator/functionSchema.js

@@ -7,31 +7,61 @@ exports.functionSchema = {
     patternProperties: {
         '.*': {
             type: 'object',
-            required: ['name', 'runtime', 'handler', 'code'],
+            required: ['name'],
             properties: {
                 name: { type: 'string' },
-                runtime: {
+                code: {
+                    type: 'object',
+                    required: ['runtime', 'handler', 'path'],
+                    additionalProperties: false,
+                    properties: {
+                        runtime: {
+                            type: 'string',
+                            enum: [
+                                'nodejs20',
+                                'nodejs18',
+                                'nodejs16',
+                                'nodejs14',
+                                'nodejs12',
+                                'nodejs10',
+                                'nodejs8',
+                                'python3.10',
+                                'python3.9',
+                                'python3',
+                                'PHP 7.2',
+                                'Java 11',
+                                '.NET Core 3.1',
+                                'Go 1.x',
+                            ],
+                        },
+                        handler: { type: 'string' },
+                        path: { type: 'string' },
+                    },
+                },
+                container: {
+                    type: 'object',
+                    required: ['image', 'port'],
+                    additionalProperties: false,
+                    properties: {
+                        image: { type: 'string' },
+                        cmd: { type: 'string' },
+                        port: { type: 'number' },
+                    },
+                },
+                memory: { type: 'number' },
+                gpu: {
                     type: 'string',
                     enum: [
-                        'nodejs20',
-                        'nodejs18',
-                        'nodejs16',
-                        'nodejs14',
-                        'nodejs12',
-                        'nodejs10',
-                        'nodejs8',
-                        'python3.10',
-                        'python3.9',
-                        'python3',
-                        'PHP 7.2',
-                        'Java 11',
-                        '.NET Core 3.1',
-                        'Go 1.x',
+                        'TESLA_8',
+                        'TESLA_12',
+                        'TESLA_16',
+                        'AMPERE_8',
+                        'AMPERE_12',
+                        'AMPERE_16',
+                        'AMPERE_24',
+                        'ADA_48',
                     ],
                 },
-                handler: { type: 'string' },
-                code: { type: 'string' },
-                memory: { type: 'number' },
                 timeout: { type: 'number' },
                 log: { type: 'boolean' },
                 environment: {
@@ -40,6 +70,50 @@ exports.functionSchema = {
                         type: ['string', 'number', 'boolean'],
                     },
                 },
+                network: {
+                    type: 'object',
+                    properties: {
+                        vpc_id: { type: 'string' },
+                        subnet_ids: { type: 'array', items: { type: 'string' } },
+                        security_group: {
+                            type: 'object',
+                            properties: {
+                                name: { type: 'string' },
+                                ingress: { type: 'array', items: { type: 'string' } },
+                                egress: { type: 'array', items: { type: 'string' } },
+                            },
+                            required: ['name', 'ingress'],
+                            additionalProperties: false,
+                        },
+                    },
+                    required: ['vpc_id', 'subnet_ids', 'security_group'],
+                },
+                storage: {
+                    type: 'object',
+                    properties: {
+                        disk: { type: 'number' },
+                        nas: {
+                            type: 'array',
+                            items: {
+                                type: 'object',
+                                properties: {
+                                    mount_path: { type: 'string' },
+                                    storage_class: {
+                                        type: 'string',
+                                        enum: [
+                                            'STANDARD_CAPACITY',
+                                            'STANDARD_PERFORMANCE',
+                                            'EXTREME_STANDARD',
+                                            'EXTREME_ADVANCE',
+                                        ],
+                                    },
+                                    additionalProperties: false,
+                                },
+                                required: ['mount_path', 'storage_class'],
+                            },
+                        },
+                    },
+                },
             },
             additionalProperties: false,
         },

package/dist/src/validator/iacSchema.js

@@ -10,6 +10,7 @@ const rootSchema_1 = require("./rootSchema");
 const databaseSchema_1 = require("./databaseSchema");
 const eventSchema_1 = require("./eventSchema");
 const functionSchema_1 = require("./functionSchema");
+const bucketSchema_1 = require("./bucketSchema");
 class IacSchemaErrors extends Error {
     constructor(errors) {
         super(`Invalid yaml`);
@@ -30,6 +31,7 @@ const validate = ajv
     .addSchema(functionSchema_1.functionSchema)
     .addSchema(eventSchema_1.eventSchema)
     .addSchema(databaseSchema_1.databaseSchema)
+    .addSchema(bucketSchema_1.bucketSchema)
     .compile(rootSchema_1.rootSchema);
 const validateYaml = (iacJson) => {
     const valid = validate(iacJson);

package/dist/src/validator/rootSchema.js

@@ -46,6 +46,9 @@ exports.rootSchema = {
         databases: {
             $ref: 'https://serverlessinsight.geekfun.club/schemas/databaseschema.json',
         },
+        buckets: {
+            $ref: 'https://serverlessinsight.geekfun.club/schemas/bucketschema.json',
+        },
     },
     required: ['version', 'provider', 'service'],
     additionalProperties: false,

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/index.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/actionContext.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/getVersion.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/tagParser.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/rosStack/bootstrap.ts","../src/stack/rosStack/database.ts","../src/stack/rosStack/event.ts","../src/stack/rosStack/function.ts","../src/stack/rosStack/index.ts","../src/stack/rosStack/stage.ts","../src/stack/rosStack/tag.ts","../src/stack/rosStack/vars.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/provider.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts"],"version":"5.7.2"}
+{"root":["../src/index.ts","../src/commands/deploy.ts","../src/commands/destroy.ts","../src/commands/index.ts","../src/commands/template.ts","../src/commands/validate.ts","../src/common/base64.ts","../src/common/constants.ts","../src/common/context.ts","../src/common/domainHelper.ts","../src/common/getVersion.ts","../src/common/iacHelper.ts","../src/common/imsClient.ts","../src/common/index.ts","../src/common/logger.ts","../src/common/providerEnum.ts","../src/common/rosAssets.ts","../src/common/rosClient.ts","../src/lang/index.ts","../src/parser/bucketParser.ts","../src/parser/databaseParser.ts","../src/parser/eventParser.ts","../src/parser/functionParser.ts","../src/parser/index.ts","../src/parser/tagParser.ts","../src/stack/deploy.ts","../src/stack/index.ts","../src/stack/rfsStack/function.ts","../src/stack/rfsStack/index.ts","../src/stack/rosStack/bootstrap.ts","../src/stack/rosStack/bucket.ts","../src/stack/rosStack/database.ts","../src/stack/rosStack/event.ts","../src/stack/rosStack/function.ts","../src/stack/rosStack/index.ts","../src/stack/rosStack/stage.ts","../src/stack/rosStack/tag.ts","../src/stack/rosStack/vars.ts","../src/types/assets.ts","../src/types/index.ts","../src/types/domains/bucket.ts","../src/types/domains/context.ts","../src/types/domains/database.ts","../src/types/domains/event.ts","../src/types/domains/function.ts","../src/types/domains/provider.ts","../src/types/domains/tag.ts","../src/types/domains/vars.ts","../src/validator/bucketSchema.ts","../src/validator/databaseSchema.ts","../src/validator/eventSchema.ts","../src/validator/functionSchema.ts","../src/validator/iacSchema.ts","../src/validator/index.ts","../src/validator/rootSchema.ts"],"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geek-fun/serverlessinsight",
-  "version": "0.2.1",
+  "version": "0.3.1",
   "description": "Full life cycle cross providers serverless application management for your fast-growing business.",
   "homepage": "https://serverlessinsight.geekfun.club",
   "main": "dist/src/index.js",
@@ -49,45 +49,52 @@
     "function"
   ],
   "dependencies": {
-    "@alicloud/ims20190815": "^2.1.4",
-    "@alicloud/openapi-client": "^0.4.12",
-    "@alicloud/ros-cdk-apigateway": "^1.4.0",
-    "@alicloud/ros-cdk-core": "^1.4.0",
-    "@alicloud/ros-cdk-elasticsearchserverless": "^1.4.0",
-    "@alicloud/ros-cdk-fc3": "^1.4.0",
-    "@alicloud/ros-cdk-oss": "^1.4.0",
-    "@alicloud/ros-cdk-ossdeployment": "^1.4.0",
-    "@alicloud/ros-cdk-ram": "^1.4.0",
-    "@alicloud/ros-cdk-rds": "^1.5.0",
-    "@alicloud/ros-cdk-sls": "^1.5.0",
-    "@alicloud/ros20190910": "^3.5.2",
+    "@alicloud/ims20190815": "^2.2.0",
+    "@alicloud/openapi-client": "^0.4.14",
+    "@alicloud/ros-cdk-apigateway": "^1.8.0",
+    "@alicloud/ros-cdk-core": "^1.8.0",
+    "@alicloud/ros-cdk-dns": "^1.8.0",
+    "@alicloud/ros-cdk-ecs": "^1.8.0",
+    "@alicloud/ros-cdk-elasticsearchserverless": "^1.8.0",
+    "@alicloud/ros-cdk-fc3": "^1.8.0",
+    "@alicloud/ros-cdk-nas": "^1.8.0",
+    "@alicloud/ros-cdk-oss": "^1.8.0",
+    "@alicloud/ros-cdk-ossdeployment": "^1.8.0",
+    "@alicloud/ros-cdk-ram": "^1.8.0",
+    "@alicloud/ros-cdk-rds": "^1.8.0",
+    "@alicloud/ros-cdk-sls": "^1.8.0",
+    "@alicloud/ros-cdk-vpc": "^1.8.0",
+    "@alicloud/ros20190910": "^3.5.6",
     "ajv": "^8.17.1",
     "ali-oss": "^6.22.0",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
+    "chalk": "^5.4.1",
+    "commander": "^13.1.0",
+    "i": "^0.3.7",
     "i18n": "^0.15.1",
+    "jszip": "^3.10.1",
     "lodash": "^4.17.21",
-    "pino": "^9.5.0",
+    "npm": "^11.2.0",
+    "pino": "^9.6.0",
     "pino-pretty": "^13.0.0",
-    "yaml": "^2.6.1"
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
     "@types/ali-oss": "^6.16.11",
     "@types/i18n": "^0.13.12",
     "@types/jest": "^29.5.14",
-    "@types/lodash": "^4.17.13",
-    "@types/node": "^22.10.1",
-    "@typescript-eslint/eslint-plugin": "^8.17.0",
-    "@typescript-eslint/parser": "^8.17.0",
-    "eslint": "^9.16.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.13.0",
+    "@types/lodash": "^4.17.16",
+    "@types/node": "^22.14.0",
+    "@typescript-eslint/eslint-plugin": "^8.29.0",
+    "@typescript-eslint/parser": "^8.29.0",
+    "eslint": "^9.24.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-prettier": "^5.2.6",
+    "globals": "^16.0.0",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
-    "prettier": "^3.4.2",
-    "ts-jest": "^29.2.5",
+    "prettier": "^3.5.3",
+    "ts-jest": "^29.3.1",
     "ts-node": "^10.9.2",
-    "typescript": "^5.7.2"
+    "typescript": "^5.8.3"
   }
 }

package/samples/{aliyun-poc-fc.yml → aliyun-poc-api.yml}

@@ -1,7 +1,7 @@
 version: 0.0.1
 provider:
   name: aliyun
-  region: cn-chengdu
+  region: cn-hongkong
 
 vars:
   region: cn-hangzhou
@@ -18,17 +18,18 @@ stages:
   prod:
     region: cn-shanghai
 
-service: insight-poc
+service: insight-poc-api
 
 tags:
   owner: geek-fun
 
 functions:
   insight_poc_fn:
-    name: insight-poc-fn
-    runtime: nodejs18
-    handler: ${vars.handler}
-    code: tests/fixtures/artifacts/artifact.zip
+    name: insight-poc-api-fn
+    code:
+      runtime: nodejs18
+      handler: ${vars.handler}
+      path: tests/fixtures/artifacts/artifact.zip
     memory: 512
     timeout: 10
     environment:
@@ -36,15 +37,6 @@ functions:
       TEST_VAR: ${vars.testv}
       TEST_VAR_EXTRA: abcds-${vars.testv}-andyou
 
-databases:
-  insight_poc_db:
-    name: insight-poc-db
-    type: RDS_POSTGRESQL_SERVERLESS
-    version: '17.0'
-    security:
-      basic_auth:
-        password: 'U34I6InQ8elseTgqTWT2t2oFXpoqFg'
-
 events:
   gateway_event:
     type: API_GATEWAY
@@ -53,8 +45,5 @@ events:
       - method: GET
         path: /api/hello
         backend: ${functions.insight_poc_fn}
-#    custom_domain:
-#      domain_name: test.com
-#      certificate_name: test
-#      certificate_private_key: test
-#      certificate_body: test
+    domain:
+      domain_name: insight-api.serverlessinsight.com

package/samples/aliyun-poc-bucket.yml

@@ -0,0 +1,20 @@
+version: 0.0.1
+
+provider:
+  name: aliyun
+  region: cn-chengdu
+
+
+service: insight-bucket-poc
+
+tags:
+  owner: geek-fun
+
+buckets:
+  insight_poc_bucket:
+    name: insight-poc-bucket
+    website:
+      code: dist
+      index: index.html
+      error_page: 404.html
+      error_code: 404

package/samples/aliyun-poc-domain.yml

@@ -0,0 +1,23 @@
+version: 0.0.1
+
+provider:
+  name: aliyun
+  region: cn-hongkong
+
+
+service: insight-poc-domain
+
+tags:
+  owner: geek-fun
+
+buckets:
+  insight_poc_bucket:
+    name: insight-poc-domain
+    security:
+      acl: PUBLIC_READ
+    website:
+      code: dist
+      domain: meke-ui.serverlessinsight.com
+      index: index.html
+      error_page: 404.html
+      error_code: 404

package/samples/aliyun-poc-fc-gpu.yml

@@ -0,0 +1,55 @@
+version: 0.0.1
+provider:
+  name: aliyun
+  region: cn-hangzhou
+
+
+service: insight-poc-gpu
+
+tags:
+  owner: geek-fun
+
+functions:
+  insight_poc_fn:
+    name: insight-poc-gpu-fn
+    container:
+      image: registry.cn-hangzhou.aliyuncs.com/serverless_devs/modelscope:ubuntu20.04-cuda11.3.0-py37-torch1.11.0-tf1.15.5-1.5.0
+      cmd: "ollama run modelscope.cn/DeepSeek-R1-Distill-Qwen-1.5B-GGUF"
+      port: 9000
+    memory: 4096
+    gpu: TESLA_16
+    timeout: 900
+    log: true
+    network:
+      vpc_id: vpc-bp1jpzq0807mrww7i8uko
+      subnet_ids:
+        - vsw-bp1tp32pxn8c3mm07e9s2
+        - vsw-bp1gs2ggjq85apbf5yd9d
+      security_group:
+        name: insight-poc-gpu-fn-sg
+        ingress:
+          - TCP:0.0.0.0/0:80
+          - TCP:0.0.0.0/0:443
+          - TCP:0.0.0.0/0:22/22
+          - ICMP:0.0.0.0/0:ALL
+        egress:
+          - ALL:0.0.0.0/0:ALL
+    storage:
+      nas:
+        - mount_path: /mnt/nas
+          storage_class: STANDARD_CAPACITY
+    environment:
+      OLLAMA_MODELS: /mnt/nas/models
+      LLAMA_GPU_OVERHEAD: 0
+      OLLAMA_HOST: http://0.0.0.0:11434
+      OLLAMA_INTEL_GPU: false
+      OLLAMA_KEEP_ALIVE: 2562047h47m16.854775807s
+      OLLAMA_LOAD_TIMEOUT: 5m0s
+      OLLAMA_MAX_LOADED_MODELS: 1
+      OLLAMA_MAX_QUEUE: 1
+      OLLAMA_MULTIUSER_CACHE: false
+      OLLAMA_NOHISTORY: false
+      OLLAMA_NOPRUNE: false
+      OLLAMA_NUM_PARALLEL: 1
+      OLLAMA_ORIGINS: [ * http://localhost https://localhost http://localhost:* https://localhost:* http://127.0.0.1 https://127.0.0.1 http://127.0.0.1:* https://127.0.0.1:* http://0.0.0.0 https://0.0.0.0 http://0.0.0.0:* https://0.0.0.0:* app://* file://* tauri://* vscode-webview://* ]
+      OLLAMA_SCHED_SPREAD: fals

package/samples/huawei-poc-fc.yml

@@ -23,9 +23,10 @@ tags:
 functions:
   insight_poc_fn:
     name: insight-poc-fn
-    runtime: nodejs18
-    handler: ${vars.handler}
-    code: tests/fixtures/artifacts/artifact.zip
+    code:
+      runtime: nodejs18
+      handler: ${vars.handler}
+      path: tests/fixtures/artifacts/artifact.zip
     memory: 512
     timeout: 10
     environment:

package/dist/src/common/actionContext.js

@@ -1,31 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.constructActionContext = exports.getIacLocation = void 0;
-const node_path_1 = __importDefault(require("node:path"));
-const getIacLocation = (location) => {
-    const projectRoot = node_path_1.default.resolve(process.cwd());
-    return location
-        ? node_path_1.default.resolve(projectRoot, location)
-        : node_path_1.default.resolve(projectRoot, 'serverlessinsight.yml') ||
-            node_path_1.default.resolve(projectRoot, 'serverlessInsight.yml') ||
-            node_path_1.default.resolve(projectRoot, 'ServerlessInsight.yml') ||
-            node_path_1.default.resolve(projectRoot, 'serverless-insight.yml');
-};
-exports.getIacLocation = getIacLocation;
-const constructActionContext = (config) => {
-    return {
-        stage: config?.stage ?? 'default',
-        stackName: config?.stackName ?? '',
-        region: config?.region ?? process.env.ROS_REGION_ID ?? process.env.ALIYUN_REGION ?? 'cn-hangzhou',
-        accessKeyId: config?.accessKeyId ?? process.env.ALIYUN_ACCESS_KEY_ID,
-        accessKeySecret: config?.accessKeySecret ?? process.env.ALIYUN_ACCESS_KEY_SECRET,
-        securityToken: config?.securityToken ?? process.env.ALIYUN_SECURITY_TOKEN,
-        iacLocation: (0, exports.getIacLocation)(config?.location),
-        parameters: Object.entries(config?.parameters ?? {}).map(([key, value]) => ({ key, value })),
-        provider: config?.provider,
-    };
-};
-exports.constructActionContext = constructActionContext;