yakuza0 2.23.44 → 2.23.45

package/nuxt/build/index.js

@@ -208,6 +208,9 @@ exports.default = function (config) {
     })(conf, ctx);
 
     (0, _assign2.default)(conf.resolve.alias, (0, _runtimeDependencies.runtimeAliases)());
+    if (ctx && ctx.isServer) {
+      conf.externals = [_runtimeDependencies.runtimeServerExternal].concat((0, _toConsumableArray3.default)([].concat(conf.externals || [])));
+    }
 
     (0, _eslint2.default)(conf, ctx);
 

package/nuxt/build/runtime-dependencies.js

@@ -1,5 +1,11 @@
 'use strict';
 
+var _stringify = require('babel-runtime/core-js/json/stringify');
+
+var _stringify2 = _interopRequireDefault(_stringify);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var path = require('path');
 
 // Nuxt writes plugins into the application's build directory. Resolve the
@@ -10,4 +16,21 @@ var runtimeAliases = function runtimeAliases() {
   };
 };
 
-module.exports = { runtimeAliases: runtimeAliases };
+// Nuxt externalizes server dependencies before Webpack applies resolve.alias.
+// Resolve at runtime from yakuza0 so SSR uses the same package as the browser.
+// Keep resolution inside this Node module: Nuxt's bundle renderer provides a
+// require function without require.resolve. This also survives moved builds and
+// pnpm layouts where protocol dependencies are siblings of yakuza0.
+var runtimeServerExternal = function runtimeServerExternal(context, request, callback) {
+  if (request === 'yakuza1' || request.startsWith('yakuza1/')) {
+    callback(null, 'var require(\'yakuza0/nuxt/build/runtime-dependencies\').requireRuntime(' + (0, _stringify2.default)(request) + ')');
+    return;
+  }
+  callback();
+};
+
+var requireRuntime = function requireRuntime(request) {
+  return require(request);
+};
+
+module.exports = { runtimeAliases: runtimeAliases, runtimeServerExternal: runtimeServerExternal, requireRuntime: requireRuntime };

package/nuxt/plugins/init_server.js

