@react-native-ohos/react-native-default-preference 1.6.0-beta.1 → 1.6.0-beta.2

package/harmony/react_native_default_preference/src/main/ets/RNDefaultPreferenceTurboModule.ts

@@ -1,144 +1,184 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-import dataPreferences from '@ohos.data.preferences';
-import { BusinessError } from '@ohos.base';
-import { TurboModule } from '@rnoh/react-native-openharmony/ts';
-import { TM } from './generated/ts';
-import Logger from './Logger'
-
-
-let preferences: dataPreferences.Preferences | null = null;
-const DEFAULT = 'default'
-let options = { name:'defultName' }
-
-
-export class RNDefaultPreferenceTurboModule extends TurboModule implements TM.DefaultPreferenceNativeModule.Spec {
-  constructor(ctx) {
-    super(ctx);
-  }
-
-  get(key: string): Promise<string | null> {
-    return new Promise((res) => {
-      let preferencesName: dataPreferences.Options = { name: options.name };
-      preferences = dataPreferences.getPreferencesSync(this.ctx.uiAbilityContext, preferencesName);
-      preferences.get(key, DEFAULT, async(err: BusinessError, val: string) => {
-        if (err) {
-          Logger.error("Failed to get value of 'startup'. code =" + err.code + ", message =" + err.message);
-          return;
-        }
-        res(val)
-      })
-    })
-  }
-
-  set(key: string, value: string): Promise<void> {
-    return new Promise(() => {
-      let preferencesName: dataPreferences.Options = { name: options.name };
-      preferences = dataPreferences.getPreferencesSync(this.ctx.uiAbilityContext, preferencesName);
-      preferences.put(key, value, (err: BusinessError) => {
-        if (err) {
-          Logger.error("Failed to put value of 'startup'. code =" + err.code + ", message =" + err.message);
-          return;
-        }
-        Logger.info("Succeeded in putting value of 'startup'.");
-      })
-      preferences.flush((err: BusinessError) => {
-        if (err) {
-          Logger.error("Failed to flush. code =" + err.code + ", message =" + err.message);
-          return;
-        }
-        Logger.info("Succeeded in flushing.");
-      })
-    })
-  }
-
-  clear(key: string): Promise<void> {
-    return new Promise(() => {
-      preferences.delete(key, (err: BusinessError) => {
-        if (err) {
-          console.error("Failed to delete the key 'startup'. code =" + err.code + ", message =" + err.message);
-          return;
-        }
-        console.info("Succeeded in deleting the key 'startup'.");
-      })
-    })
-  }
-
-  getMultiple(keys: string[]): Promise<string[]> {
-    return new Promise(async (res) => {
-      let resArry=[]
-      for (const element of keys) {
-        let getItem = await this.get(element)
-        resArry.push(getItem)
-      }
-      res(resArry)
-    })
-  }
-
-  setMultiple(data: {}): Promise<void> {
-    return new Promise(async () => {
-      for (const key in data) {
-        this.set(key,data[key])
-      }
-    })
-  }
-
-  clearMultiple(keys: string[]): Promise<void> {
-    return new Promise(async () => {
-      for (const key of keys) {
-        this.clear(key)
-      }
-    })
-  }
-
-  getAll(): Promise<{}> {
-    return new Promise((res) => {
-      let preferencesName: dataPreferences.Options = { name: options.name };
-      preferences = dataPreferences.getPreferencesSync(this.ctx.uiAbilityContext, preferencesName);
-      preferences.getAll(async (err: BusinessError, value: Object) => {
-        if (err) {
-          Logger.error("Failed to get all key-values. code =" + err.code + ", message =" + err.message);
-          return;
-        }
-        let allKeys = this.getObjKeys(value);
-        res(allKeys)
-      })
-    })
-  }
-
-  clearAll(): Promise<void> {
-    return new Promise(()=>{
-      let preferencesName: dataPreferences.Options = { name: options.name };
-      preferences = dataPreferences.getPreferencesSync(this.ctx.uiAbilityContext, preferencesName);
-      preferences.clear((err: BusinessError) =>{
-        if (err) {
-          console.error("Failed to clear. code =" + err.code + ", message =" + err.message);
-          return;
-        }
-        console.info("Succeeded in clearing.");
-      })
-    })
-  }
-
-  getName(): Promise<string> {
-    return new Promise((res)=>{
-      res(options.name)
-    })
-  }
-
-  setName(name: string): Promise<void> {
-    return new Promise(()=>{
-      options.name = name
-    })
-  }
-
-  getObjKeys(obj: Object): string[] {
-    let keys = Object.keys(obj);
-    return keys;
-  }
-
-}
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+import dataPreferences from '@ohos.data.preferences';
+import { BusinessError } from '@ohos.base';
+import { TurboModule } from '@rnoh/react-native-openharmony/ts';
+import { TM } from './generated/ts';
+import Logger from './Logger'
+
+interface PreferenceOptions {
+  name: string;
+}
+
+export class RNDefaultPreferenceTurboModule extends TurboModule implements TM.DefaultPreferenceNativeModule.Spec {
+  private options: PreferenceOptions;
+
+  constructor(ctx) {
+    super(ctx);
+    this.options = { name: this.getDefaultPreferencesName() };
+  }
+
+  private getDefaultPreferencesName(): string {
+    return this.ctx.uiAbilityContext.applicationInfo.name + '_preferences';
+  }
+
+  private getPreferencesInstance(): dataPreferences.Preferences {
+    const preferencesName: dataPreferences.Options = { name: this.options.name };
+    return dataPreferences.getPreferencesSync(this.ctx.uiAbilityContext, preferencesName);
+  }
+
+  get(key: string): Promise<string | null> {
+    return new Promise((resolve, reject) => {
+      try {
+        const prefs = this.getPreferencesInstance();
+        if (!prefs.hasSync(key)) {
+          resolve(null);
+          return;
+        }
+        resolve(prefs.getSync(key, '') as string);
+      } catch (err) {
+        const error = err as BusinessError;
+        Logger.error("Failed to get value. code =" + error.code + ", message =" + error.message);
+        reject(error);
+      }
+    });
+  }
+
+  set(key: string, value: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const prefs = this.getPreferencesInstance();
+      prefs.put(key, value, (err: BusinessError) => {
+        if (err) {
+          Logger.error("Failed to put value. code =" + err.code + ", message =" + err.message);
+          reject(err);
+          return;
+        }
+        prefs.flush((flushErr: BusinessError) => {
+          if (flushErr) {
+            Logger.error("Failed to flush. code =" + flushErr.code + ", message =" + flushErr.message);
+            reject(flushErr);
+            return;
+          }
+          resolve();
+        });
+      });
+    });
+  }
+
+  clear(key: string): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const prefs = this.getPreferencesInstance();
+      prefs.delete(key, (err: BusinessError) => {
+        if (err) {
+          Logger.error("Failed to delete key. code =" + err.code + ", message =" + err.message);
+          reject(err);
+          return;
+        }
+        prefs.flush((flushErr: BusinessError) => {
+          if (flushErr) {
+            Logger.error("Failed to flush. code =" + flushErr.code + ", message =" + flushErr.message);
+            reject(flushErr);
+            return;
+          }
+          resolve();
+        });
+      });
+    });
+  }
+
+  getMultiple(keys: string[]): Promise<string[]> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const result: string[] = [];
+        for (const key of keys) {
+          const item = await this.get(key);
+          result.push(item as string);
+        }
+        resolve(result);
+      } catch (err) {
+        reject(err);
+      }
+    });
+  }
+
+  setMultiple(data: {}): Promise<void> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        const record = data as Record<string, string>;
+        for (const key of Object.keys(record)) {
+          await this.set(key, record[key]);
+        }
+        resolve();
+      } catch (err) {
+        reject(err);
+      }
+    });
+  }
+
+  clearMultiple(keys: string[]): Promise<void> {
+    return new Promise(async (resolve, reject) => {
+      try {
+        for (const key of keys) {
+          await this.clear(key);
+        }
+        resolve();
+      } catch (err) {
+        reject(err);
+      }
+    });
+  }
+
+  getAll(): Promise<{}> {
+    return new Promise((resolve, reject) => {
+      const prefs = this.getPreferencesInstance();
+      prefs.getAll((err: BusinessError, value: Object) => {
+        if (err) {
+          Logger.error("Failed to get all key-values. code =" + err.code + ", message =" + err.message);
+          reject(err);
+          return;
+        }
+        const result: Record<string, string> = {};
+        const keys = Object.keys(value);
+        for (const key of keys) {
+          const entry = (value as Record<string, Object>)[key];
+          result[key] = entry !== null && entry !== undefined ? String(entry) : '';
+        }
+        resolve(result);
+      });
+    });
+  }
+
+  clearAll(): Promise<void> {
+    return new Promise((resolve, reject) => {
+      const prefs = this.getPreferencesInstance();
+      prefs.clear((err: BusinessError) => {
+        if (err) {
+          Logger.error("Failed to clear. code =" + err.code + ", message =" + err.message);
+          reject(err);
+          return;
+        }
+        prefs.flush((flushErr: BusinessError) => {
+          if (flushErr) {
+            Logger.error("Failed to flush. code =" + flushErr.code + ", message =" + flushErr.message);
+            reject(flushErr);
+            return;
+          }
+          resolve();
+        });
+      });
+    });
+  }
+
+  getName(): Promise<string> {
+    return Promise.resolve(this.options.name);
+  }
+
+  setName(name: string): Promise<void> {
+    this.options.name = name;
+    return Promise.resolve();
+  }
+}

