@nocobase/cli 2.2.0-beta.8 → 2.3.0-alpha.1

package/assets/env-proxy/nginx/app.conf.tpl

@@ -0,0 +1,23 @@
+# Rendered by `nb env proxy`.
+# Context:
+# publicBasePath={{publicBasePath}}
+# apiBasePath={{apiBasePath}}
+# wsPath={{wsPath}}
+# v2PublicPath={{v2PublicPath}}
+# backendUrl={{backendUrl}}
+# snippetsDir={{snippetsDir}}
+# uploadsDir={{uploadsDir}}
+# distRootDir={{distRootDir}}
+# entryDir={{entryDir}}
+# publicDir={{publicDir}}
+
+server {
+    listen 80;
+    server_name _;
+
+    # Add custom directives or locations above the managed block as needed.
+
+{{managedConfigBlock}}
+
+    # Add custom directives or locations below the managed block as needed.
+}

package/assets/env-proxy/nginx/nocobase.conf.tpl

@@ -0,0 +1,5 @@
+# Managed by `nb env proxy`. Changes will be overwritten.
+
+include {{snippetsDir}}/log-format-http.conf;
+include {{snippetsDir}}/maps-http.conf;
+include {{appConfigIncludePath}};

package/assets/env-proxy/nginx/snippets/dist-location.conf

@@ -0,0 +1,5 @@
+expires 365d;
+add_header Cache-Control "public" always;
+
+access_log off;
+autoindex off;

package/assets/env-proxy/nginx/snippets/gzip.conf

@@ -0,0 +1,17 @@
+gzip on;
+gzip_types
+    text/plain
+    text/css
+    text/xml
+    text/markdown
+    text/javascript
+    application/javascript
+    application/json
+    application/manifest+json
+    application/atom+xml
+    application/rss+xml
+    application/xml
+    application/xml+rss
+    application/xhtml+xml
+    application/wasm
+    image/svg+xml;

package/assets/env-proxy/nginx/snippets/log-format-http.conf

@@ -0,0 +1,13 @@
+log_format apm '"$time_local" client=$remote_addr '
+               'method=$request_method request="$request" '
+               'request_length=$request_length '
+               'status=$status bytes_sent=$bytes_sent '
+               'body_bytes_sent=$body_bytes_sent '
+               'referer=$http_referer '
+               'user_agent="$http_user_agent" '
+               'upstream_addr=$upstream_addr '
+               'upstream_status=$upstream_status '
+               'request_time=$request_time '
+               'upstream_response_time=$upstream_response_time '
+               'upstream_connect_time=$upstream_connect_time '
+               'upstream_header_time=$upstream_header_time';

package/assets/env-proxy/nginx/snippets/maps-http.conf

@@ -0,0 +1,14 @@
+map $http_upgrade $connection_upgrade {
+    default upgrade;
+    ""      close;
+}
+
+map $http_x_forwarded_proto $upstream_x_forwarded_proto {
+    default $http_x_forwarded_proto;
+    ""      $scheme;
+}
+
+map $http_host $final_host {
+    default $http_host;
+    ""      $host;
+}

package/assets/env-proxy/nginx/snippets/mime-types.conf

