fix(app-service): clean unused codes; remove cloud.storage() #21

labring · Feb 2, 2022 · c650bfe · c650bfe
1 parent 621fb14
commit c650bfe
Show file tree

Hide file tree

Showing 32 changed files with 153 additions and 1,362 deletions.
diff --git a/packages/app-service/package-lock.json b/packages/app-service/package-lock.json
diff --git a/packages/app-service/package.json b/packages/app-service/package.json
@@ -16,13 +16,13 @@
   },
   "keywords": [
     "BaaS",
-    "cloud",
-    "mysql",
-    "acl",
+    "mongodb",
+    "laf.js",
     "serverless",
-    "less-api"
+    "laf"
   ],
   "dependencies": {
+    "adm-zip": "^0.5.9",
     "alipay-sdk": "^3.1.7",
     "axios": "^0.21.1",
     "cloud-function-engine": "^0.7.0",
@@ -44,9 +44,10 @@
     "ws": "^8.2.3"
   },
   "devDependencies": {
+    "@types/adm-zip": "^0.4.34",
     "@types/dotenv": "^8.2.0",
     "@types/ejs": "^3.0.7",
-    "@types/express": "^4.17.13",
+    "@types/express": "^4.17.11",
     "@types/fs-extra": "^9.0.8",
     "@types/jsonwebtoken": "^8.5.1",
     "@types/lodash": "^4.14.171",

diff --git a/packages/app-service/scripts/create-internal-package.js b/packages/app-service/scripts/create-internal-package.js
@@ -1,3 +1,5 @@
-const { createCloudFunctionDeclarationPackage } = require("../dist/lib/utils/init");
+const { createCloudFunctionDeclarationPackage } = require("../dist/api/init");
 
-createCloudFunctionDeclarationPackage()
+createCloudFunctionDeclarationPackage()
+
+process.exit(0)
diff --git a/packages/app-service/src/api/function-log.ts b/packages/app-service/src/api/function-log.ts
diff --git a/packages/app-service/src/api/function.ts b/packages/app-service/src/api/function.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: Maslow<[email protected]>
  * @Date: 2021-07-30 10:30:29
- * @LastEditTime: 2021-11-05 13:38:09
+ * @LastEditTime: 2022-02-03 00:58:33
  * @Description: 
  */
 
@@ -37,4 +37,41 @@ export async function getFunctionById(func_id: string) {
     })
 
   return doc as any
+}
+
+
+export interface CloudFunctionLogStruct {
+  requestId: string
+  method: string
+  func_id: ObjectId
+  func_name: string
+  logs: string[]
+  time_usage: number
+  data: any
+  error: Error
+  debug?: boolean
+  created_at?: Date
+  created_by?: any
+}
+
+/**
+ * Add function execution log
+ * @param data 
+ * @returns 
+ */
+export async function addFunctionLog(data: CloudFunctionLogStruct): Promise<any> {
+  const db = DatabaseAgent.db
+
+  if (!data) return null
+  if (typeof data.error === 'object') {
+    data.error = data.error.toString() as any
+  }
+
+  const r = await db.collection(Constants.function_log_collection)
+    .insertOne({
+      ...data,
+      created_at: new Date()
+    })
+
+  return r.insertedId
 }
diff --git a/packages/app-service/src/api/indexes.ts b/packages/app-service/src/api/indexes.ts
diff --git a/packages/app-service/src/api/init.ts b/packages/app-service/src/api/init.ts
@@ -4,6 +4,7 @@ import path = require('path')
 import { Constants } from '../constants'
 import { DatabaseAgent } from '../lib/database'
 import { execSync } from 'child_process'
+import Config from '../config'
 
 /**
  * 在 node_modules 中创建 云函数 sdk 包：@， 这个包是为了云函数IDE 加载类型提示文件而创建的，不可发布
@@ -96,4 +97,26 @@ export function moduleExists(mod: string) {
   } catch (_err) {
     return false
   }
+}
+
+/**
+ * Create necessary indexes of collections
+ * @param data 
+ * @returns 
+ */
+ export async function ensureCollectionIndexes(): Promise<any> {
+  const db = DatabaseAgent.db
+  await db.collection(Constants.function_log_collection)
+    .createIndexes([
+      {
+        key: { created_at: 1 },
+        expireAfterSeconds: Config.FUNCTION_LOG_EXPIRED_TIME
+      },
+      {
+        key: { requestId: 1 }
+      },
+      { key: { func_id: 1 } }
+    ])
+
+  return true
 }