package/harmony/react_native_default_preference/src/main/ets/generated/components/ts.ts

@@ -1,5 +1,5 @@
-
-/**
- */
-
-export {}
+
+/**
+ */
+
+export {}

package/harmony/react_native_default_preference/src/main/ets/generated/index.ets

@@ -1,5 +1,5 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-export * from "./ts"
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+export * from "./ts"

package/harmony/react_native_default_preference/src/main/ets/generated/ts.ts

@@ -1,6 +1,6 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-export * as RNC from "./components/ts"
-export * as TM from "./turboModules/ts"
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+export * as RNC from "./components/ts"
+export * as TM from "./turboModules/ts"

package/harmony/react_native_default_preference/src/main/ets/generated/turboModules/DefaultPreferenceNativeModule.ts

@@ -1,32 +1,32 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-import { Tag } from "@rnoh/react-native-openharmony/ts"
-
-export namespace DefaultPreferenceNativeModule {
-  export const NAME = 'DefaultPreferenceNativeModule' as const
-
-  export interface Spec {
-    get(key: string): Promise<null | string>;
-  
-    set(key: string, value: string): Promise<void>;
-  
-    clear(key: string): Promise<void>;
-  
-    getMultiple(keys: string[]): Promise<string[]>;
-  
-    setMultiple(data: {}): Promise<void>;
-  
-    clearMultiple(keys: string[]): Promise<void>;
-  
-    getAll(): Promise<{}>;
-  
-    clearAll(): Promise<void>;
-  
-    getName(): Promise<string>;
-  
-    setName(name: string): Promise<void>;
-  
-  }
-}
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+import { Tag } from "@rnoh/react-native-openharmony/ts"
+
+export namespace DefaultPreferenceNativeModule {
+  export const NAME = 'DefaultPreferenceNativeModule' as const
+
+  export interface Spec {
+    get(key: string): Promise<null | string>;
+  
+    set(key: string, value: string): Promise<void>;
+  
+    clear(key: string): Promise<void>;
+  
+    getMultiple(keys: string[]): Promise<string[]>;
+  
+    setMultiple(data: {}): Promise<void>;
+  
+    clearMultiple(keys: string[]): Promise<void>;
+  
+    getAll(): Promise<{}>;
+  
+    clearAll(): Promise<void>;
+  
+    getName(): Promise<string>;
+  
+    setName(name: string): Promise<void>;
+  
+  }
+}