@@ -0,0 +1,98 @@
+types {
+    text/html                                        html htm shtml;
+    text/css                                         css;
+    text/xml                                         xml;
+    image/gif                                        gif;
+    image/jpeg                                       jpeg jpg;
+    application/javascript                           js mjs;
+    application/atom+xml                             atom;
+    application/rss+xml                              rss;
+
+    text/mathml                                      mml;
+    text/plain                                       txt;
+    text/vnd.sun.j2me.app-descriptor                 jad;
+    text/vnd.wap.wml                                 wml;
+    text/x-component                                 htc;
+
+    image/avif                                       avif;
+    image/png                                        png;
+    image/svg+xml                                    svg svgz;
+    image/tiff                                       tif tiff;
+    image/vnd.wap.wbmp                               wbmp;
+    image/webp                                       webp;
+    image/x-icon                                     ico;
+    image/x-jng                                      jng;
+    image/x-ms-bmp                                   bmp;
+
+    font/woff                                        woff;
+    font/woff2                                       woff2;
+
+    application/java-archive                         jar war ear;
+    application/json                                 json;
+    application/mac-binhex40                         hqx;
+    application/msword                               doc;
+    application/pdf                                  pdf;
+    application/postscript                           ps eps ai;
+    application/rtf                                  rtf;
+    application/vnd.apple.mpegurl                    m3u8;
+    application/vnd.google-earth.kml+xml             kml;
+    application/vnd.google-earth.kmz                 kmz;
+    application/vnd.ms-excel                         xls;
+    application/vnd.ms-fontobject                    eot;
+    application/vnd.ms-powerpoint                    ppt;
+    application/vnd.oasis.opendocument.graphics      odg;
+    application/vnd.oasis.opendocument.presentation  odp;
+    application/vnd.oasis.opendocument.spreadsheet   ods;
+    application/vnd.oasis.opendocument.text          odt;
+    application/vnd.openxmlformats-officedocument.presentationml.presentation
+                                                     pptx;
+    application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
+                                                     xlsx;
+    application/vnd.openxmlformats-officedocument.wordprocessingml.document
+                                                     docx;
+    application/vnd.wap.wmlc                         wmlc;
+    application/wasm                                 wasm;
+    application/x-7z-compressed                      7z;
+    application/x-cocoa                              cco;
+    application/x-java-archive-diff                  jardiff;
+    application/x-java-jnlp-file                     jnlp;
+    application/x-makeself                           run;
+    application/x-perl                               pl pm;
+    application/x-pilot                              prc pdb;
+    application/x-rar-compressed                     rar;
+    application/x-redhat-package-manager             rpm;
+    application/x-sea                                sea;
+    application/x-shockwave-flash                    swf;
+    application/x-stuffit                            sit;
+    application/x-tcl                                tcl tk;
+    application/x-x509-ca-cert                       der pem crt;
+    application/x-xpinstall                          xpi;
+    application/xhtml+xml                            xhtml;
+    application/xspf+xml                             xspf;
+    application/zip                                  zip;
+
+    application/octet-stream                         bin exe dll;
+    application/octet-stream                         deb;
+    application/octet-stream                         dmg;
+    application/octet-stream                         iso img;
+    application/octet-stream                         msi msp msm;
+
+    audio/midi                                       mid midi kar;
+    audio/mpeg                                       mp3;
+    audio/ogg                                        ogg;
+    audio/x-m4a                                      m4a;
+    audio/x-realaudio                                ra;
+
+    video/3gpp                                       3gpp 3gp;
+    video/mp2t                                       ts;
+    video/mp4                                        mp4;
+    video/mpeg                                       mpeg mpg;
+    video/quicktime                                  mov;
+    video/webm                                       webm;
+    video/x-flv                                      flv;
+    video/x-m4v                                      m4v;
+    video/x-mng                                      mng;
+    video/x-ms-asf                                   asx asf;
+    video/x-ms-wmv                                   wmv;
+    video/x-msvideo                                  avi;
+}

package/assets/env-proxy/nginx/snippets/proxy-location.conf

@@ -0,0 +1,18 @@
+proxy_http_version 1.1;
+
+proxy_set_header Upgrade $http_upgrade;
+proxy_set_header Connection $connection_upgrade;
+proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+proxy_set_header X-Forwarded-Proto $upstream_x_forwarded_proto;
+proxy_set_header Host $final_host;
+proxy_set_header Referer $http_referer;
+proxy_set_header User-Agent $http_user_agent;
+
+add_header Cache-Control "no-cache, no-store" always;
+proxy_cache_bypass $http_upgrade;
+
+proxy_connect_timeout 600;
+proxy_send_timeout 600;
+proxy_read_timeout 600;
+send_timeout 600;
+proxy_buffering off;

package/assets/env-proxy/nginx/snippets/spa-location.conf

@@ -0,0 +1,6 @@
+add_header Cache-Control "no-store, no-cache, must-revalidate" always;
+add_header X-Robots-Tag "noindex, nofollow" always;
+
+if_modified_since off;
+expires off;
+etag off;

package/assets/env-proxy/nginx/snippets/uploads-location.conf

