refactor (backend-rs): rewrite id generator

Co-authored-by: sup39 <dev@sup39.dev>

packages/backend-rs/index.js

@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, nativeRandomStr, IdConvertType, convertId, nativeGetTimestamp, nativeCreateId, nativeInitIdGenerator } = nativeBinding
+const { AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, secureRndstr, IdConvertType, convertId, getTimestamp, genId, initIdGenerator } = nativeBinding
 
 module.exports.AntennaSrcEnum = AntennaSrcEnum
 module.exports.MutedNoteReasonEnum = MutedNoteReasonEnum
@@ -322,9 +322,9 @@ module.exports.RelayStatusEnum = RelayStatusEnum
 module.exports.UserEmojimodpermEnum = UserEmojimodpermEnum
 module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
-module.exports.nativeRandomStr = nativeRandomStr
+module.exports.secureRndstr = secureRndstr
 module.exports.IdConvertType = IdConvertType
 module.exports.convertId = convertId
-module.exports.nativeGetTimestamp = nativeGetTimestamp
+module.exports.getTimestamp = getTimestamp
-module.exports.nativeCreateId = nativeCreateId
+module.exports.genId = genId
-module.exports.nativeInitIdGenerator = nativeInitIdGenerator
+module.exports.initIdGenerator = initIdGenerator

packages/backend-rs/src/util/id.rs

@@ -2,7 +2,7 @@
 
 use basen::BASE36;
 use cfg_if::cfg_if;
-use chrono::Utc;
+use chrono::NaiveDateTime;
 use once_cell::sync::OnceCell;
 use std::cmp;
 