package/harmony/react_native_default_preference/src/main/ets/generated/turboModules/ts.ts

@@ -1,5 +1,5 @@
-/**
- * This code was generated by "react-native codegen-lib-harmony"
- */
-
-export * from "./DefaultPreferenceNativeModule"
+/**
+ * This code was generated by "react-native codegen-lib-harmony"
+ */
+
+export * from "./DefaultPreferenceNativeModule"

package/harmony/react_native_default_preference/src/main/ets/pages/Index.ets

@@ -1,23 +1,23 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-@Entry
-@Component
-struct Index {
-  @State message: string = 'Hello World';
-
-  build() {
-    Row() {
-      Column() {
-        Text(this.message)
-          .fontSize(50)
-          .fontWeight(FontWeight.Bold)
-      }
-      .width('100%')
-    }
-    .height('100%')
-  }
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+@Entry
+@Component
+struct Index {
+  @State message: string = 'Hello World';
+
+  build() {
+    Row() {
+      Column() {
+        Text(this.message)
+          .fontSize(50)
+          .fontWeight(FontWeight.Bold)
+      }
+      .width('100%')
+    }
+    .height('100%')
+  }
 }

package/harmony/react_native_default_preference/src/main/ets/utils/Calc.ets

@@ -1,9 +1,9 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-export function add(a: number, b: number) {
-  return a + b;
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+export function add(a: number, b: number) {
+  return a + b;
 }

package/harmony/react_native_default_preference/src/main/module.json5

@@ -1,11 +1,11 @@
-{
-  "module": {
-    "name": "react_native_default_preference",
-    "type": "har",
-    "deviceTypes": [
-      "phone",
-      "tablet",
-      "2in1"
-    ],
-  }
+{
+  "module": {
+    "name": "react_native_default_preference",
+    "type": "har",
+    "deviceTypes": [
+      "phone",
+      "tablet",
+      "2in1"
+    ],
+  }
 }

package/harmony/react_native_default_preference/src/main/resources/base/element/string.json

@@ -1,8 +1,8 @@
-{
-  "string": [
-    {
-      "name": "shared_desc",
-      "value": "description"
-    }
-  ]
+{
+  "string": [
+    {
+      "name": "shared_desc",
+      "value": "description"
+    }
+  ]
 }

package/harmony/react_native_default_preference/ts.ets

@@ -1,8 +1,8 @@
-/*
- * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
- * Use of this source code is governed by a MIT license that can be
- * found in the LICENSE file.
- */
-
-export * from './src/main/ets/RNDefaultPreferencePackage';
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+export * from './src/main/ets/RNDefaultPreferencePackage';
 export * from './src/main/ets/RNDefaultPreferenceTurboModule';

package/harmony/react_native_default_preference/ts.ts

@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2024 Huawei Device Co., Ltd. All rights reserved
+ * Use of this source code is governed by a MIT license that can be
+ * found in the LICENSE file.
+ */
+
+export * from './src/main/ets/RNDefaultPreferencePackage';
+export * from './src/main/ets/RNDefaultPreferenceTurboModule';

package/index.d.ts

@@ -1,19 +1,19 @@
-declare module 'react-native-default-preference' {
-  export interface RNDefaultPreferenceKeys {
-    [key: string]: string;
-  }
-
-  export default class RNDefaultPreference {
-    static get(key: string): Promise<string | undefined | null>;
-    static set(key: string, value: string): Promise<void>;
-    static clear(key: string): Promise<void>;
-    static getMultiple(keys: string[]): Promise<string[]>;
-    static setMultiple(data: RNDefaultPreferenceKeys): Promise<void>;
-    static clearMultiple(keys: string[]): Promise<void>;
-    static getAll(): Promise<RNDefaultPreferenceKeys>;
-    static clearAll(): Promise<void>;
-
-    static getName(): Promise<string>;
-    static setName(name: string): Promise<void>;
-  }
-}
+declare module 'react-native-default-preference' {
+  export interface RNDefaultPreferenceKeys {
+    [key: string]: string;
+  }
+
+  export default class RNDefaultPreference {
+    static get(key: string): Promise<string | undefined | null>;
+    static set(key: string, value: string): Promise<void>;
+    static clear(key: string): Promise<void>;
+    static getMultiple(keys: string[]): Promise<string[]>;
+    static setMultiple(data: RNDefaultPreferenceKeys): Promise<void>;
+    static clearMultiple(keys: string[]): Promise<void>;
+    static getAll(): Promise<RNDefaultPreferenceKeys>;
+    static clearAll(): Promise<void>;
+
+    static getName(): Promise<string>;
+    static setName(name: string): Promise<void>;
+  }
+}

package/index.js

@@ -1,12 +1,12 @@
-
-import { NativeModules,Platform  } from 'react-native';
-import preference from './src/NativeDefaultPreference'
-let RNDefaultPreference
-if (Platform.OS == 'harmony') {
-    RNDefaultPreference = preference
-}else{
-    RNDefaultPreference = NativeModules;
-}
-
-
-export default RNDefaultPreference;
+
+import { NativeModules,Platform  } from 'react-native';
+import preference from './src/NativeDefaultPreference'
+let RNDefaultPreference
+if (Platform.OS == 'harmony') {
+    RNDefaultPreference = preference
+}else{
+    RNDefaultPreference = NativeModules;
+}
+
+
+export default RNDefaultPreference;