@@ -0,0 +1,21 @@
+add_header Cache-Control "public" always;
+add_header X-Content-Type-Options "nosniff" always;
+
+access_log off;
+autoindex off;
+
+# Force potentially renderable uploaded files to download.
+location ~* \.(?:htm|html|svg|svgz|xhtml)$ {
+    add_header Cache-Control "public" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header Content-Disposition "attachment" always;
+}
+
+# Let Markdown files render as plain Markdown text.
+location ~* \.md$ {
+    default_type text/markdown;
+
+    add_header Cache-Control "public" always;
+    add_header X-Content-Type-Options "nosniff" always;
+    add_header Content-Disposition "inline" always;
+}

package/dist/commands/app/start.js

@@ -37,6 +37,9 @@ function buildLicenseSyncArgv(envName, options) {
 }
 function resolveHookCommand(value) {
     const text = String(value ?? '').trim();
+    if (text === 'init') {
+        return text;
+    }
     if (text === 'app:restart' || text === 'app:upgrade') {
         return text;
     }
@@ -225,7 +228,7 @@ export default class AppStart extends Command {
         }),
         'hook-command': Flags.string({
             hidden: true,
-            options: ['app:start', 'app:restart', 'app:upgrade'],
+            options: ['init', 'app:start', 'app:restart', 'app:upgrade'],
         }),
     };
     async run() {

package/dist/commands/env/info.js

@@ -170,8 +170,13 @@ export default class EnvInfo extends Command {
             'auth.accessToken': authGroup.accessToken,
             'auth.refreshToken': authGroup.refreshToken,
         };
+        const envGroup = {
+            name: runtime.envName,
+            kind: runtime.kind,
+        };
         const output = {
             ok: true,
+            name: runtime.envName,
             env: runtime.envName,
             kind: runtime.kind,
             app: serializeGroup(appGroup),
@@ -197,6 +202,11 @@ export default class EnvInfo extends Command {
             this.log(JSON.stringify(output, null, 2));
             return;
         }
-        this.log([createGroupTable('App', appGroup), createGroupTable('DB', dbGroup), createGroupTable('API', apiGroup)].join('\n\n'));
+        this.log([
+            createGroupTable('Env', envGroup),
+            createGroupTable('App', appGroup),
+            createGroupTable('DB', dbGroup),
+            createGroupTable('API', apiGroup),
+        ].join('\n\n'));
     }
 }

package/dist/commands/init.js

@@ -16,7 +16,8 @@ import { getEnv, upsertEnv } from "../lib/auth-store.js";
 import { runPromptCatalog, } from "../lib/prompt-catalog.js";
 import { applyCliLocale, localeText, translateCli } from "../lib/cli-locale.js";
 import { resolveConfiguredEnvPath, resolveDefaultConfigScope, resolveEnvRelativePath } from '../lib/cli-home.js';
-import { resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { getCliConfigValue, resolveDefaultApiHost, resolveDefaultUiHost } from '../lib/cli-config.js';
+import { resolveOfficialDockerRegistry } from '../lib/docker-image.js';
 import { areConfiguredPathsEquivalent, deriveConfiguredSourcePath, deriveConfiguredStoragePath, inferConfiguredAppPathFromLegacyConfig, } from '../lib/env-paths.js';
 import { formatMissingManagedAppEnvMessage } from '../lib/app-runtime.js';
 import { runPromptCatalogWebUI } from "../lib/prompt-web-ui.js";
@@ -697,6 +698,12 @@ Prompt modes:
         if (flags.yes && !Object.prototype.hasOwnProperty.call(downloadSeed, 'source')) {
             downloadSeed.source = 'docker';
         }
+        const builtinDbImageRegistry = String(presetValues.dockerRegistry ?? '').trim() ||
+            resolveOfficialDockerRegistry(await getCliConfigValue('nb-image-registry'));
+        if (!Object.prototype.hasOwnProperty.call(presetValues, 'dockerRegistry')) {
+            out.dockerRegistry = builtinDbImageRegistry;
+        }
+        out.builtinDbImageRegistry = builtinDbImageRegistry;
         const dbInitial = await Install.buildDbPromptInitialValues({
             flags,
             downloadResults: downloadSeed,
@@ -704,6 +711,9 @@ Prompt modes:
             warnOnPortFallback: false,
         });
         for (const [key, value] of Object.entries(dbInitial)) {
+            if (key === 'builtinDbImage') {
+                continue;
+            }
             if (!Object.prototype.hasOwnProperty.call(presetValues, key)) {
                 out[key] = value;
             }