@@ -93,8 +93,8 @@ exports.default = function () {
                         _context.prev = 9;
                         _context.t0 = _context['catch'](3);
 
-                        (0, _httpDebug.httpDebugLog)({
-                          trace: trace,
+                        (0, _httpDebug.httpSsrFailureLog)({
+                          req: ctx.req,
                           stage: 'NUXT_SERVER_INIT_ACTION_ERROR',
                           data: {
                             action: key,

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "yakuza0",
-  "version": "2.23.44",
+  "version": "2.23.45",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
     "base": "babel --no-babelrc src -d /Users/ningfujun/work/repo/web/CLN_BASE_TEST/node_modules/yakuza0 -w --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
     "build": "babel --no-babelrc src -d . --presets=env --plugins=transform-runtime,transform-object-rest-spread,add-module-exports",
-    "pub:beta": "npm run build && npm version prerelease --preid=beta && pxnpm publish --no-git-check",
+    "pub:beta": "npm run build && npm version prerelease --preid=beta && npm publish --no-git-check",
     "pub:hotfix": "npm run build && npm version prerelease --preid=hotfix && npm publish --tag hotfix",
     "pub": "npm run build && npm version patch && npm publish",
     "test": "jest",
+    "test:ssr": "node tests/zunir-ssr.js",
     "postinstall": "yk init"
   },
   "author": "nfjbill",

package/template/http.plugin.js

@@ -8,6 +8,7 @@ import {
   getHttpDebugTrace,
   HTTP_DEBUG_HEADER,
   httpDebugLog,
+  httpSsrFailureLog,
   sanitizeHttpDebugHeaders,
 } from 'yakuza0/utils/httpDebug';
 
@@ -213,6 +214,7 @@ export default (ctx, inject) => {
               : undefined,
             status: res.response && res.response.status,
             responseType: typeof res.data,
+            fromCache: Boolean((res.data && res.data.isUseFeCache) || (res.headers && res.headers.get('x-slc') === '1')),
             headers: sanitizeHttpDebugHeaders(res.headers),
           },
         });
@@ -226,6 +228,20 @@ export default (ctx, inject) => {
       },
       async error(err) {
         const responseConfig = err.response && err.response.config || {};
+        if (checkServer() && /(?:^|\/)(?:auth\/isc\/ticket|(?:open\/)?system\/fornt\/params)(?:[?]|$)/.test(responseConfig.url || '')) {
+          httpSsrFailureLog({
+            req,
+            stage: 'SSR_PLATFORM_REQUEST_FAILED',
+            data: {
+              method: responseConfig.method,
+              url: responseConfig.url,
+              prefixUrl: responseConfig.prefixUrl || prefixUrl,
+              status: err.response && err.response.status,
+              apiCode: err.response && err.response.data && err.response.data.code,
+            },
+            error: err,
+          });
+        }
         httpDebugLog({
           trace: httpDebugTrace,
           stage: 'HTTP_ERROR',

package/template/init.plugin.js

@@ -1,5 +1,5 @@
 import {set} from 'yakuza0/utils/secret';
-import {getHttpDebugTrace, httpDebugLog} from 'yakuza0/utils/httpDebug';
+import {getHttpDebugTrace, httpDebugLog, httpSsrFailureLog} from 'yakuza0/utils/httpDebug';
 
 export default async (ctx, inject) => {
   const trace = getHttpDebugTrace({req: ctx.req});
@@ -23,8 +23,8 @@ export default async (ctx, inject) => {
       },
     });
   } catch (error) {
-    httpDebugLog({
-      trace,
+    httpSsrFailureLog({
+      req: ctx.req,
       stage: 'SECRET_INIT_ERROR',
       data: {
         elapsedMs: Date.now() - startedAt,

package/utils/httpDebug.js

@@ -3,12 +3,16 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.httpDebugLog = exports.sanitizeHttpDebugHeaders = exports.isHttpDebugEnabled = exports.getHttpDebugTrace = exports.HTTP_DEBUG_HEADER = exports.HTTP_DEBUG_COOKIE_KEY = undefined;
+exports.httpSsrFailureLog = exports.httpDebugLog = exports.sanitizeHttpDebugData = exports.sanitizeHttpDebugHeaders = exports.isHttpDebugEnabled = exports.getHttpDebugTrace = exports.HTTP_DEBUG_HEADER = exports.HTTP_DEBUG_COOKIE_KEY = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
 
+var _typeof2 = require('babel-runtime/helpers/typeof');
+
+var _typeof3 = _interopRequireDefault(_typeof2);
+
 var _keys = require('babel-runtime/core-js/object/keys');
 
 var _keys2 = _interopRequireDefault(_keys);
@@ -74,7 +78,7 @@ var isHttpDebugEnabled = exports.isHttpDebugEnabled = function isHttpDebugEnable
 };
 
 var sensitiveHeader = function sensitiveHeader(key) {
-  return (/cookie|authorization|token|secret|password|csrf|signature|x-xss-sm|x-rpk|x-ssr-verify/i.test(key)
+  return (/cookie|authorization|token|secret|password|csrf|signature|x-xss-sm|x-rpk|x-ssr-verify|x-verify-ssr/i.test(key)
   );
 };
 
@@ -110,6 +114,21 @@ var sanitizeHttpDebugHeaders = exports.sanitizeHttpDebugHeaders = function sanit
   return result;
 };
 
+// Trace URLs can contain one-use ISC tickets; mask these even in opt-in logs.
+var sanitizeHttpDebugData = exports.sanitizeHttpDebugData = function sanitizeHttpDebugData(value) {
+  if (typeof value === 'string') {
+    return value.replace(/(^|[?&])((?:ticket|access_token|refresh_token|token|password|secret|csrf|signature)=)[^&#\s]*/gi, '$1$2[redacted]');
+  }
+  if (Array.isArray(value)) return value.map(sanitizeHttpDebugData);
+  if (value && (typeof value === 'undefined' ? 'undefined' : (0, _typeof3.default)(value)) === 'object') {
+    return (0, _keys2.default)(value).reduce(function (result, key) {
+      result[key] = /^(?:ticket|access_token|refresh_token|token|password|secret|csrf|signature)$/i.test(key) ? '[redacted]' : sanitizeHttpDebugData(value[key]);
+      return result;
+    }, {});
+  }
+  return value;
+};
+
 var serializeError = function serializeError(error) {
   if (!error) {
     return error;
@@ -147,7 +166,7 @@ var httpDebugLog = exports.httpDebugLog = function httpDebugLog(_ref2) {
     pid: typeof process !== 'undefined' && process ? process.pid : undefined,
     stage: stage
   }, data || {}, error ? { error: serializeError(error) } : {});
-  var output = '[YK_HTTP_DEBUG][' + debugTrace + '][' + stage + '] ' + (0, _stringify2.default)(payload);
+  var output = '[YK_HTTP_DEBUG][' + debugTrace + '][' + stage + '] ' + (0, _stringify2.default)(sanitizeHttpDebugData(payload));
 
   if (error) {
     nativeConsole.error(output);
@@ -156,4 +175,13 @@ var httpDebugLog = exports.httpDebugLog = function httpDebugLog(_ref2) {
   }
 
   return true;
+};
+
+// Failures before a business API reaches platform must remain visible even
+// when the temporary debug cookie is absent. Successful requests stay quiet.
+var httpSsrFailureLog = exports.httpSsrFailureLog = function httpSsrFailureLog(options) {
+  if (!(0, _yakuza.checkServer)()) return false;
+  return httpDebugLog((0, _extends3.default)({}, options, {
+    trace: getHttpDebugTrace(options) || 'SSR_FAILURE'
+  }));
 };