@steedos/service-pages 3.0.13-beta.38 → 3.0.13-beta.40

package/main/default/functions/pages_schema.function.yml

@@ -8,13 +8,10 @@ script: |-
       throw new Error("pageId parameter is missing");
   }
 
-  const _t0 = Date.now();
-
   const pages = await ctx.getObject('pages').find({
       filters: [['name', '=', pageId], "or", ['_id', '=', pageId]],
       top: 1
   });
-  console.log(`[PerfLog] [pages_schema.function] pages.find done | pageId=${pageId} | cost=${Date.now()-_t0}ms | rows=${pages ? pages.length : 0}`);
 
   // Fix: Check if a version was actually found to avoid "undefined" errors
   if (!pages || pages.length === 0) {
@@ -23,13 +20,11 @@ script: |-
   }
 
   const filters = [['page', '=', pages[0]._id], ['is_active', '=', true]];
-  const _t1 = Date.now();
   const pageVersions = await ctx.getObject('page_versions').find({
       filters: filters,
       sort: 'version desc',
       top: 1
   });
-  console.log(`[PerfLog] [pages_schema.function] page_versions.find done | pageId=${pageId} | cost=${Date.now()-_t1}ms | rows=${pageVersions ? pageVersions.length : 0}`);
 
   // Fix: Check if a version was actually found to avoid "undefined" errors
   if (!pageVersions || pageVersions.length === 0) {
@@ -48,8 +43,6 @@ script: |-
       }
   }
 
