src: move ToNamespacedPath call of webstorage

PR-URL: #53875
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: anonrig

lib/internal/webstorage.js

@@ -6,7 +6,6 @@ const { ERR_INVALID_ARG_VALUE } = require('internal/errors').codes;
 const{ getOptionValue }=require('internal/options');
 const{ emitExperimentalWarning }=require('internal/util');
 const{ kConstructorKey, Storage }=internalBinding('webstorage');
-const{ resolve, toNamespacedPath }=require('path');
 const{ getValidatedPath }=require('internal/fs/utils');
 constkInMemoryPath=':memory:';
 
@@ -25,16 +24,15 @@ ObjectDefineProperties(module.exports, {
 enumerable: true,
 get(){
 if(lazyLocalStorage===undefined){
-letlocation=getOptionValue('--localstorage-file');
+constlocation=getOptionValue('--localstorage-file');
 
 if(location===''){
 thrownewERR_INVALID_ARG_VALUE('--localstorage-file',
 location,
 'is an invalid localStorage location');
 }
 
-location=toNamespacedPath(resolve(getValidatedPath(location)));
-lazyLocalStorage=newStorage(kConstructorKey,location);
+lazyLocalStorage=newStorage(kConstructorKey,getValidatedPath(location));
 }
 
 returnlazyLocalStorage;

src/node_webstorage.cc

@@ -6,6 +6,7 @@
 #include"node.h"
 #include"node_errors.h"
 #include"node_mem-inl.h"
+#include"path.h"
 #include"sqlite3.h"
 #include"util-inl.h"
 
@@ -76,13 +77,14 @@ static void ThrowQuotaExceededException(Local<Context> context) {
  isolate->ThrowException(exception);
 }
 
-Storage::Storage(Environment* env, Local<Object> object, Local<String> location)
+Storage::Storage(Environment* env,
+ Local<Object> object,
+ std::string_view location)
  : BaseObject(env, object) {
 MakeWeak();
- Utf8Value utf8_location(env->isolate(), location);
  symbols_.Reset(env->isolate(), Map::New(env->isolate()));
  db_ = nullptr;
- location_ = utf8_location.ToString();
+ location_ = std::string(location);
 }
 
 Storage::~Storage() {
@@ -209,7 +211,15 @@ void Storage::New(const FunctionCallbackInfo<Value>& args) {
 
 CHECK(args.IsConstructCall());
 CHECK(args[1]->IsString());
-newStorage(env, args.This(), args[1].As<String>());
+
+ BufferValue location(env->isolate(), args[1]);
+CHECK_NOT_NULL(*location);
+// Only call namespaced path if the location is not "in memory".
+if (location.ToStringView() != kInMemoryPath) {
+ToNamespacedPath(env, &location);
+ }
+
+newStorage(env, args.This(), location.ToStringView());
 }
 
 voidStorage::Clear() {

src/node_webstorage.h

@@ -23,11 +23,13 @@ struct stmt_deleter {
 };
 using stmt_unique_ptr = std::unique_ptr<sqlite3_stmt, stmt_deleter>;
 
+staticconstexpr std::string_view kInMemoryPath = ":memory:";
+
 classStorage : publicBaseObject {
 public:
 Storage(Environment* env,
  v8::Local<v8::Object> object,
-v8::Local<v8::String> location);
+std::string_view location);
 voidMemoryInfo(MemoryTracker* tracker) constoverride;
 staticvoidNew(const v8::FunctionCallbackInfo<v8::Value>& args);