fix: serverless app layers support (#892)

midwayjs · Mar 9, 2021 · 45cd7fe · 45cd7fe
1 parent 9a7c2ca
commit 45cd7fe
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/packages-serverless/serverless-app/src/index.ts b/packages-serverless/serverless-app/src/index.ts
@@ -203,12 +203,13 @@ export class Framework
     }
 
     const triggerMap = this.getTriggerMap();
-
+    const layers = this.getLayers();
     const { Framework } = require(usageFaasModulePath);
     const startResult = await start2({
       appDir,
       baseDir: currentBaseDir,
       framework: Framework,
+      layers: layers,
       starter: require(starterName),
       initializeContext: undefined,
     });
@@ -314,4 +315,28 @@ export class Framework
       process.send({ type: 'dev:' + type, data, id: msg.id });
     });
   }
+
+  private getLayers() {
+    const specLayers = [];
+    if (this.configurationOptions.layers) {
+      this.configurationOptions.layers.forEach(path => {
+        const layer = require(path);
+        specLayers.push(layer);
+      });
+    }
+    if (this.spec?.layers) {
+      Object.keys(this.spec.layers).forEach(layerName => {
+        const info = this.spec.layers[layerName];
+        if (!info?.path) {
+          return;
+        }
+        const [type, path] = info.path.split(':');
+        if (type === 'npm') {
+          const layer = require(path);
+          specLayers.push(layer);
+        }
+      });
+    }
+    return specLayers;
+  }
 }
diff --git a/packages-serverless/serverless-app/src/interface.ts b/packages-serverless/serverless-app/src/interface.ts
@@ -10,4 +10,5 @@ export interface IServerlessApp extends IMidwayApplication {
 export interface IServerlessAppOptions extends IConfigurationOptions {
   port?: string | number;
   initContext?: any;
+  layers?: string[];
 }
diff --git a/packages-serverless/serverless-app/src/platform.ts b/packages-serverless/serverless-app/src/platform.ts
@@ -1,9 +1,13 @@
 export const StarterMap = {
   aliyun: ['@ali/serverless-fc-starter', '@midwayjs/serverless-fc-starter'],
   tencent: ['@midwayjs/serverless-scf-trigger'],
+  gaia: ['@ali/serverless-gaia-starter'],
+  ginkgo: ['@ali/serverless-ginkgo-starter'],
 };
 
 export const TriggerMap = {
   aliyun: ['@midwayjs/serverless-fc-trigger'],
   tencent: ['@midwayjs/serverless-scf-trigger'],
+  gaia: ['@ali/serverless-gaia-trigger'],
+  ginkgo: ['@ali/serverless-ginkgo-trigger'],
 };
diff --git a/packages-serverless/serverless-app/src/utils.ts b/packages-serverless/serverless-app/src/utils.ts
@@ -36,7 +36,7 @@ export const output404 = (path, functionsMap) => {
     <div style="padding: 48px 24px 0 24px;font-size: 24px;color: #333;line-height: 24px;">404</div>
     <div style="padding: 0 24px;font-size: 14px;color: #666;line-height: 48px;">path '${path}' not found</div>
     ${
-      allPath.length
+      process.env.NODE_ENV === 'development' && allPath.length
         ? `<div style="padding: 24px;font-size: 13px;line-height: 18px;">
       <div>You can visit:</div>
       ${allPath