feat(server): add npm install flags to region; opt instance starting …

…perf (#1133)

runtimes/nodejs/init.sh

@@ -1,7 +1,14 @@
 #!/bin/sh
 
-# echo "****** init start ******"
 set -e
-node ./dist/init.js
+# node ./dist/init.js
+
+# skip init if $DEPENDENCIES is empty
+if [ -z "$DEPENDENCIES" ]; then
+  echo "No dependencies to install."
+  exit 0
+fi
+
+echo "npm install $DEPENDENCIES $NPM_INSTALL_FLAGS"
+npm install $DEPENDENCIES $NPM_INSTALL_FLAGS
 cp -r /app/* /tmp/app
-# echo "****** init end *******"

runtimes/nodejs/src/config.ts

@@ -72,8 +72,8 @@ export default class Config {
     return require('../package.json')?.version
   }
 
-  static get APP_ID(): string {
-    return process.env.APP_ID
+  static get APPID(): string {
+    return process.env.APPID ?? process.env.APP_ID
   }
 
   static get NPM_INSTALL_FLAGS(): string {
@@ -83,8 +83,4 @@ export default class Config {
   static get REQUEST_LIMIT_SIZE(): string {
     return process.env.REQUEST_LIMIT_SIZE || '10mb'
   }
-
-  static get PACKAGES(): string {
-    return process.env.PACKAGES || ''
-  }
 }

runtimes/nodejs/src/index.ts

@@ -18,15 +18,16 @@ import { DatabaseAgent } from './db'
 import xmlparser from 'express-xml-bodyparser'
 
 // init static method of class
-import './support/function-log'
 import './support/cloud-sdk'
 import { FunctionCache } from './support/function-engine/cache'
 import { DatabaseChangeStream } from './support/db-change-stream'
 import { InitHook } from './support/init-hook'
+import { ensureCollectionIndexes } from './support/function-log'
 
 const app = express()
 
 DatabaseAgent.accessor.ready.then(() => {
+  ensureCollectionIndexes()
   FunctionCache.initialize()
   DatabaseChangeStream.initialize()
   InitHook.invoke()

runtimes/nodejs/src/init.ts

@@ -2,13 +2,10 @@ import { execSync } from 'child_process'
 import Config from './config'
 
 import { logger } from './support/logger'
-import { FUNCTION_LOG_COLLECTION } from './constants'
 
 async function main() {
   try {
     installPackages()
-
-    await ensureCollectionIndexes()
   } catch (error) {
     logger.error(error)
     return 1
@@ -32,7 +29,7 @@ main()
  * @returns
  */
 export function installPackages() {
-  const deps = process.env.DEPENDENCIES || ''
+  const deps = process.env.DEPENDENCIES
   if (!deps) {
     return
   }
@@ -56,23 +53,3 @@ export function moduleExists(mod: string) {
     return false
   }
 }
-
-/**
- * Create necessary indexes of collections
- * @param data
- * @returns
- */
-export async function ensureCollectionIndexes(): Promise<any> {
-  // init.ts should not import db globally, because init.ts would be referenced in build time
-  const { DatabaseAgent } = require('./db')
-  await DatabaseAgent.accessor.ready
-  const db = DatabaseAgent.db
-  await db.collection(FUNCTION_LOG_COLLECTION).createIndexes([
-    {
-      key: { created_at: 1 },
-      expireAfterSeconds: Config.FUNCTION_LOG_EXPIRED_TIME,
-    },
-  ])
-
-  return true
-}

runtimes/nodejs/src/support/cloud-sdk.ts

@@ -25,7 +25,7 @@ function createCloudSdk() {
       db: DatabaseAgent.accessor.db,
     },
     sockets: WebSocketAgent.clients,
-    appid: Config.APP_ID,
+    appid: Config.APPID,
     get env() {
       return {
         ...process.env,

runtimes/nodejs/src/support/function-log.ts

@@ -1,3 +1,4 @@
+import Config from '../config'
 import { FUNCTION_LOG_COLLECTION } from '../constants'
 import { DatabaseAgent } from '../db'
 import { FunctionConsole, FunctionContext } from './function-engine'
@@ -22,3 +23,21 @@ FunctionConsole.write = (message: string, ctx: FunctionContext) => {
 
   db.collection<IFunctionLog>(FUNCTION_LOG_COLLECTION).insertOne(doc)
 }
+
+
+/**
+ * Create necessary indexes of collections
+ * @param data
+ * @returns
+ */
+export async function ensureCollectionIndexes(): Promise<any> {
+  const db = DatabaseAgent.db
+  await db.collection(FUNCTION_LOG_COLLECTION).createIndexes([
+    {
+      key: { created_at: 1 },
+      expireAfterSeconds: Config.FUNCTION_LOG_EXPIRED_TIME,
+    },
+  ])
+
+  return true
+}

runtimes/nodejs/src/support/token.ts

@@ -7,7 +7,6 @@
 
 import Config from '../config'
 import * as jwt from 'jsonwebtoken'
-const DEFAULT_SALT = Config.SERVER_SECRET
 
 /**
  * Generate a JWT token
@@ -16,7 +15,7 @@ const DEFAULT_SALT = Config.SERVER_SECRET
  * @returns
  */
 export function getToken(payload: any, secret?: string): string {
-  return jwt.sign(payload, secret ?? DEFAULT_SALT)
+  return jwt.sign(payload, secret ?? Config.SERVER_SECRET)
 }
 
 /**
@@ -27,7 +26,7 @@ export function getToken(payload: any, secret?: string): string {
 export function parseToken(token: string, secret?: string): any | null {
   if (!token) return null
   try {
-    const ret = jwt.verify(token, secret ?? DEFAULT_SALT)
+    const ret = jwt.verify(token, secret ?? Config.SERVER_SECRET)
     return ret
   } catch (error) {
     return null

runtimes/nodejs/start.sh

@@ -1,9 +1,5 @@
 #!/bin/sh
 
-# echo "****** init start ******"
-# node ./dist/init.js
-# echo "****** init end *******"
-
 # source .env
 echo "****** start service: node $FLAGS --expose-internals --experimental-fetch ./dist/index.js *******"
 exec node $FLAGS --expose-internals --experimental-fetch ./dist/index.js

server/prisma/schema.prisma

@@ -105,8 +105,9 @@ model PersonalAccessToken {
 // region schemas
 
 type RegionClusterConf {
-  driver     String // kubernetes
-  kubeconfig String?
+  driver          String // kubernetes
+  kubeconfig      String?
+  npmInstallFlags String  @default("")
 }
 
 type RegionDatabaseConf {
@@ -737,9 +738,9 @@ model SmsVerifyCode {
 }
 
 model Setting {
-  id        String   @id @default(auto()) @map("_id") @db.ObjectId
-  key       String   @unique
-  value     String
-  desc      String
-  metadata  Json? // extra meta data
+  id       String @id @default(auto()) @map("_id") @db.ObjectId
+  key      String @unique
+  value    String
+  desc     String
+  metadata Json? // extra meta data
 }

server/src/application/application-task.service.ts

@@ -26,7 +26,7 @@ import { BucketDomainService } from 'src/gateway/bucket-domain.service'
 
 @Injectable()
 export class ApplicationTaskService {
-  readonly lockTimeout = 60 // in second
+  readonly lockTimeout = 15 // in second
   private readonly logger = new Logger(ApplicationTaskService.name)
 
   constructor(
@@ -85,6 +85,7 @@ export class ApplicationTaskService {
           lockedAt: { $lt: new Date(Date.now() - 1000 * this.lockTimeout) },
         },
         { $set: { lockedAt: new Date() } },
+        { sort: { lockedAt: 1, updatedAt: 1 } },
       )
 
     if (!res.value) return
@@ -180,6 +181,7 @@ export class ApplicationTaskService {
           lockedAt: { $lt: new Date(Date.now() - 1000 * this.lockTimeout) },
         },
         { $set: { lockedAt: new Date() } },
+        { sort: { lockedAt: 1, updatedAt: 1 } },
       )
 
     if (!res.value) return

server/src/instance/instance-task.service.ts

@@ -9,7 +9,7 @@ import { CronJobService } from 'src/trigger/cron-job.service'
 
 @Injectable()
 export class InstanceTaskService {
-  readonly lockTimeout = 10 // in second
+  readonly lockTimeout = 15 // in second
   private readonly logger = new Logger(InstanceTaskService.name)
 
   constructor(
@@ -50,7 +50,7 @@ export class InstanceTaskService {
     // Phase `Started` -> `Starting`
     this.handleRestartingState().catch((err) => {
       this.logger.error('handleRestartingPhase error', err)
-      err?.response && this.logger.debug(err?.response?.data || err?.response)
+      this.logger.debug(err?.response?.toJSON() || JSON.stringify(err))
     })
   }
 
@@ -93,6 +93,7 @@ export class InstanceTaskService {
           lockedAt: { $lt: new Date(Date.now() - 1000 * this.lockTimeout) },
         },
         { $set: { lockedAt: new Date() } },
+        { sort: { lockedAt: 1, updatedAt: 1 } },
       )
 
     if (!res.value) return
@@ -207,6 +208,7 @@ export class InstanceTaskService {
           lockedAt: { $lt: new Date(Date.now() - 1000 * this.lockTimeout) },
         },
         { $set: { lockedAt: new Date() } },
+        { sort: { lockedAt: 1, updatedAt: 1 } },
       )
 
     if (!res.value) return
@@ -260,10 +262,13 @@ export class InstanceTaskService {
       .findOneAndUpdate(
         {
           state: ApplicationState.Restarting,
-          phase: ApplicationPhase.Started,
+          phase: {
+            $in: [ApplicationPhase.Started, ApplicationPhase.Stopped],
+          },
           lockedAt: { $lt: new Date(Date.now() - 1000 * this.lockTimeout) },
         },
         { $set: { lockedAt: new Date() } },
+        { sort: { lockedAt: 1, updatedAt: 1 } },
       )
 
     if (!res.value) return
@@ -273,7 +278,12 @@ export class InstanceTaskService {
 
     // update application phase to `Starting`
     await db.collection<Application>('Application').updateOne(
-      { appid: app.appid, phase: ApplicationPhase.Started },
+      {
+        appid: app.appid,
+        phase: {
+          $in: [ApplicationPhase.Started, ApplicationPhase.Stopped],
+        },
+      },
       {
         $set: {
           phase: ApplicationPhase.Starting,
@@ -289,9 +299,12 @@ export class InstanceTaskService {
    * Relock application by appid, lockedTime is in milliseconds
    */
   async relock(appid: string, lockedTime = 0) {
-    // if lockedTime greater than 3 minutes, set it to 3 minutes
-    if (lockedTime > 3 * 60 * 1000) {
-      lockedTime = 3 * 60 * 1000
+    if (lockedTime <= 2 * 60 * 1000) {
+      lockedTime = Math.ceil(lockedTime / 10)
+    }
+
+    if (lockedTime > 2 * 60 * 1000) {
+      lockedTime = this.lockTimeout * 1000
     }
 
     const db = SystemDatabase.db