-  console.log(`[PerfLog] [pages_schema.function] total done | pageId=${pageId} | cost=${Date.now()-_t0}ms`);
-
   return {
       "type": "inject",
       "assets": [

package/main/default/routes/page_design.ejs

@@ -44,6 +44,7 @@
       const useOpenAPI= <%=(useOpenAPI === "true" || useOpenAPI === true)%>;
       const settings = {
         assetUrls: "<%=assetUrls%>",
+        unpkgUrl: "<%=unpkgUrl%>",
         rootUrl: "<%=rootUrl%>",
         userId: "<%=userId%>",
         tenantId: "<%=tenantId%>",

package/main/default/routes/page_design.router.js

@@ -34,7 +34,7 @@ router.get('/api/pageDesign', auth.requireAuthentication, async function (req, r
         const page = await objectql.broker.call(`page.getLatestPageVersion`, {pageId: req.query.pageId});
         const retUrl = req.query.retUrl || process.env.ROOT_URL + '/app/admin/pages/view/' + req.query.pageId
         const steedosBuilderUrl = process.env.STEEDOS_BUILDER_URL || 'https://builder.steedos.cn';
-        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&locale=${locale}&pageType=${page.type}`;
+        const builderHost = `${steedosBuilderUrl}/amis?${assetUrl}retUrl=${retUrl}&locale=${locale}&pageType=${page.type}&unpkgUrl=${process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn'}`;
 
         const filename = __dirname+'/page_design.ejs'
         const data = {
@@ -47,7 +47,8 @@ router.get('/api/pageDesign', auth.requireAuthentication, async function (req, r
             pageId: req.query.pageId,
             userSession: userSession,
             useOpenAPI: process.env.STEEDOS_PUBLIC_USE_OPEN_API,
-            locale: locale
+            locale: locale,
+            unpkgUrl: process.env.STEEDOS_UNPKG_URL || 'https://unpkg.steedos.cn',
         }
         const options = {}
         ejs.renderFile(filename, data, options, function(err, str){

package/main/default/routes/page_schema.router.js

@@ -18,7 +18,6 @@ router.get('/api/pageSchema/:type', auth.requireAuthentication, async function (
         const { app, objectApiName, recordId, pageId, formFactor} = req.query;
         const { type } = req.params;
 
-        const _t0 = Date.now();
         const pageSchema = await objectql.getSteedosSchema().broker.call(`page.getMeSchema`, {
             type,
             app,
@@ -31,7 +30,6 @@ router.get('/api/pageSchema/:type', auth.requireAuthentication, async function (
                 user: userSession
             }
         });
-        process.stdout.write(`[PerfLog] [page_schema.router] broker.call page.getMeSchema done | type=${type} | pageId=${pageId} | objectApiName=${objectApiName} | cost=${Date.now()-_t0}ms | hasSchema=${!!(pageSchema && pageSchema.schema)}\n`);
 
         res.send(pageSchema || {});
     } catch (error) {

package/main/default/services/page.service.js

@@ -29,10 +29,7 @@ module.exports = {
             async handler(ctx) {
                 const userSession = ctx.meta.user;
                 const { type, app, objectApiName, recordId, pageId, formFactor } = ctx.params;
-                const _t0 = Date.now();
-                process.stdout.write(`[PerfLog] [page.getMeSchema action] start | pageId=${pageId} | type=${type} | objectApiName=${objectApiName}\n`);
                 const _result = await this.getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession);
-                process.stdout.write(`[PerfLog] [page.getMeSchema action] done | pageId=${pageId} | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t0}ms | hasSchema=${!!(_result && _result.schema)}\n`);
                 return _result;
             }
         },
@@ -260,13 +257,11 @@ module.exports = {
             async handler(type, app, objectApiName, recordId, formFactor, userSession) {
                 const pageRender = this.settings.pageRender;
                 if (pageRender) {
-                    const _t0 = Date.now();
                     const _result = await this.broker.call(`${pageRender}.getDefaultSchema`, {type, app, objectApiName, recordId, formFactor}, {
                         meta: {
                           user: userSession
                         }
                       });
-                    process.stdout.write(`[PerfLog] [getDefaultSchema] broker.call ${pageRender}.getDefaultSchema done | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t0}ms | hasResult=${!!_result}\n`);
                     return _result;
                 }
                 return;
@@ -372,60 +367,42 @@ module.exports = {
         },
         getMeSchema: {
             async handler(type, app, objectApiName, recordId, pageId, formFactor, userSession) {
-                const _t0 = Date.now();
                 if(pageId){
-                    const _t1 = Date.now();
                     const records = await objectql.getObject('pages').find({filters: [['name', '=', pageId]]});
-                    process.stdout.write(`[PerfLog] [getMeSchema] pages.find done | pageId=${pageId} | cost=${Date.now()-_t1}ms | rows=${records.length}\n`);
                     let pageInfo = {};
                     if(records.length > 0){
                         pageInfo = records[0];
-                        const _t2 = Date.now();
                         const pageVersion = await this.getLatestPageVersion(pageInfo._id, true);
-                        process.stdout.write(`[PerfLog] [getMeSchema] getLatestPageVersion done | pageId=${pageId} | pageInfoId=${pageInfo._id} | cost=${Date.now()-_t2}ms | hasSchema=${!!(pageVersion && pageVersion.schema)}\n`);
                         if(pageVersion && pageVersion.schema){
-                            process.stdout.write(`[PerfLog] [getMeSchema] total done | pageId=${pageId} | cost=${Date.now()-_t0}ms | result=pageVersion schema\n`);
                             return Object.assign({}, pageInfo, {schema: pageVersion.schema});
                         } 
                     }
-                    process.stdout.write(`[PerfLog] [getMeSchema] total done | pageId=${pageId} | cost=${Date.now()-_t0}ms | result=null\n`);
                     return ;
                     
                 }
                 // 计算 userSchema
-                const _t3 = Date.now();
                 const userPage = await this.getUserPage(type, app, objectApiName, recordId, formFactor, userSession);
-                process.stdout.write(`[PerfLog] [getMeSchema] getUserPage done | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t3}ms | hasPage=${!!userPage}\n`);
                 if (userPage) {
-                    const _t4 = Date.now();
                     const pageVersion = await this.getLatestPageVersion(userPage._id, true);
-                    process.stdout.write(`[PerfLog] [getMeSchema] getLatestPageVersion (userPage) done | pageId=${userPage._id} | cost=${Date.now()-_t4}ms | hasSchema=${!!(pageVersion && pageVersion.schema)}\n`);
                     if(pageVersion && pageVersion.schema){
-                        process.stdout.write(`[PerfLog] [getMeSchema] total done | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t0}ms | result=userPage schema\n`);
                         return Object.assign({}, userPage, {schema: pageVersion.schema});
                     }
                 }
-                const _t5 = Date.now();
                 const defaultSchema = await this.getDefaultSchema(type, app, objectApiName, recordId, formFactor, userSession);
-                process.stdout.write(`[PerfLog] [getMeSchema] getDefaultSchema done | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t5}ms | hasSchema=${!!defaultSchema}\n`);
                 if(defaultSchema){
                     const pageRender = this.settings.pageRender;
-                    process.stdout.write(`[PerfLog] [getMeSchema] total done | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t0}ms | result=defaultSchema\n`);
                     return { render_engine: pageRender , schema: defaultSchema}
                 }
-                process.stdout.write(`[PerfLog] [getMeSchema] total done | type=${type} | objectApiName=${objectApiName} | cost=${Date.now()-_t0}ms | result=null\n`);
             }
         },
         getLatestPageVersion:{
             async handler(pageId, isArchived) {
-                const _t0 = Date.now();
                 const filters = [['page', '=', pageId]];
                 if(isArchived){
                     filters.push(['is_active','=',true])
                 }
                 // 根据pageId 获取 page version
                 const pageVersions = await objectql.getObject('page_versions').find({filters: filters, sort: 'version desc', top: 1});
-                process.stdout.write(`[PerfLog] [getLatestPageVersion] page_versions.find done | pageId=${pageId} | isArchived=${isArchived} | cost=${Date.now()-_t0}ms | rows=${pageVersions.length}\n`);
                 if(pageVersions.length === 1){
                     return pageVersions[0]
                 }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@steedos/service-pages",
-  "version": "3.0.13-beta.38",
+  "version": "3.0.13-beta.40",
   "main": "package.service.js",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "097e5103dfef4585bb2b3d17e9c8810045840b5b",
+  "gitHead": "ec68f10e987b00e83898adc3e148942e6dac6264",
   "dependencies": {
     "clone": "^2.1.2",
     "ejs": "^3.1.8"