diff --git a/packages/app-service/src/cloud-sdk/index.ts b/packages/app-service/src/cloud-sdk/index.ts
@@ -1,14 +1,12 @@
 import { AxiosStatic } from "axios"
 import { Db, getDb } from "database-proxy"
 import { FunctionContext } from "cloud-function-engine"
-import { FileStorageInterface } from "../lib/storage/interface"
 import * as mongodb from "mongodb"
 import { DatabaseAgent } from "../lib/database"
 import request from 'axios'
 import { SchedulerInstance } from "../lib/scheduler"
 import { getToken, parseToken } from "../lib/utils/token"
 import { invokeInFunction } from "./invoke"
-import { createFileStorage } from "../lib/storage"
 import { CloudFunction } from "../lib/function"
 import { WebSocket } from "ws"
 import { WebSocketAgent } from "../lib/ws"
@@ -31,14 +29,6 @@ export interface CloudSdkInterface {
    */
   fetch: AxiosStatic
 
-  /**
-   * Get a file storage manager
-   * 
-   * @deprecated this is deprecated and will be removed in a future release
-   * @param bucket the bucket name, default is 'public'
-   */
-  storage(bucket?: string): FileStorageInterface
-
   /**
    * Get a laf.js database-ql instance
    */
@@ -134,7 +124,6 @@ DatabaseAgent.accessor.ready.then(() => {
 export function create() {
   const cloud: CloudSdkInterface = {
     database: () => getDb(DatabaseAgent.accessor),
-    storage: createFileStorage,
     fetch: request,
     invoke: invokeInFunction,
     emit: (event: string, param: any) => SchedulerInstance.emit(event, param),

diff --git a/packages/app-service/src/cloud-sdk/invoke.ts b/packages/app-service/src/cloud-sdk/invoke.ts
@@ -1,6 +1,5 @@
-import { getFunctionByName } from "../api/function"
+import { addFunctionLog, getFunctionByName } from "../api/function"
 import { FunctionContext } from "cloud-function-engine"
-import { addFunctionLog } from "../api/function-log"
 import { CloudFunction } from "../lib/function"
 
 

diff --git a/packages/app-service/src/constants.ts b/packages/app-service/src/constants.ts
@@ -1,4 +1,4 @@
-import { deepFreeze } from "./lib/utils/lang"
+import { deepFreeze } from "./lib/utils"
 
 /**
  * Constants collection

diff --git a/packages/app-service/src/init.ts b/packages/app-service/src/init.ts
@@ -1,4 +1,4 @@
-import { getExtraPackages, initCloudSdkPackage, installPackages, moduleExists } from "./api/init"
+import { ensureCollectionIndexes, getExtraPackages, initCloudSdkPackage, installPackages, moduleExists } from "./api/init"
 import { logger } from "./lib/logger"
 
 
@@ -24,6 +24,8 @@ async function main() {
     logger.info(res)
 
     initCloudSdkPackage()
+
+    await ensureCollectionIndexes()
   } catch (error) {
     logger.error(error)
     return 1

diff --git a/packages/app-service/src/lib/database/index.ts b/packages/app-service/src/lib/database/index.ts
@@ -1,7 +1,7 @@
 /*
  * @Author: Maslow<[email protected]>
  * @Date: 2021-08-16 15:29:15
- * @LastEditTime: 2021-11-03 17:10:04
+ * @LastEditTime: 2022-02-03 00:42:33
  * @Description: 
  */
 
@@ -10,7 +10,6 @@ import { MongoAccessor } from 'database-proxy'
 import Config from '../../config'
 import { createLogger, logger } from '../logger'
 import * as mongodb_uri from 'mongodb-uri'
-import { ensureCollectionIndexes } from '../../api/indexes'
 
 
 /**
@@ -45,7 +44,6 @@ export class DatabaseAgent {
     accessor.init()
       .then(async () => {
         logger.info('db connected')
-        await ensureCollectionIndexes()
       })
       .catch(error => {
         logger.error(error)

diff --git a/packages/app-service/src/lib/scheduler/scheduler.ts b/packages/app-service/src/lib/scheduler/scheduler.ts
@@ -1,12 +1,12 @@
 /*
  * @Author: Maslow<[email protected]>
  * @Date: 2021-07-30 10:30:29
- * @LastEditTime: 2021-11-09 20:02:51
+ * @LastEditTime: 2022-02-03 00:58:59
  * @Description: 
  */
 
 import { getFunctionById } from "../../api/function"
-import { addFunctionLog, CloudFunctionLogStruct } from "../../api/function-log"
+import { addFunctionLog, CloudFunctionLogStruct } from "../../api/function"
 import { TriggerScheduler } from "cloud-function-engine"
 import { createLogger } from "../logger"
 import assert = require("assert")