@@ -33,20 +33,14 @@ pub fn init_id(length: u16, fingerprint: &str) {
 
 /// Returns Cuid2 with the length specified by [init_id]. Must be called after
 /// [init_id], otherwise returns [ErrorUninitialized].
-/// The current timestamp via [chrono::Utc] is used if `date_num` is `0`.
+pub fn create_id(datetime: &NaiveDateTime) -> Result<String, ErrorUninitialized> {
-pub fn create_id(date_num: i64) -> Result<String, ErrorUninitialized> {
     match GENERATOR.get() {
         None => Err(ErrorUninitialized),
         Some(gen) => {
-            let date_num = if date_num > 0 {
+            let date_num = cmp::max(0, datetime.and_utc().timestamp_millis() - TIME_2000) as u64;
-                date_num
-            } else {
-                Utc::now().timestamp_millis()
-            };
-            let time = cmp::max(date_num - TIME_2000, 0);
             Ok(format!(
                 "{:0>8}{}",
-                BASE36.encode_var_len(&(time as u64)),
+                BASE36.encode_var_len(&date_num),
                 gen.create_id()
             ))
         }
@@ -64,20 +58,26 @@ pub fn get_timestamp(id: &str) -> i64 {
 cfg_if! {
     if #[cfg(feature = "napi")] {
         use napi_derive::napi;
+        use chrono::{DateTime, Utc};
 
         /// Calls [init_id] inside. Must be called before [native_create_id].
-        #[napi]
+        #[napi(js_name = "initIdGenerator")]
         pub fn native_init_id_generator(length: u16, fingerprint: String) {
             init_id(length, &fingerprint);
         }
 
-        /// Generates
+        /// The generated ID results in the form of `[8 chars timestamp] + [cuid2]`.
+        /// The minimum and maximum lengths are 16 and 24, respectively.
+        /// With the length of 16, namely 8 for cuid2, roughly 1427399 IDs are needed
+        /// in the same millisecond to reach 50% chance of collision.
+        ///
+        /// Ref: https://github.com/paralleldrive/cuid2#parameterized-length
         #[napi]
-        pub fn native_create_id(date_num: i64) -> String {
+        pub fn gen_id(date: Option<DateTime<Utc>>) -> String {
-            create_id(date_num).unwrap()
+            create_id(&date.unwrap_or_else(|| Utc::now()).naive_utc()).unwrap()
         }
 
-        #[napi]
+        #[napi(js_name = "getTimestamp")]
         pub fn native_get_timestamp(id: String) -> i64 {
             get_timestamp(&id)
         }
@@ -92,18 +92,18 @@ mod unit_test {
     use std::thread;
 
     #[test]
-    fn can_create_and_decode() {
+    fn can_create_and_decode_id() {
-        assert_eq!(id::create_id(0), Err(id::ErrorUninitialized));
+        let now = Utc::now().naive_utc();
+        assert_eq!(id::create_id(&now), Err(id::ErrorUninitialized));
         id::init_id(16, "");
-        assert_eq!(id::create_id(0).unwrap().len(), 16);
+        assert_eq!(id::create_id(&now).unwrap().len(), 16);
-        assert_ne!(id::create_id(0).unwrap(), id::create_id(0).unwrap());
+        assert_ne!(id::create_id(&now).unwrap(), id::create_id(&now).unwrap());
-        let id1 = thread::spawn(|| id::create_id(0).unwrap());
+        let id1 = thread::spawn(move || id::create_id(&now).unwrap());
-        let id2 = thread::spawn(|| id::create_id(0).unwrap());
+        let id2 = thread::spawn(move || id::create_id(&now).unwrap());
         assert_ne!(id1.join().unwrap(), id2.join().unwrap());
 
-        let now = Utc::now().timestamp_millis();
+        let test_id = id::create_id(&now).unwrap();
-        let test_id = id::create_id(now).unwrap();
         let timestamp = id::get_timestamp(&test_id);
-        assert_eq!(now, timestamp);
+        assert_eq!(now.and_utc().timestamp_millis(), timestamp);
     }
 }

packages/backend-rs/src/util/random.rs

@@ -10,9 +10,9 @@ pub fn gen_string(length: u16) -> String {
 }
 
 #[cfg(feature = "napi")]
-#[napi_derive::napi]
+#[napi_derive::napi(js_name = "secureRndstr")]
-pub fn native_random_str(length: u16) -> String {
+pub fn native_random_str(length: Option<u16>) -> String {
-    gen_string(length)
+    gen_string(length.unwrap_or(32))
 }
 
 #[cfg(test)]

packages/backend/src/boot/worker.ts

@@ -1,11 +1,17 @@
 import cluster from "node:cluster";
+import config from "@/config/index.js";
 import { initDb } from "@/db/postgre.js";
+import { initIdGenerator } from "backend-rs";
 import os from "node:os";
 
 /**
  * Init worker process
  */
 export async function workerMain() {
+	const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);
+	const fingerprint = config.cuid?.fingerprint ?? "";
+	initIdGenerator(length, fingerprint);
+
 	await initDb();
 
 	if (!process.env.mode || process.env.mode === "web") {

packages/backend/src/misc/gen-id.ts

@@ -1,26 +1,6 @@
 import config from "@/config/index.js";
-import {
+import { initIdGenerator } from "backend-rs";
-	nativeCreateId,
-	nativeInitIdGenerator,
-	nativeGetTimestamp,
-} from "backend-rs";
 
 const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);
 const fingerprint = config.cuid?.fingerprint ?? "";
-nativeInitIdGenerator(length, fingerprint);
+initIdGenerator(length, fingerprint);
-
-/**
- * The generated ID results in the form of `[8 chars timestamp] + [cuid2]`.
- * The minimum and maximum lengths are 16 and 24, respectively.
- * With the length of 16, namely 8 for cuid2, roughly 1427399 IDs are needed
- * in the same millisecond to reach 50% chance of collision.
- *
- * Ref: https://github.com/paralleldrive/cuid2#parameterized-length
- */
-export function genId(date?: Date): string {
-	return nativeCreateId(date?.getTime() ?? Date.now());
-}
-
-export function getTimestamp(id: string): number {
-	return nativeGetTimestamp(id);
-}

packages/backend/src/misc/secure-rndstr.ts

@@ -1,5 +0,0 @@
-import { nativeRandomStr } from "backend-rs";
-
-export function secureRndstr(length = 32, _ = true): string {
-	return nativeRandomStr(length);
-}

packages/backend/src/queue/processors/db/import-custom-emojis.ts

@@ -8,7 +8,7 @@ import { downloadUrl } from "@/misc/download-url.js";
 import { DriveFiles, Emojis } from "@/models/index.js";
 import type { DbUserImportJobData } from "@/queue/types.js";
 import { addFile } from "@/services/drive/add-file.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { db } from "@/db/postgre.js";
 import probeImageSize from "probe-image-size";
 import * as path from "path";

packages/backend/src/queue/processors/db/import-firefish-post.ts

@@ -9,7 +9,7 @@ import type Bull from "bull";
 import { createImportCkPostJob } from "@/queue/index.js";
 import { Notes, NoteEdits } from "@/models/index.js";
 import type { Note } from "@/models/entities/note.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 const logger = queueLogger.createSubLogger("import-firefish-post");
 

packages/backend/src/queue/processors/db/import-masto-post.ts

@@ -9,7 +9,7 @@ import { uploadFromUrl } from "@/services/drive/upload-from-url.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { Notes, NoteEdits } from "@/models/index.js";
 import type { Note } from "@/models/entities/note.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 const logger = queueLogger.createSubLogger("import-masto-post");
 

packages/backend/src/queue/processors/db/import-muting.ts

@@ -8,7 +8,7 @@ import { isSelfHost, toPuny } from "@/misc/convert-host.js";
 import { Users, DriveFiles, Mutings } from "@/models/index.js";
 import type { DbUserImportJobData } from "@/queue/types.js";
 import type { User } from "@/models/entities/user.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { IsNull } from "typeorm";
 import { inspect } from "node:util";
 

packages/backend/src/queue/processors/db/import-user-lists.ts

@@ -12,7 +12,7 @@ import {
 	UserLists,
 	UserListJoinings,
 } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { DbUserImportJobData } from "@/queue/types.js";
 import { IsNull } from "typeorm";
 import { inspect } from "node:util";

packages/backend/src/remote/activitypub/kernel/flag/index.ts

@@ -4,7 +4,7 @@ import type { IFlag } from "../../type.js";
 import { getApIds } from "../../type.js";
 import { AbuseUserReports, Users } from "@/models/index.js";
 import { In } from "typeorm";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export default async (
 	actor: CacheableRemoteUser,

packages/backend/src/remote/activitypub/models/note.ts

@@ -33,7 +33,7 @@ import {
 	getApType,
 } from "../type.js";
 import type { Emoji } from "@/models/entities/emoji.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { getApLock } from "@/misc/app-lock.js";
 import { createMessage } from "@/services/messages/create.js";
 import { parseAudience } from "../audience.js";

packages/backend/src/remote/activitypub/models/person.ts

@@ -16,7 +16,7 @@ import type { IRemoteUser, CacheableUser } from "@/models/entities/user.js";
 import { User } from "@/models/entities/user.js";
 import type { Emoji } from "@/models/entities/emoji.js";
 import { UserNotePining } from "@/models/entities/user-note-pining.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { UserPublickey } from "@/models/entities/user-publickey.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import { isSameOrigin, toPuny } from "@/misc/convert-host.js";

packages/backend/src/server/api/common/generate-native-user-token.ts

@@ -1,3 +1,3 @@
-import { secureRndstr } from "@/misc/secure-rndstr.js";
+import { secureRndstr } from "backend-rs";
 
-export default () => secureRndstr(16, true);
+export default () => secureRndstr(16);

packages/backend/src/server/api/common/signin.ts

@@ -3,7 +3,7 @@ import type Koa from "koa";
 import config from "@/config/index.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { Signins } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { publishMainStream } from "@/services/stream.js";
 
 export default function (ctx: Koa.Context, user: ILocalUser, redirect = false) {

packages/backend/src/server/api/common/signup.ts

@@ -4,7 +4,7 @@ import { User } from "@/models/entities/user.js";
 import { Users, UsedUsernames } from "@/models/index.js";
 import { UserProfile } from "@/models/entities/user-profile.js";
 import { IsNull } from "typeorm";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { toPunyNullable } from "@/misc/convert-host.js";
 import { UserKeypair } from "@/models/entities/user-keypair.js";
 import { UsedUsername } from "@/models/entities/used-username.js";

packages/backend/src/server/api/endpoints/admin/ad/create.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { Ads } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/announcements/create.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { Announcements } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/admin/emoji/add.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { Emojis, DriveFiles } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { ApiError } from "@/server/api/error.js";
 import rndstr from "rndstr";

packages/backend/src/server/api/endpoints/admin/emoji/copy.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { Emojis } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { ApiError } from "@/server/api/error.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { uploadFromUrl } from "@/services/drive/upload-from-url.js";

packages/backend/src/server/api/endpoints/admin/invite.ts

@@ -1,7 +1,7 @@
 import rndstr from "rndstr";
 import define from "@/server/api/define.js";
 import { RegistrationTickets } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["admin"],

packages/backend/src/server/api/endpoints/antennas/create.ts

@@ -1,5 +1,5 @@
 import define from "@/server/api/define.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { Antennas, UserLists, UserGroupJoinings } from "@/models/index.js";
 import { ApiError } from "@/server/api/error.js";
 import { publishInternalEvent } from "@/services/stream.js";

packages/backend/src/server/api/endpoints/antennas/notes.ts

@@ -2,7 +2,7 @@ import define from "@/server/api/define.js";
 import readNote from "@/services/note/read.js";
 import { Antennas, Notes } from "@/models/index.js";
 import { redisClient } from "@/db/redis.js";
-import { getTimestamp } from "@/misc/gen-id.js";
+import { getTimestamp } from "backend-rs";
 import { makePaginationQuery } from "@/server/api/common/make-pagination-query.js";
 import { generateVisibilityQuery } from "@/server/api/common/generate-visibility-query.js";
 import { generateMutedUserQuery } from "@/server/api/common/generate-muted-user-query.js";

packages/backend/src/server/api/endpoints/app/create.ts

@@ -1,8 +1,7 @@
 import define from "@/server/api/define.js";
 import { Apps } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId, secureRndstr } from "backend-rs";
 import { unique } from "@/prelude/array.js";
-import { secureRndstr } from "@/misc/secure-rndstr.js";
 
 export const meta = {
 	tags: ["app"],
@@ -41,7 +40,7 @@ export default define(meta, paramDef, async (ps, user) => {
 			includeSecret: true,
 		});
 	// Generate secret
-	const secret = secureRndstr(32, true);
+	const secret = secureRndstr(32);
 
 	// for backward compatibility
 	const permission = unique(

packages/backend/src/server/api/endpoints/auth/accept.ts

@@ -2,8 +2,7 @@ import * as crypto from "node:crypto";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { AuthSessions, AccessTokens, Apps } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId, secureRndstr } from "backend-rs";
-import { secureRndstr } from "@/misc/secure-rndstr.js";
 
 export const meta = {
 	tags: ["auth"],
@@ -38,7 +37,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	}
 
 	// Generate access token
-	const accessToken = secureRndstr(32, true);
+	const accessToken = secureRndstr(32);
 
 	// Fetch exist access token
 	const exist = await AccessTokens.exist({

packages/backend/src/server/api/endpoints/auth/session/generate.ts

@@ -3,7 +3,7 @@ import config from "@/config/index.js";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { Apps, AuthSessions } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["auth"],

packages/backend/src/server/api/endpoints/channels/create.ts

@@ -2,7 +2,7 @@ import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { Channels, DriveFiles } from "@/models/index.js";
 import type { Channel } from "@/models/entities/channel.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["channels"],

packages/backend/src/server/api/endpoints/channels/follow.ts

@@ -1,7 +1,7 @@
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { Channels, ChannelFollowings } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { publishUserEvent } from "@/services/stream.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/clips/add-note.ts

@@ -1,7 +1,7 @@
 import define from "@/server/api/define.js";
 import { ClipNotes, Clips } from "@/models/index.js";
 import { ApiError } from "@/server/api/error.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { getNote } from "@/server/api/common/getters.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/clips/create.ts

@@ -1,5 +1,5 @@
 import define from "@/server/api/define.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { Clips } from "@/models/index.js";
 
 export const meta = {

packages/backend/src/server/api/endpoints/drive/folders/create.ts

@@ -2,7 +2,7 @@ import { publishDriveStream } from "@/services/stream.js";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { DriveFolders } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["drive"],

packages/backend/src/server/api/endpoints/gallery/posts/create.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { DriveFiles, GalleryPosts } from "@/models/index.js";
-import { genId } from "@/server/api/../../misc/gen-id.js";
+import { genId } from "backend-rs";
 import { GalleryPost } from "@/models/entities/gallery-post.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { HOUR } from "@/const.js";

packages/backend/src/server/api/endpoints/gallery/posts/like.ts

@@ -1,7 +1,7 @@
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { GalleryPosts, GalleryLikes } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	tags: ["gallery"],

packages/backend/src/server/api/endpoints/i/2fa/register-key.ts

@@ -2,7 +2,7 @@ import define from "@/server/api/define.js";
 import { UserProfiles, AttestationChallenges } from "@/models/index.js";
 import { promisify } from "node:util";
 import * as crypto from "node:crypto";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { hash } from "@/server/api/2fa.js";
 import { comparePassword } from "@/misc/password.js";
 

packages/backend/src/server/api/endpoints/i/read-announcement.ts

@@ -1,6 +1,6 @@
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { AnnouncementReads, Announcements, Users } from "@/models/index.js";
 import { publishMainStream } from "@/services/stream.js";
 

packages/backend/src/server/api/endpoints/i/registry/set.ts

@@ -1,7 +1,7 @@
 import { publishMainStream } from "@/services/stream.js";
 import define from "@/server/api/define.js";
 import { RegistryItems } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export const meta = {
 	requireCredential: true,

packages/backend/src/server/api/endpoints/i/webhooks/create.ts

@@ -1,5 +1,5 @@
 import define from "@/server/api/define.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { Webhooks } from "@/models/index.js";
 import { publishInternalEvent } from "@/services/stream.js";
 import { webhookEventTypes } from "@/models/entities/webhook.js";

packages/backend/src/server/api/endpoints/miauth/gen-token.ts

@@ -1,7 +1,6 @@
 import define from "@/server/api/define.js";
 import { AccessTokens } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId, secureRndstr } from "backend-rs";
-import { secureRndstr } from "@/misc/secure-rndstr.js";
 
 export const meta = {
 	tags: ["auth"],
@@ -44,7 +43,7 @@ export const paramDef = {
 
 export default define(meta, paramDef, async (ps, user) => {
 	// Generate access token
-	const accessToken = secureRndstr(32, true);
+	const accessToken = secureRndstr(32);
 
 	const now = new Date();
 

packages/backend/src/server/api/endpoints/mute/create.ts

@@ -1,7 +1,7 @@
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { getUser } from "@/server/api/common/getters.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { Mutings, NoteWatchings } from "@/models/index.js";
 import type { Muting } from "@/models/entities/muting.js";
 import { publishUserEvent } from "@/services/stream.js";

packages/backend/src/server/api/endpoints/notes/edit.ts

@@ -26,7 +26,7 @@ import { concat } from "@/prelude/array.js";
 import { extractHashtags } from "@/misc/extract-hashtags.js";
 import { extractCustomEmojisFromMfm } from "@/misc/extract-custom-emojis-from-mfm.js";
 import { extractMentionedUsers } from "@/services/note/create.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { publishNoteStream } from "@/services/stream.js";
 import DeliverManager from "@/remote/activitypub/deliver-manager.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";

packages/backend/src/server/api/endpoints/notes/favorites/create.ts

@@ -1,5 +1,5 @@
 import { NoteFavorites } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { getNote } from "@/server/api/common/getters.js";

packages/backend/src/server/api/endpoints/notes/polls/vote.ts

@@ -12,7 +12,7 @@ import {
 	Blockings,
 } from "@/models/index.js";
 import type { IRemoteUser } from "@/models/entities/user.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { getNote } from "@/server/api/common/getters.js";
 import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/notes/thread-muting/create.ts

@@ -1,5 +1,5 @@
 import { Notes, NoteThreadMutings } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import readNote from "@/services/note/read.js";
 import define from "@/server/api/define.js";
 import { getNote } from "@/server/api/common/getters.js";

packages/backend/src/server/api/endpoints/pages/create.ts

@@ -1,5 +1,5 @@
 import { Pages, DriveFiles } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { Page } from "@/models/entities/page.js";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";

packages/backend/src/server/api/endpoints/pages/like.ts

@@ -1,5 +1,5 @@
 import { Pages, PageLikes } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 

packages/backend/src/server/api/endpoints/promo/read.ts

@@ -1,5 +1,5 @@
 import { PromoReads } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { getNote } from "@/server/api/common/getters.js";

packages/backend/src/server/api/endpoints/renote-mute/create.ts

@@ -1,4 +1,4 @@
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { RenoteMutings } from "@/models/index.js";
 import { RenoteMuting } from "@/models/entities/renote-muting.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/reply-mute/create.ts

@@ -1,4 +1,4 @@
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { ReplyMutings } from "@/models/index.js";
 import { ReplyMuting } from "@/models/entities/reply-muting.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/request-reset-password.ts

@@ -3,7 +3,7 @@ import { IsNull } from "typeorm";
 import config from "@/config/index.js";
 import { Users, UserProfiles, PasswordResetRequests } from "@/models/index.js";
 import { sendEmail } from "@/services/send-email.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import define from "@/server/api/define.js";
 import { HOUR } from "@/const.js";
 

packages/backend/src/server/api/endpoints/sw/register.ts

@@ -1,5 +1,5 @@
 import { fetchMeta } from "@/misc/fetch-meta.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { SwSubscriptions } from "@/models/index.js";
 import define from "@/server/api/define.js";
 

packages/backend/src/server/api/endpoints/users/groups/create.ts

@@ -1,5 +1,5 @@
 import { UserGroups, UserGroupJoinings } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { UserGroup } from "@/models/entities/user-group.js";
 import type { UserGroupJoining } from "@/models/entities/user-group-joining.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/users/groups/invitations/accept.ts

@@ -1,5 +1,5 @@
 import { UserGroupJoinings, UserGroupInvitations } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { UserGroupJoining } from "@/models/entities/user-group-joining.js";
 import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";

packages/backend/src/server/api/endpoints/users/groups/invite.ts

@@ -3,7 +3,7 @@ import {
 	UserGroupJoinings,
 	UserGroupInvitations,
 } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { UserGroupInvitation } from "@/models/entities/user-group-invitation.js";
 import { createNotification } from "@/services/create-notification.js";
 import { getUser } from "@/server/api/common/getters.js";

packages/backend/src/server/api/endpoints/users/lists/create.ts

@@ -1,5 +1,5 @@
 import { UserLists } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { UserList } from "@/models/entities/user-list.js";
 import define from "@/server/api/define.js";
 

packages/backend/src/server/api/endpoints/users/report-abuse.ts

@@ -2,7 +2,7 @@ import * as mfm from "mfm-js";
 import sanitizeHtml from "sanitize-html";
 import { publishAdminStream } from "@/services/stream.js";
 import { AbuseUserReports, UserProfiles, Users } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { sendEmail } from "@/services/send-email.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 import { getUser } from "@/server/api/common/getters.js";

packages/backend/src/server/api/private/signin.ts

@@ -10,7 +10,7 @@ import {
 	AttestationChallenges,
 } from "@/models/index.js";
 import type { ILocalUser } from "@/models/entities/user.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import {
 	comparePassword,
 	hashPassword,

packages/backend/src/server/api/private/signup.ts

@@ -6,7 +6,7 @@ import { Users, RegistrationTickets, UserPendings } from "@/models/index.js";
 import { signup } from "@/server/api/common/signup.js";
 import config from "@/config/index.js";
 import { sendEmail } from "@/services/send-email.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { validateEmailForAccount } from "@/services/validate-email-for-account.js";
 import { hashPassword } from "@/misc/password.js";
 import { inspect } from "node:util";

packages/backend/src/services/add-note-to-antenna.ts

@@ -1,6 +1,6 @@
 import type { Antenna } from "@/models/entities/antenna.js";
 import type { Note } from "@/models/entities/note.js";
-import { getTimestamp } from "@/misc/gen-id.js";
+import { getTimestamp } from "backend-rs";
 import { redisClient } from "@/db/redis.js";
 import { publishAntennaStream } from "@/services/stream.js";
 import type { User } from "@/models/entities/user.js";

packages/backend/src/services/blocking/create.ts

@@ -15,7 +15,7 @@ import {
 	UserListJoinings,
 	UserLists,
 } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { webhookDeliver } from "@/queue/index.js";
 

packages/backend/src/services/create-notification.ts

@@ -8,7 +8,7 @@ import {
 	Users,
 	Followings,
 } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 import type { Notification } from "@/models/entities/notification.js";
 import { sendEmailNotification } from "./send-email-notification.js";

packages/backend/src/services/create-system-user.ts

@@ -4,7 +4,7 @@ import { genRsaKeyPair } from "@/misc/gen-key-pair.js";
 import { User } from "@/models/entities/user.js";
 import { UserProfile } from "@/models/entities/user-profile.js";
 import { IsNull } from "typeorm";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { UserKeypair } from "@/models/entities/user-keypair.js";
 import { UsedUsername } from "@/models/entities/used-username.js";
 import { db } from "@/db/postgre.js";

packages/backend/src/services/drive/add-file.ts

@@ -17,7 +17,7 @@ import {
 } from "@/models/index.js";
 import { DriveFile } from "@/models/entities/drive-file.js";
 import type { IRemoteUser, User } from "@/models/entities/user.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import { FILE_TYPE_BROWSERSAFE } from "@/const.js";
 import { IdentifiableError } from "@/misc/identifiable-error.js";

packages/backend/src/services/following/create.ts

@@ -17,7 +17,7 @@ import {
 	Instances,
 	UserProfiles,
 } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { createNotification } from "@/services/create-notification.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import type { Packed } from "@/misc/schema.js";

packages/backend/src/services/following/requests/create.ts

@@ -4,7 +4,7 @@ import renderFollow from "@/remote/activitypub/renderer/follow.js";
 import { deliver } from "@/queue/index.js";
 import type { User } from "@/models/entities/user.js";
 import { Blockings, FollowRequests, Users } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { createNotification } from "@/services/create-notification.js";
 import config from "@/config/index.js";
 

packages/backend/src/services/i/pin.ts

@@ -7,7 +7,7 @@ import type { User } from "@/models/entities/user.js";
 import type { Note } from "@/models/entities/note.js";
 import { Notes, UserNotePinings, Users } from "@/models/index.js";
 import type { UserNotePining } from "@/models/entities/user-note-pining.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { deliverToFollowers } from "@/remote/activitypub/deliver-manager.js";
 import { deliverToRelays } from "@/services/relay.js";
 

packages/backend/src/services/insert-moderation-log.ts

@@ -1,5 +1,5 @@
 import { ModerationLogs } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 
 export async function insertModerationLog(

packages/backend/src/services/messages/create.ts

@@ -7,7 +7,7 @@ import {
 	Mutings,
 	Users,
 } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
 import {
 	publishMessagingStream,

packages/backend/src/services/note/create.ts

@@ -37,7 +37,7 @@ import type { DriveFile } from "@/models/entities/drive-file.js";
 import type { App } from "@/models/entities/app.js";
 import { Not, In } from "typeorm";
 import type { User, ILocalUser, IRemoteUser } from "@/models/entities/user.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { activeUsersChart } from "@/services/chart/index.js";
 import type { IPoll } from "@/models/entities/poll.js";
 import { Poll } from "@/models/entities/poll.js";

packages/backend/src/services/note/polls/vote.ts

@@ -3,7 +3,7 @@ import type { CacheableUser } from "@/models/entities/user.js";
 import type { Note } from "@/models/entities/note.js";
 import { PollVotes, NoteWatchings, Polls, Blockings } from "@/models/index.js";
 import { Not } from "typeorm";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { createNotification } from "@/services/create-notification.js";
 
 export default async function (

packages/backend/src/services/note/reaction/create.ts

@@ -14,7 +14,7 @@ import {
 	Blockings,
 } from "@/models/index.js";
 import { IsNull, Not } from "typeorm";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { createNotification } from "@/services/create-notification.js";
 import deleteReaction from "./delete.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";

packages/backend/src/services/note/unread.ts

@@ -2,7 +2,7 @@ import type { Note } from "@/models/entities/note.js";
 import { publishMainStream } from "@/services/stream.js";
 import type { User } from "@/models/entities/user.js";
 import { Mutings, NoteThreadMutings, NoteUnreads } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 
 export async function insertNoteUnread(
 	userId: User["id"],

packages/backend/src/services/note/watch.ts

@@ -1,7 +1,7 @@
 import type { User } from "@/models/entities/user.js";
 import type { Note } from "@/models/entities/note.js";
 import { NoteWatchings } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { NoteWatching } from "@/models/entities/note-watching.js";
 
 export default async (me: User["id"], note: Note) => {

packages/backend/src/services/register-or-fetch-instance-doc.ts

@@ -3,7 +3,7 @@ import {
 	MAX_LENGTH_INSTANCE,
 } from "@/models/entities/instance.js";
 import { Instances } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { toPuny } from "@/misc/convert-host.js";
 import { Cache } from "@/misc/cache.js";
 import Logger from "@/services/logger.js";

packages/backend/src/services/relay.ts

@@ -8,7 +8,7 @@ import renderUndo from "@/remote/activitypub/renderer/undo.js";
 import { deliver } from "@/queue/index.js";
 import type { ILocalUser, User } from "@/models/entities/user.js";
 import { Users, Relays } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { Cache } from "@/misc/cache.js";
 import type { Relay } from "@/models/entities/relay.js";
 import { createSystemUser } from "@/services/create-system-user.js";

packages/backend/src/services/update-hashtag.ts

@@ -1,6 +1,6 @@
 import type { User } from "@/models/entities/user.js";
 import { Hashtags, Users } from "@/models/index.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import type { Hashtag } from "@/models/entities/hashtag.js";
 import { normalizeForSearch } from "@/misc/normalize-for-search.js";
 

packages/backend/src/services/user-list/push.ts

@@ -3,7 +3,7 @@ import type { User } from "@/models/entities/user.js";
 import type { UserList } from "@/models/entities/user-list.js";
 import { UserListJoinings, Users } from "@/models/index.js";
 import type { UserListJoining } from "@/models/entities/user-list-joining.js";
-import { genId } from "@/misc/gen-id.js";
+import { genId } from "backend-rs";
 import { fetchProxyAccount } from "@/misc/fetch-proxy-account.js";
 import createFollowing from "@/services/following/create.js";