fix(runtime): fix cloud sdk cannot initialize in custom deps module (#…

…1711) * fix(runtime): fix cloud sdk cannot initialize in custom deps module * opt the init scripts * chore: use fixed node version in dockerfile
labring · Nov 27, 2023 · c1748d6 · c1748d6
1 parent 2fbc5f1
commit c1748d6
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 18 deletions.
diff --git a/packages/cloud-sdk/package-lock.json b/packages/cloud-sdk/package-lock.json
diff --git a/packages/cloud-sdk/package.json b/packages/cloud-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lafjs/cloud",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.13-fix",
   "description": "The cloud sdk for laf cloud function",
   "main": "dist/index.js",
   "scripts": {

diff --git a/packages/cloud-sdk/src/cloud.ts b/packages/cloud-sdk/src/cloud.ts
@@ -19,6 +19,10 @@ export class Cloud implements CloudSdkInterface {
   private _cloud: CloudSdkInterface
 
   private get cloud(): CloudSdkInterface {
+    if (globalThis.createCloudSdk && !Cloud.create) {
+      Cloud.create = globalThis.createCloudSdk
+    }
+
     if (!this._cloud) {
       this._cloud = Cloud.create()
     }

diff --git a/runtimes/nodejs/Dockerfile b/runtimes/nodejs/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:20.10.0
 
 RUN apt update && apt-get install build-essential libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev git -y
 

diff --git a/runtimes/nodejs/Dockerfile.init b/runtimes/nodejs/Dockerfile.init
@@ -1,4 +1,4 @@
-FROM node:20
+FROM node:20.10.0
 
 WORKDIR /app
 

diff --git a/runtimes/nodejs/init.sh b/runtimes/nodejs/init.sh
@@ -29,20 +29,21 @@ if [ -n "$NODE_MODULES_PULL_URL" ]; then
   else
     elapsed_time=$(expr $end_time - $start_time)
     echo "Downloaded node_modules.tar in $elapsed_time seconds."
-  fi
-
-  # untar node_modules.tar
-  tar -xf node_modules.tar -C .
 
-  # check tar exit code
-  if [ $? -ne 0 ]; then
-    echo "Failed to extract node_modules cache."
-  else
-    end_time_2=$(date +%s)
-    elapsed_time_2=$(expr $end_time_2 - $end_time)
-    echo "Extracted node_modules cache in $elapsed_time_2 seconds."
+    # untar node_modules.tar
+    tar -xf node_modules.tar -C .
+
+    # check tar exit code
+    if [ $? -ne 0 ]; then
+      echo "Failed to extract node_modules cache."
+    else
+      end_time_2=$(date +%s)
+      elapsed_time_2=$(expr $end_time_2 - $end_time)
+      echo "Extracted node_modules cache in $elapsed_time_2 seconds."
+    fi
   fi
 
+
   # re-enable set -e
   set -e
 else

diff --git a/runtimes/nodejs/src/index.ts b/runtimes/nodejs/src/index.ts
@@ -21,6 +21,10 @@ import xmlparser from 'express-xml-bodyparser'
 import './support/cloud-sdk'
 import storageServer from './storage-server'
 import { DatabaseChangeStream } from './support/database-change-stream'
+import { createCloudSdk } from './support/cloud-sdk'
+
+// hack: set createCloudSdk to global object to make it available in @lafjs/cloud package
+globalThis.createCloudSdk = createCloudSdk
 
 const app = express()
 

diff --git a/runtimes/nodejs/src/support/cloud-sdk.ts b/runtimes/nodejs/src/support/cloud-sdk.ts
@@ -7,7 +7,9 @@ import Config from '../config'
 import { FunctionContext } from './engine'
 import { FunctionModule } from './engine/module'
 
-Cloud.create = createCloudSdk
+if (!Cloud.create) {
+  Cloud.create = createCloudSdk
+}
 
 /**
  * object shared cross all functions & requests
@@ -19,7 +21,7 @@ const _shared_preference = new Map<string, any>()
  *
  * @returns
  */
-function createCloudSdk() {
+export function createCloudSdk() {
   const cloud: CloudSdkInterface = {
     database: () => getDb(DatabaseAgent.accessor),
     invoke: invokeInFunction,