jr-common-micro 1.1.98 → 1.1.99

package/dist/proto/micro/v1/mining/mining_messages_nest.d.ts

@@ -15,10 +15,7 @@ export interface RateInfo {
     badge: string;
     badge_base: string;
     own_tasks: string;
-    team_share: string;
-    full_team: string;
-    full_team_ready: number;
-    full_team_size: number;
+    team_bonus: string;
     multiplier: string;
     cap: string;
     hourly: string;
@@ -50,23 +47,37 @@ export interface TeamMember {
     user_id: string;
     username: string;
     avatar_url: string;
-    tasks_today: number;
-    task_multiplier: string;
-    contribution: string;
     mining: boolean;
-    full_team_ready: boolean;
     active_from: string;
     active_until: string;
     nudge_available_at: string;
+    sessions_week: number;
+    easy_done: boolean;
+    refs_week: number;
+}
+export interface TeamWeek {
+    week_start: string;
+    week_end: string;
+    members_count: number;
+    eligible: boolean;
+    easy_sessions: number;
+    easy_bonus_each: string;
+    easy_done_count: number;
+    hard_leader_refs: number;
+    hard_leader_required: number;
+    hard_member_count: number;
+    hard_member_required: number;
+    hard_done: boolean;
+    hard_bonus: string;
+    bonus: string;
 }
 export interface TeamInfo {
     members: TeamMember[];
     size: number;
-    locked: boolean;
-    locked_until: string;
-    share: string;
-    full_team_bonus: string;
-    full_team_min_tasks: number;
+    min_members: number;
+    week: TeamWeek | undefined;
+    current_bonus: string;
+    current_bonus_until: string;
 }
 export interface TaskInfo {
     id: string;
@@ -223,9 +234,6 @@ export interface ConfigResponse {
     badge_blue: string;
     badge_yellow: string;
     team_size: number;
-    team_share: string;
-    full_team_bonus: string;
-    full_team_min_tasks: number;
     multiplier_cap: string;
     gift_jr: string;
     gift_sessions: number;
@@ -235,6 +243,14 @@ export interface ConfigResponse {
     claim_min: string;
     nudge_cooldown_days: number;
     base_rate: string;
+    referrer_gift_jr: string;
+    l2_gift_jr: string;
+    team_min_members: number;
+    team_easy_sessions: number;
+    team_easy_bonus: string;
+    team_hard_leader_refs: number;
+    team_hard_member_refs: number;
+    team_hard_bonus: string;
 }
 export interface AdminOverviewRequest {
     period: string;

package/dist/proto/micro/v1/mining/mining_messages_pb.d.ts

@@ -24,10 +24,7 @@ export declare class RateInfo extends Message<RateInfo> {
     badge: string;
     badgeBase: string;
     ownTasks: string;
-    teamShare: string;
-    fullTeam: string;
-    fullTeamReady: number;
-    fullTeamSize: number;
+    teamBonus: string;
     multiplier: string;
     cap: string;
     hourly: string;
@@ -83,14 +80,13 @@ export declare class TeamMember extends Message<TeamMember> {
     userId: string;
     username: string;
     avatarUrl: string;
-    tasksToday: number;
-    taskMultiplier: string;
-    contribution: string;
     mining: boolean;
-    fullTeamReady: boolean;
     activeFrom: string;
     activeUntil: string;
     nudgeAvailableAt: string;
+    sessionsWeek: number;
+    easyDone: boolean;
+    refsWeek: number;
     constructor(data?: PartialMessage<TeamMember>);
     static readonly runtime: typeof proto3;
     static readonly typeName = "micro.v1.mining.TeamMember";
@@ -100,14 +96,37 @@ export declare class TeamMember extends Message<TeamMember> {
     static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): TeamMember;
     static equals(a: TeamMember | PlainMessage<TeamMember> | undefined, b: TeamMember | PlainMessage<TeamMember> | undefined): boolean;
 }
+export declare class TeamWeek extends Message<TeamWeek> {
+    weekStart: string;
+    weekEnd: string;
+    membersCount: number;
+    eligible: boolean;
+    easySessions: number;
+    easyBonusEach: string;
+    easyDoneCount: number;
+    hardLeaderRefs: number;
+    hardLeaderRequired: number;
+    hardMemberCount: number;
+    hardMemberRequired: number;
+    hardDone: boolean;
+    hardBonus: string;
+    bonus: string;
+    constructor(data?: PartialMessage<TeamWeek>);
+    static readonly runtime: typeof proto3;
+    static readonly typeName = "micro.v1.mining.TeamWeek";
+    static readonly fields: FieldList;
+    static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): TeamWeek;
+    static fromJson(jsonValue: JsonValue, options?: Partial<JsonReadOptions>): TeamWeek;
+    static fromJsonString(jsonString: string, options?: Partial<JsonReadOptions>): TeamWeek;
+    static equals(a: TeamWeek | PlainMessage<TeamWeek> | undefined, b: TeamWeek | PlainMessage<TeamWeek> | undefined): boolean;
+}
 export declare class TeamInfo extends Message<TeamInfo> {
     members: TeamMember[];
     size: number;
-    locked: boolean;
-    lockedUntil: string;
-    share: string;
-    fullTeamBonus: string;
-    fullTeamMinTasks: number;
+    minMembers: number;
+    week?: TeamWeek;
+    currentBonus: string;
+    currentBonusUntil: string;
     constructor(data?: PartialMessage<TeamInfo>);
     static readonly runtime: typeof proto3;
     static readonly typeName = "micro.v1.mining.TeamInfo";
@@ -456,9 +475,6 @@ export declare class ConfigResponse extends Message<ConfigResponse> {
     badgeBlue: string;
     badgeYellow: string;
     teamSize: number;
-    teamShare: string;
-    fullTeamBonus: string;
-    fullTeamMinTasks: number;
     multiplierCap: string;
     giftJr: string;
     giftSessions: number;
@@ -468,6 +484,14 @@ export declare class ConfigResponse extends Message<ConfigResponse> {
     claimMin: string;
     nudgeCooldownDays: number;
     baseRate: string;
+    referrerGiftJr: string;
+    l2GiftJr: string;
+    teamMinMembers: number;
+    teamEasySessions: number;
+    teamEasyBonus: string;
+    teamHardLeaderRefs: number;
+    teamHardMemberRefs: number;
+    teamHardBonus: string;
     constructor(data?: PartialMessage<ConfigResponse>);
     static readonly runtime: typeof proto3;
     static readonly typeName = "micro.v1.mining.ConfigResponse";

package/dist/proto/micro/v1/mining/mining_messages_pb.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetParameterRequest = exports.ParametersResponse = exports.ParameterItem = exports.AdminOverviewResponse = exports.AdminTopReferrer = exports.AdminTaskStat = exports.AdminSeries = exports.AdminSeriesPoint = exports.AdminMetric = exports.AdminOverviewRequest = exports.ConfigResponse = exports.ResolveCodeResponse = exports.ResolveCodeRequest = exports.EnrollResponse = exports.EnrollRequest = exports.UpdateSettingsRequest = exports.HistoryResponse = exports.HistoryDay = exports.HistoryItem = exports.HistoryRequest = exports.TeamResponse = exports.SetTeamRequest = exports.ClaimResponse = exports.ReferralListResponse = exports.ReferralListRequest = exports.ReferralItem = exports.TaskEventResponse = exports.TaskEventRequest = exports.TasksResponse = exports.MiningMeResponse = exports.MiningState = exports.MiningSettings = exports.TasksSummary = exports.TaskInfo = exports.TeamInfo = exports.TeamMember = exports.ReferralInfo = exports.HalvingInfo = exports.RateInfo = exports.SessionInfo = void 0;
+exports.SetParameterRequest = exports.ParametersResponse = exports.ParameterItem = exports.AdminOverviewResponse = exports.AdminTopReferrer = exports.AdminTaskStat = exports.AdminSeries = exports.AdminSeriesPoint = exports.AdminMetric = exports.AdminOverviewRequest = exports.ConfigResponse = exports.ResolveCodeResponse = exports.ResolveCodeRequest = exports.EnrollResponse = exports.EnrollRequest = exports.UpdateSettingsRequest = exports.HistoryResponse = exports.HistoryDay = exports.HistoryItem = exports.HistoryRequest = exports.TeamResponse = exports.SetTeamRequest = exports.ClaimResponse = exports.ReferralListResponse = exports.ReferralListRequest = exports.ReferralItem = exports.TaskEventResponse = exports.TaskEventRequest = exports.TasksResponse = exports.MiningMeResponse = exports.MiningState = exports.MiningSettings = exports.TasksSummary = exports.TaskInfo = exports.TeamInfo = exports.TeamWeek = exports.TeamMember = exports.ReferralInfo = exports.HalvingInfo = exports.RateInfo = exports.SessionInfo = void 0;
 const protobuf_1 = require("@bufbuild/protobuf");
 const general_pb_js_1 = require("../general_pb.js");
 class SessionInfo extends protobuf_1.Message {
@@ -47,10 +47,7 @@ class RateInfo extends protobuf_1.Message {
     badge = "";
     badgeBase = "";
     ownTasks = "";
-    teamShare = "";
-    fullTeam = "";
-    fullTeamReady = 0;
-    fullTeamSize = 0;
+    teamBonus = "";
     multiplier = "";
     cap = "";
     hourly = "";
@@ -65,10 +62,7 @@ class RateInfo extends protobuf_1.Message {
         { no: 2, name: "badge", kind: "scalar", T: 9 },
         { no: 3, name: "badge_base", kind: "scalar", T: 9 },
         { no: 4, name: "own_tasks", kind: "scalar", T: 9 },
-        { no: 5, name: "team_share", kind: "scalar", T: 9 },
-        { no: 6, name: "full_team", kind: "scalar", T: 9 },
-        { no: 7, name: "full_team_ready", kind: "scalar", T: 5 },
-        { no: 8, name: "full_team_size", kind: "scalar", T: 5 },
+        { no: 5, name: "team_bonus", kind: "scalar", T: 9 },
         { no: 9, name: "multiplier", kind: "scalar", T: 9 },
         { no: 10, name: "cap", kind: "scalar", T: 9 },
         { no: 11, name: "hourly", kind: "scalar", T: 9 },
@@ -175,14 +169,13 @@ class TeamMember extends protobuf_1.Message {
     userId = "";
     username = "";
     avatarUrl = "";
-    tasksToday = 0;
-    taskMultiplier = "";
-    contribution = "";
     mining = false;
-    fullTeamReady = false;
     activeFrom = "";
     activeUntil = "";
     nudgeAvailableAt = "";
+    sessionsWeek = 0;
+    easyDone = false;
+    refsWeek = 0;
     constructor(data) {
         super();
         protobuf_1.proto3.util.initPartial(data, this);
@@ -193,14 +186,13 @@ class TeamMember extends protobuf_1.Message {
         { no: 1, name: "user_id", kind: "scalar", T: 9 },
         { no: 2, name: "username", kind: "scalar", T: 9 },
         { no: 3, name: "avatar_url", kind: "scalar", T: 9 },
-        { no: 4, name: "tasks_today", kind: "scalar", T: 5 },
-        { no: 5, name: "task_multiplier", kind: "scalar", T: 9 },
-        { no: 6, name: "contribution", kind: "scalar", T: 9 },
         { no: 7, name: "mining", kind: "scalar", T: 8 },
-        { no: 8, name: "full_team_ready", kind: "scalar", T: 8 },
         { no: 9, name: "active_from", kind: "scalar", T: 9 },
         { no: 10, name: "active_until", kind: "scalar", T: 9 },
         { no: 11, name: "nudge_available_at", kind: "scalar", T: 9 },
+        { no: 12, name: "sessions_week", kind: "scalar", T: 5 },
+        { no: 13, name: "easy_done", kind: "scalar", T: 8 },
+        { no: 14, name: "refs_week", kind: "scalar", T: 5 },
     ]);
     static fromBinary(bytes, options) {
         return new TeamMember().fromBinary(bytes, options);
@@ -216,14 +208,64 @@ class TeamMember extends protobuf_1.Message {
     }
 }
 exports.TeamMember = TeamMember;
+class TeamWeek extends protobuf_1.Message {
+    weekStart = "";
+    weekEnd = "";
+    membersCount = 0;
+    eligible = false;
+    easySessions = 0;
+    easyBonusEach = "";
+    easyDoneCount = 0;
+    hardLeaderRefs = 0;
+    hardLeaderRequired = 0;
+    hardMemberCount = 0;
+    hardMemberRequired = 0;
+    hardDone = false;
+    hardBonus = "";
+    bonus = "";
+    constructor(data) {
+        super();
+        protobuf_1.proto3.util.initPartial(data, this);
+    }
+    static runtime = protobuf_1.proto3;
+    static typeName = "micro.v1.mining.TeamWeek";
+    static fields = protobuf_1.proto3.util.newFieldList(() => [
+        { no: 1, name: "week_start", kind: "scalar", T: 9 },
+        { no: 2, name: "week_end", kind: "scalar", T: 9 },
+        { no: 3, name: "members_count", kind: "scalar", T: 5 },
+        { no: 4, name: "eligible", kind: "scalar", T: 8 },
+        { no: 5, name: "easy_sessions", kind: "scalar", T: 5 },
+        { no: 6, name: "easy_bonus_each", kind: "scalar", T: 9 },
+        { no: 7, name: "easy_done_count", kind: "scalar", T: 5 },
+        { no: 8, name: "hard_leader_refs", kind: "scalar", T: 5 },
+        { no: 9, name: "hard_leader_required", kind: "scalar", T: 5 },
+        { no: 10, name: "hard_member_count", kind: "scalar", T: 5 },
+        { no: 11, name: "hard_member_required", kind: "scalar", T: 5 },
+        { no: 12, name: "hard_done", kind: "scalar", T: 8 },
+        { no: 13, name: "hard_bonus", kind: "scalar", T: 9 },
+        { no: 14, name: "bonus", kind: "scalar", T: 9 },
+    ]);
+    static fromBinary(bytes, options) {
+        return new TeamWeek().fromBinary(bytes, options);
+    }
+    static fromJson(jsonValue, options) {
+        return new TeamWeek().fromJson(jsonValue, options);
+    }
+    static fromJsonString(jsonString, options) {
+        return new TeamWeek().fromJsonString(jsonString, options);
+    }
+    static equals(a, b) {
+        return protobuf_1.proto3.util.equals(TeamWeek, a, b);
+    }
+}
+exports.TeamWeek = TeamWeek;
 class TeamInfo extends protobuf_1.Message {
     members = [];
     size = 0;
-    locked = false;
-    lockedUntil = "";
-    share = "";
-    fullTeamBonus = "";
-    fullTeamMinTasks = 0;
+    minMembers = 0;
+    week;
+    currentBonus = "";
+    currentBonusUntil = "";
     constructor(data) {
         super();
         protobuf_1.proto3.util.initPartial(data, this);
@@ -233,11 +275,10 @@ class TeamInfo extends protobuf_1.Message {
     static fields = protobuf_1.proto3.util.newFieldList(() => [
         { no: 1, name: "members", kind: "message", T: TeamMember, repeated: true },
         { no: 2, name: "size", kind: "scalar", T: 5 },
-        { no: 3, name: "locked", kind: "scalar", T: 8 },
-        { no: 4, name: "locked_until", kind: "scalar", T: 9 },
-        { no: 5, name: "share", kind: "scalar", T: 9 },
-        { no: 6, name: "full_team_bonus", kind: "scalar", T: 9 },
-        { no: 7, name: "full_team_min_tasks", kind: "scalar", T: 5 },
+        { no: 8, name: "min_members", kind: "scalar", T: 5 },
+        { no: 9, name: "week", kind: "message", T: TeamWeek },
+        { no: 10, name: "current_bonus", kind: "scalar", T: 9 },
+        { no: 11, name: "current_bonus_until", kind: "scalar", T: 9 },
     ]);
     static fromBinary(bytes, options) {
         return new TeamInfo().fromBinary(bytes, options);
@@ -993,9 +1034,6 @@ class ConfigResponse extends protobuf_1.Message {
     badgeBlue = "";
     badgeYellow = "";
     teamSize = 0;
-    teamShare = "";
-    fullTeamBonus = "";
-    fullTeamMinTasks = 0;
     multiplierCap = "";
     giftJr = "";
     giftSessions = 0;
@@ -1005,6 +1043,14 @@ class ConfigResponse extends protobuf_1.Message {
     claimMin = "";
     nudgeCooldownDays = 0;
     baseRate = "";
+    referrerGiftJr = "";
+    l2GiftJr = "";
+    teamMinMembers = 0;
+    teamEasySessions = 0;
+    teamEasyBonus = "";
+    teamHardLeaderRefs = 0;
+    teamHardMemberRefs = 0;
+    teamHardBonus = "";
     constructor(data) {
         super();
         protobuf_1.proto3.util.initPartial(data, this);
@@ -1018,9 +1064,6 @@ class ConfigResponse extends protobuf_1.Message {
         { no: 4, name: "badge_blue", kind: "scalar", T: 9 },
         { no: 5, name: "badge_yellow", kind: "scalar", T: 9 },
         { no: 6, name: "team_size", kind: "scalar", T: 5 },
-        { no: 7, name: "team_share", kind: "scalar", T: 9 },
-        { no: 8, name: "full_team_bonus", kind: "scalar", T: 9 },
-        { no: 9, name: "full_team_min_tasks", kind: "scalar", T: 5 },
         { no: 10, name: "multiplier_cap", kind: "scalar", T: 9 },
         { no: 11, name: "gift_jr", kind: "scalar", T: 9 },
         { no: 12, name: "gift_sessions", kind: "scalar", T: 5 },
@@ -1030,6 +1073,14 @@ class ConfigResponse extends protobuf_1.Message {
         { no: 16, name: "claim_min", kind: "scalar", T: 9 },
         { no: 17, name: "nudge_cooldown_days", kind: "scalar", T: 5 },
         { no: 18, name: "base_rate", kind: "scalar", T: 9 },
+        { no: 19, name: "referrer_gift_jr", kind: "scalar", T: 9 },
+        { no: 20, name: "l2_gift_jr", kind: "scalar", T: 9 },
+        { no: 21, name: "team_min_members", kind: "scalar", T: 5 },
+        { no: 22, name: "team_easy_sessions", kind: "scalar", T: 5 },
+        { no: 23, name: "team_easy_bonus", kind: "scalar", T: 9 },
+        { no: 24, name: "team_hard_leader_refs", kind: "scalar", T: 5 },
+        { no: 25, name: "team_hard_member_refs", kind: "scalar", T: 5 },
+        { no: 26, name: "team_hard_bonus", kind: "scalar", T: 9 },
     ]);
     static fromBinary(bytes, options) {
         return new ConfigResponse().fromBinary(bytes, options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jr-common-micro",
-  "version": "1.1.98",
+  "version": "1.1.99",
   "description": "",
   "author": "",
   "private": false,

package/proto/micro/v1/mining/mining_messages.proto

@@ -26,18 +26,18 @@ message SessionInfo {
 }
 
 // How the hourly rate comes together: hourly = base × multiplier,
-// multiplier = min(cap, badge + own_tasks + team_share + full_team).
+// multiplier = min(cap, badge_base × (1 + own_tasks + team_bonus)).
+// The badge multiplies everything; tasks and the weekly team bonus are
+// additive layers on top of 1.
 message RateInfo {
   string base = 1;
   // standard | blue | yellow
   string badge = 2;
   string badge_base = 3;
   string own_tasks = 4;
-  string team_share = 5;
-  string full_team = 6;
-  // Team members that reached the full-team task threshold today.
-  int32 full_team_ready = 7;
-  int32 full_team_size = 8;
+  // This week's team bonus (earned last week; 0 when none).
+  string team_bonus = 5;
+  reserved 6 to 8;
   string multiplier = 9;
   string cap = 10;
   string hourly = 11;
@@ -75,32 +75,62 @@ message ReferralInfo {
   string referred_by_username = 15;
 }
 
+// A team member and what they did for the week in progress. Sessions and
+// referrals count from the moment the member joined the team.
 message TeamMember {
   string user_id = 1;
   string username = 2;
   string avatar_url = 3;
-  // Tasks done today and the multiplier they add to the owner.
-  int32 tasks_today = 4;
-  string task_multiplier = 5;
-  string contribution = 6;
+  reserved 4 to 6, 8;
   bool mining = 7;
-  bool full_team_ready = 8;
-  // When the member becomes / stops being effective (team lock).
+  // When the member joined / left the team.
   string active_from = 9;
   string active_until = 10;
   // Nudge state: when the owner may nudge this member again ('' = now).
   string nudge_available_at = 11;
+  // Sessions completed this week (easy task: >= easy_sessions).
+  int32 sessions_week = 12;
+  bool easy_done = 13;
+  // Referrals of this member that activated this week (hard task: >= 1).
+  int32 refs_week = 14;
+}
+
+// One week of the team task: Monday 00:00 to the next Monday 00:00
+// (Europe/Istanbul). What was earned in a week applies the week after,
+// to the owner only.
+message TeamWeek {
+  string week_start = 1;
+  string week_end = 2;
+  // Members in the roster (the week counts only from min_members on).
+  int32 members_count = 3;
+  bool eligible = 4;
+  // Easy task: each member with >= easy_sessions completed sessions adds
+  // easy_bonus_each to next week's layer.
+  int32 easy_sessions = 5;
+  string easy_bonus_each = 6;
+  int32 easy_done_count = 7;
+  // Hard task: the owner brings >= hard_leader_required new referrals AND
+  // >= hard_member_required distinct members bring >= 1 each.
+  int32 hard_leader_refs = 8;
+  int32 hard_leader_required = 9;
+  int32 hard_member_count = 10;
+  int32 hard_member_required = 11;
+  bool hard_done = 12;
+  string hard_bonus = 13;
+  // The layer this week earns for the next one (so far, while running).
+  string bonus = 14;
 }
 
 message TeamInfo {
   repeated TeamMember members = 1;
   int32 size = 2;
-  // The team is locked while a session runs; changes apply at this time.
-  bool locked = 3;
-  string locked_until = 4;
-  string share = 5;
-  string full_team_bonus = 6;
-  int32 full_team_min_tasks = 7;
+  reserved 3 to 7;
+  int32 min_members = 8;
+  // The week in progress.
+  TeamWeek week = 9;
+  // The bonus applied to the owner's rate this week (earned last week).
+  string current_bonus = 10;
+  string current_bonus_until = 11;
 }
 
 message TaskInfo {
@@ -311,10 +341,9 @@ message ConfigResponse {
   string badge_blue = 4;
   string badge_yellow = 5;
   int32 team_size = 6;
-  string team_share = 7;
-  string full_team_bonus = 8;
-  int32 full_team_min_tasks = 9;
+  reserved 7 to 9;
   string multiplier_cap = 10;
+  // The invitee's gift on activation.
   string gift_jr = 11;
   int32 gift_sessions = 12;
   int32 referral_levels = 13;
@@ -324,6 +353,16 @@ message ConfigResponse {
   int32 nudge_cooldown_days = 17;
   // Current base rate after halvings, JR per hour.
   string base_rate = 18;
+  // The referrer's gift after gift_sessions, and the referrer's referrer's.
+  string referrer_gift_jr = 19;
+  string l2_gift_jr = 20;
+  // Weekly team task.
+  int32 team_min_members = 21;
+  int32 team_easy_sessions = 22;
+  string team_easy_bonus = 23;
+  int32 team_hard_leader_refs = 24;
+  int32 team_hard_member_refs = 25;
+  string team_hard_bonus = 26;
 }
 
 message AdminOverviewRequest {